From 6f59a96575c130e6606e679b51a5799d44a4f725 Mon Sep 17 00:00:00 2001
From: Debo <debottam.bakshi.gupta@cern.ch>
Date: Thu, 5 Aug 2021 16:36:07 +0200
Subject: [PATCH 001/272] Making TRTHTH variables enable to be monitored
---
.../python/TrigTRTHTHhypoTool.py | 11 ++++++++++-
.../src/TrigTRTHTHhypoTool.cxx | 16 +++++++++++-----
.../src/TrigTRTHTHhypoTool.h | 3 +++
3 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/python/TrigTRTHTHhypoTool.py b/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/python/TrigTRTHTHhypoTool.py
index df977cd24ee9..b3a9dc620c1e 100644
--- a/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/python/TrigTRTHTHhypoTool.py
+++ b/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/python/TrigTRTHTHhypoTool.py
@@ -1,9 +1,16 @@
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
from TrigTRTHighTHitCounter.TrigTRTHighTHitCounterConf import TrigTRTHTHhypoTool
+from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool, defineHistogram
def _IncTool(name):
+ monTool = GenericMonitoringTool("MonTool_"+name)
+ monTool.Histograms = [ defineHistogram('HTRatioRoad', type='TH1F', path='EXPERT', title="TrigTRTHTH Hypo HTRatioRoad", xbins=10, xmin=0.0, xmax=0.9),
+ defineHistogram('HTRatioWedge', type='TH1F', path='EXPERT', title="TrigTRTHTH Hypo HTRatioWedge", xbins=10, xmin=0.0, xmax=0.9),
+ defineHistogram('TRTHTHitsRoad', type='TH1F', path='EXPERT', title="TrigTRTHTH Hypo TRTHTHitsRoad", xbins=100, xmin=0, xmax=100),
+ defineHistogram('TRTHTHitsWedge', type='TH1F', path='EXPERT', title="TrigTRTHTH Hypo TRTHTHitsWedge", xbins=100, xmin=0, xmax=100),]
+
tool = TrigTRTHTHhypoTool( name )
tool.AcceptAll = False
tool.MinTRTHTHitsRoad = 20
@@ -11,7 +18,9 @@ def _IncTool(name):
tool.MinTRTHTHitsWedge = 30
tool.MinHTRatioWedge = 0.4
tool.DoWedge = True
- tool.DoRoad = False
+ tool.DoRoad = False
+ monTool.HistPath = 'TrigTRTHTHhypo/'+tool.getName()
+ tool.MonTool = monTool
return tool
def TrigTRTHTHhypoToolFromDict( d ):
diff --git a/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/TrigTRTHTHhypoTool.cxx b/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/TrigTRTHTHhypoTool.cxx
index 0ea79792c7cc..4750788417e7 100644
--- a/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/TrigTRTHTHhypoTool.cxx
+++ b/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/TrigTRTHTHhypoTool.cxx
@@ -3,7 +3,7 @@
*/
#include "TrigTRTHTHhypoTool.h"
-
+#include "AthenaMonitoringKernel/Monitored.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
namespace TCU = TrigCompositeUtils;
@@ -25,6 +25,12 @@ StatusCode TrigTRTHTHhypoTool::initialize() {
bool TrigTRTHTHhypoTool::decide( const ITrigTRTHTHhypoTool::RNNOutputInfo& input ) const {
bool pass = false;
+
+ auto fHT_road = Monitored::Scalar( "HTRatioRoad", -1. );
+ auto fHT_wedge = Monitored::Scalar( "HTRatioWedge", -1. );
+ auto trththits_road = Monitored::Scalar( "TRTHTHitsRoad" , -1.0 );
+ auto trththits_wedge = Monitored::Scalar( "TRTHTHitsWedge", -1.0 );
+ auto monitorIt = Monitored::Group( m_monTool, fHT_road, fHT_wedge, trththits_road, trththits_wedge);
if( m_acceptAll ){
pass=true;
@@ -42,10 +48,10 @@ bool TrigTRTHTHhypoTool::decide( const ITrigTRTHTHhypoTool::RNNOutputInfo& input
//Parse the vector to assign fHT and nHT appropriately
- float fHT_road = vec.at(1);
- float fHT_wedge = vec.at(3);
- float trththits_road = vec.at(0);
- float trththits_wedge = vec.at(2);
+ fHT_road = vec.at(1);
+ fHT_wedge = vec.at(3);
+ trththits_road = vec.at(0);
+ trththits_wedge = vec.at(2);
ATH_MSG_DEBUG ( "trththits_road: " << trththits_road);
ATH_MSG_DEBUG ("m_minTRTHTHitsRoad in hypotool: "<<m_minTRTHTHitsRoad);
diff --git a/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/TrigTRTHTHhypoTool.h b/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/TrigTRTHTHhypoTool.h
index 74e665cd303d..1d488ea6e929 100644
--- a/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/TrigTRTHTHhypoTool.h
+++ b/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/TrigTRTHTHhypoTool.h
@@ -6,6 +6,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
+#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
#include "ITrigTRTHTHhypoTool.h"
@@ -38,6 +39,8 @@ class TrigTRTHTHhypoTool : public extends<AthAlgTool, ITrigTRTHTHhypoTool> {
Gaudi::Property< bool > m_doWedge { this, "DoWedge", true , "Bins of eta" };
Gaudi::Property< bool > m_doRoad { this, "DoRoad", false , "Bins of eta" };
+ ToolHandle< GenericMonitoringTool > m_monTool{ this, "MonTool", "", "Monitoring tool" };
+
};
#endif
--
GitLab
From 6e9570f29696212d9062530cb07dfad0d962bc11 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Fri, 6 Aug 2021 22:41:47 +0200
Subject: [PATCH 002/272] MuonRDO: Fix gcc11 warnings.
The proper way to avoid pointer aliasing issues is to use a union
rather than casting between unrelated pointer types.
---
MuonSpectrometer/MuonRDO/MuonRDO/TgcL1Rdo.h | 31 +++++++++++++--------
MuonSpectrometer/MuonRDO/MuonRDO/TgcRdo.h | 31 +++++++++++++--------
2 files changed, 38 insertions(+), 24 deletions(-)
diff --git a/MuonSpectrometer/MuonRDO/MuonRDO/TgcL1Rdo.h b/MuonSpectrometer/MuonRDO/MuonRDO/TgcL1Rdo.h
index dd49b9df71c5..968821e80e63 100755
--- a/MuonSpectrometer/MuonRDO/MuonRDO/TgcL1Rdo.h
+++ b/MuonSpectrometer/MuonRDO/MuonRDO/TgcL1Rdo.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MUONRDO_TGCL1RDO_H
@@ -11,14 +11,6 @@
#include "AthenaKernel/CLASS_DEF.h"
#include "Identifier/IdentifierHash.h"
-// This cast is needed to remove warning: dereferencing type-punned pointer will break strict-aliasing rules
-// bug #67256: compiler warning in MuonEventAthenaPool/src/TgcL1RdoCnv_p2.cxx
-// This cast breaks ATLAS C++ Coding Standard : CC4 Do not use reinterpret_cast. (REQUIRED)
-template<typename DEST, typename SRC> const DEST* TgcL1Rdo_const_pointer_cast(const SRC* src) {
- const void* ptr = src;
- return reinterpret_cast<const DEST*>(ptr);
-}
-
/*
TGC collection class used for bare RDO ByteStream Conversion.
This class holds one ROD information
@@ -171,7 +163,12 @@ public:
{
// FIXME BUG: This is not portable!
// The layout of bitfields in a structure is implementation-defined.
- m_errors = *TgcL1Rdo_const_pointer_cast<Errors>(&data);
+ union cnvErrors {
+ uint16_t data;
+ Errors errors;
+ } cnv;
+ cnv.data = data;
+ m_errors = cnv.errors;
}
const SRodStatus& srodStatus() const
@@ -182,7 +179,12 @@ public:
{
// FIXME BUG: This is not portable!
// The layout of bitfields in a structure is implementation-defined.
- m_srodStatus = *TgcL1Rdo_const_pointer_cast<SRodStatus>(&data);
+ union cnvSRodStatus {
+ uint16_t data;
+ SRodStatus srodStatus;
+ } cnv;
+ cnv.data = data;
+ m_srodStatus = cnv.srodStatus;
}
const LocalStatus& localStatus() const
@@ -193,7 +195,12 @@ public:
{
// FIXME BUG: This is not portable!
// The layout of bitfields in a structure is implementation-defined.
- m_localStatus = *TgcL1Rdo_const_pointer_cast<LocalStatus>(&data);
+ union cnvLocalStatus {
+ uint16_t data;
+ LocalStatus localStatus;
+ } cnv;
+ cnv.data = data;
+ m_localStatus = cnv.localStatus;
}
uint32_t orbit() const
diff --git a/MuonSpectrometer/MuonRDO/MuonRDO/TgcRdo.h b/MuonSpectrometer/MuonRDO/MuonRDO/TgcRdo.h
index 0aa2218b7996..eb489bf57a50 100755
--- a/MuonSpectrometer/MuonRDO/MuonRDO/TgcRdo.h
+++ b/MuonSpectrometer/MuonRDO/MuonRDO/TgcRdo.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MUONRDO_TGCRDO_H
@@ -11,14 +11,6 @@
#include "AthenaKernel/CLASS_DEF.h"
#include "Identifier/IdentifierHash.h"
-// This cast is needed to remove warning: dereferencing type-punned pointer will break strict-aliasing rules
-// bug #67256: compiler warning in MuonEventAthenaPool/src/TgcRdoCnv_p2.cxx
-// This cast breaks ATLAS C++ Coding Standard : CC4 Do not use reinterpret_cast. (REQUIRED)
-template<typename DEST, typename SRC> const DEST* TgcRdo_const_pointer_cast(const SRC* src) {
- const void* ptr = src;
- return reinterpret_cast<const DEST*>(ptr);
-}
-
/*
TGC collection class used for bare RDO ByteStream Conversion.
This class holds one ROD information
@@ -171,7 +163,12 @@ public:
{
// FIXME BUG: This is not portable!
// The layout of bitfields in a structure is implementation-defined.
- m_errors = *TgcRdo_const_pointer_cast<Errors>(&data);
+ union cnvErrors {
+ uint16_t data;
+ Errors errors;
+ } cnv;
+ cnv.data = data;
+ m_errors = cnv.errors;
}
const RodStatus& rodStatus() const
@@ -182,7 +179,12 @@ public:
{
// FIXME BUG: This is not portable!
// The layout of bitfields in a structure is implementation-defined.
- m_rodStatus = *TgcRdo_const_pointer_cast<RodStatus>(&data);
+ union cnvRodStatus {
+ uint16_t data;
+ RodStatus rodStatus;
+ } cnv;
+ cnv.data = data;
+ m_rodStatus = cnv.rodStatus;
}
const LocalStatus& localStatus() const
@@ -193,7 +195,12 @@ public:
{
// FIXME BUG: This is not portable!
// The layout of bitfields in a structure is implementation-defined.
- m_localStatus = *TgcRdo_const_pointer_cast<LocalStatus>(&data);
+ union cnvLocalStatus {
+ uint16_t data;
+ LocalStatus localStatus;
+ } cnv;
+ cnv.data = data;
+ m_localStatus = cnv.localStatus;
}
uint32_t orbit() const
--
GitLab
From 15ed046bef37ccbd338d2036d96236a5888121cf Mon Sep 17 00:00:00 2001
From: Junpei Maeda <junpei.maeda@cern.ch>
Date: Wed, 11 Aug 2021 13:41:46 +0200
Subject: [PATCH 003/272] migrated pointers of multi-arrays of
TGCRPhiCoincidenceMap to std::array using std::shared_ptr
---
.../TrigT1TGC/TrigT1TGC/TGCDatabaseManager.h | 6 +++---
.../TrigT1TGC/TGCRPhiCoincidenceMatrix.h | 4 ++--
.../TrigT1TGC/src/TGCDatabaseManager.cxx | 19 +------------------
.../src/TGCRPhiCoincidenceMatrix.cxx | 4 +---
4 files changed, 7 insertions(+), 26 deletions(-)
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCDatabaseManager.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCDatabaseManager.h
index 7b18d1ff9183..9122f8681e84 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCDatabaseManager.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCDatabaseManager.h
@@ -52,7 +52,7 @@ class TGCDatabaseManager : public AthMessaging
const TGCConnectionPPToSL* getConnectionPPToSL(TGCRegionType type) const;
const TGCConnectionASDToPP* getConnectionASDToPP(TGCRegionType region, int type, TGCForwardBackwardType forwardBackward) const;
- const TGCRPhiCoincidenceMap* getRPhiCoincidenceMap(int sideId, int octantId) const;
+ std::shared_ptr<TGCRPhiCoincidenceMap> getRPhiCoincidenceMap(int sideId, int octantId) const;
const TGCEIFICoincidenceMap* getEIFICoincidenceMap(int sideId) const;
std::shared_ptr<LVL1TGC::TGCTileMuCoincidenceLUT> getTileMuCoincidenceLUT() const;
std::shared_ptr<TGCNSWCoincidenceMap> getNSWCoincidenceMap(int sideId, int octantId, int moduleId) const;
@@ -75,7 +75,7 @@ class TGCDatabaseManager : public AthMessaging
private:
enum {NumberOfModuleInBW=9};
- TGCRPhiCoincidenceMap* m_mapRphi[NumberOfSide][NumberOfOctant];
+ std::array<std::array<std::shared_ptr<TGCRPhiCoincidenceMap>, NumberOfOctant>,NumberOfSide> m_mapRphi;
TGCEIFICoincidenceMap* m_mapEIFI[NumberOfSide];
std::shared_ptr<LVL1TGC::TGCTileMuCoincidenceLUT> m_tileMuLUT;
std::array<std::array<std::array<std::shared_ptr<TGCNSWCoincidenceMap>, NumberOfModuleInBW>, NumberOfOctant>, NumberOfSide> m_mapNSW;
@@ -91,7 +91,7 @@ class TGCDatabaseManager : public AthMessaging
};
inline
-const TGCRPhiCoincidenceMap* TGCDatabaseManager::getRPhiCoincidenceMap(int sideId, int octantId) const
+std::shared_ptr<TGCRPhiCoincidenceMap> TGCDatabaseManager::getRPhiCoincidenceMap(const int sideId, const int octantId) const
{
return m_mapRphi[sideId][octantId];
}
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceMatrix.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceMatrix.h
index e28d83bb1d69..2e02d73386ef 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceMatrix.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceMatrix.h
@@ -18,7 +18,7 @@ class TGCRPhiCoincidenceMatrix {
public:
void setSSCId(int SSCIdIn){ m_SSCId=SSCIdIn;};
void setSideId(int sideIdIn){ m_sideId=sideIdIn;};
- void setRPhiMap(const TGCRPhiCoincidenceMap* map);
+ void setRPhiMap(std::shared_ptr<const TGCRPhiCoincidenceMap> map);
void inputR(int rIn, int dRIn, int ptRIn);
void inputPhi(int phiIn, int dPhiIn, int ptPhiIn);
void clear();
@@ -39,7 +39,7 @@ private:
const TGCSectorLogic* m_sectorLogic;
TGCRPhiCoincidenceOut* m_matrixOut;
- const TGCRPhiCoincidenceMap* m_map;
+ std::shared_ptr<const TGCRPhiCoincidenceMap> m_map;
int m_nPhiHit;
int m_SSCId;
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCDatabaseManager.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCDatabaseManager.cxx
index fa22285de88c..41f5051fb5f9 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCDatabaseManager.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCDatabaseManager.cxx
@@ -88,9 +88,6 @@ TGCDatabaseManager::TGCDatabaseManager()
}
for (int side=0; side<NumberOfSide; side +=1) {
m_mapEIFI[side] = 0;
- for (int oct=0; oct<NumberOfOctant; oct++) {
- m_mapRphi[side][oct] = 0;
- }
}
}
@@ -146,7 +143,7 @@ TGCDatabaseManager::TGCDatabaseManager(TGCArguments* tgcargs,
// RPhi Coincidence Map
for (int side=0; side<NumberOfSide; side +=1) {
for (int oct=0; oct<NumberOfOctant; oct++) {
- m_mapRphi[side][oct] = new TGCRPhiCoincidenceMap(tgcArgs(),readCondKey,readLUTsCondKey, ver_BW, side, oct);
+ m_mapRphi[side][oct].reset(new TGCRPhiCoincidenceMap(tgcArgs(),readCondKey,readLUTsCondKey, ver_BW, side, oct));
}
}
@@ -204,11 +201,6 @@ TGCDatabaseManager::~TGCDatabaseManager()
m_PPToSL[j]=0;
}
- for (int side=0; side<NumberOfSide; side +=1) {
- for (int oct=0; oct<NumberOfOctant; oct++)
- delete m_mapRphi[side][oct];
- }
-
for(int side=0; side<NumberOfSide; side +=1) {
delete m_mapEIFI[side];
}
@@ -227,10 +219,6 @@ TGCDatabaseManager::TGCDatabaseManager(const TGCDatabaseManager& right)
for( int i=0; i<NumberOfRegionType; i+=1) m_PPToSL[i] = 0;
for (int side=0; side<NumberOfSide; side +=1) {
m_mapEIFI[side] =0;
-
- for (int oct=0; oct<NumberOfOctant; oct++) {
- m_mapRphi[side][oct] = 0;
- }
}
*this = right;
@@ -257,11 +245,6 @@ TGCDatabaseManager::operator=(const TGCDatabaseManager& right)
for (int side=0; side<NumberOfSide; side +=1) {
if (m_mapEIFI[side]!=0) delete m_mapEIFI[side];
m_mapEIFI[side] = new TGCEIFICoincidenceMap(*(right.m_mapEIFI[side]));
-
- for (int oct=0; oct<NumberOfOctant; oct++) {
- if(m_mapRphi[side][oct]!=0) delete m_mapRphi[side][oct];
- m_mapRphi[side][oct] = new TGCRPhiCoincidenceMap(*(right.m_mapRphi[side][oct]));
- }
}
m_patchPanelToConnectionInPP = right.m_patchPanelToConnectionInPP;
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMatrix.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMatrix.cxx
index a9339820babd..2fd89ba0fb2f 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMatrix.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMatrix.cxx
@@ -141,7 +141,7 @@ TGCRPhiCoincidenceOut* TGCRPhiCoincidenceMatrix::doCoincidence()
return out;
}
-void TGCRPhiCoincidenceMatrix::setRPhiMap(const TGCRPhiCoincidenceMap* map)
+void TGCRPhiCoincidenceMatrix::setRPhiMap(std::shared_ptr<const TGCRPhiCoincidenceMap> map)
{
this->m_map = map;
}
@@ -170,8 +170,6 @@ TGCRPhiCoincidenceMatrix& TGCRPhiCoincidenceMatrix::operator=(const TGCRPhiCoinc
m_sectorLogic = right.m_sectorLogic;
delete m_matrixOut;
m_matrixOut =0;
- delete m_map;
- m_map = new TGCRPhiCoincidenceMap(*(right.m_map));
m_nPhiHit = 0;
m_SSCId = 0;
m_r = 0;
--
GitLab
From 75c082419e101f72b074c3b6212be2e9697fadf5 Mon Sep 17 00:00:00 2001
From: Junpei Maeda <junpei.maeda@cern.ch>
Date: Wed, 11 Aug 2021 13:48:19 +0200
Subject: [PATCH 004/272] removed unnecessary includes
---
Trigger/TrigT1/TrigT1TGC/src/TGCSSCController.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCSSCController.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCSSCController.cxx
index 5842bed92fab..7513e65b0213 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCSSCController.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCSSCController.cxx
@@ -5,7 +5,7 @@
#include "TrigT1TGC/TGCSSCController.h"
#include "TrigT1TGC/TGCSSCControllerOut.h"
#include "TrigT1TGC/TGCSectorLogic.h"
-#include "TrigT1TGC/TGCRPhiCoincidenceMap.h"
+//#include "TrigT1TGC/TGCRPhiCoincidenceMap.h"
#include "TrigT1TGC/TGCHighPtBoardOut.h"
#include <iostream>
--
GitLab
From 26b5ade45981103b3cc452a847350eae5e39b0ae Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Wed, 11 Aug 2021 15:31:44 +0200
Subject: [PATCH 005/272] Lvl1ResultAccessTool: remove obsolete code
The `Lvl1ResultAccessTool` was used in Run-1&2 to seed the HLT steering.
But now the only use is within `TrigDecisionMaker` and most of the code
and interfaces are obsolete.
---
.../TrigDecisionMaker/ILvl1ResultAccessTool.h | 24 -
.../src/Lvl1ResultAccessTool.cxx | 814 +-----------------
.../src/Lvl1ResultAccessTool.h | 136 +--
3 files changed, 2 insertions(+), 972 deletions(-)
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/TrigDecisionMaker/ILvl1ResultAccessTool.h b/Trigger/TrigAnalysis/TrigDecisionMaker/TrigDecisionMaker/ILvl1ResultAccessTool.h
index 12c9de1b61f3..1765d0726852 100644
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/TrigDecisionMaker/ILvl1ResultAccessTool.h
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/TrigDecisionMaker/ILvl1ResultAccessTool.h
@@ -33,39 +33,15 @@ namespace HLT {
public:
DeclareInterfaceID (ILvl1ResultAccessTool, 1, 0);
- virtual const std::vector<LVL1CTP::Lvl1Item>& getDecisionItems() = 0;
-
- virtual const std::vector< MuonRoI >& getMuonRoIs() const = 0;
- virtual const std::vector< EMTauRoI >& getEMTauRoIs() const = 0;
- virtual const std::vector< JetEnergyRoI >& getJetEnergyRoIs() const = 0;
-
virtual bool isCalibrationEvent(const ROIB::RoIBResult& result) const = 0;
virtual std::vector< const LVL1CTP::Lvl1Item*>
- createL1Items(const ROIB::RoIBResult& result,
- LVL1CTP::Lvl1Result const** lvl1ResultOut = nullptr) = 0;
- virtual std::vector< const LVL1CTP::Lvl1Item*>
createL1Items(const std::vector< std::unique_ptr<LVL1CTP::Lvl1Item> >& lvl1ItemConfig,
const ROIB::RoIBResult& result,
LVL1CTP::Lvl1Result const** lvl1ResultOut = nullptr) const = 0;
- virtual const std::vector< MuonRoI >& createMuonThresholds(const ROIB::RoIBResult& result) = 0;
- virtual const std::vector< EMTauRoI >& createEMTauThresholds(const ROIB::RoIBResult& result, bool updateCaloRoIs=false) = 0;
- virtual const std::vector< JetEnergyRoI >& createJetEnergyThresholds(const ROIB::RoIBResult& result, bool updateCaloRoIs) = 0;
-
virtual std::bitset<3> lvl1EMTauJetOverflow(const ROIB::RoIBResult& result) = 0;
- virtual StatusCode updateConfig(bool useL1Calo = true,
- bool useL1Muon = true,
- bool useL1JetEnergy = true) = 0;
-
- virtual std::vector< std::unique_ptr<LVL1CTP::Lvl1Item> > makeLvl1ItemConfig() const = 0;
virtual std::vector< std::unique_ptr<LVL1CTP::Lvl1Item> > makeLvl1ItemConfig(const EventContext& context) const = 0;
- virtual StatusCode updateItemsConfigOnly() = 0;
-
- virtual StatusCode updateResult(const ROIB::RoIBResult& result,
- bool updateCaloRoIs = false) = 0;
-
- virtual StatusCode updateResult(const LVL1CTP::Lvl1Result& result) = 0;
};
}
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/src/Lvl1ResultAccessTool.cxx b/Trigger/TrigAnalysis/TrigDecisionMaker/src/Lvl1ResultAccessTool.cxx
index 56fb4eef5b9b..2231d3dd81fc 100755
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/src/Lvl1ResultAccessTool.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/src/Lvl1ResultAccessTool.cxx
@@ -2,19 +2,11 @@
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-#include "TrigDecisionMaker/Lvl1ItemsAndRoIs.h"
#include "Lvl1ResultAccessTool.h"
#include "TrigT1Result/RoIBResult.h"
#include "CTPfragment/CTPdataformatVersion.h"
-#include "TrigT1Interfaces/TriggerTypeWord.h"
-#include "TrigT1Interfaces/TrigT1Interfaces_ClassDEF.h"
-#include "TrigT1Interfaces/RoIFormatUpdater.h"
-#include "TrigT1Interfaces/RecEmTauRoI.h"
-#include "TrigT1Interfaces/RecJetRoI.h"
-#include "TrigT1Interfaces/TrigT1CaloDefs.h"
-
#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
#include "TrigConfL1Data/CTPConfig.h"
#include "TrigConfL1Data/ThresholdConfig.h"
@@ -22,28 +14,14 @@
#include "TrigConfL1Data/Menu.h"
#include "TrigConfL1Data/TriggerItem.h"
#include "TrigConfData/L1Menu.h"
-#include "TrigConfHLTData/HLTTriggerElement.h"
#include "TrigConfHLTData/HLTUtils.h"
#include "TrigSteeringEvent/Lvl1Result.h"
-using TrigConf::L1DataDef;
HLT::Lvl1ResultAccessTool::Lvl1ResultAccessTool(const std::string& name, const std::string& type,
const IInterface* parent) :
base_class(name, type, parent)
{
- declareProperty( "ignorePrescales", m_ignorePrescales=false, "Allows to set prescales but ignore them");
- declareProperty( "muonCommissioningStep", m_muonCommissioningStep=0, "Set thresholods creation policty. 0 means default, i.e. thresholds fully inclusive");
-}
-
-HLT::Lvl1ResultAccessTool::~Lvl1ResultAccessTool() {
- clearDecisionItems();
-}
-
-
-void
-HLT::Lvl1ResultAccessTool::clearDecisionItems() {
- m_decisionItems.clear();
}
StatusCode
@@ -61,9 +39,6 @@ HLT::Lvl1ResultAccessTool::initialize() {
ATH_MSG_DEBUG("Retrieving TrigConfigSvc.");
CHECK( m_lvl1ConfigSvc.retrieve() );
- if(m_ignorePrescales)
- ATH_MSG_INFO("Prescales will be ignored.");
-
return StatusCode::SUCCESS;
}
@@ -72,33 +47,6 @@ HLT::Lvl1ResultAccessTool::initialize() {
// a vector where the position corresponds to the LVL1 item
// position in the CTP result!
// =============================================================
-std::vector< std::unique_ptr<LVL1CTP::Lvl1Item> >
-HLT::Lvl1ResultAccessTool::makeLvl1ItemConfig() const
-{
- // vector holding all configured LVL1 items, default initializes to empty unique_ptr
- constexpr size_t numberOfCTPItems = 512; // this is fixed
- std::vector<std::unique_ptr<LVL1CTP::Lvl1Item>> lvl1ItemConfig(numberOfCTPItems);
-
- if( m_useNewConfig ) {
- ATH_MSG_ERROR("Called makeLvl1ItemConfig without EventContext and UseNewConfig==True. The new configuration requires an EventContext to retrieve the prescales.");
- } else {
- const TrigConf::CTPConfig *ctpConfig = m_lvl1ConfigSvc->ctpConfig();
- const auto & prescales = ctpConfig->prescaleSet().prescales_float();
- for(const TrigConf::TriggerItem * item : ctpConfig->menu().items() ) {
- unsigned int pos = item->ctpId();
- if (lvl1ItemConfig[pos] != nullptr && item->name() != lvl1ItemConfig[pos]->name() ) {
- ATH_MSG_ERROR( "LVL1 item: " << item->name() << " uses a CTP id: "
- << pos << " that is already used!! --> ignore this LVL1 item! ");
- } else {
- lvl1ItemConfig[pos] = std::make_unique<LVL1CTP::Lvl1Item>( item->name(),
- TrigConf::HLTUtils::string2hash(item->name()),
- 0, 0, 0, prescales[pos]);
- }
- }
- }
- return lvl1ItemConfig;
-}
-
std::vector< std::unique_ptr<LVL1CTP::Lvl1Item> >
HLT::Lvl1ResultAccessTool::makeLvl1ItemConfig(const EventContext& context) const
{
@@ -147,348 +95,7 @@ HLT::Lvl1ResultAccessTool::makeLvl1ItemConfig(const EventContext& context) const
}
-StatusCode
-HLT::Lvl1ResultAccessTool::updateItemsConfigOnly() {
-
- // =============================================================
- // Prepare LVL1 items, i.e. name -> hashID, put everything into
- // a vector where the position corresponds to the LVL1 item
- // position in the CTP result!
- // =============================================================
-
- m_lvl1ItemConfig = makeLvl1ItemConfig();
-
- int xtra = m_decisionItems.size() - m_lvl1ItemConfig.size();
-
- if (xtra > 0)
- for (unsigned int i = 0; i < (unsigned int)xtra; ++i) {
- m_decisionItems.pop_back();
- }
-
- for (unsigned int i = 0; i < m_lvl1ItemConfig.size(); ++i) {
-
- // make sure we have a non-zero object:
- if (!m_lvl1ItemConfig[i]) continue;
-
- if (i < m_decisionItems.size()) {
- m_decisionItems[i].setName(m_lvl1ItemConfig[i]->name());
- m_decisionItems[i].setHashId(m_lvl1ItemConfig[i]->hashId());
- m_decisionItems[i].setPrescaleFactor(m_lvl1ItemConfig[i]->prescaleFactor());
- }
-
- ATH_MSG_DEBUG("name " << m_lvl1ItemConfig[i]->name() << " (and hashID " << m_lvl1ItemConfig[i]->hashId() << ") position " << i);
- }
-
- return StatusCode::SUCCESS;
-}
-
-
-StatusCode
-HLT::Lvl1ResultAccessTool::updateConfig( bool useL1Muon, bool useL1Calo, bool useL1JetEnergy)
-{
- StatusCode sc = updateItemsConfigOnly();
- if (!sc.isSuccess()) return sc;
-
- const TrigConf::ThresholdConfig* thresholdConfig = m_lvl1ConfigSvc->thresholdConfig();
-
- // =============================================================
- // Prepare LVL1 RoI thresholds:
- // - for a fast execution, we save the threholds names (hashIDs)
- // here
- // - matching these hashIDs with HLT sequence TriggerElements,
- // we can flag the thresholds that are used in HLT in order to
- // save time in the execute: create only those TriggerElements
- // =============================================================
-
- // ------------------------------
- // Muon RoIs
- // ------------------------------
-
- if (useL1Muon) {
- ATH_MSG_DEBUG("Going through configured LVL1 MUON thresholds ... ");
- const std::vector<TrigConf::TriggerThreshold*>& muonThresholdConfig = thresholdConfig->getThresholdVector(L1DataDef::MUON);
-
- m_muonCfg.clear();
- m_useL1Muon = false; // care about muons in execute only if at least one muon TriggerElement is used in HLT !
-
- // make sure, the vector is filled up to a size of MAX MUON NUMBER (should be 6):
- while(m_muonCfg.size() <= 6) {
- m_muonCfg.push_back( ConfigThreshold() ); // default entries are not active !
- }
-
- for (const TrigConf::TriggerThreshold* muonTT : muonThresholdConfig) {
- ATH_MSG_DEBUG("Searching TE that matches LVL1 MUON threshold: " << muonTT->name());
- unsigned int teId = 0;
- bool activeHLT = TrigConf::HLTTriggerElement::getId( muonTT->name().c_str(), teId);
- teId = TrigConf::HLTUtils::string2hash(muonTT->name());
- if (activeHLT) {
- ATH_MSG_DEBUG(" => OK (found TE)");
- ATH_MSG_DEBUG(" => TE=(name="<<muonTT->name() << ", hashID="<<teId << ")");
- } else {
- ATH_MSG_DEBUG(" => NO");
- }
- int tn = muonTT->thresholdNumber()+1;
- if (tn < 0) {
- ATH_MSG_WARNING("this LVL1 threshold bit position (" << tn << ") is smaller 0, go on w/o this threshold!");
- } else if (tn > 6) {
- ATH_MSG_WARNING("this LVL1 threshold bit position (" << tn << ") is greater 6, go on w/o this threshold!");
- } else{
- ATH_MSG_DEBUG("thresholdNumber = " << tn);
- m_muonCfg.at(tn) = ConfigThreshold(muonTT->name(), teId, activeHLT) ;
- m_useL1Muon = true;
- }
- }
- }
-
- // ------------------------------
- // EMTau RoIs
- // ------------------------------
- if (useL1Calo) {
- ATH_MSG_DEBUG("Going through configured LVL1 CALO thresholds ... ");
- m_useL1Calo = false; // care about calo RoIs in execute only if at least one calo TriggerElement is used in HLT !
- m_emCfg.clear();
- m_tauCfg.clear();
- m_emtauThresholds.clear();
-
- for( L1DataDef::TriggerType caloType : std::vector<L1DataDef::TriggerType>{ L1DataDef::EM, L1DataDef::TAU} ) {
-
- for (TrigConf::TriggerThreshold * clusterTT : thresholdConfig->getThresholdVector( caloType ) ) {
-
- if (clusterTT == nullptr) continue;
-
- // Needed to find thresholds passed by Run 2 RoI
- m_emtauThresholds.push_back(clusterTT);
-
- ATH_MSG_DEBUG("Searching TE that matches LVL1 EM/TAU threshold: " << clusterTT->name());
-
- unsigned int teId = 0;
- bool activeHLT = TrigConf::HLTTriggerElement::getId( clusterTT->name().c_str(), teId);
- teId = TrigConf::HLTUtils::string2hash( clusterTT->name() );
- if (activeHLT) {
- ATH_MSG_DEBUG(" => OK (found TE)");
- ATH_MSG_DEBUG(" => TE=(name="<< clusterTT->name() << ", hashID="<<teId << ")");
- } else {
- ATH_MSG_DEBUG(" => NO");
- }
- int tn = clusterTT->thresholdNumber();
- if (tn < 0) {
- ATH_MSG_WARNING("this LVL1 threshold bit position (" << tn << ") is smaller 0, go on w/o this threshold!");
- } else {
- uint32_t mask= 0x1 << tn;
- ATH_MSG_DEBUG("thresholdNumber = " << tn << " .. bit position = 0x" << std::hex << std::setw( 8 ) << std::setfill( '0' ) << mask << std::dec);
- if (caloType == L1DataDef::EM)
- m_emCfg.push_back( ConfigThreshold( clusterTT->name(), teId, activeHLT, mask ));
- else if (caloType == L1DataDef::TAU)
- m_tauCfg.push_back( ConfigThreshold( clusterTT->name(), teId, activeHLT, mask ));
- m_useL1Calo = true;
- }
- }
- }
- } // if (useL1Calo)
-
-
- // ------------------------------
- // JetEnergy RoIs
- // ------------------------------
- if (useL1JetEnergy) {
-
- ATH_MSG_DEBUG("Going through configured LVL1 JetEnergy thresholds ... ");
-
- m_useL1JetEnergy = false;// care about jetEnergy RoIs in execute only if at least one jetEnergy TriggerElement is used in HLT !
- m_jetCfg.clear();
-
- // In case we need to calculate thresholds passed: copy jet thresholds into vector RecJetRoI can use
- m_jetThresholds = thresholdConfig->getJetThresholdVector();
- m_jetThresholds.insert( m_jetThresholds.end(),
- thresholdConfig->getFJetThresholdVector().begin(),
- thresholdConfig->getFJetThresholdVector().end() );
-
- // Jet threholds:
- for(const TrigConf::TriggerThreshold * thr : thresholdConfig->getJetThresholdVector() ) {
- ATH_MSG_DEBUG("Searching TE that matches LVL1 JET threshold: " << thr->name());
- unsigned int teId = 0;
- bool activeHLT = TrigConf::HLTTriggerElement::getId( thr->name().c_str(), teId);
- teId = TrigConf::HLTUtils::string2hash( thr->name() );
- if (activeHLT) {
- ATH_MSG_DEBUG(" => OK (found TE)");
- ATH_MSG_DEBUG(" => TE=(name="<< thr->name() << ", hashID="<<teId << ")");
- } else {
- ATH_MSG_DEBUG(" => NO");
- }
-
- int tn = thr->thresholdNumber();
- if (tn < 0) {
- ATH_MSG_WARNING("this LVL1 threshold bit position (" << tn << ") is smaller 0, go on w/o this threshold!");
- } else {
- uint32_t mask= 0x1 << tn; // 8 bits in Run 1, up to 25 in Run 2
- ATH_MSG_DEBUG("thresholdNumber = " << tn << " .. mask = 0x" << std::hex << std::setw( 8 ) << std::setfill( '0' ) << mask << std::dec);
- m_jetCfg.push_back( ConfigJetEThreshold( thr->name(), teId, activeHLT, mask, JetRoI) );
- m_useL1JetEnergy = true;
- }
- }
-
-
- // Forward Jet threholds (only Run 1):
- for(const TrigConf::TriggerThreshold * thr : thresholdConfig->getFJetThresholdVector() ) {
- ATH_MSG_DEBUG("Searching TE that matches LVL1 ForwardJET (FJET) threshold: " << thr->name());
- unsigned int teId = 0;
- bool activeHLT = TrigConf::HLTTriggerElement::getId( thr->name().c_str(), teId);
- teId = TrigConf::HLTUtils::string2hash(thr->name());
- if (activeHLT) {
- ATH_MSG_DEBUG(" => OK (found TE)");
- ATH_MSG_DEBUG(" => TE=(name="<<thr->name() << ", hashID="<<teId << ")");
- } else {
- ATH_MSG_DEBUG(" => NO");
- }
- int tn = thr->thresholdNumber();
- if (tn < 0) {
- ATH_MSG_WARNING("this LVL1 threshold bit position (" << tn << ") is smaller 0" << ", go on w/o this threshold!");
- } else {
- uint32_t mask= 0x1;
- mask <<= 8; // first 8 bits are for jet thresholds (this code will never be reached in Run 2)
- mask <<= tn; // move to threshold number (4 bits)
- ATH_MSG_DEBUG("thresholdNumber = " << tn << " .. bit position = 0x" << std::hex << std::setw( 8 ) << std::setfill( '0' ) << mask << std::dec);
- m_jetCfg.push_back( ConfigJetEThreshold(thr->name(), teId, activeHLT, mask, ForwardJetRoI) );
- m_useL1JetEnergy = true;
- }
-
- }
-
- // Total Energy thresholds:
- for(const TrigConf::TriggerThreshold * thr : thresholdConfig->getTotEtVector() ) {
- ATH_MSG_DEBUG("Searching TE that matches LVL1 TotalEt (ET) threshold: " << thr->name());
- unsigned int teId = 0;
- bool activeHLT = TrigConf::HLTTriggerElement::getId( thr->name().c_str(), teId);
- teId = TrigConf::HLTUtils::string2hash(thr->name());
- if (activeHLT) {
- ATH_MSG_DEBUG(" => OK (found TE)");
- ATH_MSG_DEBUG(" => TE=(name="<<thr->name() << ", hashID="<<teId << ")");
- } else {
- ATH_MSG_DEBUG(" => NO");
- }
- int tn = thr->thresholdNumber();
- if (tn < 0) {
- ATH_MSG_WARNING("this LVL1 threshold bit position (" << tn << ") is smaller 0, go on w/o this threshold!" );
- } else {
- uint32_t mask= 0x1;
- mask <<= 16; // first 15 bits are EnergyY, 16th bit is overflow
- mask <<= tn; // 16 bits for TE (lower 8bit) and restricted range TE (upper 8bit)
- ATH_MSG_DEBUG( "thresholdNumber = " << tn << ", mask = 0x" << std::hex << std::setw( 8 ) << std::setfill( '0' ) << mask << std::dec);
- m_jetCfg.push_back( ConfigJetEThreshold(thr->name(), teId, activeHLT, mask, TotalEtRoI) );
- m_useL1JetEnergy = true;
- }
- }
-
-
- // Jet Energy threholds:
- for(const TrigConf::TriggerThreshold * thr : thresholdConfig->getJetEtVector() ) {
- ATH_MSG_DEBUG("Searching TE that matches LVL1 JetEt (JE) threshold: " << thr->name());
- unsigned int teId = 0;
- bool activeHLT = TrigConf::HLTTriggerElement::getId( thr->name().c_str(), teId);
- teId = TrigConf::HLTUtils::string2hash(thr->name());
- if (activeHLT) {
- ATH_MSG_DEBUG(" => OK (found TE)");
- ATH_MSG_DEBUG(" => TE=(name="<<thr->name() << ", hashID="<<teId << ")");
- } else {
- ATH_MSG_DEBUG(" => NO");
- }
- int tn = thr->thresholdNumber();
- if (tn < 0) {
- ATH_MSG_WARNING("this LVL1 threshold bit position (" << tn << ") is smaller 0, go on w/o this threshold!");
- } else {
- uint32_t mask= 0x1 << tn; // 4 bits here !
- ATH_MSG_DEBUG("thresholdNumber = " << tn << ", mask = 0x" << std::hex << std::setw( 8 ) << std::setfill( '0' ) << mask << std::dec);
- m_jetCfg.push_back( ConfigJetEThreshold(thr->name(), teId, activeHLT,mask, JetEtRoI) );
- m_useL1JetEnergy = true;
- }
- }
-
-
- // Missing Energy threholds:
- for(const TrigConf::TriggerThreshold * thr : thresholdConfig->getMissEtVector() ) {
- ATH_MSG_DEBUG("Searching TE that matches LVL1 MissingEt (XE) threshold: " << thr->name());
- unsigned int teId = 0;
- bool activeHLT = TrigConf::HLTTriggerElement::getId( thr->name().c_str(), teId);
- teId = TrigConf::HLTUtils::string2hash(thr->name());
- if (activeHLT) {
- ATH_MSG_DEBUG(" => OK (found TE)");
- ATH_MSG_DEBUG(" => TE=(name="<<thr->name() << ", hashID="<<teId << ")");
- } else {
- ATH_MSG_DEBUG(" => NO");
- }
- int tn = thr->thresholdNumber();
- if (tn < 0) {
- ATH_MSG_WARNING( "this LVL1 threshold bit position (" << tn << ") is smaller 0, go on w/o this threshold!");
- } else {
- uint32_t mask= 0x1;
- mask <<= 16; // first 15 bits are EnergyY, 16th bit is overflow
- mask <<= tn; // 16 bits for XE (lower 8bit) and restricted range XE (upper 8bit)
- ATH_MSG_DEBUG("thresholdNumber = " << tn << ", mask = 0x" << std::hex << std::setw( 8 ) << std::setfill( '0' ) << mask << std::dec);
- m_jetCfg.push_back( ConfigJetEThreshold(thr->name(), teId, activeHLT, mask, MissingEtRoI) );
- m_useL1JetEnergy = true;
- }
- }
-
-
- for(const TrigConf::TriggerThreshold * thr : thresholdConfig->getMissEtSignVector() ) {
- ATH_MSG_DEBUG("Searching TE that matches LVL1 MissingEtSignificance (XS) threshold: " << thr->name());
- unsigned int teId = 0;
- bool activeHLT = TrigConf::HLTTriggerElement::getId( thr->name().c_str(), teId);
- teId = TrigConf::HLTUtils::string2hash(thr->name());
- if (activeHLT) {
- ATH_MSG_DEBUG(" => OK (found TE)");
- ATH_MSG_DEBUG(" => TE=(name="<<thr->name() << ", hashID="<<teId << ")");
- } else {
- ATH_MSG_DEBUG(" => NO");
- }
- int tn = thr->thresholdNumber();
- if (tn < 0) {
- ATH_MSG_WARNING("this LVL1 threshold bit position (" << tn << ") is smaller 0, go on w/o this threshold!");
- } else {
- uint32_t mask= 0x1;
- mask <<= 16; // first 15 bits are EnergyY, 16th bit is overflow
- mask <<= tn; // 8 bits here
- ATH_MSG_DEBUG("thresholdNumber = " << tn << ", mask = 0x" << std::hex << std::setw( 8 ) << std::setfill( '0' ) << mask << std::dec);
- m_jetCfg.push_back( ConfigJetEThreshold(thr->name(), teId, activeHLT, mask, METSignificanceRoI) );
- m_useL1JetEnergy = true;
- }
- }
- } // end of Jet/Energy part
-
- ATH_MSG_DEBUG(" Initialize done");
- return StatusCode::SUCCESS;
-}
-
-
-
-StatusCode
-HLT::Lvl1ResultAccessTool::updateResult(const ROIB::RoIBResult& result,
- bool updateCaloRoIs)
-{
- // set L1 items:
- createL1Items(result);
- createMuonThresholds(result);
- createEMTauThresholds(result, updateCaloRoIs);
- createJetEnergyThresholds(result, updateCaloRoIs);
- return StatusCode::SUCCESS;
-}
-
-
-StatusCode
-HLT::Lvl1ResultAccessTool::updateResult(const LVL1CTP::Lvl1Result& result)
-{
- clearDecisionItems();
- // set L1 items:
- for (unsigned int i = 0; i < result.nItems(); ++i)
- m_decisionItems.push_back(LVL1CTP::Lvl1Item("", 0,
- result.isPassedBeforePrescale(i),
- result.isPassedAfterPrescale(i),
- result.isPassedAfterVeto(i) ));
- return StatusCode::SUCCESS;
-}
-
-
-// check for calo calibration bits
+// check for calo calibration bits
// get the calibration triggers, 253, 254 and 255 ie, bits
// 29, 30 and 31 from word 7
bool
@@ -520,15 +127,6 @@ namespace {
// ==============================
// create LVL1 items
// ==============================
-std::vector< const LVL1CTP::Lvl1Item* >
-HLT::Lvl1ResultAccessTool::createL1Items( const ROIB::RoIBResult& result,
- LVL1CTP::Lvl1Result const** lvl1ResultOut /*= nullptr*/)
-{
- // Not const because it modifies the pointed-to objects in m_lvl1ItemConfig.
- return createL1Items (m_lvl1ItemConfig, result, lvl1ResultOut);
-}
-
-
std::vector< const LVL1CTP::Lvl1Item* >
HLT::Lvl1ResultAccessTool::createL1Items( const std::vector< std::unique_ptr<LVL1CTP::Lvl1Item> >& lvl1ItemConfig,
const ROIB::RoIBResult& result,
@@ -602,357 +200,6 @@ HLT::Lvl1ResultAccessTool::createL1Items( const std::vector< std::unique_ptr<LVL
return items;
}
-// ==============================
-// create Muon RoIs
-// ==============================
-const std::vector<HLT::MuonRoI> &
-HLT::Lvl1ResultAccessTool::createMuonThresholds(const ROIB::RoIBResult &result)
-{
- m_muonRoIs.clear();
-
- if (m_useL1Muon) {
-
- const std::vector<ROIB::MuCTPIRoI>& muonRoIVec = result.muCTPIResult().roIVec();
-
- // some Debug output
- ATH_MSG_DEBUG("Looking for Muon RoIs");
- ATH_MSG_DEBUG("---------------------");
-
- for (std::vector<ROIB::MuCTPIRoI>::const_iterator itMuon = muonRoIVec.begin();
- itMuon != muonRoIVec.end(); ++itMuon) {
-
- MuonRoI roi(*itMuon);
- uint32_t roIWord = itMuon->roIWord();
-
- ATH_MSG_DEBUG("Muon RoI word: 0x" << std::hex << std::setw(8) << roIWord << std::dec);
-
- // the Threshold Number (1 to 6) associated with this Muon RoI
- unsigned int thresholdNumber = itMuon->pt();
-
- // this should never happen ... but who knows
- if (thresholdNumber > 6 || thresholdNumber < 1) {
- ATH_MSG_WARNING("Muon threshold number is not between 1 and 6 but ="
- << thresholdNumber << " !!! Go on with a value of 1");
- thresholdNumber = 1;
- }
-
- bool tgc = (itMuon->getSectorLocation() != MuCTPI_RDO::BARREL);
-
- std::vector<int> thToFire;
- thToFire.reserve(6);
-
- if ( m_muonCommissioningStep == 0 ) {
- // corresponding to "Menu 1E31"
- for ( unsigned int th = 1; th <= thresholdNumber; ++th )
- thToFire.push_back(th);
- } else if ( m_muonCommissioningStep == 1 ) {
-
- // corresponding to "Step 1." in the table //
-
- switch (thresholdNumber) {
- case 1: // (5) , 1
- thToFire.push_back(1);
- if ( tgc )
- thToFire.push_back(5);
- break;
- case 2: // (5) , 1 , 2
- thToFire.push_back(1); thToFire.push_back(2);
- if ( tgc )
- thToFire.push_back(5);
- break;
- case 3: // (5) , 1 , 2 , 3
- thToFire.push_back(1); thToFire.push_back(2); thToFire.push_back(3);
- if ( tgc )
- thToFire.push_back(5);
-
- break;
- case 4: // 1 , 2 , 3 , 4
- thToFire.push_back(1); thToFire.push_back(2); thToFire.push_back(3); thToFire.push_back(4);
- break;
- case 5: // 5
- thToFire.push_back(5);
- break;
- case 6: // 1, 2, 3, (4 or 5) , 6
- thToFire.push_back(1); thToFire.push_back(2); thToFire.push_back(3); thToFire.push_back(6);
- if ( tgc )
- thToFire.push_back(5);
- else
- thToFire.push_back(4);
- break;
- }
- } else if ( m_muonCommissioningStep == 2 || m_muonCommissioningStep == 3 ) {
- // corresponds to "Step.2 & Step.3" commonly //
- switch (thresholdNumber) {
- case 1: // 1
- thToFire.push_back(1);
- break;
- case 2: // 1 , 2
- thToFire.push_back(1); thToFire.push_back(2);
- break;
- case 3: // 1 , 2 , 3
- thToFire.push_back(1); thToFire.push_back(2); thToFire.push_back(3);
- break;
- case 4: // 1 , 2 , 3 , 4
- thToFire.push_back(1); thToFire.push_back(2); thToFire.push_back(3); thToFire.push_back(4);
- break;
- case 5: // 1 , 2 , 3 , 5
- thToFire.push_back(1); thToFire.push_back(2); thToFire.push_back(3); thToFire.push_back(5);
- break;
- case 6: // 1 , 2 , 3 , (4 or 5) , 6
- thToFire.push_back(1); thToFire.push_back(2); thToFire.push_back(3); thToFire.push_back(6);
- if ( tgc )
- thToFire.push_back(5);
- else
- thToFire.push_back(4);
- break;
- }
- }
-
- // produce all TEs that have an equal or lower threshold number AND are needed by HLT
- for (std::vector<int>::const_iterator th = thToFire.begin(); th != thToFire.end(); ++th) {
-
- roi.addThreshold( & m_muonCfg[*th] );
-
- ATH_MSG_DEBUG("found Muon Threshold " << m_muonCfg[*th].name << " threshold number: " << *th);
- }
-
- m_muonRoIs.push_back(roi);
- }
- }
- return m_muonRoIs;
-}
-
-
-// ==============================
-// EMTau RoIs
-// ==============================
-const std::vector< HLT::EMTauRoI >&
-HLT::Lvl1ResultAccessTool::createEMTauThresholds(const ROIB::RoIBResult& result, bool updateCaloRoIs)
-{
- m_emTauRoIs.clear();
-
- if (m_useL1Calo) {
-
- // reconstruct RoIs
- ATH_MSG_DEBUG("Looking for EMTau RoIs");
- ATH_MSG_DEBUG("----------------------");
-
- const std::vector<ROIB::EMTauResult>& emTauResult = result.eMTauResult();
-
- for (std::vector<ROIB::EMTauResult>::const_iterator itResult = emTauResult.begin();
- itResult != emTauResult.end(); ++itResult) {
-
- const std::vector<ROIB::EMTauRoI>& roIVec = itResult->roIVec();
-
- for (std::vector<ROIB::EMTauRoI>::const_iterator itEMTau = roIVec.begin();
- itEMTau != roIVec.end(); ++itEMTau) {
-
- uint32_t roIWord = itEMTau->roIWord();
-
- // Fix for change of RoI format
- if (updateCaloRoIs) roIWord = LVL1::RoIFormatUpdater::UpdateEMTauRoI(roIWord);
- HLT::EMTauRoI roi = HLT::EMTauRoI( ROIB::EMTauRoI(roIWord) );
-
- // Set threshold bits in a way that work for Run 1 or Run 2
-
- LVL1::RecEmTauRoI recRoI( roIWord, &m_emtauThresholds );
- roi.setThresholdMask(recRoI.thresholdPattern());
-
- ATH_MSG_DEBUG("RoI word: 0x" << MSG::hex << std::setw(8) << roIWord << ", threshold pattern " << roi.thresholdMask() << MSG::dec);
-
- if (recRoI.roiType() == LVL1::TrigT1CaloDefs::EMRoIWordType || recRoI.roiType() == LVL1::TrigT1CaloDefs::CpRoIWordType) {
- for ( std::vector< ConfigThreshold >::const_iterator threshold = m_emCfg.begin();
- threshold != m_emCfg.end(); ++threshold) {
-
- // check whether this LVL1 threshold is used by HLT:
- if ( !(threshold->mask & roi.thresholdMask()) ) continue;
-
- roi.addThreshold( &(*threshold) );
-
- ATH_MSG_DEBUG("creating EM Theshold: " << threshold->name);
- }
- }
- if (recRoI.roiType() == LVL1::TrigT1CaloDefs::TauRoIWordType || recRoI.roiType() == LVL1::TrigT1CaloDefs::CpRoIWordType) {
- for ( std::vector< ConfigThreshold >::const_iterator threshold = m_tauCfg.begin();
- threshold != m_tauCfg.end(); ++threshold) {
-
- // check whether this LVL1 threshold is used by HLT:
- if ( !(threshold->mask & roi.thresholdMask()) ) continue;
-
- roi.addThreshold( &(*threshold) );
-
- ATH_MSG_DEBUG("creating TAU Theshold: " << threshold->name);
- }
- }
- m_emTauRoIs.push_back(roi);
- }
- }
- }
- return m_emTauRoIs;
-}
-
-
-// ==============================
-// JetEnergy RoIs
-// ==============================
-const std::vector< HLT::JetEnergyRoI >&
-HLT::Lvl1ResultAccessTool::createJetEnergyThresholds(const ROIB::RoIBResult& result, bool /*updateCaloRoIs*/)
-{
- m_jetRoIs.clear();
-
- if (m_useL1JetEnergy) {
-
- ATH_MSG_DEBUG("Looking for JetEnergy RoIs");
- ATH_MSG_DEBUG("--------------------------");
-
- const std::vector<ROIB::JetEnergyResult>& jetEnergyResult = result.jetEnergyResult();
-
- ATH_MSG_DEBUG("# Jet Energy results " << jetEnergyResult.size());
-
- for (const ROIB::JetEnergyResult & JEResult : jetEnergyResult) {
-
- const std::vector<ROIB::JetEnergyRoI>& roIVec = JEResult.roIVec();
-
- ATH_MSG_DEBUG("# Jet Energy RoIs " << roIVec.size());
-
- for ( std::vector<ROIB::JetEnergyRoI>::const_iterator itJetEn = roIVec.begin();
- itJetEn != roIVec.end(); ++itJetEn) {
-
- uint32_t roIWord = itJetEn->roIWord();
- // Fix for change of RoI format - long obsolete
- //if (updateCaloRoIs) roIWord = LVL1::RoIFormatUpdater::UpdateJetEnergyRoI( roIWord );
-
- // Create RoI
- HLT::JetEnergyRoI roi = HLT::JetEnergyRoI( ROIB::JetEnergyRoI(roIWord) );
-
- // create a second roi container, since the 3 roiWords contain all SumET & all MissingET thresholds!
- // use roi for SumET and roi2 for MissingET
- HLT::JetEnergyRoI roiET = HLT::JetEnergyRoI( ROIB::JetEnergyRoI(roIWord) );
-
- unsigned int etSumType = itJetEn->etSumType();
-
- ATH_MSG_DEBUG("RoI word: 0x" << std::hex << std::setw( 8 ) << std::setfill( '0' ) << roIWord << std::dec);
-
- // RoI Type
- LVL1::TrigT1CaloDefs::RoIType roiType = m_jepDecoder.roiType(roIWord);
-
- if ( roiType == LVL1::TrigT1CaloDefs::EnergyRoIWordType0) {
-
- // this roIWord is of type Energy RoI (Energy RoI consists of 3 RoI words!) => get the next two words as well
- ++itJetEn;
- if (itJetEn == roIVec.end()) break;
-
- uint32_t roIWord1 = itJetEn->roIWord();
-
- ++itJetEn;
- if (itJetEn == roIVec.end()) break;
-
- uint32_t roIWord2 = itJetEn->roIWord();
-
- if ( !roiET.setExtraWords(roIWord, roIWord1, roIWord2)) {
- ATH_MSG_ERROR("Error setting Total/Missing ET RoI extra words");
- return m_jetRoIs;
- }
-
- ATH_MSG_DEBUG( "RoI triplet = 0x" << std::hex << std::setw( 8 ) << std::setfill( '0' )
- << roIWord << " 0x" << roIWord1 << " 0x" << roIWord2 << std::dec);
-
- } else if ( roiType == LVL1::TrigT1CaloDefs::JetRoIWordType ) {
-
- // For Jet RoIs, fill thresholdMask word, used later for setting Configured Thresholds
- // Do it here so that it only needs to be done once/RoI
-
- LVL1::RecJetRoI recRoI( roIWord, &m_jetThresholds );
- roi.setThresholdMask(recRoI.thresholdPattern());
-
- ATH_MSG_DEBUG("Jet RoI threshold pattern: 0x" << std::hex << recRoI.thresholdPattern() << std::dec);
-
- }
-
-
- // Loop over possible Jet thresholds
- for (std::vector< ConfigJetEThreshold >::const_iterator threshold = m_jetCfg.begin();
- threshold != m_jetCfg.end(); ++threshold) {
-
- if ( roiType == LVL1::TrigT1CaloDefs::JetRoIWordType && (threshold->type == JetRoI || threshold->type == ForwardJetRoI) ) {
-
- ATH_MSG_DEBUG(threshold->name << " is of type JetRoI or ForwardJetRoI");
-
- // plain Jet & ForwardJet RoI
- //---------------------
- if ( ! addJetThreshold(roi, &*threshold) ) {
- ATH_MSG_WARNING("Problem while adding threshold: " << threshold->name << " returning prematurely");
- return m_jetRoIs;
- }
-
- } else if ( roiType == LVL1::TrigT1CaloDefs::JetEtRoIWordType && threshold->type == JetEtRoI ) {
-
- ATH_MSG_DEBUG(threshold->name << " is of type JetEtRoI");
-
- // JetEt ET RoI (total transv. energy from jets)
- //----------------------------------------------
- if ( ! addJetThreshold(roi, &*threshold) ) {
- ATH_MSG_WARNING("Problem while adding threshold: " << threshold->name << " returning prematurely");
- return m_jetRoIs;
- }
-
- } else if ( roiType == LVL1::TrigT1CaloDefs::EnergyRoIWordType0 && ( threshold->type == TotalEtRoI ||
- threshold->type == MissingEtRoI ||
- threshold->type == METSignificanceRoI)) {
- bool ignoreThreshold = false;
- // for TE and XE thresholds the etSumType distinguishes between full and restricted range thresholds
- // etSumType==0: full eta range
- // etSumType==1: restricted eta range
- // restricted range thresholds must be ignored when the etSumType==0 and vice versa
- // restricted range thresholds have a mask >= 0x1000000 (lower 24 bit are energy sum (15bit), overflow (1bit) and full range thresholds (8bit)
- if( threshold->type == TotalEtRoI || threshold->type == MissingEtRoI) {
- bool thrIsRestrictedRangeThr = false;
- if(threshold->mask >= 0x1000000 )
- thrIsRestrictedRangeThr = true;
-
- if( (etSumType==0 && thrIsRestrictedRangeThr) ||
- (etSumType==1 && !thrIsRestrictedRangeThr) )
- {
- ignoreThreshold = true;
- }
-
- }
-
- if( ! ignoreThreshold ) {
-
- ATH_MSG_DEBUG( threshold->name << " is of type " << threshold->type << " TotalEtRoI (" << TotalEtRoI << ") or MissingEtRoI (" << MissingEtRoI << ") or METSignificanceRoI (" << METSignificanceRoI << ")"
- << " and etSumType " << etSumType << "(" << (etSumType==0?"full range":"restricted range") << ")");
-
- roiET.setType(MissingOrTotalEtRoI);
-
- if ( ! addMetThreshold(roiET, &*threshold, etSumType==1) ) {
- ATH_MSG_WARNING("Problem while adding threshold: " << threshold->name << " returning prematurely");
- return m_jetRoIs;
- }
-
- }
-
- } // end of Energy part (totEt, missEt)
-
- if (itJetEn == roIVec.end()) break;
- } // end of loop over possible thresholds
-
- if (roi.size()!=0 ) m_jetRoIs.push_back(roi);
-
- //this rois have type set to unknown in all normal jet RoIs
- // add TotalEt and MissingEt rois even if no threshold has fired
- if (roiET.type() != Unknown) {
- ATH_MSG_DEBUG("adding MissingOrTotalET RoI with: " << roiET.size() << " thresholds");
- m_jetRoIs.push_back(roiET);
- }
- } // end of loop over RoIs
- } // end of jetEnergy Result
- }// enf of m_useL1JetEnergy
- ATH_MSG_DEBUG("done with jet thresholds");
- return m_jetRoIs;
-}
-
-
std::bitset<3>
HLT::Lvl1ResultAccessTool::lvl1EMTauJetOverflow(const ROIB::RoIBResult& result)
{
@@ -1004,62 +251,3 @@ HLT::Lvl1ResultAccessTool::lvl1EMTauJetOverflow(const ROIB::RoIBResult& result)
return overflow;
}
-
-bool
-HLT::Lvl1ResultAccessTool::addJetThreshold(HLT::JetEnergyRoI & roi, const ConfigJetEThreshold* threshold ) {
-
- if ( !(threshold->mask & roi.thresholdMask()) ) {
- return true;
- }
-
- if (!roi.setType(threshold->type)) {
- ATH_MSG_ERROR("Inconsistent threshold types " << roi.type() << " " << threshold->type);
- return false;
- }
- roi.addThreshold( threshold );
- ATH_MSG_DEBUG("Creating Jet threshold: " << threshold->name);
- return true;
-}
-
-
-// this is made separate function as it usesses different word for threhold bits (namely word1/2)
-bool
-HLT::Lvl1ResultAccessTool::addMetThreshold( HLT::JetEnergyRoI & roi, const ConfigJetEThreshold* threshold, bool isRestrictedRange ) {
-
- uint32_t word(0);
- switch(threshold->type) {
- case METSignificanceRoI:
- word = roi.word0();
- break;
- case TotalEtRoI:
- word = roi.word1();
- break;
- case MissingEtRoI:
- word = roi.word2();
- break;
- default:
- word = 0;
- }
-
- uint32_t mask = threshold->mask;
-
- if (isRestrictedRange) {
- mask >>= 8;
- }
-
- if ( (mask & word) == 0 ) {
- return true;
- }
-
-
- if (!roi.setType(threshold->type)) {
- ATH_MSG_ERROR("Inconsistent threshold types " << roi.type() << " " << threshold->type);
- return false;
- }
-
- roi.addThreshold( threshold );
- ATH_MSG_DEBUG("creating Met threshold: " << threshold->name);
-
- return true;
-}
-
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/src/Lvl1ResultAccessTool.h b/Trigger/TrigAnalysis/TrigDecisionMaker/src/Lvl1ResultAccessTool.h
index 495913592992..5ae4746b7ae5 100755
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/src/Lvl1ResultAccessTool.h
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/src/Lvl1ResultAccessTool.h
@@ -8,7 +8,6 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "TrigDecisionMaker/ILvl1ResultAccessTool.h"
-#include "TrigDecisionMaker/Lvl1ItemsAndRoIs.h"
#include "TrigConfData/L1PrescalesSet.h"
#include "TrigT1Interfaces/CPRoIDecoder.h"
#include "TrigT1Interfaces/JEPRoIDecoder.h"
@@ -39,17 +38,6 @@ namespace HLT {
is the trigger decision tool (class TrigDecisionTool) which makes all
trigger information available to the end-users.
- Lvl1ResultAccessTool needs to know the trigger configuration, it can however handle
- a changing configuration. Simply call the updateConfiguration(..) method each time
- the trigger configuration changes.
-
- For each new event, one has to explicitly tell @c to update the LVL1 result. This
- is done via the method updateResult(..). Afterwards, one can inspect the results
- via several getter methods, as getMuonRoIs() for
- the LVL1 Muon-type RoIs. The returned objects are simple classes which are defined
- for easy usage. See the classes description for more details.
-
-
@author Till Eifert <Till.Eifert@cern.ch>
@author Nicolas Berger <Nicolas.Berger@cern.ch>
*/
@@ -60,68 +48,17 @@ namespace HLT {
Lvl1ResultAccessTool(const std::string& name, const std::string& type,
const IInterface* parent); //!< std Gaudi constructor
- virtual
- ~Lvl1ResultAccessTool(); //!< destructor -> delete Jet converter object
-
virtual StatusCode initialize() override;
- // Accessors to the unpacked information:
- //_______________________________________
-
- /** @brief Get LVL1 items ... for TrigDecision
- */
- virtual
- const std::vector<LVL1CTP::Lvl1Item>& getDecisionItems() override { return m_decisionItems; }
-
-
- // LVL1 RoIs and thresholds:
- //__________________________
-
- /** @brief get all LVL1 Muon-type RoI objects
- */
- virtual
- const std::vector< MuonRoI >& getMuonRoIs() const override { return m_muonRoIs; }
-
- /** @brief get all LVL1 EMTau-type RoI objects
- */
- virtual
- const std::vector< EMTauRoI >& getEMTauRoIs() const override { return m_emTauRoIs; }
-
- /** @brief get all LVL1 JetEnergy-type RoI objects
- */
- virtual
- const std::vector< JetEnergyRoI >& getJetEnergyRoIs() const override { return m_jetRoIs; }
-
-
- /** @brief Function to be called every time the trigger configuration changes,
- * i.e. either in initialize() or in beginRun() of the client.
- * @param useL1calo consider LVL1 Calorimeter (EMTau-type) RoIs ?
- * @param useL1Muon consider LVL1 Muon RoIs ?
- * @param useL1JetEnergy consider LVL1 JetEnergy RoIs ?
- */
- virtual
- StatusCode updateConfig(bool useL1Muon = true,
- bool useL1Calo = true,
- bool useL1JetEnergy = true) override;
-
- virtual std::vector< std::unique_ptr<LVL1CTP::Lvl1Item>> makeLvl1ItemConfig() const override;
virtual std::vector< std::unique_ptr<LVL1CTP::Lvl1Item>> makeLvl1ItemConfig(const EventContext& context) const override;
- /** @brief update the LVL1 items settings from the (LVL1) trigger configuration.
- * This method is called from within updateConfig(..), the reason to have it
- * separate is that TrigDecisionTool only needs the LVL1 items and not the RoIs.
- */
- virtual
- StatusCode updateItemsConfigOnly() override;
-
/** @brief checks if we have calibration items fired in this event
* @return true if calibration items are present in this event
*/
-
virtual bool isCalibrationEvent(const ROIB::RoIBResult& result) const override;
- /** @brief Extract LVL1 items from given RoIBResult and cache them in internally.
+ /** @brief Extract LVL1 items from given RoIBResult.
* @param result reference to RoIBResult object, holding all LVL1 RoIs and items
* @param lvl1ResultOut If non-null, create (in addition) a LVL1 container holding all Lvl1 results,
* and return through this argument.
@@ -130,41 +67,10 @@ namespace HLT {
*/
virtual
std::vector< const LVL1CTP::Lvl1Item* >
- createL1Items(const ROIB::RoIBResult& result,
- LVL1CTP::Lvl1Result const** lvl1ResultOut = nullptr) override;
-
- /// Alternate version with configuration passed in explicitly.
- /// Can be used when the tool is const.
- virtual
- std::vector< const LVL1CTP::Lvl1Item* >
createL1Items(const std::vector< std::unique_ptr<LVL1CTP::Lvl1Item> >& lvl1ItemConfig,
const ROIB::RoIBResult& result,
LVL1CTP::Lvl1Result const** lvl1ResultOut = nullptr) const override;
- /** @brief Extract LVL1 Muon-type RoIs and cache them internally
- * @param result reference to RoIBResult object, holding all LVL1 RoIs and items
- *
- * @return reference to vector holding all Muon-RoI objects
- */
- virtual
- const std::vector< MuonRoI >& createMuonThresholds(const ROIB::RoIBResult& result) override;
-
- /** @brief Extract LVL1 EMTau-type RoIs and cache them internally
- * @param result reference to RoIBResult object, holding all LVL1 RoIs and items
- *
- * @return reference to vector holding all EMTau-RoI objects
- */
- virtual
- const std::vector< EMTauRoI >& createEMTauThresholds(const ROIB::RoIBResult& result, bool updateCaloRoIs=false) override;
-
- /** @brief Extract LVL1 JetEnergy-type RoIs and cache them internally
- * @param result reference to RoIBResul object, holding all LVL1 RoIs and items
- *
- * @return reference to vector holding all JetEnergy-RoI objects
- */
- virtual
- const std::vector< JetEnergyRoI >& createJetEnergyThresholds(const ROIB::RoIBResult& result, bool updateCaloRoIs=false) override;
-
/** @brief Check if there was an overflow in the TOB transmission to CMX
* @param result reference to RoIBResul object
*
@@ -173,40 +79,12 @@ namespace HLT {
virtual
std::bitset<3> lvl1EMTauJetOverflow(const ROIB::RoIBResult& result) override;
- /** @brief Extract all LVL1 items and all LVL1 items from given RoIBResult
- * @param result reference to RoIBResult object, holding all LVL1 RoIs and items
- * @param updateCaloRoIs if true, assume old Calo RoI words which need to be corrected
- */
- virtual
- StatusCode updateResult(const ROIB::RoIBResult& result,
- bool updateCaloRoIs = false) override;
-
- /** @brief Extract all LVL1 items and all LVL1 items from given Lvl1Result
- * @param result reference to Lvl1Result object, holding all LVL1 RoIs and items
- * @param updateCaloRoIs if true, assume old Calo RoI words which need to be corrected
- */
- virtual
- StatusCode updateResult(const LVL1CTP::Lvl1Result& result) override;
-
private:
- void clearDecisionItems(); //!< delete all LVL1 decisio items
-
// L1 decoders
LVL1::JEPRoIDecoder m_jepDecoder;
LVL1::CPRoIDecoder m_cpDecoder;
- // Results cache
- std::vector<LVL1CTP::Lvl1Item> m_decisionItems; //!< vector holding all LVL1 items for TrigDecision
-
- std::vector< MuonRoI> m_muonRoIs; //!< cached LVL1 Muon-type RoI objects
- std::vector< EMTauRoI> m_emTauRoIs; //!< cached LVL1 EMTau-type RoI objects
- std::vector< JetEnergyRoI> m_jetRoIs; //!< cached LVL1 JetEnergy-type RoI objects
-
- // Config data
- bool m_useL1Muon { false }, m_useL1Calo { false }, m_useL1JetEnergy { false }; //!< consider RoI types ?
- unsigned int m_muonCommissioningStep; //!< change thresholds creation inclusivness depending on the comissioning stage
- bool m_ignorePrescales; //!< Set to true to ignore prescales
Gaudi::Property<bool> m_useNewConfig { this, "UseNewConfig", true, "When true, read the menu from detector store, when false use the LVL1ConfigSvc" };
/// access to L1Prescales
@@ -214,18 +92,6 @@ namespace HLT {
SG::WriteHandleKey<LVL1CTP::Lvl1Result> m_l1ResultKey{ this, "L1Result", "L1Result", "L1 result"};
- std::vector< std::unique_ptr<LVL1CTP::Lvl1Item> > m_lvl1ItemConfig; //!< vector holding all configured LVL1 items
- std::vector< ConfigThreshold > m_muonCfg; //!< vector holding all configured LVL1 muon thresholds
- std::vector< ConfigThreshold > m_emCfg; //!< vector holding all configured LVL1 EM thresholds
- std::vector< ConfigThreshold > m_tauCfg; //!< vector holding all configured LVL1 TAU thresholds
- std::vector< ConfigJetEThreshold > m_jetCfg; //!< vector holding all configured LVL1 jet thresholds
-
- std::vector<TrigConf::TriggerThreshold*> m_emtauThresholds;
- std::vector<TrigConf::TriggerThreshold*> m_jetThresholds;
-
- bool addJetThreshold( HLT::JetEnergyRoI & roi, const ConfigJetEThreshold* threshold );
- bool addMetThreshold( HLT::JetEnergyRoI & roi, const ConfigJetEThreshold* threshold, bool isRestrictedRange );
-
ServiceHandle<TrigConf::ILVL1ConfigSvc> m_lvl1ConfigSvc{ this, "LVL1ConfigSvc", "LVL1ConfigSvc", "LVL1 Config Service"}; //!< handle for the LVL1 configuration service
};
} // end namespace
--
GitLab
From 62209f89b948c03effc718f6e8e8557e0331ded5 Mon Sep 17 00:00:00 2001
From: Rafal Bielski <rafal.bielski@cern.ch>
Date: Wed, 11 Aug 2021 16:08:02 +0200
Subject: [PATCH 006/272] Fix T0Mon tests: reco conditions tag and DQ script
threads
---
.../test/test_trigP1_v1PhysP1_T0MonTrf_build.py | 14 ++++++++------
.../test/test_trigP1_v1PhysP1_T0Mon_build.py | 6 ++++--
.../test/test_trigP1_v1PhysP1_T0Mon_grid.py | 6 ++++--
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py
index 11dbc096a76f..4cfc1dc99e96 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py
@@ -45,17 +45,19 @@ tzreco.max_events = 50
tzreco.args = '--inputBSFile=RAW.pool.root' # output of the previous step
tzreco.args += ' --outputESDFile=ESD.pool.root --outputAODFile=AOD.pool.root'
tzreco.args += ' --outputNTUP_TRIGRATEFile=rate.ntup.root'
-tzreco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2018-11\' --geometryVersion=\'ATLAS-R2-2016-01-00-01\''
+tzreco.args += ' --conditionsTag=\'CONDBR2-BLKPA-RUN2-06\' --geometryVersion=\'ATLAS-R2-2016-01-00-01\''
tzreco.args += ' --preExec="{:s}"'.format(tzrecoPreExec)
tzreco.args += ' --postInclude="TriggerTest/disableChronoStatSvcPrintout.py"'
#====================================================================================================
-# Tier-0 monitoring step (AOD->HIST)
-tzmon = ExecStep.ExecStep('Tier0Mon')
+# Tier-0 monitoring step (AOD->HIST)
+tzmon = ExecStep.ExecStep('Tier0Mon')
tzmon.type = 'other'
-tzmon.executable = 'Run3DQTestingDriver.py'
-tzmon.input = ''
-tzmon.args = '--dqOffByDefault Input.Files="[\'AOD.pool.root\']" DQ.Steering.doHLTMon=True'
+tzmon.executable = 'Run3DQTestingDriver.py'
+tzmon.input = ''
+tzmon.args = '--threads=1'
+tzmon.args += ' --dqOffByDefault'
+tzmon.args += ' Input.Files="[\'AOD.pool.root\']" DQ.Steering.doHLTMon=True'
#====================================================================================================
# Merging NTUP_TRIGRATE/COST
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py
index f7420fc013a4..2a6a00c2cdad 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py
@@ -47,7 +47,7 @@ tzreco.explicit_input = True
tzreco.max_events = 50
tzreco.args = '--inputBSFile=' + find_file('*.physics_Main*._athenaHLT*.data') # output of the previous step
tzreco.args += ' --outputESDFile=ESD.pool.root --outputAODFile=AOD.pool.root'
-tzreco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2018-11\' --geometryVersion=\'ATLAS-R2-2016-01-00-01\''
+tzreco.args += ' --conditionsTag=\'CONDBR2-BLKPA-RUN2-06\' --geometryVersion=\'ATLAS-R2-2016-01-00-01\''
tzreco.args += ' --preExec="{:s}"'.format(tzrecoPreExec)
tzreco.args += ' --postInclude="TriggerTest/disableChronoStatSvcPrintout.py"'
@@ -56,7 +56,9 @@ tzmon = ExecStep.ExecStep('Tier0Mon')
tzmon.type = 'other'
tzmon.executable = 'Run3DQTestingDriver.py'
tzmon.input = ''
-tzmon.args = '--dqOffByDefault Input.Files="[\'AOD.pool.root\']" DQ.Steering.doHLTMon=True'
+tzmon.args = '--threads=1'
+tzmon.args += ' --dqOffByDefault'
+tzmon.args += ' Input.Files="[\'AOD.pool.root\']" DQ.Steering.doHLTMon=True'
# The full test
test = Test.Test()
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py
index 356e16e9067e..2bf2d086d240 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py
@@ -58,7 +58,7 @@ tzreco.input = ''
tzreco.explicit_input = True
tzreco.args = '--inputBSFile=' + find_file('*.physics_Main*._athenaHLT*.data') # output of the previous step
tzreco.args += ' --outputESDFile=ESD.pool.root --outputAODFile=AOD.pool.root'
-tzreco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2018-11\' --geometryVersion=\'ATLAS-R2-2016-01-00-01\''
+tzreco.args += ' --conditionsTag=\'CONDBR2-BLKPA-RUN2-06\' --geometryVersion=\'ATLAS-R2-2016-01-00-01\''
tzreco.args += ' --preExec="{:s}"'.format(tzrecoPreExec)
tzreco.args += ' --postInclude="TriggerTest/disableChronoStatSvcPrintout.py"'
@@ -67,7 +67,9 @@ tzmon = ExecStep.ExecStep('Tier0Mon')
tzmon.type = 'other'
tzmon.executable = 'Run3DQTestingDriver.py'
tzmon.input = ''
-tzmon.args = '--dqOffByDefault Input.Files="[\'AOD.pool.root\']" DQ.Steering.doHLTMon=True'
+tzmon.args = '--threads=4'
+tzmon.args += ' --dqOffByDefault'
+tzmon.args += ' Input.Files="[\'AOD.pool.root\']" DQ.Steering.doHLTMon=True'
# The full test
test = Test.Test()
--
GitLab
From 0e640966e046ed1d09e19a51baef3a0beb2d392c Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Wed, 11 Aug 2021 17:05:31 +0200
Subject: [PATCH 007/272] TrigTrackJetFinderTool: delete package and interface
Delete the obsolete `TrigTrackJetFinderTool` and its interface. The only
(unused) reference was in `HLTBjetMonTool`.
---
.../TrigBjetMonitoring/CMakeLists.txt | 2 +-
.../TrigBjetMonitoring/src/HLTBjetMonTool.cxx | 9 +-
.../TrigBjetMonitoring/src/HLTBjetMonTool.h | 9 +-
.../TrigInDetToolInterfaces/CMakeLists.txt | 2 +-
.../ITrigTrackJetFinderTool.h | 48 ---
.../ATLAS_CHECK_THREAD_SAFETY | 1 -
.../TrigTrackJetFinderTool/CMakeLists.txt | 14 -
.../src/TrigTrackJetFinderTool.cxx | 333 ------------------
.../src/TrigTrackJetFinderTool.h | 179 ----------
.../TrigTrackJetFinderTool_entries.cxx | 4 -
10 files changed, 4 insertions(+), 597 deletions(-)
delete mode 100755 Trigger/TrigTools/TrigInDetToolInterfaces/TrigInDetToolInterfaces/ITrigTrackJetFinderTool.h
delete mode 100644 Trigger/TrigTools/TrigTrackJetFinderTool/ATLAS_CHECK_THREAD_SAFETY
delete mode 100644 Trigger/TrigTools/TrigTrackJetFinderTool/CMakeLists.txt
delete mode 100755 Trigger/TrigTools/TrigTrackJetFinderTool/src/TrigTrackJetFinderTool.cxx
delete mode 100644 Trigger/TrigTools/TrigTrackJetFinderTool/src/TrigTrackJetFinderTool.h
delete mode 100644 Trigger/TrigTools/TrigTrackJetFinderTool/src/components/TrigTrackJetFinderTool_entries.cxx
diff --git a/Trigger/TrigMonitoring/TrigBjetMonitoring/CMakeLists.txt b/Trigger/TrigMonitoring/TrigBjetMonitoring/CMakeLists.txt
index c1ad515099d5..95ab6fb06b10 100644
--- a/Trigger/TrigMonitoring/TrigBjetMonitoring/CMakeLists.txt
+++ b/Trigger/TrigMonitoring/TrigBjetMonitoring/CMakeLists.txt
@@ -10,7 +10,7 @@ find_package( ROOT COMPONENTS Core Hist MathCore )
atlas_add_component( TrigBjetMonitoring
src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaMonitoringKernelLib AthenaMonitoringLib EventPrimitives FourMomUtils GaudiKernel GeoPrimitives JetEvent JetUtils Particle StoreGateLib TrigDecisionToolLib TrigHLTMonitoringLib TrigParticle TrigInDetToolInterfacesLib muonEvent xAODBTagging xAODEventInfo xAODMuon xAODTracking )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaMonitoringKernelLib AthenaMonitoringLib EventPrimitives FourMomUtils GaudiKernel GeoPrimitives JetEvent JetUtils Particle StoreGateLib TrigDecisionToolLib TrigHLTMonitoringLib TrigParticle muonEvent xAODBTagging xAODEventInfo xAODMuon xAODTracking )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.cxx b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.cxx
index af8780f07c39..0af4706afebd 100755
--- a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.cxx
+++ b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// ***************************************************
@@ -67,8 +67,6 @@
#include "HLTBjetMonTool.h"
-#include "TrigInDetToolInterfaces/ITrigTrackJetFinderTool.h"
-
#include "GaudiKernel/ListItem.h"
namespace Analysis { class MuonContainer; }
@@ -80,7 +78,6 @@ namespace Analysis { class MuonContainer; }
HLTBjetMonTool::HLTBjetMonTool(const std::string & type, const std::string & name, const IInterface* parent) :
IHLTMonTool(type, name, parent),
- m_trackJetFinderTool("TrigTrackJetFinderTool"),
m_TriggerChainBjet{}, m_TriggerChainMujet{},
m_TriggerChainBjet_x{}, m_TriggerChainMujet_x{},
m_Chain2Dir{},
@@ -114,10 +111,6 @@ float HLTBjetMonTool::phiCorr(float phi) {
StatusCode HLTBjetMonTool::init() {
- ATH_CHECK(m_trackJetFinderTool.retrieve());
-
- ATH_MSG_INFO("in HLTBjetMonTool::init - retrieved tool: " << m_trackJetFinderTool);
-
m_etCut = 10.;
ATH_MSG_INFO(" ===> in HLTBjetMonTool::init - Muon-jet parameters: m_etCut = " << m_etCut);
diff --git a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.h b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.h
index 293af2637fb0..bd38bab9bac2 100755
--- a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.h
+++ b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// ***************************************************
@@ -20,11 +20,6 @@
#include <vector>
#include <map>
-
-
-#include "TrigInDetToolInterfaces/ITrigTrackJetFinderTool.h"
-
-
#include "TrigDecisionTool/TrigDecisionTool.h"
@@ -58,8 +53,6 @@ class HLTBjetMonTool : public IHLTMonTool {
private:
- ToolHandle<ITrigTrackJetFinderTool> m_trackJetFinderTool;
-
std::vector<std::string> m_TriggerChainBjet, m_TriggerChainMujet;
std::vector<std::string> m_TriggerChainBjet_x, m_TriggerChainMujet_x;
diff --git a/Trigger/TrigTools/TrigInDetToolInterfaces/CMakeLists.txt b/Trigger/TrigTools/TrigInDetToolInterfaces/CMakeLists.txt
index d15db0734e47..0829d03b6199 100644
--- a/Trigger/TrigTools/TrigInDetToolInterfaces/CMakeLists.txt
+++ b/Trigger/TrigTools/TrigInDetToolInterfaces/CMakeLists.txt
@@ -8,4 +8,4 @@ atlas_add_library( TrigInDetToolInterfacesLib
TrigInDetToolInterfaces/*.h
INTERFACE
PUBLIC_HEADERS TrigInDetToolInterfaces
- LINK_LIBRARIES LINK_LIBRARIES ByteStreamData GaudiKernel IRegionSelector Identifier InDetPrepRawData TrigInDetEvent TrigInDetPattRecoEvent TrkEventPrimitives TrkTrack )
+ LINK_LIBRARIES LINK_LIBRARIES ByteStreamData GaudiKernel IRegionSelector Identifier InDetPrepRawData TrigInDetEvent TrigInDetPattRecoEvent TrkTrack )
diff --git a/Trigger/TrigTools/TrigInDetToolInterfaces/TrigInDetToolInterfaces/ITrigTrackJetFinderTool.h b/Trigger/TrigTools/TrigInDetToolInterfaces/TrigInDetToolInterfaces/ITrigTrackJetFinderTool.h
deleted file mode 100755
index d0065b1068b5..000000000000
--- a/Trigger/TrigTools/TrigInDetToolInterfaces/TrigInDetToolInterfaces/ITrigTrackJetFinderTool.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// **************************************************
-//
-// NAME: ITrigTrackJetFinderTool.h
-//
-// AUTHOR: Andrea Coccaro
-// MAIL: Andrea.Coccaro@ge.infn.it
-//
-// **************************************************
-
-#ifndef TRIGINDETTOOLINTERFACES_ITRIGTRACKJETFINDERTOOL_H
-#define TRIGINDETTOOLINTERFACES_ITRIGTRACKJETFINDERTOOL_H
-
-#include "GaudiKernel/IAlgTool.h"
-
-
-
-class TrigInDetTrack;
-namespace Rec { class TrackParticle; }
-namespace Trk { class Track;}
-
-
-static const InterfaceID IID_ITrigTrackJetFinderTool("ITrigTrackJetFinderTool", 1, 0);
-
-class ITrigTrackJetFinderTool : virtual public IAlgTool {
-
- public:
-
- static const InterfaceID& interfaceID() {return IID_ITrigTrackJetFinderTool;}
-
- virtual void setDefTrackSel(bool) = 0;
- virtual void setExtTrackSel(bool) = 0;
-
- virtual void inputPrimaryVertexZ(const float&) = 0;
- virtual void addTrack(const TrigInDetTrack*&, unsigned int) = 0;
- virtual void addTrack(const Rec::TrackParticle*&, unsigned int) = 0;
- virtual void addTrack(const Trk::Track*&, unsigned int) = 0;
-
- virtual void findJet(std::vector<int>&, float&, float&) = 0;
-
- virtual void clear() = 0;
-
-};
-
-#endif
diff --git a/Trigger/TrigTools/TrigTrackJetFinderTool/ATLAS_CHECK_THREAD_SAFETY b/Trigger/TrigTools/TrigTrackJetFinderTool/ATLAS_CHECK_THREAD_SAFETY
deleted file mode 100644
index a435b3d518c0..000000000000
--- a/Trigger/TrigTools/TrigTrackJetFinderTool/ATLAS_CHECK_THREAD_SAFETY
+++ /dev/null
@@ -1 +0,0 @@
-Trigger/TrigTools/TrigTrackJetFinderTool
diff --git a/Trigger/TrigTools/TrigTrackJetFinderTool/CMakeLists.txt b/Trigger/TrigTools/TrigTrackJetFinderTool/CMakeLists.txt
deleted file mode 100644
index 0bed70f07e8d..000000000000
--- a/Trigger/TrigTools/TrigTrackJetFinderTool/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
-# Declare the package name:
-atlas_subdir( TrigTrackJetFinderTool )
-
-# External dependencies:
-find_package( ROOT COMPONENTS MathCore )
-
-# Component(s) in the package:
-atlas_add_component( TrigTrackJetFinderTool
- src/*.cxx
- src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps Particle TrigInDetEvent TrigInDetToolInterfacesLib TrkTrack )
diff --git a/Trigger/TrigTools/TrigTrackJetFinderTool/src/TrigTrackJetFinderTool.cxx b/Trigger/TrigTools/TrigTrackJetFinderTool/src/TrigTrackJetFinderTool.cxx
deleted file mode 100755
index 3639037e995b..000000000000
--- a/Trigger/TrigTools/TrigTrackJetFinderTool/src/TrigTrackJetFinderTool.cxx
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// *********************************************************
-//
-// NAME.cxx
-// PACKAGE: Trigger/TrigTools/TrigTrackJetFinderTool
-//
-// AUTHOR: Andrea Coccaro (Andrea.Coccaro@ge.infn.it)
-// Andrew Lowe (Andrew.Lowe@cern.ch)
-// Ariel Schwartzman (sch@slac.stanford.edu)
-//
-// *********************************************************
-
-#include "TrigTrackJetFinderTool.h"
-#include "TMath.h"
-
-using namespace std;
-using std::vector;
-
-
-
-//** ----------------------------------------------------------------------------------------------------------------- **//
-
-
-bool TrackAttributesSortPredicate(const TrackAttributes& lhs, const TrackAttributes& rhs) {
-
- return fabs(lhs.Pt()) > fabs(rhs.Pt());
-}
-
-
-//** ----------------------------------------------------------------------------------------------------------------- **//
-
-
-TrigTrackJetFinderTool::TrigTrackJetFinderTool(const std::string& t, const std::string& n, const IInterface* p) :
- AthAlgTool(t,n,p),
- m_pi(3.14159265358979323846)
-{
- declareInterface<ITrigTrackJetFinderTool>(this);
-
- declareProperty("DeltaR", m_dr = 0.4);
- declareProperty("DeltaZ", m_dz = 10.0);
- declareProperty("PtMin", m_ptMin = 0.5);
- declareProperty("PtJet", m_ptJet = 0.0);
- declareProperty("PtSeed", m_ptSeed = 2.0);
- declareProperty("Mult", m_mult = 1);
-
- declareProperty("DefTrkSel", m_defTrackSel = true);
- declareProperty("ExtTrkSel", m_extTrackSel = false);
-}
-
-
-//** ----------------------------------------------------------------------------------------------------------------- **//
-
-
-TrigTrackJetFinderTool::~TrigTrackJetFinderTool() {}
-
-
-//** ----------------------------------------------------------------------------------------------------------------- **//
-
-
-StatusCode TrigTrackJetFinderTool::initialize() {
-
- StatusCode sc = AlgTool::initialize();
-
- msg(MSG::INFO) << "Initializing TrigTrackJetFinderTool" << endmsg;
-
- if (msgLvl(MSG::DEBUG)) {
- msg(MSG::DEBUG) << "declareProperty review:" << endmsg;
- msg(MSG::DEBUG) << " cone size (R,Z) = " << m_dr << ", " << m_dz << endmsg;
- msg(MSG::DEBUG) << " minimum seed pT = " << m_ptSeed << endmsg;
- msg(MSG::DEBUG) << " minimum jet pT = " << m_ptJet << endmsg;
- msg(MSG::DEBUG) << " minimum track pT = " << m_ptMin << endmsg;
- msg(MSG::DEBUG) << " minimum multiplicity = " << m_mult << endmsg;
- }
-
- return sc;
-}
-
-
-//** ----------------------------------------------------------------------------------------------------------------- **//
-
-
-void TrigTrackJetFinderTool::clear() {
-
- if (msgLvl(MSG::VERBOSE))
- msg(MSG::VERBOSE) << "Clearing internal track classe" << endmsg;
-
- m_attributesOfTracks.clear();
-}
-
-
-//** ----------------------------------------------------------------------------------------------------------------- **//
-
-
-void TrigTrackJetFinderTool::addTrack(const TrigInDetTrack*& track, unsigned int i) {
-
- bool selTrack=true;
-
- if (m_defTrackSel) {
-
- if (fabs(track->param()->pT()) < m_ptMin && (fabs(track->param()->z0() - m_zpv) >= m_dz)) {
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " track " << i+1 << " not selected (pT && deltaZ cut)" << endmsg;
- selTrack=false;
- }
-
- }
-
- if (m_extTrackSel) {
-
- m_trkSelPt = 1000;
- m_trkSelSiHits = 4;
- m_trkSelBLayer = 1;
- m_trkSelChi2 = 0.001;
-
- if (fabs(track->param()->pT()) < m_trkSelPt) {
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " track " << i+1 << " not selected (pT cut)" << endmsg;
- selTrack=false;
- }
- if (track->siSpacePoints()) {
-
- if ((*track->siSpacePoints())[0]->layer()) {
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " track " << i+1 << " not selected (missing b-layer hit)" << endmsg;
- selTrack=false;
- }
- if ((int)track->siSpacePoints()->size() < m_trkSelSiHits) {
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " track " << i+1 << " not selected (too few silicon hits)" << endmsg;
- selTrack=false;
- }
- if (TMath::Prob(track->chi2(),(int)track->siSpacePoints()->size()*3-5) <= m_trkSelChi2) {
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " track " << i+1 << " not selected (chi2 cut)" << endmsg;
- selTrack=false;
- }
- }
- }
-
- if (!selTrack) return;
-
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " track " << i+1 << " selected" << endmsg;
-
- TrackAttributes p(track, i);
- m_attributesOfTracks.push_back(p);
-
- std::sort(m_attributesOfTracks.begin(), m_attributesOfTracks.end(), TrackAttributesSortPredicate);
-}
-
-
-//** ----------------------------------------------------------------------------------------------------------------- **//
-
-
-void TrigTrackJetFinderTool::addTrack(const Rec::TrackParticle*& track, unsigned int i) {
-
- TrackAttributes p(track, i);
-
- float z0 = track->measuredPerigee()->parameters()[Trk::z0];
- float pT = track->pt();
-
- if (fabs(pT) >= m_ptMin && (fabs(z0 - m_zpv) < m_dz)) {
-
- if (msgLvl(MSG::DEBUG))
- msg(MSG::DEBUG) << "Adding selected track " << i+1 << " for finding the track-jet direction" << endmsg;
-
- m_attributesOfTracks.push_back(p);
-
- } else {
-
- if (msgLvl(MSG::DEBUG))
- msg(MSG::DEBUG) << "Selected track " << i+1 << " not added for finding the track-jet direction since pT "
- << pT << " is not >= " << m_ptMin << " and/or Delta(z) is not < " << m_dz << endmsg;
-
- }
-
- std::sort(m_attributesOfTracks.begin(), m_attributesOfTracks.end(), TrackAttributesSortPredicate);
-}
-
-
-//** ----------------------------------------------------------------------------------------------------------------- **//
-
-
-void TrigTrackJetFinderTool::addTrack(const Trk::Track*& track, unsigned int i) {
-
- TrackAttributes p(track, i);
-
- float z0 = track->perigeeParameters()->parameters()[Trk::z0];
- float pT = track->perigeeParameters()->pT();
-
- if (fabs(pT) >= m_ptMin && (fabs(z0 - m_zpv) < m_dz)) {
-
- if (msgLvl(MSG::DEBUG))
- msg(MSG::DEBUG) << "Adding selected track " << i+1 << " for finding the track-jet direction" << endmsg;
-
- m_attributesOfTracks.push_back(p);
-
- } else {
-
- if (msgLvl(MSG::DEBUG))
- msg(MSG::DEBUG) << "Selected track " << i+1 << " not added for finding the track-jet direction since pT "
- << pT << " is not >= " << m_ptMin << " and/or Delta(z) is not < " << m_dz << endmsg;
-
- }
-
- std::sort(m_attributesOfTracks.begin(), m_attributesOfTracks.end(), TrackAttributesSortPredicate);
-}
-
-
-//** ----------------------------------------------------------------------------------------------------------------- **//
-
-
-void TrigTrackJetFinderTool::inputPrimaryVertexZ(const float& zPV) {
-
- if (msgLvl(MSG::VERBOSE))
- msg(MSG::VERBOSE) << "Z primary vertex " << zPV << endmsg;
-
- m_zpv = zPV;
-}
-
-
-//** ----------------------------------------------------------------------------------------------------------------- **//
-
-
-void TrigTrackJetFinderTool::findJet(std::vector<int>& tracks, float& jetEta, float& jetPhi) {
-
- tracks.clear();
- float jetPx = 0, jetPy = 0, jetPz = 0;
- float jetP = 0;
- jetEta = 0, jetPhi = 0;
-
- if (msgLvl(MSG::DEBUG))
- msg(MSG::DEBUG) << "Number of input tracks = " << m_attributesOfTracks.size() << endmsg;
-
- if(m_attributesOfTracks.size() < m_mult) {
- jetEta = -99; jetPhi = -99;
-
- if (msgLvl(MSG::DEBUG))
- msg(MSG::DEBUG) << "Seed multiplicity is below threshold " << m_mult << ". Not computing track-jet direction." << endmsg;
-
- return;
- }
-
- TrackAttributes seed = m_attributesOfTracks[0];
-
- if(fabs(seed.Pt())<m_ptSeed) {
- jetEta = -99; jetPhi = -99;
-
- if (msgLvl(MSG::DEBUG))
- msg(MSG::DEBUG) << "Highest-pT seed is below threshold " << m_ptSeed << ". Not computing track-jet direction." << endmsg;
-
- return;
- }
-
- tracks.push_back(seed.Id());
-
- jetPx += seed.Px();
- jetPy += seed.Py();
- jetPz += seed.Pz();
- jetP = sqrt(jetPx*jetPx+jetPy*jetPy+jetPz*jetPz);
- jetEta = 0.5*log( (jetP+jetPz)/(jetP-jetPz) );
- jetPhi = phiCorr(atan2(jetPy,jetPx));
-
- if (msgLvl(MSG::VERBOSE))
- msg(MSG::VERBOSE) << " jetP = " << jetP << " jetEta = " << jetEta << " jetPhi = " << jetPhi << endmsg;
-
- for(unsigned int j=1; j < m_attributesOfTracks.size(); j++) {
-
- if (msgLvl(MSG::VERBOSE))
- msg(MSG::VERBOSE) << "Considering seed " << m_attributesOfTracks[j].Id()+1 << endmsg;
-
- float pEta = m_attributesOfTracks[j].Eta();
- float pPhi = m_attributesOfTracks[j].Phi();
-
- float dr = deltaR(jetEta,jetPhi, pEta,pPhi);
-
- if(dr<m_dr) {
-
- if (msgLvl(MSG::VERBOSE))
- msg(MSG::VERBOSE) << " deltaR matching between seed and jet direction satisfied (" << dr << ">" << m_dr << ")" << endmsg;
-
- jetPx += m_attributesOfTracks[j].Px();
- jetPy += m_attributesOfTracks[j].Py();
- jetPz += m_attributesOfTracks[j].Pz();
- tracks.push_back(m_attributesOfTracks[j].Id());
-
- jetP = sqrt(jetPx*jetPx+jetPy*jetPy+jetPz*jetPz);
- jetEta = 0.5*log((jetP+jetPz)/(jetP-jetPz));
- jetPhi = atan2(jetPy,jetPx);
-
- if (msgLvl(MSG::VERBOSE))
- msg(MSG::VERBOSE) << " jetP+= " << jetP << " jetEta+= " << jetEta << " jetPhi+= " << jetPhi << endmsg;
- }
- }
-
- //float jetPt = sqrt(jetPx*jetPx+jetPy*jetPy);
-}
-
-
-//** ----------------------------------------------------------------------------------------------------------------- **//
-
-
-float TrigTrackJetFinderTool::deltaR(float& eta0, float& phi0, float& eta1, float& phi1) {
-
- float deta = eta0 - eta1;
- float dphi = phiCorr(phiCorr(phi0) - phiCorr(phi1));
-
- return sqrt(deta*deta+dphi*dphi);
-}
-
-
-//** ----------------------------------------------------------------------------------------------------------------- **//
-
-
-float TrigTrackJetFinderTool::phiCorr(float phi){
-
- if(phi < -m_pi) phi += 2*m_pi;
- if(phi > m_pi) phi -= 2*m_pi;
-
- return phi;
-}
-
-
-//** ----------------------------------------------------------------------------------------------------------------- **//
-
-
-StatusCode TrigTrackJetFinderTool::finalize() {
-
- StatusCode sc = AlgTool::finalize();
-
- msg(MSG::INFO) << "Finalizing TrigTrackJetFinderTool" << endmsg;
-
- return sc;
-}
-
-
diff --git a/Trigger/TrigTools/TrigTrackJetFinderTool/src/TrigTrackJetFinderTool.h b/Trigger/TrigTools/TrigTrackJetFinderTool/src/TrigTrackJetFinderTool.h
deleted file mode 100644
index c3cf3bc87f91..000000000000
--- a/Trigger/TrigTools/TrigTrackJetFinderTool/src/TrigTrackJetFinderTool.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// *********************************************************
-//
-// NAME: TrigTrackJetFinderTool.h
-// PACKAGE: Trigger/TrigTools/TrigTrackJetFinderTool
-//
-// AUTHOR: Andrea Coccaro (Andrea.Coccaro@ge.infn.it)
-// Andrew Lowe (Andrew.Lowe@cern.ch)
-// Ariel Schwartzman (sch@slac.stanford.edu)
-//
-// *********************************************************
-
-#ifndef TRIGTRACKJETFINDERTOOL_H
-#define TRIGTRACKJETFINDERTOOL_H
-
-#include <math.h>
-#include <vector>
-#include <algorithm>
-#include <iostream>
-
-#include "AthenaBaseComps/AthAlgTool.h"
-
-#include "TrigInDetToolInterfaces/ITrigTrackJetFinderTool.h"
-
-#include "TrigInDetEvent/TrigInDetTrack.h"
-#include "Particle/TrackParticle.h"
-#include "TrkTrack/Track.h"
-
-
-
-class TrackAttributes {
-
- public:
-
- TrackAttributes(const TrigInDetTrack*& track, unsigned int id) {
-
- const float pi = 3.14159265358979323846;
-
- m_id = id;
- m_pt = track->param()->pT();
- m_phi = track->param()->phi0();
- m_eta = track->param()->eta();
- m_z0 = track->param()->z0();
- m_d0 = track->param()->a0();
-
- if(m_phi < -pi) m_phi += 2 * pi;
- if(m_phi > pi) m_phi -= 2 * pi;
-
- m_px = fabs(m_pt)*cos(m_phi);
- m_py = fabs(m_pt)*sin(m_phi);
- m_pz = fabs(m_pt)*sinh(m_eta);
-
- };
-
- TrackAttributes(const Rec::TrackParticle*& track, unsigned int id) {
-
- const float pi = 3.14159265358979323846;
-
- m_id = id;
- m_pt = track->pt();
- m_phi = track->phi();
- m_eta = track->eta();
- m_z0 = track->measuredPerigee()->parameters()[Trk::z0];
- m_d0 = track->measuredPerigee()->parameters()[Trk::d0];
-
- if(m_phi < -pi) m_phi += 2 * pi;
- if(m_phi > pi) m_phi -= 2 * pi;
-
- m_px = fabs(m_pt)*cos(m_phi);
- m_py = fabs(m_pt)*sin(m_phi);
- m_pz = fabs(m_pt)*sinh(m_eta);
-
- };
-
- TrackAttributes(const Trk::Track*& track, unsigned int id) {
-
- const float pi = 3.14159265358979323846;
-
- m_id = id;
- m_pt = track->perigeeParameters()->pT();
- m_phi = track->perigeeParameters()->parameters()[Trk::phi];
- m_eta = track->perigeeParameters()->eta();
- m_z0 = track->perigeeParameters()->parameters()[Trk::z0];
- m_d0 = track->perigeeParameters()->parameters()[Trk::d0];
-
- if(m_phi < -pi) m_phi += 2 * pi;
- if(m_phi > pi) m_phi -= 2 * pi;
-
- m_px = fabs(m_pt)*cos(m_phi);
- m_py = fabs(m_pt)*sin(m_phi);
- m_pz = fabs(m_pt)*sinh(m_eta);
-
- };
-
- ~TrackAttributes() {};
-
- int Id() const { return m_id; }
-
- float Px() const { return m_px; }
- float Py() const { return m_py; }
- float Pz() const { return m_pz; }
- float Pt() const { return m_pt; }
- float Eta() const { return m_eta; }
- float Phi() const { return m_phi; }
- float Z() const { return m_z0; }
-
- bool operator== (const TrackAttributes &other) const {
- if(this->Phi() != other.Phi()) return false;
- return true;
- }
-
- private:
-
- unsigned int m_id;
-
- float m_px;
- float m_py;
- float m_pz;
- float m_pt;
- float m_eta;
- float m_phi;
- float m_z0;
- float m_d0;
-
-};
-
-
-//** ----------------------------------------------------------------------------------------------------------------- **//
-
-
-class TrigTrackJetFinderTool: public AthAlgTool, virtual public ITrigTrackJetFinderTool {
-
- public:
-
- TrigTrackJetFinderTool(const std::string&, const std::string&, const IInterface*);
- virtual ~TrigTrackJetFinderTool();
-
- virtual StatusCode initialize();
- virtual StatusCode finalize();
-
- void setDefTrackSel(bool doTrackSel) { m_defTrackSel=doTrackSel; }
- void setExtTrackSel(bool doTrackSel) { m_extTrackSel=doTrackSel; }
-
- void inputPrimaryVertexZ(const float& zPV);
- void addTrack(const TrigInDetTrack*&, unsigned int);
- void addTrack(const Rec::TrackParticle*&, unsigned int);
- void addTrack(const Trk::Track*&, unsigned int);
-
- void findJet(std::vector<int>& tracks, float& eta, float& phi);
-
- void clear();
-
- private:
-
- bool m_defTrackSel;
- bool m_extTrackSel;
-
- float m_trkSelChi2;
- int m_trkSelBLayer;
- int m_trkSelSiHits;
- float m_trkSelPt;
-
- float phiCorr(float);
- float deltaR(float& eta0, float& phi0, float& eta1, float& phi1);
-
- float m_dr, m_dz, m_ptMin, m_ptJet, m_ptSeed, m_mult;
- float m_zpv;
-
- /** @brief Value of pi set in CTOR to the exact value in TMath.h to avoid including everything in the TMath namespace and multiple calls to TMath::Pi(). */
- const float m_pi;
-
- std::vector<TrackAttributes> m_attributesOfTracks;
-};
-
-#endif
-
diff --git a/Trigger/TrigTools/TrigTrackJetFinderTool/src/components/TrigTrackJetFinderTool_entries.cxx b/Trigger/TrigTools/TrigTrackJetFinderTool/src/components/TrigTrackJetFinderTool_entries.cxx
deleted file mode 100644
index cdf492ab54c6..000000000000
--- a/Trigger/TrigTools/TrigTrackJetFinderTool/src/components/TrigTrackJetFinderTool_entries.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "../TrigTrackJetFinderTool.h"
-
-DECLARE_COMPONENT( TrigTrackJetFinderTool )
-
--
GitLab
From 562b483244239ffe93fa234350a8cba431660e4b Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Wed, 11 Aug 2021 17:33:54 +0200
Subject: [PATCH 008/272] TrigT1TGC: const fixes
Return `const` pointer from `const` method. The remaining thread-checker
warning are being followed up in ATR-23513.
---
Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCGoodMF.h | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCGoodMF.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCGoodMF.h
index a102309a71ae..ccecab8494c3 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCGoodMF.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCGoodMF.h
@@ -28,7 +28,7 @@ public:
bool test_GoodMF(int moduleId, int sscId, int subsector) const;
bool readBadMFList();
- TGCArguments* tgcArgs() const;
+ const TGCArguments* tgcArgs() const { return m_tgcArgs; }
private:
std::map<int, std::map<int,int> > m_mapisgoodMF; //Number of moduleId
@@ -37,11 +37,6 @@ private:
};
-inline
-TGCArguments* TGCGoodMF::tgcArgs() const {
- return m_tgcArgs;
-}
-
} //end of namespace bracket
#endif // TGCGoodMF_h
--
GitLab
From 16be13f01bc2704ebaf7a6feb168ef23a30af0a3 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Wed, 11 Aug 2021 17:55:35 +0200
Subject: [PATCH 009/272] InDetBeamSpotFinder: migrate to BunchCrossingCondData
Migrate code from `TrigBunchCrossingTool` to `BunchCrossingCondData`.
Closes ATLASRECTS-6406.
---
.../InDetBeamSpotFinder/CMakeLists.txt | 4 ++--
.../InDetBeamSpotFinder/python/VertexTemplate.py | 10 +---------
.../src/InDetBeamSpotFinder.cxx | 15 +++++++++------
.../InDetBeamSpotFinder/src/InDetBeamSpotFinder.h | 15 +++++++++------
4 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/CMakeLists.txt b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/CMakeLists.txt
index 21e1504a119b..41bd99a9f4bc 100644
--- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/CMakeLists.txt
+++ b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetBeamSpotFinder )
@@ -14,7 +14,7 @@ atlas_add_library( InDetBeamSpotFinderLib
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} BeamSpotConditionsData GaudiKernel TrigAnalysisInterfaces TrkFitterUtils xAODTracking
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} BeamSpotConditionsData LumiBlockData GaudiKernel TrkFitterUtils xAODTracking
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps CxxUtils EventInfo xAODEventInfo TrkEventPrimitives VxVertex AtlasDetDescr Identifier StoreGateLib TrkFitterInterfaces TrkParameters TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkTrack TrkVertexFitterInterfaces )
atlas_add_component( InDetBeamSpotFinder
diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/python/VertexTemplate.py b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/python/VertexTemplate.py
index 0187fccdd6e9..7ca0eebdd7cc 100644
--- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/python/VertexTemplate.py
+++ b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/python/VertexTemplate.py
@@ -1,6 +1,5 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-# $Id: VertexTemplate.py 601782 2014-06-14 00:00:08Z btamadio $
#
# Top-level job options file to run the vertex-based beamspot algorithm
# from AOD files using a JobRunner.
@@ -126,13 +125,6 @@ topSequence += CfgMgr.InDet__InDetBeamSpotFinder(name = 'InDetBea
OutputLevel = min(INFO,jobConfig['outputlevel']))
-if jobConfig['UseFilledBCIDsOnly']:
- # Bunch crossing tool to allow selecting on non-empty BCIDs
- from TrigBunchCrossingTool.BunchCrossingTool import BunchCrossingTool
- bunchCrossingTool = BunchCrossingTool()
- #bunchCrossingTool.FilledBunchNames=[]
- topSequence.InDetBeamSpotFinder.BCTool = bunchCrossingTool
-
try:
topSequence.InDetBeamSpotFinder.UseLBFromViewed = jobConfig['UseLBFromViewed']
topSequence.InDetBeamSpotFinder.UseLBFromAccepted = jobConfig['UseLBFromAccepted']
diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotFinder.cxx b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotFinder.cxx
index 8b90110a2b5d..39937e185810 100644
--- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotFinder.cxx
+++ b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotFinder.cxx
@@ -3,7 +3,6 @@
*/
#include "InDetBeamSpotFinder.h"
-#include "TrigAnalysisInterfaces/IBunchCrossingTool.h"
#include "InDetBeamSpotFinder/IInDetBeamSpotTool.h"
#include "InDetBeamSpotVertex.h"
#include "InDetBeamSpotRooFit.h"
@@ -31,10 +30,9 @@ namespace{
InDet::InDetBeamSpotFinder::InDetBeamSpotFinder(const std::string& name, ISvcLocator* pSvcLocator):
AthAlgorithm(name, pSvcLocator),
- m_toolSvc("ToolSvc",name),m_bcTool("Trig::TrigConfBunchCrossingTool/BunchCrossingTool")
+ m_toolSvc("ToolSvc",name)
{
declareProperty( "ToolSvc", m_toolSvc );
- declareProperty( "BCTool", m_bcTool );
declareProperty( "BeamSpotToolList" , m_beamSpotToolList );
declareProperty( "RunRange" , m_maxRunsPerFit = 0 );
declareProperty( "LumiRange" , m_maxLBsPerFit = 0 );
@@ -64,7 +62,9 @@ StatusCode InDet::InDetBeamSpotFinder::initialize() {
ATH_CHECK( service("THistSvc",m_thistSvc) );
ATH_CHECK( m_toolSvc.retrieve() );
- if( m_useFilledBCIDsOnly ) ATH_CHECK( m_bcTool.retrieve() );
+
+ ATH_CHECK( m_bcDataKey.initialize(m_useFilledBCIDsOnly) );
+
ATH_CHECK( m_eventInfo.initialize() );
ATH_CHECK( m_vertexContainer.initialize() );
@@ -210,8 +210,11 @@ void InDet::InDetBeamSpotFinder::convertVtxTypeNames(){
}
bool InDet::InDetBeamSpotFinder::passEventSelection(const xAOD::EventInfo & eventInfo){
- int bcid = eventInfo.bcid();
- if (m_useFilledBCIDsOnly && !m_bcTool->isFilled(bcid)) { return false; }
+ const int bcid = eventInfo.bcid();
+ if ( m_useFilledBCIDsOnly) {
+ SG::ReadCondHandle<BunchCrossingCondData> bcData(m_bcDataKey);
+ if ( !bcData->isFilled(bcid) ) return false;
+ }
if( m_BCIDsToAccept.begin() != m_BCIDsToAccept.end() )
return ( std::find(m_BCIDsToAccept.begin(), m_BCIDsToAccept.end(), bcid) != m_BCIDsToAccept.end());
else
diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotFinder.h b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotFinder.h
index 0a5ec6a7b956..78fe0f35f05b 100644
--- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotFinder.h
+++ b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotFinder.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef INDET_INDETBEAMSPOTFINDER_H
@@ -21,7 +21,8 @@
#include "xAODTracking/VertexContainer.h" //typedef, can't fwd declare
#include "xAODTracking/TrackingPrimitives.h" //for xAOD::VxType
// #include "xAODTracking/Vertex.h"
-#include "TrigAnalysisInterfaces/IBunchCrossingTool.h"
+#include "LumiBlockData/BunchCrossingCondData.h"
+#include "StoreGate/ReadCondHandleKey.h"
#include "StoreGate/ReadHandleKey.h"
#include "BeamSpotID.h"
#include <string>
@@ -39,15 +40,17 @@ namespace InDet {
public:
//Standard constructor and methods
InDetBeamSpotFinder (const std::string& name, ISvcLocator* pSvcLocator);
- StatusCode initialize();
- StatusCode execute();
- StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode execute() override;
+ virtual StatusCode finalize() override;
private:
//Reorganize and clean up this section
ServiceHandle<IToolSvc> m_toolSvc;
ToolHandleArray<IInDetBeamSpotTool> m_beamSpotToolList;
- ToolHandle<Trig::IBunchCrossingTool> m_bcTool; ///< Handle to the BC tool
+
+ SG::ReadCondHandleKey<BunchCrossingCondData> m_bcDataKey
+ {this, "BunchCrossingCondDataKey", "BunchCrossingData" ,"SG Key of BunchCrossing CDO"};
SG::ReadHandleKey<xAOD::EventInfo> m_eventInfo
{this, "EvtInfo", "EventInfo", "EventInfo name"};
--
GitLab
From 02464519ab554bd66362cfa9cf0112a22d995bb5 Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Wed, 11 Aug 2021 19:52:40 +0200
Subject: [PATCH 010/272] TrkKalmanFitter prefer prefix than postfix
---
.../src/ForwardKalmanFitter.cxx | 4 ++--
.../src/ForwardRefTrackKalmanFitter.cxx | 2 +-
.../TrkKalmanFitter/src/KalmanFitter.cxx | 18 +++++++--------
.../src/KalmanOutlierLogic.cxx | 2 +-
.../src/KalmanOutlierRecovery_InDet.cxx | 22 +++++++++----------
.../TrkKalmanFitter/src/KalmanSmoother.cxx | 4 ++--
6 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/Tracking/TrkFitter/TrkKalmanFitter/src/ForwardKalmanFitter.cxx b/Tracking/TrkFitter/TrkKalmanFitter/src/ForwardKalmanFitter.cxx
index 8a41db4244ea..b41d5d61381e 100755
--- a/Tracking/TrkFitter/TrkKalmanFitter/src/ForwardKalmanFitter.cxx
+++ b/Tracking/TrkFitter/TrkKalmanFitter/src/ForwardKalmanFitter.cxx
@@ -184,7 +184,7 @@ Trk::ForwardKalmanFitter::fit(Trk::Trajectory& trajectory,
// loop over all PreRawData objects in Set
int itcounter=1;
PrepRawDataSet::const_iterator it = inputPRDColl.begin();
- for( ; it!=inputPRDColl.end(); it++) {
+ for( ; it!=inputPRDColl.end(); ++it) {
const Trk::TrackParameters* predPar =
this->predict( updatedPar,
(*it)->detectorElement()->surface( (*it)->identify() ),
@@ -323,7 +323,7 @@ Trk::ForwardKalmanFitter::fit(Trk::Trajectory& trajectory,
//////////////////////////////////////////////////////////////////////////////////////////
// the regular filter loop after finding the correct initialisation
- for( ; it!=trajectory.end(); it++) if (!it->isOutlier()) {
+ for( ; it!=trajectory.end(); ++it) if (!it->isOutlier()) {
const Trk::TrackParameters* predPar =
this->predict( updatedPar, it->measurement()->associatedSurface(),
diff --git a/Tracking/TrkFitter/TrkKalmanFitter/src/ForwardRefTrackKalmanFitter.cxx b/Tracking/TrkFitter/TrkKalmanFitter/src/ForwardRefTrackKalmanFitter.cxx
index ca5a51207764..f30bb300d01a 100755
--- a/Tracking/TrkFitter/TrkKalmanFitter/src/ForwardRefTrackKalmanFitter.cxx
+++ b/Tracking/TrkFitter/TrkKalmanFitter/src/ForwardRefTrackKalmanFitter.cxx
@@ -201,7 +201,7 @@ Trk::ForwardRefTrackKalmanFitter::fit(Trk::Trajectory& trajectory,
//////////////////////////////////////////////////////////////////////////////////////////
// the regular filter loop after finding the correct initialisation
- for( ; it!=trajectory.end(); it++) {
+ for( ; it!=trajectory.end(); ++it) {
const AmgVector(5)* predDiffPar = nullptr;
const AmgSymMatrix(5)* predDiffCov = nullptr;
diff --git a/Tracking/TrkFitter/TrkKalmanFitter/src/KalmanFitter.cxx b/Tracking/TrkFitter/TrkKalmanFitter/src/KalmanFitter.cxx
index f6eaad953516..50c95a7b08d5 100755
--- a/Tracking/TrkFitter/TrkKalmanFitter/src/KalmanFitter.cxx
+++ b/Tracking/TrkFitter/TrkKalmanFitter/src/KalmanFitter.cxx
@@ -527,7 +527,7 @@ Trk::KalmanFitter::fit(const EventContext& ctx,
if (msgLvl(MSG::VERBOSE)) {
ATH_MSG_VERBOSE(" Sorting passed, sorted list by distance to ref point:" );
PrepRawDataSet::const_iterator it1 = orderedPRDColl.begin();
- for( ; it1!=orderedPRDColl.end(); it1++) {
+ for( ; it1!=orderedPRDColl.end(); ++it1) {
if ( !(*it1)->detectorElement() ) {
ATH_MSG_ERROR( "corrupt data - PrepRawData has no element link.\n"
<< "The track fitter won't help you here -> segfault expected." );
@@ -627,14 +627,14 @@ Trk::KalmanFitter::fit(const EventContext& ctx,
// fill measurements into fitter-internal trajectory: no outlier, external meas't
MeasurementSet::const_iterator it = sortedHitSet.begin();
MeasurementSet::const_iterator itEnd = sortedHitSet.end();
- for(int istate=1 ; it!=itEnd; it++, istate++) {
+ for(int istate=1 ; it!=itEnd; ++it, ++istate) {
m_trajectory.push_back(ProtoTrackStateOnSurface((*it),false,false,istate));
m_trajectory.back().identifier(Trk::IdentifierExtractor::extract(*it));
}
} else {
MeasurementSet::const_iterator it = inputMeasSet.begin();
MeasurementSet::const_iterator itEnd = inputMeasSet.end();
- for(int istate=1 ; it!=itEnd; it++, istate++) {
+ for(int istate=1 ; it!=itEnd; ++it, ++istate) {
m_trajectory.push_back(ProtoTrackStateOnSurface((*it),false,false,istate));
m_trajectory.back().identifier(Trk::IdentifierExtractor::extract(*it));
}
@@ -1075,7 +1075,7 @@ bool Trk::KalmanFitter::iterateKalmanFilter(const EventContext& ctx,
int nMeasPrecise = 0; int nMeasTube = 0; int nOutlPrecise = 0; int nOutlTube = 0;
int posFirstTrt=0;
Trajectory::iterator it = m_trajectory.begin();
- for(; it!=m_trajectory.end(); it++) {
+ for(; it!=m_trajectory.end(); ++it) {
if (it->isDriftCircle()) {
if (posFirstTrt == 0) posFirstTrt = it->positionOnTrajectory();
if (it->measurement()->localCovariance()(Trk::locR,Trk::locR) > 1.0) {
@@ -1184,7 +1184,7 @@ bool Trk::KalmanFitter::invokeAnnealingFilter(const Trk::TrackParameters*& star
else
dafStatus = m_smoother->fit(m_trajectory, newFitQuality, kalMec);
ATH_MSG_INFO( "Internal DAF returned with chi2 chain:");
- for (Trk::Trajectory::const_iterator it=m_trajectory.begin();it!=m_trajectory.end(); it++) {
+ for (Trk::Trajectory::const_iterator it=m_trajectory.begin();it!=m_trajectory.end(); ++it) {
if (!it->isOutlier()) {
if (it->fitQuality()) ATH_MSG_INFO( it->fitQuality()->chiSquared() << " % ");
else ATH_MSG_INFO( "Problem - no FitQ % ");
@@ -1239,7 +1239,7 @@ bool Trk::KalmanFitter::prepareNextIteration(const unsigned int& upcomingIterati
// get chi2 asymmetry
double Chi2FilterAfb = 0.0;
if (FQ != nullptr) {
- for (Trk::Trajectory::const_iterator it=m_trajectory.begin(); it!=m_trajectory.end(); it++)
+ for (Trk::Trajectory::const_iterator it=m_trajectory.begin(); it!=m_trajectory.end(); ++it)
if ( !it->isOutlier() ||
(it->trackStateType() != Trk::TrackState::ExternalOutlier
&& it->iterationShowingThisOutlier() == int(upcomingIteration-1)) )
@@ -1349,7 +1349,7 @@ Trk::KalmanFitter::makeTrack(
bool dnaFitPresent = Trk::ProtoTrajectoryUtility::trajectoryHasMefot(m_trajectory);
Trajectory::iterator it = m_trajectory.begin();
int i=0;
- for(; it!=m_trajectory.end(); it++, i++) {
+ for(; it!=m_trajectory.end(); ++it, i++) {
const TrackStateOnSurface* trkState = it->createState();
if (trkState) finalTrajectory.push_back( trkState );
else ATH_MSG_WARNING ("fitter inconsistency - no track state #"<<i<<" available!");
@@ -1574,14 +1574,14 @@ Trk::KalmanFitter::callValidation(const EventContext& ctx,
const Trk::PerigeeSurface perSurf; // default perigee at origin
const Trk::TrackParameters* nearestParam = nullptr;
Trajectory::const_iterator it = m_trajectory.begin();
- for ( ; it != m_trajectory.end(); it++ ) { // FIXME this can be coded more elegantly
+ for ( ; it != m_trajectory.end(); ++it ) { // FIXME this can be coded more elegantly
if (!it->isOutlier() && (it->smoothedTrackParameters())) {
nearestParam = it->smoothedTrackParameters();
break;
}
}
if (!nearestParam) {
- for ( it = m_trajectory.begin(); it != m_trajectory.end(); it++ ) {
+ for ( it = m_trajectory.begin(); it != m_trajectory.end(); ++it ) {
if (!it->isOutlier() && (it->forwardTrackParameters())) {
nearestParam = it->forwardTrackParameters();
break;
diff --git a/Tracking/TrkFitter/TrkKalmanFitter/src/KalmanOutlierLogic.cxx b/Tracking/TrkFitter/TrkKalmanFitter/src/KalmanOutlierLogic.cxx
index 45df6ff8a42c..9a6a3cba9cc4 100755
--- a/Tracking/TrkFitter/TrkKalmanFitter/src/KalmanOutlierLogic.cxx
+++ b/Tracking/TrkFitter/TrkKalmanFitter/src/KalmanOutlierLogic.cxx
@@ -165,7 +165,7 @@ bool Trk::KalmanOutlierLogic::flagNewOutliers(Trk::Trajectory& T,
FQ.chiSquared() <<"/"<<FQ.numberDoF());
// loop over all meas'ts and do outlier cuts
- for( Trk::Trajectory::iterator it = T.begin(); it!=T.end(); it++) {
+ for( Trk::Trajectory::iterator it = T.begin(); it!=T.end(); ++it) {
if (it->measurement() && !it->isOutlier()) {
// first check: track should be inside active sensor boundaries + tolerance
diff --git a/Tracking/TrkFitter/TrkKalmanFitter/src/KalmanOutlierRecovery_InDet.cxx b/Tracking/TrkFitter/TrkKalmanFitter/src/KalmanOutlierRecovery_InDet.cxx
index e8a63a978242..32660eac118b 100755
--- a/Tracking/TrkFitter/TrkKalmanFitter/src/KalmanOutlierRecovery_InDet.cxx
+++ b/Tracking/TrkFitter/TrkKalmanFitter/src/KalmanOutlierRecovery_InDet.cxx
@@ -138,7 +138,7 @@ bool Trk::KalmanOutlierRecovery_InDet::flagNewOutliers(Trk::Trajectory& T,
int numberOfRejections = 0;
bool failureRecoveryNeedsRefit = false;
int c_allPix=0,c_allSct=0,c_allTrt=0; int c_outPix=0,c_outSct=0,c_outTrt=0;
- for( Trk::Trajectory::iterator it = T.begin(); it!=T.end(); it++) {
+ for( Trk::Trajectory::iterator it = T.begin(); it!=T.end(); ++it) {
using namespace Trk::TrackState;
if (it->measurementType()==Pixel) {if (it->isNewOutlier()) ++c_outPix; ++c_allPix;}
if (it->measurementType()==SCT) {if (it->isNewOutlier()) ++c_outSct; ++c_allSct;}
@@ -168,7 +168,7 @@ bool Trk::KalmanOutlierRecovery_InDet::flagNewOutliers(Trk::Trajectory& T,
&& c_allPix > 0 && 2*c_outPix <= c_allPix
&& 2*c_outSct < c_allSct ) {
- for( Trk::Trajectory::iterator it = T.begin(); it!=T.end(); it++) {
+ for( Trk::Trajectory::iterator it = T.begin(); it!=T.end(); ++it) {
if (it->isNewOutlier() && it->measurementType()==Pixel
&& it->trackStateType() != PredictedOutlier ) {
@@ -224,7 +224,7 @@ bool Trk::KalmanOutlierRecovery_InDet::flagNewOutliers(Trk::Trajectory& T,
if (fitIteration >= 2) {
// further ideas: check of predictive vs. pattern momentum at states 2-3-4
ATH_MSG_DEBUG ("-O- Giving up... hope for predictive seed recovery ");
- for( Trk::Trajectory::iterator it = T.begin(); it!=T.end(); it++)
+ for( Trk::Trajectory::iterator it = T.begin(); it!=T.end(); ++it)
it->isOutlier(GeneralOutlier,fitIteration);
firstNew = 1;
return true;
@@ -232,7 +232,7 @@ bool Trk::KalmanOutlierRecovery_InDet::flagNewOutliers(Trk::Trajectory& T,
const int badRankedNumberOfMeas = Trk::ProtoTrajectoryUtility::rankedNumberOfMeasurements(T);
Trk::Trajectory::iterator lastSctState = T.end();
- for( Trk::Trajectory::iterator it = T.begin(); it!=T.end(); it++)
+ for( Trk::Trajectory::iterator it = T.begin(); it!=T.end(); ++it)
if (it->measurementType() == SCT) lastSctState = it;
const Trk::TrackParameters* sctExitTemp =
@@ -242,7 +242,7 @@ bool Trk::KalmanOutlierRecovery_InDet::flagNewOutliers(Trk::Trajectory& T,
false, Trk::nonInteracting);
if (sctExitTemp == nullptr) {
ATH_MSG_DEBUG ("-O- can not reproduce trajectory in SCT recovery!");
- for( Trk::Trajectory::iterator it = T.begin(); it!=T.end(); it++)
+ for( Trk::Trajectory::iterator it = T.begin(); it!=T.end(); ++it)
it->isOutlier(GeneralOutlier,fitIteration);
firstNew = 1;
return true;
@@ -296,7 +296,7 @@ bool Trk::KalmanOutlierRecovery_InDet::flagNewOutliers(Trk::Trajectory& T,
delete sctFitResult;
if (!predPar) {
ATH_MSG_DEBUG ("-O- internal mini-filter failed in SCT recovery!");
- // for( Trk::Trajectory::iterator it = T.begin(); it!=T.end(); it++)
+ // for( Trk::Trajectory::iterator it = T.begin(); it!=T.end(); ++it)
// it->isOutlier(GeneralOutlier,fitIteration);
// firstNew = 1;
// return true;
@@ -331,7 +331,7 @@ bool Trk::KalmanOutlierRecovery_InDet::flagNewOutliers(Trk::Trajectory& T,
rit->measurement()->localCovariance());
if (testQuality == nullptr) {
ATH_MSG_DEBUG ("-O- can not reproduce trajectory at the end of SCT recovery!");
- for( Trk::Trajectory::iterator it = T.begin(); it!=T.end(); it++)
+ for( Trk::Trajectory::iterator it = T.begin(); it!=T.end(); ++it)
it->isOutlier(GeneralOutlier,fitIteration);
firstNew = 1;
return true;
@@ -415,12 +415,12 @@ bool Trk::KalmanOutlierRecovery_InDet::flagNewOutliers(Trk::Trajectory& T,
improvedRank += Trk::ProtoTrajectoryUtility::numberOfSpecificStates(T,SCT,GeneralOutlier);
if (improvedRank <= badRankedNumberOfMeas) { // no good in removing lots of pixel!
ATH_MSG_DEBUG ("SCT recovery has produced bogus solution!");
- for( Trk::Trajectory::iterator it = T.begin(); it!=T.end(); it++)
+ for( Trk::Trajectory::iterator it = T.begin(); it!=T.end(); ++it)
if ( (it->measurementType()==Pixel) && (it->trackStateType() != PredictedOutlier) )
it->isOutlier(false);
} else {
ATH_MSG_DEBUG ("SCT recovery achieved through cleaning pixel part");
- for( Trk::Trajectory::iterator it = T.begin(); it!=T.end(); it++)
+ for( Trk::Trajectory::iterator it = T.begin(); it!=T.end(); ++it)
if ( (it->measurementType() == SCT) && (it->isNewOutlier()) )
it->isOutlier(false);
}
@@ -434,7 +434,7 @@ bool Trk::KalmanOutlierRecovery_InDet::flagNewOutliers(Trk::Trajectory& T,
if (c_allTrt-c_outTrt > 0 && m_recalibrator!=nullptr ) {
if (numberOfRejections > 0 ) {
- for( Trk::Trajectory::iterator it = T.begin(); it!=T.end(); it++) {
+ for( Trk::Trajectory::iterator it = T.begin(); it!=T.end(); ++it) {
if (msgLvl(MSG::VERBOSE)) {
const Trk::RIO_OnTrack* rot=nullptr;
@@ -510,7 +510,7 @@ bool Trk::KalmanOutlierRecovery_InDet::flagNewOutliers(Trk::Trajectory& T,
if (trtProb < 10.0e-3 && (2*c_outTrt < c_allTrt) ) {
ATH_MSG_VERBOSE ("risk of losing TRT extension, reduce TRT's chi2 contrib.");
- for( Trk::Trajectory::iterator it = T.begin(); it!=T.end(); it++) {
+ for( Trk::Trajectory::iterator it = T.begin(); it!=T.end(); ++it) {
const Trk::RIO_OnTrack* trt=dynamic_cast<const Trk::RIO_OnTrack*>(it->measurement());
if (it->measurementType() == Trk::TrackState::TRT
&& !it->isOutlier() && it->smoothedTrackParameters()!=nullptr
diff --git a/Tracking/TrkFitter/TrkKalmanFitter/src/KalmanSmoother.cxx b/Tracking/TrkFitter/TrkKalmanFitter/src/KalmanSmoother.cxx
index 35835a0098b2..c65ecd22a656 100755
--- a/Tracking/TrkFitter/TrkKalmanFitter/src/KalmanSmoother.cxx
+++ b/Tracking/TrkFitter/TrkKalmanFitter/src/KalmanSmoother.cxx
@@ -281,7 +281,7 @@ Trk::FitterStatusCode Trk::KalmanSmoother::fit(Trk::Trajectory& tra
Trk::Trajectory::reverse_iterator rit = lastPredictedState + 1;
Trk::Trajectory::reverse_iterator lastSmoothableState
= Trk::Trajectory::reverse_iterator(Trk::ProtoTrajectoryUtility::firstFittableState(trajectory)) - 1; // this takes outliers into account
- for( ; rit!=trajectory.rend(); rit++) {
+ for( ; rit!=trajectory.rend(); ++rit) {
if (!rit->isOutlier()) {
smooPar_eta_for_monitoring = 1000.;
@@ -540,7 +540,7 @@ Trk::FitterStatusCode Trk::KalmanSmoother::fitWithReference(Trk::Trajectory&
Trk::Trajectory::reverse_iterator rit = lastPredictedState + 1; // go to one-but-last state
Trk::Trajectory::reverse_iterator lastSmoothableState
= Trk::Trajectory::reverse_iterator(Trk::ProtoTrajectoryUtility::firstFittableState(trajectory)) - 1; // this takes outliers into account
- for( ; rit!=trajectory.rend(); rit++) {
+ for( ; rit!=trajectory.rend(); ++rit) {
smooPar_eta_for_monitoring=1000.;
--
GitLab
From 9ddccd9bab5093ee2c227421fe57b6829a6f08aa Mon Sep 17 00:00:00 2001
From: stapiaar <stapiaar@cern.ch>
Date: Wed, 11 Aug 2021 20:56:55 +0200
Subject: [PATCH 011/272] updating HI flags and ART test accordingly
---
.../HeavyIonRec/HIRecExample/share/heavyion_flagsAOD.py | 8 ++++++++
.../HeavyIonRec/HIRecExample/share/heavyion_flagsESD.py | 2 +-
.../RecJobTransformTests/test/test_data11_heavy_ion.sh | 2 +-
.../test/test_data11_heavy_ion_MultipleThreads.sh | 2 +-
.../RecJobTransformTests/test/test_data15_heavy_ion.sh | 2 +-
.../test/test_data15_heavy_ion_MultipleThreads.sh | 2 +-
.../test/test_data18_heavy_ion_notrigger.sh | 2 +-
.../test_data18_heavy_ion_notrigger_MultipleThreads.sh | 2 +-
.../test/test_mc18_heavy_ion_notrigger.sh | 2 +-
.../test/test_mc18_heavy_ion_notrigger_MultipleThreads.sh | 2 +-
10 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/Reconstruction/HeavyIonRec/HIRecExample/share/heavyion_flagsAOD.py b/Reconstruction/HeavyIonRec/HIRecExample/share/heavyion_flagsAOD.py
index 767c73c54608..806f66006664 100755
--- a/Reconstruction/HeavyIonRec/HIRecExample/share/heavyion_flagsAOD.py
+++ b/Reconstruction/HeavyIonRec/HIRecExample/share/heavyion_flagsAOD.py
@@ -3,10 +3,13 @@
include.block ('HIRecExample/heavyion_flagsAOD.py')
from HIRecExample.HIRecExampleFlags import jobproperties
+from RecExConfig.RecFlags import rec
if not jobproperties.HIRecExampleFlags.ppMode:
print ("Applying HI AOD flags mods")
+ rec.doTau = False
+
# AO (standard JetRec turned off)
from JetRec.JetRecFlags import jetFlags
jetFlags.Enabled = False
@@ -39,3 +42,8 @@ if not jobproperties.HIRecExampleFlags.ppMode:
AODFlags.FastSimulation = False
AODFlags.MissingEtTruth = False
AODFlags.FastTrackParticle = False
+
+ AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);
+ AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False);
+ AODFlags.AddEgammaMuonTracksInAOD.set_Value_and_Lock(False);
+ AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False);
diff --git a/Reconstruction/HeavyIonRec/HIRecExample/share/heavyion_flagsESD.py b/Reconstruction/HeavyIonRec/HIRecExample/share/heavyion_flagsESD.py
index 80884031969a..e53dc93a2588 100755
--- a/Reconstruction/HeavyIonRec/HIRecExample/share/heavyion_flagsESD.py
+++ b/Reconstruction/HeavyIonRec/HIRecExample/share/heavyion_flagsESD.py
@@ -31,7 +31,7 @@ if not jobproperties.HIRecExampleFlags.ppMode :
from CaloRec.CaloRecFlags import jobproperties
#need this eventually, but for now it breaks egamma isolation
- jobproperties.CaloRecFlags.doCaloTopoCluster = False
+ jobproperties.CaloRecFlags.doCaloTopoCluster = True
jobproperties.CaloRecFlags.doCaloEMTopoCluster = False
jobproperties.CaloRecFlags.doCaloTopoTower = False
# 2015 data, no pileup
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion.sh
index 07ed72d2c9c8..93522c21dea2 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion.sh
@@ -10,7 +10,7 @@
# art-include: 21.9/Athena
-export TRF_ECHO=True; Reco_tf.py --athenaopts="--threads=1" --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data11_hi.00193321.physics_HardProbes.merge.RAW._lb0050._SFO-9._0002.1 --outputESDFile ESD.pool.root --outputAODFile AOD.pool.root --conditionsTag COMCOND-BLKPA-RUN1-06 --geometryVersion ATLAS-R1-2011-02-00-00 --autoConfiguration=everything --maxEvents='25' --preExec 'all:rec.doHeavyIon.set_Value_and_Lock(True);rec.doZdc.set_Value_and_Lock(False);from CaloRec.CaloRecFlags import jobproperties;jobproperties.CaloRecFlags.doCaloTopoCluster.set_Value_and_Lock(True);AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False);AODFlags.AddEgammaMuonTracksInAOD.set_Value_and_Lock(False);AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False);'
+export TRF_ECHO=True; Reco_tf.py --athenaopts="--threads=1" --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data11_hi.00193321.physics_HardProbes.merge.RAW._lb0050._SFO-9._0002.1 --outputESDFile ESD.pool.root --outputAODFile AOD.pool.root --conditionsTag COMCOND-BLKPA-RUN1-06 --geometryVersion ATLAS-R1-2011-02-00-00 --autoConfiguration=everything --maxEvents='25' --preExec 'all:rec.doHeavyIon.set_Value_and_Lock(True);rec.doZdc.set_Value_and_Lock(False);rec.doTrigger.set_Value_and_Lock(False);'
RES=$?
echo "art-result: $RES Reco"
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion_MultipleThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion_MultipleThreads.sh
index d5f8bd0c9a4a..cf3eeffe45a2 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion_MultipleThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion_MultipleThreads.sh
@@ -9,7 +9,7 @@
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-export TRF_ECHO=True; Reco_tf.py --athenaopts="--threads=8" --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data11_hi.00193321.physics_HardProbes.merge.RAW._lb0050._SFO-9._0002.1 --outputESDFile ESD.pool.root --outputAODFile AOD.pool.root --conditionsTag COMCOND-BLKPA-RUN1-06 --geometryVersion ATLAS-R1-2011-02-00-00 --autoConfiguration=everything --maxEvents='25' --preExec 'rec.doZdc.set_Value_and_Lock(False);from CaloRec.CaloRecFlags import jobproperties;jobproperties.CaloRecFlags.doCaloTopoCluster.set_Value_and_Lock(True);AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False);AODFlags.AddEgammaMuonTracksInAOD.set_Value_and_Lock(False);AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False);'
+export TRF_ECHO=True; Reco_tf.py --athenaopts="--threads=8" --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data11_hi.00193321.physics_HardProbes.merge.RAW._lb0050._SFO-9._0002.1 --outputESDFile ESD.pool.root --outputAODFile AOD.pool.root --conditionsTag COMCOND-BLKPA-RUN1-06 --geometryVersion ATLAS-R1-2011-02-00-00 --autoConfiguration=everything --maxEvents='25' --preExec 'all:rec.doHeavyIon.set_Value_and_Lock(True);rec.doZdc.set_Value_and_Lock(False);rec.doTrigger.set_Value_and_Lock(False);'
RES=$?
echo "art-result: $RES Reco"
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion.sh
index d654a7f74bc5..31e9e4e4ccba 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion.sh
@@ -10,7 +10,7 @@
# art-include: 21.9/Athena
-export TRF_ECHO=True; Reco_tf.py --athenaopts="--threads=1" --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_hi.00286711.physics_MinBiasOverlay.daq.RAW._lb0217._SFO-2._0001.data --outputESDFile=ESD.root --outputAODFile=AOD.root --maxEvents=25 --conditionsTag 'default:CONDBR2-BLKPA-2016-07' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --autoConfiguration 'everything' --preExec 'all:rec.doHeavyIon.set_Value_and_Lock(True);rec.doZdc.set_Value_and_Lock(False);from CaloRec.CaloRecFlags import jobproperties;jobproperties.CaloRecFlags.doCaloTopoCluster.set_Value_and_Lock(True);AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False);AODFlags.AddEgammaMuonTracksInAOD.set_Value_and_Lock(False);AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False);'
+export TRF_ECHO=True; Reco_tf.py --athenaopts="--threads=1" --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_hi.00286711.physics_MinBiasOverlay.daq.RAW._lb0217._SFO-2._0001.data --outputESDFile=ESD.root --outputAODFile=AOD.root --maxEvents=25 --conditionsTag 'default:CONDBR2-BLKPA-2016-07' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --autoConfiguration 'everything' --preExec 'all:rec.doHeavyIon.set_Value_and_Lock(True);rec.doZdc.set_Value_and_Lock(False);rec.doTrigger.set_Value_and_Lock(False);'
RES=$?
echo "art-result: $RES Reco"
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion_MultipleThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion_MultipleThreads.sh
index 39f3d97b3e26..e109d0b899b5 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion_MultipleThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion_MultipleThreads.sh
@@ -9,7 +9,7 @@
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-export TRF_ECHO=True; Reco_tf.py --athenaopts="--threads=8" --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_hi.00286711.physics_MinBiasOverlay.daq.RAW._lb0217._SFO-2._0001.data --outputESDFile=ESD.root --outputAODFile=AOD.root --maxEvents=25 --conditionsTag 'default:CONDBR2-BLKPA-2016-07' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --autoConfiguration 'everything' --preExec 'all:rec.doHeavyIon.set_Value_and_Lock(True);rec.doZdc.set_Value_and_Lock(False);from CaloRec.CaloRecFlags import jobproperties;jobproperties.CaloRecFlags.doCaloTopoCluster.set_Value_and_Lock(True);AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False);AODFlags.AddEgammaMuonTracksInAOD.set_Value_and_Lock(False);AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False);'
+export TRF_ECHO=True; Reco_tf.py --athenaopts="--threads=8" --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_hi.00286711.physics_MinBiasOverlay.daq.RAW._lb0217._SFO-2._0001.data --outputESDFile=ESD.root --outputAODFile=AOD.root --maxEvents=25 --conditionsTag 'default:CONDBR2-BLKPA-2016-07' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --autoConfiguration 'everything' --preExec 'all:rec.doHeavyIon.set_Value_and_Lock(True);rec.doZdc.set_Value_and_Lock(False);rec.doTrigger.set_Value_and_Lock(False);'
RES=$?
echo "art-result: $RES Reco"
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger.sh
index 9b41d7a78481..6a8f492f1c85 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger.sh
@@ -17,7 +17,7 @@ export TRF_ECHO=True; Reco_tf.py \
--autoConfiguration 'everything' \
--steering='doRAWtoALL' \
--postExec 'r2a:y=(StreamAOD.ItemList if "StreamAOD" in dir() else []);y+=["xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList.CELL_SIGNIFICANCE.CELL_SIG_SAMPLING"];' \
---preExec 'r2a:from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.cutLevel.set_Value_and_Lock(4);from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags;InDetGeometryFlags.useDynamicAlignFolders.set_Value_and_Lock(True);jobproperties.Beam.bunchSpacing.set_Value_and_Lock(100);rec.doTrigger.set_Value_and_Lock(False);TriggerFlags.AODEDMSet="AODFULL";rec.doHeavyIon.set_Value_and_Lock(True);rec.doDPD.set_Value_and_Lock(True); from CaloRec.CaloRecFlags import jobproperties;jobproperties.CaloRecFlags.doCaloTopoCluster.set_Value_and_Lock(True);from AthenaMonitoring.DQMonFlags import jobproperties; jobproperties.DQMonFlagsCont.doHIMon.set_Value_and_Lock(False);AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False);AODFlags.AddEgammaMuonTracksInAOD.set_Value_and_Lock(False);AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False);rec.doZdc.set_Value_and_Lock(False);'
+--preExec 'r2a:from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.cutLevel.set_Value_and_Lock(4);from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags;InDetGeometryFlags.useDynamicAlignFolders.set_Value_and_Lock(True);jobproperties.Beam.bunchSpacing.set_Value_and_Lock(100);rec.doTrigger.set_Value_and_Lock(False);TriggerFlags.AODEDMSet="AODFULL";rec.doHeavyIon.set_Value_and_Lock(True);rec.doDPD.set_Value_and_Lock(True);from AthenaMonitoring.DQMonFlags import jobproperties; jobproperties.DQMonFlagsCont.doHIMon.set_Value_and_Lock(False);rec.doZdc.set_Value_and_Lock(False);'
RES=$?
echo "art-result: $RES Reco"
return $RES
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger_MultipleThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger_MultipleThreads.sh
index 7482fa8e9941..73032c7dd432 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger_MultipleThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger_MultipleThreads.sh
@@ -16,7 +16,7 @@ export TRF_ECHO=True; Reco_tf.py \
--autoConfiguration 'everything' \
--steering='doRAWtoALL' \
--postExec 'r2a:y=(StreamAOD.ItemList if "StreamAOD" in dir() else []);y+=["xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList.CELL_SIGNIFICANCE.CELL_SIG_SAMPLING"];' \
---preExec 'r2a:from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.cutLevel.set_Value_and_Lock(4);from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags;InDetGeometryFlags.useDynamicAlignFolders.set_Value_and_Lock(True);jobproperties.Beam.bunchSpacing.set_Value_and_Lock(100);rec.doTrigger.set_Value_and_Lock(False);TriggerFlags.AODEDMSet="AODFULL";rec.doHeavyIon.set_Value_and_Lock(True);rec.doDPD.set_Value_and_Lock(True); from CaloRec.CaloRecFlags import jobproperties;jobproperties.CaloRecFlags.doCaloTopoCluster.set_Value_and_Lock(True);from AthenaMonitoring.DQMonFlags import jobproperties; jobproperties.DQMonFlagsCont.doHIMon.set_Value_and_Lock(False);AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False);AODFlags.AddEgammaMuonTracksInAOD.set_Value_and_Lock(False);AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False);rec.doZdc.set_Value_and_Lock(False);'
+--preExec 'r2a:from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.cutLevel.set_Value_and_Lock(4);from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags;InDetGeometryFlags.useDynamicAlignFolders.set_Value_and_Lock(True);jobproperties.Beam.bunchSpacing.set_Value_and_Lock(100);rec.doTrigger.set_Value_and_Lock(False);TriggerFlags.AODEDMSet="AODFULL";rec.doHeavyIon.set_Value_and_Lock(True);rec.doDPD.set_Value_and_Lock(True);from AthenaMonitoring.DQMonFlags import jobproperties; jobproperties.DQMonFlagsCont.doHIMon.set_Value_and_Lock(False);rec.doZdc.set_Value_and_Lock(False);'
RES=$?
echo "art-result: $RES Reco"
return $RES
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger.sh
index 9120fc4d631c..ed1d2595586b 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger.sh
@@ -14,7 +14,7 @@ export TRF_ECHO=True; Reco_tf.py \
--maxEvents=20 \
--postInclude 'all:RecJobTransforms/UseFrontier.py,SimulationJobOptions/postInclude.HijingPars.py' \
--postExec 'r2a:y=(StreamAOD.ItemList if "StreamAOD" in dir() else []);y+=["xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList.CELL_SIGNIFICANCE.CELL_SIG_SAMPLING"];' \
---preExec 'r2a:from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.cutLevel.set_Value_and_Lock(4);jobproperties.Beam.bunchSpacing.set_Value_and_Lock(100);rec.doDPD.set_Value_and_Lock(True);' 'all:from CaloRec.CaloRecFlags import jobproperties;jobproperties.CaloRecFlags.doCaloTopoCluster.set_Value_and_Lock(True);from AthenaMonitoring.DQMonFlags import jobproperties; jobproperties.DQMonFlagsCont.doHIMon.set_Value_and_Lock(False);from ParticleBuilderOptions.AODFlags import AODFlags;AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False); AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False); AODFlags.AddEgammaMuonTracksInAOD.set_Value_and_Lock(False);AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False);rec.doZdc.set_Value_and_Lock(False);rec.doHeavyIon.set_Value_and_Lock(True);rec.doTrigger.set_Value_and_Lock(False);' \
+--preExec 'r2a:from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.cutLevel.set_Value_and_Lock(4);jobproperties.Beam.bunchSpacing.set_Value_and_Lock(100);rec.doDPD.set_Value_and_Lock(True);' 'all:from AthenaMonitoring.DQMonFlags import jobproperties; jobproperties.DQMonFlagsCont.doHIMon.set_Value_and_Lock(False);rec.doZdc.set_Value_and_Lock(False);rec.doHeavyIon.set_Value_and_Lock(True);rec.doTrigger.set_Value_and_Lock(False);' \
--autoConfiguration 'everything' \
--DataRunNumber '313000'
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger_MultipleThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger_MultipleThreads.sh
index d9f2a070e936..992174970fc1 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger_MultipleThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger_MultipleThreads.sh
@@ -13,7 +13,7 @@ export TRF_ECHO=True; Reco_tf.py \
--maxEvents=20 \
--postInclude 'all:RecJobTransforms/UseFrontier.py,SimulationJobOptions/postInclude.HijingPars.py' \
--postExec 'r2a:y=(StreamAOD.ItemList if "StreamAOD" in dir() else []);y+=["xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList.CELL_SIGNIFICANCE.CELL_SIG_SAMPLING"];' \
---preExec 'r2a:from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.cutLevel.set_Value_and_Lock(4);jobproperties.Beam.bunchSpacing.set_Value_and_Lock(100);rec.doDPD.set_Value_and_Lock(True);' 'all:from CaloRec.CaloRecFlags import jobproperties;jobproperties.CaloRecFlags.doCaloTopoCluster.set_Value_and_Lock(True);from AthenaMonitoring.DQMonFlags import jobproperties; jobproperties.DQMonFlagsCont.doHIMon.set_Value_and_Lock(False);from ParticleBuilderOptions.AODFlags import AODFlags;AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False); AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False); AODFlags.AddEgammaMuonTracksInAOD.set_Value_and_Lock(False);AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False);rec.doZdc.set_Value_and_Lock(False);rec.doHeavyIon.set_Value_and_Lock(True);rec.doTrigger.set_Value_and_Lock(False);' \
+--preExec 'r2a:from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.cutLevel.set_Value_and_Lock(4);jobproperties.Beam.bunchSpacing.set_Value_and_Lock(100);rec.doDPD.set_Value_and_Lock(True);' 'all:from AthenaMonitoring.DQMonFlags import jobproperties; jobproperties.DQMonFlagsCont.doHIMon.set_Value_and_Lock(False);rec.doZdc.set_Value_and_Lock(False);rec.doHeavyIon.set_Value_and_Lock(True);rec.doTrigger.set_Value_and_Lock(False);' \
--autoConfiguration 'everything' \
--DataRunNumber '313000'
--
GitLab
From f200aa279c047fc3a7e0af7546417187441ed028 Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Wed, 11 Aug 2021 21:39:23 +0200
Subject: [PATCH 012/272] TForwardElectronIsEMSelector rm unused method
---
.../Root/TForwardElectronIsEMSelector.cxx | 38 -------------------
.../Root/TForwardElectronIsEMSelector.h | 21 +---------
2 files changed, 1 insertion(+), 58 deletions(-)
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TForwardElectronIsEMSelector.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TForwardElectronIsEMSelector.cxx
index d9f2bd7de55d..5cc881a4f526 100755
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TForwardElectronIsEMSelector.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TForwardElectronIsEMSelector.cxx
@@ -163,44 +163,6 @@ Root::TForwardElectronIsEMSelector::fillAccept(unsigned int isEM) const
return acceptData;
}
-//=============================================================================
-// Calculate the actual accept of each cut individually.
-//=============================================================================
-asg::AcceptData
-Root::TForwardElectronIsEMSelector::accept(
- // eta position in second sampling
- float eta,
- // transverse energy in calorimeter (using eta position in second sampling)
- float nvtx,
- //////////////// - calo
- // E(3*3) in 2nd sampling e233
- float secondLambda,
- // E(3*7) in 2nd sampling e237
- float lateral,
- // transverse energy in 1st scintillator of hadronic calorimeter
- float longitudinal,
- // E(min) in strips
- float fracMax,
- // total shower width in 1st sampling
- float centerLambda,
- // fraction of energy reconstructed in the 3rd sampling
- float secondR) const
-{
- // -----------------------------------------------------------
- // Do the actual selection
-
- unsigned int isEM = calcIsEm(eta,
- nvtx,
- secondLambda, // e233,
- lateral, // e237,
- longitudinal, /// ethad1,
- fracMax, // emin,
- centerLambda,
- secondR);
-
- return fillAccept(isEM);
-}
-
// return the isem
//
unsigned int
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TForwardElectronIsEMSelector.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TForwardElectronIsEMSelector.h
index 1f87f5888815..7cdf1df2e377 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TForwardElectronIsEMSelector.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TForwardElectronIsEMSelector.h
@@ -47,29 +47,10 @@ public:
/** Initialize this class */
StatusCode initialize();
- /** The main accept method: the actual cuts are applied here */
- asg::AcceptData accept(
- // eta
- float eta,
- // NVP
- float nvtx,
- // secondlambda
- float secondLambda,
- // lateral
- float lateral,
- // longitudinal
- float longitudinal,
- // fracMax
- float fracMax,
- // centerlambda
- float centerLambda,
- // secondR
- float secondR) const;
-
/** Return dummy accept with only info */
asg::AcceptData accept() const { return asg::AcceptData(&m_acceptInfo); }
- // calculate the isEM. (Used internally by accept)
+ // calculate the isEM.
unsigned int calcIsEm(
// eta
float eta,
--
GitLab
From 018c671d0e1b3bff3515385431ab5b07afda41b6 Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Wed, 11 Aug 2021 21:52:22 +0200
Subject: [PATCH 013/272] cppcheck:
AsgElectronLikelihoodTool,AsgElectronEfficiencyCorrectionTool prefer prefix
---
.../Root/AsgElectronEfficiencyCorrectionTool.cxx | 2 +-
.../Root/AsgElectronLikelihoodTool.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/Root/AsgElectronEfficiencyCorrectionTool.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/Root/AsgElectronEfficiencyCorrectionTool.cxx
index d688a857c03a..a55cd43768e1 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/Root/AsgElectronEfficiencyCorrectionTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/Root/AsgElectronEfficiencyCorrectionTool.cxx
@@ -880,7 +880,7 @@ AsgElectronEfficiencyCorrectionTool::currentUncorrSystRegion(
for (; itr_ptBEGIN != itr_ptEND; ++itr_ptBEGIN) {
std::map<float, std::vector<float>>::const_iterator itr_ptBEGINplusOne =
itr_ptBEGIN;
- itr_ptBEGINplusOne++;
+ ++itr_ptBEGINplusOne;
// Find the pt bin : Larger or equal from the current and (the next one is
// the last or the next one is larger).
if (et >= itr_ptBEGIN->first &&
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronLikelihoodTool.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronLikelihoodTool.cxx
index 4efbd4bdc63c..f2defbe44010 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronLikelihoodTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronLikelihoodTool.cxx
@@ -1156,7 +1156,7 @@ AsgElectronLikelihoodTool::getFcalEt(const EventContext& ctx) const
SG::ReadHandle<xAOD::HIEventShapeContainer> HIESCont(m_HIESContKey, ctx);
xAOD::HIEventShapeContainer::const_iterator es_itr = HIESCont->begin();
xAOD::HIEventShapeContainer::const_iterator es_end = HIESCont->end();
- for (; es_itr != es_end; es_itr++) {
+ for (; es_itr != es_end; ++es_itr) {
double et = (*es_itr)->et();
const std::string name = (*es_itr)->auxdataConst<std::string>("Summary");
if (name == "FCal")
--
GitLab
From 4239711047b6e0d785135cac89302432613058cb Mon Sep 17 00:00:00 2001
From: Vakho Tsulaia <vakhtang.tsulaia@cern.ch>
Date: Thu, 12 Aug 2021 01:51:19 +0200
Subject: [PATCH 014/272] CaloDetMgrDetDescrCnv code cleanup
Migrated CaloMgrDetDescrCnv to AthMessaging, and made a number of cosmetic and
stylistic changes in CaloMgrDetDescrCnv.cxx.
Dropped two obsolete python scripts:
* CaloDetMgrDetDescrCnv/python/CaloDetMgrDDCnv.py
* CaloDetMgrDetDescrCnv/share/CaloTTDetMgrDetDescrCnv_joboptions.py
and updated their clients.
Fixed broken TestLArDetDescr/share/TestCaloDDE_jobOptions.py
---
.../CaloDetMgrDetDescrCnv/CMakeLists.txt | 5 +-
.../python/CaloDetMgrDDCnv.py | 12 -
.../CaloDetMgrDetDescrCnv/python/__init__.py | 3 -
.../CaloTTDetMgrDetDescrCnv_joboptions.py | 10 -
.../src/CaloMgrDetDescrCnv.cxx | 468 ++++++++----------
.../src/CaloMgrDetDescrCnv.h | 35 +-
.../CaloHiveEx/share/CaloHiveExOpts.py | 2 -
.../share/CaloHiveExOpts_SerialOnly.py | 2 -
.../CaloHiveEx/share/CaloHiveExOpts_alt.py | 2 -
.../CaloHiveEx/share/old/CaloHiveExOpts.py | 2 -
.../AtlasGeoModel/python/GeoModelInitH6.py | 4 -
.../GeoModel/AtlasGeoModel/python/LArGM.py | 5 +-
.../share/TestCaloDDE_jobOptions.py | 14 +-
.../share/TestLArTT_jobOptions.py | 2 +-
.../initTTMap_poolTestWrite_jobOptions.py | 2 +-
.../share/RecExRecoTest_ART_egamma_fromESD.py | 2 -
.../RecJobTransformTests_CaloHiveExOpts.py | 2 -
.../RecJobTransformTests_PFlowHiveExOpts.py | 2 -
.../eflowRec/share/PFlowHiveExOpts.py | 2 -
19 files changed, 228 insertions(+), 348 deletions(-)
delete mode 100755 Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/python/CaloDetMgrDDCnv.py
delete mode 100644 Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/python/__init__.py
delete mode 100755 Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/share/CaloTTDetMgrDetDescrCnv_joboptions.py
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CMakeLists.txt b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CMakeLists.txt
index ea5d96170ae3..4ff718cafbd2 100644
--- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloDetMgrDetDescrCnv )
@@ -6,9 +6,8 @@ atlas_subdir( CaloDetMgrDetDescrCnv )
# Component(s) in the package:
atlas_add_component( CaloDetMgrDetDescrCnv
src/*.cxx
- LINK_LIBRARIES DetDescrCnvSvcLib Identifier GaudiKernel CaloDetDescrLib CaloIdentifier AthenaKernel StoreGateLib GeoModelUtilities LArReadoutGeometry TileDetDescr )
+ LINK_LIBRARIES DetDescrCnvSvcLib Identifier GaudiKernel CaloDetDescrLib CaloIdentifier AthenaKernel AthenaBaseComps StoreGateLib GeoModelUtilities LArReadoutGeometry TileDetDescr )
# Install files from the package:
-atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/python/CaloDetMgrDDCnv.py b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/python/CaloDetMgrDDCnv.py
deleted file mode 100755
index 89051ffe889f..000000000000
--- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/python/CaloDetMgrDDCnv.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#
-# Joboptions for the loading of the of CaloDetDescrMgr
-#
-
-#from DetDescrCnvSvc.DetDescrCnvSvcConf import DetDescrCnvSvc
-#DetDescrCnvSvc = DetDescrCnvSvc()
-#DetDescrCnvSvc.DetectorManagers += [ "CaloMgr" ]
-#DetDescrCnvSvc.DetectorManagers += [ "CaloTTMgr" ]
-
-
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/python/__init__.py b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/python/__init__.py
deleted file mode 100644
index b50ea153f0f4..000000000000
--- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/python/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-__author__ = 'Vakho Tsulaia'
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/share/CaloTTDetMgrDetDescrCnv_joboptions.py b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/share/CaloTTDetMgrDetDescrCnv_joboptions.py
deleted file mode 100755
index 0bb98e88f928..000000000000
--- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/share/CaloTTDetMgrDetDescrCnv_joboptions.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Joboptions for the loading of the of CaloTTDetDescrMgr
-#
-
-#theApp.Dlls += [ "CaloDetMgrDetDescrCnv" ]
-
-#DetDescrCnvSvc = Service( "DetDescrCnvSvc" )
-#DetDescrCnvSvc.DetectorManagers += [ "CaloTTMgr" ]
-include( "CaloConditions/CaloConditions_jobOptions.py" )
-
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx
index 74b59f777ab5..e3a4d59ec2a9 100755
--- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx
+++ b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "CaloMgrDetDescrCnv.h"
@@ -9,6 +9,9 @@
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
#include "StoreGate/StoreGateSvc.h"
+#include "AthenaKernel/getMessageSvc.h"
+#include "GaudiKernel/ThreadLocalContext.h"
+#include "AthenaBaseComps/AthCheckMacros.h"
#include "CaloDetDescr/CaloDetDescrManager.h"
#include "CaloDetDescr/CaloDetectorElements.h"
@@ -41,7 +44,12 @@
#include "TileDetDescr/TileDetDescrManager.h"
-#include <GaudiKernel/ThreadLocalContext.h>
+
+CaloMgrDetDescrCnv::CaloMgrDetDescrCnv(ISvcLocator* svcloc)
+ : DetDescrConverter(ClassID_traits<CaloDetDescrManager>::ID(), svcloc)
+ , AthMessaging(Athena::getMessageSvc(), "CaloMgrDetDescrCnv")
+{
+}
long int CaloMgrDetDescrCnv::repSvcType() const
{
@@ -50,24 +58,14 @@ long int CaloMgrDetDescrCnv::repSvcType() const
StatusCode CaloMgrDetDescrCnv::initialize()
{
- StatusCode sc = DetDescrConverter::initialize();
- MsgStream log(msgSvc(), "CaloMgrDetDescrCnv");
- if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "in initialize" << endmsg;
-
- if (sc.isFailure())
- {
- log << MSG::ERROR << "DetDescrConverter::initialize failed" << endmsg;
- return sc;
- }
-
+ ATH_MSG_DEBUG("in initialize");
+ ATH_CHECK(DetDescrConverter::initialize());
return StatusCode::SUCCESS;
}
StatusCode CaloMgrDetDescrCnv::finalize()
{
- MsgStream log(msgSvc(), "CaloMgrDetDescrCnv");
- if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "in finalize" << endmsg;
-
+ ATH_MSG_DEBUG("in finalize");
return StatusCode::SUCCESS;
}
@@ -75,64 +73,36 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
{
// Ensure that this object is created inside the event loop
const EventContext& ctx = Gaudi::Hive::currentContext();
- MsgStream log(msgSvc(), "CaloMgrDetDescrCnv");
if (!ctx.valid()) {
- log << MSG::WARNING
- << "Attempting to create a Calo Detector Manager object outside of the "
- "event loop. Geometry may not be aligned."
- << endmsg;
+ ATH_MSG_WARNING("Attempting to create a Calo Detector Manager object outside of the event loop. Geometry may not be aligned.");
}
- log << MSG::INFO
- << "in createObj: creating a Calo Detector Manager object in the "
- "detector store"
- << endmsg;
-
- bool debug = log.level()<=MSG::DEBUG;
+ ATH_MSG_INFO("in createObj: creating a Calo Detector Manager object in the detector store");
- DetDescrAddress* ddAddr;
- ddAddr = dynamic_cast<DetDescrAddress*> (pAddr);
+ DetDescrAddress* ddAddr = dynamic_cast<DetDescrAddress*> (pAddr);
if(!ddAddr) {
- log << MSG::FATAL << "Could not cast to DetDescrAddress." << endmsg;
+ ATH_MSG_FATAL("Could not cast to DetDescrAddress.");
return StatusCode::FAILURE;
}
std::string mgrKey = *(ddAddr->par());
- if (debug)
- {
- if ("" == mgrKey)
- log << MSG::DEBUG << "No Manager key " << endmsg;
- else
- log << MSG::DEBUG << "Manager key is " << mgrKey << endmsg;
+ if(mgrKey.empty()) {
+ ATH_MSG_DEBUG("No Manager key ");
+ }
+ else {
+ ATH_MSG_DEBUG("Manager key is " << mgrKey);
}
// --- --- Get CaloCell_ID and CaloIdManager helpers --- ---
- StoreGateSvc * detStore;
- StatusCode status = serviceLocator()->service("DetectorStore", detStore);
- if (status.isFailure())
- {
- log << MSG::FATAL << "DetectorStore service not found !" << endmsg;
- return StatusCode::FAILURE;
- }
+ StoreGateSvc* detStore{nullptr};
+ ATH_CHECK(serviceLocator()->service("DetectorStore", detStore));
- const CaloCell_ID* cell_id;
- status = detStore->retrieve(cell_id, "CaloCell_ID");
- if (status.isFailure())
- {
- log << MSG::FATAL << "Could not get CaloCell_ID helper !" << endmsg;
- return status;
- }
- else
- log << MSG::DEBUG << " Found the CaloCell_ID helper. " << endmsg;
-
- const CaloIdManager* caloId_mgr;
- status = detStore->retrieve(caloId_mgr, "CaloIdManager");
- if (status.isFailure())
- {
- log << MSG::ERROR << "Could not get CaloIdManager helper !" << endmsg;
- return status;
- }
- else
- if (debug) log << MSG::DEBUG << " Found the CaloIdManager helper. " << endmsg;
+ const CaloCell_ID* cell_id{nullptr};
+ ATH_CHECK(detStore->retrieve(cell_id, "CaloCell_ID"));
+ ATH_MSG_DEBUG(" Found the CaloCell_ID helper. ");
+
+ const CaloIdManager* caloId_mgr{nullptr};
+ ATH_CHECK(detStore->retrieve(caloId_mgr, "CaloIdManager"));
+ ATH_MSG_DEBUG(" Found the CaloIdManager helper. ");
// --- --- Get CaloCell_ID and CaloIdManager helpers --- ---
// --- --- Create CaloDetDescrManager object --- ---
@@ -164,31 +134,30 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
// Check whether we are working with Test Beam geometry
bool isTestBeam = false;
- const LArDetectorManager* larMgr = 0;
- status = detStore->retrieve(larMgr);
- if(status.isFailure() || larMgr==0)
- log << MSG::WARNING << "Could not get LArDetectorManager. Assuming TestBeam=false" << endmsg;
- else
+ const LArDetectorManager* larMgr{nullptr};
+ StatusCode status = detStore->retrieve(larMgr);
+ if(status.isFailure()) {
+ ATH_MSG_WARNING("Could not get LArDetectorManager. Assuming TestBeam=false");
+ }
+ else {
isTestBeam = larMgr->isTestBeam();
+ }
// ****************************************************************
// ** --- --- EMB --- --- **
// ****************************************************************
// --- Retrieve Emec Detector Manager
- const EMBDetectorManager* embManager = 0;
+ const EMBDetectorManager* embManager{nullptr};
status = detStore->retrieve(embManager);
- if(status.isFailure())
- {
- log << MSG::WARNING << "Could not get the EMBDetectorManager. No Calo Elements will be built for EMB" << endmsg;
+ if(status.isFailure()) {
+ ATH_MSG_WARNING("Could not get the EMBDetectorManager. No Calo Elements will be built for EMB");
}
- else
- {
+ else {
// --- --- Iterate over EMB regions and cells --- ---
EMBDetectorManager::DetectorRegionConstIterator embregIt;
- for (embregIt=embManager->beginDetectorRegion(); embregIt!=embManager->endDetectorRegion(); embregIt++)
- {
+ for (embregIt=embManager->beginDetectorRegion(); embregIt!=embManager->endDetectorRegion(); embregIt++) {
const EMBDetectorRegion *embRegion = *embregIt;
// *** *** Create descriptor for this region *** ***
@@ -196,28 +165,21 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
// Do some mapping between LArReadoutGeometry and CaloID
int barrel_ec = 0;
- switch(embRegion->getEndcapIndex())
- {
+ switch(embRegion->getEndcapIndex()) {
case EMBDetectorRegion::NEG:
- {
- barrel_ec = -1; // negative side
- break;
- }
+ barrel_ec = -1; // negative side
+ break;
case EMBDetectorRegion::POS:
- {
- barrel_ec = 1; // positive side
- break;
- }
+ barrel_ec = 1; // positive side
+ break;
default:
- {
- log << MSG::ERROR << "Wrong Side Index for EMB region " << embRegion->getEndcapIndex() << endmsg;
- return StatusCode::FAILURE;
- }
+ ATH_MSG_ERROR("Wrong Side Index for EMB region " << embRegion->getEndcapIndex());
+ return StatusCode::FAILURE;
}
- Identifier regId = em_id->region_id(barrel_ec,
- embRegion->getSamplingIndex(),
- embRegion->getRegionIndex());
+ Identifier regId = em_id->region_id(barrel_ec
+ , embRegion->getSamplingIndex()
+ , embRegion->getRegionIndex());
EMBDescriptor* embDescr = new EMBDescriptor(regId,(AtlasDetectorID *)cell_id,cell_id,embRegion);
caloMgr->add(embDescr);
@@ -239,27 +201,28 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
//
// *** *** *** Iterate over cells *** *** ***
//
- for (unsigned int iPhi=embRegion->beginPhiIndex();iPhi<embRegion->endPhiIndex();iPhi++)
- {
- for (unsigned int iEta=embRegion->beginEtaIndex();iEta<embRegion->endEtaIndex();iEta++)
- {
+ for (unsigned int iPhi=embRegion->beginPhiIndex();iPhi<embRegion->endPhiIndex();iPhi++) {
+ for (unsigned int iEta=embRegion->beginEtaIndex();iEta<embRegion->endEtaIndex();iEta++) {
EMBCellConstLink cellPtr = embRegion->getEMBCell(iEta,iPhi);
// build hash identifier for this cell
- Identifier chanId = em_id->channel_id(barrel_ec,
- cellPtr->getSamplingIndex(),
- cellPtr->getRegionIndex(),
- iEta,iPhi);
+ Identifier chanId = em_id->channel_id(barrel_ec
+ , cellPtr->getSamplingIndex()
+ , cellPtr->getRegionIndex()
+ , iEta
+ , iPhi);
// Create the element and store it
- EMBDetectorElement* embElement = new EMBDetectorElement(em_id->channel_hash(chanId),
- 0,0,
- embDescr,
- cellPtr,
- embRegion,
- isTestBeam);
- if(iPhi==embRegion->beginPhiIndex())
+ EMBDetectorElement* embElement = new EMBDetectorElement(em_id->channel_hash(chanId)
+ , 0
+ , 0
+ , embDescr
+ , cellPtr
+ , embRegion
+ , isTestBeam);
+ if(iPhi==embRegion->beginPhiIndex()) {
phi_min = embElement->phi() - 0.5*embElement->dphi();
+ }
// cell volume
embElement->set_volume(cellVol.CellVolume(chanId));
@@ -282,8 +245,7 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
reg_max = embElement->eta()+0.5*embElement->deta();
// deal with depth
- if(iPhi==embRegion->beginPhiIndex())
- {
+ if(iPhi==embRegion->beginPhiIndex()) {
depth_in.push_back(cellPtr->getRLocal(EMBCell::FRONT));
depth_out.push_back(cellPtr->getRLocal(EMBCell::BACK));
}
@@ -291,18 +253,12 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
} // Phi loop
// *** *** *** Iterate over cells *** *** ***
- double eta_min;
- if(embRegion->getSamplingIndex()==1 && embRegion->getRegionIndex()==0)
- {
- // special case for this region: strip 0 is missing
- eta_min = (embRegion->getDescriptor()->getEtaBinning()).getStart() -
- (embRegion->getDescriptor()->getEtaBinning()).getDelta();
- }
- else
- eta_min = (embRegion->getDescriptor()->getEtaBinning()).getStart();
+ double eta_min = (embRegion->getSamplingIndex()==1 && embRegion->getRegionIndex()==0)
+ ? embRegion->getDescriptor()->getEtaBinning().getStart() - embRegion->getDescriptor()->getEtaBinning().getDelta()
+ : embRegion->getDescriptor()->getEtaBinning().getStart();
double eta_max = (embRegion->getDescriptor()->getEtaBinning()).getEnd();
- double phi_max = phi_min + fabs((embRegion->getDescriptor()->getPhiBinning()).getDelta())*embDescr->n_phi();
+ double phi_max = phi_min + std::fabs((embRegion->getDescriptor()->getPhiBinning()).getDelta())*embDescr->n_phi();
// 'ideal' values
embDescr->setCaloEtaMin(eta_min);
@@ -337,19 +293,16 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
// ****************************************************************
// --- Retrieve Emec Detector Manager
- const EMECDetectorManager* emecManager = 0;
+ const EMECDetectorManager* emecManager{nullptr};
status = detStore->retrieve(emecManager);
- if(status.isFailure())
- {
- log << MSG::WARNING << "Could not get the EMECDetectorManager. No Calo Elements will be built for EMEC" << endmsg;
+ if(status.isFailure()) {
+ ATH_MSG_WARNING("Could not get the EMECDetectorManager. No Calo Elements will be built for EMEC");
}
- else
- {
+ else {
// --- --- Iterate over EMEC regions and cells --- ---
EMECDetectorManager::DetectorRegionConstIterator emecregIt;
- for (emecregIt=emecManager->beginDetectorRegion(); emecregIt!=emecManager->endDetectorRegion(); emecregIt++)
- {
+ for (emecregIt=emecManager->beginDetectorRegion(); emecregIt!=emecManager->endDetectorRegion(); emecregIt++) {
const EMECDetectorRegion *emecRegion = *emecregIt;
// *** *** Create descriptor for this region *** ***
@@ -360,47 +313,33 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
unsigned int radialInd = emecRegion->getRadialIndex();
int barrel_ec;
- switch(endcapInd)
- {
+ switch(endcapInd) {
case EMECDetectorRegion::NEG:
- {
- barrel_ec = -1; // negative side
- break;
- }
+ barrel_ec = -1; // negative side
+ break;
case EMECDetectorRegion::POS:
- {
- barrel_ec = 1; // positive side
- break;
- }
+ barrel_ec = 1; // positive side
+ break;
default:
- {
- log << MSG::ERROR << "Wrong Endcap Index for EMEC region " << endcapInd << endmsg;
- return StatusCode::FAILURE;
- }
+ ATH_MSG_ERROR("Wrong Endcap Index for EMEC region " << endcapInd);
+ return StatusCode::FAILURE;
}// switch(endcapInd)
- switch(radialInd)
- {
+ switch(radialInd) {
case 0:
- {
- barrel_ec *= 2; // outer wheel
- break;
- }
+ barrel_ec *= 2; // outer wheel
+ break;
case 1:
- {
- barrel_ec *= 3; // inner wheel
- break;
- }
+ barrel_ec *= 3; // inner wheel
+ break;
default:
- {
- log << MSG::ERROR << "Wrong Radial Index for EMEC region " << radialInd << endmsg;
- return StatusCode::FAILURE;
- }
+ ATH_MSG_ERROR("Wrong Radial Index for EMEC region " << radialInd);
+ return StatusCode::FAILURE;
}// switch(radialInd)
- Identifier regId = em_id->region_id(barrel_ec,
- emecRegion->getSamplingIndex(),
- emecRegion->getRegionIndex());
+ Identifier regId = em_id->region_id(barrel_ec
+ , emecRegion->getSamplingIndex()
+ , emecRegion->getRegionIndex());
EMECDescriptor* emecDescr = new EMECDescriptor(regId,(AtlasDetectorID *)cell_id,cell_id,emecRegion);
caloMgr->add(emecDescr);
@@ -421,26 +360,27 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
//
// *** *** *** Iterate over cells *** *** ***
//
- for (unsigned int iPhi=emecRegion->beginPhiIndex();iPhi<emecRegion->endPhiIndex();iPhi++)
- {
- for (unsigned int iEta=emecRegion->beginEtaIndex();iEta<emecRegion->endEtaIndex();iEta++)
- {
+ for (unsigned int iPhi=emecRegion->beginPhiIndex();iPhi<emecRegion->endPhiIndex();iPhi++) {
+ for (unsigned int iEta=emecRegion->beginEtaIndex();iEta<emecRegion->endEtaIndex();iEta++) {
EMECCellConstLink cellPtr = emecRegion->getEMECCell(iEta,iPhi);
- Identifier chanId = em_id->channel_id(barrel_ec,
- cellPtr->getSamplingIndex(),
- cellPtr->getRegionIndex(),
- iEta,iPhi);
+ Identifier chanId = em_id->channel_id(barrel_ec
+ , cellPtr->getSamplingIndex()
+ , cellPtr->getRegionIndex()
+ , iEta
+ , iPhi);
// Create the element and store it
- EMECDetectorElement* emecElement = new EMECDetectorElement(em_id->channel_hash(chanId),
- 0,0,
- emecDescr,
- cellPtr,
- emecRegion,
- isTestBeam);
- if(iPhi==emecRegion->beginPhiIndex())
+ EMECDetectorElement* emecElement = new EMECDetectorElement(em_id->channel_hash(chanId)
+ , 0
+ , 0
+ , emecDescr
+ , cellPtr
+ , emecRegion
+ , isTestBeam);
+ if(iPhi==emecRegion->beginPhiIndex()) {
phi_min = emecElement->phi() - 0.5*emecElement->dphi();
+ }
// cell volume
emecElement->set_volume(cellVol.CellVolume(chanId));
@@ -462,8 +402,7 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
reg_max = emecElement->eta()+0.5*emecElement->deta();
// depths
- if(iPhi==emecRegion->beginPhiIndex())
- {
+ if(iPhi==emecRegion->beginPhiIndex()) {
depth_in.push_back(fabs(emecElement->z_raw())-emecElement->dz());
depth_out.push_back(fabs(emecElement->z_raw())+emecElement->dz());
}
@@ -471,9 +410,9 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
} // Phi loop
// *** *** *** Iterate over cells *** *** ***
- double eta_min = (emecRegion->getDescriptor()->getEtaBinning()).getStart();
- double eta_max = (emecRegion->getDescriptor()->getEtaBinning()).getEnd();
- double phi_max = phi_min + fabs((emecRegion->getDescriptor()->getPhiBinning()).getDelta())*emecDescr->n_phi();
+ double eta_min = emecRegion->getDescriptor()->getEtaBinning().getStart();
+ double eta_max = emecRegion->getDescriptor()->getEtaBinning().getEnd();
+ double phi_max = phi_min + std::fabs(emecRegion->getDescriptor()->getPhiBinning().getDelta())*emecDescr->n_phi();
// 'ideal' values
emecDescr->setCaloEtaMin(eta_min);
@@ -508,19 +447,16 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
// ****************************************************************
// --- Retrieve Hec Detector Manager
- const HECDetectorManager* hecManager = 0;
+ const HECDetectorManager* hecManager{nullptr};
status = detStore->retrieve(hecManager);
- if(status.isFailure())
- {
- log << MSG::WARNING << "Could not get the HECDetectorManager. No Calo Elements will be built for HEC" << endmsg;
+ if(status.isFailure()) {
+ ATH_MSG_WARNING("Could not get the HECDetectorManager. No Calo Elements will be built for HEC");
}
- else
- {
+ else {
// --- --- Iterate over HEC regions and cells --- ---
HECDetectorManager::DetectorRegionConstIterator hecregIt;
- for (hecregIt=hecManager->beginDetectorRegion(); hecregIt!=hecManager->endDetectorRegion(); hecregIt++)
- {
+ for (hecregIt=hecManager->beginDetectorRegion(); hecregIt!=hecManager->endDetectorRegion(); hecregIt++) {
const HECDetectorRegion *hecregion = *hecregIt;
// *** *** Create descriptor for this region *** ***
@@ -529,16 +465,16 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
HECDetectorRegion::DetectorSide endcapInd = hecregion->getEndcapIndex();
int pos_neg = endcapInd==HECDetectorRegion::NEG ? -2 : 2;
- Identifier regId = hec_id->region_id(pos_neg,
- hecregion->getSamplingIndex(),
- hecregion->getRegionIndex());
+ Identifier regId = hec_id->region_id(pos_neg
+ , hecregion->getSamplingIndex()
+ , hecregion->getRegionIndex());
HECDescriptor* hecDescr = new HECDescriptor(regId,(AtlasDetectorID *)cell_id,cell_id,hecregion);
caloMgr->add(hecDescr);
double phi_min = 0.;
- double z_min = 10000.;
- double z_max = -10000.;
+ float z_min = 10000.f;
+ float z_max = -10000.f;
double r_min = 10000.;
double r_max = -10000.;
@@ -551,30 +487,30 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
//
// *** *** *** Iterate over cells *** *** ***
//
- for (unsigned int iPhi=hecregion->beginPhiIndex();iPhi<hecregion->endPhiIndex();iPhi++)
- {
- for (unsigned int iEta=hecregion->beginEtaIndex();iEta<hecregion->endEtaIndex();iEta++)
- {
+ for (unsigned int iPhi=hecregion->beginPhiIndex();iPhi<hecregion->endPhiIndex();iPhi++) {
+ for (unsigned int iEta=hecregion->beginEtaIndex();iEta<hecregion->endEtaIndex();iEta++) {
HECCellConstLink cellPtr = hecregion->getHECCell(iEta,iPhi);
// build hash identifier for this cell
// Do some mapping between LArReadoutGeometry and CaloID
- if(cellPtr)
- {
- Identifier chanId = hec_id->channel_id(pos_neg,
- cellPtr->getSamplingIndex(),
- cellPtr->getRegionIndex(),
- iEta,iPhi);
+ if(cellPtr) {
+ Identifier chanId = hec_id->channel_id(pos_neg
+ , cellPtr->getSamplingIndex()
+ , cellPtr->getRegionIndex()
+ , iEta
+ , iPhi);
// Create the element and store it
- HECDetectorElement* hecElement = new HECDetectorElement(hec_id->channel_hash(chanId),
- 0,0,
- hecDescr,
- cellPtr,
- hecregion,
- isTestBeam);
- if(iPhi==hecregion->beginPhiIndex())
+ HECDetectorElement* hecElement = new HECDetectorElement(hec_id->channel_hash(chanId)
+ , 0
+ , 0
+ , hecDescr
+ , cellPtr
+ , hecregion
+ , isTestBeam);
+ if(iPhi==hecregion->beginPhiIndex()) {
phi_min = hecElement->phi() - 0.5*hecElement->dphi();
+ }
// cell volume
hecElement->set_volume(cellVol.CellVolume(chanId));
@@ -596,8 +532,7 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
if(reg_max < hecElement->eta()+0.5*hecElement->deta())
reg_max = hecElement->eta()+0.5*hecElement->deta();
- if(iPhi==hecregion->beginPhiIndex() && iEta==hecregion->beginEtaIndex())
- {
+ if(iPhi==hecregion->beginPhiIndex() && iEta==hecregion->beginEtaIndex()) {
depth_in.push_back(fabs(hecElement->z_raw())-hecElement->dz());
depth_out.push_back(fabs(hecElement->z_raw())+hecElement->dz());
}
@@ -607,9 +542,9 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
} // Phi loop
// *** *** *** Iterate over cells *** *** ***
- double eta_min = (hecregion->getDescriptor()->getEtaBinning()).getStart();
- double eta_max = (hecregion->getDescriptor()->getEtaBinning()).getEnd();
- double phi_max = phi_min + fabs((hecregion->getDescriptor()->getPhiBinning()).getDelta())*hecDescr->n_phi();
+ double eta_min = hecregion->getDescriptor()->getEtaBinning().getStart();
+ double eta_max = hecregion->getDescriptor()->getEtaBinning().getEnd();
+ double phi_max = phi_min + std::fabs(hecregion->getDescriptor()->getPhiBinning().getDelta())*hecDescr->n_phi();
// 'ideal' values
hecDescr->setCaloEtaMin(eta_min);
@@ -644,19 +579,16 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
// ****************************************************************
// --- Retrieve Fcal Detector Manager
- const FCALDetectorManager* fcalManager = 0;
+ const FCALDetectorManager* fcalManager{nullptr};
status = detStore->retrieve(fcalManager);
- if(status.isFailure())
- {
- log << MSG::WARNING << "Could not get the FCALDetectorManager. No Calo Elements will be built for FCAL" << endmsg;
+ if(status.isFailure()) {
+ ATH_MSG_WARNING("Could not get the FCALDetectorManager. No Calo Elements will be built for FCAL");
}
- else
- {
+ else {
// --- --- Iterate over FCAL modules and tiles --- ---
FCALDetectorManager::ConstIterator fcalmodIt;
- for (fcalmodIt=fcalManager->beginFCAL(); fcalmodIt!=fcalManager->endFCAL(); fcalmodIt++)
- {
+ for (fcalmodIt=fcalManager->beginFCAL(); fcalmodIt!=fcalManager->endFCAL(); fcalmodIt++) {
const FCALModule* fcalmodule = *fcalmodIt;
// *** *** Create descriptor for this module *** ***
@@ -667,10 +599,12 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
int pos_neg = endcapInd==FCALModule::NEG ? -2 : 2;
- Identifier regId = fcal_id->module_id(pos_neg,
- (int)fcalmodule->getModuleIndex());
+ Identifier regId = fcal_id->module_id(pos_neg,(int)fcalmodule->getModuleIndex());
- FCALDescriptor* fcalDescr = new FCALDescriptor(regId,(AtlasDetectorID *)cell_id,cell_id,fcalmodule);
+ FCALDescriptor* fcalDescr = new FCALDescriptor(regId
+ ,(AtlasDetectorID *)cell_id
+ ,cell_id
+ ,fcalmodule);
caloMgr->add(fcalDescr);
double eta_min = 10000.;
@@ -690,19 +624,19 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
// *** *** *** Iterate over cells *** *** ***
//
FCALModule::ConstIterator fcaltileIt;
- for (fcaltileIt=fcalmodule->beginTiles();fcaltileIt!=fcalmodule->endTiles();fcaltileIt++)
- {
- Identifier chanId = fcal_id->channel_id(pos_neg,
- (int)fcalmodule->getModuleIndex(),
- fcaltileIt->getIndexJ(), // eta
- fcaltileIt->getIndexI()); // phi
-
- FCALDetectorElement* fcalElement = new FCALDetectorElement(fcal_id->channel_hash(chanId),
- 0,0,
- fcalDescr,
- &(*fcaltileIt),
- fcalmodule,
- isTestBeam);
+ for (fcaltileIt=fcalmodule->beginTiles();fcaltileIt!=fcalmodule->endTiles();fcaltileIt++) {
+ Identifier chanId = fcal_id->channel_id(pos_neg
+ , (int)fcalmodule->getModuleIndex()
+ , fcaltileIt->getIndexJ() // eta
+ , fcaltileIt->getIndexI()); // phi
+
+ FCALDetectorElement* fcalElement = new FCALDetectorElement(fcal_id->channel_hash(chanId)
+ , 0
+ , 0
+ , fcalDescr
+ , &(*fcaltileIt)
+ , fcalmodule
+ , isTestBeam);
// calculate cell volume
double tubeSpacing = cellVol.getFcalTubeSpacing((int)fcalmodule->getModuleIndex());
unsigned int numTubes = fcaltileIt->getNumTubes();
@@ -728,10 +662,9 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
if(reg_max < fcalElement->eta()+0.5*fcalElement->deta())
reg_max = fcalElement->eta()+0.5*fcalElement->deta();
- if(fcaltileIt==fcalmodule->beginTiles())
- {
- depth_in.push_back(fabs(fcalElement->z_raw()) - fcalElement->dz());
- depth_out.push_back(fabs(fcalElement->z_raw()) + fcalElement->dz());
+ if(fcaltileIt==fcalmodule->beginTiles()) {
+ depth_in.push_back(std::fabs(fcalElement->z_raw()) - fcalElement->dz());
+ depth_out.push_back(std::fabs(fcalElement->z_raw()) + fcalElement->dz());
}
}
@@ -755,11 +688,12 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
fcalDescr->set_depth_in(depth_in);
fcalDescr->set_depth_out(depth_out);
- if(fcalmodule->getEndcapIndex()==FCALModule::NEG)
+ if(fcalmodule->getEndcapIndex()==FCALModule::NEG) {
fcalDescr->setLArEtaMin(-reg_max);
- else
+ }
+ else {
fcalDescr->setLArEtaMin(reg_min);
-
+ }
}// Module loop
}// if FCAL manager has been retrieved
@@ -771,27 +705,27 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
// ****************************************************************
// ** --- --- Tile --- --- **
// ****************************************************************
- const TileDetDescrManager* tile_mgr;
-
+ const TileDetDescrManager* tile_mgr{nullptr};
status = detStore->retrieve(tile_mgr);
- if (status.isFailure())
- {
- log << MSG::WARNING << "Could not get the TileDetectorManager. No Calo Elements will be built for Tile" << endmsg;
+ if (status.isFailure()) {
+ ATH_MSG_WARNING("Could not get the TileDetectorManager. No Calo Elements will be built for Tile");
}
- else
- {
- if (debug) log << MSG::DEBUG << " Found the TileDetDescrManager " << endmsg;
+ else {
+ ATH_MSG_DEBUG(" Found the TileDetDescrManager ");
cell_id->calo_cell_hash_range((int)CaloCell_ID::TILE,min,max);
- for(unsigned int idhash=0; idhash < max-min; idhash++)
- {
+ for(unsigned int idhash=0; idhash < max-min; idhash++) {
CaloDetDescrElement* newelt = tile_mgr->get_cell_element(idhash);
- if(newelt) caloMgr->add(newelt);
+ if(newelt) {
+ caloMgr->add(newelt);
+ }
}
std::vector<CaloDetDescriptor*>::const_iterator itr = tile_mgr->calo_descriptors_begin();
std::vector<CaloDetDescriptor*>::const_iterator end = tile_mgr->calo_descriptors_end();
- for(; itr != end; ++itr) caloMgr->add_tile(*itr);
+ for(; itr != end; ++itr) {
+ caloMgr->add_tile(*itr);
+ }
}
// ****************************************************************
// ** --- --- Tile --- --- **
@@ -800,11 +734,10 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
// ****************************************************************
// ** --- Additional elements --- **
// ****************************************************************
- if(isTestBeam)
- {
+ if(isTestBeam) {
CaloDetDescrElementContainer *cDDEvec;
- if(detStore->retrieve(cDDEvec) == StatusCode::SUCCESS)
- { // We have additional elements
+ if(detStore->retrieve(cDDEvec) == StatusCode::SUCCESS) {
+ // We have additional elements
for (CaloDetDescrElement* elt : *cDDEvec) {
caloMgr->add (elt);
}
@@ -816,20 +749,13 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
//--------------------------------------------------------------------
-long
-CaloMgrDetDescrCnv::storageType()
+long CaloMgrDetDescrCnv::storageType()
{
- return DetDescr_StorageType;
+ return DetDescr_StorageType;
}
//--------------------------------------------------------------------
-const CLID&
-CaloMgrDetDescrCnv::classID() {
- return ClassID_traits<CaloDetDescrManager>::ID();
+const CLID& CaloMgrDetDescrCnv::classID()
+{
+ return ClassID_traits<CaloDetDescrManager>::ID();
}
-
-//--------------------------------------------------------------------
-CaloMgrDetDescrCnv::CaloMgrDetDescrCnv(ISvcLocator* svcloc)
- :
- DetDescrConverter(ClassID_traits<CaloDetDescrManager>::ID(), svcloc)
-{}
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.h b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.h
index 91589792f8cd..cf5b6d3965ac 100755
--- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.h
+++ b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.h
@@ -1,27 +1,28 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef CALODETMGRDETDESCRCNV_CALODETMGRDETDESCRCNV_H
#define CALODETMGRDETDESCRCNV_CALODETMGRDETDESCRCNV_H
#include "DetDescrCnvSvc/DetDescrConverter.h"
-
-class CaloMgrDetDescrCnv: public DetDescrConverter {
-
-public:
- virtual long int repSvcType() const;
- virtual StatusCode initialize();
- virtual StatusCode finalize();
- virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
-
- // Storage type and class ID (used by CnvFactory)
- static long storageType();
- static const CLID& classID();
-
- CaloMgrDetDescrCnv(ISvcLocator* svcloc);
-
-private:
+#include "AthenaBaseComps/AthMessaging.h"
+
+class CaloMgrDetDescrCnv: public DetDescrConverter , public AthMessaging
+{
+ public:
+ CaloMgrDetDescrCnv(ISvcLocator* svcloc);
+
+ virtual long int repSvcType() const override;
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
+ virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj) override;
+
+ // Storage type and class ID (used by CnvFactory)
+ static long storageType();
+ static const CLID& classID();
+
+ private:
};
diff --git a/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts.py b/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts.py
index 662bfba9d140..231d36afa60e 100644
--- a/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts.py
+++ b/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts.py
@@ -82,8 +82,6 @@ ServiceMgr.GeoModelSvc.DetectorTools += [ LArDetectorToolNV(ApplyAlignments = Tr
]
-from CaloDetMgrDetDescrCnv import CaloDetMgrDDCnv
-
include( "TileConditions/TileConditions_jobOptions.py" )
include( "CaloConditions/LArTTCellMap_ATLAS_jobOptions.py")
diff --git a/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts_SerialOnly.py b/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts_SerialOnly.py
index 71c181da3006..2b8aa3160640 100644
--- a/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts_SerialOnly.py
+++ b/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts_SerialOnly.py
@@ -56,8 +56,6 @@ ServiceMgr.GeoModelSvc.DetectorTools += [ LArDetectorToolNV(ApplyAlignments = Tr
]
-from CaloDetMgrDetDescrCnv import CaloDetMgrDDCnv
-
include( "TileConditions/TileConditions_jobOptions.py" )
include( "CaloConditions/LArTTCellMap_ATLAS_jobOptions.py")
diff --git a/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts_alt.py b/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts_alt.py
index e6fe68c6c4da..c358c22fba72 100644
--- a/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts_alt.py
+++ b/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts_alt.py
@@ -193,8 +193,6 @@ topSequence = AlgSequence()
#ServiceMgr.GeoModelSvc.AtlasVersion='ATLAS-GEO-10-00-00' # for the original input file
#ServiceMgr.GeoModelSvc.AtlasVersion='ATLAS-R2-2015-02-01-00' # for the new input file
-#from CaloDetMgrDetDescrCnv import CaloDetMgrDDCnv
-
#include( "TileConditions/TileConditions_jobOptions.py" )
#include( "CaloConditions/LArTTCellMap_ATLAS_jobOptions.py")
diff --git a/Calorimeter/CaloExample/CaloHiveEx/share/old/CaloHiveExOpts.py b/Calorimeter/CaloExample/CaloHiveEx/share/old/CaloHiveExOpts.py
index b1c675b68529..9b54aac4a221 100644
--- a/Calorimeter/CaloExample/CaloHiveEx/share/old/CaloHiveExOpts.py
+++ b/Calorimeter/CaloExample/CaloHiveEx/share/old/CaloHiveExOpts.py
@@ -167,8 +167,6 @@ ServiceMgr.GeoModelSvc.DetectorTools += [ LArDetectorToolNV(ApplyAlignments = Tr
ServiceMgr.GeoModelSvc.AtlasVersion='ATLAS-GEO-10-00-00'
-from CaloDetMgrDetDescrCnv import CaloDetMgrDDCnv
-
include( "TileConditions/TileConditions_jobOptions.py" )
include( "CaloConditions/LArTTCellMap_ATLAS_jobOptions.py")
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInitH6.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInitH6.py
index c9bda3fd87c6..6efd71e15627 100644
--- a/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInitH6.py
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInitH6.py
@@ -32,7 +32,3 @@ elif (SimFlags.SimLayout.get_Value()=="tb_LArH6_2004"):
LArDetTool.isFcal = SimFlags.LArTB_H6Fcal.get_Value()
LArDetTool.isColdnose = SimFlags.LArTB_H6Coldnose.get_Value()
GeoModelSvc.DetectorTools += [ LArDetTool ]
-
-
-# as long as not created anywhere else in GeoModel :
-from CaloDetMgrDetDescrCnv import CaloDetMgrDDCnv # noqa: F401
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/LArGM.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/LArGM.py
index b184c5fd6b21..85f1cc617370 100755
--- a/DetectorDescription/GeoModel/AtlasGeoModel/python/LArGM.py
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/LArGM.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
#
# LAr GeoModel initialization
@@ -12,9 +12,6 @@ if ( DetFlags.detdescr.LAr_on() ):
from LArGeoAlgsNV.LArGeoAlgsNVConf import LArDetectorToolNV
GeoModelSvc.DetectorTools += [ LArDetectorToolNV() ]
- # as long as not created anywhere else in GeoModel :
- from CaloDetMgrDetDescrCnv import CaloDetMgrDDCnv # noqa: F401
-
# apply possible alignments
if ( jobproperties.Global.DetGeo() == "atlas" or
jobproperties.Global.DetGeo() == "commis" ):
diff --git a/LArCalorimeter/LArExample/TestLArDetDescr/share/TestCaloDDE_jobOptions.py b/LArCalorimeter/LArExample/TestLArDetDescr/share/TestCaloDDE_jobOptions.py
index 517ca0413fc6..f8a5782b7967 100755
--- a/LArCalorimeter/LArExample/TestLArDetDescr/share/TestCaloDDE_jobOptions.py
+++ b/LArCalorimeter/LArExample/TestLArDetDescr/share/TestCaloDDE_jobOptions.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
###############################################################
#
# jobOptions file for LArDetDescr loading and CaloDDE tests
@@ -12,17 +14,17 @@ svcMgr.MessageSvc.OutputLevel = 3
svcMgr.MessageSvc.defaultLimit = 9999999 # all messages
# make sure that other subdet are not built
-from AthenaCommon.GlobalFlags import GlobalFlags
-GlobalFlags.DetGeo.set_atlas()
-GlobalFlags.DataSource.set_geant4()
-GlobalFlags.Luminosity.set_zero()
+from AthenaCommon.GlobalFlags import globalflags
+globalflags.DetGeo.set_Value_and_Lock('atlas')
+globalflags.DataSource.set_Value_and_Lock('geant4')
+globalflags.Luminosity.set_Value_and_Lock('zero')
from AthenaCommon.DetFlags import DetFlags
DetFlags.detdescr.all_setOff()
DetFlags.detdescr.LAr_setOn()
from AthenaCommon.GlobalFlags import globalflags
-globalflags.DetDescrVersion = 'ATLAS-GEO-02-00-00'
+globalflags.DetDescrVersion = 'ATLAS-R2-2016-01-00-01'
from AtlasGeoModel import SetGeometryVersion
from AtlasGeoModel import GeoModelInit
@@ -37,5 +39,5 @@ from TestLArDetDescr.TestLArDetDescrConf import TestCaloDDE
topSequence += TestCaloDDE()
from IOVDbSvc.CondDB import conddb
-conddb.setGlobalTag('DEFAULTCOND')
+conddb.setGlobalTag('OFLCOND-MC16-SDR-RUN2-08')
diff --git a/LArCalorimeter/LArExample/TestLArDetDescr/share/TestLArTT_jobOptions.py b/LArCalorimeter/LArExample/TestLArDetDescr/share/TestLArTT_jobOptions.py
index ca028b7b8db8..6f5f14c7af01 100755
--- a/LArCalorimeter/LArExample/TestLArDetDescr/share/TestLArTT_jobOptions.py
+++ b/LArCalorimeter/LArExample/TestLArDetDescr/share/TestLArTT_jobOptions.py
@@ -13,7 +13,7 @@ theApp.EvtMax = 1
#(0=ALL 1=VERBOSE, 2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
MessageSvc = Service( "MessageSvc" )
MessageSvc.OutputLevel = 3
-include( "CaloDetMgrDetDescrCnv/CaloTTDetMgrDetDescrCnv_joboptions.py" )
+include( "CaloConditions/CaloConditions_jobOptions.py" )
theApp.Dlls += [
"TestLArDetDescr"
diff --git a/LArCalorimeter/LArExample/TestLArHardwareID/share/initTTMap_poolTestWrite_jobOptions.py b/LArCalorimeter/LArExample/TestLArHardwareID/share/initTTMap_poolTestWrite_jobOptions.py
index 4adf83daba9b..8eec984e2bfd 100755
--- a/LArCalorimeter/LArExample/TestLArHardwareID/share/initTTMap_poolTestWrite_jobOptions.py
+++ b/LArCalorimeter/LArExample/TestLArHardwareID/share/initTTMap_poolTestWrite_jobOptions.py
@@ -26,7 +26,7 @@ DetDescrVersion="ATLAS-DC3-05"
include( "AtlasGeoModel/SetGeometryVersion.py" )
include( "AtlasGeoModel/GeoModelInit.py" )
include( "LArDetDescr/LArDetDescr_joboptions.py" )
-include( "CaloDetMgrDetDescrCnv/CaloTTDetMgrDetDescrCnv_joboptions.py" )
+include( "CaloConditions/CaloConditions_jobOptions.py" )
include( "CaloConditions/LArTTCellMap_ATLAS_jobOptions.py" )
diff --git a/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_ART_egamma_fromESD.py b/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_ART_egamma_fromESD.py
index 1ba1796e3020..d30930fcebf8 100644
--- a/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_ART_egamma_fromESD.py
+++ b/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_ART_egamma_fromESD.py
@@ -115,8 +115,6 @@ ServiceMgr.GeoModelSvc.DetectorTools += [ LArDetectorToolNV(ApplyAlignments = Tr
]
-from CaloDetMgrDetDescrCnv import CaloDetMgrDDCnv
-
include( "TileConditions/TileConditions_jobOptions.py" )
include( "CaloConditions/LArTTCellMap_ATLAS_jobOptions.py")
diff --git a/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_CaloHiveExOpts.py b/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_CaloHiveExOpts.py
index ed01a5bded1c..487ba0ae230d 100644
--- a/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_CaloHiveExOpts.py
+++ b/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_CaloHiveExOpts.py
@@ -89,8 +89,6 @@ ServiceMgr.GeoModelSvc.DetectorTools += [ LArDetectorToolNV(ApplyAlignments = Tr
]
-from CaloDetMgrDetDescrCnv import CaloDetMgrDDCnv
-
include( "TileConditions/TileConditions_jobOptions.py" )
include( "CaloConditions/LArTTCellMap_ATLAS_jobOptions.py")
diff --git a/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_PFlowHiveExOpts.py b/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_PFlowHiveExOpts.py
index 391666c9bd3d..b603eda93bd6 100644
--- a/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_PFlowHiveExOpts.py
+++ b/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_PFlowHiveExOpts.py
@@ -111,8 +111,6 @@ ServiceMgr.GeoModelSvc.DetectorTools += [ LArDetectorToolNV(ApplyAlignments = Tr
]
-from CaloDetMgrDetDescrCnv import CaloDetMgrDDCnv
-
include( "TileConditions/TileConditions_jobOptions.py" )
include( "CaloConditions/LArTTCellMap_ATLAS_jobOptions.py")
diff --git a/Reconstruction/eflowRec/share/PFlowHiveExOpts.py b/Reconstruction/eflowRec/share/PFlowHiveExOpts.py
index 47a9665ef274..1fab2b07ae55 100644
--- a/Reconstruction/eflowRec/share/PFlowHiveExOpts.py
+++ b/Reconstruction/eflowRec/share/PFlowHiveExOpts.py
@@ -111,8 +111,6 @@ ServiceMgr.GeoModelSvc.DetectorTools += [ LArDetectorToolNV(ApplyAlignments = Tr
]
-from CaloDetMgrDetDescrCnv import CaloDetMgrDDCnv
-
include( "TileConditions/TileConditions_jobOptions.py" )
include( "CaloConditions/LArTTCellMap_ATLAS_jobOptions.py")
--
GitLab
From 5d0bd98a823481f005c5799db29108b1e6a5cec9 Mon Sep 17 00:00:00 2001
From: Junpei Maeda <junpei.maeda@cern.ch>
Date: Thu, 12 Aug 2021 09:12:22 +0200
Subject: [PATCH 015/272] fixed huge memory usage when the BW-CW are read from
textfile. New class for Run 3 has been introduced.
---
.../TrigT1TGC/BigWheelCoincidenceLUT.h | 123 ++++++++++
.../TrigT1TGC/src/BigWheelCoincidenceLUT.cxx | 214 ++++++++++++++++++
2 files changed, 337 insertions(+)
create mode 100644 Trigger/TrigT1/TrigT1TGC/TrigT1TGC/BigWheelCoincidenceLUT.h
create mode 100644 Trigger/TrigT1/TrigT1TGC/src/BigWheelCoincidenceLUT.cxx
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/BigWheelCoincidenceLUT.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/BigWheelCoincidenceLUT.h
new file mode 100644
index 000000000000..b8911eeae59e
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/BigWheelCoincidenceLUT.h
@@ -0,0 +1,123 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TrigT1TGC_BigWheelCoincidenceLUT_h
+#define TrigT1TGC_BigWheelCoincidenceLUT_h
+
+#include <vector>
+#include <map>
+#include <string>
+
+#include "GaudiKernel/ToolHandle.h"
+#include "StoreGate/ReadCondHandleKey.h"
+#include "MuonCondSvc/TGCTriggerData.h"
+#include "TGCTriggerCondSvc/TGCTriggerLUTs.h"
+#include "TrigT1TGC/TGCArguments.h"
+
+namespace LVL1TGC {
+
+/** Contents of Run-3 BW-CW LUT
+ * ===========================
+ * std::unordered_map<GLOBALADDR, PTVALUE>
+ * where
+ * GLOBALADDR | 27 bits | unsigned int | side, octant, type, phimod2, module, roi,
+ * | DR(0...0x1f for -15...15), DPhi(0...0xf for -7...7)
+ * PTVALUE | 3 bits | unsigned char | pT value (0x0 and 0x7 is no cand.)
+ *
+ * for GLOBALADDR
+ * | 29 |28|27|26|25|24|23| 22 |21|..|18|17|...|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0|
+ * |side| octant | 0|type |phimod2| module | RoI | 0| delta R | delta Phi |
+ * where side = 0x0 (A-side), 0x1 (C-side).
+ * octant = 0x(0...7)
+ * type = 0x0(HH), 0x1(HL), 0x2(LH), 0x3(LL): HL means 3-sta.-wire and 2-sta.-strip.
+ */
+
+class BigWheelCoincidenceLUT {
+ public:
+ BigWheelCoincidenceLUT(LVL1TGCTrigger::TGCArguments*,
+ const SG::ReadCondHandleKey<TGCTriggerLUTs>& readKey,
+ const std::string& version);
+ virtual ~BigWheelCoincidenceLUT();
+
+ BigWheelCoincidenceLUT(const BigWheelCoincidenceLUT& right) = default;
+ BigWheelCoincidenceLUT& operator = (const BigWheelCoincidenceLUT& right) = delete;
+
+ bool readMap();
+
+ int test(int octantId, int moduleId, int subsector,
+ int type, int dr, int dphi) const;
+
+ int getMapType(int hlwire, int hlstrip) const;
+ const std::string& getVersion() const;
+ int getOctantId() const;
+
+ const LVL1TGCTrigger::TGCArguments* tgcArgs() const;
+
+ private: // hide default constructor
+ BigWheelCoincidenceLUT() = delete;
+
+ protected:
+ int SUBSECTORADD(int ssid, int modid, int phimod2, int type) const;
+ int getTYPE(int lDR, int hDR, int lDPhi, int hDPhi ) const;
+
+ enum {TMap_HH=0, TMap_HL, TMap_LH, TMap_LL, N_TMap};
+ enum {NumberOfCoincidenceType=4};
+ enum {NumberOfModuleType=12};
+ enum {DR_offset=-15, DPhi_offset=-7};
+
+ //converter from char to pTthre Number. the sign mean muon sign.
+ std::map<char, int> m_pTdef={{'X',0},
+ {'A',1},{'B',2},{'C',3},{'D',4},{'E',5},{'F',6},{'G',7},{'H',8},{'I',9},{'J',10},{'K',11},{'L',12},{'M',13},{'N',14},{'O',15},
+ {'a',-1},{'b',-2},{'c',-3},{'d',-4},{'e',-5},{'f',-6},{'g',-7},{'h',-8},{'i',-9},{'j',-10},{'k',-11},{'l',-12},{'m',-13},{'n',-14},{'o',-15} };
+
+ private:
+ std::map<int, std::map<int, std::map<int, char> > > m_lut; //for Run3 <RoI(&type),<R,<Phi,pT(char)> > >
+
+ std::string m_verName;
+ int m_side;
+ int m_octant;
+ bool m_fullCW;
+
+ LVL1TGCTrigger::TGCArguments* m_tgcArgs;
+
+ const SG::ReadCondHandleKey<TGCTriggerLUTs>& m_readCondKey;
+};
+
+inline const LVL1TGCTrigger::TGCArguments* BigWheelCoincidenceLUT::tgcArgs() const {
+ return m_tgcArgs;
+}
+
+inline const std::string& BigWheelCoincidenceLUT::getVersion() const {
+ return m_verName;
+}
+
+inline int BigWheelCoincidenceLUT::getOctantId() const {
+ return m_octant;
+}
+
+inline int BigWheelCoincidenceLUT::getTYPE(int lDR, int hDR, int lDPhi, int hDPhi) const {
+ if((lDR == -TGCTriggerData::DR_HIGH_RANGE) && (hDR == TGCTriggerData::DR_HIGH_RANGE)) {
+ if ((lDPhi == -TGCTriggerData::DPHI_HIGH_RANGE) && (hDPhi == TGCTriggerData::DPHI_HIGH_RANGE)) return TGCTriggerData::COIN_HH;
+ else if((lDPhi == -TGCTriggerData::DPHI_LOW_RANGE) && (hDPhi == TGCTriggerData::DPHI_LOW_RANGE)) return TGCTriggerData::COIN_HL;
+ } else if((lDR == -TGCTriggerData::DR_LOW_RANGE) && (hDR == TGCTriggerData::DR_LOW_RANGE)) {
+ if ((lDPhi == -TGCTriggerData::DPHI_HIGH_RANGE) && (hDPhi == TGCTriggerData::DPHI_HIGH_RANGE)) return TGCTriggerData::COIN_LH;
+ else if((lDPhi == -TGCTriggerData::DPHI_LOW_RANGE) && (hDPhi == TGCTriggerData::DPHI_LOW_RANGE)) return TGCTriggerData::COIN_LL;
+ }
+ return -1;
+}
+
+inline int BigWheelCoincidenceLUT::getMapType(int hlwire, int hlstrip) const {
+ return (N_TMap - 2*hlwire - hlstrip - 1);
+}
+
+
+inline int BigWheelCoincidenceLUT::SUBSECTORADD(int ssid, int modid, int phimod2, int type) const {
+ return (ssid+(modid<<8)+(phimod2<<12) + (type<<16) );
+}
+
+} // namespace LVL1TGC
+
+#endif // TrigT1TGC_BigWheelCoincidenceLUT_H
+
+
diff --git a/Trigger/TrigT1/TrigT1TGC/src/BigWheelCoincidenceLUT.cxx b/Trigger/TrigT1/TrigT1TGC/src/BigWheelCoincidenceLUT.cxx
new file mode 100644
index 000000000000..2087678bfc36
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1TGC/src/BigWheelCoincidenceLUT.cxx
@@ -0,0 +1,214 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "TrigT1TGC/BigWheelCoincidenceLUT.h"
+
+#include <iostream>
+#include <fstream>
+#include <sstream>
+#include <string>
+
+#include "TrigT1TGC/TGCNumbering.h"
+#include "PathResolver/PathResolver.h"
+
+#include "GaudiKernel/ISvcLocator.h"
+#include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/IMessageSvc.h"
+
+#include "AthenaPoolUtilities/CondAttrListCollection.h"
+
+#include "StoreGate/ReadCondHandle.h"
+#include "MuonCondSvc/TGCTriggerData.h"
+
+namespace LVL1TGC {
+
+int BigWheelCoincidenceLUT::test(int octantId, int moduleId, int subsector,
+ int type, int dr, int dphi) const {
+ // check pt range
+ if (type<0 || type>=N_TMap ) return false;
+
+ int sector=(moduleId-2)/3+octantId*3;
+ int phimod2 = (moduleId==2||moduleId==5||moduleId==8)&&(sector%2==1) ? 1 : 0;
+ int addr=SUBSECTORADD(subsector, moduleId, phimod2,type);
+
+ std::map<int, std::map<int, std::map<int, char> > > themap;
+
+ if (tgcArgs()->USE_CONDDB()) {
+ SG::ReadCondHandle<TGCTriggerLUTs> readHandle{m_readCondKey};
+ const TGCTriggerLUTs* readCdo{*readHandle};
+ themap = readCdo->getReadMapBw(m_side, m_octant);
+ } else {
+ themap = m_lut;
+ }
+
+ std::map<int, std::map<int, std::map<int, char> > >::const_iterator it = themap.find(addr);
+ if (it==themap.end()) return false;
+
+ std::map<int, std::map<int, char> > mapR = it->second;
+ std::map<int, std::map<int, char> >::const_iterator itR=mapR.find(dr);
+ if (itR==mapR.end()) return false;
+
+ std::map<int, char> mapPhi = itR->second;
+ std::map<int, char>::const_iterator itPhi=mapPhi.find(dphi);
+ if (itPhi==mapPhi.end()) return false;
+
+ char pT_char=itPhi->second;
+ int pT_int=m_pTdef.find(pT_char)->second;
+
+ return pT_int;
+}
+
+
+BigWheelCoincidenceLUT::BigWheelCoincidenceLUT(LVL1TGCTrigger::TGCArguments* tgcargs,
+ const SG::ReadCondHandleKey<TGCTriggerLUTs>& readKey,
+ const std::string& version)
+: m_verName(version),
+ m_side(0), m_octant(0),
+ m_fullCW(false),
+ m_tgcArgs(tgcargs),
+ m_readCondKey(readKey) {
+ IMessageSvc* msgSvc = 0;
+ ISvcLocator* svcLocator = Gaudi::svcLocator();
+ if (svcLocator->service("MessageSvc", msgSvc) == StatusCode::FAILURE) {
+ return;
+ }
+ MsgStream log(msgSvc, "LVL1TGC::BigWheelCoincidenceLUT");
+
+ if (!tgcArgs()->useRun3Config()) {
+ log << MSG::ERROR
+ << "This class should be used only for Run-3 configuration!"
+ << endmsg;
+ }
+
+ log << MSG::INFO
+ << " BigWheel LUT version of " << m_verName << " is selected." << endmsg;
+
+ if (!tgcArgs()->USE_CONDDB()) {
+ // read LUT contents from local files
+ this->readMap();
+ }
+}
+
+BigWheelCoincidenceLUT::~BigWheelCoincidenceLUT() {
+}
+
+bool BigWheelCoincidenceLUT::readMap()
+{
+ const int moduleNumber[NumberOfModuleType] =
+ { 0, 1, 2, 2, 3, 4, 5, 5, 6, 7, 8, 8 };
+ const std::string moduleName[NumberOfModuleType]=
+ {"0a","1a","2a","2b","3a","4a","5a","5b","6a","7a","8a","8b"};
+ const std::string sideName[kNSide] = {"a","c"};
+ const std::string octantName[kNOctant] =
+ { "0", "1", "2", "3", "4", "5", "6", "7"};
+ const std::string coincidenceTypeName[NumberOfCoincidenceType] = {"HH","HL","LH","LL"};
+
+
+ IMessageSvc* msgSvc = 0;
+ ISvcLocator* svcLocator = Gaudi::svcLocator();
+ if (svcLocator->service("MessageSvc", msgSvc) == StatusCode::FAILURE) {
+ return false;
+ }
+ MsgStream log(msgSvc, "LVL1TGC::BigWheelCoincidenceLUT");
+
+ // initialize
+ std::string buf;
+ std::string fn, fullName, tag;
+ int ssId;
+ char delimiter = '\n';
+
+ // loop over all files...
+ for(int iModule=0; iModule<NumberOfModuleType; iModule+=1) {
+ for(int iCoinType=0; iCoinType!=NumberOfCoincidenceType; iCoinType++){
+ int phimod2=moduleName[iModule].find("b")!=std::string::npos ? 1 : 0;
+ std::string fn = "/BW/cm_";
+ if (m_fullCW) {
+ fn += sideName[m_side]+octantName[m_octant]+moduleName[iModule]+coincidenceTypeName[iCoinType]+"_";
+ } else {
+ fn += sideName[m_side]+moduleName[iModule]+coincidenceTypeName[iCoinType]+"_Octant_";
+ }
+ fn += m_verName + ".db";
+// bool Forward_type1=(moduleName[iModule]=="2b"||moduleName[iModule]=="5a"||moduleName[iModule]=="8b");
+// bool Forward_type2=(moduleName[iModule]=="2a"||moduleName[iModule]=="5b"||moduleName[iModule]=="8a");
+// if(m_octant%2==0 && Forward_type1){continue;}
+// if(m_octant%2==1 && Forward_type2){continue;}
+ int type = -1;
+ int lDR, hDR, lDPhi, hDPhi;
+
+ fullName = PathResolver::FindCalibDirectory("dev")+"/TrigT1TGC"+fn;
+ if( fullName.length() == 0 ) {
+ log << MSG::ERROR
+ << " Could not found "
+ << fn.c_str()
+ <<endmsg;
+ continue;
+ }
+
+ std::ifstream file(fullName.c_str(),std::ios::in);
+ if(!file){
+ log << MSG::ERROR
+ << " Could not found "
+ << fullName.c_str()
+ <<endmsg;
+ continue;
+ }
+ while(getline(file,buf,delimiter)){
+ std::istringstream header(buf);
+ header>>tag;
+ if(tag=="#") { // read header part.
+ header>>ssId>>lDR>>hDR>>lDPhi>>hDPhi;
+ type = getTYPE( lDR, hDR, lDPhi, hDPhi );
+ // check moduleNumber and ptLevel
+ if( type<0 ) {
+ log << MSG::WARNING
+ << " illegal parameter in database header : "
+ << header.str()
+ <<" in file "
+ << fn
+ <<endmsg;
+ break;
+ }
+
+ // get window data
+ std::map<int, std::map<int, char> > bWindow;//<R,<~>>
+ char pT;
+ for(int ir=0; ir<=hDR-lDR; ir++) {
+ getline(file,buf,delimiter);
+ std::map<int, char> aWindow;//<Phi,pT>
+ for(int iphi=0; iphi<=hDPhi-lDPhi; iphi++){
+ pT = buf[iphi];
+ if (pT=='X'){continue;} // none of window is opened in this dR
+ aWindow[iphi+DPhi_offset] = pT;
+ }
+ // Warning : no window
+ if (aWindow.size()==0) {
+ log << MSG::DEBUG
+ << " No window is opened for (ptLevel,ssId,mod) = ("
+ << ssId
+ <<" ) "
+ <<endmsg;
+ } else {
+ bWindow[ir+DR_offset]=aWindow;
+ }
+ }
+
+ int addr = SUBSECTORADD(ssId,moduleNumber[iModule],phimod2,type);
+ if (m_lut.find(addr)!=m_lut.end()) {
+ log << MSG::DEBUG
+ << " This subsector was already reserved."
+ <<endmsg;
+ } else {
+ m_lut[addr]=bWindow;
+ }
+ }
+ }
+
+ }
+ }
+ return true;
+
+}
+
+
+} //end of namespace bracket
--
GitLab
From de587c5b61f9449a412676dd17f2cc7bac2a8e61 Mon Sep 17 00:00:00 2001
From: John Chapman <jchapman@cern.ch>
Date: Tue, 10 Aug 2021 17:58:27 +0200
Subject: [PATCH 016/272] Add Output.EVNT_TRFileName - needed for Cosmics
Simulation
---
Control/AthenaConfiguration/python/AllConfigFlags.py | 1 +
.../AthenaPoolCnvSvc/python/PoolWriteConfig.py | 9 +++++++++
2 files changed, 10 insertions(+)
diff --git a/Control/AthenaConfiguration/python/AllConfigFlags.py b/Control/AthenaConfiguration/python/AllConfigFlags.py
index 3d31245975d8..c4c9023a4566 100644
--- a/Control/AthenaConfiguration/python/AllConfigFlags.py
+++ b/Control/AthenaConfiguration/python/AllConfigFlags.py
@@ -101,6 +101,7 @@ def _createCfgFlags():
acf.addFlag('Output.EVNTFileName', '')
+ acf.addFlag('Output.EVNT_TRFileName', '')
acf.addFlag('Output.HITSFileName', '')
acf.addFlag('Output.RDOFileName', '')
acf.addFlag('Output.RDO_SGNLFileName', '')
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/python/PoolWriteConfig.py b/Database/AthenaPOOL/AthenaPoolCnvSvc/python/PoolWriteConfig.py
index db59bdd18220..0dcf592cd522 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/python/PoolWriteConfig.py
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/python/PoolWriteConfig.py
@@ -29,6 +29,15 @@ def PoolWriteCfg(flags):
# Kept in sync with RecoUtils.py
from AthenaPoolCnvSvc import PoolAttributeHelper as pah
+ if flags.Output.EVNT_TRFileName:
+ # Use LZMA w/ Level 1
+ PoolAttributes += [ pah.setFileCompAlg( flags.Output.EVNT_TRFileName, 2 ) ]
+ PoolAttributes += [ pah.setFileCompLvl( flags.Output.EVNT_TRFileName, 1 ) ]
+ # Flush the CollectionTree, POOLContainer, and POOLContainerForm to disk at every 1 events
+ PoolAttributes += [ pah.setTreeAutoFlush( flags.Output.EVNT_TRFileName, "CollectionTree", 1 ) ]
+ PoolAttributes += [ pah.setTreeAutoFlush( flags.Output.EVNT_TRFileName, "POOLContainer", 1 ) ]
+ PoolAttributes += [ pah.setTreeAutoFlush( flags.Output.EVNT_TRFileName, "POOLContainerForm", 1 ) ]
+
if flags.Output.HITSFileName:
# Use LZMA w/ Level 1
PoolAttributes += [ pah.setFileCompAlg( flags.Output.HITSFileName, 2 ) ]
--
GitLab
From 3222247b498d7fc529a761a961e3221667beb74b Mon Sep 17 00:00:00 2001
From: Junpei Maeda <junpei.maeda@cern.ch>
Date: Thu, 12 Aug 2021 13:29:11 +0200
Subject: [PATCH 017/272] forgotten to git add other codes
---
.../TrigT1TGC/TrigT1TGC/TGCDatabaseManager.h | 45 ++--
.../TrigT1/TrigT1TGC/TrigT1TGC/TGCNumbering.h | 16 +-
.../TrigT1TGC/TGCRPhiCoincidenceMap.h | 13 -
.../TrigT1TGC/TGCRPhiCoincidenceMatrix.h | 17 +-
.../TrigT1TGC/src/TGCDatabaseManager.cxx | 20 +-
.../TrigT1TGC/src/TGCRPhiCoincidenceMap.cxx | 241 +-----------------
.../src/TGCRPhiCoincidenceMatrix.cxx | 39 ++-
.../TrigT1/TrigT1TGC/src/TGCSectorLogic.cxx | 3 +-
8 files changed, 77 insertions(+), 317 deletions(-)
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCDatabaseManager.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCDatabaseManager.h
index 9122f8681e84..c5c4e2c04a76 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCDatabaseManager.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCDatabaseManager.h
@@ -19,6 +19,7 @@
#include <string>
namespace LVL1TGC {
+class BigWheelCoincidenceLUT;
class TGCTileMuCoincidenceLUT;
class Run2TileMuCoincidenceMap;
}
@@ -52,13 +53,14 @@ class TGCDatabaseManager : public AthMessaging
const TGCConnectionPPToSL* getConnectionPPToSL(TGCRegionType type) const;
const TGCConnectionASDToPP* getConnectionASDToPP(TGCRegionType region, int type, TGCForwardBackwardType forwardBackward) const;
- std::shared_ptr<TGCRPhiCoincidenceMap> getRPhiCoincidenceMap(int sideId, int octantId) const;
+ std::shared_ptr<LVL1TGC::BigWheelCoincidenceLUT> getBigWheelCoincidenceLUT() const;
const TGCEIFICoincidenceMap* getEIFICoincidenceMap(int sideId) const;
std::shared_ptr<LVL1TGC::TGCTileMuCoincidenceLUT> getTileMuCoincidenceLUT() const;
std::shared_ptr<TGCNSWCoincidenceMap> getNSWCoincidenceMap(int sideId, int octantId, int moduleId) const;
std::shared_ptr<TGCGoodMF> getGoodMFMap() const;
// only Run-2
+ std::shared_ptr<TGCRPhiCoincidenceMap> getRPhiCoincidenceMap(int sideId, int octantId) const;
std::shared_ptr<LVL1TGC::Run2TileMuCoincidenceMap> getRun2TileMuCoincidenceMap() const;
TGCConnectionInPP* getConnectionInPP(TGCPatchPanel* patchPanel) const;
@@ -75,7 +77,7 @@ class TGCDatabaseManager : public AthMessaging
private:
enum {NumberOfModuleInBW=9};
- std::array<std::array<std::shared_ptr<TGCRPhiCoincidenceMap>, NumberOfOctant>,NumberOfSide> m_mapRphi;
+ std::shared_ptr<LVL1TGC::BigWheelCoincidenceLUT> m_bigWheelLUT;
TGCEIFICoincidenceMap* m_mapEIFI[NumberOfSide];
std::shared_ptr<LVL1TGC::TGCTileMuCoincidenceLUT> m_tileMuLUT;
std::array<std::array<std::array<std::shared_ptr<TGCNSWCoincidenceMap>, NumberOfModuleInBW>, NumberOfOctant>, NumberOfSide> m_mapNSW;
@@ -83,6 +85,7 @@ class TGCDatabaseManager : public AthMessaging
TGCConnectionASDToPP* m_ASDToPP[NumberOfRegionType][TGCSector::NumberOfPatchPanelType][TotalNumForwardBackwardType];
std::shared_ptr<TGCGoodMF> m_mapGoodMF;
+ std::array<std::array<std::shared_ptr<TGCRPhiCoincidenceMap>, NumberOfOctant>,NumberOfSide> m_mapRphi;
std::shared_ptr<LVL1TGC::Run2TileMuCoincidenceMap> m_mapRun2TileMu;
std::map<PatchPanelIDs, std::pair<const TGCConnectionInPP, PatchPanelPointers> > m_patchPanelToConnectionInPP;
@@ -90,54 +93,46 @@ class TGCDatabaseManager : public AthMessaging
TGCArguments* m_tgcArgs;
};
-inline
-std::shared_ptr<TGCRPhiCoincidenceMap> TGCDatabaseManager::getRPhiCoincidenceMap(const int sideId, const int octantId) const
+inline std::shared_ptr<LVL1TGC::BigWheelCoincidenceLUT> TGCDatabaseManager::getBigWheelCoincidenceLUT() const
{
- return m_mapRphi[sideId][octantId];
+ return m_bigWheelLUT;
}
-inline
-const TGCEIFICoincidenceMap* TGCDatabaseManager::getEIFICoincidenceMap(int sideId) const
+inline const TGCEIFICoincidenceMap* TGCDatabaseManager::getEIFICoincidenceMap(int sideId) const
{
return m_mapEIFI[sideId];
}
-inline
- std::shared_ptr<LVL1TGC::TGCTileMuCoincidenceLUT> TGCDatabaseManager::getTileMuCoincidenceLUT() const
+inline std::shared_ptr<LVL1TGC::TGCTileMuCoincidenceLUT> TGCDatabaseManager::getTileMuCoincidenceLUT() const
{
return m_tileMuLUT;
}
-inline
-std::shared_ptr<TGCNSWCoincidenceMap> TGCDatabaseManager::getNSWCoincidenceMap(int sideId, int octantId, int moduleId) const
+inline std::shared_ptr<TGCNSWCoincidenceMap> TGCDatabaseManager::getNSWCoincidenceMap(int sideId, int octantId, int moduleId) const
{
return m_mapNSW[sideId][octantId][moduleId];
}
-inline
-std::shared_ptr<TGCGoodMF> TGCDatabaseManager::getGoodMFMap() const
-{
- return m_mapGoodMF;
+inline std::shared_ptr<TGCGoodMF> TGCDatabaseManager::getGoodMFMap() const {
+ return m_mapGoodMF;
}
-inline
- const TGCConnectionPPToSL* TGCDatabaseManager::getConnectionPPToSL(TGCRegionType type) const
-{
+inline const TGCConnectionPPToSL* TGCDatabaseManager::getConnectionPPToSL(TGCRegionType type) const {
return m_PPToSL[type-1];
}
-inline
- const TGCConnectionASDToPP* TGCDatabaseManager::getConnectionASDToPP(TGCRegionType region, int type, TGCForwardBackwardType forwardBackward) const
-{
+inline const TGCConnectionASDToPP* TGCDatabaseManager::getConnectionASDToPP(TGCRegionType region, int type, TGCForwardBackwardType forwardBackward) const {
return m_ASDToPP[region-1][type][forwardBackward];
}
-inline
- std::shared_ptr<LVL1TGC::Run2TileMuCoincidenceMap> TGCDatabaseManager::getRun2TileMuCoincidenceMap() const
-{
+inline std::shared_ptr<TGCRPhiCoincidenceMap> TGCDatabaseManager::getRPhiCoincidenceMap(const int sideId, const int octantId) const {
+ return m_mapRphi[sideId][octantId];
+}
+
+inline std::shared_ptr<LVL1TGC::Run2TileMuCoincidenceMap> TGCDatabaseManager::getRun2TileMuCoincidenceMap() const {
return m_mapRun2TileMu;
}
-} //end of namespace bracket
+} // end of LVL1TGCTrigger namespace
#endif // TGCDatabaseManager_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCNumbering.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCNumbering.h
index df97becb2a42..c9157dd87d0c 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCNumbering.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCNumbering.h
@@ -1,12 +1,22 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef TGCNumbering_hh
-#define TGCNumbering_hh
+#ifndef TrigT1TGC_TGCNumbering_h
+#define TrigT1TGC_TGCNumbering_h
#include <string>
+namespace LVL1TGC {
+
+/** The number of sides of TGC (A- or C-side) */
+static constexpr unsigned int kNSide = 2;
+
+/** The number of octants per side */
+static constexpr unsigned kNOctant = 8;
+
+} // namespace LVL1TGC
+
namespace LVL1TGCTrigger {
enum TGCZDirection {
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceMap.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceMap.h
index ac26c9bc229a..0f14d794a6e9 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceMap.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceMap.h
@@ -39,10 +39,6 @@ class TGCRPhiCoincidenceMap
uint8_t test(int octantId, int moduleId, int subsector,
int type, int dr, int dphi) const;// for Run2
- int test_Run3(int octantId, int moduleId, int subsector,
- int type, int dr, int dphi) const; //for Run3
-
-
int getMapType(int hlwire, int hlstrip) const;
const std::string& getVersion() const;
int getSideId() const;
@@ -52,8 +48,6 @@ class TGCRPhiCoincidenceMap
TGCRPhiCoincidenceMap(TGCArguments*,
const SG::ReadCondHandleKey<TGCTriggerData>& readCondKey,
- const SG::ReadCondHandleKey<TGCTriggerLUTs>& readLUTsCondKey,
- const std::string& version,
int sideId=0, int octantId=0);
virtual ~TGCRPhiCoincidenceMap();
@@ -63,7 +57,6 @@ class TGCRPhiCoincidenceMap
TGCRPhiCoincidenceMap& operator=(const TGCRPhiCoincidenceMap& right);
bool readMap(); // for Run2
- bool readMap_Run3();// for Run3
const TGCArguments* tgcArgs() const;
@@ -71,7 +64,6 @@ class TGCRPhiCoincidenceMap
TGCRPhiCoincidenceMap() = delete;
protected:
- bool checkVersion();
int PHIPOS(int iphi, int type) const;
int SUBSECTORADD(int ssid, int modid, int phimod2, int type) const;
@@ -94,8 +86,6 @@ class TGCRPhiCoincidenceMap
private:
std::unordered_map<uint32_t, uint8_t> m_ptmap;
- std::map<int, std::map<int, std::map<int, char> > > m_mapDB_Run3;//for Run3 <RoI(&type),<R,<Phi,pT(char)> > >
-
int m_numberOfDR,m_numberOfDPhi;
@@ -107,9 +97,6 @@ class TGCRPhiCoincidenceMap
TGCArguments* m_tgcArgs;
const SG::ReadCondHandleKey<TGCTriggerData>& m_readCondKey;
- const SG::ReadCondHandleKey<TGCTriggerLUTs>& m_readLUTsCondKey;
-
-
};
inline
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceMatrix.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceMatrix.h
index 2e02d73386ef..8427a5b3b4d1 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceMatrix.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/TGCRPhiCoincidenceMatrix.h
@@ -6,18 +6,23 @@
#define TGCRPhiCoincidenceMatrix_hh
#include "TrigT1TGC/TGCSSCControllerOut.h"
-#include "TrigT1TGC/TGCRPhiCoincidenceMap.h"
#include "TrigT1TGC/TGCArguments.h"
+namespace LVL1TGC {
+class BigWheelCoincidenceLUT;
+}
+
namespace LVL1TGCTrigger {
+class TGCRPhiCoincidenceMap;
class TGCSectorLogic;
class TGCRPhiCoincidenceOut;
class TGCRPhiCoincidenceMatrix {
-public:
+ public:
void setSSCId(int SSCIdIn){ m_SSCId=SSCIdIn;};
void setSideId(int sideIdIn){ m_sideId=sideIdIn;};
+ void setCoincidenceLUT(std::shared_ptr<const LVL1TGC::BigWheelCoincidenceLUT> lut);
void setRPhiMap(std::shared_ptr<const TGCRPhiCoincidenceMap> map);
void inputR(int rIn, int dRIn, int ptRIn);
void inputPhi(int phiIn, int dPhiIn, int ptPhiIn);
@@ -27,18 +32,18 @@ public:
TGCRPhiCoincidenceMatrix(const TGCArguments*, const TGCSectorLogic* sL=0);
virtual ~TGCRPhiCoincidenceMatrix();
- TGCRPhiCoincidenceMatrix(const TGCRPhiCoincidenceMatrix& right);
+ TGCRPhiCoincidenceMatrix(const TGCRPhiCoincidenceMatrix& right) = default;
TGCRPhiCoincidenceMatrix& operator=(const TGCRPhiCoincidenceMatrix& right);
const TGCArguments* tgcArgs() const { return m_tgcArgs; }
-private:
-
+ private:
enum {MaxNPhiHit = 2};
const TGCSectorLogic* m_sectorLogic;
TGCRPhiCoincidenceOut* m_matrixOut;
+ std::shared_ptr<const LVL1TGC::BigWheelCoincidenceLUT> m_lut;
std::shared_ptr<const TGCRPhiCoincidenceMap> m_map;
int m_nPhiHit;
@@ -54,7 +59,7 @@ private:
const TGCArguments* m_tgcArgs;
};
-} //end of namespace bracket
+} // LVL1TGCTrigger namespace
#endif // TGCRPhiCoincidenceMatrix_hh
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCDatabaseManager.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCDatabaseManager.cxx
index 41f5051fb5f9..ed616dda5fbe 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCDatabaseManager.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCDatabaseManager.cxx
@@ -5,7 +5,7 @@
#include "TrigT1TGC/TGCDatabaseManager.h"
#include "TrigT1TGC/TGCArguments.h"
#include "TrigT1TGC/TGCConnectionPPToSL.h"
-#include "TrigT1TGC/TGCRPhiCoincidenceMap.h"
+#include "TrigT1TGC/BigWheelCoincidenceLUT.h"
#include "TrigT1TGC/TGCEIFICoincidenceMap.h"
#include "TrigT1TGC/TGCTileMuCoincidenceLUT.h"
#include "TrigT1TGC/TGCNSWCoincidenceMap.h"
@@ -13,6 +13,7 @@
#include "TrigT1TGC/TGCConnectionASDToPP.h"
#include "TrigT1TGC/TGCConnectionInPP.h"
#include "TrigT1TGC/TGCPatchPanel.h"
+#include "TrigT1TGC/TGCRPhiCoincidenceMap.h"
#include "TrigT1TGC/Run2TileMuCoincidenceMap.h"
#include "AthenaBaseComps/AthMsgStreamMacros.h"
@@ -140,13 +141,6 @@ TGCDatabaseManager::TGCDatabaseManager(TGCArguments* tgcargs,
ver_HotRoI = "v" + vers[0];
}
- // RPhi Coincidence Map
- for (int side=0; side<NumberOfSide; side +=1) {
- for (int oct=0; oct<NumberOfOctant; oct++) {
- m_mapRphi[side][oct].reset(new TGCRPhiCoincidenceMap(tgcArgs(),readCondKey,readLUTsCondKey, ver_BW, side, oct));
- }
- }
-
// EIFI Coincidence Map
ATH_MSG_DEBUG("start to create EIFI coincidence map.");
for (int side=0; side<NumberOfSide; side +=1) {
@@ -154,6 +148,9 @@ TGCDatabaseManager::TGCDatabaseManager(TGCArguments* tgcargs,
}
if(tgcArgs()->useRun3Config()){
+ // Big Wheel Coincidence LUT
+ m_bigWheelLUT.reset(new LVL1TGC::BigWheelCoincidenceLUT(tgcArgs(), readLUTsCondKey, ver_BW));
+
// Tile-Muon LUT
m_tileMuLUT.reset(new LVL1TGC::TGCTileMuCoincidenceLUT(tgcArgs(), readCondKey, ver_TILE));
@@ -173,6 +170,13 @@ TGCDatabaseManager::TGCDatabaseManager(TGCArguments* tgcargs,
m_mapGoodMF.reset(new TGCGoodMF(tgcArgs(),ver_HotRoI));
} else { // for Run-2
+ // RPhi Coincidence Map (available on DB)
+ for (int side=0; side<NumberOfSide; side +=1) {
+ for (int oct=0; oct<NumberOfOctant; oct++) {
+ m_mapRphi[side][oct].reset(new TGCRPhiCoincidenceMap(tgcArgs(),readCondKey, side, oct));
+ }
+ }
+
// Tile-Muon Coincidence Map (available on DB)
m_mapRun2TileMu.reset(new LVL1TGC::Run2TileMuCoincidenceMap(readCondKey));
}
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMap.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMap.cxx
index 71a19563d221..6deaccc72d88 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMap.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMap.cxx
@@ -62,148 +62,31 @@ uint8_t TGCRPhiCoincidenceMap::test(int octantId, int moduleId, int subsector,
}
-int TGCRPhiCoincidenceMap::test_Run3(int octantId, int moduleId, int subsector,
- int type, int dr, int dphi) const
-{
- // check pt range
- if (type<0 || type>=N_TMap ) return false;
-
- int sector=(moduleId-2)/3+octantId*3;
- int phimod2 = (moduleId==2||moduleId==5||moduleId==8)&&(sector%2==1) ? 1 : 0;
- int addr=SUBSECTORADD(subsector, moduleId, phimod2,type);
-
- SG::ReadCondHandle<TGCTriggerLUTs> readHandle{m_readLUTsCondKey};
- const TGCTriggerLUTs* readCdo{*readHandle};
-
- std::map<int, std::map<int, std::map<int, char> > > readMap;
-
- if (tgcArgs()->USE_CONDDB()){
- readMap = readCdo->getReadMapBw(m_side, m_octant);
- } else {
- readMap = m_mapDB_Run3;
- }
-
- std::map<int, std::map<int, std::map<int, char> > >::const_iterator it=readMap.find(addr);
- if (it==readMap.end()) return false;
-
- std::map<int, std::map<int, char> > mapR = it->second;
- std::map<int, std::map<int, char> >::const_iterator itR=mapR.find(dr);
- if (itR==mapR.end()) return false;
-
- std::map<int, char> mapPhi = itR->second;
- std::map<int, char>::const_iterator itPhi=mapPhi.find(dphi);
- if (itPhi==mapPhi.end()) return false;
-
- char pT_char=itPhi->second;
- int pT_int=m_pTdef.find(pT_char)->second;
-
- return pT_int;
-}
-
-
TGCRPhiCoincidenceMap::TGCRPhiCoincidenceMap(TGCArguments* tgcargs,
const SG::ReadCondHandleKey<TGCTriggerData>& readCondKey,
- const SG::ReadCondHandleKey<TGCTriggerLUTs>& readLUTsCondKey,
- const std::string& version,
int sideId, int octantId)
: m_numberOfDR(0), m_numberOfDPhi(0),
- m_verName(version),
m_side(sideId),
m_octant(octantId),
m_fullCW(false),
m_tgcArgs(tgcargs),
- m_readCondKey(readCondKey),
- m_readLUTsCondKey(readLUTsCondKey)
+ m_readCondKey(readCondKey)
{
if (!tgcArgs()->USE_CONDDB()) {
if(!tgcArgs()->useRun3Config()){
- if (!checkVersion()){
- m_verName = "NA";
- return;
- }
this->readMap(); // read Coincidence Map for Run2 (6 thresholds)
- } else {
- this->readMap_Run3();// read Coincidence Map for Run3 (15 thresholds)
}
}
}
-bool TGCRPhiCoincidenceMap::checkVersion()
-{
- IMessageSvc* msgSvc = 0;
- ISvcLocator* svcLocator = Gaudi::svcLocator();
- if (svcLocator->service("MessageSvc", msgSvc) == StatusCode::FAILURE) {
- return false;
- }
- MsgStream log(msgSvc, "TGCRPhiCoincidenceMap::TGCRPhiCoincidenceMap");
-
- // select right database according to a set of thresholds
- std::string dbname="";
- dbname = "RPhiCoincidenceMap."+m_verName+"._12.db";
-
- //-----
- std::string fullName;
- fullName = PathResolver::find_file( dbname.c_str(), "DATAPATH" );
- bool isFound =( fullName.length() > 0 );
- if (!isFound) {
- if (tgcArgs()->MSGLEVEL() <= MSG::DEBUG) {
- log << MSG::DEBUG
- << " Could not found " << dbname.c_str()
- << " Default set is chosen !!" << endmsg;
- }
- // default set
- m_verName = "v000f";
- dbname = "RPhiCoincidenceMap."+m_verName+"._12.db";
- fullName = PathResolver::find_file( dbname.c_str(), "DATAPATH" );
- isFound =( fullName.length() > 0 );
- }
- if (!isFound) {
- log << MSG::INFO
- << " Could not found " << dbname.c_str() << endmsg;
- return false;
- }
-
- std::ifstream file(fullName.c_str());
- std::string buf;
-
- //--- read RPhiCoincidence.XXX.db
- int maxpt[N_PT_THRESH]={0,0,0,0,0,0};
-
- while( getline(file,buf) ) {
- if( buf.size()>3 && buf.substr(0,1)=="#" ) {
- std::istringstream ist(buf.substr(1));
- int level = 0 ;
- int ptv=0;
- ist >> level >> ptv;
- if (( level >0 ) && (level <= N_PT_THRESH)) maxpt[level-1]=ptv;
- }
- }
- file.close();
-
- // use full CW (i.e. different maps for each octant and side)
- m_fullCW = (m_verName == "v0016" || m_verName == "v0017");
-
- ///////////
- log << MSG::INFO
- << " TGC Big Wheel CW version of " << m_verName << " is selected " << endmsg;
- for(int i=0; i<N_PT_THRESH; i++) {
- log << MSG::VERBOSE
- << "TGC Pt_Thr: " << std::setw(2) << i+1
- << " pt(used)=" << std::setw(3) << maxpt[i]
- << endmsg;
- }
- return true;
-}
-
TGCRPhiCoincidenceMap::~TGCRPhiCoincidenceMap()
{
}
TGCRPhiCoincidenceMap::TGCRPhiCoincidenceMap(const TGCRPhiCoincidenceMap& right)
- : m_readCondKey(right.m_readCondKey)
- , m_readLUTsCondKey(right.m_readLUTsCondKey)
+: m_readCondKey(right.m_readCondKey)
{
m_numberOfDR=right.m_numberOfDR;
m_numberOfDPhi=right.m_numberOfDPhi;
@@ -212,7 +95,6 @@ TGCRPhiCoincidenceMap::TGCRPhiCoincidenceMap(const TGCRPhiCoincidenceMap& right)
m_octant=right.m_octant;
m_fullCW=right.m_fullCW;
if(m_verName!="NA" && !tgcArgs()->useRun3Config()) this->readMap(); // read Coincidence Map for Run2 (6 thresholds)
- if(m_verName!="NA" && tgcArgs()->useRun3Config()){this -> readMap_Run3();}// read Coincidence Map for Run3 (15 thresholds)
}
@@ -226,7 +108,6 @@ TGCRPhiCoincidenceMap& TGCRPhiCoincidenceMap::operator=(const TGCRPhiCoincidence
m_octant=right.m_octant;
m_fullCW=right.m_fullCW;
if(m_verName!="NA" && !tgcArgs()->useRun3Config()) this->readMap(); // read Coincidence Map for Run2 (6 thresholds)
- if(m_verName!="NA" && tgcArgs()->useRun3Config()){ this -> readMap_Run3();} // read Coincidence Map for Run3 (15 thresholds)
}
return *this;
@@ -331,122 +212,4 @@ bool TGCRPhiCoincidenceMap::readMap()
}
-bool TGCRPhiCoincidenceMap::readMap_Run3()
-{
- const int moduleNumber[NumberOfModuleType] =
- { 0, 1, 2, 2, 3, 4, 5, 5, 6, 7, 8, 8 };
- const std::string moduleName[NumberOfModuleType]=
- {"0a","1a","2a","2b","3a","4a","5a","5b","6a","7a","8a","8b"};
- const std::string sideName[NumberOfSide] = {"a","c"};
- const std::string octantName[NumberOfOctant] =
- { "0", "1", "2", "3", "4", "5", "6", "7"};
- const std::string coincidenceTypeName[NumberOfCoincidenceType] = {"HH","HL","LH","LL"};
-
-
- IMessageSvc* msgSvc = 0;
- ISvcLocator* svcLocator = Gaudi::svcLocator();
- if (svcLocator->service("MessageSvc", msgSvc) == StatusCode::FAILURE) {
- return false;
- }
- MsgStream log(msgSvc, "TGCRPhiCoincidenceMap::TGCRPhiCoincidenceMap");
-
-
- // initialize
- std::string buf;
- std::string fn, fullName, tag;
- int ssId;
- char delimiter = '\n';
-
- // loop over all files...
- for(int iModule=0; iModule<NumberOfModuleType; iModule+=1) {
- for(int iCoinType=0; iCoinType!=NumberOfCoincidenceType; iCoinType++){
- int phimod2=moduleName[iModule].find("b")!=std::string::npos ? 1 : 0;
- std::string fn;
- if (m_fullCW) {
- fn = "/BW/cm_"+ sideName[m_side]+octantName[m_octant]+moduleName[iModule]+coincidenceTypeName[iCoinType]+"_"+m_verName+".db";}
- else{
- fn = "/BW/cm_"+ sideName[m_side]+moduleName[iModule]+coincidenceTypeName[iCoinType]+"_Octant_"+m_verName+".db";
- }
- bool Forward_type1=(moduleName[iModule]=="2b"||moduleName[iModule]=="5a"||moduleName[iModule]=="8b");
- bool Forward_type2=(moduleName[iModule]=="2a"||moduleName[iModule]=="5b"||moduleName[iModule]=="8a");
- if(m_octant%2==0 && Forward_type1){continue;}
- if(m_octant%2==1 && Forward_type2){continue;}
- int type = -1;
- int lDR, hDR, lDPhi, hDPhi;
-
- fullName = PathResolver::FindCalibDirectory("dev")+"/TrigT1TGC"+fn;
- if( fullName.length() == 0 ) {
- log << MSG::ERROR
- << " Could not found "
- << fn.c_str()
- <<endmsg;
- continue;
- }
-
- std::ifstream file(fullName.c_str(),std::ios::in);
- if(!file){
- log << MSG::ERROR
- << " Could not found "
- << fullName.c_str()
- <<endmsg;
- continue;
- }
- while(getline(file,buf,delimiter)){
- std::istringstream header(buf);
- header>>tag;
- if(tag=="#") { // read header part.
- header>>ssId>>lDR>>hDR>>lDPhi>>hDPhi;
- type = getTYPE( lDR, hDR, lDPhi, hDPhi );
- // check moduleNumber and ptLevel
- if( type<0 ) {
- log << MSG::WARNING
- << " illegal parameter in database header : "
- << header.str()
- <<" in file "
- << fn
- <<endmsg;
- break;
- }
-
- // get window data
- std::map<int, std::map<int, char> > bWindow;//<R,<~>>
- char pT;
- for(int ir=0; ir<=hDR-lDR; ir++) {
- getline(file,buf,delimiter);
- std::map<int, char> aWindow;//<Phi,pT>
- for(int iphi=0; iphi<=hDPhi-lDPhi; iphi++){
- pT = buf[iphi];
- if (pT=='X'){continue;} // none of window is opened in this dR
- aWindow[iphi+DPhi_offset] = pT;
- }
- // Warning : no window
- if (aWindow.size()==0) {
- log << MSG::DEBUG
- << " No window is opened for (ptLevel,ssId,mod) = ("
- << ssId
- <<" ) "
- <<endmsg;
- } else {
- bWindow[ir+DR_offset]=aWindow;
- }
- }
-
- int addr = SUBSECTORADD(ssId,moduleNumber[iModule],phimod2,type);
- if (m_mapDB_Run3.find(addr)!=m_mapDB_Run3.end()) {
- log << MSG::DEBUG
- << " This subsector was already reserved."
- <<endmsg;
- } else {
- m_mapDB_Run3[addr]=bWindow;
- }
- }
- }
-
- }
- }
- return true;
-
-}
-
-
} //end of namespace bracket
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMatrix.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMatrix.cxx
index 2fd89ba0fb2f..5cd57e94601a 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMatrix.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCRPhiCoincidenceMatrix.cxx
@@ -1,13 +1,16 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "TrigT1TGC/TGCRPhiCoincidenceMatrix.h"
+
+#include <iostream>
+#include <cstdlib>
+
#include "TrigT1TGC/TGCRPhiCoincidenceOut.h"
+#include "TrigT1TGC/BigWheelCoincidenceLUT.h"
#include "TrigT1TGC/TGCRPhiCoincidenceMap.h"
#include "TrigT1TGC/TGCSectorLogic.h"
-#include <iostream>
-#include <cstdlib>
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/Bootstrap.h"
@@ -78,23 +81,21 @@ TGCRPhiCoincidenceOut* TGCRPhiCoincidenceMatrix::doCoincidence()
} else {
subsector = 4*(2*m_SSCId+m_r)+m_phi[j];
}
-
- int type = m_map->getMapType(m_ptR, m_ptPhi[j]);
// calculate pT of muon candidate
uint8_t ptOut = 0; // 0 is no candidate.
- if(tgcArgs()->useRun3Config()){
- //Algorithm for Run3
- int pt=m_map->test_Run3(m_sectorLogic->getOctantID(),m_sectorLogic->getModuleID(),
- subsector,type,m_dR,m_dPhi[j]); // this function will be implemented.
+ if(tgcArgs()->useRun3Config()){ // for Run-3
+ int type = m_lut->getMapType(m_ptR, m_ptPhi[j]);
+ int pt = m_lut->test(m_sectorLogic->getOctantID(), m_sectorLogic->getModuleID(),
+ subsector,type,m_dR,m_dPhi[j]);
ptOut = std::abs(pt);
chargeOut = pt<0 ? 0:1;
// the charge is inverted on the C-side.
chargeOut = m_sideId == 0 ? chargeOut : !chargeOut;
CoincidenceTypeOut=(type==0);
-
} else { // for Run-2
+ int type = m_map->getMapType(m_ptR, m_ptPhi[j]);
ptOut = m_map->test(m_sectorLogic->getOctantID(),
m_sectorLogic->getModuleID(), subsector,
type, m_dR, m_dPhi[j]);
@@ -141,14 +142,17 @@ TGCRPhiCoincidenceOut* TGCRPhiCoincidenceMatrix::doCoincidence()
return out;
}
-void TGCRPhiCoincidenceMatrix::setRPhiMap(std::shared_ptr<const TGCRPhiCoincidenceMap> map)
-{
+void TGCRPhiCoincidenceMatrix::setCoincidenceLUT(std::shared_ptr<const LVL1TGC::BigWheelCoincidenceLUT> lut) {
+ this->m_lut = lut;
+}
+
+void TGCRPhiCoincidenceMatrix::setRPhiMap(std::shared_ptr<const TGCRPhiCoincidenceMap> map) {
this->m_map = map;
}
TGCRPhiCoincidenceMatrix::TGCRPhiCoincidenceMatrix(const TGCArguments* tgcargs,const TGCSectorLogic* sL)
: m_sectorLogic(sL),
- m_matrixOut(0), m_map(0),
+ m_matrixOut(0), m_lut(0), m_map(0),
m_nPhiHit(0), m_SSCId(0), m_r(0), m_dR(0), m_ptR(0), m_sideId(0), m_tgcArgs(tgcargs)
{
for (int i=0; i<MaxNPhiHit; i++) {
@@ -161,7 +165,6 @@ TGCRPhiCoincidenceMatrix::TGCRPhiCoincidenceMatrix(const TGCArguments* tgcargs,c
TGCRPhiCoincidenceMatrix::~TGCRPhiCoincidenceMatrix()
{
m_matrixOut=0;
- m_map = 0;
}
TGCRPhiCoincidenceMatrix& TGCRPhiCoincidenceMatrix::operator=(const TGCRPhiCoincidenceMatrix& right)
@@ -184,12 +187,4 @@ TGCRPhiCoincidenceMatrix& TGCRPhiCoincidenceMatrix::operator=(const TGCRPhiCoinc
return *this;
}
-TGCRPhiCoincidenceMatrix::TGCRPhiCoincidenceMatrix(const TGCRPhiCoincidenceMatrix& right)
- : m_sectorLogic(0),
- m_matrixOut(0), m_map(0),
- m_nPhiHit(0), m_SSCId(0), m_r(0), m_dR(0), m_ptR(0)
-{
- *this = right;
-}
-
} //end of namespace bracket
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCSectorLogic.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCSectorLogic.cxx
index 3fb8c9bff71a..13cf02ae2755 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCSectorLogic.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCSectorLogic.cxx
@@ -63,14 +63,15 @@ TGCSectorLogic::TGCSectorLogic(TGCArguments* tgcargs, const TGCDatabaseManager*
m_SSCController.setRegion(regionIn);
m_matrix.setSideId(m_sideId);
- m_matrix.setRPhiMap(db->getRPhiCoincidenceMap(m_sideId, m_octantId));
m_mapEIFI = db->getEIFICoincidenceMap(m_sideId);
m_useTileMu = tgcArgs()->TILE_MU() && (m_region==ENDCAP);
if(tgcArgs()->useRun3Config()) {
+ m_matrix.setCoincidenceLUT(db->getBigWheelCoincidenceLUT());
m_tileMuLUT = db->getTileMuCoincidenceLUT();
m_useTileMu = (m_tileMuLUT != nullptr) && m_useTileMu;
} else {
+ m_matrix.setRPhiMap(db->getRPhiCoincidenceMap(m_sideId, m_octantId));
m_mapRun2TileMu = db->getRun2TileMuCoincidenceMap();
m_useTileMu = (m_mapRun2TileMu != nullptr) && m_useTileMu;
}
--
GitLab
From a866ba3b4777713781530edd0e53bc84e4fc06f4 Mon Sep 17 00:00:00 2001
From: Junpei Maeda <junpei.maeda@cern.ch>
Date: Thu, 12 Aug 2021 15:54:53 +0200
Subject: [PATCH 018/272] removed a few lines which are commented out
---
Trigger/TrigT1/TrigT1TGC/src/BigWheelCoincidenceLUT.cxx | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/Trigger/TrigT1/TrigT1TGC/src/BigWheelCoincidenceLUT.cxx b/Trigger/TrigT1/TrigT1TGC/src/BigWheelCoincidenceLUT.cxx
index 2087678bfc36..946702268e4a 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/BigWheelCoincidenceLUT.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/BigWheelCoincidenceLUT.cxx
@@ -129,10 +129,7 @@ bool BigWheelCoincidenceLUT::readMap()
fn += sideName[m_side]+moduleName[iModule]+coincidenceTypeName[iCoinType]+"_Octant_";
}
fn += m_verName + ".db";
-// bool Forward_type1=(moduleName[iModule]=="2b"||moduleName[iModule]=="5a"||moduleName[iModule]=="8b");
-// bool Forward_type2=(moduleName[iModule]=="2a"||moduleName[iModule]=="5b"||moduleName[iModule]=="8a");
-// if(m_octant%2==0 && Forward_type1){continue;}
-// if(m_octant%2==1 && Forward_type2){continue;}
+
int type = -1;
int lDR, hDR, lDPhi, hDPhi;
--
GitLab
From 6361ca58be8324b425773cfa2e1022807ad5df9a Mon Sep 17 00:00:00 2001
From: Christos Anastopoulos <christos.anastopoulos@cern.ch>
Date: Thu, 12 Aug 2021 14:18:26 +0000
Subject: [PATCH 019/272] Revert "Merge branch
'ATLASRECTS-6530_disable_when_doIP_false' into 'master'"
This reverts merge request !45626
---
.../src/IDAlignMonGenericTracksAlg.cxx | 8 ++--
.../src/IDAlignMonGenericTracksAlg.h | 11 ++---
.../data/master_q431_AOD_digest_500events.ref | 44 +++++++++----------
3 files changed, 28 insertions(+), 35 deletions(-)
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.cxx b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.cxx
index 61c4c48ec108..0230dc4d97d9 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.cxx
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.cxx
@@ -101,13 +101,11 @@ StatusCode IDAlignMonGenericTracksAlg::initialize()
ATH_MSG_DEBUG("Hit quality tool setup - hit quality cuts will be applied to Si hits");
m_doHitQuality = true;
}
-
+
if (m_doIP) {
- ATH_CHECK(m_trackToVertexIPEstimator.retrieve());
- } else {
- m_trackToVertexIPEstimator.disable();
+ ATH_CHECK (m_trackToVertexIPEstimator.retrieve());
}
-
+
if ( m_beamSpotKey.initialize().isFailure() ) {
ATH_MSG_WARNING("Failed to retrieve beamspot service " << m_beamSpotKey << " - will use nominal beamspot at (0,0,0)");
m_hasBeamCondSvc = false;
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.h b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.h
index c660a7908319..3aa15c7378a3 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.h
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.h
@@ -93,14 +93,9 @@ private:
ToolHandle<InDet::IInDetTrackSelectionTool> m_trackSelection; // baseline
ToolHandle<IInDetAlignHitQualSelTool> m_hitQualityTool;
- //doIP false disables this one
- ToolHandle<Trk::ITrackToVertexIPEstimator> m_trackToVertexIPEstimator{
- this,
- "TrackToVertexIPEstimator",
- "Trk::TrackToVertexIPEstimator",
- ""
- };
-
+ PublicToolHandle< Trk::ITrackToVertexIPEstimator > m_trackToVertexIPEstimator
+ {this,"TrackToVertexIPEstimator","Trk::TrackToVertexIPEstimator",""};
+
std::string m_Pixel_Manager;
std::string m_SCT_Manager;
std::string m_TRT_Manager;
diff --git a/Tools/PROCTools/data/master_q431_AOD_digest_500events.ref b/Tools/PROCTools/data/master_q431_AOD_digest_500events.ref
index 4f6bb1c57f28..851baef8f070 100644
--- a/Tools/PROCTools/data/master_q431_AOD_digest_500events.ref
+++ b/Tools/PROCTools/data/master_q431_AOD_digest_500events.ref
@@ -3,7 +3,7 @@
330470 1183722156 360 388 1 3 0 3 12 0 12
330470 1183722158 1 0 0 0 0 0 0 0 0
330470 1183722342 394 429 0 2 0 2 15 0 15
- 330470 1183723134 463 502 4 3 0 3 16 0 16
+ 330470 1183723134 463 502 5 3 0 3 16 0 16
330470 1183723677 583 584 3 13 0 13 33 0 33
330470 1183724572 518 627 4 7 0 7 15 0 15
330470 1183725127 367 460 2 9 0 9 16 0 16
@@ -55,15 +55,15 @@
330470 1183745001 320 380 0 10 0 10 12 0 12
330470 1183745791 361 401 0 19 0 19 20 0 20
330470 1183745889 371 380 1 5 0 5 10 0 10
- 330470 1183746019 446 489 0 7 0 7 24 0 24
- 330470 1183746343 492 495 0 3 0 3 16 0 16
+ 330470 1183746019 446 489 1 7 0 7 24 0 24
+ 330470 1183746343 492 495 1 3 0 3 16 0 16
330470 1183746391 364 441 2 15 0 15 20 0 20
330470 1183746668 459 380 0 7 0 7 20 0 20
330470 1183746710 6 0 0 0 0 0 0 0 0
330470 1183746776 348 356 1 9 0 9 27 0 27
330470 1183747953 302 377 2 4 0 4 10 0 10
330470 1183748096 455 491 0 5 0 5 17 0 17
- 330470 1183748136 663 654 1 12 0 12 26 0 26
+ 330470 1183748136 663 654 2 12 0 12 26 0 26
330470 1183748263 396 410 3 8 0 8 16 0 16
330470 1183748421 460 422 1 8 0 8 15 0 15
330470 1183748705 490 523 2 9 0 9 20 0 20
@@ -71,8 +71,8 @@
330470 1183750781 377 365 1 5 0 5 16 0 16
330470 1183750906 702 757 3 10 0 10 29 0 29
330470 1183751782 239 246 0 0 0 0 6 0 6
- 330470 1183752624 347 366 3 5 0 5 15 0 15
- 330470 1183753006 357 398 2 4 0 4 14 0 14
+ 330470 1183752624 347 366 2 5 0 5 15 0 15
+ 330470 1183753006 357 398 3 4 0 4 14 0 14
330470 1183753030 398 352 2 23 0 23 20 0 20
330470 1183753541 400 453 2 8 0 8 11 0 11
330470 1183754806 470 424 0 2 0 2 17 0 17
@@ -142,7 +142,7 @@
330470 1183783921 518 489 1 22 0 22 32 0 32
330470 1183784212 561 538 0 36 0 36 28 0 28
330470 1183784686 458 490 7 5 0 5 23 0 23
- 330470 1183784788 350 327 3 18 0 18 16 0 16
+ 330470 1183784788 350 327 2 18 0 18 16 0 16
330470 1183785404 682 719 4 11 0 11 32 0 32
330470 1183786663 355 436 2 2 0 2 6 0 6
330470 1183787021 684 606 2 9 0 9 33 0 33
@@ -160,7 +160,7 @@
330470 1183792990 468 509 4 24 0 24 28 0 28
330470 1183793190 396 527 1 10 0 10 14 0 14
330470 1183793693 492 620 2 16 0 16 29 0 29
- 330470 1183793783 562 522 5 20 0 20 27 0 27
+ 330470 1183793783 562 522 6 20 0 20 27 0 27
330470 1183794278 454 558 0 7 0 7 9 0 9
330470 1183794508 448 473 2 17 0 17 19 0 19
330470 1183794655 393 364 1 3 0 3 5 0 5
@@ -235,7 +235,7 @@
330470 1183827424 359 352 1 22 0 22 16 0 16
330470 1183828215 521 413 2 12 0 12 30 0 30
330470 1183828765 562 596 4 4 0 4 25 0 25
- 330470 1183828961 522 572 3 4 0 4 19 0 19
+ 330470 1183828961 522 572 2 4 0 4 19 0 19
330470 1183829595 473 418 0 5 0 5 17 0 17
330470 1183829748 592 613 0 10 0 10 23 0 23
330470 1183830135 428 476 1 14 0 14 22 0 22
@@ -285,11 +285,11 @@
330470 1183852355 410 415 0 3 0 3 14 0 14
330470 1183852362 567 668 1 16 0 16 29 0 29
330470 1183852486 387 405 2 4 0 4 15 0 15
- 330470 1183852552 509 470 3 18 0 18 20 0 20
+ 330470 1183852552 509 470 4 18 0 18 20 0 20
330470 1183853281 404 390 2 5 0 5 14 0 14
330470 1183853303 555 525 5 6 0 6 25 0 25
- 330470 1183853317 313 327 5 4 0 4 15 0 15
- 330470 1183853842 629 584 1 10 0 10 28 0 28
+ 330470 1183853317 313 327 4 4 0 4 15 0 15
+ 330470 1183853842 629 584 2 10 0 10 28 0 28
330470 1183854086 313 362 1 6 0 6 11 0 11
330470 1183854099 444 521 0 2 0 2 13 0 13
330470 1183854665 506 450 0 6 0 6 14 0 14
@@ -333,7 +333,7 @@
330470 1183878363 529 583 5 15 0 15 26 0 26
330470 1183879080 615 646 3 9 0 9 30 0 30
330470 1183879154 597 628 4 8 0 8 28 0 28
- 330470 1183879547 423 439 3 0 0 0 13 0 13
+ 330470 1183879547 423 439 2 0 0 0 13 0 13
330470 1183879670 489 525 2 13 0 13 21 0 21
330470 1183879957 494 578 0 12 0 12 26 0 26
330470 1183880152 349 453 3 1 0 1 16 0 16
@@ -350,8 +350,8 @@
330470 1183884717 238 261 2 2 0 2 6 0 6
330470 1183885069 292 240 3 12 0 12 13 0 13
330470 1183885910 310 358 1 11 0 11 16 0 16
- 330470 1183889121 367 381 1 11 0 11 20 0 20
- 330470 1183889788 361 471 2 13 0 13 20 0 20
+ 330470 1183889121 367 381 3 11 0 11 20 0 20
+ 330470 1183889788 361 471 3 13 0 13 20 0 20
330470 1183890058 429 392 1 6 0 6 21 0 21
330470 1183890245 558 582 1 5 0 5 23 0 23
330470 1183891126 511 511 4 10 0 10 18 0 18
@@ -419,7 +419,7 @@
330470 1183931811 465 375 0 8 0 8 18 0 18
330470 1183932465 456 541 3 11 0 11 17 0 17
330470 1183933264 514 450 2 4 0 4 10 0 10
- 330470 1183934061 556 608 2 15 0 15 31 0 31
+ 330470 1183934061 556 608 1 15 0 15 31 0 31
330470 1183934188 559 640 0 11 0 11 28 0 28
330470 1183935176 505 635 1 7 0 7 21 0 21
330470 1183935243 406 422 3 15 0 15 26 0 26
@@ -431,12 +431,12 @@
330470 1183939219 533 500 2 9 0 9 16 0 16
330470 1183939285 273 161 0 5 0 5 8 0 8
330470 1183939881 561 508 3 6 0 6 22 0 22
- 330470 1183941479 270 333 1 2 0 2 6 0 6
+ 330470 1183941479 270 333 0 2 0 2 6 0 6
330470 1183943435 21 0 0 0 0 0 0 0 0
330470 1183944121 428 399 2 5 0 5 25 0 25
330470 1183944525 423 496 1 6 0 6 13 0 13
330470 1183946835 778 886 4 24 0 24 38 0 38
- 330470 1183949177 403 463 1 7 0 7 17 0 17
+ 330470 1183949177 403 463 0 7 0 7 17 0 17
330470 1183949782 548 522 2 12 0 12 20 0 20
330470 1183952907 561 642 4 9 0 9 16 0 16
330470 1183953399 578 478 0 13 0 13 31 0 31
@@ -455,14 +455,14 @@
330470 1183969905 585 593 1 14 0 14 23 0 23
330470 1183970393 350 359 0 8 0 8 14 0 14
330470 1183970582 174 223 1 2 0 2 5 0 5
- 330470 1183973235 544 533 1 5 0 5 17 0 17
+ 330470 1183973235 544 533 3 5 0 5 17 0 17
330470 1183974800 386 404 1 4 0 4 15 0 15
330470 1183975144 422 516 0 8 0 8 28 0 28
330470 1183977930 266 296 0 6 0 6 8 0 8
330470 1183979636 434 503 1 4 0 4 10 0 10
330470 1183982156 373 450 1 2 0 2 10 0 10
330470 1183982855 448 401 2 2 0 2 14 0 14
- 330470 1183983079 512 545 2 7 0 7 29 0 29
+ 330470 1183983079 512 545 1 7 0 7 29 0 29
330470 1183983113 387 382 1 3 0 3 17 0 17
330470 1183984897 342 293 0 14 0 14 15 0 15
330470 1183985311 421 572 1 12 0 12 12 0 12
@@ -477,7 +477,7 @@
330470 1183997552 522 536 0 4 0 4 23 0 23
330470 1183997623 408 325 2 6 0 6 14 0 14
330470 1183997905 350 317 0 1 0 1 6 0 6
- 330470 1184001332 450 406 6 11 0 11 26 0 26
+ 330470 1184001332 450 406 5 11 0 11 26 0 26
330470 1184003671 421 386 1 6 0 6 16 0 16
330470 1184007839 421 441 3 9 0 9 15 0 15
330470 1184010792 477 468 0 5 0 5 15 0 15
@@ -487,7 +487,7 @@
330470 1184014074 358 359 0 3 0 3 12 0 12
330470 1184016450 487 503 1 13 0 13 29 0 29
330470 1184019719 414 367 1 3 0 3 20 0 20
- 330470 1184020401 563 454 4 7 0 7 28 0 28
+ 330470 1184020401 563 454 3 7 0 7 28 0 28
330470 1184026109 415 333 0 11 0 11 20 0 20
330470 1184026603 601 609 2 6 0 6 26 0 26
330470 1184027737 477 484 0 0 0 0 16 0 16
--
GitLab
From 61eaa322782b06dbddb1d43aada98ec9b90dbfc0 Mon Sep 17 00:00:00 2001
From: Andrew Mehta <andrew.mehta@cern.ch>
Date: Thu, 12 Aug 2021 14:48:22 +0000
Subject: [PATCH 020/272] Update version.txt
---
Projects/AnalysisBase/version.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Projects/AnalysisBase/version.txt b/Projects/AnalysisBase/version.txt
index 74d877d8acde..bba25d9d92e1 100644
--- a/Projects/AnalysisBase/version.txt
+++ b/Projects/AnalysisBase/version.txt
@@ -1 +1 @@
-22.2.37
+22.2.38
--
GitLab
From 5da8016fe4833e53c21b206c527509a700423000 Mon Sep 17 00:00:00 2001
From: Andrew Mehta <andrew.mehta@cern.ch>
Date: Thu, 12 Aug 2021 14:48:35 +0000
Subject: [PATCH 021/272] Update version.txt
---
Projects/AthAnalysis/version.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Projects/AthAnalysis/version.txt b/Projects/AthAnalysis/version.txt
index 74d877d8acde..bba25d9d92e1 100644
--- a/Projects/AthAnalysis/version.txt
+++ b/Projects/AthAnalysis/version.txt
@@ -1 +1 @@
-22.2.37
+22.2.38
--
GitLab
From 67d7828f4f6df7f9806f10a4124ce95bca3aace7 Mon Sep 17 00:00:00 2001
From: Mark Hodgkinson <m.hodgkinson@sheffield.ac.uk>
Date: Thu, 12 Aug 2021 17:27:00 +0200
Subject: [PATCH 022/272] Update PhysVal tests to no longer run jet and met
validation (AOD no longer contain jet or met data). Also remvoe trigger
validaiton, which is not relevant for offline reco.
---
.../RecJobTransformTests/test/test_mc20e_13TeV_PhysValAll.sh | 2 +-
.../test/test_mc20e_13TeV_chainRecoPhysVal.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc20e_13TeV_PhysValAll.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc20e_13TeV_PhysValAll.sh
index b1fade29c623..53d4eb9623ef 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc20e_13TeV_PhysValAll.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc20e_13TeV_PhysValAll.sh
@@ -6,6 +6,6 @@
# art-include: master/Athena
export TRF_ECHO=True;
-Reco_tf.py --inputAODFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.AOD.e4993_s3227_r12649/myAOD.pool.root --outputNTUP_PHYSVALFile physval.root --validationFlags 'doExample,doMET,doPFlow_FlowElements,doTau,doEgamma,doBtag,doZee,doJet,doTopoCluster,doMuon,doTrigMinBias,doTrigIDtrk,doTrigBphys,doTrigMET,doTrigJet,doTrigTau, doTrigEgamma,doTrigMuon,doTrigBjet,doTrigHLTResult'
+Reco_tf.py --inputAODFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.AOD.e4993_s3227_r12649/myAOD.pool.root --outputNTUP_PHYSVALFile physval.root --validationFlags 'doExample,doPFlow_FlowElements,doTau,doEgamma,doBtag,doZee,doTopoCluster,doMuon'
RES=$?
echo "art-result: $RES Reco"
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc20e_13TeV_chainRecoPhysVal.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc20e_13TeV_chainRecoPhysVal.sh
index c58122a95295..5c9f383b90b0 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc20e_13TeV_chainRecoPhysVal.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc20e_13TeV_chainRecoPhysVal.sh
@@ -15,7 +15,7 @@ Reco_tf.py --AMI=r12806 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.po
RES=$?
echo "art-result: $RES Reco"
-Reco_tf.py --inputAODFile=myAOD.pool.root --outputNTUP_PHYSVALFile physval.root --validationFlags 'doExample,doMET,doPFlow_FlowElements,doTau,doEgamma,doBtag,doZee,doJet,doTopoCluster,doMuon,doTrigMinBias,doTrigIDtrk,doTrigBphys,doTrigMET,doTrigJet,doTrigTau, doTrigEgamma,doTrigMuon,doTrigBjet,doTrigHLTResult'
+Reco_tf.py --inputAODFile=myAOD.pool.root --outputNTUP_PHYSVALFile physval.root --validationFlags 'doExample,doPFlow_FlowElements,doTau,doEgamma,doBtag,doZee,doTopoCluster,doMuon'
RES=$?
echo "art-result: $RES Reco"
--
GitLab
From d4be62ece9d17ba9d88b0ecac770f8bee0199201 Mon Sep 17 00:00:00 2001
From: Rafal Bielski <rafal.bielski@cern.ch>
Date: Thu, 12 Aug 2021 18:07:04 +0200
Subject: [PATCH 023/272] HLTSeeding: Migration to new L1Menu access + clean-up
---
Trigger/TrigSteer/HLTSeeding/CMakeLists.txt | 2 +-
.../HLTSeeding/src/CreateFullScanRoI.cxx | 38 ---
.../HLTSeeding/src/CreateFullScanRoI.h | 30 ---
.../HLTSeeding/src/EMRoIsUnpackingTool.cxx | 86 ++-----
.../HLTSeeding/src/EMRoIsUnpackingTool.h | 26 +-
.../HLTSeeding/src/FSRoIsUnpackingTool.cxx | 34 +--
.../HLTSeeding/src/FSRoIsUnpackingTool.h | 18 +-
Trigger/TrigSteer/HLTSeeding/src/FakeCTP.cxx | 68 -----
Trigger/TrigSteer/HLTSeeding/src/FakeCTP.h | 39 ---
Trigger/TrigSteer/HLTSeeding/src/FakeRoI.cxx | 241 ------------------
Trigger/TrigSteer/HLTSeeding/src/FakeRoI.h | 59 -----
.../TrigSteer/HLTSeeding/src/HLTSeeding.cxx | 33 +--
Trigger/TrigSteer/HLTSeeding/src/HLTSeeding.h | 12 +-
.../src/HLTSeedingNoCtpForTesting.cxx | 1 -
.../HLTSeeding/src/IRoIsUnpackingTool.h | 7 -
.../HLTSeeding/src/JRoIsUnpackingTool.cxx | 72 ++----
.../HLTSeeding/src/JRoIsUnpackingTool.h | 21 --
.../HLTSeeding/src/L1CaloDecoder.cxx | 126 ---------
.../TrigSteer/HLTSeeding/src/L1CaloDecoder.h | 47 ----
.../HLTSeeding/src/METRoIsUnpackingTool.cxx | 79 ++----
.../HLTSeeding/src/METRoIsUnpackingTool.h | 15 +-
.../HLTSeeding/src/MURoIsUnpackingTool.cxx | 118 ++++-----
.../HLTSeeding/src/MURoIsUnpackingTool.h | 30 +--
.../HLTSeeding/src/RerunRoIsUnpackingTool.cxx | 80 ------
.../HLTSeeding/src/RerunRoIsUnpackingTool.h | 52 ----
.../src/RoIsUnpackingEmulationTool.cxx | 53 +---
.../src/RoIsUnpackingEmulationTool.h | 22 +-
.../HLTSeeding/src/RoIsUnpackingToolBase.cxx | 37 ++-
.../HLTSeeding/src/RoIsUnpackingToolBase.h | 39 +--
.../HLTSeeding/src/TAURoIsUnpackingTool.cxx | 75 ++----
.../HLTSeeding/src/TAURoIsUnpackingTool.h | 30 +--
.../src/components/HLTSeeding_entries.cxx | 37 +--
.../src/eFexEMRoIsUnpackingTool.cxx | 31 +--
.../HLTSeeding/src/eFexEMRoIsUnpackingTool.h | 10 -
.../src/eFexTauRoIsUnpackingTool.cxx | 31 +--
.../HLTSeeding/src/eFexTauRoIsUnpackingTool.h | 10 -
.../src/jFexTauRoIsUnpackingTool.cxx | 31 +--
.../HLTSeeding/src/jFexTauRoIsUnpackingTool.h | 10 -
.../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 79 +++++-
.../share/ref_data_v1Dev_build.ref | 8 +
40 files changed, 363 insertions(+), 1474 deletions(-)
delete mode 100644 Trigger/TrigSteer/HLTSeeding/src/CreateFullScanRoI.cxx
delete mode 100644 Trigger/TrigSteer/HLTSeeding/src/CreateFullScanRoI.h
delete mode 100644 Trigger/TrigSteer/HLTSeeding/src/FakeCTP.cxx
delete mode 100644 Trigger/TrigSteer/HLTSeeding/src/FakeCTP.h
delete mode 100644 Trigger/TrigSteer/HLTSeeding/src/FakeRoI.cxx
delete mode 100644 Trigger/TrigSteer/HLTSeeding/src/FakeRoI.h
delete mode 100644 Trigger/TrigSteer/HLTSeeding/src/L1CaloDecoder.cxx
delete mode 100644 Trigger/TrigSteer/HLTSeeding/src/L1CaloDecoder.h
delete mode 100644 Trigger/TrigSteer/HLTSeeding/src/RerunRoIsUnpackingTool.cxx
delete mode 100644 Trigger/TrigSteer/HLTSeeding/src/RerunRoIsUnpackingTool.h
diff --git a/Trigger/TrigSteer/HLTSeeding/CMakeLists.txt b/Trigger/TrigSteer/HLTSeeding/CMakeLists.txt
index 87bee1b950e8..9500d3840cbf 100644
--- a/Trigger/TrigSteer/HLTSeeding/CMakeLists.txt
+++ b/Trigger/TrigSteer/HLTSeeding/CMakeLists.txt
@@ -16,7 +16,7 @@ atlas_add_library( HLTSeedingLib
atlas_add_component( HLTSeeding
src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel AthenaMonitoringKernelLib GaudiKernel HLTSeedingLib StoreGateLib TrigCompositeUtilsLib TrigConfHLTUtilsLib TrigConfInterfaces TrigConfL1Data TrigConfxAODLib TrigCostMonitorLib TrigSteeringEvent TrigT1Interfaces TrigT1Result TrigTimeAlgsLib xAODEventInfo xAODTrigger )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel AthenaMonitoringKernelLib GaudiKernel HLTSeedingLib StoreGateLib TrigCompositeUtilsLib TrigConfxAODLib TrigCostMonitorLib TrigSteeringEvent TrigT1Interfaces TrigT1Result TrigTimeAlgsLib xAODEventInfo xAODTrigger )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Trigger/TrigSteer/HLTSeeding/src/CreateFullScanRoI.cxx b/Trigger/TrigSteer/HLTSeeding/src/CreateFullScanRoI.cxx
deleted file mode 100644
index 4ec284058a78..000000000000
--- a/Trigger/TrigSteer/HLTSeeding/src/CreateFullScanRoI.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "CreateFullScanRoI.h"
-#include "TrigCompositeUtils/TrigCompositeUtils.h"
-
-CreateFullScanRoI::CreateFullScanRoI(const std::string& name, ISvcLocator* pSvcLocator) :
- AthReentrantAlgorithm(name, pSvcLocator)
-{
-}
-
-CreateFullScanRoI::~CreateFullScanRoI()
-{
-}
-
-StatusCode CreateFullScanRoI::initialize()
-{
- //ATH_MSG_DEBUG("Use macros for logging!");
- CHECK( m_roisKey.initialize() );
-
- return StatusCode::SUCCESS;
-}
-
-StatusCode CreateFullScanRoI::finalize()
-{
- return StatusCode::SUCCESS;
-}
-
-StatusCode CreateFullScanRoI::execute(const EventContext& ctx) const
-{
- using namespace TrigCompositeUtils;
- SG::WriteHandle<TrigRoiDescriptorCollection> handle1 = createAndStoreNoAux(m_roisKey, ctx );
- auto roisCollection = handle1.ptr();
- auto roi = new TrigRoiDescriptor( true ); // this is FullScan RoI
- roisCollection->push_back( roi );
- return StatusCode::SUCCESS;
-}
diff --git a/Trigger/TrigSteer/HLTSeeding/src/CreateFullScanRoI.h b/Trigger/TrigSteer/HLTSeeding/src/CreateFullScanRoI.h
deleted file mode 100644
index fd6d816ba20f..000000000000
--- a/Trigger/TrigSteer/HLTSeeding/src/CreateFullScanRoI.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
-#ifndef HLTSEEDING_CREATEFULLSCANROI_H
-#define HLTSEEDING_CREATEFULLSCANROI_H
-
-// Framework includes
-#include "AthenaBaseComps/AthReentrantAlgorithm.h"
-#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
-
-#include <string>
-
-/**
- * @class CreateFullScanRoI
- * @brief in every event creates collection with single FullScanRoI (for testing MET, Jet and similar FS reco)
- **/
-class CreateFullScanRoI : public AthReentrantAlgorithm {
-public:
- CreateFullScanRoI(const std::string& name, ISvcLocator* pSvcLocator);
- virtual ~CreateFullScanRoI() override;
-
- virtual StatusCode initialize() override;
- virtual StatusCode execute(const EventContext& context) const override;
- virtual StatusCode finalize() override;
-
-private:
- SG::WriteHandleKey<TrigRoiDescriptorCollection> m_roisKey{ this, "RoIsKey", "FullScanRoIs", "name of the output"};
-};
-
-#endif // HLTSEEDING_CREATEFULLSCANROI_H
diff --git a/Trigger/TrigSteer/HLTSeeding/src/EMRoIsUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/EMRoIsUnpackingTool.cxx
index db8e3f602c85..6b10bea05692 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/EMRoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/EMRoIsUnpackingTool.cxx
@@ -10,19 +10,10 @@
EMRoIsUnpackingTool::EMRoIsUnpackingTool( const std::string& type,
const std::string& name,
const IInterface* parent )
- : RoIsUnpackingToolBase(type, name, parent),
- m_configSvc( "TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", name )
-{
-}
-
-using namespace TrigCompositeUtils;
-
+ : RoIsUnpackingToolBase(type, name, parent) {}
StatusCode EMRoIsUnpackingTool::initialize() {
-
ATH_CHECK( RoIsUnpackingToolBase::initialize() );
- ATH_CHECK( m_configSvc.retrieve() );
- ATH_CHECK( m_trigRoIsKey.initialize() );
ATH_CHECK( m_recRoIsKey.initialize() );
return StatusCode::SUCCESS;
}
@@ -32,51 +23,22 @@ StatusCode EMRoIsUnpackingTool::start() {
return StatusCode::SUCCESS;
}
-StatusCode EMRoIsUnpackingTool::updateConfiguration() {
- m_emThresholds.clear();
- using namespace TrigConf;
- const ThresholdConfig* thresholdConfig = m_configSvc->thresholdConfig();
- auto filteredThresholds= thresholdConfig->getThresholdVector( L1DataDef::EM );
- ATH_MSG_DEBUG( "Number of filtered thresholds " << filteredThresholds.size() );
- for ( auto th : filteredThresholds ) {
- if ( th != nullptr ) {
- ATH_MSG_INFO( "Found threshold in the configuration: " << th->name() << " of ID: " << HLT::Identifier( th->name() ).numeric() );
- m_emThresholds.push_back( th );
- } else {
- ATH_MSG_DEBUG( "Nullptr to the threshold" );
- }
- }
-
- if ( m_emThresholds.empty() ) {
- ATH_MSG_WARNING( "No EM thresholds configured" );
- } else {
- ATH_MSG_INFO( "Configured " << m_emThresholds.size() << " thresholds" );
- }
-
- return StatusCode::SUCCESS;
-}
-
-
-StatusCode EMRoIsUnpackingTool::finalize()
-{
- return StatusCode::SUCCESS;
-}
-
-
StatusCode EMRoIsUnpackingTool::unpack( const EventContext& ctx,
const ROIB::RoIBResult& roib,
const HLT::IDSet& activeChains ) const {
using namespace TrigCompositeUtils;
// create and record the collections needed
- SG::WriteHandle<TrigRoiDescriptorCollection> handle1 = createAndStoreNoAux(m_trigRoIsKey, ctx );
- auto trigRoIs = handle1.ptr();
- SG::WriteHandle< DataVector<LVL1::RecEmTauRoI> > handle2 = createAndStoreNoAux( m_recRoIsKey, ctx );
- auto recRoIs = handle2.ptr();
- SG::WriteHandle<DecisionContainer> handle3 = createAndStore(m_decisionsKey, ctx );
- auto decisionOutput = handle3.ptr();
- SG::WriteHandle<DecisionContainer> handle4 = createAndStore(m_decisionsKeyProbe, ctx );
- auto decisionOutputProbe = handle4.ptr();
+ SG::WriteHandle<TrigRoiDescriptorCollection> trigRoIs = createAndStoreNoAux(m_trigRoIsKey, ctx );
+ SG::WriteHandle<DataVector<LVL1::RecEmTauRoI>> recRoIs = createAndStoreNoAux( m_recRoIsKey, ctx );
+ SG::WriteHandle<DecisionContainer> decisionOutput = createAndStore(m_decisionsKey, ctx );
+ SG::WriteHandle<DecisionContainer> decisionOutputProbe = createAndStore(m_decisionsKeyProbe, ctx );
+
+ // Retrieve the L1 menu configuration
+ SG::ReadHandle<TrigConf::L1Menu> l1Menu = SG::makeHandle(m_l1MenuKey, ctx);
+ ATH_CHECK(l1Menu.isValid());
+ std::optional<ThrVecRef> emThresholds;
+ ATH_CHECK(getL1Thresholds(*l1Menu, "EM", emThresholds));
// RoIBResult contains vector of EM fragments
for ( auto& emTauFragment : roib.eMTauResult() ) {
@@ -87,25 +49,25 @@ StatusCode EMRoIsUnpackingTool::unpack( const EventContext& ctx,
continue;
}
- auto recRoI = new LVL1::RecEmTauRoI( roIWord, &m_emThresholds );
- recRoIs->push_back( recRoI );
+ recRoIs->push_back( std::make_unique<LVL1::RecEmTauRoI>(roIWord, l1Menu.cptr()) );
+ const LVL1::RecEmTauRoI* recRoI = recRoIs->back();
- auto trigRoI = new TrigRoiDescriptor( roIWord, 0u ,0u,
- recRoI->eta(), recRoI->eta()-m_roIWidth, recRoI->eta()+m_roIWidth,
- recRoI->phi(), recRoI->phi()-m_roIWidth, recRoI->phi()+m_roIWidth );
- trigRoIs->push_back( trigRoI );
+ trigRoIs->push_back( std::make_unique<TrigRoiDescriptor>(
+ roIWord, 0u ,0u,
+ recRoI->eta(), recRoI->eta()-m_roIWidth, recRoI->eta()+m_roIWidth,
+ recRoI->phi(), recRoI->phi()-m_roIWidth, recRoI->phi()+m_roIWidth) );
ATH_MSG_DEBUG( "RoI word: 0x" << MSG::hex << std::setw( 8 ) << roIWord << MSG::dec );
// The hltSeedingNodeName denotes an initial node with no parents
- Decision* decisionMain = TrigCompositeUtils::newDecisionIn( decisionOutput, hltSeedingNodeName() );
- Decision* decisionProbe = TrigCompositeUtils::newDecisionIn( decisionOutputProbe, hltSeedingNodeName() );
+ Decision* decisionMain = TrigCompositeUtils::newDecisionIn( decisionOutput.ptr(), hltSeedingNodeName() );
+ Decision* decisionProbe = TrigCompositeUtils::newDecisionIn( decisionOutputProbe.ptr(), hltSeedingNodeName() );
std::vector<unsigned> passedThresholdIDs;
- for ( auto th: m_emThresholds ) {
+ for (const auto th : emThresholds.value().get()) {
ATH_MSG_VERBOSE( "Checking if the threshold " << th->name() << " passed" );
- if ( recRoI->passedThreshold( th->thresholdNumber() ) ) {
+ if ( recRoI->passedThreshold( th->mapping() ) ) {
passedThresholdIDs.push_back( HLT::Identifier( th->name() ) );
const std::string thresholdProbeName = getProbeThresholdName(th->name());
ATH_MSG_DEBUG( "Passed Threshold names " << th->name() << " and " << thresholdProbeName);
@@ -138,9 +100,5 @@ StatusCode EMRoIsUnpackingTool::unpack( const EventContext& ctx,
ATH_MSG_DEBUG( "Unpacked " << trigRoIs->size() << " RoIs" );
- return StatusCode::SUCCESS; // what else
-
-
-
+ return StatusCode::SUCCESS;
}
-
diff --git a/Trigger/TrigSteer/HLTSeeding/src/EMRoIsUnpackingTool.h b/Trigger/TrigSteer/HLTSeeding/src/EMRoIsUnpackingTool.h
index ebd20c3c6389..5b31e31236ff 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/EMRoIsUnpackingTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/EMRoIsUnpackingTool.h
@@ -4,23 +4,11 @@
#ifndef HLTSEEDING_EMROISUNPACKINGTOOL_H
#define HLTSEEDING_EMROISUNPACKINGTOOL_H 1
-// STL includes
-#include <string>
-#include <functional>
-#include <vector>
+#include "RoIsUnpackingToolBase.h"
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
#include "TrigT1Interfaces/RecEmTauRoI.h"
-#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
-
-// FrameWork includes
-#include "GaudiKernel/ServiceHandle.h"
#include "StoreGate/WriteHandleKey.h"
-// HLTSeeding includes
-#include "RoIsUnpackingToolBase.h"
-
-
class EMRoIsUnpackingTool : public RoIsUnpackingToolBase {
public:
@@ -34,17 +22,10 @@ public:
const HLT::IDSet& activeChains) const override;
virtual StatusCode initialize() override;
- virtual StatusCode updateConfiguration() override;
- virtual StatusCode finalize() override;
virtual StatusCode start() override;
private:
-
///@{ @name Properties
- SG::WriteHandleKey<TrigRoiDescriptorCollection> m_trigRoIsKey{
- this, "OutputTrigRoIs", "HLT_EMRoIs",
- "Name of the RoIs object produced by the unpacker"};
-
SG::WriteHandleKey< DataVector<LVL1::RecEmTauRoI> > m_recRoIsKey{
this, "OutputRecRoIs", "HLT_RecEMRoIs",
"Name of the RoIs object produced by the unpacker"};
@@ -52,9 +33,6 @@ private:
Gaudi::Property<float> m_roIWidth{
this, "RoIWidth", 0.1, "Size of RoI in eta/ phi"};
///@}
-
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc;
- std::vector<TrigConf::TriggerThreshold*> m_emThresholds;
-};
+};
#endif //> !HLTSEEDING_EMROISUNPACKINGTOOL_H
diff --git a/Trigger/TrigSteer/HLTSeeding/src/FSRoIsUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/FSRoIsUnpackingTool.cxx
index d568463d8e69..1ab332e19660 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/FSRoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/FSRoIsUnpackingTool.cxx
@@ -2,32 +2,18 @@
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-
#include "FSRoIsUnpackingTool.h"
-
-#include "TrigT1Result/RoIBResult.h"
-#include "TrigConfL1Data/TrigConfData.h"
#include "xAODTrigger/TrigCompositeContainer.h"
FSRoIsUnpackingTool::FSRoIsUnpackingTool( const std::string& type,
const std::string& name,
const IInterface* parent )
- : RoIsUnpackingToolBase(type, name, parent),
- m_configSvc( "TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", name )
-{}
+ : RoIsUnpackingToolBase(type, name, parent) {}
StatusCode FSRoIsUnpackingTool::initialize()
{
- ATH_CHECK( m_fsRoIKey.initialize() );
-
ATH_CHECK(RoIsUnpackingToolBase::initialize());
- // for ( auto th2chains: m_thresholdToChainMapping ) {
- // m_allFSChains.insert( th2chains.second.begin(), th2chains.second.end() );
- // }
-
- CHECK( m_configSvc.retrieve() );
-
return StatusCode::SUCCESS;
}
@@ -36,12 +22,6 @@ StatusCode FSRoIsUnpackingTool::start() {
name.find("FS") == 0 or
name == ""; } ) );
- return StatusCode::SUCCESS;
-}
-
-
-StatusCode FSRoIsUnpackingTool::updateConfiguration() {
- using namespace TrigConf;
m_allFSChains.clear();
for ( auto thresholdToChain: m_thresholdToChainMapping ) {
@@ -76,17 +56,13 @@ StatusCode FSRoIsUnpackingTool::unpack( const EventContext& ctx,
TrigCompositeUtils::DecisionIDContainer ids;
TrigCompositeUtils::decisionIDs( decision, ids );
return std::vector<TrigCompositeUtils::DecisionID>( ids.begin(), ids.end() ); }() );
-
-
- std::unique_ptr<TrigRoiDescriptorCollection> fsRoIsColl = std::make_unique<TrigRoiDescriptorCollection>();
- TrigRoiDescriptor* fsRoI = new TrigRoiDescriptor( true ); // true == FS
- fsRoIsColl->push_back( fsRoI );
- auto roiHandle = SG::makeHandle( m_fsRoIKey, ctx );
- ATH_CHECK( roiHandle.record ( std::move( fsRoIsColl ) ) );
+ auto roiHandle = SG::makeHandle( m_trigRoIsKey, ctx );
+ ATH_CHECK(roiHandle.record( std::make_unique<TrigRoiDescriptorCollection>() ));
+ roiHandle->push_back( std::make_unique<TrigRoiDescriptor>(true) ); // true == FS
ATH_MSG_DEBUG("Linking to FS RoI descriptor");
- decision->setObjectLink( initialRoIString(), ElementLink<TrigRoiDescriptorCollection>( m_fsRoIKey.key(), 0 ) );
+ decision->setObjectLink( initialRoIString(), ElementLink<TrigRoiDescriptorCollection>( m_trigRoIsKey.key(), 0 ) );
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigSteer/HLTSeeding/src/FSRoIsUnpackingTool.h b/Trigger/TrigSteer/HLTSeeding/src/FSRoIsUnpackingTool.h
index eed1688acad2..9642d7b895fb 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/FSRoIsUnpackingTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/FSRoIsUnpackingTool.h
@@ -6,14 +6,6 @@
#include "RoIsUnpackingToolBase.h"
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
-#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
-#include "TrigCompositeUtils/TrigCompositeUtils.h"
-#include "TrigT1Result/RoIBResult.h"
-
-#include <string>
-
-
class FSRoIsUnpackingTool : public RoIsUnpackingToolBase {
public:
@@ -21,24 +13,16 @@ public:
const std::string& name,
const IInterface* parent );
- virtual StatusCode updateConfiguration() override;
-
virtual StatusCode initialize() override;
+ virtual StatusCode start() override;
using RoIsUnpackingToolBase::unpack;
StatusCode unpack(const EventContext& ctx,
const ROIB::RoIBResult& roib,
const HLT::IDSet& activeChains) const override;
- virtual StatusCode start() override;
private:
- SG::WriteHandleKey<TrigRoiDescriptorCollection> m_fsRoIKey{
- this, "OutputTrigRoIs", "HLT_FSRoI", "The key of FS RoI" };
-
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc;
HLT::IDSet m_allFSChains;
-
};
-
#endif
diff --git a/Trigger/TrigSteer/HLTSeeding/src/FakeCTP.cxx b/Trigger/TrigSteer/HLTSeeding/src/FakeCTP.cxx
deleted file mode 100644
index e4a1b97a4009..000000000000
--- a/Trigger/TrigSteer/HLTSeeding/src/FakeCTP.cxx
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include <fstream>
-#include "HLTSeeding/TrigIdentifiers.h"
-#include "./FakeCTP.h"
-
-
-FakeCTP::FakeCTP(const std::string& name, ISvcLocator* pSvcLocator)
- : AthAlgorithm(name, pSvcLocator),
- m_inputFileName("ChainsToActivate"),
- m_decisions("CTPDecisions"),
- m_decisionsAux("CTPDecisionsAux."),
- m_currentEvent(0) {
- declareProperty("InputFilename", m_inputFileName, "FakeROI input filename");
- declareProperty("OutputDecisions", m_decisions, "Name of the chains decisions object (one decision obj per chain)");
- declareProperty("OutputDecisionsAux", m_decisionsAux, "Aux for chains decision");
-
-}
-
-StatusCode FakeCTP::parseInputFile() {
- std::ifstream inputFile(m_inputFileName);
- if ( not inputFile.good() ) {
- ATH_MSG_ERROR("Input file " << m_inputFileName << " inaccessible");
- return StatusCode::FAILURE;
- }
-
- std::string chain;
- m_events.resize(1);
- while ( inputFile ) {
- inputFile >> chain;
- m_events.back().push_back(TrigConf::HLTUtils::string2hash(chain, "chain"));
- while ( inputFile and inputFile.peek() == ' ') inputFile.ignore(); // read till the end of line or new chain name
- if ( inputFile and inputFile.peek() == '\n')
- m_events.resize( m_events.size() + 1 ); // new event
- }
- inputFile.close();
- return StatusCode::SUCCESS;
-}
-
-StatusCode FakeCTP::initialize() {
- CHECK( parseInputFile() );
- return StatusCode::SUCCESS;
-}
-
-StatusCode FakeCTP::execute() {
- m_decisions = std::make_unique< xAOD::TrigCompositeContainer >();
- m_decisionsAux = std::make_unique< xAOD::TrigCompositeAuxContainer>();
- m_decisions->setStore(m_decisionsAux.ptr());
-
-
-
-
- for ( const auto& chain : m_events[m_currentEvent] ) {
- ATH_MSG_DEBUG("Enabling chain " << TrigConf::HLTUtils::hash2string(chain, "chain"));
- xAOD::TrigComposite * decision = new xAOD::TrigComposite();
- m_decisions->push_back(decision);
- decision->setDetail("ID", ChainID(chain));
- decision->setDetail("Decision", 1);
- }
-
-
- m_currentEvent += 1;
- if ( m_currentEvent >= m_events.size() )
- m_currentEvent = 0;
- return StatusCode::SUCCESS;
-}
diff --git a/Trigger/TrigSteer/HLTSeeding/src/FakeCTP.h b/Trigger/TrigSteer/HLTSeeding/src/FakeCTP.h
deleted file mode 100644
index 0e112c7fba7a..000000000000
--- a/Trigger/TrigSteer/HLTSeeding/src/FakeCTP.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// -*- c++ -*-
-
-/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef HLTSeeding_FakeCTP_h
-#define HLTSeeding_FakeCTP_h
-
-#include <vector>
-#include "TrigConfHLTUtils/HLTUtils.h"
-#include "AthenaBaseComps/AthAlgorithm.h"
-
-#include "xAODTrigger/TrigCompositeContainer.h"
-#include "xAODTrigger/TrigCompositeAuxContainer.h"
-
-
-class FakeCTP : public AthAlgorithm {
-public:
- FakeCTP(const std::string& name, ISvcLocator* pSvcLocator);
- StatusCode initialize();
- StatusCode execute();
-
-private:
-
- typedef std::vector< std::vector<TrigConf::HLTHash> > ChainsInTheEvent;
- // @brief returns names of the chains (inner vector) to activate for each event (outer vector)
- StatusCode parseInputFile();
-
- std::string m_inputFileName;
- SG::WriteHandle< xAOD::TrigCompositeContainer > m_decisions;
- SG::WriteHandle< xAOD::TrigCompositeAuxContainer > m_decisionsAux;
-
- ChainsInTheEvent m_events;
- size_t m_currentEvent;
-};
-#endif
-
-
diff --git a/Trigger/TrigSteer/HLTSeeding/src/FakeRoI.cxx b/Trigger/TrigSteer/HLTSeeding/src/FakeRoI.cxx
deleted file mode 100644
index e2845fde8205..000000000000
--- a/Trigger/TrigSteer/HLTSeeding/src/FakeRoI.cxx
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
-
-/*
- * Author: Piotr Sarna
- */
-
-#include <vector>
-#include <fstream>
-#include <stdexcept>
-#include <string>
-
-#include "HLTSeeding/TrigIdentifiers.h"
-#include "TrigT1Interfaces/RecEmTauRoI.h"
-#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
-#include "TrigConfL1Data/L1DataDef.h"
-#include "TrigConfL1Data/ThresholdConfig.h"
-#include "TrigConfL1Data/TriggerThreshold.h"
-#include "TrigConfHLTUtils/HLTUtils.h"
-#include "AthenaMonitoringKernel/Monitored.h"
-
-#include "./FakeRoI.h"
-
-FakeRoI::FakeRoI(const std::string& name, ISvcLocator* pSvcLocator)
- : AthAlgorithm(name, pSvcLocator),
- m_trigRoIs("OutputRoIs"),
- m_recEMTauRoIs("OutputRecEMTauRoIs"),
- m_decisions("OutputDecisions"),
- m_decisionsAux("OutputDecisionsAux."),
- // m_view("View"),
- m_configSvc("TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", name)
-{
- // outputs
- declareProperty("OutputRoIs", m_trigRoIs, "Name of the RoIs object produced by the unpacker");
- declareProperty("OutputRecEMTauRoIs", m_recEMTauRoIs, "Name of the RoIs object produced by the unpacker");
- declareProperty("OutputDecisions", m_decisions, "Name of the decisions object (wiht links to specific RoIs)");
- declareProperty("OutputDecisionsAux", m_decisionsAux, "Name of the decisions object (wiht links to specific RoIs) - aux");
-
- // input
- declareProperty("InputFilename", m_inputFilename, "FakeROI input filename");
-
- // views
- // declareProperty("View", m_view, "Name of the generated view");
-
- // services
- declareProperty("LVL1ConfigSvc", m_configSvc, "LVL1 Config Service");
- declareProperty("MonTool", m_monTool=VoidMonitoringTool(this), "Monitoring");
-}
-
-StatusCode FakeRoI::initialize() {
- CHECK( m_configSvc.retrieve() );
- if (!m_monTool.empty()) CHECK( m_monTool.retrieve() );
-
- return StatusCode::SUCCESS;
-}
-
-StatusCode FakeRoI::start() {
- if (m_inputFilename.empty()) {
- ATH_MSG_WARNING("Provided InputFilename parameter is empty");
- return StatusCode::RECOVERABLE;
- }
-
- try
- {
- m_currentRowNumber = 0;
- m_inputData = parseInputFile();
- }
- catch (const std::exception& ex)
- {
- ATH_MSG_WARNING(ex.what());
- return StatusCode::RECOVERABLE;
- }
-
- ATH_MSG_DEBUG("Input file parsed successfully. Data:");
-
- for (auto& fragment : m_inputData) {
- for (auto& fakeRoI : fragment) {
- const char* const delim = ", ";
- std::ostringstream debugPassedTresholdIDs;
- std::copy(fakeRoI.passedThresholdIDs.begin(), fakeRoI.passedThresholdIDs.end(), std::ostream_iterator<std::string>(debugPassedTresholdIDs, delim));
-
- ATH_MSG_DEBUG("Eta: " + std::to_string(fakeRoI.eta) +
- ", Phi: " + std::to_string(fakeRoI.phi) +
- ", Word: " + std::to_string(fakeRoI.word) +
- ", PassedThresholdIDs: " + debugPassedTresholdIDs.str());
- }
- }
-
- using namespace TrigConf;
- const ThresholdConfig* thresholdConfig = m_configSvc->thresholdConfig();
- for (auto caloType : std::vector<L1DataDef::TriggerType>{ L1DataDef::EM/*, L1DataDef::TAU*/ }) {
- for (TriggerThreshold * th : thresholdConfig->getThresholdVector(caloType)) {
- if (th != nullptr)
- ATH_MSG_DEBUG("Found threshold in the configuration: " << th->name() << " of ID: " << HLTUtils::string2hash(th->name(), "TE"));
- m_emtauThresholds.push_back(th);
- }
- }
-
- return StatusCode::SUCCESS;
-}
-
-StatusCode FakeRoI::execute() {
- // create view (BEN: for now don't do it until we've got the scheduling going)
- ///*m_view = std::make_unique< std::vector<SG::View*>>();
- //IProxyDict * view = new SG::View("L1CaloDecoderView");
- //m_view->push_back(view);*/
- IProxyDict * view = 0;
-
- // redirect handles to that view
- CHECK(m_trigRoIs.setProxyDict(view));
- CHECK(m_recEMTauRoIs.setProxyDict(view));
- CHECK(m_decisions.setProxyDict(view));
- CHECK(m_decisionsAux.setProxyDict(view));
-
- // define output
- m_trigRoIs = std::make_unique< TrigRoiDescriptorCollection >();
- m_recEMTauRoIs = std::make_unique< DataVector<LVL1::RecEmTauRoI> >();
-
- m_decisions = std::make_unique< xAOD::TrigCompositeContainer >();
- m_decisionsAux = std::make_unique< xAOD::TrigCompositeAuxContainer>();
- m_decisions->setStore(m_decisionsAux.ptr());
-
-
- auto roiCount = Monitored::Scalar<int>("roiCount",0);
- auto monitorit = Monitored::Group(m_monTool, roiCount);
-
- for (auto& fakeRoI : m_inputData[m_currentRowNumber]) {
- roiCount += 1;
- ATH_MSG_INFO(roiCount);
- auto recRoI = new LVL1::RecEmTauRoI(fakeRoI.word, &m_emtauThresholds);
- m_recEMTauRoIs->push_back(recRoI);
-
- auto trigRoI = new TrigRoiDescriptor(fakeRoI.word, 0u, 0u,
- fakeRoI.eta, fakeRoI.eta - 0.1, fakeRoI.eta + 0.1,
- fakeRoI.phi, fakeRoI.phi - 0.1, fakeRoI.phi + 0.1);
- m_trigRoIs->push_back(trigRoI);
-
-
- ATH_MSG_DEBUG("RoI word: 0x" << MSG::hex << std::setw(8) << fakeRoI.word << ", threshold pattern " << MSG::dec);
- std::vector<TriggerElementID> passedThresholdIDs;
- for ( const auto& th: fakeRoI.passedThresholdIDs ) {
- passedThresholdIDs.push_back(TrigConf::HLTUtils::string2hash(th, "TE"));
- ATH_MSG_DEBUG("Threshold " << th << " id: " << MSG::hex << passedThresholdIDs.back() << MSG::dec);
- }
-
-
-
- xAOD::TrigComposite * decision = new xAOD::TrigComposite();
- m_decisions->push_back(decision);
- decision->setDetail("Passed", passedThresholdIDs);
- decision->setObjectLink("initialRoI", ElementLink<TrigRoiDescriptorCollection>(m_trigRoIs.name(), m_trigRoIs->size() - 1));
- decision->setObjectLink("initialRecRoI", ElementLink<DataVector<LVL1::RecEmTauRoI>>(m_recEMTauRoIs.name(), m_recEMTauRoIs->size() - 1));
- }
-
- ATH_MSG_DEBUG("Found "<< m_trigRoIs->size() <<" RoIs and "<< m_decisions->size() <<" decisions in this event");
- ++m_currentRowNumber;
- m_currentRowNumber %= m_inputData.size();
-
- return StatusCode::SUCCESS;
-}
-
-StatusCode FakeRoI::finalize() {
- return StatusCode::SUCCESS;
-}
-
-std::vector<std::vector<FakeRoI::SingleFakeRoI>> FakeRoI::parseInputFile() {
- const char* whiteSpaceChars = " \t\n\r\f\v";
- auto rtrim = [whiteSpaceChars](std::string& s) { s.erase(s.find_last_not_of(whiteSpaceChars) + 1); };
- auto ltrim = [whiteSpaceChars](std::string& s) { s.erase(0, s.find_first_not_of(whiteSpaceChars)); };
- auto trim = [&rtrim, <rim](std::string& s) { ltrim(s); rtrim(s); };
-
- std::vector<std::vector<FakeRoI::SingleFakeRoI>> result;
- unsigned lineNumber = 0;
- std::string line;
-
- std::ifstream inputFile(m_inputFilename);
-
- if (!inputFile.good())
- {
- throw std::invalid_argument("File " + m_inputFilename + "does not exists or is corrupted");
- }
-
- while (getline(inputFile, line))
- {
- trim(line);
-
- if (line.empty()) continue;
-
- result.push_back(parseInputFileLine(line, ++lineNumber));
- }
-
- if (result.size() == 0) {
- throw std::invalid_argument("File " + m_inputFilename + " does not contain any RoI");
- }
-
- return result;
-}
-
-std::vector<FakeRoI::SingleFakeRoI> FakeRoI::parseInputFileLine(const std::string& line, unsigned lineNumber) {
- std::vector<FakeRoI::SingleFakeRoI> result;
- unsigned roiNumber = 0;
- std::stringstream inputLine(line);
- std::string roi;
-
- while (getline(inputLine, roi, ';'))
- {
- result.push_back(parseInputRoI(roi, lineNumber, ++roiNumber));
- }
-
- return result;
-}
-
-FakeRoI::SingleFakeRoI FakeRoI::parseInputRoI(const std::string& roi, unsigned lineNumber, unsigned roiNumber) {
- FakeRoI::SingleFakeRoI result;
- std::stringstream inputRoi(roi);
- std::string roiElement;
- unsigned roiElementNumber = 0;
-
- std::vector<std::function<void(const std::string&)>> fillResultFunctors;
- fillResultFunctors.push_back([&](const std::string& eta) { result.eta = stod(eta); });
- fillResultFunctors.push_back([&](const std::string& phi) { result.phi = stod(phi); });
- fillResultFunctors.push_back([&](const std::string& word) { result.word = stoul(word); });
- fillResultFunctors.push_back([&](const std::string& passedThresholdID) { result.passedThresholdIDs.push_back(passedThresholdID); });
-
- while (getline(inputRoi, roiElement, ','))
- {
- if (roiElementNumber > 2) { roiElementNumber = 3; }
-
- try
- {
- fillResultFunctors[roiElementNumber++](roiElement);
- }
- catch (const std::exception& ex)
- {
- throw std::invalid_argument("Exception encoruated while parsing line " + std::to_string(lineNumber) + ", roi " + std::to_string(roiNumber) + ". Exception: " + ex.what());
- }
- }
-
- return result;
-}
diff --git a/Trigger/TrigSteer/HLTSeeding/src/FakeRoI.h b/Trigger/TrigSteer/HLTSeeding/src/FakeRoI.h
deleted file mode 100644
index e28fe2809ee7..000000000000
--- a/Trigger/TrigSteer/HLTSeeding/src/FakeRoI.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
-
-/*
- * Author: Piotr Sarna
- */
-
-#ifndef HLTSeeding_FakeRoI_h
-#define HLTSeeding_FakeRoI_h
-
-#include "AthenaBaseComps/AthAlgorithm.h"
-#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
-
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
-#include "TrigT1Interfaces/RecEmTauRoI.h"
-#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
-#include "xAODTrigger/TrigCompositeContainer.h"
-#include "xAODTrigger/TrigCompositeAuxContainer.h"
-
-
-class FakeRoI : public AthAlgorithm {
-private:
- struct SingleFakeRoI {
- double eta;
- double phi;
- uint32_t word;
- std::vector<std::string> passedThresholdIDs;
- };
-public:
- FakeRoI(const std::string& name, ISvcLocator* pSvcLocator);
- virtual StatusCode initialize() override;
- virtual StatusCode start() override;
- virtual StatusCode execute() override;
- virtual StatusCode finalize() override;
-private:
- std::vector<std::vector<SingleFakeRoI>> parseInputFile();
- std::vector<SingleFakeRoI> parseInputFileLine(const std::string& line, unsigned lineNumber);
- SingleFakeRoI parseInputRoI(const std::string& roi, unsigned lineNumber, unsigned roiNumber);
-
- std::vector<TrigConf::TriggerThreshold*> m_emtauThresholds;
-
-
- SG::WriteHandle< TrigRoiDescriptorCollection > m_trigRoIs;
- SG::WriteHandle< DataVector<LVL1::RecEmTauRoI> > m_recEMTauRoIs;
- SG::WriteHandle< xAOD::TrigCompositeContainer > m_decisions;
- SG::WriteHandle< xAOD::TrigCompositeAuxContainer > m_decisionsAux;
- // SG::WriteHandle< std::vector<SG::View*> > m_view;
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc; //!< access to trigger menu
-
- // can demand objects
-
- std::string m_inputFilename;
- std::vector<std::vector<FakeRoI::SingleFakeRoI>> m_inputData;
- unsigned m_currentRowNumber;
- ToolHandle<GenericMonitoringTool> m_monTool;
-};
-
-#endif
diff --git a/Trigger/TrigSteer/HLTSeeding/src/HLTSeeding.cxx b/Trigger/TrigSteer/HLTSeeding/src/HLTSeeding.cxx
index 4b0a28293629..2e8332253973 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/HLTSeeding.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/HLTSeeding.cxx
@@ -12,10 +12,7 @@
#include "xAODTrigger/TrigCompositeAuxContainer.h"
HLTSeeding::HLTSeeding(const std::string& name, ISvcLocator* pSvcLocator)
- : AthReentrantAlgorithm(name, pSvcLocator)
-{
-}
-
+ : AthReentrantAlgorithm(name, pSvcLocator) {}
StatusCode HLTSeeding::initialize() {
ATH_MSG_INFO( "Reading RoIB infromation from: "<< m_RoIBResultKey.objKey() << " : " << m_RoIBResultKey.fullKey() << " : " << m_RoIBResultKey.key() );
@@ -38,11 +35,6 @@ StatusCode HLTSeeding::initialize() {
ATH_CHECK( m_keyWriterTool.retrieve() );
}
- ServiceHandle<IIncidentSvc> incidentSvc("IncidentSvc", "CTPSimulation");
- ATH_CHECK(incidentSvc.retrieve());
- incidentSvc->addListener(this,"BeginRun", 200);
- incidentSvc.release().ignore();
-
if (m_doCostMonitoring) {
ATH_CHECK( m_trigCostSvcHandle.retrieve() );
}
@@ -51,29 +43,6 @@ StatusCode HLTSeeding::initialize() {
}
-void HLTSeeding::handle(const Incident& incident) {
- if (incident.type()!="BeginRun") return;
- ATH_MSG_DEBUG( "In HLTSeeding BeginRun incident" );
-
- for ( auto t: m_roiUnpackers_roib ) {
- if ( t->updateConfiguration().isFailure() ) {
- ATH_MSG_ERROR( "Problem in configuring " << t->name() );
- }
- }
-
- for ( auto t: m_roiUnpackers_xaod ) {
- if ( t->updateConfiguration( ).isFailure() ) {
- ATH_MSG_ERROR( "Problem in configuring " << t->name() );
- }
- }
-}
-
-
-StatusCode HLTSeeding::readConfiguration() {
- return StatusCode::SUCCESS;
-}
-
-
StatusCode HLTSeeding::execute (const EventContext& ctx) const {
{
auto timeStampHandle = SG::makeHandle( m_startStampKey, ctx );
diff --git a/Trigger/TrigSteer/HLTSeeding/src/HLTSeeding.h b/Trigger/TrigSteer/HLTSeeding/src/HLTSeeding.h
index a3338a87cbfd..222bf16780b8 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/HLTSeeding.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/HLTSeeding.h
@@ -26,26 +26,18 @@
All the unpacking is outsourced to tools. However the menu mapping, this is from CTP items to chains
and threshods to chains is maintained in this algorithm and provided to unpacking tools.
*/
-
-class HLTSeeding : public AthReentrantAlgorithm, public IIncidentListener {
+class HLTSeeding : public AthReentrantAlgorithm {
public:
HLTSeeding(const std::string& name, ISvcLocator* pSvcLocator);
virtual StatusCode initialize() override;
- virtual void handle(const Incident& incident) override;
virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode finalize() override;
-protected: // protected to support unit testing
- // StatusCode flagPassingRoIs(TrigCompositeUtils::DecisionContainer* rois,
- // const xAOD::TrigCompositeUtils* chains) const;
- virtual StatusCode readConfiguration();
-
+private:
StatusCode saveChainsInfo(const HLT::IDVec& chains,
xAOD::TrigCompositeContainer* storage,
const std::string& type) const;
-private:
-
///@{ @name Properties
/// Level-1 result with RoIs from Run-2 hardware systems
diff --git a/Trigger/TrigSteer/HLTSeeding/src/HLTSeedingNoCtpForTesting.cxx b/Trigger/TrigSteer/HLTSeeding/src/HLTSeedingNoCtpForTesting.cxx
index 02d81bdf85d8..0d65184c14fb 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/HLTSeedingNoCtpForTesting.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/HLTSeedingNoCtpForTesting.cxx
@@ -4,7 +4,6 @@
*/
#include "StoreGate/WriteHandle.h"
#include "GaudiKernel/EventContext.h"
-#include "TrigConfHLTUtils/HLTUtils.h"
#include "TrigT1Interfaces/RecEmTauRoI.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
#include "TrigConfL1Data/ThresholdConfig.h"
diff --git a/Trigger/TrigSteer/HLTSeeding/src/IRoIsUnpackingTool.h b/Trigger/TrigSteer/HLTSeeding/src/IRoIsUnpackingTool.h
index 82e06c108770..1f7d9b40861c 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/IRoIsUnpackingTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/IRoIsUnpackingTool.h
@@ -19,14 +19,7 @@ namespace ROIB {
class IRoIsUnpackingTool : virtual public IAlgTool {
public:
DeclareInterfaceID(IRoIsUnpackingTool, 1, 0);
-
- /**
- * Invoked when there is a potential change of the configuration. Typically beginRun
- * it obtains the information about the L1 item -> HLT seeding relation in a form of a map where the key is the HLT chain name and value is the L1 item
- **/
- virtual StatusCode updateConfiguration( ) = 0;
-
/**
* Unpack RoIB result depending on implementaton (e.g. EM, Jet, ...)
*
diff --git a/Trigger/TrigSteer/HLTSeeding/src/JRoIsUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/JRoIsUnpackingTool.cxx
index 8597e18d38bc..85b39655b774 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/JRoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/JRoIsUnpackingTool.cxx
@@ -6,22 +6,14 @@
#include "TrigT1Result/RoIBResult.h"
#include "TrigT1Interfaces/TrigT1CaloDefs.h"
#include "AthenaMonitoringKernel/Monitored.h"
-#include "TrigConfL1Data/L1DataDef.h"
-#include "TrigConfL1Data/ThresholdConfig.h"
-#include "TrigConfL1Data/TriggerThreshold.h"
JRoIsUnpackingTool::JRoIsUnpackingTool( const std::string& type,
const std::string& name,
const IInterface* parent )
- : RoIsUnpackingToolBase(type, name, parent),
- m_configSvc( "TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", name ) {
-}
+ : RoIsUnpackingToolBase(type, name, parent) {}
StatusCode JRoIsUnpackingTool::initialize() {
-
ATH_CHECK( RoIsUnpackingToolBase::initialize() );
- ATH_CHECK( m_configSvc.retrieve() );
- ATH_CHECK( m_trigRoIsKey.initialize() );
ATH_CHECK( m_recRoIsKey.initialize() );
return StatusCode::SUCCESS;
@@ -32,41 +24,22 @@ StatusCode JRoIsUnpackingTool::start() {
return StatusCode::SUCCESS;
}
-
-StatusCode JRoIsUnpackingTool::updateConfiguration() {
- using namespace TrigConf;
-
- m_jetThresholds.clear();
- ATH_CHECK( copyThresholds(m_configSvc->thresholdConfig()->getThresholdVector( L1DataDef::JET ), m_jetThresholds ) );
- ATH_CHECK( copyThresholds(m_configSvc->thresholdConfig()->getThresholdVector( L1DataDef::JF ), m_jetThresholds ) );
- ATH_CHECK( copyThresholds(m_configSvc->thresholdConfig()->getThresholdVector( L1DataDef::JB ), m_jetThresholds ) );
-
- if ( m_jetThresholds.empty() ) {
- ATH_MSG_WARNING( "No JET thresholds configured" );
- } else {
- ATH_MSG_INFO( "Configured " << m_jetThresholds.size() << " thresholds" );
- }
-
-
-
- return StatusCode::SUCCESS;
-}
-
-
StatusCode JRoIsUnpackingTool::unpack( const EventContext& ctx,
const ROIB::RoIBResult& roib,
const HLT::IDSet& activeChains ) const {
using namespace TrigCompositeUtils;
// create and record the collections needed
- SG::WriteHandle<TrigRoiDescriptorCollection> handle1 = createAndStoreNoAux(m_trigRoIsKey, ctx );
- auto trigRoIs = handle1.ptr();
- SG::WriteHandle< DataVector<LVL1::RecJetRoI> > handle2 = createAndStoreNoAux( m_recRoIsKey, ctx );
- auto recRoIs = handle2.ptr();
- SG::WriteHandle<DecisionContainer> handle3 = createAndStore(m_decisionsKey, ctx );
- auto decisionOutput = handle3.ptr();
+ SG::WriteHandle<TrigRoiDescriptorCollection> trigRoIs = createAndStoreNoAux(m_trigRoIsKey, ctx );
+ SG::WriteHandle< DataVector<LVL1::RecJetRoI> > recRoIs = createAndStoreNoAux( m_recRoIsKey, ctx );
+ SG::WriteHandle<DecisionContainer> decisionOutput = createAndStore(m_decisionsKey, ctx );
+ // Retrieve the L1 menu configuration
+ SG::ReadHandle<TrigConf::L1Menu> l1Menu = SG::makeHandle(m_l1MenuKey, ctx);
+ ATH_CHECK(l1Menu.isValid());
+ std::optional<ThrVecRef> jetThresholds;
+ ATH_CHECK(getL1Thresholds(*l1Menu, "JET", jetThresholds));
- auto decision = TrigCompositeUtils::newDecisionIn( decisionOutput, hltSeedingNodeName() ); // This hltSeedingNodeName() denotes an initial node with no parents
+ auto decision = TrigCompositeUtils::newDecisionIn( decisionOutput.ptr(), hltSeedingNodeName() ); // This hltSeedingNodeName() denotes an initial node with no parents
decision->setObjectLink( "initialRoI", ElementLink<TrigRoiDescriptorCollection>( m_fsRoIKey, 0 ) );
auto roiEL = decision->objectLink<TrigRoiDescriptorCollection>( "initialRoI" );
CHECK( roiEL.isValid() );
@@ -82,7 +55,7 @@ StatusCode JRoIsUnpackingTool::unpack( const EventContext& ctx,
continue;
}
- auto recRoI = new LVL1::RecJetRoI( roIWord, &m_jetThresholds );
+ auto recRoI = new LVL1::RecJetRoI( roIWord, l1Menu.cptr() );
recRoIs->push_back( recRoI );
/* TDOD, decide if we need this collection at all here, now keep filling of it commented out
@@ -94,16 +67,16 @@ StatusCode JRoIsUnpackingTool::unpack( const EventContext& ctx,
*/
ATH_MSG_DEBUG( "RoI word: 0x" << MSG::hex << std::setw( 8 ) << roIWord << MSG::dec );
- for ( auto th: m_jetThresholds ) {
- ATH_MSG_VERBOSE( "Checking if the threshold " << th->name() << " passed" );
- if ( recRoI->passedThreshold( th->thresholdNumber() ) ) {
- ATH_MSG_DEBUG( "Passed Threshold name " << th->name() );
- addChainsToDecision( HLT::Identifier( th->name() ), decision, activeChains );
- ATH_MSG_DEBUG( "Labeled object with chains: " << [&](){
- TrigCompositeUtils::DecisionIDContainer ids;
- TrigCompositeUtils::decisionIDs( decision, ids );
- return std::vector<TrigCompositeUtils::DecisionID>( ids.begin(), ids.end() ); }() );
- }
+ for (const auto th : jetThresholds.value().get()) {
+ ATH_MSG_VERBOSE( "Checking if the threshold " << th->name() << " passed" );
+ if ( recRoI->passedThreshold(th->mapping()) ) {
+ ATH_MSG_DEBUG( "Passed Threshold name " << th->name() );
+ addChainsToDecision( HLT::Identifier( th->name() ), decision, activeChains );
+ ATH_MSG_DEBUG( "Labeled object with chains: " << [&](){
+ TrigCompositeUtils::DecisionIDContainer ids;
+ TrigCompositeUtils::decisionIDs( decision, ids );
+ return std::vector<TrigCompositeUtils::DecisionID>( ids.begin(), ids.end() ); }() );
+ }
}
@@ -129,6 +102,5 @@ StatusCode JRoIsUnpackingTool::unpack( const EventContext& ctx,
ATH_MSG_DEBUG( "Number of decision IDs associated with FS RoI: " << TrigCompositeUtils::decisionIDs( decision ).size() );
-
- return StatusCode::SUCCESS; // what else
+ return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigSteer/HLTSeeding/src/JRoIsUnpackingTool.h b/Trigger/TrigSteer/HLTSeeding/src/JRoIsUnpackingTool.h
index 8cc95c2e4349..8645f0cc8d2c 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/JRoIsUnpackingTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/JRoIsUnpackingTool.h
@@ -5,18 +5,9 @@
#define HLTSEEDING_JROISUNPACKINGTOOL_H 1
#include "RoIsUnpackingToolBase.h"
-
-#include "GaudiKernel/ServiceHandle.h"
-
-#include "TrigCompositeUtils/HLTIdentifier.h"
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
-#include "TrigT1Result/RoIBResult.h"
#include "TrigT1Interfaces/RecJetRoI.h"
-#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
#include <string>
-#include <vector>
-
class JRoIsUnpackingTool : public RoIsUnpackingToolBase {
public:
@@ -31,15 +22,9 @@ public:
const HLT::IDSet& activeChains) const override;
virtual StatusCode initialize() override;
- virtual StatusCode updateConfiguration() override;
virtual StatusCode start() override;
private:
- SG::WriteHandleKey<TrigRoiDescriptorCollection> m_trigRoIsKey{
- this, "OutputTrigRoIs", "HLT_JETRoIs",
- "Name of the RoIs object produced by the unpacker"};
-
-
SG::WriteHandleKey< DataVector<LVL1::RecJetRoI> > m_recRoIsKey{
this, "OutputRecRoIs", "HLT_RecJETRoIs",
"Name of the RoIs object produced by the unpacker"};
@@ -47,15 +32,9 @@ private:
Gaudi::Property<float> m_roIWidth{
this, "RoIWidth", 0.4, "Size of RoI in eta/ phi"};
-
Gaudi::Property<std::string> m_fsRoIKey{
this, "FSRoIKey", "HLT_FSRoI",
"The key of FS RoI made earlier by the HLTSeeding" };
-
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc;
- std::vector<TrigConf::TriggerThreshold*> m_jetThresholds;
-
};
-
#endif //> !HLTSEEDING_JROISUNPACKINGTOOL_H
diff --git a/Trigger/TrigSteer/HLTSeeding/src/L1CaloDecoder.cxx b/Trigger/TrigSteer/HLTSeeding/src/L1CaloDecoder.cxx
deleted file mode 100644
index 6f937a08c23b..000000000000
--- a/Trigger/TrigSteer/HLTSeeding/src/L1CaloDecoder.cxx
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include <vector>
-
-#include "HLTSeeding/TrigIdentifiers.h"
-#include "TrigT1Interfaces/RecEmTauRoI.h"
-
-#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
-#include "TrigSteeringEvent/Lvl1Result.h"
-#include "TrigT1Result/RoIBResult.h"
-#include "TrigConfL1Data/L1DataDef.h"
-#include "TrigConfHLTUtils/HLTUtils.h"
-
-#include "./L1CaloDecoder.h"
-
-L1CaloDecoder::L1CaloDecoder(const std::string& name, ISvcLocator* pSvcLocator)
- : AthAlgorithm(name, pSvcLocator),
- m_trigRoIs("OutputRoIs"),
- m_recEMTauRoIs("OutputRecEMTauRoIs"),
- m_decisions("OutputDecisions"),
- m_decisionsAux("OutputDecisionsAux."),
- // m_view("View"),
- m_configSvc("TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", name),
- m_RoIBResult("RoIBResult")
-{
- // outputs
- declareProperty("OutputRoIs", m_trigRoIs, "Name of the RoIs object produced by the unpacker");
- declareProperty("OutputRecEMTauRoIs", m_recEMTauRoIs, "Name of the RoIs object produced by the unpacker");
- declareProperty("OutputDecisions", m_decisions, "Name of the decisions object (wiht links to specific RoIs)");
- declareProperty("OutputDecisionsAux", m_decisionsAux, "Name of the decisions object (wiht links to specific RoIs) - aux");
-
- // input
- declareProperty("RoIBResult", m_RoIBResult, "Name of the RoIB result");
-
- // views
- // declareProperty("View", m_view, "Name of the generated view" );
-
- // services
- declareProperty( "LVL1ConfigSvc", m_configSvc, "LVL1 Config Service");
-}
-
-StatusCode L1CaloDecoder::initialize() {
- CHECK(m_configSvc.retrieve());
- return StatusCode::SUCCESS;
-}
-
-StatusCode L1CaloDecoder::start() {
- using namespace TrigConf;
- const ThresholdConfig* thresholdConfig = m_configSvc->thresholdConfig();
- for( auto caloType : std::vector<L1DataDef::TriggerType>{ L1DataDef::EM/*, L1DataDef::TAU*/} ) {
- for (TriggerThreshold * th : thresholdConfig->getThresholdVector( caloType ) ) {
- if ( th != nullptr ) {
- ATH_MSG_DEBUG("Found threshold in the configuration: " << th->name() << " of ID: " << HLTUtils::string2hash(th->name(), "TE"));
- m_emtauThresholds.push_back(th);
- }
- }
- }
- return StatusCode::SUCCESS;
-}
-
-
-
-StatusCode L1CaloDecoder::execute() {
-
- if ( not m_RoIBResult.isValid() ) {
- ATH_MSG_WARNING("No L1 result");
- return StatusCode::RECOVERABLE;
- }
-
-
- IProxyDict * view = 0;
-
- // redirect handles to that view
- CHECK( m_trigRoIs.setProxyDict(view) );
- CHECK( m_recEMTauRoIs.setProxyDict(view) );
- CHECK( m_decisions.setProxyDict(view) );
- CHECK( m_decisionsAux.setProxyDict(view) );
-
- // define output
- m_trigRoIs = std::make_unique< TrigRoiDescriptorCollection >();
- m_recEMTauRoIs = std::make_unique< DataVector<LVL1::RecEmTauRoI> >();
-
- m_decisions = std::make_unique< xAOD::TrigCompositeContainer >();
- m_decisionsAux = std::make_unique< xAOD::TrigCompositeAuxContainer>();
- m_decisions->setStore(m_decisionsAux.ptr());
-
- for ( const ROIB::EMTauResult& fragment : m_RoIBResult->eMTauResult() ) {
- for ( const ROIB::EMTauRoI& emtau : fragment.roIVec() ) {
- uint32_t roIWord = emtau.roIWord();
-
- auto recRoI = new LVL1::RecEmTauRoI( roIWord, &m_emtauThresholds );
- m_recEMTauRoIs->push_back(recRoI);
-
- auto trigRoI = new TrigRoiDescriptor(recRoI->roiWord(), 0u ,0u,
- recRoI->eta(),recRoI->eta()-0.1,recRoI->eta()+0.1,
- recRoI->phi(),recRoI->phi()-0.1,recRoI->phi()+0.1);
- m_trigRoIs->push_back(trigRoI);
-
- ATH_MSG_DEBUG("RoI word: 0x" << MSG::hex << std::setw(8) << roIWord << ", threshold pattern " << MSG::dec);
-
- std::vector<TriggerElementID> passedThresholdIDs;
- for ( auto th: m_emtauThresholds ) {
- if ( recRoI->passedThreshold(th->thresholdNumber()) ) {
- passedThresholdIDs.push_back(TrigConf::HLTUtils::string2hash(th->name(), "TE"));
- }
- }
-
- xAOD::TrigComposite * decision = new xAOD::TrigComposite();
- m_decisions->push_back(decision);
- decision->setDetail("Passed", passedThresholdIDs);
- decision->setObjectLink("initialRoI", ElementLink<TrigRoiDescriptorCollection>(m_trigRoIs.name(), m_trigRoIs->size()-1 ));
- decision->setObjectLink("initialRecRoI", ElementLink<DataVector<LVL1::RecEmTauRoI>>(m_recEMTauRoIs.name(), m_recEMTauRoIs->size()-1));
- }
- }
- for ( auto roi: *m_trigRoIs ) {
- ATH_MSG_DEBUG("RoI Eta: " << roi->eta() << " Phi: " << roi->phi() << " RoIWord: " << roi->roiWord());
- }
-
- return StatusCode::SUCCESS; // what else
-}
-
-StatusCode L1CaloDecoder::finalize() {
- return StatusCode::SUCCESS;
-}
diff --git a/Trigger/TrigSteer/HLTSeeding/src/L1CaloDecoder.h b/Trigger/TrigSteer/HLTSeeding/src/L1CaloDecoder.h
deleted file mode 100644
index ebfea8be6e9f..000000000000
--- a/Trigger/TrigSteer/HLTSeeding/src/L1CaloDecoder.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef HLTSeeding_L1CaloDecoder_h
-#define HLTSeeding_L1CaloDecoder_h
-
-#include "AthenaBaseComps/AthAlgorithm.h"
-
-
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
-#include "TrigConfL1Data/ThresholdConfig.h"
-#include "TrigConfL1Data/TriggerThreshold.h"
-
-
-#include "xAODTrigger/TrigCompositeContainer.h"
-#include "xAODTrigger/TrigCompositeAuxContainer.h"
-#include "TrigT1Interfaces/RecEmTauRoI.h"
-#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
-#include "TrigT1Result/RoIBResult.h"
-//#include "AthViews/View.h"
-
-class L1CaloDecoder : public AthAlgorithm {
-public:
- L1CaloDecoder(const std::string& name, ISvcLocator* pSvcLocator);
- virtual StatusCode initialize() override;
- virtual StatusCode start() override;
- virtual StatusCode execute() override;
- virtual StatusCode finalize() override;
-private:
- std::vector<TrigConf::TriggerThreshold*> m_emtauThresholds;
-
- ///@{ @name Properties
- SG::WriteHandle< TrigRoiDescriptorCollection > m_trigRoIs;
- SG::WriteHandle< DataVector<LVL1::RecEmTauRoI> > m_recEMTauRoIs;
- SG::WriteHandle< xAOD::TrigCompositeContainer > m_decisions;
- SG::WriteHandle< xAOD::TrigCompositeAuxContainer > m_decisionsAux;
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc; //!< access to trigger menu
- ///@}
-
- SG::ReadHandle<ROIB::RoIBResult> m_RoIBResult;
- // can demand objects
-};
-
-
-
-#endif
diff --git a/Trigger/TrigSteer/HLTSeeding/src/METRoIsUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/METRoIsUnpackingTool.cxx
index bceab98c6a31..e38adf82b6a3 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/METRoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/METRoIsUnpackingTool.cxx
@@ -1,28 +1,18 @@
/*
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-#include "TrigConfL1Data/ThresholdConfig.h"
+#include "METRoIsUnpackingTool.h"
#include "TrigT1Result/JetEnergyResult.h"
#include "TrigT1Result/RoIBResult.h"
-#include "TrigConfL1Data/CTPConfig.h"
-#include "METRoIsUnpackingTool.h"
METRoIsUnpackingTool::METRoIsUnpackingTool( const std::string& type,
const std::string& name,
const IInterface* parent )
- : RoIsUnpackingToolBase(type, name, parent),
- m_configSvc( "TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", name )
-{}
+ : RoIsUnpackingToolBase(type, name, parent) {}
StatusCode METRoIsUnpackingTool::initialize()
{
ATH_CHECK(RoIsUnpackingToolBase::initialize());
- for ( auto th2chains: m_thresholdToChainMapping ) {
- m_allMETChains.insert( th2chains.second.begin(), th2chains.second.end() );
- }
-
- CHECK( m_configSvc.retrieve() );
-
return StatusCode::SUCCESS;
}
@@ -32,49 +22,33 @@ StatusCode METRoIsUnpackingTool::start() {
name.find("TE") == 0 or
name.find("XE") == 0 or
name.find("XS") == 0 ; } ) );
- return StatusCode::SUCCESS;
-}
-
-StatusCode METRoIsUnpackingTool::updateConfiguration() {
- using namespace TrigConf;
-
- for ( auto thresholdToChain: m_thresholdToChainMapping ) {
- m_allMETChains.insert( thresholdToChain.second.begin(), thresholdToChain.second.end() );
- }
-
- const ThresholdConfig* thresholdConfig = m_configSvc->thresholdConfig();
- std::vector<const TriggerThreshold*> filtered;
- {
- auto insert = [&]( const std::vector<TriggerThreshold*>& src ) -> void { filtered.insert(filtered.end(), src.begin(), src.end()); };
- insert( thresholdConfig->getThresholdVector( L1DataDef::TE ) );
- insert( thresholdConfig->getThresholdVector( L1DataDef::XE ) );
- insert( thresholdConfig->getThresholdVector( L1DataDef::XS ) );
- }
-
- for ( auto th: filtered ) {
- if ( th != nullptr ) {
- ATH_MSG_INFO( "Found threshold in the configuration: " << th->name() << " of ID: " << HLT::Identifier( th->name() ).numeric() );
- m_thresholds.push_back( th );
- } else {
- ATH_MSG_DEBUG( "Nullptr to the threshold" );
- }
- }
-
- if ( m_thresholds.empty() ) {
- ATH_MSG_INFO("No MET thresholds configured");
+ for ( auto th2chains: m_thresholdToChainMapping ) {
+ m_allMETChains.insert( th2chains.second.begin(), th2chains.second.end() );
}
return StatusCode::SUCCESS;
}
-
StatusCode METRoIsUnpackingTool::unpack( const EventContext& ctx,
const ROIB::RoIBResult& roib,
const HLT::IDSet& activeChains ) const {
using namespace TrigCompositeUtils;
- SG::WriteHandle<DecisionContainer> handle = createAndStore(m_decisionsKey, ctx );
- auto decisionOutput = handle.ptr();
+ SG::WriteHandle<DecisionContainer> decisionOutput = createAndStore(m_decisionsKey, ctx );
+
+ // Retrieve the L1 menu configuration
+ SG::ReadHandle<TrigConf::L1Menu> l1Menu = SG::makeHandle(m_l1MenuKey, ctx);
+ ATH_CHECK(l1Menu.isValid());
+ ThrVec thresholds;
+ std::optional<ThrVecRef> xeThresholds;
+ std::optional<ThrVecRef> teThresholds;
+ std::optional<ThrVecRef> xsThresholds;
+ ATH_CHECK(getL1Thresholds(*l1Menu, "XE", xeThresholds));
+ ATH_CHECK(getL1Thresholds(*l1Menu, "TE", teThresholds));
+ ATH_CHECK(getL1Thresholds(*l1Menu, "XS", xsThresholds));
+ thresholds.insert(thresholds.end(), xeThresholds.value().get().cbegin(), xeThresholds.value().get().cend());
+ thresholds.insert(thresholds.end(), teThresholds.value().get().cbegin(), teThresholds.value().get().cend());
+ thresholds.insert(thresholds.end(), xsThresholds.value().get().cbegin(), xsThresholds.value().get().cend());
HLT::IDSet activeMETchains;
// see if any chain we care of is active
@@ -84,10 +58,10 @@ StatusCode METRoIsUnpackingTool::unpack( const EventContext& ctx,
ATH_MSG_DEBUG("Unpacking MET RoI for " << activeMETchains.size() << " chains");
- auto decision = TrigCompositeUtils::newDecisionIn( decisionOutput, hltSeedingNodeName() ); // This hltSeedingNodeName() denotes an initial node with no parents
- for ( auto th: m_thresholds )
+ auto decision = TrigCompositeUtils::newDecisionIn( decisionOutput.ptr(), hltSeedingNodeName() ); // This hltSeedingNodeName() denotes an initial node with no parents
+ for (const auto th: thresholds) {
addChainsToDecision( HLT::Identifier( th->name() ), decision, activeChains );
-
+ }
ATH_MSG_DEBUG("Linking to FS RoI descriptor");
decision->setObjectLink( "initialRoI", ElementLink<TrigRoiDescriptorCollection>( m_fsRoIKey, 0 ) );
@@ -97,16 +71,15 @@ StatusCode METRoIsUnpackingTool::unpack( const EventContext& ctx,
const std::vector<ROIB::JetEnergyResult>& jetEnergyResult = roib.jetEnergyResult();
for ( const ROIB::JetEnergyResult& jeResult: jetEnergyResult ) {
for ( const ROIB::JetEnergyRoI& roi: jeResult.roIVec() ) {
- uint32_t roIWord = roi.roIWord();
- LVL1::TrigT1CaloDefs::RoIType roiType = m_jepDecoder.roiType( roIWord );
+ const LVL1::TrigT1CaloDefs::RoIType roiType = m_jepDecoder.roiType( roi.roIWord() );
if ( roiType == LVL1::TrigT1CaloDefs::EnergyRoIWordType0 ) {
- foundMETRoI = true;
- break;
+ foundMETRoI = true;
+ break;
}
}
}
- // inconsistency, active MET chains, yet missing MET RoI
+ // inconsistency, active MET chains, yet missing MET RoI
if ( (not activeMETchains.empty()) and not foundMETRoI) {
ATH_MSG_WARNING( "" << activeMETchains.size() << " active MET chains while missing MET RoI" );
}
diff --git a/Trigger/TrigSteer/HLTSeeding/src/METRoIsUnpackingTool.h b/Trigger/TrigSteer/HLTSeeding/src/METRoIsUnpackingTool.h
index d61319c2bd2d..421910b637c3 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/METRoIsUnpackingTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/METRoIsUnpackingTool.h
@@ -4,40 +4,31 @@
#ifndef HLTSEEDING_METROISUNPACKINGTOOL_H
#define HLTSEEDING_METROISUNPACKINGTOOL_H 1
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
-#include "TrigConfL1Data/TriggerThreshold.h"
+#include "RoIsUnpackingToolBase.h"
#include "TrigT1Interfaces/JEPRoIDecoder.h"
-#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
-#include "RoIsUnpackingToolBase.h"
-#include <string>
+#include <string>
class METRoIsUnpackingTool : public RoIsUnpackingToolBase {
public:
-
METRoIsUnpackingTool( const std::string& type,
const std::string& name,
const IInterface* parent );
- virtual StatusCode updateConfiguration() override;
-
virtual StatusCode initialize() override;
+ virtual StatusCode start() override;
using RoIsUnpackingToolBase::unpack;
StatusCode unpack(const EventContext& ctx,
const ROIB::RoIBResult& roib,
const HLT::IDSet& activeChains) const override;
- virtual StatusCode start() override;
private:
Gaudi::Property<std::string> m_fsRoIKey{ this, "FSRoIKey", "HLT_FSRoI", "The key of FS RoI made earlier by the HLTSeeding" };
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc;
LVL1::JEPRoIDecoder m_jepDecoder;
HLT::IDSet m_allMETChains;
- std::vector<const TrigConf::TriggerThreshold*> m_thresholds;
};
-
#endif //> !HLTSEEDING_JROISUNPACKINGTOOL_H
diff --git a/Trigger/TrigSteer/HLTSeeding/src/MURoIsUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/MURoIsUnpackingTool.cxx
index 82a2497da578..66e27479b62f 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/MURoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/MURoIsUnpackingTool.cxx
@@ -3,37 +3,21 @@
*/
#include "MURoIsUnpackingTool.h"
#include "TrigT1Result/RoIBResult.h"
-#include "xAODTrigger/MuonRoIContainer.h"
#include "AthenaMonitoringKernel/Monitored.h"
-#include "TrigConfL1Data/CTPConfig.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
#include "StoreGate/ReadDecorHandle.h"
-///////////////////////////////////////////////////////////////////
-// Public methods:
-///////////////////////////////////////////////////////////////////
-
-// Constructors
-////////////////
MURoIsUnpackingTool::MURoIsUnpackingTool( const std::string& type,
const std::string& name,
const IInterface* parent )
- : RoIsUnpackingToolBase ( type, name, parent ),
- m_configSvc( "TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", name )
-{
-}
-
+ : RoIsUnpackingToolBase ( type, name, parent ) {}
StatusCode MURoIsUnpackingTool::initialize() {
-
CHECK( RoIsUnpackingToolBase::initialize() );
- CHECK( m_configSvc.retrieve() );
- CHECK( m_trigRoIsKey.initialize() );
CHECK( m_recRoIsKey.initialize(SG::AllowEmpty) );
CHECK( m_thresholdPatternsKey.initialize(!m_thresholdPatternsKey.empty()) );
CHECK( m_recRpcRoITool.retrieve() );
CHECK( m_recTgcRoITool.retrieve() );
-
return StatusCode::SUCCESS;
}
@@ -42,72 +26,64 @@ StatusCode MURoIsUnpackingTool::start() {
return StatusCode::SUCCESS;
}
-
-StatusCode MURoIsUnpackingTool::updateConfiguration() {
- using namespace TrigConf;
- const ThresholdConfig* thresholdConfig = m_configSvc->thresholdConfig();
- for ( TriggerThreshold * th : thresholdConfig->getThresholdVector( L1DataDef::MUON ) ) {
- if ( th != nullptr ) {
- ATH_MSG_DEBUG( "Found threshold in the configuration: " << th->name() << " of ID: " << HLT::Identifier( th->name() ).numeric() );
- m_muonThresholds.push_back( th );
- }
- }
- return StatusCode::SUCCESS;
-}
-
-
StatusCode MURoIsUnpackingTool::unpack( const EventContext& ctx,
const ROIB::RoIBResult& roib,
const HLT::IDSet& activeChains ) const {
using namespace TrigCompositeUtils;
+
// create and record the collections needed
- SG::WriteHandle<TrigRoiDescriptorCollection> handle1 = createAndStoreNoAux(m_trigRoIsKey, ctx );
- auto trigRoIs = handle1.ptr();
- SG::WriteHandle< DataVector<LVL1::RecMuonRoI> > handle2 = createAndStoreNoAux( m_recRoIsKey, ctx );
- auto recRoIs = handle2.ptr();
- SG::WriteHandle<DecisionContainer> handle3 = createAndStore(m_decisionsKey, ctx );
- auto decisionOutput = handle3.ptr();
- SG::WriteHandle<DecisionContainer> handle4 = createAndStore(m_decisionsKeyProbe, ctx );
- auto decisionOutputProbe = handle4.ptr();
+ SG::WriteHandle<TrigRoiDescriptorCollection> trigRoIs = createAndStoreNoAux(m_trigRoIsKey, ctx );
+ SG::WriteHandle< DataVector<LVL1::RecMuonRoI> > recRoIs = createAndStoreNoAux( m_recRoIsKey, ctx );
+ SG::WriteHandle<DecisionContainer> decisionOutput = createAndStore(m_decisionsKey, ctx );
+ SG::WriteHandle<DecisionContainer> decisionOutputProbe = createAndStore(m_decisionsKeyProbe, ctx );
+
+ // Retrieve the L1 menu configuration
+ SG::ReadHandle<TrigConf::L1Menu> l1Menu = SG::makeHandle(m_l1MenuKey, ctx);
+ ATH_CHECK(l1Menu.isValid());
+ std::optional<ThrVecRef> muThresholds;
+ ATH_CHECK(getL1Thresholds(*l1Menu, "MU", muThresholds));
for ( auto& roi : roib.muCTPIResult().roIVec() ) {
const uint32_t roIWord = roi.roIWord();
- int thresholdNumber = roi.pt();
+ unsigned int thresholdNumber = roi.pt();
ATH_MSG_DEBUG( "MUON RoI with the threshold number: " << thresholdNumber );
if ( thresholdNumber < 1 or thresholdNumber > 6 ) {
ATH_MSG_WARNING( "Incorrect threshold number, should be between 1 and 6 but is: "
<< thresholdNumber << ", force setting it to 1" );
thresholdNumber = 1;
}
- LVL1::RecMuonRoI* recRoI = new LVL1::RecMuonRoI( roIWord, m_recRpcRoITool.get(), m_recTgcRoITool.get(), &m_muonThresholds );
- recRoIs->push_back( recRoI );
- auto trigRoI = new TrigRoiDescriptor( roIWord, 0u ,0u,
- recRoI->eta(), recRoI->eta()-m_roIWidth, recRoI->eta()+m_roIWidth,
- recRoI->phi(), recRoI->phi()-m_roIWidth, recRoI->phi()+m_roIWidth );
- trigRoIs->push_back( trigRoI );
+
+ recRoIs->push_back( std::make_unique<LVL1::RecMuonRoI>(roIWord, m_recRpcRoITool.get(), m_recTgcRoITool.get(), l1Menu.cptr()) );
+ const LVL1::RecMuonRoI* recRoI = recRoIs->back();
+
+ trigRoIs->push_back( std::make_unique<TrigRoiDescriptor>(
+ roIWord, 0u ,0u,
+ recRoI->eta(), recRoI->eta()-m_roIWidth, recRoI->eta()+m_roIWidth,
+ recRoI->phi(), recRoI->phi()-m_roIWidth, recRoI->phi()+m_roIWidth) );
ATH_MSG_DEBUG( "RoI word: 0x" << MSG::hex << std::setw( 8 ) << roIWord );
// The hltSeedingNodeName() denotes an initial node with no parents
- Decision* decisionMain = TrigCompositeUtils::newDecisionIn( decisionOutput, hltSeedingNodeName() );
+ Decision* decisionMain = TrigCompositeUtils::newDecisionIn( decisionOutput.ptr(), hltSeedingNodeName() );
decisionMain->setObjectLink( initialRoIString(), ElementLink<TrigRoiDescriptorCollection>( m_trigRoIsKey.key(), trigRoIs->size()-1 ) );
decisionMain->setObjectLink( initialRecRoIString(), ElementLink<DataVector<LVL1::RecMuonRoI>>( m_recRoIsKey.key(), recRoIs->size()-1 ) );
- Decision* decisionProbe = TrigCompositeUtils::newDecisionIn( decisionOutputProbe, hltSeedingNodeName() );
+ Decision* decisionProbe = TrigCompositeUtils::newDecisionIn( decisionOutputProbe.ptr(), hltSeedingNodeName() );
decisionProbe->setObjectLink( initialRoIString(), ElementLink<TrigRoiDescriptorCollection>( m_trigRoIsKey.key(), trigRoIs->size()-1 ) );
decisionProbe->setObjectLink( initialRecRoIString(), ElementLink<DataVector<LVL1::RecMuonRoI>>( m_recRoIsKey.key(), recRoIs->size()-1 ) );
- for ( auto th: m_muonThresholds ) {
- if ( th->thresholdNumber() < thresholdNumber ) {
- //th->thresholdNumber() is defined to be [0,5] and thresholdNumber [0,6]
- const std::string thresholdProbeName = getProbeThresholdName(th->name());
- ATH_MSG_DEBUG( "Passed Threshold names " << th->name() << " and " << thresholdProbeName);
- addChainsToDecision( HLT::Identifier( th->name() ), decisionMain, activeChains );
- addChainsToDecision( HLT::Identifier(thresholdProbeName ), decisionProbe, activeChains );
+ for (const auto th : muThresholds.value().get()) {
+ if ( th->mapping() < thresholdNumber ) {
+ //th->thresholdNumber() is defined to be [0,5] and thresholdNumber [0,6]
+ const std::string thresholdProbeName = getProbeThresholdName(th->name());
+ ATH_MSG_DEBUG( "Passed Threshold names " << th->name() << " and " << thresholdProbeName);
+ addChainsToDecision( HLT::Identifier( th->name() ), decisionMain, activeChains );
+ addChainsToDecision( HLT::Identifier(thresholdProbeName ), decisionProbe, activeChains );
}
}
}
+
// monitoring
{
auto RoIsCount = Monitored::Scalar( "count", trigRoIs->size() );
@@ -118,10 +94,16 @@ StatusCode MURoIsUnpackingTool::unpack( const EventContext& ctx,
return StatusCode::SUCCESS;
}
-
StatusCode MURoIsUnpackingTool::unpack(const EventContext& ctx,
const xAOD::TrigComposite& l1TriggerResult,
const HLT::IDSet& activeChains) const {
+ using namespace TrigCompositeUtils;
+
+ // Create and record RoI descriptor and decision containers
+ SG::WriteHandle<TrigRoiDescriptorCollection> roiDescriptors = createAndStoreNoAux(m_trigRoIsKey, ctx );
+ SG::WriteHandle<DecisionContainer> decisions = createAndStore(m_decisionsKey, ctx );
+ SG::WriteHandle<DecisionContainer> decisionsProbe = createAndStore(m_decisionsKeyProbe, ctx );
+
// Retrieve the xAOD RoI container from L1TriggerResult
if (!l1TriggerResult.hasObjectLink(m_muRoILinkName, ClassID_traits<xAOD::MuonRoIContainer>::ID())) {
ATH_MSG_DEBUG("No muon RoIs in this event");
@@ -133,11 +115,13 @@ StatusCode MURoIsUnpackingTool::unpack(const EventContext& ctx,
// Create threshold patterns decoration accessor
auto thrPatternAcc = SG::makeHandle<uint64_t>(m_thresholdPatternsKey, ctx);
+ ATH_CHECK(thrPatternAcc.isPresent());
- // Create and record RoI descriptor and decision containers
- using namespace TrigCompositeUtils;
- SG::WriteHandle<TrigRoiDescriptorCollection> roiDescriptors = createAndStoreNoAux(m_trigRoIsKey, ctx);
- SG::WriteHandle<DecisionContainer> decisions = createAndStore(m_decisionsKey, ctx);
+ // Retrieve the L1 menu configuration
+ SG::ReadHandle<TrigConf::L1Menu> l1Menu = SG::makeHandle(m_l1MenuKey, ctx);
+ ATH_CHECK(l1Menu.isValid());
+ std::optional<ThrVecRef> muThresholds;
+ ATH_CHECK(getL1Thresholds(*l1Menu, "MU", muThresholds));
size_t linkIndex{0};
for (const xAOD::MuonRoI* roi : rois) {
@@ -155,14 +139,22 @@ StatusCode MURoIsUnpackingTool::unpack(const EventContext& ctx,
decision->setObjectLink(initialRecRoIString(),
ElementLink<xAOD::MuonRoIContainer>(m_muRoILinkName, linkIndex, ctx));
+ Decision* decisionProbe = TrigCompositeUtils::newDecisionIn(decisionsProbe.ptr(), hltSeedingNodeName());
+ decisionProbe->setObjectLink(initialRoIString(),
+ ElementLink<TrigRoiDescriptorCollection>(m_trigRoIsKey.key(), linkIndex, ctx));
+ decisionProbe->setObjectLink(initialRecRoIString(),
+ ElementLink<xAOD::MuonRoIContainer>(m_muRoILinkName, linkIndex, ctx));
+
// Add positive decisions for chains above the threshold
uint64_t thresholdPattern = thrPatternAcc(*roi);
ATH_MSG_DEBUG("RoI #" << linkIndex << " threshold pattern: " << thresholdPattern);
- for (const TrigConf::TriggerThreshold* thr : m_muonThresholds) {
+ for (const auto thr : muThresholds.value().get()) {
if (not (thresholdPattern & (1 << thr->mapping()))) {continue;}
- ATH_MSG_DEBUG("RoI #" << linkIndex << " passed threshold number " << thr->thresholdNumber()
- << " name " << thr->name());
+ const std::string thresholdProbeName = getProbeThresholdName(thr->name());
+ ATH_MSG_DEBUG("RoI #" << linkIndex << " passed threshold number " << thr->mapping()
+ << " names " << thr->name() << " and " << thresholdProbeName);
addChainsToDecision(HLT::Identifier(thr->name()), decision, activeChains);
+ addChainsToDecision(HLT::Identifier(thresholdProbeName), decisionProbe, activeChains);
if (msgLvl(MSG::DEBUG)) {
DecisionIDContainer ids;
decisionIDs(decision, ids);
diff --git a/Trigger/TrigSteer/HLTSeeding/src/MURoIsUnpackingTool.h b/Trigger/TrigSteer/HLTSeeding/src/MURoIsUnpackingTool.h
index 122545c9ed71..db1ec7054dbc 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/MURoIsUnpackingTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/MURoIsUnpackingTool.h
@@ -4,25 +4,18 @@
#ifndef HLTSEEDING_MUROISUNPACKINGTOOL_H
#define HLTSEEDING_MUROISUNPACKINGTOOL_H
+#include "RoIsUnpackingToolBase.h"
-#include <string>
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
-#include "TrigConfL1Data/ThresholdConfig.h"
-#include "TrigConfL1Data/TriggerThreshold.h"
-
-#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
+#include "TrigT1Interfaces/RecMuonRoI.h"
+#include "TrigT1Interfaces/ITrigT1MuonRecRoiTool.h"
#include "xAODTrigger/MuonRoIContainer.h"
-#include "AthenaBaseComps/AthAlgTool.h"
#include "StoreGate/ReadDecorHandleKey.h"
#include "StoreGate/WriteHandleKey.h"
-#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/ToolHandle.h"
-#include "TrigT1Interfaces/RecMuonRoI.h"
-#include "TrigT1Interfaces/ITrigT1MuonRecRoiTool.h"
-#include "RoIsUnpackingToolBase.h"
+#include "GaudiKernel/ToolHandle.h"
+#include <string>
class MURoIsUnpackingTool : public RoIsUnpackingToolBase
{
@@ -33,21 +26,16 @@ class MURoIsUnpackingTool : public RoIsUnpackingToolBase
const IInterface* parent );
virtual StatusCode initialize() override;
- virtual StatusCode updateConfiguration() override;
+ virtual StatusCode start() override;
+
virtual StatusCode unpack(const EventContext& ctx,
const ROIB::RoIBResult& roib,
const HLT::IDSet& activeChains) const override;
virtual StatusCode unpack(const EventContext& ctx,
const xAOD::TrigComposite& l1TriggerResult,
const HLT::IDSet& activeChains) const override;
- virtual StatusCode start() override;
private:
-
///@{ @name Properties
- SG::WriteHandleKey< TrigRoiDescriptorCollection > m_trigRoIsKey{
- this, "OutputTrigRoIs", "HLT_MURoIs",
- "Name of the RoIs object produced by the unpacker"};
-
SG::WriteHandleKey< DataVector<LVL1::RecMuonRoI> > m_recRoIsKey{
this, "OutputRecRoIs", "HLT_RecMURoIs",
"Name of the RoIs object produced by the unpacker"};
@@ -64,12 +52,8 @@ private:
this, "RoIWidth", 0.1, "Size of RoI in eta/ phi"};
///@}
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc;
ToolHandle<LVL1::ITrigT1MuonRecRoiTool> m_recRpcRoITool{this, "RecRpcRoiTool", "LVL1::TrigT1RPCRecRoiTool/TrigT1RPCRecRoiTool"};
ToolHandle<LVL1::ITrigT1MuonRecRoiTool> m_recTgcRoITool{this, "TgcRpcRoiTool", "LVL1::TrigT1TGCRecRoiTool/TrigT1TGCRecRoiTool"};
-
- std::vector<TrigConf::TriggerThreshold*> m_muonThresholds;
};
-
#endif //> !HLTSEEDING_MUROISUNPACKINGTOOL_H
diff --git a/Trigger/TrigSteer/HLTSeeding/src/RerunRoIsUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/RerunRoIsUnpackingTool.cxx
deleted file mode 100644
index 6b6a55ae13ed..000000000000
--- a/Trigger/TrigSteer/HLTSeeding/src/RerunRoIsUnpackingTool.cxx
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
-// HLTSeeding includes
-#include "RerunRoIsUnpackingTool.h"
-
-// STL includes
-
-// FrameWork includes
-#include "GaudiKernel/IToolSvc.h"
-
-
-
-
-RerunRoIsUnpackingTool::RerunRoIsUnpackingTool( const std::string& type,
- const std::string& name,
- const IInterface* parent )
- : RoIsUnpackingToolBase( type, name, parent ) { }
-
-RerunRoIsUnpackingTool::~RerunRoIsUnpackingTool() {}
-
-StatusCode RerunRoIsUnpackingTool::initialize() {
- CHECK( RoIsUnpackingToolBase::initialize() );
- CHECK( m_sourceKey.initialize() );
- CHECK( m_decisionsKey.initialize() );
- return StatusCode::SUCCESS;
-}
-
-StatusCode RerunRoIsUnpackingTool::finalize() {
- return StatusCode::SUCCESS;
-}
-
-StatusCode RerunRoIsUnpackingTool::updateConfiguration() {
- return StatusCode::SUCCESS;
-}
-
-StatusCode RerunRoIsUnpackingTool::unpack(const EventContext& ctx,
- const ROIB::RoIBResult& ,
- const HLT::IDSet& activeChains) const {
- using namespace TrigCompositeUtils;
- SG::WriteHandle<DecisionContainer> outputHandle = createAndStore( m_decisionsKey, ctx );
- auto decisionOutput = outputHandle.ptr();
-
- auto sourceHandle = SG::makeHandle( m_sourceKey, ctx );
-
- for ( auto sourceDecision: *sourceHandle.cptr() ) {
- if ( allFailed( sourceDecision ) ) {
-
- // this is RoI in which no Chain was interested, a candidate to re-enable
- // we need to obtain thresholds and see if the RoI is associated
- // with any chain in activeChains set
- if ( not sourceDecision->hasDetail< std::vector<unsigned> > ("thresholds") ) {
- ATH_MSG_DEBUG("No threshold passed, can not re-enable this RoI for re-running");
- continue;
- }
-
- std::vector<unsigned> thresholds;
- sourceDecision->getDetail( "thresholds", thresholds );
-
- ATH_MSG_DEBUG( "Thresholds in this RoI " << thresholds );
- auto decision = newDecisionIn( decisionOutput, hltSeedingNodeName() ); // This hltSeedingNodeName() denotes an initial node with no parents
- for ( auto th: thresholds ) {
- ATH_MSG_DEBUG( "Activating because there are some chains to be rerun seeded from the threshold of ID " << th );
- addChainsToDecision( th, decision, activeChains );
- }
- copyLinks( sourceDecision, decision );
-
- ATH_MSG_DEBUG( "Candidate for re-running " << ( allFailed( decision ) ? "not to be re-run" : "for re-running") );
-
-
- }
- }
-
-
-
- return StatusCode::SUCCESS;
-}
-
-
-
diff --git a/Trigger/TrigSteer/HLTSeeding/src/RerunRoIsUnpackingTool.h b/Trigger/TrigSteer/HLTSeeding/src/RerunRoIsUnpackingTool.h
deleted file mode 100644
index cd613c70f549..000000000000
--- a/Trigger/TrigSteer/HLTSeeding/src/RerunRoIsUnpackingTool.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
-#ifndef HLTSEEDING_RERUNROISUNPACKINGTOOL_H
-#define HLTSEEDING_RERUNROISUNPACKINGTOOL_H 1
-
-// STL includes
-#include <string>
-
-// FrameWork includes
-#include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/ServiceHandle.h"
-
-// HLTSeeding includes
-#include "RoIsUnpackingToolBase.h"
-
-
-
-/**
- * @class $(klass)s
- * @brief
- **/
-
-class RerunRoIsUnpackingTool : public RoIsUnpackingToolBase
-{
-
- public:
-
- RerunRoIsUnpackingTool( const std::string& type,
- const std::string& name,
- const IInterface* parent );
-
- virtual ~RerunRoIsUnpackingTool();
- virtual StatusCode initialize() override;
- virtual StatusCode finalize() override;
- virtual StatusCode updateConfiguration() override;
-
- using RoIsUnpackingToolBase::unpack;
- StatusCode unpack( const EventContext& ctx,
- const ROIB::RoIBResult& roib,
- const HLT::IDSet& activeChains ) const override;
-
-
- private:
- SG::ReadHandleKey<TrigCompositeUtils::DecisionContainer> m_sourceKey{
- this, "SourceDecisions", "UnspecifiedRoIDecisionsForRerunning",
- "The collection which has to be checked for RoIs to re-enable" };
-
-};
-
-
-#endif //> !HLTSEEDING_RERUNROISUNPACKINGTOOL_H
diff --git a/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingEmulationTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingEmulationTool.cxx
index d31ce5c222af..e05ae0af4d7f 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingEmulationTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingEmulationTool.cxx
@@ -1,38 +1,23 @@
/*
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-// HLTSeeding includes
#include "RoIsUnpackingEmulationTool.h"
-#include "TrigT1Result/RoIBResult.h"
#include "TrigT1Interfaces/TrigT1CaloDefs.h"
#include <fstream>
-///////////////////////////////////////////////////////////////////
-// Public methods:
-///////////////////////////////////////////////////////////////////
-
-// Constructors
-////////////////
RoIsUnpackingEmulationTool::RoIsUnpackingEmulationTool( const std::string& type,
const std::string& name,
const IInterface* parent )
- : RoIsUnpackingToolBase ( type, name, parent )
-{}
-
+ : RoIsUnpackingToolBase ( type, name, parent ) {}
StatusCode RoIsUnpackingEmulationTool::initialize() {
-
ATH_CHECK( RoIsUnpackingToolBase::initialize() );
- ATH_CHECK( m_trigRoIsKey.initialize() );
if (readEmulatedData().isFailure() ) {
ATH_MSG_ERROR( "Failed to read emulated data" );
return StatusCode::FAILURE;
}
-
- ATH_CHECK( decodeThresholdToChainMapping() );
-
return StatusCode::SUCCESS;
}
@@ -41,14 +26,6 @@ StatusCode RoIsUnpackingEmulationTool::start() {
return StatusCode::SUCCESS;
}
-
-StatusCode RoIsUnpackingEmulationTool::decodeThresholdToChainMapping() {
-
- return StatusCode::SUCCESS;
-}
-
-
-
StatusCode RoIsUnpackingEmulationTool::readEmulatedData(){
if ( m_inputFilename.empty() ) {
ATH_MSG_WARNING("Provided InputFilename parameter is empty");
@@ -155,47 +132,39 @@ RoIsUnpackingEmulationTool::FakeRoI RoIsUnpackingEmulationTool::parseInputRoI(co
return result;
}
-
-
StatusCode RoIsUnpackingEmulationTool::unpack( const EventContext& ctx,
const ROIB::RoIBResult& /*roib*/,
const HLT::IDSet& activeChains ) const {
using namespace TrigCompositeUtils;
// create and record the collections needed
- SG::WriteHandle<TrigRoiDescriptorCollection> handle1 = createAndStoreNoAux(m_trigRoIsKey, ctx );
- auto trigRoIs = handle1.ptr();
- SG::WriteHandle<DecisionContainer> handle3 = createAndStore(m_decisionsKey, ctx );
- auto decisionOutput = handle3.ptr();
+ SG::WriteHandle<TrigRoiDescriptorCollection> trigRoIs = createAndStoreNoAux(m_trigRoIsKey, ctx );
+ SG::WriteHandle<DecisionContainer> decisionOutput = createAndStore(m_decisionsKey, ctx );
// retrieve fake data for this event
-
if (m_inputData.size() ==0){
ATH_MSG_ERROR("No input dataset found. Cannot decode RoI emulation");
return StatusCode::FAILURE;
}
-
int line = ctx.evt() % m_inputData.size();
ATH_MSG_DEBUG("Getting RoIs for event "<< line);
auto FakeRoIs = m_inputData[line];
-
-
+
for (auto& roi : FakeRoIs) {
uint32_t roIWord = roi.roIWord;
- auto trigRoI = new TrigRoiDescriptor( roIWord, 0u ,0u,
- roi.eta, roi.eta-m_roIWidth, roi.eta+m_roIWidth,
- roi.phi, roi.phi-m_roIWidth, roi.phi+m_roIWidth );
- trigRoIs->push_back( trigRoI );
+ trigRoIs->push_back( std::make_unique<TrigRoiDescriptor>(
+ roIWord, 0u ,0u,
+ roi.eta, roi.eta-m_roIWidth, roi.eta+m_roIWidth,
+ roi.phi, roi.phi-m_roIWidth, roi.phi+m_roIWidth) );
ATH_MSG_DEBUG( "RoI word: 0x" << MSG::hex << std::setw(8) << roIWord << MSG::dec );
- auto decision = TrigCompositeUtils::newDecisionIn( decisionOutput, hltSeedingNodeName() ); // This hltSeedingNodeName() denotes an initial node with no parents
+ auto decision = TrigCompositeUtils::newDecisionIn( decisionOutput.ptr(), hltSeedingNodeName() ); // This hltSeedingNodeName() denotes an initial node with no parents
for ( auto th: roi.passedThresholdIDs ) {
ATH_MSG_DEBUG( "Passed Threshold " << th << " enabling respective chains " );
addChainsToDecision( HLT::Identifier( th ), decision, activeChains );
-
// TODO would be nice to have this. Requires modifying the TC class: decision->setDetail("Thresholds", passedThresholds); // record passing threshold names (for easy debugging)
decision->setObjectLink( initialRoIString(), ElementLink<TrigRoiDescriptorCollection>(m_trigRoIsKey.key(), trigRoIs->size()-1 ) );
}
@@ -205,7 +174,5 @@ StatusCode RoIsUnpackingEmulationTool::unpack( const EventContext& ctx,
ATH_MSG_DEBUG("RoI Eta: " << roi->eta() << " Phi: " << roi->phi() << " RoIWord: " << roi->roiWord());
}
- return StatusCode::SUCCESS; // what else
-
+ return StatusCode::SUCCESS;
}
-
diff --git a/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingEmulationTool.h b/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingEmulationTool.h
index 03841f917467..5c67448323a8 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingEmulationTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingEmulationTool.h
@@ -4,20 +4,11 @@
#ifndef HLTSEEDING_ROISUNPACKINGEMULATIONTOOL_H
#define HLTSEEDING_ROISUNPACKINGEMULATIONTOOL_H 1
-// STL includes
-#include <string>
-
-#include "TrigConfL1Data/ThresholdConfig.h"
-#include "TrigConfL1Data/TriggerThreshold.h"
-#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
-
-// HLTSeeding includes
#include "RoIsUnpackingToolBase.h"
+#include <string>
class RoIsUnpackingEmulationTool : public RoIsUnpackingToolBase {
-
-
public:
RoIsUnpackingEmulationTool( const std::string& type,
const std::string& name,
@@ -32,11 +23,7 @@ class RoIsUnpackingEmulationTool : public RoIsUnpackingToolBase {
virtual StatusCode start() override;
private:
-
///@{ @name Properties
- SG::WriteHandleKey<TrigRoiDescriptorCollection> m_trigRoIsKey{
- this, "OutputTrigRoIs", "HLT_EMRoIs", "Name of the RoIs object produced by the unpacker"};
-
Gaudi::Property<float> m_roIWidth{"RoIWidth", 0.1, "Size of RoI in eta/ phi"};
Gaudi::Property<std::string> m_inputFilename{
@@ -59,15 +46,8 @@ class RoIsUnpackingEmulationTool : public RoIsUnpackingToolBase {
std::vector<std::vector<FakeRoI>> parseInputFile();
std::vector<FakeRoI> parseInputFileLine(const std::string& line, unsigned lineNumber);
FakeRoI parseInputRoI(const std::string& roi, unsigned lineNumber, unsigned roiNumber);
-
- std::vector<TrigConf::TriggerThreshold*> m_emtauThresholds;
-
- std::vector<TrigConf::TriggerThreshold*> m_emThresholds;
std::vector<std::vector<RoIsUnpackingEmulationTool::FakeRoI>> m_inputData;
unsigned m_currentRowNumber;
-
- StatusCode decodeThresholdToChainMapping();
-
};
#endif //> !HLTSEEDING_EMROISUNPACKINGTOOL_H
diff --git a/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingToolBase.cxx b/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingToolBase.cxx
index ae3b718613c0..cc38cfb2a699 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingToolBase.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingToolBase.cxx
@@ -9,26 +9,36 @@
RoIsUnpackingToolBase::RoIsUnpackingToolBase(const std::string& type,
const std::string& name,
const IInterface* parent)
- : base_class(type, name, parent)
-{
-}
-
+ : base_class(type, name, parent) {}
-StatusCode RoIsUnpackingToolBase::initialize()
-{
+StatusCode RoIsUnpackingToolBase::initialize() {
if ( !m_monTool.empty() ) ATH_CHECK( m_monTool.retrieve() );
ATH_CHECK( m_decisionsKey.initialize() );
ATH_CHECK( m_decisionsKeyProbe.initialize(SG::AllowEmpty) );
+ ATH_CHECK( m_trigRoIsKey.initialize(SG::AllowEmpty) );
+ ATH_CHECK( m_l1MenuKey.initialize() );
ATH_CHECK( m_HLTMenuKey.initialize() );
return StatusCode::SUCCESS;
}
+StatusCode RoIsUnpackingToolBase::getL1Thresholds(const TrigConf::L1Menu& l1Menu,
+ const std::string& thrType,
+ std::optional<ThrVecRef>& thrVec) const {
+ try {
+ thrVec = ThrVecRef(l1Menu.thresholds(thrType));
+ }
+ catch (const std::exception& ex) {
+ ATH_MSG_ERROR("Failed to retrieve " << thrType << " thresholds from L1 menu. Exception:" << ex.what());
+ return StatusCode::FAILURE;
+ }
+ return StatusCode::SUCCESS;
+}
+
std::string RoIsUnpackingToolBase::getProbeThresholdName(const std::string& thresholdName) {
return "PROBE" + thresholdName;
}
-
StatusCode RoIsUnpackingToolBase::decodeMapping( std::function< bool(const std::string&)> filter ) {
SG::ReadHandle<TrigConf::HLTMenu> hltMenuHandle = SG::makeHandle( m_HLTMenuKey );
@@ -89,16 +99,3 @@ void RoIsUnpackingToolBase::addChainsToDecision( HLT::Identifier thresholdId,
TrigCompositeUtils::insertDecisionIDs(ids, d);
ATH_MSG_DEBUG( "Number of decisions in this RoI after adding chains using threshold " << thresholdId << " " << TrigCompositeUtils::decisionIDs( d ).size() );
}
-
-StatusCode RoIsUnpackingToolBase::copyThresholds( const std::vector<TrigConf::TriggerThreshold*>& src, std::vector<TrigConf::TriggerThreshold*>& dest ) const {
- for ( auto th: src ) {
- if ( th == nullptr ) {
- ATH_MSG_INFO( "Nullptr TrigConf::TriggerThreshold" );
- } else {
- ATH_MSG_INFO( "Found threshold in the configuration: " << th->name() << " of ID: " << HLT::Identifier( th->name() ).numeric() );
- dest.push_back( th );
- }
- }
-
- return StatusCode::SUCCESS;
-}
diff --git a/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingToolBase.h b/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingToolBase.h
index 8b7f3cbf3b3e..36b531c5342a 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingToolBase.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingToolBase.h
@@ -10,9 +10,9 @@
#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
-#include "TrigConfL1Data/TriggerThreshold.h"
-#include "TrigConfL1Data/Menu.h"
+#include "TrigConfData/L1Menu.h"
#include "TrigConfData/HLTMenu.h"
+#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
#include "xAODTrigger/TrigComposite.h"
namespace ROIB {
@@ -35,9 +35,6 @@ public:
typedef HLT::IDtoIDVecMap ThresholdToIdentifiers;
virtual StatusCode initialize() override;
-
-
- virtual StatusCode updateConfiguration( ) override { return StatusCode::SUCCESS; }
virtual StatusCode unpack(const EventContext& /*ctx*/,
const ROIB::RoIBResult& /*roib*/,
@@ -49,7 +46,6 @@ public:
protected:
-
///@{ @name Properties
SG::WriteHandleKey<TrigCompositeUtils::DecisionContainer> m_decisionsKey{
this, "Decisions", "RoIDecisions", "Decisions for each RoI"};
@@ -57,36 +53,49 @@ protected:
SG::WriteHandleKey<TrigCompositeUtils::DecisionContainer> m_decisionsKeyProbe{
this, "DecisionsProbe", "", "Optional secondary set of Decisions for each RoI for probe a.k.a. delayed a.k.a. rerun chains"};
+ SG::WriteHandleKey<TrigRoiDescriptorCollection> m_trigRoIsKey{
+ this, "OutputTrigRoIs", "", "Name of the RoIs collection produced by the unpacker"};
+
+ SG::ReadHandleKey<TrigConf::L1Menu> m_l1MenuKey{
+ this, "L1TriggerMenu", "DetectorStore+L1TriggerMenu", "Name of the L1Menu object to read configuration from"};
+
SG::ReadHandleKey<TrigConf::HLTMenu> m_HLTMenuKey{
- this, "HLTTriggerMenu", "DetectorStore+HLTTriggerMenu", "HLT Menu"};
+ this, "HLTTriggerMenu", "DetectorStore+HLTTriggerMenu", "Name of the HLTMenu object to read configuration from"};
ToolHandle<GenericMonitoringTool> m_monTool{
this, "MonTool", "", "Monitoring tool"};
///@}
+ std::map<HLT::Identifier, HLT::IDVec> m_thresholdToChainMapping;
+ std::map<HLT::Identifier, HLT::Identifier> m_legToChainMapping;
+
+ using ThrVec = std::vector<std::shared_ptr<TrigConf::L1Threshold>>;
+ using ThrVecRef = std::reference_wrapper<const ThrVec>;
+ /**
+ * Retrieve a vector of thresholds with type @c thrType from L1Menu
+ *
+ * @param[in] l1Menu The L1Menu object
+ * @param[in] thrType The threshold type, e.g. EM, MU, eTAU
+ * @param[out] thrVec The output will be passed into this parameter
+ * @return FAILURE on exception reading the menu (e.g. thrType not in menu), SUCCESS otherwise
+ */
+ StatusCode getL1Thresholds(const TrigConf::L1Menu& l1Menu, const std::string& thrType, std::optional<ThrVecRef>& thrVec) const;
+
/**
* @brief Concatonate the probe identifier string with the threshold name string to create the alternate version,
* used by lower pT probe legs of tag+probe chains.
**/
static std::string getProbeThresholdName(const std::string& thresholdName);
- std::map<HLT::Identifier, HLT::IDVec> m_thresholdToChainMapping;
- std::map<HLT::Identifier, HLT::Identifier> m_legToChainMapping;
/**
* Fills mapping from L1 threshold -> to HLT chain
* @arg filter is a function that, using the threshold name defines if this decoder instance should take care of this threshold
**/
-
StatusCode decodeMapping( std::function< bool(const std::string&)> filter ) ;
void addChainsToDecision( HLT::Identifier thresholdId,
TrigCompositeUtils::Decision* d,
const HLT::IDSet& activeChains ) const;
-
- //!< copies thresholds from src to dest filtering nulls and making verbose messages
- StatusCode copyThresholds( const std::vector<TrigConf::TriggerThreshold*>& src,
- std::vector<TrigConf::TriggerThreshold*>& dest ) const;
-
};
diff --git a/Trigger/TrigSteer/HLTSeeding/src/TAURoIsUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/TAURoIsUnpackingTool.cxx
index e9060cd0ccd2..28f70922f7b6 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/TAURoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/TAURoIsUnpackingTool.cxx
@@ -6,35 +6,22 @@
#include "TrigT1Result/RoIBResult.h"
#include "TrigT1Interfaces/TrigT1CaloDefs.h"
#include "AthenaMonitoringKernel/Monitored.h"
-#include "TrigConfL1Data/CTPConfig.h"
-///////////////////////////////////////////////////////////////////
-// Public methods:
-///////////////////////////////////////////////////////////////////
-
-// Constructors
-////////////////
TAURoIsUnpackingTool::TAURoIsUnpackingTool( const std::string& type,
const std::string& name,
const IInterface* parent )
- : RoIsUnpackingToolBase(type, name, parent),
- m_configSvc( "TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", name ){
-}
+ : RoIsUnpackingToolBase(type, name, parent) {}
StatusCode TAURoIsUnpackingTool::initialize() {
-
ATH_CHECK( RoIsUnpackingToolBase::initialize() );
- ATH_CHECK( m_configSvc.retrieve() );
- ATH_CHECK( m_trigRoIsKey.initialize() );
ATH_CHECK( m_recRoIsKey.initialize() );
-
return StatusCode::SUCCESS;
}
StatusCode TAURoIsUnpackingTool::start() {
ATH_CHECK( decodeMapping( [](const std::string& name ){ return name.find("TAU") == 0 or name.find(getProbeThresholdName("TAU")) == 0; } ) );
- // for taus, since there is threshold name change from HA to TAU we need to fill up mapping wiht same threshold but prefixed by HA
+ // for taus, since there is threshold name change from HA to TAU we need to fill up mapping with same threshold but prefixed by HA
// TODO remove once L1 configuration switches to TAU
for ( const auto& [threshold, chains] : m_thresholdToChainMapping ) {
if ( threshold.name().find("TAU") != std::string::npos ) {
@@ -45,38 +32,26 @@ StatusCode TAURoIsUnpackingTool::start() {
}
}
-
- return StatusCode::SUCCESS;
-}
-
-
-StatusCode TAURoIsUnpackingTool::updateConfiguration() {
- using namespace TrigConf;
-
- m_tauThresholds.clear();
- ATH_CHECK( copyThresholds(m_configSvc->thresholdConfig()->getThresholdVector( L1DataDef::TAU ), m_tauThresholds ) );
return StatusCode::SUCCESS;
}
-
-StatusCode TAURoIsUnpackingTool::finalize() {
- return StatusCode::SUCCESS;
-}
-
-
StatusCode TAURoIsUnpackingTool::unpack( const EventContext& ctx,
const ROIB::RoIBResult& roib,
const HLT::IDSet& activeChains ) const {
using namespace TrigCompositeUtils;
- SG::WriteHandle<TrigRoiDescriptorCollection> handle1 = createAndStoreNoAux(m_trigRoIsKey, ctx );
- auto trigRoIs = handle1.ptr();
- SG::WriteHandle< DataVector<LVL1::RecEmTauRoI> > handle2 = createAndStoreNoAux( m_recRoIsKey, ctx );
- auto recRoIs = handle2.ptr();
- SG::WriteHandle<DecisionContainer> handle3 = createAndStore(m_decisionsKey, ctx );
- auto decisionOutput = handle3.ptr();
- SG::WriteHandle<DecisionContainer> handle4 = createAndStore(m_decisionsKeyProbe, ctx );
- auto decisionOutputProbe = handle4.ptr();
+
+ // create and record the collections needed
+ SG::WriteHandle<TrigRoiDescriptorCollection> trigRoIs = createAndStoreNoAux(m_trigRoIsKey, ctx );
+ SG::WriteHandle< DataVector<LVL1::RecEmTauRoI> > recRoIs = createAndStoreNoAux( m_recRoIsKey, ctx );
+ SG::WriteHandle<DecisionContainer> decisionOutput = createAndStore(m_decisionsKey, ctx );
+ SG::WriteHandle<DecisionContainer> decisionOutputProbe = createAndStore(m_decisionsKeyProbe, ctx );
+ // Retrieve the L1 menu configuration
+ SG::ReadHandle<TrigConf::L1Menu> l1Menu = SG::makeHandle(m_l1MenuKey, ctx);
+ ATH_CHECK(l1Menu.isValid());
+ std::optional<ThrVecRef> tauThresholds;
+ ATH_CHECK(getL1Thresholds(*l1Menu, "TAU", tauThresholds));
+
// RoIBResult contains vector of TAU fragments
for ( auto& emTauFragment : roib.eMTauResult() ) {
for ( auto& roi : emTauFragment.roIVec() ) {
@@ -86,23 +61,23 @@ StatusCode TAURoIsUnpackingTool::unpack( const EventContext& ctx,
continue;
}
- auto recRoI = new LVL1::RecEmTauRoI( roIWord, &m_tauThresholds );
- recRoIs->push_back( recRoI );
-
- auto trigRoI = new TrigRoiDescriptor( roIWord, 0u ,0u,
- recRoI->eta(), recRoI->eta()-m_roIWidth, recRoI->eta()+m_roIWidth,
- recRoI->phi(), recRoI->phi()-m_roIWidth, recRoI->phi()+m_roIWidth );
- trigRoIs->push_back( trigRoI );
+ recRoIs->push_back( std::make_unique<LVL1::RecEmTauRoI>(roIWord, l1Menu.cptr()) );
+ const LVL1::RecEmTauRoI* recRoI = recRoIs->back();
+
+ trigRoIs->push_back( std::make_unique<TrigRoiDescriptor>(
+ roIWord, 0u ,0u,
+ recRoI->eta(), recRoI->eta()-m_roIWidth, recRoI->eta()+m_roIWidth,
+ recRoI->phi(), recRoI->phi()-m_roIWidth, recRoI->phi()+m_roIWidth) );
ATH_MSG_DEBUG( "RoI word: 0x" << MSG::hex << std::setw( 8 ) << roIWord << MSG::dec );
// The hltSeedingNodeName() denotes an initial node with no parents
- Decision* decisionMain = TrigCompositeUtils::newDecisionIn( decisionOutput, hltSeedingNodeName() );
- Decision* decisionProbe = TrigCompositeUtils::newDecisionIn( decisionOutputProbe, hltSeedingNodeName() );
+ Decision* decisionMain = TrigCompositeUtils::newDecisionIn( decisionOutput.ptr(), hltSeedingNodeName() );
+ Decision* decisionProbe = TrigCompositeUtils::newDecisionIn( decisionOutputProbe.ptr(), hltSeedingNodeName() );
- for ( auto th: m_tauThresholds ) {
+ for (const auto th : tauThresholds.value().get()) {
ATH_MSG_VERBOSE( "Checking if the threshold " << th->name() << " passed" );
- if ( recRoI->passedThreshold( th->thresholdNumber() ) ) {
+ if ( recRoI->passedThreshold( th->mapping() ) ) {
const std::string thresholdProbeName = getProbeThresholdName(th->name());
ATH_MSG_DEBUG( "Passed Threshold names " << th->name() << " and " << thresholdProbeName);
addChainsToDecision( HLT::Identifier( th->name() ), decisionMain, activeChains );
diff --git a/Trigger/TrigSteer/HLTSeeding/src/TAURoIsUnpackingTool.h b/Trigger/TrigSteer/HLTSeeding/src/TAURoIsUnpackingTool.h
index c13e33bfc153..b12c2e765a3a 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/TAURoIsUnpackingTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/TAURoIsUnpackingTool.h
@@ -4,27 +4,11 @@
#ifndef HLTSEEDING_TAUROISUNPACKINGTOOL_H
#define HLTSEEDING_TAUROISUNPACKINGTOOL_H 1
-// STL includes
-#include <string>
-
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
-#include "TrigConfL1Data/ThresholdConfig.h"
-#include "TrigConfL1Data/TriggerThreshold.h"
-#include "TrigT1Interfaces/RecEmTauRoI.h"
-#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
-#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
-
-// FrameWork includes
-#include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/ServiceHandle.h"
-
-// HLTSeeding includes
#include "RoIsUnpackingToolBase.h"
-
+#include "TrigT1Interfaces/RecEmTauRoI.h"
class TAURoIsUnpackingTool : public RoIsUnpackingToolBase {
public:
-
TAURoIsUnpackingTool(const std::string& type,
const std::string& name,
const IInterface* parent);
@@ -35,16 +19,10 @@ public:
const HLT::IDSet& activeChains) const override;
virtual StatusCode initialize() override;
- virtual StatusCode updateConfiguration() override;
- virtual StatusCode finalize() override;
virtual StatusCode start() override;
-private:
+private:
///@{ @name Properties
- SG::WriteHandleKey<TrigRoiDescriptorCollection> m_trigRoIsKey{
- this, "OutputTrigRoIs", "HLT_TAURoIs",
- "Name of the RoIs object produced by the unpacker"};
-
SG::WriteHandleKey< DataVector<LVL1::RecEmTauRoI> > m_recRoIsKey{
this, "OutputRecRoIs", "HLT_RecTAURoIs",
"Name of the RoIs object produced by the unpacker"};
@@ -52,10 +30,6 @@ private:
Gaudi::Property<float> m_roIWidth{
this, "RoIWidth", 0.1, "Size of RoI in eta/ phi"};
///@}
-
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc;
- std::vector<TrigConf::TriggerThreshold*> m_tauThresholds;
-
};
#endif //> !HLTSEEDING_TAUROISUNPACKINGTOOL_H
diff --git a/Trigger/TrigSteer/HLTSeeding/src/components/HLTSeeding_entries.cxx b/Trigger/TrigSteer/HLTSeeding/src/components/HLTSeeding_entries.cxx
index cbab400a0d25..c954667a575b 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/components/HLTSeeding_entries.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/components/HLTSeeding_entries.cxx
@@ -1,8 +1,5 @@
-#include "../L1CaloDecoder.h"
-#include "../FakeRoI.h"
#include "../HLTSeeding.h"
#include "../HLTSeedingNoCtpForTesting.h"
-#include "../FakeCTP.h"
#include "../CTPUnpackingToolBase.h"
#include "../CTPUnpackingTool.h"
#include "../CTPUnpackingEmulationTool.h"
@@ -20,36 +17,42 @@
#include "../RoIsUnpackingToolBase.h"
#include "../RoIsUnpackingEmulationTool.h"
#include "../MURoIsUnpackingTool.h"
-#include "../RerunRoIsUnpackingTool.h"
#include "../PrescalingTool.h"
#include "../PrescalingEmulationTool.h"
-#include "../CreateFullScanRoI.h"
#include "../L1TriggerResultMaker.h"
-DECLARE_COMPONENT( L1CaloDecoder )
-DECLARE_COMPONENT( FakeRoI )
-DECLARE_COMPONENT( FakeCTP )
+// Algorithms
DECLARE_COMPONENT( HLTSeeding )
DECLARE_COMPONENT( HLTSeedingNoCtpForTesting )
+DECLARE_COMPONENT( L1TriggerResultMaker )
+
+// Prescaling tools
+DECLARE_COMPONENT( PrescalingTool )
+DECLARE_COMPONENT( PrescalingEmulationTool )
+
+// Seeding tools: CTP
DECLARE_COMPONENT( CTPUnpackingToolBase )
DECLARE_COMPONENT( CTPUnpackingTool )
DECLARE_COMPONENT( CTPUnpackingEmulationTool )
+
+// Seeding tools: Muon
+DECLARE_COMPONENT( MURoIsUnpackingTool )
+
+// Seeding: tools L1Calo
DECLARE_COMPONENT( eFexEMRoIsUnpackingTool )
DECLARE_COMPONENT( eFexEMRoIThresholdsTool )
DECLARE_COMPONENT( eFexTauRoIsUnpackingTool )
DECLARE_COMPONENT( eFexTauRoIThresholdsTool )
DECLARE_COMPONENT( jFexTauRoIsUnpackingTool )
DECLARE_COMPONENT( jFexTauRoIThresholdsTool )
+
+// Seeding tools: Legacy L1Calo
DECLARE_COMPONENT( EMRoIsUnpackingTool )
+DECLARE_COMPONENT( TAURoIsUnpackingTool )
+DECLARE_COMPONENT( JRoIsUnpackingTool )
DECLARE_COMPONENT( METRoIsUnpackingTool )
-DECLARE_COMPONENT( FSRoIsUnpackingTool )
+
+// Seeding tools: Common
DECLARE_COMPONENT( RoIsUnpackingToolBase )
DECLARE_COMPONENT( RoIsUnpackingEmulationTool )
-DECLARE_COMPONENT( MURoIsUnpackingTool )
-DECLARE_COMPONENT( JRoIsUnpackingTool )
-DECLARE_COMPONENT( TAURoIsUnpackingTool )
-DECLARE_COMPONENT( PrescalingTool )
-DECLARE_COMPONENT( PrescalingEmulationTool )
-DECLARE_COMPONENT( RerunRoIsUnpackingTool )
-DECLARE_COMPONENT( CreateFullScanRoI )
-DECLARE_COMPONENT( L1TriggerResultMaker )
+DECLARE_COMPONENT( FSRoIsUnpackingTool )
diff --git a/Trigger/TrigSteer/HLTSeeding/src/eFexEMRoIsUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/eFexEMRoIsUnpackingTool.cxx
index 688f69726b1b..3f64a96883ed 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/eFexEMRoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/eFexEMRoIsUnpackingTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "eFexEMRoIsUnpackingTool.h"
-#include "xAODTrigger/eFexEMRoIContainer.h"
#include "StoreGate/ReadDecorHandle.h"
// =============================================================================
@@ -30,21 +29,12 @@ StatusCode eFexEMRoIsUnpackingTool::start() {
StatusCode eFexEMRoIsUnpackingTool::unpack(const EventContext& ctx,
const xAOD::TrigComposite& l1TriggerResult,
const HLT::IDSet& activeChains) const {
- // Retrieve the L1 menu configuration
- SG::ReadHandle<TrigConf::L1Menu> l1Menu = SG::makeHandle(m_l1MenuKey, ctx);
- ATH_CHECK(l1Menu.isValid());
+ using namespace TrigCompositeUtils;
- // Retrieve the eEM thresholds vector from L1 menu configuration
- using ThrVec = const std::vector<std::shared_ptr<TrigConf::L1Threshold>>;
- using ThrVecRef = std::reference_wrapper<ThrVec>;
- std::optional<ThrVecRef> thresholds;
- try {
- thresholds = ThrVecRef(l1Menu->thresholds("eEM"));
- }
- catch (const std::exception& ex) {
- ATH_MSG_ERROR("Failed to retrieve eEM thresholds from L1 menu. Exception:" << ex.what());
- return StatusCode::FAILURE;
- }
+ // Create and record RoI descriptor and decision containers
+ SG::WriteHandle<TrigRoiDescriptorCollection> roiDescriptors = createAndStoreNoAux(m_trigRoIsKey, ctx);
+ SG::WriteHandle<DecisionContainer> decisionsMain = createAndStore(m_decisionsKey, ctx);
+ SG::WriteHandle<DecisionContainer> decisionsProbe = createAndStore(m_decisionsKeyProbe, ctx);
// Retrieve the xAOD RoI container from L1TriggerResult
if (!l1TriggerResult.hasObjectLink(m_eFexEMRoILinkName, ClassID_traits<xAOD::eFexEMRoIContainer>::ID())) {
@@ -57,12 +47,13 @@ StatusCode eFexEMRoIsUnpackingTool::unpack(const EventContext& ctx,
// Create threshold patterns decoration accessor
auto thrPatternAcc = SG::makeHandle<uint64_t>(m_thresholdPatternsKey, ctx);
+ ATH_CHECK(thrPatternAcc.isPresent());
- // Create and record RoI descriptor and decision containers
- using namespace TrigCompositeUtils;
- SG::WriteHandle<TrigRoiDescriptorCollection> roiDescriptors = createAndStoreNoAux(m_trigRoIsKey, ctx);
- SG::WriteHandle<DecisionContainer> decisionsMain = createAndStore(m_decisionsKey, ctx);
- SG::WriteHandle<DecisionContainer> decisionsProbe = createAndStore(m_decisionsKeyProbe, ctx);
+ // Retrieve the L1 menu configuration
+ SG::ReadHandle<TrigConf::L1Menu> l1Menu = SG::makeHandle(m_l1MenuKey, ctx);
+ ATH_CHECK(l1Menu.isValid());
+ std::optional<ThrVecRef> thresholds;
+ ATH_CHECK(getL1Thresholds(*l1Menu, "eEM", thresholds));
size_t linkIndex{0};
for (const xAOD::eFexEMRoI* roi : rois) {
diff --git a/Trigger/TrigSteer/HLTSeeding/src/eFexEMRoIsUnpackingTool.h b/Trigger/TrigSteer/HLTSeeding/src/eFexEMRoIsUnpackingTool.h
index 854a8939429f..f0d7ded16b39 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/eFexEMRoIsUnpackingTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/eFexEMRoIsUnpackingTool.h
@@ -5,8 +5,6 @@
#define HLTSEEDING_EFEXEMROISUNPACKINGTOOL_H 1
#include "RoIsUnpackingToolBase.h"
-#include "TrigConfData/L1Menu.h"
-#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
#include "xAODTrigger/eFexEMRoIContainer.h"
#include "StoreGate/ReadDecorHandleKey.h"
@@ -25,14 +23,6 @@ public:
virtual StatusCode start() override;
private:
- SG::ReadHandleKey<TrigConf::L1Menu> m_l1MenuKey{
- this, "L1TriggerMenu", "DetectorStore+L1TriggerMenu",
- "Name of the L1Menu object to read configuration from"};
-
- SG::WriteHandleKey<TrigRoiDescriptorCollection> m_trigRoIsKey{
- this, "OutputTrigRoIs", "HLT_eEMRoIs",
- "Name of the TrigRoiDescriptor collection produced by the unpacker"};
-
Gaudi::Property<std::string> m_eFexEMRoILinkName {
this, "eFexEMRoILinkName", "L1_eEMRoI",
"Name of the link to read from L1TriggerResult for eFexEMRoI container"};
diff --git a/Trigger/TrigSteer/HLTSeeding/src/eFexTauRoIsUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/eFexTauRoIsUnpackingTool.cxx
index 28f4e9335e94..38f470d972a9 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/eFexTauRoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/eFexTauRoIsUnpackingTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "eFexTauRoIsUnpackingTool.h"
-#include "xAODTrigger/eFexTauRoIContainer.h"
#include "StoreGate/ReadDecorHandle.h"
// =============================================================================
@@ -30,21 +29,12 @@ StatusCode eFexTauRoIsUnpackingTool::start() {
StatusCode eFexTauRoIsUnpackingTool::unpack(const EventContext& ctx,
const xAOD::TrigComposite& l1TriggerResult,
const HLT::IDSet& activeChains) const {
- // Retrieve the L1 menu configuration
- SG::ReadHandle<TrigConf::L1Menu> l1Menu = SG::makeHandle(m_l1MenuKey, ctx);
- ATH_CHECK(l1Menu.isValid());
+ using namespace TrigCompositeUtils;
- // Retrieve the eTAU thresholds vector from L1 menu configuration
- using ThrVec = const std::vector<std::shared_ptr<TrigConf::L1Threshold>>;
- using ThrVecRef = std::reference_wrapper<ThrVec>;
- std::optional<ThrVecRef> thresholds;
- try {
- thresholds = ThrVecRef(l1Menu->thresholds("eTAU"));
- }
- catch (const std::exception& ex) {
- ATH_MSG_ERROR("Failed to retrieve eTAU thresholds from L1 menu. Exception:" << ex.what());
- return StatusCode::FAILURE;
- }
+ // Create and record RoI descriptor and decision containers
+ SG::WriteHandle<TrigRoiDescriptorCollection> roiDescriptors = createAndStoreNoAux(m_trigRoIsKey, ctx);
+ SG::WriteHandle<DecisionContainer> decisionsMain = createAndStore(m_decisionsKey, ctx);
+ SG::WriteHandle<DecisionContainer> decisionsProbe = createAndStore(m_decisionsKeyProbe, ctx);
// Retrieve the xAOD RoI container from L1TriggerResult
if (!l1TriggerResult.hasObjectLink(m_eFexTauRoILinkName, ClassID_traits<xAOD::eFexTauRoIContainer>::ID())) {
@@ -57,12 +47,13 @@ StatusCode eFexTauRoIsUnpackingTool::unpack(const EventContext& ctx,
// Create threshold patterns decoration accessor
auto thrPatternAcc = SG::makeHandle<uint64_t>(m_thresholdPatternsKey, ctx);
+ ATH_CHECK(thrPatternAcc.isPresent());
- // Create and record RoI descriptor and decision containers
- using namespace TrigCompositeUtils;
- SG::WriteHandle<TrigRoiDescriptorCollection> roiDescriptors = createAndStoreNoAux(m_trigRoIsKey, ctx);
- SG::WriteHandle<DecisionContainer> decisionsMain = createAndStore(m_decisionsKey, ctx);
- SG::WriteHandle<DecisionContainer> decisionsProbe = createAndStore(m_decisionsKeyProbe, ctx);
+ // Retrieve the L1 menu configuration
+ SG::ReadHandle<TrigConf::L1Menu> l1Menu = SG::makeHandle(m_l1MenuKey, ctx);
+ ATH_CHECK(l1Menu.isValid());
+ std::optional<ThrVecRef> thresholds;
+ ATH_CHECK(getL1Thresholds(*l1Menu, "eTAU", thresholds));
size_t linkIndex{0};
for (const xAOD::eFexTauRoI* roi : rois) {
diff --git a/Trigger/TrigSteer/HLTSeeding/src/eFexTauRoIsUnpackingTool.h b/Trigger/TrigSteer/HLTSeeding/src/eFexTauRoIsUnpackingTool.h
index 8f0561e7e884..eaa0479d14e7 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/eFexTauRoIsUnpackingTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/eFexTauRoIsUnpackingTool.h
@@ -5,8 +5,6 @@
#define HLTSEEDING_EFEXTAUROISUNPACKINGTOOL_H 1
#include "RoIsUnpackingToolBase.h"
-#include "TrigConfData/L1Menu.h"
-#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
#include "xAODTrigger/eFexTauRoIContainer.h"
#include "StoreGate/ReadDecorHandleKey.h"
@@ -25,14 +23,6 @@ public:
virtual StatusCode start() override;
private:
- SG::ReadHandleKey<TrigConf::L1Menu> m_l1MenuKey{
- this, "L1TriggerMenu", "DetectorStore+L1TriggerMenu",
- "Name of the L1Menu object to read configuration from"};
-
- SG::WriteHandleKey<TrigRoiDescriptorCollection> m_trigRoIsKey{
- this, "OutputTrigRoIs", "HLT_eTAURoIs",
- "Name of the TrigRoiDescriptor collection produced by the unpacker"};
-
Gaudi::Property<std::string> m_eFexTauRoILinkName {
this, "eFexTauRoILinkName", "L1_eTauRoI",
"Name of the link to read from L1TriggerResult for eFexTauRoI container"};
diff --git a/Trigger/TrigSteer/HLTSeeding/src/jFexTauRoIsUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/jFexTauRoIsUnpackingTool.cxx
index a4de1cc36994..cce2b14c570c 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/jFexTauRoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/jFexTauRoIsUnpackingTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "jFexTauRoIsUnpackingTool.h"
-#include "xAODTrigger/jFexTauRoIContainer.h"
#include "StoreGate/ReadDecorHandle.h"
// =============================================================================
@@ -30,21 +29,12 @@ StatusCode jFexTauRoIsUnpackingTool::start() {
StatusCode jFexTauRoIsUnpackingTool::unpack(const EventContext& ctx,
const xAOD::TrigComposite& l1TriggerResult,
const HLT::IDSet& activeChains) const {
- // Retrieve the L1 menu configuration
- SG::ReadHandle<TrigConf::L1Menu> l1Menu = SG::makeHandle(m_l1MenuKey, ctx);
- ATH_CHECK(l1Menu.isValid());
+ using namespace TrigCompositeUtils;
- // Retrieve the jTAU thresholds vector from L1 menu configuration
- using ThrVec = const std::vector<std::shared_ptr<TrigConf::L1Threshold>>;
- using ThrVecRef = std::reference_wrapper<ThrVec>;
- std::optional<ThrVecRef> thresholds;
- try {
- thresholds = ThrVecRef(l1Menu->thresholds("jTAU"));
- }
- catch (const std::exception& ex) {
- ATH_MSG_ERROR("Failed to retrieve jTAU thresholds from L1 menu. Exception:" << ex.what());
- return StatusCode::FAILURE;
- }
+ // Create and record RoI descriptor and decision containers
+ SG::WriteHandle<TrigRoiDescriptorCollection> roiDescriptors = createAndStoreNoAux(m_trigRoIsKey, ctx);
+ SG::WriteHandle<DecisionContainer> decisionsMain = createAndStore(m_decisionsKey, ctx);
+ SG::WriteHandle<DecisionContainer> decisionsProbe = createAndStore(m_decisionsKeyProbe, ctx);
// Retrieve the xAOD RoI container from L1TriggerResult
if (!l1TriggerResult.hasObjectLink(m_jFexTauRoILinkName, ClassID_traits<xAOD::jFexTauRoIContainer>::ID())) {
@@ -57,12 +47,13 @@ StatusCode jFexTauRoIsUnpackingTool::unpack(const EventContext& ctx,
// Create threshold patterns decoration accessor
auto thrPatternAcc = SG::makeHandle<uint64_t>(m_thresholdPatternsKey, ctx);
+ ATH_CHECK(thrPatternAcc.isPresent());
- // Create and record RoI descriptor and decision containers
- using namespace TrigCompositeUtils;
- SG::WriteHandle<TrigRoiDescriptorCollection> roiDescriptors = createAndStoreNoAux(m_trigRoIsKey, ctx);
- SG::WriteHandle<DecisionContainer> decisionsMain = createAndStore(m_decisionsKey, ctx);
- SG::WriteHandle<DecisionContainer> decisionsProbe = createAndStore(m_decisionsKeyProbe, ctx);
+ // Retrieve the L1 menu configuration
+ SG::ReadHandle<TrigConf::L1Menu> l1Menu = SG::makeHandle(m_l1MenuKey, ctx);
+ ATH_CHECK(l1Menu.isValid());
+ std::optional<ThrVecRef> thresholds;
+ ATH_CHECK(getL1Thresholds(*l1Menu, "jTAU", thresholds));
size_t linkIndex{0};
for (const xAOD::jFexTauRoI* roi : rois) {
diff --git a/Trigger/TrigSteer/HLTSeeding/src/jFexTauRoIsUnpackingTool.h b/Trigger/TrigSteer/HLTSeeding/src/jFexTauRoIsUnpackingTool.h
index 62a64418b9a2..9410ef04e5b1 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/jFexTauRoIsUnpackingTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/jFexTauRoIsUnpackingTool.h
@@ -5,8 +5,6 @@
#define HLTSEEDING_JFEXTAUROISUNPACKINGTOOL_H 1
#include "RoIsUnpackingToolBase.h"
-#include "TrigConfData/L1Menu.h"
-#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
#include "xAODTrigger/jFexTauRoIContainer.h"
#include "StoreGate/ReadDecorHandleKey.h"
@@ -25,14 +23,6 @@ public:
virtual StatusCode start() override;
private:
- SG::ReadHandleKey<TrigConf::L1Menu> m_l1MenuKey{
- this, "L1TriggerMenu", "DetectorStore+L1TriggerMenu",
- "Name of the L1Menu object to read configuration from"};
-
- SG::WriteHandleKey<TrigRoiDescriptorCollection> m_trigRoIsKey{
- this, "OutputTrigRoIs", "HLT_jTAURoIs",
- "Name of the TrigRoiDescriptor collection produced by the unpacker"};
-
Gaudi::Property<std::string> m_jFexTauRoILinkName {
this, "jFexTauRoILinkName", "L1_jFexTauRoI",
"Name of the link to read from L1TriggerResult for jFexTauRoI container"};
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 9ecb16b91462..d833b8878152 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -6811,8 +6811,27 @@ HLT_mu24_ivarmedium_mu6_ivarmedium_L1MU20:
4: 3
HLT_mu24_ivarmedium_mu6_ivarmedium_probe_L1MU20:
eventCount: 0
+ stepCounts:
+ 0: 8
+ 1: 6
+ 2: 6
+ 3: 6
+ 4: 4
+ 5: 2
+ 6: 1
+ 7: 1
+ 8: 1
stepFeatures:
0: 10
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 4
+ 5: 6
+ 6: 3
+ 7: 2
+ 8: 2
+ 9: 1
HLT_mu24_ivarmedium_mu6_ivarperf_L1MU20:
eventCount: 1
stepCounts:
@@ -6828,13 +6847,51 @@ HLT_mu24_ivarmedium_mu6_ivarperf_L1MU20:
3: 7
4: 5
HLT_mu24_ivarmedium_mu6_ivarperf_probe_L1MU20:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 8
+ 1: 6
+ 2: 6
+ 3: 6
+ 4: 4
+ 5: 2
+ 6: 1
+ 7: 1
+ 8: 1
+ 9: 1
stepFeatures:
0: 10
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 4
+ 5: 6
+ 6: 3
+ 7: 2
+ 8: 2
+ 9: 2
HLT_mu24_ivarmedium_mu6_probe_L1MU20:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 8
+ 1: 6
+ 2: 6
+ 3: 6
+ 4: 4
+ 5: 2
+ 6: 1
+ 7: 1
+ 8: 1
stepFeatures:
0: 10
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 4
+ 5: 6
+ 6: 3
+ 7: 2
+ 8: 2
HLT_mu24_mu10noL1_L1MU20:
eventCount: 2
stepCounts:
@@ -6864,9 +6921,25 @@ HLT_mu24_mu6_L1MU20:
2: 7
3: 7
HLT_mu24_mu6_probe_L1MU20:
- eventCount: 0
+ eventCount: 2
+ stepCounts:
+ 0: 8
+ 1: 6
+ 2: 6
+ 3: 6
+ 4: 3
+ 5: 2
+ 6: 2
+ 7: 2
stepFeatures:
0: 10
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 9
+ 5: 5
+ 6: 4
+ 7: 4
HLT_mu24_mu8noL1_L1MU20:
eventCount: 2
stepCounts:
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index 897d55b282e5..e62cf8389782 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -2762,6 +2762,8 @@ HLT_mu24_ivarmedium_mu6_ivarmedium_L1MU20:
0: 3
HLT_mu24_ivarmedium_mu6_ivarmedium_probe_L1MU20:
eventCount: 0
+ stepCounts:
+ 0: 1
stepFeatures:
0: 1
HLT_mu24_ivarmedium_mu6_ivarperf_L1MU20:
@@ -2772,10 +2774,14 @@ HLT_mu24_ivarmedium_mu6_ivarperf_L1MU20:
0: 3
HLT_mu24_ivarmedium_mu6_ivarperf_probe_L1MU20:
eventCount: 0
+ stepCounts:
+ 0: 1
stepFeatures:
0: 1
HLT_mu24_ivarmedium_mu6_probe_L1MU20:
eventCount: 0
+ stepCounts:
+ 0: 1
stepFeatures:
0: 1
HLT_mu24_mu10noL1_L1MU20:
@@ -2792,6 +2798,8 @@ HLT_mu24_mu6_L1MU20:
0: 3
HLT_mu24_mu6_probe_L1MU20:
eventCount: 0
+ stepCounts:
+ 0: 1
stepFeatures:
0: 1
HLT_mu24_mu8noL1_L1MU20:
--
GitLab
From 5488923e18844eed352f76446dd2feb1aa854ccf Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Thu, 12 Aug 2021 21:14:51 +0200
Subject: [PATCH 024/272] Super cluster position corrections, use the newly
provided named list from Scott Snyder
---
.../egamma/egammaRec/python/egammaRecFlags.py | 14 ++++++--
.../python/egammaToolsFactories.py | 34 ++++++-------------
2 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/Reconstruction/egamma/egammaRec/python/egammaRecFlags.py b/Reconstruction/egamma/egammaRec/python/egammaRecFlags.py
index 8b2425563986..5499127a552b 100755
--- a/Reconstruction/egamma/egammaRec/python/egammaRecFlags.py
+++ b/Reconstruction/egamma/egammaRec/python/egammaRecFlags.py
@@ -1,5 +1,5 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# =======================================================================
# File: egammaRec/python/egammaRecFlags.py
@@ -133,6 +133,15 @@ class clusterCorrectionVersion (JobProperty):
StoredValue = 'v12phiflip_noecorrnogap'
+class superClusterCorrectionVersion (JobProperty):
+ """Version of calo cluster corrections used for
+ super cluster position correction.
+ """
+ statusOn = True
+ allowedTypes = ['str', 'None']
+ StoredValue = 'v12phiflip_supercluster'
+
+
class calibMVAVersion (JobProperty):
"""Version of calo cluster corrections used for calibration.
"""
@@ -154,7 +163,8 @@ jobproperties.add_Container(egammaRecFlags)
_list_Egamma = [Enabled, doEgammaCaloSeeded, doEgammaForwardSeeded,
doBremFinding, doVertexBuilding, doConversions,
cellContainerName, doEgammaTruthAssociation,
- clusterCorrectionVersion, calibMVAVersion, doSuperclusters,
+ clusterCorrectionVersion, superClusterCorrectionVersion,
+ calibMVAVersion, doSuperclusters,
inputTopoClusterCollection, egammaTopoClusterCollection]
for j in _list_Egamma:
diff --git a/Reconstruction/egamma/egammaTools/python/egammaToolsFactories.py b/Reconstruction/egamma/egammaTools/python/egammaToolsFactories.py
index 2f62ade2d980..952bf9b48526 100644
--- a/Reconstruction/egamma/egammaTools/python/egammaToolsFactories.py
+++ b/Reconstruction/egamma/egammaTools/python/egammaToolsFactories.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
__doc__ = """ToolFactories to instantiate
all egammaTools with default configuration"""
@@ -31,7 +31,8 @@ _clusterTypes = dict(
# Configure fixed-size (non-supercell) corrections
def configureFixedSizeClusterCorrections(swTool):
- "Add attributes ClusterCorrectionToolsXX to egammaSwTool object for fixed-size cluster corrections."
+ """Add attributes ClusterCorrectionToolsXX to egammaSwTool
+ object for fixed-size cluster corrections."""
from CaloClusterCorrection.CaloSwCorrections import make_CaloSwCorrections
from CaloRec.CaloRecMakers import _process_tools
@@ -49,11 +50,9 @@ def configureFixedSizeClusterCorrections(swTool):
# Configure corrections for superclusters.
def configureSuperClusterCorrections(swTool):
- "Add attributes ClusterCorrectionToolsXX to egammaSwTool object for corrections for superclusters."
- from CaloClusterCorrection.CaloSwCorrections import (
- make_CaloSwCorrections, rfac, etaoff_b1, etaoff_e1,
- etaoff_b2, etaoff_e2, phioff_b2, phioff_e2, update,
- time, listBadChannel)
+ """Add attributes ClusterCorrectionToolsXX to egammaSwTool
+ object for corrections for superclusters."""
+ from CaloClusterCorrection.CaloSwCorrections import make_CaloSwCorrections
from CaloRec.CaloRecMakers import _process_tools
for attrName, clName in _clusterTypes.items():
@@ -66,22 +65,10 @@ def configureSuperClusterCorrections(swTool):
make_CaloSwCorrections(
clName,
suffix='EGSuperCluster',
- version=jobproperties.egammaRecFlags.clusterCorrectionVersion(),
- corrlist=[
- [rfac, 'v5'],
- [etaoff_b1, 'v5'],
- [etaoff_e1, 'v5'],
- [etaoff_b2, 'v5'],
- [etaoff_e2, 'v5'],
- [phioff_b2, 'v5data'],
- [phioff_e2, 'v5data'],
- [update],
- [time],
- [listBadChannel]],
+ version=jobproperties.egammaRecFlags.superClusterCorrectionVersion(),
cells_name=egammaKeys.caloCellKey())))
-
def configureClusterCorrections(swTool):
"Add attributes ClusterCorrectionToolsXX to egammaSwTool object"
configureFixedSizeClusterCorrections(swTool)
@@ -93,8 +80,9 @@ egammaSwTool = ToolFactory(egammaToolsConf.egammaSwTool,
postInit=[configureClusterCorrections])
-egammaSwSuperClusterTool = ToolFactory(egammaToolsConf.egammaSwTool,
- postInit=[configureSuperClusterCorrections])
+egammaSwSuperClusterTool = ToolFactory(
+ egammaToolsConf.egammaSwTool,
+ postInit=[configureSuperClusterCorrections])
EMClusterTool = ToolFactory(
@@ -129,7 +117,7 @@ egammaLargeFWDClusterMakerTool = ToolFactory(
name="egammaLCFWDMakerTool",
InputClusterCollection=egammaKeys.FwdClusterKey(),
CellsName=egammaKeys.caloCellKey(),
- doFWDelesurraundingWindows = True
+ doFWDelesurraundingWindows=True
)
# Electron Selectors
--
GitLab
From 80e69ef31a34ee76c7baf3592052b366a260db6f Mon Sep 17 00:00:00 2001
From: Peter Onyisi <ponyisi@utexas.edu>
Date: Thu, 12 Aug 2021 22:31:07 +0200
Subject: [PATCH 025/272] Fix DQ running on R21 AOD
---
.../python/AthenaMonitoringAODRecoCfg.py | 54 ++++++++++---------
1 file changed, 30 insertions(+), 24 deletions(-)
diff --git a/Control/AthenaMonitoring/python/AthenaMonitoringAODRecoCfg.py b/Control/AthenaMonitoring/python/AthenaMonitoringAODRecoCfg.py
index bd77e8117496..cc96c0c72fc0 100644
--- a/Control/AthenaMonitoring/python/AthenaMonitoringAODRecoCfg.py
+++ b/Control/AthenaMonitoring/python/AthenaMonitoringAODRecoCfg.py
@@ -12,32 +12,38 @@ def AthenaMonitoringAODRecoCfg(flags):
info('Running on AOD: Scheduling rebuild of standard jet collections if necessary')
from JetRecConfig.StandardSmallRJets import AntiKt4EMTopo, AntiKt4EMPFlow, AntiKt4LCTopo
from JetRecConfig.StandardLargeRJets import AntiKt10LCTopo
- jets_to_schedule = (AntiKt4EMTopo, AntiKt4EMPFlow, AntiKt4LCTopo, AntiKt10LCTopo)
-
- info(f'Ensuring presence of jet collections for monitoring: {jets_to_schedule}')
- from JetRecConfig.JetRecConfig import JetRecCfg
- for container in jets_to_schedule:
- result.merge(JetRecCfg(flags, container))
-
- info('Scheduling b-tagging of rebuilt jets')
- from AtlasGeoModel.AtlasGeoModelConfig import AtlasGeometryCfg
- result.merge(AtlasGeometryCfg(flags))
- from BeamSpotConditions.BeamSpotConditionsConfig import BeamSpotCondAlgCfg
- result.merge(BeamSpotCondAlgCfg(flags))
- from BTagging.BTagRun3Config import BTagRecoSplitCfg
- # would rather use removesuffix below but need to wait for Python 3.9
- for container in [_.fullname().replace('Jets','') for _ in jets_to_schedule]:
- if container in ('AntiKt4EMTopo', 'AntiKt4EMPFlow'):
+ jets_to_schedule = [_ for _ in (AntiKt4EMTopo, AntiKt4EMPFlow, AntiKt4LCTopo, AntiKt10LCTopo)
+ if _.fullname() not in flags.Input.Collections]
+
+ if jets_to_schedule:
+ info(f'Ensuring presence of jet collections for monitoring: {jets_to_schedule}')
+ from JetRecConfig.JetRecConfig import JetRecCfg
+ for container in jets_to_schedule:
+ result.merge(JetRecCfg(flags, container))
+
+ jet_collections = set([_.fullname().replace('Jets','') for _ in jets_to_schedule])
+ btag_jet_collections = set(['AntiKt4EMTopo', 'AntiKt4EMPFlow'])
+ met_jet_collections = set(['AntiKt4EMTopo', 'AntiKt4EMPFlow', 'AntiKt4LCTopo'])
+
+ if jet_collections & btag_jet_collections:
+ info('Scheduling b-tagging of rebuilt jets')
+ from AtlasGeoModel.AtlasGeoModelConfig import AtlasGeometryCfg
+ result.merge(AtlasGeometryCfg(flags))
+ from BeamSpotConditions.BeamSpotConditionsConfig import BeamSpotCondAlgCfg
+ result.merge(BeamSpotCondAlgCfg(flags))
+ from BTagging.BTagRun3Config import BTagRecoSplitCfg
+ # would rather use removesuffix below but need to wait for Python 3.9
+ for container in jet_collections & btag_jet_collections:
result.merge(BTagRecoSplitCfg(flags, [container]))
- info('Scheduling rebuild of standard MET')
- from METReconstruction.METAssociatorCfg import METAssociatorCfg
- for container in [_.fullname().replace('Jets','') for _ in jets_to_schedule]:
- if container in ('AntiKt4EMTopo', 'AntiKt4EMPFlow', 'AntiKt4LCTopo'):
+ if jet_collections & met_jet_collections:
+ info('Scheduling rebuild of standard MET')
+ from METReconstruction.METAssociatorCfg import METAssociatorCfg
+ for container in jet_collections & met_jet_collections:
result.merge(METAssociatorCfg(flags, container))
- from CaloTools.CaloNoiseCondAlgConfig import CaloNoiseCondAlgCfg
- result.merge(CaloNoiseCondAlgCfg(flags)) # Prereq for Calo MET
- from METReconstruction.METCalo_Cfg import METCalo_Cfg
- result.merge(METCalo_Cfg(flags))
+ from CaloTools.CaloNoiseCondAlgConfig import CaloNoiseCondAlgCfg
+ result.merge(CaloNoiseCondAlgCfg(flags)) # Prereq for Calo MET
+ from METReconstruction.METCalo_Cfg import METCalo_Cfg
+ result.merge(METCalo_Cfg(flags))
return result
--
GitLab
From 29a0c1fbac12d8cea32ba76b38426c487beb91b3 Mon Sep 17 00:00:00 2001
From: Ke Li <ke.li@cern.ch>
Date: Fri, 13 Aug 2021 08:03:21 +0200
Subject: [PATCH 026/272] change the conditions tag to CONDBR2-BLKPA-RUN2-06
for reco tests
---
.../InDetPhysValMonitoring/test/test_data15_13TeV_1000evt.sh | 2 +-
.../InDetPhysValMonitoring/test/test_data16_13TeV_1000evt.sh | 2 +-
.../InDetPhysValMonitoring/test/test_data17_13TeV_1000evt.sh | 1 +
.../InDetPhysValMonitoring/test/test_data18_13TeV_1000evt.sh | 1 +
.../InDetPhysValMonitoring/test/test_ele10GeV_reco.sh | 1 +
.../InDetPhysValMonitoring/test/test_ele5GeV_reco.sh | 1 +
.../InDetPhysValMonitoring/test/test_mu100GeV_reco.sh | 1 +
.../InDetPhysValMonitoring/test/test_mu10GeV_reco.sh | 1 +
.../InDetPhysValMonitoring/test/test_mu1GeV_reco.sh | 1 +
.../InDetPhysValMonitoring/test/test_mu20GeV_reco.sh | 1 +
.../InDetPhysValMonitoring/test/test_piplus1GeV_reco.sh | 1 +
.../InDetPhysValMonitoring/test/test_piplus5GeV_reco.sh | 1 +
.../InDetPhysValMonitoring/test/test_ttbarPU0_reco.sh | 1 +
.../InDetPhysValMonitoring/test/test_ttbarPU40_reco.sh | 1 +
14 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data15_13TeV_1000evt.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data15_13TeV_1000evt.sh
index eb170383a419..3b858a8d3b76 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data15_13TeV_1000evt.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data15_13TeV_1000evt.sh
@@ -23,7 +23,7 @@ run Reco_tf.py \
--inputBSFile "$inputBS" \
--maxEvents 1000 \
--autoConfiguration everything \
- --conditionsTag="CONDBR2-BLKPA-2016-14" \
+ --conditionsTag="CONDBR2-BLKPA-RUN2-06" \
--outputAODFile physval.AOD.root \
--outputNTUP_PHYSVALFile physval.ntuple.root \
--steering doRAWtoALL \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data16_13TeV_1000evt.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data16_13TeV_1000evt.sh
index 3efe0fede1c4..9af604fe3c03 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data16_13TeV_1000evt.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data16_13TeV_1000evt.sh
@@ -23,7 +23,7 @@ run Reco_tf.py \
--inputBSFile "$inputBS" \
--maxEvents 1000 \
--autoConfiguration everything \
- --conditionsTag="CONDBR2-BLKPA-2016-19" \
+ --conditionsTag 'CONDBR2-BLKPA-RUN2-06' \
--outputAODFile physval.AOD.root \
--outputNTUP_PHYSVALFile physval.ntuple.root \
--steering doRAWtoALL \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data17_13TeV_1000evt.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data17_13TeV_1000evt.sh
index 679554938cd5..38caac64e36d 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data17_13TeV_1000evt.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data17_13TeV_1000evt.sh
@@ -23,6 +23,7 @@ run Reco_tf.py \
--inputBSFile "$inputBS" \
--maxEvents 1000 \
--AMI=f1088 \
+ --conditionsTag 'CONDBR2-BLKPA-RUN2-06' \
--outputAODFile physval.AOD.root \
--outputNTUP_PHYSVALFile physval.ntuple.root \
--steering doRAWtoALL \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data18_13TeV_1000evt.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data18_13TeV_1000evt.sh
index 9decc003c2f3..6128fe079afc 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data18_13TeV_1000evt.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_data18_13TeV_1000evt.sh
@@ -23,6 +23,7 @@ run Reco_tf.py \
--inputBSFile "$inputBS" \
--maxEvents 1000 \
--AMI=f1089 \
+ --conditionsTag 'CONDBR2-BLKPA-RUN2-06' \
--outputAODFile physval.AOD.root \
--outputNTUP_PHYSVALFile physval.ntuple.root \
--steering doRAWtoALL \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele10GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele10GeV_reco.sh
index 5a8f519cb57f..362061e888ac 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele10GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele10GeV_reco.sh
@@ -70,6 +70,7 @@ case $ArtProcess in
--inputRDOFile $x \
--outputNTUP_PHYSVALFile physval.ntuple.root \
--outputAODFile physval.AOD.root \
+ --conditionsTag 'CONDBR2-BLKPA-RUN2-06' \
--steering doRAWtoALL \
--checkEventCount False \
--ignoreErrors True \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele5GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele5GeV_reco.sh
index ddcc50e652b9..261f7aaaa582 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele5GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele5GeV_reco.sh
@@ -71,6 +71,7 @@ case $ArtProcess in
--outputNTUP_PHYSVALFile physval.ntuple.root \
--outputAODFile physval.AOD.root \
--steering doRAWtoALL \
+ --conditionsTag 'CONDBR2-BLKPA-RUN2-06' \
--checkEventCount False \
--ignoreErrors True \
--maxEvents -1 \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_reco.sh
index 899d1c0b0312..6cf88a31cea1 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_reco.sh
@@ -70,6 +70,7 @@ case $ArtProcess in
--inputRDOFile $x \
--outputNTUP_PHYSVALFile physval.ntuple.root \
--outputAODFile physval.AOD.root \
+ --conditionsTag 'CONDBR2-BLKPA-RUN2-06' \
--steering doRAWtoALL \
--checkEventCount False \
--ignoreErrors True \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu10GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu10GeV_reco.sh
index 2a325ee3c45f..1931963d9b96 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu10GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu10GeV_reco.sh
@@ -70,6 +70,7 @@ case $ArtProcess in
--inputRDOFile $x \
--outputNTUP_PHYSVALFile physval.ntuple.root \
--outputAODFile physval.AOD.root \
+ --conditionsTag 'CONDBR2-BLKPA-RUN2-06' \
--steering doRAWtoALL \
--checkEventCount False \
--ignoreErrors True \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_reco.sh
index 5f6a5395e611..e78212f8dc27 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_reco.sh
@@ -70,6 +70,7 @@ case $ArtProcess in
--inputRDOFile $x \
--outputNTUP_PHYSVALFile physval.ntuple.root \
--outputAODFile physval.AOD.root \
+ --conditionsTag 'CONDBR2-BLKPA-RUN2-06' \
--steering doRAWtoALL \
--checkEventCount False \
--ignoreErrors True \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_reco.sh
index 89526f1b9857..377cb6271a1a 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_reco.sh
@@ -70,6 +70,7 @@ case $ArtProcess in
--inputRDOFile $x \
--outputNTUP_PHYSVALFile physval.ntuple.root \
--outputAODFile physval.AOD.root \
+ --conditionsTag 'CONDBR2-BLKPA-RUN2-06' \
--steering doRAWtoALL \
--checkEventCount False \
--ignoreErrors True \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_reco.sh
index e6c1e12e40d5..b7e183e734eb 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_reco.sh
@@ -70,6 +70,7 @@ case $ArtProcess in
--inputRDOFile $x \
--outputNTUP_PHYSVALFile physval.ntuple.root \
--outputAODFile physval.AOD.root \
+ --conditionsTag 'CONDBR2-BLKPA-RUN2-06' \
--steering doRAWtoALL \
--checkEventCount False \
--ignoreErrors True \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_reco.sh
index 2674d37d67b1..5e521d61c0da 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_reco.sh
@@ -70,6 +70,7 @@ case $ArtProcess in
--inputRDOFile $x \
--outputNTUP_PHYSVALFile physval.ntuple.root \
--outputAODFile physval.AOD.root \
+ --conditionsTag 'CONDBR2-BLKPA-RUN2-06' \
--steering doRAWtoALL \
--checkEventCount False \
--ignoreErrors True \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU0_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU0_reco.sh
index ba2c8bb8c111..0a2ab84a91bb 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU0_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU0_reco.sh
@@ -22,6 +22,7 @@ run Reco_tf.py \
--inputRDOFile "$inputRDO" \
--outputAODFile physval.AOD.root \
--outputNTUP_PHYSVALFile physval.ntuple.root \
+ --conditionsTag 'CONDBR2-BLKPA-RUN2-06' \
--steering doRAWtoALL \
--checkEventCount False \
--ignoreErrors True \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU40_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU40_reco.sh
index a8205843d45d..2a51c52895a2 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU40_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU40_reco.sh
@@ -22,6 +22,7 @@ run Reco_tf.py \
--inputRDOFile "$inputRDO" \
--outputAODFile physval.AOD.root \
--outputNTUP_PHYSVALFile physval.ntuple.root \
+ --conditionsTag 'CONDBR2-BLKPA-RUN2-06' \
--steering doRAWtoALL \
--checkEventCount False \
--ignoreErrors True \
--
GitLab
From e64f0ddc80062c810651b14cee10ec5ac752f88b Mon Sep 17 00:00:00 2001
From: Marcin Nowak <Marcin.Nowak@cern.ch>
Date: Fri, 13 Aug 2021 13:06:08 +0200
Subject: [PATCH 027/272] Add TrigMuonEFIsolation_p2 from 17.1.15 to
bs-streamerinfos ATR-23437
---
.../share/bs-streamerinfos.root | Bin 1111765 -> 1113869 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/Trigger/TrigDataAccess/TrigSerializeResult/share/bs-streamerinfos.root b/Trigger/TrigDataAccess/TrigSerializeResult/share/bs-streamerinfos.root
index f8ac85bc7b2818463ae973eb2c9172d94820c6b4..22044d32ace6f63ff2c0248f696e723da27849a9 100644
GIT binary patch
delta 175595
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
delta 175541
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≠r80NB3G
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%0D+E(qr_<WU5;F
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
--
GitLab
From 430881f87d44ddeda36c4e5c560aca5c9a58ca24 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Thu, 12 Aug 2021 14:03:49 +0200
Subject: [PATCH 028/272] L1DynamicPedestalProviderTxt: migrate to
BunchCrossingCondData
Migrate the pedestal corrector from `TrigBunchCrossingTool` to
`BunchCrossingCondData`. Instead of caching the bunch distance structure
just calculate it every time as this should be fast enough.
Note that the `gapBefore/AfterBunch` methods in `TrigBunchCrossingTool`
have a bug that cause it to return one extra BC. E.g. the first empty
bunch after a train would have `gapBeforeBunch()==1` whereas the
`BunchCrossingCondData` returns the correct value `0`. The
`distanceFromHeadOfTrain` function has been adapted and it was verified
that the distance values are the same before/after migration to the
conditions object.
Partially addresses ATR-23378.
---
.../src/Run2TriggerTowerMaker.cxx | 1 +
.../IL1DynamicPedestalProvider.h | 4 +-
Trigger/TrigT1/TrigT1CaloTools/CMakeLists.txt | 6 +-
.../src/L1DynamicPedestalProviderRoot.cxx | 4 +-
.../src/L1DynamicPedestalProviderRoot.h | 6 +-
.../src/L1DynamicPedestalProviderTxt.cxx | 91 +++++++++----------
.../src/L1DynamicPedestalProviderTxt.h | 21 ++---
.../src/L1TriggerTowerTool.cxx | 11 ++-
8 files changed, 68 insertions(+), 76 deletions(-)
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx
index ab0b26eada8e..abc2922a2117 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx
@@ -98,6 +98,7 @@ namespace LVL1 {
declareProperty("RngSvc", m_rngSvc, "Random number service");
declareProperty("DigiEngine", m_digiEngine = "TrigT1CaloSim_Digitization");
+ declareProperty("L1TriggerTowerTool", m_TTtool);
declareProperty("PpmMappingTool", m_mappingTool);
declareProperty("LumiBlockMuTool", m_lumiBlockMuTool);
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1DynamicPedestalProvider.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1DynamicPedestalProvider.h
index 74314ff3ef89..371b03477ab2 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1DynamicPedestalProvider.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1DynamicPedestalProvider.h
@@ -1,7 +1,7 @@
// -*- C++ -*-
///////////////////////////////////////////////////////////////////
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// IL1DynamicPedestalProvider.h,
///////////////////////////////////////////////////////////////////
@@ -24,7 +24,7 @@ public:
static const InterfaceID& interfaceID( );
// return the value of the dynamic pedestal
- virtual int dynamicPedestal(int iEta, int layer, int pedestal, int iBCID, float mu) = 0;
+ virtual int dynamicPedestal(int iEta, int layer, int pedestal, int iBCID, float mu) const = 0;
};
inline const InterfaceID& IL1DynamicPedestalProvider::interfaceID()
diff --git a/Trigger/TrigT1/TrigT1CaloTools/CMakeLists.txt b/Trigger/TrigT1/TrigT1CaloTools/CMakeLists.txt
index 1f9a9c59adba..8de37af56f89 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CaloTools/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigT1CaloTools )
@@ -13,8 +13,8 @@ atlas_add_component( TrigT1CaloTools
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthContainers AthenaBaseComps CaloIdentifier
- CaloTriggerToolLib CxxUtils EventInfo GaudiKernel PathResolver StoreGateLib TrigAnalysisInterfaces
- TrigBunchCrossingToolLib TrigConfInterfaces TrigConfData TrigConfL1Data TrigT1CaloCalibConditions
+ CaloTriggerToolLib CxxUtils EventInfo GaudiKernel PathResolver StoreGateLib LumiBlockData
+ TrigConfInterfaces TrigConfData TrigConfL1Data TrigT1CaloCalibConditions
TrigT1CaloCalibToolInterfaces TrigT1CaloCondSvcLib TrigT1CaloEventLib TrigT1CaloToolInterfaces
TrigT1CaloUtilsLib TrigT1Interfaces xAODEventInfo xAODTrigL1Calo )
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderRoot.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderRoot.cxx
index 92222222f54a..548bb8c3bbf2 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderRoot.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderRoot.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
//////////////////////////////////////////////////////////////////////
// L1DynamicPedestalProviderRoot.cxx
@@ -73,7 +73,7 @@ StatusCode L1DynamicPedestalProviderRoot::initialize()
// The correction is currently not available as a function of mu.
// In case no correction is available or applicable this function
// returns the uncorrected pedestal.
-int L1DynamicPedestalProviderRoot::dynamicPedestal(int iEta, int layer, int pedestal, int iBCID, float /* mu */)
+int L1DynamicPedestalProviderRoot::dynamicPedestal(int iEta, int layer, int pedestal, int iBCID, float /* mu */) const
{
if(iEta < 0 || iEta >= s_nElement) {
ATH_MSG_ERROR("Inputs out of range: iEta = " << iEta);
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderRoot.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderRoot.h
index 8433b28c72b3..33236170f2f0 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderRoot.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderRoot.h
@@ -1,6 +1,6 @@
/** -*- C++ -*- */
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/**
* @file L1DynamicPedestalProviderRoot.h
@@ -40,10 +40,10 @@ namespace LVL1
virtual ~L1DynamicPedestalProviderRoot();
/** standard Athena-Algorithm method */
- virtual StatusCode initialize();
+ virtual StatusCode initialize() override;
/** retrieve the bcidCorrection value */
- virtual int dynamicPedestal(int iEta, int layer, int pedestal, int iBCID, float mu);
+ virtual int dynamicPedestal(int iEta, int layer, int pedestal, int iBCID, float mu) const override;
private:
std::string m_firRefFileName;
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.cxx
index 29c3f3e5c2a3..1f2eb55d8d7c 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
//////////////////////////////////////////////////////////////////////
// L1DynamicPedestalProviderTxt.cxx
@@ -7,12 +7,8 @@
#include "L1DynamicPedestalProviderTxt.h"
-#include "TrigAnalysisInterfaces/IBunchCrossingTool.h"
-#include "TrigBunchCrossingTool/BunchCrossing.h"
-
#include "PathResolver/PathResolver.h"
#include "CxxUtils/StringUtils.h"
-#include "GaudiKernel/IIncidentSvc.h"
#include <algorithm>
#include <cmath>
@@ -24,8 +20,8 @@
using std::make_unique;
namespace {
-using bcid_t = Trig::IBunchCrossingTool::bcid_type;
-static const bcid_t MAX_BCID = 3564;
+using bcid_t = BunchCrossingCondData::bcid_type;
+static constexpr bcid_t MAX_BCID = BunchCrossingCondData::m_MAX_BCID;
}
namespace LVL1
@@ -58,7 +54,6 @@ L1DynamicPedestalProviderTxt::L1DynamicPedestalProviderTxt(const std::string& t,
const std::string& n,
const IInterface* p)
: AthAlgTool(t, n, p)
- , m_bunchCrossingTool("Trig::MCBunchCrossingTool/BunchCrossingTool")
{
declareInterface<IL1DynamicPedestalProvider>(this);
@@ -74,8 +69,6 @@ L1DynamicPedestalProviderTxt::L1DynamicPedestalProviderTxt(const std::string& t,
m_hadParameterizations[1][i] = std::vector<std::unique_ptr<ParamFunc>>(s_nBCIDPerTrain);
}
- declareProperty("BunchCrossingTool", m_bunchCrossingTool);
-
// Input files containing the parameters for the electromagnetic and hadronic
// layer, respectively.
declareProperty("InputFileEM_ShortGap", m_inputFileEMShort);
@@ -90,10 +83,11 @@ L1DynamicPedestalProviderTxt::~L1DynamicPedestalProviderTxt()
// keep destructor in .cxx file since ~unique_ptr needs full type
}
+
//================ Initialisation =============================================
StatusCode L1DynamicPedestalProviderTxt::initialize()
{
- CHECK( m_bunchCrossingTool.retrieve() );
+ ATH_CHECK( m_bcDataKey.initialize() );
// parse parameterization for the electromagnetic layer
std::string fileNameEMShort = PathResolver::find_file(m_inputFileEMShort, "DATAPATH");
@@ -153,30 +147,20 @@ StatusCode L1DynamicPedestalProviderTxt::initialize()
return StatusCode::FAILURE;
}
- ServiceHandle<IIncidentSvc> incSvc("IncidentSvc",name());
- CHECK(incSvc.retrieve());
- incSvc->addListener(this, "BunchConfig");
-
return StatusCode::SUCCESS;
}
-void L1DynamicPedestalProviderTxt::handle(const Incident& inc)
-{
- if(inc.type() != "BunchConfig") return;
-
- parseBeamIntensityPattern();
-}
-
namespace {
// Display results of the parsing for debugging purposes
-template<typename Log, typename Tool, typename ResultVector>
-void printPatternParsingInfo(Log& log, const Tool& tool, const ResultVector& result) {
+template<typename ResultVector>
+void printPatternParsingInfo(MsgStream& log, const BunchCrossingCondData& bcData, const ResultVector& result) {
+
for(bcid_t bcid = 0; bcid < MAX_BCID; bcid += 20) {
// print 20 items at once
log << MSG::VERBOSE << "Filled ";
- for(bcid_t j = bcid; j != std::min(MAX_BCID, bcid+20); ++j) log << std::setw(3) << tool->isFilled(j) << " ";
+ for(bcid_t j = bcid; j != std::min(MAX_BCID, bcid+20); ++j) log << std::setw(3) << bcData.isFilled(j) << " ";
log << endmsg;
log << MSG::VERBOSE << "Distance ";
@@ -191,47 +175,58 @@ void printPatternParsingInfo(Log& log, const Tool& tool, const ResultVector& res
} // namespace [anonymous]
+
// "Parse" the beam intensity pattern to get the bunch train structure.
-void L1DynamicPedestalProviderTxt::parseBeamIntensityPattern()
+std::pair<bool,int> L1DynamicPedestalProviderTxt::distanceFromHeadOfTrain(int bcid) const
{
- // using bcid_t = Trig::IBunchCrossingTool::bcid_type;
- auto BC = Trig::IBunchCrossingTool::BunchCrossings;
+ const auto BC = BunchCrossingCondData::BunchCrossings;
- m_distanceFromHeadOfTrain.assign(MAX_BCID, std::make_pair(false, -10));
+ SG::ReadCondHandle<BunchCrossingCondData> bcData(m_bcDataKey);
- for(bcid_t bcid = 0; bcid != MAX_BCID; ++bcid) {
- if(m_bunchCrossingTool->isFilled(bcid) || m_bunchCrossingTool->bcType(bcid) == Trig::IBunchCrossingTool::MiddleEmpty) {
- m_distanceFromHeadOfTrain[bcid] = std::make_pair(m_bunchCrossingTool->gapBeforeTrain(bcid) > 250,
- m_bunchCrossingTool->distanceFromFront(bcid, BC));
+ if(bcData->isFilled(bcid) || bcData->bcType(bcid) == BunchCrossingCondData::MiddleEmpty) {
+ return {bcData->gapBeforeTrain(bcid) > 250, bcData->distanceFromFront(bcid, BC)};
+ } else {
+ if(bcData->gapAfterBunch(bcid, BC) == 0) {
+ const bcid_t head = ((bcid + 1) == MAX_BCID ? 0 : bcid + 1); // wrap around
+ return {bcData->gapBeforeTrain(head) > 250, -1};
+ } else if(bcData->gapBeforeBunch(bcid, BC) == 0) {
+ const bcid_t tail = bcid ? bcid - 1 : MAX_BCID - 1; // wrap around
+ return {bcData->gapBeforeTrain(tail) > 250,
+ bcData->distanceFromFront(tail, BC) + 1};
} else {
- if(m_bunchCrossingTool->gapAfterBunch(bcid, BC) == 1) {
- bcid_t head = ((bcid + 1) == MAX_BCID ? 0 : bcid + 1); // wrap around
- m_distanceFromHeadOfTrain[bcid] = std::make_pair(m_bunchCrossingTool->gapBeforeTrain(head) > 250,
- -1);
- } else if(m_bunchCrossingTool->gapBeforeBunch(bcid, BC) == 1) {
- bcid_t tail = bcid ? bcid - 1 : MAX_BCID - 1; // wrap around
- m_distanceFromHeadOfTrain[bcid] = std::make_pair(m_bunchCrossingTool->gapBeforeTrain(tail) > 250,
- m_bunchCrossingTool->distanceFromFront(tail, BC) + 1);
- } else {
- m_distanceFromHeadOfTrain[bcid] = std::make_pair(false, -10);
- }
+ return {false, -10};
}
}
- if(msgLvl(MSG::VERBOSE)) printPatternParsingInfo(msg(), m_bunchCrossingTool, m_distanceFromHeadOfTrain);
}
//================ dynamic pedestal ==============================================
// Return the dynamic pedestal.
// In case no correction is available or applicable this function
// returns the uncorrected pedestal.
-int L1DynamicPedestalProviderTxt::dynamicPedestal(int iElement, int layer, int pedestal, int iBCID, float mu)
+int L1DynamicPedestalProviderTxt::dynamicPedestal(int iElement, int layer, int pedestal, int iBCID, float mu) const
{
- if(iBCID < 0 || (unsigned)iBCID >= m_distanceFromHeadOfTrain.size()) return pedestal;
+ /*
+ * Uncomment this for debugging/printing the full bunch train pattern
+ *
+ static bool first=true;
+ if (first) {
+ SG::ReadCondHandle<BunchCrossingCondData> bcData(m_bcDataKey);
+ first = false;
+ std::vector<std::pair<bool, int16_t>> dist;
+ dist.assign(MAX_BCID, std::make_pair(false, -10));
+ for(bcid_t bcid = 0; bcid != MAX_BCID; ++bcid) {
+ dist[bcid] = distanceFromHeadOfTrain(bcid);
+ }
+ printPatternParsingInfo(msg(), *bcData.retrieve(), dist);
+ }
+ */
+
+ if(iBCID < 0 || (unsigned)iBCID >= MAX_BCID) return pedestal;
// Only one bunch train is parameterized. Thus the BCID needs to be mapped
// to the first train. The train starts at bcid = 1, thus the '+ 1'.
// Bunches without available parameterization will have a value of -9 and a value of 0 is returned.
- auto bcidInfo = m_distanceFromHeadOfTrain[iBCID];
+ auto bcidInfo = distanceFromHeadOfTrain(iBCID);
bool longGap = bcidInfo.first;
int bcid = bcidInfo.second + 1;
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.h
index 06f005f14a83..575a3bf3881e 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.h
@@ -1,6 +1,6 @@
/** -*- C++ -*-*/
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/*
* @file L1DynamicPedestalProviderTxt.h
@@ -16,6 +16,8 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
+#include "LumiBlockData/BunchCrossingCondData.h"
+#include "StoreGate/ReadCondHandleKey.h"
#include <array>
#include <cstdint> // for guaranteed size-types
@@ -25,8 +27,6 @@
#include <utility> // std::pair
#include <vector>
-namespace Trig { class IBunchCrossingTool; }
-
namespace LVL1
{
/**
@@ -51,8 +51,7 @@ namespace LVL1
* The parameters are read from a text file.
*/
class L1DynamicPedestalProviderTxt : public AthAlgTool,
- virtual public IL1DynamicPedestalProvider,
- virtual public IIncidentListener
+ virtual public IL1DynamicPedestalProvider
{
public:
/** constructor */
@@ -64,10 +63,8 @@ namespace LVL1
/** standard Athena-Algorithm method */
virtual StatusCode initialize() override;
- void handle(const Incident&) override;
-
/** retrieve the bcidCorrection value */
- virtual int dynamicPedestal(int iEta, int layer, int pedestal, int iBCID, float mu) override;
+ virtual int dynamicPedestal(int iEta, int layer, int pedestal, int iBCID, float mu) const override;
// forward declaration for a function that evaluates the correction as function of mu
class ParamFunc;
@@ -79,7 +76,8 @@ namespace LVL1
std::array<std::vector<std::vector<std::unique_ptr<ParamFunc>>>, 2> m_hadParameterizations;
//// properties ////
- ToolHandle<Trig::IBunchCrossingTool> m_bunchCrossingTool;
+ SG::ReadCondHandleKey<BunchCrossingCondData> m_bcDataKey
+ {this, "BunchCrossingCondDataKey", "BunchCrossingData" ,"SG Key of BunchCrossing CDO"};
std::string m_inputFileEMShort;
std::string m_inputFileHADShort;
@@ -88,10 +86,7 @@ namespace LVL1
// maps the BCID (index) to the distance from the head of the train (after short or long gap)
// bool: long-gap train (true); short-gap train (false)
- std::vector<std::pair<bool, int16_t>> m_distanceFromHeadOfTrain;
-
- // fills the vector above with data from the BeamIntensityPattern
- void parseBeamIntensityPattern();
+ std::pair<bool, int> distanceFromHeadOfTrain(int bcid) const;
// parses the input file
void parseInputFile(const std::string& fileName, std::vector<std::vector<std::unique_ptr<ParamFunc>>>& params);
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
index f293758dc448..782d842d4715 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
//////////////////////////////////////////////////////////////////////
// L1TriggerTowerTool.cxx
@@ -68,13 +68,14 @@ L1TriggerTowerTool::L1TriggerTowerTool(const std::string& t,
AthAlgTool(t,n,p),
m_caloMgr(0),
m_lvl1Helper(0),
- m_l1CaloTTIdTools("LVL1::L1CaloTTIdTools/L1CaloTTIdTools"),
- m_ttSvc("CaloTriggerTowerService/CaloTriggerTowerService"),
- m_mappingTool("LVL1::PpmCoolOrBuiltinMappingTool/PpmCoolOrBuiltinMappingTool"),
+ m_l1CaloTTIdTools("LVL1::L1CaloTTIdTools/L1CaloTTIdTools", this),
+ m_ttSvc("CaloTriggerTowerService/CaloTriggerTowerService", this),
+ m_mappingTool("LVL1::PpmCoolOrBuiltinMappingTool/PpmCoolOrBuiltinMappingTool", this),
m_l1CondSvc("L1CaloCondSvc", n),
m_configSvc("TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", n),
m_dbFineTimeRefsTowers(0),
- m_correctFir(false)
+ m_correctFir(false),
+ m_dynamicPedestalProvider("", this)
{
declareInterface<IL1TriggerTowerTool>(this);
--
GitLab
From 8cc486d5162b8a4c4c8b1a4e4a1107cf44c5c329 Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <smh@cern.ch>
Date: Fri, 13 Aug 2021 16:16:38 +0200
Subject: [PATCH 029/272] Migrate L1CPMTools and L1JEMJetTools to use L1Menu
only
---
.../TrigT1/TrigT1CaloTools/src/L1CPMTools.cxx | 17 +-
.../TrigT1/TrigT1CaloTools/src/L1CPMTools.h | 2 -
.../TrigT1CaloTools/src/L1JEMJetTools.cxx | 19 +-
.../TrigT1CaloTools/src/L1JEMJetTools.h | 3 -
.../TrigT1CaloUtils/CPMTobAlgorithm.h | 5 +-
.../TrigT1CaloUtils/JEMJetAlgorithm.h | 3 +-
.../TrigT1CaloUtils/src/CPMTobAlgorithm.cxx | 173 +++++-------------
.../TrigT1CaloUtils/src/JEMJetAlgorithm.cxx | 23 +--
8 files changed, 68 insertions(+), 177 deletions(-)
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.cxx
index 116437876537..1ad59d1d677a 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.cxx
@@ -25,10 +25,7 @@ L1CPMTools::L1CPMTools(const std::string& t, const std::string& n, const IInterf
StatusCode L1CPMTools::initialize()
{
- ATH_CHECK(m_configSvc.retrieve());
- if( m_useNewConfig ) {
- ATH_CHECK(detStore()->retrieve(m_l1menu));
- }
+ ATH_CHECK(detStore()->retrieve(m_l1menu));
return StatusCode::SUCCESS;
}
@@ -78,7 +75,7 @@ void L1CPMTools::findCPMResults(const xAOD::CPMTowerMap_t* towers, int crate, in
* evaluating window, this would be the place to put the test */
/** Form algorithm object for this location */
- CPMTobAlgorithm tob(eta, phi, towers, m_configSvc, m_l1menu, slice); // quicker to do both in one go, though maybe not cleaner
+ CPMTobAlgorithm tob(eta, phi, towers, m_l1menu, slice); // quicker to do both in one go, though maybe not cleaner
/** Did it pass as EM TOB? If so:
* Create TOB RoI object and push back into system results
@@ -239,7 +236,7 @@ void L1CPMTools::findCPMTobRoIs(const xAOD::CPMTowerMap_t* towers, xAOD::CPMTobR
if (test == analysed.end()) {
analysed.insert(std::map<int, int>::value_type(key,1));
- CPMTobAlgorithm tob(tempEta, tempPhi, towers, m_configSvc, m_l1menu, slice);
+ CPMTobAlgorithm tob(tempEta, tempPhi, towers, m_l1menu, slice);
// Did this pass as an EM TOB?
if (tob.isEMRoI()) {
@@ -305,7 +302,7 @@ void L1CPMTools::findRoIs(const xAOD::CPMTowerMap_t* towers, DataVector<CPMTobAl
if (test == analysed.end()) {
analysed.insert(std::map<int, int>::value_type(key,1));
- CPMTobAlgorithm* tob = new CPMTobAlgorithm(tempEta, tempPhi, towers, m_configSvc, m_l1menu, slice);
+ CPMTobAlgorithm* tob = new CPMTobAlgorithm(tempEta, tempPhi, towers, m_l1menu, slice);
if ( (tob->isEMRoI() || tob->isTauRoI()) ) tobs->push_back(tob);
else delete tob;
} // not done this one already
@@ -354,14 +351,14 @@ void L1CPMTools::mapTowers(const DataVector<xAOD::CPMTower>* cpmts, xAOD::CPMTow
CPMTobAlgorithm L1CPMTools::findRoI(double RoIeta, double RoIphi, const xAOD::CPMTowerMap_t* towers, int slice) const {
// Performs all processing for this location
- return CPMTobAlgorithm(RoIeta, RoIphi, towers, m_configSvc, m_l1menu, slice);
+ return CPMTobAlgorithm(RoIeta, RoIphi, towers, m_l1menu, slice);
}
/** Form clusters for given coordinates */
CPMTobAlgorithm L1CPMTools::formSums(double RoIeta, double RoIphi, const xAOD::CPMTowerMap_t* towers, int slice) const {
// Performs all processing for this location
- return CPMTobAlgorithm(RoIeta, RoIphi, towers, m_configSvc, m_l1menu, slice);
+ return CPMTobAlgorithm(RoIeta, RoIphi, towers, m_l1menu, slice);
}
/** Form sums for given RoI */
@@ -373,7 +370,7 @@ CPMTobAlgorithm L1CPMTools::formSums(uint32_t roiWord, const xAOD::CPMTowerMap_t
float RoIeta = coord.eta();
// Performs all processing for this location
- return CPMTobAlgorithm(RoIeta, RoIphi, towers, m_configSvc, m_l1menu, slice);
+ return CPMTobAlgorithm(RoIeta, RoIphi, towers, m_l1menu, slice);
}
} // end of namespace
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.h
index a10f39a37b25..19e4229b95ee 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.h
@@ -88,8 +88,6 @@ namespace LVL1
private:
/** pointer to LVL1ConfigSvc */
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc {this, "LVL1ConfigSvc", "TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", "LVL1 Config Service"};
- Gaudi::Property<bool> m_useNewConfig { this, "UseNewConfig", true, "When true, read the menu from detector store, when false use the L1ConfigSvc" };
const TrigConf::L1Menu * m_l1menu{nullptr};
/** Utility for decoding RoI words */
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEMJetTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEMJetTools.cxx
index 38bbbb87efcd..b7357a539c9e 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEMJetTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEMJetTools.cxx
@@ -27,10 +27,7 @@ L1JEMJetTools::L1JEMJetTools(const std::string& t, const std::string& n, const I
StatusCode L1JEMJetTools::initialize()
{
- ATH_CHECK(m_configSvc.retrieve());
- if( m_useNewConfig ) {
- ATH_CHECK(detStore()->retrieve(m_l1menu).ignore());
- }
+ ATH_CHECK(detStore()->retrieve(m_l1menu).ignore());
return StatusCode::SUCCESS;
}
@@ -148,7 +145,7 @@ void L1JEMJetTools::findRoIs(const std::map<int, JetInput*>* elements, DataVecto
analysed.insert(std::map<int, int>::value_type(key,1));
double tempEta = tempCoord.eta();
double tempPhi = tempCoord.phi();
- JEMJetAlgorithm* roi = new JEMJetAlgorithm(tempEta, tempPhi, elements, m_configSvc, m_l1menu);
+ JEMJetAlgorithm* roi = new JEMJetAlgorithm(tempEta, tempPhi, elements, m_l1menu);
if (roi->isRoI()) rois->push_back(roi);
else delete roi;
}
@@ -211,7 +208,7 @@ void L1JEMJetTools::findRoIs(const std::map<int, JetInput*>* elements, xAOD::JEM
analysed.insert(std::map<int, int>::value_type(key,1));
double tempEta = tempCoord.eta();
double tempPhi = tempCoord.phi();
- JEMJetAlgorithm roi(tempEta, tempPhi, elements, m_configSvc, m_l1menu);
+ JEMJetAlgorithm roi(tempEta, tempPhi, elements, m_l1menu);
if (roi.isRoI() != 0) rois->push_back(roi.jemTobRoI());
@@ -295,7 +292,7 @@ void L1JEMJetTools::findJEMResults(const std::map<int, JetInput*>* inputs, int c
* evaluating window, this would be the place to put the test */
/** Form algorithm object for this location */
- JEMJetAlgorithm tob(EtaCell[ie], PhiCell[ip], inputs, m_configSvc, m_l1menu);
+ JEMJetAlgorithm tob(EtaCell[ie], PhiCell[ip], inputs, m_l1menu);
/** Did it pass as JetTOB? If so:
* Create TOB RoI object and push back into system results
@@ -403,7 +400,7 @@ void L1JEMJetTools::findJEMResults(const std::map<int, JetInput*>* inputs, int c
* evaluating window, this would be the place to put the test */
/** Form algorithm object for this location */
- JEMJetAlgorithm tob(EtaCell[ie], PhiCell[ip], inputs, m_configSvc, m_l1menu);
+ JEMJetAlgorithm tob(EtaCell[ie], PhiCell[ip], inputs, m_l1menu);
/** Did it pass as JetTOB? If so:
* Create TOB RoI object and push back into system results
@@ -466,14 +463,14 @@ void L1JEMJetTools::findJEMResults(const std::map<int, JetInput*>* inputs, int c
/** Form RoI object for specified coordinate */
JEMJetAlgorithm L1JEMJetTools::findRoI(double RoIeta, double RoIphi, const std::map<int, JetInput*>* elements) const {
- return JEMJetAlgorithm(RoIeta, RoIphi, elements, m_configSvc, m_l1menu);
+ return JEMJetAlgorithm(RoIeta, RoIphi, elements, m_l1menu);
}
///=====================Form clusters for given coordinates ====================
JEMJetAlgorithm L1JEMJetTools::formSums(double RoIeta, double RoIphi, const std::map<int, JetInput*>* elements) const {
// Performs all processing for this location
- return JEMJetAlgorithm(RoIeta, RoIphi, elements, m_configSvc, m_l1menu);
+ return JEMJetAlgorithm(RoIeta, RoIphi, elements, m_l1menu);
}
///=====================Form clusters for given RoI ====================
@@ -487,7 +484,7 @@ JEMJetAlgorithm L1JEMJetTools::formSums(uint32_t roiWord, const std::map<int, Je
if (RoIeta > 3.1 && m_conv.column(roiWord) != 3) RoIeta = 3.1;
// Performs all processing for this location
- return JEMJetAlgorithm(RoIeta, RoIphi, elements, m_configSvc, m_l1menu);
+ return JEMJetAlgorithm(RoIeta, RoIphi, elements, m_l1menu);
}
//============================================================================================
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEMJetTools.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEMJetTools.h
index 984392810169..77b6ca2a65ed 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEMJetTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEMJetTools.h
@@ -19,7 +19,6 @@
#include "TrigT1CaloUtils/JetInputKey.h"
#include "TrigT1CaloUtils/JEMJetAlgorithm.h"
#include "TrigT1Interfaces/JEPRoIDecoder.h"
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
#include "xAODTrigL1Calo/JetElementContainer.h"
@@ -84,8 +83,6 @@ namespace LVL1
private:
/** pointer to LVL1ConfigSvc */
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc{this, "LVL1ConfigSvc", "TrigConf::LVL1ConfigSvc/LVL1ConfigSvc"};
- Gaudi::Property<bool> m_useNewConfig { this, "UseNewConfig", true, "When true, read the menu from detector store, when false use the L1ConfigSvc" };
const TrigConf::L1Menu * m_l1menu{nullptr};
/** Utility for decoding RoI words */
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPMTobAlgorithm.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPMTobAlgorithm.h
index a640ed6e50ea..90f2be7e949a 100644
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPMTobAlgorithm.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPMTobAlgorithm.h
@@ -16,8 +16,6 @@
#include <vector>
#include "GaudiKernel/ServiceHandle.h"
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
-
#include "xAODTrigL1Calo/CPMTower.h"
#include "xAODTrigL1Calo/CPMTobRoI.h"
#include "TrigT1CaloUtils/TriggerTowerKey.h"
@@ -46,7 +44,7 @@ class CPMTobAlgorithm {
public:
CPMTobAlgorithm(double eta, double phi, const xAOD::CPMTowerMap_t* ttContainer,
- ServiceHandle<TrigConf::ILVL1ConfigSvc> config, const TrigConf::L1Menu * l1menu, int slice = -1);
+ const TrigConf::L1Menu * l1menu, int slice = -1);
~CPMTobAlgorithm();
@@ -85,7 +83,6 @@ public:
private: //atribs
double m_refEta;
double m_refPhi;
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc;
const TrigConf::L1Menu * m_l1menu{nullptr};
/** Algorithm results */
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JEMJetAlgorithm.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JEMJetAlgorithm.h
index d7e94aba1c4b..5973acfde8bc 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JEMJetAlgorithm.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JEMJetAlgorithm.h
@@ -40,7 +40,7 @@ class JEMJetAlgorithm {
public:
JEMJetAlgorithm( double eta, double phi, const std::map<int, JetInput *>* jiContainer,
- ServiceHandle<TrigConf::ILVL1ConfigSvc> config, const TrigConf::L1Menu * l1menu);
+ const TrigConf::L1Menu * l1menu);
~JEMJetAlgorithm();
@@ -64,7 +64,6 @@ public:
private: //atribs
double m_refEta;
double m_refPhi;
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc;
const TrigConf::L1Menu * m_l1menu{nullptr};
/** Algorithm results */
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/CPMTobAlgorithm.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/CPMTobAlgorithm.cxx
index 174cfbbf644d..5115f62199e5 100644
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/CPMTobAlgorithm.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/CPMTobAlgorithm.cxx
@@ -14,13 +14,6 @@
#include "TrigT1Interfaces/TrigT1CaloDefs.h"
#include "TrigT1Interfaces/CoordinateRange.h"
#include "TrigT1CaloUtils/CoordToHardware.h"
-#include "TrigConfL1Data/IsolationParam.h"
-#include "TrigConfL1Data/CaloInfo.h"
-#include "TrigConfL1Data/CTPConfig.h"
-#include "TrigConfL1Data/Menu.h"
-#include "TrigConfL1Data/TriggerThreshold.h"
-#include "TrigConfL1Data/TriggerThresholdValue.h"
-#include "TrigConfL1Data/ClusterThresholdValue.h"
#include "TrigConfData/L1Menu.h"
#include <math.h>
@@ -46,8 +39,7 @@ const unsigned int CPMTobAlgorithm::m_tauLUT_EMIsolNBits = 6;
const unsigned int CPMTobAlgorithm::m_noIsol = 999;
LVL1::CPMTobAlgorithm::CPMTobAlgorithm( double eta, double phi, const xAOD::CPMTowerMap_t* ttContainer,
- ServiceHandle<TrigConf::ILVL1ConfigSvc> config, const TrigConf::L1Menu * l1menu, int slice ):
- m_configSvc(config),
+ const TrigConf::L1Menu * l1menu, int slice ):
m_l1menu(l1menu),
m_Core(0),
m_EMClus(0),
@@ -223,14 +215,9 @@ void LVL1::CPMTobAlgorithm::emAlgorithm() {
// Need to worry about digit scale not being GeV
float emEnergyScale{1};
unsigned int tobPtMinEM{0};
- if( m_l1menu ) {
- emEnergyScale = m_l1menu->thrExtraInfo().EM().emScale();
- tobPtMinEM = m_l1menu->thrExtraInfo().EM().ptMinToTopo();
- } else {
- const TrigConf::CaloInfo & caloInfo = m_configSvc->thresholdConfig()->caloInfo();
- emEnergyScale = caloInfo.globalEmScale();
- tobPtMinEM = caloInfo.minTobEM().ptmin;
- }
+ emEnergyScale = m_l1menu->thrExtraInfo().EM().emScale();
+ tobPtMinEM = m_l1menu->thrExtraInfo().EM().ptMinToTopo();
+
unsigned int thresh = tobPtMinEM * emEnergyScale;
if (m_EMClus <= thresh) return;
@@ -261,75 +248,36 @@ void LVL1::CPMTobAlgorithm::emAlgorithm() {
* Also must rescale ET sums to same scale for comparison */
std::vector<int> emisolcuts(5,m_noIsol);
std::vector<int> hadisolcuts(5,m_noIsol);
- if( m_l1menu ) {
- for(size_t bit = 1; bit<=5; ++bit) {
- const TrigConf::IsolationLegacy & iso = m_l1menu->thrExtraInfo().EM().isolation("EMIsoForEMthr", bit);
- if(! iso.isDefined() ) {
- continue;
- }
- int offset = iso.offset();
- int slope = iso.slope();
- int mincut = iso.mincut();
- int upperlimit = iso.upperlimit()*10;
- if (clus < upperlimit && bit >= 1 && bit <= 5) {
- // As "slope" = 10* slope, rescale clus too to get fraction right.
- int cut = offset + (slope != 0 ? 10*clus/slope : 0);
- if (cut < mincut) cut = mincut;
- emisolcuts[bit-1] = cut;
- }
+ for(size_t bit = 1; bit<=5; ++bit) {
+ const TrigConf::IsolationLegacy & iso = m_l1menu->thrExtraInfo().EM().isolation("EMIsoForEMthr", bit);
+ if(! iso.isDefined() ) {
+ continue;
}
- for(size_t bit = 1; bit<=5; ++bit) {
- const TrigConf::IsolationLegacy & iso = m_l1menu->thrExtraInfo().EM().isolation("HAIsoForEMthr", bit);
- if(! iso.isDefined() ) {
- continue;
- }
- int offset = iso.offset();
- int slope = iso.slope();
- int mincut = iso.mincut();
- int upperlimit = iso.upperlimit()*10;
- if (clus < upperlimit && bit >= 1 && bit <= 5) {
- // As "slope" = 10* slope, rescale clus too to get fraction right.
- int cut = offset + (slope != 0 ? 10*clus/slope : 0);
- if (cut < mincut) cut = mincut;
- hadisolcuts[bit-1] = cut;
- }
+ int offset = iso.offset();
+ int slope = iso.slope();
+ int mincut = iso.mincut();
+ int upperlimit = iso.upperlimit()*10;
+ if (clus < upperlimit && bit >= 1 && bit <= 5) {
+ // As "slope" = 10* slope, rescale clus too to get fraction right.
+ int cut = offset + (slope != 0 ? 10*clus/slope : 0);
+ if (cut < mincut) cut = mincut;
+ emisolcuts[bit-1] = cut;
}
- } else {
- const TrigConf::CaloInfo & caloInfo = m_configSvc->thresholdConfig()->caloInfo();
-
- const std::vector<IsolationParam> & emIsolParams = caloInfo.isolationEMIsoForEMthr();
- for (std::vector<IsolationParam>::const_iterator it = emIsolParams.begin(); it != emIsolParams.end(); ++it) {
- // Offset & Mincut are in 100 MeV units. Slope = 10* the actual slope, but we will stick with integers here
- int offset = (*it).offset();
- int slope = (*it).slope();
- int mincut = (*it).mincut();
-
- // Upperlimit is in GeV, so convert that to 100 MeV steps
- int upperlimit = (*it).upperlimit()*10;
-
- int bit = (*it).isobit();
-
- if (clus < upperlimit && bit >= 1 && bit <= 5) {
- // As "slope" = 10* slope, rescale clus too to get fraction right.
- int cut = offset + (slope != 0 ? 10*clus/slope : 0);
- if (cut < mincut) cut = mincut;
- emisolcuts[bit-1] = cut;
- }
+ }
+ for(size_t bit = 1; bit<=5; ++bit) {
+ const TrigConf::IsolationLegacy & iso = m_l1menu->thrExtraInfo().EM().isolation("HAIsoForEMthr", bit);
+ if(! iso.isDefined() ) {
+ continue;
}
-
- const std::vector<IsolationParam> & hadIsolParams = caloInfo.isolationHAIsoForEMthr();
- for (std::vector<IsolationParam>::const_iterator it = hadIsolParams.begin(); it != hadIsolParams.end(); ++it) {
- int offset = (*it).offset();
- int slope = (*it).slope();
- int mincut = (*it).mincut();
- int upperlimit = (*it).upperlimit()*10;
- int bit = (*it).isobit();
-
- if (clus < upperlimit && bit >= 1 && bit <= 5) {
- int cut = offset + (slope != 0 ? 10*clus/slope : 0);
- if (cut < mincut) cut = mincut;
- hadisolcuts[bit-1] = cut;
- }
+ int offset = iso.offset();
+ int slope = iso.slope();
+ int mincut = iso.mincut();
+ int upperlimit = iso.upperlimit()*10;
+ if (clus < upperlimit && bit >= 1 && bit <= 5) {
+ // As "slope" = 10* slope, rescale clus too to get fraction right.
+ int cut = offset + (slope != 0 ? 10*clus/slope : 0);
+ if (cut < mincut) cut = mincut;
+ hadisolcuts[bit-1] = cut;
}
}
@@ -355,14 +303,8 @@ void LVL1::CPMTobAlgorithm::tauAlgorithm() {
// Need to worry about digit scale not being GeV
float emEnergyScale{1};
unsigned int tobPtMinTau{0};
- if( m_l1menu ) {
- emEnergyScale = m_l1menu->thrExtraInfo().EM().emScale();
- tobPtMinTau = m_l1menu->thrExtraInfo().TAU().ptMinToTopo();
- } else {
- const TrigConf::CaloInfo & caloInfo = m_configSvc->thresholdConfig()->caloInfo();
- emEnergyScale = caloInfo.globalEmScale();
- tobPtMinTau = caloInfo.minTobTau().ptmin;
- }
+ emEnergyScale = m_l1menu->thrExtraInfo().EM().emScale();
+ tobPtMinTau = m_l1menu->thrExtraInfo().TAU().ptMinToTopo();
unsigned int thresh = tobPtMinTau * emEnergyScale;
if (m_TauClus <= thresh) return;
@@ -387,43 +329,20 @@ void LVL1::CPMTobAlgorithm::tauAlgorithm() {
// Get isolation values from menu (placeholder code - example logic)
std::vector<int> emisolcuts(5,m_noIsol);
- if( m_l1menu ) {
- for(size_t bit = 1; bit<=5; ++bit) {
- const TrigConf::IsolationLegacy & iso = m_l1menu->thrExtraInfo().TAU().isolation("EMIsoForTAUthr", bit);
- if(! iso.isDefined() ) {
- continue;
- }
- int offset = iso.offset();
- int slope = iso.slope();
- int mincut = iso.mincut();
- int upperlimit = iso.upperlimit()*10;
- if (clus < upperlimit && bit >= 1 && bit <= 5) {
- // As "slope" = 10* slope, rescale clus too to get fraction right.
- int cut = offset + (slope != 0 ? 10*clus/slope : 0);
- if (cut < mincut) cut = mincut;
- emisolcuts[bit-1] = cut;
- }
+ for(size_t bit = 1; bit<=5; ++bit) {
+ const TrigConf::IsolationLegacy & iso = m_l1menu->thrExtraInfo().TAU().isolation("EMIsoForTAUthr", bit);
+ if(! iso.isDefined() ) {
+ continue;
}
- } else {
- const TrigConf::CaloInfo & caloInfo = m_configSvc->thresholdConfig()->caloInfo();
- std::vector<IsolationParam> emIsolParams = caloInfo.isolationEMIsoForTAUthr();
-
- for (std::vector<IsolationParam>::const_iterator it = emIsolParams.begin(); it != emIsolParams.end(); ++it) {
- if ((*it).isDefined()) {
- float offset = (*it).offset();
- float slope = (*it).slope();
- float mincut = (*it).mincut();
- // upperlimit is in GeV, so convert to 100 MeV units
- int upperlimit = (*it).upperlimit()*10;
- int bit = (*it).isobit();
-
- if (clus < upperlimit && bit >= 1 && bit <= 5) {
- // slope parameter is 10* actual slope, so correct for that here
- int cut = offset + (slope != 0 ? 10*clus/slope : 0);
- if (cut < mincut) cut = mincut;
- emisolcuts[bit-1] = cut;
- }
- }
+ int offset = iso.offset();
+ int slope = iso.slope();
+ int mincut = iso.mincut();
+ int upperlimit = iso.upperlimit()*10;
+ if (clus < upperlimit && bit >= 1 && bit <= 5) {
+ // As "slope" = 10* slope, rescale clus too to get fraction right.
+ int cut = offset + (slope != 0 ? 10*clus/slope : 0);
+ if (cut < mincut) cut = mincut;
+ emisolcuts[bit-1] = cut;
}
}
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/JEMJetAlgorithm.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/JEMJetAlgorithm.cxx
index 967dd241d988..84d31bf9179d 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/JEMJetAlgorithm.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/JEMJetAlgorithm.cxx
@@ -28,8 +28,7 @@ const int JEMJetAlgorithm::m_satLarge = 0x3FF;
const int JEMJetAlgorithm::m_satSmall = 0x1FF;
LVL1::JEMJetAlgorithm::JEMJetAlgorithm( double eta, double phi, const std::map<int, JetInput *>* jiContainer,
- ServiceHandle<TrigConf::ILVL1ConfigSvc> config, const TrigConf::L1Menu * l1menu):
- m_configSvc(config),
+ const TrigConf::L1Menu * l1menu):
m_l1menu(l1menu),
m_ET4x4(0),
m_ET6x6(0),
@@ -220,22 +219,10 @@ void LVL1::JEMJetAlgorithm::passesTrigger() {
int threshSmall{0}; // the minimum pT of small jet objects sent to TOPO (in counts, not in GeV)
int threshLarge{0}; // the minimum pT of large jet objects sent to TOPO (in counts, not in GeV)
- if(m_l1menu)
- {
- sizeSmall = 4; // not part of the new menu
- sizeLarge = 8; // not part of the new menu
- threshSmall = m_l1menu->thrExtraInfo().JET().ptMinToTopoSmallWindowCounts();
- threshLarge = m_l1menu->thrExtraInfo().JET().ptMinToTopoLargeWindowCounts();
- }
- else
- {
- const TrigConf::CaloInfo & caloInfo = m_configSvc->thresholdConfig()->caloInfo();
- float scale = caloInfo.globalJetScale(); // the jet energy count scale
- sizeSmall = caloInfo.jetWindowSizeSmall();
- sizeLarge = caloInfo.jetWindowSizeLarge();
- threshSmall = caloInfo.minTobJetSmall().ptmin * scale;
- threshLarge = caloInfo.minTobJetLarge().ptmin * scale;
- }
+ sizeSmall = 4; // not part of the new menu
+ sizeLarge = 8; // not part of the new menu
+ threshSmall = m_l1menu->thrExtraInfo().JET().ptMinToTopoSmallWindowCounts();
+ threshLarge = m_l1menu->thrExtraInfo().JET().ptMinToTopoLargeWindowCounts();
int etLarge = m_ET8x8;
if (sizeLarge == 6) etLarge = m_ET6x6;
--
GitLab
From ae07fc2fe069ccd1e25bcc0980fa5b908c59c2bd Mon Sep 17 00:00:00 2001
From: Liza Mijovic <liza.mijovic@cern.ch>
Date: Fri, 13 Aug 2021 16:39:42 +0200
Subject: [PATCH 030/272] FATRAS: fix TRT building in complex geometry mode
---
.../src/TRT_LayerBuilder.cxx | 55 +++++++++++-----
.../src/TRT_LayerBuilderCond.cxx | 64 +++++++++++++------
2 files changed, 85 insertions(+), 34 deletions(-)
diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/TRT_LayerBuilder.cxx b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/TRT_LayerBuilder.cxx
index 7de9ed02690a..a91a4b7809f8 100644
--- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/TRT_LayerBuilder.cxx
+++ b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/TRT_LayerBuilder.cxx
@@ -251,8 +251,11 @@ const std::vector< const Trk::CylinderLayer* >* InDet::TRT_LayerBuilder::cylindr
} else {
// (B) complex geometry section
- int nMaterialLayerStep = int(nTotalBarrelLayers/m_modelBarrelLayers+1);
- int cMaterialLayerCount = 0;
+ float nMaterialLayerStep = 1.*nTotalBarrelLayers/m_modelBarrelLayers;
+ // complex geo should build same # of mat. layers as model geo; counter to check this:
+ unsigned int cMaterialLayerCount = 0;
+ // inclusive layer counter over all rings, used to determine mat. layer position
+ unsigned int cLayer=0;
// loop over rings
ATH_MSG_VERBOSE("TRT Barrel has " << nBarrelRings << " rings.");
@@ -266,7 +269,8 @@ const std::vector< const Trk::CylinderLayer* >* InDet::TRT_LayerBuilder::cylindr
// ----------------------------------------------------------------------------------
ATH_MSG_VERBOSE("--> Layer " << layer << " is being built with " << nBarrelPhiSectors << " secors in phi.");
- ++cMaterialLayerCount;
+ // increase inclusive layer counter for next material layer
+ ++cLayer;
// set layer dimensions radius
double layerRadius = 0.;
@@ -383,9 +387,9 @@ const std::vector< const Trk::CylinderLayer* >* InDet::TRT_LayerBuilder::cylindr
layerRadius = 0.5*(layerRadiusMin+layerRadiusMax)+0.5*m_layerStrawRadius;
bool assignMaterial = false;
- if (cMaterialLayerCount == nMaterialLayerStep) {
+ if (cLayer==(unsigned)int((cMaterialLayerCount+1)*nMaterialLayerStep)) {
assignMaterial = true;
- cMaterialLayerCount = 0;
+ ++cMaterialLayerCount;
ATH_MSG_VERBOSE( "--> Creating a material+straw layer at radius : " << layerRadius );
} else
ATH_MSG_VERBOSE( "--> Creating a straw layer at radius : " << layerRadius );
@@ -455,7 +459,16 @@ const std::vector< const Trk::CylinderLayer* >* InDet::TRT_LayerBuilder::cylindr
++ilay;
} // loop over layers
} // loop over rings
- }
+
+ ATH_MSG_VERBOSE(" Built number of TRT barrel material layers: " << cMaterialLayerCount);
+ // In Complex geo # of material layers should match the expected # of layers,
+ // else a mis-match in layer and material map index occurs.
+ // This mis-match will results layers getting incorrect material properties.
+ if (cMaterialLayerCount!=m_modelBarrelLayers) {
+ ATH_MSG_WARNING(" Complex geo built incorrect # of TRT material layers: " << cMaterialLayerCount << " / " << m_modelBarrelLayers);
+ }
+
+ } // complex geometry
// return what you have
return barrelLayers.release();
@@ -580,19 +593,21 @@ const std::vector< const Trk::DiscLayer* >* InDet::TRT_LayerBuilder::discLayers(
} else {
// (b) complex geometry
- int nMaterialLayerStep = int(numTotalLayers/m_modelEndcapLayers+1);
- int cMaterialLayerCount = 0;
+ float nMaterialLayerStep = 1.*numTotalLayers/m_modelEndcapLayers;
+ // inclusive layer counter over all wheels
+ unsigned int cLayer = 0;
+ // complex geo should build same # of mat. layers as model geo; counter to check this:
+ unsigned int cMaterialLayerCount = 0;
// complex geometry - needs a little bit of joggling
- int currentLayerCounter = 0;
for (unsigned int iwheel=0; iwheel<nEndcapWheels; ++iwheel)
{
// do the loop per side
unsigned int nEndcapLayers = trtNums->getNEndcapLayers(iwheel);
for (unsigned int ilayer = 0; ilayer < nEndcapLayers; ++ilayer){
- // increase the layerCounter for material layer decission
- ++currentLayerCounter;
- ++cMaterialLayerCount;
+
+ // increase inclusive layer counter for next material layer
+ ++cLayer;
// count the straws;
int numberOfStraws = 0;
@@ -608,9 +623,9 @@ const std::vector< const Trk::DiscLayer* >* InDet::TRT_LayerBuilder::discLayers(
// check if we need to build a straw layer or not
bool assignMaterial = false;
- if (cMaterialLayerCount == nMaterialLayerStep) {
+ if (cLayer == (unsigned)int((cMaterialLayerCount+1)*nMaterialLayerStep)) {
assignMaterial = true;
- cMaterialLayerCount = 0;
+ ++cMaterialLayerCount;
ATH_MSG_VERBOSE( "--> Creating a material+straw layer at z-pos : " << discZ );
} else {
ATH_MSG_VERBOSE( "--> Creating a straw layer at z-pos : " << discZ );
@@ -698,7 +713,17 @@ const std::vector< const Trk::DiscLayer* >* InDet::TRT_LayerBuilder::discLayers(
} // end of sectorDiscBounds if
} // end of layer loop
} // end of wheel loop
- } // model/real geometry
+
+ ATH_MSG_VERBOSE(" Built # of TRT material layers: " << cMaterialLayerCount << "in ispos: " << iposneg << "ring");
+ // # of material layers should match the expected # of layers,
+ // else a mis-match in layer and material map index occurs.
+ // This mis-match will results layers getting incorrect material properties.
+ if (cMaterialLayerCount != m_modelEndcapLayers) {
+ ATH_MSG_WARNING(" Built incorrect # of TRT material layers: "
+ << cMaterialLayerCount << " / " << m_modelEndcapLayers << "in ispos" << iposneg << "ring" );
+ }
+
+ } // model/real geometry
} // end of posneg loop
delete layerMaterial; layerMaterial = nullptr;
diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/TRT_LayerBuilderCond.cxx b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/TRT_LayerBuilderCond.cxx
index 60377606551d..aadef458aaed 100644
--- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/TRT_LayerBuilderCond.cxx
+++ b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/TRT_LayerBuilderCond.cxx
@@ -262,10 +262,13 @@ std::pair<EventIDRange, const std::vector< const Trk::CylinderLayer* >* > InDet:
delete layerMaterial;
}
} else {
- // (B) complex geometry section
- int nMaterialLayerStep = int(nTotalBarrelLayers/m_modelBarrelLayers+1);
- int cMaterialLayerCount = 0;
+ // (B) complex geometry section
+ float nMaterialLayerStep = 1.*nTotalBarrelLayers/m_modelBarrelLayers;
+ // complex geo should build same # of mat. layers as model geo; counter to check this:
+ unsigned int cMaterialLayerCount = 0;
+ // inclusive layer counter over all rings, used to determine mat. layer position
+ unsigned int cLayer=0;
// loop over rings
ATH_MSG_VERBOSE("TRT Barrel has " << nBarrelRings << " rings.");
@@ -279,7 +282,9 @@ std::pair<EventIDRange, const std::vector< const Trk::CylinderLayer* >* > InDet:
// ----------------------------------------------------------------------------------
ATH_MSG_VERBOSE("--> Layer " << layer << " is being built with " << nBarrelPhiSectors << " secors in phi.");
- ++cMaterialLayerCount;
+
+ // increase inclusive layer counter for next material layer
+ ++cLayer;
// set layer dimensions radius
double layerRadius = 0.;
@@ -398,10 +403,10 @@ std::pair<EventIDRange, const std::vector< const Trk::CylinderLayer* >* > InDet:
layerRadius = 0.5*(layerRadiusMin+layerRadiusMax)+0.5*m_layerStrawRadius;
bool assignMaterial = false;
- if (cMaterialLayerCount == nMaterialLayerStep) {
- assignMaterial = true;
- cMaterialLayerCount = 0;
- ATH_MSG_VERBOSE( "--> Creating a material+straw layer at radius : " << layerRadius );
+ if (cLayer==(unsigned)int((cMaterialLayerCount+1)*nMaterialLayerStep)) {
+ assignMaterial = true;
+ ++cMaterialLayerCount;
+ ATH_MSG_VERBOSE( "--> Creating a material+straw layer at radius : " << layerRadius );
} else
ATH_MSG_VERBOSE( "--> Creating a straw layer at radius : " << layerRadius );
@@ -474,7 +479,16 @@ std::pair<EventIDRange, const std::vector< const Trk::CylinderLayer* >* > InDet:
++ilay;
} // loop over layers
} // loop over rings
- }
+
+ ATH_MSG_VERBOSE(" Built number of TRT barrel material layers: " << cMaterialLayerCount);
+ // In Complex geo # of material layers should match the expected # of layers,
+ // else a mis-match in layer and material map index occurs.
+ // This mis-match will results layers getting incorrect material properties.
+ if (cMaterialLayerCount!=m_modelBarrelLayers) {
+ ATH_MSG_WARNING(" Complex geo built incorrect # of TRT barrel material layers: "
+ << cMaterialLayerCount << " / " << m_modelBarrelLayers);
+ }
+ }// complex geometry
// return what you have
range = readHandleTRTContainer.getRange();
@@ -608,20 +622,22 @@ std::pair<EventIDRange, const std::vector< const Trk::DiscLayer* >* > InDet::TRT
} else {
// (b) complex geometry
- int nMaterialLayerStep = int(numTotalLayers/m_modelEndcapLayers+1);
- int cMaterialLayerCount = 0;
+ float nMaterialLayerStep = 1.*numTotalLayers/m_modelEndcapLayers;
+ // inclusive layer counter over all wheels
+ unsigned int cLayer = 0;
+ // complex geo should build same # of mat. layers as model geo; counter to check this:
+ unsigned int cMaterialLayerCount = 0;
// complex geometry - needs a little bit of joggling
- int currentLayerCounter = 0;
for (unsigned int iwheel=0; iwheel<nEndcapWheels; ++iwheel)
{
// do the loop per side
unsigned int nEndcapLayers = trtNums->getNEndcapLayers(iwheel);
for (unsigned int ilayer = 0; ilayer < nEndcapLayers; ++ilayer){
- // increase the layerCounter for material layer decission
- ++currentLayerCounter;
- ++cMaterialLayerCount;
+ // increase inclusive layer counter for next material layer
+ ++cLayer;
+
// count the straws;
int numberOfStraws = 0;
@@ -636,10 +652,10 @@ std::pair<EventIDRange, const std::vector< const Trk::DiscLayer* >* > InDet::TRT
// check if we need to build a straw layer or not
bool assignMaterial = false;
- if (cMaterialLayerCount == nMaterialLayerStep) {
- assignMaterial = true;
- cMaterialLayerCount = 0;
- ATH_MSG_VERBOSE( "--> Creating a material+straw layer at z-pos : " << discZ );
+ if (cLayer == (unsigned)int((cMaterialLayerCount+1)*nMaterialLayerStep)) {
+ assignMaterial = true;
+ ++cMaterialLayerCount;
+ ATH_MSG_VERBOSE( "--> Creating a material+straw layer at z-pos : " << discZ );
} else {
ATH_MSG_VERBOSE( "--> Creating a straw layer at z-pos : " << discZ );
}
@@ -725,6 +741,16 @@ std::pair<EventIDRange, const std::vector< const Trk::DiscLayer* >* > InDet::TRT
} // end of sectorDiscBounds if
} // end of layer loop
} // end of wheel loop
+
+ ATH_MSG_VERBOSE(" Built # of TRT material layers: " << cMaterialLayerCount << "in ispos: " << iposneg << "ring");
+ // # of material layers should match the expected # of layers,
+ // else a mis-match in layer and material map index occurs.
+ // This mis-match will results layers getting incorrect material properties.
+ if (cMaterialLayerCount != m_modelEndcapLayers) {
+ ATH_MSG_WARNING(" Built incorrect # of TRT material layers: "
+ << cMaterialLayerCount << " / " << m_modelEndcapLayers << "in ispos" << iposneg << "ring" );
+ }
+
} // model/real geometry
} // end of posneg loop
--
GitLab
From f83c06149ce837a8411b11a0453c731aeae37f40 Mon Sep 17 00:00:00 2001
From: Giancarlo Panizzo <giancarlo.panizzo@cern.ch>
Date: Fri, 13 Aug 2021 17:06:39 +0200
Subject: [PATCH 031/272] Saving xsec info in hepmc event by passing
pythia.info pointer
---
Generators/Pythia8B_i/src/Pythia8B_i.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Generators/Pythia8B_i/src/Pythia8B_i.cxx b/Generators/Pythia8B_i/src/Pythia8B_i.cxx
index fc90ea6c6603..319cdec78f18 100644
--- a/Generators/Pythia8B_i/src/Pythia8B_i.cxx
+++ b/Generators/Pythia8B_i/src/Pythia8B_i.cxx
@@ -379,7 +379,7 @@ StatusCode Pythia8B_i::fillEvt(HepMC::GenEvent *evt){
Pythia8::Event &pyev = *(m_BEventBuffer.begin());
evt->set_event_number(*(m_internalEventNumbers.begin()));
- m_pythiaToHepMC.fill_next_event(pyev, evt, 1);
+ m_pythiaToHepMC.fill_next_event(pyev, evt, 1, &Pythia8_i::m_pythia->info);
// set the randomseeds
--
GitLab
From dec1de769e4ae91a60f5df45b45c4af037b43d5b Mon Sep 17 00:00:00 2001
From: John Chapman <jchapman@cern.ch>
Date: Fri, 13 Aug 2021 17:03:24 +0200
Subject: [PATCH 032/272] Update CG vs CA SimCoreTests ART jobs
Rename SimCoreTests CG vs CA ART scripts from `XXX_OldvsNew.sh` to `XXX_CGvsCA.sh`.
Add configuration comparison to all CAvsCG tests
Add test_AtlasG4_CavernBg_EVNT2TR_CGvsCA.sh
Add test_AtlasG4_CavernBg_TR2HITS_CGvsCA.sh
Add test_AtlasG4_CosmicSim_CGvsCA.sh ART job - CA-based configuration job currently gives ERRORs
Add test_AtlasG4_CosmicSimTR_CGvsCA.sh ART job
---
....sh => test_AtlasG4_2010GeomSim_CGvsCA.sh} | 27 ++++--
....sh => test_AtlasG4_2011GeomSim_CGvsCA.sh} | 25 ++++--
....sh => test_AtlasG4_2012GeomSim_CGvsCA.sh} | 25 ++++--
.../test_AtlasG4_CavernBg_EVNT2TR_CGvsCA.sh | 79 ++++++++++++++++
.../test_AtlasG4_CavernBg_TR2HITS_CGvsCA.sh | 71 +++++++++++++++
....sh => test_AtlasG4_CosmicSimTR_CGvsCA.sh} | 30 +++++--
.../test/test_AtlasG4_CosmicSim_CGvsCA.sh | 89 +++++++++++++++++++
...st_AtlasG4_FrozenShowerFCalOnly_CGvsCA.sh} | 26 ++++--
...=> test_AtlasG4_FtfpBertAtlTest_CGvsCA.sh} | 25 ++++--
.../test/test_AtlasG4_QgsBicTest_CGvsCA.sh | 72 +++++++++++++++
.../test/test_AtlasG4_QgsBicTest_OldvsNew.sh | 59 ------------
...dvsNew.sh => test_AtlasG4_ttbar_CGvsCA.sh} | 19 +++-
12 files changed, 452 insertions(+), 95 deletions(-)
rename Simulation/Tests/SimCoreTests/test/{test_AtlasG4_2010GeomSim_OldvsNew.sh => test_AtlasG4_2010GeomSim_CGvsCA.sh} (68%)
rename Simulation/Tests/SimCoreTests/test/{test_AtlasG4_2011GeomSim_OldvsNew.sh => test_AtlasG4_2011GeomSim_CGvsCA.sh} (69%)
rename Simulation/Tests/SimCoreTests/test/{test_AtlasG4_2012GeomSim_OldvsNew.sh => test_AtlasG4_2012GeomSim_CGvsCA.sh} (69%)
create mode 100755 Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_EVNT2TR_CGvsCA.sh
create mode 100755 Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_TR2HITS_CGvsCA.sh
rename Simulation/Tests/SimCoreTests/test/{test_AtlasG4_CosmicSimTR_OldvsNew.sh => test_AtlasG4_CosmicSimTR_CGvsCA.sh} (66%)
create mode 100755 Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSim_CGvsCA.sh
rename Simulation/Tests/SimCoreTests/test/{test_AtlasG4_FrozenShowerFCalOnly_OldvsNew.sh => test_AtlasG4_FrozenShowerFCalOnly_CGvsCA.sh} (69%)
rename Simulation/Tests/SimCoreTests/test/{test_AtlasG4_FtfpBertAtlTest_OldvsNew.sh => test_AtlasG4_FtfpBertAtlTest_CGvsCA.sh} (69%)
create mode 100755 Simulation/Tests/SimCoreTests/test/test_AtlasG4_QgsBicTest_CGvsCA.sh
delete mode 100755 Simulation/Tests/SimCoreTests/test/test_AtlasG4_QgsBicTest_OldvsNew.sh
rename Simulation/Tests/SimCoreTests/test/{test_AtlasG4_ttbar_OldvsNew.sh => test_AtlasG4_ttbar_CGvsCA.sh} (70%)
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2010GeomSim_OldvsNew.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2010GeomSim_CGvsCA.sh
similarity index 68%
rename from Simulation/Tests/SimCoreTests/test/test_AtlasG4_2010GeomSim_OldvsNew.sh
rename to Simulation/Tests/SimCoreTests/test/test_AtlasG4_2010GeomSim_CGvsCA.sh
index 08b7a4ed4f9a..4fbe61bf0812 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2010GeomSim_OldvsNew.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2010GeomSim_CGvsCA.sh
@@ -4,14 +4,15 @@
# art-include: master/Athena
# art-include: master/AthSimulation
# art-type: grid
-# art-output: test.OLD.HITS.pool.root
-# art-output: test.NEW.HITS.pool.root
-# art-output: log.G4AtlasAlg*
+# art-output: test.*.HITS.pool.root
+# art-output: log.*
+# art-output: Config*.pkl
AtlasG4_tf.py \
--CA \
--conditionsTag 'OFLCOND-RUN12-SDR-19' \
--physicsList 'FTFP_BERT' \
+--truthStrategy 'MC15aPlus' \
--postInclude 'PyJobTransforms.TransformUtils.UseFrontier' \
--DataRunNumber '155697' \
--geometryVersion 'ATLAS-R1-2010-02-00-00' \
@@ -20,6 +21,7 @@ AtlasG4_tf.py \
--maxEvents '10' \
--skipEvents '0' \
--randomSeed '10' \
+--postExec 'with open("ConfigSimCA.pkl", "wb") as f: cfg.store(f)' \
--imf False
rc=$?
@@ -28,9 +30,22 @@ echo "art-result: $rc G4AtlasAlg_AthenaCA"
rc2=-9999
if [ $rc -eq 0 ]
then
- ArtPackage=$1
- ArtJobName=$2
- AtlasG4_tf.py \
+ AtlasG4_tf.py \
+ --conditionsTag 'OFLCOND-RUN12-SDR-19' \
+ --physicsList 'FTFP_BERT' \
+ --postInclude 'default:PyJobTransforms/UseFrontier.py' \
+ --DataRunNumber '155697' \
+ --geometryVersion 'ATLAS-R1-2010-02-00-00' \
+ --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mu_E200_eta0-25.evgen.pool.root' \
+ --outputHITSFile 'test.NEW.HITS.pool.root' \
+ --maxEvents '10' \
+ --skipEvents '0' \
+ --randomSeed '10' \
+ --truthStrategy 'MC15aPlus' \
+ --imf False \
+ --athenaopts '"--config-only=ConfigSimCG.pkl"'
+
+ AtlasG4_tf.py \
--conditionsTag 'OFLCOND-RUN12-SDR-19' \
--physicsList 'FTFP_BERT' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2011GeomSim_OldvsNew.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2011GeomSim_CGvsCA.sh
similarity index 69%
rename from Simulation/Tests/SimCoreTests/test/test_AtlasG4_2011GeomSim_OldvsNew.sh
rename to Simulation/Tests/SimCoreTests/test/test_AtlasG4_2011GeomSim_CGvsCA.sh
index c55427f66a99..8389fd86d82b 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2011GeomSim_OldvsNew.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2011GeomSim_CGvsCA.sh
@@ -4,9 +4,9 @@
# art-include: master/Athena
# art-include: master/AthSimulation
# art-type: grid
-# art-output: test.OLD.HITS.pool.root
-# art-output: test.NEW.HITS.pool.root
-# art-output: log.G4AtlasAlg*
+# art-output: test.*.HITS.pool.root
+# art-output: log.*
+# art-output: Config*.pkl
AtlasG4_tf.py \
--CA \
@@ -20,6 +20,8 @@ AtlasG4_tf.py \
--maxEvents '10' \
--skipEvents '0' \
--randomSeed '10' \
+--truthStrategy 'MC15aPlus' \
+--postExec 'with open("ConfigSimCA.pkl", "wb") as f: cfg.store(f)' \
--imf False
rc=$?
@@ -28,8 +30,21 @@ echo "art-result: $rc G4AtlasAlg_AthenaCA"
rc2=-9999
if [ $rc -eq 0 ]
then
- ArtPackage=$1
- ArtJobName=$2
+ AtlasG4_tf.py \
+ --conditionsTag 'OFLCOND-RUN12-SDR-19' \
+ --physicsList 'FTFP_BERT' \
+ --postInclude 'default:PyJobTransforms/UseFrontier.py' \
+ --DataRunNumber '180164' \
+ --geometryVersion 'ATLAS-R1-2011-02-00-00' \
+ --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mu_E200_eta0-25.evgen.pool.root" \
+ --outputHITSFile "test.NEW.HITS.pool.root" \
+ --maxEvents '10' \
+ --skipEvents '0' \
+ --randomSeed '10' \
+ --truthStrategy 'MC15aPlus' \
+ --imf False \
+ --athenaopts '"--config-only=ConfigSimCG.pkl"'
+
AtlasG4_tf.py \
--conditionsTag 'OFLCOND-RUN12-SDR-19' \
--physicsList 'FTFP_BERT' \
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2012GeomSim_OldvsNew.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2012GeomSim_CGvsCA.sh
similarity index 69%
rename from Simulation/Tests/SimCoreTests/test/test_AtlasG4_2012GeomSim_OldvsNew.sh
rename to Simulation/Tests/SimCoreTests/test/test_AtlasG4_2012GeomSim_CGvsCA.sh
index c6fc17bf9154..34d51e686b88 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2012GeomSim_OldvsNew.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2012GeomSim_CGvsCA.sh
@@ -4,9 +4,9 @@
# art-include: master/Athena
# art-include: master/AthSimulation
# art-type: grid
-# art-output: test.OLD.HITS.pool.root
-# art-output: test.NEW.HITS.pool.root
-# art-output: log.G4AtlasAlg*
+# art-output: test.*.HITS.pool.root
+# art-output: log.*
+# art-output: Config*.pkl
AtlasG4_tf.py \
--CA \
@@ -20,6 +20,8 @@ AtlasG4_tf.py \
--maxEvents '10' \
--skipEvents '0' \
--randomSeed '10' \
+--truthStrategy 'MC15aPlus' \
+--postExec 'with open("ConfigSimCA.pkl", "wb") as f: cfg.store(f)' \
--imf False
rc=$?
@@ -28,8 +30,21 @@ echo "art-result: $rc G4AtlasAlg_AthenaCA"
rc2=-9999
if [ $rc -eq 0 ]
then
- ArtPackage=$1
- ArtJobName=$2
+ AtlasG4_tf.py \
+ --conditionsTag 'OFLCOND-RUN12-SDR-19' \
+ --physicsList 'FTFP_BERT' \
+ --postInclude 'default:PyJobTransforms/UseFrontier.py' \
+ --DataRunNumber '212272' \
+ --geometryVersion 'ATLAS-R1-2012-03-00-00' \
+ --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mu_E200_eta0-25.evgen.pool.root" \
+ --outputHITSFile "test.NEW.HITS.pool.root" \
+ --maxEvents '10' \
+ --skipEvents '0' \
+ --randomSeed '10' \
+ --truthStrategy 'MC15aPlus' \
+ --imf False \
+ --athenaopts '"--config-only=ConfigSimCG.pkl"'
+
AtlasG4_tf.py \
--conditionsTag 'OFLCOND-RUN12-SDR-19' \
--physicsList 'FTFP_BERT' \
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_EVNT2TR_CGvsCA.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_EVNT2TR_CGvsCA.sh
new file mode 100755
index 000000000000..f60f1e5cbee1
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_EVNT2TR_CGvsCA.sh
@@ -0,0 +1,79 @@
+#!/bin/sh
+#
+# art-description: Run simulation outside ISF, reading min bias events, write cavern background track records, using 2015 geometry and conditions
+# art-type: grid
+# art-output: test.*.EVNT_TR.pool.root
+# art-output: log.*
+# art-output: Config*.pkl
+
+AtlasG4_tf.py \
+--CA \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/minbias_Inelastic_low-pythia8-7000.evgen.pool.root' \
+--outputHITSFile 'discard.HITS.pool.root' \
+--outputEVNT_TRFile 'test.NEW.EVNT_TR.pool.root' \
+--maxEvents '2' \
+--skipEvents '0' \
+--randomSeed '5678' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--DataRunNumber '222525' \
+--physicsList 'QGSP_BERT_HP' \
+--postInclude 'PyJobTransforms.TransformUtils.UseFrontier' \
+--truthStrategy 'MC12' \
+--postExec 'with open("ConfigSimCA.pkl", "wb") as f: cfg.store(f)' \
+--imf False
+
+rc=$?
+mv log.AtlasG4Tf log.G4AtlasAlg_AthenaCA
+# remove HITS file so it does not trigger regression
+rm discard.HITS.pool.root
+
+echo "art-result: $rc G4AtlasAlg_AthenaCA"
+rc2=-9999
+if [ $rc -eq 0 ]
+then
+ AtlasG4_tf.py \
+ --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/minbias_Inelastic_low-pythia8-7000.evgen.pool.root' \
+ --outputHITSFile 'discard.HITS.pool.root' \
+ --outputEVNT_TRFile 'test.NEW.EVNT_TR.pool.root' \
+ --maxEvents '2' \
+ --skipEvents '0' \
+ --randomSeed '5678' \
+ --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+ --conditionsTag 'OFLCOND-RUN12-SDR-19' \
+ --DataRunNumber '222525' \
+ --physicsList 'QGSP_BERT_HP' \
+ --postInclude 'PyJobTransforms/UseFrontier.py' \
+ --truthStrategy 'MC12' \
+ --imf False \
+ --athenaopts '"--config-only=ConfigSimCG.pkl"'
+
+ AtlasG4_tf.py \
+ --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/minbias_Inelastic_low-pythia8-7000.evgen.pool.root' \
+ --outputHITSFile 'discard.HITS.pool.root' \
+ --outputEVNT_TRFile 'test.OLD.EVNT_TR.pool.root' \
+ --maxEvents '2' \
+ --skipEvents '0' \
+ --randomSeed '5678' \
+ --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+ --conditionsTag 'OFLCOND-RUN12-SDR-19' \
+ --DataRunNumber '222525' \
+ --physicsList 'QGSP_BERT_HP' \
+ --postInclude 'PyJobTransforms/UseFrontier.py' \
+ --truthStrategy 'MC12' \
+ --imf False
+
+ rc2=$?
+ # remove HITS file so it does not trigger regression
+ rm discard.HITS.pool.root
+fi
+
+echo "art-result: $rc2 G4AtlasAlg_AthenaCA_OLD"
+
+rc5=-9999
+if [ $rc2 -eq 0 ]
+then
+ acmd.py diff-root test.OLD.EVNT_TR.pool.root test.NEW.EVNT_TR.pool.root --error-mode resilient --mode=semi-detailed --order-trees --ignore-leaves RecoTimingObj_p1_AtlasG4Tf_timings index_ref
+ rc5=$?
+fi
+echo "art-result: $rc5 CompareEVNT_TR_CGvsCA"
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_TR2HITS_CGvsCA.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_TR2HITS_CGvsCA.sh
new file mode 100755
index 000000000000..4c412eb01206
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_TR2HITS_CGvsCA.sh
@@ -0,0 +1,71 @@
+#!/bin/sh
+#
+# art-description: Run simulation outside ISF, reading cavern background track records, writing cavern background HITS, using 2015 geometry and conditions
+# art-type: grid
+# art-output: test.*.HITS.pool.root
+# art-output: log.*
+# art-output: Config*.pkl
+
+AtlasG4_tf.py \
+--CA \
+--inputEVNT_TRFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/cavernbg-pythia8-7000.evgen.pool.root' \
+--outputHITSFile 'test.NEW.HITS.pool.root' \
+--maxEvents '5' \
+--skipEvents '0' \
+--randomSeed '8765' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--DataRunNumber '222525' \
+--physicsList 'QGSP_BERT_HP' \
+--postInclude 'PyJobTransforms.TransformUtils.UseFrontier' \
+--truthStrategy 'MC12' \
+--postExec 'with open("ConfigSimCA.pkl", "wb") as f: cfg.store(f)' \
+--imf False
+
+rc=$?
+mv log.AtlasG4Tf log.G4AtlasAlg_AthenaCA
+echo "art-result: $rc G4AtlasAlg_AthenaCA"
+rc2=-9999
+if [ $rc -eq 68 ]
+then
+ AtlasG4_tf.py \
+ --inputEVNT_TRFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/cavernbg-pythia8-7000.evgen.pool.root' \
+ --outputHITSFile 'test.NEW.HITS.pool.root' \
+ --maxEvents '5' \
+ --skipEvents '0' \
+ --randomSeed '8765' \
+ --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+ --conditionsTag 'OFLCOND-RUN12-SDR-19' \
+ --DataRunNumber '222525' \
+ --physicsList 'QGSP_BERT_HP' \
+ --postInclude 'PyJobTransforms/UseFrontier.py' \
+ --truthStrategy 'MC12' \
+ --imf False \
+ --athenaopts '"--config-only=ConfigSimCG.pkl"'
+
+ AtlasG4_tf.py \
+ --inputEVNT_TRFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/cavernbg-pythia8-7000.evgen.pool.root' \
+ --outputHITSFile 'test.OLD.HITS.pool.root' \
+ --maxEvents '5' \
+ --skipEvents '0' \
+ --randomSeed '8765' \
+ --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+ --conditionsTag 'OFLCOND-RUN12-SDR-19' \
+ --DataRunNumber '222525' \
+ --physicsList 'QGSP_BERT_HP' \
+ --postInclude 'PyJobTransforms/UseFrontier.py' \
+ --truthStrategy 'MC12' \
+ --imf False
+
+ rc2=$?
+fi
+
+echo "art-result: $rc2 G4AtlasAlg_AthenaCA_OLD"
+
+rc5=-9999
+if [ $rc2 -eq 0 ]
+then
+ acmd.py diff-root test.OLD.HITS.pool.root test.NEW.HITS.pool.root --error-mode resilient --mode=semi-detailed --order-trees --ignore-leaves RecoTimingObj_p1_AtlasG4Tf_timings index_ref
+ rc5=$?
+fi
+echo "art-result: $rc5 CompareHITS_CGvsCA"
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSimTR_OldvsNew.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSimTR_CGvsCA.sh
similarity index 66%
rename from Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSimTR_OldvsNew.sh
rename to Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSimTR_CGvsCA.sh
index 8441b938b6f5..97a0dddfc440 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSimTR_OldvsNew.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSimTR_CGvsCA.sh
@@ -1,12 +1,10 @@
#!/bin/sh
#
# art-description: Run cosmics simulation outside ISF, using TrackRecords as input, using 2015 geometry and conditions
-# art-include: 21.0/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-# art-include: master/Athena
# art-type: grid
-# art-output: test.HITS.pool.root
+# art-output: test.*.HITS.pool.root
+# art-output: log.*
+# art-output: Config*.pkl
AtlasG4_tf.py \
--CA \
@@ -21,6 +19,8 @@ AtlasG4_tf.py \
--firstEvent '0' \
--beamType 'cosmics' \
--postInclude 'PyJobTransforms.TransformUtils.UseFrontier' \
+--postExec 'with open("ConfigSimCA.pkl", "wb") as f: cfg.store(f)' \
+--truthStrategy 'MC15aPlus' \
--imf False
rc=$?
@@ -29,8 +29,22 @@ echo "art-result: $rc G4AtlasAlg_AthenaCA"
rc2=-9999
if [ $rc -eq 0 ]
then
- ArtPackage=$1
- ArtJobName=$2
+ AtlasG4_tf.py \
+ --inputEVNT_TRFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/Cosmics.TR.pool.root' \
+ --outputHITSFile 'test.OLD.HITS.pool.root' \
+ --maxEvents '-1' \
+ --randomSeed '1234' \
+ --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+ --conditionsTag 'OFLCOND-RUN12-SDR-19' \
+ --physicsList 'FTFP_BERT' \
+ --DataRunNumber '222525' \
+ --firstEvent '0' \
+ --beamType 'cosmics' \
+ --postInclude 'PyJobTransforms/UseFrontier.py' \
+ --truthStrategy 'MC15aPlus' \
+ --imf False \
+ --athenaopts '"--config-only=ConfigSimCG.pkl"'
+
AtlasG4_tf.py \
--inputEVNT_TRFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/Cosmics.TR.pool.root' \
--outputHITSFile 'test.OLD.HITS.pool.root' \
@@ -56,4 +70,4 @@ then
acmd.py diff-root test.OLD.HITS.pool.root test.NEW.HITS.pool.root --error-mode resilient --mode=semi-detailed --order-trees --ignore-leaves RecoTimingObj_p1_AtlasG4Tf_timings index_ref
rc4=$?
fi
-echo "art-result: $rc4 FullG4MT_OLDvsCA"
+echo "art-result: $rc4 CompareHITS_CGvsCA"
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSim_CGvsCA.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSim_CGvsCA.sh
new file mode 100755
index 000000000000..de975328e36d
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSim_CGvsCA.sh
@@ -0,0 +1,89 @@
+#!/bin/sh
+#
+# art-description: Run cosmics simulation outside ISF, generating events on-the-fly, using 2015 geometry and conditions
+# art-type: grid
+# art-output: test.*.HITS.pool.root
+# art-output: test.*.TR.pool.root
+# art-output: log.*
+# art-output: Config*.pkl
+
+AtlasG4_tf.py \
+--CA \
+--outputHITSFile 'test.NEW.HITS.pool.root' \
+--maxEvents '1500' \
+--randomSeed '1234' \
+--DataRunNumber '222525' \
+--CosmicFilterVolume 'Calo' \
+--CosmicFilterVolume2 'NONE' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--physicsList 'FTFP_BERT' \
+--CosmicPtSlice 'NONE' \
+--outputEVNT_TRFile 'test.NEW.TR.pool.root' \
+--beamType 'cosmics' \
+--postInclude 'PyJobTransforms.TransformUtils.UseFrontier,CosmicGenerator.CosmicGeneratorConfig.postIncludeCosmicGenerator' \
+--postExec 'with open("ConfigSimCA.pkl", "wb") as f: cfg.store(f)' \
+--truthStrategy 'MC12' \
+--imf False
+
+# Currently generates errors in ID DetectorManger initialisations. Unclear why.
+
+rc=$?
+mv log.AtlasG4Tf log.G4AtlasAlg_AthenaCA
+echo "art-result: $rc G4AtlasAlg_AthenaCA"
+rc2=-9999
+if [ $rc -eq 68 ]
+then
+ AtlasG4_tf.py \
+ --outputHITSFile 'test.NEW.HITS.pool.root' \
+ --maxEvents '1500' \
+ --randomSeed '1234' \
+ --DataRunNumber '222525' \
+ --CosmicFilterVolume 'Calo' \
+ --CosmicFilterVolume2 'NONE' \
+ --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+ --conditionsTag 'OFLCOND-RUN12-SDR-19' \
+ --physicsList 'FTFP_BERT' \
+ --CosmicPtSlice 'NONE' \
+ --outputEVNT_TRFile 'test.NEW.TR.pool.root' \
+ --beamType 'cosmics' \
+ --postInclude 'PyJobTransforms/UseFrontier.py' \
+ --truthStrategy 'MC12' \
+ --imf False \
+ --athenaopts '"--config-only=ConfigSimCG.pkl"'
+
+ AtlasG4_tf.py \
+ --outputHITSFile 'test.OLD.HITS.pool.root' \
+ --maxEvents '1500' \
+ --randomSeed '1234' \
+ --DataRunNumber '222525' \
+ --CosmicFilterVolume 'Calo' \
+ --CosmicFilterVolume2 'NONE' \
+ --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+ --conditionsTag 'OFLCOND-RUN12-SDR-19' \
+ --physicsList 'FTFP_BERT' \
+ --CosmicPtSlice 'NONE' \
+ --outputEVNT_TRFile 'test.OLD.TR.pool.root' \
+ --beamType 'cosmics' \
+ --postInclude 'PyJobTransforms/UseFrontier.py' \
+ --truthStrategy 'MC12' \
+ --imf False
+
+ rc2=$?
+fi
+
+echo "art-result: $rc2 G4AtlasAlg_AthenaCA_OLD"
+rc4=-9999
+if [ $rc2 -eq 0 ]
+then
+ acmd.py diff-root test.OLD.TR.pool.root test.NEW.TR.pool.root --error-mode resilient --mode=semi-detailed --order-trees --ignore-leaves RecoTimingObj_p1_AtlasG4Tf_timings index_ref
+ rc4=$?
+fi
+echo "art-result: $rc4 CompareTR_CGvsCA"
+rc5=-9999
+if [ $rc2 -eq 0 ]
+then
+ acmd.py diff-root test.OLD.HITS.pool.root test.NEW.HITS.pool.root --error-mode resilient --mode=semi-detailed --order-trees --ignore-leaves RecoTimingObj_p1_AtlasG4Tf_timings index_ref
+ rc5=$?
+fi
+echo "art-result: $rc5 CompareHITS_CGvsCA"
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FrozenShowerFCalOnly_OldvsNew.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FrozenShowerFCalOnly_CGvsCA.sh
similarity index 69%
rename from Simulation/Tests/SimCoreTests/test/test_AtlasG4_FrozenShowerFCalOnly_OldvsNew.sh
rename to Simulation/Tests/SimCoreTests/test/test_AtlasG4_FrozenShowerFCalOnly_CGvsCA.sh
index ff8b072d68ca..505578e62533 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FrozenShowerFCalOnly_OldvsNew.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FrozenShowerFCalOnly_CGvsCA.sh
@@ -4,9 +4,9 @@
# art-include: master/Athena
# art-include: master/AthSimulation
# art-type: grid
-# art-output: test.OLD.HITS.pool.root
-# art-output: test.NEW.HITS.pool.root
-# art-output: log.G4AtlasAlg*
+# art-output: test.*.HITS.pool.root
+# art-output: log.*
+# art-output: Config*.pkl
AtlasG4_tf.py \
--CA \
@@ -21,6 +21,8 @@ AtlasG4_tf.py \
--maxEvents '10' \
--skipEvents '0' \
--randomSeed '10' \
+--postExec 'with open("ConfigSimCA.pkl", "wb") as f: cfg.store(f)' \
+--truthStrategy 'MC15aPlus' \
--imf False
rc=$?
@@ -29,8 +31,22 @@ echo "art-result: $rc G4AtlasAlg_AthenaCA"
rc2=-9999
if [ $rc -eq 0 ]
then
- ArtPackage=$1
- ArtJobName=$2
+ AtlasG4_tf.py \
+ --conditionsTag 'OFLCOND-RUN12-SDR-19' \
+ --physicsList 'FTFP_BERT' \
+ --postInclude 'default:PyJobTransforms/UseFrontier.py' \
+ --preInclude 'SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' \
+ --DataRunNumber '222525' \
+ --geometryVersion 'ATLAS-R2-2015-03-01-00' \
+ --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/e_E50_eta34_49.EVNT.pool.root" \
+ --outputHITSFile "test.NEW.HITS.pool.root" \
+ --maxEvents '10' \
+ --skipEvents '0' \
+ --randomSeed '10' \
+ --truthStrategy 'MC15aPlus' \
+ --imf False \
+ --athenaopts '"--config-only=ConfigSimCG.pkl"'
+
AtlasG4_tf.py \
--conditionsTag 'OFLCOND-RUN12-SDR-19' \
--physicsList 'FTFP_BERT' \
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FtfpBertAtlTest_OldvsNew.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FtfpBertAtlTest_CGvsCA.sh
similarity index 69%
rename from Simulation/Tests/SimCoreTests/test/test_AtlasG4_FtfpBertAtlTest_OldvsNew.sh
rename to Simulation/Tests/SimCoreTests/test/test_AtlasG4_FtfpBertAtlTest_CGvsCA.sh
index a166d31f35ad..b06fc8e76bb0 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FtfpBertAtlTest_OldvsNew.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FtfpBertAtlTest_CGvsCA.sh
@@ -4,9 +4,9 @@
# art-include: master/Athena
# art-include: master/AthSimulation
# art-type: grid
-# art-output: test.OLD.HITS.pool.root
-# art-output: test.NEW.HITS.pool.root
-# art-output: log.G4AtlasAlg*
+# art-output: test.*.HITS.pool.root
+# art-output: log.*
+# art-output: Config*.pkl
AtlasG4_tf.py \
--CA \
@@ -20,6 +20,8 @@ AtlasG4_tf.py \
--maxEvents '10' \
--skipEvents '0' \
--randomSeed '10' \
+--truthStrategy 'MC15aPlus' \
+--postExec 'with open("ConfigSimCA.pkl", "wb") as f: cfg.store(f)' \
--imf False
rc=$?
@@ -28,8 +30,21 @@ echo "art-result: $rc G4AtlasAlg_AthenaCA"
rc2=-9999
if [ $rc -eq 0 ]
then
- ArtPackage=$1
- ArtJobName=$2
+ AtlasG4_tf.py \
+ --conditionsTag 'OFLCOND-RUN12-SDR-19' \
+ --physicsList 'FTFP_BERT_ATL' \
+ --postInclude 'default:PyJobTransforms/UseFrontier.py' \
+ --DataRunNumber '222525' \
+ --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
+ --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/J2_jetjet-pythia6-7000.evgen.pool.root' \
+ --outputHITSFile "test.OLD.HITS.pool.root" \
+ --maxEvents '10' \
+ --skipEvents '0' \
+ --randomSeed '10' \
+ --truthStrategy 'MC15aPlus' \
+ --imf False \
+ --athenaopts '"--config-only=ConfigSimCG.pkl"'
+
AtlasG4_tf.py \
--conditionsTag 'OFLCOND-RUN12-SDR-19' \
--physicsList 'FTFP_BERT_ATL' \
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_QgsBicTest_CGvsCA.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_QgsBicTest_CGvsCA.sh
new file mode 100755
index 000000000000..942571cf4f23
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_QgsBicTest_CGvsCA.sh
@@ -0,0 +1,72 @@
+#!/bin/sh
+#
+# art-description: Run simulation outside ISF, with alternative QGS_BIC physics list, reading in SU3 SUSY events, using 2015 geometry and conditions
+# art-include: master/Athena
+# art-include: master/AthSimulation
+# art-type: grid
+# art-output: test.*.HITS.pool.root
+# art-output: log.*
+# art-output: Config*.pkl
+
+AtlasG4_tf.py \
+--CA \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/susy_SU3-herwigpp-7000.evgen.pool.root' \
+--outputHITSFile 'test.NEW.HITS.pool.root' \
+--maxEvents '5' \
+--skipEvents '0' \
+--randomSeed '42' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--DataRunNumber '222525' \
+--physicsList 'QGSP_BIC' \
+--postInclude 'PyJobTransforms.TransformUtils.UseFrontier' \
+--truthStrategy 'MC15aPlus' \
+--postExec 'with open("ConfigSimCA.pkl", "wb") as f: cfg.store(f)' \
+--imf False
+
+rc=$?
+mv log.AtlasG4Tf log.G4AtlasAlg_AthenaCA
+echo "art-result: $rc G4AtlasAlg_AthenaCA"
+rc2=-9999
+if [ $rc -eq 0 ]
+then
+ AtlasG4_tf.py \
+ --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/susy_SU3-herwigpp-7000.evgen.pool.root' \
+ --outputHITSFile 'test.OLD.HITS.pool.root' \
+ --maxEvents '5' \
+ --skipEvents '0' \
+ --randomSeed '42' \
+ --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+ --conditionsTag 'OFLCOND-RUN12-SDR-19' \
+ --DataRunNumber '222525' \
+ --physicsList 'QGSP_BIC' \
+ --postInclude 'PyJobTransforms/UseFrontier.py' \
+ --truthStrategy 'MC15aPlus' \
+ --imf False \
+ --athenaopts '"--config-only=ConfigSimCG.pkl"'
+
+ AtlasG4_tf.py \
+ --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/susy_SU3-herwigpp-7000.evgen.pool.root' \
+ --outputHITSFile 'test.OLD.HITS.pool.root' \
+ --maxEvents '5' \
+ --skipEvents '0' \
+ --randomSeed '42' \
+ --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+ --conditionsTag 'OFLCOND-RUN12-SDR-19' \
+ --DataRunNumber '222525' \
+ --physicsList 'QGSP_BIC' \
+ --postInclude 'PyJobTransforms/UseFrontier.py' \
+ --truthStrategy 'MC15aPlus' \
+ --imf False
+ mv log.AtlasG4Tf log.G4AtlasAlg_AthenaCA_OLD
+ rc2=$?
+
+fi
+echo "art-result: $rc2 G4AtlasAlg_AthenaCA_OLD"
+rc4=-9999
+if [ $rc2 -eq 0 ]
+then
+ acmd.py diff-root test.OLD.HITS.pool.root test.NEW.HITS.pool.root --error-mode resilient --mode=semi-detailed --order-trees --ignore-leaves RecoTimingObj_p1_AtlasG4Tf_timings index_ref
+ rc4=$?
+fi
+echo "art-result: $rc4 FullG4MT_OLDvsCA"
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_QgsBicTest_OldvsNew.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_QgsBicTest_OldvsNew.sh
deleted file mode 100755
index 45b242495aef..000000000000
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_QgsBicTest_OldvsNew.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-#
-# art-description: Run simulation outside ISF, with alternative QGS_BIC physics list, reading in SU3 SUSY events, using 2015 geometry and conditions
-# art-include: 21.0/Athena
-# art-include: 21.0/AthSimulation
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-# art-include: master/Athena
-# art-include: master/AthSimulation
-# art-type: grid
-# art-output: test.HITS.pool.root
-
-AtlasG4_tf.py \
---CA \
---inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/susy_SU3-herwigpp-7000.evgen.pool.root' \
---outputHITSFile 'test.NEW.HITS.pool.root' \
---maxEvents '5' \
---skipEvents '0' \
---randomSeed '42' \
---geometryVersion 'ATLAS-R2-2015-03-01-00' \
---conditionsTag 'OFLCOND-RUN12-SDR-19' \
---DataRunNumber '222525' \
---physicsList 'QGSP_BIC' \
---postInclude 'PyJobTransforms.TransformUtils.UseFrontier' \
---imf False
-
-rc=$?
-mv log.AtlasG4Tf log.G4AtlasAlg_AthenaCA
-echo "art-result: $rc G4AtlasAlg_AthenaCA"
-rc2=-9999
-if [ $rc -eq 0 ]
-then
- ArtPackage=$1
- ArtJobName=$2
- AtlasG4_tf.py \
- --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/susy_SU3-herwigpp-7000.evgen.pool.root' \
- --outputHITSFile 'test.OLD.HITS.pool.root' \
- --maxEvents '5' \
- --skipEvents '0' \
- --randomSeed '42' \
- --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
- --conditionsTag 'OFLCOND-RUN12-SDR-19' \
- --DataRunNumber '222525' \
- --physicsList 'QGSP_BIC' \
- --postInclude 'PyJobTransforms/UseFrontier.py' \
- --truthStrategy 'MC15aPlus' \
- --imf False
- mv log.AtlasG4Tf log.G4AtlasAlg_AthenaCA_OLD
- rc2=$?
-
-fi
-echo "art-result: $rc2 G4AtlasAlg_AthenaCA_OLD"
-rc4=-9999
-if [ $rc2 -eq 0 ]
-then
- acmd.py diff-root test.OLD.HITS.pool.root test.NEW.HITS.pool.root --error-mode resilient --mode=semi-detailed --order-trees --ignore-leaves RecoTimingObj_p1_AtlasG4Tf_timings index_ref
- rc4=$?
-fi
-echo "art-result: $rc4 FullG4MT_OLDvsCA"
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ttbar_OldvsNew.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ttbar_CGvsCA.sh
similarity index 70%
rename from Simulation/Tests/SimCoreTests/test/test_AtlasG4_ttbar_OldvsNew.sh
rename to Simulation/Tests/SimCoreTests/test/test_AtlasG4_ttbar_CGvsCA.sh
index 78263f84940e..a386fc974de1 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ttbar_OldvsNew.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ttbar_CGvsCA.sh
@@ -7,6 +7,7 @@
# art-output: log.*
# art-output: test.OLD.HITS.pool.root
# art-output: test.NEW.HITS.pool.root
+# art-output: Config*.pkl
AtlasG4_tf.py \
--CA \
@@ -20,6 +21,7 @@ AtlasG4_tf.py \
--inputEVNTFile "/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" \
--outputHITSFile "test.NEW.HITS.pool.root" \
--maxEvents 1 \
+--postExec 'with open("ConfigSimCA.pkl", "wb") as f: cfg.store(f)' \
--imf False
rc=$?
@@ -28,8 +30,6 @@ echo "art-result: $rc G4AtlasAlg_AthenaCA"
rc2=-9999
if [ $rc -eq 0 ]
then
- ArtPackage=$1
- ArtJobName=$2
AtlasG4_tf.py \
--conditionsTag 'default:OFLCOND-MC16-SDR-14' \
--physicsList 'FTFP_BERT_ATL' \
@@ -40,6 +40,21 @@ then
--DataRunNumber '284500' \
--geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
--inputEVNTFile "/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" \
+ --outputHITSFile "test.NEW.HITS.pool.root" \
+ --maxEvents 1 \
+ --imf False \
+ --athenaopts '"--config-only=ConfigSimCG.pkl"'
+
+ AtlasG4_tf.py \
+ --conditionsTag 'default:OFLCOND-MC16-SDR-14' \
+ --physicsList 'FTFP_BERT_ATL' \
+ --truthStrategy 'MC15aPlus' \
+ --postInclude 'default:PyJobTransforms/UseFrontier.py' \
+ --preInclude 'AtlasG4Tf:SimulationJobOptions/preInclude.BeamPipeKill.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' \
+ --preExec 'AtlasG4Tf:simFlags.TightMuonStepping=True' \
+ --DataRunNumber '284500' \
+ --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
+ --inputEVNTFile "/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" \
--outputHITSFile "test.OLD.HITS.pool.root" \
--maxEvents 1 \
--imf False
--
GitLab
From 0f7a31b80ea74257d25b46043b6aab2efc3cb266 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Fri, 13 Aug 2021 18:11:53 +0200
Subject: [PATCH 033/272] TrigBunchCrossingTool: delete obsolete/unused
D3PDBunchCrossingTool
Delete obsolete `D3PDBunchCrossingTool`. Also delete two unused headers
files.
---
.../TrigBunchCrossingTool/CMakeLists.txt | 18 +-
.../Root/BunchCrossingToolBase.cxx | 3 +-
.../Root/D3PDBunchCrossingTool.cxx | 634 ------------------
.../Root/binary_compose.h | 83 ---
.../Root/unary_compose.h | 77 ---
.../D3PDBunchCrossingTool.h | 141 ----
.../python/BunchCrossingTool.py | 50 +-
.../TrigBunchCrossingTool_entries.cxx | 4 +-
8 files changed, 9 insertions(+), 1001 deletions(-)
delete mode 100644 Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/D3PDBunchCrossingTool.cxx
delete mode 100644 Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/binary_compose.h
delete mode 100644 Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/unary_compose.h
delete mode 100644 Trigger/TrigAnalysis/TrigBunchCrossingTool/TrigBunchCrossingTool/D3PDBunchCrossingTool.h
diff --git a/Trigger/TrigAnalysis/TrigBunchCrossingTool/CMakeLists.txt b/Trigger/TrigAnalysis/TrigBunchCrossingTool/CMakeLists.txt
index 834dee0deff3..eecf58ac891a 100644
--- a/Trigger/TrigAnalysis/TrigBunchCrossingTool/CMakeLists.txt
+++ b/Trigger/TrigAnalysis/TrigBunchCrossingTool/CMakeLists.txt
@@ -1,37 +1,32 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigBunchCrossingTool )
# External dependencies:
find_package( CORAL QUIET COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( ROOT COMPONENTS Net Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
if( XAOD_STANDALONE )
atlas_add_library( TrigBunchCrossingTool
TrigBunchCrossingTool/*.h Root/*.h Root/*.cxx
- Root/json/*.h Root/json/*.inl
PUBLIC_HEADERS TrigBunchCrossingTool
LINK_LIBRARIES AsgTools TrigAnalysisInterfaces
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} xAODEventInfo
- xAODTrigger TrigConfL1Data TrigConfInterfaces )
+ PRIVATE_LINK_LIBRARIES xAODTrigger TrigConfL1Data TrigConfInterfaces )
else()
atlas_add_library( TrigBunchCrossingToolLib
TrigBunchCrossingTool/*.h
INTERFACE
PUBLIC_HEADERS TrigBunchCrossingTool
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools TrigAnalysisInterfaces TrigConfInterfaces )
+ LINK_LIBRARIES AsgTools TrigAnalysisInterfaces TrigConfInterfaces )
atlas_add_component( TrigBunchCrossingTool
TrigBunchCrossingTool/*.h src/*.cxx Root/*.h Root/*.cxx
Root/json/*.h Root/json/*.inl
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
+ INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
LINK_LIBRARIES ${CORAL_LIBRARIES} AthenaKernel AthenaPoolUtilities CxxUtils
- GaudiKernel TrigBunchCrossingToolLib TrigConfL1Data xAODEventInfo xAODTrigger )
+ GaudiKernel TrigBunchCrossingToolLib TrigConfL1Data xAODTrigger )
endif()
atlas_add_test( ut_static_bunch_tool_test
@@ -42,8 +37,7 @@ atlas_add_test( ut_static_bunch_tool_test
Root/BunchCrossingToolBase.cxx
Root/StaticBunchCrossingTool.cxx
Root/count_bunch_neighbors.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODEventInfo xAODTrigger
+ LINK_LIBRARIES AsgTools xAODTrigger
TrigConfL1Data TrigAnalysisInterfaces )
# Install files from the package:
diff --git a/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/BunchCrossingToolBase.cxx b/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/BunchCrossingToolBase.cxx
index 5b7c21240f8d..339a42c0c93b 100644
--- a/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/BunchCrossingToolBase.cxx
+++ b/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/BunchCrossingToolBase.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// STL include(s):
@@ -9,7 +9,6 @@
// Local include(s):
#include "TrigBunchCrossingTool/BunchCrossingToolBase.h"
-#include "unary_compose.h"
#include "SetPrint.h"
#include "count_bunch_neighbors.h"
diff --git a/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/D3PDBunchCrossingTool.cxx b/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/D3PDBunchCrossingTool.cxx
deleted file mode 100644
index e6c377795b3e..000000000000
--- a/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/D3PDBunchCrossingTool.cxx
+++ /dev/null
@@ -1,634 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: D3PDBunchCrossingTool.cxx 618313 2014-09-24 10:05:46Z krasznaa $
-
-// ROOT include(s):
-#include "TTree.h"
-#include "TChain.h"
-#include "TBranch.h"
-
-// Local include(s):
-#include "TrigBunchCrossingTool/D3PDBunchCrossingTool.h"
-
-namespace Trig {
-
- D3PDBunchCrossingTool::D3PDBunchCrossingTool( const std::string& name )
- : BunchCrossingToolBase( name ),
- m_configLoaded( false ), m_currentID( 0 ),
- m_validConfig( false ) {
-
- }
-
- /**
- * This function should be called whenever a new file is opened by the
- * analysis code. It reads in all the information from the metadata TTree
- * into memory in one go, so the users can access the metadata tree however
- * they want after the function is finished.
- *
- * @param metaTree Pointer to the metadata tree holding the bunch
- * configuration
- * @param clearCache If set to <code>true</code> (default value) then the
- * already known configurations are forgotten by the tool.
- * This is good practice in general to keep the memory
- * consumption of the tool low in a big job.
- * @returns <code>StatusCode::SUCCESS</code> if the caching was successful,
- * or <code>StatusCode::FAILURE</code> otherwise
- */
- StatusCode D3PDBunchCrossingTool::cacheConfig( ::TTree* metaTree,
- bool clearCache ) {
-
- // Do a very simple sanity check:
- if( ! metaTree ) {
- ATH_MSG_ERROR( "Function called with null-pointer!" );
- return StatusCode::FAILURE;
- }
-
- // Decide which version of the metadata we have available:
- if( metaTree->GetBranch( "ConfigID" ) &&
- metaTree->GetBranch( "FilledBunches" ) &&
- metaTree->GetBranch( "BunchIntensities" ) ) {
-
- ATH_CHECK( cacheConfigV1( metaTree, clearCache ) );
- return StatusCode::SUCCESS;
-
- } else if( metaTree->GetBranch( "ConfigID" ) &&
- metaTree->GetBranch( "FilledBunches" ) &&
- metaTree->GetBranch( "FilledBunchIntBeam1" ) &&
- metaTree->GetBranch( "FilledBunchIntBeam2" ) &&
- metaTree->GetBranch( "UnpairedBeam1" ) &&
- metaTree->GetBranch( "UnpairedBeam2" ) &&
- metaTree->GetBranch( "UnpairedIntBeam1" ) &&
- metaTree->GetBranch( "UnpairedIntBeam2" ) ) {
-
- ATH_CHECK( cacheConfigV2( metaTree, clearCache ) );
- return StatusCode::SUCCESS;
- }
-
- // This is an unknown TTree format:
- ATH_MSG_ERROR( "Didn't recognize the format of the metadata tree" );
- return StatusCode::FAILURE;
- }
-
- /**
- * This function should be called whenever processing a new D3PD event. It
- * tries to be as smart as possible, to do as little as possible. So it
- * should be safe to call it in every event.
- *
- * You should yourself read the configuration ID from the event information
- * in the D3PD, and pass that to this function.
- *
- * Of course you should also not forget about caching the configurations of
- * the current file using <code>cacheConfig(...)</code>.
- *
- * @param configID The configuration ID of the current event
- * @returns <code>StatusCode::SUCCESS</code> if the loading of the
- * configuration was successful, or
- * <code>StatusCode::FAILURE</code> otherwise
- */
- StatusCode D3PDBunchCrossingTool::loadConfig( UInt_t configID ) {
-
- // Check whether we already have this configuration loaded:
- if( ( configID == m_currentID ) && m_configLoaded ) {
- ATH_MSG_VERBOSE( "Configuration key already loaded: " << configID );
- return StatusCode::SUCCESS;
- }
-
- // Search for this configuration in the cache:
- std::map< UInt_t, BunchConfig >::const_iterator conf_itr;
- if( ( conf_itr = m_cache.find( configID ) ) == m_cache.end() ) {
- ATH_MSG_ERROR( "Configuration ID " << configID << " not known!" );
- ATH_MSG_ERROR( "Did you call \"cacheConfig(...)\" on the new files?" );
- return StatusCode::FAILURE;
- }
-
- // Let the user know what we're doing:
- ATH_MSG_DEBUG( "Loading the configuration with key: " << configID );
-
- // Check if the cached information makes sense for the filled bunches:
- if( ( conf_itr->second.filledIntBeam1.size() &&
- ( conf_itr->second.filledBCIDs.size() !=
- conf_itr->second.filledIntBeam1.size() ) ) ||
- ( conf_itr->second.filledIntBeam2.size() &&
- ( conf_itr->second.filledBCIDs.size() !=
- conf_itr->second.filledIntBeam2.size() ) ) ) {
- ATH_MSG_WARNING( "Infortmation about the filled bunches is "
- << "invalid for config ID: " << configID );
- m_configLoaded = true;
- m_validConfig = false;
- return StatusCode::SUCCESS;
- }
-
- // Check if the cached information makes sense for the unpaired bunches:
- if( ( conf_itr->second.unpairedIntBeam1.size() &&
- ( conf_itr->second.unpairedBCIDsBeam1.size() !=
- conf_itr->second.unpairedIntBeam1.size() ) ) ||
- ( conf_itr->second.unpairedIntBeam2.size() &&
- ( conf_itr->second.unpairedBCIDsBeam2.size() !=
- conf_itr->second.unpairedIntBeam2.size() ) ) ) {
- ATH_MSG_WARNING( "Infortmation about the unpaired bunches is "
- << "invalid for config ID: " << configID );
- m_configLoaded = true;
- m_validConfig = false;
- return StatusCode::SUCCESS;
- }
-
- // Let the base class load this configuration:
- ATH_CHECK( loadSingleBunches( conf_itr->second.filledBCIDs,
- conf_itr->second.filledIntBeam1,
- conf_itr->second.filledIntBeam2 ) );
- ATH_CHECK( loadBunchTrains( conf_itr->second.filledBCIDs,
- conf_itr->second.filledIntBeam1,
- conf_itr->second.filledIntBeam2 ) );
- ATH_CHECK( loadUnpairedBunches( conf_itr->second.unpairedBCIDsBeam1,
- conf_itr->second.unpairedBCIDsBeam2,
- conf_itr->second.unpairedIntBeam1,
- conf_itr->second.unpairedIntBeam2 ) );
-
- // Remember what we just did:
- m_currentID = configID;
- m_validConfig = true;
- m_configLoaded = true;
-
- // Print the configuration to give some feedback to the user:
- ATH_MSG_INFO( "Loaded configuration key " << m_currentID );
- printConfig();
-
- // Return gracefully:
- return StatusCode::SUCCESS;
- }
-
- /**
- * This function can be used to figure out if a given configuration is
- * available to the tool currently. It is mostly used by the Athena version
- * of the tool to decide when to read in new metadata.
- *
- * @param configID The configuration ID that is to be checked
- * @returns <code>true</code> if the configuration is available,
- * <code>false</code> if it's not
- */
- bool D3PDBunchCrossingTool::isAvailable( UInt_t configID ) const {
-
- return ( m_cache.find( configID ) != m_cache.end() );
- }
-
- /**
- * Function re-implemented to give meaningful answers for non-pileup MC files
- * as well.
- */
- bool D3PDBunchCrossingTool::isFilled( bcid_type bcid ) const {
-
- if( ! m_validConfig ) return true;
- else return BunchCrossingToolBase::isFilled( bcid );
- }
-
- /**
- * Function re-implemented to give meaningful answers for non-pileup MC files
- * as well.
- */
- bool D3PDBunchCrossingTool::isInTrain( bcid_type bcid ) const {
-
- if( ! m_validConfig ) return false;
- else return BunchCrossingToolBase::isInTrain( bcid );
- }
-
- /**
- * Function re-implemented to give meaningful answers for non-pileup MC files
- * as well.
- */
- bool D3PDBunchCrossingTool::isUnpaired( bcid_type bcid ) const {
-
- if( ! m_validConfig ) return false;
- else return BunchCrossingToolBase::isUnpaired( bcid );
- }
-
- /**
- * Function re-implemented to give meaningful answers for non-pileup MC files
- * as well.
- */
- bool D3PDBunchCrossingTool::isBeam1( bcid_type bcid ) const {
-
- if( ! m_validConfig ) return false;
- else return BunchCrossingToolBase::isBeam1( bcid );
- }
-
- /**
- * Function re-implemented to give meaningful answers for non-pileup MC files
- * as well.
- */
- bool D3PDBunchCrossingTool::isBeam2( bcid_type bcid ) const {
-
- if( ! m_validConfig ) return false;
- else return BunchCrossingToolBase::isBeam2( bcid );
- }
-
- /**
- * Function re-implemented to give meaningful answers for non-pileup MC files
- * as well.
- */
- float D3PDBunchCrossingTool::bcIntensity( bcid_type bcid,
- BeamType type ) const {
-
- if( ! m_validConfig ) return 1.0;
- else return BunchCrossingToolBase::bcIntensity( bcid, type );
- }
-
- /**
- * Function re-implemented to give meaningful answers for non-pileup MC files
- * as well.
- */
- IBunchCrossingTool::BunchCrossingType
- D3PDBunchCrossingTool::bcType( bcid_type bcid ) const {
-
- if( ! m_validConfig ) return Single;
- else return BunchCrossingToolBase::bcType( bcid );
- }
-
- /**
- * Function re-implemented to give meaningful answers for non-pileup MC files
- * as well.
- */
- std::vector< bool >
- D3PDBunchCrossingTool::bunchesInFront( bcid_type bcid,
- int bunches ) const {
-
- if( ! m_validConfig ) {
- std::vector< bool > result;
- result.push_back( true );
- for( int i = 0; i < bunches - 1; ++i ) {
- result.push_back( false );
- }
- return result;
- } else {
- return BunchCrossingToolBase::bunchesInFront( bcid, bunches );
- }
- }
-
- /**
- * Function re-implemented to give meaningful answers for non-pileup MC files
- * as well.
- */
- std::vector< bool >
- D3PDBunchCrossingTool::bunchesAfter( bcid_type bcid,
- int bunches ) const {
-
- if( ! m_validConfig ) {
- std::vector< bool > result;
- result.push_back( true );
- for( int i = 0; i < bunches - 1; ++i ) {
- result.push_back( false );
- }
- return result;
- } else {
- return BunchCrossingToolBase::bunchesAfter( bcid, bunches );
- }
- }
-
- /**
- * Function re-implemented to give meaningful answers for non-pileup MC files
- * as well.
- */
- std::vector< float >
- D3PDBunchCrossingTool::bunchIntInFront( bcid_type bcid,
- int bunches,
- BeamType type ) const {
-
- if( ! m_validConfig ) {
- std::vector< float > result;
- result.push_back( 1.0 );
- for( int i = 0; i < bunches - 1; ++i ) {
- result.push_back( 0.0 );
- }
- return result;
- } else {
- return BunchCrossingToolBase::bunchIntInFront( bcid, bunches, type );
- }
- }
-
- /**
- * Function re-implemented to give meaningful answers for non-pileup MC files
- * as well.
- */
- std::vector< float >
- D3PDBunchCrossingTool::bunchIntAfter( bcid_type bcid,
- int bunches,
- BeamType type ) const {
-
- if( ! m_validConfig ) {
- std::vector< float > result;
- result.push_back( 1.0 );
- for( int i = 0; i < bunches - 1; ++i ) {
- result.push_back( 0.0 );
- }
- return result;
- } else {
- return BunchCrossingToolBase::bunchIntAfter( bcid, bunches, type );
- }
- }
-
- /**
- * Function re-implemented to give meaningful answers for non-pileup MC files
- * as well.
- */
- int D3PDBunchCrossingTool::gapBeforeBunch( bcid_type bcid,
- BunchDistanceType dtype,
- BunchFillType ftype ) const {
-
- if( ! m_validConfig ) return -1;
- else return BunchCrossingToolBase::gapBeforeBunch( bcid, dtype, ftype );
- }
-
- /**
- * Function re-implemented to give meaningful answers for non-pileup MC files
- * as well.
- */
- int D3PDBunchCrossingTool::gapAfterBunch( bcid_type bcid,
- BunchDistanceType dtype,
- BunchFillType ftype ) const {
-
- if( ! m_validConfig ) return -1;
- else return BunchCrossingToolBase::gapAfterBunch( bcid, dtype, ftype );
- }
-
- /**
- * In case the tool is not configured correctly (we're processing a
- * non-pileup MC file) it should not report 0 filled bunches, but 1. The
- * override of this function makes sure that this is what happens...
- */
- unsigned int D3PDBunchCrossingTool::numberOfFilledBunches() const {
-
- if( ! m_validConfig ) return 1;
- else return BunchCrossingToolBase::numberOfFilledBunches();
- }
-
- StatusCode D3PDBunchCrossingTool::cacheConfigV1( ::TTree* metaTree,
- bool clearCache ) {
-
- // Do a very simple sanity check:
- if( ! metaTree ) {
- ATH_MSG_ERROR( "Function called with null-pointer!" );
- return StatusCode::FAILURE;
- }
-
- // Let the user know what we're doing:
- ATH_MSG_DEBUG( "Caching configuration..." );
-
- // The variables that should be connected to the branches:
- UInt_t configID;
- std::vector< int >* confFilledBCIDs = 0;
- std::vector< float >* confFilledIntensities = 0;
- std::vector< int >* confUnpairedBCIDs = 0;
- std::vector< float >* confUnpairedIntensities = 0;
-
- // Check if the specified TTree has all the needed branches:
- if( ( ! metaTree->GetBranch( "ConfigID" ) ) ||
- ( ! metaTree->GetBranch( "FilledBunches" ) ) ||
- ( ! metaTree->GetBranch( "BunchIntensities" ) ) ) {
- ATH_MSG_ERROR( "The supplied TTree doesn't seem to be a bunch "
- "configuration metadata tree" );
- return StatusCode::FAILURE;
- }
-
- // Check if the specified TTree has he unpaired branches:
- bool hasUnpairedInfo = true;
- if( ( ! metaTree->GetBranch( "UnpairedBunches" ) ) ||
- ( ! metaTree->GetBranch( "UnpairedBunchIntensities" ) ) ) {
- ATH_MSG_DEBUG( "The supplied TTree doesn't seem to hold the unpaired "
- << "bunch configuration branches" );
- hasUnpairedInfo = false;
- }
-
- // Connect all the required branches:
- TBranch* b_configID = 0;
- TBranch* b_confFilledBCIDs = 0;
- TBranch* b_confFilledIntensities = 0;
- if( metaTree->SetBranchAddress( "ConfigID", &configID, &b_configID ) ||
- metaTree->SetBranchAddress( "FilledBunches", &confFilledBCIDs,
- &b_confFilledBCIDs ) ||
- metaTree->SetBranchAddress( "BunchIntensities",
- &confFilledIntensities,
- &b_confFilledIntensities ) ) {
- ATH_MSG_ERROR( "Couldn't connect variables to the metadata tree "
- "branches" );
- return StatusCode::FAILURE;
- }
- TBranch* b_confUnpairedBCIDs = 0;
- TBranch* b_confUnpairedIntensities = 0;
- if( hasUnpairedInfo ) {
- b_confUnpairedBCIDs = 0;
- b_confUnpairedIntensities = 0;
- if( metaTree->SetBranchAddress( "UnpairedBunches", &confUnpairedBCIDs,
- &b_confUnpairedBCIDs ) ||
- metaTree->SetBranchAddress( "UnpairedBunchIntensities",
- &confUnpairedIntensities,
- &b_confUnpairedIntensities ) ) {
- ATH_MSG_ERROR( "Couldn't connect variables to the metadata tree "
- "branches" );
- return StatusCode::FAILURE;
- }
- }
-
- // Clear the cache:
- if( clearCache ) {
- m_cache.clear();
- m_configLoaded = false;
- m_currentID = 0;
- m_validConfig = false;
- }
-
- // Decide whether the TTree is actually a TChain:
- TChain* metaChain = dynamic_cast< TChain* >( metaTree );
-
- // Cache all the configurations:
- for( Int_t i = 0; i < metaTree->GetEntries(); ++i ) {
-
- // The entry to load:
- Long64_t entry = i;
- if( metaChain ) {
- entry = metaChain->LoadTree( i );
- }
-
- // Load the configuration ID:
- b_configID->GetEntry( entry );
-
- // Skip already known configurations (can happen in case of
- // using merged files or TChains):
- if( m_cache.find( configID ) != m_cache.end() ) {
- continue;
- }
-
- // Load the rest of the entry:
- b_confFilledBCIDs->GetEntry( entry );
- b_confFilledIntensities->GetEntry( entry );
- if( hasUnpairedInfo ) {
- b_confUnpairedBCIDs->GetEntry( entry );
- b_confUnpairedIntensities->GetEntry( entry );
- }
-
- // Create the configuration:
- BunchConfig config;
- config.filledBCIDs = *confFilledBCIDs;
- config.filledIntBeam1 = *confFilledIntensities;
- if( hasUnpairedInfo ) {
- config.unpairedBCIDsBeam1 = *confUnpairedBCIDs;
- config.unpairedBCIDsBeam2 = *confUnpairedBCIDs;
- config.unpairedIntBeam1 = *confUnpairedIntensities;
- }
-
- // Now remember it:
- m_cache[ configID ] = config;
-
- ATH_MSG_VERBOSE( "Cached the configuration for config ID: "
- << configID );
- }
-
- // Disconnect and delete everything:
- b_configID->SetAddress( 0 );
- b_confFilledBCIDs->SetAddress( 0 );
- b_confFilledIntensities->SetAddress( 0 );
- delete confFilledBCIDs; delete confFilledIntensities;
- if( hasUnpairedInfo ) {
- b_confUnpairedBCIDs->SetAddress( 0 );
- b_confUnpairedIntensities->SetAddress( 0 );
- delete confUnpairedBCIDs; delete confUnpairedIntensities;
- }
-
- // Return gracefully:
- return StatusCode::SUCCESS;
- }
-
- StatusCode D3PDBunchCrossingTool::cacheConfigV2( ::TTree* metaTree,
- bool clearCache ) {
-
- // Do a very simple sanity check:
- if( ! metaTree ) {
- ATH_MSG_ERROR( "Function called with null-pointer!" );
- return StatusCode::FAILURE;
- }
-
- // Let the user know what we're doing:
- ATH_MSG_DEBUG( "Caching configuration..." );
-
- // The variables that should be connected to the branches:
- UInt_t configID;
- std::vector< int >* confFilledBCIDs = 0;
- std::vector< float >* confFilledIntBeam1 = 0;
- std::vector< float >* confFilledIntBeam2 = 0;
- std::vector< int >* confUnpairedBeam1 = 0;
- std::vector< int >* confUnpairedBeam2 = 0;
- std::vector< float >* confUnpairedIntBeam1 = 0;
- std::vector< float >* confUnpairedIntBeam2 = 0;
-
- ::TBranch* b_configID = 0;
- ::TBranch* b_confFilledBCIDs = 0;
- ::TBranch* b_confFilledIntBeam1 = 0;
- ::TBranch* b_confFilledIntBeam2 = 0;
- ::TBranch* b_confUnpairedBeam1 = 0;
- ::TBranch* b_confUnpairedBeam2 = 0;
- ::TBranch* b_confUnpairedIntBeam1 = 0;
- ::TBranch* b_confUnpairedIntBeam2 = 0;
-
- // Check that all branches exist:
- if( ( ! metaTree->GetBranch( "ConfigID" ) ) ||
- ( ! metaTree->GetBranch( "FilledBunches" ) ) ||
- ( ! metaTree->GetBranch( "FilledBunchIntBeam1" ) ) ||
- ( ! metaTree->GetBranch( "FilledBunchIntBeam2" ) ) ||
- ( ! metaTree->GetBranch( "UnpairedBeam1" ) ) ||
- ( ! metaTree->GetBranch( "UnpairedBeam2" ) ) ||
- ( ! metaTree->GetBranch( "UnpairedIntBeam1" ) ) ||
- ( ! metaTree->GetBranch( "UnpairedIntBeam2" ) ) ) {
-
- ATH_MSG_ERROR( "The supplied TTree doesn't seem to be a bunch "
- "configuration metadata tree" );
- return StatusCode::FAILURE;
- }
-
- // Connect all the branches:
- if( metaTree->SetBranchAddress( "ConfigID", &configID, &b_configID ) ||
- metaTree->SetBranchAddress( "FilledBunches", &confFilledBCIDs,
- &b_confFilledBCIDs ) ||
- metaTree->SetBranchAddress( "FilledBunchIntBeam1",
- &confFilledIntBeam1,
- &b_confFilledIntBeam1 ) ||
- metaTree->SetBranchAddress( "FilledBunchIntBeam2",
- &confFilledIntBeam2,
- &b_confFilledIntBeam2 ) ||
- metaTree->SetBranchAddress( "UnpairedBeam1",
- &confUnpairedBeam1,
- &b_confUnpairedBeam1 ) ||
- metaTree->SetBranchAddress( "UnpairedBeam2",
- &confUnpairedBeam2,
- &b_confUnpairedBeam2 ) ||
- metaTree->SetBranchAddress( "UnpairedIntBeam1",
- &confUnpairedIntBeam1,
- &b_confUnpairedIntBeam1 ) ||
- metaTree->SetBranchAddress( "UnpairedIntBeam2",
- &confUnpairedIntBeam2,
- &b_confUnpairedIntBeam2 ) ) {
-
- ATH_MSG_ERROR( "Couldn't connect variables to the metadata tree "
- "branches" );
- return StatusCode::FAILURE;
- }
-
- // Clear the cache:
- if( clearCache ) {
- m_cache.clear();
- m_configLoaded = false;
- m_currentID = 0;
- m_validConfig = false;
- }
-
- // Decide whether the TTree is actually a TChain:
- TChain* metaChain = dynamic_cast< TChain* >( metaTree );
-
- // Cache all the configurations:
- for( Int_t i = 0; i < metaTree->GetEntries(); ++i ) {
-
- // The entry to load:
- Long64_t entry = i;
- if( metaChain ) {
- entry = metaChain->LoadTree( i );
- }
-
- // Load the configuration ID:
- b_configID->GetEntry( entry );
-
- // Skip already known configurations (can happen in case of
- // using merged files or TChains):
- if( m_cache.find( configID ) != m_cache.end() ) {
- continue;
- }
-
- // Load the rest of the entry:
- b_confFilledBCIDs->GetEntry( entry );
- b_confFilledIntBeam1->GetEntry( entry );
- b_confFilledIntBeam2->GetEntry( entry );
- b_confUnpairedBeam1->GetEntry( entry );
- b_confUnpairedBeam2->GetEntry( entry );
- b_confUnpairedIntBeam1->GetEntry( entry );
- b_confUnpairedIntBeam2->GetEntry( entry );
-
- // Create the configuration:
- BunchConfig config;
- config.filledBCIDs = *confFilledBCIDs;
- config.filledIntBeam1 = *confFilledIntBeam1;
- config.filledIntBeam2 = *confFilledIntBeam2;
- config.unpairedBCIDsBeam1 = *confUnpairedBeam1;
- config.unpairedBCIDsBeam2 = *confUnpairedBeam2;
- config.unpairedIntBeam1 = *confUnpairedIntBeam1;
- config.unpairedIntBeam2 = *confUnpairedIntBeam2;
-
- // Now remember it:
- m_cache[ configID ] = config;
-
- ATH_MSG_VERBOSE( "Cached the configuration for config ID: "
- << configID );
- }
-
- // Return gracefully:
- return StatusCode::SUCCESS;
- }
-
-} // namespace Trig
diff --git a/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/binary_compose.h b/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/binary_compose.h
deleted file mode 100644
index bd6ff386b9a2..000000000000
--- a/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/binary_compose.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// Dear emacs, this is -*- c++ -*-
-
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: binary_compose.h 457114 2011-09-05 09:35:49Z krasznaa $
-#ifndef TRIGBUNCHCROSSINGTOOL_BINARY_COMPOSE_H
-#define TRIGBUNCHCROSSINGTOOL_BINARY_COMPOSE_H
-
-namespace Trig {
-
- /**
- * @short Function adaptor for combining function objects
- *
- * I got this function adaptor from the STL documentation, because
- * it doesn't seem to be present in recent versions of GCC.
- *
- * What it does is that if you call it with a binary function
- * "bfn( X, Y )", and two unary functions "x1( X )" and "x2( X )",
- * then internally it will evaluate as
- *
- * <code>
- * bfn( x1( X ), x2( X ) )
- * </code>
- *
- * The concept may be a bit tricky, but have a look at the STL
- * documentation...
- *
- * This class is not actually used by the code anymore, but I didn't
- * just want to throw it out, as it might come handy later on.
- *
- * @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
- *
- * $Revision: 457114 $
- * $Date: 2011-09-05 11:35:49 +0200 (Mon, 05 Sep 2011) $
- */
- template< class BinaryFunction,
- class UnaryFunction1,
- class UnaryFunction2 >
- class binary_compose {
-
- public:
- binary_compose( BinaryFunction bfn, UnaryFunction1 ufn1,
- UnaryFunction2 ufn2 )
- : m_bfn( bfn ), m_ufn1( ufn1 ), m_ufn2( ufn2 ) {}
-
- typename BinaryFunction::result_type
- operator()( const typename UnaryFunction1::argument_type& x ) {
- return m_bfn( m_ufn1( x ), m_ufn2( x ) );
- }
-
- private:
- BinaryFunction m_bfn;
- UnaryFunction1 m_ufn1;
- UnaryFunction2 m_ufn2;
- }; // class binary_compose
-
- /**
- * @short Helper function for creating binary_compose function objects
- *
- * This function is here because when you call it, you don't need
- * to explicitly specify the template parameter types. When you
- * create a binary_compose object directly, you do have to.
- *
- * @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
- *
- * $Revision: 457114 $
- * $Date: 2011-09-05 11:35:49 +0200 (Mon, 05 Sep 2011) $
- */
- template< class BinaryFunction,
- class UnaryFunction1,
- class UnaryFunction2 >
- binary_compose< BinaryFunction, UnaryFunction1, UnaryFunction2 >
- compose2( BinaryFunction bfn, UnaryFunction1 ufn1, UnaryFunction2 ufn2 ) {
-
- return binary_compose< BinaryFunction, UnaryFunction1,
- UnaryFunction2 >( bfn, ufn1, ufn2 );
- }
-
-} // namespace Trig
-
-#endif // TRIGBUNCHCROSSINGTOOL_BINARY_COMPOSE_H
diff --git a/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/unary_compose.h b/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/unary_compose.h
deleted file mode 100644
index d2c684de5648..000000000000
--- a/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/unary_compose.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// Dear emacs, this is -*- c++ -*-
-
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: unary_compose.h 457114 2011-09-05 09:35:49Z krasznaa $
-#ifndef TRIGBUNCHCROSSINGTOOL_UNARY_COMPOSE_H
-#define TRIGBUNCHCROSSINGTOOL_UNARY_COMPOSE_H
-
-namespace Trig {
-
- /**
- * @short Function adaptor for combining function objects
- *
- * I got this function adaptor from the STL documentation, because
- * it doesn't seem to be present in recent versions of GCC.
- *
- * What it does is that if you call it with two unary functions
- * "x1( X )" and "x2( Y )", this function object evaluates internally
- * as
- *
- * <code>
- * x1( x2( X ) )
- * </code>
- *
- * This can be a very useful thing to have when using the STL functionals
- * and algorithms.
- *
- * @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
- *
- * $Revision: 457114 $
- * $Date: 2011-09-05 11:35:49 +0200 (Mon, 05 Sep 2011) $
- */
- template< class UnaryFunction1,
- class UnaryFunction2 >
- class unary_compose {
-
- public:
- unary_compose( UnaryFunction1 ufn1, UnaryFunction2 ufn2 )
- : m_ufn1( ufn1 ), m_ufn2( ufn2 ) {}
-
- typename UnaryFunction1::result_type
- operator()( const typename UnaryFunction2::argument_type& x ) {
- return m_ufn1( m_ufn2( x ) );
- }
-
- private:
- UnaryFunction1 m_ufn1;
- UnaryFunction2 m_ufn2;
-
- }; // class unary_compose
-
- /**
- * @short Helper function for creating unary_compose function objects
- *
- * This function is here because when you call it, you don't need
- * to explicitly specify the template parameter types. When you
- * create a unary_compose object directly, you do have to.
- *
- * @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
- *
- * $Revision: 457114 $
- * $Date: 2011-09-05 11:35:49 +0200 (Mon, 05 Sep 2011) $
- */
- template< class UnaryFunction1,
- class UnaryFunction2 >
- unary_compose< UnaryFunction1, UnaryFunction2 >
- compose1( UnaryFunction1 ufn1, UnaryFunction2 ufn2 ) {
-
- return unary_compose< UnaryFunction1,
- UnaryFunction2 >( ufn1, ufn2 );
- }
-
-} // namespace Trig
-
-#endif // TRIGBUNCHCROSSINGTOOL_UNARY_COMPOSE_H
diff --git a/Trigger/TrigAnalysis/TrigBunchCrossingTool/TrigBunchCrossingTool/D3PDBunchCrossingTool.h b/Trigger/TrigAnalysis/TrigBunchCrossingTool/TrigBunchCrossingTool/D3PDBunchCrossingTool.h
deleted file mode 100644
index 612415ac6c92..000000000000
--- a/Trigger/TrigAnalysis/TrigBunchCrossingTool/TrigBunchCrossingTool/D3PDBunchCrossingTool.h
+++ /dev/null
@@ -1,141 +0,0 @@
-// Dear emacs, this is -*- c++ -*-
-
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: D3PDBunchCrossingTool.h 639543 2015-01-14 17:51:02Z krasznaa $
-#ifndef TRIGBUNCHCROSSINGTOOL_D3PDBUNCHCROSSINGTOOL_H
-#define TRIGBUNCHCROSSINGTOOL_D3PDBUNCHCROSSINGTOOL_H
-
-// STL include(s):
-#include <string>
-#include <map>
-#include <vector>
-
-// ROOT include(s):
-#include <Rtypes.h>
-
-// Local include(s):
-#include "TrigBunchCrossingTool/BunchCrossingToolBase.h"
-#include "TrigBunchCrossingTool/BunchConfig.h"
-
-// Forward declaration(s):
-class TTree;
-
-namespace Trig {
-
- /**
- * @short Stand-alone bunch crossing tool for processing D3PD files
- *
- * This implementation was designed to be used for processing D3PD
- * files which have the bunch configuration stored in them as
- * metadata.
- *
- * Each time you open a new D3PD file you need to call the
- * <code>cacheConfig(...)</code> function, and for each event you
- * need to call the <code>loadConfig(...)</code> function. This way
- * the tool is always configured correctly in your analysis.
- * Unfortunately unlike in Athena, there's no way of doing this
- * automatically behing the scenes in this tool...
- *
- * This tool has no Athena front-end, as it would make no sense.
- *
- * @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
- *
- * $Revision: 639543 $
- * $Date: 2015-01-14 18:51:02 +0100 (Wed, 14 Jan 2015) $
- */
- class D3PDBunchCrossingTool : public BunchCrossingToolBase {
-
- /// Create a proper constructor for Athena
- ASG_TOOL_CLASS( D3PDBunchCrossingTool, Trig::IBunchCrossingTool )
-
- public:
- /// Default constructor
- D3PDBunchCrossingTool( const std::string& name =
- "D3PDBunchCrossingTool" );
-
- /// @name Function managing the configuration loaded by the tool
- /// @{
-
- /// Function caching the information out of the metadata tree
- StatusCode cacheConfig( ::TTree* metaTree, bool clearCache = true );
-
- /// Function loading a the configuration corresponding to a given
- /// configuration ID
- StatusCode loadConfig( UInt_t configID );
- /// Function checking if a given configuration key is known
- bool isAvailable( UInt_t configID ) const;
-
- /// @}
-
- /// @name Functions re-implemented from the IBunchCrossingTool interface
- /// @{
-
- /// The simplest query: Is the bunch crossing filled or not?
- virtual bool isFilled( bcid_type bcid ) const;
- /// Function deciding if a given bunch crossing is in a filled train
- virtual bool isInTrain( bcid_type bcid ) const;
- /// Function deciding if a given bunch crossing has an unpaired bunch
- virtual bool isUnpaired( bcid_type bcid ) const;
- /// Function deciding if there was a bunch from "beam 1" in this bunch crossing
- virtual bool isBeam1( bcid_type bcid ) const;
- /// Function deciding if there was a bunch from "beam 2" in this bunch crossing
- virtual bool isBeam2( bcid_type bcid ) const;
- /// Function returning the "intensity" of a given bunch crossing
- virtual float bcIntensity( bcid_type bcid,
- BeamType type = Crossing ) const;
- /// Get the type of the specific bunch crossing
- virtual BunchCrossingType bcType( bcid_type bcid ) const;
- /// Function returning whether the previous bunches were filled, and how
- virtual std::vector< bool > bunchesInFront( bcid_type bcid,
- int bunches = 10 ) const;
- /// Function returning whether the following bunches were filled, and how
- virtual std::vector< bool > bunchesAfter( bcid_type bcid,
- int bunches = 10 ) const;
- /// Function returning the intensities of the bunch crossings before the reference
- virtual std::vector< float > bunchIntInFront( bcid_type bcid,
- int bunches = 10,
- BeamType type = Crossing ) const;
- /// Function returning the intensities of the bunch crossings after the reference
- virtual std::vector< float > bunchIntAfter( bcid_type bcid,
- int bunches = 10,
- BeamType type = Crossing ) const;
- /// Gap before a particular bunch
- virtual int gapBeforeBunch( bcid_type bcid,
- BunchDistanceType dtype = NanoSec,
- BunchFillType ftype = CollidingBunch ) const;
- /// Gap after a particular bunch
- virtual int gapAfterBunch( bcid_type bcid,
- BunchDistanceType dtype = NanoSec,
- BunchFillType ftype = CollidingBunch ) const;
-
- /// Get the number of filled bunches in the current configuration
- virtual unsigned int numberOfFilledBunches() const;
-
- /// @}
-
- private:
- /// Function reading the V1 metadata format
- StatusCode cacheConfigV1( ::TTree* metaTree, bool clearCache );
- /// Function reading the V2 metadata format
- StatusCode cacheConfigV2( ::TTree* metaTree, bool clearCache );
-
- /// Cached configurations
- /// We need to be explicit about the namespace of Trig::BunchConfig,
- /// otherwise the dictionary generator fails in ROOT 5.
- std::map< UInt_t, Trig::BunchConfig > m_cache;
-
- /// Flag specifying if any configuration is loaded already
- bool m_configLoaded;
- /// The currently loaded configuration ID
- UInt_t m_currentID;
- /// Flag specifying whether we use a "valid" configuration
- bool m_validConfig;
-
- }; // class D3PDBunchCrossingTool
-
-} // namespace Trig
-
-#endif // TRIGBUNCHCROSSINGTOOL_D3PDBUNCHCROSSINGTOOL_H
diff --git a/Trigger/TrigAnalysis/TrigBunchCrossingTool/python/BunchCrossingTool.py b/Trigger/TrigAnalysis/TrigBunchCrossingTool/python/BunchCrossingTool.py
index d9f750becf65..5fdc593447f6 100644
--- a/Trigger/TrigAnalysis/TrigBunchCrossingTool/python/BunchCrossingTool.py
+++ b/Trigger/TrigAnalysis/TrigBunchCrossingTool/python/BunchCrossingTool.py
@@ -1,6 +1,5 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-# $Id: BunchCrossingTool.py 784782 2016-11-17 09:42:26Z krasznaa $
## @package BunchCrossingTool
#
@@ -9,8 +8,6 @@
#
# @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
#
-# $Revision: 784782 $
-# $Date: 2016-11-17 10:42:26 +0100 (Thu, 17 Nov 2016) $
##
# @short Function instantiating the correct type of bunch crossing tool
@@ -28,8 +25,6 @@
#
# @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
#
-# $Revision: 784782 $
-# $Date: 2016-11-17 10:42:26 +0100 (Thu, 17 Nov 2016) $
def BunchCrossingTool( type = "" ):
# Get ourselves a logger:
@@ -50,9 +45,6 @@ def BunchCrossingTool( type = "" ):
elif type == "Web":
__logger.info( "Forcing the usage of WebBunchCrossingTool" )
return WebBunchCrossingTool()
- elif type == "D3PD":
- __logger.info( "Forcing the usage of D3PDBunchCrossingTool" )
- return D3PDBunchCrossingTool()
else:
__logger.warning( "Type = " + type + " not recognized" )
__logger.warning( "Will select tool type based on global flags" )
@@ -346,43 +338,3 @@ def StaticBunchCrossingTool():
# Add the tool to ToolSvc and return it to the user:
ToolSvc += __tool
return getattr( ToolSvc, __defaultToolName )
-
-##
-# @short Function creating a default configuration for the Trig::D3PDBunchCrossingTool
-#
-# This function should be used when you read a D3PD in an Athena job. It configures
-# the D3PDBunchCrossingTool implementation to read the bunch configuration from
-# the D3PD metadata.
-#
-# @returns The default configuration of a public Trig::D3PDBunchCrossingTool
-#
-# @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
-#
-# $Revision: 784782 $
-# $Date: 2016-11-17 10:42:26 +0100 (Thu, 17 Nov 2016) $
-def D3PDBunchCrossingTool():
-
- # The default name of the tool:
- __defaultToolName = "BunchCrossingTool"
-
- # Get ourselves a logger:
- from AthenaCommon.Logging import logging
- __logger = logging.getLogger( "D3PDBunchCrossingTool" )
-
- # Check if the tool already exists. If it does, let's just return it without
- # any modifications:
- from AthenaCommon.AppMgr import ToolSvc
- if hasattr( ToolSvc, __defaultToolName ):
- return getattr( ToolSvc, __defaultToolName )
-
- # Create a new instance of the tool if it doesn't exist yet:
- from TrigBunchCrossingTool.TrigBunchCrossingToolConf import \
- Trig__D3PDBunchCrossingTool
- __tool = Trig__D3PDBunchCrossingTool( __defaultToolName )
-
- # Create a default configuration for it:
- __logger.info( "Set the default values for the D3PDBunchCrossingTool configuration" )
-
- # Add the tool to ToolSvc and return it to the user:
- ToolSvc += __tool
- return getattr( ToolSvc, __defaultToolName )
diff --git a/Trigger/TrigAnalysis/TrigBunchCrossingTool/src/components/TrigBunchCrossingTool_entries.cxx b/Trigger/TrigAnalysis/TrigBunchCrossingTool/src/components/TrigBunchCrossingTool_entries.cxx
index 6ea753ea1487..4d53b21cefaa 100644
--- a/Trigger/TrigAnalysis/TrigBunchCrossingTool/src/components/TrigBunchCrossingTool_entries.cxx
+++ b/Trigger/TrigAnalysis/TrigBunchCrossingTool/src/components/TrigBunchCrossingTool_entries.cxx
@@ -1,9 +1,8 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "TrigBunchCrossingTool/StaticBunchCrossingTool.h"
-#include "TrigBunchCrossingTool/D3PDBunchCrossingTool.h"
#include "TrigBunchCrossingTool/xAODBunchCrossingTool.h"
#include "TrigBunchCrossingTool/TrigConfBunchCrossingTool.h"
@@ -11,7 +10,6 @@
#include "../LHCBunchCrossingTool.h"
DECLARE_COMPONENT( Trig::StaticBunchCrossingTool )
-DECLARE_COMPONENT( Trig::D3PDBunchCrossingTool )
DECLARE_COMPONENT( Trig::xAODBunchCrossingTool )
DECLARE_COMPONENT( Trig::TrigConfBunchCrossingTool )
--
GitLab
From 0ddbdc14cd76fc5ba58b8d2a06a60cb1207b3f7a Mon Sep 17 00:00:00 2001
From: Masato Aoki <masato.aoki@cern.ch>
Date: Fri, 13 Aug 2021 17:58:46 +0000
Subject: [PATCH 034/272] bug fix for RPC feet-trigger definition
---
.../TrigT1MuctpiPhase1/src/MuonSectorProcessor.cxx | 1 +
.../python/L1/Config/TypeWideThresholdConfig.py | 11 +++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Trigger/TrigT1/TrigT1MuctpiPhase1/src/MuonSectorProcessor.cxx b/Trigger/TrigT1/TrigT1MuctpiPhase1/src/MuonSectorProcessor.cxx
index a2d5f702ac84..76c6589f9e2d 100644
--- a/Trigger/TrigT1/TrigT1MuctpiPhase1/src/MuonSectorProcessor.cxx
+++ b/Trigger/TrigT1/TrigT1MuctpiPhase1/src/MuonSectorProcessor.cxx
@@ -168,6 +168,7 @@ namespace LVL1MUCTPIPHASE1 {
for(const boost::property_tree::ptree::value_type &z: lut) {
std::string menuElementName = z.first;
+ if(menuElementName!="Element" && menuElementName!="BBElement")continue;
ptree ele = z.second;
auto roi1 = MuctpiXMLHelper::getIntAttribute(ele, "RoI1");
auto roi2 = MuctpiXMLHelper::getIntAttribute(ele, "RoI2");
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TypeWideThresholdConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TypeWideThresholdConfig.py
index e28999e078eb..16d1e9e77950 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TypeWideThresholdConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TypeWideThresholdConfig.py
@@ -34,8 +34,15 @@ def getConfig_MU():
confObj = odict()
confObj["exclusionLists"] = odict()
confObj["exclusionLists"]["rpcFeet"] = []
- confObj["exclusionLists"]["rpcFeet"].append( odict([("sectorName", "B31"), ("rois",[1, 2, 3, 4, 5, 6, 7, 8])]) )
- confObj["exclusionLists"]["rpcFeet"].append( odict([("sectorName", "B32"), ("rois",[1, 2, 3, 4, 5, 6, 7, 8])]) )
+ confObj["exclusionLists"]["rpcFeet"].append( odict([("sectorName", "B21"), ("rois",[8,9,10,11,16,17,18,19,20,21,22,23,28,29,30,31])]) )
+ confObj["exclusionLists"]["rpcFeet"].append( odict([("sectorName", "B22"), ("rois",[8,9,10,11,16,17,18,19,20,21,22,23,28,29,30,31])]) )
+ confObj["exclusionLists"]["rpcFeet"].append( odict([("sectorName", "B25"), ("rois",[8,9,10,11,16,17,18,19,20,21,22,23,28,29,30,31])]) )
+ confObj["exclusionLists"]["rpcFeet"].append( odict([("sectorName", "B26"), ("rois",[8,9,10,11,16,17,18,19,20,21,22,23,28,29,30,31])]) )
+ confObj["exclusionLists"]["rpcFeet"].append( odict([("sectorName", "B53"), ("rois",[8,9,10,11,16,17,18,19,20,21,22,23,28,29,30,31])]) )
+ confObj["exclusionLists"]["rpcFeet"].append( odict([("sectorName", "B54"), ("rois",[8,9,10,11,16,17,18,19,20,21,22,23,28,29,30,31])]) )
+ confObj["exclusionLists"]["rpcFeet"].append( odict([("sectorName", "B57"), ("rois",[8,9,10,11,16,17,18,19,20,21,22,23,28,29,30,31])]) )
+ confObj["exclusionLists"]["rpcFeet"].append( odict([("sectorName", "B58"), ("rois",[8,9,10,11,16,17,18,19,20,21,22,23,28,29,30,31])]) )
+
# roads from https://indico.cern.ch/event/1011425/contributions/4272884/
confObj["roads"] = odict()
--
GitLab
From 94a64f9d082778e0bb506788793379ae9e08ccc6 Mon Sep 17 00:00:00 2001
From: Peter Onyisi <ponyisi@utexas.edu>
Date: Fri, 13 Aug 2021 20:10:24 +0200
Subject: [PATCH 035/272] Some small ART fixes for DQ
---
Control/AthenaMonitoring/share/hist_diff.sh | 2 +-
.../AthenaMonitoring/share/hist_file_dump.py | 24 ++++++++++++++-----
.../test/test_run3dq_r21_aod.sh | 1 +
.../test/test_run3dq_r21_aod_mt_t8.sh | 1 +
.../test/test_run3dq_r21_esd.sh | 3 ++-
.../test/test_run3dq_r21_esd_mc.sh | 1 +
.../test/test_run3dq_r21_esd_mt.sh | 3 ++-
.../test/test_run3dq_r22_aod.sh | 1 +
.../test/test_run3dq_r22_aod_trigger.sh | 1 +
.../test/test_run3dq_r22_aod_trigger_mt.sh | 1 +
.../test/test_run3dq_r22_esd.sh | 1 +
.../test/test_run3dq_r22_esd_cosmics.sh | 1 +
.../test/test_run3dq_r22_recotf.sh | 1 +
.../test/test_run3dq_r22_recotf_rawtoall.sh | 1 +
.../test_run3dq_r22_recotf_rawtoall_mt_t2.sh | 1 +
15 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/Control/AthenaMonitoring/share/hist_diff.sh b/Control/AthenaMonitoring/share/hist_diff.sh
index 605f98e06340..db59939be678 100755
--- a/Control/AthenaMonitoring/share/hist_diff.sh
+++ b/Control/AthenaMonitoring/share/hist_diff.sh
@@ -15,7 +15,7 @@ while getopts "itx:" opt; do
;;
i )
echo "Doing fuzzy check"
- DUMPOPTS="$DUMPOPTS --no_onfile -r name"
+ DUMPOPTS="$DUMPOPTS --fuzzy_histbins --no_onfile -r name"
;;
t )
echo "Doing loose TTree check"
diff --git a/Control/AthenaMonitoring/share/hist_file_dump.py b/Control/AthenaMonitoring/share/hist_file_dump.py
index 527f62ec1bb6..fd2402b6516f 100755
--- a/Control/AthenaMonitoring/share/hist_file_dump.py
+++ b/Control/AthenaMonitoring/share/hist_file_dump.py
@@ -9,27 +9,37 @@ import zlib
import json
from PyUtils.fprint import _formatFloat
-def fixprecision(x):
+def fixprecision(x, precision=15):
import math
if not isinstance(x, float):
return x
else:
mantissa, exponent = math.frexp(x)
sm = '%.12g' % mantissa
- return _formatFloat (float(sm[:16]) * 2**exponent)
+ return _formatFloat (float(sm[:precision]) * 2**exponent)
-def jsonfixup(instr):
+def jsonfixup(instr, fuzzyarray=False):
instr = instr.Data()
j=json.loads(instr)
# the following are very subject to floating point numeric effects
+ # are doubles, keep 15 decimal digits of precision
for badkey in ('fTsumw', 'fTsumwx', 'fTsumw2', 'fTsumwx2', 'fTsumwy', 'fTsumwy2', 'fTsumwxy',
'fTsumwz', 'fTsumwz2', 'fTsumwxz', 'fTsumwyz' ):
if badkey in j:
j[badkey] = fixprecision(j[badkey])
#print(type(j["fTsumwx"]))
- for badkey in ('fSumw2',):
+ # member, digits of precision
+ arrkeys = [('fSumw2', 15)]
+ if fuzzyarray:
+ arrkeys += [('fBinEntries',15), ('fBinSumw2',15)]
+ # apply different precision for fArray depending on object type
+ if '_typename' in j and j['_typename'] in ('TH1F', 'TH2F', 'TH3F'):
+ arrkeys.append(('fArray', 6))
+ else:
+ arrkeys.append(('fArray', 15))
+ for badkey, precision in arrkeys:
if badkey in j:
- j[badkey] = [fixprecision(_) for _ in j[badkey]]
+ j[badkey] = [fixprecision(_, precision) for _ in j[badkey]]
# the following ignores small layout fluctuations in TTrees
if 'fBranches' in j:
for branch in j['fBranches']['arr']:
@@ -54,6 +64,8 @@ parser.add_argument('--no_inmem', action='store_true',
help="Don't show in memory size")
parser.add_argument('--tree_entries', action='store_true',
help="Use more robust hash of TTree branches + entries")
+parser.add_argument('--fuzzy_histbins', action='store_true',
+ help="Allow small variations in histogram bin content")
args=parser.parse_args()
ordering = args.rankorder
@@ -91,7 +103,7 @@ def dumpdir(d):
if args.tree_entries and k.GetClassName() == 'TTree':
lhash = fuzzytreehash(k)
elif args.hash:
- lhash = zlib.adler32(jsonfixup(ROOT.getjson(k)).encode())
+ lhash = zlib.adler32(jsonfixup(ROOT.getjson(k), args.fuzzy_histbins).encode())
if lhash < 0:
lhash += 2**32
else:
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r21_aod.sh b/Control/AthenaMonitoring/test/test_run3dq_r21_aod.sh
index 4b93d807ff8e..1f96575f43fa 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_r21_aod.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_r21_aod.sh
@@ -2,6 +2,7 @@
# art-description: AOD->HIST, R21 data AOD
# art-type: grid
# art-include: master/Athena
+# art-include: 22.0-mc20/Athena
# art-output: ExampleMonitorOutput.root
# art-output: log*
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r21_aod_mt_t8.sh b/Control/AthenaMonitoring/test/test_run3dq_r21_aod_mt_t8.sh
index c9f3b594da4a..a5380e33f2b8 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_r21_aod_mt_t8.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_r21_aod_mt_t8.sh
@@ -2,6 +2,7 @@
# art-description: AOD->HIST, R21 data AOD, Threads=8
# art-type: grid
# art-include: master/Athena
+# art-include: 22.0-mc20/Athena
# art-output: ExampleMonitorOutput.root
# art-output: log*
# art-athena-mt: 8
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r21_esd.sh b/Control/AthenaMonitoring/test/test_run3dq_r21_esd.sh
index 9888d80e3f01..14d2758a5ab5 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_r21_esd.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_r21_esd.sh
@@ -3,10 +3,11 @@
# art-type: grid
# art-memory: 4096
# art-include: master/Athena
+# art-include: 22.0-mc20/Athena
# art-output: ExampleMonitorOutput.root
# art-output: log*
-Run3DQTestingDriver.py --inputFiles=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/AthenaMonitoring/q431/21.0/f946/myESD.pool.root DQ.Steering.doHLTMon=False > log.HIST_Creation 2>&1
+Run3DQTestingDriver.py --inputFiles=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/AthenaMonitoring/q431/21.0/f946/myESD.pool.root DQ.Steering.doHLTMon=False IOVDb.GlobalTag=\"CONDBR2-BLKPA-RUN2-06\" > log.HIST_Creation 2>&1
echo "art-result: $? HIST_Creation"
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r21_esd_mc.sh b/Control/AthenaMonitoring/test/test_run3dq_r21_esd_mc.sh
index 174425a2d037..b660834e5be7 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_r21_esd_mc.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_r21_esd_mc.sh
@@ -3,6 +3,7 @@
# art-type: grid
# art-memory: 4096
# art-include: master/Athena
+# art-include: 22.0-mc20/Athena
# art-output: ExampleMonitorOutput.root
# art-output: log*
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r21_esd_mt.sh b/Control/AthenaMonitoring/test/test_run3dq_r21_esd_mt.sh
index f0de4e8d1ccd..7fcdfbb26f1d 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_r21_esd_mt.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_r21_esd_mt.sh
@@ -3,10 +3,11 @@
# art-type: grid
# art-memory: 4096
# art-include: master/Athena
+# art-include: 22.0-mc20/Athena
# art-output: ExampleMonitorOutput.root
# art-output: log*
-Run3DQTestingDriver.py --inputFiles=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/AthenaMonitoring/q431/21.0/f946/myESD.pool.root DQ.Steering.doHLTMon=False --threads=1 > log.HIST_Creation 2>&1
+Run3DQTestingDriver.py --inputFiles=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/AthenaMonitoring/q431/21.0/f946/myESD.pool.root DQ.Steering.doHLTMon=False IOVDb.GlobalTag=\"CONDBR2-BLKPA-RUN2-06\" --threads=1 > log.HIST_Creation 2>&1
echo "art-result: $? HIST_Creation"
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r22_aod.sh b/Control/AthenaMonitoring/test/test_run3dq_r22_aod.sh
index d50c88cb1099..c7c1e87c4478 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_r22_aod.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_r22_aod.sh
@@ -2,6 +2,7 @@
# art-description: AOD->HIST, R22 data AOD
# art-type: grid
# art-include: master/Athena
+# art-include: 22.0-mc20/Athena
# art-output: ExampleMonitorOutput.root
# art-output: log*
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger.sh b/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger.sh
index 8d24e327a9ce..9ec8123d5b52 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger.sh
@@ -3,6 +3,7 @@
# art-type: grid
# art-memory: 3072
# art-include: master/Athena
+# art-include: 22.0-mc20/Athena
# art-output: ExampleMonitorOutput.root
# art-output: log*
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger_mt.sh b/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger_mt.sh
index e33bec7d9ea1..754e8d30b662 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger_mt.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger_mt.sh
@@ -3,6 +3,7 @@
# art-type: grid
# art-memory: 3072
# art-include: master/Athena
+# art-include: 22.0-mc20/Athena
# art-output: ExampleMonitorOutput.root
# art-output: log*
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r22_esd.sh b/Control/AthenaMonitoring/test/test_run3dq_r22_esd.sh
index 072608cd8bf7..d1016a151d9c 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_r22_esd.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_r22_esd.sh
@@ -3,6 +3,7 @@
# art-type: grid
# art-memory: 4096
# art-include: master/Athena
+# art-include: 22.0-mc20/Athena
# art-output: ExampleMonitorOutput.root
# art-output: log*
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r22_esd_cosmics.sh b/Control/AthenaMonitoring/test/test_run3dq_r22_esd_cosmics.sh
index fa1dc1992a75..e258de3cf107 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_r22_esd_cosmics.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_r22_esd_cosmics.sh
@@ -3,6 +3,7 @@
# art-type: grid
# art-memory: 3072
# art-include: master/Athena
+# art-include: 22.0-mc20/Athena
# art-output: ExampleMonitorOutput.root
# art-output: log*
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r22_recotf.sh b/Control/AthenaMonitoring/test/test_run3dq_r22_recotf.sh
index f77a6de31a16..1e368a8e7ded 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_r22_recotf.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_r22_recotf.sh
@@ -3,6 +3,7 @@
# art-type: grid
# art-memory: 6144
# art-include: master/Athena
+# art-include: 22.0-mc20/Athena
# art-output: myHIST.root
# art-output: log*
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r22_recotf_rawtoall.sh b/Control/AthenaMonitoring/test/test_run3dq_r22_recotf_rawtoall.sh
index 040e7e538982..8d2718fd099e 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_r22_recotf_rawtoall.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_r22_recotf_rawtoall.sh
@@ -3,6 +3,7 @@
# art-type: grid
# art-memory: 6144
# art-include: master/Athena
+# art-include: 22.0-mc20/Athena
# art-output: myHIST.root
# art-output: log*
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r22_recotf_rawtoall_mt_t2.sh b/Control/AthenaMonitoring/test/test_run3dq_r22_recotf_rawtoall_mt_t2.sh
index 39478ee34493..fb39bd4e10c7 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_r22_recotf_rawtoall_mt_t2.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_r22_recotf_rawtoall_mt_t2.sh
@@ -3,6 +3,7 @@
# art-type: grid
# art-memory: 6144
# art-include: master/Athena
+# art-include: 22.0-mc20/Athena
# art-output: myHIST.root
# art-output: log*
# art-athena-mt: 2
--
GitLab
From da98477b4ccc9f88a79270e5bde2a0639d5a4b70 Mon Sep 17 00:00:00 2001
From: Christos Anastopoulos <christos.anastopoulos@cern.ch>
Date: Fri, 13 Aug 2021 18:19:47 +0000
Subject: [PATCH 036/272] TrigEgammaMonitoring, cppcheck and clang-tidy related
fixes
---
.../TrigEgammaMonitorAnalysisAlgorithm.cxx | 88 +++++++++----------
.../src/TrigEgammaMonitorAnalysisAlgorithm.h | 34 +++----
.../src/TrigEgammaMonitorBaseAlgorithm.cxx | 30 +++----
.../src/TrigEgammaMonitorBaseAlgorithm.h | 22 ++---
.../TrigEgammaMonitorElectronAlgorithm.cxx | 6 +-
.../src/TrigEgammaMonitorElectronAlgorithm.h | 2 +-
.../src/TrigEgammaMonitorPhotonAlgorithm.cxx | 4 +-
.../src/TrigEgammaMonitorPhotonAlgorithm.h | 2 +-
.../TrigEgammaMonitorTagAndProbeAlgorithm.cxx | 20 ++---
.../TrigEgammaMonitorTagAndProbeAlgorithm.h | 6 +-
.../src/egammaMonitorElectronAlgorithm.cxx | 8 +-
.../src/egammaMonitorPhotonAlgorithm.cxx | 4 +-
.../egammaMonitorSuperClusterAlgorithm.cxx | 2 +-
13 files changed, 114 insertions(+), 114 deletions(-)
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorAnalysisAlgorithm.cxx b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorAnalysisAlgorithm.cxx
index f4daaef835ac..bef11ddf291b 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorAnalysisAlgorithm.cxx
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorAnalysisAlgorithm.cxx
@@ -37,8 +37,8 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillLabel( const ToolHandle<GenericMoni
// *********************************************************************************
-void TrigEgammaMonitorAnalysisAlgorithm::fillEfficiencies( std::vector< std::pair< const xAOD::Egamma*, const TrigCompositeUtils::Decision * >> pairObjs,
- const TrigInfo info ) const
+void TrigEgammaMonitorAnalysisAlgorithm::fillEfficiencies( const std::vector< std::pair< const xAOD::Egamma*, const TrigCompositeUtils::Decision * >>& pairObjs,
+ const TrigInfo& info ) const
{
std::vector< std::pair< const xAOD::Egamma*, const TrigCompositeUtils::Decision * >> pair_vec;
@@ -150,10 +150,10 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillEfficiencies( std::vector< std::pai
void TrigEgammaMonitorAnalysisAlgorithm::fillEfficiency( const std::string &subgroup,
const std::string &level,
const std::string &pidword,
- const TrigInfo info,
- std::vector< std::pair< const xAOD::Egamma *, const TrigCompositeUtils::Decision* >> pairObjs,
+ const TrigInfo& info,
+ const std::vector< std::pair< const xAOD::Egamma *, const TrigCompositeUtils::Decision* >>& pairObjs,
std::vector< asg::AcceptData > acceptObjs ,
- std::string dirname ) const
+ const std::string& dirname ) const
{
@@ -288,8 +288,8 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillEfficiency( const std::string &subg
-void TrigEgammaMonitorAnalysisAlgorithm::fillDistributions( std::vector< std::pair< const xAOD::Egamma*, const TrigCompositeUtils::Decision * >> pairObjs,
- const TrigInfo info ) const
+void TrigEgammaMonitorAnalysisAlgorithm::fillDistributions( const std::vector< std::pair< const xAOD::Egamma*, const TrigCompositeUtils::Decision * >>& pairObjs,
+ const TrigInfo& info ) const
{
const std::string trigger = info.trigName;
@@ -305,7 +305,7 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillDistributions( std::vector< std::pa
auto initRois = tdt()->features<TrigRoiDescriptorCollection>(trigger,condition,"",TrigDefs::allFeaturesOfType,"initialRoI");
for( auto &initRoi: initRois ){
if( !initRoi.link.isValid() ) continue;
- auto feat = match()->getL1Feature( initRoi.source );
+ const auto *feat = match()->getL1Feature( initRoi.source );
if(feat)
l1_vec.push_back(feat);
}
@@ -367,7 +367,7 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillDistributions( std::vector< std::pa
auto initRois = tdt()->features<TrigRoiDescriptorCollection>(trigger,condition,"",TrigDefs::allFeaturesOfType,"initialRoI");
for( auto &initRoi: initRois ){
if( !initRoi.link.isValid() ) continue;
- auto feat = match()->getL1Feature( initRoi.source );
+ const auto *feat = match()->getL1Feature( initRoi.source );
if(feat)
l1_vec.push_back(feat);
}
@@ -471,7 +471,7 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillDistributions( std::vector< std::pa
-void TrigEgammaMonitorAnalysisAlgorithm::fillL1Calo( const std::string &trigger, std::vector< const xAOD::EmTauRoI* > l1_vec ) const
+void TrigEgammaMonitorAnalysisAlgorithm::fillL1Calo( const std::string &trigger, const std::vector< const xAOD::EmTauRoI* >& l1_vec ) const
{
auto monGroup = getGroup(trigger+"_Distributions_L1Calo");
@@ -484,7 +484,7 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillL1Calo( const std::string &trigger,
auto emIso_col = Monitored::Collection( "emIso" , emIso_vec );
auto hadCore_col = Monitored::Collection( "hadCore" , hadCore_vec );
- for( auto l1 : l1_vec )
+ for( const auto *l1 : l1_vec )
{
if(!l1) continue;
eta_vec.push_back( l1->eta() );
@@ -503,7 +503,7 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillL1Calo( const std::string &trigger,
-void TrigEgammaMonitorAnalysisAlgorithm::fillL2Calo(const std::string &trigger, std::vector< const xAOD::TrigEMCluster *> emCluster_vec) const
+void TrigEgammaMonitorAnalysisAlgorithm::fillL2Calo(const std::string &trigger, const std::vector< const xAOD::TrigEMCluster *>& emCluster_vec) const
{
auto monGroup = getGroup(trigger+"_Distributions_L2Calo");
@@ -513,7 +513,7 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillL2Calo(const std::string &trigger,
auto eta_col = Monitored::Collection("eta", eta_vec );
auto phi_col = Monitored::Collection("phi", phi_vec );
- for ( auto emCluster : emCluster_vec )
+ for ( const auto *emCluster : emCluster_vec )
{
if(!emCluster) continue;
et_vec.push_back( emCluster->et()/Gaudi::Units::GeV );
@@ -528,7 +528,7 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillL2Calo(const std::string &trigger,
-void TrigEgammaMonitorAnalysisAlgorithm::fillL2Electron(const std::string &trigger, std::vector< const xAOD::TrigElectron* > el_vec) const
+void TrigEgammaMonitorAnalysisAlgorithm::fillL2Electron(const std::string &trigger, const std::vector< const xAOD::TrigElectron* >& el_vec) const
{
auto monGroup = getGroup(trigger+"_Distributions_L2Electron");
@@ -539,7 +539,7 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillL2Electron(const std::string &trigg
auto eta_col = Monitored::Collection("eta", eta_vec );
auto phi_col = Monitored::Collection("phi", phi_vec );
- for ( auto el : el_vec )
+ for ( const auto *el : el_vec )
{
if(!el) continue;
et_vec.push_back( el->pt()/Gaudi::Units::GeV );
@@ -550,7 +550,7 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillL2Electron(const std::string &trigg
fill( monGroup, et_col, eta_col, phi_col );
}
-void TrigEgammaMonitorAnalysisAlgorithm::fillEFCalo(const std::string &trigger, std::vector< const xAOD::CaloCluster*> clus_vec) const
+void TrigEgammaMonitorAnalysisAlgorithm::fillEFCalo(const std::string &trigger, const std::vector< const xAOD::CaloCluster*>& clus_vec) const
{
auto monGroup = getGroup( trigger + "_Distributions_EFCalo" );
@@ -572,7 +572,7 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillEFCalo(const std::string &trigger,
auto eta_calo_col = Monitored::Collection("eta_calo" , eta_calo_vec );
auto phi_calo_col = Monitored::Collection("phi_calo" , phi_calo_vec );
- for ( auto clus : clus_vec )
+ for ( const auto *clus : clus_vec )
{
double tmpeta = -999.;
if(!clus->retrieveMoment(xAOD::CaloCluster::ETACALOFRAME,tmpeta))
@@ -603,7 +603,7 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillEFCalo(const std::string &trigger,
-void TrigEgammaMonitorAnalysisAlgorithm::fillShowerShapes(const std::string &trigger, std::vector<const xAOD::Egamma*> eg_vec , bool online) const
+void TrigEgammaMonitorAnalysisAlgorithm::fillShowerShapes(const std::string &trigger, const std::vector<const xAOD::Egamma*>& eg_vec , bool online) const
{
ATH_MSG_DEBUG("Fill SS distributions: " << trigger);
@@ -634,7 +634,7 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillShowerShapes(const std::string &tri
auto topoetcone20_rel_col = Monitored::Collection("topoetcone20_rel", topoetcone20_rel_vec);
auto topoetcone40_shift_rel_col = Monitored::Collection("topoetcone40_shift_rel", topoetcone40_shift_rel_vec );
- for ( auto eg : eg_vec ){
+ for ( const auto *eg : eg_vec ){
if(!eg) continue;
@@ -670,7 +670,7 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillShowerShapes(const std::string &tri
}
-void TrigEgammaMonitorAnalysisAlgorithm::fillTracking(const std::string &trigger, std::vector< const xAOD::Electron *> eg_vec, bool online ) const
+void TrigEgammaMonitorAnalysisAlgorithm::fillTracking(const std::string &trigger, const std::vector< const xAOD::Electron *>& eg_vec, bool online ) const
{
ATH_MSG_DEBUG("Fill tracking");
@@ -702,7 +702,7 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillTracking(const std::string &trigger
auto ptvarcone20_rel_col = Monitored::Collection( "ptvarcone20" , ptvarcone20_rel_vec );
- for ( auto eg : eg_vec ){
+ for ( const auto *eg : eg_vec ){
if(!eg) continue;
@@ -757,8 +757,8 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillTracking(const std::string &trigger
//
-void TrigEgammaMonitorAnalysisAlgorithm::fillResolutions( std::vector< std::pair< const xAOD::Egamma*, const TrigCompositeUtils::Decision * >> pairObjs,
- const TrigInfo info ) const
+void TrigEgammaMonitorAnalysisAlgorithm::fillResolutions( const std::vector< std::pair< const xAOD::Egamma*, const TrigCompositeUtils::Decision * >>& pairObjs,
+ const TrigInfo& info ) const
{
std::vector< std::pair< const xAOD::Egamma*, const xAOD::EmTauRoI * >> pair_l1_vec;
@@ -777,28 +777,28 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillResolutions( std::vector< std::pair
if (feat){
if (info.trigL1){
// Get l1 for all level one objects found for each off object
- auto l1 = match()->getL1Feature( feat );
+ const auto *l1 = match()->getL1Feature( feat );
if(l1){
- pair_l1_vec.push_back( std::make_pair(eg,l1) );
+ pair_l1_vec.emplace_back(eg,l1 );
}
}else{
//
// Get only off and l1 where the offline object passed by the offline pid selector
//
- auto l1 = match()->getL1Feature( feat );
+ const auto *l1 = match()->getL1Feature( feat );
if(eg->type()==xAOD::Type::Electron){
const xAOD::Electron* el = static_cast<const xAOD::Electron*>(eg);
float et = getEt(el)/Gaudi::Units::GeV;
if( et < info.trigThrHLT-5.0) continue;
if(!eg->auxdecor<bool>(info.trigPidDecorator)) continue;
- pair_eg_vec.push_back(std::make_pair(el,feat));
- if(l1) pair_l1_vec.push_back( std::make_pair(eg,l1) );
+ pair_eg_vec.emplace_back(el,feat);
+ if(l1) pair_l1_vec.emplace_back(eg,l1 );
}
else if(eg->type()==xAOD::Type::Photon){
float et = getCluster_et(eg)/Gaudi::Units::GeV;
if( et < info.trigThrHLT-5.0) continue;
- pair_eg_vec.push_back(std::make_pair(eg,feat));
- if(l1) pair_l1_vec.push_back( std::make_pair(eg,l1) );
+ pair_eg_vec.emplace_back(eg,feat);
+ if(l1) pair_l1_vec.emplace_back(eg,l1 );
}
}
@@ -834,7 +834,7 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillResolutions( std::vector< std::pair
void TrigEgammaMonitorAnalysisAlgorithm::fillL1CaloResolution(const std::string &trigger,
- std::vector< std::pair< const xAOD::Egamma*, const xAOD::EmTauRoI * >> pairObjs ) const
+ const std::vector< std::pair< const xAOD::Egamma*, const xAOD::EmTauRoI * >>& pairObjs ) const
{
auto monGroup = getGroup( trigger + "_Resolutions_L1Calo" );
@@ -844,9 +844,9 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillL1CaloResolution(const std::string
auto res_et_col = Monitored::Collection( "res_et" , res_et_vec );
- for (auto& pairObj : pairObjs){
- auto off = pairObj.first;
- auto l1 = pairObj.second;
+ for (const auto & pairObj : pairObjs){
+ const auto *off = pairObj.first;
+ const auto *l1 = pairObj.second;
ATH_MSG_DEBUG("Fill L1CaloResolution");
if(off->type()==xAOD::Type::Electron){
const xAOD::Electron* eloff =static_cast<const xAOD::Electron*> (off);
@@ -864,7 +864,7 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillL1CaloResolution(const std::string
void TrigEgammaMonitorAnalysisAlgorithm::fillL1CaloAbsResolution(const std::string &trigger,
- std::vector< std::pair< const xAOD::Egamma*, const xAOD::EmTauRoI * >> pairObjs ) const
+ const std::vector< std::pair< const xAOD::Egamma*, const xAOD::EmTauRoI * >>& pairObjs ) const
{
auto monGroup = getGroup( trigger + "_AbsResolutions_L1Calo" );
@@ -874,9 +874,9 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillL1CaloAbsResolution(const std::stri
auto res_et_col = Monitored::Collection( "res_et" , res_et_vec );
- for (auto& pairObj : pairObjs){
- auto off = pairObj.first;
- auto l1 = pairObj.second;
+ for (const auto & pairObj : pairObjs){
+ const auto *off = pairObj.first;
+ const auto *l1 = pairObj.second;
ATH_MSG_DEBUG("Fill L1CaloAbsResolution");
if(off->type()==xAOD::Type::Electron){
const xAOD::Electron* eloff =static_cast<const xAOD::Electron*> (off);
@@ -892,7 +892,7 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillL1CaloAbsResolution(const std::stri
void TrigEgammaMonitorAnalysisAlgorithm::fillHLTElectronResolution(const std::string &trigger,
- std::vector< std::pair< const xAOD::Egamma*, const TrigCompositeUtils::Decision * >> pairObjs,
+ const std::vector< std::pair< const xAOD::Egamma*, const TrigCompositeUtils::Decision * >>& pairObjs,
bool filliso) const
{
@@ -956,7 +956,7 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillHLTElectronResolution(const std::st
- for ( auto& pairObj : pairObjs ){
+ for ( const auto & pairObj : pairObjs ){
const xAOD::Electron *off = static_cast<const xAOD::Electron*>(pairObj.first);
const xAOD::Electron *onl=nullptr;
@@ -1258,7 +1258,7 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillHLTElectronResolution(const std::st
void TrigEgammaMonitorAnalysisAlgorithm::fillHLTPhotonResolution(const std::string &trigger,
- std::vector< std::pair< const xAOD::Egamma*, const TrigCompositeUtils::Decision * >> pairObjs,
+ const std::vector< std::pair< const xAOD::Egamma*, const TrigCompositeUtils::Decision * >>& pairObjs,
bool filliso) const
{
@@ -1325,7 +1325,7 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillHLTPhotonResolution(const std::stri
- for ( auto& pairObj : pairObjs ){
+ for ( const auto & pairObj : pairObjs ){
const xAOD::Photon *off = static_cast<const xAOD::Photon*>(pairObj.first);
const xAOD::Photon *onl=nullptr;
@@ -1563,7 +1563,7 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillHLTPhotonResolution(const std::stri
void TrigEgammaMonitorAnalysisAlgorithm::fillL2CaloResolution(const std::string &trigger,
- std::vector< std::pair< const xAOD::Egamma*, const TrigCompositeUtils::Decision * >> pairObjs ) const
+ const std::vector< std::pair< const xAOD::Egamma*, const TrigCompositeUtils::Decision * >>& pairObjs ) const
{
ATH_MSG_DEBUG("Fill L2Calo Resolution");
@@ -1591,7 +1591,7 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillL2CaloResolution(const std::string
auto res_eratio_col = Monitored::Collection( "res_eratio" , res_eratio_vec );
- for ( auto& pairObj : pairObjs ){
+ for ( const auto & pairObj : pairObjs ){
const xAOD::Egamma *off = pairObj.first;
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorAnalysisAlgorithm.h b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorAnalysisAlgorithm.h
index d66b843cc4fe..e5b25c42d3dc 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorAnalysisAlgorithm.h
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorAnalysisAlgorithm.h
@@ -21,34 +21,34 @@ class TrigEgammaMonitorAnalysisAlgorithm: public TrigEgammaMonitorBaseAlgorithm
protected:
void fillLabel( const ToolHandle<GenericMonitoringTool>& groupHandle, const std::string &histname, const std::string &label ) const;
- void fillEfficiencies( std::vector< std::pair<const xAOD::Egamma*, const TrigCompositeUtils::Decision*> > , TrigInfo ) const;
- void fillDistributions( std::vector< std::pair<const xAOD::Egamma*, const TrigCompositeUtils::Decision*> > , TrigInfo ) const;
- void fillResolutions( std::vector< std::pair< const xAOD::Egamma*, const TrigCompositeUtils::Decision * >> pairObjs, const TrigInfo info ) const;
+ void fillEfficiencies( const std::vector< std::pair<const xAOD::Egamma*, const TrigCompositeUtils::Decision*> >& , const TrigInfo& ) const;
+ void fillDistributions( const std::vector< std::pair<const xAOD::Egamma*, const TrigCompositeUtils::Decision*> >& , const TrigInfo& ) const;
+ void fillResolutions( const std::vector< std::pair< const xAOD::Egamma*, const TrigCompositeUtils::Decision * >>& pairObjs, const TrigInfo& info ) const;
private:
// Efficiency monitoring
- void fillEfficiency( const std::string &subgroup, const std::string &level, const std::string &pidword, const TrigInfo info,
- std::vector< std::pair< const xAOD::Egamma *, const TrigCompositeUtils::Decision* >> pairObjs,
- std::vector< asg::AcceptData > acceptObjs, std::string dirname ) const;
+ void fillEfficiency( const std::string &subgroup, const std::string &level, const std::string &pidword, const TrigInfo& info,
+ const std::vector< std::pair< const xAOD::Egamma *, const TrigCompositeUtils::Decision* >>& pairObjs,
+ std::vector< asg::AcceptData > acceptObjs, const std::string& dirname ) const;
// Disribution monitoring
- void fillL1Calo( const std::string &trigger, std::vector< const xAOD::EmTauRoI* > l1_vec ) const;
- void fillL2Calo(const std::string &trigger, std::vector< const xAOD::TrigEMCluster*> emCluster_vec ) const;
- void fillL2Electron(const std::string &trigger, std::vector<const xAOD::TrigElectron*> el_vec) const;
- void fillEFCalo(const std::string &trigger, std::vector<const xAOD::CaloCluster*> clus_vec) const;
- void fillShowerShapes(const std::string &trigger, std::vector<const xAOD::Egamma*> eg_vec, bool online) const;
- void fillTracking(const std::string &trigger, std::vector<const xAOD::Electron *> eg_vec, bool online ) const;
+ void fillL1Calo( const std::string &trigger, const std::vector< const xAOD::EmTauRoI* >& l1_vec ) const;
+ void fillL2Calo(const std::string &trigger, const std::vector< const xAOD::TrigEMCluster*>& emCluster_vec ) const;
+ void fillL2Electron(const std::string &trigger, const std::vector<const xAOD::TrigElectron*>& el_vec) const;
+ void fillEFCalo(const std::string &trigger, const std::vector<const xAOD::CaloCluster*>& clus_vec) const;
+ void fillShowerShapes(const std::string &trigger, const std::vector<const xAOD::Egamma*>& eg_vec, bool online) const;
+ void fillTracking(const std::string &trigger, const std::vector<const xAOD::Electron *>& eg_vec, bool online ) const;
// Resolution monitoring
- void fillL1CaloResolution(const std::string &trigger, std::vector< std::pair< const xAOD::Egamma*, const xAOD::EmTauRoI * >> pairObjs ) const;
- void fillL1CaloAbsResolution(const std::string &trigger, std::vector< std::pair< const xAOD::Egamma*, const xAOD::EmTauRoI * >> pairObjs ) const;
- void fillL2CaloResolution(const std::string &trigger, std::vector< std::pair< const xAOD::Egamma*, const TrigCompositeUtils::Decision * >> pairObjs ) const;
- void fillHLTElectronResolution(const std::string &trigger, std::vector< std::pair< const xAOD::Egamma*, const TrigCompositeUtils::Decision * >> pairObjs , bool) const;
- void fillHLTPhotonResolution(const std::string &trigger, std::vector< std::pair< const xAOD::Egamma*, const TrigCompositeUtils::Decision * >> pairObjs , bool) const;
+ void fillL1CaloResolution(const std::string &trigger, const std::vector< std::pair< const xAOD::Egamma*, const xAOD::EmTauRoI * >>& pairObjs ) const;
+ void fillL1CaloAbsResolution(const std::string &trigger, const std::vector< std::pair< const xAOD::Egamma*, const xAOD::EmTauRoI * >>& pairObjs ) const;
+ void fillL2CaloResolution(const std::string &trigger, const std::vector< std::pair< const xAOD::Egamma*, const TrigCompositeUtils::Decision * >>& pairObjs ) const;
+ void fillHLTElectronResolution(const std::string &trigger, const std::vector< std::pair< const xAOD::Egamma*, const TrigCompositeUtils::Decision * >>& pairObjs , bool) const;
+ void fillHLTPhotonResolution(const std::string &trigger, const std::vector< std::pair< const xAOD::Egamma*, const TrigCompositeUtils::Decision * >>& pairObjs , bool) const;
};
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorBaseAlgorithm.cxx b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorBaseAlgorithm.cxx
index c795035b78ab..7ab325cd54b6 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorBaseAlgorithm.cxx
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorBaseAlgorithm.cxx
@@ -50,9 +50,9 @@ StatusCode TrigEgammaMonitorBaseAlgorithm::initialize()
-bool TrigEgammaMonitorBaseAlgorithm::ApplyElectronPid( const xAOD::Electron *eg, const std::string pidname) const
+bool TrigEgammaMonitorBaseAlgorithm::ApplyElectronPid( const xAOD::Electron *eg, const std::string& pidname) const
{
- auto ctx = Gaudi::Hive::currentContext() ;
+ const auto& ctx = Gaudi::Hive::currentContext() ;
if (pidname == "tight"){
return (bool) this->m_electronIsEMTool[0]->accept(ctx,eg);
}
@@ -92,9 +92,9 @@ bool TrigEgammaMonitorBaseAlgorithm::ApplyElectronPid( const xAOD::Electron *eg,
// ************************************************************************************************
-bool TrigEgammaMonitorBaseAlgorithm::ApplyPhotonPid( const xAOD::Photon *eg, const std::string pidname) const
+bool TrigEgammaMonitorBaseAlgorithm::ApplyPhotonPid( const xAOD::Photon *eg, const std::string& pidname) const
{
- auto ctx = Gaudi::Hive::currentContext() ;
+ const auto& ctx = Gaudi::Hive::currentContext() ;
if (pidname == "tight"){
return (bool) this->m_photonIsEMTool[0]->accept(ctx,eg);
}
@@ -113,7 +113,7 @@ bool TrigEgammaMonitorBaseAlgorithm::ApplyPhotonPid( const xAOD::Photon *eg, con
-bool TrigEgammaMonitorBaseAlgorithm::isIsolated(const xAOD::Electron *eg, const std::string isolation) const {
+bool TrigEgammaMonitorBaseAlgorithm::isIsolated(const xAOD::Electron *eg, const std::string& isolation) const {
ATH_MSG_DEBUG("Apply Isolation " << isolation);
float ptcone20;
eg->isolationValue(ptcone20, xAOD::Iso::ptcone20);
@@ -141,7 +141,7 @@ bool TrigEgammaMonitorBaseAlgorithm::isIsolated(const xAOD::Electron *eg, const
-bool TrigEgammaMonitorBaseAlgorithm::isPrescaled(const std::string trigger) const {
+bool TrigEgammaMonitorBaseAlgorithm::isPrescaled(const std::string& trigger) const {
bool efprescale=false;
bool l1prescale=false;
@@ -174,7 +174,7 @@ bool TrigEgammaMonitorBaseAlgorithm::isPrescaled(const std::string trigger) cons
-asg::AcceptData TrigEgammaMonitorBaseAlgorithm::setAccept( const TrigCompositeUtils::Decision *dec, const TrigInfo info) const {
+asg::AcceptData TrigEgammaMonitorBaseAlgorithm::setAccept( const TrigCompositeUtils::Decision *dec, const TrigInfo& info) const {
ATH_MSG_DEBUG("setAccept");
@@ -574,7 +574,7 @@ float TrigEgammaMonitorBaseAlgorithm::getE0Eaccordion(const xAOD::Egamma *eg) co
-TrigInfo TrigEgammaMonitorBaseAlgorithm::getTrigInfo(const std::string trigger) const{
+TrigInfo TrigEgammaMonitorBaseAlgorithm::getTrigInfo(const std::string& trigger) const{
return m_trigInfo.at(trigger);
}
@@ -582,7 +582,7 @@ TrigInfo TrigEgammaMonitorBaseAlgorithm::getTrigInfo(const std::string trigger)
// This is not const function and can not be used in execute mode (not thread safe)
// adds entry in TrigInfo map to retrieve later via trigger name
-void TrigEgammaMonitorBaseAlgorithm::setTrigInfo(const std::string trigger){
+void TrigEgammaMonitorBaseAlgorithm::setTrigInfo(const std::string& trigger){
/********************************************
std::string trigName; //Trigger Name
@@ -635,7 +635,7 @@ void TrigEgammaMonitorBaseAlgorithm::setTrigInfo(const std::string trigger){
-bool TrigEgammaMonitorBaseAlgorithm::splitTriggerName(const std::string trigger,
+bool TrigEgammaMonitorBaseAlgorithm::splitTriggerName(const std::string& trigger,
std::string &p1trigger,
std::string &p2trigger) const {
@@ -688,8 +688,8 @@ bool TrigEgammaMonitorBaseAlgorithm::splitTriggerName(const std::string trigger,
-void TrigEgammaMonitorBaseAlgorithm::parseTriggerName(const std::string trigger,
- std::string defaultPid,
+void TrigEgammaMonitorBaseAlgorithm::parseTriggerName(const std::string& trigger,
+ const std::string& defaultPid,
bool &isL1,
std::string &type,
float &threshold,
@@ -779,15 +779,15 @@ void TrigEgammaMonitorBaseAlgorithm::parseTriggerName(const std::string trigger,
-std::string TrigEgammaMonitorBaseAlgorithm::getProbePid(const std::string pidtype) const {
+std::string TrigEgammaMonitorBaseAlgorithm::getProbePid(const std::string& pidtype) const {
// Note vloose/lhvloose trigger mapped to Loose/LHLoose offline PID
return m_pidMap.at(pidtype);
}
-std::string TrigEgammaMonitorBaseAlgorithm::getL1Item(std::string trigger) const{
- auto trig_conf = m_trigdec->ExperimentalAndExpertMethods()->getChainConfigurationDetails(trigger);
+std::string TrigEgammaMonitorBaseAlgorithm::getL1Item(const std::string& trigger) const{
+ const auto *trig_conf = m_trigdec->ExperimentalAndExpertMethods()->getChainConfigurationDetails(trigger);
std::string L1_seed = "";
if(trig_conf != nullptr){
ATH_MSG_DEBUG("TrigConf available");
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorBaseAlgorithm.h b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorBaseAlgorithm.h
index ca978e60c4f2..6e87750a460c 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorBaseAlgorithm.h
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorBaseAlgorithm.h
@@ -121,33 +121,33 @@ class TrigEgammaMonitorBaseAlgorithm : public AthMonitorAlgorithm {
/*! Get the trig info map */
std::map<std::string,TrigInfo> getTrigInfoMap() { return m_trigInfo; }
/*! Get offline electron decision */
- bool ApplyElectronPid(const xAOD::Electron *eg,const std::string) const;
+ bool ApplyElectronPid(const xAOD::Electron *eg,const std::string&) const;
/*! Get offline electron decision */
- bool ApplyPhotonPid(const xAOD::Photon *eg,const std::string) const;
+ bool ApplyPhotonPid(const xAOD::Photon *eg,const std::string&) const;
/*! Get the TDT */
const ToolHandle<Trig::TrigDecisionTool>& tdt() const {return m_trigdec;};
/*! Get the e/g match tool */
const ToolHandle<TrigEgammaMatchingToolMT>& match() const {return m_matchTool;}
/*! Set the accept object for all trigger levels */
- asg::AcceptData setAccept(const TrigCompositeUtils::Decision*, const TrigInfo) const;
+ asg::AcceptData setAccept(const TrigCompositeUtils::Decision*, const TrigInfo&) const;
/*! Get the trigger info parsed from the chain name */
- TrigInfo getTrigInfo(const std::string) const;
+ TrigInfo getTrigInfo(const std::string&) const;
/*! Get delta R */
float dR(const float, const float, const float, const float) const;
/*! Simple setter to pick up correct probe PID for given trigger */
- void parseTriggerName(const std::string,const std::string, bool&, std::string &,float &, float &, std::string &,std::string &, bool&, bool&) const;
+ void parseTriggerName(const std::string&,const std::string&, bool&, std::string &,float &, float &, std::string &,std::string &, bool&, bool&) const;
/*! Split double object trigger in two simple object trigger */
- bool splitTriggerName(const std::string, std::string &, std::string &) const;
+ bool splitTriggerName(const std::string&, std::string &, std::string &) const;
/*! Creates static map to return L1 item from trigger name */
- std::string getL1Item(std::string trigger) const;
+ std::string getL1Item(const std::string& trigger) const;
/*! Check if electron fulfils isolation criteria */
- bool isIsolated(const xAOD::Electron*, const std::string) const;
+ bool isIsolated(const xAOD::Electron*, const std::string&) const;
/*! Check if the event is prescaled */
- bool isPrescaled(const std::string) const;
+ bool isPrescaled(const std::string&) const;
/*! Get the pid name */
- std::string getProbePid(const std::string) const;
+ std::string getProbePid(const std::string&) const;
/*! Set the trigger info parsed from the chain name */
- void setTrigInfo(const std::string);
+ void setTrigInfo(const std::string&);
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorElectronAlgorithm.cxx b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorElectronAlgorithm.cxx
index 9598afba4802..dcb467307620 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorElectronAlgorithm.cxx
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorElectronAlgorithm.cxx
@@ -89,9 +89,9 @@ StatusCode TrigEgammaMonitorElectronAlgorithm::fillHistograms( const EventContex
StatusCode TrigEgammaMonitorElectronAlgorithm::executeNavigation( const EventContext& ctx,
- std::string trigItem,
+ const std::string& trigItem,
float etthr,
- std::string pidName,
+ const std::string& pidName,
std::vector<std::pair<std::shared_ptr<const xAOD::Egamma>, const TrigCompositeUtils::Decision* >> &pairObjs) const
{
@@ -107,7 +107,7 @@ StatusCode TrigEgammaMonitorElectronAlgorithm::executeNavigation( const EventCon
const std::string decor="is"+pidName;
- for(const auto eg : *offElectrons ){
+ for(const auto *const eg : *offElectrons ){
const TrigCompositeUtils::Decision *dec=nullptr;
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorElectronAlgorithm.h b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorElectronAlgorithm.h
index 5ca2d5ef3c6a..1b5f4c60f264 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorElectronAlgorithm.h
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorElectronAlgorithm.h
@@ -30,7 +30,7 @@ class TrigEgammaMonitorElectronAlgorithm: public TrigEgammaMonitorAnalysisAlgori
/*! navigation method called by executeNavigation */
- StatusCode executeNavigation(const EventContext& ctx, const std::string trigItem,float,std::string,
+ StatusCode executeNavigation(const EventContext& ctx, const std::string& trigItem,float,const std::string&,
std::vector<std::pair<std::shared_ptr<const xAOD::Egamma>, const TrigCompositeUtils::Decision*>> &) const;
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorPhotonAlgorithm.cxx b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorPhotonAlgorithm.cxx
index 7db10fd1dbbe..c35940275017 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorPhotonAlgorithm.cxx
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorPhotonAlgorithm.cxx
@@ -89,7 +89,7 @@ StatusCode TrigEgammaMonitorPhotonAlgorithm::fillHistograms( const EventContext&
-StatusCode TrigEgammaMonitorPhotonAlgorithm::executeNavigation( const EventContext& ctx, std::string trigItem, float etthr, std::string pidName,
+StatusCode TrigEgammaMonitorPhotonAlgorithm::executeNavigation( const EventContext& ctx, const std::string& trigItem, float etthr, const std::string& pidName,
std::vector<std::pair<std::shared_ptr<const xAOD::Egamma>, const TrigCompositeUtils::Decision * >> &pairObjs)
const
{
@@ -107,7 +107,7 @@ StatusCode TrigEgammaMonitorPhotonAlgorithm::executeNavigation( const EventConte
const std::string decor="is"+pidName;
- for(const auto eg : *offPhotons ){
+ for(const auto *const eg : *offPhotons ){
const TrigCompositeUtils::Decision *dec=nullptr;
if(!eg->caloCluster()){
ATH_MSG_DEBUG("No caloCluster");
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorPhotonAlgorithm.h b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorPhotonAlgorithm.h
index 15aeb2e02371..f9d553deb917 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorPhotonAlgorithm.h
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorPhotonAlgorithm.h
@@ -31,7 +31,7 @@ class TrigEgammaMonitorPhotonAlgorithm: public TrigEgammaMonitorAnalysisAlgorith
/*! navigation method called by executeNavigation */
- StatusCode executeNavigation(const EventContext& ctx, const std::string trigItem,float, std::string pidName,
+ StatusCode executeNavigation(const EventContext& ctx, const std::string& trigItem,float, const std::string& pidName,
std::vector<std::pair<std::shared_ptr<const xAOD::Egamma>, const TrigCompositeUtils::Decision*>> &) const;
/*! List of triggers to study */
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorTagAndProbeAlgorithm.cxx b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorTagAndProbeAlgorithm.cxx
index 741b7c705d19..3ae6677ad8b5 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorTagAndProbeAlgorithm.cxx
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorTagAndProbeAlgorithm.cxx
@@ -44,7 +44,7 @@ TrigEgammaMonitorTagAndProbeAlgorithm::~TrigEgammaMonitorTagAndProbeAlgorithm()
StatusCode TrigEgammaMonitorTagAndProbeAlgorithm::initialize() {
ATH_MSG_INFO("TrigEgammaMonitorTagAndProbeAlgorithm::initialize()...");
- ATH_CHECK(TrigEgammaMonitorBaseAlgorithm::initialize());
+ ATH_CHECK(TrigEgammaMonitorAnalysisAlgorithm::initialize());
ATH_CHECK(m_offElectronKey.initialize());
ATH_CHECK(m_jetKey.initialize());
@@ -101,7 +101,7 @@ StatusCode TrigEgammaMonitorTagAndProbeAlgorithm::fillHistograms( const EventCon
const TrigInfo info = getTrigInfo(probeTrigger);
- std::string trigName=probeTrigger;
+ const std::string& trigName=probeTrigger;
ATH_MSG_DEBUG("Trigger " << probeTrigger << " pidword " << info.trigPidDecorator << " threshold " << info.trigThrHLT);
matchObjects(trigName, probes, pairObjs);
@@ -174,7 +174,7 @@ bool TrigEgammaMonitorTagAndProbeAlgorithm::executeTandP( const EventContext& ct
- SG::ReadHandle<xAOD::JetContainer> jets(m_jetKey);
+ SG::ReadHandle<xAOD::JetContainer> jets(m_jetKey,ctx);
if(!jets.isValid()){
ATH_MSG_WARNING("Failed to retrieve JetContainer");
return false;
@@ -199,11 +199,11 @@ bool TrigEgammaMonitorTagAndProbeAlgorithm::executeTandP( const EventContext& ct
ATH_MSG_DEBUG("Execute TandP BaseTool " << offElectrons->size());
- for(const auto elTag : *offElectrons)
+ for(const auto *const elTag : *offElectrons)
{
if( ! isTagElectron( monGroup, elTag) ) continue;
- for(const auto elProbe : *offElectrons)
+ for(const auto *const elProbe : *offElectrons)
{ // Dress the probes with updated Pid decision
fillLabel(monGroup, "ProbeCutCounter", "Electrons");
@@ -286,7 +286,7 @@ bool TrigEgammaMonitorTagAndProbeAlgorithm::minimalTriggerRequirement() const {
-void TrigEgammaMonitorTagAndProbeAlgorithm::matchObjects(const std::string probeTrigItem,
+void TrigEgammaMonitorTagAndProbeAlgorithm::matchObjects(const std::string& probeTrigItem,
std::vector<std::shared_ptr<const xAOD::Electron>>& probeElectrons,
std::vector<std::pair<const xAOD::Egamma*, const TrigCompositeUtils::Decision *>> &pairObj ) const
{
@@ -303,7 +303,7 @@ void TrigEgammaMonitorTagAndProbeAlgorithm::matchObjects(const std::string probe
-bool TrigEgammaMonitorTagAndProbeAlgorithm::isTagElectron( ToolHandle<GenericMonitoringTool> monGroup,
+bool TrigEgammaMonitorTagAndProbeAlgorithm::isTagElectron( const ToolHandle<GenericMonitoringTool>& monGroup,
const xAOD::Electron *el) const
{
fillLabel(monGroup, "TagCutCounter", "Electrons");
@@ -435,7 +435,7 @@ bool TrigEgammaMonitorTagAndProbeAlgorithm::isTagElectron( ToolHandle<GenericMon
-bool TrigEgammaMonitorTagAndProbeAlgorithm::isGoodProbeElectron( ToolHandle<GenericMonitoringTool> monGroup,
+bool TrigEgammaMonitorTagAndProbeAlgorithm::isGoodProbeElectron( const ToolHandle<GenericMonitoringTool>& monGroup,
const xAOD::Electron *el,
const xAOD::JetContainer *jets ) const
{
@@ -478,7 +478,7 @@ bool TrigEgammaMonitorTagAndProbeAlgorithm::isGoodProbeElectron( ToolHandle<Gene
TLorentzVector probeCandidate;
probeCandidate.SetPtEtaPhiE(el->pt(), el->trackParticle()->eta(), el->trackParticle()->phi(), el->e());
Int_t jetsAroundProbeElectron = 0;
- for(const auto i_jet : *jets){
+ for(const auto *const i_jet : *jets){
TLorentzVector jet;
jet.SetPtEtaPhiE(i_jet->pt(), i_jet->eta(), i_jet->phi(), i_jet->e());
if( (jet.Et() > 20*Gaudi::Units::GeV) && (jet.DeltaR(probeCandidate) < 0.4)) jetsAroundProbeElectron++;
@@ -498,7 +498,7 @@ bool TrigEgammaMonitorTagAndProbeAlgorithm::isGoodProbeElectron( ToolHandle<Gene
void TrigEgammaMonitorTagAndProbeAlgorithm::dressPid(const xAOD::Electron *eg) const
{
- auto ctx = Gaudi::Hive::currentContext() ;
+ const auto& ctx = Gaudi::Hive::currentContext() ;
for(int ipid=0;ipid<3;ipid++){
bool accept = (bool) this->m_electronIsEMTool[ipid]->accept(ctx,eg);
const std::string pidname="is"+m_isemname[ipid];
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorTagAndProbeAlgorithm.h b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorTagAndProbeAlgorithm.h
index f4aac99f423f..cc9d0e79e12f 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorTagAndProbeAlgorithm.h
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorTagAndProbeAlgorithm.h
@@ -29,7 +29,7 @@ class TrigEgammaMonitorTagAndProbeAlgorithm: public TrigEgammaMonitorAnalysisAlg
bool executeTandP( const EventContext& ctx, std::vector<std::shared_ptr<const xAOD::Electron>> & ) const;
/*! Match probes called by derived classes */
- void matchObjects(const std::string trigItem, std::vector<std::shared_ptr<const xAOD::Electron>>&,
+ void matchObjects(const std::string& trigItem, std::vector<std::shared_ptr<const xAOD::Electron>>&,
std::vector<std::pair<const xAOD::Egamma*, const TrigCompositeUtils::Decision*>> &) const;
@@ -44,9 +44,9 @@ class TrigEgammaMonitorTagAndProbeAlgorithm: public TrigEgammaMonitorAnalysisAlg
/*! at least one chain should pass. e28_tight_iloose? */
bool minimalTriggerRequirement () const;
/*! Tag Electron selection */
- bool isTagElectron( ToolHandle<GenericMonitoringTool> monGroup, const xAOD::Electron *el) const;
+ bool isTagElectron( const ToolHandle<GenericMonitoringTool>& monGroup, const xAOD::Electron *el) const;
/*! Probe selection */
- bool isGoodProbeElectron( ToolHandle<GenericMonitoringTool> monGroup, const xAOD::Electron *el, const xAOD::JetContainer *) const;
+ bool isGoodProbeElectron( const ToolHandle<GenericMonitoringTool>& monGroup, const xAOD::Electron *el, const xAOD::JetContainer *) const;
/*! Return pseudo-lifetime of Jpsi */
float getPseudoLifetime(const xAOD::Electron*,const xAOD::Electron*) const;
/*! Calculate the displacement of the Jpsi vertex w.r.t. the primary vertex in the transverse plane */
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/egammaMonitorElectronAlgorithm.cxx b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/egammaMonitorElectronAlgorithm.cxx
index 44082afd5b35..3ac9320d11ce 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/egammaMonitorElectronAlgorithm.cxx
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/egammaMonitorElectronAlgorithm.cxx
@@ -49,7 +49,7 @@ void egammaMonitorElectronAlgorithm::filltopoElectronTrackCaloMatch(const EventC
auto deltaPhiLast_col = Monitored::Collection("deltaPhiLast",deltaPhiLast_vec );
auto d0_col = Monitored::Collection("d0",d0_vec);
- for (const auto electron : *electrons){
+ for (const auto *const electron : *electrons){
deltaEta0_vec.push_back(getCaloTrackMatch_deltaEta0(electron));
deltaEta1_vec.push_back(getCaloTrackMatch_deltaEta1(electron));
@@ -102,7 +102,7 @@ void egammaMonitorElectronAlgorithm::filltopoElectronShowerShapes(const EventCon
auto eta_col = Monitored::Collection("eta" , eta_vec );
auto phi_col = Monitored::Collection("phi" , phi_vec );
- for ( const auto electron : *electrons ){
+ for ( const auto *const electron : *electrons ){
if(!electron) continue;
@@ -137,7 +137,7 @@ void egammaMonitorElectronAlgorithm::filltopoElectronIsolation(const EventContex
// This is ok but defeats a bit the purpose...
std::map<TString,std::vector<float>> iso_vec;
- for (auto hk : m_isoKey) {
+ for (const auto& hk : m_isoKey) {
TString n = hk.key();
n.ReplaceAll(m_baseName,"");
iso_vec.emplace(n,std::vector<float>());
@@ -148,7 +148,7 @@ void egammaMonitorElectronAlgorithm::filltopoElectronIsolation(const EventContex
std::vector<std::reference_wrapper<Monitored::IMonitoredVariable>> allMonIsoVars;
allMonIsoVars.insert(allMonIsoVars.end(),{col0,col1});
- for (auto hk : m_isoKey) {
+ for (const auto& hk : m_isoKey) {
TString n = hk.key();
n.ReplaceAll(m_baseName,"");
SG::ReadDecorHandle<xAOD::ElectronContainer, float> handle(hk,ctx);
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/egammaMonitorPhotonAlgorithm.cxx b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/egammaMonitorPhotonAlgorithm.cxx
index 40c3ab6316a3..c933646e13c0 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/egammaMonitorPhotonAlgorithm.cxx
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/egammaMonitorPhotonAlgorithm.cxx
@@ -56,7 +56,7 @@ void egammaMonitorPhotonAlgorithm::filltopoPhotonShowerShapes( const EventContex
auto eta_col = Monitored::Collection("eta" , eta_vec );
auto phi_col = Monitored::Collection("phi" , phi_vec );
- for ( const auto photon : *photons ){
+ for ( const auto *const photon : *photons ){
if(!photon) continue;
@@ -93,7 +93,7 @@ void egammaMonitorPhotonAlgorithm::filltopoPhotonIsolation(const EventContext& c
auto topoetcone20_col = Monitored::Collection("topoetcone20", topoetcone20_vec);
auto topoetcone40_shift_col = Monitored::Collection("topoetcone40_shift", topoetcone40_shift_vec);
- for (auto hk : m_isoKey) {
+ for (const auto& hk : m_isoKey) {
TString n = hk.key();
n.ReplaceAll(m_baseName,"");
SG::ReadDecorHandle<xAOD::PhotonContainer, float> handle(hk,ctx);
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/egammaMonitorSuperClusterAlgorithm.cxx b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/egammaMonitorSuperClusterAlgorithm.cxx
index 317c7658a62b..58cc129513a0 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/egammaMonitorSuperClusterAlgorithm.cxx
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/egammaMonitorSuperClusterAlgorithm.cxx
@@ -40,7 +40,7 @@ void egammaMonitorSuperClusterAlgorithm::fillSuperClusterQuantities( const Event
auto clusterSize_col = Monitored::Collection("clusterSize" ,clusterSize_vec);
auto signalState_col = Monitored::Collection("signalState" ,signalState_vec);
- for (const auto eg : *egammaRec) {
+ for (const auto *const eg : *egammaRec) {
et_vec.push_back(eg->caloCluster()->et()/Gaudi::Units::GeV);
eta_vec.push_back(eg->caloCluster()->eta());
--
GitLab
From 972f3c3215a8a3cd516c342b4b3ec9d513a75b80 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Fri, 13 Aug 2021 18:27:11 +0000
Subject: [PATCH 037/272] TrigT1CaloSim: use private tools in TriggerTowerMaker
---
Trigger/TrigT1/TrigT1CaloSim/CMakeLists.txt | 6 +-
.../python/TrigT1CaloSimRun2Config.py | 6 --
.../share/TrigT1CaloSimJobOptions_Run2.py | 2 -
.../src/OverlayRun2TriggerTowerMaker.cxx | 42 ++++++-------
.../src/OverlayRun2TriggerTowerMaker.h | 14 ++---
.../src/Run2TriggerTowerMaker.cxx | 59 +++++++++----------
.../TrigT1CaloSim/src/Run2TriggerTowerMaker.h | 19 +++---
7 files changed, 65 insertions(+), 83 deletions(-)
diff --git a/Trigger/TrigT1/TrigT1CaloSim/CMakeLists.txt b/Trigger/TrigT1/TrigT1CaloSim/CMakeLists.txt
index db3b01f38c52..ed0cce118731 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CaloSim/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigT1CaloSim )
@@ -12,13 +12,13 @@ atlas_add_component( TrigT1CaloSim
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AthContainers AthenaBaseComps AthenaKernel CaloDetDescrLib CaloEvent CaloIdentifier CaloTTDetDescr GaudiKernel Identifier LArRawEvent LumiBlockCompsLib PathResolver PileUpToolsLib StoreGateLib TileConditionsLib TileEvent TrigConfInterfaces TrigConfData TrigConfL1Data TrigT1CaloByteStreamLib TrigT1CaloCalibConditions TrigT1CaloCalibToolInterfaces TrigT1CaloCondSvcLib TrigT1CaloEventLib TrigT1CaloToolInterfaces TrigT1CaloUtilsLib TrigT1Interfaces xAODEventInfo xAODTrigL1Calo )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthContainers AthenaBaseComps AthenaKernel CaloIdentifier GaudiKernel Identifier LArRawEvent PathResolver StoreGateLib TileConditionsLib TileEvent TrigConfData TrigConfL1Data TrigT1CaloByteStreamLib TrigT1CaloCalibConditions TrigT1CaloCondSvcLib TrigT1CaloEventLib TrigT1CaloToolInterfaces TrigT1CaloUtilsLib TrigT1Interfaces xAODEventInfo xAODTrigL1Calo )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
-
+# Tests:
atlas_add_test( NewJOSimSetup
SCRIPT python -m TrigT1CaloSim.TrigT1CaloSimRun2Config
POST_EXEC_SCRIPT nopost.sh )
diff --git a/Trigger/TrigT1/TrigT1CaloSim/python/TrigT1CaloSimRun2Config.py b/Trigger/TrigT1/TrigT1CaloSim/python/TrigT1CaloSimRun2Config.py
index a7d154443843..64aa2705a0c5 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/python/TrigT1CaloSimRun2Config.py
+++ b/Trigger/TrigT1/TrigT1CaloSim/python/TrigT1CaloSimRun2Config.py
@@ -22,11 +22,6 @@ class Run2TriggerTowerMaker(Run2TriggerTowerMakerBase):
from SGComps.AddressRemappingSvc import addInputRename
addInputRename ( 'xAOD::TriggerTowerContainer', 'xAODTriggerTowers_rerun', 'xAODTriggerTowers')
- from AthenaCommon import CfgMgr
- from AthenaCommon.AppMgr import ToolSvc
- if not hasattr(ToolSvc, "LumiBlockMuTool"):
- ToolSvc += CfgMgr.LumiBlockMuTool("LumiBlockMuTool")
-
class Run2TriggerTowerMaker25ns(Run2TriggerTowerMaker):
""" Run2 TriggerTower configuration for 25ns running """
__slots__ = []
@@ -61,7 +56,6 @@ def Run2TriggerTowerMakerCfg(flags, name):
ZeroSuppress = True,
#ExtraInputs = ['LArTTL1Container#LArTTL1EM', 'LArTTL1Container#LArTTL1HAD', 'TileTTL1Container#TileTTL1Cnt']
)
- acc.addPublicTool(CompFactory.LumiBlockMuTool('LumiBlockMuTool'))
acc.addEventAlgo(alg)
return acc
diff --git a/Trigger/TrigT1/TrigT1CaloSim/share/TrigT1CaloSimJobOptions_Run2.py b/Trigger/TrigT1/TrigT1CaloSim/share/TrigT1CaloSimJobOptions_Run2.py
index dbe21ed7cce9..965768943564 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/share/TrigT1CaloSimJobOptions_Run2.py
+++ b/Trigger/TrigT1/TrigT1CaloSim/share/TrigT1CaloSimJobOptions_Run2.py
@@ -37,8 +37,6 @@ if globalflags.isOverlay() is True:
_doPC = False
from AthenaCommon import CfgMgr
from AthenaCommon.AppMgr import ToolSvc
- if not hasattr(ToolSvc, "LumiBlockMuTool"):
- ToolSvc += CfgMgr.LumiBlockMuTool("LumiBlockMuTool")
from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__OverlayRun2TriggerTowerMaker
job += LVL1__OverlayRun2TriggerTowerMaker('Run2TriggerTowerMaker',
CellType = 3,
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx
index 854a7def871f..3a1552901c95 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx
@@ -23,7 +23,6 @@
#include "CaloIdentifier/CaloLVL1_ID.h"
#include "TileConditions/TileInfo.h"
-#include "LumiBlockComps/ILumiBlockMuTool.h"
#include "xAODEventInfo/EventInfo.h"
//For getting TriggerTowers from BS
@@ -79,10 +78,9 @@ namespace LVL1 {
m_rngSvc("AthRNGSvc", name),
m_condSvc("L1CaloCondSvc", name),
m_rndmADCs(0),
- m_TTtool("LVL1::L1TriggerTowerTool/L1TriggerTowerTool"),
- m_mappingTool("LVL1::PpmMappingTool/PpmMappingTool"),
- m_lumiBlockMuTool("LumiBlockMuTool/LumiBlockMuTool"),
- m_bstowertool("LVL1BS__TrigT1CaloDataAccessV2/TrigT1CaloDataAccessV2",0), //ACH
+ m_TTtool("LVL1::L1TriggerTowerTool/L1TriggerTowerTool", this),
+ m_mappingTool("LVL1::PpmMappingTool/PpmMappingTool", this),
+ m_bstowertool("LVL1BS__TrigT1CaloDataAccessV2/TrigT1CaloDataAccessV2", this),
m_caloId(0),
m_cpLutScale(1.),
m_jepLutScale(1.),
@@ -95,7 +93,6 @@ namespace LVL1 {
declareProperty("DigiEngine", m_digiEngine = "TrigT1CaloSim_Digitization");
declareProperty("PpmMappingTool", m_mappingTool);
- declareProperty("LumiBlockMuTool", m_lumiBlockMuTool);
declareProperty("inputTTLocation", m_inputTTLocation=TrigT1CaloDefs::xAODTriggerTowerLocation);
declareProperty("EmTTL1ContainerName",m_EmTTL1ContainerName= "LArTTL1EM");
@@ -164,7 +161,6 @@ namespace LVL1 {
CHECK(m_mappingTool.retrieve());
CHECK(m_TTtool.retrieve());
CHECK(m_rngSvc.retrieve());
- CHECK(m_lumiBlockMuTool.retrieve());
CHECK(m_condSvc.retrieve());
CHECK(m_bstowertool.retrieve());
@@ -322,15 +318,13 @@ namespace LVL1 {
ATH_MSG_ERROR("Unsupported Cell Type!!!!!!"); return StatusCode::FAILURE;
}
- // Pedestal Correction: Get the BCID number
const xAOD::EventInfo* evt = nullptr;
CHECK(evtStore()->retrieve(evt));
- int eventBCID = evt->bcid();
- CHECK(preProcess(eventBCID)); // FIR, BCID etc
+ CHECK(preProcess(*evt)); // FIR, BCID etc
if (m_doOverlay) {
- CHECK( addOverlay(eventBCID) );
+ CHECK( addOverlay(*evt) );
}
// store them thar trigger towers
@@ -362,7 +356,7 @@ namespace LVL1 {
return false;
}
- StatusCode OverlayRun2TriggerTowerMaker::addOverlay(const int eventBCID)
+ StatusCode OverlayRun2TriggerTowerMaker::addOverlay(const xAOD::EventInfo& event)
{
// Get the overlay data TTs from Bytestream
xAOD::TriggerTowerContainer* overlayDataTTs = new xAOD::TriggerTowerContainer();
@@ -405,7 +399,7 @@ namespace LVL1 {
Itr match = overlayMap.find( tt->coolId() );
if (match != overlayMap.end()) {
- CHECK( addOverlay(eventBCID,tt,(*match).second) );
+ CHECK( addOverlay(event,tt,(*match).second) );
// Let the overlay TT know that it has been used
(*match).second->auxdecor<char>(decor_name) = decor_ttUsedInOverlay;
@@ -440,7 +434,7 @@ namespace LVL1 {
}
/** Add the overlay TriggerTower to the signal TriggerTower **/
- StatusCode OverlayRun2TriggerTowerMaker::addOverlay(const int eventBCID,xAOD::TriggerTower* sigTT,xAOD::TriggerTower* ovTT)
+ StatusCode OverlayRun2TriggerTowerMaker::addOverlay(const xAOD::EventInfo& event,xAOD::TriggerTower* sigTT,xAOD::TriggerTower* ovTT)
{
// Get the relevant databases
const L1CaloPprChanCalib* sigDB = m_chanCalibContainer->pprChanCalib(sigTT->coolId());
@@ -465,8 +459,8 @@ namespace LVL1 {
// Get LUT input
std::vector<int> sigLutIn,ovLutIn;
- CHECK( preProcessTower_getLutIn(eventBCID,sigTT,sigDB,sigDigits,sigLutIn) );
- CHECK( preProcessTower_getLutIn(eventBCID,ovTT,ovDB,normOverlayDigits,ovLutIn) );
+ CHECK( preProcessTower_getLutIn(event,sigTT,sigDB,sigDigits,sigLutIn) );
+ CHECK( preProcessTower_getLutIn(event,ovTT,ovDB,normOverlayDigits,ovLutIn) );
// LUT ouput
std::vector<int> lutOut_cp,lutOut_jep;
@@ -562,7 +556,7 @@ namespace LVL1 {
}
}
- StatusCode OverlayRun2TriggerTowerMaker::preProcessTower_getLutIn(const int eventBCID,xAOD::TriggerTower* tower,const L1CaloPprChanCalib* db,const std::vector<int>& digits,std::vector<int>& output)
+ StatusCode OverlayRun2TriggerTowerMaker::preProcessTower_getLutIn(const xAOD::EventInfo& event,xAOD::TriggerTower* tower,const L1CaloPprChanCalib* db,const std::vector<int>& digits,std::vector<int>& output)
{
// factorised version of OverlayRun2TriggerTowerMaker::preProcessTower
@@ -587,8 +581,8 @@ namespace LVL1 {
firPed,
etaToElement(tower->eta(), tower->layer()),
tower->layer(),
- eventBCID,
- m_lumiBlockMuTool->actualInteractionsPerCrossing(),
+ event.bcid(),
+ event.actualInteractionsPerCrossing(),
correction);
}
@@ -648,16 +642,16 @@ namespace LVL1 {
/** Emulate FIR filter, bunch-crossing identification & LUT, and create & fill
TriggerTowers. */
- StatusCode OverlayRun2TriggerTowerMaker::preProcess(const int eventBCID)
+ StatusCode OverlayRun2TriggerTowerMaker::preProcess(const xAOD::EventInfo& event)
{
// Loop over all existing towers and simulate preprocessor functions
for(auto tower : *m_xaodTowers) {
- CHECK(preProcessTower(eventBCID,tower));
+ CHECK(preProcessTower(event,tower));
}
return StatusCode::SUCCESS;
}
- StatusCode OverlayRun2TriggerTowerMaker::preProcessTower(const int eventBCID,xAOD::TriggerTower *tower)
+ StatusCode OverlayRun2TriggerTowerMaker::preProcessTower(const xAOD::EventInfo& event,xAOD::TriggerTower *tower)
{
const L1CaloPprChanCalib* chanCalib = m_chanCalibContainer->pprChanCalib(tower->coolId());
@@ -708,8 +702,8 @@ namespace LVL1 {
firPed,
etaToElement(tower->eta(), tower->layer()),
tower->layer(),
- eventBCID,
- m_lumiBlockMuTool->actualInteractionsPerCrossing(),
+ event.bcid(),
+ event.actualInteractionsPerCrossing(),
correction);
}
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.h b/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.h
index 6e6959f4ed65..3137b71a70d3 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.h
@@ -48,11 +48,11 @@
#include "TrigT1CaloCalibConditions/L1CaloPprChanDefaults.h"
// EDM include(s)
+#include "xAODEventInfo/EventInfo.h"
#include "xAODTrigL1Calo/TriggerTowerContainer.h"
#include "xAODTrigL1Calo/TriggerTowerAuxContainer.h"
// forward decl(s)
-class ILumiBlockMuTool;
class CaloLVL1_ID;
class CaloTriggerTowerService;
class L1CaloCondSvc;
@@ -65,7 +65,6 @@ class L1CaloPpmDeadChannelsContainer;
class L1CaloPpmDeadChannels;
class IAthRNGSvc;
-class ILumiBlockMuTool;
namespace ATHRNG {
class RNGWrapper;
}
@@ -163,7 +162,6 @@ private:
ToolHandle<IL1TriggerTowerTool> m_TTtool;
ToolHandle<IL1CaloMappingTool> m_mappingTool;
- ToolHandle<ILumiBlockMuTool> m_lumiBlockMuTool;
ToolHandle<LVL1BS::ITrigT1CaloDataAccessV2> m_bstowertool;
const CaloLVL1_ID* m_caloId; //non-owning ptr
@@ -219,15 +217,15 @@ private:
void digitize();
/** Simulate PreProcessing on analogue amplitudes */
- StatusCode preProcess(const int eventBCID);
- StatusCode preProcessTower(const int eventBCID,xAOD::TriggerTower* tower);
+ StatusCode preProcess(const xAOD::EventInfo& event);
+ StatusCode preProcessTower(const xAOD::EventInfo& event,xAOD::TriggerTower* tower);
/** Add overlay data **/
- virtual StatusCode addOverlay(const int eventBCID);
- virtual StatusCode addOverlay(const int eventBCID,xAOD::TriggerTower* sigTT,xAOD::TriggerTower* ovTT);
+ virtual StatusCode addOverlay(const xAOD::EventInfo& event);
+ virtual StatusCode addOverlay(const xAOD::EventInfo& event,xAOD::TriggerTower* sigTT,xAOD::TriggerTower* ovTT);
/** PreProcess up to LUT in **/
- StatusCode preProcessTower_getLutIn(const int eventBCID,xAOD::TriggerTower* tower,const L1CaloPprChanCalib* db,const std::vector<int>& digits,std::vector<int>& output);
+ StatusCode preProcessTower_getLutIn(const xAOD::EventInfo& event,xAOD::TriggerTower* tower,const L1CaloPprChanCalib* db,const std::vector<int>& digits,std::vector<int>& output);
/** calculate LUT out **/
StatusCode calcLutOutCP(const std::vector<int>& sigLutIn,const L1CaloPprChanCalib* sigDB,const std::vector<int>& ovLutIn,const L1CaloPprChanCalib* ovDB,std::vector<int>& output);
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx
index ab0b26eada8e..61282b5594e1 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx
@@ -24,7 +24,6 @@
#include "CaloIdentifier/CaloLVL1_ID.h"
#include "TileConditions/TileInfo.h"
-#include "LumiBlockComps/ILumiBlockMuTool.h"
#include "xAODEventInfo/EventInfo.h"
//For getting TriggerTowers from BS
@@ -38,6 +37,7 @@
// AthenaMT
#include "StoreGate/ReadHandle.h"
+#include "StoreGate/ReadDecorHandle.h"
#include "GaudiKernel/ThreadLocalContext.h"
#include "CLHEP/Random/RandGaussZiggurat.h"
@@ -82,10 +82,9 @@ namespace LVL1 {
m_rngSvc("AthRNGSvc", name),
m_condSvc("L1CaloCondSvc", name),
m_rndmADCs(0),
- m_TTtool("LVL1::L1TriggerTowerTool/L1TriggerTowerTool"),
- m_mappingTool("LVL1::PpmMappingTool/PpmMappingTool"),
- m_lumiBlockMuTool("LumiBlockMuTool/LumiBlockMuTool"),
- m_bstowertool("LVL1BS__TrigT1CaloDataAccessV2/TrigT1CaloDataAccessV2",0), //ACH
+ m_TTtool("LVL1::L1TriggerTowerTool/L1TriggerTowerTool", this),
+ m_mappingTool("LVL1::PpmMappingTool/PpmMappingTool", this),
+ m_bstowertool("LVL1BS__TrigT1CaloDataAccessV2/TrigT1CaloDataAccessV2", this),
m_caloId(0),
m_cpLutScale(1.),
m_jepLutScale(1.),
@@ -98,8 +97,8 @@ namespace LVL1 {
declareProperty("RngSvc", m_rngSvc, "Random number service");
declareProperty("DigiEngine", m_digiEngine = "TrigT1CaloSim_Digitization");
+ declareProperty("L1TriggerTowerTool", m_TTtool);
declareProperty("PpmMappingTool", m_mappingTool);
- declareProperty("LumiBlockMuTool", m_lumiBlockMuTool);
declareProperty("inputTTLocation", m_inputTTLocation=TrigT1CaloDefs::xAODTriggerTowerLocation);
declareProperty("EmTTL1ContainerName",m_EmTTL1ContainerName= "LArTTL1EM");
@@ -167,7 +166,6 @@ namespace LVL1 {
CHECK(m_mappingTool.retrieve());
CHECK(m_TTtool.retrieve());
CHECK(m_rngSvc.retrieve());
- CHECK(m_lumiBlockMuTool.retrieve());
CHECK(m_condSvc.retrieve());
CHECK(m_bstowertool.retrieve());
@@ -186,6 +184,7 @@ namespace LVL1 {
m_xaodTowersAmps.assign(7168, std::vector<double>());
ATH_CHECK(m_xaodevtKey.initialize());
+ ATH_CHECK(m_actMuKey.initialize());
ATH_CHECK(m_inputTTLocation.initialize());
@@ -340,21 +339,22 @@ namespace LVL1 {
case TTL1:
ATH_MSG_VERBOSE("Looking for calo towers");
CHECK(getCaloTowers());
- digitize(); // digitisation
+ digitize(ctx); // digitisation
break;
default:
ATH_MSG_ERROR("Unsupported Cell Type!!!!!!"); return StatusCode::FAILURE;
}
- // Pedestal Correction: Get the BCID number
- SG::ReadHandle<xAOD::EventInfo> evt(m_xaodevtKey);
+ SG::ReadHandle<xAOD::EventInfo> evt(m_xaodevtKey, ctx);
+ SG::ReadDecorHandle<xAOD::EventInfo,float> muDecor(m_actMuKey, ctx);
CHECK(evt.isValid());
- int eventBCID = evt->bcid();
-
- CHECK(preProcess(eventBCID)); // FIR, BCID etc
-
+ CHECK(muDecor.isPresent());
+ const float mu = muDecor(0);
+
+ CHECK(preProcess(evt->bcid(), mu)); // FIR, BCID etc
+
if (m_doOverlay) {
- CHECK( addOverlay(eventBCID) );
+ CHECK( addOverlay(evt->bcid(), mu) );
}
// store them thar trigger towers
@@ -386,7 +386,7 @@ namespace LVL1 {
return false;
}
- StatusCode Run2TriggerTowerMaker::addOverlay(const int eventBCID)
+ StatusCode Run2TriggerTowerMaker::addOverlay(int bcid,float mu)
{
// Get the overlay data TTs from Bytestream
xAOD::TriggerTowerContainer* overlayDataTTs = new xAOD::TriggerTowerContainer();
@@ -429,7 +429,7 @@ namespace LVL1 {
Itr match = overlayMap.find( tt->coolId() );
if (match != overlayMap.end()) {
- CHECK( addOverlay(eventBCID,tt,(*match).second) );
+ CHECK( addOverlay(bcid,mu,tt,(*match).second) );
// Let the overlay TT know that it has been used
(*match).second->auxdecor<char>(decor_name) = decor_ttUsedInOverlay;
@@ -464,7 +464,7 @@ namespace LVL1 {
}
/** Add the overlay TriggerTower to the signal TriggerTower **/
- StatusCode Run2TriggerTowerMaker::addOverlay(const int eventBCID,xAOD::TriggerTower* sigTT,xAOD::TriggerTower* ovTT)
+ StatusCode Run2TriggerTowerMaker::addOverlay(int bcid,float mu,xAOD::TriggerTower* sigTT,xAOD::TriggerTower* ovTT)
{
// Get the relevant databases
const L1CaloPprChanCalib* sigDB = m_chanCalibContainer->pprChanCalib(sigTT->coolId());
@@ -489,8 +489,8 @@ namespace LVL1 {
// Get LUT input
std::vector<int> sigLutIn,ovLutIn;
- CHECK( preProcessTower_getLutIn(eventBCID,sigTT,sigDB,sigDigits,sigLutIn) );
- CHECK( preProcessTower_getLutIn(eventBCID,ovTT,ovDB,normOverlayDigits,ovLutIn) );
+ CHECK( preProcessTower_getLutIn(bcid,mu,sigTT,sigDB,sigDigits,sigLutIn) );
+ CHECK( preProcessTower_getLutIn(bcid,mu,ovTT,ovDB,normOverlayDigits,ovLutIn) );
// LUT ouput
std::vector<int> lutOut_cp,lutOut_jep;
@@ -586,7 +586,7 @@ namespace LVL1 {
}
}
- StatusCode Run2TriggerTowerMaker::preProcessTower_getLutIn(const int eventBCID,xAOD::TriggerTower* tower,const L1CaloPprChanCalib* db,const std::vector<int>& digits,std::vector<int>& output)
+ StatusCode Run2TriggerTowerMaker::preProcessTower_getLutIn(int bcid,float mu,xAOD::TriggerTower* tower,const L1CaloPprChanCalib* db,const std::vector<int>& digits,std::vector<int>& output)
{
// factorised version of Run2TriggerTowerMaker::preProcessTower
@@ -611,8 +611,8 @@ namespace LVL1 {
firPed,
etaToElement(tower->eta(), tower->layer()),
tower->layer(),
- eventBCID,
- m_lumiBlockMuTool->actualInteractionsPerCrossing(),
+ bcid,
+ mu,
correction);
}
@@ -672,16 +672,16 @@ namespace LVL1 {
/** Emulate FIR filter, bunch-crossing identification & LUT, and create & fill
TriggerTowers. */
- StatusCode Run2TriggerTowerMaker::preProcess(const int eventBCID)
+ StatusCode Run2TriggerTowerMaker::preProcess(int bcid,float mu)
{
// Loop over all existing towers and simulate preprocessor functions
for(auto tower : *m_xaodTowers) {
- CHECK(preProcessTower(eventBCID,tower));
+ CHECK(preProcessTower(bcid,mu,tower));
}
return StatusCode::SUCCESS;
}
- StatusCode Run2TriggerTowerMaker::preProcessTower(const int eventBCID,xAOD::TriggerTower *tower)
+ StatusCode Run2TriggerTowerMaker::preProcessTower(int bcid,float mu,xAOD::TriggerTower *tower)
{
const L1CaloPprChanCalib* chanCalib = m_chanCalibContainer->pprChanCalib(tower->coolId());
@@ -732,8 +732,8 @@ namespace LVL1 {
firPed,
etaToElement(tower->eta(), tower->layer()),
tower->layer(),
- eventBCID,
- m_lumiBlockMuTool->actualInteractionsPerCrossing(),
+ bcid,
+ mu,
correction);
}
@@ -1124,9 +1124,8 @@ namespace LVL1 {
}
/** Digitize pulses and store results back in xAOD::TriggerTowers */
- void Run2TriggerTowerMaker::digitize()
+ void Run2TriggerTowerMaker::digitize(const EventContext& ctx)
{
- const EventContext& ctx = Gaudi::Hive::currentContext();
CLHEP::HepRandomEngine* rndmADCs = m_rndmADCs->getEngine (ctx);
// Loop over all existing towers and digitize pulses
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.h b/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.h
index 06122175b718..867944653966 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.h
@@ -39,6 +39,7 @@
#include "GaudiKernel/ToolHandle.h"
#include "AthContainers/DataVector.h"
#include "StoreGate/ReadHandleKey.h"
+#include "StoreGate/ReadDecorHandleKey.h"
#include "xAODEventInfo/EventInfo.h"
//Calorimeter tower includes
@@ -56,7 +57,6 @@
#include "xAODTrigL1Calo/TriggerTowerAuxContainer.h"
// forward decl(s)
-class ILumiBlockMuTool;
class CaloLVL1_ID;
class CaloTriggerTowerService;
class L1CaloCondSvc;
@@ -69,7 +69,6 @@ class L1CaloPpmDeadChannelsContainer;
class L1CaloPpmDeadChannels;
class IAthRNGSvc;
-class ILumiBlockMuTool;
namespace ATHRNG {
class RNGWrapper;
}
@@ -156,7 +155,6 @@ private:
ToolHandle<IL1TriggerTowerTool> m_TTtool;
ToolHandle<IL1CaloMappingTool> m_mappingTool;
- ToolHandle<ILumiBlockMuTool> m_lumiBlockMuTool;
ToolHandle<LVL1BS::ITrigT1CaloDataAccessV2> m_bstowertool;
const CaloLVL1_ID* m_caloId; //non-owning ptr
@@ -211,18 +209,18 @@ private:
StatusCode getCaloTowers();
/** Convert analogue pulses to digits */
- void digitize();
+ void digitize(const EventContext& ctx);
/** Simulate PreProcessing on analogue amplitudes */
- StatusCode preProcess(const int eventBCID);
- StatusCode preProcessTower(const int eventBCID,xAOD::TriggerTower* tower);
+ StatusCode preProcess(int bcid,float mu);
+ StatusCode preProcessTower(int bcid,float mu,xAOD::TriggerTower* tower);
/** Add overlay data **/
- virtual StatusCode addOverlay(const int eventBCID);
- virtual StatusCode addOverlay(const int eventBCID,xAOD::TriggerTower* sigTT,xAOD::TriggerTower* ovTT);
+ virtual StatusCode addOverlay(int bcid,float mu);
+ virtual StatusCode addOverlay(int bcid,float mu,xAOD::TriggerTower* sigTT,xAOD::TriggerTower* ovTT);
/** PreProcess up to LUT in **/
- StatusCode preProcessTower_getLutIn(const int eventBCID,xAOD::TriggerTower* tower,const L1CaloPprChanCalib* db,const std::vector<int>& digits,std::vector<int>& output);
+ StatusCode preProcessTower_getLutIn(int bcid,float mu,xAOD::TriggerTower* tower,const L1CaloPprChanCalib* db,const std::vector<int>& digits,std::vector<int>& output);
/** calculate LUT out **/
StatusCode calcLutOutCP(const std::vector<int>& sigLutIn,const L1CaloPprChanCalib* sigDB,const std::vector<int>& ovLutIn,const L1CaloPprChanCalib* ovDB,std::vector<int>& output);
@@ -258,7 +256,6 @@ private:
int EtRange(int et, unsigned short bcidEnergyRangeLow, unsigned short bcidEnergyRangeHigh) const;
// void preProcessLayer(int layer, int eventBCID, InternalTriggerTower* tower, std::vector<int>& etResultVector, std::vector<int>& bcidResultVector);
- StatusCode preProcessTower(xAOD::TriggerTower* tower, int eventBCID);
int etaToElement(float feta, int layer) const;
@@ -269,6 +266,8 @@ private:
// Read and Write Handlers
// --------------------------------------------------------------------------
SG::ReadHandleKey<xAOD::EventInfo> m_xaodevtKey;
+ SG::ReadDecorHandleKey<xAOD::EventInfo> m_actMuKey { this, "actualInteractionsPerCrossingKey", "EventInfo.actualInteractionsPerCrossing", "Decoration for actual interactions per crossing" };
+
// location of input TriggerTowers (for reprocessing)
SG::ReadHandleKey<xAOD::TriggerTowerContainer> m_inputTTLocation;
// locations within StoreGate to store collections of Trigger Towers
--
GitLab
From 1c24d1617dbe82036ecaa73c59692bea1959a6da Mon Sep 17 00:00:00 2001
From: Frank Berghaus <frank.berghaus@cern.ch>
Date: Fri, 13 Aug 2021 18:29:44 +0000
Subject: [PATCH 038/272] xAODMetaDataCnv: Use TagInfoMgr on first event or
EndInputFile Fix ATLASSIM-5368
---
.../share/AthenaPoolExample_Concat.ref | 94 ++++++++--
.../share/AthenaPoolExample_Copy.ref | 30 ++--
.../share/AthenaPoolExample_RCond.ref | 26 ++-
.../share/AthenaPoolExample_RMeta.ref | 28 +--
.../share/AthenaPoolExample_ReWrite.ref | 30 ++--
.../share/AthenaPoolExample_ReWriteAgain.ref | 4 +-
.../share/AthenaPoolExample_ReWriteNext.ref | 4 +-
.../share/AthenaPoolExample_Read.ref | 142 +++++++++------
.../share/AthenaPoolExample_ReadAgain.ref | 116 +++++++-----
.../share/AthenaPoolExample_ReadConcat.ref | 168 +++++++++++-------
.../share/AthenaPoolExample_WCond.ref | 26 ++-
.../share/AthenaPoolExample_WMeta.ref | 51 ++++--
.../share/AthenaPoolExample_Write.ref | 135 +++++++++++---
.../src/FileMetaDataCreatorTool.cxx | 20 ++-
14 files changed, 604 insertions(+), 270 deletions(-)
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Concat.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Concat.ref
index e4bbb3c29694..4fa3d3c4be5f 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Concat.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Concat.ref
@@ -292,6 +292,8 @@ SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[8 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:float
SimplePoolFile1... DEBUG ---->[0]:float Typ:float [10] Size:0 Offset:0 #Elements:1
+Stream1.FileMet... DEBUG beam energy "" tag could not be converted to float
+Stream1.FileMet... DEBUG Failed to retrieve 'SimInfoKey':'/Simulation/Parameters' => cannot set: xAOD::FileMetaData::simFlavour, and xAOD::FileMetaData::isDataOverlay
Stream1.FileMet... DEBUG Retrieved 'EventInfoKey':'EventInfo'
Stream1.FileMet... DEBUG setting xAOD::FileMetaData::mcProcID to 0
Stream1.FileMet... DEBUG Retrieved 'StreamName':'Stream1'
@@ -475,6 +477,8 @@ SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[8 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:float
SimplePoolFile3... DEBUG ---->[0]:float Typ:float [10] Size:0 Offset:0 #Elements:1
+Stream2.FileMet... DEBUG beam energy "" tag could not be converted to float
+Stream2.FileMet... DEBUG Failed to retrieve 'SimInfoKey':'/Simulation/Parameters' => cannot set: xAOD::FileMetaData::simFlavour, and xAOD::FileMetaData::isDataOverlay
Stream2.FileMet... DEBUG Retrieved 'EventInfoKey':'EventInfo'
Stream2.FileMet... DEBUG setting xAOD::FileMetaData::mcProcID to 0
Stream2.FileMet... DEBUG Retrieved 'StreamName':'Stream2'
@@ -1624,11 +1628,11 @@ AthenaEventLoopMgr INFO ===>>> done processing event #19, run #1 20 events
Stream1 DEBUG AthenaOutputStream Stream1 ::stop()
Stream2 DEBUG AthenaOutputStream Stream2 ::stop()
Stream1 DEBUG slot 0 handle() incident type: MetaDataStop
-Stream1.FileMet... DEBUG Not writing empty or incomplete FileMetaData object
Stream1 DEBUG addItemObjects(73252552,"FileMetaDataAux.") called
Stream1 DEBUG Key:FileMetaDataAux.
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+Stream1 DEBUG Added object 73252552,"FileMetaDataAux."
Stream1 DEBUG addItemObjects(167728019,"Stream1") called
Stream1 DEBUG Key:Stream1
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
@@ -1638,6 +1642,7 @@ Stream1 DEBUG addItemObjects(178309087,"FileMetaData") called
Stream1 DEBUG Key:FileMetaData
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+Stream1 DEBUG Added object 178309087,"FileMetaData"
Stream1 DEBUG addItemObjects(243004407,"EventFormatStream1") called
Stream1 DEBUG Key:EventFormatStream1
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
@@ -1650,27 +1655,51 @@ Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
Stream1 DEBUG Added object 1316383046,"/TagInfo"
Stream1 DEBUG connectOutput done for SimplePoolFile1.root
StorageSvc INFO Building shape according to reflection information using shape ID for:
+StorageSvc INFO xAOD::FileMetaDataAuxInfo_v1 [????]
+SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.)
+MetaData(xAOD::... DEBUG Opening
+MetaData(xAOD::... DEBUG attributes# = 1
+MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.'
+MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) of type ROOT_Tree
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (14 , ffffffff)
+SimplePoolFile1... DEBUG ---->ClassID:????
+SimplePoolFile1... DEBUG --->Adding Shape[9 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG ---->Class:xAOD::FileMetaDataAuxInfo_v1
+SimplePoolFile1... DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
+StorageSvc INFO Building shape according to reflection information using shape ID for:
StorageSvc INFO EventStreamInfo_p3 [????]
SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(EventStreamInfo_p3/Stream1)
MetaData(EventS... DEBUG Opening
MetaData(EventS... DEBUG attributes# = 1
MetaData(EventS... DEBUG Branch container 'EventStreamInfo_p3_Stream1'
MetaData(EventS... DEBUG Opened container MetaData(EventStreamInfo_p3/Stream1) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream1) [203] (14 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream1) [203] (15 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Adding Shape[9 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG --->Adding Shape[10 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:EventStreamInfo_p3
SimplePoolFile1... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
StorageSvc INFO Building shape according to reflection information using shape ID for:
+StorageSvc INFO xAOD::FileMetaData_v1 [????]
+SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::FileMetaData_v1/FileMetaData)
+MetaData(xAOD::... DEBUG Opening
+MetaData(xAOD::... DEBUG attributes# = 1
+MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaData_v1_FileMetaData'
+MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaData_v1/FileMetaData) of type ROOT_Tree
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (16 , ffffffff)
+SimplePoolFile1... DEBUG ---->ClassID:????
+SimplePoolFile1... DEBUG --->Adding Shape[11 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG ---->Class:xAOD::FileMetaData_v1
+SimplePoolFile1... DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
+StorageSvc INFO Building shape according to reflection information using shape ID for:
StorageSvc INFO xAOD::EventFormat_v1 [????]
SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::EventFormat_v1/EventFormatStream1)
MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream1'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream1) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (15 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (17 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Adding Shape[10 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG --->Adding Shape[12 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:xAOD::EventFormat_v1
SimplePoolFile1... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
StorageSvc INFO Building shape according to reflection information using shape ID for:
@@ -1680,9 +1709,9 @@ MetaData(IOVMet... DEBUG Opening
MetaData(IOVMet... DEBUG attributes# = 1
MetaData(IOVMet... DEBUG Branch container 'IOVMetaDataContainer_p1__TagInfo'
MetaData(IOVMet... DEBUG Opened container MetaData(IOVMetaDataContainer_p1//TagInfo) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (16 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (18 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Adding Shape[11 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG --->Adding Shape[13 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:IOVMetaDataContainer_p1
SimplePoolFile1... DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdr(DataHeader)
@@ -1690,23 +1719,27 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [203] (17 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [203] (19 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [203] (18 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [203] (1a , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
+MetaData(xAOD::... DEBUG SG::IAuxStoreIO* detected in xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.
+MetaData(xAOD::... DEBUG Attributes= 1
+MetaData(xAOD::... DEBUG Creating branch for new dynamic attribute, Id=52: type=float, mcProcID
+MetaData(xAOD::... DEBUG createBasicAuxBranch: xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAuxDyn.mcProcID, leaf:mcProcID/F
Stream1 INFO Metadata records written: 21
Stream1 DEBUG Leaving incident handler for MetaDataStop
Stream2 DEBUG slot 0 handle() incident type: MetaDataStop
-Stream2.FileMet... DEBUG Not writing empty or incomplete FileMetaData object
Stream2 DEBUG addItemObjects(73252552,"FileMetaDataAux.") called
Stream2 DEBUG Key:FileMetaDataAux.
Stream2 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream2 DEBUG Comp Attr 0 with 15 mantissa bits.
+Stream2 DEBUG Added object 73252552,"FileMetaDataAux."
Stream2 DEBUG addItemObjects(167728019,"Stream2") called
Stream2 DEBUG Key:Stream2
Stream2 DEBUG Comp Attr 0 with 7 mantissa bits.
@@ -1716,6 +1749,7 @@ Stream2 DEBUG addItemObjects(178309087,"FileMetaData") called
Stream2 DEBUG Key:FileMetaData
Stream2 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream2 DEBUG Comp Attr 0 with 15 mantissa bits.
+Stream2 DEBUG Added object 178309087,"FileMetaData"
Stream2 DEBUG addItemObjects(243004407,"EventFormatStream2") called
Stream2 DEBUG Key:EventFormatStream2
Stream2 DEBUG Comp Attr 0 with 7 mantissa bits.
@@ -1727,24 +1761,44 @@ Stream2 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream2 DEBUG Comp Attr 0 with 15 mantissa bits.
Stream2 DEBUG Added object 1316383046,"/TagInfo"
Stream2 DEBUG connectOutput done for SimplePoolFile3.root
+SimplePoolFile3... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.)
+MetaData(xAOD::... DEBUG Opening
+MetaData(xAOD::... DEBUG attributes# = 1
+MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.'
+MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) of type ROOT_Tree
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (14 , ffffffff)
+SimplePoolFile3... DEBUG ---->ClassID:????
+SimplePoolFile3... DEBUG --->Adding Shape[9 , ????]: [1 Column(s)]
+SimplePoolFile3... DEBUG ---->Class:xAOD::FileMetaDataAuxInfo_v1
+SimplePoolFile3... DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile3... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(EventStreamInfo_p3/Stream2)
MetaData(EventS... DEBUG Opening
MetaData(EventS... DEBUG attributes# = 1
MetaData(EventS... DEBUG Branch container 'EventStreamInfo_p3_Stream2'
MetaData(EventS... DEBUG Opened container MetaData(EventStreamInfo_p3/Stream2) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream2) [203] (14 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream2) [203] (15 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Adding Shape[9 , ????]: [1 Column(s)]
+SimplePoolFile3... DEBUG --->Adding Shape[10 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:EventStreamInfo_p3
SimplePoolFile3... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile3... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::FileMetaData_v1/FileMetaData)
+MetaData(xAOD::... DEBUG Opening
+MetaData(xAOD::... DEBUG attributes# = 1
+MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaData_v1_FileMetaData'
+MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaData_v1/FileMetaData) of type ROOT_Tree
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (16 , ffffffff)
+SimplePoolFile3... DEBUG ---->ClassID:????
+SimplePoolFile3... DEBUG --->Adding Shape[11 , ????]: [1 Column(s)]
+SimplePoolFile3... DEBUG ---->Class:xAOD::FileMetaData_v1
+SimplePoolFile3... DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile3... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::EventFormat_v1/EventFormatStream2)
MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream2'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream2) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [203] (15 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [203] (17 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Adding Shape[10 , ????]: [1 Column(s)]
+SimplePoolFile3... DEBUG --->Adding Shape[12 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:xAOD::EventFormat_v1
SimplePoolFile3... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile3... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(IOVMetaDataContainer_p1//TagInfo)
@@ -1752,9 +1806,9 @@ MetaData(IOVMet... DEBUG Opening
MetaData(IOVMet... DEBUG attributes# = 1
MetaData(IOVMet... DEBUG Branch container 'IOVMetaDataContainer_p1__TagInfo'
MetaData(IOVMet... DEBUG Opened container MetaData(IOVMetaDataContainer_p1//TagInfo) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (16 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (18 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Adding Shape[11 , ????]: [1 Column(s)]
+SimplePoolFile3... DEBUG --->Adding Shape[13 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:IOVMetaDataContainer_p1
SimplePoolFile3... DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile3... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdr(DataHeader)
@@ -1762,15 +1816,19 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [203] (17 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [203] (19 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [203] (18 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [203] (1a , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
+MetaData(xAOD::... DEBUG SG::IAuxStoreIO* detected in xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.
+MetaData(xAOD::... DEBUG Attributes= 1
+MetaData(xAOD::... DEBUG Creating branch for new dynamic attribute, Id=52: type=float, mcProcID
+MetaData(xAOD::... DEBUG createBasicAuxBranch: xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAuxDyn.mcProcID, leaf:mcProcID/F
Stream2 INFO Metadata records written: 21
Stream2 DEBUG Leaving incident handler for MetaDataStop
PoolSvc DEBUG Disconnect request for contextId=0
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Copy.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Copy.ref
index e93f66d743e5..6f01bdecd9d7 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Copy.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Copy.ref
@@ -29,12 +29,16 @@ SimplePoolFile1... DEBUG ---->[0]:Token Typ:Token [18] Size:0 Offset:0 #Element
SimplePoolFile1... DEBUG --->Reading Shape[5 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->[0]:unsigned int Typ:unsigned int [3] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --->Reading Shape[6 , ????]: [1 Column(s)]
-SimplePoolFile1... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile1... DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --->Reading Shape[7 , ????]: [1 Column(s)]
-SimplePoolFile1... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile1... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --->Reading Shape[8 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile1... DEBUG --->Reading Shape[9 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile1... DEBUG --->Reading Shape[10 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 9 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 11 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -57,17 +61,21 @@ SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber) [202] (a , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [203] (b , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (b , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (c , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [203] (c , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (d , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (d , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (e , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (e , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (f , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (f , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 14 Entries in total.
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (10 , ffffffff)
+SimplePoolFile1... DEBUG ---->ClassID:????
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (11 , ffffffff)
+SimplePoolFile1... DEBUG ---->ClassID:????
+##Links DEBUG No objects passing selection criteria... Container has 16 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -126,8 +134,6 @@ RootDatabase.se... DEBUG File name SimplePoolFile1.root
RootDatabase.se... DEBUG Got tree CollectionTree read entry -1
RootDatabase.se... DEBUG Using Tree cache. Size: -1 Nevents to learn with: -1
AthenaPoolCnvSvc DEBUG setAttribute TREE_CACHE to -1 for db: SimplePoolFile1.root and cont: CollectionTree
-Stream1.FileMet... DEBUG beam energy tag could not be converted to float
-Stream1.FileMet... DEBUG Failed to retrieve 'SimInfoKey':'/Simulation/Parameters' => cannot set: xAOD::FileMetaData::simFlavour, and xAOD::FileMetaData::isDataOverlay
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000].
@@ -349,6 +355,8 @@ SimplePoolRepli... DEBUG ---->ClassID:????
SimplePoolRepli... DEBUG --->Adding Shape[8 , ????]: [1 Column(s)]
SimplePoolRepli... DEBUG ---->Class:float
SimplePoolRepli... DEBUG ---->[0]:float Typ:float [10] Size:0 Offset:0 #Elements:1
+Stream1.FileMet... DEBUG beam energy "" tag could not be converted to float
+Stream1.FileMet... DEBUG Failed to retrieve 'SimInfoKey':'/Simulation/Parameters' => cannot set: xAOD::FileMetaData::simFlavour, and xAOD::FileMetaData::isDataOverlay
Stream1.FileMet... DEBUG Retrieved 'EventInfoKey':'EventInfo'
Stream1.FileMet... DEBUG setting xAOD::FileMetaData::mcProcID to 0
Stream1.FileMet... DEBUG Retrieved 'StreamName':'Stream1'
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RCond.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RCond.ref
index 3d1abea1edfd..0c06e5d5ae23 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RCond.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RCond.ref
@@ -39,12 +39,16 @@ SimplePoolFile1... DEBUG ---->[0]:unsigned long long Typ:unsigned long long [23
SimplePoolFile1... DEBUG --->Reading Shape[8 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->[0]:float Typ:float [10] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --->Reading Shape[9 , ????]: [1 Column(s)]
-SimplePoolFile1... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile1... DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --->Reading Shape[10 , ????]: [1 Column(s)]
-SimplePoolFile1... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile1... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --->Reading Shape[11 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile1... DEBUG --->Reading Shape[12 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile1... DEBUG --->Reading Shape[13 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 12 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 14 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -85,17 +89,21 @@ SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(BunchId) [20
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventWeight) [202] (13 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [203] (14 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (14 , ffffffff)
+SimplePoolFile1... DEBUG ---->ClassID:????
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [203] (15 , ffffffff)
+SimplePoolFile1... DEBUG ---->ClassID:????
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (16 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (15 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (17 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (16 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (18 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (17 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (19 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (18 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (1a , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 23 Entries in total.
+##Links DEBUG No objects passing selection criteria... Container has 25 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RMeta.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RMeta.ref
index 16a17a90dd0e..3ea01b9e256d 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RMeta.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RMeta.ref
@@ -38,12 +38,16 @@ SimplePoolFile5... DEBUG ---->[0]:unsigned long long Typ:unsigned long long [23
SimplePoolFile5... DEBUG --->Reading Shape[8 , ????]: [1 Column(s)]
SimplePoolFile5... DEBUG ---->[0]:float Typ:float [10] Size:0 Offset:0 #Elements:1
SimplePoolFile5... DEBUG --->Reading Shape[9 , ????]: [1 Column(s)]
-SimplePoolFile5... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile5... DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile5... DEBUG --->Reading Shape[10 , ????]: [1 Column(s)]
-SimplePoolFile5... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile5... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile5... DEBUG --->Reading Shape[11 , ????]: [1 Column(s)]
+SimplePoolFile5... DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile5... DEBUG --->Reading Shape[12 , ????]: [1 Column(s)]
+SimplePoolFile5... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile5... DEBUG --->Reading Shape[13 , ????]: [1 Column(s)]
SimplePoolFile5... DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 12 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 14 Entries in total.
SimplePoolFile5... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -84,19 +88,23 @@ SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(BunchId) [20
SimplePoolFile5... DEBUG ---->ClassID:????
SimplePoolFile5... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventWeight) [202] (13 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaData(ExampleHitContainer_p1/PedestalWriteData) [202] (14 , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [202] (14 , ffffffff)
+SimplePoolFile5... DEBUG ---->ClassID:????
+SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaData(ExampleHitContainer_p1/PedestalWriteData) [202] (15 , ffffffff)
+SimplePoolFile5... DEBUG ---->ClassID:????
+SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [202] (16 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [202] (15 , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [202] (17 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [202] (16 , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [202] (18 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [202] (17 , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [202] (19 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [202] (18 , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [202] (1a , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [202] (19 , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [202] (1b , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 24 Entries in total.
+##Links DEBUG No objects passing selection criteria... Container has 26 Entries in total.
SimplePoolFile5... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWrite.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWrite.ref
index 5a11227a4024..9bf1f6ee41e1 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWrite.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWrite.ref
@@ -32,12 +32,16 @@ SimplePoolFile1... DEBUG ---->[0]:Token Typ:Token [18] Size:0 Offset:0 #Element
SimplePoolFile1... DEBUG --->Reading Shape[5 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->[0]:unsigned int Typ:unsigned int [3] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --->Reading Shape[6 , ????]: [1 Column(s)]
-SimplePoolFile1... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile1... DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --->Reading Shape[7 , ????]: [1 Column(s)]
-SimplePoolFile1... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile1... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --->Reading Shape[8 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile1... DEBUG --->Reading Shape[9 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile1... DEBUG --->Reading Shape[10 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 9 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 11 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -60,17 +64,21 @@ SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber) [202] (a , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [203] (b , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (b , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (c , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [203] (c , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (d , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (d , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (e , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (e , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (f , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (f , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 14 Entries in total.
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (10 , ffffffff)
+SimplePoolFile1... DEBUG ---->ClassID:????
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (11 , ffffffff)
+SimplePoolFile1... DEBUG ---->ClassID:????
+##Links DEBUG No objects passing selection criteria... Container has 16 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -144,8 +152,6 @@ MetaDataSvc DEBUG handle() BeginInputFile for SimplePoolFile1.root
MetaDataSvc DEBUG initInputMetaDataStore: file name SimplePoolFile1.root
MetaDataSvc DEBUG Loaded input meta data store proxies
MetaDataSvc DEBUG calling beginInputFile for ToolSvc.IOVDbMetaDataTool
-Stream1.FileMet... DEBUG beam energy tag could not be converted to float
-Stream1.FileMet... DEBUG Failed to retrieve 'SimInfoKey':'/Simulation/Parameters' => cannot set: xAOD::FileMetaData::simFlavour, and xAOD::FileMetaData::isDataOverlay
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000].
@@ -351,6 +357,8 @@ SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLCollectionTree(MagicNumber)
SimplePoolFile3... DEBUG ---->ClassID:????
MetaDataSvc DEBUG MetaDataSvc will handle EventStreamInfo ClassID: 167728019
MetaDataSvc DEBUG MetaDataSvc will handle xAOD::EventFormat_v1 ClassID: 243004407
+Stream1.FileMet... DEBUG beam energy "" tag could not be converted to float
+Stream1.FileMet... DEBUG Failed to retrieve 'SimInfoKey':'/Simulation/Parameters' => cannot set: xAOD::FileMetaData::simFlavour, and xAOD::FileMetaData::isDataOverlay
Stream1.FileMet... DEBUG Retrieved 'EventInfoKey':'EventInfo'
Stream1.FileMet... DEBUG setting xAOD::FileMetaData::mcProcID to 0
Stream1.FileMet... DEBUG Retrieved 'StreamName':'Stream1'
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteAgain.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteAgain.ref
index 3713f3292e0d..68fab88d6c14 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteAgain.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteAgain.ref
@@ -176,8 +176,6 @@ MetaDataSvc DEBUG handle() BeginInputFile for SimplePoolReplica1.root
MetaDataSvc DEBUG initInputMetaDataStore: file name SimplePoolReplica1.root
MetaDataSvc DEBUG Loaded input meta data store proxies
MetaDataSvc DEBUG calling beginInputFile for ToolSvc.IOVDbMetaDataTool
-Stream1.FileMet... DEBUG beam energy tag could not be converted to float
-Stream1.FileMet... DEBUG Failed to retrieve 'SimInfoKey':'/Simulation/Parameters' => cannot set: xAOD::FileMetaData::simFlavour, and xAOD::FileMetaData::isDataOverlay
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000].
@@ -383,6 +381,8 @@ SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLCollectionTree(MagicNumber)
SimplePoolFile3... DEBUG ---->ClassID:????
MetaDataSvc DEBUG MetaDataSvc will handle EventStreamInfo ClassID: 167728019
MetaDataSvc DEBUG MetaDataSvc will handle xAOD::EventFormat_v1 ClassID: 243004407
+Stream1.FileMet... DEBUG beam energy "" tag could not be converted to float
+Stream1.FileMet... DEBUG Failed to retrieve 'SimInfoKey':'/Simulation/Parameters' => cannot set: xAOD::FileMetaData::simFlavour, and xAOD::FileMetaData::isDataOverlay
Stream1.FileMet... DEBUG Retrieved 'EventInfoKey':'EventInfo'
Stream1.FileMet... DEBUG setting xAOD::FileMetaData::mcProcID to 0
Stream1.FileMet... DEBUG Retrieved 'StreamName':'Stream1'
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteNext.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteNext.ref
index 2bfa2621bfc4..d6984dd6eb53 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteNext.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteNext.ref
@@ -152,8 +152,6 @@ MetaDataSvc DEBUG handle() BeginInputFile for SimplePoolFile3.root
MetaDataSvc DEBUG initInputMetaDataStore: file name SimplePoolFile3.root
MetaDataSvc DEBUG Loaded input meta data store proxies
MetaDataSvc DEBUG calling beginInputFile for ToolSvc.IOVDbMetaDataTool
-Stream1.FileMet... DEBUG beam energy tag could not be converted to float
-Stream1.FileMet... DEBUG Failed to retrieve 'SimInfoKey':'/Simulation/Parameters' => cannot set: xAOD::FileMetaData::simFlavour, and xAOD::FileMetaData::isDataOverlay
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000000].
@@ -325,6 +323,8 @@ SimplePoolFile4... DEBUG --->Adding Assoc :????/POOLCollectionTree(MagicNumber)
SimplePoolFile4... DEBUG ---->ClassID:????
MetaDataSvc DEBUG MetaDataSvc will handle EventStreamInfo ClassID: 167728019
MetaDataSvc DEBUG MetaDataSvc will handle xAOD::EventFormat_v1 ClassID: 243004407
+Stream1.FileMet... DEBUG beam energy "" tag could not be converted to float
+Stream1.FileMet... DEBUG Failed to retrieve 'SimInfoKey':'/Simulation/Parameters' => cannot set: xAOD::FileMetaData::simFlavour, and xAOD::FileMetaData::isDataOverlay
Stream1.FileMet... DEBUG Retrieved 'EventInfoKey':'EventInfo'
Stream1.FileMet... DEBUG setting xAOD::FileMetaData::mcProcID to 0
Stream1.FileMet... DEBUG Retrieved 'StreamName':'Stream1'
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Read.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Read.ref
index de2d04d1b7b3..ff8fcec075e9 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Read.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Read.ref
@@ -19,33 +19,41 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Shape
##Shapes DEBUG attributes# = 1
##Shapes DEBUG Opened container ##Shapes of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Shape[0 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[1 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[2 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[3 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[4 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[5 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[6 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:DataHeaderForm_p6 Typ:DataHeaderForm_p6 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 5 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 7 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
##Links DEBUG Opened container ##Links of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (3 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (3 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (4 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (6 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (7 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (7 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (8 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 6 Entries in total.
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (9 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+##Links DEBUG No objects passing selection criteria... Container has 8 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -80,12 +88,16 @@ SimplePoolFile1... DEBUG ---->[0]:Token Typ:Token [18] Size:0 Offset:0 #Element
SimplePoolFile1... DEBUG --->Reading Shape[5 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->[0]:unsigned int Typ:unsigned int [3] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --->Reading Shape[6 , ????]: [1 Column(s)]
-SimplePoolFile1... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile1... DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --->Reading Shape[7 , ????]: [1 Column(s)]
-SimplePoolFile1... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile1... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --->Reading Shape[8 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile1... DEBUG --->Reading Shape[9 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile1... DEBUG --->Reading Shape[10 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 9 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 11 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -108,17 +120,21 @@ SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber) [202] (a , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [203] (b , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (b , ffffffff)
+SimplePoolFile1... DEBUG ---->ClassID:????
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [203] (c , ffffffff)
+SimplePoolFile1... DEBUG ---->ClassID:????
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (d , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (c , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (e , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (d , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (f , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (e , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (10 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (f , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (11 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 14 Entries in total.
+##Links DEBUG No objects passing selection criteria... Container has 16 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -158,33 +174,41 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Shape
##Shapes DEBUG attributes# = 1
##Shapes DEBUG Opened container ##Shapes of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Shape[0 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[1 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[2 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[3 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[4 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[5 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[6 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:DataHeaderForm_p6 Typ:DataHeaderForm_p6 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 5 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 7 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
##Links DEBUG Opened container ##Links of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (3 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (3 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (4 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (7 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (6 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (8 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (7 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (9 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 6 Entries in total.
+##Links DEBUG No objects passing selection criteria... Container has 8 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -588,33 +612,41 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Shape
##Shapes DEBUG attributes# = 1
##Shapes DEBUG Opened container ##Shapes of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Shape[0 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[1 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[2 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[3 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[4 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[5 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[6 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:DataHeaderForm_p6 Typ:DataHeaderForm_p6 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 5 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 7 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
##Links DEBUG Opened container ##Links of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (3 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (3 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (4 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (6 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (7 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (7 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 6 Entries in total.
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (8 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (9 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+##Links DEBUG No objects passing selection criteria... Container has 8 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -661,12 +693,16 @@ SimplePoolFile2... DEBUG ---->[0]:Token Typ:Token [18] Size:0 Offset:0 #Element
SimplePoolFile2... DEBUG --->Reading Shape[4 , ????]: [1 Column(s)]
SimplePoolFile2... DEBUG ---->[0]:unsigned int Typ:unsigned int [3] Size:0 Offset:0 #Elements:1
SimplePoolFile2... DEBUG --->Reading Shape[5 , ????]: [1 Column(s)]
-SimplePoolFile2... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile2... DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile2... DEBUG --->Reading Shape[6 , ????]: [1 Column(s)]
-SimplePoolFile2... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile2... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile2... DEBUG --->Reading Shape[7 , ????]: [1 Column(s)]
+SimplePoolFile2... DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile2... DEBUG --->Reading Shape[8 , ????]: [1 Column(s)]
+SimplePoolFile2... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile2... DEBUG --->Reading Shape[9 , ????]: [1 Column(s)]
SimplePoolFile2... DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 8 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 10 Entries in total.
SimplePoolFile2... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -687,17 +723,21 @@ SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber)
SimplePoolFile2... DEBUG ---->ClassID:????
SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber) [202] (9 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream2) [203] (a , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (a , ffffffff)
+SimplePoolFile2... DEBUG ---->ClassID:????
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream2) [203] (b , ffffffff)
+SimplePoolFile2... DEBUG ---->ClassID:????
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (c , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [203] (b , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [203] (d , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (c , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (e , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (d , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (f , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (e , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (10 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 13 Entries in total.
+##Links DEBUG No objects passing selection criteria... Container has 15 Entries in total.
SimplePoolFile2... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReadAgain.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReadAgain.ref
index 79df94e00bb4..aaa18512a878 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReadAgain.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReadAgain.ref
@@ -19,33 +19,41 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Shape
##Shapes DEBUG attributes# = 1
##Shapes DEBUG Opened container ##Shapes of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Shape[0 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[1 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[2 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[3 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[4 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[5 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[6 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:DataHeaderForm_p6 Typ:DataHeaderForm_p6 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 5 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 7 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
##Links DEBUG Opened container ##Links of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (3 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (3 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (4 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (6 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (7 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (7 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (8 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 6 Entries in total.
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (9 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+##Links DEBUG No objects passing selection criteria... Container has 8 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -194,33 +202,41 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Shape
##Shapes DEBUG attributes# = 1
##Shapes DEBUG Opened container ##Shapes of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Shape[0 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[1 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[2 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[3 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[4 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[5 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[6 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:DataHeaderForm_p6 Typ:DataHeaderForm_p6 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 5 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 7 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
##Links DEBUG Opened container ##Links of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (3 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (3 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (4 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (6 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (7 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (7 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 6 Entries in total.
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (8 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (9 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+##Links DEBUG No objects passing selection criteria... Container has 8 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -624,33 +640,41 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Shape
##Shapes DEBUG attributes# = 1
##Shapes DEBUG Opened container ##Shapes of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Shape[0 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[1 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[2 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[3 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[4 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[5 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[6 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:DataHeaderForm_p6 Typ:DataHeaderForm_p6 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 5 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 7 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
##Links DEBUG Opened container ##Links of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (3 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (3 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (4 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (7 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (6 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (8 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (7 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (9 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 6 Entries in total.
+##Links DEBUG No objects passing selection criteria... Container has 8 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -697,12 +721,16 @@ SimplePoolFile2... DEBUG ---->[0]:Token Typ:Token [18] Size:0 Offset:0 #Element
SimplePoolFile2... DEBUG --->Reading Shape[4 , ????]: [1 Column(s)]
SimplePoolFile2... DEBUG ---->[0]:unsigned int Typ:unsigned int [3] Size:0 Offset:0 #Elements:1
SimplePoolFile2... DEBUG --->Reading Shape[5 , ????]: [1 Column(s)]
-SimplePoolFile2... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile2... DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile2... DEBUG --->Reading Shape[6 , ????]: [1 Column(s)]
-SimplePoolFile2... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile2... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile2... DEBUG --->Reading Shape[7 , ????]: [1 Column(s)]
+SimplePoolFile2... DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile2... DEBUG --->Reading Shape[8 , ????]: [1 Column(s)]
+SimplePoolFile2... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile2... DEBUG --->Reading Shape[9 , ????]: [1 Column(s)]
SimplePoolFile2... DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 8 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 10 Entries in total.
SimplePoolFile2... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -723,17 +751,21 @@ SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber)
SimplePoolFile2... DEBUG ---->ClassID:????
SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber) [202] (9 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream2) [203] (a , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (a , ffffffff)
+SimplePoolFile2... DEBUG ---->ClassID:????
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream2) [203] (b , ffffffff)
+SimplePoolFile2... DEBUG ---->ClassID:????
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (c , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [203] (b , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [203] (d , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (c , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (e , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (d , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (f , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (e , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (10 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 13 Entries in total.
+##Links DEBUG No objects passing selection criteria... Container has 15 Entries in total.
SimplePoolFile2... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReadConcat.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReadConcat.ref
index 61dd996b6f3c..561293a105b3 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReadConcat.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReadConcat.ref
@@ -19,33 +19,41 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Shape
##Shapes DEBUG attributes# = 1
##Shapes DEBUG Opened container ##Shapes of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Shape[0 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[1 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[2 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[3 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[4 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[5 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[6 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:DataHeaderForm_p6 Typ:DataHeaderForm_p6 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 5 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 7 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
##Links DEBUG Opened container ##Links of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (3 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (3 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (4 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (6 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (7 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (7 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (8 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 6 Entries in total.
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (9 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+##Links DEBUG No objects passing selection criteria... Container has 8 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -86,12 +94,16 @@ SimplePoolFile1... DEBUG ---->[0]:unsigned long long Typ:unsigned long long [23
SimplePoolFile1... DEBUG --->Reading Shape[8 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->[0]:float Typ:float [10] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --->Reading Shape[9 , ????]: [1 Column(s)]
-SimplePoolFile1... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile1... DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --->Reading Shape[10 , ????]: [1 Column(s)]
-SimplePoolFile1... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile1... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --->Reading Shape[11 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile1... DEBUG --->Reading Shape[12 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile1... DEBUG --->Reading Shape[13 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 12 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 14 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -132,17 +144,21 @@ SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(BunchId) [20
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventWeight) [202] (13 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [203] (14 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (14 , ffffffff)
+SimplePoolFile1... DEBUG ---->ClassID:????
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [203] (15 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (15 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (16 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (16 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (17 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (17 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (18 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (18 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (19 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 23 Entries in total.
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (1a , ffffffff)
+SimplePoolFile1... DEBUG ---->ClassID:????
+##Links DEBUG No objects passing selection criteria... Container has 25 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -182,33 +198,41 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Shape
##Shapes DEBUG attributes# = 1
##Shapes DEBUG Opened container ##Shapes of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Shape[0 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[1 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[2 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[3 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[4 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[5 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[6 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:DataHeaderForm_p6 Typ:DataHeaderForm_p6 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 5 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 7 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
##Links DEBUG Opened container ##Links of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (3 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (3 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (4 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (6 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (7 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (7 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 6 Entries in total.
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (8 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (9 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+##Links DEBUG No objects passing selection criteria... Container has 8 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -607,33 +631,41 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Shape
##Shapes DEBUG attributes# = 1
##Shapes DEBUG Opened container ##Shapes of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Shape[0 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[1 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[2 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[3 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[4 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[5 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[6 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:DataHeaderForm_p6 Typ:DataHeaderForm_p6 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 5 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 7 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
##Links DEBUG Opened container ##Links of type ROOT_Tree
EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (3 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (3 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [203] (4 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (7 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (6 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (8 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (7 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (9 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 6 Entries in total.
+##Links DEBUG No objects passing selection criteria... Container has 8 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -680,12 +712,16 @@ SimplePoolFile2... DEBUG ---->[0]:Token Typ:Token [18] Size:0 Offset:0 #Element
SimplePoolFile2... DEBUG --->Reading Shape[4 , ????]: [1 Column(s)]
SimplePoolFile2... DEBUG ---->[0]:unsigned int Typ:unsigned int [3] Size:0 Offset:0 #Elements:1
SimplePoolFile2... DEBUG --->Reading Shape[5 , ????]: [1 Column(s)]
-SimplePoolFile2... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile2... DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile2... DEBUG --->Reading Shape[6 , ????]: [1 Column(s)]
-SimplePoolFile2... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile2... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile2... DEBUG --->Reading Shape[7 , ????]: [1 Column(s)]
+SimplePoolFile2... DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile2... DEBUG --->Reading Shape[8 , ????]: [1 Column(s)]
+SimplePoolFile2... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile2... DEBUG --->Reading Shape[9 , ????]: [1 Column(s)]
SimplePoolFile2... DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 8 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 10 Entries in total.
SimplePoolFile2... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -706,17 +742,21 @@ SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventNumber)
SimplePoolFile2... DEBUG ---->ClassID:????
SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber) [202] (9 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream2) [203] (a , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (a , ffffffff)
+SimplePoolFile2... DEBUG ---->ClassID:????
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream2) [203] (b , ffffffff)
+SimplePoolFile2... DEBUG ---->ClassID:????
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (c , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [203] (b , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [203] (d , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (c , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (e , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (d , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (f , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (e , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (10 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 13 Entries in total.
+##Links DEBUG No objects passing selection criteria... Container has 15 Entries in total.
SimplePoolFile2... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -1203,12 +1243,16 @@ SimplePoolFile3... DEBUG ---->[0]:unsigned long long Typ:unsigned long long [23
SimplePoolFile3... DEBUG --->Reading Shape[8 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->[0]:float Typ:float [10] Size:0 Offset:0 #Elements:1
SimplePoolFile3... DEBUG --->Reading Shape[9 , ????]: [1 Column(s)]
-SimplePoolFile3... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile3... DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile3... DEBUG --->Reading Shape[10 , ????]: [1 Column(s)]
-SimplePoolFile3... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile3... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile3... DEBUG --->Reading Shape[11 , ????]: [1 Column(s)]
+SimplePoolFile3... DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile3... DEBUG --->Reading Shape[12 , ????]: [1 Column(s)]
+SimplePoolFile3... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile3... DEBUG --->Reading Shape[13 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 12 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 14 Entries in total.
SimplePoolFile3... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -1249,17 +1293,21 @@ SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLCollectionTree(BunchId) [20
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventWeight) [202] (13 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream2) [203] (14 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (14 , ffffffff)
+SimplePoolFile3... DEBUG ---->ClassID:????
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream2) [203] (15 , ffffffff)
+SimplePoolFile3... DEBUG ---->ClassID:????
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (16 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [203] (15 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [203] (17 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (16 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (18 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (17 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (19 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (18 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (1a , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 23 Entries in total.
+##Links DEBUG No objects passing selection criteria... Container has 25 Entries in total.
SimplePoolFile3... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WCond.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WCond.ref
index 094a968c8486..4ab2bfd4e1e0 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WCond.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WCond.ref
@@ -38,12 +38,16 @@ SimplePoolFile1... DEBUG ---->[0]:unsigned long long Typ:unsigned long long [23
SimplePoolFile1... DEBUG --->Reading Shape[8 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->[0]:float Typ:float [10] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --->Reading Shape[9 , ????]: [1 Column(s)]
-SimplePoolFile1... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile1... DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --->Reading Shape[10 , ????]: [1 Column(s)]
-SimplePoolFile1... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile1... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --->Reading Shape[11 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile1... DEBUG --->Reading Shape[12 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile1... DEBUG --->Reading Shape[13 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 12 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 14 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -84,17 +88,21 @@ SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(BunchId) [20
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventWeight) [202] (13 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [203] (14 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (14 , ffffffff)
+SimplePoolFile1... DEBUG ---->ClassID:????
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [203] (15 , ffffffff)
+SimplePoolFile1... DEBUG ---->ClassID:????
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (16 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (15 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (17 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (16 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (18 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (17 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [203] (19 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (18 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [203] (1a , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 23 Entries in total.
+##Links DEBUG No objects passing selection criteria... Container has 25 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMeta.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMeta.ref
index b12c711a528e..6e3788164392 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMeta.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMeta.ref
@@ -258,6 +258,8 @@ SimplePoolFile5... DEBUG ---->ClassID:????
SimplePoolFile5... DEBUG --->Adding Shape[8 , ????]: [1 Column(s)]
SimplePoolFile5... DEBUG ---->Class:float
SimplePoolFile5... DEBUG ---->[0]:float Typ:float [10] Size:0 Offset:0 #Elements:1
+Stream1.FileMet... DEBUG beam energy "" tag could not be converted to float
+Stream1.FileMet... DEBUG Failed to retrieve 'SimInfoKey':'/Simulation/Parameters' => cannot set: xAOD::FileMetaData::simFlavour, and xAOD::FileMetaData::isDataOverlay
Stream1.FileMet... DEBUG Retrieved 'EventInfoKey':'EventInfo'
Stream1.FileMet... DEBUG setting xAOD::FileMetaData::mcProcID to 0
Stream1.FileMet... DEBUG Retrieved 'StreamName':'Stream1'
@@ -857,7 +859,6 @@ WriteCond INFO in finalize()
WriteCond INFO Pedestal x = 193136 y = -5580.01 z = -175208 string = <..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o>
Stream1 DEBUG AthenaOutputStream Stream1 ::stop()
Stream1 DEBUG slot 0 handle() incident type: MetaDataStop
-Stream1.FileMet... DEBUG Not writing empty or incomplete FileMetaData object
Stream1 DEBUG addItemObjects(9102,"PedestalWriteData") called
Stream1 DEBUG Key:PedestalWriteData
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
@@ -867,6 +868,7 @@ Stream1 DEBUG addItemObjects(73252552,"FileMetaDataAux.") called
Stream1 DEBUG Key:FileMetaDataAux.
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+Stream1 DEBUG Added object 73252552,"FileMetaDataAux."
Stream1 DEBUG addItemObjects(167728019,"Stream1") called
Stream1 DEBUG Key:Stream1
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
@@ -876,6 +878,7 @@ Stream1 DEBUG addItemObjects(178309087,"FileMetaData") called
Stream1 DEBUG Key:FileMetaData
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+Stream1 DEBUG Added object 178309087,"FileMetaData"
Stream1 DEBUG addItemObjects(243004407,"EventFormatStream1") called
Stream1 DEBUG Key:EventFormatStream1
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
@@ -887,12 +890,24 @@ Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
Stream1 DEBUG Added object 1316383046,"/TagInfo"
Stream1 DEBUG connectOutput done for ROOTTREE:SimplePoolFile5.root
+StorageSvc INFO Building shape according to reflection information using shape ID for:
+StorageSvc INFO xAOD::FileMetaDataAuxInfo_v1 [????]
+SimplePoolFile5... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.)
+MetaData(xAOD::... DEBUG Opening
+MetaData(xAOD::... DEBUG attributes# = 1
+MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.'
+MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) of type ROOT_Tree
+SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [202] (14 , ffffffff)
+SimplePoolFile5... DEBUG ---->ClassID:????
+SimplePoolFile5... DEBUG --->Adding Shape[9 , ????]: [1 Column(s)]
+SimplePoolFile5... DEBUG ---->Class:xAOD::FileMetaDataAuxInfo_v1
+SimplePoolFile5... DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile5... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(ExampleHitContainer_p1/PedestalWriteData)
MetaData(Exampl... DEBUG Opening
MetaData(Exampl... DEBUG attributes# = 1
MetaData(Exampl... DEBUG Branch container 'ExampleHitContainer_p1_PedestalWriteData'
MetaData(Exampl... DEBUG Opened container MetaData(ExampleHitContainer_p1/PedestalWriteData) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaData(ExampleHitContainer_p1/PedestalWriteData) [202] (14 , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaData(ExampleHitContainer_p1/PedestalWriteData) [202] (15 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
StorageSvc INFO Building shape according to reflection information using shape ID for:
StorageSvc INFO EventStreamInfo_p3 [????]
@@ -901,21 +916,33 @@ MetaData(EventS... DEBUG Opening
MetaData(EventS... DEBUG attributes# = 1
MetaData(EventS... DEBUG Branch container 'EventStreamInfo_p3_Stream1'
MetaData(EventS... DEBUG Opened container MetaData(EventStreamInfo_p3/Stream1) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream1) [202] (15 , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream1) [202] (16 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Adding Shape[9 , ????]: [1 Column(s)]
+SimplePoolFile5... DEBUG --->Adding Shape[10 , ????]: [1 Column(s)]
SimplePoolFile5... DEBUG ---->Class:EventStreamInfo_p3
SimplePoolFile5... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
StorageSvc INFO Building shape according to reflection information using shape ID for:
+StorageSvc INFO xAOD::FileMetaData_v1 [????]
+SimplePoolFile5... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::FileMetaData_v1/FileMetaData)
+MetaData(xAOD::... DEBUG Opening
+MetaData(xAOD::... DEBUG attributes# = 1
+MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaData_v1_FileMetaData'
+MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaData_v1/FileMetaData) of type ROOT_Tree
+SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [202] (17 , ffffffff)
+SimplePoolFile5... DEBUG ---->ClassID:????
+SimplePoolFile5... DEBUG --->Adding Shape[11 , ????]: [1 Column(s)]
+SimplePoolFile5... DEBUG ---->Class:xAOD::FileMetaData_v1
+SimplePoolFile5... DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
+StorageSvc INFO Building shape according to reflection information using shape ID for:
StorageSvc INFO xAOD::EventFormat_v1 [????]
SimplePoolFile5... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::EventFormat_v1/EventFormatStream1)
MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream1'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream1) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [202] (16 , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [202] (18 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Adding Shape[10 , ????]: [1 Column(s)]
+SimplePoolFile5... DEBUG --->Adding Shape[12 , ????]: [1 Column(s)]
SimplePoolFile5... DEBUG ---->Class:xAOD::EventFormat_v1
SimplePoolFile5... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
StorageSvc INFO Building shape according to reflection information using shape ID for:
@@ -925,9 +952,9 @@ MetaData(IOVMet... DEBUG Opening
MetaData(IOVMet... DEBUG attributes# = 1
MetaData(IOVMet... DEBUG Branch container 'IOVMetaDataContainer_p1__TagInfo'
MetaData(IOVMet... DEBUG Opened container MetaData(IOVMetaDataContainer_p1//TagInfo) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaData(IOVMetaDataContainer_p1//TagInfo) [202] (17 , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaData(IOVMetaDataContainer_p1//TagInfo) [202] (19 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Adding Shape[11 , ????]: [1 Column(s)]
+SimplePoolFile5... DEBUG --->Adding Shape[13 , ????]: [1 Column(s)]
SimplePoolFile5... DEBUG ---->Class:IOVMetaDataContainer_p1
SimplePoolFile5... DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile5... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdr(DataHeader)
@@ -935,15 +962,19 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [202] (18 , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [202] (1a , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
SimplePoolFile5... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [202] (19 , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [202] (1b , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
+MetaData(xAOD::... DEBUG SG::IAuxStoreIO* detected in xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.
+MetaData(xAOD::... DEBUG Attributes= 1
+MetaData(xAOD::... DEBUG Creating branch for new dynamic attribute, Id=52: type=float, mcProcID
+MetaData(xAOD::... DEBUG createBasicAuxBranch: xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAuxDyn.mcProcID, leaf:mcProcID/F
Stream1 INFO Metadata records written: 21
Stream1 DEBUG Leaving incident handler for MetaDataStop
PoolSvc DEBUG Disconnect request for contextId=0
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Write.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Write.ref
index 6ed5138bc728..cd37bea92b87 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Write.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Write.ref
@@ -199,6 +199,8 @@ POOLCollectionT... DEBUG Branch container 'MagicNumber'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(MagicNumber) of type ROOT_Tree
SimplePoolFile1... DEBUG --->Adding Assoc :????/POOLCollectionTree(MagicNumber) [202] (a , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
+Stream1.FileMet... DEBUG beam energy "" tag could not be converted to float
+Stream1.FileMet... DEBUG Failed to retrieve 'SimInfoKey':'/Simulation/Parameters' => cannot set: xAOD::FileMetaData::simFlavour, and xAOD::FileMetaData::isDataOverlay
Stream1.FileMet... DEBUG Retrieved 'EventInfoKey':'EventInfo'
Stream1.FileMet... DEBUG setting xAOD::FileMetaData::mcProcID to 0
Stream1.FileMet... DEBUG Retrieved 'StreamName':'Stream1'
@@ -296,6 +298,8 @@ POOLCollectionT... DEBUG Branch container 'MagicNumber'
POOLCollectionT... DEBUG Opened container POOLCollectionTree(MagicNumber) of type ROOT_Tree
SimplePoolFile2... DEBUG --->Adding Assoc :????/POOLCollectionTree(MagicNumber) [202] (9 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
+Stream2.FileMet... DEBUG beam energy "" tag could not be converted to float
+Stream2.FileMet... DEBUG Failed to retrieve 'SimInfoKey':'/Simulation/Parameters' => cannot set: xAOD::FileMetaData::simFlavour, and xAOD::FileMetaData::isDataOverlay
Stream2.FileMet... DEBUG Retrieved 'EventInfoKey':'EventInfo'
Stream2.FileMet... DEBUG setting xAOD::FileMetaData::mcProcID to 0
Stream2.FileMet... DEBUG Retrieved 'StreamName':'Stream2'
@@ -1078,12 +1082,12 @@ AthenaEventLoopMgr INFO ===>>> done processing event #19, run #1 20 events
Stream1 DEBUG AthenaOutputStream Stream1 ::stop()
Stream2 DEBUG AthenaOutputStream Stream2 ::stop()
Stream1 DEBUG slot 0 handle() incident type: MetaDataStop
-Stream1.FileMet... DEBUG Not writing empty or incomplete FileMetaData object
ToolSvc.Bookkee... INFO Successfully copied CutBookkeepers to the output MetaDataStore
Stream1 DEBUG addItemObjects(73252552,"FileMetaDataAux.") called
Stream1 DEBUG Key:FileMetaDataAux.
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+Stream1 DEBUG Added object 73252552,"FileMetaDataAux."
Stream1 DEBUG addItemObjects(167728019,"Stream1") called
Stream1 DEBUG Key:Stream1
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
@@ -1093,6 +1097,7 @@ Stream1 DEBUG addItemObjects(178309087,"FileMetaData") called
Stream1 DEBUG Key:FileMetaData
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+Stream1 DEBUG Added object 178309087,"FileMetaData"
Stream1 DEBUG addItemObjects(243004407,"EventFormatStream1") called
Stream1 DEBUG Key:EventFormatStream1
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
@@ -1105,27 +1110,51 @@ Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
Stream1 DEBUG Added object 1316383046,"/TagInfo"
Stream1 DEBUG connectOutput done for SimplePoolFile1.root
StorageSvc INFO Building shape according to reflection information using shape ID for:
+StorageSvc INFO xAOD::FileMetaDataAuxInfo_v1 [????]
+SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.)
+MetaData(xAOD::... DEBUG Opening
+MetaData(xAOD::... DEBUG attributes# = 1
+MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.'
+MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) of type ROOT_Tree
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (b , ffffffff)
+SimplePoolFile1... DEBUG ---->ClassID:????
+SimplePoolFile1... DEBUG --->Adding Shape[6 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG ---->Class:xAOD::FileMetaDataAuxInfo_v1
+SimplePoolFile1... DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
+StorageSvc INFO Building shape according to reflection information using shape ID for:
StorageSvc INFO EventStreamInfo_p3 [????]
SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(EventStreamInfo_p3/Stream1)
MetaData(EventS... DEBUG Opening
MetaData(EventS... DEBUG attributes# = 1
MetaData(EventS... DEBUG Branch container 'EventStreamInfo_p3_Stream1'
MetaData(EventS... DEBUG Opened container MetaData(EventStreamInfo_p3/Stream1) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream1) [203] (b , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream1) [203] (c , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Adding Shape[6 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG --->Adding Shape[7 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:EventStreamInfo_p3
SimplePoolFile1... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
StorageSvc INFO Building shape according to reflection information using shape ID for:
+StorageSvc INFO xAOD::FileMetaData_v1 [????]
+SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::FileMetaData_v1/FileMetaData)
+MetaData(xAOD::... DEBUG Opening
+MetaData(xAOD::... DEBUG attributes# = 1
+MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaData_v1_FileMetaData'
+MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaData_v1/FileMetaData) of type ROOT_Tree
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (d , ffffffff)
+SimplePoolFile1... DEBUG ---->ClassID:????
+SimplePoolFile1... DEBUG --->Adding Shape[8 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG ---->Class:xAOD::FileMetaData_v1
+SimplePoolFile1... DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
+StorageSvc INFO Building shape according to reflection information using shape ID for:
StorageSvc INFO xAOD::EventFormat_v1 [????]
SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::EventFormat_v1/EventFormatStream1)
MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream1'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream1) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (c , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [203] (e , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Adding Shape[7 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG --->Adding Shape[9 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:xAOD::EventFormat_v1
SimplePoolFile1... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
StorageSvc INFO Building shape according to reflection information using shape ID for:
@@ -1135,9 +1164,9 @@ MetaData(IOVMet... DEBUG Opening
MetaData(IOVMet... DEBUG attributes# = 1
MetaData(IOVMet... DEBUG Branch container 'IOVMetaDataContainer_p1__TagInfo'
MetaData(IOVMet... DEBUG Opened container MetaData(IOVMetaDataContainer_p1//TagInfo) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (d , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (f , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Adding Shape[8 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG --->Adding Shape[10 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:IOVMetaDataContainer_p1
SimplePoolFile1... DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdr(DataHeader)
@@ -1145,23 +1174,26 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [203] (e , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [203] (10 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [203] (f , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [203] (11 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
+MetaData(xAOD::... DEBUG SG::IAuxStoreIO* detected in xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.
+MetaData(xAOD::... DEBUG Attributes= 1
+MetaData(xAOD::... DEBUG createBasicAuxBranch: xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAuxDyn.mcProcID, leaf:mcProcID/F
Stream1 INFO Metadata records written: 21
Stream1 DEBUG Leaving incident handler for MetaDataStop
Stream2 DEBUG slot 0 handle() incident type: MetaDataStop
-Stream2.FileMet... DEBUG Not writing empty or incomplete FileMetaData object
Stream2 DEBUG addItemObjects(73252552,"FileMetaDataAux.") called
Stream2 DEBUG Key:FileMetaDataAux.
Stream2 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream2 DEBUG Comp Attr 0 with 15 mantissa bits.
+Stream2 DEBUG Added object 73252552,"FileMetaDataAux."
Stream2 DEBUG addItemObjects(167728019,"Stream2") called
Stream2 DEBUG Key:Stream2
Stream2 DEBUG Comp Attr 0 with 7 mantissa bits.
@@ -1171,6 +1203,7 @@ Stream2 DEBUG addItemObjects(178309087,"FileMetaData") called
Stream2 DEBUG Key:FileMetaData
Stream2 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream2 DEBUG Comp Attr 0 with 15 mantissa bits.
+Stream2 DEBUG Added object 178309087,"FileMetaData"
Stream2 DEBUG addItemObjects(243004407,"EventFormatStream2") called
Stream2 DEBUG Key:EventFormatStream2
Stream2 DEBUG Comp Attr 0 with 7 mantissa bits.
@@ -1182,24 +1215,44 @@ Stream2 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream2 DEBUG Comp Attr 0 with 15 mantissa bits.
Stream2 DEBUG Added object 1316383046,"/TagInfo"
Stream2 DEBUG connectOutput done for SimplePoolFile2.root
+SimplePoolFile2... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.)
+MetaData(xAOD::... DEBUG Opening
+MetaData(xAOD::... DEBUG attributes# = 1
+MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.'
+MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) of type ROOT_Tree
+SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (a , ffffffff)
+SimplePoolFile2... DEBUG ---->ClassID:????
+SimplePoolFile2... DEBUG --->Adding Shape[5 , ????]: [1 Column(s)]
+SimplePoolFile2... DEBUG ---->Class:xAOD::FileMetaDataAuxInfo_v1
+SimplePoolFile2... DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile2... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(EventStreamInfo_p3/Stream2)
MetaData(EventS... DEBUG Opening
MetaData(EventS... DEBUG attributes# = 1
MetaData(EventS... DEBUG Branch container 'EventStreamInfo_p3_Stream2'
MetaData(EventS... DEBUG Opened container MetaData(EventStreamInfo_p3/Stream2) of type ROOT_Tree
-SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream2) [203] (a , ffffffff)
+SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream2) [203] (b , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Adding Shape[5 , ????]: [1 Column(s)]
+SimplePoolFile2... DEBUG --->Adding Shape[6 , ????]: [1 Column(s)]
SimplePoolFile2... DEBUG ---->Class:EventStreamInfo_p3
SimplePoolFile2... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile2... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::FileMetaData_v1/FileMetaData)
+MetaData(xAOD::... DEBUG Opening
+MetaData(xAOD::... DEBUG attributes# = 1
+MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaData_v1_FileMetaData'
+MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaData_v1/FileMetaData) of type ROOT_Tree
+SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (c , ffffffff)
+SimplePoolFile2... DEBUG ---->ClassID:????
+SimplePoolFile2... DEBUG --->Adding Shape[7 , ????]: [1 Column(s)]
+SimplePoolFile2... DEBUG ---->Class:xAOD::FileMetaData_v1
+SimplePoolFile2... DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile2... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::EventFormat_v1/EventFormatStream2)
MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream2'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream2) of type ROOT_Tree
-SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [203] (b , ffffffff)
+SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [203] (d , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Adding Shape[6 , ????]: [1 Column(s)]
+SimplePoolFile2... DEBUG --->Adding Shape[8 , ????]: [1 Column(s)]
SimplePoolFile2... DEBUG ---->Class:xAOD::EventFormat_v1
SimplePoolFile2... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile2... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(IOVMetaDataContainer_p1//TagInfo)
@@ -1207,9 +1260,9 @@ MetaData(IOVMet... DEBUG Opening
MetaData(IOVMet... DEBUG attributes# = 1
MetaData(IOVMet... DEBUG Branch container 'IOVMetaDataContainer_p1__TagInfo'
MetaData(IOVMet... DEBUG Opened container MetaData(IOVMetaDataContainer_p1//TagInfo) of type ROOT_Tree
-SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (c , ffffffff)
+SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (e , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Adding Shape[7 , ????]: [1 Column(s)]
+SimplePoolFile2... DEBUG --->Adding Shape[9 , ????]: [1 Column(s)]
SimplePoolFile2... DEBUG ---->Class:IOVMetaDataContainer_p1
SimplePoolFile2... DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile2... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdr(DataHeader)
@@ -1217,15 +1270,18 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [203] (d , ffffffff)
+SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [203] (f , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
SimplePoolFile2... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [203] (e , ffffffff)
+SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [203] (10 , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
+MetaData(xAOD::... DEBUG SG::IAuxStoreIO* detected in xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.
+MetaData(xAOD::... DEBUG Attributes= 1
+MetaData(xAOD::... DEBUG createBasicAuxBranch: xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAuxDyn.mcProcID, leaf:mcProcID/F
Stream2 INFO Metadata records written: 21
Stream2 DEBUG Leaving incident handler for MetaDataStop
EmptyPoolFile.root DEBUG --> Access DbContainer CREATE [ROOT_All] ##Shapes
@@ -1245,24 +1301,44 @@ EmptyPoolFile.root DEBUG --> Access DbContainer CREATE [ROOT_All] ##Param
EmptyPoolFile.root DEBUG --->Adding Assoc :????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
##Params DEBUG No objects passing selection criteria... Container has 0 Entries in total.
+EmptyPoolFile.root DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.)
+MetaData(xAOD::... DEBUG Opening
+MetaData(xAOD::... DEBUG attributes# = 1
+MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.'
+MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) of type ROOT_Tree
+EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaDataAuxInfo_v1/FileMetaDataAux.) [203] (3 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+EmptyPoolFile.root DEBUG --->Adding Shape[0 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->Class:xAOD::FileMetaDataAuxInfo_v1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::FileMetaDataAuxInfo_v1 Typ:xAOD::FileMetaDataAuxInfo_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(EventStreamInfo_p3/Stream3)
MetaData(EventS... DEBUG Opening
MetaData(EventS... DEBUG attributes# = 1
MetaData(EventS... DEBUG Branch container 'EventStreamInfo_p3_Stream3'
MetaData(EventS... DEBUG Opened container MetaData(EventStreamInfo_p3/Stream3) of type ROOT_Tree
-EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream3) [203] (3 , ffffffff)
+EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaData(EventStreamInfo_p3/Stream3) [203] (4 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Adding Shape[0 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG --->Adding Shape[1 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->Class:EventStreamInfo_p3
EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::FileMetaData_v1/FileMetaData)
+MetaData(xAOD::... DEBUG Opening
+MetaData(xAOD::... DEBUG attributes# = 1
+MetaData(xAOD::... DEBUG Branch container 'xAOD::FileMetaData_v1_FileMetaData'
+MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::FileMetaData_v1/FileMetaData) of type ROOT_Tree
+EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaData(xAOD::FileMetaData_v1/FileMetaData) [203] (5 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+EmptyPoolFile.root DEBUG --->Adding Shape[2 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->Class:xAOD::FileMetaData_v1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::FileMetaData_v1 Typ:xAOD::FileMetaData_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::EventFormat_v1/EventFormatStream3)
MetaData(xAOD::... DEBUG Opening
MetaData(xAOD::... DEBUG attributes# = 1
MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream3'
MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream3) of type ROOT_Tree
-EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [203] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Adding Shape[1 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG --->Adding Shape[3 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->Class:xAOD::EventFormat_v1
EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(IOVMetaDataContainer_p1//TagInfo)
@@ -1270,9 +1346,9 @@ MetaData(IOVMet... DEBUG Opening
MetaData(IOVMet... DEBUG attributes# = 1
MetaData(IOVMet... DEBUG Branch container 'IOVMetaDataContainer_p1__TagInfo'
MetaData(IOVMet... DEBUG Opened container MetaData(IOVMetaDataContainer_p1//TagInfo) of type ROOT_Tree
-EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaData(IOVMetaDataContainer_p1//TagInfo) [203] (7 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Adding Shape[2 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG --->Adding Shape[4 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->Class:IOVMetaDataContainer_p1
EmptyPoolFile.root DEBUG ---->[0]:IOVMetaDataContainer_p1 Typ:IOVMetaDataContainer_p1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdr(DataHeader)
@@ -1280,9 +1356,9 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [203] (6 , ffffffff)
+EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [203] (8 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Adding Shape[3 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG --->Adding Shape[5 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->Class:DataHeader_p6
EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
@@ -1290,11 +1366,14 @@ MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [203] (7 , ffffffff)
+EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [203] (9 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Adding Shape[4 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG --->Adding Shape[6 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->Class:DataHeaderForm_p6
EmptyPoolFile.root DEBUG ---->[0]:DataHeaderForm_p6 Typ:DataHeaderForm_p6 [21] Size:0 Offset:0 #Elements:1
+MetaData(xAOD::... DEBUG SG::IAuxStoreIO* detected in xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAux.
+MetaData(xAOD::... DEBUG Attributes= 1
+MetaData(xAOD::... DEBUG createBasicAuxBranch: xAOD::FileMetaDataAuxInfo_v1_FileMetaDataAuxDyn.mcProcID, leaf:mcProcID/F
Stream3 INFO Metadata records written: 1
PoolSvc DEBUG Disconnect request for contextId=0
PoolSvc DEBUG Disconnected PersistencySvc session
diff --git a/Event/xAOD/xAODMetaDataCnv/src/FileMetaDataCreatorTool.cxx b/Event/xAOD/xAODMetaDataCnv/src/FileMetaDataCreatorTool.cxx
index a7ffc5f38f90..64edae8fa4ca 100644
--- a/Event/xAOD/xAODMetaDataCnv/src/FileMetaDataCreatorTool.cxx
+++ b/Event/xAOD/xAODMetaDataCnv/src/FileMetaDataCreatorTool.cxx
@@ -42,7 +42,7 @@ StatusCode
// TagInfoMgr (prio 50). That means the FileMetaDataTool be called first
ServiceHandle< IIncidentSvc > incidentSvc("IncidentSvc", name());
ATH_CHECK(incidentSvc.retrieve());
- incidentSvc->addListener(this, "BeginInputFile", 40);
+ incidentSvc->addListener(this, "EndInputFile", 40);
// Create a fresh object to fill
ATH_MSG_DEBUG("Creating new xAOD::FileMetaData object to fill");
@@ -61,9 +61,12 @@ StatusCode
void
FileMetaDataCreatorTool::handle(const Incident& inc) {
// gracefully ignore unexpected incident types
- if (inc.type() == "BeginInputFile")
+ if (inc.type() == "EndInputFile") {
+ // Lock the tool while we work on the FileMetaData
+ std::lock_guard lock(m_toolMutex);
if (!updateFromNonEvent().isSuccess())
ATH_MSG_DEBUG("Failed to fill FileMetaData with non-event info");
+ }
}
StatusCode
@@ -120,6 +123,10 @@ StatusCode
// Return if object has already been filled
if (m_filledEvent) return StatusCode::SUCCESS;
+ // Fill information from TagInfo and Simulation Parameters
+ if (!updateFromNonEvent().isSuccess())
+ ATH_MSG_DEBUG("Failed to fill FileMetaData with non-event info");
+
// Sanity check
if (!(m_info && m_aux)) {
ATH_MSG_DEBUG("No xAOD::FileMetaData object to fill");
@@ -188,8 +195,6 @@ StatusCode
StatusCode
FileMetaDataCreatorTool::updateFromNonEvent() {
- // Lock the tool while we work on the FileMetaData
- std::lock_guard lock(m_toolMutex);
// Have we already done this?
if (m_filledNonEvent) return StatusCode::SUCCESS;
@@ -212,13 +217,14 @@ StatusCode
set(xAOD::FileMetaData::beamType, m_tagInfoMgr->findTag("beam_type"));
+ std::string beamEnergy = m_tagInfoMgr->findTag("beam_energy");
try {
set(xAOD::FileMetaData::beamEnergy,
- std::stof(m_tagInfoMgr->findTag("beam_energy")));
+ std::stof(beamEnergy));
} catch (std::invalid_argument& e) {
- ATH_MSG_DEBUG("beam energy tag could not be converted to float");
+ ATH_MSG_DEBUG("beam energy \"" << beamEnergy << "\" tag could not be converted to float");
} catch (std::out_of_range& e) {
- ATH_MSG_DEBUG("converted beam energy value outside float range");
+ ATH_MSG_DEBUG("converted beam energy value (\"" << beamEnergy << "\") outside float range");
}
// Read simulation parameters
--
GitLab
From f1392f91cf1c4f3180330283fbe3c36f10a67704 Mon Sep 17 00:00:00 2001
From: James Catmore <james.catmore@cern.ch>
Date: Fri, 13 Aug 2021 18:35:39 +0000
Subject: [PATCH 039/272] Adding EventShape containers to DAOD_PHYS
---
.../DerivationFrameworkCore/python/ContainersOnTheFly.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/ContainersOnTheFly.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/ContainersOnTheFly.py
index 50d4e28bc33e..9cf685a5329f 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/ContainersOnTheFly.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/ContainersOnTheFly.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# List of containers that are made on-the-fly by basically all DAOD types and
# can therefore be reasonably added to the NameAndTypes dictionary centrally
@@ -81,6 +81,11 @@ ContainersOnTheFly = [
["AntiKt10UFOCSSKJets","xAOD::JetContainer"],
["AntiKt10UFOCSSKJetsAux","xAOD::JetAuxContainer"],
+ ["Kt4EMPFlowEventShape","xAOD::EventShape"],
+ ["Kt4EMPFlowEventShapeAux","xAOD::EventShapeAuxInfo"],
+ ["Kt4EMTopoOriginEventShape","xAOD::EventShape"],
+ ["Kt4EMTopoOriginEventShapeAux","xAOD::EventShapeAuxInfo"],
+
["TrackCaloClustersCombinedAndNeutral","xAOD::TrackCaloClusterContainer"],
["TrackCaloClustersCombinedAndNeutralAux","xAOD::TrackCaloClusterAuxContainer"],
["BTagging_AntiKt4LCTopo","xAOD::BTaggingContainer"],
--
GitLab
From 421b784562d70020dc6dbea72a4f14f107d1bd82 Mon Sep 17 00:00:00 2001
From: Liaoshan Shi <liaoshan.shi@cern.ch>
Date: Fri, 13 Aug 2021 18:43:04 +0000
Subject: [PATCH 040/272] GeometryJiveXML: Add function to read NSW geometry;
Add RPC to BIS78
---
.../GeometryJiveXML/MuonGeometryWriter.h | 69 +++
.../src/MuonGeometryWriter.cxx | 427 ++++++++++++++++--
2 files changed, 459 insertions(+), 37 deletions(-)
diff --git a/graphics/GeometryJiveXML/GeometryJiveXML/MuonGeometryWriter.h b/graphics/GeometryJiveXML/GeometryJiveXML/MuonGeometryWriter.h
index 9430b8cf12bb..fecbee429426 100755
--- a/graphics/GeometryJiveXML/GeometryJiveXML/MuonGeometryWriter.h
+++ b/graphics/GeometryJiveXML/GeometryJiveXML/MuonGeometryWriter.h
@@ -8,6 +8,9 @@
#include "JiveXML/IGeometryWriter.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "CLHEP/Geometry/Point3D.h"
+#include "GeoPrimitives/GeoPrimitives.h"
+#include "GeoModelKernel/GeoVolumeCursor.h"
+#include "GeoModelKernel/GeoSimplePolygonBrep.h"
#include <string>
#include <fstream>
@@ -53,12 +56,22 @@ namespace JiveXML
*/
void writeStations(std::ofstream &out) const ;
+ /** process the geometry of New Small Wheel */
+ void processNSW(std::ofstream &out);
+
/**
* Writes the footer of the XML file to a stream.
* \param out stream where the XML fragment is written to
*/
void writeFooter(std::ofstream &out) const ;
+ /**
+ * Writes a trapezoid station in XML to a stream.
+ * \param out stream where the XML fragment is written to
+ */
+ void writeATrd(std::ofstream &out, std::string stationTech, std::string stationName, double zi, double zo, double ri, double ro, double wi, double wo, int eta, std::string phiString, double dphi, double shift, double alpha) const ;
+
+
/**
* Returns the global position of the station, rotated to sector 1.
* \param station under consideration
@@ -90,6 +103,62 @@ namespace JiveXML
*/
double getAlpha(const HepGeom::Transform3D &trans) const ;
+ /**
+ * Returns the global position of the NSW station, rotated to sector 1.
+ * \param position of the station under consideration
+ * \param maxPhi maximum phi index for this station type
+ * \return position of the station after rotation
+ */
+ HepGeom::Point3D<double> getPositionNSW(Amg::Vector3D pos, int maxPhi) const ;
+
+ /**
+ * Returns phi index of the sector
+ * \param phi phi of the sector
+ * \param maxPhi maximum phi index for this station type
+ * \return phi index of the sector
+ */
+ int getPhiIndex(double phi, int maxPhi) const ;
+
+ /**
+ * Reads the geometry parameters of a NSW Micromegas chamber
+ * \param pv pointer to the detector volume considered
+ * \param maxPhi maximum number of phi sectors (=8 for NSW)
+ * other parameters are used to store the retrieved parameters
+ */
+ void readNSWMMPars(const GeoVolumeCursor *pv, int maxPhi, std::string& chamberName, HepGeom::Point3D<double>& pos_rot,
+ double& zi, double& zo, double& ri, double& ro, double& wi, double& wo, double& dphi, double& shift, int& phiIndex) const ;
+
+ /**
+ * Reads the geometry parameters of a NSW sTGC chamber.
+ * \param pv pointer to the detector volume considered
+ * \param maxPhi maximum number of phi sectors (=8 for NSW)
+ * other parameters are used to store the retrieved parameters
+ */
+ void readNSWSTGCPars(const GeoVolumeCursor *pv, int maxPhi,
+ std::string& chamberName, HepGeom::Point3D<double>& pos_rot, const GeoSimplePolygonBrep*& theBrep,
+ int& nvtx, double& dz, double& dphi, double& shift, int& phiIndex) const ;
+
+ /**
+ * Takes four vetecies of a GeoSimplePolygonBrep to form a trapezoid shape and reads the parameters of the trapezoid shape.
+ * \param theBrep pointer to the GeoSimplePolygonBrep
+ * \param rho radius of the center of the GeoSimplePolygonBrep for calculating the inner and outer radius (ri and ro)
+ * \param vtx a list of the indecies of the four verticies of GeoSimplePolygonBrep to be used in drawing the trapezoid
+ * other parameters are used to store the retrieved parameters
+ */
+ void readBrepAsATrd(const GeoSimplePolygonBrep* theBrep, double rho, const int* vtx, double& ri, double& ro, double& wi, double& wo) const ;
+
+ /**
+ * Compares two angles
+ * \return true if the difference is within a precision defined by m_smallAngle
+ */
+ bool equalAngle(double a, double b) const ;
+
+ /**
+ * Compares two coordinates or lenghts
+ * \return true if the difference is within a precision defined by m_smallDistance
+ */
+ bool equalLength(double a, double b) const ;
+
/** Pointer to the muon detector manager (GeoModel) */
const MuonGM::MuonDetectorManager* m_muon_manager ;
diff --git a/graphics/GeometryJiveXML/src/MuonGeometryWriter.cxx b/graphics/GeometryJiveXML/src/MuonGeometryWriter.cxx
index f2eccc886149..d129c0694f0c 100755
--- a/graphics/GeometryJiveXML/src/MuonGeometryWriter.cxx
+++ b/graphics/GeometryJiveXML/src/MuonGeometryWriter.cxx
@@ -13,6 +13,13 @@
#include "MuonReadoutGeometry/MuonDetectorManager.h"
#include "MuonReadoutGeometry/MuonStation.h"
+#include "GeoModelKernel/GeoVolumeCursor.h"
+#include "GeoModelKernel/GeoVDetectorManager.h"
+#include "GeoModelUtilities/GeoModelExperiment.h"
+#include "GeoModelKernel/GeoTubs.h"
+#include "GeoModelKernel/GeoTrd.h"
+#include "GeoModelKernel/GeoShapeShift.h"
+
#include <fstream>
namespace JiveXML {
@@ -22,19 +29,21 @@ namespace JiveXML {
StatusCode MuonGeometryWriter::writeGeometry() {
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "writeGeometry()" << endmsg;
+ ATH_MSG_DEBUG( "writeGeometry()" );
std::ofstream outputFile("AMuonGeometry.xml");
writeHeader(outputFile);
if ( detStore()->retrieve(m_muon_manager).isFailure() ) {
- if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Could not retrieve MuonGM::MuonDetectorManager" << endmsg;
+ ATH_MSG_ERROR( "Could not retrieve MuonGM::MuonDetectorManager" );
m_muon_manager = 0;
return StatusCode::FAILURE;
} else {
writeStations(outputFile);
}
+ processNSW(outputFile);
+
writeFooter(outputFile);
outputFile.close();
@@ -103,7 +112,7 @@ namespace JiveXML {
const MdtIdHelper *mdtIdHelper = m_muon_manager->mdtIdHelper();
int snMax = mdtIdHelper->stationNameIndexMax();
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Station types: " << snMax << endmsg;
+ ATH_MSG_DEBUG( " Station types: " << snMax );
// Loop over all station types.
for (int sn=0; sn<=snMax; sn++) {
@@ -159,8 +168,6 @@ namespace JiveXML {
if (station) stations->push_back(station);
}
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " Station size: " << stations->size() << endmsg;
-
// While there are stations that haven't been written to XML, stay in this loop.
while (stations->size() > 0) {
@@ -207,22 +214,20 @@ namespace JiveXML {
// If the parameters are indeed the same (within reasonable limits), then we
// can simply add this chamber to the sectors attribute of the first one.
if (pos1.distance(pos2) < m_smallDistance
- && fabs(dphi1 - dphi2) < m_smallAngle
- && fabs(shift1 - shift2) < m_smallDistance
- && fabs(alpha1 - alpha2) < m_smallAngle
- && fabs(zi1 - zi2) < m_smallDistance
- && fabs(zo1 - zo2) < m_smallDistance
- && fabs(ri1 - ri2) < m_smallDistance
- && fabs(ro1 - ro2) < m_smallDistance
- && fabs(wi1 - wi2) < m_smallDistance
- && fabs(wo1 - wo2) < m_smallDistance) {
+ && equalAngle(dphi1, dphi2)
+ && equalLength(shift1, shift2)
+ && equalAngle(alpha1, alpha2)
+ && equalLength(zi1, zi2)
+ && equalLength(zo1, zo2)
+ && equalLength(ri1, ri2)
+ && equalLength(ro1, ro2)
+ && equalLength(wi1, wi2)
+ && equalLength(wo1, wo2)) {
// Add the station to the phi sector string and remove it from the
// to-be-processed list.
phiString += " " + DataType(phi2).toString();
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << " phiString " << phiString << endmsg;
-
stations->erase(it, it+1);
}
}
@@ -248,7 +253,10 @@ namespace JiveXML {
// On the outside for large sectors (BOL, BOF, BOG, BOH).
rpco = 15.;
}
- }
+ } else if (stationName[1] == 'I' && eta==7 && wi1>1800) {
+ // Run3 BIS7/8 stations have RPCs on the inner side and they are wider than the Run2 BIS7 and BIS8 stations.
+ rpci = 4.;
+ }
// Barrel chambers are written as <ABox> elements.
out << "<ABox n=\"" << stationTech << "_" << stationName << "\""
@@ -259,11 +267,11 @@ namespace JiveXML {
<< " phi=\"" << phiString << "\"";
// A rotation with respect to the large sector.
- if (fabs(dphi1) > m_smallAngle)
+ if (std::abs(dphi1) > m_smallAngle)
out << " dphi=\"" << 180/M_PI * dphi1 << "\"";
// A shift perpendicular to r in the xy-plane.
- if (fabs(shift1) > m_smallDistance)
+ if (std::abs(shift1) > m_smallDistance)
out << " sh=\"" << shift1/10. << "\"";
// RPCs.
@@ -276,21 +284,7 @@ namespace JiveXML {
} else {
// Endcap chambers are written as <ATrd> elements, parameters are similar to <ABox>.
- out << "<ATrd n=\"" << stationTech << "_" << stationName << eta << "\""
- << " zi=\"" << zi1/10. << "\"" << " zo=\"" << zo1/10. << "\""
- << " ri=\"" << ri1/10. << "\"" << " ro=\"" << ro1/10. << "\""
- << " wi=\"" << wi1/10. << "\"" << " wo=\"" << wo1/10. << "\""
- << " eta=\"" << eta << "\""
- << " phi=\"" << phiString << "\"";
- if (fabs(dphi1) > m_smallAngle)
- out << " dphi=\"" << 180/M_PI * dphi1 << "\"";
- if (fabs(shift1) > m_smallDistance)
- out << " sh=\"" << shift1/10. << "\"";
-
- // A tilt in the rz-plane, for the CSCs.
- if (fabs(alpha1) > m_smallAngle)
- out << " a=\"" << 180/M_PI * alpha1 << "\"";
- out << " />" << std::endl;
+ writeATrd(out, stationTech, stationName, zi1, zo1, ri1, ro1, wi1, wo1, eta, phiString, dphi1, shift1, alpha1);
}
}
@@ -316,7 +310,7 @@ namespace JiveXML {
if (maxPhi > 8) {
// For TGCs there is no shift, so we can just return the angle.
return pos.phi();
- } else if (fabs(pos.phi() - M_PI/8.) < M_PI/16.) {
+ } else if (std::abs(pos.phi() - M_PI/8.) < M_PI/16.) {
// For the others, rotate to the next sector if it's reasonably close to pi/8.
// Any further deviation will be put in as a shift.
return M_PI/8.;
@@ -340,14 +334,14 @@ namespace JiveXML {
HepGeom::Point3D<double> rotpos;
// First we remove the shift caused by the rotation over dphi.
- if (fabs(dphi) < m_smallAngle) {
+ if (std::abs(dphi) < m_smallAngle) {
rotpos = pos;
} else {
rotpos = HepGeom::RotateZ3D(-dphi) * pos;
}
// Then we return what is left as the shift.
- if (fabs(rotpos.y()) < m_smallDistance) {
+ if (std::abs(rotpos.y()) < m_smallDistance) {
return 0.;
} else {
return rotpos.y();
@@ -359,4 +353,363 @@ namespace JiveXML {
out << "</AMuonGeometry>" << std::endl;
}
+
+ void MuonGeometryWriter::writeATrd(std::ofstream &out,
+ std::string stationTech, std::string stationName,
+ double zi, double zo, double ri, double ro, double wi, double wo,
+ int eta, std::string phiString,
+ double dphi, double shift, double alpha) const {
+
+ out << "<ATrd n=\"" << stationTech << "_" << stationName << eta << "\""
+ << " zi=\"" << zi/10. << "\"" << " zo=\"" << zo/10. << "\""
+ << " ri=\"" << ri/10. << "\"" << " ro=\"" << ro/10. << "\""
+ << " wi=\"" << wi/10. << "\"" << " wo=\"" << wo/10. << "\""
+ << " eta=\"" << eta << "\""
+ << " phi=\"" << phiString << "\"";
+
+ // A rotation with respect to the large sector.
+ if (std::abs(dphi) > m_smallAngle)
+ out << " dphi=\"" << 180/M_PI * dphi << "\"";
+
+ // A shift perpendicular to r in the xy-plane.
+ if (std::abs(shift) > m_smallDistance)
+ out << " sh=\"" << shift/10. << "\"";
+
+ // A tilt in the rz-plane, for the CSCs.
+ if (std::abs(alpha) > m_smallAngle)
+ out << " a=\"" << 180/M_PI * alpha << "\"";
+
+ out << " />" << std::endl;
+
+
+ }
+
+ void MuonGeometryWriter::processNSW(std::ofstream &out) {
+
+ int maxPhi = 8;
+
+ // Check if NSW exists in the GeoModel tree, and process it if exists
+ const GeoModelExperiment * theExpt = nullptr;
+ if (detStore()->retrieve(theExpt, "ATLAS").isFailure()) {
+ ATH_MSG_ERROR( "Could not retrieve the ATLAS GeoModelExperiment from detector store" );
+ return;
+ }
+
+ PVConstLink world(theExpt->getPhysVol());
+ GeoVolumeCursor av(world);
+ while (!av.atEnd()) {
+ if ( av.getName()=="Muon") {
+ GeoVolumeCursor pv(av.getVolume());
+ while (!pv.atEnd()) { // Loop over Muon stations
+ if (pv.getVolume()->getLogVol()->getName()=="NewSmallWheel") {
+ ATH_MSG_INFO( "Found New Small Wheel geometry." );
+ GeoVolumeCursor pvnsw(pv.getVolume());
+
+ while (!pvnsw.atEnd()){
+ std::string stationName = pvnsw.getVolume()->getLogVol()->getName();
+
+ // Process MicroMegas chambers
+ if (stationName=="NSW_MM"){
+ ATH_MSG_DEBUG( "Processing NSW micromegas chambers." );
+
+ GeoVolumeCursor pvnswsub(pvnsw.getVolume());
+ bool newChamber = true;
+ std::string phiString = "";
+ double dphi=0, shift=0, zi=0, zo=0, ri=0, ro=0, wi=0, wo=0;
+ std::string chamberName="";
+ HepGeom::Point3D<double> pos_rot;
+
+ while (!pvnswsub.atEnd()){
+ if (((pvnswsub.getVolume()->getLogVol())->getShape())->typeID() == GeoTrd::getClassTypeID() ) { // MicroMega
+
+ if (pvnswsub.getTransform().translation().z()>=0) { // only process the chambers in the positive eta region
+ if (newChamber){
+
+ int phiIndex;
+ readNSWMMPars(&pvnswsub, maxPhi, chamberName, pos_rot, zi, zo, ri, ro, wi, wo, dphi, shift, phiIndex);
+ phiString = DataType(phiIndex).toString();
+
+ newChamber = false;
+ pvnswsub.next();
+ } // end of processing the first chamber
+
+ else{
+ std::string chamberName2;
+ HepGeom::Point3D<double> pos_rot2;
+ double zi2, zo2, ri2, ro2, wi2, wo2, dphi2, shift2;
+ int phiIndex2;
+ readNSWMMPars(&pvnswsub, maxPhi, chamberName2, pos_rot2, zi2, zo2, ri2, ro2, wi2, wo2, dphi2, shift2, phiIndex2);
+
+ if (chamberName == chamberName2
+ && pos_rot.distance(pos_rot2) < m_smallDistance
+ && equalAngle(dphi, dphi2)
+ && equalLength(shift, shift2)
+ && equalLength(zi, zi2)
+ && equalLength(zo, zo2)
+ && equalLength(ri, ri2)
+ && equalLength(ro, ro2)
+ && equalLength(wi, wi2)
+ && equalLength(wo, wo2)) {
+ // same chamber in different phi sector, add it to the existing phi index list
+ std::string stationPhi = DataType(phiIndex2).toString();
+ if (phiString.find(stationPhi) == std::string::npos) phiString += " " + stationPhi;
+
+ pvnswsub.next();
+ }
+ else {
+ // This is a different chamber.
+ // Reset the new chamber flag so that it can be processed as a new chamber in the next loop
+ newChamber = true;
+ }
+ } // end of processing another chamber and comparing it to the first chamber
+
+ }
+ else{ // skip negative eta chambers
+ pvnswsub.next();
+ }
+
+ if (phiString!="" && (newChamber || pvnswsub.atEnd())){
+ // if the next chamber is a different chamber, or this is the last chamber, write the geometry to output
+ ATH_MSG_DEBUG( "Writing " << chamberName );
+
+ std::string stationTech = "MM";
+ std::string stationName = "MM"+chamberName.substr(7,1); // MMS: small sector. MML: large sector
+ int eta = std::stoi(chamberName.substr(8,1));
+ writeATrd(out, stationTech, stationName, zi, zo, ri, ro, wi, wo, eta, phiString, dphi, shift, 0);
+
+ phiString = ""; // reset for new chambers
+ }
+ }
+ else { // not MicroMegas; Move to the next chamber
+ pvnswsub.next();
+ }
+
+ }
+ }
+
+ // Process sTGC chambers
+ else if (stationName=="NSW_sTGC"){
+
+ ATH_MSG_DEBUG( "Processing NSW sTGC chambers." );
+
+ GeoVolumeCursor pvnswsub(pvnsw.getVolume());
+ bool newChamber = true;
+ std::string phiString = "";
+ int nvtx=0;
+ double dz=0, dphi=0, shift=0;
+ std::string chamberName="";
+ HepGeom::Point3D<double> pos_rot;
+ const GeoSimplePolygonBrep* theBrep = nullptr;
+
+ while (!pvnswsub.atEnd()){
+ if (((pvnswsub.getVolume()->getLogVol())->getShape())->typeID() == GeoShapeShift::getClassTypeID() ) {// sTGC
+
+ if (pvnswsub.getTransform().translation().z()>=0) { // only process the chambers in the positive eta region
+
+ if (newChamber){
+
+ int phiIndex;
+ readNSWSTGCPars(&pvnswsub, maxPhi, chamberName, pos_rot, theBrep, nvtx, dz, dphi, shift, phiIndex);
+ phiString = DataType(phiIndex).toString();
+
+ newChamber = false;
+ pvnswsub.next();
+ } // end of processing the first chamber
+
+ else{
+
+ std::string chamberName2;
+ HepGeom::Point3D<double> pos_rot2;
+ const GeoSimplePolygonBrep* theBrep2;
+ int nvtx2, phiIndex2;
+ double dz2, dphi2, shift2;
+ readNSWSTGCPars(&pvnswsub, maxPhi, chamberName2, pos_rot2, theBrep2, nvtx2, dz2, dphi2, shift2, phiIndex2);
+
+ // Check if it is the same shape as the first chamber
+ bool isSameShape = true;
+ if (nvtx == nvtx2 && equalLength(dz, dz2) ) { // Same Nvtx and thickness. Check vertices coordinates.
+ for (int i=0; i<nvtx; ++i){
+ if ( !equalLength(theBrep->getXVertex(i), theBrep2->getXVertex(i))
+ || !equalLength(theBrep->getYVertex(i), theBrep2->getYVertex(i)) )
+ {
+ isSameShape = false;
+ }
+ }
+ }
+ else { // Different Nvtx or thickness
+ isSameShape = false;
+ }
+
+ // Check if it has the same name, offset and shape as the first chamber
+ if (chamberName == chamberName2
+ && pos_rot.distance(pos_rot2) < m_smallDistance
+ && equalAngle(dphi, dphi2)
+ && equalLength(shift, shift2)
+ && isSameShape)
+ {
+ // same chamber in different phi sector, add it to the existing phi index list
+ std::string stationPhi = DataType(phiIndex2).toString();
+ if (phiString.find(stationPhi) == std::string::npos) phiString += " " + stationPhi;
+
+ pvnswsub.next();
+ }
+ else {
+ // This is a different chamber.
+ // Reset the new chamber flag so that it can be processed as a new chamber in the next loop
+ newChamber = true;
+ }
+ } // end of processing another chamber and comparing it to the first chamber
+
+ }
+ else{ // skip negative eta chambers
+ pvnswsub.next();
+ }
+
+
+ if (phiString!="" && (newChamber || pvnswsub.atEnd())){
+ // if the next chamber is a different chamber, or this is the last chamber, write the geometry to output
+ ATH_MSG_DEBUG( "Writing " << chamberName );
+
+ std::string stationTech = "STGC";
+ std::string stationName = "ST"+chamberName.substr(8,1); // STS: small sector. STL: large sector
+ int eta = std::stoi(chamberName.substr(9,1));
+ double zi = pos_rot.z() - dz;
+ double zo = pos_rot.z() + dz;
+ double rho = pos_rot.perp();
+ double ri, ro, wi, wo;
+
+ if (nvtx==4){ // write as a single ATrd
+ // vtx1-----vtx0 (outer)
+ // \ /
+ // vtx2--vtx3 (inner)
+ const int vtxList[] = {0, 1, 2, 3};
+ readBrepAsATrd(theBrep, rho, vtxList, ri, ro, wi, wo);
+ writeATrd(out, stationTech, stationName, zi, zo, ri, ro, wi, wo, eta, phiString, dphi, shift, 0);
+ }
+
+ else if (nvtx==6){ // print as two ATrds
+ // vtx1-----vtx0 (outer)
+ // | |
+ // vtx2 vtx5
+ // \ /
+ // vtx3--vtx4 (inner)
+
+ // First ATrd (inner part): vertex 2, 3, 4, 5
+ const int vtxList1[] = {5, 2, 3, 4};
+ readBrepAsATrd(theBrep, rho, vtxList1, ri, ro, wi, wo);
+ writeATrd(out, stationTech, stationName, zi, zo, ri, ro, wi, wo, eta, phiString, dphi, shift, 0);
+
+ // Second ATrd (outter part): vertex 0, 1, 2, 5
+ const int vtxList2[] = {0, 1, 2, 5};
+ readBrepAsATrd(theBrep, rho, vtxList2, ri, ro, wi, wo);
+ writeATrd(out, stationTech, stationName, zi, zo, ri, ro, wi, wo, eta, phiString, dphi, shift, 0);
+
+ }
+
+ else{
+ ATH_MSG_ERROR( "Shape not supported by GeometryJiveXML: polygon shape with "<<nvtx <<" verticies in NSW sTGC." );
+ }
+ phiString = ""; // reset for new chambers
+ }
+
+ }
+ else { // not sTGC; Move to the next chamber
+ pvnswsub.next();
+ }
+
+ }
+ }
+ pvnsw.next();
+ }
+ return; // Done with NSW. Skip other subdetectors
+ }
+
+ pv.next();
+ }
+ }
+ av.next(); // increment volume cursor.
+ }
+ }
+
+ int MuonGeometryWriter::getPhiIndex(double phi, int maxPhi) const {
+ if (phi<0) phi += 2.*M_PI;
+ int phiIndex = std::round(phi * maxPhi / (2.*M_PI) - 0.1) + 1;
+ return phiIndex;
+ }
+
+ HepGeom::Point3D<double> MuonGeometryWriter::getPositionNSW(Amg::Vector3D pos, int maxPhi) const {
+ // get phi index of the sector
+ int phiIndex = getPhiIndex(pos.phi(), maxPhi);
+ // calculate phi of the sector center
+ double sectorPhi = 2.*M_PI * ((double) phiIndex-1.) / maxPhi;
+ // rotate to first sector
+ HepGeom::Point3D<double> pos_rot = HepGeom::RotateZ3D(-sectorPhi) * HepGeom::Point3D<double>(pos.x(), pos.y(), pos.z());
+
+ return pos_rot;
+ }
+
+ void MuonGeometryWriter::readNSWMMPars(const GeoVolumeCursor *pv, int maxPhi, std::string& chamberName, HepGeom::Point3D<double>& pos_rot,
+ double& zi, double& zo, double& ri, double& ro, double& wi, double& wo, double& dphi, double& shift, int& phiIndex) const {
+
+ chamberName = pv->getVolume()->getLogVol()->getName();
+ const GeoTrd* theTrd = dynamic_cast<const GeoTrd*> ((pv->getVolume()->getLogVol())->getShape());
+ Amg::Vector3D pos = pv->getTransform().translation();
+
+ pos_rot = getPositionNSW(pos, maxPhi);
+ dphi = getDeltaPhi(pos_rot, maxPhi);
+ shift = getShift(pos_rot, dphi);
+
+ zi = pos_rot.z() - theTrd->getXHalfLength1();
+ zo = pos_rot.z() + theTrd->getXHalfLength1();
+ ri = pos_rot.perp() - theTrd->getZHalfLength();
+ ro = pos_rot.perp() + theTrd->getZHalfLength();
+ wi = 2.0 * theTrd->getYHalfLength1();
+ wo = 2.0 * theTrd->getYHalfLength2();
+
+ phiIndex = getPhiIndex(pos.phi(), maxPhi);
+
+ return;
+ }
+
+ void MuonGeometryWriter::readNSWSTGCPars(const GeoVolumeCursor *pv, int maxPhi,
+ std::string& chamberName, HepGeom::Point3D<double>& pos_rot, const GeoSimplePolygonBrep*& theBrep,
+ int& nvtx, double& dz, double& dphi, double& shift, int& phiIndex) const {
+
+ chamberName = pv->getVolume()->getLogVol()->getName();
+
+ const GeoShapeShift* theShift = dynamic_cast<const GeoShapeShift*> ((pv->getVolume()->getLogVol())->getShape());
+ theBrep = dynamic_cast<const GeoSimplePolygonBrep*> (theShift->getOp());
+ nvtx = theBrep->getNVertices();
+ dz = theBrep->getDZ();
+
+ Amg::Vector3D pos = pv->getTransform().translation();
+ pos_rot = getPositionNSW(pos, maxPhi);
+ dphi = getDeltaPhi(pos_rot, maxPhi);
+ shift = getShift(pos_rot, dphi);
+
+ phiIndex = getPhiIndex(pos.phi(), maxPhi);
+
+ return;
+ }
+
+ void MuonGeometryWriter::readBrepAsATrd(const GeoSimplePolygonBrep* theBrep, double rho, const int *vtx,
+ double& ri, double& ro, double& wi, double& wo) const {
+ // vtx1-----vtx0 (outer)
+ // \ /
+ // vtx2--vtx3 (inner)
+ ri = rho + theBrep->getYVertex(vtx[3]);
+ ro = rho + theBrep->getYVertex(vtx[0]);
+ wi = theBrep->getXVertex(vtx[3]) - theBrep->getXVertex(vtx[2]);
+ wo = theBrep->getXVertex(vtx[0]) - theBrep->getXVertex(vtx[1]);
+ return;
+ }
+
+ bool MuonGeometryWriter::equalAngle(double a, double b) const {
+ return std::abs(a - b) < m_smallAngle;
+ }
+
+ bool MuonGeometryWriter::equalLength(double a, double b) const {
+ return std::abs(a - b) < m_smallDistance;
+ }
+
}
--
GitLab
From 697d7706c91dc085ad189339e418f08c05bd871c Mon Sep 17 00:00:00 2001
From: Nikita Belyaev <nikita.belyaev@cern.ch>
Date: Fri, 13 Aug 2021 18:47:49 +0000
Subject: [PATCH 041/272] TRTMonitoringRun3: Adding MT-safe calculation for
LumiVsTime histogram
---
.../TRTMonitoringRun3ESD_Alg.h | 3 +--
.../python/TRTMonitoringRun3ESD_Alg.py | 2 +-
.../src/TRTMonitoringRun3ESD_Alg.cxx | 17 +++++------------
3 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/TRTMonitoringRun3/TRTMonitoringRun3ESD_Alg.h b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/TRTMonitoringRun3/TRTMonitoringRun3ESD_Alg.h
index cfda0e201ac7..a591f30a163e 100644
--- a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/TRTMonitoringRun3/TRTMonitoringRun3ESD_Alg.h
+++ b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/TRTMonitoringRun3/TRTMonitoringRun3ESD_Alg.h
@@ -138,8 +138,7 @@ private:
int m_min_trt_hits;
int m_minTRThits;
float m_minP;
- float m_min_pT;
-
+ float m_min_pT;
// Deciphers status HT to GasType Enumerator
inline GasType Straw_Gastype(int stat) const {
diff --git a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/python/TRTMonitoringRun3ESD_Alg.py b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/python/TRTMonitoringRun3ESD_Alg.py
index 4835963b4070..3f6a89137035 100644
--- a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/python/TRTMonitoringRun3ESD_Alg.py
+++ b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/python/TRTMonitoringRun3ESD_Alg.py
@@ -214,7 +214,7 @@ def TRTMonitoringRun3ESD_AlgConfig(inputFlags):
smryGroup.defineHistogram('Summary;hSummary',weight='SummaryWeight',type='TH1F',title='Run Summary;;Entries',path='TRT/Shift/Summary',xbins=8,xmin=0,xmax=8,xlabels=sumLabels)
smryGroup.defineHistogram('IntLum;hIntLum',weight='IntLumWeight',type='TH1F',title='Luminosity;;Luminosity [#mub^{1}]',path='TRT/Shift/Summary',xbins=1,xmin=0.,xmax=1.)
smryGroup.defineHistogram('LBvsLum;hLBvsLum',weight='LBvsLumWeight',type='TH1F',title='Luminosity;Luminosity Bin;Luminosity [#mub^{1}]',path='TRT/Shift/Summary',xbins=2000,xmin=0.,xmax=2000.)
- smryGroup.defineHistogram('LBvsTime;hLBvsTime',weight='LBvsTimeWeight',type='TH1F',title='Time;Luminosity Bin;Time [s]',path='TRT/Shift/Summary',xbins=2000,xmin=0.,xmax=2000.)
+ smryGroup.defineHistogram('LBvsTime_x,LBvsTime_y;hLBvsTime',type='TProfile',title='Time;Luminosity Bin;Time [s]',path='TRT/Shift/Summary',xbins=2000,xmin=0.,xmax=2000.)
acc = helper.result()
result.merge(acc)
diff --git a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/src/TRTMonitoringRun3ESD_Alg.cxx b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/src/TRTMonitoringRun3ESD_Alg.cxx
index b000d7fb3bdf..ca081b5c5305 100644
--- a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/src/TRTMonitoringRun3ESD_Alg.cxx
+++ b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/src/TRTMonitoringRun3ESD_Alg.cxx
@@ -1269,39 +1269,32 @@ for (; p_trk != trackCollection.end(); ++p_trk) {
StatusCode TRTMonitoringRun3ESD_Alg::fillTRTHighThreshold(const xAOD::TrackParticleContainer& trackCollection,
const xAOD::EventInfo& eventInfo, const EventContext& ctx) const {
//----------------------------------------------------------------------------------//
- int maxtimestamp = 0.; // ToDo - this should be outside the function,
- // but such thing is restricted by the MT-safe paradigm
auto IntLum = Monitored::Scalar<float>("IntLum", 0.0);
auto LBvsLum = Monitored::Scalar<float>("LBvsLum", 0.0);
- auto LBvsTime = Monitored::Scalar<float>("LBvsTime", 0.0);
+ auto LBvsTime_x = Monitored::Scalar<float>("LBvsTime_x", 0.0);
+ auto LBvsTime_y = Monitored::Scalar<float>("LBvsTime_y", 0.0);
auto IntLumWeight = Monitored::Scalar<float>("IntLumWeight", 0.0);
auto LBvsLumWeight = Monitored::Scalar<float>("LBvsLumWeight", 0.0);
- auto LBvsTimeWeight = Monitored::Scalar<float>("LBvsTimeWeight", 0.0);
int lumiBlockNumber;
int timeStamp;
lumiBlockNumber = eventInfo.lumiBlock();
timeStamp = eventInfo.timeStamp();
- if (timeStamp > maxtimestamp) {
- maxtimestamp = timeStamp;
- }
-
int runNumber;
runNumber = eventInfo.runNumber();
// get Online Luminosity
double intLum = (lbDuration(ctx) * lbAverageLuminosity(ctx));
- double timeStampAverage = (maxtimestamp - 0.5*lbDuration(ctx));
IntLum = 0.5;
IntLumWeight = intLum;
fill("SmryHistograms", IntLumWeight, IntLum);
LBvsLum = lumiBlockNumber;
LBvsLumWeight = intLum;
fill("SmryHistograms", LBvsLumWeight, LBvsLum);
- LBvsTime = lumiBlockNumber;
- LBvsTimeWeight = timeStampAverage;
- fill("SmryHistograms", LBvsTimeWeight, LBvsTime);
+ LBvsTime_x = lumiBlockNumber;
+ LBvsTime_y = timeStamp;
+ fill("SmryHistograms", LBvsTime_x, LBvsTime_y);
ATH_MSG_VERBOSE("Filling TRT Aging Histos");
--
GitLab
From 0e4f471da0c79a10cadb6c4a00b9d61c01bfe255 Mon Sep 17 00:00:00 2001
From: Michael Sloan <michael.sloan@cern.ch>
Date: Fri, 13 Aug 2021 18:51:38 +0000
Subject: [PATCH 042/272] New Position Reconstruction Tool For sTGC
---
.../src/CaruanaSTgcClusterBuilderTool.cxx | 387 ++++++++++++++++++
.../src/CaruanaSTgcClusterBuilderTool.h | 67 +++
.../components/STgcClusterization_entries.cxx | 3 +-
.../python/MuonPrdProviderToolsConfig.py | 14 +-
.../python/MuonRecExampleConfigDb.py | 15 +-
.../MuonRecExample/python/NSWTools.py | 4 +-
.../share/MuonRDO_to_PRD_jobOptions.py | 2 +-
7 files changed, 475 insertions(+), 17 deletions(-)
create mode 100644 MuonSpectrometer/MuonReconstruction/MuonDataPrep/STgcClusterization/src/CaruanaSTgcClusterBuilderTool.cxx
create mode 100644 MuonSpectrometer/MuonReconstruction/MuonDataPrep/STgcClusterization/src/CaruanaSTgcClusterBuilderTool.h
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/STgcClusterization/src/CaruanaSTgcClusterBuilderTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/STgcClusterization/src/CaruanaSTgcClusterBuilderTool.cxx
new file mode 100644
index 000000000000..33adb9bd1a94
--- /dev/null
+++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/STgcClusterization/src/CaruanaSTgcClusterBuilderTool.cxx
@@ -0,0 +1,387 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "CaruanaSTgcClusterBuilderTool.h"
+#include "MuonPrepRawData/sTgcPrepData.h"
+#include "MuonReadoutGeometry/MuonDetectorManager.h"
+
+#include <set>
+#include <vector>
+#include <cmath>
+
+using namespace Muon;
+using namespace MuonGM;
+
+Muon::CaruanaSTgcClusterBuilderTool::CaruanaSTgcClusterBuilderTool(const std::string& t, const std::string& n, const IInterface* p) :
+ AthAlgTool(t,n,p)
+{
+ declareProperty("ChargeCut", m_chargeCut=0.0);
+ declareProperty("maxHoleSize",m_maxHoleSize=1);
+ declareProperty("addError",m_addError=0);
+ declareProperty("angularStripResolution", m_angularStripResolution=0.07);
+}
+
+StatusCode Muon::CaruanaSTgcClusterBuilderTool::initialize()
+{
+ ATH_CHECK( m_idHelperSvc.retrieve() );
+ ATH_CHECK(m_DetectorManagerKey.initialize());
+ return StatusCode::SUCCESS;
+}
+
+//
+// Build the clusters given a vector of single-hit PRD
+//
+StatusCode Muon::CaruanaSTgcClusterBuilderTool::getClusters(std::vector<Muon::sTgcPrepData>& stripsVect, std::vector<Muon::sTgcPrepData*>& clustersVect) const
+{
+
+ ATH_MSG_DEBUG("Size of the input vector: " << stripsVect.size());
+
+ //
+ // define the identifier hash
+ IdentifierHash hash;
+
+ double resolution=0.;
+ bool isStrip = false;
+ if ( !stripsVect.empty() ) {
+ resolution = stripsVect.at(0).localCovariance()(0,0);
+ Identifier chanId = stripsVect.at(0).identify();
+ if ( m_idHelperSvc->stgcIdHelper().channelType(chanId)==1 ) isStrip = true;
+ ATH_MSG_DEBUG(" channelType " << m_idHelperSvc->stgcIdHelper().channelType(chanId));
+ ATH_MSG_DEBUG("isStrip: " << isStrip << "Single channel resolution: " << resolution);
+ }
+ else {
+ ATH_MSG_DEBUG("Size of the channel vectors is zero");
+ return StatusCode::SUCCESS;
+ }
+
+ std::vector<std::set<unsigned int>> clustersStripNum[2][4];
+ std::vector<std::vector<Muon::sTgcPrepData>> clusters[2][4];
+
+ for ( auto& it : stripsVect ) {
+ if ( !addStrip(it,clustersStripNum,clusters) ) {
+ ATH_MSG_ERROR("Could not add a strip to the sTGC clusters");
+ return StatusCode::FAILURE;
+ }
+ }
+
+ // now add the clusters to the PRD container
+ //
+ clustersVect.clear();
+
+ SG::ReadCondHandle<MuonGM::MuonDetectorManager> DetectorManagerHandle{m_DetectorManagerKey};
+ const MuonGM::MuonDetectorManager* detManager = DetectorManagerHandle.cptr();
+ if(!detManager){
+ ATH_MSG_ERROR("Null pointer to the read MuonDetectorManager conditions object");
+ return StatusCode::FAILURE;
+ }
+
+ for ( unsigned int multilayer=0 ; multilayer<2 ; ++multilayer ) {
+ for ( unsigned int gasGap=0 ; gasGap<4 ; ++gasGap ) {
+ //
+ // loop on the clusters of that gap
+ //
+ for ( unsigned int i=0 ; i<clusters[multilayer][gasGap].size() ; ++i ) {
+ // get the cluster
+ std::vector<Muon::sTgcPrepData> const &cluster = clusters[multilayer][gasGap].at(i);
+ //
+ // loop on the strips and set the cluster weighted position and charge
+ //
+ std::vector<Identifier> rdoList;
+ //vectors to hold the properties of the elements of a cluster
+ std::vector<int> elementsCharge;
+ std::vector<short int> elementsTime;
+ std::vector<uint16_t> elementsChannel;
+ std::vector<double> elementsLocalPositions;
+ std::vector<Identifier> elementsIdentifier;
+ Identifier clusterId;
+ double reconstructedPosX = 0.0;
+ double posY = (cluster.at(0)).localPosition().y();
+
+ for ( const auto& it : cluster ){
+ rdoList.push_back(it.identify());
+ elementsCharge.push_back(it.charge());
+ elementsChannel.push_back(m_idHelperSvc->stgcIdHelper().channel(it.identify()));
+ elementsTime.push_back(it.time());
+ elementsLocalPositions.push_back(it.localPosition().x());
+ elementsIdentifier.push_back(it.identify());
+ }
+
+ // If the cluster is a cluster of pads or wires, use the default weighted mean method to compute the reconstructed postion. If it is a cluster of strips, we use the Caruana method of fitting a Gaussian to the distribution
+ bool caruanaFail = false; // If the Caruana method fails at some point this is changed to true and the reconstruction reverts to the weighted mean method
+ double sigmaSq = 0.0;
+ if (isStrip){
+ // Here we implement the Caruana method to reconstruct the position of the cluster
+ AmgSymMatrix(3) elementPosMatrix;
+ for (int i=0; i<3; i++){
+ for (int j=0; j<=i; j++) elementPosMatrix.fillSymmetric(i, j, 0);
+ }
+ Amg::Vector3D chargeVector(0., 0., 0.);
+
+ // Some strips are recorded with a charge of zero, these strips will break the reconstruction (as the log of the charges are taken) and hence must be removed from the cluster temporarily.
+ std::vector<int> charges = elementsCharge;
+ std::vector<double> stripPositions = elementsLocalPositions;
+ bool zeroChargeFlag = false;
+ do {
+ zeroChargeFlag = false;
+ for (size_t i_charge=0; i_charge<charges.size(); i_charge++){
+ if (charges.at(i_charge) <= 0){
+ charges.erase(charges.begin()+i_charge);
+ stripPositions.erase(stripPositions.begin()+i_charge);
+ zeroChargeFlag = true;
+ break;
+ }
+ }
+ } while (zeroChargeFlag);
+
+ // The reconstruction method becomes much simpiler when the strip positions are shifted such that the center of the cluster is at zero.
+ float clusterCenter = 0;
+ for (size_t i_strip=0; i_strip<stripPositions.size(); i_strip++) clusterCenter += stripPositions.at(i_strip);
+ clusterCenter = clusterCenter/stripPositions.size();
+
+ std::vector<double> stripPositions_shifted = {};
+ for (size_t i_strip=0; i_strip<stripPositions.size(); i_strip++) stripPositions_shifted.push_back(stripPositions.at(i_strip)-clusterCenter);
+
+ // Now build the matrix equation
+ for (size_t i_element=0; i_element<stripPositions_shifted.size(); i_element++){
+ if (charges.at(i_element) == 0) continue;
+ elementPosMatrix.fillSymmetric(0, 0, elementPosMatrix(0,0) + 1);
+ elementPosMatrix.fillSymmetric(0, 1, elementPosMatrix(0,1) + stripPositions_shifted.at(i_element));
+ elementPosMatrix.fillSymmetric(0, 2, elementPosMatrix(0,2) + std::pow(stripPositions_shifted.at(i_element), 2));
+ elementPosMatrix.fillSymmetric(1, 2, elementPosMatrix(1,2) + std::pow(stripPositions_shifted.at(i_element), 3));
+ elementPosMatrix.fillSymmetric(2, 2, elementPosMatrix(2,2) + std::pow(stripPositions_shifted.at(i_element), 4));
+ const double log_charge = std::log(charges.at(i_element));
+ chargeVector(0) += log_charge;
+ chargeVector(1) += stripPositions_shifted.at(i_element)*log_charge;
+ chargeVector(2) += std::pow(stripPositions_shifted.at(i_element), 2)*log_charge;
+ }
+ elementPosMatrix(1,1) = elementPosMatrix(0,2);
+
+ if (elementPosMatrix.determinant() == 0) caruanaFail = true; // If the matrix is singular then the reconstruction method will fail. Revert back to the weighted mean.
+
+ if (!caruanaFail){
+ Amg::Vector3D caruanaPars = (elementPosMatrix.inverse())*chargeVector;
+ reconstructedPosX = clusterCenter - caruanaPars(1)/(2*caruanaPars(2));
+ if (isnan(reconstructedPosX)) caruanaFail = true; // In the event that the caruanaPars(2) parameter is 0 we reconstruct and infinite position. In this case we must revert back to the weighted mean method.
+
+ if (!caruanaFail){
+ // Find the channel that the cluster position reconstructs on top of and set the cluster id to it's id
+ double minCenterDistance = 9999.99;
+ int channelIndex = 0;
+ for (size_t i_elem=0; i_elem<elementsLocalPositions.size(); i_elem++){
+ if (minCenterDistance > abs(elementsLocalPositions.at(i_elem)-reconstructedPosX)){
+ minCenterDistance = abs(elementsLocalPositions.at(i_elem)-reconstructedPosX);
+ channelIndex = i_elem;
+ }
+ }
+ clusterId = elementsIdentifier.at(channelIndex);
+
+ // We denote caruanaPars = (a, b, c) and find the error on the b and c componant
+ double gamma0 = 0;
+ double gamma2 = 0;
+ double gamma4 = 0;
+ for (size_t i_strip=0; i_strip<stripPositions_shifted.size(); i_strip++){
+ gamma0 += 1;
+ gamma2 += std::pow(stripPositions_shifted.at(i_strip), 2);
+ gamma4 += std::pow(stripPositions_shifted.at(i_strip), 4);
+ }
+
+ // We also need the tan(theta) of the cluster
+ const MuonGM::sTgcReadoutElement* detEl = detManager->getsTgcReadoutElement(clusterId);
+ Amg::Vector3D globPos(0., 0.,0.);
+ detEl->stripGlobalPosition(clusterId, globPos);
+ double tan_theta = std::sqrt(globPos.x()*globPos.x() + globPos.y()*globPos.y())/globPos.z();
+ double spreadFactor = m_angularStripResolution*std::sqrt(1+12*tan_theta*tan_theta);
+ // m_angularStripResolution = 0.07 *** This value is also used in the Digitization and should therefore be modified to reference the same variable used there ***
+
+ double sigma_b = spreadFactor/std::sqrt(gamma2);
+ double sigma_c = spreadFactor*std::sqrt(gamma0/(gamma0*gamma4-gamma2*gamma2));
+
+ // Now propagate the Uncertainty to find the uncertainty on the mean
+ sigmaSq = std::pow((1/(2*caruanaPars(2)))*sigma_b, 2) + std::pow((caruanaPars(1)/(2*caruanaPars(2)*caruanaPars(2)))*sigma_c, 2);
+ }
+ }
+ }
+
+ // If the cluster is not a cluster of strip, the Caruana method constructed a matrix that is not invertible, or we choose to skip the Caruana reconstruction completely then the position is calculated using a weighted mean.
+ if (!isStrip || caruanaFail){
+ double weightedPosX = 0.0;
+ double totalCharge = 0.0;
+ sigmaSq = 0;
+ for ( const auto& it : cluster ){
+ double weight = 0.0;
+ isStrip ? weight = it.charge() : weight = 1.0;
+ ATH_MSG_DEBUG("isStrip: " << isStrip << " weight: " << weight);
+ weightedPosX += it.localPosition().x()*weight;
+ totalCharge += weight;
+ ATH_MSG_DEBUG("Channel local position and charge: " << it.localPosition().x() << " " << it.charge() );
+ }
+ reconstructedPosX = weightedPosX/totalCharge;
+
+ //
+ // get the error on the cluster position
+ //
+ ATH_MSG_DEBUG("Cluster size: " << cluster.size());
+ if ( cluster.size() > 1 ) {
+ double weight = 0.0;
+ for ( const auto& it : cluster ) {
+ isStrip ? weight = it.charge() : weight = 1.0;
+ ATH_MSG_DEBUG("isStrip: " << isStrip << " weight: " << weight);
+ //sigmaSq += weight*(it.localPosition().x()-weightedPosX)*(it.localPosition().x()-weightedPosX);
+ sigmaSq += weight*weight*resolution;
+ ATH_MSG_DEBUG(">>>> posX: " << it.localPosition().x() << " weightedPosX: " << weightedPosX);
+ }
+ }
+ else {
+ sigmaSq = resolution;
+ }
+ sigmaSq = sigmaSq/(totalCharge*totalCharge);
+ ATH_MSG_DEBUG("Uncertainty on cluster position is: " << sqrt(sigmaSq));
+
+ // Find the channel that the cluster position reconstructs on top of and set the cluster id to it's id
+ double minCenterDistance = 9999.99;
+ int channelIndex = 0;
+ for (size_t i_elem=0; i_elem<elementsLocalPositions.size(); i_elem++){
+ if (minCenterDistance > abs(elementsLocalPositions.at(i_elem)-reconstructedPosX)){
+ minCenterDistance = abs(elementsLocalPositions.at(i_elem)-reconstructedPosX);
+ channelIndex = i_elem;
+ }
+ }
+ clusterId = elementsIdentifier.at(channelIndex);
+ }
+
+ Amg::Vector2D localPosition(reconstructedPosX,posY);
+
+ auto covN = Amg::MatrixX(1,1);
+ covN(0,0) = sigmaSq + m_addError*m_addError;
+
+ //
+ // memory allocated dynamically for the PrepRawData is managed by Event Store in the converters
+ //
+ ATH_MSG_DEBUG("error on cluster " << sqrt((covN)(0,0)) << " added error " << m_addError);
+
+ sTgcPrepData* prdN = new sTgcPrepData(
+ clusterId,
+ hash,
+ localPosition,
+ rdoList,
+ covN,
+ cluster.at(0).detectorElement(),
+ std::accumulate(elementsCharge.begin(), elementsCharge.end(), 0),
+ (short int)0,
+ (uint16_t)0,
+ elementsChannel,
+ elementsTime,
+ elementsCharge);
+ clustersVect.push_back(prdN);
+ }
+ }
+ }
+
+ ATH_MSG_DEBUG("Size of the output cluster vector: " << clustersVect.size());
+
+ return StatusCode::SUCCESS;
+}
+
+
+bool Muon::CaruanaSTgcClusterBuilderTool::addStrip(const Muon::sTgcPrepData& strip, std::vector<std::set<unsigned int>> (&clustersStripNum)[2][4],
+ std::vector<std::vector<Muon::sTgcPrepData>> (&clusters)[2][4])const
+{
+
+ Identifier prd_id = strip.identify();
+ int channelType = m_idHelperSvc->stgcIdHelper().channelType(prd_id);
+ int multilayer = m_idHelperSvc->stgcIdHelper().multilayer(prd_id)-1;
+ int gasGap = m_idHelperSvc->stgcIdHelper().gasGap(prd_id)-1;
+ unsigned int stripNum = m_idHelperSvc->stgcIdHelper().channel(prd_id);
+
+ ATH_MSG_DEBUG(">>>>>>>>>>>>>> In addStrip: channelType, multilayer, gasGap, stripNum: " << channelType
+ << " " << multilayer << " "
+ << gasGap << " " << stripNum);
+
+ // if no cluster is present start creating a new one
+ if (clustersStripNum[multilayer][gasGap].empty() ) {
+
+ ATH_MSG_DEBUG( ">>> No strip present in this gap: adding it as first cluster " );
+ std::set<unsigned int> clusterStripNum;
+ std::vector<Muon::sTgcPrepData> cluster;
+
+ clusterStripNum.insert(stripNum);
+ cluster.push_back(strip);
+
+ std::vector<std::set<unsigned int>> &clustersOfLayerStripNum = clustersStripNum[multilayer][gasGap];
+ std::vector<std::vector<Muon::sTgcPrepData>> &clustersOfLayer = clusters[multilayer][gasGap];
+
+ clustersOfLayerStripNum.emplace_back();
+ clustersOfLayerStripNum.back().insert(stripNum);
+ clustersOfLayer.emplace_back();
+ clustersOfLayer.back().push_back(strip);
+
+ return true;
+ }
+ else {
+
+ //
+ // check if the strip can be added to a cluster
+ //
+ for ( unsigned int i=0 ; i<clustersStripNum[multilayer][gasGap].size() ; ++i ) {
+
+ std::set<unsigned int> &clusterStripNum = clustersStripNum[multilayer][gasGap].at(i);
+
+ unsigned int firstStrip = *(clusterStripNum.begin());
+ unsigned int lastStrip = *(--clusterStripNum.end());
+ ATH_MSG_DEBUG("First strip and last strip are: " << firstStrip << " " << lastStrip);
+ unsigned int diffFirst = (stripNum-firstStrip) > 0 ? stripNum - firstStrip : firstStrip-stripNum ;
+ unsigned int diffLast = (stripNum-lastStrip) > 0 ? stripNum - lastStrip : lastStrip-stripNum ;
+ if ( diffFirst<=m_maxHoleSize + 1 || diffLast<=m_maxHoleSize + 1) {
+
+ ATH_MSG_DEBUG(">> inserting a new strip");
+ clustersStripNum[multilayer][gasGap].at(i).insert(stripNum);
+ clusters[multilayer][gasGap].at(i).push_back(strip);
+
+ ATH_MSG_DEBUG("size after inserting is: " << clustersStripNum[multilayer][gasGap].at(i).size());
+ ATH_MSG_DEBUG("and the first and last strip are: "
+ << *(clustersStripNum[multilayer][gasGap].at(i).begin()) << " "
+ << *(--clustersStripNum[multilayer][gasGap].at(i).end()));
+ return true;
+ }
+ }
+ // if not, build a new cluster starting from it
+ //
+ std::set<unsigned int> clusterStripNum;
+ std::vector<Muon::sTgcPrepData> cluster;
+
+ clusterStripNum.insert(stripNum);
+ cluster.push_back(strip);
+
+ clustersStripNum[multilayer][gasGap].push_back(std::move(clusterStripNum));
+ clusters[multilayer][gasGap].push_back(std::move(cluster));
+
+ return true;
+ }
+
+ return false;
+}
+
+///
+/// sort the strips if needed
+void CaruanaSTgcClusterBuilderTool::dumpStrips( std::vector<Muon::sTgcPrepData>& stripsVect,
+ std::vector<Muon::sTgcPrepData*>& clustersVect ) const
+{
+
+ ATH_MSG_INFO("====> Dumping all strips: ");
+ for ( const auto& it : stripsVect ) {
+ Identifier stripId = it.identify();
+ ATH_MSG_INFO("Strip identifier: " << m_idHelperSvc->stgcIdHelper().show_to_string(stripId) );
+ }
+
+ ATH_MSG_INFO("Dumping all clusters: ");
+ for ( auto *it : clustersVect ) {
+ Identifier clusterId = it->identify();
+ ATH_MSG_INFO("***> New cluster identifier: " << m_idHelperSvc->stgcIdHelper().show_to_string(clusterId) );
+ ATH_MSG_INFO("Cluster size: " << it->rdoList().size() );
+ ATH_MSG_INFO("List of associated RDO's: ");
+
+ }
+
+ return;
+}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/STgcClusterization/src/CaruanaSTgcClusterBuilderTool.h b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/STgcClusterization/src/CaruanaSTgcClusterBuilderTool.h
new file mode 100644
index 000000000000..e08bfe7d75a9
--- /dev/null
+++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/STgcClusterization/src/CaruanaSTgcClusterBuilderTool.h
@@ -0,0 +1,67 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef CaruanaSTgcClusterBuilderTool_h
+#define CaruanaSTgcClusterBuilderTool_h
+
+#include "STgcClusterization/ISTgcClusterBuilderTool.h"
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "GaudiKernel/ServiceHandle.h"
+#include "StoreGate/ReadCondHandleKey.h"
+#include "MuonReadoutGeometry/MuonDetectorManager.h"
+#include "MuonIdHelpers/IMuonIdHelperSvc.h"
+
+#include <vector>
+#include <string>
+#include <set>
+
+//
+// Simple clusterization tool for STgc
+//
+namespace Muon
+{
+
+ class ISTgcClusterBuilderTool;
+
+ class CaruanaSTgcClusterBuilderTool : virtual public ISTgcClusterBuilderTool, public AthAlgTool {
+
+ public:
+
+ /** Default constructor */
+ CaruanaSTgcClusterBuilderTool(const std::string&, const std::string&, const IInterface*);
+
+ /** Default destructor */
+ virtual ~CaruanaSTgcClusterBuilderTool()=default;
+
+ /** standard initialize method */
+ virtual StatusCode initialize();
+
+ StatusCode getClusters(std::vector<Muon::sTgcPrepData>& stripsVect,
+ std::vector<Muon::sTgcPrepData*>& clustersVect)const;
+
+ private:
+
+ double m_chargeCut;
+ unsigned int m_maxHoleSize;
+ double m_addError;
+ double m_angularStripResolution;
+
+ ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
+
+ SG::ReadCondHandleKey<MuonGM::MuonDetectorManager> m_DetectorManagerKey {this, "DetectorManagerKey", "MuonDetectorManager", "Key of input MuonDetectorManager condition data"};
+
+
+ /// private functions
+ void dumpStrips( std::vector<Muon::sTgcPrepData>& stripsVect,
+ std::vector<Muon::sTgcPrepData*>& clustersVect )const;
+
+ bool addStrip(const Muon::sTgcPrepData& strip,std::vector<std::set<unsigned int>> (&clustersStripNum)[2][4],
+ std::vector<std::vector<Muon::sTgcPrepData>> (&clusters)[2][4])const;
+
+
+ };
+
+
+}
+#endif
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/STgcClusterization/src/components/STgcClusterization_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/STgcClusterization/src/components/STgcClusterization_entries.cxx
index ed42e0be422b..39343efbf5ab 100755
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/STgcClusterization/src/components/STgcClusterization_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/STgcClusterization/src/components/STgcClusterization_entries.cxx
@@ -1,4 +1,5 @@
#include "../SimpleSTgcClusterBuilderTool.h"
+#include "../CaruanaSTgcClusterBuilderTool.h"
DECLARE_COMPONENT(Muon::SimpleSTgcClusterBuilderTool)
-
+DECLARE_COMPONENT(Muon::CaruanaSTgcClusterBuilderTool)
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonPrdProviderToolsConfig.py b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonPrdProviderToolsConfig.py
index f0774162fac5..863f7a7a9b97 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonPrdProviderToolsConfig.py
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonPrdProviderToolsConfig.py
@@ -20,7 +20,7 @@ def RpcPrepDataProviderTool(name="RpcPrepDataProviderTool",**kwargs):
raise ValueError( "RpcPrepDataProviderTool: unsupported dataSource %s" % globalflags.DataSource() )
from MuonRPC_CnvTools.MuonRPC_CnvToolsConf import Muon__RpcRdoToPrepDataToolMT
- if athenaCommonFlags.isOnline:
+ if athenaCommonFlags.isOnline:
kwargs["ReadKey"] = ""
return Muon__RpcRdoToPrepDataToolMT(name,**kwargs)
@@ -33,7 +33,7 @@ def MdtPrepDataProviderTool(name="MdtPrepDataProviderTool", **kwargs):
from AthenaCommon.Include import include
MuonCalibConfig.setupMdtCondDB()
include("AmdcAth/AmdcAth_jobOptions.py")
-
+
if globalflags.DataSource.is_data():
kwargs.setdefault("UseTwin", True)
kwargs.setdefault("CalibrationTool", MuonCalibConfig.MdtCalibrationTool())
@@ -43,13 +43,13 @@ def MdtPrepDataProviderTool(name="MdtPrepDataProviderTool", **kwargs):
def TgcPrepDataProviderTool(name="TgcPrepDataProviderTool", **kwargs):
- # setup dependencies which are not yet in C++
+ # setup dependencies which are not yet in C++
import MuonCnvExample.MuonCablingConfig # noqa: F401
from MuonTGC_CnvTools.MuonTGC_CnvToolsConf import Muon__TgcRdoToPrepDataToolMT
return Muon__TgcRdoToPrepDataToolMT(name, **kwargs)
-
-
+
+
def CscPrepDataProviderTool(name="CscPrepDataProviderTool", **kwargs):
# setup dependencies which are not yet in C++
import MuonCnvExample.MuonCablingConfig # noqa: F401
@@ -71,13 +71,13 @@ def CscRdoToCscPrepData(name="CscRdoToCscPrepData", **kwargs):
return Muon__CscRdoToCscPrepData(name, **kwargs)
#############################################################################
-def MM_PrepDataProviderTool(name="MM_PrepDataProviderTool", **kwargs):
+def MM_PrepDataProviderTool(name="MM_PrepDataProviderTool", **kwargs):
kwargs.setdefault("ClusterBuilderTool","SimpleMMClusterBuilderTool")
kwargs.setdefault("NSWCalibTool","NSWCalibTool")
from MuonMM_CnvTools.MuonMM_CnvToolsConf import Muon__MmRdoToPrepDataToolMT
return Muon__MmRdoToPrepDataToolMT(name,**kwargs)
-def STGC_PrepDataProviderTool(name="STGC_PrepDataProviderTool", **kwargs):
+def STGC_PrepDataProviderTool(name="STGC_PrepDataProviderTool", **kwargs):
kwargs.setdefault("ClusterBuilderTool","SimpleSTgcClusterBuilderTool")
from MuonSTGC_CnvTools.MuonSTGC_CnvToolsConf import Muon__sTgcRdoToPrepDataToolMT
return Muon__sTgcRdoToPrepDataToolMT(name,**kwargs)
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecExampleConfigDb.py b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecExampleConfigDb.py
index 96981ae20e7f..45d9f5ca9e02 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecExampleConfigDb.py
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecExampleConfigDb.py
@@ -59,8 +59,8 @@ addTool("MuonRecExample.MuonRecTools.MuonStraightLineExtrapolator", "MuonStraigh
addTool("Trk::KalmanUpdator", "MuonMeasUpdator")
-addService("Muon::MuonIdHelperSvc", "MuonIdHelperSvc", HasCSC=MuonGeometryFlags.hasCSC(),
- HasSTgc=MuonGeometryFlags.hasSTGC(),
+addService("Muon::MuonIdHelperSvc", "MuonIdHelperSvc", HasCSC=MuonGeometryFlags.hasCSC(),
+ HasSTgc=MuonGeometryFlags.hasSTGC(),
HasMM=MuonGeometryFlags.hasMM(),
RunCSC=setup_cscs,
RunsTgc=setup_stgcs,
@@ -170,9 +170,9 @@ if setup_cscs:
addTool( "MuonRecExample.MuonRecTools.CscClusterOnTrackCreator", "CscClusterOnTrackCreator" )
addTool( "MuonRecExample.MuonRecTools.CscBroadClusterOnTrackCreator", "CscBroadClusterOnTrackCreator" )
-addTool( "MuonRecExample.MooreTools.MuonChamberHoleRecoveryTool",
- "MuonChamberHoleRecoveryTool",
- CscRotCreator=("Muon::CscClusterOnTrackCreator/CscClusterOnTrackCreator" if setup_cscs else ""),
+addTool( "MuonRecExample.MooreTools.MuonChamberHoleRecoveryTool",
+ "MuonChamberHoleRecoveryTool",
+ CscRotCreator=("Muon::CscClusterOnTrackCreator/CscClusterOnTrackCreator" if setup_cscs else ""),
CscPrepDataContainer=("CSC_Clusters" if setup_cscs else ""))
addTool( "MuonRecExample.MooreTools.MuonSegmentRegionRecoveryTool", "MuonSegmentRegionRecoveryTool" )
@@ -241,6 +241,7 @@ if setup_mm:
addTool("NSWCalibTools.NSWCalibToolsConfig.MMCalibSmearingTool","MMCalibSmearingTool")
if setup_stgcs:
addTool("MuonRecExample.NSWTools.SimpleSTgcClusterBuilderTool","SimpleSTgcClusterBuilderTool")
+ addTool("MuonRecExample.NSWTools.CaruanaSTgcClusterBuilderTool","CaruanaSTgcClusterBuilderTool")
addTool("NSWCalibTools.NSWCalibToolsConfig.STgcCalibSmearingTool","STgcCalibSmearingTool")
if setup_stgcs or setup_mm:
addTool("NSWCalibTools.NSWCalibToolsConfig.NSWCalibTool","NSWCalibTool")
@@ -249,10 +250,10 @@ if setup_stgcs or setup_mm:
# Tools from MuonRecExample.MuPatTools
################################################################################
-addTool( "MuonRecExample.MuPatTools.MuPatCandidateTool","MuPatCandidateTool",
+addTool( "MuonRecExample.MuPatTools.MuPatCandidateTool","MuPatCandidateTool",
CscRotCreator=("Muon::CscClusterOnTrackCreator/CscClusterOnTrackCreator" if setup_cscs else ""))
-addTool( "MuonRecExample.MuPatTools.MuPatHitTool", "MuPatHitTool",
+addTool( "MuonRecExample.MuPatTools.MuPatHitTool", "MuPatHitTool",
CscRotCreator=("Muon::CscClusterOnTrackCreator/CscClusterOnTrackCreator" if setup_cscs else ""))
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/NSWTools.py b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/NSWTools.py
index 5a60b828fcbc..2f06e5c61154 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/NSWTools.py
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/NSWTools.py
@@ -29,4 +29,6 @@ def ClusterTimeProjectionMMClusterBuilderTool(name="ClusterTimeProjectionMMClust
##
def SimpleSTgcClusterBuilderTool(name="SimpleSTgcClusterBuilderTool",extraFlags=None,**kwargs):
return CfgMgr.Muon__SimpleSTgcClusterBuilderTool(name,**kwargs)
-
+
+def CaruanaSTgcClusterBuilderTool(name="CaruanaSTgcClusterBuilderTool",extraFlags=None,**kwargs):
+ return CfgMgr.Muon__CaruanaSTgcClusterBuilderTool(name,**kwargs)
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRDO_to_PRD_jobOptions.py b/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRDO_to_PRD_jobOptions.py
index 8085d278a475..7ccf38ed3a22 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRDO_to_PRD_jobOptions.py
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRDO_to_PRD_jobOptions.py
@@ -17,7 +17,7 @@ from AthenaCommon.BeamFlags import jobproperties
beamFlags = jobproperties.Beam
from AthenaCommon.CfgGetter import getAlgorithm
-from MuonRecExample.MuonPrdProviderToolsConfig import RpcPrepDataProviderTool, MdtPrepDataProviderTool, TgcPrepDataProviderTool, CscPrepDataProviderTool
+from MuonRecExample.MuonPrdProviderToolsConfig import STGC_PrepDataProviderTool, RpcPrepDataProviderTool, MdtPrepDataProviderTool, TgcPrepDataProviderTool, CscPrepDataProviderTool
from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags
--
GitLab
From e1d8632068478e31fcce13aade497bf0aa0df36e Mon Sep 17 00:00:00 2001
From: Yohei Yamaguchi <yohei.yamaguchi@cern.ch>
Date: Fri, 13 Aug 2021 18:56:25 +0000
Subject: [PATCH 043/272] Update track isolation variables used in isolation
WPs
---
.../share/DataQualityMon_jobOptions.py | 21 +-
.../Root/getIsolationAccessor.cxx | 28 +-
.../Root/getIsolationDecorator.cxx | 28 +-
.../xAODPrimitives/IsolationFlavour.h | 34 +-
.../xAODPrimitives/IsolationType.h | 98 +-
.../Root/IsolationCloseByCorrectionTool.cxx | 8 +-
.../Root/IsolationSelectionTool.cxx | 58 +-
.../python/EGammaCommon.py | 2 +-
.../python/ElectronsCPContent.py | 2 +-
.../python/PhotonsCPContent.py | 2 +-
.../DerivationFrameworkEGamma/share/EGAM10.py | 2 +-
.../python/MuonsCPContent.py | 15 +-
.../DerivationFrameworkMuons/share/MUON3.py | 2 +-
.../DerivationFrameworkPhys/share/PHYSLITE.py | 4 +-
.../share/PhysValMuon_jobOptions.py | 10 +-
.../SUSYPhys/SUSYTools/CMakeLists.txt | 6 +-
.../SUSYTools/data/SUSYTools_Default.conf | 2 +-
.../SUSYTools/scripts/TestSUSYToolsAlg.py | 4 +-
.../share/ut_SUSYToolsTester_data.ref | 95 +-
.../SUSYTools/share/ut_SUSYToolsTester_mc.ref | 4549 ++++++++++-------
.../SUSYPhys/SUSYTools/src/SUSYToolsAlg.cxx | 4 +-
.../TopAnalysis/Root/EventSaverFlatNtuple.cxx | 8 +-
.../TopAnalysis/EventSaverFlatNtuple.h | 2 +-
.../Root/EgammaObjectCollectionMaker.cxx | 24 +-
.../Root/MuonObjectCollectionMaker.cxx | 38 +-
.../python/IsoUpdatedTrackCones.py | 4 +-
26 files changed, 2880 insertions(+), 2170 deletions(-)
diff --git a/DataQuality/DataQualityTools/share/DataQualityMon_jobOptions.py b/DataQuality/DataQualityTools/share/DataQualityMon_jobOptions.py
index feeeff14aaee..c89137d261b0 100644
--- a/DataQuality/DataQualityTools/share/DataQualityMon_jobOptions.py
+++ b/DataQuality/DataQualityTools/share/DataQualityMon_jobOptions.py
@@ -36,9 +36,24 @@ else:
JetCollectionKey='AntiKt4EMTopoJets'
# add isolation variables for IsolationSelection
-from IsolationAlgs.IsoUpdatedTrackCones import GetUpdatedIsoTrackCones
-if not hasattr(topSequence,"IsolationBuilderTight1000"):
- topSequence += GetUpdatedIsoTrackCones()
+isESD=False
+for class_name, name in metadata['metadata_items'].items():
+ if name == 'EventStreamInfo':
+ if "ESD" in class_name :
+ print ("Running on ESD - will add TTVA decorations.")
+ isESD=True
+
+if isESD:
+ from IsolationAlgs.IsoUpdatedTrackCones import GetUpdatedIsoTrackCones
+ if not hasattr(topSequence,"IsolationBuilderNonprompt_All_MaxWeight1000"):
+ ToolSvc += CfgMgr.InDet__InDetUsedInFitTrackDecoratorTool( name = topSequence.name()+"_InDetUsedInFitDecoratorTool_forIso",
+ AMVFVerticesDecoName = 'TTVA_AMVFVertices',
+ AMVFWeightsDecoName = 'TTVA_AMVFWeights',
+ TrackContainer = 'InDetTrackParticles',
+ VertexContainer = 'PrimaryVertices' )
+ topSequence += CfgMgr.InDet__InDetUsedInVertexFitTrackDecorator(name = topSequence.name()+"_InDetUsedInFitDecorator_forIso",
+ UsedInFitDecoratorTool = getattr(ToolSvc, topSequence.name()+"_InDetUsedInFitDecoratorTool_forIso") )
+ topSequence += GetUpdatedIsoTrackCones()
from AthenaCommon.JobProperties import jobproperties
if not 'InDetKeys' in dir():
diff --git a/Event/xAOD/xAODPrimitives/Root/getIsolationAccessor.cxx b/Event/xAOD/xAODPrimitives/Root/getIsolationAccessor.cxx
index be60b1b14af8..05759bf454a4 100644
--- a/Event/xAOD/xAODPrimitives/Root/getIsolationAccessor.cxx
+++ b/Event/xAOD/xAODPrimitives/Root/getIsolationAccessor.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// Local include(s):
@@ -40,6 +40,32 @@ const SG::AuxElement::Accessor< float >*
DEFINE_ACCESSOR(ptvarcone20);
DEFINE_ACCESSOR(ptvarcone30);
DEFINE_ACCESSOR(ptvarcone40);
+ // Ptcone variables for high mu:
+ DEFINE_ACCESSOR(ptcone20_Nonprompt_All_MaxWeightTTVA_pt500);
+ DEFINE_ACCESSOR(ptcone30_Nonprompt_All_MaxWeightTTVA_pt500);
+ DEFINE_ACCESSOR(ptcone40_Nonprompt_All_MaxWeightTTVA_pt500);
+ DEFINE_ACCESSOR(ptcone20_Nonprompt_All_MaxWeightTTVA_pt1000);
+ DEFINE_ACCESSOR(ptcone30_Nonprompt_All_MaxWeightTTVA_pt1000);
+ DEFINE_ACCESSOR(ptcone40_Nonprompt_All_MaxWeightTTVA_pt1000);
+ DEFINE_ACCESSOR(ptcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt500);
+ DEFINE_ACCESSOR(ptcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt500);
+ DEFINE_ACCESSOR(ptcone40_Nonprompt_All_MaxWeightTTVALooseCone_pt500);
+ DEFINE_ACCESSOR(ptcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt1000);
+ DEFINE_ACCESSOR(ptcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt1000);
+ DEFINE_ACCESSOR(ptcone40_Nonprompt_All_MaxWeightTTVALooseCone_pt1000);
+ // Mini-Isolation (http://arxiv.org/abs/1007.2221) variables for high mu:
+ DEFINE_ACCESSOR(ptvarcone20_Nonprompt_All_MaxWeightTTVA_pt500);
+ DEFINE_ACCESSOR(ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500);
+ DEFINE_ACCESSOR(ptvarcone40_Nonprompt_All_MaxWeightTTVA_pt500);
+ DEFINE_ACCESSOR(ptvarcone20_Nonprompt_All_MaxWeightTTVA_pt1000);
+ DEFINE_ACCESSOR(ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000);
+ DEFINE_ACCESSOR(ptvarcone40_Nonprompt_All_MaxWeightTTVA_pt1000);
+ DEFINE_ACCESSOR(ptvarcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt500);
+ DEFINE_ACCESSOR(ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt500);
+ DEFINE_ACCESSOR(ptvarcone40_Nonprompt_All_MaxWeightTTVALooseCone_pt500);
+ DEFINE_ACCESSOR(ptvarcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt1000);
+ DEFINE_ACCESSOR(ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt1000);
+ DEFINE_ACCESSOR(ptvarcone40_Nonprompt_All_MaxWeightTTVALooseCone_pt1000);
// neutral eflow
DEFINE_ACCESSOR(neflowisol20);
DEFINE_ACCESSOR(neflowisol30);
diff --git a/Event/xAOD/xAODPrimitives/Root/getIsolationDecorator.cxx b/Event/xAOD/xAODPrimitives/Root/getIsolationDecorator.cxx
index 44a015b6202a..ed5f11c0d8b5 100644
--- a/Event/xAOD/xAODPrimitives/Root/getIsolationDecorator.cxx
+++ b/Event/xAOD/xAODPrimitives/Root/getIsolationDecorator.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// Local include(s):
@@ -40,6 +40,32 @@ const SG::AuxElement::Decorator< float >*
DEFINE_DECORATOR(ptvarcone20);
DEFINE_DECORATOR(ptvarcone30);
DEFINE_DECORATOR(ptvarcone40);
+ // Ptcone variables for high mu:
+ DEFINE_DECORATOR(ptcone20_Nonprompt_All_MaxWeightTTVA_pt500);
+ DEFINE_DECORATOR(ptcone30_Nonprompt_All_MaxWeightTTVA_pt500);
+ DEFINE_DECORATOR(ptcone40_Nonprompt_All_MaxWeightTTVA_pt500);
+ DEFINE_DECORATOR(ptcone20_Nonprompt_All_MaxWeightTTVA_pt1000);
+ DEFINE_DECORATOR(ptcone30_Nonprompt_All_MaxWeightTTVA_pt1000);
+ DEFINE_DECORATOR(ptcone40_Nonprompt_All_MaxWeightTTVA_pt1000);
+ DEFINE_DECORATOR(ptcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt500);
+ DEFINE_DECORATOR(ptcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt500);
+ DEFINE_DECORATOR(ptcone40_Nonprompt_All_MaxWeightTTVALooseCone_pt500);
+ DEFINE_DECORATOR(ptcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt1000);
+ DEFINE_DECORATOR(ptcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt1000);
+ DEFINE_DECORATOR(ptcone40_Nonprompt_All_MaxWeightTTVALooseCone_pt1000);
+ // Mini-Isolation (http://arxiv.org/abs/1007.2221) variables for high mu:
+ DEFINE_DECORATOR(ptvarcone20_Nonprompt_All_MaxWeightTTVA_pt500);
+ DEFINE_DECORATOR(ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500);
+ DEFINE_DECORATOR(ptvarcone40_Nonprompt_All_MaxWeightTTVA_pt500);
+ DEFINE_DECORATOR(ptvarcone20_Nonprompt_All_MaxWeightTTVA_pt1000);
+ DEFINE_DECORATOR(ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000);
+ DEFINE_DECORATOR(ptvarcone40_Nonprompt_All_MaxWeightTTVA_pt1000);
+ DEFINE_DECORATOR(ptvarcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt500);
+ DEFINE_DECORATOR(ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt500);
+ DEFINE_DECORATOR(ptvarcone40_Nonprompt_All_MaxWeightTTVALooseCone_pt500);
+ DEFINE_DECORATOR(ptvarcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt1000);
+ DEFINE_DECORATOR(ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt1000);
+ DEFINE_DECORATOR(ptvarcone40_Nonprompt_All_MaxWeightTTVALooseCone_pt1000);
// neutral eflow
DEFINE_DECORATOR(neflowisol20);
DEFINE_DECORATOR(neflowisol30);
diff --git a/Event/xAOD/xAODPrimitives/xAODPrimitives/IsolationFlavour.h b/Event/xAOD/xAODPrimitives/xAODPrimitives/IsolationFlavour.h
index 3a55d4ac8347..2227b550d3e1 100644
--- a/Event/xAOD/xAODPrimitives/xAODPrimitives/IsolationFlavour.h
+++ b/Event/xAOD/xAODPrimitives/xAODPrimitives/IsolationFlavour.h
@@ -1,7 +1,7 @@
// Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// $Id: IsolationType.h 618834 2014-09-27 16:40:39Z christos $
@@ -31,19 +31,19 @@ namespace xAOD {
neflowisol = 4,
///ptvarcone for high mu
- ptvarcone_TightTTVA_pt500 = 5,
- ptvarcone_TightTTVA_pt1000 = 6,
+ ptvarcone_Nonprompt_All_MaxWeightTTVA_pt500 = 5,
+ ptvarcone_Nonprompt_All_MaxWeightTTVA_pt1000 = 6,
///ptcone for high mu
- ptcone_TightTTVA_pt500 = 7,
- ptcone_TightTTVA_pt1000 = 8,
+ ptcone_Nonprompt_All_MaxWeightTTVA_pt500 = 7,
+ ptcone_Nonprompt_All_MaxWeightTTVA_pt1000 = 8,
- ptvarcone_TightTTVALooseCone_pt500 = 9,
- ptvarcone_TightTTVALooseCone_pt1000 = 10,
+ ptvarcone_Nonprompt_All_MaxWeightTTVALooseCone_pt500 = 9,
+ ptvarcone_Nonprompt_All_MaxWeightTTVALooseCone_pt1000 = 10,
///ptcone for high mu
- ptcone_TightTTVALooseCone_pt500 = 11,
- ptcone_TightTTVALooseCone_pt1000 = 12,
+ ptcone_Nonprompt_All_MaxWeightTTVALooseCone_pt500 = 11,
+ ptcone_Nonprompt_All_MaxWeightTTVALooseCone_pt1000 = 12,
numIsolationFlavours=13
@@ -57,14 +57,14 @@ namespace xAOD {
case topoetcone: return "topoetcone";
case ptvarcone: return "ptvarcone";
case neflowisol: return "neflowisol";
- case ptvarcone_TightTTVA_pt500: return "ptvarcone_TightTTVA_pt500";
- case ptvarcone_TightTTVA_pt1000: return "ptvarcone_TightTTVA_pt1000";
- case ptcone_TightTTVA_pt500: return "ptcone_TightTTVA_pt500";
- case ptcone_TightTTVA_pt1000: return "ptcone_TightTTVA_pt1000";
- case ptvarcone_TightTTVALooseCone_pt500: return "ptvarcone_TightTTVALooseCone_pt500";
- case ptvarcone_TightTTVALooseCone_pt1000: return "ptvarcone_TightTTVALooseCone_pt1000";
- case ptcone_TightTTVALooseCone_pt500: return "ptcone_TightTTVALooseCone_pt500";
- case ptcone_TightTTVALooseCone_pt1000: return "ptcone_TightTTVALooseCone_pt1000";
+ case ptvarcone_Nonprompt_All_MaxWeightTTVA_pt500: return "ptvarcone_Nonprompt_All_MaxWeightTTVA_pt500";
+ case ptvarcone_Nonprompt_All_MaxWeightTTVA_pt1000: return "ptvarcone_Nonprompt_All_MaxWeightTTVA_pt1000";
+ case ptcone_Nonprompt_All_MaxWeightTTVA_pt500: return "ptcone_Nonprompt_All_MaxWeightTTVA_pt500";
+ case ptcone_Nonprompt_All_MaxWeightTTVA_pt1000: return "ptcone_Nonprompt_All_MaxWeightTTVA_pt1000";
+ case ptvarcone_Nonprompt_All_MaxWeightTTVALooseCone_pt500: return "ptvarcone_Nonprompt_All_MaxWeightTTVALooseCone_pt500";
+ case ptvarcone_Nonprompt_All_MaxWeightTTVALooseCone_pt1000: return "ptvarcone_Nonprompt_All_MaxWeightTTVALooseCone_pt1000";
+ case ptcone_Nonprompt_All_MaxWeightTTVALooseCone_pt500: return "ptcone_Nonprompt_All_MaxWeightTTVALooseCone_pt500";
+ case ptcone_Nonprompt_All_MaxWeightTTVALooseCone_pt1000: return "ptcone_Nonprompt_All_MaxWeightTTVALooseCone_pt1000";
default: return "[Unknown IsolationFlavour]";
}
}
diff --git a/Event/xAOD/xAODPrimitives/xAODPrimitives/IsolationType.h b/Event/xAOD/xAODPrimitives/xAODPrimitives/IsolationType.h
index ca2e1d1032d4..ace792898714 100644
--- a/Event/xAOD/xAODPrimitives/xAODPrimitives/IsolationType.h
+++ b/Event/xAOD/xAODPrimitives/xAODPrimitives/IsolationType.h
@@ -1,7 +1,7 @@
// Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef XAODPRIMITIVES_ISOLATIONTYPE_H
@@ -70,48 +70,48 @@ namespace xAOD {
/// Mini-Isolation http://arxiv.org/abs/1007.2221 for high mu
/// @{
- ptvarcone20_TightTTVA_pt500 = 52,
- ptvarcone30_TightTTVA_pt500 = 54,
- ptvarcone40_TightTTVA_pt500 = 56,
- ptvarcone20_TightTTVA_pt1000 = 62,
- ptvarcone30_TightTTVA_pt1000 = 64,
- ptvarcone40_TightTTVA_pt1000 = 66,
+ ptvarcone20_Nonprompt_All_MaxWeightTTVA_pt500 = 52,
+ ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500 = 54,
+ ptvarcone40_Nonprompt_All_MaxWeightTTVA_pt500 = 56,
+ ptvarcone20_Nonprompt_All_MaxWeightTTVA_pt1000 = 62,
+ ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000 = 64,
+ ptvarcone40_Nonprompt_All_MaxWeightTTVA_pt1000 = 66,
/// @}
/// Ptcone http://arxiv.org/abs/1007.2221 for high mu
/// @{
- ptcone20_TightTTVA_pt500 = 72,
- ptcone30_TightTTVA_pt500 = 74,
- ptcone40_TightTTVA_pt500 = 76,
- ptcone20_TightTTVA_pt1000 = 82,
- ptcone30_TightTTVA_pt1000 = 84,
- ptcone40_TightTTVA_pt1000 = 86,
+ ptcone20_Nonprompt_All_MaxWeightTTVA_pt500 = 72,
+ ptcone30_Nonprompt_All_MaxWeightTTVA_pt500 = 74,
+ ptcone40_Nonprompt_All_MaxWeightTTVA_pt500 = 76,
+ ptcone20_Nonprompt_All_MaxWeightTTVA_pt1000 = 82,
+ ptcone30_Nonprompt_All_MaxWeightTTVA_pt1000 = 84,
+ ptcone40_Nonprompt_All_MaxWeightTTVA_pt1000 = 86,
/// @}
/// Mini-Isolation http://arxiv.org/abs/1007.2221 for high mu
/// @{
- ptvarcone20_TightTTVALooseCone_pt500 = 92,
- ptvarcone30_TightTTVALooseCone_pt500 = 94,
- ptvarcone40_TightTTVALooseCone_pt500 = 96,
- ptvarcone20_TightTTVALooseCone_pt1000 = 102,
- ptvarcone30_TightTTVALooseCone_pt1000 = 104,
- ptvarcone40_TightTTVALooseCone_pt1000 = 106,
+ ptvarcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt500 = 92,
+ ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt500 = 94,
+ ptvarcone40_Nonprompt_All_MaxWeightTTVALooseCone_pt500 = 96,
+ ptvarcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt1000 = 102,
+ ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt1000 = 104,
+ ptvarcone40_Nonprompt_All_MaxWeightTTVALooseCone_pt1000 = 106,
/// @}
/// Ptcone http://arxiv.org/abs/1007.2221 for high mu
/// @{
- ptcone20_TightTTVALooseCone_pt500 = 112,
- ptcone30_TightTTVALooseCone_pt500 = 114,
- ptcone40_TightTTVALooseCone_pt500 = 116,
- ptcone20_TightTTVALooseCone_pt1000 = 122,
- ptcone30_TightTTVALooseCone_pt1000 = 124,
- ptcone40_TightTTVALooseCone_pt1000 = 126,
+ ptcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt500 = 112,
+ ptcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt500 = 114,
+ ptcone40_Nonprompt_All_MaxWeightTTVALooseCone_pt500 = 116,
+ ptcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt1000 = 122,
+ ptcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt1000 = 124,
+ ptcone40_Nonprompt_All_MaxWeightTTVALooseCone_pt1000 = 126,
/// @}
@@ -136,37 +136,37 @@ namespace xAOD {
case ptvarcone30: return "ptvarcone30";
case ptvarcone40: return "ptvarcone40";
- case ptcone20_TightTTVA_pt500: return "ptcone20_TightTTVA_pt500";
- case ptcone30_TightTTVA_pt500: return "ptcone30_TightTTVA_pt500";
- case ptcone40_TightTTVA_pt500: return "ptcone40_TightTTVA_pt500";
+ case ptcone20_Nonprompt_All_MaxWeightTTVA_pt500: return "ptcone20_Nonprompt_All_MaxWeightTTVA_pt500";
+ case ptcone30_Nonprompt_All_MaxWeightTTVA_pt500: return "ptcone30_Nonprompt_All_MaxWeightTTVA_pt500";
+ case ptcone40_Nonprompt_All_MaxWeightTTVA_pt500: return "ptcone40_Nonprompt_All_MaxWeightTTVA_pt500";
- case ptcone20_TightTTVA_pt1000: return "ptcone20_TightTTVA_pt1000";
- case ptcone30_TightTTVA_pt1000: return "ptcone30_TightTTVA_pt1000";
- case ptcone40_TightTTVA_pt1000: return "ptcone40_TightTTVA_pt1000";
+ case ptcone20_Nonprompt_All_MaxWeightTTVA_pt1000: return "ptcone20_Nonprompt_All_MaxWeightTTVA_pt1000";
+ case ptcone30_Nonprompt_All_MaxWeightTTVA_pt1000: return "ptcone30_Nonprompt_All_MaxWeightTTVA_pt1000";
+ case ptcone40_Nonprompt_All_MaxWeightTTVA_pt1000: return "ptcone40_Nonprompt_All_MaxWeightTTVA_pt1000";
- case ptvarcone20_TightTTVA_pt500: return "ptvarcone20_TightTTVA_pt500";
- case ptvarcone30_TightTTVA_pt500: return "ptvarcone30_TightTTVA_pt500";
- case ptvarcone40_TightTTVA_pt500: return "ptvarcone40_TightTTVA_pt500";
+ case ptvarcone20_Nonprompt_All_MaxWeightTTVA_pt500: return "ptvarcone20_Nonprompt_All_MaxWeightTTVA_pt500";
+ case ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500: return "ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500";
+ case ptvarcone40_Nonprompt_All_MaxWeightTTVA_pt500: return "ptvarcone40_Nonprompt_All_MaxWeightTTVA_pt500";
- case ptvarcone20_TightTTVA_pt1000: return "ptvarcone20_TightTTVA_pt1000";
- case ptvarcone30_TightTTVA_pt1000: return "ptvarcone30_TightTTVA_pt1000";
- case ptvarcone40_TightTTVA_pt1000: return "ptvarcone40_TightTTVA_pt1000";
+ case ptvarcone20_Nonprompt_All_MaxWeightTTVA_pt1000: return "ptvarcone20_Nonprompt_All_MaxWeightTTVA_pt1000";
+ case ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000: return "ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000";
+ case ptvarcone40_Nonprompt_All_MaxWeightTTVA_pt1000: return "ptvarcone40_Nonprompt_All_MaxWeightTTVA_pt1000";
- case ptcone20_TightTTVALooseCone_pt500: return "ptcone20_TightTTVALooseCone_pt500";
- case ptcone30_TightTTVALooseCone_pt500: return "ptcone30_TightTTVALooseCone_pt500";
- case ptcone40_TightTTVALooseCone_pt500: return "ptcone40_TightTTVALooseCone_pt500";
+ case ptcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt500: return "ptcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt500";
+ case ptcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt500: return "ptcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt500";
+ case ptcone40_Nonprompt_All_MaxWeightTTVALooseCone_pt500: return "ptcone40_Nonprompt_All_MaxWeightTTVALooseCone_pt500";
- case ptcone20_TightTTVALooseCone_pt1000: return "ptcone20_TightTTVALooseCone_pt1000";
- case ptcone30_TightTTVALooseCone_pt1000: return "ptcone30_TightTTVALooseCone_pt1000";
- case ptcone40_TightTTVALooseCone_pt1000: return "ptcone40_TightTTVALooseCone_pt1000";
+ case ptcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt1000: return "ptcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt1000";
+ case ptcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt1000: return "ptcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt1000";
+ case ptcone40_Nonprompt_All_MaxWeightTTVALooseCone_pt1000: return "ptcone40_Nonprompt_All_MaxWeightTTVALooseCone_pt1000";
- case ptvarcone20_TightTTVALooseCone_pt500: return "ptvarcone20_TightTTVALooseCone_pt500";
- case ptvarcone30_TightTTVALooseCone_pt500: return "ptvarcone30_TightTTVALooseCone_pt500";
- case ptvarcone40_TightTTVALooseCone_pt500: return "ptvarcone40_TightTTVALooseCone_pt500";
+ case ptvarcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt500: return "ptvarcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt500";
+ case ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt500: return "ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt500";
+ case ptvarcone40_Nonprompt_All_MaxWeightTTVALooseCone_pt500: return "ptvarcone40_Nonprompt_All_MaxWeightTTVALooseCone_pt500";
- case ptvarcone20_TightTTVALooseCone_pt1000: return "ptvarcone20_TightTTVALooseCone_pt1000";
- case ptvarcone30_TightTTVALooseCone_pt1000: return "ptvarcone30_TightTTVALooseCone_pt1000";
- case ptvarcone40_TightTTVALooseCone_pt1000: return "ptvarcone40_TightTTVALooseCone_pt1000";
+ case ptvarcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt1000: return "ptvarcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt1000";
+ case ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt1000: return "ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt1000";
+ case ptvarcone40_Nonprompt_All_MaxWeightTTVALooseCone_pt1000: return "ptvarcone40_Nonprompt_All_MaxWeightTTVALooseCone_pt1000";
case topoetcone20: return "topoetcone20";
case topoetcone30: return "topoetcone30";
diff --git a/PhysicsAnalysis/AnalysisCommon/IsolationSelection/Root/IsolationCloseByCorrectionTool.cxx b/PhysicsAnalysis/AnalysisCommon/IsolationSelection/Root/IsolationCloseByCorrectionTool.cxx
index f99aede7fd76..c29200551952 100644
--- a/PhysicsAnalysis/AnalysisCommon/IsolationSelection/Root/IsolationCloseByCorrectionTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/IsolationSelection/Root/IsolationCloseByCorrectionTool.cxx
@@ -795,11 +795,11 @@ namespace CP {
}
bool IsolationCloseByCorrectionTool::isFixedTrackIsoTTVA(xAOD::Iso::IsolationType type) const {
xAOD::Iso::IsolationFlavour flavour = xAOD::Iso::isolationFlavour(type);
- return xAOD::Iso::IsolationFlavour::ptcone_TightTTVA_pt500 == flavour || xAOD::Iso::IsolationFlavour::ptcone_TightTTVA_pt1000 == flavour;
+ return xAOD::Iso::IsolationFlavour::ptcone_Nonprompt_All_MaxWeightTTVA_pt500 == flavour || xAOD::Iso::IsolationFlavour::ptcone_Nonprompt_All_MaxWeightTTVA_pt1000 == flavour;
}
bool IsolationCloseByCorrectionTool::isVarTrackIsoTTVA(xAOD::Iso::IsolationType type) const {
xAOD::Iso::IsolationFlavour flavour = xAOD::Iso::isolationFlavour(type);
- return xAOD::Iso::IsolationFlavour::ptvarcone_TightTTVA_pt500 == flavour || xAOD::Iso::IsolationFlavour::ptvarcone_TightTTVA_pt1000 == flavour;
+ return xAOD::Iso::IsolationFlavour::ptvarcone_Nonprompt_All_MaxWeightTTVA_pt500 == flavour || xAOD::Iso::IsolationFlavour::ptvarcone_Nonprompt_All_MaxWeightTTVA_pt1000 == flavour;
}
bool IsolationCloseByCorrectionTool::isTrackIsoTTVA(xAOD::Iso::IsolationType type) const {
return isFixedTrackIsoTTVA(type) || isVarTrackIsoTTVA(type);
@@ -813,8 +813,8 @@ namespace CP {
float IsolationCloseByCorrectionTool::trackPtCut(xAOD::Iso::IsolationType type) const {
if (!isTrackIso(type)) return -1;
xAOD::Iso::IsolationFlavour flavour = xAOD::Iso::isolationFlavour(type);
- if (flavour == xAOD::Iso::IsolationFlavour::ptcone_TightTTVA_pt500) return 500;
- else if (flavour == xAOD::Iso::IsolationFlavour::ptvarcone_TightTTVA_pt500) return 500;
+ if (flavour == xAOD::Iso::IsolationFlavour::ptcone_Nonprompt_All_MaxWeightTTVA_pt500) return 500;
+ else if (flavour == xAOD::Iso::IsolationFlavour::ptvarcone_Nonprompt_All_MaxWeightTTVA_pt500) return 500;
return 1000;
}
bool IsolationCloseByCorrectionTool::isPFlowIso(xAOD::Iso::IsolationType type) const{
diff --git a/PhysicsAnalysis/AnalysisCommon/IsolationSelection/Root/IsolationSelectionTool.cxx b/PhysicsAnalysis/AnalysisCommon/IsolationSelection/Root/IsolationSelectionTool.cxx
index e76df6ce1600..b62959d9f41e 100644
--- a/PhysicsAnalysis/AnalysisCommon/IsolationSelection/Root/IsolationSelectionTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/IsolationSelection/Root/IsolationSelectionTool.cxx
@@ -179,52 +179,52 @@ namespace CP {
StatusCode IsolationSelectionTool::addMuonWP(std::string muWPname) {
IsolationWP* wp = new IsolationWP(muWPname);
if (muWPname == "HighPtTrackOnly") {
- wp->addCut(new IsolationConditionFormula("ptcone20_Tight_1p25", xAOD::Iso::ptcone20_TightTTVA_pt1000, "1.25E03")); //units are MeV!
+ wp->addCut(new IsolationConditionFormula("ptcone20_Tight_1p25", xAOD::Iso::ptcone20_Nonprompt_All_MaxWeightTTVA_pt1000, "1.25E03")); //units are MeV!
} else if (muWPname == "FCTightTrackOnly_FixedRad" || muWPname == "TightTrackOnly_FixedRad") {
- wp->addCut(new IsolationConditionFormula("MuonFixedCutHighMuTrackOnly_lowPt", xAOD::Iso::ptvarcone30_TightTTVA_pt1000, "0.06*(x>50e3?1e9:x)"));
- wp->addCut(new IsolationConditionFormula("MuonFixedCutHighMuTrackOnly_highPt", xAOD::Iso::ptcone20_TightTTVA_pt1000, "0.06*(x>50e3?x:1e9)"));
+ wp->addCut(new IsolationConditionFormula("MuonFixedCutHighMuTrackOnly_lowPt", xAOD::Iso::ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000, "0.06*(x>50e3?1e9:x)"));
+ wp->addCut(new IsolationConditionFormula("MuonFixedCutHighMuTrackOnly_highPt", xAOD::Iso::ptcone20_Nonprompt_All_MaxWeightTTVA_pt1000, "0.06*(x>50e3?x:1e9)"));
} else if (muWPname == "FCTight_FixedRad" || muWPname == "Tight_FixedRad") {
- wp->addCut(new IsolationConditionFormula("MuonFixedCutHighMuTight_track_lowPt", xAOD::Iso::ptvarcone30_TightTTVA_pt1000, "0.04*(x>50e3?1e9:x)"));
- wp->addCut(new IsolationConditionFormula("MuonFixedCutHighMuTight_track_highPt", xAOD::Iso::ptcone20_TightTTVA_pt1000, "0.04*(x>50e3?x:1e9)"));
+ wp->addCut(new IsolationConditionFormula("MuonFixedCutHighMuTight_track_lowPt", xAOD::Iso::ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000, "0.04*(x>50e3?1e9:x)"));
+ wp->addCut(new IsolationConditionFormula("MuonFixedCutHighMuTight_track_highPt", xAOD::Iso::ptcone20_Nonprompt_All_MaxWeightTTVA_pt1000, "0.04*(x>50e3?x:1e9)"));
wp->addCut(new IsolationConditionFormula("MuonFixedCutHighMuTight_calo", xAOD::Iso::topoetcone20, "0.15*x"));
} else if (muWPname == "FCLoose_FixedRad" || muWPname == "Loose_FixedRad") {
- wp->addCut(new IsolationConditionFormula("MuonFixedCutHighMuLoose_track_lowPt", xAOD::Iso::ptvarcone30_TightTTVA_pt1000, "0.15*(x>50e3?1e9:x)"));
- wp->addCut(new IsolationConditionFormula("MuonFixedCutHighMuLoose_track_highPt", xAOD::Iso::ptcone20_TightTTVA_pt1000, "0.15*(x>50e3?x:1e9)"));
+ wp->addCut(new IsolationConditionFormula("MuonFixedCutHighMuLoose_track_lowPt", xAOD::Iso::ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000, "0.15*(x>50e3?1e9:x)"));
+ wp->addCut(new IsolationConditionFormula("MuonFixedCutHighMuLoose_track_highPt", xAOD::Iso::ptcone20_Nonprompt_All_MaxWeightTTVA_pt1000, "0.15*(x>50e3?x:1e9)"));
wp->addCut(new IsolationConditionFormula("MuonFixedCutHighMuLoose_calo", xAOD::Iso::topoetcone20, "0.30*x"));
} else if (muWPname == "FCTightTrackOnly" || muWPname == "TightTrackOnly_VarRad") {
- wp->addCut(new IsolationConditionFormula("MuonFixedCutHighMuTrackOnly", xAOD::Iso::ptvarcone30_TightTTVA_pt1000, "0.06*x"));
+ wp->addCut(new IsolationConditionFormula("MuonFixedCutHighMuTrackOnly", xAOD::Iso::ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000, "0.06*x"));
} else if (muWPname == "FCTight" || muWPname == "Tight_VarRad") {
- wp->addCut(new IsolationConditionFormula("MuonFixedCutHighMuTight_track", xAOD::Iso::ptvarcone30_TightTTVA_pt1000, "0.04*x"));
+ wp->addCut(new IsolationConditionFormula("MuonFixedCutHighMuTight_track", xAOD::Iso::ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000, "0.04*x"));
wp->addCut(new IsolationConditionFormula("MuonFixedCutHighMuTight_calo", xAOD::Iso::topoetcone20, "0.15*x"));
} else if (muWPname == "FCLoose" || muWPname == "Loose_VarRad") {
- wp->addCut(new IsolationConditionFormula("MuonFixedCutHighMuLoose_track", xAOD::Iso::ptvarcone30_TightTTVA_pt1000, "0.15*x"));
+ wp->addCut(new IsolationConditionFormula("MuonFixedCutHighMuLoose_track", xAOD::Iso::ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000, "0.15*x"));
wp->addCut(new IsolationConditionFormula("MuonFixedCutHighMuLoose_calo", xAOD::Iso::topoetcone20, "0.30*x"));
} else if (muWPname == "FixedCutPflowTight" || muWPname == "PflowTight_FixedRad") {
std::vector<xAOD::Iso::IsolationType> isoTypesHighPt;
std::vector<xAOD::Iso::IsolationType> isoTypesLowPt;
- isoTypesHighPt.push_back(xAOD::Iso::ptcone20_TightTTVA_pt500);
+ isoTypesHighPt.push_back(xAOD::Iso::ptcone20_Nonprompt_All_MaxWeightTTVA_pt500);
isoTypesHighPt.push_back(xAOD::Iso::neflowisol20);
- isoTypesLowPt.push_back(xAOD::Iso::ptvarcone30_TightTTVA_pt500);
+ isoTypesLowPt.push_back(xAOD::Iso::ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500);
isoTypesLowPt.push_back(xAOD::Iso::neflowisol20);
wp->addCut(new IsolationConditionCombined("MuonPFlowTightLowPt", isoTypesLowPt, TF2("pflowTFunctionLowPt","fabs(x)+0.4*(y>0?y:0)"), "0.045*(x>50e3?1e9:x)"));
wp->addCut(new IsolationConditionCombined("MuonPFlowTightHighPt", isoTypesHighPt, TF2("pflowTFunctionHighPt","fabs(x)+0.4*(y>0?y:0)"), "0.045*(x>50e3?x:1e9)"));
} else if (muWPname == "PflowTight_VarRad") {
std::vector<xAOD::Iso::IsolationType> isoTypes;
- isoTypes.push_back(xAOD::Iso::ptvarcone30_TightTTVA_pt500);
+ isoTypes.push_back(xAOD::Iso::ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500);
isoTypes.push_back(xAOD::Iso::neflowisol20);
wp->addCut(new IsolationConditionCombined("MuonPFlowTight", isoTypes, TF2("pflowTFunction","fabs(x)+0.4*(y>0?y:0)"), "0.045*x"));
} else if (muWPname == "FixedCutPflowLoose" || muWPname == "PflowLoose_FixedRad") {
std::vector<xAOD::Iso::IsolationType> isoTypesHighPt;
std::vector<xAOD::Iso::IsolationType> isoTypesLowPt;
- isoTypesHighPt.push_back(xAOD::Iso::ptcone20_TightTTVA_pt500);
+ isoTypesHighPt.push_back(xAOD::Iso::ptcone20_Nonprompt_All_MaxWeightTTVA_pt500);
isoTypesHighPt.push_back(xAOD::Iso::neflowisol20);
- isoTypesLowPt.push_back(xAOD::Iso::ptvarcone30_TightTTVA_pt500);
+ isoTypesLowPt.push_back(xAOD::Iso::ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500);
isoTypesLowPt.push_back(xAOD::Iso::neflowisol20);
wp->addCut(new IsolationConditionCombined("MuonPFlowLooseLowPt", isoTypesLowPt, TF2("pflowLFunctionLowPt","fabs(x)+0.4*(y>0?y:0)"), "0.16*(x>50e3?1e9:x)"));
wp->addCut(new IsolationConditionCombined("MuonPFlowLooseHighPt", isoTypesHighPt, TF2("pflowLFunctionHighPt","fabs(x)+0.4*(y>0?y:0)"), "0.16*(x>50e3?x:1e9)"));
} else if (muWPname == "PflowLoose_VarRad") {
std::vector<xAOD::Iso::IsolationType> isoTypes;
- isoTypes.push_back(xAOD::Iso::ptvarcone30_TightTTVA_pt500);
+ isoTypes.push_back(xAOD::Iso::ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500);
isoTypes.push_back(xAOD::Iso::neflowisol20);
wp->addCut(new IsolationConditionCombined("MuonPFlowLoose", isoTypes, TF2("pflowTFunction","fabs(x)+0.4*(y>0?y:0)"), "0.16*x"));
} else {
@@ -249,10 +249,10 @@ namespace CP {
wp->addCut(new IsolationConditionFormula("PhFixedCut_track20", xAOD::Iso::ptcone20, "0.05*x"));
} else if (phWPname == "Tight") {
wp->addCut(new IsolationConditionFormula("PhFixedCut_calo40", xAOD::Iso::topoetcone40, "0.022*x+2450"));
- wp->addCut(new IsolationConditionFormula("PhFixedCut_Tighttrack20", xAOD::Iso::ptcone20_TightTTVA_pt1000, "0.05*x"));
+ wp->addCut(new IsolationConditionFormula("PhFixedCut_Tighttrack20", xAOD::Iso::ptcone20_Nonprompt_All_MaxWeightTTVA_pt1000, "0.05*x"));
} else if (phWPname == "Loose") {
wp->addCut(new IsolationConditionFormula("PhFixedCut_calo20", xAOD::Iso::topoetcone20, "0.065*x"));
- wp->addCut(new IsolationConditionFormula("PhFixedCut_Tighttrack20", xAOD::Iso::ptcone20_TightTTVA_pt1000, "0.05*x"));
+ wp->addCut(new IsolationConditionFormula("PhFixedCut_Tighttrack20", xAOD::Iso::ptcone20_Nonprompt_All_MaxWeightTTVA_pt1000, "0.05*x"));
} else {
ATH_MSG_ERROR("Unknown photon isolation WP: " << phWPname);
delete wp;
@@ -272,42 +272,42 @@ namespace CP {
if(elWPname == "FCHighPtCaloOnly" || elWPname == "HighPtCaloOnly"){
wp->addCut(new IsolationConditionFormula("FCHighPtCaloOnly_calo", xAOD::Iso::topoetcone20, "std::max(0.015*x,3.5E3)")); //units are MeV!
} else if (elWPname == "Tight" || elWPname == "Tight_VarRad") {
- wp->addCut(new IsolationConditionFormula("ElecTight_track", xAOD::Iso::ptvarcone30_TightTTVALooseCone_pt1000, "0.06*x"));
+ wp->addCut(new IsolationConditionFormula("ElecTight_track", xAOD::Iso::ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt1000, "0.06*x"));
wp->addCut(new IsolationConditionFormula("ElecTight_calo", xAOD::Iso::topoetcone20, "0.06*x"));
} else if (elWPname == "Loose" || elWPname == "Loose_VarRad") {
- wp->addCut(new IsolationConditionFormula("ElecLoose_track", xAOD::Iso::ptvarcone30_TightTTVALooseCone_pt1000, "0.15*x"));
+ wp->addCut(new IsolationConditionFormula("ElecLoose_track", xAOD::Iso::ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt1000, "0.15*x"));
wp->addCut(new IsolationConditionFormula("ElecLoose_calo", xAOD::Iso::topoetcone20, "0.20*x"));
} else if (elWPname == "TightTrackOnly" || elWPname == "TightTrackOnly_VarRad") {
- wp->addCut(new IsolationConditionFormula("ElecTightTrackOnly", xAOD::Iso::ptvarcone30_TightTTVALooseCone_pt1000, "0.06*x"));
+ wp->addCut(new IsolationConditionFormula("ElecTightTrackOnly", xAOD::Iso::ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt1000, "0.06*x"));
} else if (elWPname == "TightTrackOnly_FixedRad") {
- wp->addCut(new IsolationConditionFormula("ElecTightTrackOnly_lowPt", xAOD::Iso::ptvarcone30_TightTTVALooseCone_pt1000, "0.06*(x>50e3?1e9:x)"));
- wp->addCut(new IsolationConditionFormula("ElecTightTrackOnly_highPt", xAOD::Iso::ptcone20_TightTTVALooseCone_pt1000, "0.06*(x>50e3?x:1e9)"));
+ wp->addCut(new IsolationConditionFormula("ElecTightTrackOnly_lowPt", xAOD::Iso::ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt1000, "0.06*(x>50e3?1e9:x)"));
+ wp->addCut(new IsolationConditionFormula("ElecTightTrackOnly_highPt", xAOD::Iso::ptcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt1000, "0.06*(x>50e3?x:1e9)"));
} else if (elWPname == "PflowTight_FixedRad") {
std::vector<xAOD::Iso::IsolationType> isoTypesHighPt;
std::vector<xAOD::Iso::IsolationType> isoTypesLowPt;
- isoTypesHighPt.push_back(xAOD::Iso::ptcone20_TightTTVALooseCone_pt500);
+ isoTypesHighPt.push_back(xAOD::Iso::ptcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt500);
isoTypesHighPt.push_back(xAOD::Iso::neflowisol20);
- isoTypesLowPt.push_back(xAOD::Iso::ptvarcone30_TightTTVALooseCone_pt500);
+ isoTypesLowPt.push_back(xAOD::Iso::ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt500);
isoTypesLowPt.push_back(xAOD::Iso::neflowisol20);
wp->addCut(new IsolationConditionCombined("ElecPFlowTightLowPt", isoTypesLowPt, TF2("pflowTFunctionLowPt","fabs(x)+0.4*(y>0?y:0)"), "0.045*(x>50e3?1e9:x)"));
wp->addCut(new IsolationConditionCombined("ElecPFlowTightHighPt", isoTypesHighPt, TF2("pflowTFunctionHighPt","fabs(x)+0.4*(y>0?y:0)"), "0.045*(x>50e3?x:1e9)"));
} else if (elWPname == "PflowTight") {
std::vector<xAOD::Iso::IsolationType> isoTypes;
- isoTypes.push_back(xAOD::Iso::ptvarcone30_TightTTVALooseCone_pt500);
+ isoTypes.push_back(xAOD::Iso::ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt500);
isoTypes.push_back(xAOD::Iso::neflowisol20);
wp->addCut(new IsolationConditionCombined("ElecPFlowTight", isoTypes, TF2("pflowLFunction","fabs(x)+0.4*(y>0?y:0)"), "0.045*x"));
} else if (elWPname == "PflowLoose_FixedRad") {
std::vector<xAOD::Iso::IsolationType> isoTypesHighPt;
std::vector<xAOD::Iso::IsolationType> isoTypesLowPt;
- isoTypesHighPt.push_back(xAOD::Iso::ptcone20_TightTTVALooseCone_pt500);
+ isoTypesHighPt.push_back(xAOD::Iso::ptcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt500);
isoTypesHighPt.push_back(xAOD::Iso::neflowisol20);
- isoTypesLowPt.push_back(xAOD::Iso::ptvarcone30_TightTTVALooseCone_pt500);
+ isoTypesLowPt.push_back(xAOD::Iso::ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt500);
isoTypesLowPt.push_back(xAOD::Iso::neflowisol20);
wp->addCut(new IsolationConditionCombined("ElecPFlowLooseLowPt", isoTypesLowPt, TF2("pflowLFunctionLowPt","fabs(x)+0.4*(y>0?y:0)"), "0.16*(x>50e3?1e9:x)"));
wp->addCut(new IsolationConditionCombined("ElecPFlowLooseHighPt", isoTypesHighPt, TF2("pflowLFunctionHighPt","fabs(x)+0.4*(y>0?y:0)"), "0.16*(x>50e3?x:1e9)"));
} else if (elWPname == "PflowLoose") {
std::vector<xAOD::Iso::IsolationType> isoTypes;
- isoTypes.push_back(xAOD::Iso::ptvarcone30_TightTTVALooseCone_pt500);
+ isoTypes.push_back(xAOD::Iso::ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt500);
isoTypes.push_back(xAOD::Iso::neflowisol20);
wp->addCut(new IsolationConditionCombined("ElecPFlowLoose", isoTypes, TF2("pflowLFunction","fabs(x)+0.4*(y>0?y:0)"), "0.16*x"));
} else {
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGammaCommon.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGammaCommon.py
index 204ef77db1de..6c04fb44580b 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGammaCommon.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGammaCommon.py
@@ -532,5 +532,5 @@ def makeEGammaDFCommon():
# =======================================
import IsolationAlgs.IsoUpdatedTrackCones as isoCones
- if not hasattr(DerivationFrameworkJob, "IsolationBuilderTight1000"):
+ if not hasattr(DerivationFrameworkJob, "IsolationBuilderNonprompt_All_MaxWeight1000"):
DerivationFrameworkJob += isoCones.GetUpdatedIsoTrackCones()
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/ElectronsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/ElectronsCPContent.py
index 51717eae95e3..40c802a9db33 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/ElectronsCPContent.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/ElectronsCPContent.py
@@ -2,7 +2,7 @@
ElectronsCPContent = [
"Electrons",
-"ElectronsAux.trackParticleLinks.pt.eta.phi.m.charge.author.OQ.DFCommonElectronsLHVeryLoose.DFCommonElectronsLHLoose.DFCommonElectronsLHLooseBL.DFCommonElectronsLHMedium.DFCommonElectronsLHTight.DFCommonElectronsLHVeryLooseIsEMValue.DFCommonElectronsLHLooseIsEMValue.DFCommonElectronsLHLooseBLIsEMValue.DFCommonElectronsLHMediumIsEMValue.DFCommonElectronsLHTightIsEMValue.DFCommonElectronsECIDS.DFCommonElectronsECIDSResult.ptvarcone20.ptvarcone40_TightTTVALooseCone_pt1000.topoetcone20.topoetcone20ptCorrection.ptcone20_TightTTVALooseCone_pt500.ptcone20_TightTTVALooseCone_pt1000.ptvarcone20_TightTTVA_pt1000.ptvarcone30_TightTTVA_pt500.ptvarcone30_TightTTVA_pt1000.ptvarcone20_TightTTVALooseCone_pt1000.ptvarcone30_TightTTVALooseCone_pt500.ptvarcone30_TightTTVALooseCone_pt1000.neflowisol20.core57cellsEnergyCorrection.topoetconecoreConeSCEnergyCorrection.topoetconecoreConeEnergyCorrection.DFCommonCrackVetoCleaning.caloClusterLinks.ambiguityLink.truthParticleLink.truthOrigin.truthType.truthPdgId.firstEgMotherTruthType.firstEgMotherTruthOrigin.firstEgMotherTruthParticleLink.firstEgMotherPdgId.ambiguityType.DFCommonAddAmbiguity",
+"ElectronsAux.trackParticleLinks.pt.eta.phi.m.charge.author.OQ.DFCommonElectronsLHVeryLoose.DFCommonElectronsLHLoose.DFCommonElectronsLHLooseBL.DFCommonElectronsLHMedium.DFCommonElectronsLHTight.DFCommonElectronsLHVeryLooseIsEMValue.DFCommonElectronsLHLooseIsEMValue.DFCommonElectronsLHLooseBLIsEMValue.DFCommonElectronsLHMediumIsEMValue.DFCommonElectronsLHTightIsEMValue.DFCommonElectronsECIDS.DFCommonElectronsECIDSResult.ptvarcone20.ptvarcone40_Nonprompt_All_MaxWeightTTVALooseCone_pt1000.topoetcone20.topoetcone20ptCorrection.ptcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt500.ptcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt1000.ptvarcone20_Nonprompt_All_MaxWeightTTVA_pt1000.ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500.ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000.ptvarcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt1000.ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt500.ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt1000.neflowisol20.core57cellsEnergyCorrection.topoetconecoreConeSCEnergyCorrection.topoetconecoreConeEnergyCorrection.DFCommonCrackVetoCleaning.caloClusterLinks.ambiguityLink.truthParticleLink.truthOrigin.truthType.truthPdgId.firstEgMotherTruthType.firstEgMotherTruthOrigin.firstEgMotherTruthParticleLink.firstEgMotherPdgId.ambiguityType.DFCommonAddAmbiguity",
"GSFTrackParticles",
"GSFTrackParticlesAux.chiSquared.phi.d0.theta.qOverP.definingParametersCovMatrixDiag.definingParametersCovMatrixOffDiag.numberOfPixelHits.numberOfPixelOutliers.numberOfPixelDeadSensors.numberOfSCTHits.numberOfSCTOutliers.numberOfSCTDeadSensors.z0.vz.charge.vertexLink.numberOfInnermostPixelLayerHits.numberOfInnermostPixelLayerOutliers.numberOfNextToInnermostPixelLayerOutliers.expectInnermostPixelLayerHit.truthParticleLink.originalTrackParticle.numberOfNextToInnermostPixelLayerHits.expectNextToInnermostPixelLayerHit",
"GSFConversionVertices",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/PhotonsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/PhotonsCPContent.py
index 483f80478f6c..9e6acf9c0dfb 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/PhotonsCPContent.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/PhotonsCPContent.py
@@ -6,7 +6,7 @@ PhotonsCPContent = [
"GSFTrackParticles",
"GSFTrackParticlesAux.phi.theta.qOverP.numberOfPixelHits.numberOfSCTHits.vertexLink.truthParticleLink.originalTrackParticle.numberOfInnermostPixelLayerHits.expectInnermostPixelLayerHit.numberOfNextToInnermostPixelLayerHits.expectNextToInnermostPixelLayerHit",
"Photons",
-"PhotonsAux.pt.eta.phi.m.author.OQ.DFCommonPhotonsIsEMLoose.DFCommonPhotonsIsEMTight.DFCommonPhotonsIsEMTightIsEMValue.DFCommonPhotonsIsEMTightPtIncl.DFCommonPhotonsIsEMTightPtInclIsEMValue.DFCommonPhotonsCleaning.DFCommonPhotonsCleaningNoTime.DFCommonCrackVetoCleaning.ptcone20.ptcone20_TightTTVA_pt1000.neflowisol20.topoetcone20.topoetcone40.topoetcone20ptCorrection.topoetcone40ptCorrection.core57cellsEnergyCorrection.topoetconecoreConeSCEnergyCorrection.topoetconecoreConeEnergyCorrection.caloClusterLinks.vertexLinks.ambiguityLink.truthParticleLink.truthOrigin.truthType",
+"PhotonsAux.pt.eta.phi.m.author.OQ.DFCommonPhotonsIsEMLoose.DFCommonPhotonsIsEMTight.DFCommonPhotonsIsEMTightIsEMValue.DFCommonPhotonsIsEMTightPtIncl.DFCommonPhotonsIsEMTightPtInclIsEMValue.DFCommonPhotonsCleaning.DFCommonPhotonsCleaningNoTime.DFCommonCrackVetoCleaning.ptcone20.ptcone20_Nonprompt_All_MaxWeightTTVA_pt1000.neflowisol20.topoetcone20.topoetcone40.topoetcone20ptCorrection.topoetcone40ptCorrection.core57cellsEnergyCorrection.topoetconecoreConeSCEnergyCorrection.topoetconecoreConeEnergyCorrection.caloClusterLinks.vertexLinks.ambiguityLink.truthParticleLink.truthOrigin.truthType",
"egammaClusters",
"egammaClustersAux.calE.calEta.calPhi.e_sampl.eta_sampl.etaCalo.phiCalo.ETACALOFRAME.PHICALOFRAME.clusterSize.altE.calM.constituentClusterLinks",
"Electrons",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/share/EGAM10.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/share/EGAM10.py
index b2e5913de027..1242523df48d 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/share/EGAM10.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/share/EGAM10.py
@@ -452,7 +452,7 @@ from DerivationFrameworkEGamma.PhotonsCPDetailedContent import *
EGAM10SlimmingHelper.ExtraVariables += PhotonsCPDetailedContent
# add new TTVA isolation variables
-EGAM10SlimmingHelper.ExtraVariables += ["Photons.ptcone20_TightTTVA_pt1000.ptcone20_TightTTVA_pt500.ptvarcone30_TightTTVA_pt1000.ptvarcone30_TightTTVA_pt500"]
+EGAM10SlimmingHelper.ExtraVariables += ["Photons.ptcone20_Nonprompt_All_MaxWeightTTVA_pt1000.ptcone20_Nonprompt_All_MaxWeightTTVA_pt500.ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000.ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500"]
# additional truth-level variables
if DerivationFrameworkIsMonteCarlo:
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/python/MuonsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/python/MuonsCPContent.py
index d15997fd7f6a..38a050e2db14 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/python/MuonsCPContent.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/python/MuonsCPContent.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
MuonsCPContent = [
"CombinedMuonTrackParticles",
@@ -17,18 +17,9 @@ MuonsCPContent = [
"InDetTrackParticlesAux.phi.theta.qOverP.numberOfPixelHits.numberOfPixelHoles.numberOfPixelDeadSensors.numberOfSCTHits.numberOfSCTHoles.numberOfSCTDeadSensors.numberOfTRTHits.numberOfTRTOutliers.numberOfPrecisionLayers.d0.z0.vz.definingParametersCovMatrixDiag.definingParametersCovMatrixOffDiag.vertexLink.truthParticleLink.chiSquared.numberDoF.numberOfPhiLayers.numberOfPhiHoleLayers.numberOfPrecisionHoleLayers",
"MuonSpectrometerTrackParticles",
"MuonSpectrometerTrackParticlesAux.phi.d0.z0.vz.definingParametersCovMatrixDiag.definingParametersCovMatrixOffDiag.vertexLink.theta.qOverP.truthParticleLink",
-"MuonsAux.pt.eta.phi.truthType.truthOrigin.author.muonType.quality.inDetTrackParticleLink.muonSpectrometerTrackParticleLink.combinedTrackParticleLink.InnerDetectorPt.MuonSpectrometerPt.DFCommonMuonPassIDCuts.DFCommonMuonPassPreselection.momentumBalanceSignificance.clusterLink.ptcone20.ptcone30.ptcone40.ptvarcone20.ptvarcone30.ptvarcone40.topoetcone20.topoetcone30.topoetcone40.innerSmallHits.truthParticleLink.charge.CaloLRLikelihood.CaloMuonIDTag.CaloMuonScore.extrapolatedMuonSpectrometerTrackParticleLink.numberOfPrecisionLayers.numberOfPrecisionHoleLayers.innerLargeHits.muonSegmentLinks.numberOfGoodPrecisionLayers.innerSmallHoles.innerLargeHoles.middleSmallHoles.middleLargeHoles.outerSmallHoles.outerLargeHoles.extendedSmallHoles.extendedLargeHoles.innerClosePrecisionHits.middleClosePrecisionHits.outerClosePrecisionHits.extendedClosePrecisionHits.innerOutBoundsPrecisionHits.middleOutBoundsPrecisionHits.outerOutBoundsPrecisionHits.extendedOutBoundsPrecisionHits.combinedTrackOutBoundsPrecisionHits.isEndcapGoodLayers.isSmallGoodSectors.middleLargeHits.middleSmallHits.outerLargeHits.outerSmallHits.extendedSmallHits.extendedLargeHits.cscEtaHits.cscUnspoiledEtaHits.spectrometerFieldIntegral.scatteringCurvatureSignificance.scatteringNeighbourSignificance.msOnlyExtrapolatedMuonSpectrometerTrackParticleLink.allAuthors.ptcone20_TightTTVA_pt500.ptvarcone30_TightTTVA_pt500.neflowisol20.segmentDeltaEta.DFCommonJetDr.EnergyLoss",
+"MuonsAux.pt.eta.phi.truthType.truthOrigin.author.muonType.quality.inDetTrackParticleLink.muonSpectrometerTrackParticleLink.combinedTrackParticleLink.InnerDetectorPt.MuonSpectrometerPt.DFCommonMuonPassIDCuts.DFCommonMuonPassPreselection.momentumBalanceSignificance.clusterLink.ptcone20.ptcone30.ptcone40.ptvarcone20.ptvarcone30.ptvarcone40.topoetcone20.topoetcone30.topoetcone40.innerSmallHits.truthParticleLink.charge.CaloLRLikelihood.CaloMuonIDTag.CaloMuonScore.extrapolatedMuonSpectrometerTrackParticleLink.numberOfPrecisionLayers.numberOfPrecisionHoleLayers.innerLargeHits.muonSegmentLinks.numberOfGoodPrecisionLayers.innerSmallHoles.innerLargeHoles.middleSmallHoles.middleLargeHoles.outerSmallHoles.outerLargeHoles.extendedSmallHoles.extendedLargeHoles.innerClosePrecisionHits.middleClosePrecisionHits.outerClosePrecisionHits.extendedClosePrecisionHits.innerOutBoundsPrecisionHits.middleOutBoundsPrecisionHits.outerOutBoundsPrecisionHits.extendedOutBoundsPrecisionHits.combinedTrackOutBoundsPrecisionHits.isEndcapGoodLayers.isSmallGoodSectors.middleLargeHits.middleSmallHits.outerLargeHits.outerSmallHits.extendedSmallHits.extendedLargeHits.cscEtaHits.cscUnspoiledEtaHits.spectrometerFieldIntegral.scatteringCurvatureSignificance.scatteringNeighbourSignificance.msOnlyExtrapolatedMuonSpectrometerTrackParticleLink.allAuthors.neflowisol20.segmentDeltaEta.DFCommonJetDr.EnergyLoss",
"MuonSegmentsAux.chamberIndex",
-"MuonsAux.ptcone20_LooseTTVA_pt1000.ptvarcone30_LooseTTVA_pt1000",
-"MuonsAux.ptcone20_NominalTTVA_pt1000.ptvarcone30_NominalTTVA_pt1000",
-"MuonsAux.ptcone20_TightTTVA_pt1000.ptvarcone30_TightTTVA_pt1000",
-"MuonsAux.ptcone20_Prompt_D0SigTTVA_pt1000.ptvarcone30_Prompt_D0SigTTVA_pt1000",
-"MuonsAux.ptcone20_Nonprompt_Hard_D0SigTTVA_pt1000.ptvarcone30_Nonprompt_Hard_D0SigTTVA_pt1000",
-"MuonsAux.ptcone20_Nonprompt_Medium_D0SigTTVA_pt1000.ptvarcone30_Nonprompt_Medium_D0SigTTVA_pt1000",
-"MuonsAux.ptcone20_Nonprompt_All_D0SigTTVA_pt1000.ptvarcone30_Nonprompt_All_D0SigTTVA_pt1000",
-"MuonsAux.ptcone20_Prompt_MaxWeightTTVA_pt1000.ptvarcone30_Prompt_MaxWeightTTVA_pt1000",
-"MuonsAux.ptcone20_Nonprompt_Hard_MaxWeightTTVA_pt1000.ptvarcone30_Nonprompt_Hard_MaxWeightTTVA_pt1000",
-"MuonsAux.ptcone20_Nonprompt_Medium_MaxWeightTTVA_pt1000.ptvarcone30_Nonprompt_Medium_MaxWeightTTVA_pt1000",
+"MuonsAux.ptcone20_Nonprompt_All_MaxWeightTTVA_pt500.ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500",
"MuonsAux.ptcone20_Nonprompt_All_MaxWeightTTVA_pt1000.ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000",
"PhotonsAux.pt.eta.phi.m.caloClusterLinks.author.f1.topoetcone40.Tight.truthParticleLink.vertexLinks",
"egammaClustersAux.calEta.calPhi.calE.calM",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/share/MUON3.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/share/MUON3.py
index 5e663d4eac70..d5eaa4e4733b 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/share/MUON3.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/share/MUON3.py
@@ -196,7 +196,7 @@ theCaloCellDFGetter = CaloCellDFGetter(inputClusterKeys=["MuonClusterCollection"
outputCellKey="DFMUONCellContainer")
import IsolationAlgs.IsoUpdatedTrackCones as isoCones
-if not hasattr(DerivationFrameworkJob,"IsolationBuilderTight1000"):
+if not hasattr(DerivationFrameworkJob,"IsolationBuilderNonprompt_All_MaxWeight1000"):
DerivationFrameworkJob += isoCones.GetUpdatedIsoTrackCones()
from DerivationFrameworkMuons import JPsiVertexFitSetup
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYSLITE.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYSLITE.py
index 8833069149ec..775e7d000bdc 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYSLITE.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYSLITE.py
@@ -318,11 +318,11 @@ PHYSLITESlimmingHelper.SmartCollections = [
# Variables to save, per object type
PHYSLITESlimmingHelper.ExtraVariables = [
- "AnalysisElectrons.trackParticleLinks.pt.eta.phi.m.charge.author.DFCommonElectronsLHVeryLoose.DFCommonElectronsLHLoose.DFCommonElectronsLHLooseBL.DFCommonElectronsLHMedium.DFCommonElectronsLHTight.DFCommonElectronsLHVeryLooseIsEMValue.DFCommonElectronsLHLooseIsEMValue.DFCommonElectronsLHLooseBLIsEMValue.DFCommonElectronsLHMediumIsEMValue.DFCommonElectronsLHTightIsEMValue.DFCommonElectronsECIDS.DFCommonElectronsECIDSResult.ptvarcone20.ptvarcone40.topoetcone20.topoetcone20ptCorrection.ptcone20_TightTTVA_pt500.ptcone20_TightTTVA_pt1000.ptvarcone20_TightTTVA_pt1000.ptvarcone30_TightTTVA_pt500.ptvarcone30_TightTTVA_pt1000.caloClusterLinks.ambiguityLink.truthParticleLink.truthOrigin.truthType.truthPdgId.firstEgMotherTruthType.firstEgMotherTruthOrigin.firstEgMotherTruthParticleLink.firstEgMotherPdgId.ambiguityType.OQ",
+ "AnalysisElectrons.trackParticleLinks.pt.eta.phi.m.charge.author.DFCommonElectronsLHVeryLoose.DFCommonElectronsLHLoose.DFCommonElectronsLHLooseBL.DFCommonElectronsLHMedium.DFCommonElectronsLHTight.DFCommonElectronsLHVeryLooseIsEMValue.DFCommonElectronsLHLooseIsEMValue.DFCommonElectronsLHLooseBLIsEMValue.DFCommonElectronsLHMediumIsEMValue.DFCommonElectronsLHTightIsEMValue.DFCommonElectronsECIDS.DFCommonElectronsECIDSResult.ptvarcone20.ptvarcone40.topoetcone20.topoetcone20ptCorrection.ptcone20_Nonprompt_All_MaxWeightTTVA_pt500.ptcone20_Nonprompt_All_MaxWeightTTVA_pt1000.ptvarcone20_Nonprompt_All_MaxWeightTTVA_pt1000.ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500.ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000.caloClusterLinks.ambiguityLink.truthParticleLink.truthOrigin.truthType.truthPdgId.firstEgMotherTruthType.firstEgMotherTruthOrigin.firstEgMotherTruthParticleLink.firstEgMotherPdgId.ambiguityType.OQ",
"AnalysisPhotons.pt.eta.phi.m.author.OQ.DFCommonPhotonsIsEMLoose.DFCommonPhotonsIsEMTight.DFCommonPhotonsIsEMTightIsEMValue.DFCommonPhotonsIsEMTightPtIncl.DFCommonPhotonsIsEMTightPtInclIsEMValue.DFCommonPhotonsCleaning.DFCommonPhotonsCleaningNoTime.ptcone20.topoetcone20.topoetcone40.topoetcone20ptCorrection.topoetcone40ptCorrection.caloClusterLinks.vertexLinks.ambiguityLink.truthParticleLink.truthOrigin.truthType",
"GSFTrackParticles.chiSquared.phi.d0.theta.qOverP.definingParametersCovMatrixDiag.definingParametersCovMatrixOffDiag.z0.vz.charge.vertexLink",
"egammaClusters.calE.calEta.calPhi.e_sampl.eta_sampl.ETACALOFRAME.PHICALOFRAME.ETA2CALOFRAME.PHI2CALOFRAME.constituentClusterLinks",
- "AnalysisMuons.pt.eta.phi.truthType.truthOrigin.author.muonType.quality.inDetTrackParticleLink.muonSpectrometerTrackParticleLink.combinedTrackParticleLink.InnerDetectorPt.MuonSpectrometerPt.DFCommonGoodMuon.ptcone20.ptcone30.ptcone40.ptvarcone20.ptvarcone30.ptvarcone40.topoetcone20.topoetcone30.topoetcone40.truthParticleLink.charge.extrapolatedMuonSpectrometerTrackParticleLink.allAuthors.ptcone20_TightTTVA_pt1000.ptcone20_TightTTVA_pt500.ptvarcone30_TightTTVA_pt1000.ptvarcone30_TightTTVA_pt500.numberOfPrecisionLayers.combinedTrackOutBoundsPrecisionHits.numberOfPrecisionLayers.numberOfPrecisionHoleLayers.numberOfGoodPrecisionLayers.innerSmallHits.innerLargeHits.middleSmallHits.middleLargeHits.outerSmallHits.outerLargeHits.extendedSmallHits.extendedLargeHits.extendedSmallHoles.isSmallGoodSectors.cscUnspoiledEtaHits.EnergyLoss.energyLossType.momentumBalanceSignificance.scatteringCurvatureSignificance.scatteringNeighbourSignificance",
+ "AnalysisMuons.pt.eta.phi.truthType.truthOrigin.author.muonType.quality.inDetTrackParticleLink.muonSpectrometerTrackParticleLink.combinedTrackParticleLink.InnerDetectorPt.MuonSpectrometerPt.DFCommonGoodMuon.ptcone20.ptcone30.ptcone40.ptvarcone20.ptvarcone30.ptvarcone40.topoetcone20.topoetcone30.topoetcone40.truthParticleLink.charge.extrapolatedMuonSpectrometerTrackParticleLink.allAuthors.ptcone20_Nonprompt_All_MaxWeightTTVA_pt1000.ptcone20_Nonprompt_All_MaxWeightTTVA_pt500.ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000.ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500.numberOfPrecisionLayers.combinedTrackOutBoundsPrecisionHits.numberOfPrecisionLayers.numberOfPrecisionHoleLayers.numberOfGoodPrecisionLayers.innerSmallHits.innerLargeHits.middleSmallHits.middleLargeHits.outerSmallHits.outerLargeHits.extendedSmallHits.extendedLargeHits.extendedSmallHoles.isSmallGoodSectors.cscUnspoiledEtaHits.EnergyLoss.energyLossType.momentumBalanceSignificance.scatteringCurvatureSignificance.scatteringNeighbourSignificance",
"CombinedMuonTrackParticles.qOverP.d0.z0.vz.phi.theta.truthOrigin.truthType.definingParametersCovMatrixDiag.definingParametersCovMatrixOffDiag.numberOfPixelDeadSensors.numberOfPixelHits.numberOfPixelHoles.numberOfSCTDeadSensors.numberOfSCTHits.numberOfSCTHoles.numberOfTRTHits.numberOfTRTOutliers.chiSquared.numberDoF",
"ExtrapolatedMuonTrackParticles.d0.z0.vz.definingParametersCovMatrixDiag.definingParametersCovMatrixOffDiag.truthOrigin.truthType.qOverP.theta.phi",
"MuonSpectrometerTrackParticles.phi.d0.z0.vz.definingParametersCovMatrixDiag.definingParametersCovMatrixOffDiag.vertexLink.theta.qOverP.truthParticleLink",
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValMuon_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValMuon_jobOptions.py
index feb3202df774..7795a6a0a398 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValMuon_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValMuon_jobOptions.py
@@ -21,11 +21,11 @@ for class_name, name in metadata['metadata_items'].items():
isDAOD_PHYSVAL=True
if not isDAOD_PHYSVAL:
- from TrackVertexAssociationTool.getTTVAToolForReco import addUsedInFitDecoratorForReco
- addUsedInFitDecoratorForReco(add2Seq = algseq)
- from IsolationAlgs.IsoUpdatedTrackCones import GetUpdatedIsoTrackCones
- if not hasattr(algseq,"IsolationBuilderTight500"):
- algseq += GetUpdatedIsoTrackCones()
+ from TrackVertexAssociationTool.getTTVAToolForReco import addUsedInFitDecoratorForReco
+ addUsedInFitDecoratorForReco(add2Seq = algseq)
+ from IsolationAlgs.IsoUpdatedTrackCones import GetUpdatedIsoTrackCones
+ if not hasattr(algseq,"IsolationBuilderNonprompt_All_MaxWeight500"):
+ algseq += GetUpdatedIsoTrackCones()
from MuonPhysValMonitoring.MuonPhysValMonitoringConf import MuonPhysValMonitoring__MuonPhysValMonitoringTool
from RecExConfig.RecFlags import rec as recFlags
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/CMakeLists.txt b/PhysicsAnalysis/SUSYPhys/SUSYTools/CMakeLists.txt
index a0c76195e39f..240348ba018c 100644
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/CMakeLists.txt
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/CMakeLists.txt
@@ -90,18 +90,18 @@ if( XAOD_STANDALONE )
endif()
# Log ignore patterns
-set (extra_patterns " (Entire loop|Excluding first event|First event).*ms|cvmfs/atlas.*\.cern\.ch/repo|INFO|${ATLAS_PLATFORM}/data/SUSYTools|build(/Analysis.*)?/${ATLAS_PLATFORM}|mySTdefs_conf\.tmp|^Ran [0-9]+ tests in [0-9.]+s|create data set info.*|Booked|<HEADER>")
+set (extra_patterns " (Entire loop|Excluding first event|First event).*ms|cvmfs/atlas.*\.cern\.ch/repo|INFO|${ATLAS_PLATFORM}/data/SUSYTools|build(/Analysis.*)?/${ATLAS_PLATFORM}|mySTdefs_conf\.tmp|^Ran [0-9]+ tests in [0-9.]+s|create data set info.*|Booked|<HEADER>|Warning in <TClass::Init>|(start|done) processing event")
# Test(s) in the package:
if( XAOD_STANDALONE )
atlas_add_test( ut_SUSYToolsTester_data
- SCRIPT SUSYToolsTester /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SUSYTools/DAOD_PHYS.data18_13TeV.358031.data18_p4441.PHYS.pool.root
+ SCRIPT SUSYToolsTester /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SUSYTools/DAOD_PHYS.data18_13TeV.358031.data18_p4631-iso.PHYS.pool.root
maxEvents=500 isData=1 isAtlfast=0 Debug=0
LOG_IGNORE_PATTERN ${extra_patterns}
PROPERTIES TIMEOUT 300
)
atlas_add_test( ut_SUSYToolsTester_mc
- SCRIPT SUSYToolsTester /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SUSYTools/DAOD_PHYS.mc16_13TeV.410470.FS_mc16e_p4441.PHYS.pool.root
+ SCRIPT SUSYToolsTester /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SUSYTools/DAOD_PHYS.mc16_13TeV.410470.FS_mc16e_p4631-iso.PHYS.pool.root
maxEvents=100 isData=0 isAtlfast=0 Debug=0 NoSyst=0
PRWFile=dev/PileupReweighting/mc16_13TeV/pileup_mc16e_dsid410470_FS.root
ilumicalcFile=GoodRunsLists/data18_13TeV/20190318/ilumicalc_histograms_None_348885-364292_OflLumi-13TeV-010.root
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/data/SUSYTools_Default.conf b/PhysicsAnalysis/SUSYPhys/SUSYTools/data/SUSYTools_Default.conf
index 4c5ca71b6e44..21e600161e18 100644
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/data/SUSYTools_Default.conf
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/data/SUSYTools_Default.conf
@@ -176,6 +176,6 @@ PRW.ActualMu2017File: GoodRunsLists/data17_13TeV/20180619/physics_25ns_Triggerno
PRW.ActualMu2018File: GoodRunsLists/data18_13TeV/20190318/physics_25ns_Triggerno17e33prim.actualMu.OflLumi-13TeV-010.root
# default to None but do set to BFilter (366010-366017), CFilterBVeto (366019-366026), or CVetoBVeto (366028-366035) to remap MC16e Znunu dsid
PRW.autoconfigPRWHFFilter: None
-PRW.autoconfigPRWRtags:mc16a:r9364_r11505_r11285,mc16c:r9781,mc16d:r10201_r11506_r11279,mc16e:r10724_r11507_r11249_r12020_r12034_r12405,mc16ans:r10740_r10832_r10847_r11008_r11036,mc16dns:r10739_r10833_r10848_r11009_r11037,mc16ens:r10790_r11038_r11265
+PRW.autoconfigPRWRtags:mc16a:r9364_r11505_r11285,mc16c:r9781,mc16d:r10201_r11506_r11279,mc16e:r10724_r11507_r11249_r12020_r12034_r12405_r12627,mc16ans:r10740_r10832_r10847_r11008_r11036,mc16dns:r10739_r10833_r10848_r11009_r11037,mc16ens:r10790_r11038_r11265
#
StrictConfigCheck: true
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/scripts/TestSUSYToolsAlg.py b/PhysicsAnalysis/SUSYPhys/SUSYTools/scripts/TestSUSYToolsAlg.py
index c522885022c8..e00d65f6f0f8 100755
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/scripts/TestSUSYToolsAlg.py
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/scripts/TestSUSYToolsAlg.py
@@ -17,14 +17,14 @@ parser.add_option('-d', '--daod', dest = 'daod', type = 'int', default = 0, help
parser.add_option('-f', '--flav', dest = 'flav', default = 'PHYS', help = 'input DAOD flavour. Do not specify for PHYSVAL input' )
parser.add_option('-m', '--maxEvts', dest = 'maxEvts', type = 'int', default = 500, help = 'Max events (-1 is all)' )
parser.add_option('-M', '--maxEvtsManual', dest = 'maxEvtsManual', type = 'int')
-parser.add_option('-p', '--ptag', dest = 'ptag', default = 'p4441', help = 'ptag' )
+parser.add_option('-p', '--ptag', dest = 'ptag', default = 'p4631', help = 'ptag' )
parser.add_option('--grl', dest = 'grl')
parser.add_option('--inputDir', dest = 'inputDir')
parser.add_option('--inputFile', dest = 'inputFile')
parser.add_option('--overwrite', dest = 'overwrite', default = False, action = 'store_true' )
( options, args ) = parser.parse_args()
print("Configured input data ptag: %s"%(options.ptag))
-ptageqdata = {'p4016':'p4017','p4095':'p4096','p4237':'p4238','p4441':'p4441'}
+ptageqdata = {'p4016':'p4017','p4095':'p4096','p4237':'p4238','p4441':'p4441','p4631':'p4441'}
if 'data' in options.type and options.ptag in ptageqdata:
options.ptag = ptageqdata[options.ptag]
print("Overriding ptag to equivalent data ptag: -> %s"%(options.ptag))
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/share/ut_SUSYToolsTester_data.ref b/PhysicsAnalysis/SUSYPhys/SUSYTools/share/ut_SUSYToolsTester_data.ref
index 9990bc3ecd40..05265865dbf1 100644
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/share/ut_SUSYToolsTester_data.ref
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/share/ut_SUSYToolsTester_data.ref
@@ -1,13 +1,10 @@
-Package.UserCode INFO Unit test for SUSYTools on data
-Package.UserCode INFO Will now run this command: SUSYToolsTester /eos/atlas/atlascerngroupdisk/data-art/grid-input/SUSYTools/DAOD_PHYS.data18_13TeV.358031.data18_p4441.PHYS.pool.root maxEvents=500 isData=1 isAtlfast=0 Debug=0
-Package.SUSYToolsTester INFO ===== Processing key /eos/atlas/atlascerngroupdisk/data-art/grid-input/SUSYTools/DAOD_PHYS.data18_13TeV.358031.data18_p4441.PHYS.pool.root with value
+Package.SUSYToolsTester INFO ===== Processing key /eos/atlas/atlascerngroupdisk/data-art/grid-input/SUSYTools/DAOD_PHYS.data18_13TeV.358031.data18_p4631-iso.PHYS.pool.root with value
Package.SUSYToolsTester INFO ===== Processing key maxEvents with value 500
Package.SUSYToolsTester INFO ===== Processing key isData with value 1
Package.SUSYToolsTester INFO ===== Processing key isAtlfast with value 0
Package.SUSYToolsTester INFO ===== Processing key Debug with value 0
-Package.SUSYToolsTester INFO Opening file: /eos/atlas/atlascerngroupdisk/data-art/grid-input/SUSYTools/DAOD_PHYS.data18_13TeV.358031.data18_p4441.PHYS.pool.root
+Package.SUSYToolsTester INFO Opening file: /eos/atlas/atlascerngroupdisk/data-art/grid-input/SUSYTools/DAOD_PHYS.data18_13TeV.358031.data18_p4631-iso.PHYS.pool.root
Warning in <TClass::Init>: no dictionary for class DataHeader_p6 is available
-Warning in <TClass::Init>: no dictionary for class DataHeader_p6::FullElement is available
Warning in <TClass::Init>: no dictionary for class DataHeaderForm_p6 is available
Warning in <TClass::Init>: no dictionary for class DataHeaderForm_p6::DbRecord is available
Warning in <TClass::Init>: no dictionary for class Guid is available
@@ -17,7 +14,6 @@ Warning in <TClass::Init>: no dictionary for class IOVPayloadContainer_p1 is ava
Warning in <TClass::Init>: no dictionary for class IOVPayloadContainer_p1::CondAttrListCollection_p1 is available
Warning in <TClass::Init>: no dictionary for class IOVPayloadContainer_p1::CondAttrListEntry_p1 is available
Warning in <TClass::Init>: no dictionary for class IOVPayloadContainer_p1::IOVRange_p1 is available
-Warning in <TClass::Init>: no dictionary for class AttrListIndexes is available
Warning in <TClass::Init>: no dictionary for class ILockable is available
Warning in <TClass::Init>: no dictionary for class ByteStreamMetadataContainer_p1 is available
Warning in <TClass::Init>: no dictionary for class ByteStreamMetadata_p1 is available
@@ -26,13 +22,13 @@ Warning in <TClass::Init>: no dictionary for class EventType_p3 is available
Warning in <TClass::Init>: no dictionary for class EventInfo_p4 is available
Warning in <TClass::Init>: no dictionary for class EventID_p1 is available
Warning in <TClass::Init>: no dictionary for class TriggerInfo_p2 is available
-Package.SUSYToolsTester INFO Number of events in the file: 38555
+Package.SUSYToolsTester INFO Number of events in the file: 2000
--- TGRLCollection : Now merging GRLs where possible. Metadata required to be identical.[0m
Package.SUSYToolsTester INFO GRL tool retrieve & initialized...
Package.SUSYToolsTester INFO ABOUT TO INITIALIZE SUSYTOOLS
SUSYObjDef_xAOD INFO Initialising...
SUSYObjDef_xAOD INFO ***** ***** ***** *****
-SUSYObjDef_xAOD INFO Configuring from file /afs/cern.ch/user/y/yoyamagu/work/IFF/IsolationSelectionTool_cleanup/build/x86_64-centos7-gcc8-opt/data/SUSYTools/SUSYTools_Default.conf
+SUSYObjDef_xAOD INFO Configuring from file /data/CERN/BGF/MR45546/build/x86_64-centos7-gcc8-opt/data/SUSYTools/SUSYTools_Default.conf
SUSYObjDef_xAOD INFO Config file opened
SUSYObjDef_xAOD INFO readConfig(): Loaded property Jet.InputType with value 9
SUSYObjDef_xAOD INFO readConfig(): Loaded property Muon.Id with value 1
@@ -254,7 +250,7 @@ SUSYObjDef_xAOD INFO configFromFile(): Loaded property "PRW.autoconf
SUSYObjDef_xAOD INFO configFromFile(): Loaded property "PRW.autoconfigPRWCombinedmode" with value 0
SUSYObjDef_xAOD INFO configFromFile(): Loaded property "PRW.autoconfigPRWRPVmode" with value 0
SUSYObjDef_xAOD INFO configFromFile(): Loaded property "PRW.autoconfigPRWHFFilter" with value
-SUSYObjDef_xAOD INFO configFromFile(): Loaded property "PRW.autoconfigPRWRtags" with value mc16a:r9364_r11505_r11285,mc16c:r9781,mc16d:r10201_r11506_r11279,mc16e:r10724_r11507_r11249_r12020_r12034_r12405,mc16ans:r10740_r10832_r10847_r11008_r11036,mc16dns:r10739_r10833_r10848_r11009_r11037,mc16ens:r10790_r11038_r11265
+SUSYObjDef_xAOD INFO configFromFile(): Loaded property "PRW.autoconfigPRWRtags" with value mc16a:r9364_r11505_r11285,mc16c:r9781,mc16d:r10201_r11506_r11279,mc16e:r10724_r11507_r11249_r12020_r12034_r12405_r12627,mc16ans:r10740_r10832_r10847_r11008_r11036,mc16dns:r10739_r10833_r10848_r11009_r11037,mc16ens:r10790_r11038_r11265
SUSYObjDef_xAOD INFO configFromFile(): Loaded property "StrictConfigCheck" with value 1
SUSYObjDef_xAOD INFO Configured for jet collection: AntiKt4EMPFlowJets
SUSYObjDef_xAOD INFO Configured for truth jet collection: AntiKt4TruthDressedWZJets
@@ -267,7 +263,7 @@ Info in <CP::TPileupReweighting::UsePeriodConfig>: Using MC16 Period configurati
Info in <CP::TPileupReweighting::AddLumiCalcFile>: Adding LumiMetaData (scale factor=0.970874)...
Info in <CP::TPileupReweighting::AddLumiCalcFile>: Adding LumiMetaData (scale factor=1.010100)...
Info in <CP::TPileupReweighting::AddLumiCalcFile>: Adding LumiMetaData (scale factor=0.934579)...
-DefaultWeightTool INFO AsgTool DefaultWeightTool @ 0xac38fe0
+DefaultWeightTool INFO AsgTool DefaultWeightTool @ 0xb4a4890
ToolSvc.JetCalibTool_A...INFO Initializing ToolSvc.JetCalibTool_AntiKt4EMPFlow...
ToolSvc.JetCalibTool_A...INFO ===================================
ToolSvc.JetCalibTool_A...INFO Initializing the xAOD Jet Calibration Tool for AntiKt4EMPFlowjets
@@ -453,8 +449,8 @@ ToolSvc.JetTruthLabeli...INFO Parameters for ToolSvc.JetTruthLabelingTool
ToolSvc.JetTruthLabeli...INFO xAOD information:
ToolSvc.JetTruthLabeli...INFO TruthLabelName: R10TruthLabel_R21Consolidated
ToolSvc.JetTruthLabeli...INFO UseTRUTH3: True
-ToolSvc.JetTruthLabeli...INFO TruthBosonContainerName: TruthBoson
-ToolSvc.JetTruthLabeli...INFO TruthTopQuarkContainerName: TruthTop
+ToolSvc.JetTruthLabeli...INFO TruthBosonContainerName: 'TruthBoson'
+ToolSvc.JetTruthLabeli...INFO TruthTopQuarkContainerName: 'TruthTop'
ToolSvc.JetTruthLabeli...INFO TruthJetCollectionName: AntiKt10TruthTrimmedPtFrac5SmallR20Jets
ToolSvc.JetTruthLabeli...INFO dRTruthJet: 0.750000
ToolSvc.JetTruthLabeli...INFO dRTruthPart: 0.750000
@@ -719,7 +715,7 @@ ToolSvc.JetVertexTagge...INFO Reading JVT file from:
JetMomentTools/JVTlikelihood_20140805.root
ToolSvc.JetVertexTagge...INFO resolved in :
- /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_AnalysisBase_x86_64-centos7-gcc8-opt/2021-06-18T0524/AnalysisBase/22.2.30/InstallArea/x86_64-centos7-gcc8-opt/data/JetMomentTools/JVTlikelihood_20140805.root
+ /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_AnalysisBase_x86_64-centos7-gcc8-opt/2021-08-06T0524/AnalysisBase/22.2.36/InstallArea/x86_64-centos7-gcc8-opt/data/JetMomentTools/JVTlikelihood_20140805.root
ToolSvc.JVTEfficiencyToolINFO Path found = /cvmfs/atlas.cern.ch/repo/sw/database/GroupData/JetJvtEfficiency/Moriond2018/JvtSFFile_EMPFlowJets.root
@@ -967,8 +963,8 @@ CalibrationDataInterface: retrieved container DL1/AntiKt4EMPFlowJets_BTagging201
ToolSvc.BTagSF_AntiKt4...INFO Using systematics model Envelope
ToolSvc.METMaker_ST_Ti...INFO Initializing ToolSvc.METMaker_ST_Tight_NOfJVT...
ToolSvc.METSystTool INFO Searching for configFile: TrackSoftTerms-pflow.config
-ToolSvc.METSystTool INFO PWD: /afs/cern.ch/work/y/yoyamagu/private/IFF/IsolationSelectionTool_cleanup/build/PhysicsAnalysis/SUSYPhys/SUSYTools/CMakeFiles/unitTestRun
-ToolSvc.METSystTool INFO CALIBPATH: /afs/cern.ch/user/y/yoyamagu/work/IFF/IsolationSelectionTool_cleanup/build/x86_64-centos7-gcc8-opt/data:/afs/cern.ch/user/y/yoyamagu/work/IFF/IsolationSelectionTool_cleanup/build/x86_64-centos7-gcc8-opt/share:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_AnalysisBase_x86_64-centos7-gcc8-opt/2021-06-18T0524/AnalysisBase/22.2.30/InstallArea/x86_64-centos7-gcc8-opt/data:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_AnalysisBase_x86_64-centos7-gcc8-opt/2021-06-18T0524/AnalysisBase/22.2.30/InstallArea/x86_64-centos7-gcc8-opt/share:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_AnalysisBase_x86_64-centos7-gcc8-opt/2021-06-18T0524/AnalysisBaseExternals/22.2.30/InstallArea/x86_64-centos7-gcc8-opt/data:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_AnalysisBase_x86_64-centos7-gcc8-opt/2021-06-18T0524/AnalysisBaseExternals/22.2.30/InstallArea/x86_64-centos7-gcc8-opt/share:/sw/DbData/GroupData:/cvmfs/atlas.cern.ch/repo/sw/database/GroupData:/eos/atlas/atlascerngroupdisk/asg-calib:/afs/cern.ch/atlas/www/GROUPS/DATABASE/GroupData:http//cern.ch/atlas-groupdata:http//atlas.web.cern.ch/Atlas/GROUPS/DATABASE/GroupData
+ToolSvc.METSystTool INFO PWD: /data/CERN/BGF/MR45546/build/PhysicsAnalysis/SUSYPhys/SUSYTools/CMakeFiles/unitTestRun
+ToolSvc.METSystTool INFO CALIBPATH: /data/CERN/BGF/MR45546/build/x86_64-centos7-gcc8-opt/data:/data/CERN/BGF/MR45546/build/x86_64-centos7-gcc8-opt/share:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_AnalysisBase_x86_64-centos7-gcc8-opt/2021-08-06T0524/AnalysisBase/22.2.36/InstallArea/x86_64-centos7-gcc8-opt/data:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_AnalysisBase_x86_64-centos7-gcc8-opt/2021-08-06T0524/AnalysisBase/22.2.36/InstallArea/x86_64-centos7-gcc8-opt/share:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_AnalysisBase_x86_64-centos7-gcc8-opt/2021-08-06T0524/AnalysisBaseExternals/22.2.36/InstallArea/x86_64-centos7-gcc8-opt/data:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_AnalysisBase_x86_64-centos7-gcc8-opt/2021-08-06T0524/AnalysisBaseExternals/22.2.36/InstallArea/x86_64-centos7-gcc8-opt/share:/sw/DbData/GroupData:/cvmfs/atlas.cern.ch/repo/sw/database/GroupData:/eos/atlas/atlascerngroupdisk/asg-calib:/afs/cern.ch/atlas/www/GROUPS/DATABASE/GroupData:http//cern.ch/atlas-groupdata:http//atlas.web.cern.ch/Atlas/GROUPS/DATABASE/GroupData
ToolSvc.METSystTool INFO Configuring from file : /cvmfs/atlas.cern.ch/repo/sw/database/GroupData/METUtilities/data17_13TeV/prerec_Jan16/TrackSoftTerms-pflow.config
ToolSvc.METSystTool INFO Will read histograms from : METUtilities/data17_13TeV/prerec_Jan16/pre-rec_systematics_EMPFlow.root
ToolSvc.METSystTool INFO Systpath :/
@@ -1077,6 +1073,7 @@ ToolSvc.METSigAutoConf...INFO ep combination = 0
ToolSvc.METSigAutoConf...INFO use MVA calibration = 2
ToolSvc.METSigAutoConf...INFO use temperature correction 2015 = 2
ToolSvc.METSigAutoConf...INFO use uA2MeV correction 2015 1/2 week = 2
+ToolSvc.METSigAutoConf...INFO Using calibration file: /cvmfs/atlas.cern.ch/repo/sw/database/GroupData/tauRecTools/R22_preprod/CombinedTES_R22_v0.root
ToolSvc.xAODConfigTool INFO Initialising...
ToolSvc.TrigDecisionTool INFO Initializing Trig::TrigDecisionTool (standalone version even for athena)
ToolSvc.TrigDecisionTool INFO Initialized TDT
@@ -1116,10 +1113,10 @@ ToolSvc.ttva_selection...INFO (For Custom WP:) cut on Δz * sin θ: -1 (dzSin
ToolSvc.ttva_selection...INFO (For Custom WP:) allow UsedInFit MatchStatus: 1 (doUsedInFit).
ToolSvc.ttva_selection...INFO Require VxType::PriVtx for unique match: 1 (requirePriVtx).
ToolSvc.IsoCloseByTool INFO The following isolation cones are considered for Electron
-ToolSvc.IsoCloseByTool INFO --- ptvarcone30_TightTTVALooseCone_pt1000
+ToolSvc.IsoCloseByTool INFO --- ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt1000
ToolSvc.IsoCloseByTool INFO --- topoetcone20
ToolSvc.IsoCloseByTool INFO The following isolation cones are considered for Muon
-ToolSvc.IsoCloseByTool INFO --- ptvarcone30_TightTTVA_pt1000
+ToolSvc.IsoCloseByTool INFO --- ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000
ToolSvc.IsoCloseByTool INFO --- topoetcone20
ToolSvc.IsoCloseByTool INFO The following isolation cones are considered for Photon
ToolSvc.IsoCloseByTool INFO --- topoetcone40
@@ -1132,61 +1129,61 @@ Package.SUSYToolsTester INFO SUSYObjDef_xAOD initialized...
Package.SUSYToolsTester INFO Initialized SUSYTools
Package.SUSYToolsTester INFO Config file opened
ToolSvc.xAODConfigTool INFO Loaded xAOD::TriggerMenu configuration:
-ToolSvc.xAODConfigTool INFO SMK = 2740, L1PSK = 23222, HLTPSK = 17386
-ToolSvc.TrigDecisionTool INFO Tool: updating config in slot 0 with SMK: 2740 and L1PSK: 23222 and HLTPSK: 17386 getForceConfigUpdate()=1 HLT Chains: 3171
+ToolSvc.xAODConfigTool INFO SMK = 2740, L1PSK = 23209, HLTPSK = 17444
+ToolSvc.TrigDecisionTool INFO Tool: updating config in slot 0 with SMK: 2740 and L1PSK: 23209 and HLTPSK: 17444 getForceConfigUpdate()=1 HLT Chains: 3171
Package.SUSYToolsTester INFO == cbkname: AllExecutedEvents, description: Number of processed events before any cut, stream: StreamAOD
Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
-Package.SUSYToolsTester INFO cycle: 0, allEvents = 12718
+Package.SUSYToolsTester INFO cycle: 0, allEvents = 2000
Package.SUSYToolsTester INFO == cbkname: TauAugmentationKernelTopAlg, description: N/A, stream: StreamAOD
Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams:
-Package.SUSYToolsTester INFO cycle: 0, allEvents = 12718
+Package.SUSYToolsTester INFO cycle: 0, allEvents = 2000
Package.SUSYToolsTester INFO == cbkname: PHYSKernel, description: N/A, stream: StreamAOD
Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: StreamDAOD_PHYS
-Package.SUSYToolsTester INFO cycle: 0, allEvents = 12718
+Package.SUSYToolsTester INFO cycle: 0, allEvents = 2000
Package.SUSYToolsTester INFO No relevent CutBookKeepers found
Package.SUSYToolsTester INFO Found kernel: PHYS
Package.SUSYToolsTester INFO Found stream: StreamAOD
Info in <CP::TPileupReweighting::GetLumiBlockMu>: Initializing the subtool..
-Package.SUSYToolsTester INFO ===>>> start processing event #, 252706848run #358031 0 events processed so far <<<===
-Info in <SUSYToolsTester>: ===>>> done processing event #252706848, run #358031 1 events processed so far <<<===
-ToolSvc.TopTagger WARNING One (or more) tagger input variable has an out-of-range value, setting score to -666
+Package.SUSYToolsTester INFO ===>>> start processing event #, 836030867run #358031 0 events processed so far <<<===
+Info in <SUSYToolsTester>: ===>>> done processing event #836030867, run #358031 1 events processed so far <<<===
ToolSvc.TrigDecisionTool INFO decision not set on first (?) assert. deciding how to unpack
ToolSvc.TrigDecisionTool INFO SG contains xAOD decision, use DecisionUnpackerStandalone
ToolSvc.TopTagger WARNING One (or more) tagger input variable has an out-of-range value, setting score to -666
ToolSvc.TopTagger WARNING One (or more) tagger input variable has an out-of-range value, setting score to -666
ToolSvc.TopTagger WARNING One (or more) tagger input variable has an out-of-range value, setting score to -666
-Package.SUSYToolsTester INFO ===>>> start processing event #, 252808698run #358031 99 events processed so far <<<===
-Info in <SUSYToolsTester>: ===>>> done processing event #252808698, run #358031 100 events processed so far <<<===
+ToolSvc.TopTagger WARNING One (or more) tagger input variable has an out-of-range value, setting score to -666
+Package.SUSYToolsTester INFO ===>>> start processing event #, 835983333run #358031 99 events processed so far <<<===
+Info in <SUSYToolsTester>: ===>>> done processing event #835983333, run #358031 100 events processed so far <<<===
ToolSvc.TopTagger WARNING One (or more) tagger input variable has an out-of-range value, setting score to -666
ToolSvc.TopTagger WARNING One (or more) tagger input variable has an out-of-range value, setting score to -666
+Warning in <SUSYToolsTester>: No PV found for this event! Skipping...
ToolSvc.TopTagger WARNING One (or more) tagger input variable has an out-of-range value, setting score to -666
-Package.SUSYToolsTester INFO ===>>> start processing event #, 252869255run #358031 199 events processed so far <<<===
-Info in <SUSYToolsTester>: ===>>> done processing event #252869255, run #358031 200 events processed so far <<<===
ToolSvc.TopTagger WARNING One (or more) tagger input variable has an out-of-range value, setting score to -666
ToolSvc.TopTagger WARNING One (or more) tagger input variable has an out-of-range value, setting score to -666
-Package.SUSYToolsTester INFO ===>>> start processing event #, 252689918run #358031 299 events processed so far <<<===
-Info in <SUSYToolsTester>: ===>>> done processing event #252689918, run #358031 300 events processed so far <<<===
ToolSvc.TopTagger WARNING One (or more) tagger input variable has an out-of-range value, setting score to -666
-Package.SUSYToolsTester INFO ===>>> start processing event #, 252990016run #358031 399 events processed so far <<<===
-Info in <SUSYToolsTester>: ===>>> done processing event #252990016, run #358031 400 events processed so far <<<===
-Package.SUSYToolsTester INFO ===>>> start processing event #, 253017498run #358031 499 events processed so far <<<===
-Info in <SUSYToolsTester>: ===>>> done processing event #253017498, run #358031 500 events processed so far <<<===
+Package.SUSYToolsTester INFO ===>>> start processing event #, 835764972run #358031 199 events processed so far <<<===
+Info in <SUSYToolsTester>: ===>>> done processing event #835764972, run #358031 200 events processed so far <<<===
+Package.SUSYToolsTester INFO ===>>> start processing event #, 836098077run #358031 299 events processed so far <<<===
+Info in <SUSYToolsTester>: ===>>> done processing event #836098077, run #358031 300 events processed so far <<<===
+Package.SUSYToolsTester INFO ===>>> start processing event #, 836130511run #358031 399 events processed so far <<<===
+Info in <SUSYToolsTester>: ===>>> done processing event #836130511, run #358031 400 events processed so far <<<===
+Package.SUSYToolsTester INFO ===>>> start processing event #, 836035578run #358031 499 events processed so far <<<===
+Info in <SUSYToolsTester>: ===>>> done processing event #836035578, run #358031 500 events processed so far <<<===
Info in <SUSYToolsTester>: Time per event: (CPU / WALL)
- Entire loop - 321.840000 / 343.053210 ms
- First event - 600.000000 / 1775.295973 ms
- Excluding first event - 321.282565 / 340.183000 ms
+ Entire loop - 192.180000 / 330.101846 ms
+ First event - 260.000000 / 25722.627163 ms
+ Excluding first event - 192.044088 / 279.215022 ms
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation <<<<
-Package.SUSYToolsTester INFO Cut 0(All)-> el: 500, mu: 500
-Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 500, mu: 500
-Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 500, mu: 500
-Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 500, mu: 500
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 496, mu: 496
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 47, mu: 67
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 38, mu: 54
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 38, mu: 53
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 32, mu: 52
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 1, mu: 0
+Package.SUSYToolsTester INFO Cut 0(All)-> el: 499, mu: 499
+Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 499, mu: 499
+Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 499, mu: 499
+Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 499, mu: 499
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 494, mu: 494
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 52, mu: 70
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 42, mu: 48
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 41, mu: 46
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 41, mu: 45
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 1, mu: 1
ToolSvc.TrigDecisionTool INFO TDT finalized and removed from instance list
CalibrationDataInterfaceROOT object out-of-bounds summary:
No issues found
-Package.UserCode INFO Finished (return code was 0)
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/share/ut_SUSYToolsTester_mc.ref b/PhysicsAnalysis/SUSYPhys/SUSYTools/share/ut_SUSYToolsTester_mc.ref
index 140511309535..84105b51e29a 100644
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/share/ut_SUSYToolsTester_mc.ref
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/share/ut_SUSYToolsTester_mc.ref
@@ -1,16 +1,13 @@
-Package.UserCode INFO Unit test for SUSYTools on MC
-Package.UserCode INFO Will now run this command: SUSYToolsTester /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SUSYTools/DAOD_PHYS.mc16_13TeV.410470.FS_mc16e_p4441.PHYS.pool.root maxEvents=100 isData=0 isAtlfast=0 Debug=0 NoSyst=0 PRWFile=/cvmfs/atlas.cern.ch/repo/sw/database/GroupData/dev/PileupReweighting/mc16_13TeV/pileup_mc16e_dsid410470_FS.root ilumicalcFile=/cvmfs/atlas.cern.ch/repo/sw/database/GroupData/GoodRunsLists/data18_13TeV/20190318/ilumicalc_histograms_None_348885-364292_OflLumi-13TeV-010.root
-Package.SUSYToolsTester INFO ===== Processing key /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SUSYTools/DAOD_PHYS.mc16_13TeV.410470.FS_mc16e_p4441.PHYS.pool.root with value
+Package.SUSYToolsTester INFO ===== Processing key /eos/atlas/atlascerngroupdisk/data-art/grid-input/SUSYTools/DAOD_PHYS.mc16_13TeV.410470.FS_mc16e_p4631-iso.PHYS.pool.root with value
Package.SUSYToolsTester INFO ===== Processing key maxEvents with value 100
Package.SUSYToolsTester INFO ===== Processing key isData with value 0
Package.SUSYToolsTester INFO ===== Processing key isAtlfast with value 0
Package.SUSYToolsTester INFO ===== Processing key Debug with value 0
Package.SUSYToolsTester INFO ===== Processing key NoSyst with value 0
-Package.SUSYToolsTester INFO ===== Processing key PRWFile with value /cvmfs/atlas.cern.ch/repo/sw/database/GroupData/dev/PileupReweighting/mc16_13TeV/pileup_mc16e_dsid410470_FS.root
-Package.SUSYToolsTester INFO ===== Processing key ilumicalcFile with value /cvmfs/atlas.cern.ch/repo/sw/database/GroupData/GoodRunsLists/data18_13TeV/20190318/ilumicalc_histograms_None_348885-364292_OflLumi-13TeV-010.root
-Package.SUSYToolsTester INFO Opening file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SUSYTools/DAOD_PHYS.mc16_13TeV.410470.FS_mc16e_p4441.PHYS.pool.root
+Package.SUSYToolsTester INFO ===== Processing key PRWFile with value dev/PileupReweighting/mc16_13TeV/pileup_mc16e_dsid410470_FS.root
+Package.SUSYToolsTester INFO ===== Processing key ilumicalcFile with value GoodRunsLists/data18_13TeV/20190318/ilumicalc_histograms_None_348885-364292_OflLumi-13TeV-010.root
+Package.SUSYToolsTester INFO Opening file: /eos/atlas/atlascerngroupdisk/data-art/grid-input/SUSYTools/DAOD_PHYS.mc16_13TeV.410470.FS_mc16e_p4631-iso.PHYS.pool.root
Warning in <TClass::Init>: no dictionary for class DataHeader_p6 is available
-Warning in <TClass::Init>: no dictionary for class DataHeader_p6::FullElement is available
Warning in <TClass::Init>: no dictionary for class DataHeaderForm_p6 is available
Warning in <TClass::Init>: no dictionary for class DataHeaderForm_p6::DbRecord is available
Warning in <TClass::Init>: no dictionary for class Guid is available
@@ -20,18 +17,17 @@ Warning in <TClass::Init>: no dictionary for class IOVPayloadContainer_p1 is ava
Warning in <TClass::Init>: no dictionary for class IOVPayloadContainer_p1::CondAttrListCollection_p1 is available
Warning in <TClass::Init>: no dictionary for class IOVPayloadContainer_p1::CondAttrListEntry_p1 is available
Warning in <TClass::Init>: no dictionary for class IOVPayloadContainer_p1::IOVRange_p1 is available
-Warning in <TClass::Init>: no dictionary for class AttrListIndexes is available
Warning in <TClass::Init>: no dictionary for class ILockable is available
Warning in <TClass::Init>: no dictionary for class EventStreamInfo_p3 is available
Warning in <TClass::Init>: no dictionary for class EventType_p3 is available
-Package.SUSYToolsTester INFO Number of events in the file: 30000
+Package.SUSYToolsTester INFO Number of events in the file: 2000
PathResolver WARNING Locating dev file dev/PMGTools/PMGxsecDB_mc16.txt. Do not let this propagate to a release
ToolSvc.PMGCrossSectio...INFO Initializing ToolSvc.PMGCrossSectionTool...
Package.SUSYToolsTester INFO xsec DB initialized
Package.SUSYToolsTester INFO ABOUT TO INITIALIZE SUSYTOOLS
SUSYObjDef_xAOD INFO Initialising...
SUSYObjDef_xAOD INFO ***** ***** ***** *****
-SUSYObjDef_xAOD INFO Configuring from file /afs/cern.ch/user/y/yoyamagu/work/IFF/IsolationSelectionTool_cleanup/build/x86_64-centos7-gcc8-opt/data/SUSYTools/SUSYTools_Default.conf
+SUSYObjDef_xAOD INFO Configuring from file /data/CERN/BGF/MR45546/build/x86_64-centos7-gcc8-opt/data/SUSYTools/SUSYTools_Default.conf
SUSYObjDef_xAOD INFO Config file opened
SUSYObjDef_xAOD INFO readConfig(): Loaded property Jet.InputType with value 9
SUSYObjDef_xAOD INFO readConfig(): Loaded property Muon.Id with value 1
@@ -253,15 +249,15 @@ SUSYObjDef_xAOD INFO configFromFile(): Loaded property "PRW.autoconf
SUSYObjDef_xAOD INFO configFromFile(): Loaded property "PRW.autoconfigPRWCombinedmode" with value 0
SUSYObjDef_xAOD INFO configFromFile(): Loaded property "PRW.autoconfigPRWRPVmode" with value 0
SUSYObjDef_xAOD INFO configFromFile(): Loaded property "PRW.autoconfigPRWHFFilter" with value
-SUSYObjDef_xAOD INFO configFromFile(): Loaded property "PRW.autoconfigPRWRtags" with value mc16a:r9364_r11505_r11285,mc16c:r9781,mc16d:r10201_r11506_r11279,mc16e:r10724_r11507_r11249_r12020_r12034_r12405,mc16ans:r10740_r10832_r10847_r11008_r11036,mc16dns:r10739_r10833_r10848_r11009_r11037,mc16ens:r10790_r11038_r11265
+SUSYObjDef_xAOD INFO configFromFile(): Loaded property "PRW.autoconfigPRWRtags" with value mc16a:r9364_r11505_r11285,mc16c:r9781,mc16d:r10201_r11506_r11279,mc16e:r10724_r11507_r11249_r12020_r12034_r12405_r12627,mc16ans:r10740_r10832_r10847_r11008_r11036,mc16dns:r10739_r10833_r10848_r11009_r11037,mc16ens:r10790_r11038_r11265
SUSYObjDef_xAOD INFO configFromFile(): Loaded property "StrictConfigCheck" with value 1
SUSYObjDef_xAOD INFO Configured for jet collection: AntiKt4EMPFlowJets
SUSYObjDef_xAOD INFO Configured for truth jet collection: AntiKt4TruthDressedWZJets
SUSYObjDef_xAOD INFO Build MET with map: METAssoc_AntiKt4EMPFlow
-SUSYObjDef_xAOD INFO Setting up autoconfigurePileupRWTool for mc campaign mc16e (from amiTag r12405_r12405_r12405_r12405_r12405_r12405) (standard-like = true).
+SUSYObjDef_xAOD INFO Setting up autoconfigurePileupRWTool for mc campaign mc16e (from amiTag r12627_r12627_r12627_r12627) (standard-like = true).
PathResolver WARNING Locating dev file dev/PileupReweighting/share/DSID410xxx/pileup_mc16e_dsid410470_FS.root. Do not let this propagate to a release
SUSYObjDef_xAOD INFO autoconfigurePileupRWTool(): configuring PRW tool using /cvmfs/atlas.cern.ch/repo/sw/database/GroupData/dev/PileupReweighting/share/DSID410xxx/pileup_mc16e_dsid410470_FS.root
-SUSYObjDef_xAOD INFO Adding ilumicalc file: /cvmfs/atlas.cern.ch/repo/sw/database/GroupData/GoodRunsLists/data18_13TeV/20190318/ilumicalc_histograms_None_348885-364292_OflLumi-13TeV-010.root
+SUSYObjDef_xAOD INFO Adding ilumicalc file: GoodRunsLists/data18_13TeV/20190318/ilumicalc_histograms_None_348885-364292_OflLumi-13TeV-010.root
Info in <CP::TPileupReweighting::UsePeriodConfig>: Using MC16 Period configuration
Info in <CP::TPileupReweighting::UsePeriodConfig>: Using MC16 Period configuration
Info in <CP::TPileupReweighting::UsePeriodConfig>: Using MC16 Period configuration
@@ -269,7 +265,7 @@ PathResolver WARNING Locating dev file dev/PileupReweighting/share/D
Info in <CP::TPileupReweighting::AddLumiCalcFile>: Adding LumiMetaData (scale factor=0.970874)...
Info in <CP::TPileupReweighting::AddLumiCalcFile>: Adding LumiMetaData (scale factor=1.010100)...
Info in <CP::TPileupReweighting::AddLumiCalcFile>: Adding LumiMetaData (scale factor=0.934579)...
-DefaultWeightTool INFO AsgTool DefaultWeightTool @ 0x89f3ed0
+DefaultWeightTool INFO AsgTool DefaultWeightTool @ 0x92f5be0
ToolSvc.JetCalibTool_A...INFO Initializing ToolSvc.JetCalibTool_AntiKt4EMPFlow...
ToolSvc.JetCalibTool_A...INFO ===================================
ToolSvc.JetCalibTool_A...INFO Initializing the xAOD Jet Calibration Tool for AntiKt4EMPFlowjets
@@ -429,8 +425,8 @@ ToolSvc.JetTruthLabeli...INFO Parameters for ToolSvc.JetTruthLabelingTool
ToolSvc.JetTruthLabeli...INFO xAOD information:
ToolSvc.JetTruthLabeli...INFO TruthLabelName: R10TruthLabel_R21Consolidated
ToolSvc.JetTruthLabeli...INFO UseTRUTH3: True
-ToolSvc.JetTruthLabeli...INFO TruthBosonContainerName: TruthBoson
-ToolSvc.JetTruthLabeli...INFO TruthTopQuarkContainerName: TruthTop
+ToolSvc.JetTruthLabeli...INFO TruthBosonContainerName: 'TruthBoson'
+ToolSvc.JetTruthLabeli...INFO TruthTopQuarkContainerName: 'TruthTop'
ToolSvc.JetTruthLabeli...INFO TruthJetCollectionName: AntiKt10TruthTrimmedPtFrac5SmallR20Jets
ToolSvc.JetTruthLabeli...INFO dRTruthJet: 0.750000
ToolSvc.JetTruthLabeli...INFO dRTruthPart: 0.750000
@@ -695,7 +691,7 @@ ToolSvc.JetVertexTagge...INFO Reading JVT file from:
JetMomentTools/JVTlikelihood_20140805.root
ToolSvc.JetVertexTagge...INFO resolved in :
- /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_AnalysisBase_x86_64-centos7-gcc8-opt/2021-06-18T0524/AnalysisBase/22.2.30/InstallArea/x86_64-centos7-gcc8-opt/data/JetMomentTools/JVTlikelihood_20140805.root
+ /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_AnalysisBase_x86_64-centos7-gcc8-opt/2021-08-06T0524/AnalysisBase/22.2.36/InstallArea/x86_64-centos7-gcc8-opt/data/JetMomentTools/JVTlikelihood_20140805.root
ToolSvc.JVTEfficiencyToolINFO Path found = /cvmfs/atlas.cern.ch/repo/sw/database/GroupData/JetJvtEfficiency/Moriond2018/JvtSFFile_EMPFlowJets.root
@@ -1018,8 +1014,8 @@ CalibrationDataInterface: retrieved container DL1/AntiKt4EMPFlowJets_BTagging201
ToolSvc.BTagSF_AntiKt4...INFO Using systematics model Envelope
ToolSvc.METMaker_ST_Ti...INFO Initializing ToolSvc.METMaker_ST_Tight_NOfJVT...
ToolSvc.METSystTool INFO Searching for configFile: TrackSoftTerms-pflow.config
-ToolSvc.METSystTool INFO PWD: /afs/cern.ch/work/y/yoyamagu/private/IFF/IsolationSelectionTool_cleanup/build/PhysicsAnalysis/SUSYPhys/SUSYTools/CMakeFiles/unitTestRun
-ToolSvc.METSystTool INFO CALIBPATH: /afs/cern.ch/user/y/yoyamagu/work/IFF/IsolationSelectionTool_cleanup/build/x86_64-centos7-gcc8-opt/data:/afs/cern.ch/user/y/yoyamagu/work/IFF/IsolationSelectionTool_cleanup/build/x86_64-centos7-gcc8-opt/share:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_AnalysisBase_x86_64-centos7-gcc8-opt/2021-06-18T0524/AnalysisBase/22.2.30/InstallArea/x86_64-centos7-gcc8-opt/data:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_AnalysisBase_x86_64-centos7-gcc8-opt/2021-06-18T0524/AnalysisBase/22.2.30/InstallArea/x86_64-centos7-gcc8-opt/share:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_AnalysisBase_x86_64-centos7-gcc8-opt/2021-06-18T0524/AnalysisBaseExternals/22.2.30/InstallArea/x86_64-centos7-gcc8-opt/data:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_AnalysisBase_x86_64-centos7-gcc8-opt/2021-06-18T0524/AnalysisBaseExternals/22.2.30/InstallArea/x86_64-centos7-gcc8-opt/share:/sw/DbData/GroupData:/cvmfs/atlas.cern.ch/repo/sw/database/GroupData:/eos/atlas/atlascerngroupdisk/asg-calib:/afs/cern.ch/atlas/www/GROUPS/DATABASE/GroupData:http//cern.ch/atlas-groupdata:http//atlas.web.cern.ch/Atlas/GROUPS/DATABASE/GroupData
+ToolSvc.METSystTool INFO PWD: /data/CERN/BGF/MR45546/build/PhysicsAnalysis/SUSYPhys/SUSYTools/CMakeFiles/unitTestRun
+ToolSvc.METSystTool INFO CALIBPATH: /data/CERN/BGF/MR45546/build/x86_64-centos7-gcc8-opt/data:/data/CERN/BGF/MR45546/build/x86_64-centos7-gcc8-opt/share:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_AnalysisBase_x86_64-centos7-gcc8-opt/2021-08-06T0524/AnalysisBase/22.2.36/InstallArea/x86_64-centos7-gcc8-opt/data:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_AnalysisBase_x86_64-centos7-gcc8-opt/2021-08-06T0524/AnalysisBase/22.2.36/InstallArea/x86_64-centos7-gcc8-opt/share:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_AnalysisBase_x86_64-centos7-gcc8-opt/2021-08-06T0524/AnalysisBaseExternals/22.2.36/InstallArea/x86_64-centos7-gcc8-opt/data:/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_AnalysisBase_x86_64-centos7-gcc8-opt/2021-08-06T0524/AnalysisBaseExternals/22.2.36/InstallArea/x86_64-centos7-gcc8-opt/share:/sw/DbData/GroupData:/cvmfs/atlas.cern.ch/repo/sw/database/GroupData:/eos/atlas/atlascerngroupdisk/asg-calib:/afs/cern.ch/atlas/www/GROUPS/DATABASE/GroupData:http//cern.ch/atlas-groupdata:http//atlas.web.cern.ch/Atlas/GROUPS/DATABASE/GroupData
ToolSvc.METSystTool INFO Configuring from file : /cvmfs/atlas.cern.ch/repo/sw/database/GroupData/METUtilities/data17_13TeV/prerec_Jan16/TrackSoftTerms-pflow.config
ToolSvc.METSystTool INFO Will read histograms from : METUtilities/data17_13TeV/prerec_Jan16/pre-rec_systematics_EMPFlow.root
ToolSvc.METSystTool INFO Systpath :/
@@ -1128,6 +1124,7 @@ ToolSvc.METSigAutoConf...INFO ep combination = 0
ToolSvc.METSigAutoConf...INFO use MVA calibration = 2
ToolSvc.METSigAutoConf...INFO use temperature correction 2015 = 2
ToolSvc.METSigAutoConf...INFO use uA2MeV correction 2015 1/2 week = 2
+ToolSvc.METSigAutoConf...INFO Using calibration file: /cvmfs/atlas.cern.ch/repo/sw/database/GroupData/tauRecTools/R22_preprod/CombinedTES_R22_v0.root
ToolSvc.xAODConfigTool INFO Initialising...
ToolSvc.TrigDecisionTool INFO Initializing Trig::TrigDecisionTool (standalone version even for athena)
ToolSvc.TrigDecisionTool INFO Initialized TDT
@@ -1167,10 +1164,10 @@ ToolSvc.ttva_selection...INFO (For Custom WP:) cut on Δz * sin θ: -1 (dzSin
ToolSvc.ttva_selection...INFO (For Custom WP:) allow UsedInFit MatchStatus: 1 (doUsedInFit).
ToolSvc.ttva_selection...INFO Require VxType::PriVtx for unique match: 1 (requirePriVtx).
ToolSvc.IsoCloseByTool INFO The following isolation cones are considered for Electron
-ToolSvc.IsoCloseByTool INFO --- ptvarcone30_TightTTVALooseCone_pt1000
+ToolSvc.IsoCloseByTool INFO --- ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt1000
ToolSvc.IsoCloseByTool INFO --- topoetcone20
ToolSvc.IsoCloseByTool INFO The following isolation cones are considered for Muon
-ToolSvc.IsoCloseByTool INFO --- ptvarcone30_TightTTVA_pt1000
+ToolSvc.IsoCloseByTool INFO --- ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000
ToolSvc.IsoCloseByTool INFO --- topoetcone20
ToolSvc.IsoCloseByTool INFO The following isolation cones are considered for Photon
ToolSvc.IsoCloseByTool INFO --- topoetcone40
@@ -1190,28 +1187,680 @@ ToolSvc.xAODConfigTool INFO SMK = 2232, L1PSK = 86, HLTPSK = 278
ToolSvc.TrigDecisionTool INFO Tool: updating config in slot 0 with SMK: 2232 and L1PSK: 86 and HLTPSK: 278 getForceConfigUpdate()=1 HLT Chains: 4309
Package.SUSYToolsTester INFO == cbkname: AllExecutedEvents, description: Number of processed events before any cut, stream: StreamAOD
Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
-Package.SUSYToolsTester INFO cycle: 4, allEvents = 1000
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
Package.SUSYToolsTester INFO == cbkname: TauAugmentationKernelTopAlg, description: N/A, stream: StreamAOD
Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams:
-Package.SUSYToolsTester INFO cycle: 4, allEvents = 1000
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
Package.SUSYToolsTester INFO == cbkname: MiniCollectionTruthLinkKernel, description: N/A, stream: StreamAOD
Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams:
-Package.SUSYToolsTester INFO cycle: 4, allEvents = 1000
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3SumWeightsAlg, description: N/A, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams:
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_nominal, description: LHE3Weight_nominal, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_muR=10,muF=20, description: LHE3Weight_muR=10,muF=20, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_muR=10,muF=05, description: LHE3Weight_muR=10,muF=05, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_muR=20,muF=10, description: LHE3Weight_muR=20,muF=10, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_muR=05,muF=10, description: LHE3Weight_muR=05,muF=10, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_muR=05,muF=05, description: LHE3Weight_muR=05,muF=05, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_muR=20,muF=20, description: LHE3Weight_muR=20,muF=20, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_muR=20,muF=05, description: LHE3Weight_muR=20,muF=05, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_muR=05,muF=20, description: LHE3Weight_muR=05,muF=20, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=25200, description: LHE3Weight_PDFset=25200, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=13165, description: LHE3Weight_PDFset=13165, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90900, description: LHE3Weight_PDFset=90900, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=265000, description: LHE3Weight_PDFset=265000, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=266000, description: LHE3Weight_PDFset=266000, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=303400, description: LHE3Weight_PDFset=303400, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260001, description: LHE3Weight_PDFset=260001, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260002, description: LHE3Weight_PDFset=260002, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260003, description: LHE3Weight_PDFset=260003, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260004, description: LHE3Weight_PDFset=260004, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260005, description: LHE3Weight_PDFset=260005, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260006, description: LHE3Weight_PDFset=260006, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260007, description: LHE3Weight_PDFset=260007, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260008, description: LHE3Weight_PDFset=260008, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260009, description: LHE3Weight_PDFset=260009, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260010, description: LHE3Weight_PDFset=260010, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260011, description: LHE3Weight_PDFset=260011, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260012, description: LHE3Weight_PDFset=260012, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260013, description: LHE3Weight_PDFset=260013, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260014, description: LHE3Weight_PDFset=260014, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260015, description: LHE3Weight_PDFset=260015, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260016, description: LHE3Weight_PDFset=260016, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260017, description: LHE3Weight_PDFset=260017, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260018, description: LHE3Weight_PDFset=260018, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260019, description: LHE3Weight_PDFset=260019, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260020, description: LHE3Weight_PDFset=260020, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260021, description: LHE3Weight_PDFset=260021, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260022, description: LHE3Weight_PDFset=260022, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260023, description: LHE3Weight_PDFset=260023, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260024, description: LHE3Weight_PDFset=260024, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260025, description: LHE3Weight_PDFset=260025, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260026, description: LHE3Weight_PDFset=260026, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260027, description: LHE3Weight_PDFset=260027, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260028, description: LHE3Weight_PDFset=260028, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260029, description: LHE3Weight_PDFset=260029, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260030, description: LHE3Weight_PDFset=260030, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260031, description: LHE3Weight_PDFset=260031, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260032, description: LHE3Weight_PDFset=260032, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260033, description: LHE3Weight_PDFset=260033, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260034, description: LHE3Weight_PDFset=260034, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260035, description: LHE3Weight_PDFset=260035, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260036, description: LHE3Weight_PDFset=260036, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260037, description: LHE3Weight_PDFset=260037, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260038, description: LHE3Weight_PDFset=260038, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260039, description: LHE3Weight_PDFset=260039, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260040, description: LHE3Weight_PDFset=260040, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260041, description: LHE3Weight_PDFset=260041, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260042, description: LHE3Weight_PDFset=260042, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260043, description: LHE3Weight_PDFset=260043, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260044, description: LHE3Weight_PDFset=260044, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260045, description: LHE3Weight_PDFset=260045, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260046, description: LHE3Weight_PDFset=260046, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260047, description: LHE3Weight_PDFset=260047, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260048, description: LHE3Weight_PDFset=260048, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260049, description: LHE3Weight_PDFset=260049, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260050, description: LHE3Weight_PDFset=260050, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260051, description: LHE3Weight_PDFset=260051, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260052, description: LHE3Weight_PDFset=260052, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260053, description: LHE3Weight_PDFset=260053, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260054, description: LHE3Weight_PDFset=260054, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260055, description: LHE3Weight_PDFset=260055, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260056, description: LHE3Weight_PDFset=260056, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260057, description: LHE3Weight_PDFset=260057, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260058, description: LHE3Weight_PDFset=260058, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260059, description: LHE3Weight_PDFset=260059, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260060, description: LHE3Weight_PDFset=260060, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260061, description: LHE3Weight_PDFset=260061, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260062, description: LHE3Weight_PDFset=260062, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260063, description: LHE3Weight_PDFset=260063, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260064, description: LHE3Weight_PDFset=260064, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260065, description: LHE3Weight_PDFset=260065, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260066, description: LHE3Weight_PDFset=260066, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260067, description: LHE3Weight_PDFset=260067, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260068, description: LHE3Weight_PDFset=260068, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260069, description: LHE3Weight_PDFset=260069, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260070, description: LHE3Weight_PDFset=260070, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260071, description: LHE3Weight_PDFset=260071, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260072, description: LHE3Weight_PDFset=260072, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260073, description: LHE3Weight_PDFset=260073, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260074, description: LHE3Weight_PDFset=260074, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260075, description: LHE3Weight_PDFset=260075, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260076, description: LHE3Weight_PDFset=260076, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260077, description: LHE3Weight_PDFset=260077, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260078, description: LHE3Weight_PDFset=260078, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260079, description: LHE3Weight_PDFset=260079, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260080, description: LHE3Weight_PDFset=260080, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260081, description: LHE3Weight_PDFset=260081, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260082, description: LHE3Weight_PDFset=260082, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260083, description: LHE3Weight_PDFset=260083, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260084, description: LHE3Weight_PDFset=260084, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260085, description: LHE3Weight_PDFset=260085, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260086, description: LHE3Weight_PDFset=260086, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260087, description: LHE3Weight_PDFset=260087, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260088, description: LHE3Weight_PDFset=260088, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260089, description: LHE3Weight_PDFset=260089, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260090, description: LHE3Weight_PDFset=260090, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260091, description: LHE3Weight_PDFset=260091, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260092, description: LHE3Weight_PDFset=260092, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260093, description: LHE3Weight_PDFset=260093, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260094, description: LHE3Weight_PDFset=260094, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260095, description: LHE3Weight_PDFset=260095, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260096, description: LHE3Weight_PDFset=260096, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260097, description: LHE3Weight_PDFset=260097, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260098, description: LHE3Weight_PDFset=260098, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260099, description: LHE3Weight_PDFset=260099, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=260100, description: LHE3Weight_PDFset=260100, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90901, description: LHE3Weight_PDFset=90901, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90902, description: LHE3Weight_PDFset=90902, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90903, description: LHE3Weight_PDFset=90903, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90904, description: LHE3Weight_PDFset=90904, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90905, description: LHE3Weight_PDFset=90905, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90906, description: LHE3Weight_PDFset=90906, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90907, description: LHE3Weight_PDFset=90907, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90908, description: LHE3Weight_PDFset=90908, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90909, description: LHE3Weight_PDFset=90909, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90910, description: LHE3Weight_PDFset=90910, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90911, description: LHE3Weight_PDFset=90911, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90912, description: LHE3Weight_PDFset=90912, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90913, description: LHE3Weight_PDFset=90913, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90914, description: LHE3Weight_PDFset=90914, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90915, description: LHE3Weight_PDFset=90915, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90916, description: LHE3Weight_PDFset=90916, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90917, description: LHE3Weight_PDFset=90917, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90918, description: LHE3Weight_PDFset=90918, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90919, description: LHE3Weight_PDFset=90919, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90920, description: LHE3Weight_PDFset=90920, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90921, description: LHE3Weight_PDFset=90921, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90922, description: LHE3Weight_PDFset=90922, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90923, description: LHE3Weight_PDFset=90923, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90924, description: LHE3Weight_PDFset=90924, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90925, description: LHE3Weight_PDFset=90925, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90926, description: LHE3Weight_PDFset=90926, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90927, description: LHE3Weight_PDFset=90927, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90928, description: LHE3Weight_PDFset=90928, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90929, description: LHE3Weight_PDFset=90929, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_PDFset=90930, description: LHE3Weight_PDFset=90930, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_2muF_MMHT, description: LHE3Weight_2muF_MMHT, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_0p5muF_MMHT, description: LHE3Weight_0p5muF_MMHT, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_2muR_MMHT, description: LHE3Weight_2muR_MMHT, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_0p5muR_MMHT, description: LHE3Weight_0p5muR_MMHT, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_0p5muF_0p5muR_MMHT, description: LHE3Weight_0p5muF_0p5muR_MMHT, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_2muF_2muR_MMHT, description: LHE3Weight_2muF_2muR_MMHT, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_0p5muF_2muR_MMHT, description: LHE3Weight_0p5muF_2muR_MMHT, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_2muF_0p5muR_MMHT, description: LHE3Weight_2muF_0p5muR_MMHT, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_2muF_CT14, description: LHE3Weight_2muF_CT14, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_0p5muF_CT14, description: LHE3Weight_0p5muF_CT14, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_2muR_CT14, description: LHE3Weight_2muR_CT14, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_0p5muR_CT14, description: LHE3Weight_0p5muR_CT14, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_0p5muF_0p5muR_CT14, description: LHE3Weight_0p5muF_0p5muR_CT14, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_2muF_2muR_CT14, description: LHE3Weight_2muF_2muR_CT14, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_0p5muF_2muR_CT14, description: LHE3Weight_0p5muF_2muR_CT14, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_2muF_0p5muR_CT14, description: LHE3Weight_2muF_0p5muR_CT14, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_2muF_PDF4LHC15_NLO_30, description: LHE3Weight_2muF_PDF4LHC15_NLO_30, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_0p5muF_PDF4LHC15_NLO_30, description: LHE3Weight_0p5muF_PDF4LHC15_NLO_30, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_2muR_PDF4LHC15_NLO_30, description: LHE3Weight_2muR_PDF4LHC15_NLO_30, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_0p5muR_PDF4LHC15_NLO_30, description: LHE3Weight_0p5muR_PDF4LHC15_NLO_30, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_0p5muF_0p5muR_PDF4LHC15_NLO_30, description: LHE3Weight_0p5muF_0p5muR_PDF4LHC15_NLO_30, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_2muF_2muR_PDF4LHC15_NLO_30, description: LHE3Weight_2muF_2muR_PDF4LHC15_NLO_30, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_0p5muF_2muR_PDF4LHC15_NLO_30, description: LHE3Weight_0p5muF_2muR_PDF4LHC15_NLO_30, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_2muF_0p5muR_PDF4LHC15_NLO_30, description: LHE3Weight_2muF_0p5muR_PDF4LHC15_NLO_30, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_2muF_NNPDF_NLO_0117, description: LHE3Weight_2muF_NNPDF_NLO_0117, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_0p5muF_NNPDF_NLO_0117, description: LHE3Weight_0p5muF_NNPDF_NLO_0117, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_2muR_NNPDF_NLO_0117, description: LHE3Weight_2muR_NNPDF_NLO_0117, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_0p5muR_NNPDF_0117, description: LHE3Weight_0p5muR_NNPDF_0117, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_0p5muF_0p5muR_NNPDF_NLO_0117, description: LHE3Weight_0p5muF_0p5muR_NNPDF_NLO_0117, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_2muF_2muR_NNPDF_NLO_0117, description: LHE3Weight_2muF_2muR_NNPDF_NLO_0117, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_0p5muF_2muR_NNPDF_NLO_0117, description: LHE3Weight_0p5muF_2muR_NNPDF_NLO_0117, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_2muF_0p5muR_NNPDF_NLO_0117, description: LHE3Weight_2muF_0p5muR_NNPDF_NLO_0117, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_2muF_NNPDF_NLO_0119, description: LHE3Weight_2muF_NNPDF_NLO_0119, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_0p5muF_NNPDF_NLO_0119, description: LHE3Weight_0p5muF_NNPDF_NLO_0119, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_2muR_NNPDF_NLO_0119, description: LHE3Weight_2muR_NNPDF_NLO_0119, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_0p5muR_NNPDF_NLO_0119, description: LHE3Weight_0p5muR_NNPDF_NLO_0119, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_0p5muF_0p5muR_NNPDF_NLO_0119, description: LHE3Weight_0p5muF_0p5muR_NNPDF_NLO_0119, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_2muF_2muR_NNPDF_NLO_0119, description: LHE3Weight_2muF_2muR_NNPDF_NLO_0119, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_0p5muF_2muR_NNPDF_NLO_0119, description: LHE3Weight_0p5muF_2muR_NNPDF_NLO_0119, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_2muF_0p5muR_NNPDF_NLO_0119, description: LHE3Weight_2muF_0p5muR_NNPDF_NLO_0119, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_2muF_NNPDF31_NLO_0118, description: LHE3Weight_2muF_NNPDF31_NLO_0118, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_0p5muF_NNPDF31_NLO_0118, description: LHE3Weight_0p5muF_NNPDF31_NLO_0118, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_2muR_NNPDF31_NLO_0118, description: LHE3Weight_2muR_NNPDF31_NLO_0118, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_0p5muR_NNPDF31_NLO_0118, description: LHE3Weight_0p5muR_NNPDF31_NLO_0118, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_0p5muF_0p5muR_NNPDF31_NLO_0118, description: LHE3Weight_0p5muF_0p5muR_NNPDF31_NLO_0118, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_2muF_2muR_NNPDF31_NLO_0118, description: LHE3Weight_2muF_2muR_NNPDF31_NLO_0118, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_0p5muF_2muR_NNPDF31_NLO_0118, description: LHE3Weight_0p5muF_2muR_NNPDF31_NLO_0118, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_2muF_0p5muR_NNPDF31_NLO_0118, description: LHE3Weight_2muF_0p5muR_NNPDF31_NLO_0118, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_Var3cUp, description: LHE3Weight_Var3cUp, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_Var3cDown, description: LHE3Weight_Var3cDown, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_isr:muRfac=20_fsr:muRfac=20, description: LHE3Weight_isr:muRfac=20_fsr:muRfac=20, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_isr:muRfac=20_fsr:muRfac=10, description: LHE3Weight_isr:muRfac=20_fsr:muRfac=10, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_isr:muRfac=20_fsr:muRfac=05, description: LHE3Weight_isr:muRfac=20_fsr:muRfac=05, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_isr:muRfac=10_fsr:muRfac=20, description: LHE3Weight_isr:muRfac=10_fsr:muRfac=20, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_isr:muRfac=10_fsr:muRfac=05, description: LHE3Weight_isr:muRfac=10_fsr:muRfac=05, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_isr:muRfac=05_fsr:muRfac=20, description: LHE3Weight_isr:muRfac=05_fsr:muRfac=20, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_isr:muRfac=05_fsr:muRfac=10, description: LHE3Weight_isr:muRfac=05_fsr:muRfac=10, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_isr:muRfac=05_fsr:muRfac=05, description: LHE3Weight_isr:muRfac=05_fsr:muRfac=05, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_isr:muRfac=175_fsr:muRfac=10, description: LHE3Weight_isr:muRfac=175_fsr:muRfac=10, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_isr:muRfac=15_fsr:muRfac=10, description: LHE3Weight_isr:muRfac=15_fsr:muRfac=10, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_isr:muRfac=125_fsr:muRfac=10, description: LHE3Weight_isr:muRfac=125_fsr:muRfac=10, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_isr:muRfac=0625_fsr:muRfac=10, description: LHE3Weight_isr:muRfac=0625_fsr:muRfac=10, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_isr:muRfac=075_fsr:muRfac=10, description: LHE3Weight_isr:muRfac=075_fsr:muRfac=10, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_isr:muRfac=0875_fsr:muRfac=10, description: LHE3Weight_isr:muRfac=0875_fsr:muRfac=10, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_isr:muRfac=10_fsr:muRfac=175, description: LHE3Weight_isr:muRfac=10_fsr:muRfac=175, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_isr:muRfac=10_fsr:muRfac=15, description: LHE3Weight_isr:muRfac=10_fsr:muRfac=15, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_isr:muRfac=10_fsr:muRfac=125, description: LHE3Weight_isr:muRfac=10_fsr:muRfac=125, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_isr:muRfac=10_fsr:muRfac=0625, description: LHE3Weight_isr:muRfac=10_fsr:muRfac=0625, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_isr:muRfac=10_fsr:muRfac=075, description: LHE3Weight_isr:muRfac=10_fsr:muRfac=075, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_isr:muRfac=10_fsr:muRfac=0875, description: LHE3Weight_isr:muRfac=10_fsr:muRfac=0875, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_hardHi, description: LHE3Weight_hardHi, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
+Package.SUSYToolsTester INFO == cbkname: LHE3Weight_hardLo, description: LHE3Weight_hardLo, stream: StreamAOD
+Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: AllStreams
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
Package.SUSYToolsTester INFO == cbkname: PHYSKernel, description: N/A, stream: StreamAOD
Package.SUSYToolsTester INFO inputStream: StreamAOD, outputStreams: StreamDAOD_PHYS
-Package.SUSYToolsTester INFO cycle: 4, allEvents = 1000
+Package.SUSYToolsTester INFO cycle: 2, allEvents = 2000
Package.SUSYToolsTester INFO No relevent CutBookKeepers found
Package.SUSYToolsTester INFO Found kernel: PHYS
Package.SUSYToolsTester INFO Found stream: StreamAOD
-Package.SUSYToolsTester INFO ===>>> start processing event #, 96429run #310000 0 events processed so far <<<===
+Package.SUSYToolsTester INFO ===>>> start processing event #, 110031run #310000 0 events processed so far <<<===
Package.SUSYToolsTester INFO ===>>> process cross section 452.311
SUSYObjDef_xAOD WARNING TruthBSM is empty. Skipping FindSusyHP.
Package.SUSYToolsTester INFO Xsec (high order) 452.311
Package.SUSYToolsTester INFO kfactor (high order) 1.13976
Package.SUSYToolsTester INFO filter efficiency 0.5438
-ToolSvc.TrigDecisionTool INFO decision not set on first (?) assert. deciding how to unpack
-ToolSvc.TrigDecisionTool INFO SG contains xAOD decision, use DecisionUnpackerStandalone
-Info in <SUSYToolsTester>: ===>>> done processing event #96429, run #310000 1 events processed so far <<<===
+Info in <SUSYToolsTester>: ===>>> done processing event #110031, run #310000 1 events processed so far <<<===
SUSYObjDef_xAOD WARNING TruthBSM is empty. Skipping FindSusyHP.
Package.SUSYToolsTester INFO Xsec (high order) 452.311
Package.SUSYToolsTester INFO kfactor (high order) 1.13976
@@ -1228,6 +1877,9 @@ SUSYObjDef_xAOD WARNING TruthBSM is empty. Skipping FindSusyHP.
Package.SUSYToolsTester INFO Xsec (high order) 452.311
Package.SUSYToolsTester INFO kfactor (high order) 1.13976
Package.SUSYToolsTester INFO filter efficiency 0.5438
+ToolSvc.TrigDecisionTool INFO decision not set on first (?) assert. deciding how to unpack
+ToolSvc.TrigDecisionTool INFO SG contains xAOD decision, use DecisionUnpackerStandalone
+ToolSvc.TopTagger WARNING One (or more) tagger input variable has an out-of-range value, setting score to -666
ToolSvc.TopTagger WARNING One (or more) tagger input variable has an out-of-range value, setting score to -666
ToolSvc.TopTagger WARNING One (or more) tagger input variable has an out-of-range value, setting score to -666
ToolSvc.TopTagger WARNING One (or more) tagger input variable has an out-of-range value, setting score to -666
@@ -1235,3522 +1887,3521 @@ ToolSvc.TopTagger WARNING One (or more) tagger input variable has an out-
ToolSvc.TopTagger WARNING One (or more) tagger input variable has an out-of-range value, setting score to -666
ToolSvc.TopTagger WARNING One (or more) tagger input variable has an out-of-range value, setting score to -666
ToolSvc.TopTagger WARNING One (or more) tagger input variable has an out-of-range value, setting score to -666
-Package.SUSYToolsTester INFO ===>>> start processing event #, 96574run #310000 99 events processed so far <<<===
-Info in <SUSYToolsTester>: ===>>> done processing event #96574, run #310000 100 events processed so far <<<===
+Package.SUSYToolsTester INFO ===>>> start processing event #, 110613run #310000 99 events processed so far <<<===
+Info in <SUSYToolsTester>: ===>>> done processing event #110613, run #310000 100 events processed so far <<<===
Info in <SUSYToolsTester>: Time per event: (CPU / WALL)
- Entire loop - 978.300000 / 981.135390 ms
- First event - 1460.000000 / 1503.227949 ms
- Excluding first event - 973.434343 / 975.861687 ms
+ Entire loop - 581.800000 / 582.167902 ms
+ First event - 720.000000 / 720.604897 ms
+ Excluding first event - 580.404040 / 580.769536 ms
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation EG_RESOLUTION_ALL__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation EG_RESOLUTION_ALL__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation EG_SCALE_AF2__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation EG_SCALE_AF2__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation EG_SCALE_ALL__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation EG_SCALE_ALL__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation EL_EFF_ChargeIDSel_TOTAL_1NPCOR_PLUS_UNCOR__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation EL_EFF_ChargeIDSel_TOTAL_1NPCOR_PLUS_UNCOR__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation EL_EFF_ID_TOTAL_1NPCOR_PLUS_UNCOR__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation EL_EFF_ID_TOTAL_1NPCOR_PLUS_UNCOR__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation EL_EFF_Iso_TOTAL_1NPCOR_PLUS_UNCOR__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation EL_EFF_Iso_TOTAL_1NPCOR_PLUS_UNCOR__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation EL_EFF_Reco_TOTAL_1NPCOR_PLUS_UNCOR__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation EL_EFF_Reco_TOTAL_1NPCOR_PLUS_UNCOR__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation EL_EFF_TriggerEff_TOTAL_1NPCOR_PLUS_UNCOR__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation EL_EFF_TriggerEff_TOTAL_1NPCOR_PLUS_UNCOR__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation EL_EFF_Trigger_TOTAL_1NPCOR_PLUS_UNCOR__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation EL_EFF_Trigger_TOTAL_1NPCOR_PLUS_UNCOR__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation FT_EFF_B_systematics__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation FT_EFF_B_systematics__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation FT_EFF_C_systematics__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation FT_EFF_C_systematics__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation FT_EFF_Light_systematics__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation FT_EFF_Light_systematics__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation FT_EFF_extrapolation__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation FT_EFF_extrapolation__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation FT_EFF_extrapolation_from_charm__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation FT_EFF_extrapolation_from_charm__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_BJES_Response__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_BJES_Response__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_CombMass_Baseline__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_CombMass_Baseline__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_CombMass_Modelling__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_CombMass_Modelling__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_CombMass_TotalStat__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_CombMass_TotalStat__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_CombMass_Tracking1__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_CombMass_Tracking1__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_CombMass_Tracking2__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_CombMass_Tracking2__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_CombMass_Tracking3__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_CombMass_Tracking3__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Detector1__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Detector1__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Detector2__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Detector2__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Mixed1__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Mixed1__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Mixed2__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Mixed2__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Mixed3__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Mixed3__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Modelling1__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 10, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Modelling1__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 2, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Modelling2__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Modelling2__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Modelling3__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Modelling3__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Modelling4__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Modelling4__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_R10_1__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_R10_1__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_R10_2__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_R10_2__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_R10_3__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_R10_3__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_R10_4__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_R10_4__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_R10_5__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_R10_5__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_R10_6restTerm__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_R10_6restTerm__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_R10_Mixed1__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_R10_Mixed1__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_R10_Modelling1__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_R10_Modelling1__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Statistical1__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Statistical1__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Statistical2__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Statistical2__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Statistical3__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Statistical3__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Statistical4__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Statistical4__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Statistical5__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Statistical5__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Statistical6__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EffectiveNP_Statistical6__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EtaIntercalibration_Modelling__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 10, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EtaIntercalibration_Modelling__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EtaIntercalibration_NonClosure_2018data__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EtaIntercalibration_NonClosure_2018data__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EtaIntercalibration_NonClosure_highE__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EtaIntercalibration_NonClosure_highE__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EtaIntercalibration_NonClosure_negEta__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EtaIntercalibration_NonClosure_negEta__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EtaIntercalibration_NonClosure_posEta__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EtaIntercalibration_NonClosure_posEta__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EtaIntercalibration_R10_TotalStat__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EtaIntercalibration_R10_TotalStat__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EtaIntercalibration_TotalStat__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_EtaIntercalibration_TotalStat__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_Flavor_Composition__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 10, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_Flavor_Composition__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 14
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 2, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_Flavor_Response__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 14
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 2, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_Flavor_Response__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 10, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JER_DataVsMC_MC16__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JER_DataVsMC_MC16__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JER_EffectiveNP_1__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JER_EffectiveNP_1__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JER_EffectiveNP_2__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JER_EffectiveNP_2__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JER_EffectiveNP_3__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JER_EffectiveNP_3__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JER_EffectiveNP_4__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JER_EffectiveNP_4__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JER_EffectiveNP_5__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JER_EffectiveNP_5__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JER_EffectiveNP_6__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JER_EffectiveNP_6__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JER_EffectiveNP_7restTerm__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JER_EffectiveNP_7restTerm__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JetTagSF_Dijet_Modelling__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JetTagSF_Dijet_Modelling__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JetTagSF_Gammajet_Modelling__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JetTagSF_Gammajet_Modelling__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JetTagSF_Hadronisation__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JetTagSF_Hadronisation__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JetTagSF_MatrixElement__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JetTagSF_MatrixElement__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JetTagSF_Radiation__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JetTagSF_Radiation__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JvtEfficiency__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_JvtEfficiency__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_LargeR_TopologyUncertainty_V__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_LargeR_TopologyUncertainty_V__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_LargeR_TopologyUncertainty_top__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_LargeR_TopologyUncertainty_top__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_MassRes_Hbb_comb__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_MassRes_Hbb_comb__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_MassRes_Top_comb__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_MassRes_Top_comb__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_MassRes_WZ_comb__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_MassRes_WZ_comb__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_Pileup_OffsetMu__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 10, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_Pileup_OffsetMu__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 2, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_Pileup_OffsetNPV__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 10, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_Pileup_OffsetNPV__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 2, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_Pileup_PtTerm__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 10, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_Pileup_PtTerm__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_Pileup_RhoTopology__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 10, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_Pileup_RhoTopology__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 14
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 2, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_PunchThrough_MC16__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_PunchThrough_MC16__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_SingleParticle_HighPt__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_SingleParticle_HighPt__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_TopTagInclusive_SigEff80_BGSF_Dijet_Stat__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_TopTagInclusive_SigEff80_BGSF_Dijet_Stat__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_TopTagInclusive_SigEff80_BGSF_Gammajet_Stat__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_TopTagInclusive_SigEff80_BGSF_Gammajet_Stat__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_TopTagInclusive_SigEff80_BGSF_Propagated_AllOthers__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_TopTagInclusive_SigEff80_BGSF_Propagated_AllOthers__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_TopTagInclusive_SigEff80_SigSF_BinVariation__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_TopTagInclusive_SigEff80_SigSF_BinVariation__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_TopTagInclusive_SigEff80_SigSF_ExtrapolationPt__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_TopTagInclusive_SigEff80_SigSF_ExtrapolationPt__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_TopTagInclusive_SigEff80_SigSF_Propagated_AllOthers__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_TopTagInclusive_SigEff80_SigSF_Propagated_AllOthers__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_TopTagInclusive_SigEff80_SigSF_Statistics__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_TopTagInclusive_SigEff80_SigSF_Statistics__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_TopTagInclusive_SigEff80_TagEffUnc_GlobalBackground__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_TopTagInclusive_SigEff80_TagEffUnc_GlobalBackground__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_TopTagInclusive_SigEff80_TagEffUnc_GlobalOther__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_TopTagInclusive_SigEff80_TagEffUnc_GlobalOther__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_TopTagInclusive_SigEff80_TagEffUnc_GlobalSignal__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_TopTagInclusive_SigEff80_TagEffUnc_GlobalSignal__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_WTag_SigEff50_BGSF_Dijet_Stat__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_WTag_SigEff50_BGSF_Dijet_Stat__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_WTag_SigEff50_BGSF_Gammajet_Stat__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_WTag_SigEff50_BGSF_Gammajet_Stat__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_WTag_SigEff50_BGSF_Propagated_AllOthers__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_WTag_SigEff50_BGSF_Propagated_AllOthers__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_WTag_SigEff50_SigSF_BinVariation__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_WTag_SigEff50_SigSF_BinVariation__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_WTag_SigEff50_SigSF_ExtrapolationPt__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_WTag_SigEff50_SigSF_ExtrapolationPt__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_WTag_SigEff50_SigSF_ExtrapolationZ__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_WTag_SigEff50_SigSF_ExtrapolationZ__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_WTag_SigEff50_SigSF_Propagated_AllOthers__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_WTag_SigEff50_SigSF_Propagated_AllOthers__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_WTag_SigEff50_SigSF_Statistics__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_WTag_SigEff50_SigSF_Statistics__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_WTag_SigEff50_TagEffUnc_GlobalBackground__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_WTag_SigEff50_TagEffUnc_GlobalBackground__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_WTag_SigEff50_TagEffUnc_GlobalOther__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_WTag_SigEff50_TagEffUnc_GlobalOther__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_WTag_SigEff50_TagEffUnc_GlobalSignal__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_WTag_SigEff50_TagEffUnc_GlobalSignal__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_fJvtEfficiency__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation JET_fJvtEfficiency__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MET_SoftTrk_ResoPara <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MET_SoftTrk_ResoPerp <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MET_SoftTrk_ScaleDown <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MET_SoftTrk_ScaleUp <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_EFF_BADMUON_SYS__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_EFF_BADMUON_SYS__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_EFF_ISO_STAT__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_EFF_ISO_STAT__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_EFF_ISO_SYS__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_EFF_ISO_SYS__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_EFF_RECO_STAT__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_EFF_RECO_STAT__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_EFF_RECO_STAT_LOWPT__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_EFF_RECO_STAT_LOWPT__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_EFF_RECO_SYS__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_EFF_RECO_SYS__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_EFF_RECO_SYS_LOWPT__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_EFF_RECO_SYS_LOWPT__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_EFF_TTVA_STAT__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_EFF_TTVA_STAT__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_EFF_TTVA_SYS__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_EFF_TTVA_SYS__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_EFF_TrigStatUncertainty__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_EFF_TrigStatUncertainty__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_EFF_TrigSystUncertainty__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_EFF_TrigSystUncertainty__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_ID__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_ID__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 99, mu: 99
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_MS__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_MS__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_SAGITTA_RESBIAS__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_SAGITTA_RESBIAS__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_SAGITTA_RHO__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_SAGITTA_RHO__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_SCALE__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation MUON_SCALE__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation PH_EFF_TRIGGER_Uncertainty__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation PH_EFF_TRIGGER_Uncertainty__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation PRW_DATASF__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation PRW_DATASF__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_RECO_TOTAL__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_RECO_TOTAL__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_RNNID_1PRONGSTATSYSTPT2025__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_RNNID_1PRONGSTATSYSTPT2025__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_RNNID_1PRONGSTATSYSTPT2530__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_RNNID_1PRONGSTATSYSTPT2530__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_RNNID_1PRONGSTATSYSTPT3040__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_RNNID_1PRONGSTATSYSTPT3040__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_RNNID_1PRONGSTATSYSTPTGE40__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_RNNID_1PRONGSTATSYSTPTGE40__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_RNNID_3PRONGSTATSYSTPT2025__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_RNNID_3PRONGSTATSYSTPT2025__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_RNNID_3PRONGSTATSYSTPT2530__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_RNNID_3PRONGSTATSYSTPT2530__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_RNNID_3PRONGSTATSYSTPT3040__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_RNNID_3PRONGSTATSYSTPT3040__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_RNNID_3PRONGSTATSYSTPTGE40__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_RNNID_3PRONGSTATSYSTPTGE40__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_RNNID_HIGHPT__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_RNNID_HIGHPT__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_RNNID_SYST__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_RNNID_SYST__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_STATDATA161718__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_STATDATA161718__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_STATDATA1718__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_STATDATA1718__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_STATDATA2016__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_STATDATA2016__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_STATDATA2018__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_STATDATA2018__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_STATDATA2018AFTTS1__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_STATDATA2018AFTTS1__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_STATMC161718__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_STATMC161718__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_STATMC1718__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_STATMC1718__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_STATMC2016__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_STATMC2016__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_STATMC2018__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_STATMC2018__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_STATMC2018AFTTS1__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_STATMC2018AFTTS1__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_SYST161718__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_SYST161718__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_SYST1718__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_SYST1718__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_SYST2016__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_SYST2016__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_SYST2018__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_SYST2018__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_SYST2018AFTTS1__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_SYST2018AFTTS1__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_SYSTMU161718__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_SYSTMU161718__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_SYSTMU1718__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_SYSTMU1718__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_SYSTMU2016__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_SYSTMU2016__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_SYSTMU2018__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_SYSTMU2018__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_SYSTMU2018AFTTS1__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_EFF_TRIGGER_SYSTMU2018AFTTS1__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_SME_TES_DETECTOR__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_SME_TES_DETECTOR__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_SME_TES_INSITUEXP__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_SME_TES_INSITUEXP__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_SME_TES_INSITUFIT__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_SME_TES_INSITUFIT__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_SME_TES_MODEL_CLOSURE__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_SME_TES_MODEL_CLOSURE__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_SME_TES_PHYSICSLIST__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation TAUS_TRUEHADTAU_SME_TES_PHYSICSLIST__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation bTag_B_0__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation bTag_B_0__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation bTag_Light_0__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation bTag_Light_0__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation bTag_Light_1__1up <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
Package.SUSYToolsTester INFO -- Dummy Cutflow -- >>>> Variation bTag_Light_1__1down <<<<
Package.SUSYToolsTester INFO Cut 0(All)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 1(GRL+Cleaning)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 2(TileTrip)-> el: 100, mu: 100
Package.SUSYToolsTester INFO Cut 3(Trigger)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 100, mu: 100
-Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 19, mu: 27
-Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 14, mu: 27
-Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 13, mu: 27
-Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 12, mu: 20
-Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 9, mu: 15
+Package.SUSYToolsTester INFO Cut 4(Cosmic veto)-> el: 98, mu: 98
+Package.SUSYToolsTester INFO Cut 5(==1 baseline lepton)-> el: 13, mu: 32
+Package.SUSYToolsTester INFO Cut 6(==1 signal lepton)-> el: 12, mu: 29
+Package.SUSYToolsTester INFO Cut 7(lepton pT>20 GeV)-> el: 11, mu: 24
+Package.SUSYToolsTester INFO Cut 8(trig. matched lepton)-> el: 10, mu: 18
+Package.SUSYToolsTester INFO Cut 9(Njet(pT>50 GeV)>=2)-> el: 3, mu: 13
ToolSvc.TrigDecisionTool INFO TDT finalized and removed from instance list
CalibrationDataInterfaceROOT object out-of-bounds summary:
No issues found
-Package.UserCode INFO Finished (return code was 0)
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/src/SUSYToolsAlg.cxx b/PhysicsAnalysis/SUSYPhys/SUSYTools/src/SUSYToolsAlg.cxx
index 84543b10ffbb..404a1be3c658 100644
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/src/SUSYToolsAlg.cxx
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/src/SUSYToolsAlg.cxx
@@ -1421,10 +1421,10 @@ void SUSYToolsAlg::stdHistsForObj(xAOD::IParticle *obj, std::string objtype, std
hist(dir+objtype+"_"+objlevel+"_z0")->Fill( obj->auxdata<float>("z0sinTheta") );
if (objtype=="el") {
hist(dir+objtype+"_"+objlevel+"_isolCalo")->Fill( obj->auxdata<float>("topoetcone20")/obj->pt() );
- hist(dir+objtype+"_"+objlevel+"_isolTrack")->Fill( obj->auxdata<float>("ptvarcone20_TightTTVALooseCone_pt1000")/obj->pt() );
+ hist(dir+objtype+"_"+objlevel+"_isolTrack")->Fill( obj->auxdata<float>("ptvarcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt1000")/obj->pt() );
} else if (objtype=="mu") {
hist(dir+objtype+"_"+objlevel+"_isolCalo")->Fill( obj->auxdata<float>("topoetcone20")/obj->pt() );
- hist(dir+objtype+"_"+objlevel+"_isolTrack")->Fill( obj->auxdata<float>("ptvarcone30_TightTTVA_pt1000")/obj->pt() );
+ hist(dir+objtype+"_"+objlevel+"_isolTrack")->Fill( obj->auxdata<float>("ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000")/obj->pt() );
} else if (objtype=="ph") {
hist(dir+objtype+"_"+objlevel+"_isolCalo")->Fill( (obj->auxdata<float>("topoetcone40")-2450)/obj->pt() );
hist(dir+objtype+"_"+objlevel+"_isolTrack")->Fill( obj->auxdata<float>("ptcone20")/obj->pt() );
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/Root/EventSaverFlatNtuple.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/Root/EventSaverFlatNtuple.cxx
index 44d716a65d14..95b3dc455027 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/Root/EventSaverFlatNtuple.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/Root/EventSaverFlatNtuple.cxx
@@ -776,7 +776,7 @@ namespace top {
systematicTree->makeOutputVariable(m_PLIV_mu_PromptLeptonImprovedInput_topoetcone30rel, "PLIV_mu_PromptLeptonImprovedInput_topoetcone30rel");
systematicTree->makeOutputVariable(m_PLIV_mu_PromptLeptonImprovedInput_PtFrac, "PLIV_mu_PromptLeptonImprovedInput_PtFrac");
systematicTree->makeOutputVariable(m_PLIV_mu_PromptLeptonImprovedInput_DRlj, "PLIV_mu_PromptLeptonImprovedInput_DRlj");
- systematicTree->makeOutputVariable(m_PLIV_mu_PromptLeptonImprovedInput_ptvarcone30_TightTTVA_pt500rel, "PLIV_mu_PromptLeptonImprovedInput_ptvarcone30_TightTTVA_pt500rel");
+ systematicTree->makeOutputVariable(m_PLIV_mu_PromptLeptonImprovedInput_ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500rel, "PLIV_mu_PromptLeptonImprovedInput_ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500rel");
systematicTree->makeOutputVariable(m_PLIV_mu_PromptLeptonImprovedInput_CaloClusterERel, "PLIV_mu_PromptLeptonImprovedInput_CaloClusterERel");
systematicTree->makeOutputVariable(m_PLIV_mu_PromptLeptonImprovedInput_CandVertex_normDistToPriVtxLongitudinalBest, "PLIV_mu_PromptLeptonImprovedInput_CandVertex_normDistToPriVtxLongitudinalBest");
systematicTree->makeOutputVariable(m_PLIV_mu_PromptLeptonImprovedVeto, "PLIV_mu_PromptLeptonImprovedVeto");
@@ -2280,7 +2280,7 @@ namespace top {
m_PLIV_mu_PromptLeptonImprovedInput_topoetcone30rel.resize(n_muons);
m_PLIV_mu_PromptLeptonImprovedInput_PtFrac.resize(n_muons);
m_PLIV_mu_PromptLeptonImprovedInput_DRlj.resize(n_muons);
- m_PLIV_mu_PromptLeptonImprovedInput_ptvarcone30_TightTTVA_pt500rel.resize(n_muons);
+ m_PLIV_mu_PromptLeptonImprovedInput_ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500rel.resize(n_muons);
m_PLIV_mu_PromptLeptonImprovedInput_CaloClusterERel.resize(n_muons);
m_PLIV_mu_PromptLeptonImprovedInput_CandVertex_normDistToPriVtxLongitudinalBest.resize(n_muons);
m_PLIV_mu_PromptLeptonImprovedVeto.resize(n_muons);
@@ -2293,7 +2293,7 @@ namespace top {
static const SG::AuxElement::Accessor<float> PLIV_mu_PromptLeptonImprovedInput_topoetcone30rel("PromptLeptonImprovedInput_topoetcone30rel");
static const SG::AuxElement::Accessor<float> PLIV_mu_PromptLeptonImprovedInput_PtFrac("PromptLeptonImprovedInput_PtFrac");
static const SG::AuxElement::Accessor<float> PLIV_mu_PromptLeptonImprovedInput_DRlj("PromptLeptonImprovedInput_DRlj");
- static const SG::AuxElement::Accessor<float> PLIV_mu_PromptLeptonImprovedInput_ptvarcone30_TightTTVA_pt500rel("PromptLeptonImprovedInput_ptvarcone30_TightTTVA_pt500rel");
+ static const SG::AuxElement::Accessor<float> PLIV_mu_PromptLeptonImprovedInput_ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500rel("PromptLeptonImprovedInput_ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500rel");
static const SG::AuxElement::Accessor<float> PLIV_mu_PromptLeptonImprovedInput_CaloClusterERel("PromptLeptonImprovedInput_CaloClusterERel");
static const SG::AuxElement::Accessor<float> PLIV_mu_PromptLeptonImprovedInput_CandVertex_normDistToPriVtxLongitudinalBest("PromptLeptonImprovedInput_CandVertex_normDistToPriVtxLongitudinalBest");
static const SG::AuxElement::Accessor<float> PLIV_mu_PromptLeptonImprovedVeto("PromptLeptonImprovedVeto");
@@ -2326,7 +2326,7 @@ namespace top {
m_PLIV_mu_PromptLeptonImprovedInput_topoetcone30rel[i] = PLIV_mu_PromptLeptonImprovedInput_topoetcone30rel.isAvailable(*muPtr) ? PLIV_mu_PromptLeptonImprovedInput_topoetcone30rel(*muPtr) : -999.;
m_PLIV_mu_PromptLeptonImprovedInput_PtFrac[i] = PLIV_mu_PromptLeptonImprovedInput_PtFrac.isAvailable(*muPtr) ? PLIV_mu_PromptLeptonImprovedInput_PtFrac(*muPtr) : -999.;
m_PLIV_mu_PromptLeptonImprovedInput_DRlj[i] = PLIV_mu_PromptLeptonImprovedInput_DRlj.isAvailable(*muPtr) ? PLIV_mu_PromptLeptonImprovedInput_DRlj(*muPtr) : -999.;
- m_PLIV_mu_PromptLeptonImprovedInput_ptvarcone30_TightTTVA_pt500rel[i] = PLIV_mu_PromptLeptonImprovedInput_ptvarcone30_TightTTVA_pt500rel.isAvailable(*muPtr) ? PLIV_mu_PromptLeptonImprovedInput_ptvarcone30_TightTTVA_pt500rel(*muPtr) : -999.;
+ m_PLIV_mu_PromptLeptonImprovedInput_ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500rel[i] = PLIV_mu_PromptLeptonImprovedInput_ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500rel.isAvailable(*muPtr) ? PLIV_mu_PromptLeptonImprovedInput_ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500rel(*muPtr) : -999.;
m_PLIV_mu_PromptLeptonImprovedInput_CaloClusterERel[i] = PLIV_mu_PromptLeptonImprovedInput_CaloClusterERel.isAvailable(*muPtr) ? PLIV_mu_PromptLeptonImprovedInput_CaloClusterERel(*muPtr) : -999.;
m_PLIV_mu_PromptLeptonImprovedInput_CandVertex_normDistToPriVtxLongitudinalBest[i] = PLIV_mu_PromptLeptonImprovedInput_CandVertex_normDistToPriVtxLongitudinalBest.isAvailable(*muPtr) ? PLIV_mu_PromptLeptonImprovedInput_CandVertex_normDistToPriVtxLongitudinalBest(*muPtr) : -999.;
m_PLIV_mu_PromptLeptonImprovedVeto[i] = PLIV_mu_PromptLeptonImprovedVeto.isAvailable(*muPtr) ? PLIV_mu_PromptLeptonImprovedVeto(*muPtr) : -999.;
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/TopAnalysis/EventSaverFlatNtuple.h b/PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/TopAnalysis/EventSaverFlatNtuple.h
index 24a696575ed9..291cbac5636f 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/TopAnalysis/EventSaverFlatNtuple.h
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/TopAnalysis/EventSaverFlatNtuple.h
@@ -556,7 +556,7 @@ namespace top {
std::vector<float> m_PLIV_mu_PromptLeptonImprovedInput_topoetcone30rel;
std::vector<float> m_PLIV_mu_PromptLeptonImprovedInput_PtFrac;
std::vector<float> m_PLIV_mu_PromptLeptonImprovedInput_DRlj;
- std::vector<float> m_PLIV_mu_PromptLeptonImprovedInput_ptvarcone30_TightTTVA_pt500rel;
+ std::vector<float> m_PLIV_mu_PromptLeptonImprovedInput_ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500rel;
std::vector<float> m_PLIV_mu_PromptLeptonImprovedInput_CaloClusterERel;
std::vector<float> m_PLIV_mu_PromptLeptonImprovedInput_CandVertex_normDistToPriVtxLongitudinalBest;
std::vector<float> m_PLIV_mu_PromptLeptonImprovedVeto;
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/EgammaObjectCollectionMaker.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/EgammaObjectCollectionMaker.cxx
index dba7ac6cdcf6..a307d33ba87a 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/EgammaObjectCollectionMaker.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/EgammaObjectCollectionMaker.cxx
@@ -231,7 +231,7 @@ namespace top {
}
}
///-- Isolation selection --///
- static const SG::AuxElement::ConstAccessor<float> ptcone20_TightTTVA_pt1000("ptcone20_TightTTVA_pt1000");
+ static const SG::AuxElement::ConstAccessor<float> ptcone20_Nonprompt_All_MaxWeightTTVA_pt1000("ptcone20_Nonprompt_All_MaxWeightTTVA_pt1000");
char passIsol_FixedCutTight(0);
char passIsol_FixedCutTightCaloOnly(0);
char passIsol_FixedCutLoose(0);
@@ -250,7 +250,7 @@ namespace top {
if (m_isolationTool_TightCaloOnly->accept(*photon)) {
passIsol_TightCaloOnly = 1;
}
- if (ptcone20_TightTTVA_pt1000.isAvailable(*photon)) {
+ if (ptcone20_Nonprompt_All_MaxWeightTTVA_pt1000.isAvailable(*photon)) {
if (m_isolationTool_Tight->accept(*photon)) {
passIsol_Tight = 1;
}
@@ -285,10 +285,10 @@ namespace top {
}
StatusCode EgammaObjectCollectionMaker::executeElectrons(bool executeNominal) {
- static const SG::AuxElement::ConstAccessor<float> ptcone20_TightTTVALooseCone_pt1000("ptcone20_TightTTVALooseCone_pt1000");
- static const SG::AuxElement::ConstAccessor<float> ptvarcone20_TightTTVA_pt1000("ptvarcone20_TightTTVA_pt1000");
- static const SG::AuxElement::ConstAccessor<float> ptvarcone30_TightTTVALooseCone_pt1000("ptvarcone30_TightTTVALooseCone_pt1000");
- static const SG::AuxElement::ConstAccessor<float> ptvarcone30_TightTTVALooseCone_pt500("ptvarcone30_TightTTVALooseCone_pt500");
+ static const SG::AuxElement::ConstAccessor<float> ptcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt1000("ptcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt1000");
+ static const SG::AuxElement::ConstAccessor<float> ptvarcone20_Nonprompt_All_MaxWeightTTVA_pt1000("ptvarcone20_Nonprompt_All_MaxWeightTTVA_pt1000");
+ static const SG::AuxElement::ConstAccessor<float> ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt1000("ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt1000");
+ static const SG::AuxElement::ConstAccessor<float> ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt500("ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt500");
static const SG::AuxElement::ConstAccessor<float> neflowisol20("neflowisol20");
static const SG::AuxElement::ConstAccessor<short> PLV_TrackJetNTrack("PromptLeptonInput_TrackJetNTrack");
static const SG::AuxElement::ConstAccessor<float> PLV_DRlj("PromptLeptonInput_DRlj");
@@ -372,19 +372,23 @@ namespace top {
electron->auxdecor<char>("AnalysisTop_Isol_Gradient") = passIsol_Gradient;
electron->auxdecor<char>("AnalysisTop_Isol_FCHighPtCaloOnly") = passIsol_FCHighPtCaloOnly;
electron->auxdecor<char>("AnalysisTop_Isol_HighPtCaloOnly") = passIsol_HighPtCaloOnly;
- if (ptvarcone20_TightTTVA_pt1000.isAvailable(*electron)) {
+ if (ptvarcone20_Nonprompt_All_MaxWeightTTVA_pt1000.isAvailable(*electron)) {
AnalysisTop_Isol_FCTight(*electron) = (m_isolationTool_FCTight->accept(*electron) ? 1 : 0);
AnalysisTop_Isol_FCLoose(*electron) = (m_isolationTool_FCLoose->accept(*electron) ? 1 : 0);
}
- if (ptvarcone30_TightTTVALooseCone_pt1000.isAvailable(*electron)) {
+ else {
+ AnalysisTop_Isol_FCTight(*electron) = 0;
+ AnalysisTop_Isol_FCLoose(*electron) = 0;
+ }
+ if (ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt1000.isAvailable(*electron)) {
AnalysisTop_Isol_Tight(*electron) = (m_isolationTool_Tight->accept(*electron) ? 1 : 0);
AnalysisTop_Isol_Loose(*electron) = (m_isolationTool_Loose->accept(*electron) ? 1 : 0);
AnalysisTop_Isol_TightTrackOnly(*electron) = (m_isolationTool_TightTrackOnly->accept(*electron) ? 1 : 0);
- if (ptcone20_TightTTVALooseCone_pt1000.isAvailable(*electron)) {
+ if (ptcone20_Nonprompt_All_MaxWeightTTVALooseCone_pt1000.isAvailable(*electron)) {
AnalysisTop_Isol_TightTrackOnly_FixedRad(*electron) = (m_isolationTool_TightTrackOnly_FixedRad->accept(*electron) ? 1 : 0);
}
}
- if (ptvarcone30_TightTTVALooseCone_pt500.isAvailable(*electron) && neflowisol20.isAvailable(*electron)) {
+ if (ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt500.isAvailable(*electron) && neflowisol20.isAvailable(*electron)) {
AnalysisTop_Isol_PflowTight(*electron) = (m_isolationTool_PflowTight->accept(*electron) ? 1 : 0);
AnalysisTop_Isol_PflowLoose(*electron) = (m_isolationTool_PflowLoose->accept(*electron) ? 1 : 0);
}
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/MuonObjectCollectionMaker.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/MuonObjectCollectionMaker.cxx
index 98886907b35b..ce9e7e2c2ecb 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/MuonObjectCollectionMaker.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/MuonObjectCollectionMaker.cxx
@@ -135,13 +135,13 @@ namespace top {
StatusCode MuonObjectCollectionMaker::execute(bool executeNominal) {
static const SG::AuxElement::ConstAccessor<float> topoetcone20("topoetcone20");
- static const SG::AuxElement::ConstAccessor<float> ptvarcone30_TightTTVA_pt1000("ptvarcone30_TightTTVA_pt1000");
- static const SG::AuxElement::ConstAccessor<float> ptvarcone20_TightTTVA_pt500("ptvarcone20_TightTTVA_pt500");
- static const SG::AuxElement::ConstAccessor<float> ptcone20_TightTTVA_pt1000("ptcone20_TightTTVA_pt1000");
- static const SG::AuxElement::ConstAccessor<float> ptcone20_TightTTVA_pt500("ptcone20_TightTTVA_pt500");
- static const SG::AuxElement::ConstAccessor<float> ptvarcone30_TightTTVA_pt500("ptvarcone30_TightTTVA_pt500");
+ static const SG::AuxElement::ConstAccessor<float> ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000("ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000");
+ static const SG::AuxElement::ConstAccessor<float> ptvarcone20_Nonprompt_All_MaxWeightTTVA_pt500("ptvarcone20_Nonprompt_All_MaxWeightTTVA_pt500");
+ static const SG::AuxElement::ConstAccessor<float> ptcone20_Nonprompt_All_MaxWeightTTVA_pt1000("ptcone20_Nonprompt_All_MaxWeightTTVA_pt1000");
+ static const SG::AuxElement::ConstAccessor<float> ptcone20_Nonprompt_All_MaxWeightTTVA_pt500("ptcone20_Nonprompt_All_MaxWeightTTVA_pt500");
+ static const SG::AuxElement::ConstAccessor<float> ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500("ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500");
static const SG::AuxElement::ConstAccessor<float> neflowisol20("neflowisol20");
- static const SG::AuxElement::ConstAccessor<float> ptvarcone30_TightTTVALooseCone_pt1000("ptvarcone30_TightTTVALooseCone_pt1000");
+ static const SG::AuxElement::ConstAccessor<float> ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt1000("ptvarcone30_Nonprompt_All_MaxWeightTTVALooseCone_pt1000");
static const SG::AuxElement::ConstAccessor<int> chamberIndex("chamberIndex");
static const SG::AuxElement::ConstAccessor<short> PLV_TrackJetNTrack("PromptLeptonInput_TrackJetNTrack");
static const SG::AuxElement::ConstAccessor<float> PLV_DRlj("PromptLeptonInput_DRlj");
@@ -243,7 +243,7 @@ namespace top {
passIsol_Tight_VarRad = -1;
passIsol_Loose_VarRad = -1;
- if (ptvarcone30_TightTTVA_pt1000.isAvailable(*muon)
+ if (ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000.isAvailable(*muon)
&& topoetcone20.isAvailable(*muon)) {
passIsol_FCTight = m_isolationTool_FCTight->accept(*muon) ? 1 : 0;
passIsol_FCLoose = m_isolationTool_FCLoose->accept(*muon) ? 1 : 0;
@@ -251,40 +251,40 @@ namespace top {
passIsol_FCTight_FixedRad = m_isolationTool_FCTight_FixedRad->accept(*muon) ? 1 : 0;
}
- if (ptvarcone30_TightTTVA_pt1000.isAvailable(*muon)) {
+ if (ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000.isAvailable(*muon)) {
passIsol_FCTightTrackOnly = m_isolationTool_FCTightTrackOnly->accept(*muon) ? 1 : 0;
passIsol_FCTightTrackOnly_FixedRad = m_isolationTool_FCTightTrackOnly_FixedRad->accept(*muon) ? 1 : 0;
}
- if (ptvarcone30_TightTTVA_pt500.isAvailable(*muon)
- && ptvarcone20_TightTTVA_pt500.isAvailable(*muon)
+ if (ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500.isAvailable(*muon)
+ && ptvarcone20_Nonprompt_All_MaxWeightTTVA_pt500.isAvailable(*muon)
&& neflowisol20.isAvailable(*muon)) {
passIsol_FixedCutPflowTight = m_isolationTool_FixedCutPflowTight->accept(*muon) ? 1 : 0;
passIsol_FixedCutPflowLoose = m_isolationTool_FixedCutPflowLoose->accept(*muon) ? 1 : 0;
}
//new Iso WPs
- if (ptvarcone30_TightTTVA_pt500.isAvailable(*muon)
+ if (ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500.isAvailable(*muon)
&& neflowisol20.isAvailable(*muon)
- && ptcone20_TightTTVA_pt500.isAvailable(*muon)) {
+ && ptcone20_Nonprompt_All_MaxWeightTTVA_pt500.isAvailable(*muon)) {
passIsol_PflowTight_FixedRad = m_isolationTool_PflowTight_FixedRad->accept(*muon) ? 1 : 0;
passIsol_PflowLoose_FixedRad = m_isolationTool_PflowLoose_FixedRad->accept(*muon) ? 1 : 0;
}
- if (ptvarcone30_TightTTVA_pt500.isAvailable(*muon)
+ if (ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500.isAvailable(*muon)
&& neflowisol20.isAvailable(*muon)) {
passIsol_PflowTight_VarRad = m_isolationTool_PflowTight_VarRad->accept(*muon) ? 1 : 0;
passIsol_PflowLoose_VarRad = m_isolationTool_PflowLoose_VarRad->accept(*muon) ? 1 : 0;
}
- if (ptcone20_TightTTVA_pt1000.isAvailable(*muon)) {
+ if (ptcone20_Nonprompt_All_MaxWeightTTVA_pt1000.isAvailable(*muon)) {
passIsol_HighPtTrackOnly = m_isolationTool_HighPtTrackOnly->accept(*muon) ? 1 : 0;
}
- if (ptvarcone30_TightTTVA_pt1000.isAvailable(*muon)) {
+ if (ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000.isAvailable(*muon)) {
passIsol_TightTrackOnly_VarRad = m_isolationTool_TightTrackOnly_VarRad->accept(*muon) ? 1 : 0;
}
- if (ptvarcone30_TightTTVA_pt1000.isAvailable(*muon) && ptcone20_TightTTVA_pt1000.isAvailable(*muon)) {
+ if (ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000.isAvailable(*muon) && ptcone20_Nonprompt_All_MaxWeightTTVA_pt1000.isAvailable(*muon)) {
passIsol_TightTrackOnly_FixedRad = m_isolationTool_TightTrackOnly_FixedRad->accept(*muon) ? 1 : 0;
}
- if (ptvarcone30_TightTTVA_pt500.isAvailable(*muon)) {
+ if (ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt500.isAvailable(*muon)) {
// if ( PLV_TrackJetNTrack.isAvailable(*muon) &&
// PLV_DRlj.isAvailable(*muon) &&
// PLV_PtRel.isAvailable(*muon) &&
@@ -293,11 +293,11 @@ namespace top {
// else
// byhand_LowPtPLV(*muon) = 1.1;
}
- if (ptvarcone30_TightTTVA_pt1000.isAvailable(*muon) && ptcone20_TightTTVA_pt1000.isAvailable(*muon)) {
+ if (ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000.isAvailable(*muon) && ptcone20_Nonprompt_All_MaxWeightTTVA_pt1000.isAvailable(*muon)) {
passIsol_Tight_FixedRad = m_isolationTool_Tight_FixedRad->accept(*muon) ? 1 : 0;
passIsol_Loose_FixedRad = m_isolationTool_Loose_FixedRad->accept(*muon) ? 1 : 0;
}
- if (ptvarcone30_TightTTVA_pt1000.isAvailable(*muon) && topoetcone20.isAvailable(*muon)) {
+ if (ptvarcone30_Nonprompt_All_MaxWeightTTVA_pt1000.isAvailable(*muon) && topoetcone20.isAvailable(*muon)) {
passIsol_Tight_VarRad = m_isolationTool_Tight_VarRad->accept(*muon) ? 1 : 0;
passIsol_Loose_VarRad = m_isolationTool_Loose_VarRad->accept(*muon) ? 1 : 0;
}
diff --git a/Reconstruction/RecoAlgs/IsolationAlgs/python/IsoUpdatedTrackCones.py b/Reconstruction/RecoAlgs/IsolationAlgs/python/IsoUpdatedTrackCones.py
index d32af6051824..50e671c903bb 100644
--- a/Reconstruction/RecoAlgs/IsolationAlgs/python/IsoUpdatedTrackCones.py
+++ b/Reconstruction/RecoAlgs/IsolationAlgs/python/IsoUpdatedTrackCones.py
@@ -7,7 +7,7 @@ from AthenaCommon.BeamFlags import jobproperties
log = logging.getLogger(__name__)
-def GetUpdatedIsoTrackCones(postfix="", object_types=("Electrons", "Photons", "Muons"),WP="Tight"):
+def GetUpdatedIsoTrackCones(postfix="", object_types=("Electrons", "Photons", "Muons"),WP="Nonprompt_All_MaxWeight"):
""" Return a list of IsolationBuilder algorithms to calculate TTVA moments
---------
@@ -98,7 +98,7 @@ def iso_vars():
iso_vars = []
for track_pt in 500, 1000:
for cone_str in "", "LooseCone":
- name = f"TightTTVA{cone_str}_pt{track_pt}"
+ name = f"Nonprompt_All_MaxWeightTTVA{cone_str}_pt{track_pt}"
iso_vars += ["ptconeCorrBitset_"+name, "ptconecoreTrackPtrCorrection_"+name]
for cone_size in 20, 30, 40:
for var_str in "", "var":
--
GitLab
From e36d0a5f4419b539aaa05cec40db284ea9a5e272 Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Sat, 14 Aug 2021 05:21:25 +0200
Subject: [PATCH 044/272] The configuration of the Likelihood times te last
few years (>5) expects a config file. Certain properties are also expected to
be present in the config file and read in it. This simplified a lot of the
analysis config back in time. Before that the user was expected to configure
each of them , not even if she does they will be superseeded by the config.
Remove the old pre 2014 or so style as it allows also to clean the code a bit
---
.../Root/AsgElectronLikelihoodTool.cxx | 234 ++++--------------
.../python/ElectronLikelihoodMenuDefs.py | 156 ++----------
.../python/ElectronLikelihoodToolMapping.py | 71 +++---
3 files changed, 108 insertions(+), 353 deletions(-)
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronLikelihoodTool.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronLikelihoodTool.cxx
index f2defbe44010..da0c040da46d 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronLikelihoodTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronLikelihoodTool.cxx
@@ -12,8 +12,8 @@
*/
#include "ElectronPhotonSelectorTools/AsgElectronLikelihoodTool.h"
-#include "EgammaAnalysisHelpers/AsgEGammaConfigHelper.h"
#include "EGSelectorConfigurationMapping.h"
+#include "EgammaAnalysisHelpers/AsgEGammaConfigHelper.h"
#include "ElectronPhotonSelectorTools/ElectronSelectorHelpers.h"
#include "TElectronLikelihoodTool.h"
// STL includes
@@ -41,8 +41,17 @@ AsgElectronLikelihoodTool::AsgElectronLikelihoodTool(const std::string& myname)
m_rootTool = new Root::TElectronLikelihoodTool(("T" + myname).c_str());
// Declare the needed properties
+ // not having a config file results in
+ // a failure
declareProperty("WorkingPoint", m_WorkingPoint = "", "The Working Point");
declareProperty("ConfigFile", m_configFile = "", "The config file to use");
+
+ // pdf file name. If specified it overrides the one in the config file
+ declareProperty("inputPDFFileName",
+ m_pdfFileName = "",
+ "The input ROOT file name that holds the PDFs");
+
+ //Addtional properties that are not part of the config files
declareProperty(
"usePVContainer", m_usePVCont = true, "Whether to use the PV container");
declareProperty(
@@ -55,158 +64,17 @@ AsgElectronLikelihoodTool::AsgElectronLikelihoodTool(const std::string& myname)
declareProperty("skipDeltaPoverP",
m_skipDeltaPoverP = false,
"If true, it wil skip the check of deltaPoverP");
- declareProperty("correctDeltaEta",
- m_correctDeltaEta = false,
- "If true, deltaEta1 will be corrected for the pear shape disortion of the LAr");
- //
- // Configurables in the root tool
- //
- // pdf file name. Managed in the Asg tool.
- declareProperty("inputPDFFileName",
- m_pdfFileName = "",
- "The input ROOT file name that holds the PDFs");
- // the variable names, if non-standard - nope, it's done above!
- declareProperty("VariableNames",
- m_rootTool->m_variableNames,
- "Variable names input to the LH");
- // The likelihood cut values
- declareProperty("CutLikelihood",
- m_rootTool->m_cutLikelihood,
- "Cut on likelihood discriminant");
- // The pileup-correction part of the likelihood cut values
- declareProperty("CutLikelihoodPileupCorrection",
- m_rootTool->m_cutLikelihoodPileupCorrection,
- "Pileup correction for LH discriminant");
- // The likelihood cut values - 4 GeV
- declareProperty("CutLikelihood4GeV",
- m_rootTool->m_cutLikelihood4GeV,
- "Cut on likelihood discriminant, 4 GeV special bin");
- // The pileup-correction part of the likelihood cut values - 4 GeV
- declareProperty("CutLikelihoodPileupCorrection4GeV",
- m_rootTool->m_cutLikelihoodPileupCorrection4GeV,
- "Pileup correction for LH discriminant, 4 GeV special bin");
- // do the ambiguity cut
- declareProperty("CutAmbiguity",
- m_rootTool->m_cutAmbiguity,
- "Apply a cut on the ambiguity bit");
- // cut on b-layer
- declareProperty("CutBL", m_rootTool->m_cutBL, "Cut on b-layer");
- // cut on pixel hits
- declareProperty("CutPi", m_rootTool->m_cutPi, "Cut on pixel hits");
- // cut on d0
- declareProperty("CutA0", m_rootTool->m_cutA0, "Cut on d0");
- // cut on deltaEta
- declareProperty("CutDeltaEta", m_rootTool->m_cutDeltaEta, "Cut on deltaEta");
- // cut on deltaPhiRes
- declareProperty(
- "CutDeltaPhiRes", m_rootTool->m_cutDeltaPhiRes, "Cut on deltaPhiRes");
- // cut on precision hits
- declareProperty("CutSi", m_rootTool->m_cutSi, "Cut on precision hits");
- // turn off f3 at high Et
- declareProperty("doRemoveF3AtHighEt",
- m_rootTool->m_doRemoveF3AtHighEt,
- "Turn off f3 at high Et");
- // turn off TRTPID at high Et
- declareProperty("doRemoveTRTPIDAtHighEt",
- m_rootTool->m_doRemoveTRTPIDAtHighEt,
- "Turn off TRTPID at high Et");
- // use smooth interpolation between LH bins
- declareProperty("doSmoothBinInterpolation",
- m_rootTool->m_doSmoothBinInterpolation,
- "use smooth interpolation between LH bins");
- // use one extra bin for high ET LH
- declareProperty("useOneExtraHighETLHBin",
- m_rootTool->m_useOneExtraHighETLHBin,
- "Use one extra bin for high ET LH");
- // cut on Wstot above HighETBinThreshold
- declareProperty("CutWstotAtHighET",
- m_rootTool->m_cutWstotAtHighET,
- "Cut on Wstot above HighETBinThreshold");
- // cut on EoverP above HighETBinThreshold
- declareProperty("CutEoverPAtHighET",
- m_rootTool->m_cutEoverPAtHighET,
- "Cut on EoverP above HighETBinThreshold");
- // ET threshold for using high ET cuts and bin
- declareProperty("HighETBinThreshold",
- m_rootTool->m_highETBinThreshold,
- "ET threshold for using high ET cuts and bin");
- // do pileup-dependent transform on discriminant value
- declareProperty("doPileupTransform",
- m_rootTool->m_doPileupTransform,
- "Do pileup-dependent transform on discriminant value");
- // do centrality-dependent transform on discriminant value
- declareProperty("doCentralityTransform",
- m_rootTool->m_doCentralityTransform,
- "Do centrality-dependent transform on discriminant value");
- // reference disc for very hard cut; used by pileup transform
- declareProperty("DiscHardCutForPileupTransform",
- m_rootTool->m_discHardCutForPileupTransform,
- "Reference disc for very hard cut; used by pileup transform");
- // reference slope on disc for very hard cut; used by pileup transform
- declareProperty(
- "DiscHardCutSlopeForPileupTransform",
- m_rootTool->m_discHardCutSlopeForPileupTransform,
- "Reference slope on disc for very hard cut; used by pileup transform");
- // reference quadratic par on disc for very hard cut; used by centrality
- // transform
- declareProperty("DiscHardCutQuadForPileupTransform",
- m_rootTool->m_discHardCutQuadForPileupTransform,
- "Reference quadratic par on disc for very hard cut; used by "
- "centrality transform");
- // reference disc for a pileup independent loose menu; used by pileup
- // transform
- declareProperty("DiscLooseForPileupTransform",
- m_rootTool->m_discLooseForPileupTransform,
- "Reference disc for pileup indepdendent loose menu; used by "
- "pileup transform");
- // reference disc for very hard cut; used by pileup transform - 4-7 GeV bin
- declareProperty(
- "DiscHardCutForPileupTransform4GeV",
- m_rootTool->m_discHardCutForPileupTransform4GeV,
- "Reference disc for very hard cut; used by pileup transform. 4-7 GeV bin");
- // reference slope on disc for very hard cut; used by pileup transform - 4-7
- // GeV bin
- declareProperty("DiscHardCutSlopeForPileupTransform4GeV",
- m_rootTool->m_discHardCutSlopeForPileupTransform4GeV,
- "Reference slope on disc for very hard cut; used by pileup "
- "transform. 4-7 GeV bin");
- // reference quadratic par on disc for very hard cut; used by centrality
- // transform in 4-7 GeV bin
- declareProperty("DiscHardCutQuadForPileupTransform4GeV",
- m_rootTool->m_discHardCutQuadForPileupTransform4GeV,
- "Reference quadratic par on disc for very hard cut; used by "
- "centrality transform in 4-7 GeV bin");
- // reference disc for a pileup independent loose menu; used by pileup
- // transform - 4-7 GeV bin
- declareProperty("DiscLooseForPileupTransform4GeV",
- m_rootTool->m_discLooseForPileupTransform4GeV,
- "Reference disc for pileup indepdendent loose menu; used by "
- "pileup transform. 4-7 GeV bin");
- // max discriminant for which pileup transform is to be used
- declareProperty("DiscMaxForPileupTransform",
- m_rootTool->m_discMaxForPileupTransform,
- "Max discriminant for which pileup transform is to be used");
- // max nvtx or mu to be used in pileup transform
- declareProperty("PileupMaxForPileupTransform",
- m_rootTool->m_pileupMaxForPileupTransform,
- "Max nvtx or mu to be used in pileup transform");
- // Flag to tell the tool if it is a calo-only LH
+ // Flag to tell the tool if it is a calo-only LH
declareProperty("caloOnly",
m_caloOnly = false,
"Flag to tell the tool if it is a calo-only LH");
}
-//=============================================================================
-// Standard destructor
-//=============================================================================
AsgElectronLikelihoodTool::~AsgElectronLikelihoodTool()
{
delete m_rootTool;
}
-//=============================================================================
-// Asgena initialize method
-//=============================================================================
StatusCode
AsgElectronLikelihoodTool::initialize()
{
@@ -214,7 +82,7 @@ AsgElectronLikelihoodTool::initialize()
ATH_MSG_INFO("initialize : WP " << m_WorkingPoint.size() << " "
<< m_configFile.size());
- std::string configFile, PDFfilename, resolvedPDF; // Default
+ std::string configFile,PDFfilename, resolvedPDF; // Default
if (!m_WorkingPoint.empty()) {
m_configFile = AsgConfigHelper::findConfigFile(
@@ -232,12 +100,15 @@ AsgElectronLikelihoodTool::initialize()
ATH_MSG_DEBUG("Configfile to use " << m_configFile);
TEnv env;
- if(env.ReadFile(configFile.c_str(), kEnvLocal)) {
+ if (env.ReadFile(configFile.c_str(), kEnvLocal)) {
ATH_MSG_ERROR("Could not open config " << configFile);
return StatusCode::FAILURE;
}
- // Get the input PDFs in the tool.
+ // Get the input PDFs for the tool.
+ // We need to see if the user had provided
+ // an override, if not needs to be in the input
+ // config file
ATH_MSG_DEBUG("Get the input PDFs in the tool ");
if (!m_pdfFileName
@@ -245,17 +116,19 @@ AsgElectronLikelihoodTool::initialize()
ATH_MSG_INFO("Setting user specified PDF file " << m_pdfFileName);
PDFfilename = m_pdfFileName;
} else {
- if(!env.Defined("inputPDFFileName")) {
+ if (!env.Defined("inputPDFFileName")) {
ATH_MSG_WARNING("will use default PDF filename "
- "since none is specified in the config " << m_configFile);
+ "since none is specified in the config "
+ << m_configFile);
}
- PDFfilename = env.GetValue("inputPDFFileName",
+ PDFfilename = env.GetValue(
+ "inputPDFFileName",
"ElectronPhotonSelectorTools/v1/ElectronLikelihoodPdfs.root");
- if(PDFfilename.empty()) {
+ if (PDFfilename.empty()) {
ATH_MSG_ERROR("empty inputPDFFilename in " << configFile);
return StatusCode::FAILURE;
}
- if(m_configFile.find("dev/") != std::string::npos) {
+ if (m_configFile.find("dev/") != std::string::npos) {
PDFfilename.insert(0, "dev/");
}
ATH_MSG_DEBUG("Getting the input PDFs from: " << PDFfilename);
@@ -265,12 +138,14 @@ AsgElectronLikelihoodTool::initialize()
if (!resolvedPDF.empty()) {
m_rootTool->setPDFFileName(resolvedPDF.c_str());
} else {
- ATH_MSG_ERROR("Couldn't resolve PDF filename from " << PDFfilename
- << ", config file = " << configFile
- );
+ ATH_MSG_ERROR("Couldn't resolve PDF filename from "
+ << PDFfilename << ", config file = " << configFile);
return StatusCode::FAILURE;
}
+ ///-----------Begin of text config----------------------------
+ // The following are all taken from the config
+ // file
m_rootTool->m_variableNames = env.GetValue("VariableNames", "");
m_rootTool->m_cutLikelihood =
AsgConfigHelper::HelperDouble("CutLikelihood", env);
@@ -343,11 +218,9 @@ AsgElectronLikelihoodTool::initialize()
env.GetValue("DiscMaxForPileupTransform", 2.0);
m_rootTool->m_pileupMaxForPileupTransform =
env.GetValue("PileupMaxForPileupTransform", 50);
-
- // if true, deltaEta1 will be corrected for the pear shape disortion of the LAr
- m_correctDeltaEta =
- env.GetValue("doCorrectDeltaEta", false);
-
+ // if true, deltaEta1 will be corrected for the pear shape distortion of the
+ // LAr
+ m_correctDeltaEta = env.GetValue("doCorrectDeltaEta", false);
} else { // Error if it cant find the conf
ATH_MSG_ERROR("Could not find configuration file");
return StatusCode::FAILURE;
@@ -372,13 +245,12 @@ AsgElectronLikelihoodTool::initialize()
// We need to initialize the underlying ROOT TSelectorTool
if (m_rootTool->initialize().isFailure()) {
ATH_MSG_ERROR("Could not initialize the TElectronLikelihoodTool! "
- "Configuration details: "
- << "working point = \"" << m_WorkingPoint
- << "\", config file = \"" << m_configFile
- << "\", resolved file = \"" << configFile
- << "\", PDF file = \"" << PDFfilename
- << "\", resolved file = \"" << resolvedPDF
- );
+ "Configuration details: "
+ << "working point = \"" << m_WorkingPoint
+ << "\", config file = \"" << m_configFile
+ << "\", resolved file = \"" << configFile
+ << "\", PDF file = \"" << PDFfilename
+ << "\", resolved file = \"" << resolvedPDF);
return StatusCode::FAILURE;
}
return StatusCode::SUCCESS;
@@ -479,24 +351,25 @@ AsgElectronLikelihoodTool::accept(const EventContext& ctx,
ATH_MSG_ERROR("Failed, no track particle. et= " << et << "eta= " << eta);
return m_rootTool->accept();
}
-
+
if (!el->trackCaloMatchValue(deltaEta, xAOD::EgammaParameters::deltaEta1)) {
allFound = false;
notFoundList += "deltaEta1 ";
}
// correction of deltaEta1 for pear shape distortion
- else if ( m_correctDeltaEta ) {
- const static SG::AuxElement::Accessor<float> acc("deltaEta1PearDistortion");
- if ( acc.isAvailable(*el) ) {
- deltaEta -= acc(*el);
+ else if (m_correctDeltaEta) {
+ const static SG::AuxElement::Accessor<float> acc(
+ "deltaEta1PearDistortion");
+ if (acc.isAvailable(*el)) {
+ deltaEta -= acc(*el);
} else {
- allFound = false;
- notFoundList += "deltaEta1PearDistortion ";
+ allFound = false;
+ notFoundList += "deltaEta1PearDistortion ";
}
}
if (!el->trackCaloMatchValue(deltaPhiRescaled2,
- xAOD::EgammaParameters::deltaPhiRescaled2)) {
+ xAOD::EgammaParameters::deltaPhiRescaled2)) {
allFound = false;
notFoundList += "deltaPhiRescaled2 ";
}
@@ -835,13 +708,14 @@ AsgElectronLikelihoodTool::calculate(const EventContext& ctx,
notFoundList += "deltaEta1 ";
}
// correction of deltaEta1 for pear shape distortion
- else if ( m_correctDeltaEta ) {
- const static SG::AuxElement::Accessor<float> acc("deltaEta1PearDistortion");
- if ( acc.isAvailable(*el) ) {
- deltaEta -= acc(*el);
+ else if (m_correctDeltaEta) {
+ const static SG::AuxElement::Accessor<float> acc(
+ "deltaEta1PearDistortion");
+ if (acc.isAvailable(*el)) {
+ deltaEta -= acc(*el);
} else {
- allFound = false;
- notFoundList += "deltaEta1PearDistortion ";
+ allFound = false;
+ notFoundList += "deltaEta1PearDistortion ";
}
}
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/python/ElectronLikelihoodMenuDefs.py b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/python/ElectronLikelihoodMenuDefs.py
index 7c768fba393e..f9d51c6b9fc7 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/python/ElectronLikelihoodMenuDefs.py
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/python/ElectronLikelihoodMenuDefs.py
@@ -1,116 +1,10 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Import a needed helper
from PATCore.HelperUtils import GetTool
-def ElectronLikelihoodCUSTOMMediumConfig(theTool) :
- '''
- This is for the custom implementation of the MediumLLH definitions.
- '''
-
- theTool = GetTool(theTool)
-
- # Variable names in the likelihood. Use these exact names! Comma-separated.
- theTool.VariableNames = "el_deltaeta1,el_weta2,el_TRTHighTOutliersRatio,el_f1,el_f3,el_eratio,el_rphi,el_rhad,el_reta,el_DeltaPoverP,el_deltaphiRescaled,el_trackd0pvunbiased,el_d0significance"
-
- # PdfFileName
- theTool.inputPDFFileName = "ElectronPhotonSelectorTools/v1/ElectronLikelihoodPdfs.root"
-
- # do remove f3 at high Et
- theTool.doRemoveF3AtHighEt = 0
-
- # cut on pixel-layer hits. Must be 10 long
- theTool.CutPi += [2, 2, 2, 2, 2, 2, 2, 2, 2, 2]
-
- # cut on precision hits. Must be 10 long
- theTool.CutSi += [7, 7, 7, 7, 7, 7, 7, 7, 7, 7]
-
- # cut on precision hits. Must be 10 long
- theTool.CutBL += [1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
-
- # the likelihood cut itself
- theTool.CutLikelihood += [ 0.301, 0.301, 0.345, 0.368, 0.266, 0.148, 0.319, 0.312, 0.267, 0.123, # 7-10
- 0.401, 0.401, 0.410, 0.407, 0.396, 0.250, 0.395, 0.426, 0.346, 0.102, # 10-15
- 0.439, 0.439, 0.466, 0.429, 0.422, 0.255, 0.403, 0.439, 0.341, 0.091, # 15-20
- 0.499, 0.499, 0.480, 0.475, 0.443, 0.258, 0.458, 0.459, 0.448, 0.158, # 20-25
- 0.514, 0.514, 0.501, 0.498, 0.466, 0.265, 0.463, 0.475, 0.463, 0.265, # 25-30
- 0.513, 0.513, 0.494, 0.500, 0.457, 0.270, 0.455, 0.471, 0.481, 0.289, # 30-35
- 0.535, 0.535, 0.528, 0.533, 0.486, 0.290, 0.467, 0.491, 0.505, 0.361, # 35-40
- 0.514, 0.514, 0.517, 0.520, 0.454, 0.230, 0.387, 0.464, 0.481, 0.372, # 40-45
- 0.566, 0.566, 0.581, 0.585, 0.526, 0.243, 0.441, 0.529, 0.524, 0.487, # 45<
- ]
-
- # the nvtx correction part to the likelihood cut
- theTool.CutLikelihoodPileupCorrection += [ -0.00216, -0.00216, -0.00344, -0.00504, -0.00600, -0.00176, -0.00488, -0.00896, -0.00816, -0.00448, # 7-10
- -0.00184, -0.00184, 0.00000, -0.00168, -0.00160, -0.00096, -0.00288, -0.00472, -0.00496, -0.00528, # 10-15
- -0.00096, -0.00096, -0.00120, -0.00128, -0.00160, -0.00008, -0.00168, -0.00208, -0.00344, -0.00448, # 15-20
- -0.00120, -0.00120, -0.00160, -0.00120, -0.00088, -0.00040, -0.00072, -0.00128, -0.00128, -0.00112, # 20-25
- -0.00080, -0.00080, -0.00080, -0.00088, -0.00088, -0.00016, -0.00048, -0.00120, -0.00120, -0.00184, # 25-30
- -0.00104, -0.00104, -0.00088, -0.00104, -0.00096, -0.00064, -0.00040, -0.00096, -0.00120, -0.00136, # 30-35
- -0.00080, -0.00080, -0.00072, -0.00096, -0.00096, -0.00040, -0.00048, -0.00080, -0.00080, -0.00080, # 35-40
- -0.00104, -0.00104, -0.00112, -0.00088, -0.00088, -0.00064, -0.00064, -0.00104, -0.00096, -0.00056, # 40-45
- -0.00088, -0.00088, -0.00096, -0.00088, -0.00088, -0.00064, -0.00080, -0.00080, -0.00088, -0.00080, # 45<
- ]
-
-
-def ElectronLikelihoodCUSTOMMediumNoGSFConfig(theTool) :
- '''
- This is for the custom implementation of the Medium, No GSF-variable (trigger-friendly) definitions.
- '''
-
- theTool = GetTool(theTool)
- # Variable names in the likelihood. Use these exact names! Comma-separated.
- # No deltapoverp, no deltaphires
- theTool.VariableNames = "el_deltaeta1,el_weta2,el_TRTHighTOutliersRatio,el_f1,el_f3,el_eratio,el_rphi,el_rhad,el_reta,el_trackd0pvunbiased,el_d0significance"
-
-
- # PdfFileName
- theTool.inputPDFFileName = "ElectronPhotonSelectorTools/v1/ElectronLikelihoodPdfs.root"
-
- # do remove f3 at high Et
- theTool.doRemoveF3AtHighEt = 0
-
- # cut on pixel-layer hits. Must be 10 long
- theTool.CutPi += [2, 2, 2, 2, 2, 2, 2, 2, 2, 2]
-
- # cut on precision hits. Must be 10 long
- theTool.CutSi += [7, 7, 7, 7, 7, 7, 7, 7, 7, 7]
-
- # cut on precision hits. Must be 10 long
- theTool.CutBL += [1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
-
- #
- # Details:
- # No GSF variables; Tuned to Mediumpp (not trigger mediumpp) - same signal efficiency
- # Pileup Correction is in MU!
- # Below 20 GeV the matching with mediumpp is not so great. Efficiencies too low.
- # Took 0.6 x the mu correction suggested
- # Bumped up the efficiency by 0.5%
- #
- theTool.CutLikelihood += [ 0.306, 0.306, 0.392, 0.367, 0.358, 0.167, 0.396, 0.403, 0.420, 0.168,
- 0.345, 0.345, 0.357, 0.411, 0.356, 0.192, 0.382, 0.454, 0.389, 0.196,
- 0.412, 0.412, 0.399, 0.375, 0.372, 0.194, 0.354, 0.432, 0.349, 0.162,
- 0.448, 0.448, 0.446, 0.419, 0.403, 0.184, 0.392, 0.411, 0.401, 0.114,
- 0.438, 0.438, 0.430, 0.426, 0.405, 0.181, 0.385, 0.414, 0.418, 0.226,
- 0.447, 0.447, 0.437, 0.434, 0.387, 0.194, 0.385, 0.407, 0.434, 0.251,
- 0.455, 0.455, 0.464, 0.455, 0.408, 0.206, 0.384, 0.432, 0.440, 0.310,
- 0.458, 0.458, 0.476, 0.467, 0.395, 0.158, 0.335, 0.422, 0.430, 0.302,
- 0.490, 0.490, 0.506, 0.511, 0.450, 0.175, 0.372, 0.471, 0.479, 0.416,
- ]
-
- theTool.CutLikelihoodPileupCorrection += [ -0.00360, -0.00360, -0.00588, -0.00528, -0.00864, -0.00300, -0.00840, -0.00936, -0.01128, -0.00432,
- -0.00192, -0.00192, -0.00108, -0.00432, -0.00240, -0.00144, -0.00408, -0.00648, -0.00600, -0.00648,
- -0.00324, -0.00324, -0.00132, -0.00216, -0.00228, -0.00108, -0.00228, -0.00372, -0.00408, -0.00516,
- -0.00204, -0.00204, -0.00228, -0.00180, -0.00216, -0.00024, -0.00096, -0.00144, -0.00120, -0.00012,
- -0.00120, -0.00120, -0.00108, -0.00132, -0.00168, 0.00000, -0.00060, -0.00096, -0.00132, -0.00108,
- -0.00144, -0.00144, -0.00144, -0.00144, -0.00120, -0.00048, -0.00060, -0.00048, -0.00120, -0.00120,
- -0.00120, -0.00120, -0.00144, -0.00132, -0.00120, -0.00036, -0.00036, -0.00084, -0.00048, -0.00096,
- -0.00156, -0.00156, -0.00192, -0.00156, -0.00108, -0.00036, -0.00084, -0.00096, -0.00084, -0.00012,
- -0.00144, -0.00144, -0.00144, -0.00144, -0.00120, -0.00072, -0.00108, -0.00084, -0.00132, -0.00048,
- ]
-
-def ElectronLikelihoodLooseTriggerConfig2015(theTool) :
+def ElectronLikelihoodLooseTriggerConfig2015(theTool):
'''
This is for the custom implementation of the Loose, No GSF-variable (trigger-friendly), no d0significance (for now) definitions.
This uses Online PDFs, and currently has no conversion bit either. Also note that the PDF for trackd0 comes from
@@ -119,8 +13,8 @@ def ElectronLikelihoodLooseTriggerConfig2015(theTool) :
theTool = GetTool(theTool)
theTool.ConfigFile = "ElectronPhotonSelectorTools/trigger/mc15_20150712/ElectronLikelihoodLooseTriggerConfig2015.conf"
-
-def ElectronLikelihoodMediumTriggerConfig2015(theTool) :
+
+def ElectronLikelihoodMediumTriggerConfig2015(theTool):
'''
This is for the custom implementation of the Medium, No GSF-variable (trigger-friendly), no d0significance (for now) definitions.
This uses Online PDFs, and currently has no conversion bit either. Also note that the PDF for trackd0 comes from
@@ -129,9 +23,8 @@ def ElectronLikelihoodMediumTriggerConfig2015(theTool) :
theTool = GetTool(theTool)
theTool.ConfigFile = "ElectronPhotonSelectorTools/trigger/mc15_20150712/ElectronLikelihoodMediumTriggerConfig2015.conf"
-
-
-def ElectronLikelihoodTightTriggerConfig2015(theTool) :
+
+def ElectronLikelihoodTightTriggerConfig2015(theTool):
'''
This is for the custom implementation of the Tight, No GSF-variable (trigger-friendly), no d0significance (for now) definitions.
This uses Online PDFs, and currently has no conversion bit either. Also note that the PDF for trackd0 comes from
@@ -141,16 +34,16 @@ def ElectronLikelihoodTightTriggerConfig2015(theTool) :
theTool.ConfigFile = "ElectronPhotonSelectorTools/trigger/mc15_20150712/ElectronLikelihoodTightTriggerConfig2015.conf"
-def ElectronLikelihoodVeryLooseOfflineConfig2015(theTool) :
+def ElectronLikelihoodVeryLooseOfflineConfig2015(theTool):
'''
This is for the custom implementation of the VeryLoose offline likelihood for MC15 / Run 2.
This uses Offline PDFs, but does not yet have the pileup dependent discriminant cut.
'''
theTool = GetTool(theTool)
theTool.ConfigFile = "ElectronPhotonSelectorTools/offline/mc15_20160512/ElectronLikelihoodVeryLooseOfflineConfig2016_Smooth.conf"
-
-
-def ElectronLikelihoodLooseOfflineConfig2015(theTool) :
+
+
+def ElectronLikelihoodLooseOfflineConfig2015(theTool):
'''
This is for the custom implementation of the Loose offline likelihood for MC15 / Run 2.
This uses Offline PDFs, but does not yet have the pileup dependent discriminant cut.
@@ -159,18 +52,18 @@ def ElectronLikelihoodLooseOfflineConfig2015(theTool) :
theTool = GetTool(theTool)
theTool.ConfigFile = "ElectronPhotonSelectorTools/offline/mc15_20160512/ElectronLikelihoodLooseOfflineConfig2016_Smooth.conf"
-
-def ElectronLikelihoodMediumOfflineConfig2015(theTool) :
+
+def ElectronLikelihoodMediumOfflineConfig2015(theTool):
'''
This is for the custom implementation of the Medium offline likelihood for MC15 / Run 2.
This uses Offline PDFs, but does not yet have the pileup dependent discriminant cut.
(NOTE: same signal eff as offline Mediumpp + 1%)
- '''
+ '''
theTool = GetTool(theTool)
theTool.ConfigFile = "ElectronPhotonSelectorTools/offline/mc15_20160512/ElectronLikelihoodMediumOfflineConfig2016_Smooth.conf"
-
-def ElectronLikelihoodTightOfflineConfig2015(theTool) :
+
+def ElectronLikelihoodTightOfflineConfig2015(theTool):
'''
This is for the custom implementation of the Tight offline likelihood for MC15 / Run 2.
This uses Offline PDFs, but does not yet have the pileup dependent discriminant cut.
@@ -180,17 +73,16 @@ def ElectronLikelihoodTightOfflineConfig2015(theTool) :
theTool.ConfigFile = "ElectronPhotonSelectorTools/offline/mc15_20160512/ElectronLikelihoodTightOfflineConfig2016_Smooth.conf"
-
-def ElectronLikelihoodVeryLooseOfflineConfig2016(theTool) :
+def ElectronLikelihoodVeryLooseOfflineConfig2016(theTool):
'''
This is for the custom implementation of the VeryLoose offline likelihood for MC16 / Run 2 / Release 21.
This uses Offline PDFs, but does not yet have the pileup dependent discriminant cut.
'''
theTool = GetTool(theTool)
theTool.ConfigFile = "ElectronPhotonSelectorTools/offline/mc20_20210514/ElectronLikelihoodVeryLooseOfflineConfig2017_Smooth.conf"
-
-
-def ElectronLikelihoodLooseOfflineConfig2016(theTool) :
+
+
+def ElectronLikelihoodLooseOfflineConfig2016(theTool):
'''
This is for the custom implementation of the Loose offline likelihood for MC16 / Run 2 / Release 21.
This uses Offline PDFs, but does not yet have the pileup dependent discriminant cut.
@@ -199,18 +91,18 @@ def ElectronLikelihoodLooseOfflineConfig2016(theTool) :
theTool = GetTool(theTool)
theTool.ConfigFile = "ElectronPhotonSelectorTools/offline/mc20_20210514/ElectronLikelihoodLooseOfflineConfig2017_Smooth.conf"
-
-def ElectronLikelihoodMediumOfflineConfig2016(theTool) :
+
+def ElectronLikelihoodMediumOfflineConfig2016(theTool):
'''
This is for the custom implementation of the Medium offline likelihood for MC16 / Run 2 / Release 21.
This uses Offline PDFs, but does not yet have the pileup dependent discriminant cut.
(NOTE: same signal eff as offline Mediumpp + 1%)
- '''
+ '''
theTool = GetTool(theTool)
theTool.ConfigFile = "ElectronPhotonSelectorTools/offline/mc20_20210514/ElectronLikelihoodMediumOfflineConfig2017_Smooth.conf"
-
-def ElectronLikelihoodTightOfflineConfig2016(theTool) :
+
+def ElectronLikelihoodTightOfflineConfig2016(theTool):
'''
This is for the custom implementation of the Tight offline likelihood for MC16 / Run 2 / Release 21.
This uses Offline PDFs, but does not yet have the pileup dependent discriminant cut.
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/python/ElectronLikelihoodToolMapping.py b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/python/ElectronLikelihoodToolMapping.py
index 7f810f33a92c..1f12f2415a9b 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/python/ElectronLikelihoodToolMapping.py
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/python/ElectronLikelihoodToolMapping.py
@@ -1,61 +1,50 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-##=============================================================================
-## Name: ElectronLikelihoodToolMapping.py
-##
-## Author: Tulay Cuhadar Donszelmann, Jovan Mitrevski, Kurt Brendlinger
-## Created: August 2013
-##
-## Description: Find mapping of mask and function for ID quality
-##=============================================================================
+# =============================================================================
+# Name: ElectronLikelihoodToolMapping.py
+#
+# Author: Tulay Cuhadar Donszelmann, Jovan Mitrevski, Kurt Brendlinger
+# Created: August 2013
+#
+# Description: Find mapping of mask and function for ID quality
+# =============================================================================
from ElectronPhotonSelectorTools.LikelihoodEnums import LikeEnum
+import ElectronPhotonSelectorTools.ElectronLikelihoodMenuDefs as ElectronLikelihoodMenuDefs
+
class electronLHmenu:
- customMenu = 0
- trigger2012 = 1
- trigger2015 = 2
- offline2015 = 3
- offlineMC16 = 4
+ trigger2015 = 1
+ offline2015 = 2
+ offlineMC16 = 3
-import ElectronPhotonSelectorTools.ElectronLikelihoodMenuDefs as ElectronLikelihoodMenuDefs
# format - key: (mask, function)
-ElectronLHMapCustom = {
- LikeEnum.Medium:( LikeEnum.CustomOperatingPoint, ElectronLikelihoodMenuDefs.ElectronLikelihoodCUSTOMMediumConfig )
- }
-
-ElectronLHMapTrigger2012 = {
- LikeEnum.Medium:( LikeEnum.CustomOperatingPoint, ElectronLikelihoodMenuDefs.ElectronLikelihoodCUSTOMMediumNoGSFConfig )
- }
ElectronLHMapTrigger2015 = {
- LikeEnum.Loose: ( LikeEnum.CustomOperatingPoint, ElectronLikelihoodMenuDefs.ElectronLikelihoodLooseTriggerConfig2015 ),
- LikeEnum.Medium: ( LikeEnum.CustomOperatingPoint, ElectronLikelihoodMenuDefs.ElectronLikelihoodMediumTriggerConfig2015 ),
- LikeEnum.Tight: ( LikeEnum.CustomOperatingPoint, ElectronLikelihoodMenuDefs.ElectronLikelihoodTightTriggerConfig2015 ),
- }
+ LikeEnum.Loose: (LikeEnum.CustomOperatingPoint, ElectronLikelihoodMenuDefs.ElectronLikelihoodLooseTriggerConfig2015),
+ LikeEnum.Medium: (LikeEnum.CustomOperatingPoint, ElectronLikelihoodMenuDefs.ElectronLikelihoodMediumTriggerConfig2015),
+ LikeEnum.Tight: (LikeEnum.CustomOperatingPoint, ElectronLikelihoodMenuDefs.ElectronLikelihoodTightTriggerConfig2015),
+}
ElectronLHMapOffline2015 = {
- LikeEnum.VeryLoose: ( LikeEnum.CustomOperatingPoint, ElectronLikelihoodMenuDefs.ElectronLikelihoodVeryLooseOfflineConfig2015 ),
- LikeEnum.Loose: ( LikeEnum.CustomOperatingPoint, ElectronLikelihoodMenuDefs.ElectronLikelihoodLooseOfflineConfig2015 ),
- LikeEnum.Medium: ( LikeEnum.CustomOperatingPoint, ElectronLikelihoodMenuDefs.ElectronLikelihoodMediumOfflineConfig2015 ),
- LikeEnum.Tight: ( LikeEnum.CustomOperatingPoint, ElectronLikelihoodMenuDefs.ElectronLikelihoodTightOfflineConfig2015 ),
- }
+ LikeEnum.VeryLoose: (LikeEnum.CustomOperatingPoint, ElectronLikelihoodMenuDefs.ElectronLikelihoodVeryLooseOfflineConfig2015),
+ LikeEnum.Loose: (LikeEnum.CustomOperatingPoint, ElectronLikelihoodMenuDefs.ElectronLikelihoodLooseOfflineConfig2015),
+ LikeEnum.Medium: (LikeEnum.CustomOperatingPoint, ElectronLikelihoodMenuDefs.ElectronLikelihoodMediumOfflineConfig2015),
+ LikeEnum.Tight: (LikeEnum.CustomOperatingPoint, ElectronLikelihoodMenuDefs.ElectronLikelihoodTightOfflineConfig2015),
+}
ElectronLHMapOffline2016 = {
- LikeEnum.VeryLoose: ( LikeEnum.CustomOperatingPoint, ElectronLikelihoodMenuDefs.ElectronLikelihoodVeryLooseOfflineConfig2016 ),
- LikeEnum.Loose: ( LikeEnum.CustomOperatingPoint, ElectronLikelihoodMenuDefs.ElectronLikelihoodLooseOfflineConfig2016 ),
- LikeEnum.Medium: ( LikeEnum.CustomOperatingPoint, ElectronLikelihoodMenuDefs.ElectronLikelihoodMediumOfflineConfig2016 ),
- LikeEnum.Tight: ( LikeEnum.CustomOperatingPoint, ElectronLikelihoodMenuDefs.ElectronLikelihoodTightOfflineConfig2016 ),
- }
+ LikeEnum.VeryLoose: (LikeEnum.CustomOperatingPoint, ElectronLikelihoodMenuDefs.ElectronLikelihoodVeryLooseOfflineConfig2016),
+ LikeEnum.Loose: (LikeEnum.CustomOperatingPoint, ElectronLikelihoodMenuDefs.ElectronLikelihoodLooseOfflineConfig2016),
+ LikeEnum.Medium: (LikeEnum.CustomOperatingPoint, ElectronLikelihoodMenuDefs.ElectronLikelihoodMediumOfflineConfig2016),
+ LikeEnum.Tight: (LikeEnum.CustomOperatingPoint, ElectronLikelihoodMenuDefs.ElectronLikelihoodTightOfflineConfig2016),
+}
+
def ElectronLikelihoodMap(quality, menu):
- if menu == electronLHmenu.customMenu:
- return ElectronLHMapCustom[quality]
- elif menu == electronLHmenu.trigger2012:
- return ElectronLHMapTrigger2012[quality]
- elif menu == electronLHmenu.trigger2015:
+ if menu == electronLHmenu.trigger2015:
return ElectronLHMapTrigger2015[quality]
elif menu == electronLHmenu.offline2015:
return ElectronLHMapOffline2015[quality]
--
GitLab
From b27693a96a29a3ecd95d9a99458147810abeeecc Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Sat, 14 Aug 2021 18:45:16 +0200
Subject: [PATCH 045/272] PhysValMonitoring clang-tidy related fixes
---
.../PhysValMonitoring/src/BTagPlots.cxx | 12 +++--
.../PhysValMonitoring/src/BTagPlots.h | 8 ++--
.../PhysValMonitoring/src/KinematicsPlots.cxx | 10 ++--
.../PhysValMonitoring/src/KinematicsPlots.h | 18 ++++----
.../PhysValMonitoring/src/METPlots.cxx | 12 +++--
.../PhysValMonitoring/src/METPlots.h | 14 +++---
.../PhysValMonitoring/src/PhysValExample.cxx | 46 +++++++++----------
.../PhysValMonitoring/src/PhysValExample.h | 4 +-
.../PhysValMonitoring/src/TrkAndVtxPlots.cxx | 8 ++--
.../PhysValMonitoring/src/TrkAndVtxPlots.h | 20 ++++----
10 files changed, 82 insertions(+), 70 deletions(-)
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/BTagPlots.cxx b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/BTagPlots.cxx
index b8ca1b4de8d9..10d96f247a47 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/BTagPlots.cxx
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/BTagPlots.cxx
@@ -1,15 +1,19 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
+#include <utility>
+
+
+
#include "BTagPlots.h"
using CLHEP::GeV;
namespace PhysVal{
- BTagPlots::BTagPlots(PlotBase* pParent, std::string sDir, std::string sParticleType):PlotBase(pParent, sDir),
-m_sParticleType(sParticleType)
+ BTagPlots::BTagPlots(PlotBase* pParent, const std::string& sDir, std::string sParticleType):PlotBase(pParent, sDir),
+m_sParticleType(std::move(sParticleType))
{}
void BTagPlots::initializePlots(){
@@ -20,7 +24,7 @@ void BTagPlots::initializePlots(){
std::cout << "filling b-tagging plots with BS weight: " << evt->beamSpotWeight();
}
- void BTagPlots::fill(unsigned int nbtag,const xAOD::EventInfo* evt){
+ void BTagPlots::fill(unsigned int nbtag,const xAOD::EventInfo* evt) const{
n->Fill(nbtag,evt->beamSpotWeight());
}
}
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/BTagPlots.h b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/BTagPlots.h
index 6fa4e5e69398..651517767c3d 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/BTagPlots.h
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/BTagPlots.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef PHYSVALMONITORING_BTagPLOTS_H
@@ -14,13 +14,13 @@ namespace PhysVal{
class BTagPlots:public PlotBase {
public:
- BTagPlots(PlotBase* pParent, std::string sDir, std::string sParticleType);
+ BTagPlots(PlotBase* pParent, const std::string& sDir, std::string sParticleType);
void fill(const xAOD::BTagging* btag,const xAOD::EventInfo* evt);
- void fill(unsigned int nbtag,const xAOD::EventInfo* evt);
+ void fill(unsigned int nbtag,const xAOD::EventInfo* evt) const;
// Reco only information
std::string m_sParticleType;
- TH1* n;
+ TH1* n = nullptr;
private:
virtual void initializePlots();
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/KinematicsPlots.cxx b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/KinematicsPlots.cxx
index 338999ac36b1..b43d4d93e528 100755
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/KinematicsPlots.cxx
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/KinematicsPlots.cxx
@@ -1,15 +1,19 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
+#include <utility>
+
+
+
#include "KinematicsPlots.h"
using CLHEP::GeV;
namespace PhysVal{
-KinematicsPlots::KinematicsPlots(PlotBase* pParent, std::string sDir, std::string sParticleType):PlotBase(pParent, sDir),
-m_sParticleType(sParticleType)
+KinematicsPlots::KinematicsPlots(PlotBase* pParent, const std::string& sDir, std::string sParticleType):PlotBase(pParent, sDir),
+m_sParticleType(std::move(sParticleType))
{}
void KinematicsPlots::initializePlots(){
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/KinematicsPlots.h b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/KinematicsPlots.h
index f763590541c1..f86b6cf6970e 100755
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/KinematicsPlots.h
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/KinematicsPlots.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef PHYSVALMONITORING_KINEMATICSPLOTS_H
@@ -14,7 +14,7 @@ namespace PhysVal{
class KinematicsPlots:public PlotBase {
public:
- KinematicsPlots(PlotBase* pParent, std::string sDir, std::string sParticleType);
+ KinematicsPlots(PlotBase* pParent, const std::string& sDir, std::string sParticleType);
void fill(const xAOD::IParticle* part,const xAOD::EventInfo* evt);
void fill(const xAOD::EventInfo* evt);
@@ -23,15 +23,15 @@ class KinematicsPlots:public PlotBase {
// Reco only information
std::string m_sParticleType;
- TH1* n;
+ TH1* n = nullptr;
- TH1* et;
- TH1* eta;
- TH1* phi;
+ TH1* et = nullptr;
+ TH1* eta = nullptr;
+ TH1* phi = nullptr;
- TH1* lead_et;
- TH1* lead_eta;
- TH1* lead_phi;
+ TH1* lead_et = nullptr;
+ TH1* lead_eta = nullptr;
+ TH1* lead_phi = nullptr;
private:
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/METPlots.cxx b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/METPlots.cxx
index 55d51dd29d1d..4e5b8e845a65 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/METPlots.cxx
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/METPlots.cxx
@@ -1,15 +1,19 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
+#include <utility>
+
+
+
#include "METPlots.h"
using CLHEP::GeV;
namespace PhysVal{
- METPlots::METPlots(PlotBase* pParent, std::string sDir, std::string sParticleType):PlotBase(pParent, sDir),
-m_sParticleType(sParticleType)
+ METPlots::METPlots(PlotBase* pParent, const std::string& sDir, std::string sParticleType):PlotBase(pParent, sDir),
+m_sParticleType(std::move(sParticleType))
{}
void METPlots::initializePlots(){
@@ -19,7 +23,7 @@ void METPlots::initializePlots(){
met_sumet = Book1D("SumEt", "MET " + m_sParticleType + " Ex; #Sum E_{t} ;Events", 100, 0., 2000);
}
- void METPlots::fill(const xAOD::MissingET* met,const xAOD::EventInfo* evt){
+ void METPlots::fill(const xAOD::MissingET* met,const xAOD::EventInfo* evt) const{
met_ex->Fill(met->mpx()/GeV,evt->beamSpotWeight());
met_ey->Fill(met->mpy()/GeV,evt->beamSpotWeight());
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/METPlots.h b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/METPlots.h
index 9e746cf7839f..b1e508969fee 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/METPlots.h
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/METPlots.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef PHYSVALMONITORING_METPLOTS_H
@@ -14,15 +14,15 @@ namespace PhysVal{
class METPlots:public PlotBase {
public:
- METPlots(PlotBase* pParent, std::string sDir, std::string sParticleType = "RefFinal");
- void fill(const xAOD::MissingET* met,const xAOD::EventInfo* evt);
+ METPlots(PlotBase* pParent, const std::string& sDir, std::string sParticleType = "RefFinal");
+ void fill(const xAOD::MissingET* met,const xAOD::EventInfo* evt) const;
// Reco only information
std::string m_sParticleType;
- TH1* met_ex;
- TH1* met_ey;
- TH1* met_et;
- TH1* met_sumet;
+ TH1* met_ex = nullptr;
+ TH1* met_ey = nullptr;
+ TH1* met_et = nullptr;
+ TH1* met_sumet = nullptr;
private:
virtual void initializePlots();
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/PhysValExample.cxx b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/PhysValExample.cxx
index c3cfbf6a9624..6943cd32e4c3 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/PhysValExample.cxx
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/PhysValExample.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// PhysValExample.cxx
@@ -47,14 +47,14 @@ namespace PhysVal {
const std::string& name,
const IInterface* parent ) :
ManagedMonitorToolBase( type, name, parent ),
- m_jetPlots(0, "Summary/Jet/", "Jet"),
- m_elecPlots(0, "Summary/Electron/", "Electron"),
- m_photonPlots(0, "Summary/Photon/", "Photon"),
- m_muonPlots(0, "Summary/Muon/", "Muon"),
- m_tauPlots(0, "Summary/Tau/", "Tau"),
- m_trkvtxPlots(0, "Summary/TrackAndVertex/"),
- m_metPlots(0, "Summary/MET/", "RefFinal"),
- m_btagPlots(0, "Summary/BTag/", "IP3D")
+ m_jetPlots(nullptr, "Summary/Jet/", "Jet"),
+ m_elecPlots(nullptr, "Summary/Electron/", "Electron"),
+ m_photonPlots(nullptr, "Summary/Photon/", "Photon"),
+ m_muonPlots(nullptr, "Summary/Muon/", "Muon"),
+ m_tauPlots(nullptr, "Summary/Tau/", "Tau"),
+ m_trkvtxPlots(nullptr, "Summary/TrackAndVertex/"),
+ m_metPlots(nullptr, "Summary/MET/", "RefFinal"),
+ m_btagPlots(nullptr, "Summary/BTag/", "IP3D")
{
declareProperty( "JetContainerName", m_jetName = "AntiKt4EMTopoJets" );
@@ -112,7 +112,7 @@ namespace PhysVal {
ATH_CHECK(book(m_metPlots));
}
- for (auto name : m_timingNames) {
+ for (const auto& name : m_timingNames) {
if (name == "EVNTtoHITS") {
m_timingPlots.push_back(new TH1F(("Timing" + name).c_str(), ("Timing" + name).c_str(), 10000, 0, 10000));
} else {
@@ -131,14 +131,14 @@ namespace PhysVal {
if (m_detailLevel < 10) return StatusCode::SUCCESS;
// event Info
- const xAOD::EventInfo* event(0);
+ const xAOD::EventInfo* event(nullptr);
ATH_CHECK(evtStore()->retrieve(event, "EventInfo"));
// Jets
int nbtag(0);
if (m_doExJet){
m_jetPlots.initializeEvent();
- const xAOD::JetContainer* jets(0);
+ const xAOD::JetContainer* jets(nullptr);
ATH_CHECK(evtStore()->retrieve(jets, m_jetName));
for (auto jet : *jets) {
m_jetPlots.fill(jet,event);
@@ -153,37 +153,37 @@ namespace PhysVal {
// Electrons
m_elecPlots.initializeEvent();
- const xAOD::ElectronContainer* electrons(0);
+ const xAOD::ElectronContainer* electrons(nullptr);
ATH_CHECK(evtStore()->retrieve(electrons, m_elecName));
for (auto elec : *electrons) m_elecPlots.fill(elec,event);
m_elecPlots.fill(event);
// Photons
m_photonPlots.initializeEvent();
- const xAOD::PhotonContainer* photons(0);
+ const xAOD::PhotonContainer* photons(nullptr);
ATH_CHECK(evtStore()->retrieve(photons, m_photonName));
for (auto photon : *photons) m_photonPlots.fill(photon,event);
m_photonPlots.fill(event);
// Muons
m_muonPlots.initializeEvent();
- const xAOD::MuonContainer* muons(0);
+ const xAOD::MuonContainer* muons(nullptr);
ATH_CHECK(evtStore()->retrieve(muons, m_muonName));
for (auto muon : *muons) m_muonPlots.fill(muon,event);
m_muonPlots.fill(event);
// Taus
m_tauPlots.initializeEvent();
- const xAOD::TauJetContainer* taus(0);
+ const xAOD::TauJetContainer* taus(nullptr);
ATH_CHECK(evtStore()->retrieve(taus, m_tauName));
for (auto tau : *taus) m_tauPlots.fill(tau,event);
m_tauPlots.fill(event);
// Tracks/Vertices
- const xAOD::TrackParticleContainer* trks(0);
+ const xAOD::TrackParticleContainer* trks(nullptr);
ATH_CHECK(evtStore()->retrieve(trks, m_trackName));
- const xAOD::VertexContainer* vtxs(0);
+ const xAOD::VertexContainer* vtxs(nullptr);
ATH_CHECK(evtStore()->retrieve(vtxs, m_vertexName));
for (auto vtx : *vtxs) m_trkvtxPlots.fill(vtx,event);
@@ -193,7 +193,7 @@ namespace PhysVal {
if (m_doExMET){
- const xAOD::MissingETContainer* met_container (0);
+ const xAOD::MissingETContainer* met_container (nullptr);
ATH_CHECK(evtStore()->retrieve(met_container, m_metName));
const xAOD::MissingET* met = (*met_container)["FinalClus"];
@@ -204,7 +204,7 @@ namespace PhysVal {
m_metPlots.fill(met,event);
}
int i(0);
- for (auto name : m_timingNames) {
+ for (const auto& name : m_timingNames) {
float time;
if (getTiming(name, time).isSuccess()) {
m_timingPlots[i]->Fill(time,event->beamSpotWeight());
@@ -233,11 +233,11 @@ namespace PhysVal {
// Protected methods:
///////////////////////////////////////////////////////////////////
- StatusCode PhysValExample::getTiming(std::string name, float& recoTime) {
+ StatusCode PhysValExample::getTiming(const std::string& name, float& recoTime) {
// Code form
// m_recoInclPers
- const RecoTimingObj* recTiming(0);
+ const RecoTimingObj* recTiming(nullptr);
recoTime = 0;
if (evtStore()->contains<RecoTimingObj>(name + "_timings")) {
if (evtStore()->retrieve( recTiming, name + "_timings" ).isFailure()) {
@@ -247,7 +247,7 @@ namespace PhysVal {
bool recoInclPers(true);
if (recoInclPers) {
- if ((*recTiming).size() > 0)
+ if (!(*recTiming).empty())
recoTime=*((*recTiming).rbegin());
} else {
if ((*recTiming).size() > 1)
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/PhysValExample.h b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/PhysValExample.h
index f818989a0f00..6879984dc2e0 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/PhysValExample.h
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/PhysValExample.h
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// PhysValExample.h
@@ -98,7 +98,7 @@ class PhysValExample
std::vector<TH1*> m_timingPlots;
StatusCode book(PlotBase& plots);
- StatusCode getTiming(std::string name, float& recoTime);
+ StatusCode getTiming(const std::string& name, float& recoTime);
//Flags to determine whether to fill example jet,met,btag plots
bool m_doExJet;
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/TrkAndVtxPlots.cxx b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/TrkAndVtxPlots.cxx
index 1d65a52ad0e6..f5798e8f8c7a 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/TrkAndVtxPlots.cxx
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/TrkAndVtxPlots.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "TrkAndVtxPlots.h"
@@ -10,7 +10,7 @@ using CLHEP::GeV;
namespace PhysVal{
-TrkAndVtxPlots::TrkAndVtxPlots(PlotBase* pParent, std::string sDir):PlotBase(pParent, sDir)
+TrkAndVtxPlots::TrkAndVtxPlots(PlotBase* pParent, const std::string& sDir):PlotBase(pParent, sDir)
{}
void TrkAndVtxPlots::initializePlots(){
@@ -24,7 +24,7 @@ void TrkAndVtxPlots::initializePlots(){
mu = Book1D("mu", "Pileup; mu ;Events", 120, 0., 120);
}
- void TrkAndVtxPlots::fill(const xAOD::Vertex* vtx,const xAOD::EventInfo* evt){
+ void TrkAndVtxPlots::fill(const xAOD::Vertex* vtx,const xAOD::EventInfo* evt) const{
vtx_x->Fill(vtx->x(),evt->beamSpotWeight());
vtx_y->Fill(vtx->y(),evt->beamSpotWeight());
@@ -36,7 +36,7 @@ void TrkAndVtxPlots::initializePlots(){
std::cout << "filling TrackAndVertex plots with BS weight: " << evt->beamSpotWeight();
}
- void TrkAndVtxPlots::fill(unsigned int ntrack, unsigned int nvertex, float pileup,const xAOD::EventInfo* evt){
+ void TrkAndVtxPlots::fill(unsigned int ntrack, unsigned int nvertex, float pileup,const xAOD::EventInfo* evt) const{
ntrk->Fill(ntrack,evt->beamSpotWeight());
nvtx->Fill(nvertex,evt->beamSpotWeight());
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/TrkAndVtxPlots.h b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/TrkAndVtxPlots.h
index b3f2d4039dc8..977eb925956c 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/TrkAndVtxPlots.h
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/TrkAndVtxPlots.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef PHYSVALMONITORING_TRKANDVTXPLOTS_H
@@ -15,20 +15,20 @@ namespace PhysVal{
class TrkAndVtxPlots:public PlotBase {
public:
- TrkAndVtxPlots(PlotBase* pParent, std::string sDir);
+ TrkAndVtxPlots(PlotBase* pParent, const std::string& sDir);
void fill(const xAOD::TrackParticle* trk,const xAOD::EventInfo* evt);
- void fill(const xAOD::Vertex* vtx,const xAOD::EventInfo* evt);
- void fill(unsigned int ntrack, unsigned int nvertex, float pileup = 0,const xAOD::EventInfo* evt=NULL);
+ void fill(const xAOD::Vertex* vtx,const xAOD::EventInfo* evt) const;
+ void fill(unsigned int ntrack, unsigned int nvertex, float pileup = 0,const xAOD::EventInfo* evt=NULL) const;
// Reco only information
- TH1* ntrk;
+ TH1* ntrk = nullptr;
- TH1* nvtx;
- TH1* vtx_x;
- TH1* vtx_y;
- TH1* vtx_z;
+ TH1* nvtx = nullptr;
+ TH1* vtx_x = nullptr;
+ TH1* vtx_y = nullptr;
+ TH1* vtx_z = nullptr;
- TH1* mu;
+ TH1* mu = nullptr;
private:
virtual void initializePlots();
--
GitLab
From 827c6eb0cf99e91f482202de213ef5ea06b106f6 Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Sat, 14 Aug 2021 19:19:06 +0200
Subject: [PATCH 046/272] PhysValMET clang-tidy related fixes
---
.../MissingEtDQA/src/PhysValMET.cxx | 109 ++++++++++--------
.../MissingEtDQA/src/PhysValMET.h | 10 +-
2 files changed, 63 insertions(+), 56 deletions(-)
diff --git a/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/PhysValMET.cxx b/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/PhysValMET.cxx
index eb6e2eaeacea..5480a2d57f9a 100644
--- a/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/PhysValMET.cxx
+++ b/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/PhysValMET.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// PhysValMET.cxx
@@ -13,10 +13,9 @@
#include "PhysValMET.h"
// STL includes
-#include <vector>
-#include <map>
#include <cmath>
-#include <math.h>
+#include <map>
+#include <vector>
// FrameWork includes
#include "GaudiKernel/IToolSvc.h"
@@ -132,19 +131,19 @@ namespace MissingEtDQA {
m_names["PVTrack_Pileup"] = "Track MET for each pileup vertex";
m_types.clear();
- m_types.push_back("AntiKt4EMTopo");
- m_types.push_back("AntiKt4EMPFlow");
+ m_types.emplace_back("AntiKt4EMTopo");
+ m_types.emplace_back("AntiKt4EMPFlow");
m_terms.clear();
- m_terms.push_back("RefEle");
- m_terms.push_back("RefGamma");
- m_terms.push_back("RefTau");
- m_terms.push_back("Muons");
- m_terms.push_back("RefJet");
- m_terms.push_back("SoftClus");
- m_terms.push_back("PVSoftTrk");
- m_terms.push_back("FinalTrk");
- m_terms.push_back("FinalClus");
+ m_terms.emplace_back("RefEle");
+ m_terms.emplace_back("RefGamma");
+ m_terms.emplace_back("RefTau");
+ m_terms.emplace_back("Muons");
+ m_terms.emplace_back("RefJet");
+ m_terms.emplace_back("SoftClus");
+ m_terms.emplace_back("PVSoftTrk");
+ m_terms.emplace_back("FinalTrk");
+ m_terms.emplace_back("FinalClus");
ATH_MSG_INFO("Retrieving tools...");
@@ -303,24 +302,28 @@ namespace MissingEtDQA {
name_sub = name_met + "/Correlations";
std::vector<std::string> corrClus_names;
- corrClus_names.push_back("RefEle");
- corrClus_names.push_back("RefGamma");
- corrClus_names.push_back("RefTau");
- corrClus_names.push_back("Muons");
- corrClus_names.push_back("RefJet");
- corrClus_names.push_back("SoftClus");
+ corrClus_names.emplace_back("RefEle");
+ corrClus_names.emplace_back("RefGamma");
+ corrClus_names.emplace_back("RefTau");
+ corrClus_names.emplace_back("Muons");
+ corrClus_names.emplace_back("RefJet");
+ corrClus_names.emplace_back("SoftClus");
std::vector<std::string> corrTrk_names;
- corrTrk_names.push_back("RefEle");
- corrTrk_names.push_back("RefGamma");
- corrTrk_names.push_back("RefTau");
- corrTrk_names.push_back("Muons");
- corrTrk_names.push_back("RefJet");
- corrTrk_names.push_back("PVSoftTrk");
-
- for(const auto& it : corrClus_names) {
+ corrTrk_names.emplace_back("RefEle");
+ corrTrk_names.emplace_back("RefGamma");
+ corrTrk_names.emplace_back("RefTau");
+ corrTrk_names.emplace_back("Muons");
+ corrTrk_names.emplace_back("RefJet");
+ corrTrk_names.emplace_back("PVSoftTrk");
+
+ v_MET_CorrFinalClus_Ref.reserve(corrClus_names.size());
+
+for(const auto& it : corrClus_names) {
v_MET_CorrFinalClus_Ref.push_back( new TH2D((name_met + "_" + it + "_FinalClus").c_str(), (name_met + " " + m_names[it] + " vs. CST MET; E_{T," + it + "}^{miss} [GeV]; E_{T,CST}^{miss} [GeV]; Entries").c_str(), nbinp, 0., suptmi, nbinp, 0., suptmi) );
}
- for(const auto& it : corrTrk_names) {
+ v_MET_CorrFinalTrk_Ref.reserve(corrTrk_names.size());
+
+for(const auto& it : corrTrk_names) {
v_MET_CorrFinalTrk_Ref.push_back( new TH2D((name_met + "_" + it + "_FinalTrk").c_str(), (name_met + " " + m_names[it] + " vs. TST MET; E_{T," + it + "}^{miss} [GeV]; E_{T,TST}^{miss} [GeV]; Entries").c_str(), nbinp, 0., suptmi, nbinp, 0., suptmi) );
}
@@ -335,11 +338,11 @@ namespace MissingEtDQA {
}
std::vector<std::string> sum_names;
- sum_names.push_back("RefEle");
- sum_names.push_back("RefGamma");
- sum_names.push_back("RefTau");
- sum_names.push_back("Muons");
- sum_names.push_back("RefJet");
+ sum_names.emplace_back("RefEle");
+ sum_names.emplace_back("RefGamma");
+ sum_names.emplace_back("RefTau");
+ sum_names.emplace_back("Muons");
+ sum_names.emplace_back("RefJet");
m_dir_met.clear();
@@ -458,10 +461,14 @@ namespace MissingEtDQA {
}
name_sub = name_met + "/Correlations";
- for(const auto& it : corrClus_names) {
+ v_MET_CorrFinalClus_Reb.reserve(corrClus_names.size());
+
+for(const auto& it : corrClus_names) {
v_MET_CorrFinalClus_Reb.push_back( new TH2D((name_met + "_" + it + "_FinalClus").c_str(), (name_met + " " + m_names[it] + " vs. CST MET; E_{T," + it + "}^{miss} [GeV]; E_{T,CST}^{miss} [GeV]; Entries").c_str(), nbinp, 0., suptmi, nbinp, 0., suptmi) );
}
- for(const auto& it : corrTrk_names) {
+ v_MET_CorrFinalTrk_Reb.reserve(corrTrk_names.size());
+
+for(const auto& it : corrTrk_names) {
v_MET_CorrFinalTrk_Reb.push_back( new TH2D((name_met + "_" + it + "_FinalTrk").c_str(), (name_met + " " + m_names[it] + " vs. TST MET; E_{T," + it + "}^{miss} [GeV]; E_{T,TST}^{miss} [GeV]; Entries").c_str(), nbinp, 0., suptmi, nbinp, 0., suptmi) );
}
@@ -555,13 +562,13 @@ namespace MissingEtDQA {
return StatusCode::SUCCESS;
//Beamspot weight
- const xAOD::EventInfo* eventInfo(0);
+ const xAOD::EventInfo* eventInfo(nullptr);
ATH_CHECK(evtStore()->retrieve(eventInfo, "EventInfo"));
float weight = eventInfo->beamSpotWeight();
//Retrieve MET Truth
- const xAOD::MissingETContainer* met_Truth = 0;
+ const xAOD::MissingETContainer* met_Truth = nullptr;
if(m_doTruth) {
ATH_CHECK( evtStore()->retrieve(met_Truth,"MET_Truth") );
if (!met_Truth) {
@@ -571,7 +578,7 @@ namespace MissingEtDQA {
}
//Physics Objects
- const xAOD::MuonContainer* muons = 0;
+ const xAOD::MuonContainer* muons = nullptr;
ATH_CHECK( evtStore()->retrieve(muons,m_muonColl) );
if (!muons) {
ATH_MSG_ERROR ( "Failed to retrieve Muon container. Exiting." );
@@ -586,7 +593,7 @@ namespace MissingEtDQA {
}
}
- const xAOD::ElectronContainer* electrons = 0;
+ const xAOD::ElectronContainer* electrons = nullptr;
ATH_CHECK( evtStore()->retrieve(electrons,m_eleColl) );
if (!electrons) {
ATH_MSG_ERROR ( "Failed to retrieve Electron container. Exiting." );
@@ -601,7 +608,7 @@ namespace MissingEtDQA {
}
}
- const xAOD::PhotonContainer* photons = 0;
+ const xAOD::PhotonContainer* photons = nullptr;
ATH_CHECK( evtStore()->retrieve(photons,m_gammaColl) );
if (!electrons) {
ATH_MSG_ERROR ( "Failed to retrieve Photon container. Exiting." );
@@ -614,7 +621,7 @@ namespace MissingEtDQA {
}
}
- const TauJetContainer* taus = 0;
+ const TauJetContainer* taus = nullptr;
ATH_CHECK( evtStore()->retrieve(taus, m_tauColl) );
if(!taus) {
ATH_MSG_ERROR("Failed to retrieve TauJet container: " << m_tauColl);
@@ -724,7 +731,7 @@ namespace MissingEtDQA {
// Retrieve Jets
std::string name_jet = type + "Jets";
- const xAOD::JetContainer* jets = 0;
+ const xAOD::JetContainer* jets = nullptr;
ATH_CHECK( evtStore()->retrieve(jets,name_jet) );
if (!jets) {
ATH_MSG_ERROR ( "Failed to retrieve Jet container: " << name_jet << ". Exiting." );
@@ -777,7 +784,7 @@ namespace MissingEtDQA {
// Fill MET_Ref
std::string name_met = "MET_Reference_" + type;
- const xAOD::MissingETContainer* met_Ref = 0;
+ const xAOD::MissingETContainer* met_Ref = nullptr;
// We're not building METReference anymore in derivations
if(m_doMETRefPlots){
@@ -791,7 +798,7 @@ namespace MissingEtDQA {
ATH_MSG_INFO( " MET_Ref_" << type << ":" );
for(const auto& it : *met_Ref) {
- std::string name = it->name();
+ const std::string& name = it->name();
if(name == "RefEle"){
(m_MET_Ref[type]).at(0)->Fill((*met_Ref)[name.c_str()]->met()/1000., weight);
(m_MET_Ref_x[type]).at(0)->Fill((*met_Ref)[name.c_str()]->mpx()/1000., weight);
@@ -874,13 +881,13 @@ namespace MissingEtDQA {
m_mapname = "METAssoc_"+type;
m_corename = "MET_Core_"+type;
- const MissingETAssociationMap* metMap = 0;
+ const MissingETAssociationMap* metMap = nullptr;
if( evtStore()->retrieve(metMap, m_mapname).isFailure() ) {
ATH_MSG_WARNING("Unable to retrieve MissingETAssociationMap: " << m_mapname);
return StatusCode::SUCCESS;
}
MissingETAssociationHelper metHelper(metMap);
- const MissingETContainer* coreMet(0);
+ const MissingETContainer* coreMet(nullptr);
if( evtStore()->retrieve(coreMet, m_corename).isFailure() ) {
ATH_MSG_WARNING("Unable to retrieve MissingETContainer: " << m_corename);
return StatusCode::SUCCESS;
@@ -1064,7 +1071,7 @@ namespace MissingEtDQA {
//Fill Correlation Plots
//Reference
for(const auto& it : *met_Ref) {
- std::string name = it->name();
+ const std::string& name = it->name();
if(name == "RefEle"){
(m_MET_CorrFinalTrk_Ref[type]).at(0)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalTrk"]->met()/1000., weight);
(m_MET_CorrFinalClus_Ref[type]).at(0)->Fill((*met_Ref)[name.c_str()]->met()/1000.,(*met_Ref)["FinalClus"]->met()/1000., weight);
@@ -1310,7 +1317,7 @@ namespace MissingEtDQA {
if(m_doMETRefPlots){
//Retrieve MET Track
- const xAOD::MissingETContainer* met_Track = 0;
+ const xAOD::MissingETContainer* met_Track = nullptr;
ATH_CHECK( evtStore()->retrieve(met_Track,"MET_Track") );
if (!met_Track) {
ATH_MSG_ERROR ( "Failed to retrieve MET_Track. Exiting." );
@@ -1326,7 +1333,7 @@ namespace MissingEtDQA {
m_MET_Track_phi->Fill((*met_Track)["Track"]->phi(), weight);
m_MET_Track_sum->Fill((*met_Track)["Track"]->sumet()/1000., weight);
- const xAOD::VertexContainer *vxCont = 0;
+ const xAOD::VertexContainer *vxCont = nullptr;
ATH_CHECK( evtStore()->retrieve(vxCont, "PrimaryVertices") );
for(const auto& vx : *vxCont) {
int N = vx->index();
diff --git a/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/PhysValMET.h b/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/PhysValMET.h
index 2b8372104fc3..db116db482dd 100644
--- a/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/PhysValMET.h
+++ b/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/PhysValMET.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// PhysValMET.h
@@ -112,10 +112,10 @@ class PhysValMET
std::map <std::string,std::string> m_names;
// Hists
- TH1D *m_MET_Track, *m_MET_Track_x, *m_MET_Track_y, *m_MET_Track_phi, *m_MET_Track_sum;
- TH1D *m_MET_PVTrack_Nominal, *m_MET_PVTrack_Nominal_x, *m_MET_PVTrack_Nominal_y, *m_MET_PVTrack_Nominal_phi, *m_MET_PVTrack_Nominal_sum;
- TH1D *m_MET_PVTrack_Pileup, *m_MET_PVTrack_Pileup_x, *m_MET_PVTrack_Pileup_y, *m_MET_PVTrack_Pileup_phi, *m_MET_PVTrack_Pileup_sum;
- TH1D *m_MET_Calo, *m_MET_Calo_x, *m_MET_Calo_y, *m_MET_Calo_phi, *m_MET_Calo_sum;
+ TH1D *m_MET_Track = nullptr, *m_MET_Track_x = nullptr, *m_MET_Track_y = nullptr, *m_MET_Track_phi = nullptr, *m_MET_Track_sum = nullptr;
+ TH1D *m_MET_PVTrack_Nominal = nullptr, *m_MET_PVTrack_Nominal_x = nullptr, *m_MET_PVTrack_Nominal_y = nullptr, *m_MET_PVTrack_Nominal_phi = nullptr, *m_MET_PVTrack_Nominal_sum = nullptr;
+ TH1D *m_MET_PVTrack_Pileup = nullptr, *m_MET_PVTrack_Pileup_x = nullptr, *m_MET_PVTrack_Pileup_y = nullptr, *m_MET_PVTrack_Pileup_phi = nullptr, *m_MET_PVTrack_Pileup_sum = nullptr;
+ TH1D *m_MET_Calo = nullptr, *m_MET_Calo_x = nullptr, *m_MET_Calo_y = nullptr, *m_MET_Calo_phi = nullptr, *m_MET_Calo_sum = nullptr;
//Maps
std::map<std::string,std::vector<TH1D*> > m_MET_Ref;
--
GitLab
From d78c91473437a98da7612537ff351f61ca317b36 Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Sat, 14 Aug 2021 20:13:38 +0200
Subject: [PATCH 047/272] MuonDigitization clang-tidy and cppcheck related
fixes
---
.../CSC_Digitization/src/CSC_Digitizer.cxx | 6 +-
.../src/CscDigitizationTool.cxx | 28 ++--
.../src/MDT_Response_DigiTool.cxx | 4 +-
.../src/MdtDigitizationTool.cxx | 26 ++--
.../src/RT_Relation_DB_DigiTool.cxx | 4 +-
.../src/RT_Relation_DigiTool.cxx | 4 +-
.../MDT_Response/MDT_Response/Amplifier.h | 16 +--
.../MDT_Response/MDT_Response/MDT_Response.h | 28 ++--
.../MDT_Response/src/Amplifier.cxx | 4 +-
.../MDT_Response/src/MDT_Response.cxx | 10 +-
.../MDT_Response/src/MDT_ResponseTest.cxx | 6 +-
.../MM_Digitization/MM_DigitizationTool.h | 6 +-
.../MM_ElectronicsResponseSimulation.h | 4 +-
.../MM_Digitization/MM_IonizationCluster.h | 4 +-
.../MM_Digitization/MM_StripResponse.h | 12 +-
.../MM_StripsResponseSimulation.h | 12 +-
.../MM_Digitization/VMM_Shaper.h | 14 +-
.../src/MM_DigitizationTool.cxx | 28 ++--
.../src/MM_ElectronicsResponseSimulation.cxx | 4 +-
.../src/MM_StripsResponseSimulation.cxx | 18 +--
.../MM_Digitization/src/VMM_Shaper.cxx | 21 ++-
.../src/MM_FastDigitizer.cxx | 16 ++-
.../src/sTgcFastDigitizer.cxx | 12 +-
.../RPC_Digitization/RpcDigitizationTool.h | 10 +-
.../src/RpcDigitizationTool.cxx | 73 +++++-----
.../TGC_Digitization/src/TgcDigitMaker.cxx | 18 +--
.../src/TgcDigitizationTool.cxx | 20 +--
.../sTGC_Digitization/sTgcDigitMaker.h | 18 +--
.../sTGC_Digitization/src/sTgcDigitMaker.cxx | 128 +++---------------
.../src/sTgcDigitizationTool.cxx | 52 +++----
30 files changed, 260 insertions(+), 346 deletions(-)
diff --git a/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CSC_Digitizer.cxx b/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CSC_Digitizer.cxx
index b8cae689e7ac..d21fb21e5319 100644
--- a/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CSC_Digitizer.cxx
+++ b/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CSC_Digitizer.cxx
@@ -25,7 +25,7 @@ using namespace MuonGM;
CSC_Digitizer::CSC_Digitizer(CscHitIdHelper * cscHitHelper,
const MuonDetectorManager* muonMgr,
ICscCalibTool* pcalib) :
- m_cscIdHelper(NULL),
+ m_cscIdHelper(nullptr),
m_Polia(0.0),
m_timeWindowLowerOffset(0.0),
m_timeWindowUpperOffset(0.0),
@@ -34,7 +34,7 @@ CSC_Digitizer::CSC_Digitizer(CscHitIdHelper * cscHitHelper,
{
m_cscHitHelper = cscHitHelper;
m_muonMgr = muonMgr;
- m_sprob = 0;
+ m_sprob = nullptr;
m_pcalib = pcalib;
m_debug =0;
@@ -71,7 +71,7 @@ StatusCode CSC_Digitizer::initialize() {
// std::cout << "CSC_Digitizer::intialize() : MaxElectron " << m_maxElectron << std::endl;
m_sprob = new double[m_maxElectron];
- if (m_sprob == 0) {
+ if (m_sprob == nullptr) {
std::cout << "CSC_Digitizer::initialize() : cannot request memory from the heap" << std::endl;
return StatusCode::FAILURE;
}
diff --git a/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx b/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx
index e14ba870407e..67e3f90ad134 100644
--- a/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "MuonReadoutGeometry/MuonDetectorManager.h"
@@ -89,7 +89,7 @@ StatusCode CscDigitizationTool::initialize() {
// Inherited from PileUpTools
StatusCode CscDigitizationTool::prepareEvent(const EventContext& /*ctx*/, unsigned int /*nInputEvents*/) {
- if (0 == m_thpcCSC)
+ if (nullptr == m_thpcCSC)
m_thpcCSC = new TimedHitCollection<CSCSimHit>();
m_cscHitCollList.clear();
@@ -114,7 +114,7 @@ StatusCode CscDigitizationTool::processAllSubEvents(const EventContext& ctx) {
ATH_CHECK(cscSimData.record(std::make_unique<CscSimDataCollection>()));
//merging of the hit collection in getNextEvent method
- if (0 == m_thpcCSC ) {
+ if (nullptr == m_thpcCSC ) {
StatusCode sc = getNextEvent(ctx);
if (StatusCode::FAILURE == sc) {
ATH_MSG_INFO ( "There are no CSC hits in this event" );
@@ -204,7 +204,7 @@ StatusCode CscDigitizationTool::CoreDigitization(CscDigitContainer* cscDigits,Cs
}
const HepMcParticleLink::PositionFlag idxFlag = (phit.eventId()==0) ? HepMcParticleLink::IS_POSITION: HepMcParticleLink::IS_INDEX;
const HepMcParticleLink trackLink(phit->trackNumber(), phit.eventId(), evColl, idxFlag);
- for (; vecBeg != vecEnd; vecBeg++) {
+ for (; vecBeg != vecEnd; ++vecBeg) {
CscSimData::Deposit deposit(trackLink, CscMcData(energy, ypos, zpos));
myDeposits[(*vecBeg)].push_back(deposit);
}
@@ -215,7 +215,7 @@ StatusCode CscDigitizationTool::CoreDigitization(CscDigitContainer* cscDigits,Cs
// reset the pointer if it is not null
if (m_thpcCSC) {
delete m_thpcCSC;
- m_thpcCSC=0;
+ m_thpcCSC=nullptr;
}
// now loop over the digit map
@@ -224,7 +224,7 @@ StatusCode CscDigitizationTool::CoreDigitization(CscDigitContainer* cscDigits,Cs
if (m_newDigitEDM) {
double flat = CLHEP::RandFlat::shoot(rndmEngine, 0.0,1.0); // for other particles
- bool phaseToSet = (flat<0.5) ? true : false;
+ bool phaseToSet = flat<0.5;
if (phaseToSet)
return FillCollectionWithNewDigitEDM(data_SampleMapOddPhase, myDeposits, phaseToSet, cscDigits, cscSimData);
else
@@ -241,7 +241,7 @@ FillCollectionWithNewDigitEDM(csc_newmap& data_SampleMap,
bool phaseToSet, CscDigitContainer* cscDigits,CscSimDataCollection* cscSimData
) {
- CscDigitCollection * collection = 0;
+ CscDigitCollection * collection = nullptr;
IdContext context = m_idHelperSvc->cscIdHelper().channel_context();
IdContext cscContext = m_idHelperSvc->cscIdHelper().module_context();
@@ -297,7 +297,7 @@ FillCollectionWithNewDigitEDM(csc_newmap& data_SampleMap,
int sector = zsec*(2*phisec-istation+1);
auto depositsForHash = myDeposits.find(hashId);
- if (depositsForHash != myDeposits.end() && depositsForHash->second.size()) {
+ if (depositsForHash != myDeposits.end() && !depositsForHash->second.empty()) {
depositsForHash->second[0].second.setCharge(stripCharge);
cscSimData->insert ( std::make_pair(digitId, CscSimData(depositsForHash->second,0)) );
}
@@ -361,7 +361,7 @@ FillCollectionWithNewDigitEDM(csc_newmap& data_SampleMap,
StatusCode CscDigitizationTool::
FillCollectionWithOldDigitEDM(csc_map& data_map, std::map<IdentifierHash,deposits>& myDeposits,CscDigitContainer* cscDigits,CscSimDataCollection* cscSimData) {
- CscDigitCollection * collection = 0;
+ CscDigitCollection * collection = nullptr;
IdContext context = m_idHelperSvc->cscIdHelper().channel_context();
IdContext cscContext = m_idHelperSvc->cscIdHelper().module_context();
@@ -402,7 +402,7 @@ FillCollectionWithOldDigitEDM(csc_map& data_map, std::map<IdentifierHash,deposit
int sector = zsec*(2*phisec-istation+1);
auto depositsForHash = myDeposits.find(hashId);
- if (depositsForHash != myDeposits.end() && depositsForHash->second.size()) {
+ if (depositsForHash != myDeposits.end() && !depositsForHash->second.empty()) {
depositsForHash->second[0].second.setCharge(stripCharge);
cscSimData->insert ( std::make_pair(digitId, CscSimData(depositsForHash->second,0)) );
}
@@ -488,7 +488,7 @@ StatusCode CscDigitizationTool::getNextEvent(const EventContext& ctx) // This is
ATH_MSG_ERROR ( "Could not fill TimedHitCollList" );
return StatusCode::FAILURE;
}
- if (hitCollList.size()==0) {
+ if (hitCollList.empty()) {
ATH_MSG_ERROR ( "TimedHitCollList has size 0" );
return StatusCode::FAILURE;
} else {
@@ -522,12 +522,12 @@ StatusCode CscDigitizationTool::processBunchXing(int bunchXing,
{
ATH_MSG_DEBUG("CscDigitizationTool::processBunchXing() " << bunchXing);
- typedef PileUpMergeSvc::TimedList<CSCSimHitCollection>::type TimedHitCollList;
+ using TimedHitCollList = PileUpMergeSvc::TimedList<CSCSimHitCollection>::type;
TimedHitCollList hitCollList;
if (!(m_mergeSvc->retrieveSubSetEvtData(m_inputObjectName, hitCollList, bunchXing,
bSubEvents, eSubEvents).isSuccess()) &&
- hitCollList.size() == 0) {
+ hitCollList.empty()) {
ATH_MSG_ERROR("Could not fill TimedHitCollList");
return StatusCode::FAILURE;
} else {
@@ -539,7 +539,7 @@ StatusCode CscDigitizationTool::processBunchXing(int bunchXing,
TimedHitCollList::iterator endColl(hitCollList.end());
// Iterating over the list of collections
- for( ; iColl != endColl; iColl++){
+ for( ; iColl != endColl; ++iColl){
CSCSimHitCollection *hitCollPtr = new CSCSimHitCollection(*iColl->second);
PileUpTimeEventIndex timeIndex(iColl->first);
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/MDT_Response_DigiTool.cxx b/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/MDT_Response_DigiTool.cxx
index 9ce69eb87981..0d224aad3512 100644
--- a/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/MDT_Response_DigiTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/MDT_Response_DigiTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "MDT_Digitization/MDT_Response_DigiTool.h"
@@ -25,7 +25,7 @@ MDT_Response_DigiTool::MDT_Response_DigiTool(const std::string& type, const std:
MdtDigiToolOutput MDT_Response_DigiTool::digitize(const MdtDigiToolInput& input, CLHEP::HepRandomEngine* rndmEngine) {
m_tube.SetSegment(input.radius(), input.positionAlongWire());
ATH_MSG_DEBUG("Digitizing input ");
- if (m_DoQballGamma == true) {
+ if (m_DoQballGamma) {
double ParticleCharge = input.electriccharge();
double ParticleGamma = input.gamma();
if (ParticleGamma > 0.) {
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/MdtDigitizationTool.cxx b/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/MdtDigitizationTool.cxx
index 951ccc53f6f2..a5c6c12ab576 100644
--- a/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/MdtDigitizationTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/MdtDigitizationTool.cxx
@@ -60,7 +60,7 @@
#include "MdtCalibData/MdtTubeCalibContainer.h"
namespace {
// what about this? does this also need to be 1/m_signalSpeed ?
- static constexpr double s_inv_c_light(1. / Gaudi::Units::c_light);
+ constexpr double s_inv_c_light(1. / Gaudi::Units::c_light);
} // namespace
MdtDigitizationTool::MdtDigitizationTool(const std::string& type, const std::string& name, const IInterface* pIID) :
PileUpToolBase(type, name, pIID) {}
@@ -145,7 +145,7 @@ StatusCode MdtDigitizationTool::initialize() {
ATH_CHECK(m_calibrationDbTool.retrieve());
// Gather masked stations
- for (unsigned int i = 0; i < m_maskedStations.size(); i++) {
+ for (unsigned int i = 0; i < m_maskedStations.size(); ++i) {
std::string mask = m_maskedStations[i];
std::string maskedName = mask.substr(0, mask.find(':'));
std::string temps = mask.substr(maskedName.size() + 1, std::string::npos);
@@ -184,7 +184,7 @@ StatusCode MdtDigitizationTool::processBunchXing(int bunchXing, SubEventIterator
TimedHitCollList hitCollList;
if (!(m_mergeSvc->retrieveSubSetEvtData(m_inputObjectName, hitCollList, bunchXing, bSubEvents, eSubEvents).isSuccess()) &&
- hitCollList.size() == 0) {
+ hitCollList.empty()) {
ATH_MSG_ERROR("Could not fill TimedHitCollList");
return StatusCode::FAILURE;
} else {
@@ -195,7 +195,7 @@ StatusCode MdtDigitizationTool::processBunchXing(int bunchXing, SubEventIterator
TimedHitCollList::iterator endColl(hitCollList.end());
// Iterating over the list of collections
- for (; iColl != endColl; iColl++) {
+ for (; iColl != endColl; ++iColl) {
MDTSimHitCollection* hitCollPtr = new MDTSimHitCollection(*iColl->second);
PileUpTimeEventIndex timeIndex(iColl->first);
@@ -213,7 +213,7 @@ StatusCode MdtDigitizationTool::getNextEvent(const EventContext& ctx) {
ATH_MSG_DEBUG("MdtDigitizationTool::getNextEvent()");
// get the container(s)
- typedef PileUpMergeSvc::TimedList<MDTSimHitCollection>::type TimedHitCollList;
+ using TimedHitCollList = PileUpMergeSvc::TimedList<MDTSimHitCollection>::type;
// In case of single hits container just load the collection using read handles
if (!m_onlyUseContainerName) {
@@ -342,7 +342,7 @@ StatusCode MdtDigitizationTool::doDigitization(const EventContext& ctx, MdtDigit
int size_id = readCdo->getDeadStationsId().size();
ATH_MSG_DEBUG("Number of dead/missing stations retrieved from CondService= " << size_id);
- for (int k = 0; k < size_id; k++) {
+ for (int k = 0; k < size_id; ++k) {
Identifier Id = readCdo->getDeadStationsId()[k];
m_IdentifiersToMask.push_back(readCdo->getDeadStationsId()[k]);
ATH_MSG_VERBOSE("Dead/missing chambers id from CondDB: " << m_idHelperSvc->mdtIdHelper().show_to_string(Id));
@@ -389,7 +389,7 @@ bool MdtDigitizationTool::handleMDTSimhit(const TimedHitPtr<MDTSimHit>& phit, CL
// Important checks for hits (global time, position along tube, masked chambers etc..) DO NOT SET THIS CHECK TO FALSE IF YOU DON'T KNOW
// WHAT YOU'RE DOING !
if (m_checkMDTSimHits) {
- if (checkMDTSimHit(hit) == false) return false;
+ if (!checkMDTSimHit(hit)) return false;
}
const int id = hit.MDTid();
@@ -413,7 +413,7 @@ bool MdtDigitizationTool::handleMDTSimhit(const TimedHitPtr<MDTSimHit>& phit, CL
// find the detector element associated to the hit
const MuonGM::MdtReadoutElement* element = m_MuonGeoMgr->getMdtReadoutElement(DigitId);
- if (0 == element) {
+ if (nullptr == element) {
ATH_MSG_ERROR("MuonGeoManager does not return valid element for given id!");
return false;
} else {
@@ -653,7 +653,7 @@ bool MdtDigitizationTool::checkMDTSimHit(const MDTSimHit& hit) const {
//+MASKING OF DEAD/MISSING CHAMBERS
if (m_UseDeadChamberSvc) {
- for (unsigned int i = 0; i < m_IdentifiersToMask.size(); i++) {
+ for (unsigned int i = 0; i < m_IdentifiersToMask.size(); ++i) {
Identifier Id = m_IdentifiersToMask[i];
if ((stationName == m_idHelperSvc->mdtIdHelper().stationNameString(m_idHelperSvc->mdtIdHelper().stationName(Id))) &&
@@ -669,10 +669,10 @@ bool MdtDigitizationTool::checkMDTSimHit(const MDTSimHit& hit) const {
bool phiMasked = false;
bool masked = false;
- for (unsigned int i = 0; i < m_maskedStations.size(); i++) {
+ for (unsigned int i = 0; i < m_maskedStations.size(); ++i) {
bool temp = true;
- for (unsigned int k = 0; k < 3; k++) {
+ for (unsigned int k = 0; k < 3; ++k) {
char c = m_vMaskedStations[i].maskedName[k];
char cc = stationName[k];
if (c == '*') continue;
@@ -695,7 +695,7 @@ bool MdtDigitizationTool::checkMDTSimHit(const MDTSimHit& hit) const {
const MuonGM::MdtReadoutElement* element = m_MuonGeoMgr->getMdtReadoutElement(DigitId);
- if (0 == element) {
+ if (nullptr == element) {
ATH_MSG_ERROR("MuonGeoManager does not return valid element for given id!");
} else {
tubeL = element->tubeLength(DigitId);
@@ -733,7 +733,7 @@ bool MdtDigitizationTool::createDigits(MdtDigitContainer* digitContainer, MuonSi
Identifier currentElementId;
double currentDeadTime = 0.;
- MdtDigitCollection* digitCollection = 0;
+ MdtDigitCollection* digitCollection = nullptr;
// loop over sorted hits
m_hits.sort();
HitIt it = m_hits.begin();
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/RT_Relation_DB_DigiTool.cxx b/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/RT_Relation_DB_DigiTool.cxx
index 8b46ece9a9dc..1fd7f744f392 100644
--- a/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/RT_Relation_DB_DigiTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/RT_Relation_DB_DigiTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "MDT_Digitization/RT_Relation_DB_DigiTool.h"
@@ -63,7 +63,7 @@ double RT_Relation_DB_DigiTool::getDriftTime(double r, Identifier DigitId, CLHEP
double t = 0.0;
bool outOfBound = false;
- if (data != 0) {
+ if (data != nullptr) {
// get RT relation and resolution function
const MuonCalib::IRtRelation *rtRelation = data->rt();
const MuonCalib::IRtResolution *rtResolution = data->rtRes();
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/RT_Relation_DigiTool.cxx b/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/RT_Relation_DigiTool.cxx
index 110cecf48df3..eb225ab5f137 100644
--- a/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/RT_Relation_DigiTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/RT_Relation_DigiTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "MDT_Digitization/RT_Relation_DigiTool.h"
@@ -49,7 +49,7 @@ StatusCode RT_Relation_DigiTool::initialize() {
bool RT_Relation_DigiTool::initializeTube(const MuonGM::MuonDetectorManager* detMgr) {
m_maxRadius = detMgr->getGenericMdtDescriptor()->innerRadius;
- if (m_rt.size() < 1) {
+ if (m_rt.empty()) {
std::string inputFile = RT_DATA;
// Find the full path to inputFile:
std::string file = PathResolver::find_file(inputFile, "DATAPATH");
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Response/MDT_Response/Amplifier.h b/MuonSpectrometer/MuonDigitization/MDT_Response/MDT_Response/Amplifier.h
index 00823a4fb0fd..873d5ee82474 100644
--- a/MuonSpectrometer/MuonDigitization/MDT_Response/MDT_Response/Amplifier.h
+++ b/MuonSpectrometer/MuonDigitization/MDT_Response/MDT_Response/Amplifier.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MDT_RESPONSE_AMPLIFIER_H
@@ -51,13 +51,13 @@ class Amplifier {
double Integral(); // charge integral
void AddCluster(int bin,double charge);
- double m_binsize; // binsize in ns
- double m_triggerElectron; // trigger electron
- double m_threshold; // threshold
+ double m_binsize = 0.0; // binsize in ns
+ double m_triggerElectron = 0.0; // trigger electron
+ double m_threshold = 0.0; // threshold
int m_integrationWindow; // integration window in bins
// maximum of the single electron response
- double m_responseMax;
+ double m_responseMax = 0.0;
cluster_vec m_response;
cluster_vec m_signal;
@@ -72,9 +72,9 @@ class Amplifier {
/* non linear response:
R = m_adcOffset + m_adcFactor*(log(Q)/log(m_adcFraction)-1) */
- double m_adcOffset;
- double m_adcFactor;
- double m_adcFraction;
+ double m_adcOffset = 0.0;
+ double m_adcFactor = 0.0;
+ double m_adcFraction = 0.0;
};
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Response/MDT_Response/MDT_Response.h b/MuonSpectrometer/MuonDigitization/MDT_Response/MDT_Response/MDT_Response.h
index 65891f9906ae..0099dbac3414 100644
--- a/MuonSpectrometer/MuonDigitization/MDT_Response/MDT_Response/MDT_Response.h
+++ b/MuonSpectrometer/MuonDigitization/MDT_Response/MDT_Response/MDT_Response.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MDT_RESPONSE_MDT_RESPONSE_H
@@ -69,31 +69,31 @@ class MDT_Response {
void DoStepping(double ParticleCharge,double ParticleGamma, CLHEP::HepRandomEngine *rndmEngine);
void Reset();
- double m_radius; // radius of the tube
+ double m_radius = 0.0; // radius of the tube
double m_rhit; // radius of the current hit
double m_xhit; // position along the tube of the current hit
double m_pathLength; // path length of particle in tube
- double m_clusterDensity; // clusters per mm
+ double m_clusterDensity = 0.0; // clusters per mm
std::vector<double> m_gammaFactorVec; // gamma
std::vector<double> m_numberOfClustersPerCmVec; // clusters per cm
- double m_attLength; // attenuation length of tube
- double m_signalSpeed; // propagation speed along wire
+ double m_attLength = 0.0; // attenuation length of tube
+ double m_signalSpeed = 0.0; // propagation speed along wire
- int m_rtMode; // choose rt mode
- unsigned int m_rtNpar;
+ int m_rtMode = 0; // choose rt mode
+ unsigned int m_rtNpar = 0U;
double* m_rtParameters;
- double m_difSmearing; // width of gaussian smearing
+ double m_difSmearing = 0.0; // width of gaussian smearing
- double m_triggerElectron;
- double m_integrationWindow;
- double m_binsize;
- double m_timeWindow;
- int m_offset;
- int m_bins;
+ double m_triggerElectron = 0.0;
+ double m_integrationWindow = 0.0;
+ double m_binsize = 0.0;
+ double m_timeWindow = 0.0;
+ int m_offset = 0;
+ int m_bins = 0;
Amplifier m_amplifier; // amplifier
clusterVec m_clusters; // produced clusters
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Response/src/Amplifier.cxx b/MuonSpectrometer/MuonDigitization/MDT_Response/src/Amplifier.cxx
index 008bf3103117..672857770d70 100644
--- a/MuonSpectrometer/MuonDigitization/MDT_Response/src/Amplifier.cxx
+++ b/MuonSpectrometer/MuonDigitization/MDT_Response/src/Amplifier.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "MDT_Response/Amplifier.h"
@@ -132,7 +132,7 @@ void Amplifier::Reset()
bool Amplifier::AddClusters(const std::vector<double>& clusters)
{
- if(clusters.size() == 0){ // no clusters, no signal!
+ if(clusters.empty()){ // no clusters, no signal!
return false;
}
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Response/src/MDT_Response.cxx b/MuonSpectrometer/MuonDigitization/MDT_Response/src/MDT_Response.cxx
index 7d5b309ed7fb..4bbef2fb579e 100644
--- a/MuonSpectrometer/MuonDigitization/MDT_Response/src/MDT_Response.cxx
+++ b/MuonSpectrometer/MuonDigitization/MDT_Response/src/MDT_Response.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "MDT_Response/MDT_Response.h"
@@ -9,7 +9,7 @@ MDT_Response::MDT_Response() :
m_rhit(0.0),
m_xhit(0.0),
m_pathLength(0.0),
- m_rtParameters(0),
+ m_rtParameters(nullptr),
m_t0(0.0)
{
InitTubeParameters();
@@ -21,7 +21,7 @@ MDT_Response::MDT_Response(double timewindow, double binsize) :
m_rhit(0.0),
m_xhit(0.0),
m_pathLength(0.0),
- m_rtParameters(0),
+ m_rtParameters(nullptr),
m_t0(0.0)
{
InitTubeParameters();
@@ -31,7 +31,7 @@ MDT_Response::MDT_Response(double timewindow, double binsize) :
MDT_Response::~MDT_Response()
{
- delete[] m_rtParameters; m_rtParameters=0;
+ delete[] m_rtParameters; m_rtParameters=nullptr;
}
void MDT_Response::InitClusters(double timewindow, double binsize)
@@ -141,7 +141,7 @@ void MDT_Response::InitRt(){
default:
std::cout << "MDT_Response: Wrong rt-mode" << std::endl;
m_rtNpar = 0;
- m_rtParameters = 0;
+ m_rtParameters = nullptr;
break;
}
// std::cout << "MDT_Response: RT-relation -> Polynomial" << std::endl;
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Response/src/MDT_ResponseTest.cxx b/MuonSpectrometer/MuonDigitization/MDT_Response/src/MDT_ResponseTest.cxx
index a6dc8231d316..9106957252f6 100644
--- a/MuonSpectrometer/MuonDigitization/MDT_Response/src/MDT_ResponseTest.cxx
+++ b/MuonSpectrometer/MuonDigitization/MDT_Response/src/MDT_ResponseTest.cxx
@@ -12,10 +12,10 @@
#include "TH1.h"
#include "TFile.h"
+#include <cerrno>
+#include <climits>
+#include <cstdlib>
#include <iostream>
-#include <stdlib.h>
-#include <errno.h>
-#include <limits.h>
// random generator
CLHEP::RanluxEngine ranEngine;
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_DigitizationTool.h b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_DigitizationTool.h
index 7eb4fd6a5816..63a6064d7d54 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_DigitizationTool.h
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_DigitizationTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MM_DIGITIZATIONTOOL_H
@@ -218,8 +218,8 @@ class MM_DigitizationTool : public PileUpToolBase {
std::vector<float> m_n_StrRespCharge;
std::vector<float> m_n_StrRespTime;
- float m_noiseSlope;
- float m_noiseIntercept;
+ float m_noiseSlope = 0.0F;
+ float m_noiseIntercept = 0.0F;
};
#endif // MM_DigitizationTool
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_ElectronicsResponseSimulation.h b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_ElectronicsResponseSimulation.h
index 201e1f10a0c8..25db07629860 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_ElectronicsResponseSimulation.h
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_ElectronicsResponseSimulation.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MM_DIGITIZATION_MM_ELECTRONICSRESPONSESIMULATION_H
@@ -64,7 +64,7 @@ public :
MM_DigitToolOutput getThresholdResponseFrom(const MM_ElectronicsToolInput & digiInput);
MM_ElectronicsToolTriggerOutput getTheFastestSignalInVMM(const MM_DigitToolOutput & ElectronicThresholdOutput, const int chMax, const int stationEta);
- int getIdTheFastestSignalInVMM(float time, int VMM_id, std::vector<int> trigger_VMM_id, const std::vector<float> ElectronicsThreshold_stripTime, float timeWindowLower, float timeWindowUpper);
+ int getIdTheFastestSignalInVMM(float time, int VMM_id, std::vector<int> trigger_VMM_id, const std::vector<float>& ElectronicsThreshold_stripTime, float timeWindowLower, float timeWindowUpper);
void getVMMId(const std::vector< int > & ElectronicsThreshold_stripPos, const int chMax, const int stationEta, std::vector< int > & trigger_VMM_id, std::vector< int > & trigger_MMFE_VMM_id);
MM_DigitToolOutput applyDeadTimeStrip(const MM_DigitToolOutput & ElectronicsTriggerOutput);
MM_ElectronicsToolTriggerOutput applyDeadTimeART(const MM_ElectronicsToolTriggerOutput & ElectronicsTriggerOutput);
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_IonizationCluster.h b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_IonizationCluster.h
index b447d490c529..2e29c4ad5a96 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_IonizationCluster.h
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_IonizationCluster.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MM_DIGITIZATION_MM_IONIZATIONCLUSTER_H
@@ -34,7 +34,7 @@ class MM_IonizationCluster {
// Members supplied by user
std::vector<std::unique_ptr<MM_Electron>> m_Electrons;
- float m_HitX;
+ float m_HitX = 0.0F;
TVector2 m_IonizationStart;
};
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripResponse.h b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripResponse.h
index 58352dda9beb..00d1960f65f1 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripResponse.h
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripResponse.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MM_DIGITIZATION_MM_STRIPRESPONSE_H
@@ -45,11 +45,11 @@ class MM_StripResponse {
private:
- float m_timeResolution;
- float m_stripPitch;
- int m_stripID;
- int m_minstripID;
- int m_maxstripID;
+ float m_timeResolution = 0.0F;
+ float m_stripPitch = 0.0F;
+ int m_stripID = 0;
+ int m_minstripID = 0;
+ int m_maxstripID = 0;
std::vector<std::unique_ptr<MM_Electron>> m_Electrons;
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripsResponseSimulation.h b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripsResponseSimulation.h
index e74625635db8..fa15b8b8309f 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripsResponseSimulation.h
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripsResponseSimulation.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MM_DIGITIZATION_STRIPRESPONSESIMULATION_H
@@ -172,7 +172,7 @@ private:
std::map<TString, TH2F* > m_mapOf2DHistograms;
std::unique_ptr<CLHEP::RandGeneral> m_randNelectrons;
- int m_NelectronPropBins;
+ int m_NelectronPropBins = 0;
bool m_writeOutputFile;
bool m_writeEventDisplays;
@@ -183,11 +183,11 @@ private:
mutable Athena::MsgStreamMember m_msg = Athena::MsgStreamMember("MMStripResponseSimulation");
// seperate random number generation for performance monitoring
- float generateTransverseDiffusion(float posY, CLHEP::HepRandomEngine* rndmEngine);
+ float generateTransverseDiffusion(float posY, CLHEP::HepRandomEngine* rndmEngine) const;
float getTransverseDiffusion(float posY, CLHEP::HepRandomEngine* rndmEngine);
- float getLongitudinalDiffusion(float posY, CLHEP::HepRandomEngine* rndmEngine);
- float getEffectiveCharge(CLHEP::HepRandomEngine* rndmEngine);
- float getPathLengthTraveled(CLHEP::HepRandomEngine* rndmEngine);
+ float getLongitudinalDiffusion(float posY, CLHEP::HepRandomEngine* rndmEngine) const;
+ float getEffectiveCharge(CLHEP::HepRandomEngine* rndmEngine) const;
+ float getPathLengthTraveled(CLHEP::HepRandomEngine* rndmEngine) const;
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/VMM_Shaper.h b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/VMM_Shaper.h
index cffadb2a057b..87ecc6647573 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/VMM_Shaper.h
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/VMM_Shaper.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MM_DIGITIZATION_VMM_SHAPER_H
@@ -27,17 +27,17 @@ class VMM_Shaper{
double m_timeStep, m_inverseTimeStep;
- double m_preCalculationVMMShaper;
+ double m_preCalculationVMMShaper = 0.0;
// shaper parameters
- double m_a, m_pole0, m_re_pole1, m_im_pole1, m_pole1_square, m_k1_abs, m_argK1;
- double m_peakTimeChargeScaling;
+ double m_a = 0.0, m_pole0 = 0.0, m_re_pole1 = 0.0, m_im_pole1 = 0.0, m_pole1_square = 0.0, m_k1_abs = 0.0, m_argK1 = 0.0;
+ double m_peakTimeChargeScaling = 0.0;
double vmmResponse(const std::vector<float> &effectiveCharge, const std::vector<float> &electronsTime, double time) const;
double findPeak(const std::vector<float> &effectiveCharge, const std::vector<float> &electronsTime, const double electronicsThreshold) const;
bool aboveThresholdSimple(const std::vector<float> &effectiveCharge, const std::vector<float> &electronsTime, const double electronicsThreshold) const;
- double m_pole0_ns;
- double m_re_pole1_ns;
- double m_im_pole1_ns;
+ double m_pole0_ns = 0.0;
+ double m_re_pole1_ns = 0.0;
+ double m_im_pole1_ns = 0.0;
};
#endif // MM_DIGITIZATION_VMM_SHAPER_H
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx
index 802c5da46eca..ba4995dcb218 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx
@@ -70,8 +70,8 @@ namespace {
// values from https://indico.cern.ch/event/1002207/contributions/4240818
// slide 10
- static constexpr float maxNoise = 2600;
- static constexpr float minNoise = 1000;
+ constexpr float maxNoise = 2600;
+ constexpr float minNoise = 1000;
}
@@ -333,7 +333,7 @@ StatusCode MM_DigitizationTool::processBunchXing(int bunchXing,
if (!(m_mergeSvc->retrieveSubSetEvtData(m_inputObjectName, hitCollList, bunchXing,
bSubEvents, eSubEvents).isSuccess()) &&
- hitCollList.size() == 0) {
+ hitCollList.empty()) {
ATH_MSG_ERROR("Could not fill TimedHitCollList");
return StatusCode::FAILURE;
} else {
@@ -345,7 +345,7 @@ StatusCode MM_DigitizationTool::processBunchXing(int bunchXing,
TimedHitCollList::iterator endColl(hitCollList.end());
// Iterating over the list of collections
- for( ; iColl != endColl; iColl++){
+ for( ; iColl != endColl; ++iColl){
auto hitCollPtr = std::make_unique<MMSimHitCollection>(*iColl->second);
PileUpTimeEventIndex timeIndex(iColl->first);
@@ -372,7 +372,7 @@ StatusCode MM_DigitizationTool::getNextEvent(const EventContext& ctx) {
ATH_MSG_DEBUG ( "MM_DigitizationTool::getNextEvent()" );
// get the container(s)
- typedef PileUpMergeSvc::TimedList<MMSimHitCollection>::type TimedHitCollList;
+ using TimedHitCollList = PileUpMergeSvc::TimedList<MMSimHitCollection>::type;
// In case of single hits container just load the collection using read handles
if (!m_onlyUseContainerName) {
@@ -393,7 +393,7 @@ StatusCode MM_DigitizationTool::getNextEvent(const EventContext& ctx) {
TimedHitCollList hitCollList;
ATH_CHECK( m_mergeSvc->retrieveSubEvtsData(m_inputObjectName, hitCollList) );
- if (hitCollList.size()==0) {
+ if (hitCollList.empty()) {
ATH_MSG_ERROR ( "TimedHitCollList has size 0" );
return StatusCode::FAILURE;
}
@@ -530,7 +530,7 @@ StatusCode MM_DigitizationTool::doDigitization(const EventContext& ctx) {
m_n_hitDepositEnergy = hit.depositEnergy();
m_n_hitKineticEnergy = hit.kineticEnergy();
- const Amg::Vector3D globalHitPosition = hit.globalPosition();
+ const Amg::Vector3D& globalHitPosition = hit.globalPosition();
m_globalHitTime = hit.globalTime();
m_tofCorrection = globalHitPosition.mag()/CLHEP::c_light;
@@ -955,7 +955,7 @@ StatusCode MM_DigitizationTool::doDigitization(const EventContext& ctx) {
MM_ElectronicsToolInput stripDigitOutput( tmpStripOutput.NumberOfStripsPos(), tmpStripOutput.chipCharge(), tmpStripOutput.chipTime(), digitID , hit.kineticEnergy());
// This block is purely validation
- for(size_t i = 0; i<tmpStripOutput.NumberOfStripsPos().size(); i++){
+ for(size_t i = 0; i<tmpStripOutput.NumberOfStripsPos().size(); ++i){
int tmpStripID = tmpStripOutput.NumberOfStripsPos().at(i);
bool isValid;
Identifier cr_id = m_idHelperSvc->mmIdHelper().channelID(stName, m_idHelperSvc->mmIdHelper().stationEta(layerID), m_idHelperSvc->mmIdHelper().stationPhi(layerID), m_idHelperSvc->mmIdHelper().multilayer(layerID), m_idHelperSvc->mmIdHelper().gasGap(layerID), tmpStripID, true, &isValid);
@@ -984,7 +984,7 @@ StatusCode MM_DigitizationTool::doDigitization(const EventContext& ctx) {
// Now at Detector Element Level (VMM)
- if(v_stripDigitOutput.size()==0){
+ if(v_stripDigitOutput.empty()){
ATH_MSG_DEBUG ( "MM_DigitizationTool::doDigitization() -- there is no strip response on this VMM." );
continue;
}
@@ -1057,7 +1057,7 @@ StatusCode MM_DigitizationTool::doDigitization(const EventContext& ctx) {
//
MM_ElectronicsToolTriggerOutput electronicsTriggerOutputAppliedARTTiming (m_ElectronicsResponseSimulation->applyARTTiming(electronicsTriggerOutputAppliedARTDeadTime,0.,0.));
- MM_ElectronicsToolTriggerOutput finalElectronicsTriggerOutput( electronicsTriggerOutputAppliedARTTiming );
+ const MM_ElectronicsToolTriggerOutput& finalElectronicsTriggerOutput( electronicsTriggerOutputAppliedARTTiming );
//
@@ -1113,7 +1113,7 @@ StatusCode MM_DigitizationTool::doDigitization(const EventContext& ctx) {
}
- if ( stripPosSmeared.size() > 0 ) {
+ if ( !stripPosSmeared.empty() ) {
newDigit = std::make_unique<MmDigit>(digitId,
stripTimeSmeared,
stripPosSmeared,
@@ -1202,13 +1202,13 @@ MM_ElectronicsToolInput MM_DigitizationTool::combinedStripResponseAllHits(const
max_kineticEnergy = i_stripDigitOutput.kineticEnergy();
}
//---
- for(size_t i = 0; i<i_stripDigitOutput.NumberOfStripsPos().size(); i++){
+ for(size_t i = 0; i<i_stripDigitOutput.NumberOfStripsPos().size(); ++i){
int strip_id = i_stripDigitOutput.NumberOfStripsPos()[i];
bool found = false;
- for(size_t ii = 0; ii<v_stripStripResponseAllHits.size(); ii++){
+ for(size_t ii = 0; ii<v_stripStripResponseAllHits.size(); ++ii){
if(v_stripStripResponseAllHits[ii]==strip_id){
- for(size_t iii = 0; iii<(i_stripDigitOutput.chipTime()[i]).size(); iii++){
+ for(size_t iii = 0; iii<(i_stripDigitOutput.chipTime()[i]).size(); ++iii){
v_timeStripResponseAllHits[ii].push_back(i_stripDigitOutput.chipTime()[i].at(iii));
v_qStripResponseAllHits[ii].push_back(i_stripDigitOutput.chipCharge()[i].at(iii));
}
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_ElectronicsResponseSimulation.cxx b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_ElectronicsResponseSimulation.cxx
index c303d74d4f80..c91c237b816f 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_ElectronicsResponseSimulation.cxx
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_ElectronicsResponseSimulation.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -191,7 +191,7 @@ int MM_ElectronicsResponseSimulation::getIdTheFastestSignalInVMM(
float time,
int VMM_id,
std::vector<int> trigger_VMM_id,
- const std::vector<float> electronicsThresholdStripTime,
+ const std::vector<float>& electronicsThresholdStripTime,
float timeWindowLower,
float timeWindowUpper){
int theFastestSignal = -1;
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripsResponseSimulation.cxx b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripsResponseSimulation.cxx
index dffefe58874a..c2bd5f2f2219 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripsResponseSimulation.cxx
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripsResponseSimulation.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/// PROJECTS
@@ -30,8 +30,8 @@ Check Lorentz Angle is in correct direction...
*/
namespace {
- static constexpr float electronsToFC = 1./6241.;
- static constexpr float polyaTheta = 1.765;
+ constexpr float electronsToFC = 1./6241.;
+ constexpr float polyaTheta = 1.765;
}
/*******************************************************************************/
@@ -53,10 +53,10 @@ MM_StripsResponseSimulation::MM_StripsResponseSimulation():
m_interactionDensitySigma(0), // Spread in this number.
// Function Pointers
- m_lorentzAngleFunction(0),
+ m_lorentzAngleFunction(nullptr),
m_writeOutputFile(false),
m_writeEventDisplays(false),
- m_outputFile(0)
+ m_outputFile(nullptr)
{
}
/*******************************************************************************/
@@ -313,7 +313,7 @@ void MM_StripsResponseSimulation::whichStrips( const float & hitx,
-float MM_StripsResponseSimulation::generateTransverseDiffusion(float posY, CLHEP::HepRandomEngine* rndmEngine) {
+float MM_StripsResponseSimulation::generateTransverseDiffusion(float posY, CLHEP::HepRandomEngine* rndmEngine) const {
// this is a helper function used in getTransverseDiffusion, generating double gaussian distributions
// avoid division by zero in calculation of scale if ypos is 0
@@ -351,14 +351,14 @@ float MM_StripsResponseSimulation::getTransverseDiffusion(float posY, CLHEP::Hep
return tmp;
}
-float MM_StripsResponseSimulation::getLongitudinalDiffusion(float posY, CLHEP::HepRandomEngine* rndmEngine) {
+float MM_StripsResponseSimulation::getLongitudinalDiffusion(float posY, CLHEP::HepRandomEngine* rndmEngine) const {
float tmp = CLHEP::RandGaussZiggurat::shoot(rndmEngine,0.0, posY*m_longitudinalDiffusionSigma);
// We only want random numbers between -5 and 5
while (std::abs(tmp) > 5) { tmp = CLHEP::RandGaussZiggurat::shoot(rndmEngine,0.0, posY*m_longitudinalDiffusionSigma); }
return tmp;
}
-float MM_StripsResponseSimulation::getEffectiveCharge(CLHEP::HepRandomEngine* rndmEngine) {
+float MM_StripsResponseSimulation::getEffectiveCharge(CLHEP::HepRandomEngine* rndmEngine) const {
// charge fluctuatation is described by Polya function
//m_polyaFunction = new TF1("m_polyaFunction","(TMath::Power([0]+1,[0]+1)/TMath::Gamma([0]+1))*TMath::Power(x/[1],[0])*TMath::Exp(-([0]+1)*x/[1])",0,50000);
// m_polyaFunction->SetParameter(0, 1.765); // polya theta
@@ -371,7 +371,7 @@ float MM_StripsResponseSimulation::getEffectiveCharge(CLHEP::HepRandomEngine* r
}
-float MM_StripsResponseSimulation::getPathLengthTraveled(CLHEP::HepRandomEngine* rndmEngine) {
+float MM_StripsResponseSimulation::getPathLengthTraveled(CLHEP::HepRandomEngine* rndmEngine) const {
// Probability of having an interaction (per unit length traversed) is sampled from a gaussian provided by G. Iakovidis
float rndGaus = CLHEP::RandGaussZiggurat::shoot(rndmEngine,m_interactionDensityMean, m_interactionDensitySigma);
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/VMM_Shaper.cxx b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/VMM_Shaper.cxx
index 58cb87bf1183..6f0a52b112ab 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/VMM_Shaper.cxx
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/VMM_Shaper.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "MM_Digitization/VMM_Shaper.h"
@@ -8,13 +8,13 @@
namespace {
// VMM shaper parameters provided by G. Iakovidis
- static constexpr double K0 = 1.584;
- static constexpr double Re_K1 = -0.792;
- static constexpr double Im_K1 = -0.115;
+ constexpr double K0 = 1.584;
+ constexpr double Re_K1 = -0.792;
+ constexpr double Im_K1 = -0.115;
- static constexpr double chargeScaleFactor = 1/0.411819;
+ constexpr double chargeScaleFactor = 1/0.411819;
- static constexpr double mmIonFlowTime = 150.; // ns
+ constexpr double mmIonFlowTime = 150.; // ns
}
VMM_Shaper::VMM_Shaper(const float peakTime,const float lowerTimeWindow,const float upperTimeWindow):m_peakTime(peakTime),
@@ -74,7 +74,7 @@ void VMM_Shaper::vmmPeakResponse(const std::vector<float> &effectiveCharge, cons
void VMM_Shaper::vmmThresholdResponse(const std::vector<float> &effectiveCharge, const std::vector<float> &electronsTime, const double electronicsThreshold, double &litudeAtFirstPeak, double &timeAtThreshold) const {
if (!aboveThresholdSimple(effectiveCharge, electronsTime, electronicsThreshold)) return;
- if (effectiveCharge.size() == 0) return; // protect min_element
+ if (effectiveCharge.empty()) return; // protect min_element
double startTime = m_lowerTimeWindow;
double minElectronTime = *std::min_element(electronsTime.begin(), electronsTime.end());
if (startTime < minElectronTime) startTime = minElectronTime; // if smallest strip times are higher then the lower time window, just start the loop from the smallest electron time
@@ -114,7 +114,7 @@ void VMM_Shaper::vmmThresholdResponse(const std::vector<float> &effectiveCharge,
double VMM_Shaper::findPeak(const std::vector<float> &effectiveCharge, const std::vector<float> &electronsTime, const double electronicsThreshold) const{
- if(effectiveCharge.size()==0) return -9999; // protect min_element
+ if(effectiveCharge.empty()) return -9999; // protect min_element
double startTime = m_lowerTimeWindow;
double minElectronTime = *std::min_element(electronsTime.begin(), electronsTime.end());
@@ -177,7 +177,7 @@ double VMM_Shaper::findPeak(const std::vector<float> &effectiveCharge, const std
bool VMM_Shaper::hasChargeAboveThreshold(const std::vector<float> &effectiveCharge, const std::vector<float> &electronsTime, const double electronicsThreshold) const{
if (!aboveThresholdSimple(effectiveCharge, electronsTime, electronicsThreshold)) return false;
- if (effectiveCharge.size() == 0) return false; // protect min_element
+ if (effectiveCharge.empty()) return false; // protect min_element
double startTime = m_lowerTimeWindow;
double minElectronTime = *std::min_element(electronsTime.begin(), electronsTime.end());
// since we are only checking if signal is above threshold, we can start searching close to the peak
@@ -202,6 +202,5 @@ bool VMM_Shaper::aboveThresholdSimple(const std::vector<float> &effectiveCharge,
chargeSum += effectiveCharge.at(i_elec)*m_peakTimeChargeScaling;
}
}
- if (chargeSum >= electronicsThreshold) return true;
- return false;
+ return chargeSum >= electronicsThreshold;
}
diff --git a/MuonSpectrometer/MuonDigitization/MuonFastDigitization/src/MM_FastDigitizer.cxx b/MuonSpectrometer/MuonDigitization/MuonFastDigitization/src/MM_FastDigitizer.cxx
index 9c127346d785..3602c3770dbd 100644
--- a/MuonSpectrometer/MuonDigitization/MuonFastDigitization/src/MM_FastDigitizer.cxx
+++ b/MuonSpectrometer/MuonDigitization/MuonFastDigitization/src/MM_FastDigitizer.cxx
@@ -20,6 +20,8 @@
#include "AthenaKernel/RNGWrapper.h"
#include "CLHEP/Random/RandGaussZiggurat.h"
+#include <cmath>
+
#include <sstream>
#include <iostream>
#include <fstream>
@@ -115,7 +117,7 @@ StatusCode MM_FastDigitizer::initialize() {
}
ATH_CHECK(m_idHelperSvc.retrieve());
// check the input object name
- if (m_inputObjectName=="") {
+ if (m_inputObjectName.empty()) {
ATH_MSG_FATAL ( "Property InputObjectName not set !" );
return StatusCode::FAILURE;
}
@@ -276,7 +278,7 @@ StatusCode MM_FastDigitizer::execute() {
col->setIdentifier(m_idHelperSvc->mmIdHelper().channelID(m_idHelperSvc->mmIdHelper().parentID(layid), m_idHelperSvc->mmIdHelper().multilayer(layid),1,1) );
if( prdContainer->addCollection(col,hash).isFailure() ){
ATH_MSG_WARNING("Failed to add collection with hash " << (int)hash );
- delete col;col=0;
+ delete col;col=nullptr;
continue;
}
localMMVec[hash] = col;
@@ -332,10 +334,10 @@ StatusCode MM_FastDigitizer::execute() {
// resolution = -.01/3 * angle + .64/3.
double resolution;
- if (fabs(inAngle_XZ)<3)
+ if (std::fabs(inAngle_XZ)<3)
resolution = .07;
else
- resolution = ( -.001/3.*fabs(inAngle_XZ) ) + .28/3.;
+ resolution = ( -.001/3.*std::fabs(inAngle_XZ) ) + .28/3.;
double sp = CLHEP::RandGaussZiggurat::shoot(rndmEngine, 0, resolution);
ATH_MSG_VERBOSE("slpos.z " << slpos.z() << ", ldir " << ldir.z() << ", scale " << scale << ", hitOnSurface.z " << hitOnSurface.z() );
@@ -346,7 +348,7 @@ StatusCode MM_FastDigitizer::execute() {
Amg::Vector2D posOnSurf(hitOnSurface.x()+sp,hitOnSurface.y());
// for large angles project perpendicular to surface
- if( fabs(inAngle_XZ) > 70 ){
+ if( std::fabs(inAngle_XZ) > 70 ){
posOnSurf[0]=(slpos.x()+sp);
// if using timing information use hit position after shift
}else if( m_useTimeShift && !m_microTPC ){
@@ -484,7 +486,7 @@ StatusCode MM_FastDigitizer::execute() {
hash,
Amg::Vector2D(posOnSurf.x(), 0.),
rdoList,
- std::move(cov),
+ cov,
detEl,
(int)tdrift,
0);
@@ -532,7 +534,7 @@ StatusCode MM_FastDigitizer::execute() {
hash,
Amg::Vector2D(CurrenPosOnSurf.x(), 0.),
rdoList,
- std::move(cov),
+ cov,
detEl,
(int)tdrift,
0);
diff --git a/MuonSpectrometer/MuonDigitization/MuonFastDigitization/src/sTgcFastDigitizer.cxx b/MuonSpectrometer/MuonDigitization/MuonFastDigitization/src/sTgcFastDigitizer.cxx
index 6a6436f11c61..fd0c828fd114 100644
--- a/MuonSpectrometer/MuonDigitization/MuonFastDigitization/src/sTgcFastDigitizer.cxx
+++ b/MuonSpectrometer/MuonDigitization/MuonFastDigitization/src/sTgcFastDigitizer.cxx
@@ -230,7 +230,7 @@ StatusCode sTgcFastDigitizer::execute() {
if(itersTgc + 1 ==collGMSH->end()) lastHit = true;
if(m_mergePrds) {
- if( (hash != hashLast || lastHit) && sTgcprds.size()>0 ) {
+ if( (hash != hashLast || lastHit) && !sTgcprds.empty() ) {
MuonPrepDataCollection<Muon::sTgcPrepData>* col = localsTgcVec[hashLast];
// new collection hash will be made
// first store the sTgc eta prds
@@ -274,7 +274,7 @@ StatusCode sTgcFastDigitizer::execute() {
hashLast,
sTgcprds[i]->localPosition(),
rdoList,
- std::move(covN),
+ covN,
sTgcprds[i]->detectorElement(),
sTgcprds[i]->getBcBitMap());
prdN->setHashAndIndex(col->identifyHash(), col->size());
@@ -335,7 +335,7 @@ StatusCode sTgcFastDigitizer::execute() {
hashLast,
sTgcprds[j]->localPosition(),
rdoList,
- std::move(covN),
+ covN,
sTgcprds[j]->detectorElement(),
sTgcprds[j]->getBcBitMap());
prdN->setHashAndIndex(col->identifyHash(), col->size());
@@ -354,7 +354,7 @@ StatusCode sTgcFastDigitizer::execute() {
col->setIdentifier(m_idHelperSvc->stgcIdHelper().channelID(m_idHelperSvc->stgcIdHelper().parentID(layid), m_idHelperSvc->stgcIdHelper().multilayer(layid),1,1,1) );
if( prdContainer->addCollection(col,hash).isFailure() ){
ATH_MSG_WARNING("Failed to add collection with hash " << (int)hash );
- delete col;col=0;
+ delete col;col=nullptr;
continue;
} else {
ATH_MSG_VERBOSE(" added collection with hash " << (int)hash << " last hash " << (int)hashLast );
@@ -593,7 +593,7 @@ StatusCode sTgcFastDigitizer::execute() {
(cov)(0, 0) = errX * errX;
sTgcPrepData* prd = new sTgcPrepData(
- id, hash, posOnSurf, rdoList, std::move(cov), detEl, bctag);
+ id, hash, posOnSurf, rdoList, cov, detEl, bctag);
if(type!=1 || lastHit || !m_mergePrds) {
// always store last hit
@@ -728,7 +728,7 @@ bool sTgcFastDigitizer::readFileOfTimeJitter()
std::string fileWithPath = PathResolver::find_file (fileName, "DATAPATH");
std::ifstream ifs;
- if (fileWithPath != "") {
+ if (!fileWithPath.empty()) {
ifs.open(fileWithPath.c_str(), std::ios::in);
}
else {
diff --git a/MuonSpectrometer/MuonDigitization/RPC_Digitization/RPC_Digitization/RpcDigitizationTool.h b/MuonSpectrometer/MuonDigitization/RPC_Digitization/RPC_Digitization/RpcDigitizationTool.h
index c431c511ba17..159ae57a7b93 100644
--- a/MuonSpectrometer/MuonDigitization/RPC_Digitization/RPC_Digitization/RpcDigitizationTool.h
+++ b/MuonSpectrometer/MuonDigitization/RPC_Digitization/RPC_Digitization/RpcDigitizationTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef RPC_DIGITIZATIONTOOL_H
@@ -127,8 +127,8 @@ private:
observed cluster size distribution */
std::vector<int> TurnOnStrips(std::vector<int> pcs, const Identifier* id, CLHEP::HepRandomEngine* rndmEngine);
/** Calculates the propagation time along the strip */
- double PropagationTime(const Identifier* id, const Amg::Vector3D pos);
- double PropagationTimeNew(const Identifier* id, const Amg::Vector3D globPos);
+ double PropagationTime(const Identifier* id, const Amg::Vector3D& pos);
+ double PropagationTimeNew(const Identifier* id, const Amg::Vector3D& globPos);
/** Calculates the position of the hit wrt to the strip panel
this transformation is needed since the impact point comes from the SD
int he gas gap's reference frame. */
@@ -138,7 +138,7 @@ private:
Gaudi::Property<double> m_UncorrJitter_BIS78 {this, "UncorrJitter_BIS78", 0.3 , "jitter uncorrelated between eta and phi BIS78"};
Gaudi::Property<double> m_CorrJitter_BIS78 {this, "CorrJitter_BIS78", 0.0 , "jitter correlated between eta and phi BIS78"};
- Amg::Vector3D posInPanel(const Identifier* id, const Amg::Vector3D posInGap);
+ Amg::Vector3D posInPanel(const Identifier* id, const Amg::Vector3D& posInGap);
/** adjust strip numbering according to standard OIDs **/
int adjustStripNumber(const Identifier* id,int nstrip);
/** Accounts for rotation of chambers.
@@ -146,7 +146,7 @@ private:
the gas gap reference system but RPC chambers are placed in the spectrometer
after a certain number of rotations. This method applies the necessary
modifications to axis orientation, in order to obtain the correct strip number */
- Amg::Vector3D adjustPosition(const Identifier* id, const Amg::Vector3D hitPos);
+ Amg::Vector3D adjustPosition(const Identifier* id, const Amg::Vector3D& hitPos);
/** calculates the strip number and returns the position along the strip*/
int findStripNumber(Amg::Vector3D gasGapPos, Identifier stripPanelId, double& posinstrip);
diff --git a/MuonSpectrometer/MuonDigitization/RPC_Digitization/src/RpcDigitizationTool.cxx b/MuonSpectrometer/MuonDigitization/RPC_Digitization/src/RpcDigitizationTool.cxx
index c2907dd54e02..ef40e6abea4a 100644
--- a/MuonSpectrometer/MuonDigitization/RPC_Digitization/src/RpcDigitizationTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/RPC_Digitization/src/RpcDigitizationTool.cxx
@@ -46,11 +46,13 @@
#include "AIDA/IHistogram1D.h"
#include "EventInfoMgt/ITagInfoMgr.h"
-#include <string>
-#include <sstream>
-#include <iostream>
-#include <fstream>
#include <atomic>
+#include <fstream>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <utility>
+
#include <TString.h> // for Form
@@ -329,7 +331,7 @@ StatusCode RpcDigitizationTool::processBunchXing(int bunchXing,
if (!(m_mergeSvc->retrieveSubSetEvtData(m_inputHitCollectionName, hitCollList, bunchXing,
bSubEvents, eSubEvents).isSuccess()) &&
- hitCollList.size() == 0) {
+ hitCollList.empty()) {
ATH_MSG_ERROR("Could not fill TimedHitCollList");
return StatusCode::FAILURE;
} else {
@@ -371,7 +373,7 @@ StatusCode RpcDigitizationTool::getNextEvent(const EventContext& ctx)
m_thpcRPC.reset();
// get the container(s)
- typedef PileUpMergeSvc::TimedList<RPCSimHitCollection>::type TimedHitCollList;
+ using TimedHitCollList = PileUpMergeSvc::TimedList<RPCSimHitCollection>::type;
// In case of single hits container just load the collection using read handles
if (!m_onlyUseContainerName) {
@@ -396,7 +398,7 @@ StatusCode RpcDigitizationTool::getNextEvent(const EventContext& ctx)
ATH_MSG_ERROR ( "Could not fill TimedHitCollList" );
return StatusCode::FAILURE;
}
- if (hitCollList.size()==0) {
+ if (hitCollList.empty()) {
ATH_MSG_ERROR ( "TimedHitCollList has size 0" );
return StatusCode::FAILURE;
} else {
@@ -549,7 +551,7 @@ StatusCode RpcDigitizationTool::doDigitization(const EventContext& ctx, RpcDigit
Identifier channelId;
std::vector<MuonSimData::Deposit> deposits;
Amg::Vector3D gpos;
- float simTime;
+ float simTime = 0.0F;
};
std::map<Identifier,SimDataContent> channelSimDataMap;
@@ -708,7 +710,7 @@ StatusCode RpcDigitizationTool::doDigitization(const EventContext& ctx, RpcDigit
auto channelSimDataMapPos = channelSimDataMap.find(atlasId);
if( channelSimDataMapPos == channelSimDataMap.end() ){
- Amg::Vector3D ppos=hit.postLocalPosition();
+ const Amg::Vector3D& ppos=hit.postLocalPosition();
Amg::Vector3D gppos = ele->localToGlobalCoords(ppos,atlasId);
Amg::Vector3D gdir = gppos - gpos;
Trk::Intersection intersection = ele->surface(atlasId).straightLineIntersection(gpos,gdir,false,false);
@@ -804,7 +806,7 @@ StatusCode RpcDigitizationTool::doDigitization(const EventContext& ctx, RpcDigit
std::map<Identifier, std::vector<MuonSimData::Deposit> >::iterator map_iter=m_sdo_tmp_map.begin();
ATH_MSG_DEBUG ( "Start the digit map loop" );
- for(;map_iter!=m_sdo_tmp_map.end();map_iter++){
+ for(;map_iter!=m_sdo_tmp_map.end();++map_iter){
//Identifier
const Identifier theId=(*map_iter).first;
@@ -830,7 +832,7 @@ StatusCode RpcDigitizationTool::doDigitization(const EventContext& ctx, RpcDigit
// loop to suppress digits too close in time (emulate Front-End and CMA dead time)
double last_time=-10000; // init to high value
- for(;map_dep_iter!=times.end();map_dep_iter++){
+ for(;map_dep_iter!=times.end();++map_dep_iter){
double currTime =(*map_dep_iter).first;
ATH_MSG_VERBOSE ( "deposit with time " << currTime );
@@ -897,7 +899,7 @@ StatusCode RpcDigitizationTool::doDigitization(const EventContext& ctx, RpcDigit
RpcDigit* newDigit = new RpcDigit(theId, newDigit_time); // RpcDigit::time MUST be a double, or we will lose the precision we need
Identifier elemId = m_idHelper->elementID(theId);
- RpcDigitCollection* digitCollection = 0;
+ RpcDigitCollection* digitCollection = nullptr;
IdentifierHash coll_hash;
if (m_idHelper->get_hash(elemId, coll_hash, &rpcContext)) {
@@ -923,7 +925,7 @@ StatusCode RpcDigitizationTool::doDigitization(const EventContext& ctx, RpcDigit
ATH_MSG_ERROR ( "Couldn't record RpcDigitCollection with key=" << coll_hash << " in StoreGate!" );
//else
delete digitCollection;
- digitCollection = 0 ;
+ digitCollection = nullptr ;
return StatusCode::RECOVERABLE; // consistent with ERROR message above.
} else {
ATH_MSG_DEBUG ( "New RpcHitCollection with key=" << coll_hash << " recorded in StoreGate." );
@@ -1239,7 +1241,7 @@ std::vector<int> RpcDigitizationTool::TurnOnStrips(std::vector<int> pcs, const I
}
//--------------------------------------------
-double RpcDigitizationTool::PropagationTime(const Identifier* id, const Amg::Vector3D pos){
+double RpcDigitizationTool::PropagationTime(const Identifier* id, const Amg::Vector3D& pos){
float length;
float impact;
@@ -1284,7 +1286,7 @@ double RpcDigitizationTool::PropagationTime(const Identifier* id, const Amg::Vec
}
//--------------------------------------------
-double RpcDigitizationTool::PropagationTimeNew(const Identifier* id, const Amg::Vector3D globPos){
+double RpcDigitizationTool::PropagationTimeNew(const Identifier* id, const Amg::Vector3D& globPos){
float distance;
int measuresPhi = m_idHelper->measuresPhi(*id);
@@ -1309,7 +1311,7 @@ double RpcDigitizationTool::PropagationTimeNew(const Identifier* id, const Amg::
}
//--------------------------------------------
-Amg::Vector3D RpcDigitizationTool::adjustPosition(const Identifier* id, const Amg::Vector3D hitPos){
+Amg::Vector3D RpcDigitizationTool::adjustPosition(const Identifier* id, const Amg::Vector3D& hitPos){
// code to change local axis orientation taking into account geometrical rotations
@@ -1373,7 +1375,7 @@ int RpcDigitizationTool::adjustStripNumber(const Identifier* id,int nstrip){
}
//--------------------------------------------
-Amg::Vector3D RpcDigitizationTool::posInPanel(const Identifier* id, const Amg::Vector3D posInGap){ // the hit has the position in the gap. we need the position in the panel
+Amg::Vector3D RpcDigitizationTool::posInPanel(const Identifier* id, const Amg::Vector3D& posInGap){ // the hit has the position in the gap. we need the position in the panel
int stationName = m_idHelper->stationName(*id);
// ME unused: int gasGap = m_idHelper->gasGap(*id);
@@ -1410,7 +1412,7 @@ int RpcDigitizationTool::findStripNumber(Amg::Vector3D posInGap, Identifier digi
const RpcReadoutElement* ele= m_GMmgr->getRpcReadoutElement(digitId);
- Amg::Vector3D posInElement=ele->SDtoModuleCoords(posInGap, digitId);
+ Amg::Vector3D posInElement=ele->SDtoModuleCoords(std::move(posInGap), digitId);
// extract from digit id the relevant info
@@ -1523,12 +1525,15 @@ long long int RpcDigitizationTool::PackMCTruth(float proptime, float bctime, flo
//--------------------------------------------
void RpcDigitizationTool::UnPackMCTruth(double theWord, float& proptime, float& bctime, float& posy, float& posz){
//int64_t is just a shorter way of writing long long int
- typedef union
+ using Repacker = union
+
{
+
double dWord;
+
int64_t iWord;
- }
- Repacker;
+
+ };
Repacker MCTruth;
MCTruth.dWord=theWord;
proptime=((MCTruth.iWord) & 0x00000000000000ffLL)/10.;
@@ -1556,7 +1561,7 @@ void RpcDigitizationTool::UnPackMCTruth(double theWord, float& proptime, float&
//--------------------------------------------
StatusCode RpcDigitizationTool::fillTagInfo() const {
- if (m_tagInfoMgr==0) return StatusCode::FAILURE;
+ if (m_tagInfoMgr==nullptr) return StatusCode::FAILURE;
std::string RpctimeSchema="";
std::stringstream RpctimeShift ;
@@ -1605,26 +1610,26 @@ StatusCode RpcDigitizationTool::readParameters(){
//std::cout << "thetag is " << tag << std::endl;
ATH_MSG_DEBUG ( "read tag " <<tag );
if(tag=="cs"){ // read cs distribution
- if(m_csPara.size()==0) m_csPara.resize(5);
+ if(m_csPara.empty()) m_csPara.resize(5);
str>>m_csPara[0]>>m_csPara[1]>>m_csPara[2]>>m_csPara[3]>>m_csPara[4];
} else if(tag=="rising_gaus"){
- if(m_rgausPara.size()==0) m_rgausPara.resize(3);
+ if(m_rgausPara.empty()) m_rgausPara.resize(3);
str>>m_rgausPara[0]>>m_rgausPara[1]>>m_rgausPara[2];
} else if(tag=="falling_gaus"){
- if(m_fgausPara.size()==0) m_fgausPara.resize(3);
+ if(m_fgausPara.empty()) m_fgausPara.resize(3);
str>>m_fgausPara[0]>>m_fgausPara[1]>>m_fgausPara[2];
} else if(tag=="const_value"){
- if(m_constPara.size()==0) m_constPara.resize(1);
+ if(m_constPara.empty()) m_constPara.resize(1);
str>>m_constPara[0];
} else if(tag=="cs_3_par"){
str>>m_cs3Para;
} else if(tag=="cs_4_par"){
- if(m_cs4Para.size()==0) m_cs4Para.resize(4);
+ if(m_cs4Para.empty()) m_cs4Para.resize(4);
str>>m_cs4Para[0]>>m_cs4Para[1]>>m_cs4Para[2]>>m_cs4Para[3];
}
}
- if(m_csPara.size()==0||m_rgausPara.size()==0||m_fgausPara.size()==0||m_constPara.size()==0){
+ if(m_csPara.empty()||m_rgausPara.empty()||m_fgausPara.empty()||m_constPara.empty()){
return StatusCode::FAILURE; // something didn't work properly
}
@@ -1683,8 +1688,8 @@ StatusCode RpcDigitizationTool::DetectionEfficiency(const EventContext& ctx, con
ATH_MSG_DEBUG ( "DetEff:Digit IdPhi = " << m_idHelper->show_to_string(*IdPhiRpcStrip) );
- if (IdEtaRpcStrip==0) return StatusCode::FAILURE;
- if (IdPhiRpcStrip==0) return StatusCode::FAILURE;
+ if (IdEtaRpcStrip==nullptr) return StatusCode::FAILURE;
+ if (IdPhiRpcStrip==nullptr) return StatusCode::FAILURE;
undefinedPhiStripStatus = false;
// dead spacers are not simulated in GEANT4 => their effect must be emulated in the digitizer as an effective max. efficiency = 99%
@@ -2091,7 +2096,7 @@ int RpcDigitizationTool::ClusterSizeEvaluation(const EventContext& ctx, const Id
ATH_MSG_DEBUG ( "Digit Id = " << m_idHelper->show_to_string(*IdRpcStrip) );
- if (IdRpcStrip==0) return 1;
+ if (IdRpcStrip==nullptr) return 1;
int ClusterSize = 1 ;
@@ -2580,7 +2585,7 @@ StatusCode RpcDigitizationTool::DumpRPCCalibFromCoolDB(const EventContext& ctx)
Identifier rpcId = m_idHelper->channelID(stationName, stationEta, stationPhi, doubletR, doubletZ, doubletPhi, 1, 1, 1, true, &isValid); // last 5 arguments are: int doubletPhi, int gasGap, int measuresPhi, int strip, bool check, bool* isValid
if (!isValid) continue;
const RpcReadoutElement* rpc = m_GMmgr->getRpcReadoutElement(rpcId);
- if(rpc == 0 )continue;
+ if(rpc == nullptr )continue;
Identifier idr = rpc->identify();
if(idr == 0 )continue;
Identifier atlasIdEta = m_idHelper->channelID(idr, doubletZ,doubletPhi , gasGap, 0, 1) ;
@@ -2824,7 +2829,7 @@ StatusCode RpcDigitizationTool::DumpRPCCalibFromCoolDB(const EventContext& ctx)
Identifier rpcId = m_idHelper->channelID(stationName, stationEta, stationPhi, doubletR, doubletZ, doubletPhi, 1, 1, 1, true, &isValid); // last 5 arguments are: int doubletPhi, int gasGap, int measuresPhi, int strip, bool check, bool* isValid
if (!isValid) continue;
const RpcReadoutElement* rpc = m_GMmgr->getRpcReadoutElement(rpcId);
- if(rpc == 0 )continue;
+ if(rpc == nullptr )continue;
Identifier idr = rpc->identify();
if(idr == 0 )continue;
Identifier atlasId = m_idHelper->channelID(idr, doubletZ,doubletPhi , gasGap, measphi, 1) ;
@@ -2914,7 +2919,7 @@ StatusCode RpcDigitizationTool::DumpRPCCalibFromCoolDB(const EventContext& ctx)
Identifier rpcId = m_idHelper->channelID(stationName, stationEta, stationPhi, doubletR, doubletZ, doubletPhi, 1, 1, 1, true, &isValid); // last 5 arguments are: int doubletPhi, int gasGap, int measuresPhi, int strip, bool check, bool* isValid
if (!isValid) continue;
const RpcReadoutElement* rpc = m_GMmgr->getRpcReadoutElement(rpcId);
- if(rpc == 0 )continue;
+ if(rpc == nullptr )continue;
Identifier idr = rpc->identify();
if(idr == 0 )continue;
Identifier atlasId = m_idHelper->channelID(idr, doubletZ,doubletPhi , gasGap, measphi, strip) ;
diff --git a/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/TgcDigitMaker.cxx b/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/TgcDigitMaker.cxx
index 966db0c6917c..0e92fd2117ae 100644
--- a/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/TgcDigitMaker.cxx
+++ b/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/TgcDigitMaker.cxx
@@ -34,7 +34,7 @@ TgcDigitMaker::TgcDigitMaker(TgcHitIdHelper* hitIdHelper,
m_hitIdHelper = hitIdHelper;
m_mdManager = mdManager;
m_runperiod = runperiod;
- m_idHelper = 0;
+ m_idHelper = nullptr;
m_efficiency[kWIRE] = m_efficiency[kSTRIP] = 1.000; // 100% efficiency for TGCSimHit_p1
m_timeWindowOffsetSensor[kWIRE] = m_timeWindowOffsetSensor[kSTRIP] = 0.;
m_gateTimeWindow[kOUTER][kWIRE] = 29.32; // 29.32ns = 26ns + 4 * 0.83ns(outer station)
@@ -100,7 +100,7 @@ TgcDigitCollection* TgcDigitMaker::executeDigi(const TGCSimHit* hit,
if(msgLevel(MSG::DEBUG)) msg(MSG::DEBUG) << "executeDigi() Got HIT Id." << endmsg;
// Check the chamber is dead or not.
- if(isDeadChamber(stationName, stationEta, stationPhi, ilyr)) return 0;
+ if(isDeadChamber(stationName, stationEta, stationPhi, ilyr)) return nullptr;
const Identifier elemId = m_idHelper -> elementID(stationName,stationEta,stationPhi);
if(msgLevel(MSG::DEBUG)) msg(MSG::DEBUG) << "executeDigi() - element identifier is: " << m_idHelper->show_to_string(elemId) << endmsg;
@@ -108,7 +108,7 @@ TgcDigitCollection* TgcDigitMaker::executeDigi(const TGCSimHit* hit,
const MuonGM::TgcReadoutElement *tgcChamber = m_mdManager->getTgcReadoutElement(elemId);
if(!tgcChamber) {
if(msgLevel(MSG::WARNING)) msg(MSG::WARNING) << "executeDigi() - no ReadoutElement found for " << m_idHelper->show_to_string(elemId) << endmsg;
- return 0;
+ return nullptr;
}
@@ -426,7 +426,7 @@ StatusCode TgcDigitMaker::readFileOfTimeJitter()
std::string fileWithPath = PathResolver::find_file (fileName, "DATAPATH");
std::ifstream ifs;
- if (fileWithPath != "") {
+ if (!fileWithPath.empty()) {
ifs.open(fileWithPath.c_str(), std::ios::in);
}
else {
@@ -582,7 +582,7 @@ void TgcDigitMaker::readFileOfEnergyThreshold() {
// Find path to the TGC_Digitization_energyThreshold.dat file
const std::string fileName = "TGC_Digitization_energyThreshold.dat";
std::string fileWithPath = PathResolver::find_file(fileName.c_str(), "DATAPATH");
- if(fileWithPath == "") {
+ if(fileWithPath.empty()) {
msg(MSG::FATAL) << "readFileOfEnergyThreshold(): Could not find file " << fileName.c_str() << endmsg;
return;
}
@@ -662,7 +662,7 @@ void TgcDigitMaker::readFileOfCrossTalk() {
// Find path to the TGC_Digitization_crossTalk.dat file
const std::string fileName = "TGC_Digitization_crossTalk.dat";
std::string fileWithPath = PathResolver::find_file(fileName.c_str(), "DATAPATH");
- if(fileWithPath == "") {
+ if(fileWithPath.empty()) {
msg(MSG::FATAL) << "readFileOfCrossTalk(): Could not find file " << fileName.c_str() << endmsg;
return;
}
@@ -752,7 +752,7 @@ void TgcDigitMaker::readFileOfDeadChamber() {
return;
}
std::string fileWithPath = PathResolver::find_file(fileName.c_str(), "DATAPATH");
- if(fileWithPath == "") {
+ if(fileWithPath.empty()) {
msg(MSG::FATAL) << "readFileOfDeadChamber(): Could not find file " << fileName.c_str() << endmsg;
return;
}
@@ -823,7 +823,7 @@ void TgcDigitMaker::readFileOfTimeWindowOffset() {
// Find path to the TGC_Digitization_timeWindowOffset.dat file
const std::string fileName = "TGC_Digitization_timeWindowOffset.dat";
std::string fileWithPath = PathResolver::find_file(fileName.c_str(), "DATAPATH");
- if(fileWithPath == "") {
+ if(fileWithPath.empty()) {
msg(MSG::FATAL) << "readFileOfTimeWindowOffset(): Could not find file " << fileName.c_str() << endmsg;
return;
}
@@ -887,7 +887,7 @@ void TgcDigitMaker::readFileOfAlignment() {
// Find path to the TGC_Digitization_alignment.dat file
const std::string fileName = "TGC_Digitization_alignment.dat";
std::string fileWithPath = PathResolver::find_file(fileName.c_str(), "DATAPATH");
- if(fileWithPath == "") {
+ if(fileWithPath.empty()) {
msg(MSG::FATAL) << "readFileOfAlignment(): Could not find file " << fileName.c_str() << endmsg;
return;
}
diff --git a/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/TgcDigitizationTool.cxx b/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/TgcDigitizationTool.cxx
index 4493b4c40c48..bfa40dc8094a 100644
--- a/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/TgcDigitizationTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/TgcDigitizationTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "TgcDigitizationTool.h"
@@ -130,7 +130,7 @@ StatusCode TgcDigitizationTool::processBunchXing(int bunchXing,
if (!(m_mergeSvc->retrieveSubSetEvtData(m_inputHitCollectionName, hitCollList, bunchXing,
bSubEvents, eSubEvents).isSuccess()) &&
- hitCollList.size() == 0) {
+ hitCollList.empty()) {
ATH_MSG_ERROR("Could not fill TimedHitCollList");
return StatusCode::FAILURE;
} else {
@@ -142,7 +142,7 @@ StatusCode TgcDigitizationTool::processBunchXing(int bunchXing,
TimedHitCollList::iterator endColl(hitCollList.end());
// Iterating over the list of collections
- for( ; iColl != endColl; iColl++){
+ for( ; iColl != endColl; ++iColl){
TGCSimHitCollection *hitCollPtr = new TGCSimHitCollection(*iColl->second);
PileUpTimeEventIndex timeIndex(iColl->first);
@@ -168,7 +168,7 @@ StatusCode TgcDigitizationTool::mergeEvent(const EventContext& ctx) {
ATH_CHECK(digitizeCore(ctx));
// reset the pointer (delete null pointer should be safe)
delete m_thpcTGC;
- m_thpcTGC = 0;
+ m_thpcTGC = nullptr;
std::list<TGCSimHitCollection*>::iterator TGCHitColl = m_TGCHitCollList.begin();
std::list<TGCSimHitCollection*>::iterator TGCHitCollEnd = m_TGCHitCollList.end();
@@ -191,7 +191,7 @@ StatusCode TgcDigitizationTool::processAllSubEvents(const EventContext& ctx) {
ATH_CHECK(digitizeCore(ctx));
// reset the pointer (delete null pointer should be safe)
delete m_thpcTGC;
- m_thpcTGC = 0;
+ m_thpcTGC = nullptr;
return StatusCode::SUCCESS;
}
@@ -200,7 +200,7 @@ StatusCode TgcDigitizationTool::finalize() {
ATH_MSG_DEBUG("finalize.");
delete m_digitizer;
- m_digitizer = 0;
+ m_digitizer = nullptr;
return StatusCode::SUCCESS;
}
@@ -213,7 +213,7 @@ StatusCode TgcDigitizationTool::getNextEvent(const EventContext& ctx)
m_thpcTGC = nullptr;
// get the container(s)
- typedef PileUpMergeSvc::TimedList<TGCSimHitCollection>::type TimedHitCollList;
+ using TimedHitCollList = PileUpMergeSvc::TimedList<TGCSimHitCollection>::type;
// In case of single hits container just load the collection using read handles
if (!m_onlyUseContainerName) {
@@ -238,7 +238,7 @@ StatusCode TgcDigitizationTool::getNextEvent(const EventContext& ctx)
ATH_MSG_FATAL("Could not fill TimedHitCollList");
return StatusCode::FAILURE;
}
- if(hitCollList.size()==0) {
+ if(hitCollList.empty()) {
ATH_MSG_FATAL("TimedHitCollList has size 0");
return StatusCode::FAILURE;
} else {
@@ -355,7 +355,7 @@ StatusCode TgcDigitizationTool::digitizeCore(const EventContext& ctx) const {
<< m_idHelper->show_to_string(newDigiId, &context)
<< " BC tag = " << newBcTag);
delete newDigit;
- newDigit = 0;
+ newDigit = nullptr;
break;
}
}
@@ -397,7 +397,7 @@ StatusCode TgcDigitizationTool::digitizeCore(const EventContext& ctx) const {
}
delete digiHits;
- digiHits = 0;
+ digiHits = nullptr;
}//while(i != e)
}//while(m_thpcTGC->nextDetectorElement(i, e))
diff --git a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/sTGC_Digitization/sTgcDigitMaker.h b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/sTGC_Digitization/sTgcDigitMaker.h
index 649de261c307..a02703fefcd9 100644
--- a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/sTGC_Digitization/sTgcDigitMaker.h
+++ b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/sTGC_Digitization/sTgcDigitMaker.h
@@ -90,7 +90,7 @@ class sTgcDigitMaker {
Determines whether a hit is detected or not.
*/
bool efficiencyCheck(const int channelType) const;
- bool efficiencyCheck(const std::string stationName, const int stationEta, const int stationPhi, const int multiPlet, const int gasGap, const int channelType, const double energyDeposit) const;
+ bool efficiencyCheck(const std::string& stationName, const int stationEta, const int stationPhi, const int multiPlet, const int gasGap, const int channelType, const double energyDeposit) const;
//uint16_t bcTagging(const float digittime, const int channelType) const;
void addDigit(sTgcDigitCollection* digits, const Identifier id, const uint16_t bctag, const float digittime, int channelType) const;
@@ -109,28 +109,28 @@ class sTgcDigitMaker {
/** Read share/sTGC_Digitization_alignment.dat file */
//void readFileOfAlignment();
///** Get energy threshold value for each chamber */
- double getEnergyThreshold(const std::string stationName, int stationEta, int stationPhi, int multiPlet, int gasGap, int channelType) const;
+ double getEnergyThreshold(const std::string& stationName, int stationEta, int stationPhi, int multiPlet, int gasGap, int channelType) const;
//void randomCrossTalk(const Identifier elemId, const int gasGap, const int channelType, const int channel,
// const float posInStrip, const double digitTime);
/** Method to check a chamber is dead or active */
- bool isDeadChamber(const std::string stationName, int stationEta, int stationPhi, int multiPlet, int gasGap);
+ bool isDeadChamber(const std::string& stationName, int stationEta, int stationPhi, int multiPlet, int gasGap);
float getChamberEfficiency(int stationName, int stationEta, int stationPhi, int multiPlet, int gasGap);
- double getTimeWindowOffset(const std::string stationName, int stationEta, int channelType) const;
+ double getTimeWindowOffset(const std::string& stationName, int stationEta, int channelType) const;
/** Get stationName integer from stationName string */
- int getIStationName(const std::string staionName) const;
+ int getIStationName(const std::string& staionName) const;
/** Ad hoc implementation of detector position shift */
//void adHocPositionShift(const std::string stationName, int stationEta, int stationPhi,
// const Amg::Vector3D direCos, Amg::Vector3D &localPos) const;
/** Energy threshold value for each chamber */
- double m_energyThreshold[N_STATIONNAME][N_STATIONETA][N_STATIONPHI][N_MULTIPLET][N_GASGAP][N_CHANNELTYPE];
+ double m_energyThreshold[N_STATIONNAME][N_STATIONETA][N_STATIONPHI][N_MULTIPLET][N_GASGAP][N_CHANNELTYPE]{};
///** Cross talk probabilty for each chamber */
//double m_crossTalk[N_STATIONNAME][N_STATIONETA][N_STATIONPHI][N_GASGAP][N_CHANNELTYPE][N_CROSSTALK_PARAMETER];
/** Dead chamber flag for each chamber */
- bool m_isDeadChamber[N_STATIONNAME][N_STATIONETA][N_STATIONPHI][N_MULTIPLET][N_GASGAP];
- float m_ChamberEfficiency[2][4][8][2][4];
+ bool m_isDeadChamber[N_STATIONNAME][N_STATIONETA][N_STATIONPHI][N_MULTIPLET][N_GASGAP]{};
+ float m_ChamberEfficiency[2][4][8][2][4]{};
/** Time window offset for each chamber */
- double m_timeWindowOffset[N_STATIONNAME][N_STATIONETA][N_CHANNELTYPE];
+ double m_timeWindowOffset[N_STATIONNAME][N_STATIONETA][N_CHANNELTYPE]{};
///** Alignment z constants. Translation in the global r direction */
//double m_alignmentZ[N_STATIONNAME][N_STATIONETA][N_STATIONPHI];
diff --git a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/sTgcDigitMaker.cxx b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/sTgcDigitMaker.cxx
index d9eeb7003599..144bf193683f 100644
--- a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/sTgcDigitMaker.cxx
+++ b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/sTgcDigitMaker.cxx
@@ -122,7 +122,7 @@ std::unique_ptr<sTgcDigitCollection> sTgcDigitMaker::executeDigi(const sTGCSimHi
// SimHits without energy loss are not recorded.
double energyDeposit = hit->depositEnergy(); // Energy deposit in MeV
- if(energyDeposit==0.) return 0;
+ if(energyDeposit==0.) return nullptr;
////////// convert ID for this digitizer system
sTgcSimIdToOfflineId simToOffline(m_idHelper);
@@ -138,7 +138,7 @@ std::unique_ptr<sTgcDigitCollection> sTgcDigitMaker::executeDigi(const sTGCSimHi
const MuonGM::sTgcReadoutElement* detEl = m_mdManager->getsTgcReadoutElement(layid);
if( !detEl ){
ATH_MSG_WARNING("Failed to retrieve detector element for: isSmall " << isSmall << " eta " << m_idHelper->stationEta(layid) << " phi " << m_idHelper->stationPhi(layid) << " ml " << m_idHelper->multilayer(layid) );
- return 0;
+ return nullptr;
}
// DO THE DIGITIZATTION HERE ////////
@@ -169,11 +169,11 @@ std::unique_ptr<sTgcDigitCollection> sTgcDigitMaker::executeDigi(const sTGCSimHi
int etaZero = detEl->isEtaZero(tempId, hitOnSurface_wire.y()) ? 1 : 0;
float efficiency = getChamberEfficiency(stNameInt, std::abs(stationEta)-etaZero, stationPhi-1, multiPlet-1, gasGap-1);
// Lose Hits to match HV efficiency
- if (CLHEP::RandFlat::shoot(m_engine,0.0,1.0) > efficiency) return 0;
+ if (CLHEP::RandFlat::shoot(m_engine,0.0,1.0) > efficiency) return nullptr;
}
//// Check the chamber is dead or not.
- if(isDeadChamber(stationName, stationEta, stationPhi, multiPlet, gasGap)) return 0;
+ if(isDeadChamber(stationName, stationEta, stationPhi, multiPlet, gasGap)) return nullptr;
//***************************** check effeciency ********************************
// use energyDeposit to implement detector effeciency
@@ -489,7 +489,7 @@ void sTgcDigitMaker::readFileOfTimeJitter()
std::string fileWithPath = PathResolver::find_file (fileName, "DATAPATH");
std::ifstream ifs;
- if (fileWithPath != "") {
+ if (!fileWithPath.empty()) {
ifs.open(fileWithPath.c_str(), std::ios::in);
}
else {
@@ -570,7 +570,7 @@ bool sTgcDigitMaker::efficiencyCheck(const int channelType) const {
return false;
}
//+++++++++++++++++++++++++++++++++++++++++++++++
-bool sTgcDigitMaker::efficiencyCheck(const std::string stationName, const int stationEta, const int stationPhi,const int multiPlet, const int gasGap, const int channelType, const double energyDeposit) const {
+bool sTgcDigitMaker::efficiencyCheck(const std::string& stationName, const int stationEta, const int stationPhi,const int multiPlet, const int gasGap, const int channelType, const double energyDeposit) const {
// If the energy deposit is equal to or greater than the threshold value of the chamber,
// return true.
return (energyDeposit >= getEnergyThreshold(stationName, stationEta, stationPhi, multiPlet, gasGap, channelType));
@@ -610,53 +610,7 @@ void sTgcDigitMaker::addDigit(sTgcDigitCollection* digits, const Identifier id,
}
bool duplicate = false;
- //sTgcDigit* multihitDigit = 0;
- //ATH_MSG_DEBUG( "sTgcDigitMaker::addDigit"
- // << " id = " << id
- // << " bctag = " << bctag
- // << " channelType = " << channelType );
-
- //if((bctag & 0x1) != 0) {
- // for(sTgcDigitCollection::const_iterator it=digits->begin(); it!=digits->end(); it++) {
- // if(id==(*it)->identify() && sTgcDigit::BC_PREVIOUS==(*it)->bcTag()) {
- // duplicate = true;
- // break;
- // }
- // }
- // if(!duplicate) {
- // //multihitDigit = new sTgcDigit(id,sTgcDigit::BC_PREVIOUS);
- // //digits->push_back(multihitDigit);
- // digits->push_back(new sTgcDigit(id,sTgcDigit::BC_PREVIOUS));
- // }
- //}
- //if((bctag & 0x2) != 0) {
- // for(sTgcDigitCollection::const_iterator it=digits->begin(); it!=digits->end(); it++) {
- // if(id==(*it)->identify() && sTgcDigit::BC_CURRENT==(*it)->bcTag()) {
- // duplicate = true;
- // break;
- // }
- // }
- // if(!duplicate) {
- // //multihitDigit = new sTgcDigit(id,sTgcDigit::BC_CURRENT);
- // //digits->push_back(multihitDigit);
- // digits->push_back(new sTgcDigit(id,sTgcDigit::BC_CURRENT));
- // }
- //}
- //if((bctag & 0x4) != 0) {
- // for(sTgcDigitCollection::const_iterator it=digits->begin(); it!=digits->end(); it++) {
- // if(id==(*it)->identify() && sTgcDigit::BC_NEXT==(*it)->bcTag()) {
- // duplicate = true;
- // break;
- // }
- // }
- // if(!duplicate) {
- // //multihitDigit = new sTgcDigit(id,sTgcDigit::BC_NEXT);
- // //digits->push_back(multihitDigit);
- // digits->push_back(new sTgcDigit(id,sTgcDigit::BC_NEXT));
- // }
- //}
-
- for(sTgcDigitCollection::const_iterator it=digits->begin(); it!=digits->end(); it++) {
+ for(sTgcDigitCollection::const_iterator it=digits->begin(); it!=digits->end(); ++it) {
if(id==(*it)->identify() && digittime==(*it)->time()) {
duplicate = true;
break;
@@ -676,57 +630,7 @@ void sTgcDigitMaker::addDigit(sTgcDigitCollection* digits, const Identifier id,
}
bool duplicate = false;
- //sTgcDigit* multihitDigit = 0;
- //ATH_MSG_DEBUG( "sTgcDigitMaker::addDigit"
- // << " id = " << id
- // << " bctag = " << bctag
- // << " charge = " << charge
- // << " channelType = " << channelType );
-
- //if((bctag & 0x1) != 0) {
- // for(sTgcDigitCollection::const_iterator it=digits->begin(); it!=digits->end(); it++) {
- // if(id==(*it)->identify() && sTgcDigit::BC_PREVIOUS==(*it)->bcTag()) {
- // duplicate = true;
- // (*it)->set_charge(charge+(*it)->charge());
- // break;
- // }
- // }
- // if(!duplicate) {
- // //multihitDigit = new sTgcDigit(id,sTgcDigit::BC_PREVIOUS, charge);
- // //digits->push_back(multihitDigit);
- // digits->push_back(new sTgcDigit(id,sTgcDigit::BC_PREVIOUS, charge));
- // }
- //}
- //if((bctag & 0x2) != 0) {
- // for(sTgcDigitCollection::const_iterator it=digits->begin(); it!=digits->end(); it++) {
- // if(id==(*it)->identify() && sTgcDigit::BC_CURRENT==(*it)->bcTag()) {
- // (*it)->set_charge(charge+(*it)->charge());
- // duplicate = true;
- // break;
- // }
- // }
- // if(!duplicate) {
- // //multihitDigit = new sTgcDigit(id,sTgcDigit::BC_CURRENT, charge);
- // //digits->push_back(multihitDigit);
- // digits->push_back(new sTgcDigit(id,sTgcDigit::BC_CURRENT, charge));
- // }
- //}
- //if((bctag & 0x4) != 0) {
- // for(sTgcDigitCollection::const_iterator it=digits->begin(); it!=digits->end(); it++) {
- // if(id==(*it)->identify() && sTgcDigit::BC_NEXT==(*it)->bcTag()) {
- // (*it)->set_charge(charge+(*it)->charge());
- // duplicate = true;
- // break;
- // }
- // }
- // if(!duplicate) {
- // //multihitDigit = new sTgcDigit(id,sTgcDigit::BC_NEXT, charge);
- // //digits->push_back(multihitDigit);
- // digits->push_back(new sTgcDigit(id,sTgcDigit::BC_NEXT, charge));
- // }
- //}
-
- for(sTgcDigitCollection::iterator it=digits->begin(); it!=digits->end(); it++) {
+ for(sTgcDigitCollection::iterator it=digits->begin(); it!=digits->end(); ++it) {
if(id==(*it)->identify() && digittime==(*it)->time()) {
(*it)->set_charge(charge+(*it)->charge());
duplicate = true;
@@ -762,7 +666,7 @@ void sTgcDigitMaker::readFileOfEnergyThreshold() {
// Find path to the sTGC_Digitization_energyThreshold.dat file
const std::string fileName = "sTGC_Digitization_energyThreshold.dat";
std::string fileWithPath = PathResolver::find_file(fileName.c_str(), "DATAPATH");
- if(fileWithPath == "") {
+ if(fileWithPath.empty()) {
ATH_MSG_FATAL("readFileOfEnergyThreshold(): Could not find file " << fileName.c_str() );
return;
}
@@ -836,7 +740,7 @@ void sTgcDigitMaker::readFileOfDeadChamber() {
// Find path to the sTGC_Digitization_deadChamber.dat file
const std::string fileName = "sTGC_Digitization_deadChamber.dat";
std::string fileWithPath = PathResolver::find_file(fileName.c_str(), "DATAPATH");
- if(fileWithPath == "") {
+ if(fileWithPath.empty()) {
ATH_MSG_FATAL("readFileOfDeadChamber(): Could not find file " << fileName.c_str() );
return;
}
@@ -912,7 +816,7 @@ void sTgcDigitMaker::readFileOfEffChamber() {
// Find path to the sTGC_Digitization_EffChamber.dat file
const std::string fileName = "sTGC_Digitization_EffChamber.dat";
std::string fileWithPath = PathResolver::find_file(fileName.c_str(), "DATAPATH");
- if(fileWithPath == "") {
+ if(fileWithPath.empty()) {
ATH_MSG_FATAL("readFileOfEffChamber(): Could not find file " << fileName.c_str() );
return;
}
@@ -992,7 +896,7 @@ void sTgcDigitMaker::readFileOfTimeWindowOffset() {
// Find path to the sTGC_Digitization_timeWindowOffset.dat file
const std::string fileName = "sTGC_Digitization_timeWindowOffset.dat";
std::string fileWithPath = PathResolver::find_file(fileName.c_str(), "DATAPATH");
- if(fileWithPath == "") {
+ if(fileWithPath.empty()) {
ATH_MSG_FATAL("readFileOfTimeWindowOffset(): Could not find file " << fileName.c_str() );
return;
}
@@ -1038,7 +942,7 @@ void sTgcDigitMaker::readFileOfTimeWindowOffset() {
//+++++++++++++++++++++++++++++++++++++++++++++++
-double sTgcDigitMaker::getEnergyThreshold(const std::string stationName, int stationEta, int stationPhi, int multiPlet, int gasGap, int channelType) const {
+double sTgcDigitMaker::getEnergyThreshold(const std::string& stationName, int stationEta, int stationPhi, int multiPlet, int gasGap, int channelType) const {
// Convert std::string stationName to int iStationName from 41 to 48
int iStationName = getIStationName(stationName);
@@ -1076,7 +980,7 @@ double sTgcDigitMaker::getEnergyThreshold(const std::string stationName, int sta
}
//+++++++++++++++++++++++++++++++++++++++++++++++
-bool sTgcDigitMaker::isDeadChamber(const std::string stationName, int stationEta, int stationPhi, int multiPlet, int gasGap) {
+bool sTgcDigitMaker::isDeadChamber(const std::string& stationName, int stationEta, int stationPhi, int multiPlet, int gasGap) {
bool v_isDeadChamber = true;
// Convert std::string stationName to int iStationName from 41 to 48
@@ -1127,7 +1031,7 @@ float sTgcDigitMaker::getChamberEfficiency(int stationName, int stationEta, int
}
//+++++++++++++++++++++++++++++++++++++++++++++++
-double sTgcDigitMaker::getTimeWindowOffset(const std::string stationName, int stationEta, int channelType) const {
+double sTgcDigitMaker::getTimeWindowOffset(const std::string& stationName, int stationEta, int channelType) const {
// Convert std::string stationName to int iStationName from 41 to 48
int iStationName = getIStationName(stationName);
@@ -1145,7 +1049,7 @@ double sTgcDigitMaker::getTimeWindowOffset(const std::string stationName, int st
return m_timeWindowOffset[iStationName][stationEta][channelType];
}
-int sTgcDigitMaker::getIStationName(const std::string stationName) const {
+int sTgcDigitMaker::getIStationName(const std::string& stationName) const {
int iStationName = 0;
if( stationName=="STS") iStationName = 0;
else if(stationName=="STL") iStationName = 1;
diff --git a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/sTgcDigitizationTool.cxx b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/sTgcDigitizationTool.cxx
index db1cd5f41d1a..03ba1f4a404c 100644
--- a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/sTgcDigitizationTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/sTgcDigitizationTool.cxx
@@ -64,18 +64,22 @@ typedef struct {
bool isPileup;
} structDigitType;
-typedef std::pair<float, structDigitType> tempDigitType; // pair<float digitTime, structDigitType>
+using tempDigitType = std::pair<float, structDigitType>; // pair<float digitTime, structDigitType>
+
+using structReadoutElement = struct {
-typedef struct {
int readLevel;
+
float deadtimeStart;
+
float neighborOnTime;
-} structReadoutElement;
-typedef std::map<Identifier,std::pair<structReadoutElement, std::vector<tempDigitType> > > tempDigitCollectionType; // map<ReadoutElementID, pair< read or not, all DigitObject with the identical ReadoutElementId but at different time>>; for the int(read or not) : 0 --> do not read this strip, 1 --> turned on by neighborOn mode; 2 --> this channel has signal over threshold
-typedef std::map<IdentifierHash, tempDigitCollectionType> tempDigitContainerType; // use IdentifierHashId, similar structure as the <sTgcDigitCollection>
-typedef std::map<sTGCSimHit*, int> tempHitEventMap; // use IdentifierHashId, similar structure as the <sTgcDigitCollection>
-inline bool sort_EarlyToLate(tempDigitType a, tempDigitType b){
+};
+using tempDigitCollectionType = std::map<Identifier, std::pair<structReadoutElement, std::vector<tempDigitType> > >; // map<ReadoutElementID, pair< read or not, all DigitObject with the identical ReadoutElementId but at different time>>; for the int(read or not) : 0 --> do not read this strip, 1 --> turned on by neighborOn mode; 2 --> this channel has signal over threshold
+using tempDigitContainerType = std::map<IdentifierHash, tempDigitCollectionType>; // use IdentifierHashId, similar structure as the <sTgcDigitCollection>
+using tempHitEventMap = std::map<sTGCSimHit *, int>; // use IdentifierHashId, similar structure as the <sTgcDigitCollection>
+
+inline bool sort_EarlyToLate(const tempDigitType& a, const tempDigitType& b){
return a.first < b.first;
}
@@ -183,12 +187,12 @@ StatusCode sTgcDigitizationTool::processBunchXing(int bunchXing,
if (m_thpcsTGC == nullptr) {
m_thpcsTGC = std::make_unique<TimedHitCollection<sTGCSimHit>>();
}
- typedef PileUpMergeSvc::TimedList<sTGCSimHitCollection>::type TimedHitCollList;
+ using TimedHitCollList = PileUpMergeSvc::TimedList<sTGCSimHitCollection>::type;
TimedHitCollList hitCollList;
if (!(m_mergeSvc->retrieveSubSetEvtData(m_inputObjectName, hitCollList, bunchXing,
bSubEvents, eSubEvents).isSuccess()) &&
- hitCollList.size() == 0) {
+ hitCollList.empty()) {
ATH_MSG_ERROR("Could not fill TimedHitCollList");
return StatusCode::FAILURE;
} else {
@@ -200,7 +204,7 @@ StatusCode sTgcDigitizationTool::processBunchXing(int bunchXing,
TimedHitCollList::iterator endColl(hitCollList.end());
// Iterating over the list of collections
- for( ; iColl != endColl; iColl++){
+ for( ; iColl != endColl; ++iColl){
auto hitCollPtr = std::make_unique<sTGCSimHitCollection>(*iColl->second);
PileUpTimeEventIndex timeIndex(iColl->first);
@@ -222,7 +226,7 @@ StatusCode sTgcDigitizationTool::getNextEvent(const EventContext& ctx) {
ATH_MSG_DEBUG ( "sTgcDigitizationTool::getNextEvent()" );
// get the container(s)
- typedef PileUpMergeSvc::TimedList<sTGCSimHitCollection>::type TimedHitCollList;
+ using TimedHitCollList = PileUpMergeSvc::TimedList<sTGCSimHitCollection>::type;
// In case of single hits container just load the collection using read handles
if (!m_onlyUseContainerName) {
@@ -246,7 +250,7 @@ StatusCode sTgcDigitizationTool::getNextEvent(const EventContext& ctx) {
ATH_MSG_ERROR ( "Could not fill TimedHitCollList" );
return StatusCode::FAILURE;
}
- if (hitCollList.size()==0) {
+ if (hitCollList.empty()) {
ATH_MSG_ERROR ( "TimedHitCollList has size 0" );
return StatusCode::FAILURE;
}
@@ -356,14 +360,14 @@ StatusCode sTgcDigitizationTool::doDigitization(const EventContext& ctx) {
float earliestEventTime = 9999;
- // nextDetectorElement-->sets an iterator range with the hits of current detector element , returns a bool when done
+ // --nextDetectorElement>sets an iterator range with the hits of current detector element , returns a bool when done
while(m_thpcsTGC->nextDetectorElement(i, e)) {
int nhits = 0;
ATH_MSG_VERBOSE("Next Detector Element");
while(i != e){ //loop through the hits on this Detector Element
ATH_MSG_VERBOSE("Looping over hit " << nhits+1 << " on this Detector Element." );
- nhits++;
+ ++nhits;
TimedHitPtr<sTGCSimHit> phit = *i++;
const sTGCSimHit& hit = *phit;
ATH_MSG_VERBOSE("Hit Particle ID : " << hit.particleEncoding() );
@@ -580,7 +584,7 @@ StatusCode sTgcDigitizationTool::doDigitization(const EventContext& ctx) {
std::vector<sTgcSimDigitData>::iterator i = it_REID->second.begin();
std::vector<sTgcSimDigitData>::iterator e = it_REID->second.end();
- e--; //decrement e to be the last element and not the beyond the last element iterator
+ --e; //decrement e to be the last element and not the beyond the last element iterator
while( i!=e ) {
sTgcDigit digit1 = i->getSTGCDigit();
@@ -598,7 +602,7 @@ StatusCode sTgcDigitizationTool::doDigitization(const EventContext& ctx) {
it_REID->second.erase (i+1); //remove the later time digit
e = it_REID->second.end(); //update the end iterator
- e--; //decrement e to be the last element and not the beyond the last element iterator
+ --e; //decrement e to be the last element and not the beyond the last element iterator
ATH_MSG_VERBOSE(it_REID->second.size() << " digits on the channel after merge step");
}
else {
@@ -649,7 +653,7 @@ StatusCode sTgcDigitizationTool::doDigitization(const EventContext& ctx) {
sTgcDigit* flushedDigit = theVMM->flush(); // Flush the digit buffer
if(flushedDigit) {
outputDigits[it_DETEL->first][it_REID->first].push_back(*flushedDigit); // If a digit was in the buffer: store it to the RDO
- nPadDigits++;
+ ++nPadDigits;
ATH_MSG_VERBOSE("Flushed Digit") ;
ATH_MSG_VERBOSE(" BC tag = " << flushedDigit->bcTag()) ;
ATH_MSG_VERBOSE(" digitTime = " << flushedDigit->time()) ;
@@ -689,7 +693,7 @@ StatusCode sTgcDigitizationTool::doDigitization(const EventContext& ctx) {
std::vector<sTgcSimDigitData>::iterator i = it_REID->second.begin();
std::vector<sTgcSimDigitData>::iterator e = it_REID->second.end();
- e--;
+ --e;
while( i!=e ) {
sTgcDigit digit1 = i->getSTGCDigit();
@@ -703,7 +707,7 @@ StatusCode sTgcDigitizationTool::doDigitization(const EventContext& ctx) {
it_REID->second.erase (i+1); //remove the later time digit
e = it_REID->second.end(); //update the end iterator
- e--; //decrement e to be the last element and not the beyond the last element iterator
+ --e; //decrement e to be the last element and not the beyond the last element iterator
ATH_MSG_VERBOSE(it_REID->second.size() << " digits on the channel after merge step");
}
else {
@@ -790,7 +794,7 @@ StatusCode sTgcDigitizationTool::doDigitization(const EventContext& ctx) {
sTgcDigit* flushedDigit = it_VMM->second.second->flush(); //Readout the digit buffer
if(flushedDigit) {
outputDigits[it_DETEL->first][it_VMM->first].push_back(*flushedDigit); // If a digit was in the buffer: store it to the RDO
- nStripDigits++;
+ ++nStripDigits;
}
else ATH_MSG_VERBOSE("No digit for this timestep on Strip REID[" << it_VMM->first.getString() << "]");
}
@@ -824,7 +828,7 @@ StatusCode sTgcDigitizationTool::doDigitization(const EventContext& ctx) {
std::vector<sTgcSimDigitData>::iterator i = it_REID->second.begin();
std::vector<sTgcSimDigitData>::iterator e = it_REID->second.end();
- e--; //decrement e to be the last element and not the beyond the last element iterator
+ --e; //decrement e to be the last element and not the beyond the last element iterator
while( i!=e ) {
sTgcDigit digit1 = i->getSTGCDigit();
@@ -841,7 +845,7 @@ StatusCode sTgcDigitizationTool::doDigitization(const EventContext& ctx) {
it_REID->second.erase (i+1); //remove the later time digit
e = it_REID->second.end(); //update the end iterator
- e--; //decrement e to be the last element and not the beyond the last element iterator
+ --e; //decrement e to be the last element and not the beyond the last element iterator
ATH_MSG_VERBOSE(it_REID->second.size() << " digits on the channel after merge step");
}
else {
@@ -892,7 +896,7 @@ StatusCode sTgcDigitizationTool::doDigitization(const EventContext& ctx) {
sTgcDigit* flushedDigit = theVMM->flush(); // Flush the digit buffer
if(flushedDigit) {
outputDigits[it_DETEL->first][it_REID->first].push_back(*flushedDigit); // If a digit was in the buffer: store it to the RDO
- nWGDigits++;
+ ++nWGDigits;
ATH_MSG_VERBOSE("Flushed wiregroup digit") ;
ATH_MSG_VERBOSE(" BC tag = " << flushedDigit->bcTag()) ;
ATH_MSG_VERBOSE(" digitTime = " << flushedDigit->time()) ;
@@ -989,7 +993,7 @@ void sTgcDigitizationTool::readDeadtimeConfig()
ATH_MSG_INFO("Reading deadtime config file");
std::ifstream ifs;
- if (fileWithPath != "") {
+ if (!fileWithPath.empty()) {
ifs.open(fileWithPath.c_str(), std::ios::in);
}
else {
--
GitLab
From cdc8dcf992b82abc5bcd5a9c7e6209dc32bac59a Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Sun, 11 Jul 2021 23:01:24 +0200
Subject: [PATCH 048/272] AthenaPython: Disable TPyClassGenerator to fix
deadlock.
Remove the TPyClassGenerator from the list of class generators.
TPyClassGenerator makes classes defined in Python accessible to ROOT.
We don't rely on this at all in Athena. Further, in MT jobs,
we can get deadlocks. TClass::GetClass holds the ROOT internal
mutexes, and if it ends up calling TPyClassGenerator, then the
generator will end up acquiring the Python GIL.
On the other hand, Python-based algorithms will hold the GIL.
If they then use PyROOT (or do anything which could trigger I/O),
then they can try to acquire the ROOT internal locks.
Since we have the same locks being acquired in different orders
in different threads, we can deadlock.
Ideally, TClass::GetClass should probably drop the ROOT locks
before calling a class generator. But since we don't actually
use this functionality on Athena, just suppress it.
---
Control/AthenaPython/src/PyComponentMgr.cxx | 39 ++++++++++++++++++++-
1 file changed, 38 insertions(+), 1 deletion(-)
diff --git a/Control/AthenaPython/src/PyComponentMgr.cxx b/Control/AthenaPython/src/PyComponentMgr.cxx
index 9e49b126e316..70160a58bfc7 100755
--- a/Control/AthenaPython/src/PyComponentMgr.cxx
+++ b/Control/AthenaPython/src/PyComponentMgr.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// PyComponentMgr.cxx
@@ -29,9 +29,44 @@ CLASS_DEF (PyObject, 72785480, 1)
// PyROOT includes
#include "CPyCppyy/PyException.h"
#include "TPython.h"
+#include "TROOT.h"
+#include "TClassGenerator.h"
using namespace PyAthena;
+namespace {
+
+// Remove the TPyClassGenerator from the list of class generators.
+// TPyClassGenerator makes classes defined in Python accessible to ROOT.
+// We don't rely on this at all in Athena. Further, in MT jobs,
+// we can get deadlocks. TClass::GetClass holds the ROOT internal
+// mutexes, and if it ends up calling TPyClassGenerator, then the
+// generator will end up acquiring the Python GIL.
+// On the other hand, Python-based algorithms will hold the GIL.
+// If they then use PyROOT (or do anything which could trigger I/O),
+// then they can try to acquire the ROOT internal locks.
+// Since we have the same locks being acquired in different orders
+// in different threads, we can deadlock.
+//
+// Ideally, TClass::GetClass should probably drop the ROOT locks
+// before calling a class generator. But since we don't actually
+// use this functionality on Athena, just suppress it.
+void removePyGen ()
+{
+ TCollection* gens = gROOT->GetListOfClassGenerators();
+ TIter next(gens);
+ TClassGenerator *gen;
+ while( (gen = (TClassGenerator*) next()) ) {
+ if (System::typeinfoName (typeid (*gen)) == "TPyClassGenerator") {
+ gens->Remove (gen);
+ break;
+ }
+ }
+}
+} // anonymous namespace
+
+
+
// Constructors
////////////////
PyComponentMgr::PyComponentMgr( const std::string& name,
@@ -218,6 +253,8 @@ PyComponentMgr::pyObject( IPyComponent* cppComp )
<< "] with its python cousin !");
}
+ removePyGen();
+
Py_INCREF(o);
return o;
}
--
GitLab
From 07b4f14cf4faee252e13ac6ae246b751e2f4172f Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Mon, 9 Aug 2021 20:26:59 +0200
Subject: [PATCH 049/272] InDetRecExample: New/old flag consistency.
If we disable InDetFlags.doTIDE_Ambi, we should also disable
ConfigFlags.InDet.doTIDE_Ambi. Otherwise, we can get errors when
AthenaMonitoring merges a new configuration into an old configuration.
Fixes crash in q220.
---
.../InDetExample/InDetRecExample/python/InDetJobProperties.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
index d741511c4929..678727dceac2 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
@@ -1675,6 +1675,10 @@ class InDetJobProperties(JobPropertyContainer):
self.checkThenSet(self.doTrackSegmentsTRT , True )
self.checkThenSet(self.doPixelClusterSplitting, False)
self.checkThenSet(self.doTIDE_Ambi, False)
+ if not self.doTIDE_Ambi:
+ # Need to also set new config flag consistently.
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ ConfigFlags.InDet.doTIDE_Ambi = False
self.checkThenSet(self.doTrackSegmentsDisappearing, False)
if rec.doExpressProcessing() :
--
GitLab
From 28ec3a05dd91b10a55f4f30858417894ec6d8498 Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Sun, 15 Aug 2021 02:51:10 +0200
Subject: [PATCH 050/272] ATLASRECTS-6547: Item 6 TrackSlimmingTool rm uneeded
dynamic casts
---
.../TrkToolInterfaces/ITrackSlimmingTool.h | 12 ++++++---
.../TrkTrackSlimmingTool/TrackSlimmingTool.h | 13 +++++----
.../src/TrackSlimmingTool.cxx | 27 ++++++++++---------
3 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/ITrackSlimmingTool.h b/Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/ITrackSlimmingTool.h
index 83f6834e491a..cb0218aaad4f 100755
--- a/Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/ITrackSlimmingTool.h
+++ b/Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/ITrackSlimmingTool.h
@@ -23,6 +23,7 @@ static const InterfaceID IID_ITrackSlimmingTool("Trk::ITrackSlimmingTool",
/** @brief Interface for constructing 'slimmed' Tracks from complete tracks.
@author edward.moyse@cern.ch
+ @author Christos Anastopoulos Athena MT modifications
*/
class ITrackSlimmingTool : virtual public IAlgTool
{
@@ -41,14 +42,19 @@ public:
* When asetPersistificationHints = True
* it sets persistification hints
* @return nullptr
- * The later behaviour can be not thread-safe as it
+ *
+ * The later behaviour can be nom thread-safe as it
* modifies the const TrackStateOnSurfaces attached
- * to the Trk::Track.
+ * to the const Trk::Track reference.
+ *
+ * If you need MT safety
+ * A. If the Trk::Track is not const consider the slimTrack method
+ * B. If it is const consider using slimCopy
*/
virtual Trk::Track* slim
ATLAS_NOT_THREAD_SAFE(const Trk::Track& track) const = 0;
/**
- * This method always creates a std::unique_ptr<Trk::Track*> with information
+ * This method always creates a std::unique_ptr<Trk::Track> with information
* removed
* @param track A const reference to the track to be skimmed. It will not be
* modified in any way.
diff --git a/Tracking/TrkTools/TrkTrackSlimmingTool/TrkTrackSlimmingTool/TrackSlimmingTool.h b/Tracking/TrkTools/TrkTrackSlimmingTool/TrkTrackSlimmingTool/TrackSlimmingTool.h
index 18e2d830ca3d..bad68c5eee77 100755
--- a/Tracking/TrkTools/TrkTrackSlimmingTool/TrkTrackSlimmingTool/TrackSlimmingTool.h
+++ b/Tracking/TrkTools/TrkTrackSlimmingTool/TrkTrackSlimmingTool/TrackSlimmingTool.h
@@ -25,8 +25,7 @@ class TrackStateOnSurface;
A tool to produce 'slimmed' Tracks from a reference track.
By default, this slimmed track will include all the measurements, and the
- Perigee parameters (currently these are assumed to exist, but eventually an
- extrapolator should be used to provide it if the perigee is missing)
+ Perigee parameters (currently these are assumed to exist)
@author Edward Moyse <Edward.Moysecern.ch>
@author Christos Anastopoulos Athena MT modifications
@@ -60,15 +59,19 @@ public:
* When m_setPersistificationHints = True
* it sets persistification hints
* @return nullptr
- * The later behaviour can be not thread-safe as it
+ * The later behaviour can be nom thread-safe as it
* modifies the const TrackStateOnSurfaces attached
- * to the Trk::Track.
+ * to the const Trk::Track reference.
+ *
+ * If you need MT safety
+ * A. If the Trk::Track is not const consider the slimTrack method
+ * B. If it is const consider using slimCopy
*/
Trk::Track* slim
ATLAS_NOT_THREAD_SAFE(const Trk::Track& track) const override final;
/**
- * This method always creates a std::unique_ptr<Trk::Track*> with information
+ * This method always creates a std::unique_ptr<Trk::Track> with information
* removed
* @param track A const reference to the track to be skimmed. It will not be
* modified in any way.
diff --git a/Tracking/TrkTools/TrkTrackSlimmingTool/src/TrackSlimmingTool.cxx b/Tracking/TrkTools/TrkTrackSlimmingTool/src/TrackSlimmingTool.cxx
index 37ce665abd9b..3fc41c4b3749 100755
--- a/Tracking/TrkTools/TrkTrackSlimmingTool/src/TrackSlimmingTool.cxx
+++ b/Tracking/TrkTools/TrkTrackSlimmingTool/src/TrackSlimmingTool.cxx
@@ -321,24 +321,27 @@ Trk::TrackSlimmingTool::checkForValidMeas(const Trk::TrackStateOnSurface* tsos,
bool& isMSmeas) const
{
if (tsos->measurementOnTrack() != nullptr) {
- bool isPseudo = (dynamic_cast<const Trk::PseudoMeasurementOnTrack*>(
- tsos->measurementOnTrack()) != nullptr);
+ bool isPseudo = (tsos->measurementOnTrack()->type(
+ Trk::MeasurementBaseType::PseudoMeasurementOnTrack));
// Handle horrible cROTs
- const Trk::CompetingRIOsOnTrack* cROT =
- dynamic_cast<const Trk::CompetingRIOsOnTrack*>(
+ const Trk::CompetingRIOsOnTrack* cROT = nullptr;
+ if (tsos->measurementOnTrack()->type(
+ Trk::MeasurementBaseType::CompetingRIOsOnTrack)) {
+ cROT = static_cast<const Trk::CompetingRIOsOnTrack*>(
tsos->measurementOnTrack());
+ }
Identifier id;
if (cROT) {
id = cROT->rioOnTrack(cROT->indexOfMaxAssignProb()).identify();
- } else {
- id = tsos->measurementOnTrack()
- ->associatedSurface()
- .associatedDetectorElementIdentifier();
+ } else {
+ id = tsos->measurementOnTrack()
+ ->associatedSurface()
+ .associatedDetectorElementIdentifier();
+ }
+ isIDmeas = !isPseudo && m_detID->is_indet(id);
+ isMSmeas = tsos->measurementOnTrack() != nullptr && !isPseudo &&
+ m_detID->is_muon(id);
}
- isIDmeas = !isPseudo && m_detID->is_indet(id);
- isMSmeas = tsos->measurementOnTrack() != nullptr && !isPseudo &&
- m_detID->is_muon(id);
- }
}
void
--
GitLab
From 3b22c1fd43e66051452704b7f917c7b2e369a97d Mon Sep 17 00:00:00 2001
From: Bertrand Martin <martindl@cern.ch>
Date: Sun, 15 Aug 2021 11:23:57 +0200
Subject: [PATCH 051/272] tauRec: fix TauTrackFinder config when not using
ghost matching
This is another submission of !45787 where the target branch is master, not 22.0-mc20.
The CI in 22.0-mc20 does not seem to be configured that well, with many tests failing, so it may be easier to review the MR within master.
If this MR is reviewed, then !45787 should be closed.
Cheers,
Bertrand
---
Reconstruction/tauRec/python/TauAlgorithmsHolder.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Reconstruction/tauRec/python/TauAlgorithmsHolder.py b/Reconstruction/tauRec/python/TauAlgorithmsHolder.py
index e6a233ae3096..6511d12df365 100644
--- a/Reconstruction/tauRec/python/TauAlgorithmsHolder.py
+++ b/Reconstruction/tauRec/python/TauAlgorithmsHolder.py
@@ -579,7 +579,7 @@ def getTauTrackFinder(removeDuplicateTracks=True):
removeDuplicateCoreTracks = removeDuplicateTracks,
useGhostTracks = tauFlags.useGhostTracks(),
ghostTrackDR = tauFlags.ghostTrackDR(),
- Key_jetContainer = tauFlags.tauRecSeedJetCollection(),
+ Key_jetContainer = tauFlags.tauRecSeedJetCollection() if tauFlags.useGhostTracks() else "",
Key_trackPartInputContainer = _DefaultTrackContainer,
Key_LargeD0TrackInputContainer = _DefaultLargeD0TrackContainer if tauFlags.associateLRT() else "",
TrackToVertexIPEstimator = getTauTrackToVertexIPEstimator(),
--
GitLab
From f196bab5fabc56f2ecd4d95ae0e1d0820250c264 Mon Sep 17 00:00:00 2001
From: Peter Kramer <peter.kramer@cern.ch>
Date: Sun, 15 Aug 2021 16:45:35 +0000
Subject: [PATCH 052/272] include AthenaMT version of MuonTrackValidation
---
.../MuonTrackMonitorAlgorithm.h | 4 +-
.../python/MuonTrackMonitorAlgorithm.py | 271 ++++++++++++--
.../python/MuonTrackMonitorPostProcessing.py | 27 ++
.../src/MuonTrackMonitorAlgorithm.cxx | 338 +++++++++++-------
4 files changed, 465 insertions(+), 175 deletions(-)
create mode 100644 MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/python/MuonTrackMonitorPostProcessing.py
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/MuonTrackMonitorAlgorithm.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/MuonTrackMonitorAlgorithm.h
index ea9352df5873..046850f2617d 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/MuonTrackMonitorAlgorithm.h
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/MuonTrackMonitorAlgorithm.h
@@ -44,10 +44,10 @@ class MuonTrackMonitorAlgorithm : public AthMonitorAlgorithm
StatusCode analyseCombinedTracks(const xAOD::MuonContainer& Muons, uint32_t lumiBlockID) const;
/// Function to create performance plots for all combined muons that lead to a Z Boson Candidate event
- StatusCode analyseZBosonCandidates(const xAOD::MuonContainer& Muons, uint32_t lumiBlockID) const;
+ StatusCode analyseResonanceCandidates(const xAOD::MuonContainer& Muons, uint32_t lumiBlockID) const;
/// Function to create performance plots for all combined muons that lead to a JPsi Meson Candidate event
- StatusCode analyseJPsiCandidates(const xAOD::MuonContainer& Muons, uint32_t lumiBlockID) const;
+ StatusCode plotResonanceCandidates(std::string resonanceName, std::vector<const xAOD::Muon*>& muonCandidates, uint32_t lumiBlockID) const;
Gaudi::Property< std::vector<std::string> > m_hltchainList{ this, "HLTTriggerList", {"HLT_2mu14", "HLT_mu26_ivarmedium"}, "High-level triggers used" };
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/python/MuonTrackMonitorAlgorithm.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/python/MuonTrackMonitorAlgorithm.py
index 7c7a3050f650..e240b09958dd 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/python/MuonTrackMonitorAlgorithm.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/python/MuonTrackMonitorAlgorithm.py
@@ -20,74 +20,273 @@ def MuonTrackConfig(inputFlags, isOld=False):
myGroup = helper.addGroup(muonTrackAlg, "MuonTrackMonitorAlgorithm", "MuonPhysics/")
+# Muons/Jpsi
myGroup.defineHistogram('JPsiMuonEta,JPsiMuonPhi;Muons_Jpsi_Origin_eta_phi', title='Muons_Jpsi_Origin_eta_phi;eta;phi', type='TH2F', path='Muons/Jpsi', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
myGroup.defineHistogram('JPsiMuonEtaTight,JPsiMuonPhiTight;Muons_Jpsi_Tight_eff', title='Muons_Jpsi_Tight_eff;eta;phi', type='TH2F', path='Muons/Jpsi', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
myGroup.defineHistogram('JPsiMuonEtaMedium,JPsiMuonPhiMedium;Muons_Jpsi_Medium_eff', title='Muons_Jpsi_Medium_eff;eta;phi', type='TH2F', path='Muons/Jpsi', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
- myGroup.defineHistogram('JPsiMuonD0;Muons_Jpsi_d0', title='Muons_Jpsi_d0;d0;Entries', type='TH1F', path='Muons/Jpsi', xbins=40, xmin=-1, xmax=1)
- myGroup.defineHistogram('JPsiMuonDPTIDME;Muons_Jpsi_ddpt_idme', title='Muons_Jpsi_ddpt_idme;(ptID-ptME)/ptID;Entries', type='TH1F', path='Muons/Jpsi', xbins=40, xmin=-0.5, xmax=0.5)
- myGroup.defineHistogram('JPsiMuonPt;Muons_Jpsi_pt', title='Muons_Jpsi_pt; pT[GeV];Entries', type='TH1F', path='Muons/Jpsi', xbins=50, xmin=0, xmax=50000)
- myGroup.defineHistogram('JPsiMuonPt;Muons_Jpsi_pt_broad', title='Muons_Jpsi_pt_broad;pT[GeV];Entries', type='TH1F', path='Muons/Jpsi', xbins=50, xmin=0, xmax=1000000)
- myGroup.defineHistogram('JPsiMuonLumiBlock;Overview_Jpsi_nJpsi_LB', title='Overview_Jpsi_nJpsi_LB;LumiBlock;NumberOfJPsis', type='TH1F', path='Overview/Jpsi', xbins=50, xmin=0, xmax=2500)
- myGroup.defineHistogram('JPsiMuonNBHits;TracksID_Jpsi_HitContent_NBlayerHits', title='TracksID_Jpsi_HitContent_NBlayerHits;NumberOfBLayerHits;Entries', type='TH1F', path='TracksID/Jpsi', xbins=5, xmin=0, xmax=5)
- myGroup.defineHistogram('JPsiMuonNPixHits;TracksID_Jpsi_HitContent_NPixelHits', title='TracksID_Jpsi_HitContent_NPixelHits;NumberOfPixelHits;Entries', type='TH1F', path='TracksID/Jpsi', xbins=10, xmin=0, xmax=10)
- myGroup.defineHistogram('JPsiMuonNSCTHits;TracksID_Jpsi_HitContent_NSCTHits', title='TracksID_Jpsi_HitContent_NSCTHits;NumberOfSCTHits;Entries', type='TH1F', path='TracksID/Jpsi', xbins=20, xmin=0, xmax=20)
- myGroup.defineHistogram('JPsiMuonNTRTHits;TracksID_Jpsi_HitContent_NTRTHits', title='TracksID_Jpsi_HitContent_NTRTHits;NumberOfTRTHits;Entries', type='TH1F', path='TracksID/Jpsi', xbins=50, xmin=0, xmax=50)
- myGroup.defineHistogram('JPsiMuonIDChi2NDF;TracksID_Jpsi_chi2ndof', title='TracksID_Jpsi_chi2ndof;TrackFitChi2NDF;Entries', type='TH1F', path='TracksID/Jpsi', xbins=20, xmin=0, xmax=5)
- myGroup.defineHistogram('JPsiMuonMEChi2NDF;TracksME_Jpsi_chi2ndof', title='TracksME_Jpsi_chi2ndof;TrackFitChi2NDF;Entries', type='TH1F', path='TracksME/Jpsi', xbins=20, xmin=0, xmax=5)
+ myGroup.defineHistogram('JPsiMuonD0;Muons_Jpsi_d0', title='Muons_Jpsi_d0;d0;Entries', type='TH1F', path='Muons/Jpsi', xbins=30, xmin=-1, xmax=1)
+ myGroup.defineHistogram('JPsiMuonDPTIDME;Muons_Jpsi_ddpt_idme', title='Muons_Jpsi_ddpt_idme;(ptID-ptME)/ptID;Entries', type='TH1F', path='Muons/Jpsi', xbins=30, xmin=-0.5, xmax=0.5)
+ myGroup.defineHistogram('JPsiMuonPt;Muons_Jpsi_pt', title='Muons_Jpsi_pt; pT[GeV];Entries', type='TH1F', path='Muons/Jpsi', xbins=30, xmin=0, xmax=50000)
+ myGroup.defineHistogram('JPsiMuonPt;Muons_Jpsi_pt_broad', title='Muons_Jpsi_pt_broad;pT[GeV];Entries', type='TH1F', path='Muons/Jpsi', xbins=30, xmin=0, xmax=1000000)
+ myGroup.defineHistogram('JPsiMass2D,muMinusEta;JPsimuMinusEta', title='JPsimuMinusEta;Z mass;#eta_{#mu^{-}}', type='TH2F', path='Muons/Jpsi', xbins=27, xmin=2600., xmax=3600., ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('JPsiMass2D,muPlusEta;JPsimuPlusEta', title='JPsimuPlusEta;Z mass;#eta_{#mu^{+}}', type='TH2F', path='Muons/Jpsi', xbins=27, xmin=2600., xmax=3600., ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('muMinusEta,muPlusEta;JPsimuPlusMinus', title='JPsimuPlusMinus;#eta_{#mu^{-}};#eta_{#mu^{+}}', type='TH2F', path='Muons/Jpsi', xbins=31, xmin=-3.1415, xmax=3.1415, ybins=31, ymin=-3.1415, ymax=3.1415)
myGroup.defineHistogram('JPsiMass2D,JPsiEta2D;JPsiMassAverage', title='JPsiMassAverage;mass;eta', type='TH2F', path='Muons/Jpsi', xbins=27, xmin=2600., xmax=3600, ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('JPsiMass2D,Eta2D;JPsiMassEta2D', title='JPsiMassEta2D;mass;eta(#mu^{-}#mu^{+})', type='TH2F', path='Muons/Jpsi', xbins=27, xmin=2600., xmax=3600, ybins=16, ymin=0.5, ymax=16.5)
+
+# Overview/Jpsi
+ myGroup.defineHistogram('JPsiMuonLumiBlock;Overview_Jpsi_nJpsi_LB', title='Overview_Jpsi_nJpsi_LB;LumiBlock;NumberOfJPsis', type='TH1F', path='Overview/Jpsi', xbins=30, xmin=0, xmax=2500)
+
+# TracksID/Jpsi
+ myGroup.defineHistogram('JPsiMuonNBHits;TracksID_Jpsi_HitContent_NBlayerHits', title='TracksID_Jpsi_HitContent_NBlayerHits;NumberOfBLayerHits;Entries', type='TH1F', path='TracksID/Jpsi', xbins=5, xmin=-0.5, xmax=4.5)
+ myGroup.defineHistogram('JPsiMuonNPixHits;TracksID_Jpsi_HitContent_NPixelHits', title='TracksID_Jpsi_HitContent_NPixelHits;NumberOfPixelHits;Entries', type='TH1F', path='TracksID/Jpsi', xbins=10, xmin=-0.5, xmax=9.5)
+ myGroup.defineHistogram('JPsiMuonNSCTHits;TracksID_Jpsi_HitContent_NSCTHits', title='TracksID_Jpsi_HitContent_NSCTHits;NumberOfSCTHits;Entries', type='TH1F', path='TracksID/Jpsi', xbins=20, xmin=-0.5, xmax=19.5)
+ myGroup.defineHistogram('JPsiMuonNTRTHits;TracksID_Jpsi_HitContent_NTRTHits', title='TracksID_Jpsi_HitContent_NTRTHits;NumberOfTRTHits;Entries', type='TH1F', path='TracksID/Jpsi', xbins=50, xmin=-0.5, xmax=49.5)
+ myGroup.defineHistogram('JPsiMuonIDChi2NDF;TracksID_Jpsi_chi2ndof', title='TracksID_Jpsi_chi2ndof;TrackFitChi2NDF;Entries', type='TH1F', path='TracksID/Jpsi', xbins=100, xmin=0, xmax=5)
+
+# TracksME/Jpsi
+ myGroup.defineHistogram('JPsiMuonMEChi2NDF;TracksME_Jpsi_chi2ndof', title='TracksME_Jpsi_chi2ndof;TrackFitChi2NDF;Entries', type='TH1F', path='TracksME/Jpsi', xbins=100, xmin=0, xmax=5)
+
+# MuonTrkPhys/Jpsi
myGroup.defineHistogram('JPsiMass;m_Jpsi_Mass', title='m_Jpsi_Mass;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Jpsi', xbins=50, xmin=2600, xmax=3600)
+ myGroup.defineHistogram('JPsiMass;m_Jpsi_2occupancy', title='m_Jpsi_2occupancy;#etaRegionPermutations[+#mu,-#mu];N_{#mu}', type='TH1F', path='MuonTrkPhys/Jpsi', xbins=16, xmin=-0.5, xmax=15.5)
+ myGroup.defineHistogram('JPsiMass;m_Jpsi_M_BA_BA', title='m_Jpsi_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Jpsi', xbins=50, xmin=2600, xmax=3600)
+ myGroup.defineHistogram('JPsiMass;m_Jpsi_M_BA_BC', title='m_Jpsi_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Jpsi', xbins=50, xmin=2600, xmax=3600)
+ myGroup.defineHistogram('JPsiMass;m_Jpsi_M_BA_EA', title='m_Jpsi_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Jpsi', xbins=50, xmin=2600, xmax=3600)
+ myGroup.defineHistogram('JPsiMass;m_Jpsi_M_BA_EC', title='m_Jpsi_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Jpsi', xbins=50, xmin=2600, xmax=3600)
+ myGroup.defineHistogram('JPsiMass;m_Jpsi_M_BC_BA', title='m_Jpsi_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Jpsi', xbins=50, xmin=2600, xmax=3600)
+ myGroup.defineHistogram('JPsiMass;m_Jpsi_M_BC_BC', title='m_Jpsi_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Jpsi', xbins=50, xmin=2600, xmax=3600)
+ myGroup.defineHistogram('JPsiMass;m_Jpsi_M_BC_EA', title='m_Jpsi_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Jpsi', xbins=50, xmin=2600, xmax=3600)
+ myGroup.defineHistogram('JPsiMass;m_Jpsi_M_BC_EC', title='m_Jpsi_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Jpsi', xbins=50, xmin=2600, xmax=3600)
+ myGroup.defineHistogram('JPsiMass;m_Jpsi_M_EA_BA', title='m_Jpsi_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Jpsi', xbins=50, xmin=2600, xmax=3600)
+ myGroup.defineHistogram('JPsiMass;m_Jpsi_M_EA_BC', title='m_Jpsi_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Jpsi', xbins=50, xmin=2600, xmax=3600)
+ myGroup.defineHistogram('JPsiMass;m_Jpsi_M_EA_EA', title='m_Jpsi_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Jpsi', xbins=50, xmin=2600, xmax=3600)
+ myGroup.defineHistogram('JPsiMass;m_Jpsi_M_EA_EC', title='m_Jpsi_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Jpsi', xbins=50, xmin=2600, xmax=3600)
+ myGroup.defineHistogram('JPsiMass;m_Jpsi_M_EC_BA', title='m_Jpsi_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Jpsi', xbins=50, xmin=2600, xmax=3600)
+ myGroup.defineHistogram('JPsiMass;m_Jpsi_M_EC_BC', title='m_Jpsi_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Jpsi', xbins=50, xmin=2600, xmax=3600)
+ myGroup.defineHistogram('JPsiMass;m_Jpsi_M_EC_EA', title='m_Jpsi_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Jpsi', xbins=50, xmin=2600, xmax=3600)
+ myGroup.defineHistogram('JPsiMass;m_Jpsi_M_EC_EC', title='m_Jpsi_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Jpsi', xbins=50, xmin=2600, xmax=3600)
+# Muons/Z
myGroup.defineHistogram('ZMuonEta,ZMuonPhi;Muons_Z_Origin_eta_phi', title='Muons_Z_Origin_eta_phi;eta;phi', type='TH2F', path='Muons/Z', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
myGroup.defineHistogram('ZMuonEtaTight,ZMuonPhiTight;Muons_Z_Tight_eff', title='Muons_Z_Tight_eff;eta;phi', type='TH2F', path='Muons/Z', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
myGroup.defineHistogram('ZMuonEtaMedium,ZMuonPhiMedium;Muons_Z_Medium_eff', title='Muons_Z_Medium_eff;eta;phi', type='TH2F', path='Muons/Z', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
- myGroup.defineHistogram('ZMuonD0;Muons_Z_d0', title='Muons_Z_d0;d0;Entries', type='TH1F', path='Muons/Z', xbins=40, xmin=-1, xmax=1)
- myGroup.defineHistogram('ZMuonZ0;Muons_Z_z0', title='Muons_Z_z0;z0;Entries', type='TH1F', path='Muons/Z', xbins=50, xmin=-1000, xmax=1000)
- myGroup.defineHistogram('ZMuonDPTIDME;Muons_Z_ddpt_idme', title='Muons_Z_ddpt_idme;(ptID-ptME)/ptID;Entries', type='TH1F', path='Muons/Z', xbins=40, xmin=-0.5, xmax=0.5)
- myGroup.defineHistogram('ZMuonPt;Muons_Z_pt', title='Muons_Z_pt; pT[GeV];Entries', type='TH1F', path='Muons/Z', xbins=50, xmin=0, xmax=50000)
- myGroup.defineHistogram('ZMuonPt;Muons_Z_pt_broad', title='Muons_Z_pt_broad;pT[GeV];Entries', type='TH1F', path='Muons/Z', xbins=50, xmin=0, xmax=1000000)
- myGroup.defineHistogram('ZMuonLumiBlock;Overview_Z_nZ_LB', title='Overview_Z_nJpsi_LB;LumiBlock;NumberOfZs', type='TH1F', path='Overview/Z', xbins=50, xmin=0, xmax=2500)
- myGroup.defineHistogram('ZMuonNBHits;TracksID_Z_HitContent_NBlayerHits', title='TracksID_Z_HitContent_NBlayerHits;NumberOfBLayerHits;Entries', type='TH1F', path='TracksID/Z', xbins=5, xmin=0, xmax=5)
- myGroup.defineHistogram('ZMuonNPixHits;TracksID_Z_HitContent_NPixelHits', title='TracksID_Z_HitContent_NPixelHits;NumberOfPixelHits;Entries', type='TH1F', path='TracksID/Z', xbins=10, xmin=0, xmax=10)
- myGroup.defineHistogram('ZMuonNSCTHits;TracksID_Z_HitContent_NSCTHits', title='TracksID_Z_HitContent_NSCTHits;NumberOfSCTHits;Entries', type='TH1F', path='TracksID/Z', xbins=20, xmin=0, xmax=20)
- myGroup.defineHistogram('ZMuonNTRTHits;TracksID_Z_HitContent_NTRTHits', title='TracksID_Z_HitContent_NTRTHits;NumberOfTRTHits;Entries', type='TH1F', path='TracksID/Z', xbins=50, xmin=0, xmax=50)
- myGroup.defineHistogram('ZMuonIDChi2NDF;TracksID_Z_chi2ndof', title='TracksID_Z_chi2ndof;TrackFitChi2NDF;Entries', type='TH1F', path='TracksID/Z', xbins=20, xmin=0, xmax=5)
- myGroup.defineHistogram('ZMuonMEChi2NDF;TracksME_Z_chi2ndof', title='TracksME_Z_chi2ndof;TrackFitChi2NDF;Entries', type='TH1F', path='TracksME/Z', xbins=20, xmin=0, xmax=5)
- myGroup.defineHistogram('ZMass2D,ZEta2D;ZMassAverage', title='ZMassAverage;mass;eta', type='TH2F', path='Muons/Z', xbins=27, xmin=76000., xmax=106000., ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('ZMuonD0;Muons_Z_d0', title='Muons_Z_d0;d0;Entries', type='TH1F', path='Muons/Z', xbins=100, xmin=-1, xmax=1)
+ myGroup.defineHistogram('ZMuonZ0;Muons_Z_z0', title='Muons_Z_z0;z0;Entries', type='TH1F', path='Muons/Z', xbins=100, xmin=-1000, xmax=1000)
+ myGroup.defineHistogram('ZMuonDPTIDME;Muons_Z_ddpt_idme', title='Muons_Z_ddpt_idme;(ptID-ptME)/ptID;Entries', type='TH1F', path='Muons/Z', xbins=100, xmin=-0.5, xmax=0.5)
+ myGroup.defineHistogram('ZMuonPt;Muons_Z_pt', title='Muons_Z_pt; pT[GeV];Entries', type='TH1F', path='Muons/Z', xbins=100, xmin=0, xmax=50000)
+ myGroup.defineHistogram('ZMuonPt;Muons_Z_pt_broad', title='Muons_Z_pt_broad;pT[GeV];Entries', type='TH1F', path='Muons/Z', xbins=100, xmin=0, xmax=1000000)
+ myGroup.defineHistogram('ZMass,muMinusEta;ZmuMinusEta', title='ZmuMinusEta;Z mass;#eta_{#mu^{-}}', type='TH2F', path='Muons/Z', xbins=27, xmin=76000., xmax=106000., ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('ZMass,muPlusEta;ZmuPlusEta', title='ZmuPlusEta;Z mass;#eta_{#mu^{+}}', type='TH2F', path='Muons/Z', xbins=27, xmin=76000., xmax=106000., ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('muMinusEta,muPlusEta;ZmuPlusMinus', title='ZmuPlusMinus;#eta_{#mu^{-}};#eta_{#mu^{+}}', type='TH2F', path='Muons/Z', xbins=31, xmin=-3.1415, xmax=3.1415, ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('ZMass,ZEta;ZMassAverage', title='ZMassAverage;mass;eta', type='TH2F', path='Muons/Z', xbins=27, xmin=76000., xmax=106000., ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('ZMass,MuPlusEta;ZMassEtaPlus', title='ZMassEtaPlus;mass;eta(#mu^{-}#mu^{+})', type='TH2F', path='Muons/Z', xbins=27, xmin=76000., xmax=106000., ybins=16, ymin=0.5, ymax=16.5)
+ myGroup.defineHistogram('ZMass,muMinusEta;ZMassEtaMinus', title='ZMassEtaMinus;mass;eta(#mu^{-}#mu^{+})', type='TH2F', path='Muons/Z', xbins=27, xmin=76000., xmax=106000., ybins=16, ymin=0.5, ymax=16.5)
+
+# Overview/Z
+ myGroup.defineHistogram('ZMuonLumiBlock;Overview_Z_nZ_LB', title='Overview_Z_nJpsi_LB;LumiBlock;NumberOfZs', type='TH1F', path='Overview/Z', xbins=100, xmin=0, xmax=2500)
+
+# TracksID/Z
+ myGroup.defineHistogram('ZMuonNBHits;TracksID_Z_HitContent_NBlayerHits', title='TracksID_Z_HitContent_NBlayerHits;NumberOfBLayerHits;Entries', type='TH1F', path='TracksID/Z', xbins=5, xmin=-0.5, xmax=4.5)
+ myGroup.defineHistogram('ZMuonNPixHits;TracksID_Z_HitContent_NPixelHits', title='TracksID_Z_HitContent_NPixelHits;NumberOfPixelHits;Entries', type='TH1F', path='TracksID/Z', xbins=10, xmin=-0.5, xmax=9.5)
+ myGroup.defineHistogram('ZMuonNSCTHits;TracksID_Z_HitContent_NSCTHits', title='TracksID_Z_HitContent_NSCTHits;NumberOfSCTHits;Entries', type='TH1F', path='TracksID/Z', xbins=20, xmin=-0.5, xmax=19.5)
+ myGroup.defineHistogram('ZMuonNTRTHits;TracksID_Z_HitContent_NTRTHits', title='TracksID_Z_HitContent_NTRTHits;NumberOfTRTHits;Entries', type='TH1F', path='TracksID/Z', xbins=50, xmin=-0.5, xmax=49.5)
+ myGroup.defineHistogram('ZMuonIDChi2NDF;TracksID_Z_chi2ndof', title='TracksID_Z_chi2ndof;TrackFitChi2NDF;Entries', type='TH1F', path='TracksID/Z', xbins=100, xmin=0, xmax=5)
+
+# TracksME/Z
+ myGroup.defineHistogram('ZMuonMEChi2NDF;TracksME_Z_chi2ndof', title='TracksME_Z_chi2ndof;TrackFitChi2NDF;Entries', type='TH1F', path='TracksME/Z', xbins=100, xmin=0, xmax=5)
+
+# MuonTrkPhys/Z
myGroup.defineHistogram('ZMass;m_Z_Mass', title='m_Z_Mass;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Z', xbins=50, xmin=76000., xmax=106000.)
+ myGroup.defineHistogram('ZMass;m_Z_2occupancy', title='m_Z_2occupancy;#etaRegionPermutations[+#mu,-#mu];N_{#mu}', type='TH1F', path='MuonTrkPhys/Z', xbins=16, xmin=-0.5, xmax=15.5)
+ myGroup.defineHistogram('ZMass;m_Z_M_BA_BA', title='m_Z_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Z', xbins=50, xmin=76000., xmax=106000.)
+ myGroup.defineHistogram('ZMass;m_Z_M_BA_BC', title='m_Z_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Z', xbins=50, xmin=76000., xmax=106000.)
+ myGroup.defineHistogram('ZMass;m_Z_M_BA_EA', title='m_Z_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Z', xbins=50, xmin=76000., xmax=106000.)
+ myGroup.defineHistogram('ZMass;m_Z_M_BA_EC', title='m_Z_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Z', xbins=50, xmin=76000., xmax=106000.)
+ myGroup.defineHistogram('ZMass;m_Z_M_BC_BA', title='m_Z_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Z', xbins=50, xmin=76000., xmax=106000.)
+ myGroup.defineHistogram('ZMass;m_Z_M_BC_BC', title='m_Z_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Z', xbins=50, xmin=76000., xmax=106000.)
+ myGroup.defineHistogram('ZMass;m_Z_M_BC_EA', title='m_Z_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Z', xbins=50, xmin=76000., xmax=106000.)
+ myGroup.defineHistogram('ZMass;m_Z_M_BC_EC', title='m_Z_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Z', xbins=50, xmin=76000., xmax=106000.)
+ myGroup.defineHistogram('ZMass;m_Z_M_EA_BA', title='m_Z_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Z', xbins=50, xmin=76000., xmax=106000.)
+ myGroup.defineHistogram('ZMass;m_Z_M_EA_BC', title='m_Z_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Z', xbins=50, xmin=76000., xmax=106000.)
+ myGroup.defineHistogram('ZMass;m_Z_M_EA_EA', title='m_Z_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Z', xbins=50, xmin=76000., xmax=106000.)
+ myGroup.defineHistogram('ZMass;m_Z_M_EA_EC', title='m_Z_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Z', xbins=50, xmin=76000., xmax=106000.)
+ myGroup.defineHistogram('ZMass;m_Z_M_EC_BA', title='m_Z_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Z', xbins=50, xmin=76000., xmax=106000.)
+ myGroup.defineHistogram('ZMass;m_Z_M_EC_BC', title='m_Z_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Z', xbins=50, xmin=76000., xmax=106000.)
+ myGroup.defineHistogram('ZMass;m_Z_M_EC_EA', title='m_Z_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Z', xbins=50, xmin=76000., xmax=106000.)
+ myGroup.defineHistogram('ZMass;m_Z_M_EC_EC', title='m_Z_M;M_{#mu#mu};Entries', type='TH1F', path='MuonTrkPhys/Z', xbins=50, xmin=76000., xmax=106000.)
+# Muons/CBMuons
myGroup.defineHistogram('CBMuonEta,CBMuonPhi;Muons_CBMuons_eta_phi', title='Muons_CBMuons_eta_phi;eta;phi', type='TH2F', path='Muons/CBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
myGroup.defineHistogram('CBMuonEtaTight,CBMuonPhiTight;Muons_CBMuons_eta_phi_tight', title='Muons_CBMuons_eta_phi_tight;eta;phi', type='TH2F', path='Muons/CBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
myGroup.defineHistogram('CBMuonEtaMedium,CBMuonPhiMedium;Muons_CBMuons_eta_phi_medium', title='Muons_CBMuons_eta_phi_medium;eta;phi', type='TH2F', path='Muons/CBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
myGroup.defineHistogram('CBMuonD0;Muons_CBMuons_d0', title='Muons_CBMuons_d0;d0;Entries', type='TH1F', path='Muons/CBMuons', xbins=40, xmin=-1, xmax=1)
myGroup.defineHistogram('CBMuonZ0;Muons_CBMuons_z0', title='Muons_CBMuons_z0;z0;Entries', type='TH1F', path='Muons/CBMuons', xbins=50, xmin=-1000, xmax=1000)
+ myGroup.defineHistogram('CBMuonIDChi2NDF;Muons_CBMuons_tndof', title='Muons_CBMuons_tndof;TotalNumberDOF;Entries', type='TH1F', path='Muons/CBMuons', xbins=100, xmin=0, xmax=100)
myGroup.defineHistogram('CBMuonDPTIDME;Muons_CB_ddpt_idme', title='Muons_CB_ddpt_idme;(ptID-ptME)/ptID;Entries', type='TH1F', path='Muons/CBMuons', xbins=40, xmin=-0.5, xmax=0.5)
myGroup.defineHistogram('CBMuonPt;Muons_CBMuons_pt', title='Muons_CBMuons_pt;pT[GeV];Entries', type='TH1F', path='Muons/CBMuons', xbins=50, xmin=0, xmax=50000)
myGroup.defineHistogram('CBMuonPt;Muons_CBMuons_pt_broad', title='Muons_CBMuons_pt_broad;pT[GeV];Entries', type='TH1F', path='Muons/CBMuons', xbins=50, xmin=0, xmax=1000000)
- myGroup.defineHistogram('CBMuonLumiBlock;Overview_CBMuons_nMuon_LB', title='Overview_CBMuons_nMuon_LB;LumiBlock;NumberOfCBMuons', type='TH1F', path='Overview/CBMuons', xbins=2500, xmin=0, xmax=2500)
- myGroup.defineHistogram('CBMuonNBHits;TracksID_CBMuons_HitContent_NBlayerHits', title='TracksID_CBMuons_HitContent_NBlayerHits;NumberOfBLayerHits;Entries', type='TH1F', path='TracksID/CBMuons', xbins=5, xmin=0, xmax=5)
- myGroup.defineHistogram('CBMuonNPixHits;TracksID_CBMuons_HitContent_NPixelHits', title='TracksID_CBMuons_HitContent_NPixelHits;NumberOfPixelHits;Entries', type='TH1F', path='TracksID/CBMuons', xbins=10, xmin=0, xmax=10)
- myGroup.defineHistogram('CBMuonNSCTHits;TracksID_CBMuons_HitContent_NSCTHits', title='TracksID_CBMuons_HitContent_NSCTHits;NumberOfSCTHits;Entries', type='TH1F', path='TracksID/CBMuons', xbins=20, xmin=0, xmax=20)
- myGroup.defineHistogram('CBMuonNTRTHits;TracksID_CBMuons_HitContent_NTRTHits', title='TracksID_CBMuons_HitContent_NTRTHits;NumberOfTRTHits;Entries', type='TH1F', path='TracksID/CBMuons', xbins=50, xmin=0, xmax=50)
- myGroup.defineHistogram('CBMuonIDChi2NDF;TracksID_CBMuons_chi2ndof', title='TracksID_CBMuons_chi2ndof;TrackFitChi2NDF;Entries', type='TH1F', path='TracksID/CBMuons', xbins=20, xmin=0, xmax=5)
- myGroup.defineHistogram('CBMuonMEChi2NDF;TracksME_CBMuons_chi2ndof', title='TracksME_CBMuons_chi2ndof;TrackFitChi2NDF;Entries', type='TH1F', path='TracksME/CBMuons', xbins=20, xmin=0, xmax=5)
-
myGroup.defineHistogram('CBMuonAuthor;Muons_CBMuons_Author', title='Muons_CBMuons_Author;Author;Entries', type='TH1F', path='Muons/CBMuons', xbins=20, xmin=0, xmax=20)
myGroup.defineHistogram('CBMuonEtaMedium,CBMuonPhiMedium;Muons_CBMuons_Medium_eff', title='Muons_CBMuons_Medium_eff;eta;phi', type='TH2F', path='Muons/CBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
myGroup.defineHistogram('CBMuonEta1Triggered,CBMuonPhi1Triggered;Muons_CBMuons_1Triggered_eta_phi', title='Muons_CBMuons_eta_phi_1Triggered;eta;phi', type='TH2F', path='Muons/CBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
myGroup.defineHistogram('CBMuonEta1All,CBMuonPhi1All;Muons_CBMuons_1All_eta_phi', title='Muons_CBMuons_eta_phi_1All;eta;phi', type='TH2F', path='Muons/CBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
+
+# Overview/CBMuons
+ myGroup.defineHistogram('CBMuonLumiBlock;Overview_CBMuons_nMuon_LB', title='Overview_CBMuons_nMuon_LB;LumiBlock;NumberOfCBMuons', type='TH1F', path='Overview/CBMuons', xbins=2500, xmin=0, xmax=2500)
+
+# TracksID/CBMuons
+ myGroup.defineHistogram('CBMuonNBHits;TracksID_CBMuons_HitContent_NBlayerHits', title='TracksID_CBMuons_HitContent_NBlayerHits;NumberOfBLayerHits;Entries', type='TH1F', path='TracksID/CBMuons', xbins=5, xmin=-0.5, xmax=4.5)
+ myGroup.defineHistogram('CBMuonNPixHits;TracksID_CBMuons_HitContent_NPixelHits', title='TracksID_CBMuons_HitContent_NPixelHits;NumberOfPixelHits;Entries', type='TH1F', path='TracksID/CBMuons', xbins=10, xmin=-0.5, xmax=9.5)
+ myGroup.defineHistogram('CBMuonNSCTHits;TracksID_CBMuons_HitContent_NSCTHits', title='TracksID_CBMuons_HitContent_NSCTHits;NumberOfSCTHits;Entries', type='TH1F', path='TracksID/CBMuons', xbins=20, xmin=-0.5, xmax=19.5)
+ myGroup.defineHistogram('CBMuonNTRTHits;TracksID_CBMuons_HitContent_NTRTHits', title='TracksID_CBMuons_HitContent_NTRTHits;NumberOfTRTHits;Entries', type='TH1F', path='TracksID/CBMuons', xbins=50, xmin=-0.5, xmax=49.5)
+ myGroup.defineHistogram('CBMuonIDChi2NDF;TracksID_CBMuons_chi2ndof', title='TracksID_CBMuons_chi2ndof;TrackFitChi2NDF;Entries', type='TH1F', path='TracksID/CBMuons', xbins=100, xmin=0, xmax=5)
+
+# TracksME/CBMuons
+ myGroup.defineHistogram('CBMuonMEChi2NDF;TracksME_CBMuons_chi2ndof', title='TracksME_CBMuons_chi2ndof;TrackFitChi2NDF;Entries', type='TH1F', path='TracksME/CBMuons', xbins=100, xmin=0, xmax=5)
+
+# Muons/NonCBMuons
myGroup.defineHistogram('NonCBMuonEta,NonCBMuonPhi;Muons_NonCBMuons_Origin_eta_phi', title='Muons_NonCBMuons_Origin_eta_phi;eta;phi;', type='TH2F', path='Muons/NonCBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('NonCBMuonEta,NonCBMuonPhi;Muons_NonCBMuons_eta_phi', title='Muons_NonCBMuons_eta_phi;eta;phi', type='TH2F', path='Muons/NonCBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('NonCBMuonEtaTight,NonCBMuonPhiTight;Muons_NonCBMuons_eta_phi_tight', title='Muons_NonCBMuons_eta_phi_tight;eta;phi', type='TH2F', path='Muons/NonCBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('NonCBMuonEtaMedium,NonCBMuonPhiMedium;Muons_NonCBMuons_eta_phi_medium', title='Muons_NonCBMuons_eta_phi_medium;eta;phi', type='TH2F', path='Muons/NonCBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('NonCBMuonD0;Muons_NonCBMuons_d0', title='Muons_NonCBMuons_d0;d0;Entries', type='TH1F', path='Muons/NonCBMuons', xbins=40, xmin=-1, xmax=1)
+ myGroup.defineHistogram('NonCBMuonZ0;Muons_NonCBMuons_z0', title='Muons_NonCBMuons_z0;z0;Entries', type='TH1F', path='Muons/NonCBMuons', xbins=50, xmin=-1000, xmax=1000)
+ myGroup.defineHistogram('CBMuonIDChi2NDF;Muons_CBMuons_tndof', title='Muons_CBMuons_tndof;TotalNumberDOF;Entries', type='TH1F', path='NoTrig/Muons/CBMuons', xbins=100, xmin=0, xmax=100)
+ myGroup.defineHistogram('NonCBMuonDPTIDME;Muons_CB_ddpt_idme', title='Muons_CB_ddpt_idme;(ptID-ptME)/ptID;Entries', type='TH1F', path='Muons/NonCBMuons', xbins=40, xmin=-0.5, xmax=0.5)
+ myGroup.defineHistogram('NonCBMuonPt;Muons_NonCBMuons_pt', title='Muons_NonCBMuons_pt;pT[GeV];Entries', type='TH1F', path='Muons/NonCBMuons', xbins=50, xmin=0, xmax=50000)
+ myGroup.defineHistogram('NonCBMuonPt;Muons_NonCBMuons_pt_broad', title='Muons_NonCBMuons_pt_broad;pT[GeV];Entries', type='TH1F', path='Muons/NonCBMuons', xbins=50, xmin=0, xmax=1000000)
+ myGroup.defineHistogram('NonCBMuonAuthor;Muons_NonCBMuons_Author', title='Muons_NonCBMuons_Author;Author;Entries', type='TH1F', path='Muons/NonCBMuons', xbins=20, xmin=0, xmax=20)
+ myGroup.defineHistogram('NonCBMuonEtaMedium,NonCBMuonPhiMedium;Muons_NonCBMuons_Medium_eff', title='Muons_NonCBMuons_Medium_eff;eta;phi', type='TH2F', path='Muons/NonCBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('NonCBMuonEta1Triggered,NonCBMuonPhi1Triggered;Muons_NonCBMuons_1Triggered_eta_phi', title='Muons_NonCBMuons_eta_phi_1Triggered;eta;phi', type='TH2F', path='Muons/NonCBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('NonCBMuonEta1All,NonCBMuonPhi1All;Muons_NonCBMuons_1All_eta_phi', title='Muons_NonCBMuons_eta_phi_1All;eta;phi', type='TH2F', path='Muons/NonCBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
+
+# Overview/NonCBMuons
+ myGroup.defineHistogram('NonCBMuonLumiBlock;Overview_NonCBMuons_nMuon_LB', title='Overview_NonCBMuons_nMuon_LB;LumiBlock;NumberOfNonCBMuons', type='TH1F', path='Overview/NonCBMuons', xbins=2500, xmin=0, xmax=2500)
+
+# TracksID/NonCBMuons
+ myGroup.defineHistogram('NonCBMuonNBHits;TracksID_NonCBMuons_HitContent_NBlayerHits', title='TracksID_NonCBMuons_HitContent_NBlayerHits;NumberOfBLayerHits;Entries', type='TH1F', path='TracksID/NonCBMuons', xbins=5, xmin=-0.5, xmax=4.5)
+ myGroup.defineHistogram('NonCBMuonNPixHits;TracksID_NonCBMuons_HitContent_NPixelHits', title='TracksID_NonCBMuons_HitContent_NPixelHits;NumberOfPixelHits;Entries', type='TH1F', path='TracksID/NonCBMuons', xbins=10, xmin=-0.5, xmax=9.5)
+ myGroup.defineHistogram('NonCBMuonNSCTHits;TracksID_NonCBMuons_HitContent_NSCTHits', title='TracksID_NonCBMuons_HitContent_NSCTHits;NumberOfSCTHits;Entries', type='TH1F', path='TracksID/NonCBMuons', xbins=20, xmin=-0.5, xmax=19.5)
+ myGroup.defineHistogram('NonCBMuonNTRTHits;TracksID_NonCBMuons_HitContent_NTRTHits', title='TracksID_NonCBMuons_HitContent_NTRTHits;NumberOfTRTHits;Entries', type='TH1F', path='TracksID/NonCBMuons', xbins=50, xmin=-0.5, xmax=49.5)
+ myGroup.defineHistogram('NonCBMuonIDChi2NDF;TracksID_NonCBMuons_chi2ndof', title='TracksID_NonCBMuons_chi2ndof;TrackFitChi2NDF;Entries', type='TH1F', path='TracksID/NonCBMuons', xbins=100, xmin=0, xmax=5)
+
+# TracksME/NonCBMuons
+ myGroup.defineHistogram('NonCBMuonMEChi2NDF;TracksME_NonCBMuons_chi2ndof', title='TracksME_NonCBMuons_chi2ndof;TrackFitChi2NDF;Entries', type='TH1F', path='TracksME/NonCBMuons', xbins=100, xmin=0, xmax=5)
+
+# Segments/CBMuons
myGroup.defineHistogram('CBMuonSector,CBMuonCIndex;Segments_CBMuons_chamberIndex_perSector', title='Segments_CBMuons_chamberIndex_perSector;Sector;ChamberIndex', type='TH2F', path='Segments/CBMuons', xbins=30, xmin=-15, xmax=15, ybins=17, ymin=0, ymax=17)
+ myGroup.defineHistogram('CBMuonSectorEta,CBMuonSectorPhi;Segments_CBMuons_etaphidir', title='Segments_CBMuons_etaphidir;#eta_{dir};#varphi_{dir}', type='TH2F', path='Segments/CBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('CBMuonLargeSectorZ,CBMuonLargeSectorR;Segments_CBMuons_rzpos_sectorLarge', title='Segments_CBMuons_rzpos_sectorLarge;zPos[mm];r[mm]', type='TH2F', path='Segments/CBMuons', xbins=220, xmin=-22000, xmax=22000, ybins=100, ymin=0, ymax=15000)
+ myGroup.defineHistogram('CBMuonSmallSectorZ,CBMuonSmallSectorR;Segments_CBMuons_rzpos_sectorSmall', title='Segments_CBMuons_rzpos_sectorSmall;zPos[mm];r[mm]', type='TH2F', path='Segments/CBMuons', xbins=220, xmin=-22000, xmax=22000, ybins=100, ymin=0, ymax=15000)
+ myGroup.defineHistogram('CBMuonSegmentFitChi2NDF;Segments_CBMuons_segmentfitChi2oNdof', title='Segments_CBMuons_segmentfitChi2oNdof;SegmentFit#Chi^{2}/N_{dof};Entries', type='TH1F', path='Segments/CBMuons', xbins=120, xmin=0, xmax=12)
+ myGroup.defineHistogram('CBMuonSegmentT0;Segments_CBMuons_t0', title='Segments_CBMuons_t0;t_{0};Entries', type='TH1F', path='Segments/CBMuons', xbins=200, xmin=-25, xmax=25)
+ myGroup.defineHistogram('CBMuonSegmentT0Err;Segments_CBMuons_t0err', title='Segments_CBMuons_t0err;t_{0}Error;Entries', type='TH1F', path='Segments/CBMuons', xbins=100, xmin=0, xmax=10)
+ myGroup.defineHistogram('CBMuonSegmentXYPosEndcap;Segments_CBMuons_xypos_endcap', title='Segments_CBMuons_xypos_endcap;x_{pos};y_{pos}', type='TH1F', path='Segments/CBMuons', xbins=24, xmin=-12000, xmax=12000, ybins=24, ymin=-12000, ymax=12000)
+ myGroup.defineHistogram('CBMuonSegmentXYPosBarrel;Segments_CBMuons_xypos_barrel', title='Segments_CBMuons_xypos_barrel;x_{pos};y_{pos}', type='TH1F', path='Segments/CBMuons', xbins=24, xmin=-12000, xmax=12000, ybins=24, ymin=-12000, ymax=12000)
+
+# Segments/NonCBMuons
+ myGroup.defineHistogram('CBMuonSector,CBMuonCIndex;Segments_NonCBMuons_chamberIndex_perSector', title='Segments_NonCBMuons_chamberIndex_perSector;Sector;ChamberIndex', type='TH2F', path='Segments/NonCBMuons', xbins=30, xmin=-15, xmax=15, ybins=17, ymin=0, ymax=17)
+ myGroup.defineHistogram('CBMuonSectorEta,CBMuonSectorPhi;Segments_NonCBMuons_etaphidir', title='Segments_NonCBMuons_etaphidir;#eta_{dir};#varphi_{dir}', type='TH2F', path='Segments/NonCBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('CBMuonLargeSectorZ,CBMuonLargeSectorR;Segments_NonCBMuons_rzpos_sectorLarge', title='Segments_NonCBMuons_rzpos_sectorLarge;zPos[mm];r[mm]', type='TH2F', path='Segments/NonCBMuons', xbins=220, xmin=-22000, xmax=22000, ybins=100, ymin=0, ymax=15000)
+ myGroup.defineHistogram('CBMuonSmallSectorZ,CBMuonSmallSectorR;Segments_NonCBMuons_rzpos_sectorSmall', title='Segments_NonCBMuons_rzpos_sectorSmall;zPos[mm];r[mm]', type='TH2F', path='Segments/NonCBMuons', xbins=220, xmin=-22000, xmax=22000, ybins=100, ymin=0, ymax=15000)
+ myGroup.defineHistogram('CBMuonSegmentFitChi2NDF;Segments_NonCBMuons_segmentfitChi2oNdof', title='Segments_NonCBMuons_segmentfitChi2oNdof;SegmentFit#Chi^{2}/N_{dof};Entries', type='TH1F', path='Segments/NonCBMuons', xbins=120, xmin=0, xmax=12)
+ myGroup.defineHistogram('CBMuonSegmentT0;Segments_NonCBMuons_t0', title='Segments_NonCBMuons_t0;t_{0};Entries', type='TH1F', path='Segments/NonCBMuons', xbins=200, xmin=-25, xmax=25)
+ myGroup.defineHistogram('CBMuonSegmentT0Err;Segments_NonCBMuons_t0err', title='Segments_NonCBMuons_t0err;t_{0}Error;Entries', type='TH1F', path='Segments/NonCBMuons', xbins=100, xmin=0, xmax=10)
+ myGroup.defineHistogram('CBMuonSegmentXYPosEndcap;Segments_NonCBMuons_xypos_endcap', title='Segments_NonCBMuons_xypos_endcap;x_{pos};y_{pos}', type='TH1F', path='Segments/NonCBMuons', xbins=24, xmin=-12000, xmax=12000, ybins=24, ymin=-12000, ymax=12000)
+ myGroup.defineHistogram('CBMuonSegmentXYPosBarrel;Segments_NonCBMuons_xypos_barrel', title='Segments_NonCBMuons_xypos_barrel;x_{pos};y_{pos}', type='TH1F', path='Segments/NonCBMuons', xbins=24, xmin=-12000, xmax=12000, ybins=24, ymin=-12000, ymax=12000)
+
+# NoTrig/Segments/CBMuons
+ myGroup.defineHistogram('NoTrigCBMuonSector,CBMuonCIndex;Segments_NoTrig_CBMuons_chamberIndex_perSector', title='Segments_NoTrig_CBMuons_chamberIndex_perSector;Sector;ChamberIndex', type='TH2F', path='NoTrig/Segments/CBMuons', xbins=30, xmin=-15, xmax=15, ybins=17, ymin=0, ymax=17)
+ myGroup.defineHistogram('NoTrigCBMuonSectorEta,NoTrigCBMuonSectorPhi;Segments_NoTrig_CBMuons_etaphidir', title='Segments_NoTrig_CBMuons_etaphidir;#eta_{dir};#varphi_{dir}', type='TH2F', path='NoTrig/Segments/CBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('NoTrigCBMuonLargeSectorZ,NoTrigCBMuonLargeSectorR;Segments_NoTrig_CBMuons_rzpos_sectorLarge', title='Segments_NoTrig_CBMuons_rzpos_sectorLarge;zPos[mm];r[mm]', type='TH2F', path='NoTrig/Segments/CBMuons', xbins=220, xmin=-22000, xmax=22000, ybins=100, ymin=0, ymax=15000)
+ myGroup.defineHistogram('NoTrigCBMuonSmallSectorZ,NoTrigCBMuonSmallSectorR;Segments_NoTrig_CBMuons_rzpos_sectorSmall', title='Segments_NoTrig_CBMuons_rzpos_sectorSmall;zPos[mm];r[mm]', type='TH2F', path='NoTrig/Segments/CBMuons', xbins=220, xmin=-22000, xmax=22000, ybins=100, ymin=0, ymax=15000)
+ myGroup.defineHistogram('NoTrigCBMuonSegmentFitChi2NDF;Segments_NoTrig_CBMuons_segmentfitChi2oNdof', title='Segments_NoTrig_CBMuons_segmentfitChi2oNdof;SegmentFit#Chi^{2}/N_{dof};Entries', type='TH1F', path='NoTrig/Segments/CBMuons', xbins=120, xmin=0, xmax=12)
+ myGroup.defineHistogram('NoTrigCBMuonSegmentT0;Segments_NoTrig_CBMuons_t0', title='Segments_NoTrig_CBMuons_t0;t_{0};Entries', type='TH1F', path='NoTrig/Segments/CBMuons', xbins=200, xmin=-25, xmax=25)
+ myGroup.defineHistogram('NoTrigCBMuonSegmentT0Err;Segments_NoTrig_CBMuons_t0err', title='Segments_NoTrig_CBMuons_t0err;t_{0}Error;Entries', type='TH1F', path='NoTrig/Segments/CBMuons', xbins=100, xmin=0, xmax=10)
+ myGroup.defineHistogram('NoTrigCBMuonSegmentXYPosEndcap;Segments_NoTrig_CBMuons_xypos_endcap', title='Segments_NoTrig_CBMuons_xypos_endcap;x_{pos};y_{pos}', type='TH1F', path='NoTrig/Segments/CBMuons', xbins=24, xmin=-12000, xmax=12000, ybins=24, ymin=-12000, ymax=12000)
+ myGroup.defineHistogram('NoTrigCBMuonSegmentXYPosBarrel;Segments_NoTrig_CBMuons_xypos_barrel', title='Segments_NoTrig_CBMuons_xypos_barrel;x_{pos};y_{pos}', type='TH1F', path='NoTrig/Segments/CBMuons', xbins=24, xmin=-12000, xmax=12000, ybins=24, ymin=-12000, ymax=12000)
+# NoTrig/NoTrigSegments/NonCBMuons
+ myGroup.defineHistogram('NoTrigNonCBMuonSector,CBMuonCIndex;Segments_NoTrig_NonCBMuons_chamberIndex_perSector', title='Segments_NoTrig_NonCBMuons_chamberIndex_perSector;Sector;ChamberIndex', type='TH2F', path='NoTrigSegments/NonCBMuons', xbins=30, xmin=-15, xmax=15, ybins=17, ymin=0, ymax=17)
+ myGroup.defineHistogram('NoTrigNonCBMuonSectorEta,NoTrigNonCBMuonSectorPhi;Segments_NoTrig_NonCBMuons_etaphidir', title='Segments_NoTrig_NonCBMuons_etaphidir;#eta_{dir};#varphi_{dir}', type='TH2F', path='NoTrigSegments/NonCBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('NoTrigNonCBMuonLargeSectorZ,NoTrigNonCBMuonLargeSectorR;Segments_NoTrig_NonCBMuons_rzpos_sectorLarge', title='Segments_NoTrig_NonCBMuons_rzpos_sectorLarge;zPos[mm];r[mm]', type='TH2F', path='NoTrigSegments/NonCBMuons', xbins=220, xmin=-22000, xmax=22000, ybins=100, ymin=0, ymax=15000)
+ myGroup.defineHistogram('NoTrigNonCBMuonSmallSectorZ,NoTrigNonCBMuonSmallSectorR;Segments_NoTrig_NonCBMuons_rzpos_sectorSmall', title='Segments_NoTrig_NonCBMuons_rzpos_sectorSmall;zPos[mm];r[mm]', type='TH2F', path='NoTrigSegments/NonCBMuons', xbins=220, xmin=-22000, xmax=22000, ybins=100, ymin=0, ymax=15000)
+ myGroup.defineHistogram('NoTrigNonCBMuonSegmentFitChi2NDF;Segments_NoTrig_NonCBMuons_segmentfitChi2oNdof', title='Segments_NoTrig_NonCBMuons_segmentfitChi2oNdof;SegmentFit#Chi^{2}/N_{dof};Entries', type='TH1F', path='NoTrigSegments/NonCBMuons', xbins=120, xmin=0, xmax=12)
+ myGroup.defineHistogram('NoTrigNonCBMuonSegmentT0;Segments_NoTrig_NonCBMuons_t0', title='Segments_NoTrig_NonCBMuons_t0;t_{0};Entries', type='TH1F', path='NoTrigSegments/NonCBMuons', xbins=200, xmin=-25, xmax=25)
+ myGroup.defineHistogram('NoTrigNonCBMuonSegmentT0Err;Segments_NoTrig_NonCBMuons_t0err', title='Segments_NoTrig_NonCBMuons_t0err;t_{0}Error;Entries', type='TH1F', path='NoTrigSegments/NonCBMuons', xbins=100, xmin=0, xmax=10)
+ myGroup.defineHistogram('NoTrigNonCBMuonSegmentXYPosEndcap;Segments_NoTrig_NonCBMuons_xypos_endcap', title='Segments_NoTrig_NonCBMuons_xypos_endcap;x_{pos};y_{pos}', type='TH1F', path='NoTrigSegments/NonCBMuons', xbins=24, xmin=-12000, xmax=12000, ybins=24, ymin=-12000, ymax=12000)
+ myGroup.defineHistogram('NoTrigNonCBMuonSegmentXYPosBarrel;Segments_NoTrig_NonCBMuons_xypos_barrel', title='Segments_NoTrig_NonCBMuons_xypos_barrel;x_{pos};y_{pos}', type='TH1F', path='NoTrigSegments/NonCBMuons', xbins=24, xmin=-12000, xmax=12000, ybins=24, ymin=-12000, ymax=12000)
+
+# TracksMS/Container
myGroup.defineHistogram('MSAuthor;MSAuthor', title='MSAuthor;MS-Author;Entries', type='TH1F', path='TracksMS/Container', xbins=15, xmin=0, xmax=15)
myGroup.defineHistogram('MSQuality;MSQuality', title='MSQuality;MS-Quality;Entries', type='TH1F', path='TracksMS/Container', xbins=15, xmin=0, xmax=15)
myGroup.defineHistogram('MSType;MSType', title='MSType;MS-Type;Entries', type='TH1F', path='TracksMS/Container', xbins=15, xmin=0, xmax=15)
- myGroup.defineHistogram('MSLumiBlockNumberOfMuonTracks;Overview_Container_nMuonTrack_LB', title='Overview_Container_nMuonTrack_LB;LumiBlock;NumberOfMuonTracks', type='TH1F', path='Overview/Container', xbins=50, xmin=0, xmax=2500)
- myGroup.defineHistogram('MSLumiBlockNumberOfSegments;Overview_Container_nSegment_LB', title='Overview_Container_nSegment_LB;LumiBlock;NumberOfMuonSegments', type='TH1F', path='Overview/Container', xbins=50, xmin=0, xmax=2500)
- myGroup.defineHistogram('MSLargeSectorR,MSLargeSectorZ;Segments_Container_rzpos_sectorLarge', title='Segments_Container_rzpos_sectorLarge;zPos[mm];r[mm]', type='TH2F', path='Segments/Container', xbins=220, xmin=-22000, xmax=22000, ybins=100, ymin=0, ymax=15000)
- myGroup.defineHistogram('MSSmallSectorR,MSSmallSectorZ;Segments_Container_rzpos_sectorSmall', title='Segments_Container_rzpos_sectorSmall;zPos[mm];r[mm]', type='TH2F', path='Segments/Container', xbins=220, xmin=-22000, xmax=22000, ybins=100, ymin=0, ymax=15000)
myGroup.defineHistogram('MSEta,MSPhi;TracksMS_Container_eta_phi', title='TracksMS_Container_eta_phi;eta;phi', type='TH2F', path='TracksMS/Container', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
myGroup.defineHistogram('MSPt;TracksMS_Container_pt', title='TracksMS_Container_pt;pT[GeV];Entries', type='TH1F', path='TracksMS/Container', xbins=50, xmin=0, xmax=50000)
myGroup.defineHistogram('MSPt;TracksMS_Container_pt_broad', title='TracksMS_Container_pt_broad;pT[GeV];Entries', type='TH1F', path='TracksMS/Container', xbins=50, xmin=0, xmax=1000000)
+
+# Overview/Container
+ myGroup.defineHistogram('MSLumiBlockNumberOfMuonTracks;Overview_Container_nMuonTrack_LB', title='Overview_Container_nMuonTrack_LB;LumiBlock;NumberOfMuonTracks', type='TH1F', path='Overview/Container', xbins=50, xmin=0, xmax=2500)
+ myGroup.defineHistogram('MSLumiBlockNumberOfSegments;Overview_Container_nSegment_LB', title='Overview_Container_nSegment_LB;LumiBlock;NumberOfMuonSegments', type='TH1F', path='Overview/Container', xbins=50, xmin=0, xmax=2500)
+
+
+######################################################################################################################
+
+# Segments/Container
+ myGroup.defineHistogram('MSLargeSectorZ,MSLargeSectorR;Segments_Container_rzpos_sectorLarge', title='Segments_Container_rzpos_sectorLarge;zPos[mm];r[mm]', type='TH2F', path='Segments/Container', xbins=220, xmin=-22000, xmax=22000, ybins=100, ymin=0, ymax=15000)
+ myGroup.defineHistogram('MSSmallSectorZ,MSSmallSectorR;Segments_Container_rzpos_sectorSmall', title='Segments_Container_rzpos_sectorSmall;zPos[mm];r[mm]', type='TH2F', path='Segments/Container', xbins=220, xmin=-22000, xmax=22000, ybins=100, ymin=0, ymax=15000)
+
+# MuonPhysics/NoTrig/MSVertices
+ myGroup.defineHistogram('nMDT;NoTrig_MSVertices_m_MSVx_nMDT', title='NoTrig_MSVertices_m_MSVx_nMDT;;N_{MDT}', type='TH1F', path='NoTrig/MSVertices', xbins=200, xmin=0, xmax=3000)
+ myGroup.defineHistogram('nRPC;NoTrig_MSVertices_m_MSVx_nRPC', title='NoTrig_MSVertices_m_MSVx_nRPC;;N_{RPC}', type='TH1F', path='NoTrig/MSVertices', xbins=100, xmin=0, xmax=1000)
+ myGroup.defineHistogram('nTGC;NoTrig_MSVertices_m_MSVx_nTGC', title='NoTrig_MSVertices_m_MSVx_nTGC;;N_{TGC}', type='TH1F', path='NoTrig/MSVertices', xbins=100, xmin=0, xmax=1000)
+ myGroup.defineHistogram('nTracklets;NoTrig_MSVertices_m_MSVx_nTracklets', title='NoTrig_MSVertices_m_MSVx_nTracklets;N_{trackletS};', type='TH1F', path='NoTrig/MSVertices', xbins=20, xmin=0, xmax=20)
+ myGroup.defineHistogram('MSEta,MSPhi;NoTrig_MSVertices_m_VertexEtaPhi', title='NoTrig_MSVertices_m_VertexEtaPhi;#eta;#varphi', type='TH2F', path='NoTrig/MSVertices', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
+
+# MuonPhysics/NoTrig/Muons/CBMuons/
+ myGroup.defineHistogram('CBMuonAuthorNoTrig;NoTrig_Muons_CBMuons_author', title='NoTrig_Muons_CBMuons_author;Author;Entries', type='TH1F', path='NoTrig/Muons/CBMuons', xbins=20, xmin=0, xmax=20)
+ myGroup.defineHistogram('CBMuonIDChi2NDFNoTrig;NoTrig_Muons_CBMuons_chi2ndof', title='NoTrig_Muons_CBMuons_chi2ndof;TrackFitChi2/ndof', type='TH1F', path='NoTrig/Muons/CBMuons', xbins=220, xmin=0, xmax=5)
+ myGroup.defineHistogram('CBMuonD0NoTrig;NoTrig_Muons_CBMuons_d0', title='NoTrig_Muons_CBMuons_d0;d0;Entries', type='TH1F', path='NoTrig/Muons/CBMuons', xbins=40, xmin=-1, xmax=1)
+ myGroup.defineHistogram('CBMuonDPTIDMENoTrig;NoTrig_Muons_CBMuons_ddpt_idme', title='NoTrig_Muons_CBMuons_ddpt_idme;(ptID-ptME)/ptID;Entries', type='TH1F', path='NoTrig/Muons/CBMuons', xbins=50, xmin=-5, xmax=5)
+ myGroup.defineHistogram('CBMuonDPTCBMENoTrig;NoTrig_Muons_CBMuons_ddpt_cbme', title='NoTrig_Muons_CBMuons_ddpt_cbme;(ptCB-ptME)/ptCB;Entries', type='TH1F', path='NoTrig/Muons/CBMuons', xbins=200, xmin=-5, xmax=5)
+ myGroup.defineHistogram('CBMuonEtaNoTrig;NoTrig_Muons_CBMuons_eta', title='NoTrig_Muons_CBMuons_eta;#eta;Entries', type='TH1F', path='NoTrig/Muons/CBMuons', xbins=50, xmin=-2.7, xmax=2.7)
+ myGroup.defineHistogram('CBMuonType;NoTrig_Muons_CBMuons_muonType', title='NoTrig_Muons_CBMuons_muonType;MuonType;Entries', type='TH1F', path='NoTrig/Muons/CBMuons', xbins=6, xmin=-0.5, xmax=5.5)
+ myGroup.defineHistogram('CBMuonPhiNoTrig;NoTrig_Muons_CBMuons_phi', title='NoTrig_Muons_CBMuons_phi;#varphi;Entries', type='TH1F', path='NoTrig/Muons/CBMuons', xbins=100, xmin=-3.14, xmax=3.14)
+ myGroup.defineHistogram('CBMuonPtNoTrig;NoTrig_Muons_CBMuons_pt', title='NoTrig_Muons_CBMuons_pt;p_{T};Entries', type='TH1F', path='NoTrig/Muons/CBMuons', xbins=100, xmin=0, xmax=200)
+ myGroup.defineHistogram('CBMuonPtNoTrig;NoTrig_Muons_CBMuons_pt_broad', title='NoTrig_Muons_CBMuons_pt_broad;p_{T};Entries', type='TH1F', path='NoTrig/Muons/CBMuons', xbins=100, xmin=0, xmax=1000)
+ myGroup.defineHistogram('CBMuonIDChi2NDFNoTrig;NoTrig_Muons_CBMuons_tndof', title='NoTrig_Muons_CBMuons_tndof;TrackFitChi2NDF;Entries', type='TH1F', path='NoTrig/Muons/CBMuons', xbins=100, xmin=0, xmax=100)
+ myGroup.defineHistogram('CBMuonZ0NoTrig;NoTrig_Muons_CBMuons_z0', title='NoTrig_Muons_CBMuons_z0;SignedImpactParameterZ0(mm);Entries', type='TH1F', path='NoTrig/Muons/CBMuons', xbins=100, xmin=-200, xmax=200)
+ myGroup.defineHistogram('CBMuonEtaNoTrig,CBMuonPhiNoTrig;NoTrig_Muons_CBMuons_eta_phi', title='NoTrig_Muons_CBMuons_eta_phi;eta;phi', type='TH2F', path='NoTrig/Muons/CBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('CBMuonEtaTightNoTrig,CBMuonPhiTightNoTrig;NoTrig_Muons_CBMuons_eta_phi_tight', title='NoTrig_Muons_CBMuons_eta_phi_tight;eta;phi', type='TH2F', path='NoTrig/Muons/CBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('CBMuonEtaMediumNoTrig,CBMuonPhiMediumNoTrig;NoTrig_Muons_CBMuons_eta_phi_medium', title='NoTrig_Muons_CBMuons_eta_phi_medium;eta;phi', type='TH2F', path='NoTrig/Muons/CBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('CBMuonEtaMediumNoTrig,CBMuonPhiMediumNoTrig;NoTrig_Muons_CBMuons_Medium_eff', title='NoTrig_Muons_CBMuons_Medium_eff;eta;phi', type='TH2F', path='NoTrig/Muons/CBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('CBMuonEta1NoTrig,CBMuonPhi1NoTrig;NoTrig_Muons_CBMuons_1Triggered_eta_phi', title='NoTrig_Muons_CBMuons_eta_phi_1Triggered;eta;phi', type='TH2F', path='NoTrig/Muons/CBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('CBMuonEta1AllNoTrig,CBMuonPhi1AllNoTrig;NoTrig_Muons_CBMuons_1All_eta_phi', title='NoTrig_Muons_CBMuons_eta_phi_1All;eta;phi', type='TH2F', path='NoTrig/Muons/CBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
+
+# MuonPhysics/NoTrig/Muons/NonCBMuons/
+ myGroup.defineHistogram('NonCBMuonAuthor;NoTrig_Muons_NonCBMuons_author', title='NoTrig_Muons_NonCBMuons_author;Author;Entries', type='TH1F', path='NoTrig/Muons/NonCBMuons', xbins=20, xmin=0, xmax=20)
+ myGroup.defineHistogram('NonCBMuonIDChi2NDF;NoTrig_Muons_NonCBMuons_chi2ndof', title='NoTrig_Muons_NonCBMuons_chi2ndof;TrackFitChi2/ndof', type='TH1F', path='NoTrig/Muons/NonCBMuons', xbins=220, xmin=0, xmax=5)
+ myGroup.defineHistogram('NonCBMuonD0;NoTrig_Muons_NonCBMuons_d0', title='NoTrig_Muons_NonCBMuons_d0;d0;Entries', type='TH1F', path='NoTrig/Muons/NonCBMuons', xbins=40, xmin=-1, xmax=1)
+ myGroup.defineHistogram('NonCBMuonDPTIDME;NoTrig_Muons_NonCBMuons_ddpt_idme', title='NoTrig_Muons_NonCBMuons_ddpt_idme;(ptID-ptME)/ptID;Entries', type='TH1F', path='NoTrig/Muons/NonCBMuons', xbins=50, xmin=-5, xmax=5)
+ myGroup.defineHistogram('NonCBMuonDPTCBME;NoTrig_Muons_NonCBMuons_ddpt_cbme', title='NoTrig_Muons_NonCBMuons_ddpt_cbme;(ptCB-ptME)/ptCB;Entries', type='TH1F', path='NoTrig/Muons/NonCBMuons', xbins=200, xmin=-5, xmax=5)
+ myGroup.defineHistogram('NonCBMuonEta;NoTrig_Muons_NonCBMuons_eta', title='NoTrig_Muons_NonCBMuons_eta;#eta;Entries', type='TH1F', path='NoTrig/Muons/NonCBMuons', xbins=50, xmin=-2.7, xmax=2.7)
+ myGroup.defineHistogram('NonCBMuonType;NoTrig_Muons_NonCBMuons_muonType', title='NoTrig_Muons_NonCBMuons_muonType;MuonType;Entries', type='TH1F', path='NoTrig/Muons/NonCBMuons', xbins=6, xmin=-0.5, xmax=5.5)
+ myGroup.defineHistogram('NonCBMuonPhi;NoTrig_Muons_NonCBMuons_phi', title='NoTrig_Muons_NonCBMuons_phi;#varphi;Entries', type='TH1F', path='NoTrig/Muons/NonCBMuons', xbins=100, xmin=-3.14, xmax=3.14)
+ myGroup.defineHistogram('NonCBMuonPt;NoTrig_Muons_NonCBMuons_pt', title='NoTrig_Muons_NonCBMuons_pt;p_{T};Entries', type='TH1F', path='NoTrig/Muons/NonCBMuons', xbins=100, xmin=0, xmax=200)
+ myGroup.defineHistogram('NonCBMuonPt;NoTrig_Muons_NonCBMuons_pt_broad', title='NoTrig_Muons_NonCBMuons_pt_broad;p_{T};Entries', type='TH1F', path='NoTrig/Muons/NonCBMuons', xbins=100, xmin=0, xmax=1000)
+ myGroup.defineHistogram('NonCBMuonIDChi2NDF;NoTrig_Muons_NonCBMuons_tndof', title='NoTrig_Muons_NonCBMuons_tndof;TrackFitChi2NDF;Entries', type='TH1F', path='NoTrig/Muons/NonCBMuons', xbins=100, xmin=0, xmax=100)
+ myGroup.defineHistogram('NonCBMuonZ0;NoTrig_Muons_NonCBMuons_z0', title='NoTrig_Muons_NonCBMuons_z0;SignedImpactParameterZ0(mm);Entries', type='TH1F', path='NoTrig/Muons/NonCBMuons', xbins=100, xmin=-200, xmax=200)
+ myGroup.defineHistogram('NonCBMuonEta,CBMuonPhi;NoTrig_Muons_NonCBMuons_eta_phi', title='NoTrig_Muons_NonCBMuons_eta_phi;eta;phi', type='TH2F', path='NoTrig/Muons/NonCBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('NonCBMuonEtaTight,CBMuonPhiTight;NoTrig_Muons_NonCBMuons_eta_phi_tight', title='NoTrig_Muons_NonCBMuons_eta_phi_tight;eta;phi', type='TH2F', path='NoTrig/Muons/NonCBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('NonCBMuonEtaMedium,CBMuonPhiMedium;NoTrig_Muons_NonCBMuons_eta_phi_medium', title='NoTrig_Muons_NonCBMuons_eta_phi_medium;eta;phi', type='TH2F', path='NoTrig/Muons/NonCBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('NonCBMuonEtaMedium,CBMuonPhiMedium;NoTrig_Muons_NonCBMuons_Medium_eff', title='NoTrig_Muons_NonCBMuons_Medium_eff;eta;phi', type='TH2F', path='NoTrig/Muons/NonCBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('NonCBMuonEta1Triggered,CBMuonPhi1Triggered;NoTrig_Muons_NonCBMuons_1Triggered_eta_phi', title='NoTrig_Muons_NonCBMuons_eta_phi_1Triggered;eta;phi', type='TH2F', path='NoTrig/Muons/NonCBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
+ myGroup.defineHistogram('NonCBMuonEta1All,CBMuonPhi1All;NoTrig_Muons_NonCBMuons_1All_eta_phi', title='NoTrig_Muons_NonCBMuons_eta_phi_1All;eta;phi', type='TH2F', path='NoTrig/Muons/NonCBMuons', xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.1415, ymax=3.1415)
+
+
+ myGroup.defineHistogram('MuonType;MuonType', title='MuonType', type='TH1F', path='Muons', xbins=10, xmin=0, xmax=10)
+ #myGroup.defineHistogram('', title='', type='TH1F', path='NoTrig/Muons/CBMuons', xbins=, xmin=, xmax=)
+
return helper.result()
if __name__=="__main__":
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/python/MuonTrackMonitorPostProcessing.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/python/MuonTrackMonitorPostProcessing.py
new file mode 100644
index 000000000000..3ae2f3e6fe3c
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/python/MuonTrackMonitorPostProcessing.py
@@ -0,0 +1,27 @@
+"""
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ 2021 Peter Kraemer - Uni Mainz
+"""
+
+
+"""Implement functions for postprocessing used by histgrinder."""
+
+
+def project_mean_ROOT(inputs):
+ """Fit peak for every row in 2D histogram."""
+ mean = inputs[0][1][0].ProjectionY().Clone()
+ mean.Clear()
+ sigma = inputs[0][1][0].ProjectionY().Clone()
+ sigma.Clear()
+ name = inputs[0][1][0].GetName()
+ n_bins_y = inputs[0][1][0].GetNbinsY()
+ for i in range(n_bins_y):
+ tmp = inputs[0][1][0].ProjectionX(name, i,i).Clone()
+ if tmp.GetEntries() == 0:
+ print("zero entries in Projection")
+ continue
+ mean.SetBinContent(i, tmp.GetMean(1))
+ mean.SetBinError(i, tmp.GetMeanError(1))
+ sigma.SetBinContent(i, tmp.GetRMS(1))
+ sigma.SetBinError(i, tmp.GetRMSError(1))
+ return [mean, sigma]
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/MuonTrackMonitorAlgorithm.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/MuonTrackMonitorAlgorithm.cxx
index ead033c86b4f..de6661ecafa4 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/MuonTrackMonitorAlgorithm.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/MuonTrackMonitorAlgorithm.cxx
@@ -36,6 +36,10 @@ StatusCode MuonTrackMonitorAlgorithm::FillMuonInformation(std::string sIdentifie
auto MuonsNPixHits = Monitored::Scalar<float>((sIdentifier+"MuonNPixHits").c_str(), 0);
auto MuonsNSCTHits = Monitored::Scalar<float>((sIdentifier+"MuonNSCTHits").c_str(), 0);
auto MuonsNTRTHits = Monitored::Scalar<float>((sIdentifier+"MuonNTRTHits").c_str(), 0);
+ auto NonCBMuonsNBHits = Monitored::Scalar<float>((sIdentifier+"MuonNBHits").c_str(), 0);
+ auto NonCBMuonsNPixHits = Monitored::Scalar<float>((sIdentifier+"MuonNPixHits").c_str(), 0);
+ auto NonCBMuonsNSCTHits = Monitored::Scalar<float>((sIdentifier+"MuonNSCTHits").c_str(), 0);
+ auto NonCBMuonsNTRTHits = Monitored::Scalar<float>((sIdentifier+"MuonNTRTHits").c_str(), 0);
auto MuonsIDChi2NDF = Monitored::Scalar<float>((sIdentifier+"MuonIDChi2NDF").c_str(), 0);
auto MuonsMEChi2NDF = Monitored::Scalar<float>((sIdentifier+"MuonMEChi2NDF").c_str(), 0);
@@ -48,13 +52,12 @@ StatusCode MuonTrackMonitorAlgorithm::FillMuonInformation(std::string sIdentifie
if (muonType==xAOD::Muon::Combined) {
const xAOD::TrackParticle *cbtp = nullptr;
const xAOD::TrackParticle *idtp = nullptr;
- const xAOD::TrackParticle *mstp = nullptr;
+ const xAOD::TrackParticle *metp = nullptr;
ElementLink<xAOD::TrackParticleContainer> cbtpLink = muon->combinedTrackParticleLink();
if (cbtpLink.isValid()) cbtp = *cbtpLink;
if (cbtp) {
uint8_t hitval_numberOfBLayerHits, hitval_numberOfPixelHits, hitval_numberOfSCTHits, hitval_numberOfTRTHits;
- // uint8_t hitval_innerSmallHits, hitval_innerLargeHits, hitval_middleSmallHits, hitval_middleLargeHits, hitval_outerSmallHits, hitval_outerLargeHits;
cbtp->summaryValue(hitval_numberOfBLayerHits, xAOD::SummaryType::numberOfInnermostPixelLayerHits);
cbtp->summaryValue(hitval_numberOfPixelHits, xAOD::SummaryType::numberOfPixelHits);
cbtp->summaryValue(hitval_numberOfSCTHits, xAOD::SummaryType::numberOfSCTHits);
@@ -65,7 +68,9 @@ StatusCode MuonTrackMonitorAlgorithm::FillMuonInformation(std::string sIdentifie
MuonPhi = cbtp->phi();
MuonPt = cbtp->pt();
MuonZ0 = cbtp->z0();
- fill(tool, MuonEta, MuonPhi, MuonPt, MuonZ0);
+ MuonD0 = cbtp->d0();
+
+ fill(tool, MuonEta, MuonPhi, MuonPt, MuonZ0, MuonD0);
/// Hit Information of the ID
MuonsNBHits = static_cast<unsigned int>(hitval_numberOfBLayerHits);
@@ -86,20 +91,61 @@ StatusCode MuonTrackMonitorAlgorithm::FillMuonInformation(std::string sIdentifie
MuonPhiTight = cbtp->phi();
fill(tool, MuonEtaTight, MuonPhiTight);
}
-
/// Momentum Resolution and chi2 studies of MS and ID only tracks
ElementLink<xAOD::TrackParticleContainer> idtpLink = muon->inDetTrackParticleLink();
- ElementLink<xAOD::TrackParticleContainer> mstpLink = muon->muonSpectrometerTrackParticleLink();
+ ElementLink<xAOD::TrackParticleContainer> metpLink = muon->muonSpectrometerTrackParticleLink();
if (idtpLink.isValid()) idtp = *idtpLink;
- if (mstpLink.isValid()) mstp = *mstpLink;
- if (idtp && mstp) {
- MuonDPTIDME = (idtp->pt() - mstp->pt()) / idtp->pt();
+ if (metpLink.isValid()) metp = *metpLink;
+ if (idtp && metp) {
+ MuonDPTIDME = (idtp->pt() - metp->pt()) / idtp->pt();
MuonsIDChi2NDF = idtp->chiSquared()/std::max(1.f,idtp->numberDoF());
- MuonsMEChi2NDF = mstp->chiSquared()/std::max(1.f,mstp->numberDoF());
+ MuonsMEChi2NDF = metp->chiSquared()/std::max(1.f,metp->numberDoF());
fill(tool, MuonDPTIDME, MuonsIDChi2NDF, MuonsMEChi2NDF);
}
+
}
}
+ else {
+ const xAOD::TrackParticle *ptp = nullptr;
+ const xAOD::TrackParticle *idtp = nullptr;
+ const xAOD::TrackParticle *metp = nullptr;
+
+ ptp = muon->primaryTrackParticle();
+ if (ptp) {
+ /// Basic kinematic Information
+ MuonEta = ptp->eta();
+ MuonPhi = ptp->phi();
+ MuonPt = ptp->pt();
+ MuonZ0 = ptp->z0();
+ MuonD0 = ptp->d0();
+ fill(tool, MuonEta, MuonPhi, MuonPt, MuonZ0, MuonD0);
+
+
+ // Information on hits in each layer
+ uint8_t hitval_numberOfBLayerHits{0}, hitval_numberOfPixelHits{0}, hitval_numberOfSCTHits{0}, hitval_numberOfTRTHits{0};
+ ptp->summaryValue(hitval_numberOfBLayerHits, xAOD::SummaryType::numberOfInnermostPixelLayerHits);
+ ptp->summaryValue(hitval_numberOfPixelHits, xAOD::SummaryType::numberOfPixelHits);
+ ptp->summaryValue(hitval_numberOfSCTHits, xAOD::SummaryType::numberOfSCTHits);
+ ptp->summaryValue(hitval_numberOfTRTHits, xAOD::SummaryType::numberOfTRTHits);
+ NonCBMuonsNBHits = static_cast<unsigned int>(hitval_numberOfBLayerHits);
+ NonCBMuonsNPixHits = static_cast<unsigned int>(hitval_numberOfPixelHits);
+ NonCBMuonsNSCTHits = static_cast<unsigned int>(hitval_numberOfSCTHits);
+ NonCBMuonsNTRTHits = static_cast<unsigned int>(hitval_numberOfTRTHits);
+ fill(tool, NonCBMuonsNBHits, NonCBMuonsNPixHits, NonCBMuonsNSCTHits, NonCBMuonsNTRTHits);
+
+ /// Momentum Resolution and chi2 studies of MS and ID only tracks
+ ElementLink<xAOD::TrackParticleContainer> idtpLink = muon->inDetTrackParticleLink();
+ ElementLink<xAOD::TrackParticleContainer> metpLink = muon->extrapolatedMuonSpectrometerTrackParticleLink();
+ if (idtpLink.isValid()) idtp = *idtpLink;
+ if (metpLink.isValid()) metp = *metpLink;
+ if (idtp && metp) {
+ MuonDPTIDME = (idtp->pt() - metp->pt()) / idtp->pt();
+ MuonsIDChi2NDF = idtp->chiSquared()/idtp->numberDoF();
+ MuonsMEChi2NDF = metp->chiSquared()/metp->numberDoF();
+ fill(tool, MuonDPTIDME, MuonsIDChi2NDF, MuonsMEChi2NDF);
+ }
+ }
+ }
}
return StatusCode::SUCCESS;
}
@@ -120,9 +166,6 @@ StatusCode MuonTrackMonitorAlgorithm::analyseLowLevelMuonFeatures(const xAOD::Mu
auto MSEta = Monitored::Scalar<float>("MSEta", 0);
auto MSPhi = Monitored::Scalar<float>("MSPhi", 0);
auto MSPt = Monitored::Scalar<float>("MSPt", 0);
- auto NonCBMuonEta = Monitored::Scalar<float>("NonCBMuonEta", 0);
- auto NonCBMuonPhi = Monitored::Scalar<float>("NonCBMuonPhi", 0);
- auto CBMuonAuthor = Monitored::Scalar<float>("CBMuonAuthor", 0);
auto MSLumiBlockNumberOfMuonTracks = Monitored::Scalar<float>("MSLumiBlockNumberOfMuonTracks", 0);
auto MSLumiBlockNumberOfSegments = Monitored::Scalar<float>("MSLumiBlockNumberOfSegments", 0);
@@ -143,8 +186,8 @@ StatusCode MuonTrackMonitorAlgorithm::analyseLowLevelMuonFeatures(const xAOD::Mu
fill(tool, MSAuthor, MSQuality, MSType, MSEta, MSPhi, MSPt, MSLumiBlockNumberOfMuonTracks);
/// Do Muon Segments Plots
- for (size_t nSeg=0; nSeg<muon->nMuonSegments();nSeg++) {
- MSLumiBlockNumberOfSegments = lumiBlockID;
+ for (size_t nSeg=0; nSeg < muon->nMuonSegments(); nSeg++) {
+ MSLumiBlockNumberOfSegments = lumiBlockID;
fill(tool, MSLumiBlockNumberOfSegments);
const xAOD::MuonSegment* muonSegment = muon->muonSegment(nSeg);
if (!muonSegment) {
@@ -161,10 +204,6 @@ StatusCode MuonTrackMonitorAlgorithm::analyseLowLevelMuonFeatures(const xAOD::Mu
fill(tool, MSSmallSectorZ, MSSmallSectorR);
}
}
- CBMuonAuthor = muonAuthor;
- NonCBMuonEta = muon->eta();
- NonCBMuonPhi = muon->phi();
- fill(tool, CBMuonAuthor, NonCBMuonEta, NonCBMuonPhi);
}
return StatusCode::SUCCESS;
@@ -178,20 +217,39 @@ StatusCode MuonTrackMonitorAlgorithm::analyseCombinedTracks(const xAOD::MuonCont
/// Declaring all variables that are initialized via Python will be plotted
auto tool = getGroup("MuonTrackMonitorAlgorithm");
+ auto MuonType = Monitored::Scalar<int>("MuonType", 0);
auto CBMuonSector = Monitored::Scalar<float>("CBMuonSector", 0);
auto CBMuonCIndex = Monitored::Scalar<float>("CBMuonCIndex", 0);
auto CBMuonEta1Triggered = Monitored::Scalar<float>("CBMuonEta1Triggered", 0);
auto CBMuonPhi1Triggered = Monitored::Scalar<float>("CBMuonPhi1Triggered", 0);
+ auto CBMuonEta1NoTrig = Monitored::Scalar<float>("CBMuonEta1NoTrig", 0);
+ auto CBMuonPhi1NoTrig = Monitored::Scalar<float>("CBMuonPhi1NoTrig", 0);
auto CBMuonEta1All = Monitored::Scalar<float>("CBMuonEta1All", 0);
auto CBMuonPhi1All = Monitored::Scalar<float>("CBMuonPhi1All", 0);
auto CBMuonLumiBlock = Monitored::Scalar<float>("CBMuonLumiBlock", 0);
+ auto NonCBMuonSector = Monitored::Scalar<float>("NonCBMuonSector", 0);
+ auto NonCBMuonCIndex = Monitored::Scalar<float>("NonCBMuonCIndex", 0);
+ auto NonCBMuonEta1Triggered = Monitored::Scalar<float>("NonCBMuonEta1Triggered", 0);
+ auto NonCBMuonPhi1Triggered = Monitored::Scalar<float>("NonCBMuonPhi1Triggered", 0);
+ auto NonCBMuonEta1NoTrig = Monitored::Scalar<float>("NonCBMuonEta1NoTrig", 0);
+ auto NonCBMuonPhi1NoTrig = Monitored::Scalar<float>("NonCBMuonPhi1NoTrig", 0);
+ auto NonCBMuonEta1All = Monitored::Scalar<float>("NonCBMuonEta1All", 0);
+ auto NonCBMuonPhi1All = Monitored::Scalar<float>("NonCBMuonPhi1All", 0);
+ auto NonCBMuonLumiBlock = Monitored::Scalar<float>("NonCBMuonLumiBlock", 0);
+
/// Select Combined Muons
std::vector<const xAOD::Muon*> vecCombinedMuonsHighPT;
std::vector<const xAOD::Muon*> vecCombinedMuons;
- for(const auto muon : Muons) {
+ /// Select not Combined Muons
+ std::vector<const xAOD::Muon*> vecNonCombinedMuonsHighPT;
+ std::vector<const xAOD::Muon*> vecNonCombinedMuons;
+
+ for(const auto& muon : Muons) {
xAOD::Muon::MuonType muonType = muon->muonType();
+ MuonType = muonType;
+ fill(tool, MuonType);
if (muonType==xAOD::Muon::Combined) {
CBMuonLumiBlock = lumiBlockID;
fill(tool, CBMuonLumiBlock);
@@ -210,11 +268,29 @@ StatusCode MuonTrackMonitorAlgorithm::analyseCombinedTracks(const xAOD::MuonCont
fill(tool, CBMuonSector,CBMuonCIndex);
}
}
+ else {
+ NonCBMuonLumiBlock = lumiBlockID;
+ fill(tool, NonCBMuonLumiBlock);
+
+ vecNonCombinedMuons.push_back(muon);
+ if (muon->pt() > m_CBmuons_minPt) vecNonCombinedMuonsHighPT.push_back(muon);
+
+ /// Provide Segment and Sector Plots
+ for (size_t nSeg=0; nSeg<muon->nMuonSegments();nSeg++) {
+ const xAOD::MuonSegment* muonSegment = muon->muonSegment(nSeg);
+ if (!muonSegment) {
+ continue;
+ }
+ NonCBMuonSector = muonSegment->sector();
+ NonCBMuonCIndex = muonSegment->chamberIndex();
+ fill(tool, NonCBMuonSector, NonCBMuonCIndex);
+ }
+ }
}
/// Fill the relevant Muon Information for each Combined Muon
-
ATH_CHECK (FillMuonInformation("CB", vecCombinedMuons) );
+ ATH_CHECK (FillMuonInformation("NonCB", vecNonCombinedMuons) );
/// Trigger Studies
if (vecCombinedMuonsHighPT.size()==1) {
@@ -229,125 +305,145 @@ StatusCode MuonTrackMonitorAlgorithm::analyseCombinedTracks(const xAOD::MuonCont
}
}
- if (isTriggered) {
+ if ((isTriggered) && (vecCombinedMuonsHighPT.size() > 0)){
CBMuonEta1Triggered = vecCombinedMuonsHighPT[0]->eta();
CBMuonPhi1Triggered = vecCombinedMuonsHighPT[0]->phi();
fill(tool, CBMuonEta1Triggered, CBMuonPhi1Triggered);
}
+ else if (vecCombinedMuonsHighPT.size() > 0 ) {
+ CBMuonEta1NoTrig = vecCombinedMuonsHighPT[0]->eta();
+ CBMuonPhi1NoTrig = vecCombinedMuonsHighPT[0]->phi();
+ fill(tool, CBMuonEta1NoTrig, CBMuonPhi1NoTrig);
+ }
}
+
return StatusCode::SUCCESS;
}
//========================================================================================================
-StatusCode MuonTrackMonitorAlgorithm::analyseZBosonCandidates(const xAOD::MuonContainer& Muons, uint32_t lumiBlockID) const {
+StatusCode MuonTrackMonitorAlgorithm::plotResonanceCandidates(std::string resonanceName, std::vector<const xAOD::Muon*>& muonCandidates, uint32_t lumiBlockID) const {
using namespace Monitored;
/// Declaring all variables that are initialized via Python will be plotted
auto tool = getGroup("MuonTrackMonitorAlgorithm");
- auto ZSector = Monitored::Scalar<float>("ZSector", 0);
- auto ZChamber = Monitored::Scalar<float>("ZChamber", 0);
- auto ZSectorEff = Monitored::Scalar<float>("ZSectorEff", 0);
- auto ZChamberEff = Monitored::Scalar<float>("ZChamberEff", 0);
- auto ZMass2D = Monitored::Scalar<float>("ZMass2D", 0);
- auto ZEta2D = Monitored::Scalar<float>("ZEta2D", 0);
- auto ZMass = Monitored::Scalar<float>("ZMass", 0);
- auto ZMuonLumiBlock = Monitored::Scalar<float>("ZMuonLumiBlock", 0);
-
- std::vector<const xAOD::Muon*> vecMuons_ZBoson;
- std::vector<const xAOD::Muon*> vecMuons_ZBoson_Candidates;
-
- /// Select Muons Relevant for Z
- for(const auto muon : Muons) {
- xAOD::Muon::MuonType muonType = muon->muonType();
- if (muonType==xAOD::Muon::Combined) {
- const xAOD::TrackParticle *cbtp = nullptr;
- ElementLink<xAOD::TrackParticleContainer> cbtpLink = muon->combinedTrackParticleLink();
- if (cbtpLink.isValid()) cbtp = *cbtpLink;
-
- /// Select Z Boson
- if (cbtp) {
- float trkiso = muon->isolation(xAOD::Iso::ptcone30)/muon->pt();
- if (muonType==xAOD::Muon::Combined &&
- cbtp &&
- muon->pt()>m_ZBosonSelection_minPt &&
- std::abs(muon->eta())<m_ZBosonSelection_maxEta &&
- trkiso<m_ZBosonSelection_trkIsolation &&
- std::abs(cbtp->z0())<m_ZBosonSelection_Z0Cut &&
- std::abs(cbtp->d0())<m_ZBosonSelection_D0Cut )
- vecMuons_ZBoson_Candidates.push_back(muon);
- }
- }
- }
+ auto Sector = Monitored::Scalar<float>((resonanceName+"Sector").c_str(), 0);
+ auto Chamber = Monitored::Scalar<float>((resonanceName+"Chamber").c_str(), 0);
+ auto SectorEff = Monitored::Scalar<float>((resonanceName+"SectorEff").c_str(), 0);
+ auto ChamberEff = Monitored::Scalar<float>((resonanceName+"ChamberEff").c_str(), 0);
+ auto Eta = Monitored::Scalar<float>((resonanceName+"Eta").c_str(), 0);
+ auto Mass = Monitored::Scalar<float>((resonanceName+"Mass").c_str(), 0);
+ auto MuonLumiBlock = Monitored::Scalar<float>((resonanceName+"MuonLumiBlock").c_str(), 0);
+ auto muMinusEta = Monitored::Scalar<float>("muMinusEta", -9);
+ auto muPlusEta = Monitored::Scalar<float>("muPlusEta", -9);
+ auto Eta2D = Monitored::Scalar<const char*>("Eta2D", "");
/// Z Boson related plots
- std::map<int, int> mapTagged_ZBoson;
- for (unsigned int n=0; n<vecMuons_ZBoson_Candidates.size(); n++)
- mapTagged_ZBoson[n]=0;
- for (unsigned int n=0; n<vecMuons_ZBoson_Candidates.size(); n++)
- for (unsigned int m=n+1; m<vecMuons_ZBoson_Candidates.size(); m++) {
- TLorentzVector tVec1, tVec2;
- tVec1.SetPtEtaPhiM(vecMuons_ZBoson_Candidates[n]->pt(), vecMuons_ZBoson_Candidates[n]->eta(), vecMuons_ZBoson_Candidates[n]->phi(), 0.0);
- tVec2.SetPtEtaPhiM(vecMuons_ZBoson_Candidates[m]->pt(), vecMuons_ZBoson_Candidates[m]->eta(), vecMuons_ZBoson_Candidates[m]->phi(), 0.0);
- if (vecMuons_ZBoson_Candidates[n]->charge()==vecMuons_ZBoson_Candidates[m]->charge()) continue;
- if ((tVec1+tVec2).M()<m_ZBosonSelection_minMass) continue;
- if ((tVec1+tVec2).M()>m_ZBosonSelection_maxMass) continue;
-
- if (mapTagged_ZBoson[n]!=1) vecMuons_ZBoson.push_back(vecMuons_ZBoson_Candidates[n]);
- mapTagged_ZBoson[n]=1;
- if (mapTagged_ZBoson[m]!=1) vecMuons_ZBoson.push_back(vecMuons_ZBoson_Candidates[m]);
- mapTagged_ZBoson[m]=1;
-
- ZMass2D = (tVec1+tVec2).M();
- ZEta2D = tVec1.Eta();
- fill(tool, ZMass2D, ZEta2D);
- ZEta2D = tVec2.Eta();
- fill(tool, ZMass2D, ZEta2D);
- ZMass = (tVec1+tVec2).M();
- fill(tool, ZMass);
+ std::map<int, int> mapTagged_Resonance;
+ std::vector<const xAOD::Muon*> vecMuons;
+ for (unsigned int n=0; n<muonCandidates.size(); n++)
+ mapTagged_Resonance[n]=0;
+ for (unsigned int n=0; n<muonCandidates.size(); n++){
+ const TLorentzVector& tVec1 = muonCandidates[n]->p4();
+ for (unsigned int m=n+1; m<muonCandidates.size(); m++) {
+ const TLorentzVector& tVec2 = muonCandidates[m]->p4();
+ const TLorentzVector candidate = tVec1 + tVec2;
+ const float resonance_Mass = candidate.M();
+ const float resonance_Eta = candidate.Eta();
+ if (muonCandidates[n]->charge()==muonCandidates[m]->charge()) continue;
+ if ((resonance_Mass < m_ZBosonSelection_minMass)&&(resonanceName=="Z")) continue;
+ if ((resonance_Mass > m_ZBosonSelection_maxMass)&&(resonanceName=="Z")) continue;
+ if ((resonance_Mass < m_JPsiSelection_minMass)&&(resonanceName=="JPsi")) continue;
+ if ((resonance_Mass > m_JPsiSelection_maxMass)&&(resonanceName=="JPsi")) continue;
+
+ if (mapTagged_Resonance[n]!=1) vecMuons.push_back(muonCandidates[n]);
+ mapTagged_Resonance[n]=1;
+ if (mapTagged_Resonance[m]!=1) vecMuons.push_back(muonCandidates[m]);
+ mapTagged_Resonance[m]=1;
+
+ if (muonCandidates[n]->charge()<0){
+ muMinusEta = tVec1.Eta();
+ muPlusEta = tVec2.Eta();
+ }
+ else{
+ muMinusEta = tVec2.Eta();
+ muPlusEta = tVec1.Eta();
+ }
+ if ((muMinusEta>1.05)&&(muPlusEta>1.05)){
+ Eta2D = "EA-EA";
+ } else if ((muMinusEta>1.05)&&(muPlusEta>0.)&&(muPlusEta<1.05)){
+ Eta2D = "EA-BA";
+ } else if ((muMinusEta>1.05)&&(muPlusEta>-1.05)&&(muPlusEta<0.)){
+ Eta2D = "EA-BC";
+ } else if ((muMinusEta>1.05)&&(muPlusEta<-1.05)){
+ Eta2D = "EA-EC";
+ } else if ((muMinusEta>0.)&&(muMinusEta<1.05)&&(muPlusEta>1.05)){
+ Eta2D = "BA-EA";
+ } else if ((muMinusEta>0.)&&(muMinusEta<1.05)&&(muPlusEta>0.)&&(muPlusEta<1.05)){
+ Eta2D = "BA-BA";
+ } else if ((muMinusEta>0.)&&(muMinusEta<1.05)&&(muPlusEta>-1.05)&&(muPlusEta<0.)){
+ Eta2D = "BA-BC";
+ } else if ((muMinusEta>0.)&&(muMinusEta<1.05)&&(muPlusEta<-1.05)){
+ Eta2D = "BA-EC";
+ } else if ((muMinusEta>-1.05)&&(muMinusEta<0.)&&(muPlusEta>1.05)){
+ Eta2D = "BC-EA";
+ } else if ((muMinusEta>-1.05)&&(muMinusEta<0.)&&(muPlusEta>0.)&&(muPlusEta<1.05)){
+ Eta2D = "BC-BA";
+ } else if ((muMinusEta>-1.05)&&(muMinusEta<0.)&&(muPlusEta>-1.05)&&(muPlusEta<0.)){
+ Eta2D = "BC-BC";
+ } else if ((muMinusEta>-1.05)&&(muMinusEta<0.)&&(muPlusEta<-1.05)){
+ Eta2D = "BC-EC";
+ } else if ((muMinusEta<-1.05)&&(muPlusEta>1.05)){
+ Eta2D = "EC-EA";
+ } else if ((muMinusEta<-1.05)&&(muPlusEta>0.)&&(muPlusEta<1.05)){
+ Eta2D = "EC-BA";
+ } else if ((muMinusEta<-1.05)&&(muPlusEta>-1.05)&&(muPlusEta<0.)){
+ Eta2D = "EC-BC";
+ } else if ((muMinusEta<-1.05)&&(muPlusEta<-1.05)){
+ Eta2D = "EC-EC";
+ }
+ Mass = resonance_Mass;
+ Eta = resonance_Eta;
+ fill(tool, Mass, Eta, Eta2D, muMinusEta, muPlusEta);
- ZMuonLumiBlock = lumiBlockID;
- fill(tool, ZMuonLumiBlock);
+ MuonLumiBlock = lumiBlockID;
+ fill(tool, MuonLumiBlock);
}
+ }
/// Fill the relevant Muon Information for each Z Boson Candidate Muon
- ATH_CHECK( FillMuonInformation("Z", vecMuons_ZBoson) );
+ ATH_CHECK( FillMuonInformation("Z", vecMuons) );
return StatusCode::SUCCESS;
}
+StatusCode MuonTrackMonitorAlgorithm::analyseResonanceCandidates(const xAOD::MuonContainer& Muons, uint32_t lumiBlockID) const {
-//========================================================================================================
-StatusCode MuonTrackMonitorAlgorithm::analyseJPsiCandidates(const xAOD::MuonContainer& Muons, uint32_t lumiBlockID) const {
- using namespace Monitored;
-
- /// Declaring all variables that are initialized via Python will be plotted
- auto tool = getGroup("MuonTrackMonitorAlgorithm");
- auto JPsiSector = Monitored::Scalar<float>("JPsiSector", 0);
- auto JPsiChamber = Monitored::Scalar<float>("JPsiChamber", 0);
- auto JPsiSectorEff = Monitored::Scalar<float>("JPsiSectorEff", 0);
- auto JPsiChamberEff = Monitored::Scalar<float>("JPsiChamberEff", 0);
- auto JPsiMass2D = Monitored::Scalar<float>("JPsiMass2D", 0);
- auto JPsiEta2D = Monitored::Scalar<float>("JPsiEta2D", 0);
- auto JPsiMass = Monitored::Scalar<float>("JPsiMass", 0);
- auto JPsiMuonLumiBlock = Monitored::Scalar<float>("JPsiMuonLumiBlock", 0);
-
- std::vector<const xAOD::Muon*> vecMuons_JPsi;
+ std::vector<const xAOD::Muon*> vecMuons_ZBoson_Candidates;
std::vector<const xAOD::Muon*> vecMuons_JPsi_Candidates;
+
- /// JPsi Muon Selection
+ /// Select Muons Relevant for Z
for(const auto muon : Muons) {
- xAOD::Muon::MuonType muonType = muon->muonType();
+ xAOD::Muon::MuonType muonType = muon->muonType();
if (muonType==xAOD::Muon::Combined) {
const xAOD::TrackParticle *cbtp = nullptr;
ElementLink<xAOD::TrackParticleContainer> cbtpLink = muon->combinedTrackParticleLink();
if (cbtpLink.isValid()) cbtp = *cbtpLink;
- /// Do Combined Muon Plots
+ /// Select Z Boson
if (cbtp) {
float trkiso = muon->isolation(xAOD::Iso::ptcone30)/muon->pt();
+ if (muonType==xAOD::Muon::Combined &&
+ cbtp &&
+ muon->pt()>m_ZBosonSelection_minPt &&
+ std::abs(muon->eta())<m_ZBosonSelection_maxEta &&
+ trkiso<m_ZBosonSelection_trkIsolation &&
+ std::abs(cbtp->z0())<m_ZBosonSelection_Z0Cut &&
+ std::abs(cbtp->d0())<m_ZBosonSelection_D0Cut )
+ vecMuons_ZBoson_Candidates.push_back(muon);
if (muonType==xAOD::Muon::Combined &&
cbtp &&
muon->pt()>m_JPsiSelection_minPt &&
@@ -359,39 +455,8 @@ StatusCode MuonTrackMonitorAlgorithm::analyseJPsiCandidates(const xAOD::MuonCont
}
}
}
-
- /// JPsi related plots
- std::map<int, int> mapTagged_JPsi;
- for (unsigned int n=0; n<vecMuons_JPsi_Candidates.size(); n++)
- mapTagged_JPsi[n]=0;
- for (unsigned int n=0; n<vecMuons_JPsi_Candidates.size(); n++)
- for (unsigned int m=n+1; m<vecMuons_JPsi_Candidates.size(); m++) {
- TLorentzVector tVec1, tVec2;
- tVec1.SetPtEtaPhiM(vecMuons_JPsi_Candidates[n]->pt(), vecMuons_JPsi_Candidates[n]->eta(), vecMuons_JPsi_Candidates[n]->phi(), 0.0);
- tVec2.SetPtEtaPhiM(vecMuons_JPsi_Candidates[m]->pt(), vecMuons_JPsi_Candidates[m]->eta(), vecMuons_JPsi_Candidates[m]->phi(), 0.0);
- if (vecMuons_JPsi_Candidates[n]->charge()==vecMuons_JPsi_Candidates[m]->charge()) continue;
- if ((tVec1+tVec2).M()<m_JPsiSelection_minMass) continue;
- if ((tVec1+tVec2).M()>m_JPsiSelection_maxMass) continue;
-
- if (mapTagged_JPsi[n]!=1) vecMuons_JPsi.push_back(vecMuons_JPsi_Candidates[n]);
- mapTagged_JPsi[n]=1;
- if (mapTagged_JPsi[m]!=1) vecMuons_JPsi.push_back(vecMuons_JPsi_Candidates[m]);
- mapTagged_JPsi[m]=1;
-
- JPsiMass2D = (tVec1+tVec2).M();
- JPsiEta2D = tVec1.Eta();
- fill(tool, JPsiMass2D, JPsiEta2D);
- JPsiEta2D = tVec2.Eta();
- fill(tool, JPsiMass2D, JPsiEta2D);
- JPsiMass = (tVec1+tVec2).M();
- fill(tool, JPsiMass);
-
- JPsiMuonLumiBlock = lumiBlockID;
- fill(tool, JPsiMuonLumiBlock );
- }
-
- /// Fill the relevant Muon Information for each JPsi Boson Candidate Muon
- ATH_CHECK( FillMuonInformation("JPsi", vecMuons_JPsi) );
+ ATH_CHECK( plotResonanceCandidates("Z", vecMuons_ZBoson_Candidates, lumiBlockID) );
+ ATH_CHECK( plotResonanceCandidates("JPsi", vecMuons_JPsi_Candidates, lumiBlockID) );
return StatusCode::SUCCESS;
}
@@ -413,8 +478,7 @@ StatusCode MuonTrackMonitorAlgorithm::fillHistograms(const EventContext& ctx) co
ATH_CHECK( analyseLowLevelMuonFeatures(*Muons, lumiBlockID) );
ATH_CHECK( analyseCombinedTracks(*Muons, lumiBlockID) );
- ATH_CHECK( analyseZBosonCandidates(*Muons, lumiBlockID) );
- ATH_CHECK( analyseJPsiCandidates(*Muons, lumiBlockID) );
+ ATH_CHECK( analyseResonanceCandidates(*Muons, lumiBlockID) );
return StatusCode::SUCCESS;
}
--
GitLab
From 0ee5ddd08014097254a6863045d10cb300f80c3a Mon Sep 17 00:00:00 2001
From: Ke Li <ke.li@cern.ch>
Date: Sun, 15 Aug 2021 19:21:42 +0200
Subject: [PATCH 053/272] update the conditions tag for sim tests
---
.../InDetPhysValMonitoring/test/test_mu100GeV_simreco.sh | 3 ++-
.../InDetPhysValMonitoring/test/test_mu1GeV_simreco.sh | 3 ++-
.../InDetPhysValMonitoring/test/test_mu20GeV_simreco.sh | 3 ++-
.../InDetPhysValMonitoring/test/test_mu5GeV_simreco.sh | 3 ++-
.../InDetPhysValMonitoring/test/test_piplus1GeV_simreco.sh | 3 ++-
.../InDetPhysValMonitoring/test/test_piplus5GeV_simreco.sh | 3 ++-
6 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_simreco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_simreco.sh
index ac3a43728eb6..708e590e1fe2 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_simreco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_simreco.sh
@@ -58,7 +58,7 @@ lastref_dir=last_results
--physicsList FTFP_BERT_ATL_VALIDATION \
--truthStrategy MC15aPlus \
--simulator FullG4 \
- --conditionsTag 'default:OFLCOND-MC16-SDR-14' \
+ --conditionsTag 'OFLCOND-MC16-SDR-RUN2-08' \
--geometryVersion 'default:ATLAS-R2-2016-01-00-01_VALIDATION' \
--preExec EVNTtoHITS:'simFlags.SimBarcodeOffset.set_Value_and_Lock(200000)' \
EVNTtoHITS:'simFlags.TRTRangeCut=30.0; simFlags.TightMuonStepping=True' \
@@ -92,6 +92,7 @@ if [ $sim_tf_exit_code -eq 0 ] ;then
--inputHITSFile "$hits" \
--outputAODFile physval.AOD.root \
--outputNTUP_PHYSVALFile ${dcubemon_rec} \
+ --conditionsTag 'OFLCOND-MC16-SDR-RUN2-08' \
--steering doRAWtoALL \
--checkEventCount False \
--ignoreErrors True \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_simreco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_simreco.sh
index 5a25d19ef139..b6970f13056f 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_simreco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_simreco.sh
@@ -58,7 +58,7 @@ lastref_dir=last_results
--physicsList FTFP_BERT_ATL_VALIDATION \
--truthStrategy MC15aPlus \
--simulator FullG4 \
- --conditionsTag 'default:OFLCOND-MC16-SDR-14' \
+ --conditionsTag 'OFLCOND-MC16-SDR-RUN2-08' \
--geometryVersion 'default:ATLAS-R2-2016-01-00-01_VALIDATION' \
--preExec EVNTtoHITS:'simFlags.SimBarcodeOffset.set_Value_and_Lock(200000)' \
EVNTtoHITS:'simFlags.TRTRangeCut=30.0; simFlags.TightMuonStepping=True' \
@@ -92,6 +92,7 @@ if [ $sim_tf_exit_code -eq 0 ] ;then
--inputHITSFile "$hits" \
--outputAODFile physval.AOD.root \
--outputNTUP_PHYSVALFile ${dcubemon_rec} \
+ --conditionsTag 'OFLCOND-MC16-SDR-RUN2-08' \
--steering doRAWtoALL \
--checkEventCount False \
--ignoreErrors True \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_simreco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_simreco.sh
index dac0d24291ba..3b4e9cea441c 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_simreco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_simreco.sh
@@ -58,7 +58,7 @@ lastref_dir=last_results
--physicsList FTFP_BERT_ATL_VALIDATION \
--truthStrategy MC15aPlus \
--simulator FullG4 \
- --conditionsTag 'default:OFLCOND-MC16-SDR-14' \
+ --conditionsTag 'OFLCOND-MC16-SDR-RUN2-08' \
--geometryVersion 'default:ATLAS-R2-2016-01-00-01_VALIDATION' \
--preExec EVNTtoHITS:'simFlags.SimBarcodeOffset.set_Value_and_Lock(200000)' \
EVNTtoHITS:'simFlags.TRTRangeCut=30.0; simFlags.TightMuonStepping=True' \
@@ -92,6 +92,7 @@ if [ $sim_tf_exit_code -eq 0 ] ;then
--inputHITSFile "$hits" \
--outputAODFile physval.AOD.root \
--outputNTUP_PHYSVALFile ${dcubemon_rec} \
+ --conditionsTag 'OFLCOND-MC16-SDR-RUN2-08' \
--steering doRAWtoALL \
--checkEventCount False \
--ignoreErrors True \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu5GeV_simreco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu5GeV_simreco.sh
index f4f6d28a4977..c668294e4349 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu5GeV_simreco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu5GeV_simreco.sh
@@ -58,7 +58,7 @@ lastref_dir=last_results
--physicsList FTFP_BERT_ATL_VALIDATION \
--truthStrategy MC15aPlus \
--simulator FullG4 \
- --conditionsTag 'default:OFLCOND-MC16-SDR-14' \
+ --conditionsTag 'OFLCOND-MC16-SDR-RUN2-08' \
--geometryVersion 'default:ATLAS-R2-2016-01-00-01_VALIDATION' \
--preExec EVNTtoHITS:'simFlags.SimBarcodeOffset.set_Value_and_Lock(200000)' \
EVNTtoHITS:'simFlags.TRTRangeCut=30.0; simFlags.TightMuonStepping=True' \
@@ -92,6 +92,7 @@ if [ $sim_tf_exit_code -eq 0 ] ;then
--inputHITSFile "$hits" \
--outputAODFile physval.AOD.root \
--outputNTUP_PHYSVALFile ${dcubemon_rec} \
+ --conditionsTag 'OFLCOND-MC16-SDR-RUN2-08' \
--steering doRAWtoALL \
--checkEventCount False \
--ignoreErrors True \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_simreco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_simreco.sh
index d627e7cd19eb..4e68361e25d3 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_simreco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_simreco.sh
@@ -59,7 +59,7 @@ lastref_dir=last_results
--physicsList FTFP_BERT_ATL_VALIDATION \
--truthStrategy MC15aPlus \
--simulator FullG4 \
- --conditionsTag 'default:OFLCOND-MC16-SDR-14' \
+ --conditionsTag 'OFLCOND-MC16-SDR-RUN2-08' \
--geometryVersion 'default:ATLAS-R2-2016-01-00-01_VALIDATION' \
--preExec EVNTtoHITS:'simFlags.SimBarcodeOffset.set_Value_and_Lock(200000)' \
EVNTtoHITS:'simFlags.TRTRangeCut=30.0; simFlags.TightMuonStepping=True' \
@@ -93,6 +93,7 @@ if [ $sim_tf_exit_code -eq 0 ] ;then
--inputHITSFile "$hits" \
--outputAODFile physval.AOD.root \
--outputNTUP_PHYSVALFile ${dcubemon_rec} \
+ --conditionsTag 'OFLCOND-MC16-SDR-RUN2-08' \
--steering doRAWtoALL \
--checkEventCount False \
--ignoreErrors True \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_simreco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_simreco.sh
index 259609bcdb57..a22d8156465a 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_simreco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_simreco.sh
@@ -59,7 +59,7 @@ lastref_dir=last_results
--physicsList FTFP_BERT_ATL_VALIDATION \
--truthStrategy MC15aPlus \
--simulator FullG4 \
- --conditionsTag 'default:OFLCOND-MC16-SDR-14' \
+ --conditionsTag 'OFLCOND-MC16-SDR-RUN2-08' \
--geometryVersion 'default:ATLAS-R2-2016-01-00-01_VALIDATION' \
--preExec EVNTtoHITS:'simFlags.SimBarcodeOffset.set_Value_and_Lock(200000)' \
EVNTtoHITS:'simFlags.TRTRangeCut=30.0; simFlags.TightMuonStepping=True' \
@@ -93,6 +93,7 @@ if [ $sim_tf_exit_code -eq 0 ] ;then
--inputHITSFile "$hits" \
--outputAODFile physval.AOD.root \
--outputNTUP_PHYSVALFile ${dcubemon_rec} \
+ --conditionsTag 'OFLCOND-MC16-SDR-RUN2-08' \
--steering doRAWtoALL \
--checkEventCount False \
--ignoreErrors True \
--
GitLab
From aac826dac8a35d096299c9c82c9c331b55e8bc24 Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Sun, 15 Aug 2021 21:21:53 +0200
Subject: [PATCH 054/272] Fix clang warning on 'const
std::shared_ptr<TrigConf::L1Threshold>' creates a copy from type 'const
std::shared_ptr<TrigConf::L1Threshold>' [-Wrange-loop-construct]
---
.../TrigSteer/HLTSeeding/src/CTPUnpackingTool.cxx | 2 +-
.../HLTSeeding/src/EMRoIsUnpackingTool.cxx | 6 +++---
.../HLTSeeding/src/FSRoIsUnpackingTool.cxx | 4 ++--
Trigger/TrigSteer/HLTSeeding/src/HLTSeeding.cxx | 2 +-
.../HLTSeeding/src/HLTSeedingNoCtpForTesting.cxx | 14 +++++++-------
.../HLTSeeding/src/JRoIsUnpackingTool.cxx | 10 +++++-----
.../HLTSeeding/src/METRoIsUnpackingTool.cxx | 4 ++--
.../HLTSeeding/src/MURoIsUnpackingTool.cxx | 6 +++---
.../HLTSeeding/src/RoIsUnpackingEmulationTool.cxx | 4 ++--
.../HLTSeeding/src/TAURoIsUnpackingTool.cxx | 6 +++---
10 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingTool.cxx
index 0867a64939bd..ecc21dc116a5 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingTool.cxx
@@ -79,7 +79,7 @@ StatusCode CTPUnpackingTool::start() {
}
}
- for ( auto ctpIDtoChain: m_ctpToChain ) {
+ for ( const auto& ctpIDtoChain: m_ctpToChain ) {
for ( auto chain: ctpIDtoChain.second ) {
ATH_MSG_DEBUG( "CTP seed of " << ctpIDtoChain.first << " enables chains " << chain );
}
diff --git a/Trigger/TrigSteer/HLTSeeding/src/EMRoIsUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/EMRoIsUnpackingTool.cxx
index 6b10bea05692..eb2ee10ec49c 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/EMRoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/EMRoIsUnpackingTool.cxx
@@ -41,8 +41,8 @@ StatusCode EMRoIsUnpackingTool::unpack( const EventContext& ctx,
ATH_CHECK(getL1Thresholds(*l1Menu, "EM", emThresholds));
// RoIBResult contains vector of EM fragments
- for ( auto& emTauFragment : roib.eMTauResult() ) {
- for ( auto& roi : emTauFragment.roIVec() ) {
+ for ( const auto & emTauFragment : roib.eMTauResult() ) {
+ for ( const auto & roi : emTauFragment.roIVec() ) {
uint32_t roIWord = roi.roIWord();
if ( not ( LVL1::TrigT1CaloDefs::EMRoIWordType == roi.roIType() ) ) {
ATH_MSG_DEBUG( "Skipping RoI as it is not EM threshold " << roIWord );
@@ -65,7 +65,7 @@ StatusCode EMRoIsUnpackingTool::unpack( const EventContext& ctx,
std::vector<unsigned> passedThresholdIDs;
- for (const auto th : emThresholds.value().get()) {
+ for (const auto& th : emThresholds.value().get()) {
ATH_MSG_VERBOSE( "Checking if the threshold " << th->name() << " passed" );
if ( recRoI->passedThreshold( th->mapping() ) ) {
passedThresholdIDs.push_back( HLT::Identifier( th->name() ) );
diff --git a/Trigger/TrigSteer/HLTSeeding/src/FSRoIsUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/FSRoIsUnpackingTool.cxx
index 1ab332e19660..b7c848b8617a 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/FSRoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/FSRoIsUnpackingTool.cxx
@@ -41,7 +41,7 @@ StatusCode FSRoIsUnpackingTool::unpack( const EventContext& ctx,
const HLT::IDSet& activeChains ) const {
using namespace TrigCompositeUtils;
SG::WriteHandle<DecisionContainer> handle = createAndStore(m_decisionsKey, ctx );
- auto decisionOutput = handle.ptr();
+ auto *decisionOutput = handle.ptr();
HLT::IDSet activeFSchains;
// see if any chain we care of is active
@@ -49,7 +49,7 @@ StatusCode FSRoIsUnpackingTool::unpack( const EventContext& ctx,
m_allFSChains.begin(), m_allFSChains.end(),
std::inserter(activeFSchains, activeFSchains.end() ) );
- auto decision = TrigCompositeUtils::newDecisionIn( decisionOutput, hltSeedingNodeName() ); // This hltSeedingNodeName() denotes an initial node with no parents
+ auto *decision = TrigCompositeUtils::newDecisionIn( decisionOutput, hltSeedingNodeName() ); // This hltSeedingNodeName() denotes an initial node with no parents
addChainsToDecision( HLT::Identifier( "FSNOSEED" ), decision, activeChains );
ATH_MSG_DEBUG("Unpacking FS RoI for " << activeFSchains.size() << " chains: " << [&](){
diff --git a/Trigger/TrigSteer/HLTSeeding/src/HLTSeeding.cxx b/Trigger/TrigSteer/HLTSeeding/src/HLTSeeding.cxx
index 2e8332253973..954f401c31b7 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/HLTSeeding.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/HLTSeeding.cxx
@@ -82,7 +82,7 @@ StatusCode HLTSeeding::execute (const EventContext& ctx) const {
}
SG::WriteHandle<DecisionContainer> handle = TrigCompositeUtils::createAndStore( m_summaryKey, ctx );
- auto chainsInfo = handle.ptr();
+ auto *chainsInfo = handle.ptr();
/*
auto chainsInfo = std::make_unique<DecisionContainer>();
diff --git a/Trigger/TrigSteer/HLTSeeding/src/HLTSeedingNoCtpForTesting.cxx b/Trigger/TrigSteer/HLTSeeding/src/HLTSeedingNoCtpForTesting.cxx
index 0d65184c14fb..faafde2c87e6 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/HLTSeedingNoCtpForTesting.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/HLTSeedingNoCtpForTesting.cxx
@@ -31,34 +31,34 @@ StatusCode HLTSeedingNoCtpForTesting::execute (const EventContext& ctx) const {
ATH_CHECK( roibH.isValid() );
SG::WriteHandle<TrigRoiDescriptorCollection> handleTrigRoIs = createAndStoreNoAux(m_trigEMRoIsKey, ctx );
- auto emRoIs = handleTrigRoIs.ptr();
+ auto *emRoIs = handleTrigRoIs.ptr();
SG::WriteHandle<TrigRoiDescriptorCollection> handleTrigFSRoI = createAndStoreNoAux(m_trigFSRoIKey, ctx );
- auto fsRoIs = handleTrigFSRoI.ptr();
+ auto *fsRoIs = handleTrigFSRoI.ptr();
fsRoIs->push_back( new TrigRoiDescriptor( true ) );
using namespace TrigConf;
TrigConf::TriggerThreshold threshold;
SG::WriteHandle<DecisionContainer> handleDecisions = createAndStore(m_EMDecisionsKey, ctx );
- auto decisionOutput = handleDecisions.ptr();
+ auto *decisionOutput = handleDecisions.ptr();
std::vector<TrigConf::TriggerThreshold*> thresholds{ & threshold};
- for ( auto& emTauFragment : roibH->eMTauResult() ) {
- for ( auto& roi : emTauFragment.roIVec() ) {
+ for ( const auto & emTauFragment : roibH->eMTauResult() ) {
+ for ( const auto & roi : emTauFragment.roIVec() ) {
uint32_t roIWord = roi.roIWord();
if ( not ( LVL1::TrigT1CaloDefs::EMRoIWordType == roi.roIType() ) ) {
ATH_MSG_VERBOSE( "Skipping RoI as it is not EM threshold " << roIWord );
continue;
}
LVL1::RecEmTauRoI recRoI( roIWord, &thresholds );
- auto roiDesc = new TrigRoiDescriptor( roIWord, 0u ,0u,
+ auto *roiDesc = new TrigRoiDescriptor( roIWord, 0u ,0u,
recRoI.eta(), recRoI.eta()-m_roIWidth, recRoI.eta()+m_roIWidth,
recRoI.phi(), recRoI.phi()-m_roIWidth, recRoI.phi()+m_roIWidth );
ATH_MSG_DEBUG("Decoded EM RoI at position " << *roiDesc );
emRoIs->push_back( roiDesc );
- auto decision = TrigCompositeUtils::newDecisionIn( decisionOutput, hltSeedingNodeName() );
+ auto *decision = TrigCompositeUtils::newDecisionIn( decisionOutput, hltSeedingNodeName() );
decision->setObjectLink( initialRoIString(), ElementLink<TrigRoiDescriptorCollection>( m_trigEMRoIsKey.key(), emRoIs->size()-1 ) );
addDecisionID( HLT::Identifier( "HLT_EMTestChain" ), decision );
}
diff --git a/Trigger/TrigSteer/HLTSeeding/src/JRoIsUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/JRoIsUnpackingTool.cxx
index 85b39655b774..6c4b9229e175 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/JRoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/JRoIsUnpackingTool.cxx
@@ -39,7 +39,7 @@ StatusCode JRoIsUnpackingTool::unpack( const EventContext& ctx,
std::optional<ThrVecRef> jetThresholds;
ATH_CHECK(getL1Thresholds(*l1Menu, "JET", jetThresholds));
- auto decision = TrigCompositeUtils::newDecisionIn( decisionOutput.ptr(), hltSeedingNodeName() ); // This hltSeedingNodeName() denotes an initial node with no parents
+ auto *decision = TrigCompositeUtils::newDecisionIn( decisionOutput.ptr(), hltSeedingNodeName() ); // This hltSeedingNodeName() denotes an initial node with no parents
decision->setObjectLink( "initialRoI", ElementLink<TrigRoiDescriptorCollection>( m_fsRoIKey, 0 ) );
auto roiEL = decision->objectLink<TrigRoiDescriptorCollection>( "initialRoI" );
CHECK( roiEL.isValid() );
@@ -47,15 +47,15 @@ StatusCode JRoIsUnpackingTool::unpack( const EventContext& ctx,
ATH_MSG_DEBUG("Now get jet L1 thresholds from RoIB");
// RoIBResult contains vector of jet fragments
- for ( auto& jetFragment : roib.jetEnergyResult() ) {
- for ( auto& roi : jetFragment.roIVec() ) {
+ for ( const auto & jetFragment : roib.jetEnergyResult() ) {
+ for ( const auto & roi : jetFragment.roIVec() ) {
uint32_t roIWord = roi.roIWord();
if ( not ( LVL1::TrigT1CaloDefs::JetRoIWordType == roi.roIType() ) ) {
ATH_MSG_DEBUG( "Skipping RoI as it is not JET threshold " << roIWord <<" Type "<< roi.roIType() );
continue;
}
- auto recRoI = new LVL1::RecJetRoI( roIWord, l1Menu.cptr() );
+ auto *recRoI = new LVL1::RecJetRoI( roIWord, l1Menu.cptr() );
recRoIs->push_back( recRoI );
/* TDOD, decide if we need this collection at all here, now keep filling of it commented out
@@ -67,7 +67,7 @@ StatusCode JRoIsUnpackingTool::unpack( const EventContext& ctx,
*/
ATH_MSG_DEBUG( "RoI word: 0x" << MSG::hex << std::setw( 8 ) << roIWord << MSG::dec );
- for (const auto th : jetThresholds.value().get()) {
+ for (const auto& th : jetThresholds.value().get()) {
ATH_MSG_VERBOSE( "Checking if the threshold " << th->name() << " passed" );
if ( recRoI->passedThreshold(th->mapping()) ) {
ATH_MSG_DEBUG( "Passed Threshold name " << th->name() );
diff --git a/Trigger/TrigSteer/HLTSeeding/src/METRoIsUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/METRoIsUnpackingTool.cxx
index e38adf82b6a3..3d48ab89003d 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/METRoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/METRoIsUnpackingTool.cxx
@@ -58,8 +58,8 @@ StatusCode METRoIsUnpackingTool::unpack( const EventContext& ctx,
ATH_MSG_DEBUG("Unpacking MET RoI for " << activeMETchains.size() << " chains");
- auto decision = TrigCompositeUtils::newDecisionIn( decisionOutput.ptr(), hltSeedingNodeName() ); // This hltSeedingNodeName() denotes an initial node with no parents
- for (const auto th: thresholds) {
+ auto *decision = TrigCompositeUtils::newDecisionIn( decisionOutput.ptr(), hltSeedingNodeName() ); // This hltSeedingNodeName() denotes an initial node with no parents
+ for (const auto& th: thresholds) {
addChainsToDecision( HLT::Identifier( th->name() ), decision, activeChains );
}
diff --git a/Trigger/TrigSteer/HLTSeeding/src/MURoIsUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/MURoIsUnpackingTool.cxx
index 66e27479b62f..32a0fb6e3b0e 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/MURoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/MURoIsUnpackingTool.cxx
@@ -43,7 +43,7 @@ StatusCode MURoIsUnpackingTool::unpack( const EventContext& ctx,
std::optional<ThrVecRef> muThresholds;
ATH_CHECK(getL1Thresholds(*l1Menu, "MU", muThresholds));
- for ( auto& roi : roib.muCTPIResult().roIVec() ) {
+ for ( const auto & roi : roib.muCTPIResult().roIVec() ) {
const uint32_t roIWord = roi.roIWord();
unsigned int thresholdNumber = roi.pt();
ATH_MSG_DEBUG( "MUON RoI with the threshold number: " << thresholdNumber );
@@ -72,7 +72,7 @@ StatusCode MURoIsUnpackingTool::unpack( const EventContext& ctx,
decisionProbe->setObjectLink( initialRoIString(), ElementLink<TrigRoiDescriptorCollection>( m_trigRoIsKey.key(), trigRoIs->size()-1 ) );
decisionProbe->setObjectLink( initialRecRoIString(), ElementLink<DataVector<LVL1::RecMuonRoI>>( m_recRoIsKey.key(), recRoIs->size()-1 ) );
- for (const auto th : muThresholds.value().get()) {
+ for (const auto& th : muThresholds.value().get()) {
if ( th->mapping() < thresholdNumber ) {
//th->thresholdNumber() is defined to be [0,5] and thresholdNumber [0,6]
const std::string thresholdProbeName = getProbeThresholdName(th->name());
@@ -148,7 +148,7 @@ StatusCode MURoIsUnpackingTool::unpack(const EventContext& ctx,
// Add positive decisions for chains above the threshold
uint64_t thresholdPattern = thrPatternAcc(*roi);
ATH_MSG_DEBUG("RoI #" << linkIndex << " threshold pattern: " << thresholdPattern);
- for (const auto thr : muThresholds.value().get()) {
+ for (const auto& thr : muThresholds.value().get()) {
if (not (thresholdPattern & (1 << thr->mapping()))) {continue;}
const std::string thresholdProbeName = getProbeThresholdName(thr->name());
ATH_MSG_DEBUG("RoI #" << linkIndex << " passed threshold number " << thr->mapping()
diff --git a/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingEmulationTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingEmulationTool.cxx
index e05ae0af4d7f..e2d6cec3396c 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingEmulationTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingEmulationTool.cxx
@@ -159,9 +159,9 @@ StatusCode RoIsUnpackingEmulationTool::unpack( const EventContext& ctx,
ATH_MSG_DEBUG( "RoI word: 0x" << MSG::hex << std::setw(8) << roIWord << MSG::dec );
- auto decision = TrigCompositeUtils::newDecisionIn( decisionOutput.ptr(), hltSeedingNodeName() ); // This hltSeedingNodeName() denotes an initial node with no parents
+ auto *decision = TrigCompositeUtils::newDecisionIn( decisionOutput.ptr(), hltSeedingNodeName() ); // This hltSeedingNodeName() denotes an initial node with no parents
- for ( auto th: roi.passedThresholdIDs ) {
+ for ( const auto& th: roi.passedThresholdIDs ) {
ATH_MSG_DEBUG( "Passed Threshold " << th << " enabling respective chains " );
addChainsToDecision( HLT::Identifier( th ), decision, activeChains );
diff --git a/Trigger/TrigSteer/HLTSeeding/src/TAURoIsUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/TAURoIsUnpackingTool.cxx
index 28f70922f7b6..e1d514d23b25 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/TAURoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/TAURoIsUnpackingTool.cxx
@@ -53,8 +53,8 @@ StatusCode TAURoIsUnpackingTool::unpack( const EventContext& ctx,
ATH_CHECK(getL1Thresholds(*l1Menu, "TAU", tauThresholds));
// RoIBResult contains vector of TAU fragments
- for ( auto& emTauFragment : roib.eMTauResult() ) {
- for ( auto& roi : emTauFragment.roIVec() ) {
+ for ( const auto & emTauFragment : roib.eMTauResult() ) {
+ for ( const auto & roi : emTauFragment.roIVec() ) {
uint32_t roIWord = roi.roIWord();
if ( not ( LVL1::TrigT1CaloDefs::TauRoIWordType == roi.roIType() ) ) {
ATH_MSG_DEBUG( "Skipping RoI as it is not TAU threshold " << roIWord );
@@ -75,7 +75,7 @@ StatusCode TAURoIsUnpackingTool::unpack( const EventContext& ctx,
Decision* decisionMain = TrigCompositeUtils::newDecisionIn( decisionOutput.ptr(), hltSeedingNodeName() );
Decision* decisionProbe = TrigCompositeUtils::newDecisionIn( decisionOutputProbe.ptr(), hltSeedingNodeName() );
- for (const auto th : tauThresholds.value().get()) {
+ for (const auto& th : tauThresholds.value().get()) {
ATH_MSG_VERBOSE( "Checking if the threshold " << th->name() << " passed" );
if ( recRoI->passedThreshold( th->mapping() ) ) {
const std::string thresholdProbeName = getProbeThresholdName(th->name());
--
GitLab
From 721014227d2fb6daffaed5bf429326b69333129c Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Sun, 15 Aug 2021 21:30:38 +0200
Subject: [PATCH 055/272] Run2TriggerTowerMaker clang warning on unused
variable m_digitScale
---
Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.h b/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.h
index 867944653966..42ab49fe84b1 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.h
@@ -159,8 +159,6 @@ private:
const CaloLVL1_ID* m_caloId; //non-owning ptr
- // Global calibration scale (MeV/count, to optimise performance)
- double m_digitScale;
// Global LUT scales
double m_cpLutScale;
double m_jepLutScale;
--
GitLab
From 0d09afed8c127b21dcb934a183ab41d098011bbc Mon Sep 17 00:00:00 2001
From: Edward Moyse <edward.moyse@cern.ch>
Date: Mon, 16 Aug 2021 08:30:17 +0000
Subject: [PATCH 056/272] Update Projects/AthDataQuality/version.txt,
Projects/AthSimulation/version.txt, Projects/Athena/version.txt,
Projects/DetCommon/version.txt, Projects/VP1Light/version.txt files
---
Projects/AthDataQuality/version.txt | 2 +-
Projects/AthSimulation/version.txt | 2 +-
Projects/Athena/version.txt | 2 +-
Projects/DetCommon/version.txt | 2 +-
Projects/VP1Light/version.txt | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Projects/AthDataQuality/version.txt b/Projects/AthDataQuality/version.txt
index 7fdaadab40dd..c4238c8acdca 100644
--- a/Projects/AthDataQuality/version.txt
+++ b/Projects/AthDataQuality/version.txt
@@ -1 +1 @@
-22.0.41
+22.0.42
diff --git a/Projects/AthSimulation/version.txt b/Projects/AthSimulation/version.txt
index 7fdaadab40dd..c4238c8acdca 100644
--- a/Projects/AthSimulation/version.txt
+++ b/Projects/AthSimulation/version.txt
@@ -1 +1 @@
-22.0.41
+22.0.42
diff --git a/Projects/Athena/version.txt b/Projects/Athena/version.txt
index 7fdaadab40dd..c4238c8acdca 100644
--- a/Projects/Athena/version.txt
+++ b/Projects/Athena/version.txt
@@ -1 +1 @@
-22.0.41
+22.0.42
diff --git a/Projects/DetCommon/version.txt b/Projects/DetCommon/version.txt
index 7fdaadab40dd..c4238c8acdca 100644
--- a/Projects/DetCommon/version.txt
+++ b/Projects/DetCommon/version.txt
@@ -1 +1 @@
-22.0.41
+22.0.42
diff --git a/Projects/VP1Light/version.txt b/Projects/VP1Light/version.txt
index cdbc15874e55..c4238c8acdca 100644
--- a/Projects/VP1Light/version.txt
+++ b/Projects/VP1Light/version.txt
@@ -1 +1 @@
-22.0.40
+22.0.42
--
GitLab
From 30be7302b15905d3ff29f3eeeb2664a78b948751 Mon Sep 17 00:00:00 2001
From: Rafal Bielski <rafal.bielski@cern.ch>
Date: Fri, 13 Aug 2021 18:11:10 +0200
Subject: [PATCH 057/272] Remove rerun from HLT bits (ByteStream EDM evolution)
---
.../TrigTransform/python/dbgEventInfo.py | 37 +++++---
.../src/TrigDecisionMakerMT.cxx | 15 ++--
.../TrigSteeringEvent/HLTResultMT.h | 43 ++++++---
.../TrigSteeringEvent/src/HLTResultMT.cxx | 86 +++++++++++-------
.../src/HLTResultMTByteStreamCnv.cxx | 18 ++--
.../src/HLTResultMTByteStreamDecoderAlg.cxx | 13 ++-
.../src/HLTResultMTByteStreamDecoderTool.cxx | 87 ++++++++++++++++---
.../src/HLTResultMTByteStreamDecoderTool.h | 31 ++++++-
.../ITriggerBitsMakerTool.h | 1 -
.../TrigOutputHandling/TriggerBitsMakerTool.h | 1 -
.../src/TriggerBitsMakerTool.cxx | 23 ++---
.../bin/trigbs_dumpHLTContentInBS_run3.py | 70 ++++++++++-----
.../share/dumpHLTContentInBS_run3.ref | 32 ++++---
13 files changed, 327 insertions(+), 130 deletions(-)
diff --git a/HLT/Trigger/TrigTransforms/TrigTransform/python/dbgEventInfo.py b/HLT/Trigger/TrigTransforms/TrigTransform/python/dbgEventInfo.py
index ec78d9a80352..c11c489c367d 100644
--- a/HLT/Trigger/TrigTransforms/TrigTransform/python/dbgEventInfo.py
+++ b/HLT/Trigger/TrigTransforms/TrigTransform/python/dbgEventInfo.py
@@ -186,8 +186,7 @@ class dbgEventInfo:
# Decode Lvl1 trigger info
info = event.lvl1_trigger_info()
- nwords = len(info)//3 # TBP, TAP, TAV
- l1Bits = [self.decodeTriggerBits(info[i*nwords:(i+1)*nwords]) for i in range(3)]
+ l1Bits = self.decodeTriggerBits(info, 3) # TBP, TAP, TAV
for id in l1Bits[0]:
if id in L1ItemNames:
@@ -214,10 +213,23 @@ class dbgEventInfo:
if not HLTChainNames:
return
+ # Find ROD minor version
+ version = (1,1)
+ for rob in event.children():
+ if rob.source_id().subdetector_id() == eformat.helper.SubDetector.TDAQ_HLT:
+ rod_version = rob.rod_version()
+ minor_version = rod_version.minor_version()
+ minor_version_M = (minor_version & 0xff00) >> 8
+ minor_version_L = minor_version & 0xff
+ version = (minor_version_M, minor_version_L)
+ break
+
+ # Version 1.0 has {passed, prescaled, rerun}, 1.1 and later only {passed, prescaled}
+ num_sets = 3 if version[0] < 1 or version==(1,0) else 2
+
# Decode HLT trigger info
info = event.event_filter_info()
- nwords = len(info)//3 # raw, prescaled, rerun
- chainList = [self.decodeTriggerBits(info[i*nwords:(i+1)*nwords]) for i in range(3)]
+ chainList = self.decodeTriggerBits(info, num_sets)
for id in chainList[0]:
self.HLT_Triggered_IDs.push_back(id)
@@ -230,12 +242,17 @@ class dbgEventInfo:
# Copied from ​TrigTools/TrigByteStreamTools/trigbs_dumpHLTContentInBS_run3.py
- def decodeTriggerBits(self, words, base=32):
- bit_indices = []
- for iw in range(len(words)):
- bit_indices.extend([base*iw+i for i in range(base) if words[iw] & (1 << i)])
-
- return bit_indices
+ def decodeTriggerBits(self, words, num_sets, base=32):
+ assert len(words) % num_sets == 0
+ n_words_per_set = len(words) // num_sets
+ result = []
+ for iset in range(num_sets):
+ words_in_set = words[iset*n_words_per_set:(iset+1)*n_words_per_set]
+ bit_indices = []
+ for iw in range(len(words_in_set)):
+ bit_indices.extend([base*iw+i for i in range(base) if words_in_set[iw] & (1 << i)])
+ result.append(bit_indices)
+ return result
# If line 246 not possible - to delete
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.cxx b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.cxx
index 558e864b6446..ca13b8d76752 100644
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.cxx
@@ -118,12 +118,12 @@ TrigDec::TrigDecisionMakerMT::execute(const EventContext &context) const
if (m_doHLT) {
- boost::dynamic_bitset<uint32_t> passRawBitset, prescaledBitset, rerunBitset;
+ boost::dynamic_bitset<uint32_t> passRawBitset, prescaledBitset;
if (m_bitsMakerTool.isSet()) {
ATH_MSG_DEBUG ("MC Mode: Creating bits with TriggerBitsMakerTool");
- ATH_CHECK(m_bitsMakerTool->getBits(passRawBitset, prescaledBitset, rerunBitset, context));
+ ATH_CHECK(m_bitsMakerTool->getBits(passRawBitset, prescaledBitset, context));
} else {
@@ -133,7 +133,6 @@ TrigDec::TrigDecisionMakerMT::execute(const EventContext &context) const
passRawBitset = hltResult->getHltPassRawBits();
prescaledBitset = hltResult->getHltPrescaledBits();
- rerunBitset = hltResult->getHltRerunBits();
const std::vector<HLT::OnlineErrorCode> errorCodes = hltResult->getErrorCodes();
bool truncated = false;
@@ -151,31 +150,27 @@ TrigDec::TrigDecisionMakerMT::execute(const EventContext &context) const
ATH_MSG_DEBUG ("Number of HLT chains passed raw: " << passRawBitset.count());
ATH_MSG_DEBUG ("Number of HLT chains prescaled out: " << prescaledBitset.count());
- ATH_MSG_DEBUG ("Number of HLT chains in rerun / second pass / resurrection : " << rerunBitset.count());
if (passRawBitset.any()) {
++m_hltPassed;
}
- std::vector<uint32_t> passRaw, prescaled, rerun;
+ std::vector<uint32_t> passRaw, prescaled;
passRaw.resize(passRawBitset.num_blocks());
prescaled.resize(prescaledBitset.num_blocks());
- rerun.resize(rerunBitset.num_blocks());
boost::to_block_range(passRawBitset, passRaw.begin());
boost::to_block_range(prescaledBitset, prescaled.begin());
- boost::to_block_range(rerunBitset, rerun.begin());
- if (passRaw.size() != prescaled.size() or passRaw.size() != rerun.size()) {
+ if (passRaw.size() != prescaled.size()) {
ATH_MSG_ERROR("Trigger bitsets are not all the same size! passRaw:"
- << passRaw.size() << " prescaled:" << prescaled.size() << " rerun:" << rerun.size() );
+ << passRaw.size() << " prescaled:" << prescaled.size() );
return StatusCode::FAILURE;
}
trigDec->setEFPassedRaw(passRaw);
trigDec->setEFPrescaled(prescaled);
- trigDec->setEFResurrected(rerun);
}
diff --git a/Trigger/TrigEvent/TrigSteeringEvent/TrigSteeringEvent/HLTResultMT.h b/Trigger/TrigEvent/TrigSteeringEvent/TrigSteeringEvent/HLTResultMT.h
index 29cec7151eac..0a8276ada7c9 100644
--- a/Trigger/TrigEvent/TrigSteeringEvent/TrigSteeringEvent/HLTResultMT.h
+++ b/Trigger/TrigEvent/TrigSteeringEvent/TrigSteeringEvent/HLTResultMT.h
@@ -22,6 +22,7 @@
#include <boost/dynamic_bitset.hpp>
#include <vector>
#include <unordered_map>
+#include <utility>
namespace HLT {
@@ -39,12 +40,17 @@ namespace HLT {
HLTResultMT(std::vector<eformat::helper::StreamTag> streamTags = {},
boost::dynamic_bitset<uint32_t> hltPassRawBits = boost::dynamic_bitset<uint32_t>(),
boost::dynamic_bitset<uint32_t> hltPrescaledBits = boost::dynamic_bitset<uint32_t>(),
- boost::dynamic_bitset<uint32_t> hltRerunBits = boost::dynamic_bitset<uint32_t>(),
std::unordered_map<uint16_t, std::vector<uint32_t> > data = {},
std::vector<uint32_t> status = {0},
std::set<uint16_t> truncatedModuleIds = {});
+ // ------------------------- Public typedefs -------------------------------
+
+ /// Type to store decoded ROD minor version (16-bit version split into two 8-bit numbers)
+ using RODMinorVersion = std::pair<uint8_t,uint8_t>;
+
+
// ------------------------- Stream tags getters/setters -------------------
/// Const-getter for stream tags
@@ -76,11 +82,8 @@ namespace HLT {
/// Const-getter for HLT prescaled bits
const boost::dynamic_bitset<uint32_t>& getHltPrescaledBits() const;
- /// Const-getter for HLT rerun bits
- const boost::dynamic_bitset<uint32_t>& getHltRerunBits() const;
-
- /// Const-getter for HLT bits as uint32_t array. Ordering: PassRaw, Prescaled, Rerun.
- const std::vector<uint32_t>& getHltBitsAsWords();
+ /// Const-getter for HLT bits as uint32_t array. Ordering: PassRaw, Prescaled
+ const std::vector<uint32_t>& getHltBitsAsWords() const;
/// Replace HLT pass raw bits with the given bitset
void setHltPassRawBits(const boost::dynamic_bitset<uint32_t>& bitset);
@@ -88,8 +91,9 @@ namespace HLT {
/// Replace HLT prescaled bits with the given bitset
void setHltPrescaledBits(const boost::dynamic_bitset<uint32_t>& bitset);
- /// Replace HLT rerun raw bits with the given bitset
- void setHltRerunBits(const boost::dynamic_bitset<uint32_t>& bitset);
+ /// Replace both HLT pass raw and prescaled bits with the given bitsets
+ void setHltBits(const boost::dynamic_bitset<uint32_t>& passRawBitset,
+ const boost::dynamic_bitset<uint32_t>& prescaledBitset);
// ------------------------- Serialised data getters/setters ---------------
@@ -154,6 +158,17 @@ namespace HLT {
});
+ // ------------------------- Version getters/setters -----------------------
+ // The format of the HLT ByteStream (ROD payload) and the interpretation of the HLT-specific information
+ // in the full event header are versioned by the ROD minor version of the HLT ROBFragments
+
+ /// ROD minor version getter
+ RODMinorVersion getVersion() const;
+
+ /// ROD minor version setter
+ void setVersion(RODMinorVersion version);
+
+
// ------------------------- Truncation information ------------------------
/// Getter for the truncation information
@@ -175,12 +190,11 @@ namespace HLT {
/// HLT bits (flagging which chains passed)
boost::dynamic_bitset<uint32_t> m_hltPassRawBits;
boost::dynamic_bitset<uint32_t> m_hltPrescaledBits;
- boost::dynamic_bitset<uint32_t> m_hltRerunBits;
/** @brief Vector storing m_hltBits converted to 4-byte words
*
* HLTResultMT needs to own this vector because its lifetime has to be ensured until the serialisation is finished.
- * This vector is updated internally from m_hltPassRawBits, m_hltPrescaledBits, m_hltRerunBits and does not have a setter method.
+ * This vector is updated internally from m_hltPassRawBits and m_hltPrescaledBits and does not have a setter method.
**/
std::vector<uint32_t> m_hltBitWords;
@@ -190,9 +204,18 @@ namespace HLT {
/// First word is eformat::helper::Status, next words are optional error codes
std::vector<uint32_t> m_status;
+ /// Stores the ROD minor version of the HLT ROBFragments
+ RODMinorVersion m_version;
+
/// List of module IDs with truncation. Used only by the framework while creating the result.
/// It is not stored in ByteStream files.
std::set<uint16_t> m_truncatedModuleIds;
+
+
+ // ------------------------- Private helper methods ------------------------
+
+ /// Update m_hltBitWords with the contents of m_hltPassRawBits and m_hltPrescaledBits
+ void updateHltBitWords();
};
} // namespace HLT
diff --git a/Trigger/TrigEvent/TrigSteeringEvent/src/HLTResultMT.cxx b/Trigger/TrigEvent/TrigSteeringEvent/src/HLTResultMT.cxx
index 1b4fd41e4edf..84807d9c8c25 100644
--- a/Trigger/TrigEvent/TrigSteeringEvent/src/HLTResultMT.cxx
+++ b/Trigger/TrigEvent/TrigSteeringEvent/src/HLTResultMT.cxx
@@ -6,8 +6,22 @@
#include "AthenaBaseComps/AthCheckMacros.h"
#include <algorithm>
#include <utility>
-
-#define CONTEXT_NAME "HLT::HLTResultMT"
+#include <string_view>
+
+// Local constants
+namespace {
+ /**
+ * HLT ROBFragment ROD minor version
+ *
+ * Changed from 0.0 to 1.0 in September 2019 to differentiate Run-3 HLT ByteStream format from earlier formats.
+ * Further version changes:
+ * - v1.1 (August 2021): Remove rerun bits from the HLT bits in event header
+ */
+ constexpr HLT::HLTResultMT::RODMinorVersion s_currentHltRodMinorVersion{1,1};
+
+ /// Class name to print in messages
+ constexpr std::string_view s_contextName{"HLT::HLTResultMT"};
+}
// =============================================================================
// Standard constructor
@@ -15,16 +29,15 @@
HLT::HLTResultMT::HLTResultMT(std::vector<eformat::helper::StreamTag> streamTags,
boost::dynamic_bitset<uint32_t> hltPassRawBits,
boost::dynamic_bitset<uint32_t> hltPrescaledBits,
- boost::dynamic_bitset<uint32_t> hltRerunBits,
std::unordered_map<uint16_t, std::vector<uint32_t> > data,
std::vector<uint32_t> status,
std::set<uint16_t> truncatedModuleIds)
: m_streamTags(std::move(streamTags)),
m_hltPassRawBits(std::move(hltPassRawBits)),
m_hltPrescaledBits(std::move(hltPrescaledBits)),
- m_hltRerunBits(std::move(hltRerunBits)),
m_data(std::move(data)),
m_status(std::move(status)),
+ m_version(s_currentHltRodMinorVersion),
m_truncatedModuleIds(std::move(truncatedModuleIds)) {}
// =============================================================================
@@ -59,7 +72,7 @@ StatusCode HLT::HLTResultMT::addStreamTag(const eformat::helper::StreamTag& stre
// In case of duplicate, merge ROBs and SubDets, otherwise just append the tag to the result
if (p != m_streamTags.end()) {
if (streamTag.obeys_lumiblock != p->obeys_lumiblock) {
- ATH_REPORT_ERROR_WITH_CONTEXT(StatusCode::FAILURE, CONTEXT_NAME)
+ ATH_REPORT_ERROR_WITH_CONTEXT(StatusCode::FAILURE, s_contextName.data())
<< "Stream tags have equal type and name (" << streamTag.type << "/" << streamTag.name
<< "), but inconsistent obeys_lumiblock flag";
return StatusCode::FAILURE;
@@ -87,20 +100,13 @@ const boost::dynamic_bitset<uint32_t>& HLT::HLTResultMT::getHltPrescaledBits() c
}
// -----------------------------------------------------------------------------
-const boost::dynamic_bitset<uint32_t>& HLT::HLTResultMT::getHltRerunBits() const {
- return m_hltRerunBits;
-}
-
-// -----------------------------------------------------------------------------
-const std::vector<uint32_t>& HLT::HLTResultMT::getHltBitsAsWords() {
- m_hltBitWords.clear();
- if (m_hltPassRawBits.num_blocks() != m_hltPrescaledBits.num_blocks() || m_hltPassRawBits.num_blocks() != m_hltRerunBits.num_blocks()) {
- throw std::runtime_error("Must have the same number of bits in m_hltPassRawBits, m_hltPrescaledBits and m_hltRerunBits.");
+const std::vector<uint32_t>& HLT::HLTResultMT::getHltBitsAsWords() const {
+ if (m_hltPassRawBits.num_blocks() != m_hltPrescaledBits.num_blocks()) {
+ throw std::runtime_error("Must have the same number of bits in m_hltPassRawBits and m_hltPrescaledBits");
+ }
+ if (m_hltBitWords.size() != m_hltPassRawBits.num_blocks() + m_hltPrescaledBits.num_blocks()) {
+ throw std::runtime_error("m_hltBitWords size differs from the sum of m_hltPassRawBits and m_hltPrescaledBits");
}
- m_hltBitWords.resize(m_hltPassRawBits.num_blocks() + m_hltPrescaledBits.num_blocks() + m_hltRerunBits.num_blocks());
- boost::to_block_range(m_hltPassRawBits, m_hltBitWords.begin());
- boost::to_block_range(m_hltPrescaledBits, m_hltBitWords.begin() + m_hltPassRawBits.num_blocks());
- boost::to_block_range(m_hltRerunBits, m_hltBitWords.begin() + m_hltPassRawBits.num_blocks() + m_hltPrescaledBits.num_blocks());
return m_hltBitWords;
}
@@ -108,18 +114,34 @@ const std::vector<uint32_t>& HLT::HLTResultMT::getHltBitsAsWords() {
void HLT::HLTResultMT::setHltPassRawBits(const boost::dynamic_bitset<uint32_t>& bitset) {
// copy assignment
m_hltPassRawBits = bitset;
+ updateHltBitWords();
}
// -----------------------------------------------------------------------------
void HLT::HLTResultMT::setHltPrescaledBits(const boost::dynamic_bitset<uint32_t>& bitset) {
// copy assignment
m_hltPrescaledBits = bitset;
+ updateHltBitWords();
}
// -----------------------------------------------------------------------------
-void HLT::HLTResultMT::setHltRerunBits(const boost::dynamic_bitset<uint32_t>& bitset) {
- // copy assignment
- m_hltRerunBits = bitset;
+void HLT::HLTResultMT::setHltBits(const boost::dynamic_bitset<uint32_t>& passRawBitset,
+ const boost::dynamic_bitset<uint32_t>& prescaledBitset) {
+ if (passRawBitset.num_blocks() != prescaledBitset.num_blocks()) {
+ throw std::runtime_error("Must have the same number of bits in passRawBitset and prescaledBitset");
+ }
+ // copy assignments
+ m_hltPassRawBits = passRawBitset;
+ m_hltPrescaledBits = prescaledBitset;
+ updateHltBitWords();
+}
+
+// -----------------------------------------------------------------------------
+void HLT::HLTResultMT::updateHltBitWords() {
+ m_hltBitWords.clear();
+ m_hltBitWords.resize(m_hltPassRawBits.num_blocks() + m_hltPrescaledBits.num_blocks(), 0);
+ boost::to_block_range(m_hltPassRawBits, m_hltBitWords.begin());
+ boost::to_block_range(m_hltPrescaledBits, m_hltBitWords.begin() + m_hltPassRawBits.num_blocks());
}
// =============================================================================
@@ -134,7 +156,7 @@ StatusCode HLT::HLTResultMT::getSerialisedData(const uint16_t moduleId, const st
data = nullptr;
const auto it = m_data.find(moduleId);
if (it==m_data.cend()) {
- REPORT_MESSAGE_WITH_CONTEXT(MSG::DEBUG, CONTEXT_NAME)
+ REPORT_MESSAGE_WITH_CONTEXT(MSG::DEBUG, s_contextName.data())
<< "No data available in the stored map for the requested moduleId=" << moduleId;
return StatusCode::FAILURE;
}
@@ -160,7 +182,7 @@ void HLT::HLTResultMT::addSerialisedData(const uint16_t moduleId, const std::vec
// -----------------------------------------------------------------------------
StatusCode HLT::HLTResultMT::addSerialisedDataWithCheck(const uint16_t moduleId, std::vector<uint32_t> data) {
if (m_data.find(moduleId)!=m_data.cend()) {
- ATH_REPORT_ERROR_WITH_CONTEXT(StatusCode::FAILURE, CONTEXT_NAME)
+ ATH_REPORT_ERROR_WITH_CONTEXT(StatusCode::FAILURE, s_contextName.data())
<< "Trying to add data for a module which already exists in the stored map, moduleId=" << moduleId;
return StatusCode::FAILURE;
}
@@ -220,6 +242,18 @@ void HLT::HLTResultMT::addErrorCode(const HLT::OnlineErrorCode& errorCode,
m_status.push_back(static_cast<uint32_t>(errorCode));
}
+// =============================================================================
+// Getter/setter methods for HLT ROD minor version
+// =============================================================================
+HLT::HLTResultMT::RODMinorVersion HLT::HLTResultMT::getVersion() const {
+ return m_version;
+}
+
+// -----------------------------------------------------------------------------
+void HLT::HLTResultMT::setVersion(RODMinorVersion version) {
+ m_version = version;
+}
+
// =============================================================================
// Getter/setter methods for truncation information
// =============================================================================
@@ -263,13 +297,10 @@ std::ostream& operator<<(std::ostream& str, const HLT::HLTResultMT& hltResult) {
// HLT bits
std::vector<uint32_t> hltPassRawBitWords;
std::vector<uint32_t> hltPrescaledBitWords;
- std::vector<uint32_t> hltRerunBitWords;
hltPassRawBitWords.resize(hltResult.getHltPassRawBits().num_blocks());
hltPrescaledBitWords.resize(hltResult.getHltPrescaledBits().num_blocks());
- hltRerunBitWords.resize(hltResult.getHltRerunBits().num_blocks());
boost::to_block_range(hltResult.getHltPassRawBits(),hltPassRawBitWords.begin());
boost::to_block_range(hltResult.getHltPrescaledBits(),hltPrescaledBitWords.begin());
- boost::to_block_range(hltResult.getHltRerunBits(),hltRerunBitWords.begin());
str << "--> HLT bits = ";
for (const uint32_t word : hltPassRawBitWords) {
printWord(word);
@@ -277,9 +308,6 @@ std::ostream& operator<<(std::ostream& str, const HLT::HLTResultMT& hltResult) {
for (const uint32_t word : hltPrescaledBitWords) {
printWord(word);
}
- for (const uint32_t word : hltRerunBitWords) {
- printWord(word);
- }
str << std::endl;
// Payload size
diff --git a/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamCnv.cxx b/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamCnv.cxx
index 24acfcb321b4..56bcf4234670 100644
--- a/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamCnv.cxx
+++ b/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamCnv.cxx
@@ -27,11 +27,6 @@ namespace {
* a property set from the EDM configuration to avoid multiple definitions, but the value should never change from 0.
*/
constexpr uint16_t fullResultModuleId = 0;
- /**
- * HLT ROBFragment ROD minor version.
- * Changed from 0.0 to 1.0 in September 2019 to differentiate Run-3 HLT ByteStream format from earlier formats.
- */
- constexpr uint16_t hltRodMinorVersion = 0x0100;
}
// Local helper methods
@@ -114,6 +109,17 @@ StatusCode HLT::HLTResultMTByteStreamCnv::createRep(DataObject* pObj, IOpaqueAdd
return StatusCode::FAILURE;
}
+ // Check ROD minor version
+ const HLT::HLTResultMT::RODMinorVersion hltRodMinorVersion = hltResult->getVersion();
+ if (hltRodMinorVersion == HLT::HLTResultMT::RODMinorVersion{0xff,0xff}) {
+ ATH_MSG_ERROR("Invalid HLT ROD minor version {0xff, 0xff}");
+ return StatusCode::FAILURE;
+ }
+ // Encode version X.Y (two 8-bit numbers) into a single 16-bit number
+ const uint16_t hltRodMinorVersion16 = (hltRodMinorVersion.first << 8u) | hltRodMinorVersion.second;
+ ATH_MSG_DEBUG("HLT ROD minor version is " << hltRodMinorVersion.first << "." << hltRodMinorVersion.second
+ << " (0x" << MSG::hex << hltRodMinorVersion16 << MSG::dec << ")");
+
// Obtain the RawEventWrite (aka eformat::write::FullEventFragment) pointer
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
if (!re) {
@@ -220,7 +226,7 @@ StatusCode HLT::HLTResultMTByteStreamCnv::createRep(DataObject* pObj, IOpaqueAdd
data.data(),
eformat::STATUS_BACK
));
- cache->robFragments.back()->rod_minor_version(hltRodMinorVersion);
+ cache->robFragments.back()->rod_minor_version(hltRodMinorVersion16);
re->append(cache->robFragments.back().get());
ATH_MSG_DEBUG("Appended data for HLT result ID 0x" << MSG::hex << resultId.code() << MSG::dec << " with "
<< data.size() << " words of serialised payload to the output full event");
diff --git a/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderAlg.cxx b/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderAlg.cxx
index 85e0064e0d7f..62044986bfac 100644
--- a/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderAlg.cxx
+++ b/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderAlg.cxx
@@ -55,12 +55,21 @@ StatusCode HLTResultMTByteStreamDecoderAlg::execute(const EventContext& eventCon
return StatusCode::FAILURE;
}
+ // Retrieve the HLT result payload
+ IROBDataProviderSvc::VROBFRAG vrobf; // vector of ROBFragments to be filled
+ m_robDataProviderSvc->getROBData(eventContext, m_robIdsToDecode, vrobf, name());
+ if (vrobf.empty()) {
+ ATH_MSG_ERROR("Failed to retrieve HLT ROBFragments from ROBDataProvider");
+ return StatusCode::FAILURE;
+ }
+
+ // Get the format version
+ hltResult->setVersion(m_decoderTool->getHltRodMinorVersion(vrobf));
+
// Fill the result object from ByteStream event header
ATH_CHECK(m_decoderTool->decodeHeader(re, *hltResult));
// Read the HLT result payload
- IROBDataProviderSvc::VROBFRAG vrobf; // vector of ROBFragments to be filled
- m_robDataProviderSvc->getROBData(eventContext, m_robIdsToDecode, vrobf, name());
ATH_CHECK(m_decoderTool->decodePayload(vrobf, *hltResult));
// Print the result
diff --git a/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderTool.cxx b/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderTool.cxx
index 846471498a4c..19bf0adfda6a 100644
--- a/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderTool.cxx
+++ b/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderTool.cxx
@@ -8,6 +8,15 @@
// TDAQ includes
#include "eformat/StreamTag.h"
+using RODMinorVersion = HLT::HLTResultMT::RODMinorVersion;
+
+namespace{
+ // Convert RODMinorVersion to string
+ std::string printRodMinorVersion(const RODMinorVersion v) {
+ return std::to_string(v.first) + "." + std::to_string(v.second);
+ }
+}
+
// =============================================================================
// Standard constructor
// =============================================================================
@@ -32,6 +41,39 @@ StatusCode HLTResultMTByteStreamDecoderTool::finalize() {
return StatusCode::SUCCESS;
}
+// =============================================================================
+RODMinorVersion HLTResultMTByteStreamDecoderTool::getHltRodMinorVersion(
+ const std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>& vrobf) const {
+
+ if (vrobf.empty()) {
+ ATH_MSG_ERROR("Empty ROBFragment vector passed to getHltRodMinorVersion, returning invalid version");
+ return {0xff, 0xff};
+ }
+
+ uint16_t version{0xffff};
+ bool first{true};
+ for (const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment* robf : vrobf) {
+ uint32_t thisRodVersion = robf->rod_version();
+ uint16_t thisRodMinorVersion = (thisRodVersion & 0xffffu);
+ if (thisRodMinorVersion == 0xffffu) {
+ ATH_MSG_WARNING("Invalid HLT ROD minor version 0xffff found in ROBFragment 0x"
+ << MSG::hex << robf->rob_source_id() << MSG::dec);
+ }
+ if (first) {
+ version = thisRodMinorVersion;
+ }
+ else if (thisRodMinorVersion != version) {
+ ATH_MSG_ERROR("Inconsistent HLT ROD minor versions in different ROBFragments, 0x"
+ << MSG::hex << version << " and " << thisRodMinorVersion << MSG::dec
+ << ", getHltRodMinorVersion returning invalid version");
+ return {0xff, 0xff};
+ }
+ first = false;
+ }
+ // Split the version 0xabcd into {0xab, 0xcd}
+ return {((version & 0xff00u) >> 8u), (version & 0x00ffu)};
+}
+
// =============================================================================
StatusCode HLTResultMTByteStreamDecoderTool::decodeHeader(const RawEvent* rawEvent, HLT::HLTResultMT& resultToFill) const {
@@ -41,6 +83,9 @@ StatusCode HLTResultMTByteStreamDecoderTool::decodeHeader(const RawEvent* rawEve
}
ATH_MSG_DEBUG("Decoding HLTResultMT from ByteStream event " << rawEvent->global_id());
+ const RODMinorVersion hltRodMinorVersion = resultToFill.getVersion();
+ ATH_CHECK(checkRodMinorVersion(hltRodMinorVersion));
+
// ---------------------------------------------------------------------------
// Read the status words (error codes from online event processing)
// ---------------------------------------------------------------------------
@@ -102,25 +147,30 @@ StatusCode HLTResultMTByteStreamDecoderTool::decodeHeader(const RawEvent* rawEve
ATH_MSG_ERROR("Unknown exception caught when reading HLT bits");
return StatusCode::FAILURE;
}
- if (hltBitWords.size() % 3 != 0) {
- ATH_MSG_ERROR("Size of hltBitWords=" << hltBitWords.size() << " must be divisible by three. Expecting {raw, prescaled, rerun} bits.");
+
+ // Version 1.0 includes rerun bits, removed since version 1.1
+ const size_t numBitSets = (hltRodMinorVersion==RODMinorVersion{1,0}) ? 3 : 2;
+
+ if (hltBitWords.size() % numBitSets != 0) {
+ ATH_MSG_ERROR("Size of hltBitWords=" << hltBitWords.size() << " must be divisible by " << numBitSets
+ << ". Expecting {raw, prescaled" << (numBitSets==3 ? ", rerun" : "") << "} bits.");
return StatusCode::FAILURE;
}
- const size_t sizeOfBlock = hltBitWords.size() / 3;
- auto beginPrescaledIt = hltBitWords.begin();
- std::advance(beginPrescaledIt, sizeOfBlock);
- auto beginRerunIt = hltBitWords.begin();
- std::advance(beginRerunIt, 2 * sizeOfBlock);
- resultToFill.setHltPassRawBits( {hltBitWords.begin(), beginPrescaledIt} );
- resultToFill.setHltPrescaledBits( {beginPrescaledIt, beginRerunIt} );
- resultToFill.setHltRerunBits( {beginRerunIt, hltBitWords.end()} );
- ATH_MSG_DEBUG("Successfully read " << hltBitWords.size() << " HLT bit words");
+ const size_t sizeOfBlock = hltBitWords.size() / numBitSets;
+ auto beginPrescaledIt = hltBitWords.cbegin() + sizeOfBlock;
+ auto endIt = (numBitSets==2) ? hltBitWords.cend() : hltBitWords.cbegin() + 2*sizeOfBlock;
+ resultToFill.setHltBits( {hltBitWords.cbegin(), beginPrescaledIt},
+ {beginPrescaledIt, endIt} );
+ ATH_MSG_DEBUG("Successfully read " << std::distance(hltBitWords.cbegin(), endIt) << " HLT bit words");
return StatusCode::SUCCESS;
}
// =============================================================================
StatusCode HLTResultMTByteStreamDecoderTool::decodePayload(const std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>& vrobf,
HLT::HLTResultMT& resultToFill) const {
+ const RODMinorVersion hltRodMinorVersion = resultToFill.getVersion();
+ ATH_CHECK(checkRodMinorVersion(hltRodMinorVersion));
+
for (const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment* robf : vrobf) {
eformat::helper::SourceIdentifier sid(robf->rob_source_id());
ATH_MSG_DEBUG("Reading ROBFragment " << sid.human());
@@ -148,3 +198,18 @@ StatusCode HLTResultMTByteStreamDecoderTool::decodePayload(const std::vector<con
}
return StatusCode::SUCCESS;
}
+
+// =============================================================================
+StatusCode HLTResultMTByteStreamDecoderTool::checkRodMinorVersion(const RODMinorVersion version) const {
+ if (version == RODMinorVersion{0xff, 0xff}) {
+ ATH_MSG_ERROR("Invalid HLT ROD minor version {0xff, 0xff}");
+ return StatusCode::FAILURE;
+ }
+ if (version.first < 1) {
+ ATH_MSG_ERROR("HLT ROD minor version " << printRodMinorVersion(version) << " is lower than 1.0. "
+ << "This tool is for decoding versions 1.0 or later (i.e. HLT ByteStream from Run 3 or later)");
+ return StatusCode::FAILURE;
+ }
+ ATH_MSG_DEBUG("HLT ROD minor version is " << printRodMinorVersion(version));
+ return StatusCode::SUCCESS;
+}
diff --git a/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderTool.h b/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderTool.h
index 42369dd26abd..2efa55236c77 100644
--- a/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderTool.h
+++ b/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderTool.h
@@ -25,11 +25,38 @@ public:
virtual StatusCode finalize() override;
// ------------------------- Specific methods of this class ------------------
- /// Fills the HLTResultMT object from the ByteStream event header
+ /**
+ * Retrieves the HLT ROD minor version from vector of ROBFragments, checking it is the same in all of them
+ *
+ * @param[in] vrobf A vector of HLT ROBFragments to decode (subdetector identifier TDAQ_HLT)
+ * @return The decoded minor version number or {0xff,0xff} in case of errors
+ */
+ HLT::HLTResultMT::RODMinorVersion getHltRodMinorVersion(const std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>& vrobf) const;
+ /**
+ * Fills the HLTResultMT object from the ByteStream event header
+ *
+ * The decoding may depend on HLT ROD Minor version. The passed HLTResultMT should have a valid version set.
+ *
+ * @param[in] rawEvent A pointer to the FullEventFragment to decode
+ * @param[out] resultToFill The HLTResultMT object to be updated with the decoded information
+ * @return FAILURE if anything goes wrong, else SUCCESS
+ */
StatusCode decodeHeader(const RawEvent* rawEvent, HLT::HLTResultMT& resultToFill) const;
- /// Fills the HLTResultMT object from vector of ROBFragments
+ /**
+ * Fills the HLTResultMT object from vector of ROBFragments
+ *
+ * The decoding may depend on HLT ROD Minor version. The passed HLTResultMT should have a valid version set.
+ *
+ * @param[in] vrobf A vector of HLT ROBFragments to decode (subdetector identifier TDAQ_HLT)
+ * @param[out] resultToFill The HLTResultMT object to be updated with the decoded information
+ * @return FAILURE if anything goes wrong, else SUCCESS
+ */
StatusCode decodePayload(const std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>& vrobf,
HLT::HLTResultMT& resultToFill) const;
+
+private:
+ // Check if RODMinorVersion is valid and 1.0 or higher
+ StatusCode checkRodMinorVersion(const HLT::HLTResultMT::RODMinorVersion version) const;
};
#endif // TRIGHLTRESULTBYTESTREAM_HLTResultMTByteStreamDecoderTool_H
diff --git a/Trigger/TrigSteer/TrigOutputHandling/TrigOutputHandling/ITriggerBitsMakerTool.h b/Trigger/TrigSteer/TrigOutputHandling/TrigOutputHandling/ITriggerBitsMakerTool.h
index 8ec429785d47..c423f12efd29 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/TrigOutputHandling/ITriggerBitsMakerTool.h
+++ b/Trigger/TrigSteer/TrigOutputHandling/TrigOutputHandling/ITriggerBitsMakerTool.h
@@ -19,7 +19,6 @@ public:
virtual StatusCode getBits(boost::dynamic_bitset<uint32_t>& passRaw,
boost::dynamic_bitset<uint32_t>& prescaled,
- boost::dynamic_bitset<uint32_t>& rerun,
const EventContext& ctx) const = 0;
virtual ~ITriggerBitsMakerTool() override = default;
diff --git a/Trigger/TrigSteer/TrigOutputHandling/TrigOutputHandling/TriggerBitsMakerTool.h b/Trigger/TrigSteer/TrigOutputHandling/TrigOutputHandling/TriggerBitsMakerTool.h
index 141335146bf4..6003f43476fd 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/TrigOutputHandling/TriggerBitsMakerTool.h
+++ b/Trigger/TrigSteer/TrigOutputHandling/TrigOutputHandling/TriggerBitsMakerTool.h
@@ -24,7 +24,6 @@ public:
virtual StatusCode getBits(boost::dynamic_bitset<uint32_t>& passRaw,
boost::dynamic_bitset<uint32_t>& prescaled,
- boost::dynamic_bitset<uint32_t>& rerun,
const EventContext& ctx) const override;
virtual StatusCode initialize() override;
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/TriggerBitsMakerTool.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/TriggerBitsMakerTool.cxx
index 8bed2b30f4fc..010b65cab3fb 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/TriggerBitsMakerTool.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/TriggerBitsMakerTool.cxx
@@ -75,14 +75,12 @@ StatusCode TriggerBitsMakerTool::preInsertCheck(const std::string& chain, const
StatusCode TriggerBitsMakerTool::getBits(boost::dynamic_bitset<uint32_t>& passRaw,
boost::dynamic_bitset<uint32_t>& prescaled,
- boost::dynamic_bitset<uint32_t>& rerun,
const EventContext& ctx) const
{
using namespace TrigCompositeUtils;
passRaw.clear();
prescaled.clear();
- rerun.clear();
auto chainsHandle = SG::makeHandle(m_finalChainDecisions, ctx);
if (!chainsHandle.isValid()) {
@@ -97,7 +95,6 @@ StatusCode TriggerBitsMakerTool::getBits(boost::dynamic_bitset<uint32_t>& passRa
passRaw.resize(m_largestBit + 1);
prescaled.resize(m_largestBit + 1);
- rerun.resize(m_largestBit + 1); // TODO: remove this fully in the future
const Decision* HLTPassRaw = nullptr;
const Decision* HLTPrescaled = nullptr;
@@ -107,7 +104,7 @@ StatusCode TriggerBitsMakerTool::getBits(boost::dynamic_bitset<uint32_t>& passRa
// Read the sets of chain IDs
for (const Decision* decisionObject : *chainsHandle) {
- // Collect all decisions (IDs of passed/prescaled/rerun chains) from named decisionObjects
+ // Collect all decisions (IDs of passed/prescaled chains) from named decisionObjects
if (decisionObject->name() == TrigCompositeUtils::summaryPassNodeName()) {
HLTPassRaw = decisionObject;
} else if (decisionObject->name() == TrigCompositeUtils::summaryPrescaledNodeName()) {
@@ -141,13 +138,9 @@ StatusCode TriggerBitsMakerTool::fill( HLT::HLTResultMT& resultToFill, const Eve
{
boost::dynamic_bitset<uint32_t> passRaw;
boost::dynamic_bitset<uint32_t> prescaled;
- boost::dynamic_bitset<uint32_t> rerun;
- ATH_CHECK(getBits(passRaw, prescaled, rerun, ctx));
-
- resultToFill.setHltPassRawBits(passRaw);
- resultToFill.setHltPrescaledBits(prescaled);
- resultToFill.setHltRerunBits(rerun);
+ ATH_CHECK(getBits(passRaw, prescaled, ctx));
+ resultToFill.setHltBits(passRaw, prescaled);
}
if ( msgLvl( MSG::DEBUG ) ) {
@@ -162,13 +155,9 @@ StatusCode TriggerBitsMakerTool::fill( HLT::HLTResultMT& resultToFill, const Eve
ATH_MSG_VERBOSE("HLT result now has " << bitsTemp.size() << " words with HLT prescale bits:");
for (const auto& w : bitsTemp) ATH_MSG_VERBOSE("0x" << MSG::hex << w << MSG::dec);
//
- const boost::dynamic_bitset<uint32_t> rerunBits = resultToFill.getHltRerunBits();
- boost::to_block_range(rerunBits, bitsTemp.begin());
- ATH_MSG_VERBOSE("HLT result now has " << bitsTemp.size() << " words with HLT rerun bits:");
- for (const auto& w : bitsTemp) ATH_MSG_VERBOSE("0x" << MSG::hex << w << MSG::dec);
- //
- ATH_MSG_DEBUG("HLT result now has " << resultToFill.getHltBitsAsWords().size() << " words with the final trigger bits:");
- for (const auto& w : resultToFill.getHltBitsAsWords()) ATH_MSG_DEBUG("0x" << MSG::hex << w << MSG::dec);
+ const std::vector<uint32_t>& words = resultToFill.getHltBitsAsWords();
+ ATH_MSG_DEBUG("HLT result now has " << words.size() << " words with the final trigger bits:");
+ for (const uint32_t w : words) ATH_MSG_DEBUG("0x" << MSG::hex << w << MSG::dec);
}
return StatusCode::SUCCESS;
diff --git a/Trigger/TrigTools/TrigByteStreamTools/bin/trigbs_dumpHLTContentInBS_run3.py b/Trigger/TrigTools/TrigByteStreamTools/bin/trigbs_dumpHLTContentInBS_run3.py
index fcba9a8b676c..84fe112f1b4a 100755
--- a/Trigger/TrigTools/TrigByteStreamTools/bin/trigbs_dumpHLTContentInBS_run3.py
+++ b/Trigger/TrigTools/TrigByteStreamTools/bin/trigbs_dumpHLTContentInBS_run3.py
@@ -30,9 +30,6 @@ def get_parser():
parser.add_argument('--l1',
action='store_true', default=False,
help='L1 trigger bits (from event header)')
- parser.add_argument('--l2',
- action='store_true', default=False,
- help='L2 trigger bits (from event header)')
parser.add_argument('--ef', '--hlt',
action='store_true', default=False,
help='EF/HLT trigger bits (from event header)')
@@ -54,11 +51,17 @@ def get_parser():
return parser
-def decodeTriggerBits(words, base=32):
- bit_indices = []
- for iw in range(len(words)):
- bit_indices.extend([base*iw+i for i in range(base) if words[iw] & (1 << i)])
- return bit_indices
+def decodeTriggerBits(words, num_sets, base=32):
+ assert len(words) % num_sets == 0
+ n_words_per_set = len(words) // num_sets
+ result = []
+ for iset in range(num_sets):
+ words_in_set = words[iset*n_words_per_set:(iset+1)*n_words_per_set]
+ bit_indices = []
+ for iw in range(len(words_in_set)):
+ bit_indices.extend([base*iw+i for i in range(base) if words_in_set[iw] & (1 << i)])
+ result.append(bit_indices)
+ return result
def header_info(event):
@@ -78,21 +81,25 @@ def lvl1_bits(event):
'''Return a string with information about LVL1 bits (IDs of items passed at TBP, TAP, TAV)'''
info = event.lvl1_trigger_info()
- nwords = len(info)//3 # TBP, TAP, TAV
- lvl1_bits = [decodeTriggerBits(info[i*nwords:(i+1)*nwords]) for i in range(3)]
+ lvl1_bits = decodeTriggerBits(info, 3) # TBP, TAP, TAV
info_str = 'L1 CTP IDs - TBP: {:s}\n'.format(str(lvl1_bits[0]))
info_str += 'L1 CTP IDs - TAP: {:s}\n'.format(str(lvl1_bits[1]))
info_str += 'L1 CTP IDs - TAV: {:s}'.format(str(lvl1_bits[2]))
return info_str
-def hlt_bits(event, l2=False):
- '''Return a string with information about passed chain IDs at L2/EF/HLT'''
+def hlt_bits(event, version=(1,1)):
+ '''Return a string with information about passed chain IDs at HLT'''
+
+ # Version 1.0 has {passed, prescaled, rerun}, 1.1 and later only {passed, prescaled}
+ num_sets = 3 if version[0] < 1 or version==(1,0) else 2
- info = event.lvl2_trigger_info() if l2 else event.event_filter_info()
- hlt_bits = decodeTriggerBits(info)
- info_str = 'L2' if l2 else 'EF'
- info_str += ' passed chain IDs: {:s}'.format(str(hlt_bits))
+ info = event.event_filter_info()
+ hlt_bits = decodeTriggerBits(info, num_sets)
+ info_str = 'HLT passed chain IDs: {:s}'.format(str(hlt_bits[0]))
+ info_str += '\nHLT prescaled chain IDs: {:s}'.format(str(hlt_bits[1]))
+ if num_sets==3:
+ info_str += '\nHLT rerun chain IDs: {:s}'.format(str(hlt_bits[2]))
return info_str
@@ -111,6 +118,20 @@ def stream_tags(event):
return info_str
+def hlt_rod_minor_version(rob):
+ version = rob.rod_version()
+ minor_version = version.minor_version()
+ minor_version_M = (minor_version & 0xff00) >> 8
+ minor_version_L = minor_version & 0xff
+ return (minor_version_M, minor_version_L)
+
+
+def hlt_rod_minor_version_from_event(event):
+ for rob in event.children():
+ if rob.source_id().subdetector_id() == eformat.helper.SubDetector.TDAQ_HLT:
+ return hlt_rod_minor_version(rob)
+
+
def hlt_result(event, print_sizes=False, conf_keys=False):
num_hlt_robs = 0
info_str = ""
@@ -118,12 +139,16 @@ def hlt_result(event, print_sizes=False, conf_keys=False):
if rob.source_id().subdetector_id() != eformat.helper.SubDetector.TDAQ_HLT:
continue
num_hlt_robs += 1
- info_str += '\n-- {:s} SourceID: {:s}, Size: {:d} bytes'.format(
+ version = hlt_rod_minor_version(rob)
+ info_str += '\n-- {:s} SourceID: {:s}, Version: {:s}, Size: {:d} bytes'.format(
rob.__class__.__name__,
rob.source_id().human(),
+ f'{version[0]:d}.{version[1]:d}',
rob.fragment_size_word()*4
)
if print_sizes or conf_keys:
+ if version[0] < 1:
+ raise RuntimeError('Cannot decode data from before Run 3, HLT ROD minor version needs to be >= 1.0')
raw_data = tuple(rob.rod_data())
skip_payload = not conf_keys
collections = hltResultMT.get_collections(raw_data, skip_payload=skip_payload)
@@ -165,6 +190,9 @@ def size_summary(events):
for rob in event.children():
if rob.source_id().subdetector_id() != eformat.helper.SubDetector.TDAQ_HLT:
continue
+ version = hlt_rod_minor_version(rob)
+ if version[0] < 1:
+ raise RuntimeError('Cannot decode data from before Run 3, HLT ROD minor version needs to be >= 1.0')
module = rob.source_id().module_id()
if module not in data.keys():
data[module] = {'total': 0}
@@ -203,6 +231,7 @@ def dump_info(bsfile, args):
max_events = min(args.events, len(input)) if args.events else len(input)
event_count = 0
events = []
+ version = None
# Loop over events
for event in input:
@@ -213,6 +242,9 @@ def dump_info(bsfile, args):
break
events.append(event)
+ if version is None:
+ version = hlt_rod_minor_version_from_event(event)
+
# Print header info
print('{sep:s} Event: {:{width}d}, {:s} {sep:s}'.format(
event_count, header_info(event),
@@ -221,10 +253,8 @@ def dump_info(bsfile, args):
# Print L1/L2/HLT bits
if args.l1:
print(lvl1_bits(event))
- if args.l2:
- print(hlt_bits(event, l2=True))
if args.ef:
- print(hlt_bits(event))
+ print(hlt_bits(event, version))
# Print Stream Tags
if args.stag:
diff --git a/Trigger/TrigTools/TrigByteStreamTools/share/dumpHLTContentInBS_run3.ref b/Trigger/TrigTools/TrigByteStreamTools/share/dumpHLTContentInBS_run3.ref
index 65c8c151a2b3..d189057dd936 100644
--- a/Trigger/TrigTools/TrigByteStreamTools/share/dumpHLTContentInBS_run3.ref
+++ b/Trigger/TrigTools/TrigByteStreamTools/share/dumpHLTContentInBS_run3.ref
@@ -3,54 +3,64 @@ Py:dumpHLTContentInBS INFO Opening /cvmfs/atlas-nightlies.cern.ch/repo/data/d
L1 CTP IDs - TBP: [0, 1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 23, 29, 30, 45, 47, 49, 50, 51, 56, 68, 82, 84, 86, 87, 91, 92, 93, 94, 138, 139, 143, 152, 154, 155, 157, 158, 159, 160, 200, 203, 205, 207, 250, 279, 280, 281, 286, 288, 293, 294, 295, 322, 344, 349, 380, 384, 390, 392, 402, 417, 423, 424, 501, 506]
L1 CTP IDs - TAP: [3, 8, 10, 11, 29, 30, 49, 50, 51, 56, 68, 82, 86, 87, 91, 138, 139, 143, 152, 157, 158, 159, 160, 203, 250, 279, 280, 281, 286, 293, 294, 295, 322, 344, 349, 380, 384, 390, 392, 402, 417, 423, 424, 501, 506]
L1 CTP IDs - TAV: [11, 295, 392, 402]
-EF passed chain IDs: [1]
+HLT passed chain IDs: [1]
+HLT prescaled chain IDs: []
+HLT rerun chain IDs: []
Stream Tags:
-- physics_Main - Full Event Building
Found 1 HLT ROBs
--- ROBFragment SourceID: TDAQ_HLT, module=0 (opt=0), Size: 188840 bytes
+-- ROBFragment SourceID: TDAQ_HLT, module=0 (opt=0), Version: 1.0, Size: 188840 bytes
---- xAOD::TrigConfKeys_v1#TrigConfKeysOnline SMK: 40, L1PSK: 0, HLTPSK: 146
==================== Event: 373, RunNumber: 386043, LB: 7, Global_ID: 1862814, LVL1_ID: 1694795736, BC_ID: 2255, TT: x84 ====================
L1 CTP IDs - TBP: [0, 1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 23, 24, 26, 27, 29, 30, 45, 47, 49, 50, 51, 52, 53, 54, 55, 56, 58, 59, 60, 61, 62, 68, 69, 70, 74, 76, 78, 82, 83, 84, 85, 86, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 126, 136, 137, 138, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 154, 155, 157, 158, 159, 160, 172, 175, 176, 177, 200, 203, 205, 207, 250, 253, 254, 260, 261, 266, 267, 268, 269, 275, 279, 280, 281, 286, 288, 290, 291, 292, 295, 333, 334, 337, 344, 345, 346, 347, 348, 349, 350, 353, 356, 357, 378, 380, 384, 386, 387, 390, 392, 398, 402, 409, 417, 423, 424, 429, 479, 481, 486, 501, 502, 503, 506, 507, 508]
L1 CTP IDs - TAP: [3, 8, 10, 11, 29, 30, 49, 50, 51, 52, 55, 56, 59, 61, 62, 68, 69, 74, 76, 78, 82, 83, 86, 91, 100, 101, 126, 136, 138, 141, 143, 147, 148, 149, 150, 151, 152, 157, 158, 159, 160, 172, 175, 176, 177, 203, 250, 253, 254, 260, 261, 266, 267, 268, 269, 279, 280, 281, 286, 290, 291, 292, 337, 344, 346, 349, 350, 353, 356, 378, 380, 384, 386, 390, 392, 398, 402, 409, 417, 423, 424, 429, 479, 481, 486, 501, 502, 503, 506, 507, 508]
L1 CTP IDs - TAV: [11, 52, 61, 69, 74, 76, 78, 100, 101, 141, 147, 148, 149, 150, 151, 172, 175, 176, 346, 350, 356, 392, 398, 402, 429]
-EF passed chain IDs: [1, 51, 96, 103, 104, 105, 106, 107]
+HLT passed chain IDs: [1, 51, 96, 103, 104, 105, 106, 107]
+HLT prescaled chain IDs: []
+HLT rerun chain IDs: []
Stream Tags:
-- physics_Main - Full Event Building
Found 1 HLT ROBs
--- ROBFragment SourceID: TDAQ_HLT, module=0 (opt=0), Size: 387944 bytes
+-- ROBFragment SourceID: TDAQ_HLT, module=0 (opt=0), Version: 1.0, Size: 387944 bytes
---- xAOD::TrigConfKeys_v1#TrigConfKeysOnline SMK: 40, L1PSK: 0, HLTPSK: 146
==================== Event: 374, RunNumber: 386043, LB: 7, Global_ID: 1881003, LVL1_ID: 1845920778, BC_ID: 1822, TT: x84 ====================
L1 CTP IDs - TBP: [0, 1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 23, 24, 29, 30, 45, 47, 49, 50, 51, 53, 54, 56, 58, 59, 60, 68, 82, 84, 86, 91, 92, 93, 94, 95, 96, 97, 103, 109, 125, 129, 137, 138, 143, 152, 154, 157, 158, 159, 160, 200, 203, 205, 207, 262, 263, 264, 279, 280, 281, 286, 288, 290, 291, 295, 329, 333, 345, 347, 349, 380, 385, 387, 390, 392, 397, 402, 417, 423, 424, 501, 506, 507]
L1 CTP IDs - TAP: [3, 8, 10, 11, 29, 30, 49, 50, 51, 56, 59, 68, 82, 86, 91, 125, 129, 138, 143, 152, 157, 158, 159, 160, 203, 262, 279, 280, 281, 286, 290, 291, 349, 380, 385, 390, 392, 402, 417, 423, 424, 501, 506, 507]
L1 CTP IDs - TAV: [11, 385, 392, 402]
-EF passed chain IDs: [1, 61]
+HLT passed chain IDs: [1, 61]
+HLT prescaled chain IDs: []
+HLT rerun chain IDs: []
Stream Tags:
-- calibration_CostMonitoring - Partial Event Building, robs=[0x7c0001], dets=[]
-- physics_Main - Full Event Building
Found 2 HLT ROBs
--- ROBFragment SourceID: TDAQ_HLT, module=0 (opt=0), Size: 186968 bytes
+-- ROBFragment SourceID: TDAQ_HLT, module=0 (opt=0), Version: 1.0, Size: 186968 bytes
---- xAOD::TrigConfKeys_v1#TrigConfKeysOnline SMK: 40, L1PSK: 0, HLTPSK: 146
--- ROBFragment SourceID: TDAQ_HLT, module=1 (opt=0), Size: 111696 bytes
+-- ROBFragment SourceID: TDAQ_HLT, module=1 (opt=0), Version: 1.0, Size: 111696 bytes
---- TrigConfKeys unavailable in this ROB
==================== Event: 375, RunNumber: 386043, LB: 7, Global_ID: 1857479, LVL1_ID: 1845617563, BC_ID: 947, TT: x81 ====================
L1 CTP IDs - TBP: [157, 200, 203, 205, 207, 223, 279, 280, 281, 349, 390, 417]
L1 CTP IDs - TAP: [157, 200, 203, 207, 279, 280, 281, 349, 390, 417]
L1 CTP IDs - TAV: [200, 207]
-EF passed chain IDs: [64, 66, 122]
+HLT passed chain IDs: [64, 66, 122]
+HLT prescaled chain IDs: []
+HLT rerun chain IDs: []
Stream Tags:
-- physics_Main - Full Event Building
Found 1 HLT ROBs
--- ROBFragment SourceID: TDAQ_HLT, module=0 (opt=0), Size: 357364 bytes
+-- ROBFragment SourceID: TDAQ_HLT, module=0 (opt=0), Version: 1.0, Size: 357364 bytes
---- xAOD::TrigConfKeys_v1#TrigConfKeysOnline SMK: 40, L1PSK: 0, HLTPSK: 146
==================== Event: 376, RunNumber: 386043, LB: 7, Global_ID: 1885147, LVL1_ID: 1812179054, BC_ID: 1890, TT: x84 ====================
L1 CTP IDs - TBP: [0, 1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 23, 29, 30, 45, 47, 48, 49, 50, 51, 53, 54, 56, 68, 82, 84, 86, 87, 91, 92, 93, 94, 95, 96, 109, 138, 143, 152, 154, 155, 157, 158, 159, 160, 200, 203, 205, 207, 279, 280, 281, 286, 295, 344, 349, 351, 380, 384, 390, 392, 402, 417, 423, 424, 501, 506, 507]
L1 CTP IDs - TAP: [3, 8, 10, 11, 29, 30, 49, 50, 51, 56, 68, 82, 86, 87, 91, 138, 143, 152, 157, 158, 159, 160, 203, 279, 280, 281, 286, 344, 349, 380, 384, 390, 392, 402, 417, 423, 424, 501, 506, 507]
L1 CTP IDs - TAV: [11, 392, 402]
-EF passed chain IDs: [1]
+HLT passed chain IDs: [1]
+HLT prescaled chain IDs: []
+HLT rerun chain IDs: []
Stream Tags:
-- physics_Main - Full Event Building
Found 1 HLT ROBs
--- ROBFragment SourceID: TDAQ_HLT, module=0 (opt=0), Size: 185648 bytes
+-- ROBFragment SourceID: TDAQ_HLT, module=0 (opt=0), Version: 1.0, Size: 185648 bytes
---- xAOD::TrigConfKeys_v1#TrigConfKeysOnline SMK: 40, L1PSK: 0, HLTPSK: 146
====================
Size summary:
--
GitLab
From 0066e333830769342bf8f9f306ac12f8b004713e Mon Sep 17 00:00:00 2001
From: Stefano Rosati <stefano.rosati@cern.ch>
Date: Mon, 16 Aug 2021 14:35:54 +0200
Subject: [PATCH 058/272] remove region selector LUT dependency
---
.../PadTriggerLogicOfflineTool.h | 13 +--
.../src/PadTriggerLogicOfflineTool.cxx | 91 ++++++++++++++++---
2 files changed, 82 insertions(+), 22 deletions(-)
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTriggerLogicOfflineTool.h b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTriggerLogicOfflineTool.h
index 86db1cba707d..a2dbad83f043 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTriggerLogicOfflineTool.h
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTriggerLogicOfflineTool.h
@@ -13,8 +13,6 @@
#include "TrigT1NSWSimTools/PadTriggerValidationTree.h"
#include "TrigT1NSWSimTools/L1TdrStgcTriggerLogic.h"
#include "TrigT1NSWSimTools/TriggerTypes.h"
-#include "MuonIdHelpers/IMuonIdHelperSvc.h"
-#include "IRegionSelector/IRegSelLUTCondData.h"
//forward declarations
class IIncidentSvc;
@@ -76,12 +74,11 @@ namespace NSWL1 {
PadTrigger convert(const SectorTriggerCandidate &t);
private:
- ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
/// get the output tree from the athena histogram service
- const std::vector<float> m_etaBandsLargeSector;
- const std::vector<float> m_etaBandsSmallSector;
-
-
+ const std::vector<float> m_etaBandsLargeSector;
+ const std::vector<float> m_etaBandsSmallSector;
+
+ std::map<IdentifierHash, std::pair<double,double> > m_phiTable;
StatusCode get_tree_from_histsvc(TTree*&);
@@ -99,8 +96,8 @@ namespace NSWL1 {
PadTriggerValidationTree m_validation_tree;
void fillGeometricInformation(const std::shared_ptr<PadOfflineData>&);
+ void fillPhiTable();
L1TdrStgcTriggerLogic m_tdrLogic;
- SG::ReadCondHandleKey<IRegSelLUTCondData> m_regSelTableKey{this, "RegSelLUT", "RegSelLUTCondData_STGC", "sTGC Region Selector lookup table"};
};
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/src/PadTriggerLogicOfflineTool.cxx b/Trigger/TrigT1/TrigT1NSWSimTools/src/PadTriggerLogicOfflineTool.cxx
index cffb9d16e998..fa745584932d 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/src/PadTriggerLogicOfflineTool.cxx
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/src/PadTriggerLogicOfflineTool.cxx
@@ -28,7 +28,6 @@
#include "AthenaKernel/IAtRndmGenSvc.h"
#include "CLHEP/Random/RandFlat.h"
#include "CLHEP/Random/RandGauss.h"
-#include "RegSelLUT/RegSelSiLUT.h"
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
@@ -81,8 +80,7 @@ StatusCode PadTriggerLogicOfflineTool::initialize() {
ATH_CHECK(m_incidentSvc.retrieve());
m_incidentSvc->addListener(this,IncidentType::BeginEvent);
ATH_CHECK(detStore()->retrieve(m_detManager));
- ATH_CHECK(m_idHelperSvc.retrieve());
- ATH_CHECK(m_regSelTableKey.initialize());
+ fillPhiTable();
return StatusCode::SUCCESS;
}
//------------------------------------------------------------------------------
@@ -459,24 +457,33 @@ NSWL1::PadTrigger PadTriggerLogicOfflineTool::convert(const SectorTriggerCandida
//Assignment of Phi Id using 6 bits slicing
Identifier padIdentifier(pt.m_pads.at(0)->id() );
IdentifierHash moduleHashId;
- const IdContext ModuleContext = m_idHelperSvc->stgcIdHelper().detectorElement_context();
+ const IdContext ModuleContext = m_detManager->stgcIdHelper()->module_context();
//get the module Identifier using the pad's
- m_idHelperSvc->stgcIdHelper().get_hash( padIdentifier, moduleHashId, &ModuleContext );
- SG::ReadCondHandle<IRegSelLUTCondData> rh_stgcLUT(m_regSelTableKey);
- auto regSelector = dynamic_cast<const RegSelSiLUT*>(rh_stgcLUT->payload());
- const RegSelModule* thismodule=regSelector->Module(moduleHashId);
-
- float stationPhiMin=thismodule->phiMin();
- float stationPhiMax=thismodule->phiMax();
+ m_detManager->stgcIdHelper()->get_hash( padIdentifier, moduleHashId, &ModuleContext );
+ float stationPhiMin=0.0;
+ float stationPhiMax=0.0;
+ std::map<IdentifierHash,std::pair<double,double>>::const_iterator itPhi = m_phiTable.find(moduleHashId);
+ if (itPhi != m_phiTable.end()) {
+ stationPhiMin=(*itPhi).second.first;
+ stationPhiMax=(*itPhi).second.second;
+ }
+ else {
+ ATH_MSG_WARNING("Could not find the hash Id: " << moduleHashId << " in the map");
+ }
float trgPhiCntr=pt.m_phi;
int nPhiSlices=1<<m_phiIdBits;//6 bits for Phi Id; i.e interval of [0,....63]
- if( trgPhiCntr<stationPhiMin || trgPhiCntr> stationPhiMax ){
- ATH_MSG_FATAL("Pad Trigger Phi is outside of the station!");
- //better to change the return type to return a statuscode ?
+ // special treatment for the last phi region
+ if ( stationPhiMax > M_PI && trgPhiCntr<0 ) {
+ trgPhiCntr=2*M_PI-fabs(trgPhiCntr);
}
+
+ if ( trgPhiCntr<stationPhiMin || trgPhiCntr>stationPhiMax ) {
+ ATH_MSG_WARNING("Trigger phi: " << trgPhiCntr << " outside the station. Min, max: " << stationPhiMin << " " << stationPhiMax );
+ }
+
float step=(stationPhiMax-stationPhiMin)/nPhiSlices;
for( int i=0;i<nPhiSlices;i++){
if(stationPhiMin+i*step>=trgPhiCntr){
@@ -488,6 +495,62 @@ NSWL1::PadTrigger PadTriggerLogicOfflineTool::convert(const SectorTriggerCandida
return pt;
}
+ // fill the map with the phi ranges
+ void PadTriggerLogicOfflineTool::fillPhiTable() {
+
+ const sTgcIdHelper* helper = m_detManager->stgcIdHelper();
+
+ std::vector<Identifier>::const_iterator idfirst = helper->module_begin();
+ std::vector<Identifier>::const_iterator idlast = helper->module_end();
+
+ const IdContext ModuleContext = helper->module_context();
+
+ for ( std::vector<Identifier>::const_iterator i=idfirst ; i!=idlast ; i++ ) {
+
+ Identifier Id = *i;
+ IdentifierHash hashId;
+
+ helper->get_hash( Id, hashId, &ModuleContext );
+
+ const MuonGM::sTgcReadoutElement* module = m_detManager->getsTgcReadoutElement(Id);
+ if (!module) continue;
+ int multilayer = helper->multilayer(Id);
+
+ char side = module->getStationEta() < 0 ? 'C' : 'A';
+ char sector_l = module->getStationName().substr(2,1)=="L" ? 'L' : 'S';
+
+ sTGCDetectorHelper aHelper;
+ sTGCDetectorDescription* md = aHelper.Get_sTGCDetector( sector_l, std::abs(module->getStationEta()), module->getStationPhi(), multilayer, side );
+
+ Amg::Vector3D pos = module->center();
+ double swidth = md->sWidth();
+ double lwidth = md->lWidth();
+ double ycutout = md->yCutout();
+ double length = md->Length();
+ double moduleR = std::sqrt( pos.mag()*pos.mag() - pos.z()*pos.z());
+ double dphi1 = std::atan( (0.5*lwidth)/(moduleR+0.5*length) );
+ double dphi2 = std::atan( (0.5*swidth)/(moduleR-0.5*length) );
+
+ double dphi = ( dphi1 > dphi2 ? dphi1 : dphi2 );
+ if ( ycutout > 0 ) {
+ double rcutout = moduleR+0.5*length - ycutout;
+ double dphicutout = std::atan( (0.5*lwidth)/rcutout );
+ if ( dphi < dphicutout ) dphi = dphicutout;
+ }
+ double phimin = pos.phi()-dphi;
+ double phimax = pos.phi()+dphi;
+
+ if ( phimin > M_PI ) phimin -= 2*M_PI;
+ if ( phimin < -M_PI ) phimin += 2*M_PI;
+
+ std::pair<double,double> phiRange(phimin,phimax);
+ m_phiTable[hashId]=phiRange;
+
+ }
+
+ }
+
+
} // NSWL1
--
GitLab
From e3d68d9cc5cfd95200999c2034e7f6d951c50423 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Fri, 13 Aug 2021 16:17:34 +0200
Subject: [PATCH 059/272] TopCPTools: remove commented code mentioning
BunchCrossingTool
---
.../TopPhys/xAOD/TopCPTools/Root/TopEgammaCPTools.cxx | 3 +--
.../TopPhys/xAOD/TopCPTools/TopCPTools/TopEgammaCPTools.h | 4 +---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopEgammaCPTools.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopEgammaCPTools.cxx
index 9efa6d2c82b4..b2ff9531f92b 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopEgammaCPTools.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopEgammaCPTools.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "TopCPTools/TopEgammaCPTools.h"
@@ -75,7 +75,6 @@ namespace top {
// declareProperty("FwdElectronSelector", m_fwdElectronSelector);
// declareProperty("FwdElectronSelectorLoose", m_fwdElectronSelectorLoose);
// declareProperty("FwdElectronEffIDLoose", m_fwdElectronEffSFIDLoose);
-// declareProperty("WebBunchCrossingTool", m_webBunchCrossingTool);
}
StatusCode EgammaCPTools::initialize() {
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/TopCPTools/TopEgammaCPTools.h b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/TopCPTools/TopEgammaCPTools.h
index a38e8c8a654d..e0a49acd51b3 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/TopCPTools/TopEgammaCPTools.h
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/TopCPTools/TopEgammaCPTools.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TOPCPTOOLS_TOPEGAMMACPTOOLS_H_
@@ -93,8 +93,6 @@ namespace top {
// ToolHandle<IAsgElectronEfficiencyCorrectionTool> m_fwdElectronEffSFID;
// ToolHandle<IAsgElectronEfficiencyCorrectionTool> m_fwdElectronEffSFIDLoose;
-// ToolHandle<Trig::WebBunchCrossingTool> m_webBunchCrossingTool;
-
StatusCode setupSelectors();
StatusCode setupCalibration();
StatusCode setupScaleFactors();
--
GitLab
From d50b06a61c5fe1a6ab352c52ca3b1f8d9a4af4ec Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Fri, 13 Aug 2021 16:30:27 +0200
Subject: [PATCH 060/272] TopEgammaCPTools: remove unused TrigBunchCrossingTool
include
---
.../TopPhys/xAOD/TopCPTools/TopCPTools/TopEgammaCPTools.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/TopCPTools/TopEgammaCPTools.h b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/TopCPTools/TopEgammaCPTools.h
index e0a49acd51b3..9f0146e73b54 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/TopCPTools/TopEgammaCPTools.h
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/TopCPTools/TopEgammaCPTools.h
@@ -22,7 +22,6 @@
#include "EgammaAnalysisInterfaces/IAsgPhotonEfficiencyCorrectionTool.h"
#include "EgammaAnalysisInterfaces/IAsgPhotonIsEMSelector.h"
//#include "ElectronPhotonSelectorTools/AsgForwardElectronLikelihoodTool.h"
-//#include "TrigBunchCrossingTool/WebBunchCrossingTool.h"
#include "TopConfiguration/Tokenize.h"
--
GitLab
From 192dd15a39a488e1ed1314625fbc3f218a5ff6c4 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Fri, 13 Aug 2021 16:39:06 +0200
Subject: [PATCH 061/272] TrigCost: rename UseBunchCrossingTool property
The code has already been migrated to use the `BunchCrossingCondData`
(ATR-23346). Rename the property that steers its usage to reflect that.
Also migrate some forgotten python fragments.
---
.../DerivationFrameworkTrigger/share/TRIG1.py | 11 ++++++-----
.../EnhancedBiasWeighter/EnhancedBiasWeighter.h | 6 +++---
.../Root/EnhancedBiasWeighter.cxx | 6 +++---
.../RatesAnalysis/RatesAnalysisAlg.h | 4 ++--
.../RatesAnalysis/share/RatesAnalysisFullMenu.py | 16 +++++++---------
.../RatesAnalysis/src/RatesAnalysisAlg.cxx | 10 +++++-----
.../share/RunTrigCostAnalysis.py | 2 +-
7 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTrigger/share/TRIG1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTrigger/share/TRIG1.py
index e27a204bb7ec..44abc264d68b 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTrigger/share/TRIG1.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTrigger/share/TRIG1.py
@@ -18,10 +18,11 @@ run_number = af.run_number[0]
from AthenaCommon.GlobalFlags import globalflags
isMC = 'IS_SIMULATION' in af.fileinfos['evt_type']
#globalflags.DataSource = 'data'
-globalflags.DatabaseInstance = 'CONDBR2'
-from TrigBunchCrossingTool.BunchCrossingTool import BunchCrossingTool
-if isMC: ToolSvc += BunchCrossingTool( "MC" )
-else: ToolSvc += BunchCrossingTool( "LHC" )
+globalflags.DatabaseInstance = 'CONDBR2'
+
+from LumiBlockComps.BunchCrossingCondAlgDefault import BunchCrossingCondAlgDefault
+BunchCrossingCondAlgDefault()
+
#====================================================================
# SKIMMING TOOLS
#====================================================================
@@ -37,7 +38,7 @@ else: ToolSvc += BunchCrossingTool( "LHC" )
from EnhancedBiasWeighter.EnhancedBiasWeighterConf import EnhancedBiasWeighter
TRIG1AugmentationTool = EnhancedBiasWeighter(name = "TRIG1AugmentationTool")
TRIG1AugmentationTool.RunNumber = run_number
-TRIG1AugmentationTool.UseBunchCrossingTool = True
+TRIG1AugmentationTool.UseBunchCrossingData = True
# These are needed for MC rates
#TRIG1AugmentationTool.MCCrossSection = xxx
#TRIG1AugmentationTool.MCFilterEfficiency = xxx
diff --git a/Trigger/TrigCost/EnhancedBiasWeighter/EnhancedBiasWeighter/EnhancedBiasWeighter.h b/Trigger/TrigCost/EnhancedBiasWeighter/EnhancedBiasWeighter/EnhancedBiasWeighter.h
index 4afd706362a2..4cfbd57c3363 100644
--- a/Trigger/TrigCost/EnhancedBiasWeighter/EnhancedBiasWeighter/EnhancedBiasWeighter.h
+++ b/Trigger/TrigCost/EnhancedBiasWeighter/EnhancedBiasWeighter/EnhancedBiasWeighter.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ENHANCEDBIASWEIGHTER_ENHANCEDBIASWEIGHTER_H
@@ -122,7 +122,7 @@ class EnhancedBiasWeighter: public asg::AsgTool, public virtual IEnhancedBiasWei
/**
* @return How far into the current train this BCID is.
- * Retrieved from the database using the BunchCrossingTool or fetched from TRIG1 dAOD
+ * Retrieved from the database using the BunchCrossingCondData or fetched from TRIG1 dAOD
*/
virtual StatusCode getDistanceIntoTrain(const xAOD::EventInfo* eventInfo, uint32_t& distance) const override;
@@ -184,7 +184,7 @@ class EnhancedBiasWeighter: public asg::AsgTool, public virtual IEnhancedBiasWei
Gaudi::Property<bool> m_errorOnMissingEBWeights{this, "ErrorOnMissingEBWeights", false, "If true, Throws error if EB weights are missing."};
Gaudi::Property<bool> m_calculateWeightingData{this, "CalculateWeightingData", true, "If true, read from COOL, CONDBR2 and XMLs. If false, read directly from decorated TRIG1 dAOD."};
Gaudi::Property<bool> m_enforceEBGRL{this, "EnforceEBGRL", true, "Each Enhanced Bias run has a 'good run list' style veto on some LB. If this flag is true, events in these LB get weight 0"};
- Gaudi::Property<bool> m_useBunchCrossingTool{this, "UseBunchCrossingTool", true, "BunchCrossing tool requires CONDBR2 access. Can be disabled here if this is a problem."};
+ Gaudi::Property<bool> m_useBunchCrossingData{this, "UseBunchCrossingData", true, "BunchCrossing data requires CONDBR2 access. Can be disabled here if this is a problem."};
Gaudi::Property<bool> m_isMC{this, "IsMC", false, "MC mode? If so we need a cross section and filter efficiency"};
Gaudi::Property<double> m_mcCrossSection{this, "MCCrossSection", 0.0, "If running over MC. The process cross section in nb (AMI gives thins in nb)"};
Gaudi::Property<double> m_mcFilterEfficiency{this, "MCFilterEfficiency", 1.0, "If running over MC. The process filter efficiency (0.0-1.0)"};
diff --git a/Trigger/TrigCost/EnhancedBiasWeighter/Root/EnhancedBiasWeighter.cxx b/Trigger/TrigCost/EnhancedBiasWeighter/Root/EnhancedBiasWeighter.cxx
index c6a081c27214..a7b25ef36f08 100644
--- a/Trigger/TrigCost/EnhancedBiasWeighter/Root/EnhancedBiasWeighter.cxx
+++ b/Trigger/TrigCost/EnhancedBiasWeighter/Root/EnhancedBiasWeighter.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// EnhancedBiasWeighter includes
@@ -64,7 +64,7 @@ StatusCode EnhancedBiasWeighter::initialize()
} // end isData
- if (m_useBunchCrossingTool) ATH_CHECK( m_bunchCrossingKey.initialize() );
+ if (m_useBunchCrossingData) ATH_CHECK( m_bunchCrossingKey.initialize() );
} else {
ATH_MSG_INFO ("calculateWeightingData is FALSE. This job must be running over an EnhancedBias TRIG1 dAOD which has already been decorated with weighting data.");
@@ -782,7 +782,7 @@ StatusCode EnhancedBiasWeighter::getDistanceIntoTrain(const xAOD::EventInfo* eve
{
if (m_calculateWeightingData) {
- if (!m_useBunchCrossingTool) return StatusCode::SUCCESS;
+ if (!m_useBunchCrossingData) return StatusCode::SUCCESS;
const EventContext& context = Gaudi::Hive::currentContext();
SG::ReadCondHandle<BunchCrossingCondData> bunchCrossingTool (m_bunchCrossingKey, context);
diff --git a/Trigger/TrigCost/RatesAnalysis/RatesAnalysis/RatesAnalysisAlg.h b/Trigger/TrigCost/RatesAnalysis/RatesAnalysis/RatesAnalysisAlg.h
index 81125be6816d..1f893ddb8100 100644
--- a/Trigger/TrigCost/RatesAnalysis/RatesAnalysis/RatesAnalysisAlg.h
+++ b/Trigger/TrigCost/RatesAnalysis/RatesAnalysis/RatesAnalysisAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef RATESANALYSIS_RATESANALYSISALG_H
@@ -268,7 +268,7 @@ class RatesAnalysisAlg: public ::AthAnalysisAlgorithm {
Gaudi::Property<bool> m_doGlobalGroups{this, "DoGlobalGroups", false, "Calculate total rates for each trigger level."};
Gaudi::Property<bool> m_doTriggerGroups{this, "DoTriggerGroups", false, "Calculate total rates for each group of triggers."};
Gaudi::Property<bool> m_doExpressRates{this, "DoExpressRates", false, "Calculate total rates for the express stream."};
- Gaudi::Property<bool> m_useBunchCrossingTool{this, "UseBunchCrossingTool", true, "BunchCrossing tool requires CONDBR2 access. Can be disabled here if this is a problem."};
+ Gaudi::Property<bool> m_useBunchCrossingData{this, "UseBunchCrossingData", true, "BunchCrossing data requires CONDBR2 access. Can be disabled here if this is a problem."};
Gaudi::Property<bool> m_currentEventIsUnbiased; //!< If the current event was triggered online by RDx or not. Random seeded HLT chains must only see these
Gaudi::Property<bool> m_doHistograms{this, "DoHistograms", true, "Switch on histogram output of rate vs. mu and position in train."};
Gaudi::Property<bool> m_enableLumiExtrapolation{this, "EnableLumiExtrapolation", true, "If false then no extrapolation in L, N_bunch or <mu> will be performed.."};
diff --git a/Trigger/TrigCost/RatesAnalysis/share/RatesAnalysisFullMenu.py b/Trigger/TrigCost/RatesAnalysis/share/RatesAnalysisFullMenu.py
index 9487d4482829..97c8124cf10d 100755
--- a/Trigger/TrigCost/RatesAnalysis/share/RatesAnalysisFullMenu.py
+++ b/Trigger/TrigCost/RatesAnalysis/share/RatesAnalysisFullMenu.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
#
if __name__=='__main__':
@@ -51,7 +51,7 @@ if __name__=='__main__':
runNumber = af.fileinfos['run_number'][0]
ConfigFlags.Input.isMC = isMC
- useBunchCrossingTool = (args.doRatesVsPositionInTrain or args.vetoStartOfTrain > 0)
+ useBunchCrossingData = (args.doRatesVsPositionInTrain or args.vetoStartOfTrain > 0)
ConfigFlags.lock()
@@ -95,7 +95,7 @@ if __name__=='__main__':
ebw = CompFactory.EnhancedBiasWeighter('EnhancedBiasRatesTool')
ebw.RunNumber = runNumber
- ebw.UseBunchCrossingTool = useBunchCrossingTool
+ ebw.UseBunchCrossingData = useBunchCrossingData
ebw.IsMC = isMC
# The following three are only needed if isMC == true
ebw.MCCrossSection = xsec
@@ -111,7 +111,7 @@ if __name__=='__main__':
rates.DoExpressRates = args.disableExpressGroup
rates.DoUniqueRates = args.disableUniqueRates
rates.DoHistograms = args.disableHistograms
- rates.UseBunchCrossingTool = useBunchCrossingTool
+ rates.UseBunchCrossingData = useBunchCrossingData
rates.TargetLuminosity = args.targetLuminosity
rates.VetoStartOfTrain = args.vetoStartOfTrain
rates.EnableLumiExtrapolation = args.disableLumiExtrapolation
@@ -153,11 +153,9 @@ if __name__=='__main__':
cfg.addEventAlgo(rates)
# Setup for accessing bunchgroup data from the DB
- if useBunchCrossingTool:
- if isMC:
- cfg.addPublicTool(CompFactory.BunchCrossingTool("MC"))
- else:
- cfg.addPublicTool(CompFactory.BunchCrossingTool("LHC"))
+ if useBunchCrossingData:
+ from LumiBlockComps.BunchCrossingCondAlgConfig import BunchCrossingCondAlgCfg
+ cfg.merge(BunchCrossingCondAlgCfg(ConfigFlags))
eventLoop = CompFactory.AthenaEventLoopMgr()
eventLoop.EventPrintoutInterval = 1000
diff --git a/Trigger/TrigCost/RatesAnalysis/src/RatesAnalysisAlg.cxx b/Trigger/TrigCost/RatesAnalysis/src/RatesAnalysisAlg.cxx
index 326d429c2398..a72fcae49c8a 100644
--- a/Trigger/TrigCost/RatesAnalysis/src/RatesAnalysisAlg.cxx
+++ b/Trigger/TrigCost/RatesAnalysis/src/RatesAnalysisAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// RatesAnalysis includes
@@ -534,7 +534,7 @@ StatusCode RatesAnalysisAlg::populateTriggers() {
}
ATH_CHECK( trigger.second->giveDataHist(histSvc(), std::string("/RATESTREAM/All/" + lvlSubdir + trigger.first + "/data")) );
ATH_CHECK( trigger.second->giveMuHist(histSvc(), std::string("/RATESTREAM/All/" + lvlSubdir + trigger.first + "/rateVsMu")) );
- if (m_useBunchCrossingTool) ATH_CHECK( trigger.second->giveTrainHist(histSvc(), std::string("/RATESTREAM/All/" + lvlSubdir + trigger.first + "/rateVsTrain")) );
+ if (m_useBunchCrossingData) ATH_CHECK( trigger.second->giveTrainHist(histSvc(), std::string("/RATESTREAM/All/" + lvlSubdir + trigger.first + "/rateVsTrain")) );
else trigger.second->clearTrainHist();
}
}
@@ -552,7 +552,7 @@ StatusCode RatesAnalysisAlg::populateTriggers() {
std::replace( groupName.begin(), groupName.end(), ':', '_');
ATH_CHECK( group.second->giveDataHist(histSvc(), std::string("/RATESTREAM/All/Rate_Group_HLT/" + groupName + "/data")) );
ATH_CHECK( group.second->giveMuHist(histSvc(), std::string("/RATESTREAM/All/Rate_Group_HLT/" + groupName + "/rateVsMu")) );
- if (m_useBunchCrossingTool) ATH_CHECK( group.second->giveTrainHist(histSvc(), std::string("/RATESTREAM/All/Rate_Group_HLT/" + groupName + "/rateVsTrain")) );
+ if (m_useBunchCrossingData) ATH_CHECK( group.second->giveTrainHist(histSvc(), std::string("/RATESTREAM/All/Rate_Group_HLT/" + groupName + "/rateVsTrain")) );
else group.second->clearTrainHist();
}
}
@@ -562,7 +562,7 @@ StatusCode RatesAnalysisAlg::populateTriggers() {
if (!group.second->doHistograms()) continue;
ATH_CHECK( group.second->giveDataHist(histSvc(), std::string("/RATESTREAM/All/Rate_Group_HLT/RATE_GLOBAL_" + group.first + "/data")) );
ATH_CHECK( group.second->giveMuHist(histSvc(), std::string("/RATESTREAM/All/Rate_Group_HLT/RATE_GLOBAL_" + group.first + "/rateVsMu")) );
- if (m_useBunchCrossingTool) ATH_CHECK( group.second->giveTrainHist(histSvc(), std::string("/RATESTREAM/All/Rate_Group_HLT/RATE_GLOBAL_" + group.first + "/rateVsTrain")) );
+ if (m_useBunchCrossingData) ATH_CHECK( group.second->giveTrainHist(histSvc(), std::string("/RATESTREAM/All/Rate_Group_HLT/RATE_GLOBAL_" + group.first + "/rateVsTrain")) );
else group.second->clearTrainHist();
}
}
@@ -599,7 +599,7 @@ StatusCode RatesAnalysisAlg::execute() {
m_weightingValues.m_distanceInTrain = distance;
m_weightingValues.m_eventLiveTime = m_enhancedBiasRatesTool->getEBLiveTime(eventInfo);
- if (m_useBunchCrossingTool && m_vetoStartOfTrain > 0 && m_weightingValues.m_distanceInTrain < m_vetoStartOfTrain) return StatusCode::SUCCESS;
+ if (m_useBunchCrossingData && m_vetoStartOfTrain > 0 && m_weightingValues.m_distanceInTrain < m_vetoStartOfTrain) return StatusCode::SUCCESS;
// Bunch factor doesn't change as a fn. of the run. Reminder: m_bunchFactor = m_targetBunches / (double)ebPairedBunches;
m_weightingValues.m_muFactor = m_targetMu / m_weightingValues.m_eventMu;
diff --git a/Trigger/TrigCost/TrigCostAnalysis/share/RunTrigCostAnalysis.py b/Trigger/TrigCost/TrigCostAnalysis/share/RunTrigCostAnalysis.py
index ca977c89ade8..0b0a590d9427 100755
--- a/Trigger/TrigCost/TrigCostAnalysis/share/RunTrigCostAnalysis.py
+++ b/Trigger/TrigCost/TrigCostAnalysis/share/RunTrigCostAnalysis.py
@@ -26,7 +26,7 @@ def trigCostAnalysisCfg(flags, args, isMC=False):
enhancedBiasWeighter = CompFactory.EnhancedBiasWeighter()
enhancedBiasWeighter.RunNumber = runNumbers[0]
- enhancedBiasWeighter.UseBunchCrossingTool = False
+ enhancedBiasWeighter.UseBunchCrossingData = False
enhancedBiasWeighter.IsMC = isMC
if isMC:
MCpayload = readMCpayload(args)
--
GitLab
From f709349757219fecbbfb64d82a76b025fb72bec4 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Fri, 13 Aug 2021 16:44:24 +0200
Subject: [PATCH 062/272] DerivationFrameworkJetEtMiss: fix configuration of
BunchCrossingCondAlg
The C++ has been migrated to use `BunchCrossingCondData`
(ATLJETMET-1335). But the python configuration still had mentions of the
obsolete `TrigBunchCrossingTool` (likely this code is not used,
otherwise it would have been noticed that it's broken).
---
.../python/JetCommon.py | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JetCommon.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JetCommon.py
index 1adce194ba6a..5cd7eace301d 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JetCommon.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JetCommon.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
#********************************************************************
# JetCommon.py
@@ -7,7 +7,6 @@
#********************************************************************
from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkJob
-from AthenaCommon.GlobalFlags import globalflags
from AthenaCommon import CfgMgr
from AthenaCommon import Logging
dfjetlog = Logging.logging.getLogger('JetCommon')
@@ -581,10 +580,6 @@ def addDistanceInTrain(sequence=DerivationFrameworkJob):
dfjetlog.warning( "DistanceInTrainAugmentation: DistanceInTrainAugmentation already scheduled on sequence"+sequence.name )
return
else:
- isMC = False
- if globalflags.DataSource() == 'geant4':
- isMC = True
-
distanceintrainaug = CfgMgr.DerivationFramework__CommonAugmentation("DistanceInTrainAugmentation")
sequence += distanceintrainaug
@@ -595,14 +590,9 @@ def addDistanceInTrain(sequence=DerivationFrameworkJob):
distanceintrainaugtool = getattr(ToolSvc,"DistanceInTrainAugmentationTool")
else:
distanceintrainaugtool = CfgMgr.DerivationFramework__DistanceInTrainAugmentationTool("DistanceInTrainAugmentationTool")
- from TrigBunchCrossingTool.BunchCrossingTool import BunchCrossingTool
- if isMC:
- ToolSvc += BunchCrossingTool( "MC" )
- distanceintrainaugtool.BCTool = "Trig::MCBunchCrossingTool/BunchCrossingTool"
- else:
- ToolSvc += BunchCrossingTool( "LHC" )
- distanceintrainaugtool.BCTool = "Trig::LHCBunchCrossingTool/BunchCrossingTool"
- ToolSvc += distanceintrainaugtool
+ from LumiBlockComps.BunchCrossingCondAlgDefault import BunchCrossingCondAlgDefault
+ BunchCrossingCondAlgDefault()
+
if distanceintrainaugtool not in distanceintrainaug.AugmentationTools:
distanceintrainaug.AugmentationTools.append(distanceintrainaugtool)
--
GitLab
From ab0725199d8b9d82b8a0bc4a58a63f55c8b4eb57 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Fri, 13 Aug 2021 16:49:17 +0200
Subject: [PATCH 063/272] TrigAnalysisExamples: remove obsolete
TrigBunchCrossingTool examples
---
.../TrigAnalysisExamples/CMakeLists.txt | 2 +-
.../share/BunchCrossingExample_jobOptions.py | 63 ---------
.../share/TrigAnalysisExamplesJO.py | 6 -
.../share/TrigAnalysisExamples_AthAnaJO.py | 6 -
.../src/BunchCrossingExample.cxx | 131 ------------------
.../src/BunchCrossingExample.h | 52 -------
.../src/TriggerAnalysisTutorial.cxx | 4 +-
.../src/TriggerAnalysisTutorial.h | 4 +-
.../TrigAnalysisExamples_entries.cxx | 3 -
9 files changed, 3 insertions(+), 268 deletions(-)
delete mode 100644 Trigger/TrigAnalysis/TrigAnalysisExamples/share/BunchCrossingExample_jobOptions.py
delete mode 100644 Trigger/TrigAnalysis/TrigAnalysisExamples/src/BunchCrossingExample.cxx
delete mode 100644 Trigger/TrigAnalysis/TrigAnalysisExamples/src/BunchCrossingExample.h
diff --git a/Trigger/TrigAnalysis/TrigAnalysisExamples/CMakeLists.txt b/Trigger/TrigAnalysis/TrigAnalysisExamples/CMakeLists.txt
index 1237c10164d4..656b7a52bc1a 100644
--- a/Trigger/TrigAnalysis/TrigAnalysisExamples/CMakeLists.txt
+++ b/Trigger/TrigAnalysis/TrigAnalysisExamples/CMakeLists.txt
@@ -12,7 +12,7 @@ find_package( ROOT COMPONENTS Core Tree Hist )
atlas_add_component( TrigAnalysisExamples
src/*.h src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel EventInfo FourMomUtils GaudiKernel StoreGateLib TrigAnalysisInterfaces TrigConfHLTData TrigDecisionToolLib TrigSteeringEvent TrigT1Interfaces TriggerMatchingToolLib xAODBase xAODCaloEvent xAODEgamma xAODEventInfo xAODJet xAODMissingET xAODMuon xAODTau xAODTrigCalo xAODTrigEgamma xAODTrigMissingET xAODTrigger )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel FourMomUtils GaudiKernel StoreGateLib TrigConfHLTData TrigDecisionToolLib TrigSteeringEvent TrigT1Interfaces TriggerMatchingToolLib xAODBase xAODCaloEvent xAODEgamma xAODEventInfo xAODJet xAODMissingET xAODMuon xAODTau xAODTrigCalo xAODTrigEgamma xAODTrigMissingET xAODTrigger )
atlas_add_executable( TrigAnalysisExApp
src/apps/TrigAnalysisExApp.cxx
diff --git a/Trigger/TrigAnalysis/TrigAnalysisExamples/share/BunchCrossingExample_jobOptions.py b/Trigger/TrigAnalysis/TrigAnalysisExamples/share/BunchCrossingExample_jobOptions.py
deleted file mode 100644
index c48976a7bae0..000000000000
--- a/Trigger/TrigAnalysis/TrigAnalysisExamples/share/BunchCrossingExample_jobOptions.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: BunchCrossingExample_jobOptions.py 326080 2010-10-08 13:50:09Z krasznaa $
-#
-# This example shows how to set up a generic job that is able to use the
-# TrigBunchCrossingTool package's tools.
-#
-# author: Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
-#
-# $Revision: 326080 $
-# $Date: 2010-10-08 15:50:09 +0200 (Fri, 08 Oct 2010) $
-
-# Set up the basic job properties:
-InputFiles = [ "AOD.pool.root" ]
-EvtMax = 10
-
-# Set up the needed RecEx flags:
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-athenaCommonFlags.FilesInput.set_Value_and_Lock( InputFiles )
-athenaCommonFlags.EvtMax.set_Value_and_Lock( EvtMax )
-
-# Set up what the RecExCommon job should and shouldn't do:
-from RecExConfig.RecFlags import rec
-rec.AutoConfiguration = [ "everything" ]
-rec.doCBNT.set_Value_and_Lock( False )
-rec.doWriteESD.set_Value_and_Lock( False )
-rec.doWriteAOD.set_Value_and_Lock( False )
-rec.doWriteTAG.set_Value_and_Lock( False )
-rec.doESD.set_Value_and_Lock( False )
-rec.doAOD.set_Value_and_Lock( False )
-rec.doDPD.set_Value_and_Lock( False )
-rec.doHist.set_Value_and_Lock( False )
-rec.doPerfMon.set_Value_and_Lock( False )
-
-# Let RecExCommon set everything up:
-include( "RecExCommon/RecExCommon_topOptions.py" )
-
-#######################################################################
-# #
-# Now set up the actual job... #
-# #
-#######################################################################
-
-# Get ourselves a logger, mainly for fun:
-from AthenaCommon.Logging import logging
-logger = logging.getLogger( "BunchCrossingExample" )
-logger.info( "Setting up the bunch crossing example job" )
-
-# Access the algorithm sequence:
-from AthenaCommon.AlgSequence import AlgSequence
-theJob = AlgSequence()
-
-# Add the example algorithm, configuring the appropriate Trig::IBunchCrossingTool
-# in the process:
-from TrigAnalysisExamples.TrigAnalysisExamplesConf import Trig__BunchCrossingExample
-from TrigBunchCrossingTool.BunchCrossingTool import BunchCrossingTool
-theJob += Trig__BunchCrossingExample( "BunchCrossingExample" )
-theJob.BunchCrossingExample.BCTool = BunchCrossingTool()
-theJob.BunchCrossingExample.OutputLevel = DEBUG
-
-# Do some additional tweaking:
-from AthenaCommon.AppMgr import theApp
-theApp.EvtMax = athenaCommonFlags.EvtMax()
-ServiceMgr.MessageSvc.OutputLevel = INFO
-ServiceMgr.MessageSvc.defaultLimit = 10000000
diff --git a/Trigger/TrigAnalysis/TrigAnalysisExamples/share/TrigAnalysisExamplesJO.py b/Trigger/TrigAnalysis/TrigAnalysisExamples/share/TrigAnalysisExamplesJO.py
index 66daa8edb6e4..ac16a0fc7f17 100644
--- a/Trigger/TrigAnalysis/TrigAnalysisExamples/share/TrigAnalysisExamplesJO.py
+++ b/Trigger/TrigAnalysis/TrigAnalysisExamples/share/TrigAnalysisExamplesJO.py
@@ -77,12 +77,6 @@ ToolSvc += CfgMgr.Trig__MatchingTool("MatchingTool",OutputLevel=DEBUG)
# from TrigEgammaEmulationTool.TrigEgammaEmulationToolConfig import TrigEgammaEmulationToolFactory
# egEmulator = TrigEgammaEmulationToolFactory(elHLTList, name = "TrigEgammaEmulationTool", OutputLevel = INFO)
-# Bunch crossing tool
-
-#from TrigBunchCrossingTool.BunchCrossingTool import BunchCrossingTool
-#if isMC: bcTool = BunchCrossingTool( "MC" )
-#else: bcTool = BunchCrossingTool( "LHC" )
-#ToolSvc += bcTool
#
# Trigger Analysis Examples
#
diff --git a/Trigger/TrigAnalysis/TrigAnalysisExamples/share/TrigAnalysisExamples_AthAnaJO.py b/Trigger/TrigAnalysis/TrigAnalysisExamples/share/TrigAnalysisExamples_AthAnaJO.py
index 368c8963075b..ac97c3d492ec 100644
--- a/Trigger/TrigAnalysis/TrigAnalysisExamples/share/TrigAnalysisExamples_AthAnaJO.py
+++ b/Trigger/TrigAnalysis/TrigAnalysisExamples/share/TrigAnalysisExamples_AthAnaJO.py
@@ -53,12 +53,6 @@ ToolSvc += CfgMgr.Trig__MatchingTool("MatchingTool",OutputLevel=DEBUG)
# from TrigEgammaEmulationTool.TrigEgammaEmulationToolConfig import TrigEgammaEmulationToolFactory
# egEmulator = TrigEgammaEmulationToolFactory(elHLTList, name = "TrigEgammaEmulationTool", OutputLevel = INFO)
-# Bunch crossing tool
-
-#from TrigBunchCrossingTool.BunchCrossingTool import BunchCrossingTool
-#if isMC: bcTool = BunchCrossingTool( "MC" )
-#else: bcTool = BunchCrossingTool( "LHC" )
-#ToolSvc += bcTool
#
# Trigger Analysis Examples
#
diff --git a/Trigger/TrigAnalysis/TrigAnalysisExamples/src/BunchCrossingExample.cxx b/Trigger/TrigAnalysis/TrigAnalysisExamples/src/BunchCrossingExample.cxx
deleted file mode 100644
index 5b32cd6635fa..000000000000
--- a/Trigger/TrigAnalysis/TrigAnalysisExamples/src/BunchCrossingExample.cxx
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: BunchCrossingExample.cxx 628392 2014-11-14 12:40:08Z krasznaa $
-
-// Gaudi/Athena include(s):
-#include "AthenaKernel/errorcheck.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-
-// Local include(s):
-#include "BunchCrossingExample.h"
-
-namespace Trig {
-
- /**
- * The constructor specifies a meaningful default for the ToolHandle,
- * but in general the setup of the tool should always be done on in the
- * jobOptions, because most tool implementations can't work "out of the
- * box". They need to be configured by their special configurables.
- */
- BunchCrossingExample::BunchCrossingExample( const std::string& name,
- ISvcLocator* svcloc )
- : AthAlgorithm( name, svcloc ),
- m_bcTool( "Trig::TrigConfBunchCrossingTool/BunchCrossingTool" ) {
-
- declareProperty( "BCTool", m_bcTool );
- }
-
- /**
- * The tool always needs to be retrieved before the event loop starts.
- * Most tool implementations rely on receiving various incidents, or getting
- * called by some callback function. So only instantiating the tool inside
- * the event loop would have adverse effects.
- */
- StatusCode BunchCrossingExample::initialize() {
-
- ATH_MSG_INFO( "Initializing..." );
-
- // Retrieve the tool:
- CHECK( m_bcTool.retrieve() );
- ATH_MSG_DEBUG( "Retrieved the bunch crossing tool" );
-
- return StatusCode::SUCCESS;
- }
-
- /**
- * Here I show a few things that one can ask the tool...
- */
- StatusCode BunchCrossingExample::execute() {
-
- // Retrieve the object holding the BCID of the current event:
- const EventInfo* eventInfo = 0;
- CHECK( evtStore()->retrieve( eventInfo ) );
-
- // Extract the BCID of the current event:
- EventID::number_type bcid = eventInfo->event_ID()->bunch_crossing_id();
- ATH_MSG_INFO( "The BCID of the current event is: " << bcid );
-
- // Check if this was a filled bunch crossing. Should be in most cases...
- if( m_bcTool->isFilled( bcid ) ) {
- ATH_MSG_INFO( "This was a filled bunch crossing" );
-
- // Check if the BCID is found to be in a bunch train by the tool:
- if( m_bcTool->isInTrain( bcid ) ) {
- ATH_MSG_INFO( "This BCID was part of a bunch train" );
-
- // Check the BCID's surroundings:
- std::vector< bool > b_in_front = m_bcTool->bunchesInFront( bcid, 32 );
- ATH_MSG_INFO( "Buch filled states in front of the current BCID: "
- << b_in_front );
-
- // Get the tool to calculate the BCID's distance from the front of the
- // bunch train. But remember that these numbers on their own usually
- // don't mean much...
- ATH_MSG_INFO( "This bunch was "
- << m_bcTool->distanceFromFront( bcid,
- IBunchCrossingTool::NanoSec )
- << " nanoseconds from the front of its train" );
- ATH_MSG_INFO( "Also, it was "
- << m_bcTool->distanceFromFront( bcid,
- IBunchCrossingTool::BunchCrossings )
- << " bunch crossings away from the front of its train" );
-
- } else {
- ATH_MSG_INFO( "This BCID was a single bunch" );
- }
-
- } else {
- ATH_MSG_INFO( "You've found an event from an empty bunch crossing" );
- ATH_MSG_INFO( "This can happen, but isn't the norm." );
- }
-
- //
- // Finally, let's interrogate some fixed BCIDs:
- //
- printInfo( 1 );
- printInfo( 7 );
- printInfo( 10 );
-
- return StatusCode::SUCCESS;
- }
-
- /**
- * This function prints quite detailed information about a specific bunch crossing.
- *
- * @param bcid The BCID which should be interrogated
- */
- void BunchCrossingExample::printInfo( unsigned int bcid ) {
-
- ATH_MSG_DEBUG( "bcType( " << bcid << " ) = " << m_bcTool->bcType( bcid ) );
- ATH_MSG_DEBUG( "isFilled( " << bcid << " ) = " << m_bcTool->isFilled( bcid ) );
- ATH_MSG_DEBUG( "isInTrain( " << bcid << " ) = " << m_bcTool->isInTrain( bcid ) );
- ATH_MSG_DEBUG( "distanceFromFront( " << bcid << ", NanoSec ) = "
- << m_bcTool->distanceFromFront( bcid, IBunchCrossingTool::NanoSec ) );
- ATH_MSG_DEBUG( "distanceFromTail( " << bcid << ", NanoSec ) = "
- << m_bcTool->distanceFromTail( bcid, IBunchCrossingTool::NanoSec ) );
- ATH_MSG_DEBUG( "distanceFromFront( " << bcid << ", BunchCrossings ) = "
- << m_bcTool->distanceFromFront( bcid, IBunchCrossingTool::BunchCrossings ) );
- ATH_MSG_DEBUG( "distanceFromTail( " << bcid << ", BunchCrossings ) = "
- << m_bcTool->distanceFromTail( bcid, IBunchCrossingTool::BunchCrossings ) );
- ATH_MSG_DEBUG( "distanceFromFront( " << bcid << ", FilledBunches ) = "
- << m_bcTool->distanceFromFront( bcid, IBunchCrossingTool::FilledBunches ) );
- ATH_MSG_DEBUG( "distanceFromTail( " << bcid << ", FilledBunches ) = "
- << m_bcTool->distanceFromTail( bcid, IBunchCrossingTool::FilledBunches ) );
-
- return;
- }
-
-} // namespace Trig
diff --git a/Trigger/TrigAnalysis/TrigAnalysisExamples/src/BunchCrossingExample.h b/Trigger/TrigAnalysis/TrigAnalysisExamples/src/BunchCrossingExample.h
deleted file mode 100644
index c77ca12726a3..000000000000
--- a/Trigger/TrigAnalysis/TrigAnalysisExamples/src/BunchCrossingExample.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Dear emacs, this is -*- c++ -*-
-
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: BunchCrossingExample.h 501857 2012-05-22 14:52:04Z krasznaa $
-#ifndef TRIGANALYSISEXAMPLES_BUNCHCROSSINGEXAMPLE_H
-#define TRIGANALYSISEXAMPLES_BUNCHCROSSINGEXAMPLE_H
-
-// Gaudi/Athena include(s):
-#include "GaudiKernel/ToolHandle.h"
-#include "AthenaBaseComps/AthAlgorithm.h"
-
-// Trigger include(s):
-#include "TrigAnalysisInterfaces/IBunchCrossingTool.h"
-
-namespace Trig {
-
- /**
- * @short Algorithm demonstrating the usage of Trig::IBunchCrossingTool
- *
- * This algorithm demonstrates how to use the
- * Trig::IBunchCrossingTool interface in a generic analysis.
- *
- * @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
- *
- * $Revision: 501857 $
- * $Date: 2012-05-22 16:52:04 +0200 (Tue, 22 May 2012) $
- */
- class BunchCrossingExample : public AthAlgorithm {
-
- public:
- /// Regular Athena algorithm constructor
- BunchCrossingExample( const std::string& name, ISvcLocator* svcloc );
-
- /// Initialization run before the event loop
- virtual StatusCode initialize();
- /// Function called once per event
- virtual StatusCode execute();
-
- private:
- /// Function for printing detailed info about a given bunch crossing
- void printInfo( unsigned int bcid );
-
- ToolHandle< IBunchCrossingTool > m_bcTool; ///< Handle to the tool
-
- }; // class BCTester
-
-} // namespace Trig
-
-#endif // TRIGANALYSISEXAMPLES_BUNCHCROSSINGEXAMPLE_H
diff --git a/Trigger/TrigAnalysis/TrigAnalysisExamples/src/TriggerAnalysisTutorial.cxx b/Trigger/TrigAnalysis/TrigAnalysisExamples/src/TriggerAnalysisTutorial.cxx
index bb29b4b32230..777237c9b552 100644
--- a/Trigger/TrigAnalysis/TrigAnalysisExamples/src/TriggerAnalysisTutorial.cxx
+++ b/Trigger/TrigAnalysis/TrigAnalysisExamples/src/TriggerAnalysisTutorial.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// System include(s):
@@ -38,7 +38,6 @@ TriggerAnalysisTutorial::TriggerAnalysisTutorial( const std::string &name,
m_trigDec( "Trig::TrigDecisionTool/TrigDecisionTool" ),
m_matchTool( "Trig::MatchingTool/MatchingTool", this ),
m_tah( "Trig::TriggerAnalysisHelper/TriggerAnalysisHelper",this ),
- m_bcTool( "Trig::TrigConfBunchCrossingTool/BunchCrossingTool" ),
m_histSvc( "THistSvc", name ) {
declareProperty( "TriggerList", m_chain_names, "List of triggers to analyze");
@@ -53,7 +52,6 @@ StatusCode TriggerAnalysisTutorial::initialize() {
// retrieve the tools and services:
CHECK( m_trigDec.retrieve() );
CHECK( m_matchTool.retrieve() );
- //CHECK( m_bcTool.retrieve() );
CHECK( m_histSvc.retrieve() );
m_trigDec->ExperimentalAndExpertMethods()->enable();
// done
diff --git a/Trigger/TrigAnalysis/TrigAnalysisExamples/src/TriggerAnalysisTutorial.h b/Trigger/TrigAnalysis/TrigAnalysisExamples/src/TriggerAnalysisTutorial.h
index 82bc6f1c13ed..089182e3d7c6 100644
--- a/Trigger/TrigAnalysis/TrigAnalysisExamples/src/TriggerAnalysisTutorial.h
+++ b/Trigger/TrigAnalysis/TrigAnalysisExamples/src/TriggerAnalysisTutorial.h
@@ -1,7 +1,7 @@
// Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGANALYSISEXAMPLES_TRIGGERANALYSISTUTORIAL_H
@@ -22,7 +22,6 @@
#include "TrigDecisionTool/TrigDecisionTool.h"
#include "TriggerMatchingTool/IMatchingTool.h"
#include "TriggerAnalysisHelper.h"
-#include "TrigAnalysisInterfaces/IBunchCrossingTool.h"
// Forward declaration(s):
class TTree;
@@ -73,7 +72,6 @@ private:
//! Helper class for tutorial, provides an additional layer to illustrate TDT functionality
ToolHandle< Trig::TriggerAnalysisHelper > m_tah;
- ToolHandle< Trig::IBunchCrossingTool > m_bcTool; ///< Handle to the tool
// The THistSvc
ServiceHandle< ITHistSvc > m_histSvc;
diff --git a/Trigger/TrigAnalysis/TrigAnalysisExamples/src/components/TrigAnalysisExamples_entries.cxx b/Trigger/TrigAnalysis/TrigAnalysisExamples/src/components/TrigAnalysisExamples_entries.cxx
index 54f72ce07e8a..65aae7ebdf1b 100644
--- a/Trigger/TrigAnalysis/TrigAnalysisExamples/src/components/TrigAnalysisExamples_entries.cxx
+++ b/Trigger/TrigAnalysis/TrigAnalysisExamples/src/components/TrigAnalysisExamples_entries.cxx
@@ -5,7 +5,6 @@
#include "../TriggerAnalysisTutorial.h"
#include "../TrigExpressStreamAlg.h"
#include "../TrigEmulatorExAlg.h"
-#include "../BunchCrossingExample.h"
#include "../TriggerAnalysisHelper.h"
DECLARE_COMPONENT( Trig::TDTExample )
@@ -15,6 +14,4 @@ DECLARE_COMPONENT( TrigMatchExAlg )
DECLARE_COMPONENT( TriggerAnalysisTutorial )
DECLARE_COMPONENT( TrigExpressStreamAlg )
DECLARE_COMPONENT( TrigEmulatorExAlg )
-DECLARE_COMPONENT( Trig::BunchCrossingExample )
DECLARE_COMPONENT( Trig::TriggerAnalysisHelper )
-
--
GitLab
From 2616d5bf0afdb6357bfca094e4efd6652ce7211e Mon Sep 17 00:00:00 2001
From: yoyamagu <yohei.yamaguchi@cern.ch>
Date: Mon, 16 Aug 2021 23:54:15 +0900
Subject: [PATCH 064/272] TTVA_AMVFVertices for isolation calculation
---
.../PhysValMonitoring/share/PhysValMuon_jobOptions.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValMuon_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValMuon_jobOptions.py
index 7795a6a0a398..3178becc7dbc 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValMuon_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValMuon_jobOptions.py
@@ -21,10 +21,15 @@ for class_name, name in metadata['metadata_items'].items():
isDAOD_PHYSVAL=True
if not isDAOD_PHYSVAL:
- from TrackVertexAssociationTool.getTTVAToolForReco import addUsedInFitDecoratorForReco
- addUsedInFitDecoratorForReco(add2Seq = algseq)
from IsolationAlgs.IsoUpdatedTrackCones import GetUpdatedIsoTrackCones
if not hasattr(algseq,"IsolationBuilderNonprompt_All_MaxWeight500"):
+ ToolSvc += CfgMgr.InDet__InDetUsedInFitTrackDecoratorTool( name = algseq.name()+"_InDetUsedInFitDecoratorTool_forIso",
+ AMVFVerticesDecoName = 'TTVA_AMVFVertices',
+ AMVFWeightsDecoName = 'TTVA_AMVFWeights',
+ TrackContainer = 'InDetTrackParticles',
+ VertexContainer = 'PrimaryVertices' )
+ algseq += CfgMgr.InDet__InDetUsedInVertexFitTrackDecorator(name = algseq.name()+"_InDetUsedInFitDecorator_forIso",
+ UsedInFitDecoratorTool = getattr(ToolSvc, algseq.name()+"_InDetUsedInFitDecoratorTool_forIso") )
algseq += GetUpdatedIsoTrackCones()
from MuonPhysValMonitoring.MuonPhysValMonitoringConf import MuonPhysValMonitoring__MuonPhysValMonitoringTool
--
GitLab
From 7a984fd18c821441419e5f4a073a9ddac1c09f4b Mon Sep 17 00:00:00 2001
From: Rafal Bielski <rafal.bielski@cern.ch>
Date: Mon, 16 Aug 2021 17:18:10 +0200
Subject: [PATCH 065/272] Fix configuration of the missingROBs test
---
.../test/test_trigP1_v1Dev_noL1Sim_missingROBs_build.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_missingROBs_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_missingROBs_build.py
index 74f20e2f2e9b..1dfa3f6a10be 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_missingROBs_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_noL1Sim_missingROBs_build.py
@@ -7,12 +7,15 @@
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
+# Keep only the L1 ROBs enabled in this test
+l1_robs = '[0x770001, 0x760001, 0x7500ac, 0x7500ad, 0x7300a8, 0x7300a9, 0x7300aa, 0x7300ab, 0x910081, 0x910091]'
+
ex = ExecStep.ExecStep()
ex.type = 'athenaHLT'
ex.job_options = 'TriggerJobOpts/runHLT_standalone.py'
ex.input = 'data'
ex.args = '-c "setMenu=\'LS2_v1\';forceEnableAllChains=True;"' # LS2_v1 to be renamed to Dev_pp_run3_v1
-ex.args += ' --ros2rob="{\'ROS-TDQ-CTP-00\': [0x770000]}"'
+ex.args += ' --ros2rob="{{\'ROS-TRIGP1TEST-00\': {:s}}}"'.format(l1_robs)
ex.args += ' --dump-config-reload'
test = Test.Test()
--
GitLab
From 79002160de0b43dda9d8627b83eb46ad5a86ec76 Mon Sep 17 00:00:00 2001
From: Nils Krumnack <krumnack@iastate.edu>
Date: Mon, 16 Aug 2021 10:59:30 -0500
Subject: [PATCH 066/272] switch to using SysListHandle::systematicsVector()
instead of for-each
On request of @jburr to make this easier to understand and teach for
beginners. Note that this involved a fair amount of whitespace
changes to make the for-body indentation consistent with the rest of
each file.
---
.../Root/AsgClassificationDecorationAlg.cxx | 7 +-
.../Root/AsgEventScaleFactorAlg.cxx | 7 +-
.../Root/AsgLeptonTrackSelectionAlg.cxx | 128 ++++++++---------
.../Root/AsgOriginalObjectLinkAlg.cxx | 7 +-
.../Root/AsgSelectionAlg.cxx | 38 ++---
.../Root/AsgViewFromSelectionAlg.cxx | 7 +-
.../Root/EventSelectionByObjectFlagAlg.cxx | 7 +-
.../Root/IsolationCloseByCorrectionAlg.cxx | 31 +++--
.../Root/KinematicHistAlg.cxx | 110 +++++++--------
.../Root/ObjectCutFlowHistAlg.cxx | 75 +++++-----
.../Root/OverlapRemovalAlg.cxx | 47 +++----
.../Root/PMGTruthWeightAlg.cxx | 6 +-
.../Root/PileupReweightingAlg.cxx | 89 ++++++------
.../Root/SysListDumperAlg.cxx | 6 +-
.../Root/EgammaCalibrationAndSmearingAlg.cxx | 23 ++--
.../Root/EgammaIsolationCorrectionAlg.cxx | 23 ++--
.../Root/EgammaIsolationSelectionAlg.cxx | 27 ++--
.../Root/ElectronEfficiencyCorrectionAlg.cxx | 31 +++--
.../Root/PhotonEfficiencyCorrectionAlg.cxx | 27 ++--
.../Root/PhotonShowerShapeFudgeAlg.cxx | 21 +--
.../Root/BTaggingEfficiencyAlg.cxx | 61 ++++----
.../Root/JetCalibrationAlg.cxx | 14 +-
.../Root/JetGhostMuonAssociationAlg.cxx | 7 +-
.../Root/JetModifierAlg.cxx | 14 +-
.../Root/JetSelectionAlg.cxx | 24 ++--
.../Root/JetUncertaintiesAlg.cxx | 24 ++--
.../Root/JvtEfficiencyAlg.cxx | 76 +++++-----
.../Root/JvtUpdateAlg.cxx | 25 ++--
.../Root/MetBuilderAlg.cxx | 29 ++--
.../Root/MetMakerAlg.cxx | 130 +++++++++---------
.../Root/MetSignificanceAlg.cxx | 25 ++--
.../Root/MuonCalibrationAndSmearingAlg.cxx | 23 ++--
.../Root/MuonEfficiencyScaleFactorAlg.cxx | 84 +++++------
.../Root/MuonIsolationAlg.cxx | 27 ++--
.../Root/MuonSelectionAlg.cxx | 6 +-
.../MuonTriggerEfficiencyScaleFactorAlg.cxx | 91 ++++++------
.../SystematicsHandles/SysFilterReporter.h | 6 +-
.../SystematicsHandles/SysListHandle.h | 18 +++
.../Root/DiTauEfficiencyCorrectionsAlg.cxx | 27 ++--
.../Root/DiTauSmearingAlg.cxx | 23 ++--
.../Root/DiTauTruthMatchingAlg.cxx | 21 +--
.../Root/TauEfficiencyCorrectionsAlg.cxx | 31 +++--
.../Root/TauSmearingAlg.cxx | 23 ++--
.../Root/TauTruthMatchingAlg.cxx | 21 +--
44 files changed, 805 insertions(+), 742 deletions(-)
diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/AsgClassificationDecorationAlg.cxx b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/AsgClassificationDecorationAlg.cxx
index 4b993f037efe..0497fa752895 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/AsgClassificationDecorationAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/AsgClassificationDecorationAlg.cxx
@@ -43,7 +43,7 @@ StatusCode AsgClassificationDecorationAlg::initialize()
StatusCode AsgClassificationDecorationAlg::execute()
{
- return m_systematicsList.foreach ([&](const CP::SystematicSet &sys) -> StatusCode
+ for (const auto& sys : m_systematicsList.systematicsVector())
{
xAOD::IParticleContainer *particles{};
ANA_CHECK(m_particlesHandle.getCopy(particles, sys));
@@ -53,9 +53,8 @@ StatusCode AsgClassificationDecorationAlg::execute()
ANA_CHECK(m_tool->classify(*particle, classification));
(*m_classificationAccessor)(*particle) = classification;
}
-
- return StatusCode::SUCCESS;
- });
+ }
+ return StatusCode::SUCCESS;
}
} // namespace CP
diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/AsgEventScaleFactorAlg.cxx b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/AsgEventScaleFactorAlg.cxx
index 83000cb95b6e..683160861bc9 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/AsgEventScaleFactorAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/AsgEventScaleFactorAlg.cxx
@@ -52,7 +52,8 @@ namespace CP
StatusCode AsgEventScaleFactorAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
const xAOD::EventInfo *eventInfo = nullptr;
ANA_CHECK (m_eventInfoHandle.retrieve (eventInfo, sys));
@@ -69,8 +70,8 @@ namespace CP
}
m_scaleFactorOutputDecoration.set (*eventInfo, scaleFactor, sys);
+ }
- return StatusCode::SUCCESS;
- });
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/AsgLeptonTrackSelectionAlg.cxx b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/AsgLeptonTrackSelectionAlg.cxx
index df18ee364022..9a2cd74fe089 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/AsgLeptonTrackSelectionAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/AsgLeptonTrackSelectionAlg.cxx
@@ -114,81 +114,83 @@ namespace CP
}
}
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- xAOD::IParticleContainer *particles = nullptr;
- ANA_CHECK (m_particlesHandle.getCopy (particles, sys));
- for (xAOD::IParticle *particle : *particles)
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ xAOD::IParticleContainer *particles = nullptr;
+ ANA_CHECK (m_particlesHandle.getCopy (particles, sys));
+ for (xAOD::IParticle *particle : *particles)
+ {
+ asg::AcceptData acceptData (&m_accept);
+
+ if (m_preselection.getBool (*particle))
{
- asg::AcceptData acceptData (&m_accept);
+ std::size_t cutIndex {0};
+
+ const xAOD::TrackParticle *track {nullptr};
+ if (const xAOD::Muon *muon = dynamic_cast<xAOD::Muon*>(particle))
+ track = muon->primaryTrackParticle();
+ else if (const xAOD::Electron *electron = dynamic_cast<xAOD::Electron*>(particle))
+ track = electron->trackParticle();
+ else
+ {
+ ANA_MSG_ERROR ("failed to cast input to electron or muon");
+ return StatusCode::FAILURE;
+ }
- if (m_preselection.getBool (*particle))
+ acceptData.setCutResult (cutIndex ++, track != nullptr);
+ if (track != nullptr)
{
- std::size_t cutIndex {0};
-
- const xAOD::TrackParticle *track {nullptr};
- if (const xAOD::Muon *muon = dynamic_cast<xAOD::Muon*>(particle))
- track = muon->primaryTrackParticle();
- else if (const xAOD::Electron *electron = dynamic_cast<xAOD::Electron*>(particle))
- track = electron->trackParticle();
- else
+ if (m_maxD0Significance > 0)
{
- ANA_MSG_ERROR ("failed to cast input to electron or muon");
- return StatusCode::FAILURE;
+ try
+ {
+ const float d0sig = xAOD::TrackingHelpers::d0significance
+ (track, eventInfo->beamPosSigmaX(), eventInfo->beamPosSigmaY(),
+ eventInfo->beamPosSigmaXY());
+ acceptData.setCutResult (cutIndex ++, fabs( d0sig ) < m_maxD0Significance);
+ } catch (const std::runtime_error &) {
+ acceptData.setCutResult (cutIndex ++, false);
+ }
}
-
- acceptData.setCutResult (cutIndex ++, track != nullptr);
- if (track != nullptr)
+ if (m_maxDeltaZ0SinTheta > 0)
{
- if (m_maxD0Significance > 0)
- {
- try
- {
- const float d0sig = xAOD::TrackingHelpers::d0significance
- (track, eventInfo->beamPosSigmaX(), eventInfo->beamPosSigmaY(),
- eventInfo->beamPosSigmaXY());
- acceptData.setCutResult (cutIndex ++, fabs( d0sig ) < m_maxD0Significance);
- } catch (const std::runtime_error &) {
- acceptData.setCutResult (cutIndex ++, false);
- }
+ const double vertex_z = primaryVertex ? primaryVertex->z() : 0;
+ const float deltaZ0SinTheta
+ = (track->z0() + track->vz() - vertex_z) * sin (particle->p4().Theta());
+ acceptData.setCutResult (cutIndex ++, fabs (deltaZ0SinTheta) < m_maxDeltaZ0SinTheta);
+ }
+ if (m_nMinPixelHits != -1 || m_nMaxPixelHits != -1) {
+ uint8_t nPixelHits;
+ track->summaryValue(nPixelHits, xAOD::numberOfPixelHits);
+ bool accept = true;
+ if(m_nMinPixelHits != -1) {
+ accept &= nPixelHits >= m_nMinPixelHits;
}
- if (m_maxDeltaZ0SinTheta > 0)
- {
- const double vertex_z = primaryVertex ? primaryVertex->z() : 0;
- const float deltaZ0SinTheta
- = (track->z0() + track->vz() - vertex_z) * sin (particle->p4().Theta());
- acceptData.setCutResult (cutIndex ++, fabs (deltaZ0SinTheta) < m_maxDeltaZ0SinTheta);
+ if(m_nMaxPixelHits != -1) {
+ accept &= nPixelHits <= m_nMaxPixelHits;
}
- if (m_nMinPixelHits != -1 || m_nMaxPixelHits != -1) {
- uint8_t nPixelHits;
- track->summaryValue(nPixelHits, xAOD::numberOfPixelHits);
- bool accept = true;
- if(m_nMinPixelHits != -1) {
- accept &= nPixelHits >= m_nMinPixelHits;
- }
- if(m_nMaxPixelHits != -1) {
- accept &= nPixelHits <= m_nMaxPixelHits;
- }
- acceptData.setCutResult (cutIndex++, accept);
+ acceptData.setCutResult (cutIndex++, accept);
+ }
+ if (m_nMinSCTHits != -1 || m_nMaxSCTHits != -1) {
+ uint8_t nSCTHits;
+ track->summaryValue(nSCTHits, xAOD::numberOfSCTHits);
+ bool accept = true;
+ if(m_nMinSCTHits != -1) {
+ accept &= nSCTHits >= m_nMinSCTHits;
}
- if (m_nMinSCTHits != -1 || m_nMaxSCTHits != -1) {
- uint8_t nSCTHits;
- track->summaryValue(nSCTHits, xAOD::numberOfSCTHits);
- bool accept = true;
- if(m_nMinSCTHits != -1) {
- accept &= nSCTHits >= m_nMinSCTHits;
- }
- if(m_nMaxSCTHits != -1) {
- accept &= nSCTHits <= m_nMaxSCTHits;
- }
- acceptData.setCutResult (cutIndex++, accept);
+ if(m_nMaxSCTHits != -1) {
+ accept &= nSCTHits <= m_nMaxSCTHits;
}
+ acceptData.setCutResult (cutIndex++, accept);
}
}
-
- m_selectionAccessor->setBits
- (*particle, selectionFromAccept (acceptData));
}
- return StatusCode::SUCCESS;
- });
+
+ m_selectionAccessor->setBits
+ (*particle, selectionFromAccept (acceptData));
+ }
+ }
+
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/AsgOriginalObjectLinkAlg.cxx b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/AsgOriginalObjectLinkAlg.cxx
index 990c7d6885fe..a715e235ee33 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/AsgOriginalObjectLinkAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/AsgOriginalObjectLinkAlg.cxx
@@ -46,7 +46,8 @@ namespace CP
StatusCode AsgOriginalObjectLinkAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
xAOD::IParticleContainer *particles = nullptr;
ANA_CHECK (m_particleHandle.getCopy (particles, sys));
@@ -58,8 +59,8 @@ namespace CP
ATH_MSG_ERROR ("Cannot set original object links for container named " << m_baseContainerName);
return StatusCode::FAILURE;
}
+ }
- return StatusCode::SUCCESS;
- });
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/AsgSelectionAlg.cxx b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/AsgSelectionAlg.cxx
index 5dced04a95dc..05948a8427ef 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/AsgSelectionAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/AsgSelectionAlg.cxx
@@ -65,25 +65,27 @@ namespace CP
StatusCode AsgSelectionAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- if (m_systematicsTool)
- ANA_CHECK (m_systematicsTool->applySystematicVariation (sys));
-
- xAOD::IParticleContainer *particles = nullptr;
- ANA_CHECK (m_particlesHandle.getCopy (particles, sys));
- for (xAOD::IParticle *particle : *particles)
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ if (m_systematicsTool)
+ ANA_CHECK (m_systematicsTool->applySystematicVariation (sys));
+
+ xAOD::IParticleContainer *particles = nullptr;
+ ANA_CHECK (m_particlesHandle.getCopy (particles, sys));
+ for (xAOD::IParticle *particle : *particles)
+ {
+ if (m_preselection.getBool (*particle))
+ {
+ m_selectionAccessor->setBits
+ (*particle, selectionFromAccept (m_selectionTool->accept (particle)));
+ }
+ else
{
- if (m_preselection.getBool (*particle))
- {
- m_selectionAccessor->setBits
- (*particle, selectionFromAccept (m_selectionTool->accept (particle)));
- }
- else
- {
- m_selectionAccessor->setBits(*particle, m_setOnFail);
- }
+ m_selectionAccessor->setBits(*particle, m_setOnFail);
}
- return StatusCode::SUCCESS;
- });
+ }
+ }
+
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/AsgViewFromSelectionAlg.cxx b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/AsgViewFromSelectionAlg.cxx
index 418ec5f15e55..747a250e6bf6 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/AsgViewFromSelectionAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/AsgViewFromSelectionAlg.cxx
@@ -223,7 +223,10 @@ namespace CP
StatusCode AsgViewFromSelectionAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- return (this->*m_function) (sys);});
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ ANA_CHECK ((this->*m_function) (sys));
+ }
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/EventSelectionByObjectFlagAlg.cxx b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/EventSelectionByObjectFlagAlg.cxx
index c02c9c11764b..aae77ef4180a 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/EventSelectionByObjectFlagAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/EventSelectionByObjectFlagAlg.cxx
@@ -38,7 +38,8 @@ StatusCode EventSelectionByObjectFlagAlg ::execute() {
SysFilterReporterCombiner filterCombiner (m_filterParams, true);
// loop over systematics
- return m_systematicsList.foreach ([&](const CP::SystematicSet &sys) -> StatusCode {
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
SysFilterReporter filter (filterCombiner, sys);
// particle container
@@ -55,9 +56,9 @@ StatusCode EventSelectionByObjectFlagAlg ::execute() {
}
}
}
+ }
- return StatusCode::SUCCESS;
- });
+ return StatusCode::SUCCESS;
}
StatusCode EventSelectionByObjectFlagAlg ::finalize() {
diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/IsolationCloseByCorrectionAlg.cxx b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/IsolationCloseByCorrectionAlg.cxx
index ffd21d72127c..f892c8ad70e6 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/IsolationCloseByCorrectionAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/IsolationCloseByCorrectionAlg.cxx
@@ -45,22 +45,23 @@ namespace CP
StatusCode IsolationCloseByCorrectionAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- xAOD::ElectronContainer *electrons {nullptr};
- if (m_electronsHandle)
- ANA_CHECK (m_electronsHandle.getCopy (electrons, sys));
- xAOD::MuonContainer *muons {nullptr};
- if (m_muonsHandle)
- ANA_CHECK (m_muonsHandle.getCopy (muons, sys));
- xAOD::PhotonContainer *photons {nullptr};
- if (m_photonsHandle)
- ANA_CHECK (m_photonsHandle.getCopy (photons, sys));
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ xAOD::ElectronContainer *electrons {nullptr};
+ if (m_electronsHandle)
+ ANA_CHECK (m_electronsHandle.getCopy (electrons, sys));
+ xAOD::MuonContainer *muons {nullptr};
+ if (m_muonsHandle)
+ ANA_CHECK (m_muonsHandle.getCopy (muons, sys));
+ xAOD::PhotonContainer *photons {nullptr};
+ if (m_photonsHandle)
+ ANA_CHECK (m_photonsHandle.getCopy (photons, sys));
- ANA_CHECK_CORRECTION_EVENT
- (m_outOfValidity, m_isolationCorrectionTool->getCloseByIsoCorrection
- (electrons, muons, photons, m_topoEtConeModel));
+ ANA_CHECK_CORRECTION_EVENT
+ (m_outOfValidity, m_isolationCorrectionTool->getCloseByIsoCorrection
+ (electrons, muons, photons, m_topoEtConeModel));
+ }
- return StatusCode::SUCCESS;
- });
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/KinematicHistAlg.cxx b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/KinematicHistAlg.cxx
index 16d1c7448f3b..3d045cebdd1e 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/KinematicHistAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/KinematicHistAlg.cxx
@@ -44,67 +44,67 @@ namespace CP
StatusCode KinematicHistAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- const xAOD::IParticleContainer *input = nullptr;
- ANA_CHECK (m_inputHandle.retrieve (input, sys));
-
- auto histIter = m_hist.find (sys);
- if (histIter == m_hist.end())
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ const xAOD::IParticleContainer *input = nullptr;
+ ANA_CHECK (m_inputHandle.retrieve (input, sys));
+
+ auto histIter = m_hist.find (sys);
+ if (histIter == m_hist.end())
+ {
+ std::string name;
+ HistGroup group;
+
+ name = RCU::substitute (m_histPattern, "%VAR%", "multiplicity");
+ ANA_CHECK (m_systematicsList.service().makeSystematicsName (name, name, sys));
+ ANA_CHECK (book (TH1F (name.c_str(), "multiplicity", 20, 0, 20)));
+ group.multiplicity = hist (name);
+
+ m_hist.insert (std::make_pair (sys, group));
+ histIter = m_hist.find (sys);
+ assert (histIter != m_hist.end());
+ }
+
+ std::size_t count = 0;
+ for (std::size_t iter = 0; iter != input->size(); ++ iter)
+ {
+ const xAOD::IParticle *particle = (*input)[iter];
+ if (m_preselection.getBool (*particle))
{
- std::string name;
- HistGroup group;
+ while (histIter->second.perObject.size() <= count)
+ {
+ std::string name;
+ HistSubgroup group;
- name = RCU::substitute (m_histPattern, "%VAR%", "multiplicity");
- ANA_CHECK (m_systematicsList.service().makeSystematicsName (name, name, sys));
- ANA_CHECK (book (TH1F (name.c_str(), "multiplicity", 20, 0, 20)));
- group.multiplicity = hist (name);
+ name = RCU::substitute (m_histPattern, "%VAR%", "pt" + std::to_string(histIter->second.perObject.size()));
+ ANA_CHECK (m_systematicsList.service().makeSystematicsName (name, name, sys));
+ ANA_CHECK (book (TH1F (name.c_str(), "pt", 20, 0, 200e3)));
+ group.pt = hist (name);
- m_hist.insert (std::make_pair (sys, group));
- histIter = m_hist.find (sys);
- assert (histIter != m_hist.end());
- }
+ name = RCU::substitute (m_histPattern, "%VAR%", "eta" + std::to_string(histIter->second.perObject.size()));
+ ANA_CHECK (m_systematicsList.service().makeSystematicsName (name, name, sys));
+ ANA_CHECK (book (TH1F (name.c_str(), "eta", 20, -5, 5)));
+ group.eta = hist (name);
- std::size_t count = 0;
- for (std::size_t iter = 0; iter != input->size(); ++ iter)
- {
- const xAOD::IParticle *particle = (*input)[iter];
- if (m_preselection.getBool (*particle))
- {
- while (histIter->second.perObject.size() <= count)
- {
- std::string name;
- HistSubgroup group;
-
- name = RCU::substitute (m_histPattern, "%VAR%", "pt" + std::to_string(histIter->second.perObject.size()));
- ANA_CHECK (m_systematicsList.service().makeSystematicsName (name, name, sys));
- ANA_CHECK (book (TH1F (name.c_str(), "pt", 20, 0, 200e3)));
- group.pt = hist (name);
-
- name = RCU::substitute (m_histPattern, "%VAR%", "eta" + std::to_string(histIter->second.perObject.size()));
- ANA_CHECK (m_systematicsList.service().makeSystematicsName (name, name, sys));
- ANA_CHECK (book (TH1F (name.c_str(), "eta", 20, -5, 5)));
- group.eta = hist (name);
-
- name = RCU::substitute (m_histPattern, "%VAR%", "phi" + std::to_string(histIter->second.perObject.size()));
- ANA_CHECK (m_systematicsList.service().makeSystematicsName (name, name, sys));
- ANA_CHECK (book (TH1F (name.c_str(), "phi", 20, -M_PI, M_PI)));
- group.phi = hist (name);
-
- histIter->second.perObject.push_back (group);
- }
-
- HistSubgroup& group = histIter->second.perObject[count];
-
- group.pt->Fill (particle->pt());
- group.eta->Fill (particle->eta());
- group.phi->Fill (particle->phi());
- count += 1;
+ name = RCU::substitute (m_histPattern, "%VAR%", "phi" + std::to_string(histIter->second.perObject.size()));
+ ANA_CHECK (m_systematicsList.service().makeSystematicsName (name, name, sys));
+ ANA_CHECK (book (TH1F (name.c_str(), "phi", 20, -M_PI, M_PI)));
+ group.phi = hist (name);
+
+ histIter->second.perObject.push_back (group);
}
- }
- histIter->second.multiplicity->Fill (count);
+ HistSubgroup& group = histIter->second.perObject[count];
- return StatusCode::SUCCESS;
- });
+ group.pt->Fill (particle->pt());
+ group.eta->Fill (particle->eta());
+ group.phi->Fill (particle->phi());
+ count += 1;
+ }
+ }
+
+ histIter->second.multiplicity->Fill (count);
+ }
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/ObjectCutFlowHistAlg.cxx b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/ObjectCutFlowHistAlg.cxx
index a5a8460caadf..9891afcb023b 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/ObjectCutFlowHistAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/ObjectCutFlowHistAlg.cxx
@@ -80,57 +80,58 @@ namespace CP
StatusCode ObjectCutFlowHistAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- const xAOD::IParticleContainer *input = nullptr;
- ANA_CHECK (m_inputHandle.retrieve (input, sys));
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ const xAOD::IParticleContainer *input = nullptr;
+ ANA_CHECK (m_inputHandle.retrieve (input, sys));
- auto histIter = m_hist.find (sys);
- if (histIter == m_hist.end())
- {
- std::string name;
- ANA_CHECK (m_systematicsList.service().makeSystematicsName (name, m_histPattern, sys));
+ auto histIter = m_hist.find (sys);
+ if (histIter == m_hist.end())
+ {
+ std::string name;
+ ANA_CHECK (m_systematicsList.service().makeSystematicsName (name, m_histPattern, sys));
- ANA_CHECK (book (TH1F (name.c_str(), "object cut flow", m_allCutsNum+1, 0, m_allCutsNum+1)));
+ ANA_CHECK (book (TH1F (name.c_str(), "object cut flow", m_allCutsNum+1, 0, m_allCutsNum+1)));
- m_hist.insert (std::make_pair (sys, hist (name)));
- histIter = m_hist.find (sys);
- assert (histIter != m_hist.end());
+ m_hist.insert (std::make_pair (sys, hist (name)));
+ histIter = m_hist.find (sys);
+ assert (histIter != m_hist.end());
- for (unsigned i = 0; i < m_allCutsNum+1; i++)
- {
- histIter->second->GetXaxis()->SetBinLabel(i + 1, m_labels[i].c_str());
- }
+ for (unsigned i = 0; i < m_allCutsNum+1; i++)
+ {
+ histIter->second->GetXaxis()->SetBinLabel(i + 1, m_labels[i].c_str());
}
+ }
- for (const xAOD::IParticle *particle : *input)
+ for (const xAOD::IParticle *particle : *input)
+ {
+ if (m_preselection.getBool (*particle))
{
- if (m_preselection.getBool (*particle))
+ bool keep = true;
+ unsigned cutIndex = 1;
+ histIter->second->Fill (0);
+ for (const auto& accessor : m_accessors)
{
- bool keep = true;
- unsigned cutIndex = 1;
- histIter->second->Fill (0);
- for (const auto& accessor : m_accessors)
+ const auto selection = accessor.first->getBits (*particle);
+ for (unsigned index = 0, end = accessor.second;
+ index != end; ++ index, ++ cutIndex)
{
- const auto selection = accessor.first->getBits (*particle);
- for (unsigned index = 0, end = accessor.second;
- index != end; ++ index, ++ cutIndex)
+ if (selection & (1 << index))
{
- if (selection & (1 << index))
- {
- histIter->second->Fill (cutIndex);
- } else
- {
- keep = false;
- break;
- }
- }
- if (!keep)
+ histIter->second->Fill (cutIndex);
+ } else
+ {
+ keep = false;
break;
+ }
}
+ if (!keep)
+ break;
}
}
+ }
+ }
- return StatusCode::SUCCESS;
- });
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/OverlapRemovalAlg.cxx b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/OverlapRemovalAlg.cxx
index f0762613f335..deba457111a4 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/OverlapRemovalAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/OverlapRemovalAlg.cxx
@@ -46,30 +46,31 @@ namespace CP
StatusCode OverlapRemovalAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- xAOD::ElectronContainer *electrons {nullptr};
- if (m_electronsHandle)
- ANA_CHECK (m_electronsHandle.getCopy (electrons, sys));
- xAOD::MuonContainer *muons {nullptr};
- if (m_muonsHandle)
- ANA_CHECK (m_muonsHandle.getCopy (muons, sys));
- xAOD::JetContainer *jets {nullptr};
- if (m_jetsHandle)
- ANA_CHECK (m_jetsHandle.getCopy (jets, sys));
- xAOD::TauJetContainer *taus {nullptr};
- if (m_tausHandle)
- ANA_CHECK (m_tausHandle.getCopy (taus, sys));
- xAOD::PhotonContainer *photons {nullptr};
- if (m_photonsHandle)
- ANA_CHECK (m_photonsHandle.getCopy (photons, sys));
- xAOD::JetContainer *fatJets {nullptr};
- if (m_fatJetsHandle)
- ANA_CHECK (m_fatJetsHandle.getCopy (fatJets, sys));
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ xAOD::ElectronContainer *electrons {nullptr};
+ if (m_electronsHandle)
+ ANA_CHECK (m_electronsHandle.getCopy (electrons, sys));
+ xAOD::MuonContainer *muons {nullptr};
+ if (m_muonsHandle)
+ ANA_CHECK (m_muonsHandle.getCopy (muons, sys));
+ xAOD::JetContainer *jets {nullptr};
+ if (m_jetsHandle)
+ ANA_CHECK (m_jetsHandle.getCopy (jets, sys));
+ xAOD::TauJetContainer *taus {nullptr};
+ if (m_tausHandle)
+ ANA_CHECK (m_tausHandle.getCopy (taus, sys));
+ xAOD::PhotonContainer *photons {nullptr};
+ if (m_photonsHandle)
+ ANA_CHECK (m_photonsHandle.getCopy (photons, sys));
+ xAOD::JetContainer *fatJets {nullptr};
+ if (m_fatJetsHandle)
+ ANA_CHECK (m_fatJetsHandle.getCopy (fatJets, sys));
- ATH_CHECK (m_overlapTool->removeOverlaps (electrons, muons, jets, taus,
- photons, fatJets));
+ ATH_CHECK (m_overlapTool->removeOverlaps (electrons, muons, jets, taus,
+ photons, fatJets));
+ }
- return StatusCode::SUCCESS;
- });
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/PMGTruthWeightAlg.cxx b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/PMGTruthWeightAlg.cxx
index 7ec6c2ec0d24..72eccb6df37d 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/PMGTruthWeightAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/PMGTruthWeightAlg.cxx
@@ -50,15 +50,15 @@ namespace CP
StatusCode PMGTruthWeightAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode
+ for (const auto& sys : m_systematicsList.systematicsVector())
{
ANA_CHECK (m_truthWeightTool->applySystematicVariation (sys));
const xAOD::EventInfo *eventInfo = nullptr;
ANA_CHECK (m_eventInfoHandle.retrieve (eventInfo, sys));
m_decoration.set (*eventInfo, m_truthWeightTool->getSysWeight (), sys);
+ }
- return StatusCode::SUCCESS;
- });
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/PileupReweightingAlg.cxx b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/PileupReweightingAlg.cxx
index 681aefb981ed..830351ad1148 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/PileupReweightingAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/PileupReweightingAlg.cxx
@@ -62,51 +62,50 @@ namespace CP
{
unsigned int nominalRandomRunNumber{};
- ANA_CHECK (m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- ANA_CHECK (m_pileupReweightingTool->applySystematicVariation (sys));
- xAOD::EventInfo *eventInfo = nullptr;
- ANA_CHECK (m_eventInfoHandle.getCopy (eventInfo, sys));
-
- ATH_CHECK (m_pileupReweightingTool->apply (*eventInfo));
-
- // Add additional decorations
- if (m_correctedScaledAverageMuAccessor)
- {
- (*m_correctedScaledAverageMuAccessor) (*eventInfo)
- = m_pileupReweightingTool->getCorrectedAverageInteractionsPerCrossing (*eventInfo, true);
- }
-
- if (m_correctedActualMuAccessor)
- {
- (*m_correctedActualMuAccessor) (*eventInfo)
- = m_pileupReweightingTool->getCorrectedActualInteractionsPerCrossing (*eventInfo);
- }
-
- if (m_correctedScaledActualMuAccessor)
- {
- (*m_correctedScaledActualMuAccessor) (*eventInfo)
- = m_pileupReweightingTool->getCorrectedActualInteractionsPerCrossing (*eventInfo, true);
- }
-
- //--- PRWHash to recalculate PU weights using analysis ntuples
- //--- https://twiki.cern.ch/twiki/bin/view/AtlasProtected/ExtendedPileupReweighting#Using_PRWHash_to_change_pileup_w
-
- if (eventInfo->eventType (xAOD::EventInfo::IS_SIMULATION))
- {
- eventInfo->auxdata<ULong64_t>("PRWHash")
- = m_pileupReweightingTool->getPRWHash (*eventInfo);
- }
-
- // In the case of nominal systematics store the RandomRunNumber for
- // later. Event info can not be decorated at this point as the
- // decoration will then also be present in subsequent shallow copies.
- if (sys.empty())
- {
- nominalRandomRunNumber = eventInfo->auxdecor<unsigned int> ("RandomRunNumber");
- }
-
- return StatusCode::SUCCESS;
- }));
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ ANA_CHECK (m_pileupReweightingTool->applySystematicVariation (sys));
+ xAOD::EventInfo *eventInfo = nullptr;
+ ANA_CHECK (m_eventInfoHandle.getCopy (eventInfo, sys));
+
+ ATH_CHECK (m_pileupReweightingTool->apply (*eventInfo));
+
+ // Add additional decorations
+ if (m_correctedScaledAverageMuAccessor)
+ {
+ (*m_correctedScaledAverageMuAccessor) (*eventInfo)
+ = m_pileupReweightingTool->getCorrectedAverageInteractionsPerCrossing (*eventInfo, true);
+ }
+
+ if (m_correctedActualMuAccessor)
+ {
+ (*m_correctedActualMuAccessor) (*eventInfo)
+ = m_pileupReweightingTool->getCorrectedActualInteractionsPerCrossing (*eventInfo);
+ }
+
+ if (m_correctedScaledActualMuAccessor)
+ {
+ (*m_correctedScaledActualMuAccessor) (*eventInfo)
+ = m_pileupReweightingTool->getCorrectedActualInteractionsPerCrossing (*eventInfo, true);
+ }
+
+ //--- PRWHash to recalculate PU weights using analysis ntuples
+ //--- https://twiki.cern.ch/twiki/bin/view/AtlasProtected/ExtendedPileupReweighting#Using_PRWHash_to_change_pileup_w
+
+ if (eventInfo->eventType (xAOD::EventInfo::IS_SIMULATION))
+ {
+ eventInfo->auxdata<ULong64_t>("PRWHash")
+ = m_pileupReweightingTool->getPRWHash (*eventInfo);
+ }
+
+ // In the case of nominal systematics store the RandomRunNumber for
+ // later. Event info can not be decorated at this point as the
+ // decoration will then also be present in subsequent shallow copies.
+ if (sys.empty())
+ {
+ nominalRandomRunNumber = eventInfo->auxdecor<unsigned int> ("RandomRunNumber");
+ }
+ }
// Must decorate the actual instance in the event store for
// the electron tool to work. The decoration is done out of the loop
diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/SysListDumperAlg.cxx b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/SysListDumperAlg.cxx
index 4763ebf956d7..b88ee2198b95 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/SysListDumperAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/SysListDumperAlg.cxx
@@ -60,15 +60,15 @@ namespace CP
TH1 *histogram = hist (m_histogramName);
int i = 1;
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode
+ for (const auto& sys : m_systematicsList.systematicsVector())
{
std::string name;
ANA_CHECK (m_systematicsList.service().makeSystematicsName (name, "%SYS%", sys));
histogram->GetXaxis()->SetBinLabel(i, name.c_str());
i++;
+ }
- return StatusCode::SUCCESS;
- });
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/EgammaCalibrationAndSmearingAlg.cxx b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/EgammaCalibrationAndSmearingAlg.cxx
index 6e6f5f03b3a5..2e232ce3962a 100644
--- a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/EgammaCalibrationAndSmearingAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/EgammaCalibrationAndSmearingAlg.cxx
@@ -46,18 +46,19 @@ namespace CP
StatusCode EgammaCalibrationAndSmearingAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- ANA_CHECK (m_calibrationAndSmearingTool->applySystematicVariation (sys));
- xAOD::EgammaContainer *egammas = nullptr;
- ANA_CHECK (m_egammaHandle.getCopy (egammas, sys));
- for (xAOD::Egamma *egamma : *egammas)
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ ANA_CHECK (m_calibrationAndSmearingTool->applySystematicVariation (sys));
+ xAOD::EgammaContainer *egammas = nullptr;
+ ANA_CHECK (m_egammaHandle.getCopy (egammas, sys));
+ for (xAOD::Egamma *egamma : *egammas)
+ {
+ if (m_preselection.getBool (*egamma))
{
- if (m_preselection.getBool (*egamma))
- {
- ANA_CHECK_CORRECTION (m_outOfValidity, *egamma, m_calibrationAndSmearingTool->applyCorrection (*egamma));
- }
+ ANA_CHECK_CORRECTION (m_outOfValidity, *egamma, m_calibrationAndSmearingTool->applyCorrection (*egamma));
}
- return StatusCode::SUCCESS;
- });
+ }
+ }
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/EgammaIsolationCorrectionAlg.cxx b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/EgammaIsolationCorrectionAlg.cxx
index 526218ba02c1..d14b1fc35eba 100644
--- a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/EgammaIsolationCorrectionAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/EgammaIsolationCorrectionAlg.cxx
@@ -46,18 +46,19 @@ namespace CP
StatusCode EgammaIsolationCorrectionAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- ANA_CHECK (m_isolationCorrectionTool->applySystematicVariation (sys));
- xAOD::EgammaContainer *egammas = nullptr;
- ANA_CHECK (m_egammaHandle.getCopy (egammas, sys));
- for (xAOD::Egamma *egamma : *egammas)
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ ANA_CHECK (m_isolationCorrectionTool->applySystematicVariation (sys));
+ xAOD::EgammaContainer *egammas = nullptr;
+ ANA_CHECK (m_egammaHandle.getCopy (egammas, sys));
+ for (xAOD::Egamma *egamma : *egammas)
+ {
+ if (m_preselection.getBool (*egamma))
{
- if (m_preselection.getBool (*egamma))
- {
- ANA_CHECK_CORRECTION (m_outOfValidity, *egamma, m_isolationCorrectionTool->applyCorrection (*egamma));
- }
+ ANA_CHECK_CORRECTION (m_outOfValidity, *egamma, m_isolationCorrectionTool->applyCorrection (*egamma));
}
- return StatusCode::SUCCESS;
- });
+ }
+ }
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/EgammaIsolationSelectionAlg.cxx b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/EgammaIsolationSelectionAlg.cxx
index 36e6f7d4fd9b..ce802747d9fd 100644
--- a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/EgammaIsolationSelectionAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/EgammaIsolationSelectionAlg.cxx
@@ -56,20 +56,21 @@ namespace CP
StatusCode EgammaIsolationSelectionAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- xAOD::EgammaContainer *egammas = nullptr;
- ANA_CHECK (m_egammasHandle.getCopy (egammas, sys));
- for (xAOD::Egamma *egamma : *egammas)
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ xAOD::EgammaContainer *egammas = nullptr;
+ ANA_CHECK (m_egammasHandle.getCopy (egammas, sys));
+ for (xAOD::Egamma *egamma : *egammas)
+ {
+ if (m_preselection.getBool (*egamma))
{
- if (m_preselection.getBool (*egamma))
- {
- m_selectionAccessor->setBits
- (*egamma, selectionFromAccept (m_selectionTool->accept (*egamma)));
- } else {
- m_selectionAccessor->setBits (*egamma, m_setOnFail);
- }
+ m_selectionAccessor->setBits
+ (*egamma, selectionFromAccept (m_selectionTool->accept (*egamma)));
+ } else {
+ m_selectionAccessor->setBits (*egamma, m_setOnFail);
}
- return StatusCode::SUCCESS;
- });
+ }
+ }
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/ElectronEfficiencyCorrectionAlg.cxx b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/ElectronEfficiencyCorrectionAlg.cxx
index 88e8a0b48bdc..af2f41138738 100644
--- a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/ElectronEfficiencyCorrectionAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/ElectronEfficiencyCorrectionAlg.cxx
@@ -54,22 +54,23 @@ namespace CP
StatusCode ElectronEfficiencyCorrectionAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- ANA_CHECK (m_efficiencyCorrectionTool->applySystematicVariation (sys));
- const xAOD::ElectronContainer *electrons = nullptr;
- ANA_CHECK (m_electronHandle.retrieve (electrons, sys));
- for (const xAOD::Electron *electron : *electrons)
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ ANA_CHECK (m_efficiencyCorrectionTool->applySystematicVariation (sys));
+ const xAOD::ElectronContainer *electrons = nullptr;
+ ANA_CHECK (m_electronHandle.retrieve (electrons, sys));
+ for (const xAOD::Electron *electron : *electrons)
+ {
+ if (m_preselection.getBool (*electron))
{
- if (m_preselection.getBool (*electron))
- {
- double sf = 0;
- ANA_CHECK_CORRECTION (m_outOfValidity, *electron, m_efficiencyCorrectionTool->getEfficiencyScaleFactor (*electron, sf));
- m_scaleFactorDecoration.set (*electron, sf, sys);
- } else {
- m_scaleFactorDecoration.set (*electron, invalidScaleFactor(), sys);
- }
+ double sf = 0;
+ ANA_CHECK_CORRECTION (m_outOfValidity, *electron, m_efficiencyCorrectionTool->getEfficiencyScaleFactor (*electron, sf));
+ m_scaleFactorDecoration.set (*electron, sf, sys);
+ } else {
+ m_scaleFactorDecoration.set (*electron, invalidScaleFactor(), sys);
}
- return StatusCode::SUCCESS;
- });
+ }
+ }
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/PhotonEfficiencyCorrectionAlg.cxx b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/PhotonEfficiencyCorrectionAlg.cxx
index 431c6bbba80b..c11da6812850 100644
--- a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/PhotonEfficiencyCorrectionAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/PhotonEfficiencyCorrectionAlg.cxx
@@ -54,20 +54,21 @@ namespace CP
StatusCode PhotonEfficiencyCorrectionAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- ANA_CHECK (m_efficiencyCorrectionTool->applySystematicVariation (sys));
- xAOD::PhotonContainer *photons = nullptr;
- ANA_CHECK (m_photonHandle.getCopy (photons, sys));
- for (xAOD::Photon *photon : *photons)
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ ANA_CHECK (m_efficiencyCorrectionTool->applySystematicVariation (sys));
+ xAOD::PhotonContainer *photons = nullptr;
+ ANA_CHECK (m_photonHandle.getCopy (photons, sys));
+ for (xAOD::Photon *photon : *photons)
+ {
+ if (m_preselection.getBool (*photon))
{
- if (m_preselection.getBool (*photon))
- {
- double sf = 0;
- ANA_CHECK_CORRECTION (m_outOfValidity, *photon, m_efficiencyCorrectionTool->getEfficiencyScaleFactor (*photon, sf));
- (*m_scaleFactorAccessor) (*photon) = sf;
- }
+ double sf = 0;
+ ANA_CHECK_CORRECTION (m_outOfValidity, *photon, m_efficiencyCorrectionTool->getEfficiencyScaleFactor (*photon, sf));
+ (*m_scaleFactorAccessor) (*photon) = sf;
}
- return StatusCode::SUCCESS;
- });
+ }
+ }
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/PhotonShowerShapeFudgeAlg.cxx b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/PhotonShowerShapeFudgeAlg.cxx
index 665e33a2e7e0..c3eb0fc042a4 100644
--- a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/PhotonShowerShapeFudgeAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/PhotonShowerShapeFudgeAlg.cxx
@@ -45,17 +45,18 @@ namespace CP
StatusCode PhotonShowerShapeFudgeAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- xAOD::PhotonContainer *photons = nullptr;
- ANA_CHECK (m_photonHandle.getCopy (photons, sys));
- for (xAOD::Photon *photon : *photons)
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ xAOD::PhotonContainer *photons = nullptr;
+ ANA_CHECK (m_photonHandle.getCopy (photons, sys));
+ for (xAOD::Photon *photon : *photons)
+ {
+ if (m_preselection.getBool (*photon))
{
- if (m_preselection.getBool (*photon))
- {
- ANA_CHECK_CORRECTION (m_outOfValidity, *photon, m_showerShapeFudgeTool->applyCorrection (*photon));
- }
+ ANA_CHECK_CORRECTION (m_outOfValidity, *photon, m_showerShapeFudgeTool->applyCorrection (*photon));
}
- return StatusCode::SUCCESS;
- });
+ }
+ }
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms/Root/BTaggingEfficiencyAlg.cxx b/PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms/Root/BTaggingEfficiencyAlg.cxx
index af6f383a119b..0aa0f8e348f7 100644
--- a/PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms/Root/BTaggingEfficiencyAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms/Root/BTaggingEfficiencyAlg.cxx
@@ -62,39 +62,40 @@ namespace CP
StatusCode BTaggingEfficiencyAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- ANA_CHECK (m_efficiencyTool->applySystematicVariation (sys));
- const xAOD::JetContainer *jets = nullptr;
- ANA_CHECK (m_jetHandle.retrieve (jets, sys));
- for (const xAOD::Jet *jet : *jets)
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ ANA_CHECK (m_efficiencyTool->applySystematicVariation (sys));
+ const xAOD::JetContainer *jets = nullptr;
+ ANA_CHECK (m_jetHandle.retrieve (jets, sys));
+ for (const xAOD::Jet *jet : *jets)
+ {
+ if (m_preselection.getBool (*jet))
{
- if (m_preselection.getBool (*jet))
+ float sf = 0;
+
+ // The efficiency tool can calculate both efficiencies and
+ // inefficiencies. This setup can calculate either, or
+ // both; in the case of the later a selection decoration is
+ // used to decide whether to calculate efficiencies or
+ // inefficiencies.
+ //
+ // Note that if you want to exclude jets from processing,
+ // this selection accessor/decoration has nothing to do with
+ // it. You do the pre-selection via a view container like
+ // for all the other CP algorithms.
+ if (!m_onlyInefficiency && m_selectionHandle.getBool (*jet))
+ {
+ ANA_CHECK_CORRECTION (m_outOfValidity, *jet, m_efficiencyTool->getScaleFactor (*jet, sf));
+ } else
{
- float sf = 0;
-
- // The efficiency tool can calculate both efficiencies and
- // inefficiencies. This setup can calculate either, or
- // both; in the case of the later a selection decoration is
- // used to decide whether to calculate efficiencies or
- // inefficiencies.
- //
- // Note that if you want to exclude jets from processing,
- // this selection accessor/decoration has nothing to do with
- // it. You do the pre-selection via a view container like
- // for all the other CP algorithms.
- if (!m_onlyInefficiency && m_selectionHandle.getBool (*jet))
- {
- ANA_CHECK_CORRECTION (m_outOfValidity, *jet, m_efficiencyTool->getScaleFactor (*jet, sf));
- } else
- {
- ANA_CHECK_CORRECTION (m_outOfValidity, *jet, m_efficiencyTool->getInefficiencyScaleFactor (*jet, sf));
- }
- m_scaleFactorDecoration.set (*jet, sf, sys);
- } else {
- m_scaleFactorDecoration.set (*jet, invalidScaleFactor(), sys);
+ ANA_CHECK_CORRECTION (m_outOfValidity, *jet, m_efficiencyTool->getInefficiencyScaleFactor (*jet, sf));
}
+ m_scaleFactorDecoration.set (*jet, sf, sys);
+ } else {
+ m_scaleFactorDecoration.set (*jet, invalidScaleFactor(), sys);
}
- return StatusCode::SUCCESS;
- });
+ }
+ }
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetCalibrationAlg.cxx b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetCalibrationAlg.cxx
index f94e871d7668..1fa1adec98a2 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetCalibrationAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetCalibrationAlg.cxx
@@ -42,11 +42,13 @@ namespace CP
StatusCode JetCalibrationAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- xAOD::JetContainer *jets = nullptr;
- ANA_CHECK (m_jetHandle.getCopy (jets, sys));
- ANA_CHECK (m_calibrationTool->applyCalibration(*jets));
- return StatusCode::SUCCESS;
- });
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ xAOD::JetContainer *jets = nullptr;
+ ANA_CHECK (m_jetHandle.getCopy (jets, sys));
+ ANA_CHECK (m_calibrationTool->applyCalibration(*jets));
+ }
+
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetGhostMuonAssociationAlg.cxx b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetGhostMuonAssociationAlg.cxx
index 3c6a6b8973b1..bdab686bd81f 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetGhostMuonAssociationAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetGhostMuonAssociationAlg.cxx
@@ -38,7 +38,8 @@ namespace CP
StatusCode JetGhostMuonAssociationAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
xAOD::JetContainer *jets = nullptr;
ANA_CHECK (m_jetHandle.getCopy (jets, sys));
@@ -46,8 +47,8 @@ namespace CP
const xAOD::MuonContainer* muons = nullptr;
ATH_CHECK( evtStore()->retrieve(muons, "Muons") );
met::addGhostMuonsToJets(*muons, *jets);
+ }
- return StatusCode::SUCCESS;
- });
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetModifierAlg.cxx b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetModifierAlg.cxx
index 7273676e57e1..5fd383abe732 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetModifierAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetModifierAlg.cxx
@@ -43,11 +43,13 @@ namespace CP
StatusCode JetModifierAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- xAOD::JetContainer *jets = nullptr;
- ANA_CHECK (m_jetHandle.getCopy (jets, sys));
- ANA_CHECK (m_modifierTool->modify (*jets));
- return StatusCode::SUCCESS;
- });
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ xAOD::JetContainer *jets = nullptr;
+ ANA_CHECK (m_jetHandle.getCopy (jets, sys));
+ ANA_CHECK (m_modifierTool->modify (*jets));
+ }
+
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetSelectionAlg.cxx b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetSelectionAlg.cxx
index 13e0b135dfed..e99e0179bd8a 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetSelectionAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetSelectionAlg.cxx
@@ -54,18 +54,20 @@ namespace CP
StatusCode JetSelectionAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- xAOD::JetContainer *jets = nullptr;
- ANA_CHECK (m_jetHandle.getCopy (jets, sys));
- for (xAOD::Jet *jet : *jets)
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ xAOD::JetContainer *jets = nullptr;
+ ANA_CHECK (m_jetHandle.getCopy (jets, sys));
+ for (xAOD::Jet *jet : *jets)
+ {
+ if (m_preselection.getBool (*jet))
{
- if (m_preselection.getBool (*jet))
- {
- m_selectionAccessor->setBool
- (*jet, m_selectionTool->keep(*jet));
- }
+ m_selectionAccessor->setBool
+ (*jet, m_selectionTool->keep(*jet));
}
- return StatusCode::SUCCESS;
- });
+ }
+ }
+
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetUncertaintiesAlg.cxx b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetUncertaintiesAlg.cxx
index 4ecbf00e8fc6..15916a97e3bc 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetUncertaintiesAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetUncertaintiesAlg.cxx
@@ -45,18 +45,20 @@ namespace CP
StatusCode JetUncertaintiesAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- ANA_CHECK (m_uncertaintiesTool->applySystematicVariation (sys));
- xAOD::JetContainer *jets = nullptr;
- ANA_CHECK (m_jetHandle.getCopy (jets, sys));
- for (xAOD::Jet *jet : *jets)
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ ANA_CHECK (m_uncertaintiesTool->applySystematicVariation (sys));
+ xAOD::JetContainer *jets = nullptr;
+ ANA_CHECK (m_jetHandle.getCopy (jets, sys));
+ for (xAOD::Jet *jet : *jets)
+ {
+ if (m_preselection.getBool (*jet))
{
- if (m_preselection.getBool (*jet))
- {
- ANA_CHECK_CORRECTION (m_outOfValidity, *jet, m_uncertaintiesTool->applyCorrection (*jet));
- }
+ ANA_CHECK_CORRECTION (m_outOfValidity, *jet, m_uncertaintiesTool->applyCorrection (*jet));
}
- return StatusCode::SUCCESS;
- });
+ }
+ }
+
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JvtEfficiencyAlg.cxx b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JvtEfficiencyAlg.cxx
index 3d7040ec46a4..49280bfc70a5 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JvtEfficiencyAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JvtEfficiencyAlg.cxx
@@ -67,47 +67,49 @@ namespace CP
StatusCode JvtEfficiencyAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- ANA_CHECK (m_efficiencyTool->applySystematicVariation (sys));
- const xAOD::JetContainer *jets = nullptr;
- ANA_CHECK (m_jetHandle.retrieve (jets, sys));
-
- const xAOD::JetContainer *truthjets = nullptr;
- if(!m_truthJetsName.empty()) {
- ANA_CHECK(evtStore()->retrieve(truthjets,m_truthJetsName));
- ANA_CHECK(m_efficiencyTool->tagTruth(jets,truthjets));
- }
-
- for (const xAOD::Jet *jet : *jets)
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ ANA_CHECK (m_efficiencyTool->applySystematicVariation (sys));
+ const xAOD::JetContainer *jets = nullptr;
+ ANA_CHECK (m_jetHandle.retrieve (jets, sys));
+
+ const xAOD::JetContainer *truthjets = nullptr;
+ if(!m_truthJetsName.empty()) {
+ ANA_CHECK(evtStore()->retrieve(truthjets,m_truthJetsName));
+ ANA_CHECK(m_efficiencyTool->tagTruth(jets,truthjets));
+ }
+
+ for (const xAOD::Jet *jet : *jets)
+ {
+ if (m_preselection.getBool (*jet))
{
- if (m_preselection.getBool (*jet))
+ bool goodJet = true;
+ if (m_selectionAccessor || m_skipBadEfficiency)
{
- bool goodJet = true;
- if (m_selectionAccessor || m_skipBadEfficiency)
- {
- goodJet = m_dofJVT ? m_fJVTStatusAccessor->getBool (*jet) : m_efficiencyTool->passesJvtCut (*jet);
- if (m_selectionAccessor)
- m_selectionAccessor->setBool (*jet, goodJet);
- }
- if (m_scaleFactorDecoration)
- {
- float sf = 1;
- if (goodJet) {
- ANA_CHECK_CORRECTION (m_outOfValidity, *jet, m_efficiencyTool->getEfficiencyScaleFactor (*jet, sf));
- } else if (!m_skipBadEfficiency) {
- ANA_CHECK_CORRECTION (m_outOfValidity, *jet, m_efficiencyTool->getInefficiencyScaleFactor (*jet, sf));
- }
- m_scaleFactorDecoration.set (*jet, sf, sys);
- }
- } else {
+ goodJet = m_dofJVT ? m_fJVTStatusAccessor->getBool (*jet) : m_efficiencyTool->passesJvtCut (*jet);
if (m_selectionAccessor)
- m_selectionAccessor->setBool (*jet, false);
-
- if (m_scaleFactorDecoration)
- m_scaleFactorDecoration.set (*jet, invalidScaleFactor(), sys);
+ m_selectionAccessor->setBool (*jet, goodJet);
}
+ if (m_scaleFactorDecoration)
+ {
+ float sf = 1;
+ if (goodJet) {
+ ANA_CHECK_CORRECTION (m_outOfValidity, *jet, m_efficiencyTool->getEfficiencyScaleFactor (*jet, sf));
+ } else if (!m_skipBadEfficiency) {
+ ANA_CHECK_CORRECTION (m_outOfValidity, *jet, m_efficiencyTool->getInefficiencyScaleFactor (*jet, sf));
+ }
+ m_scaleFactorDecoration.set (*jet, sf, sys);
+ }
+ } else {
+ if (m_selectionAccessor)
+ m_selectionAccessor->setBool (*jet, false);
+
+ if (m_scaleFactorDecoration)
+ m_scaleFactorDecoration.set (*jet, invalidScaleFactor(), sys);
}
- return StatusCode::SUCCESS;
- });
+ }
+ }
+
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JvtUpdateAlg.cxx b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JvtUpdateAlg.cxx
index 2207a00bec5a..59f26e3613db 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JvtUpdateAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JvtUpdateAlg.cxx
@@ -52,19 +52,20 @@ namespace CP
StatusCode JvtUpdateAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- xAOD::JetContainer *jets = nullptr;
- ANA_CHECK (m_jetHandle.getCopy (jets, sys));
- for (xAOD::Jet *jet : *jets)
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ xAOD::JetContainer *jets = nullptr;
+ ANA_CHECK (m_jetHandle.getCopy (jets, sys));
+ for (xAOD::Jet *jet : *jets)
+ {
+ if (m_preselection.getBool (*jet))
{
- if (m_preselection.getBool (*jet))
- {
- // manually update jvt decoration using the tool
- const float jvt = m_jvtTool->updateJvt (*jet);
- (*m_decorationAccessor) (*jet) = jvt;
- }
+ // manually update jvt decoration using the tool
+ const float jvt = m_jvtTool->updateJvt (*jet);
+ (*m_decorationAccessor) (*jet) = jvt;
}
- return StatusCode::SUCCESS;
- });
+ }
+ }
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/Root/MetBuilderAlg.cxx b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/Root/MetBuilderAlg.cxx
index b75a0eae063e..6aac61d0959f 100644
--- a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/Root/MetBuilderAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/Root/MetBuilderAlg.cxx
@@ -45,19 +45,20 @@ namespace CP
StatusCode MetBuilderAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- xAOD::MissingETContainer *met {};
- ANA_CHECK (m_metHandle.getCopy (met, sys));
-
- xAOD::MissingET *softTerm = (*met)[m_softTerm];
- if (softTerm == nullptr)
- {
- ANA_MSG_ERROR ("could not find MET soft-term: " << m_softTerm);
- return StatusCode::FAILURE;
- }
- ATH_CHECK (met::buildMETSum (m_finalKey, met, softTerm->source()));
-
- return StatusCode::SUCCESS;
- });
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ xAOD::MissingETContainer *met {};
+ ANA_CHECK (m_metHandle.getCopy (met, sys));
+
+ xAOD::MissingET *softTerm = (*met)[m_softTerm];
+ if (softTerm == nullptr)
+ {
+ ANA_MSG_ERROR ("could not find MET soft-term: " << m_softTerm);
+ return StatusCode::FAILURE;
+ }
+ ATH_CHECK (met::buildMETSum (m_finalKey, met, softTerm->source()));
+ }
+
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/Root/MetMakerAlg.cxx b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/Root/MetMakerAlg.cxx
index 206da690daa6..aa2a084fd8e7 100644
--- a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/Root/MetMakerAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/Root/MetMakerAlg.cxx
@@ -81,76 +81,78 @@ namespace CP
// Helper keeps track of object selection flags for this map
xAOD::MissingETAssociationHelper metHelper(&(*metMap));
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- auto met = std::make_unique<xAOD::MissingETContainer> ();
- auto aux = std::make_unique<xAOD::MissingETAuxContainer> ();
- met->setStore (aux.get());
-
- metHelper.resetObjSelectionFlags();
-
- if (m_invisHandle) {
- const xAOD::IParticleContainer* invisible = nullptr;
- ATH_CHECK( m_invisHandle.retrieve(invisible, sys) );
- ATH_CHECK( m_makerTool->markInvisible(invisible, metHelper, met.get() ) );
- }
-
- // Lambda helping with calculating the MET terms coming from the leptons
- // (and photons).
- auto processParticles =
- [&] (SysReadHandle<xAOD::IParticleContainer>& handle,
- xAOD::Type::ObjectType type,
- const std::string& term) -> StatusCode {
- if (!handle) {
- return StatusCode::SUCCESS;
- }
- const xAOD::IParticleContainer* particles = nullptr;
- ANA_CHECK (handle.retrieve (particles, sys));
- ANA_CHECK (m_makerTool->rebuildMET (term, type, met.get(),
- particles, metHelper));
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ auto met = std::make_unique<xAOD::MissingETContainer> ();
+ auto aux = std::make_unique<xAOD::MissingETAuxContainer> ();
+ met->setStore (aux.get());
+
+ metHelper.resetObjSelectionFlags();
+
+ if (m_invisHandle) {
+ const xAOD::IParticleContainer* invisible = nullptr;
+ ATH_CHECK( m_invisHandle.retrieve(invisible, sys) );
+ ATH_CHECK( m_makerTool->markInvisible(invisible, metHelper, met.get() ) );
+ }
+
+ // Lambda helping with calculating the MET terms coming from the leptons
+ // (and photons).
+ auto processParticles =
+ [&] (SysReadHandle<xAOD::IParticleContainer>& handle,
+ xAOD::Type::ObjectType type,
+ const std::string& term) -> StatusCode {
+ if (!handle) {
return StatusCode::SUCCESS;
- };
-
- // Calculate the terms coming from the user's selected objects.
- ANA_CHECK (processParticles (m_electronsHandle, xAOD::Type::Electron,
- m_electronsKey));
- ANA_CHECK (processParticles (m_photonsHandle, xAOD::Type::Photon,
- m_photonsKey));
- ANA_CHECK (processParticles (m_tausHandle, xAOD::Type::Tau, m_tausKey));
- ANA_CHECK (processParticles (m_muonsHandle, xAOD::Type::Muon,
- m_muonsKey));
-
- const xAOD::JetContainer *jets {nullptr};
- ANA_CHECK (m_jetsHandle.retrieve (jets, sys));
+ }
+ const xAOD::IParticleContainer* particles = nullptr;
+ ANA_CHECK (handle.retrieve (particles, sys));
+ ANA_CHECK (m_makerTool->rebuildMET (term, type, met.get(),
+ particles, metHelper));
+ return StatusCode::SUCCESS;
+ };
+
+ // Calculate the terms coming from the user's selected objects.
+ ANA_CHECK (processParticles (m_electronsHandle, xAOD::Type::Electron,
+ m_electronsKey));
+ ANA_CHECK (processParticles (m_photonsHandle, xAOD::Type::Photon,
+ m_photonsKey));
+ ANA_CHECK (processParticles (m_tausHandle, xAOD::Type::Tau, m_tausKey));
+ ANA_CHECK (processParticles (m_muonsHandle, xAOD::Type::Muon,
+ m_muonsKey));
+
+ const xAOD::JetContainer *jets {nullptr};
+ ANA_CHECK (m_jetsHandle.retrieve (jets, sys));
- if (m_doTrackMet)
- {
- ANA_CHECK (m_makerTool->rebuildTrackMET (m_jetsKey, m_softTermKey, met.get(), jets, metcore, metHelper, m_doJetJVT));
- } else
+ if (m_doTrackMet)
+ {
+ ANA_CHECK (m_makerTool->rebuildTrackMET (m_jetsKey, m_softTermKey, met.get(), jets, metcore, metHelper, m_doJetJVT));
+ } else
+ {
+ ANA_CHECK (m_makerTool->rebuildJetMET (m_jetsKey, m_softTermKey, met.get(), jets, metcore, metHelper, m_doJetJVT));
+ }
+
+ // Systematics
+ if (!m_systematicsTool.empty())
+ {
+ ANA_CHECK (m_systematicsTool->applySystematicVariation (sys));
+
+ xAOD::MissingET *softTerm = (*met)[m_softTermKey];
+ if (softTerm == nullptr)
{
- ANA_CHECK (m_makerTool->rebuildJetMET (m_jetsKey, m_softTermKey, met.get(), jets, metcore, metHelper, m_doJetJVT));
+ ANA_MSG_ERROR ("failed to find MET soft-term \"" << m_softTermKey << "\"");
+ return StatusCode::FAILURE;
}
- // Systematics
- if (!m_systematicsTool.empty())
- {
- ANA_CHECK (m_systematicsTool->applySystematicVariation (sys));
-
- xAOD::MissingET *softTerm = (*met)[m_softTermKey];
- if (softTerm == nullptr)
- {
- ANA_MSG_ERROR ("failed to find MET soft-term \"" << m_softTermKey << "\"");
- return StatusCode::FAILURE;
- }
+ // This returns a `CorrectionCode`, so in principle this could
+ // return an `OutOfValidity` result, but I have no idea what
+ // that would mean or how to handle it, so I'm implicitly
+ // converting it into a `FAILURE` instead.
+ ANA_CHECK (m_systematicsTool->applyCorrection (*softTerm, metHelper));
+ }
- // This returns a `CorrectionCode`, so in principle this could
- // return an `OutOfValidity` result, but I have no idea what
- // that would mean or how to handle it, so I'm implicitly
- // converting it into a `FAILURE` instead.
- ANA_CHECK (m_systematicsTool->applyCorrection (*softTerm, metHelper));
- }
+ ANA_CHECK (m_metHandle.record (std::move (met), std::move (aux), sys));
+ }
- ANA_CHECK (m_metHandle.record (std::move (met), std::move (aux), sys));
- return StatusCode::SUCCESS;
- });
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/Root/MetSignificanceAlg.cxx b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/Root/MetSignificanceAlg.cxx
index 253dd89cfd6d..5b2e246aa19d 100644
--- a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/Root/MetSignificanceAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/Root/MetSignificanceAlg.cxx
@@ -56,20 +56,21 @@ namespace CP
StatusCode MetSignificanceAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- // I'm not sure why this can't be const, but the interface
- // requires a non-const object
- xAOD::MissingETContainer *met {};
- ANA_CHECK (m_metHandle.getCopy (met, sys));
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ // I'm not sure why this can't be const, but the interface
+ // requires a non-const object
+ xAOD::MissingETContainer *met {};
+ ANA_CHECK (m_metHandle.getCopy (met, sys));
- const xAOD::EventInfo* evtInfo = 0;
- ANA_CHECK( evtStore()->retrieve( evtInfo, "EventInfo" ) );
+ const xAOD::EventInfo* evtInfo = 0;
+ ANA_CHECK( evtStore()->retrieve( evtInfo, "EventInfo" ) );
- ANA_CHECK (m_significanceTool->varianceMET (met, evtInfo->averageInteractionsPerCrossing(), m_jetTermName, m_softTermName, m_totalMETName));
- const float significance = m_significanceTool->GetSignificance();
- (*m_significanceAccessor) (*(*met)[m_totalMETName]) = significance;
+ ANA_CHECK (m_significanceTool->varianceMET (met, evtInfo->averageInteractionsPerCrossing(), m_jetTermName, m_softTermName, m_totalMETName));
+ const float significance = m_significanceTool->GetSignificance();
+ (*m_significanceAccessor) (*(*met)[m_totalMETName]) = significance;
+ }
- return StatusCode::SUCCESS;
- });
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonCalibrationAndSmearingAlg.cxx b/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonCalibrationAndSmearingAlg.cxx
index 20e890301d96..28ede652d978 100644
--- a/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonCalibrationAndSmearingAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonCalibrationAndSmearingAlg.cxx
@@ -48,18 +48,19 @@ namespace CP
StatusCode MuonCalibrationAndSmearingAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- ANA_CHECK (m_calibrationAndSmearingTool->applySystematicVariation (sys));
- xAOD::MuonContainer *muons = nullptr;
- ANA_CHECK (m_muonHandle.getCopy (muons, sys));
- for (xAOD::Muon *muon : *muons)
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ ANA_CHECK (m_calibrationAndSmearingTool->applySystematicVariation (sys));
+ xAOD::MuonContainer *muons = nullptr;
+ ANA_CHECK (m_muonHandle.getCopy (muons, sys));
+ for (xAOD::Muon *muon : *muons)
+ {
+ if (m_preselection.getBool (*muon))
{
- if (m_preselection.getBool (*muon))
- {
- ANA_CHECK_CORRECTION (m_outOfValidity, *muon, m_calibrationAndSmearingTool->applyCorrection (*muon));
- }
+ ANA_CHECK_CORRECTION (m_outOfValidity, *muon, m_calibrationAndSmearingTool->applyCorrection (*muon));
}
- return StatusCode::SUCCESS;
- });
+ }
+ }
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonEfficiencyScaleFactorAlg.cxx b/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonEfficiencyScaleFactorAlg.cxx
index cb9dea89e867..54f07302d252 100644
--- a/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonEfficiencyScaleFactorAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonEfficiencyScaleFactorAlg.cxx
@@ -59,49 +59,51 @@ namespace CP
StatusCode MuonEfficiencyScaleFactorAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- ANA_CHECK (m_efficiencyScaleFactorTool->applySystematicVariation (sys));
- const xAOD::MuonContainer *muons = nullptr;
- ANA_CHECK (m_muonHandle.retrieve (muons, sys));
- const xAOD::EventInfo *eventInfo = nullptr;
- ANA_CHECK (m_eventInfoHandle.retrieve (eventInfo, sys));
- for (const xAOD::Muon *muon : *muons)
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ ANA_CHECK (m_efficiencyScaleFactorTool->applySystematicVariation (sys));
+ const xAOD::MuonContainer *muons = nullptr;
+ ANA_CHECK (m_muonHandle.retrieve (muons, sys));
+ const xAOD::EventInfo *eventInfo = nullptr;
+ ANA_CHECK (m_eventInfoHandle.retrieve (eventInfo, sys));
+ for (const xAOD::Muon *muon : *muons)
+ {
+ if (m_preselection.getBool (*muon))
+ {
+ if (m_scaleFactorDecoration) {
+ float sf = 0;
+ ANA_CHECK_CORRECTION (m_outOfValidity, *muon, m_efficiencyScaleFactorTool->getEfficiencyScaleFactor (*muon, sf, eventInfo));
+ m_scaleFactorDecoration.set (*muon, sf, sys);
+ }
+
+ if (m_mcEfficiencyDecoration) {
+ float eff = 0;
+ ANA_CHECK_CORRECTION (m_outOfValidity, *muon, m_efficiencyScaleFactorTool->getMCEfficiency (*muon, eff, eventInfo));
+ m_mcEfficiencyDecoration.set (*muon, eff, sys);
+ }
+
+ if (m_dataEfficiencyDecoration) {
+ float eff = 0;
+ ANA_CHECK_CORRECTION (m_outOfValidity, *muon, m_efficiencyScaleFactorTool->getDataEfficiency (*muon, eff, eventInfo));
+ m_dataEfficiencyDecoration.set (*muon, eff, sys);
+ }
+ } else
{
- if (m_preselection.getBool (*muon))
- {
- if (m_scaleFactorDecoration) {
- float sf = 0;
- ANA_CHECK_CORRECTION (m_outOfValidity, *muon, m_efficiencyScaleFactorTool->getEfficiencyScaleFactor (*muon, sf, eventInfo));
- m_scaleFactorDecoration.set (*muon, sf, sys);
- }
-
- if (m_mcEfficiencyDecoration) {
- float eff = 0;
- ANA_CHECK_CORRECTION (m_outOfValidity, *muon, m_efficiencyScaleFactorTool->getMCEfficiency (*muon, eff, eventInfo));
- m_mcEfficiencyDecoration.set (*muon, eff, sys);
- }
-
- if (m_dataEfficiencyDecoration) {
- float eff = 0;
- ANA_CHECK_CORRECTION (m_outOfValidity, *muon, m_efficiencyScaleFactorTool->getDataEfficiency (*muon, eff, eventInfo));
- m_dataEfficiencyDecoration.set (*muon, eff, sys);
- }
- } else
- {
- if (m_scaleFactorDecoration) {
- m_scaleFactorDecoration.set (*muon, invalidScaleFactor(), sys);
- }
-
- if (m_mcEfficiencyDecoration) {
- m_mcEfficiencyDecoration.set (*muon, invalidEfficiency(), sys);
- }
-
- if (m_dataEfficiencyDecoration) {
- m_dataEfficiencyDecoration.set (*muon, invalidEfficiency(), sys);
- }
+ if (m_scaleFactorDecoration) {
+ m_scaleFactorDecoration.set (*muon, invalidScaleFactor(), sys);
+ }
+
+ if (m_mcEfficiencyDecoration) {
+ m_mcEfficiencyDecoration.set (*muon, invalidEfficiency(), sys);
+ }
+
+ if (m_dataEfficiencyDecoration) {
+ m_dataEfficiencyDecoration.set (*muon, invalidEfficiency(), sys);
}
}
- return StatusCode::SUCCESS;
- });
+ }
+ }
+
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonIsolationAlg.cxx b/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonIsolationAlg.cxx
index d4c307df8e07..e1b8b7825ddf 100644
--- a/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonIsolationAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonIsolationAlg.cxx
@@ -58,20 +58,21 @@ namespace CP
StatusCode MuonIsolationAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- xAOD::MuonContainer *muons = nullptr;
- ANA_CHECK (m_muonHandle.getCopy (muons, sys));
- for (xAOD::Muon *muon : *muons)
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ xAOD::MuonContainer *muons = nullptr;
+ ANA_CHECK (m_muonHandle.getCopy (muons, sys));
+ for (xAOD::Muon *muon : *muons)
+ {
+ if (m_preselection.getBool (*muon))
{
- if (m_preselection.getBool (*muon))
- {
- m_isolationAccessor->setBits
- (*muon, selectionFromAccept (m_isolationTool->accept (*muon)));
- } else {
- m_isolationAccessor->setBits (*muon, m_setOnFail);
- }
+ m_isolationAccessor->setBits
+ (*muon, selectionFromAccept (m_isolationTool->accept (*muon)));
+ } else {
+ m_isolationAccessor->setBits (*muon, m_setOnFail);
}
- return StatusCode::SUCCESS;
- });
+ }
+ }
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonSelectionAlg.cxx b/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonSelectionAlg.cxx
index 9f6b7f65564c..4c37cbcd823b 100644
--- a/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonSelectionAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonSelectionAlg.cxx
@@ -63,7 +63,7 @@ namespace CP
StatusCode MuonSelectionAlgV2 ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode
+ for (const auto& sys : m_systematicsList.systematicsVector())
{
xAOD::MuonContainer *muons = nullptr;
ANA_CHECK (m_muonsHandle.getCopy (muons, sys));
@@ -87,7 +87,7 @@ namespace CP
}
}
}
- return StatusCode::SUCCESS;
- });
+ }
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonTriggerEfficiencyScaleFactorAlg.cxx b/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonTriggerEfficiencyScaleFactorAlg.cxx
index 1dbf0e033fce..1794c7be2453 100644
--- a/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonTriggerEfficiencyScaleFactorAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonTriggerEfficiencyScaleFactorAlg.cxx
@@ -67,54 +67,55 @@ namespace CP
StatusCode MuonTriggerEfficiencyScaleFactorAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- ANA_CHECK (m_efficiencyScaleFactorTool->applySystematicVariation (sys));
- const xAOD::MuonContainer *muons = nullptr;
- ANA_CHECK (m_muonHandle.retrieve (muons, sys));
- const xAOD::EventInfo *eventInfo = nullptr;
- ANA_CHECK (m_eventInfoHandle.retrieve (eventInfo, sys));
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ ANA_CHECK (m_efficiencyScaleFactorTool->applySystematicVariation (sys));
+ const xAOD::MuonContainer *muons = nullptr;
+ ANA_CHECK (m_muonHandle.retrieve (muons, sys));
+ const xAOD::EventInfo *eventInfo = nullptr;
+ ANA_CHECK (m_eventInfoHandle.retrieve (eventInfo, sys));
+
+ unsigned int randomRunNumber = eventInfo->auxdecor<unsigned int>("RandomRunNumber");
+ bool validEvent = m_minRunNumber <= randomRunNumber && m_maxRunNumber >= randomRunNumber;
+
+ for (const xAOD::Muon *muon : *muons)
+ {
+ if (validEvent && m_preselection.getBool (*muon))
+ {
+ if (m_scaleFactorDecoration) {
+ double sf = 0;
+ ConstDataVector<xAOD::MuonContainer> singleMuonContainer(SG::VIEW_ELEMENTS);
+ singleMuonContainer.push_back(muon);
+ ANA_CHECK_CORRECTION (m_outOfValidity, *muon, m_efficiencyScaleFactorTool->getTriggerScaleFactor (*singleMuonContainer.asDataVector(), sf, m_trigger));
+ m_scaleFactorDecoration.set (*muon, sf, sys);
+ }
- unsigned int randomRunNumber = eventInfo->auxdecor<unsigned int>("RandomRunNumber");
- bool validEvent = m_minRunNumber <= randomRunNumber && m_maxRunNumber >= randomRunNumber;
+ if (m_mcEfficiencyDecoration) {
+ double eff = 0;
+ ANA_CHECK_CORRECTION (m_outOfValidity, *muon, m_efficiencyScaleFactorTool->getTriggerEfficiency (*muon, eff, m_trigger, false));
+ m_mcEfficiencyDecoration.set (*muon, eff, sys);
+ }
- for (const xAOD::Muon *muon : *muons)
- {
- if (validEvent && m_preselection.getBool (*muon))
- {
- if (m_scaleFactorDecoration) {
- double sf = 0;
- ConstDataVector<xAOD::MuonContainer> singleMuonContainer(SG::VIEW_ELEMENTS);
- singleMuonContainer.push_back(muon);
- ANA_CHECK_CORRECTION (m_outOfValidity, *muon, m_efficiencyScaleFactorTool->getTriggerScaleFactor (*singleMuonContainer.asDataVector(), sf, m_trigger));
- m_scaleFactorDecoration.set (*muon, sf, sys);
- }
-
- if (m_mcEfficiencyDecoration) {
- double eff = 0;
- ANA_CHECK_CORRECTION (m_outOfValidity, *muon, m_efficiencyScaleFactorTool->getTriggerEfficiency (*muon, eff, m_trigger, false));
- m_mcEfficiencyDecoration.set (*muon, eff, sys);
- }
-
- if (m_dataEfficiencyDecoration) {
- double eff = 0;
- ANA_CHECK_CORRECTION (m_outOfValidity, *muon, m_efficiencyScaleFactorTool->getTriggerEfficiency (*muon, eff, m_trigger, true));
- m_dataEfficiencyDecoration.set (*muon, eff, sys);
- }
- } else {
- if (m_scaleFactorDecoration) {
- m_scaleFactorDecoration.set (*muon, invalidScaleFactor(), sys);
- }
-
- if (m_mcEfficiencyDecoration) {
- m_mcEfficiencyDecoration.set (*muon, invalidEfficiency(), sys);
- }
-
- if (m_dataEfficiencyDecoration) {
- m_dataEfficiencyDecoration.set (*muon, invalidEfficiency(), sys);
- }
+ if (m_dataEfficiencyDecoration) {
+ double eff = 0;
+ ANA_CHECK_CORRECTION (m_outOfValidity, *muon, m_efficiencyScaleFactorTool->getTriggerEfficiency (*muon, eff, m_trigger, true));
+ m_dataEfficiencyDecoration.set (*muon, eff, sys);
+ }
+ } else {
+ if (m_scaleFactorDecoration) {
+ m_scaleFactorDecoration.set (*muon, invalidScaleFactor(), sys);
+ }
+
+ if (m_mcEfficiencyDecoration) {
+ m_mcEfficiencyDecoration.set (*muon, invalidEfficiency(), sys);
+ }
+
+ if (m_dataEfficiencyDecoration) {
+ m_dataEfficiencyDecoration.set (*muon, invalidEfficiency(), sys);
}
}
- return StatusCode::SUCCESS;
- });
+ }
+ }
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysFilterReporter.h b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysFilterReporter.h
index fcd978d1ed29..c8e2dbbc390b 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysFilterReporter.h
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysFilterReporter.h
@@ -31,12 +31,12 @@ namespace CP
/// SysFilterReporterCombiner filterCombiner
/// (m_filterParams, m_systematicsList, DEFAULT_DECISION);
///
- /// return m_systematicsList.foreach ([&](const CP::SystematicSet &sys) -> StatusCode {
+ /// for (const auto& sys : m_systematicsList.systematicsVector()) {
/// SysFilterReporter filter (filterCombiner, sys);
/// ...
/// filter.setPassed ();
- /// return StatusCode::SUCCESS;
- /// });
+ /// }
+ /// return StatusCode::SUCCESS;
/// }
/// ```
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysListHandle.h b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysListHandle.h
index 1538430d820b..a9d26f0b4059 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysListHandle.h
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysListHandle.h
@@ -87,6 +87,19 @@ namespace CP
/// \brief the list of systematics to loop over
+ ///
+ /// The way used should use this is as:
+ /// ```
+ /// for (const auto& sys : m_systematicsList.systematicsVector())
+ /// {
+ /// ...
+ /// }
+ /// ```
+ ///
+ /// The important part is to use `const auto&` instead of `const
+ /// CP::SystematicSet&` here, as in the future this may be updated
+ /// to be a vector of something other than a `CP::SystematicSet`
+ /// (still convertible to `const CP::SystematicSet&` though).
public:
const std::vector<CP::SystematicSet>& systematicsVector () const;
@@ -109,7 +122,12 @@ namespace CP
/// \par Failures
/// function failures
/// \pre isInitialized()
+ ///
+ /// \warn This is deprecated in favor of just calling \ref
+ /// systematicsVector directly (mostly to make code easier to
+ /// understand for new users).
public:
+ [[deprecated("please use systematicsVector() instead")]]
StatusCode foreach
(const std::function<StatusCode(const CP::SystematicSet&)>& func) const;
diff --git a/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/Root/DiTauEfficiencyCorrectionsAlg.cxx b/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/Root/DiTauEfficiencyCorrectionsAlg.cxx
index 28ab7f99e0cd..50fd77d3d6b3 100644
--- a/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/Root/DiTauEfficiencyCorrectionsAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/Root/DiTauEfficiencyCorrectionsAlg.cxx
@@ -54,20 +54,21 @@ namespace CP
StatusCode DiTauEfficiencyCorrectionsAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- ANA_CHECK (m_efficiencyCorrectionsTool->applySystematicVariation (sys));
- xAOD::DiTauJetContainer *taus = nullptr;
- ANA_CHECK (m_tauHandle.getCopy (taus, sys));
- for (xAOD::DiTauJet *tau : *taus)
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ ANA_CHECK (m_efficiencyCorrectionsTool->applySystematicVariation (sys));
+ xAOD::DiTauJetContainer *taus = nullptr;
+ ANA_CHECK (m_tauHandle.getCopy (taus, sys));
+ for (xAOD::DiTauJet *tau : *taus)
+ {
+ if (m_preselection.getBool (*tau))
{
- if (m_preselection.getBool (*tau))
- {
- double sf = 0;
- ANA_CHECK_CORRECTION (m_outOfValidity, *tau, m_efficiencyCorrectionsTool->getEfficiencyScaleFactor (*tau, sf));
- (*m_scaleFactorAccessor) (*tau) = sf;
- }
+ double sf = 0;
+ ANA_CHECK_CORRECTION (m_outOfValidity, *tau, m_efficiencyCorrectionsTool->getEfficiencyScaleFactor (*tau, sf));
+ (*m_scaleFactorAccessor) (*tau) = sf;
}
- return StatusCode::SUCCESS;
- });
+ }
+ }
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/Root/DiTauSmearingAlg.cxx b/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/Root/DiTauSmearingAlg.cxx
index 7fb9507b3bde..50ecc5b3ff59 100644
--- a/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/Root/DiTauSmearingAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/Root/DiTauSmearingAlg.cxx
@@ -47,19 +47,20 @@ namespace CP
StatusCode DiTauSmearingAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- ANA_CHECK (m_smearingTool->applySystematicVariation (sys));
- xAOD::DiTauJetContainer *taus = nullptr;
- ANA_CHECK (m_tauHandle.getCopy (taus, sys));
- for (xAOD::DiTauJet *tau : *taus)
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ ANA_CHECK (m_smearingTool->applySystematicVariation (sys));
+ xAOD::DiTauJetContainer *taus = nullptr;
+ ANA_CHECK (m_tauHandle.getCopy (taus, sys));
+ for (xAOD::DiTauJet *tau : *taus)
+ {
+ if (m_preselection.getBool (*tau))
{
- if (m_preselection.getBool (*tau))
- {
- ANA_CHECK_CORRECTION (m_outOfValidity, *tau, m_smearingTool->applyCorrection (*tau));
- }
+ ANA_CHECK_CORRECTION (m_outOfValidity, *tau, m_smearingTool->applyCorrection (*tau));
}
- return StatusCode::SUCCESS;
- });
+ }
+ }
+ return StatusCode::SUCCESS;
}
}
#endif
diff --git a/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/Root/DiTauTruthMatchingAlg.cxx b/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/Root/DiTauTruthMatchingAlg.cxx
index 39bf6b0c3ec2..9812aedf17d3 100644
--- a/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/Root/DiTauTruthMatchingAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/Root/DiTauTruthMatchingAlg.cxx
@@ -44,17 +44,18 @@ namespace CP
StatusCode DiTauTruthMatchingAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- xAOD::DiTauJetContainer *taus = nullptr;
- ANA_CHECK (m_tauHandle.getCopy (taus, sys));
- for (xAOD::DiTauJet *tau : *taus)
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ xAOD::DiTauJetContainer *taus = nullptr;
+ ANA_CHECK (m_tauHandle.getCopy (taus, sys));
+ for (xAOD::DiTauJet *tau : *taus)
+ {
+ if (m_preselection.getBool (*tau))
{
- if (m_preselection.getBool (*tau))
- {
- m_matchingTool->applyTruthMatch (*tau);
- }
+ m_matchingTool->applyTruthMatch (*tau);
}
- return StatusCode::SUCCESS;
- });
+ }
+ }
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/Root/TauEfficiencyCorrectionsAlg.cxx b/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/Root/TauEfficiencyCorrectionsAlg.cxx
index a1507f0a6fd6..b91d8d0cf5bb 100644
--- a/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/Root/TauEfficiencyCorrectionsAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/Root/TauEfficiencyCorrectionsAlg.cxx
@@ -53,22 +53,23 @@ namespace CP
StatusCode TauEfficiencyCorrectionsAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- ANA_CHECK (m_efficiencyCorrectionsTool->applySystematicVariation (sys));
- const xAOD::TauJetContainer *taus = nullptr;
- ANA_CHECK (m_tauHandle.retrieve (taus, sys));
- for (const xAOD::TauJet *tau : *taus)
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ ANA_CHECK (m_efficiencyCorrectionsTool->applySystematicVariation (sys));
+ const xAOD::TauJetContainer *taus = nullptr;
+ ANA_CHECK (m_tauHandle.retrieve (taus, sys));
+ for (const xAOD::TauJet *tau : *taus)
+ {
+ if (m_preselection.getBool (*tau))
{
- if (m_preselection.getBool (*tau))
- {
- double sf = 0;
- ANA_CHECK_CORRECTION (m_outOfValidity, *tau, m_efficiencyCorrectionsTool->getEfficiencyScaleFactor (*tau, sf));
- m_scaleFactorDecoration.set (*tau, sf, sys);
- } else {
- m_scaleFactorDecoration.set (*tau, invalidScaleFactor(), sys);
- }
+ double sf = 0;
+ ANA_CHECK_CORRECTION (m_outOfValidity, *tau, m_efficiencyCorrectionsTool->getEfficiencyScaleFactor (*tau, sf));
+ m_scaleFactorDecoration.set (*tau, sf, sys);
+ } else {
+ m_scaleFactorDecoration.set (*tau, invalidScaleFactor(), sys);
}
- return StatusCode::SUCCESS;
- });
+ }
+ }
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/Root/TauSmearingAlg.cxx b/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/Root/TauSmearingAlg.cxx
index d7eb7aead37c..d02986a62b00 100644
--- a/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/Root/TauSmearingAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/Root/TauSmearingAlg.cxx
@@ -46,18 +46,19 @@ namespace CP
StatusCode TauSmearingAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- ANA_CHECK (m_smearingTool->applySystematicVariation (sys));
- xAOD::TauJetContainer *taus = nullptr;
- ANA_CHECK (m_tauHandle.getCopy (taus, sys));
- for (xAOD::TauJet *tau : *taus)
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ ANA_CHECK (m_smearingTool->applySystematicVariation (sys));
+ xAOD::TauJetContainer *taus = nullptr;
+ ANA_CHECK (m_tauHandle.getCopy (taus, sys));
+ for (xAOD::TauJet *tau : *taus)
+ {
+ if (m_preselection.getBool (*tau))
{
- if (m_preselection.getBool (*tau))
- {
- ANA_CHECK_CORRECTION (m_outOfValidity, *tau, m_smearingTool->applyCorrection (*tau));
- }
+ ANA_CHECK_CORRECTION (m_outOfValidity, *tau, m_smearingTool->applyCorrection (*tau));
}
- return StatusCode::SUCCESS;
- });
+ }
+ }
+ return StatusCode::SUCCESS;
}
}
diff --git a/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/Root/TauTruthMatchingAlg.cxx b/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/Root/TauTruthMatchingAlg.cxx
index ac667b5fcf98..9394bc749620 100644
--- a/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/Root/TauTruthMatchingAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms/Root/TauTruthMatchingAlg.cxx
@@ -44,17 +44,18 @@ namespace CP
StatusCode TauTruthMatchingAlg ::
execute ()
{
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- xAOD::TauJetContainer *taus = nullptr;
- ANA_CHECK (m_tauHandle.getCopy (taus, sys));
- for (xAOD::TauJet *tau : *taus)
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ xAOD::TauJetContainer *taus = nullptr;
+ ANA_CHECK (m_tauHandle.getCopy (taus, sys));
+ for (xAOD::TauJet *tau : *taus)
+ {
+ if (m_preselection.getBool (*tau))
{
- if (m_preselection.getBool (*tau))
- {
- m_matchingTool->applyTruthMatch (*tau);
- }
+ m_matchingTool->applyTruthMatch (*tau);
}
- return StatusCode::SUCCESS;
- });
+ }
+ }
+ return StatusCode::SUCCESS;
}
}
--
GitLab
From ff2f7ab5481a4ae1f482b1f5eda6260297fea89f Mon Sep 17 00:00:00 2001
From: Daniele Zanzi <daniele.zanzi@cern.ch>
Date: Mon, 16 Aug 2021 16:43:58 +0000
Subject: [PATCH 067/272] Menu work for L1Topo multiplicity and decision boards
(ATR-23263, ATR-23196)
---
.../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 183 +++-
.../share/ref_data_v1Dev_build.ref | 96 +-
.../EnhancedBiasChainConfiguration.py | 3 -
.../Menu/CheckL1HLTConsistency.py | 2 +-
.../python/HLTMenuConfig/Menu/LS2_v1.py | 33 +-
.../HLTMenuConfig/Menu/Physics_pp_run3_v1.py | 7 +-
.../TriggerMenuMT/python/L1/Base/TopoAlgos.py | 31 +-
.../python/L1/Config/CTPInputConfig.py | 8 +-
.../TriggerMenuMT/python/L1/Config/ItemDef.py | 51 +-
.../python/L1/Config/ThresholdDef.py | 8 +-
.../python/L1/Config/TopoAlgoDef.py | 954 +++++++-----------
.../L1/Config/TopoAlgoDefMultiplicity.py | 14 +-
.../python/L1/Menu/Menu_MC_HI_v1.py | 134 +--
.../python/L1/Menu/Menu_MC_pp_v8.py | 31 +-
.../python/L1/Menu/Menu_MC_pp_v8_inputs.py | 85 +-
15 files changed, 800 insertions(+), 840 deletions(-)
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 9ecb16b91462..1ad5d42423c1 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -74,13 +74,13 @@ HLT_2g10_loose_mu20_L1MU20:
stepFeatures:
0: 14
1: 1
-HLT_2g15_loose_dPhi25_m80_L1DPHI-M70-2eEM12I:
+HLT_2g15_loose_dPhi25_m80_L1DPHI-M70-2eEM12M:
eventCount: 0
-HLT_2g15_tight_L1DPHI-M70-2eEM12I:
+HLT_2g15_tight_L1DPHI-M70-2eEM12M:
eventCount: 0
-HLT_2g15_tight_dPhi25_L1DPHI-M70-2eEM12I:
+HLT_2g15_tight_dPhi25_L1DPHI-M70-2eEM12M:
eventCount: 0
-HLT_2g15_tight_dPhi25_m80_L1DPHI-M70-2eEM12I:
+HLT_2g15_tight_dPhi25_m80_L1DPHI-M70-2eEM12M:
eventCount: 0
HLT_2g20_loose_L12EM15VH:
eventCount: 0
@@ -642,11 +642,35 @@ HLT_2mu6_bBmumu_Lxy0_L1BPH-2M9-2DR15-2MU6:
HLT_2mu6_bBmumux_BpmumuKp_L1BPH-2M9-2DR15-2MU6:
eventCount: 0
HLT_2mu6_bBmumux_BpmumuKp_L1LFV-MU6:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 4
+ 1: 2
+ 2: 2
+ 3: 1
+ 4: 1
+ stepFeatures:
+ 0: 8
+ 1: 9
+ 2: 4
+ 3: 4
+ 4: 2
HLT_2mu6_bBmumux_BsmumuPhi_L1BPH-2M9-2DR15-2MU6:
eventCount: 0
HLT_2mu6_bBmumux_BsmumuPhi_L1LFV-MU6:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 4
+ 1: 2
+ 2: 2
+ 3: 1
+ 4: 1
+ stepFeatures:
+ 0: 8
+ 1: 9
+ 2: 4
+ 3: 4
+ 4: 2
HLT_2mu6_bDimu_L12MU6:
eventCount: 1
stepCounts:
@@ -664,15 +688,42 @@ HLT_2mu6_bDimu_L12MU6:
HLT_2mu6_bDimu_L1BPH-2M9-2DR15-2MU6:
eventCount: 0
HLT_2mu6_bDimu_L1LFV-MU6:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 4
+ 1: 2
+ 2: 2
+ 3: 2
+ 4: 1
+ stepFeatures:
+ 0: 8
+ 1: 9
+ 2: 4
+ 3: 4
+ 4: 4
HLT_2mu6_bJpsimumu_L1BPH-2M9-2DR15-2MU6:
eventCount: 0
HLT_2mu6_bJpsimumu_Lxy0_L1BPH-2M9-2DR15-2MU6:
eventCount: 0
HLT_2mu6_bPhi_L1LFV-MU6:
eventCount: 0
+ stepCounts:
+ 0: 4
+ 1: 2
+ 2: 2
+ 3: 2
+ stepFeatures:
+ 0: 8
+ 1: 9
+ 2: 4
+ 3: 4
+ 4: 4
HLT_2mu6_bUpsimumu_L1BPH-8M15-0DR22-2MU6:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_2mu6_l2io_L12MU6:
eventCount: 3
stepCounts:
@@ -1709,7 +1760,7 @@ HLT_e20_lhtight_ivarloose_L1EM15VH:
2: 4
3: 4
4: 3
-HLT_e20_lhtight_ivarloose_L1ZAFB-25DPHI-eEM18I:
+HLT_e20_lhtight_ivarloose_L1ZAFB-25DPHI-eEM18M:
eventCount: 0
HLT_e20_lhvloose_L1EM15VH:
eventCount: 4
@@ -6073,6 +6124,16 @@ HLT_mu10_lateMu_L1LATE-MU10_XE50:
eventCount: 0
HLT_mu11_mu6_bBmumu_L1LFV-MU11:
eventCount: 0
+ stepCounts:
+ 0: 4
+ 1: 1
+ 2: 1
+ stepFeatures:
+ 0: 15
+ 1: 19
+ 2: 8
+ 3: 4
+ 4: 4
HLT_mu11_mu6_bBmumu_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -6107,6 +6168,14 @@ HLT_mu11_mu6_bBmumux_BdmumuKst_L1MU11_2MU6:
3: 4
HLT_mu11_mu6_bBmumux_BpmumuKp_L1LFV-MU11:
eventCount: 0
+ stepCounts:
+ 0: 4
+ 1: 1
+ stepFeatures:
+ 0: 15
+ 1: 19
+ 2: 8
+ 3: 4
HLT_mu11_mu6_bBmumux_BpmumuKp_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -6139,6 +6208,16 @@ HLT_mu11_mu6_bBmumux_LbPqKm_L1MU11_2MU6:
3: 4
HLT_mu11_mu6_bDimu2700_L1LFV-MU11:
eventCount: 0
+ stepCounts:
+ 0: 4
+ 1: 1
+ 2: 1
+ stepFeatures:
+ 0: 15
+ 1: 19
+ 2: 8
+ 3: 4
+ 4: 4
HLT_mu11_mu6_bDimu2700_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -6165,6 +6244,16 @@ HLT_mu11_mu6_bDimu2700_Lxy0_L1MU11_2MU6:
4: 4
HLT_mu11_mu6_bDimu_L1LFV-MU11:
eventCount: 0
+ stepCounts:
+ 0: 4
+ 1: 1
+ 2: 1
+ stepFeatures:
+ 0: 15
+ 1: 19
+ 2: 8
+ 3: 4
+ 4: 4
HLT_mu11_mu6_bDimu_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -6191,6 +6280,16 @@ HLT_mu11_mu6_bDimu_Lxy0_L1MU11_2MU6:
4: 4
HLT_mu11_mu6_bJpsimumu_L1LFV-MU11:
eventCount: 0
+ stepCounts:
+ 0: 4
+ 1: 1
+ 2: 1
+ stepFeatures:
+ 0: 15
+ 1: 19
+ 2: 8
+ 3: 4
+ 4: 4
HLT_mu11_mu6_bJpsimumu_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -6217,6 +6316,16 @@ HLT_mu11_mu6_bJpsimumu_Lxy0_L1MU11_2MU6:
4: 4
HLT_mu11_mu6_bPhi_L1LFV-MU11:
eventCount: 0
+ stepCounts:
+ 0: 4
+ 1: 1
+ 2: 1
+ stepFeatures:
+ 0: 15
+ 1: 19
+ 2: 8
+ 3: 4
+ 4: 4
HLT_mu11_mu6_bPhi_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -6231,6 +6340,16 @@ HLT_mu11_mu6_bPhi_L1MU11_2MU6:
4: 4
HLT_mu11_mu6_bTau_L1LFV-MU11:
eventCount: 0
+ stepCounts:
+ 0: 4
+ 1: 1
+ 2: 1
+ stepFeatures:
+ 0: 15
+ 1: 19
+ 2: 8
+ 3: 4
+ 4: 4
HLT_mu11_mu6_bTau_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -6245,6 +6364,16 @@ HLT_mu11_mu6_bTau_L1MU11_2MU6:
4: 4
HLT_mu11_mu6_bUpsimumu_L1LFV-MU11:
eventCount: 0
+ stepCounts:
+ 0: 4
+ 1: 1
+ 2: 1
+ stepFeatures:
+ 0: 15
+ 1: 19
+ 2: 8
+ 3: 4
+ 4: 4
HLT_mu11_mu6_bUpsimumu_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -6611,12 +6740,6 @@ HLT_mu20_msonly_L1MU20:
1: 7
HLT_mu20_msonly_iloosems_mu6noL1_msonly_nscan_L110DR-MU20-MU6:
eventCount: 0
- stepCounts:
- 0: 2
- 1: 2
- stepFeatures:
- 0: 4
- 1: 3
HLT_mu20_msonly_iloosems_mu6noL1_msonly_nscan_L1MU20_J40:
eventCount: 1
stepCounts:
@@ -7881,6 +8004,28 @@ HLT_noalg_L1eEM8:
eventCount: 0
HLT_noalg_L1eEM8L:
eventCount: 0
+HLT_noalg_L1eTAU100:
+ eventCount: 0
+HLT_noalg_L1eTAU12:
+ eventCount: 0
+HLT_noalg_L1eTAU12M:
+ eventCount: 0
+HLT_noalg_L1eTAU20:
+ eventCount: 0
+HLT_noalg_L1eTAU20M:
+ eventCount: 0
+HLT_noalg_L1eTAU25:
+ eventCount: 0
+HLT_noalg_L1eTAU25M:
+ eventCount: 0
+HLT_noalg_L1eTAU30H:
+ eventCount: 0
+HLT_noalg_L1eTAU40:
+ eventCount: 0
+HLT_noalg_L1eTAU60:
+ eventCount: 0
+HLT_noalg_L1eTAU8:
+ eventCount: 0
HLT_noalg_LArPEBCalib_L1RD0_BGRP11:
eventCount: 0
HLT_noalg_LArPEBCalib_L1RD0_EMPTY:
@@ -7974,6 +8119,8 @@ HLT_tau160_medium1_tracktwo_L1TAU100:
eventCount: 0
HLT_tau160_mediumRNN_tracktwoMVABDT_L1TAU100:
eventCount: 0
+HLT_tau160_mediumRNN_tracktwoMVABDT_L1eTAU100:
+ eventCount: 0
HLT_tau160_mediumRNN_tracktwoMVATest_L1TAU100:
eventCount: 0
HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100:
@@ -8134,6 +8281,10 @@ HLT_tau25_mediumRNN_tracktwoMVABDT_L1TAU12IM:
2: 22
3: 22
4: 5
+HLT_tau25_mediumRNN_tracktwoMVABDT_L1eTAU12:
+ eventCount: 0
+HLT_tau25_mediumRNN_tracktwoMVABDT_L1eTAU12M:
+ eventCount: 0
? HLT_tau25_mediumRNN_tracktwoMVABDT_tau20_mediumRNN_tracktwoMVABDT_03dRAB_j70_0eta320_j50_0eta490_j0_DJMASS900j50_L1MJJ-500-NFF
: eventCount: 0
stepCounts:
@@ -8382,6 +8533,10 @@ HLT_tau35_mediumRNN_tracktwoMVABDT_L1TAU20IM:
2: 17
3: 17
4: 5
+HLT_tau35_mediumRNN_tracktwoMVABDT_L1eTAU20:
+ eventCount: 0
+HLT_tau35_mediumRNN_tracktwoMVABDT_L1eTAU20M:
+ eventCount: 0
HLT_tau35_mediumRNN_tracktwoMVABDT_tau25_mediumRNN_tracktwoMVABDT_03dRAB30_L1DR-TAU20ITAU12I-J25:
eventCount: 1
stepCounts:
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index 897d55b282e5..255eaa8491d1 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -36,13 +36,13 @@ HLT_2e5_lhvloose_bBeeM6000_L12EM3:
3: 2
HLT_2g10_loose_mu20_L1MU20:
eventCount: 0
-HLT_2g15_loose_dPhi25_m80_L1DPHI-M70-2eEM12I:
+HLT_2g15_loose_dPhi25_m80_L1DPHI-M70-2eEM12M:
eventCount: 0
-HLT_2g15_tight_L1DPHI-M70-2eEM12I:
+HLT_2g15_tight_L1DPHI-M70-2eEM12M:
eventCount: 0
-HLT_2g15_tight_dPhi25_L1DPHI-M70-2eEM12I:
+HLT_2g15_tight_dPhi25_L1DPHI-M70-2eEM12M:
eventCount: 0
-HLT_2g15_tight_dPhi25_m80_L1DPHI-M70-2eEM12I:
+HLT_2g15_tight_dPhi25_m80_L1DPHI-M70-2eEM12M:
eventCount: 0
HLT_2g20_loose_L12EM15VH:
eventCount: 0
@@ -271,10 +271,18 @@ HLT_2mu6_bBmumux_BpmumuKp_L1BPH-2M9-2DR15-2MU6:
eventCount: 0
HLT_2mu6_bBmumux_BpmumuKp_L1LFV-MU6:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_2mu6_bBmumux_BsmumuPhi_L1BPH-2M9-2DR15-2MU6:
eventCount: 0
HLT_2mu6_bBmumux_BsmumuPhi_L1LFV-MU6:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_2mu6_bDimu_L12MU6:
eventCount: 0
stepCounts:
@@ -285,12 +293,20 @@ HLT_2mu6_bDimu_L1BPH-2M9-2DR15-2MU6:
eventCount: 0
HLT_2mu6_bDimu_L1LFV-MU6:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_2mu6_bJpsimumu_L1BPH-2M9-2DR15-2MU6:
eventCount: 0
HLT_2mu6_bJpsimumu_Lxy0_L1BPH-2M9-2DR15-2MU6:
eventCount: 0
HLT_2mu6_bPhi_L1LFV-MU6:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_2mu6_bUpsimumu_L1BPH-8M15-0DR22-2MU6:
eventCount: 0
HLT_2mu6_l2io_L12MU6:
@@ -654,7 +670,7 @@ HLT_e20_lhloose_L1EM7_AFP_A_OR_C:
eventCount: 0
HLT_e20_lhtight_ivarloose_L1EM15VH:
eventCount: 0
-HLT_e20_lhtight_ivarloose_L1ZAFB-25DPHI-eEM18I:
+HLT_e20_lhtight_ivarloose_L1ZAFB-25DPHI-eEM18M:
eventCount: 0
HLT_e20_lhvloose_L1EM15VH:
eventCount: 0
@@ -1023,11 +1039,11 @@ HLT_e9_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM7:
HLT_e9_lhvloose_mu20_mu8noL1_L1MU20:
eventCount: 0
HLT_eb_low_L1RD2_FILLED:
- eventCount: 9
+ eventCount: 10
stepCounts:
- 0: 9
+ 0: 10
stepFeatures:
- 0: 9
+ 0: 10
HLT_eb_medium_L1RD2_FILLED:
eventCount: 6
stepCounts:
@@ -2500,6 +2516,10 @@ HLT_mu10_lateMu_L1LATE-MU10_XE50:
eventCount: 0
HLT_mu11_mu6_bBmumu_L1LFV-MU11:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_mu11_mu6_bBmumu_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -2520,6 +2540,10 @@ HLT_mu11_mu6_bBmumux_BdmumuKst_L1MU11_2MU6:
0: 3
HLT_mu11_mu6_bBmumux_BpmumuKp_L1LFV-MU11:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_mu11_mu6_bBmumux_BpmumuKp_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -2540,6 +2564,10 @@ HLT_mu11_mu6_bBmumux_LbPqKm_L1MU11_2MU6:
0: 3
HLT_mu11_mu6_bDimu2700_L1LFV-MU11:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_mu11_mu6_bDimu2700_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -2554,6 +2582,10 @@ HLT_mu11_mu6_bDimu2700_Lxy0_L1MU11_2MU6:
0: 3
HLT_mu11_mu6_bDimu_L1LFV-MU11:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_mu11_mu6_bDimu_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -2568,6 +2600,10 @@ HLT_mu11_mu6_bDimu_Lxy0_L1MU11_2MU6:
0: 3
HLT_mu11_mu6_bJpsimumu_L1LFV-MU11:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_mu11_mu6_bJpsimumu_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -2582,6 +2618,10 @@ HLT_mu11_mu6_bJpsimumu_Lxy0_L1MU11_2MU6:
0: 3
HLT_mu11_mu6_bPhi_L1LFV-MU11:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_mu11_mu6_bPhi_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -2590,6 +2630,10 @@ HLT_mu11_mu6_bPhi_L1MU11_2MU6:
0: 3
HLT_mu11_mu6_bTau_L1LFV-MU11:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_mu11_mu6_bTau_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -2598,6 +2642,10 @@ HLT_mu11_mu6_bTau_L1MU11_2MU6:
0: 3
HLT_mu11_mu6_bUpsimumu_L1LFV-MU11:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_mu11_mu6_bUpsimumu_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -3281,6 +3329,28 @@ HLT_noalg_L1eEM8:
eventCount: 6
HLT_noalg_L1eEM8L:
eventCount: 0
+HLT_noalg_L1eTAU100:
+ eventCount: 0
+HLT_noalg_L1eTAU12:
+ eventCount: 0
+HLT_noalg_L1eTAU12M:
+ eventCount: 0
+HLT_noalg_L1eTAU20:
+ eventCount: 0
+HLT_noalg_L1eTAU20M:
+ eventCount: 0
+HLT_noalg_L1eTAU25:
+ eventCount: 0
+HLT_noalg_L1eTAU25M:
+ eventCount: 0
+HLT_noalg_L1eTAU30H:
+ eventCount: 0
+HLT_noalg_L1eTAU40:
+ eventCount: 0
+HLT_noalg_L1eTAU60:
+ eventCount: 0
+HLT_noalg_L1eTAU8:
+ eventCount: 0
HLT_noalg_LArPEBCalib_L1RD0_BGRP11:
eventCount: 0
HLT_noalg_LArPEBCalib_L1RD0_EMPTY:
@@ -3359,6 +3429,8 @@ HLT_tau160_medium1_tracktwo_L1TAU100:
eventCount: 0
HLT_tau160_mediumRNN_tracktwoMVABDT_L1TAU100:
eventCount: 0
+HLT_tau160_mediumRNN_tracktwoMVABDT_L1eTAU100:
+ eventCount: 0
HLT_tau160_mediumRNN_tracktwoMVATest_L1TAU100:
eventCount: 0
HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100:
@@ -3517,6 +3589,10 @@ HLT_tau25_mediumRNN_tracktwoMVABDT_L1TAU12IM:
1: 3
2: 3
3: 3
+HLT_tau25_mediumRNN_tracktwoMVABDT_L1eTAU12:
+ eventCount: 0
+HLT_tau25_mediumRNN_tracktwoMVABDT_L1eTAU12M:
+ eventCount: 0
? HLT_tau25_mediumRNN_tracktwoMVABDT_tau20_mediumRNN_tracktwoMVABDT_03dRAB_j70_0eta320_j50_0eta490_j0_DJMASS900j50_L1MJJ-500-NFF
: eventCount: 0
stepFeatures:
@@ -3713,6 +3789,10 @@ HLT_tau35_mediumRNN_tracktwoMVABDT_L1TAU20IM:
1: 3
2: 3
3: 3
+HLT_tau35_mediumRNN_tracktwoMVABDT_L1eTAU20:
+ eventCount: 0
+HLT_tau35_mediumRNN_tracktwoMVABDT_L1eTAU20M:
+ eventCount: 0
HLT_tau35_mediumRNN_tracktwoMVABDT_tau25_mediumRNN_tracktwoMVABDT_03dRAB30_L1DR-TAU20ITAU12I-J25:
eventCount: 0
HLT_tau35_mediumRNN_tracktwoMVABDT_tau25_mediumRNN_tracktwoMVABDT_03dRAB_L1TAU20IM_2TAU12IM_4J12p0ETA25:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/EnhancedBiasChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/EnhancedBiasChainConfiguration.py
index c90a429d6543..28ba20a5399a 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/EnhancedBiasChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/EnhancedBiasChainConfiguration.py
@@ -38,9 +38,6 @@ l1seeds = { 'low' : \
'L1_J40p0ETA25_2J15p31ETA49',\
'L1_J50',\
'L1_J50_DETA20-J50J',\
- 'L1_JPSI-1M5-eEM12',\
- 'L1_LFV-eEM15I',\
- 'L1_LFV-eEM8I',\
'L1_LFV-MU6',\
'L1_MU10_TAU12IM',\
'L1_MU6_J20',\
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/CheckL1HLTConsistency.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/CheckL1HLTConsistency.py
index a0ee5e4cdd69..0caf289970ff 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/CheckL1HLTConsistency.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/CheckL1HLTConsistency.py
@@ -32,7 +32,7 @@ def checkL1HLTConsistency():
for p in chain['chainParts']:
#now check that the thresholds of the chain are listed in the L1Menu.thresholds field
th = p['L1threshold'][5:] if p['L1threshold'].startswith("PROBE") else p['L1threshold']
- if 'TAU' in th:
+ if ('TAU' in th) and ('e' not in th) and ('j' not in th):
th = th.replace('TAU','HA')
thFoundInL1Menu = False
l1type = "NOTFOUND"
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index ece49383baf2..26e067810cf2 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -49,6 +49,7 @@ from TriggerMenuMT.HLTMenuConfig.Menu.Physics_pp_run3_v1 import (PhysicsStream,
EOFBPhysL1MuGroup,
EOFTLALegGroup,
UnconvTrkGroup,
+ TauPhaseIStreamersGroup,
EgammaPhaseIStreamersGroup
)
@@ -193,10 +194,10 @@ def setupMenu():
ChainProp(name='HLT_g80_loose_LArPEBHLT_L1EM20VHI',stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup),
#ATR-21882
- ChainProp(name='HLT_2g15_tight_dPhi25_m80_L1DPHI-M70-2eEM12I', l1SeedThresholds=['EM12'], groups=PrimaryPhIGroup+MultiPhotonGroup),
+ ChainProp(name='HLT_2g15_tight_dPhi25_m80_L1DPHI-M70-2eEM12M', l1SeedThresholds=['eEM10L'], groups=PrimaryPhIGroup+MultiPhotonGroup), # TODO: mismatch between L1topo threshold and L1 seed to be fixed
#Support photon chains ATR-23425
- ChainProp(name='HLT_2g15_loose_dPhi25_m80_L1DPHI-M70-2eEM12I', l1SeedThresholds=['EM12'], groups=SupportPhIGroup+MultiPhotonGroup),
+ ChainProp(name='HLT_2g15_loose_dPhi25_m80_L1DPHI-M70-2eEM12M', l1SeedThresholds=['eEM10L'], groups=SupportPhIGroup+MultiPhotonGroup), # TODO: mismatch between L1topo threshold and L1 seed to be fixed
ChainProp(name='HLT_2g20_loose_L12EM15VH', groups=SupportLegGroup+MultiPhotonGroup),
#------------ 1e_1g HEG ATR-23158
@@ -755,11 +756,17 @@ def setupMenu():
ChainProp(name="HLT_tau200_mediumRNN_tracktwoLLP_L1TAU100", groups=SupportLegGroup+SingleTauGroup), #
ChainProp(name="HLT_tau200_tightRNN_tracktwoLLP_L1TAU100", groups=SupportLegGroup+SingleTauGroup),
-
# displaced tau+X (ATR-21754)
- ChainProp(name="HLT_tau80_mediumRNN_tracktwoLLP_tau60_tightRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40", l1SeedThresholds=['TAU60','TAU40'], groups=SupportLegGroup+TauJetGroup), ChainProp(name="HLT_tau80_tightRNN_tracktwoLLP_tau60_tightRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40", l1SeedThresholds=['TAU60','TAU40'], groups=SupportLegGroup+TauJetGroup),
- ChainProp(name="HLT_tau100_mediumRNN_tracktwoLLP_tau80_mediumRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40", l1SeedThresholds=['TAU60','TAU40'], groups=SupportLegGroup+TauJetGroup),
-
+ ChainProp(name="HLT_tau80_mediumRNN_tracktwoLLP_tau60_tightRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40", l1SeedThresholds=['TAU60','TAU40'], groups=SupportLegGroup+TauJetGroup),
+ ChainProp(name="HLT_tau80_tightRNN_tracktwoLLP_tau60_tightRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40", l1SeedThresholds=['TAU60','TAU40'], groups=SupportLegGroup+TauJetGroup),
+ ChainProp(name="HLT_tau100_mediumRNN_tracktwoLLP_tau80_mediumRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40", l1SeedThresholds=['TAU60','TAU40'], groups=SupportLegGroup+TauJetGroup),
+
+ # Phase-I
+ ChainProp(name="HLT_tau25_mediumRNN_tracktwoMVABDT_L1eTAU12", groups=SingleTauGroup),
+ ChainProp(name="HLT_tau25_mediumRNN_tracktwoMVABDT_L1eTAU12M", groups=SingleTauGroup),
+ ChainProp(name="HLT_tau35_mediumRNN_tracktwoMVABDT_L1eTAU20", groups=SingleTauGroup),
+ ChainProp(name="HLT_tau35_mediumRNN_tracktwoMVABDT_L1eTAU20M", groups=SingleTauGroup),
+ ChainProp(name="HLT_tau160_mediumRNN_tracktwoMVABDT_L1eTAU100", groups=SingleTauGroup),
]
TriggerFlags.BphysicsSlice.signatures = TriggerFlags.BphysicsSlice.signatures() + [
@@ -1087,8 +1094,19 @@ def setupMenu():
#ChainProp(name='HLT_noalg_zb_L1ZB', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'], groups=ZeroBiasGroup),
ChainProp(name='HLT_noalg_L1All', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=['Primary:CostAndRate', 'RATE:SeededStreamers', 'BW:Other']), # ATR-22072, for rates in MC. To move to MC menu once good nightly in LS2_v1.
+ #Phase-I
+ ChainProp(name='HLT_noalg_L1eTAU8', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=TauPhaseIStreamersGroup),
+ ChainProp(name='HLT_noalg_L1eTAU12', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=TauPhaseIStreamersGroup),
+ ChainProp(name='HLT_noalg_L1eTAU12M', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=TauPhaseIStreamersGroup),
+ ChainProp(name='HLT_noalg_L1eTAU20', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=TauPhaseIStreamersGroup),
+ ChainProp(name='HLT_noalg_L1eTAU20M', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=TauPhaseIStreamersGroup),
+ ChainProp(name='HLT_noalg_L1eTAU25', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=TauPhaseIStreamersGroup),
+ ChainProp(name='HLT_noalg_L1eTAU25M', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=TauPhaseIStreamersGroup),
+ ChainProp(name='HLT_noalg_L1eTAU30H', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=TauPhaseIStreamersGroup),
+ ChainProp(name='HLT_noalg_L1eTAU40', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=TauPhaseIStreamersGroup),
+ ChainProp(name='HLT_noalg_L1eTAU60', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=TauPhaseIStreamersGroup),
+ ChainProp(name='HLT_noalg_L1eTAU100', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=TauPhaseIStreamersGroup),
- #Phase-I streamers:
ChainProp(name='HLT_noalg_L1eEM3', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=EgammaPhaseIStreamersGroup),
ChainProp(name='HLT_noalg_L1eEM7', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=EgammaPhaseIStreamersGroup),
ChainProp(name='HLT_noalg_L1eEM8', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=EgammaPhaseIStreamersGroup),
@@ -1105,6 +1123,7 @@ def setupMenu():
ChainProp(name='HLT_noalg_L1eEM22', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=EgammaPhaseIStreamersGroup),
ChainProp(name='HLT_noalg_L1eEM22M', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=EgammaPhaseIStreamersGroup),
ChainProp(name='HLT_noalg_L1eEM22T', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=EgammaPhaseIStreamersGroup),
+
]
TriggerFlags.MonitorSlice.signatures = TriggerFlags.MonitorSlice.signatures() + [
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
index 135bbad17c12..c3bb5490cf9f 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
@@ -44,6 +44,7 @@ ZeroBiasGroup = ['RATE:ZeroBias', 'BW:ZeroBias']
EgammaStreamersGroup = ['RATE:SeededStreamers', 'BW:Egamma']
EgammaPhaseIStreamersGroup = ['RATE:PhaseISeededStreamers', 'BW:Egamma']
TauStreamersGroup = ['RATE:SeededStreamers', 'BW:Tau']
+TauPhaseIStreamersGroup = ['RATE:PhaseISeededStreamers', 'BW:Tau']
JetStreamersGroup = ['RATE:SeededStreamers', 'BW:Jet']
METStreamersGroup = ['RATE:SeededStreamers', 'BW:MET']
BCIDmonGroup = ['MON:BCID']
@@ -143,7 +144,7 @@ def setupMenu():
ChainProp(name='HLT_e26_lhtight_e15_etcut_Zee_L1EM22VHI', l1SeedThresholds=['EM22VHI','EM7'], groups=TagAndProbeLegGroup+MultiElectronGroup),
#--------- primary special
- ChainProp(name='HLT_e20_lhtight_ivarloose_L1ZAFB-25DPHI-eEM18I', l1SeedThresholds=['EM12'], groups=PrimaryPhIGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e20_lhtight_ivarloose_L1ZAFB-25DPHI-eEM18M', l1SeedThresholds=['eEM18M'], groups=PrimaryPhIGroup+SingleElectronGroup),
#--------- support Zee and J/psi TnP
ChainProp(name='HLT_e26_lhtight_e15_etcut_idperf_Zee_L1EM22VHI', l1SeedThresholds=['EM22VHI','EM7'], groups=TagAndProbeLegGroup+MultiElectronGroup),
@@ -221,7 +222,7 @@ def setupMenu():
ChainProp(name='HLT_2g25_loose_g15_loose_L12EM20VH',l1SeedThresholds=['EM20VH','EM10VH'], groups=PrimaryLegGroup+MultiPhotonGroup),
#------------ primary special
- ChainProp(name='HLT_2g15_tight_dPhi25_L1DPHI-M70-2eEM12I', l1SeedThresholds=['EM12'], groups=PrimaryPhIGroup+MultiPhotonGroup),
+ ChainProp(name='HLT_2g15_tight_dPhi25_L1DPHI-M70-2eEM12M', l1SeedThresholds=['eEM10L'], groups=PrimaryPhIGroup+MultiPhotonGroup), # TODO: mismatch between L1topo threshold and L1 seed to be fixed
#------------ support legs of multi-photons
ChainProp(name='HLT_g25_medium_L1EM20VH', groups=SupportLegGroup+SinglePhotonGroup),
@@ -232,7 +233,7 @@ def setupMenu():
ChainProp(name='HLT_g20_tight_L1EM15VHI', groups=SupportLegGroup+SinglePhotonGroup),
ChainProp(name='HLT_g22_tight_L1EM15VHI', groups=SupportLegGroup+SinglePhotonGroup),
- ChainProp(name='HLT_2g15_tight_L1DPHI-M70-2eEM12I', l1SeedThresholds=['EM12'], groups=SupportPhIGroup+SinglePhotonGroup),
+ ChainProp(name='HLT_2g15_tight_L1DPHI-M70-2eEM12M', l1SeedThresholds=['eEM10L'], groups=SupportPhIGroup+SinglePhotonGroup), # TODO: mismatch between L1topo threshold and L1 seed to be fixed
#------------ support bootstrap and background studies
ChainProp(name='HLT_g250_etcut_L1EM22VHI', groups=SupportLegGroup+SinglePhotonGroup),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/TopoAlgos.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/TopoAlgos.py
index 4e819eb6bc1d..aefa54e54da9 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/TopoAlgos.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/TopoAlgos.py
@@ -65,10 +65,10 @@ class TopoAlgo(object):
confObj["klass"] = self.classtype
return confObj
- def getScaleToCountsEM(self):
+ def getScaleToCountsEM(self): # legacy Et conversion!!
tw = self.menuThr.typeWideThresholdConfig(ThrType["EM"])
return 1000 // tw["resolutionMeV"]
-
+
class Variable(object):
def __init__(self, name, selection, value):
self.name = name
@@ -111,15 +111,18 @@ class SortingAlgo(TopoAlgo):
confObj["fixedParameters"]["generics"][genParm.name] = odict([("value", genParm.value), ("position", pos)])
confObj["variableParameters"] = list()
- _emscale_for_decision = self.getScaleToCountsEM()
- _mu_for_decision=1 # MU4->3GeV, MU6->5GeV, MU10->9GeV
+ _emscale_for_decision = self.getScaleToCountsEM() # for legacy algos
+ _mu_for_decision= 10 # MU4->3GeV, MU6->5GeV, MU10->9GeV because selection is done by pt>X in 100 MeV units for Run3 muons
+ if "MUCTP-" in self.name:
+ _mu_for_decision= 1
for (pos, variable) in enumerate(self.variables):
- # adjust MinET if outputs match with EM or TAU or MU ==> this is a terrible hack that won't fly in Run 3
if variable.name == "MinET":
- if "TAU" in self.outputs or "EM" in self.outputs:
+ if "e" in self.outputs or "j" in self.outputs or "g" in self.outputs:
+ variable.value *= 1 # no conversion needed in Run3 algo
+ elif "TAU" in self.outputs or "EM" in self.outputs:
variable.value *= _emscale_for_decision
- if "MU" in self.outputs and variable.value > _mu_for_decision:
- variable.value -= _mu_for_decision
+ if "MU" in self.outputs:
+ variable.value = ((variable.value - _mu_for_decision ) if variable.value>0 else variable.value)
confObj["variableParameters"].append(odict([("name", variable.name),("value", variable.value)]))
if type(variable.value) == float:
@@ -177,14 +180,18 @@ class DecisionAlgo(TopoAlgo):
# variable parameters
confObj["variableParameters"] = list()
- _emscale_for_decision = self.getScaleToCountsEM()
- _mu_for_decision = 1 # MU4->3GeV, MU6->5GeV, MU10->9GeV
+ _emscale_for_decision = self.getScaleToCountsEM() # for legacy algos
+ _mu_for_decision= 10 # MU4->3GeV, MU6->5GeV, MU10->9GeV because selection is done by pt>X in 100 MeV units for Run3 muons
+ if "MUCTP-" in self.name:
+ _mu_for_decision= 1
for (pos, variable) in enumerate(self.variables):
# scale MinET if inputs match with EM or TAU
for _minet in ["MinET"]:
if variable.name==_minet+"1" or variable.name==_minet+"2" or variable.name==_minet+"3" or variable.name==_minet:
for (tobid, _input) in enumerate(self.inputs):
- if (_input.find("TAU")>=0 or _input.find("EM")>=0):
+ if (_input.find("e")>=0 or _input.find("j")>=0 or _input.find("g")>=0):
+ variable.value *= 1 # no conversion needed in Run3 algo
+ elif (_input.find("TAU")>=0 or _input.find("EM")>=0):
if (len(self.inputs)>1 and (variable.name==_minet+str(tobid+1) or (tobid==0 and variable.name==_minet))) or (len(self.inputs)==1 and (variable.name.find(_minet)>=0)):
variable.value *= _emscale_for_decision
@@ -284,7 +291,7 @@ class EMMultiplicityAlgo(MultiplicityAlgo):
threshold = threshold,
input=None, output="%s" % threshold,
nbits=nbits)
- mres = re.match("(?P<type>[A-z]*)[0-9]*(?P<suffix>[VHI]*)",threshold).groupdict()
+ mres = re.match("(?P<type>[A-z]*)[0-9]*(?P<suffix>[VHILMT]*)",threshold).groupdict()
self.input = mres["type"]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/CTPInputConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/CTPInputConfig.py
index 0e3c9636a73c..64d6d1e1b307 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/CTPInputConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/CTPInputConfig.py
@@ -15,9 +15,11 @@ class CTPInputConfig:
def cablingLayout():
inputLayout = odict()
inputLayout["optical"] = odict([
- ( "connector0", "Topo1Opt0" ),
- ( "connector1", "Topo1Opt1" ),
- ( "connector2", "MuCTPiOpt0" )
+ ( "connector0", "MuCTPiOpt0" ),
+ ( "connector1", "Topo1Opt0" ),
+ ( "connector2", "Topo1Opt1" ),
+ ( "connector3", "Topo1Opt2" ),
+ ( "connector4", "Topo1Opt3" )
])
inputLayout["electrical"] = odict([
( "connector0", "AlfaCtpin" ),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
index ae40ef61cb96..0623b9248529 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
@@ -358,9 +358,6 @@ class ItemDef:
MenuItem('L1_2TAU8' ).setLogic( d.HA8.x(2) & physcond).setTriggerType(TT.calo)
MenuItem('L1_TAU12' ).setLogic( d.HA12 & physcond).setTriggerType( TT.calo )
- MenuItem('L1_eTAU12' ).setLogic( d.eTAU12 & physcond).setTriggerType( TT.calo )
- MenuItem('L1_eTAU100').setLogic( d.eTAU100 & physcond).setTriggerType( TT.calo )
-
MenuItem('L1_TAU12IL').setLogic( d.HA12IL & physcond).setTriggerType( TT.calo )
MenuItem('L1_TAU12IM').setLogic( d.HA12IM & physcond).setTriggerType( TT.calo )
MenuItem('L1_TAU12IT').setLogic( d.HA12IT & physcond).setTriggerType( TT.calo )
@@ -399,6 +396,19 @@ class ItemDef:
MenuItem('L1_TAU40_EMPTY' ).setLogic( d.HA40 & cosmiccond ).setTriggerType( TT.calo )
MenuItem('L1_TAU40_UNPAIRED_ISO' ).setLogic( d.HA40 & unpaired_isocond ).setTriggerType( TT.calo )
+ #Phase-I
+ MenuItem('L1_eTAU8' ).setLogic( d.eTAU8 & physcond).setTriggerType( TT.calo )
+ MenuItem('L1_eTAU12' ).setLogic( d.eTAU12 & physcond).setTriggerType( TT.calo )
+ MenuItem('L1_eTAU12M' ).setLogic( d.eTAU12M & physcond).setTriggerType( TT.calo )
+ MenuItem('L1_eTAU20' ).setLogic( d.eTAU20 & physcond).setTriggerType( TT.calo )
+ MenuItem('L1_eTAU20M' ).setLogic( d.eTAU20M & physcond).setTriggerType( TT.calo )
+ MenuItem('L1_eTAU25' ).setLogic( d.eTAU25 & physcond).setTriggerType( TT.calo )
+ MenuItem('L1_eTAU25M' ).setLogic( d.eTAU25M & physcond).setTriggerType( TT.calo )
+ MenuItem('L1_eTAU30H' ).setLogic( d.eTAU30H & physcond).setTriggerType( TT.calo )
+ MenuItem('L1_eTAU40' ).setLogic( d.eTAU40 & physcond).setTriggerType( TT.calo )
+ MenuItem('L1_eTAU60' ).setLogic( d.eTAU60 & physcond).setTriggerType( TT.calo )
+ MenuItem('L1_eTAU100' ).setLogic( d.eTAU100 & physcond).setTriggerType( TT.calo )
+
#UPC TAU
MenuItem('L1_2TAU1_VTE50' ).setLogic( d.HA1.x(2) & Not(d.TE50) & physcond).setTriggerType(TT.calo)
MenuItem('L1_2TAU2_VTE50' ).setLogic( d.HA2.x(2) & Not(d.TE50) & physcond).setTriggerType(TT.calo)
@@ -453,9 +463,6 @@ class ItemDef:
MenuItem('L1_MU10_TAU20IM_J25_2J20').setLogic( d.MU10 & d.HA20IM & d.J25 & d.J20.x(2) & physcond).setTriggerType( TT.calo )
MenuItem('L1_MU10_TAU20I' ).setLogic( d.MU10 & d.HA20I & physcond).setTriggerType( TT.calo )
MenuItem('L1_MU20_TAU12IM' ).setLogic( d.MU20 & d.HA12IM & physcond).setTriggerType( TT.calo)
- MenuItem('L1_MU10_eTAU20IM' ).setLogic( d.MU10 & d.eTAU20IM & physcond).setTriggerType( TT.calo )
- MenuItem('L1_MU10_eTAU12IM_3jJ12' ).setLogic( d.MU10 & d.eTAU12IM & d.jJ12.x(3) & physcond).setTriggerType( TT.calo )
- MenuItem('L1_MU10_eTAU12IM_jJ25_2jJ12').setLogic( d.MU10 & d.eTAU12IM & d.jJ25 & d.jJ12.x(2) & physcond).setTriggerType( TT.calo )
MenuItem('L1_TAU12I_MU10_J25' ).setLogic( d.HA12I & d.MU10 & d.J25 & physcond).setTriggerType( TT.calo )
MenuItem('L1_TAU12I_MU10_J25_2J12' ).setLogic( d.HA12I & d.MU10 & d.J25 & d.J12.x(2) & physcond).setTriggerType( TT.calo )
MenuItem('L1_MU10_TAU12_J25_2J12' ).setLogic( d.MU10 & d.HA12 & d.J25 & d.J12.x(2) & physcond).setTriggerType( TT.calo )
@@ -499,13 +506,7 @@ class ItemDef:
MenuItem('L1_MU10_TAU12IM_XE35' ).setLogic( d.MU10 & d.HA12IM & d.XE35 & physcond).setTriggerType( TT.calo )
MenuItem('L1_MU10_TAU12IT_XE35' ).setLogic( d.MU10 & d.HA12IT & d.XE35 & physcond).setTriggerType( TT.calo )
MenuItem('L1_MU10_TAU12IM_XE40' ).setLogic( d.MU10 & d.HA12IM & d.XE40 & physcond).setTriggerType( TT.calo )
- MenuItem('L1_MU10_eTAU12IM_gXERHO35' ).setLogic( d.MU10 & d.eTAU12IM & d.gXERHO35 & physcond).setTriggerType( TT.calo )
MenuItem('L1_TAU20I_2TAU12I_XE35' ).setLogic( d.HA20I & d.HA12I.x(2) & d.XE35 & physcond).setTriggerType( TT.calo )
- MenuItem('L1_eTAU20IM_2jJ20_gXERHO45' ).setLogic( d.eTAU20IM & d.jJ20.x(2) & d.gXERHO45 & physcond).setTriggerType( TT.calo )
- MenuItem('L1_eTAU20IM_2eTAU12IM_4jJ12p0ETA25').setLogic( d.eTAU20IM & d.eTAU12IM.x(2) & d.jJ120ETA25.x(4) & physcond).setTriggerType( TT.calo )
- MenuItem('L1_eTAU25IM_2eTAU20IM_2jJ25_3jJ20' ).setLogic( d.eTAU25IM & d.eTAU20IM.x(2) & d.jJ25.x(2) & d.jJ20.x(3) & physcond).setTriggerType( TT.calo )
- MenuItem('L1_eTAU40_2eTAU12IM_gXERHO40' ).setLogic( d.eTAU40 & d.eTAU12IM.x(2) & d.gXERHO40 & physcond).setTriggerType( TT.calo )
- MenuItem('L1_eTAU60_2eTAU40' ).setLogic( d.eTAU60 & d.eTAU40.x(2) & physcond).setTriggerType( TT.calo )
MenuItem('L1_EM15VHI_TAU20IM_2TAU15_J25_2J20_3J15').setLogic( d.EM15VHI & d.HA20IM & d.HA15.x(2) & d.J25 & d.J20.x(2) & d.J15.x(3) & physcond).setTriggerType( TT.calo )
MenuItem('L1_EM15VHI_2TAU12I_XE35' ).setLogic( d.EM15VHI & d.HA12I.x(2) & d.XE35 & physcond).setTriggerType( TT.calo )
@@ -1480,16 +1481,16 @@ class ItemDef:
MenuItem('L1_LAR-ZEE').setLogic( d.R2TOPO_ZEE_EM20shi2 & physcond).setTriggerType( TT.lardemo ) # LAr demo (ATR-11897, ATR-23403)
# Phase-1:
- MenuItem('L1_LAR-ZEE-eEM').setLogic( d.TOPO_ZEE_eEM20shi2 & physcond).setTriggerType( TT.lardemo ) # LAr demo (ATR-23403)
+ MenuItem('L1_LAR-ZEE-eEM').setLogic( d.TOPO_ZEE_eEM20sm2 & physcond).setTriggerType( TT.lardemo ) # LAr demo (ATR-23403)
MenuItem('L1_LATE-MU10_XE50').setLogic( d.TOPO_LATE_MU10s1 & d.XE50 & physcond)
MenuItem('L1_LATE-MU10_XE40').setLogic( d.TOPO_LATE_MU10s1 & d.XE40 & physcond)
MenuItem('L1_LATE-MU10_J50' ).setLogic( d.TOPO_LATE_MU10s1 & d.J50 & physcond)
MenuItem('L1_LFV-MU11').setLogic( d.TOPO_0DR15_2MU6ab & d.MU11 & d.MU6.x(2) & physcond)
MenuItem('L1_LFV-MU6' ).setLogic( d.TOPO_0DR15_2MU6ab & d.MU6.x(2) & physcond)
- MenuItem('L1_LFV-eEM8I-MU11' ).setLogic( d.TOPO_0INVM10_0DR15_eEM8abi_MU10ab & d.MU11 & physcond)
- MenuItem('L1_LFV-eEM12I-MU6' ).setLogic( d.TOPO_0INVM10_0DR15_eEM12abi_MU6ab & physcond)
- MenuItem('L1_LFV-eEM8I').setLogic( d.TOPO_0DETA04_eEM8abi_MU10ab & d.TOPO_0DPHI03_eEM8abi_MU10ab & d.MU10 & physcond) #ATR-14282
- MenuItem('L1_LFV-eEM15I').setLogic( d.TOPO_0DETA04_eEM15abi_MUab & d.TOPO_0DPHI03_eEM15abi_MUab & physcond) #ATR-14282
+ MenuItem('L1_LFV-eEM8L-MU11' ).setLogic( d.TOPO_0INVM10_0DR15_eEM8abl_MU10ab & d.MU11 & physcond)
+ MenuItem('L1_LFV-eEM12L-MU6' ).setLogic( d.TOPO_0INVM10_0DR15_eEM12abl_MU6ab & physcond)
+ MenuItem('L1_LFV-eEM8L').setLogic( d.TOPO_0DETA04_eEM8abl_MU10ab & d.TOPO_0DPHI03_eEM8abl_MU10ab & d.MU10 & physcond) #ATR-14282
+ MenuItem('L1_LFV-eEM15L').setLogic( d.TOPO_0DETA04_eEM15abl_MUab & d.TOPO_0DPHI03_eEM15abl_MUab & physcond) #ATR-14282
#ATR-19720
MenuItem('L1_BPH-8M15-0DR22-2MU6' ).setLogic( d.TOPO_8INVM15_0DR22_2MU6ab & d.MU6.x(2) & physcond)
MenuItem('L1_BPH-8M15-0DR22-MU6MU4-BO').setLogic( d.TOPO_8INVM15_0DR22_MU6ab_MU4ab & d.TOPO_MULT_CMU4ab.x(2) & d.TOPO_MULT_CMU6ab & d.MU6 & physcond)
@@ -1509,12 +1510,12 @@ class ItemDef:
MenuItem('L1_CEP-CJ60').setLogic( d.TOPO_CEP_CJ60s6 & physcond )
MenuItem('L1_CEP-CJ50').setLogic( d.TOPO_CEP_CJ50s6 & physcond )
#ATR-18824
- MenuItem('L1_ZAFB-04DPHI-eEM15I' ).setLogic( d.TOPO_60INVM_04DPHI32_eEM15abhi_FJj15s623ETA49 & physcond)
- MenuItem('L1_ZAFB-25DPHI-eEM15I' ).setLogic( d.TOPO_60INVM_25DPHI32_eEM15abhi_FJj15s623ETA49 & physcond)
- MenuItem('L1_ZAFB-25DPHI-eEM18I' ).setLogic( d.TOPO_60INVM_25DPHI32_eEM15abhi_FJj15s623ETA49 & d.eEM18M & physcond)
+ MenuItem('L1_ZAFB-04DPHI-eEM15M' ).setLogic( d.TOPO_60INVM_04DPHI32_eEM15abm_FJj15s623ETA49 & physcond)
+ MenuItem('L1_ZAFB-25DPHI-eEM15M' ).setLogic( d.TOPO_60INVM_25DPHI32_eEM15abm_FJj15s623ETA49 & physcond)
+ MenuItem('L1_ZAFB-25DPHI-eEM18M' ).setLogic( d.TOPO_60INVM_25DPHI32_eEM15abm_FJj15s623ETA49 & d.eEM18M & physcond)
#ATR-19302:
- MenuItem('L1_DPHI-M70-2eEM10I' ).setLogic( d.TOPO_0INVM70_27DPHI32_eEM10his1_eEM10his6 & physcond)
- MenuItem('L1_DPHI-M70-2eEM12I' ).setLogic( d.TOPO_0INVM70_27DPHI32_eEM12his1_eEM12his6 & physcond)
+ MenuItem('L1_DPHI-M70-2eEM10M' ).setLogic( d.TOPO_0INVM70_27DPHI32_eEM10sm1_eEM10sm6 & physcond)
+ MenuItem('L1_DPHI-M70-2eEM12M' ).setLogic( d.TOPO_0INVM70_27DPHI32_eEM12sm1_eEM12sm6 & physcond)
#ATR-21637
MenuItem('L1_DPHI-M70-2eEM12' ).setLogic( d.TOPO_0INVM70_27DPHI32_eEM12s1_eEM12s6 & physcond)
#ATR-19376
@@ -1532,8 +1533,8 @@ class ItemDef:
MenuItem("L1_JPSI-1M5-eEM7" ).setLogic( d.TOPO_1INVM5_eEM7s1_eEMs6 & physcond)
MenuItem("L1_JPSI-1M5-eEM12").setLogic( d.TOPO_1INVM5_eEM12s1_eEMs6 & physcond)
- MenuItem('L1_LLP-RO-eEM').setLogic( d.TOPO_100RATIO_0MATCH_TAU30si2_eEMall & physcond)
- MenuItem('L1_LLP-NOMATCH-eEM').setLogic( d.TOPO_NOT_0MATCH_TAU30si1_eEMall & physcond)
+ MenuItem('L1_LLP-RO-eEM').setLogic( d.TOPO_100RATIO_0MATCH_eTAU30si2_eEMall & physcond)
+ MenuItem('L1_LLP-NOMATCH-eEM').setLogic( d.TOPO_NOT_0MATCH_eTAU30si1_eEMall & physcond)
MenuItem('L1_DR25-eTAU20IeTAU12I').setLogic( d.TOPO_0DR25_eTAU20abi_eTAU12abi & physcond)
MenuItem('L1_DR25-eTAU20IeTAU12I-jJ25').setLogic( d.TOPO_2DISAMB_jJ25ab_0DR25_eTAU20abi_eTAU12abi & physcond)
@@ -1553,7 +1554,7 @@ class ItemDef:
MenuItem('L1_eEM18M_jMJJ-300-NFF').setLogic( d.eEM18M & d.TOPO_300INVM_jJ30s6_AjJ20s6 & physcond) # modified from ATR-15062
MenuItem('L1_jHT150-jJ20s5pETA31_jMJJ-400-CF').setLogic( d.TOPO_HT150_jJ20s5pETA31 & d.TOPO_400INVM_AjJ30s6pETA31_AjJ20s6p31ETA49 & physcond)
MenuItem('L1_jMJJ-400-CF').setLogic( d.TOPO_400INVM_AjJ30s6pETA31_AjJ20s6p31ETA49 & physcond)
-
+ MenuItem('L1_jJ50_DETA20-jJ50J').setLogic( d.J50 & d.TOPO_0DETA20_J50s1_Js2 & physcond)
# Needed?
MenuItem('L1_DPHI-2eEM3').setLogic( d.TOPO_27DPHI32_eEMs1_eEMs6 & physcond)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDef.py
index b1b975afed71..6a559d244ed1 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDef.py
@@ -102,11 +102,15 @@ class ThresholdDef:
# TAU
- for et in [12, 20, 40, 60, 100]:
+ for et in [8, 12, 20, 25, 40, 60, 100]:
TauThreshold('eTAU%i' % et, 'eTAU').setEt(et)
+ # TODO: missing isolation thresholds
for et in [12,20, 25]:
- TauThreshold('eTAU%iIM' % et, 'eTAU').setEt(et)
+ TauThreshold('eTAU%iM' % et, 'eTAU').setEt(et)
+ # TODO: missing hadronic isolation
+ for et in [30]:
+ TauThreshold('eTAU%iH' % et, 'eTAU').setEt(et)
# JET
for thrV in [12, 15, 20, 25, 30, 40, 50, 85, 100]:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
index b9b9dba429c4..0282a36402da 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
@@ -15,20 +15,15 @@ class TopoAlgoDef:
def registerTopoAlgos(tm):
# constants and conversions:
- # legacy
- _etamax = 49
- _minet = 0
- # phase1
- _no_m_upper_threshold = 2**32-1
+ _no_m_upper_threshold = 1024*1024*10*10*10 # a check against this number in L1Topo FW and sim will disable the upper threshold on MaxMSqr
_dr_conversion = 4 # factor 10 already included to remove . from name
- _et_conversion = 10
- _eta_conversion = 4 # factor 10 already included to remove . from name
- _phi_conversion = 2 # factor 10 already included to remove . from name
- _etamax_phase1 = 49*_eta_conversion
+ _et_conversion = 10 # 1 GeV -> 100 MeV. This is to be applied also on the pt threholds for muons. A correction is then done L1/Base/TopoAlgos.py
+ _eta_conversion = 4 # factor 10 already included to remove . from name
+ _phi_conversion = 2 # factor 10 already included to remove . from name
# eEM inputs
# ALL
- alg = AlgConf.ClusterNoSort( name = 'eEMall', inputs = 'ClusterTobArray', outputs = 'eEMall' )
+ alg = AlgConf.ClusterNoSort( name = 'eEMall', inputs = 'ClusterTobArray', outputs = 'eEMall' ) #TODO: change ClusterNoSort into...? still old tobs inputs
alg.addgeneric('InputWidth', HW.InputWidthEM)
alg.addgeneric('OutputWidth', HW.InputWidthEM)
tm.registerTopoAlgo(alg)
@@ -38,21 +33,31 @@ class TopoAlgoDef:
alg.addgeneric('InputWidth', HW.InputWidthEM)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortEM)
alg.addgeneric('OutputWidth', HW.OutputWidthSortEM)
- alg.addvariable('REtaMin', 0)
- alg.addvariable('RHadMin', 0)
- alg.addvariable('WsTotMin', 0)
- alg.addvariable('MinEta', 0)
- alg.addvariable('MaxEta', _etamax_phase1)
+ alg.addvariable('REtaMin', 0)
+ alg.addvariable('RHadMin', 0)
+ alg.addvariable('WsTotMin', 0)
+ alg.addvariable('MinEta', 0*_eta_conversion)
+ alg.addvariable('MaxEta', 49*_eta_conversion)
tm.registerTopoAlgo(alg)
- alg = AlgConf.eEmSort( name = 'eEMshi', inputs = 'eEmTobs', outputs = 'eEMshi' )
+ alg = AlgConf.eEmSort( name = 'eEMsl', inputs = 'eEmTobs', outputs = 'eEMsl' )
alg.addgeneric('InputWidth', HW.InputWidthEM)
alg.addgeneric('OutputWidth', HW.OutputWidthSortEM)
- alg.addvariable('REtaMin', 2)
- alg.addvariable('RHadMin', 2)
- alg.addvariable('WsTotMin', 2)
- alg.addvariable('MinEta', 0)
- alg.addvariable('MaxEta', _etamax_phase1)
+ alg.addvariable('REtaMin', 1)
+ alg.addvariable('RHadMin', 1)
+ alg.addvariable('WsTotMin', 1)
+ alg.addvariable('MinEta', 0*_eta_conversion)
+ alg.addvariable('MaxEta', 49*_eta_conversion)
+ tm.registerTopoAlgo(alg)
+
+ alg = AlgConf.eEmSort( name = 'eEMsm', inputs = 'eEmTobs', outputs = 'eEMsm' )
+ alg.addgeneric('InputWidth', HW.InputWidthEM)
+ alg.addgeneric('OutputWidth', HW.OutputWidthSortEM)
+ alg.addvariable('REtaMin', 2)
+ alg.addvariable('RHadMin', 2)
+ alg.addvariable('WsTotMin', 2)
+ alg.addvariable('MinEta', 0*_eta_conversion)
+ alg.addvariable('MaxEta', 49*_eta_conversion)
tm.registerTopoAlgo(alg)
# SELECT
@@ -60,101 +65,130 @@ class TopoAlgoDef:
alg.addgeneric('InputWidth', HW.InputWidthEM)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectEM )
alg.addgeneric('OutputWidth', HW.OutputWidthSelectEM)
- alg.addvariable('MinET', 5*_et_conversion)
- alg.addvariable('REtaMin', 0)
- alg.addvariable('RHadMin', 0)
- alg.addvariable('WsTotMin', 0)
- alg.addvariable('MinEta', 0)
- alg.addvariable('MaxEta', _etamax_phase1)
+ alg.addvariable('MinET', 5*_et_conversion)
+ alg.addvariable('REtaMin', 0)
+ alg.addvariable('RHadMin', 0)
+ alg.addvariable('WsTotMin', 0)
+ alg.addvariable('MinEta', 0*_eta_conversion)
+ alg.addvariable('MaxEta', 49*_eta_conversion)
tm.registerTopoAlgo(alg)
- alg = AlgConf.eEmSelect( name = 'eEMabi', inputs = 'eEmTobs', outputs = 'eEMabi' )
+ alg = AlgConf.eEmSelect( name = 'eEMabl', inputs = 'eEmTobs', outputs = 'eEMabl' )
alg.addgeneric('InputWidth', HW.InputWidthEM)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectEM )
alg.addgeneric('OutputWidth', HW.OutputWidthSelectEM)
- alg.addvariable('MinET', 8*_et_conversion)
- alg.addvariable('REtaMin', 1)
- alg.addvariable('RHadMin', 1)
- alg.addvariable('WsTotMin', 1)
- alg.addvariable('MinEta', 0)
- alg.addvariable('MaxEta', _etamax_phase1)
+ alg.addvariable('MinET', 8*_et_conversion)
+ alg.addvariable('REtaMin', 1)
+ alg.addvariable('RHadMin', 1)
+ alg.addvariable('WsTotMin', 1)
+ alg.addvariable('MinEta', 0*_eta_conversion)
+ alg.addvariable('MaxEta', 49*_eta_conversion)
tm.registerTopoAlgo(alg)
- alg = AlgConf.eEmSelect( name = 'eEMabhi', inputs = 'eEmTobs', outputs = 'eEMabhi' )
+ alg = AlgConf.eEmSelect( name = 'eEMabm', inputs = 'eEmTobs', outputs = 'eEMabm' )
alg.addgeneric('InputWidth', HW.InputWidthEM)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectEM )
alg.addgeneric('OutputWidth', HW.OutputWidthSelectEM)
- alg.addvariable('MinET', 8*_et_conversion)
- alg.addvariable('REtaMin', 2)
- alg.addvariable('RHadMin', 2)
- alg.addvariable('WsTotMin', 2)
- alg.addvariable('MinEta', 0)
- alg.addvariable('MaxEta', _etamax_phase1)
+ alg.addvariable('MinET', 8*_et_conversion)
+ alg.addvariable('REtaMin', 2)
+ alg.addvariable('RHadMin', 2)
+ alg.addvariable('WsTotMin', 2)
+ alg.addvariable('MinEta', 0*_eta_conversion)
+ alg.addvariable('MaxEta', 49*_eta_conversion)
tm.registerTopoAlgo(alg)
+ # eTAU inputs
+ # all
+ alg = AlgConf.ClusterNoSort( name = 'eTAUall', inputs = 'ClusterTobArray', outputs = 'eTAUall') #TODO: change ClusterNoSort into...? still old tob inputs
+ alg.addgeneric('InputWidth', HW.InputWidthTAU)
+ alg.addgeneric('OutputWidth', HW.InputWidthTAU)
+ alg.addvariable('IsoMask', 0)
+ tm.registerTopoAlgo(alg)
- #legacy
- alg = AlgConf.ClusterSelect( name = 'TAUabi', inputs = 'ClusterTobArray', outputs = 'TAUabi' )
- alg.addgeneric('InputWidth', HW.InputWidthTAU)
- alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectTAU )
- alg.addgeneric('OutputWidth', HW.OutputWidthSelectTAU)
- alg.addvariable('MinET', 12)
- alg.addvariable('IsoMask', 2)
- alg.addvariable('MinEta', 0)
- alg.addvariable('MaxEta', _etamax)
- alg.addgeneric('DoIsoCut', 1)
+ # SORT
+ alg = AlgConf.eTauSort( name = 'eTAUsi', inputs = 'eTauTobs', outputs = 'eTAUsi' )
+ alg.addgeneric('InputWidth', HW.InputWidthTAU)
+ alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortTAU)
+ alg.addgeneric('OutputWidth', HW.OutputWidthSortTAU)
+ alg.addvariable('IsoMask', 2)
+ alg.addvariable('MinEta', 0*_eta_conversion)
+ alg.addvariable('MaxEta', 49*_eta_conversion)
+ alg.addgeneric('DoIsoCut', 1)
tm.registerTopoAlgo(alg)
- #phase1
- alg = AlgConf.ClusterSelect( name = 'eTAUabi', inputs = 'ClusterTobArray', outputs = 'eTAUabi' )
+
+ # SELECT
+ alg = AlgConf.eTauSelect( name = 'eTAUab', inputs = 'eTauTobs', outputs = 'eTAUab' )
alg.addgeneric('InputWidth', HW.InputWidthTAU)
alg.addgeneric('OutputWidth', HW.OutputWidthSelectTAU)
- alg.addvariable('MinET', 12*_et_conversion)
- alg.addvariable('IsoMask', 2)
- alg.addvariable('MinEta', 0)
- alg.addvariable('MaxEta', _etamax_phase1)
- alg.addgeneric('DoIsoCut', 1)
+ alg.addvariable('MinET', 12*_et_conversion)
+ alg.addvariable('IsoMask', 0)
+ alg.addvariable('MinEta', 0*_eta_conversion)
+ alg.addvariable('MaxEta', 49*_eta_conversion)
+ alg.addgeneric('DoIsoCut', 0)
tm.registerTopoAlgo(alg)
- #legacy
- alg = AlgConf.ClusterSelect( name = 'TAUab', inputs = 'ClusterTobArray', outputs = 'TAUab' )
+ alg = AlgConf.eTauSelect( name = 'eTAUabi', inputs = 'eTauTobs', outputs = 'eTAUabi' )
alg.addgeneric('InputWidth', HW.InputWidthTAU)
- alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectTAU )
alg.addgeneric('OutputWidth', HW.OutputWidthSelectTAU)
- alg.addvariable('MinET', 12)
- alg.addvariable('IsoMask', 0)
- alg.addvariable('MinEta', 0)
- alg.addvariable('MaxEta', _etamax)
- alg.addgeneric('DoIsoCut', 0)
+ alg.addvariable('MinET', 12*_et_conversion)
+ alg.addvariable('IsoMask', 2)
+ alg.addvariable('MinEta', 0*_eta_conversion)
+ alg.addvariable('MaxEta', 49*_eta_conversion)
+ alg.addgeneric('DoIsoCut', 1)
tm.registerTopoAlgo(alg)
- #phase1
- alg = AlgConf.ClusterSelect( name = 'eTAUab', inputs = 'ClusterTobArray', outputs = 'eTAUab' )
- alg.addgeneric('InputWidth', HW.InputWidthTAU)
- alg.addgeneric('OutputWidth', HW.OutputWidthSelectTAU)
- alg.addvariable('MinET', 12*_et_conversion)
- alg.addvariable('IsoMask', 0)
- alg.addvariable('MinEta', 0)
- alg.addvariable('MaxEta', _etamax_phase1)
- alg.addgeneric('DoIsoCut', 0)
- tm.registerTopoAlgo(alg)
- alg = AlgConf.ClusterSort( name = 'TAUsi', inputs = 'ClusterTobArray', outputs = 'TAUsi' )
- alg.addgeneric('InputWidth', HW.InputWidthTAU)
- alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortTAU)
- alg.addgeneric('OutputWidth', HW.OutputWidthSortTAU)
- alg.addvariable('IsoMask', 2)
- alg.addvariable('MinEta', 0)
- alg.addvariable('MaxEta', _etamax)
- alg.addgeneric('DoIsoCut', 1)
+ # Muon inputs # TODO: change to new Phase-1 thresholds
+ # all
+ alg = AlgConf.MuonNoSort( name = 'MUall', inputs = 'MuonTobArray', outputs = 'MUall')
+ alg.addgeneric('InputWidth', HW.InputWidthMU)
+ alg.addgeneric('OutputWidth', HW.InputWidthMU)
tm.registerTopoAlgo(alg)
+ # SORT
+ alg = AlgConf.MuonSort( name = 'MUs', inputs = 'MuonTobArray', outputs = 'MUs' )
+ alg.addgeneric('InputWidth', HW.InputWidthMU)
+ alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortMU )
+ alg.addgeneric('OutputWidth', HW.OutputWidthSortMU)
+ alg.addvariable('MinEta', 0*_eta_conversion)
+ alg.addvariable('MaxEta', 25*_eta_conversion)
+ tm.registerTopoAlgo(alg)
+ # SELECT
+ alg = AlgConf.MuonSelect( name = 'MUab', inputs = 'MuonTobArray', outputs = 'MUab' )
+ alg.addgeneric('InputWidth', HW.InputWidthMU)
+ alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectMU )
+ alg.addgeneric('OutputWidth', HW.OutputWidthSelectMU)
+ alg.addvariable('MinET', 4*_et_conversion)
+ alg.addvariable('MinEta', 0*_eta_conversion)
+ alg.addvariable('MaxEta', 25*_eta_conversion)
+ tm.registerTopoAlgo(alg)
+
+ alg = AlgConf.MuonSelect( name = 'CMUab', inputs = 'MuonTobArray', outputs = 'CMUab' )
+ alg.addgeneric('InputWidth', HW.InputWidthMU)
+ alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectMU )
+ alg.addgeneric('OutputWidth', HW.OutputWidthSelectMU)
+ alg.addvariable('MinET', 4*_et_conversion)
+ alg.addvariable('MinEta', 0*_eta_conversion)
+ alg.addvariable('MaxEta', 10*_eta_conversion)
+ tm.registerTopoAlgo(alg)
+
+ #LATE
+ alg = AlgConf.MuonSort_1BC( name = 'LMUs', inputs = 'LateMuonTobArray', outputs = 'LMUs' )
+ alg.addgeneric('InputWidth', HW.InputWidthMU)
+ #alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortMU )
+ alg.addgeneric('OutputWidth', HW.OutputWidthSortMU)
+ alg.addgeneric('nDelayedMuons', 1)
+ alg.addvariable('MinEta', 0*_eta_conversion)
+ alg.addvariable('MaxEta', 25*_eta_conversion)
+ tm.registerTopoAlgo(alg)
+
+ #jJets inputs # TODO: all lists below still to be fixed
alg = AlgConf.JetNoSort( name = 'AJall', inputs = 'JetTobArray', outputs = 'AJall' )
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('OutputWidth', HW.InputWidthJET)
alg.addgeneric('JetSize', HW.DefaultJetSize)
tm.registerTopoAlgo(alg)
-
alg = AlgConf.JetNoSort( name = 'AJjall', inputs = 'JetTobArray', outputs = 'AJjall' )
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('OutputWidth', HW.InputWidthJET)
@@ -174,7 +208,7 @@ class TopoAlgoDef:
# ab J lists:
#legacy
for jet_type in ['J', 'CJ', 'FJ']:
- jetabseta = _etamax
+ jetabseta = 49
_minet = 25
_mineta=0
if jet_type=='J':
@@ -198,7 +232,7 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
#phase1
for jet_type in ['jJ']:
- jetabseta = _etamax_phase1
+ jetabseta = 49*_eta_conversion
minet = 25*_et_conversion
mineta=0
if jet_type=='J':
@@ -225,7 +259,7 @@ class TopoAlgoDef:
alg.addgeneric('OutputWidth', HW.OutputWidthSortJET )
alg.addgeneric('JetSize', 1 if HW.DefaultJetSize.value==2 else 2)
alg.addvariable('MinEta', 0)
- alg.addvariable('MaxEta', _etamax)
+ alg.addvariable('MaxEta', 49)
alg.addgeneric('DoEtaCut', 0)
tm.registerTopoAlgo(alg)
@@ -237,7 +271,7 @@ class TopoAlgoDef:
alg.addgeneric('OutputWidth', HW.OutputWidthSortJET )
alg.addgeneric('JetSize', 1 if HW.DefaultJetSize.value==2 else 2)
alg.addvariable('MinEta', 23)
- alg.addvariable('MaxEta', _etamax)
+ alg.addvariable('MaxEta', 49)
alg.addgeneric('DoEtaCut', 1)
tm.registerTopoAlgo(alg)
@@ -254,7 +288,7 @@ class TopoAlgoDef:
# Sorted J lists:
#legacy
for jet_type in ['AJ', 'FJ']:
- jetabseta = _etamax
+ jetabseta = 49
_minet = 25
_mineta = 0
if jet_type=='J':
@@ -280,7 +314,7 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
#phase1
for jet_type in ['AjJ']:
- jetabseta = _etamax_phase1
+ jetabseta = 49*_eta_conversion
mineta = 0*_eta_conversion
if jet_type=='J':
jetabseta = 31*_eta_conversion
@@ -298,7 +332,7 @@ class TopoAlgoDef:
#legacy
for jet_type in ['J','CJ']:
- jetabseta = _etamax
+ jetabseta = 49
_minet = 25
if jet_type=='J':
jetabseta = 31
@@ -317,7 +351,7 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
#phase1
for jet_type in ['jJ']:
- jetabseta = _etamax_phase1
+ jetabseta = 49*_eta_conversion
if jet_type=='J':
jetabseta = 31*_eta_conversion
elif jet_type=='CJ':
@@ -343,92 +377,35 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
- alg = AlgConf.MuonSelect( name = 'MUab', inputs = 'MuonTobArray', outputs = 'MUab' )
-
- alg.addgeneric('InputWidth', HW.InputWidthMU)
- alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectMU )
- alg.addgeneric('OutputWidth', HW.OutputWidthSelectMU)
- alg.addvariable('MinET', 4)
- alg.addvariable('MinEta', 0)
- alg.addvariable('MaxEta', 25)
- tm.registerTopoAlgo(alg)
-
-
- alg = AlgConf.MuonSort( name = 'MUs', inputs = 'MuonTobArray', outputs = 'MUs' )
-
- alg.addgeneric('InputWidth', HW.InputWidthMU)
- alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortMU )
- alg.addgeneric('OutputWidth', HW.OutputWidthSortMU)
-# alg.addvariable('MinET', 4)
- alg.addvariable('MinEta', 0)
- alg.addvariable('MaxEta', 25)
- tm.registerTopoAlgo(alg)
-
-
- alg = AlgConf.MuonSelect( name = 'CMUab', inputs = 'MuonTobArray', outputs = 'CMUab' )
-
- alg.addgeneric('InputWidth', HW.InputWidthMU)
- alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectMU )
- alg.addgeneric('OutputWidth', HW.OutputWidthSelectMU)
- alg.addvariable('MinET', 4)
- alg.addvariable('MinEta', 0)
- alg.addvariable('MaxEta', 10)
- tm.registerTopoAlgo(alg)
-
-
- alg = AlgConf.MuonSort_1BC( name = 'LMUs', inputs = 'LateMuonTobArray', outputs = 'LMUs' )
-
- alg.addgeneric('InputWidth', HW.InputWidthMU)
- #alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortMU )
- alg.addgeneric('OutputWidth', HW.OutputWidthSortMU)
- alg.addgeneric('nDelayedMuons', 1)
- alg.addvariable('MinEta', 0)
- alg.addvariable('MaxEta', 25)
- tm.registerTopoAlgo(alg)
-
-
- # All lists:
-
- alg = AlgConf.ClusterNoSort( name = 'TAUall', inputs = 'ClusterTobArray', outputs = 'TAUall')
- alg.addgeneric('InputWidth', HW.InputWidthTAU)
- alg.addgeneric('OutputWidth', HW.InputWidthTAU)
- alg.addvariable('IsoMask', 0)
- tm.registerTopoAlgo(alg)
-
-
- alg = AlgConf.MuonNoSort( name = 'MUall', inputs = 'MuonTobArray', outputs = 'MUall')
- alg.addgeneric('InputWidth', HW.InputWidthMU)
- alg.addgeneric('OutputWidth', HW.InputWidthMU)
- tm.registerTopoAlgo(alg)
-
# Decision algorithms
# LAR ZEE
algoList = [
- {"otype" : "eEM", "ocut1" : 20, "ocut2" : 20, "olist" : "shi", "nleading1" : 2, "minInvm" : 60, "maxInvm" : 100, "inputwidth": HW.OutputWidthSortEM},
+ {"otype" : "eEM", "ocut1" : 20, "ocut2" : 20, "olist" : "sm", "nleading1" : 2, "minInvm" : 60, "maxInvm" : 100, "inputwidth": HW.OutputWidthSortEM},
]
for x in algoList:
class d:
pass
for k in x:
setattr (d, k, x[k])
- toponame = 'ZEE-eEM20shi2'
+ toponame = 'ZEE-eEM20sm2'
log.debug("Define %s", toponame)
inputList = d.otype + d.olist
alg = AlgConf.InvariantMassInclusive1( name = toponame, inputs = inputList, outputs = toponame)
alg.addgeneric('InputWidth', d.inputwidth)
alg.addgeneric('MaxTob', d.nleading1)
alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinET1', d.ocut1*_et_conversion)
- alg.addvariable('MinET2', d.ocut2*_et_conversion)
- alg.addvariable('MinMSqr', (d.minInvm*_et_conversion)*(d.minInvm*_et_conversion))
- alg.addvariable('MaxMSqr', (d.maxInvm*_et_conversion)*(d.maxInvm*_et_conversion))
+ alg.addvariable('MinET1', d.ocut1*_et_conversion )
+ alg.addvariable('MinET2', d.ocut2*_et_conversion )
+ alg.addvariable('MinMSqr', d.minInvm*d.minInvm*_et_conversion*_et_conversion )
+ alg.addvariable('MaxMSqr', d.maxInvm*d.maxInvm*_et_conversion*_et_conversion )
tm.registerTopoAlgo(alg)
# dimu DR items
+ # TODO: udpate with phase1 muons
listofalgos=[
{"minDr": 0, "maxDr": 15, "mult": 2, "otype1" : "MU", "ocut1": 6, "olist" : "ab", "otype2" : "", "ocut2": 6, "onebarrel": 0}, #0DR15-2MU6ab
{"minDr": 0, "maxDr": 15, "mult": 2, "otype1" : "MU", "ocut1": 4, "olist" : "ab", "otype2" : "", "ocut2": 4, "onebarrel": 0}, #0DR15-2MU4ab
@@ -461,14 +438,15 @@ class TopoAlgoDef:
alg.addgeneric('MaxTob1', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob2', HW.OutputWidthSelectMU)
alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinET1', d.ocut1)
- alg.addvariable('MinET2', d.ocut2)
- alg.addvariable('DeltaRMin', d.minDr*d.minDr)
- alg.addvariable('DeltaRMax', d.maxDr*d.maxDr)
+ alg.addvariable('MinET1', d.ocut1*_et_conversion)
+ alg.addvariable('MinET2', d.ocut2*_et_conversion)
+ alg.addvariable('DeltaRMin', d.minDr*d.minDr*_dr_conversion*_dr_conversion)
+ alg.addvariable('DeltaRMax', d.maxDr*d.maxDr*_dr_conversion*_dr_conversion)
tm.registerTopoAlgo(alg)
# deta-dphi with ab+ab
+ # TODO: udpate with phase1 muons
algolist=[
{"minDeta": 5, "maxDeta": 99, "minDphi": 5, "maxDphi": 99, "mult": 1, "otype1" : "MU", "ocut1": 6, "olist1" : "ab", "nleading1": HW.OutputWidthSelectMU, "otype2" : "MU", "ocut2": 4, "olist2": "ab", "nleading2": HW.OutputWidthSelectMU}, #5DETA99-5DPHI99-MU6ab-MU4ab
{"minDeta": 5, "maxDeta": 99, "minDphi": 5, "maxDphi": 99, "mult": 2, "otype1" : "MU", "ocut1": 6, "olist1" : "ab", "nleading1": HW.OutputWidthSelectMU, "otype2" : "", "ocut2": 6, "olist2": "", "nleading2": HW.OutputWidthSelectMU}, #5DETA99-5DPHI99-2MU6ab
@@ -490,51 +468,28 @@ class TopoAlgoDef:
if (d.mult>1 or d.otype1==d.otype2):
alg.addgeneric('InputWidth', d.nleading1)
alg.addgeneric('MaxTob', d.nleading1)
- alg.addvariable('MinET1', d.ocut1)
- alg.addvariable('MinET2', d.ocut2)
- alg.addvariable('MinDeltaEta', d.minDeta)
- alg.addvariable('MaxDeltaEta', d.maxDeta)
- alg.addvariable('MinDeltaPhi', d.minDphi)
- alg.addvariable('MaxDeltaPhi', d.maxDphi)
+ alg.addvariable('MinET1', d.ocut1*_et_conversion)
+ alg.addvariable('MinET2', d.ocut2*_et_conversion)
+ alg.addvariable('MinDeltaEta', d.minDeta*_eta_conversion)
+ alg.addvariable('MaxDeltaEta', d.maxDeta*_eta_conversion)
+ alg.addvariable('MinDeltaPhi', d.minDphi*_phi_conversion)
+ alg.addvariable('MaxDeltaPhi', d.maxDphi*_phi_conversion)
else:
alg.addgeneric('InputWidth1', d.nleading1)
alg.addgeneric('InputWidth2', d.nleading2)
alg.addgeneric('MaxTob1', d.nleading1)
alg.addgeneric('MaxTob2', d.nleading2)
- alg.addvariable('DeltaEtaMin', d.minDeta)
- alg.addvariable('DeltaEtaMax', d.maxDeta)
- alg.addvariable('DeltaPhiMin', d.minDphi)
- alg.addvariable('DeltaPhiMax', d.maxDphi)
- alg.addvariable('MinET1', d.ocut1)
- alg.addvariable('MinET2', d.ocut2)
+ alg.addvariable('DeltaEtaMin', d.minDeta*_eta_conversion)
+ alg.addvariable('DeltaEtaMax', d.maxDeta*_eta_conversion)
+ alg.addvariable('DeltaPhiMin', d.minDphi*_phi_conversion)
+ alg.addvariable('DeltaPhiMax', d.maxDphi*_phi_conversion)
+ alg.addvariable('MinET1', d.ocut1*_et_conversion)
+ alg.addvariable('MinET2', d.ocut2*_et_conversion)
tm.registerTopoAlgo(alg)
# (ATR-8194) L1Topo HT Trigger
- #legacy
- algoList = [
- {"minHT": 150, "otype" : "J", "ocut" : 20, "olist" : "s", "nleading" : 5, "inputwidth": HW.OutputWidthSortJET, "oeta" : 31}, #HT150-J20s5pETA31
- {"minHT": 190, "otype" : "J", "ocut" : 15, "olist" : "s", "nleading" : 5, "inputwidth": HW.OutputWidthSortJET, "oeta" : 21}, #HT190-J15s5pETA21
- ]
- for x in algoList:
- class d:
- pass
- for k in x:
- setattr (d, k, x[k])
- toponame = "HT%d-%s%s%s%spETA%s" % (d.minHT, d.otype, str(d.ocut), d.olist, str(d.nleading) if d.olist=="s" else "", str(d.oeta))
- log.debug("Define %s", toponame)
- inputList = d.otype + d.olist
- alg = AlgConf.JetHT( name = toponame, inputs = inputList, outputs = [toponame] )
- alg.addgeneric('InputWidth', d.inputwidth)
- alg.addgeneric('MaxTob', d.nleading)
- alg.addgeneric('NumRegisters', 2 if d.olist=="all" else 0)
- alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinET', d.ocut)
- alg.addvariable('MinEta', 0)
- alg.addvariable('MaxEta', d.oeta)
- alg.addvariable('MinHt', d.minHT)
- tm.registerTopoAlgo(alg)
- #phase1
+ # TODO: double check correct implementation
algoList = [
{"minHT": 150, "otype" : "jJ", "ocut" : 20, "olist" : "s", "nleading" : 5, "inputwidth": HW.OutputWidthSortJET, "oeta" : 31}, #HT150-jJ20s5pETA31
{"minHT": 190, "otype" : "jJ", "ocut" : 15, "olist" : "s", "nleading" : 5, "inputwidth": HW.OutputWidthSortJET, "oeta" : 21}, #HT190-jJ15s5pETA21
@@ -552,10 +507,10 @@ class TopoAlgoDef:
alg.addgeneric('MaxTob', d.nleading)
alg.addgeneric('NumRegisters', 2 if d.olist=="all" else 0)
alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinET', d.ocut*_et_conversion )
- alg.addvariable('MinEta', 0)
+ alg.addvariable('MinET', d.ocut*_et_conversion)
+ alg.addvariable('MinEta', 0*_eta_conversion)
alg.addvariable('MaxEta', d.oeta*_eta_conversion)
- alg.addvariable('MinHt', d.minHT*_et_conversion )
+ alg.addvariable('MinHt', d.minHT*_et_conversion)
tm.registerTopoAlgo(alg)
@@ -576,48 +531,20 @@ class TopoAlgoDef:
toponames.append(toponame)
alg = AlgConf.InvariantMassInclusive2( name = d.algoname, inputs = [inputList, 'eEMs'], outputs = toponames)
alg.addgeneric('InputWidth1', d.inputwidth)
- #alg.addgeneric('InputWidth2', HW.InputWidthEM)
alg.addgeneric('InputWidth2', HW.OutputWidthSortEM)
alg.addgeneric('MaxTob1', d.nleading)
- #alg.addgeneric('MaxTob2', HW.InputWidthEM)
alg.addgeneric('MaxTob2', HW.OutputWidthSortEM)
alg.addgeneric('NumResultBits', len(toponames))
for bitid, ocut in enumerate(d.ocutlist):
alg.addvariable('MinET1', ocut*_et_conversion, bitid)
- alg.addvariable('MinET2', 0, bitid)
- alg.addvariable('MinMSqr', (d.minInvm*_et_conversion)*(d.minInvm*_et_conversion), bitid)
- alg.addvariable('MaxMSqr', (d.maxInvm*_et_conversion)*(d.maxInvm*_et_conversion), bitid)
- tm.registerTopoAlgo(alg)
-
-
- # ZH Trigger
- supportedalgolist = [
- { "minDPhi": 10, "otype" : "J", "ocut" : 20, "olist" : "s",
- "nleading" : 2, "inputwidth": HW.OutputWidthSortJET, "ocut2": 30 }, #10MINDPHI-J20s2-XE30
- { "minDPhi": 10, "otype" : "J", "ocut" : 20, "olist" : "s",
- "nleading" : 2, "inputwidth": HW.OutputWidthSortJET, "ocut2": 50 }, #10MINDPHI-J20s2-XE50
- ]
- for x in supportedalgolist:
- class d:
- pass
- for k in x:
- setattr (d, k, x[k])
- toponame = "%iMINDPHI-%s%s%s%s-XE%i" % (d.minDPhi, d.otype, str(d.ocut) if d.ocut > 0 else "", d.olist, str(d.nleading) if d.olist=="s" else "",d.ocut2)
- log.debug("Define %s", toponame)
- inputList = d.otype + d.olist
- alg = AlgConf.MinDeltaPhiIncl2( name = toponame, inputs = [inputList, 'XE'], outputs = [ toponame ] )
- alg.addgeneric('InputWidth1', d.inputwidth)
- alg.addgeneric('InputWidth2', 1)
- alg.addgeneric('MaxTob1', d.nleading)
- alg.addgeneric('MaxTob2', 1)
- alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinET1', d.ocut)
- alg.addvariable('MinET2', d.ocut2)
- alg.addvariable('DeltaPhiMin', d.minDPhi, 0)
+ alg.addvariable('MinET2', 0*_et_conversion, bitid)
+ alg.addvariable('MinMSqr', d.minInvm*d.minInvm*_et_conversion*_et_conversion, bitid)
+ alg.addvariable('MaxMSqr', d.maxInvm*d.maxInvm*_et_conversion*_et_conversion, bitid)
tm.registerTopoAlgo(alg)
# added for muon-jet:
+ # TODO: to be updated with phase1 muons and jets
algoList = [
{"minDr": 0, "maxDr": 4, "otype1" : "MU" ,"ocut1": 4, "olist1" : "ab", "otype2" : "CJ", "ocut2": 15, "olist2" : "ab"}, #0DR04-MU4ab-CJ15ab
{"minDr": 0, "maxDr": 4, "otype1" : "MU" ,"ocut1": 4, "olist1" : "ab", "otype2" : "CJ", "ocut2": 20, "olist2" : "ab"}, #0DR04-MU4ab-CJ20ab
@@ -639,14 +566,15 @@ class TopoAlgoDef:
alg.addgeneric('MaxTob1', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob2', HW.OutputWidthSelectJET)
alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinET1', d.ocut1, 0)
- alg.addvariable('MinET2', d.ocut2, 0)
- alg.addvariable('DeltaRMin', d.minDr*d.minDr, 0)
- alg.addvariable('DeltaRMax', d.maxDr*d.maxDr, 0)
+ alg.addvariable('MinET1', d.ocut1*_et_conversion, 0)
+ alg.addvariable('MinET2', d.ocut2*_et_conversion, 0)
+ alg.addvariable('DeltaRMin', d.minDr*d.minDr*_dr_conversion*_dr_conversion, 0)
+ alg.addvariable('DeltaRMax', d.maxDr*d.maxDr*_dr_conversion*_dr_conversion, 0)
tm.registerTopoAlgo(alg)
# MULT-BIT
+ # TODO: to be updated with phase1 muons
algoList = [
{"otype1" : "CMU" ,"ocut1": 4, "olist1" : "ab", "nleading1": HW.OutputWidthSelectMU, "inputwidth1": HW.OutputWidthSelectMU}, #MULT-CMU4ab
{"otype1" : "CMU" ,"ocut1": 6, "olist1" : "ab", "nleading1": HW.OutputWidthSelectMU, "inputwidth1": HW.OutputWidthSelectMU}, #MULT-CMU6ab
@@ -656,18 +584,19 @@ class TopoAlgoDef:
pass
for k in x:
setattr (d, k, x[k])
- toponame = "MULT-%s%s%s" % (d.otype1, str(d.ocut1), d.olist1) # noqa: F821
+ toponame = "MULT-%s%s%s" % (d.otype1, str(d.ocut1), d.olist1)
toponames = [toponame+"[0]", toponame+"[1]"]
log.debug("Define %s with outputs %r", toponame, toponames)
- inputList = [d.otype1 + d.olist1] # noqa: F821
+ inputList = [d.otype1 + d.olist1]
alg = AlgConf.Multiplicity( name = toponame, inputs = inputList, outputs = toponames)
- alg.addgeneric('InputWidth', d.inputwidth1) # noqa: F821
+ alg.addgeneric('InputWidth', d.inputwidth1)
alg.addgeneric('NumResultBits', 2)
- alg.addvariable('MinET', d.ocut1-1) # for MU threshold -1 # noqa: F821
+ alg.addvariable('MinET', d.ocut1*_et_conversion)
tm.registerTopoAlgo(alg)
# dimu INVM items
+ # TODO: to be updated with phase1 muons
listofalgos = [
{"minInvm": 2, "maxInvm": 8, "mult": 2, "otype1" : "MU", "ocut1": 4, "olist" : "ab", "otype2" : "", "ocut2" : 0, "onebarrel": 0}, #2INVM8-2MU4ab
{"minInvm": 2, "maxInvm": 9, "mult": 2, "otype1" : "MU", "ocut1": 4, "olist" : "ab", "otype2" : "", "ocut2" : 0, "onebarrel": 0}, #2INVM9-2MU4ab
@@ -700,12 +629,13 @@ class TopoAlgoDef:
alg.addgeneric('MaxTob1', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob2', HW.OutputWidthSelectMU)
alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinET1', d.ocut1)
- alg.addvariable('MinET2', d.ocut2 if d.ocut2>0 else d.ocut1)
- alg.addvariable('MinMSqr', d.minInvm * d.minInvm)
- alg.addvariable('MaxMSqr', d.maxInvm * d.maxInvm)
+ alg.addvariable('MinET1', d.ocut1*_et_conversion)
+ alg.addvariable('MinET2', d.ocut2*_et_conversion if d.ocut2>0 else d.ocut1*_et_conversion)
+ alg.addvariable('MinMSqr', d.minInvm * d.minInvm *_et_conversion*_et_conversion)
+ alg.addvariable('MaxMSqr', d.maxInvm * d.maxInvm *_et_conversion*_et_conversion)
tm.registerTopoAlgo(alg)
+ # TODO: to be updated with phase1 muons
toponame = "8INVM15-2CMU4ab"
log.debug("Define %s", toponame)
inputList = ['CMUab']
@@ -713,13 +643,13 @@ class TopoAlgoDef:
alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob', HW.OutputWidthSelectMU)
alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinMSqr', 8*8)
- alg.addvariable('MaxMSqr', 15*15)
- alg.addvariable('MinET1', 4)
- alg.addvariable('MinET2', 4)
+ alg.addvariable('MinMSqr', 8*8*_et_conversion*_et_conversion)
+ alg.addvariable('MaxMSqr', 15*15*_et_conversion*_et_conversion)
+ alg.addvariable('MinET1', 4*_et_conversion)
+ alg.addvariable('MinET2', 4*_et_conversion)
tm.registerTopoAlgo(alg)
-
+ # TODO: to be updated with phase1 muons
algolist=[
{"minInvm": 2, "maxInvm": 8, "mult": 1, "otype1" : "CMU","ocut1": 4, "olist" : "ab", "otype2" :"MU", "ocut2" : 4, "onebarrel": 0}, # 2INVM8-CMU4ab-MU4ab
{"minInvm": 2, "maxInvm": 8, "mult": 1, "otype1" : "MU", "ocut1": 6, "olist" : "ab", "otype2" : "MU","ocut2" : 4, "onebarrel": 1}, # 2INVM8-ONEBARREL-MU6ab-MU4ab
@@ -746,14 +676,15 @@ class TopoAlgoDef:
alg.addgeneric('MaxTob1', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob2', HW.OutputWidthSelectMU)
alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinET1', d.ocut1)
- alg.addvariable('MinET2', d.ocut2 if d.ocut2>0 else d.ocut1)
- alg.addvariable('MinMSqr', d.minInvm * d.minInvm)
- alg.addvariable('MaxMSqr', d.maxInvm * d.maxInvm)
+ alg.addvariable('MinET1', d.ocut1*_et_conversion)
+ alg.addvariable('MinET2', d.ocut2*_et_conversion if d.ocut2>0 else d.ocut1*_et_conversion)
+ alg.addvariable('MinMSqr', d.minInvm * d.minInvm *_et_conversion*_et_conversion)
+ alg.addvariable('MaxMSqr', d.maxInvm * d.maxInvm *_et_conversion*_et_conversion)
tm.registerTopoAlgo(alg)
# dimu DR items
+ # TODO: to be updated with phase1 muons
algolist = [
{"minDr": 0, "maxDr": 24, "mult": 2, "otype1" : "CMU","ocut1": 4, "olist" : "ab", "otype2" : "", "ocut2": 4, "onebarrel": 0}, #0DR24-2CMU4ab
{"minDr": 0, "maxDr": 24, "mult": 1, "otype1" : "CMU","ocut1": 4, "olist" : "ab", "otype2" : "MU","ocut2": 4, "onebarrel": 0}, #0DR24-CMU4ab-MU4ab
@@ -781,20 +712,21 @@ class TopoAlgoDef:
alg.addgeneric('MaxTob1', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob2', HW.OutputWidthSelectMU)
alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinET1', d.ocut1)
- alg.addvariable('MinET2', d.ocut2)
- alg.addvariable('DeltaRMin', d.minDr*d.minDr)
- alg.addvariable('DeltaRMax', d.maxDr*d.maxDr)
+ alg.addvariable('MinET1', d.ocut1*_et_conversion)
+ alg.addvariable('MinET2', d.ocut2*_et_conversion)
+ alg.addvariable('DeltaRMin', d.minDr*d.minDr *_et_conversion*_et_conversion)
+ alg.addvariable('DeltaRMax', d.maxDr*d.maxDr *_et_conversion*_et_conversion)
tm.registerTopoAlgo(alg)
# LFV DETA ATR-14282
+ # TODO: update with phase1 muons (also algo below)
algoList = [
- { "minDeta": 0, "maxDeta": "04", "mult": 1, "otype1" : "eEM", "ocut1": 8, "olist1" : "abi",
+ { "minDeta": 0, "maxDeta": "04", "mult": 1, "otype1" : "eEM", "ocut1": 8, "olist1" : "abl",
"nleading1": HW.OutputWidthSelectEM, "otype2" : "MU", "ocut2": 10, "olist2": "ab",
- "nleading2": HW.OutputWidthSelectMU}, #0DETA04-eEM8abi-MU10ab
+ "nleading2": HW.OutputWidthSelectMU}, #0DETA04-eEM8abl-MU10ab
{ "minDeta": 0, "maxDeta": "04", "mult": 1,
- "otype1" : "eEM", "ocut1": 15, "olist1" : "abi", "nleading1": HW.OutputWidthSelectEM,
- "otype2" : "MU", "ocut2": 0, "olist2": "ab", "nleading2": HW.OutputWidthSelectMU}, #0DETA04-eEM15abi-MUab
+ "otype1" : "eEM", "ocut1": 15, "olist1" : "abl", "nleading1": HW.OutputWidthSelectEM,
+ "otype2" : "MU", "ocut2": 0, "olist2": "ab", "nleading2": HW.OutputWidthSelectMU}, #0DETA04-eEM15abl-MUab
]
for x in algoList:
class d:
@@ -810,16 +742,15 @@ class TopoAlgoDef:
alg.addgeneric('InputWidth2', d.nleading2)
alg.addgeneric('MaxTob1', d.nleading1)
alg.addgeneric('MaxTob2', d.nleading2)
- alg.addvariable('MinET1', d.ocut1*_et_conversion, 0)
- alg.addvariable('MinET2', d.ocut2*_et_conversion, 0)
+ alg.addvariable('MinET1', d.ocut1*_et_conversion, 0)
+ alg.addvariable('MinET2', d.ocut2*_et_conversion, 0)
alg.addvariable('MinDeltaEta', d.minDeta*_eta_conversion, 0)
alg.addvariable('MaxDeltaEta', d.maxDeta*_eta_conversion, 0)
tm.registerTopoAlgo(alg)
-
algoList = [
- {"minDphi": 0, "maxDphi": "03", "mult": 1, "otype1" : "eEM", "ocut1": 8, "olist1" : "abi", "nleading1": HW.OutputWidthSelectEM, "otype2" : "MU", "ocut2": 10, "olist2": "ab", "nleading2": HW.OutputWidthSelectMU}, #0DPHI03-eEM8abi-MU10ab
- {"minDphi": 0, "maxDphi": "03", "mult": 1, "otype1" : "eEM", "ocut1": 15, "olist1" : "abi", "nleading1": HW.OutputWidthSelectEM, "otype2" : "MU", "ocut2": 0, "olist2": "ab", "nleading2": HW.OutputWidthSelectMU}, #0DPHI03-eEM15abi-MUab
+ {"minDphi": 0, "maxDphi": "03", "mult": 1, "otype1" : "eEM", "ocut1": 8, "olist1" : "abl", "nleading1": HW.OutputWidthSelectEM, "otype2" : "MU", "ocut2": 10, "olist2": "ab", "nleading2": HW.OutputWidthSelectMU}, #0DPHI03-eEM8abl-MU10ab
+ {"minDphi": 0, "maxDphi": "03", "mult": 1, "otype1" : "eEM", "ocut1": 15, "olist1" : "abl", "nleading1": HW.OutputWidthSelectEM, "otype2" : "MU", "ocut2": 0, "olist2": "ab", "nleading2": HW.OutputWidthSelectMU}, #0DPHI03-eEM15abl-MUab
]
for x in algoList:
class d:
@@ -835,45 +766,44 @@ class TopoAlgoDef:
alg.addgeneric('InputWidth2', d.nleading2)
alg.addgeneric('MaxTob1', d.nleading1)
alg.addgeneric('MaxTob2', d.nleading2)
- alg.addvariable('MinET1', d.ocut1*_et_conversion, 0)
- alg.addvariable('MinET2', d.ocut2*_et_conversion, 0)
+ alg.addvariable('MinET1', d.ocut1*_et_conversion, 0)
+ alg.addvariable('MinET2', d.ocut2*_et_conversion, 0)
alg.addvariable('MinDeltaPhi', d.minDphi*_phi_conversion, 0)
alg.addvariable('MaxDeltaPhi', d.maxDphi*_phi_conversion, 0)
tm.registerTopoAlgo(alg)
- # RATIO MATCH dedicated to Exotic
- toponame = '100RATIO-0MATCH-TAU30si2-eEMall'
- alg = AlgConf.RatioMatch( name = toponame, inputs = [ 'TAUsi', 'eEMall'], outputs = [ toponame ] )
+ # RATIO MATCH dedicated to Exotic #TODO: are eTAU correct to use here (and below)?
+ toponame = '100RATIO-0MATCH-eTAU30si2-eEMall'
+ alg = AlgConf.RatioMatch( name = toponame, inputs = [ 'eTAUsi', 'eEMall'], outputs = [ toponame ] )
alg.addgeneric('InputWidth1', HW.OutputWidthSortTAU)
alg.addgeneric('InputWidth2', HW.InputWidthEM)
alg.addgeneric('MaxTob1', 2)
alg.addgeneric('MaxTob2', HW.InputWidthEM)
alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinET1', 30)
- alg.addvariable('MinET2', 0)
+ alg.addvariable('MinET1', 30*_et_conversion)
+ alg.addvariable('MinET2', 0*_et_conversion)
alg.addvariable('Ratio', 100, 0)
tm.registerTopoAlgo(alg)
-
# NOT MATCH dedicated to Exotic
- toponame = 'NOT-0MATCH-TAU30si1-eEMall'
- alg = AlgConf.NotMatch( name = toponame, inputs = [ 'TAUsi', 'eEMall'], outputs = [ toponame ] )
+ toponame = 'NOT-0MATCH-eTAU30si1-eEMall'
+ alg = AlgConf.NotMatch( name = toponame, inputs = [ 'eTAUsi', 'eEMall'], outputs = [ toponame ] )
alg.addgeneric('InputWidth1', HW.OutputWidthSortTAU)
alg.addgeneric('InputWidth2', HW.InputWidthEM)
alg.addgeneric('MaxTob1', 1)
alg.addgeneric('MaxTob2', HW.InputWidthEM)
alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinET1', 30)
- alg.addvariable('MinET2', 0)
- alg.addvariable('EtaMin1', 0)
- alg.addvariable('EtaMax1', 49)
- alg.addvariable('EtaMin2', 0)
- alg.addvariable('EtaMax2', _etamax_phase1)
- alg.addvariable('DRCut', 0)
+ alg.addvariable('MinET1', 30*_et_conversion)
+ alg.addvariable('MinET2', 0*_et_conversion)
+ alg.addvariable('EtaMin1', 0*_eta_conversion)
+ alg.addvariable('EtaMax1', 49*_eta_conversion)
+ alg.addvariable('EtaMin2', 0*_eta_conversion)
+ alg.addvariable('EtaMax2', 49*_eta_conversion)
+ alg.addvariable('DRCut', 0) #TODO: conversion needed here?
tm.registerTopoAlgo(alg)
-
+ # TODO: to be updated with phase1 met
xemap = [{"etcut": 0, "Threlist": [ 40, 50, 55, 60, 65, 75 ]}]
for x in xemap:
class d:
@@ -895,6 +825,7 @@ class TopoAlgoDef:
# LATE MUON : LATE-MU10s1
+ # TODO: to be updated with phase1 muons
for x in [
#{"otype" : "LATE-MU", "ocut" : 10, "inputwidth": HW.OutputWidthSortMU},
{"otype" : "LATE-MU", "ocut" : 10, "inputwidth": HW.NumberOfDelayedMuons},
@@ -915,11 +846,12 @@ class TopoAlgoDef:
alg.addgeneric('InputWidth', d.inputwidth)
alg.addgeneric('MaxTob', 1)
alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinET', str(d.ocut))
+ alg.addvariable('MinET', str(d.ocut*_et_conversion))
tm.registerTopoAlgo(alg)
# (ATR-12748) fat jet trigger with Simple Cone algo
+ # TODO: to be updated with phase1 jets
algoList = [
{"minHT": 111, "otype" : "CJ", "ocut" : 15, "olist" : "ab", "nleading" : HW.OutputWidthSelectJET, "inputwidth": HW.OutputWidthSelectJET, "oeta" : 26}, #SC111-CJ15abpETA26
]
@@ -957,14 +889,15 @@ class TopoAlgoDef:
alg.addgeneric('InputWidth', d.inputwidth)
alg.addgeneric('MaxTob', HW.OutputWidthSelectEM)
alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinET1', d.ocut1*_et_conversion)
- alg.addvariable('MinET2', d.ocut2*_et_conversion)
- alg.addvariable('MinMSqr', (d.minInvm *_et_conversion)*(d.minInvm *_et_conversion))
- alg.addvariable('MaxMSqr', (d.maxInvm *_et_conversion)*(d.maxInvm *_et_conversion))
+ alg.addvariable('MinET1', d.ocut1*_et_conversion)
+ alg.addvariable('MinET2', d.ocut2*_et_conversion)
+ alg.addvariable('MinMSqr', d.minInvm*d.minInvm*_et_conversion*_et_conversion)
+ alg.addvariable('MaxMSqr', d.maxInvm*d.maxInvm*_et_conversion*_et_conversion)
tm.registerTopoAlgo(alg)
# added for b-phys, 0DR03-eEM7ab-CJ15ab
+ # TODO: update with phase1 jets
algoList = [
{"minDr": 0, "maxDr": 3, "otype1" : "eEM" ,"ocut1": 7, "olist1" : "ab", "otype2" : "CJ", "ocut2": 15, "olist2" : "ab"}
]
@@ -982,8 +915,8 @@ class TopoAlgoDef:
alg.addgeneric('MaxTob1', HW.OutputWidthSelectEM)
alg.addgeneric('MaxTob2', HW.OutputWidthSelectJET)
alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinET1', d.ocut1*_et_conversion, 0)
- alg.addvariable('MinET2', d.ocut2*_et_conversion, 0)
+ alg.addvariable('MinET1', d.ocut1*_et_conversion, 0)
+ alg.addvariable('MinET2', d.ocut2*_et_conversion, 0)
alg.addvariable('DeltaRMin', d.minDr*d.minDr*_dr_conversion*_dr_conversion, 0)
alg.addvariable('DeltaRMax', d.maxDr*d.maxDr*_dr_conversion*_dr_conversion, 0)
tm.registerTopoAlgo(alg)
@@ -1008,62 +941,14 @@ class TopoAlgoDef:
alg.addgeneric('InputWidth', d.inputwidth1)
alg.addgeneric('MaxTob', d.nleading2)
alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinET1', d.ocut1*_et_conversion if d.ocut1 > 0 else 3, 0)
- alg.addvariable('MinET2', d.ocut2*_et_conversion if d.ocut2 > 0 else 3, 0)
+ alg.addvariable('MinET1', d.ocut1*_et_conversion if d.ocut1 > 0 else 3, 0)
+ alg.addvariable('MinET2', d.ocut2*_et_conversion if d.ocut2 > 0 else 3, 0)
alg.addvariable('MinDeltaPhi', d.minDphi*_phi_conversion, 0)
alg.addvariable('MaxDeltaPhi', d.maxDphi*_phi_conversion, 0)
tm.registerTopoAlgo(alg)
- # --------------------
- # tau+X items
- # --------------------
-
- # DR tau+X
- # legacy
- algolist=[
- { "minDr": 0, "maxDr": 28, "otype1" : "MU" ,"ocut1": 10, "olist1" : "ab",
- "nleading1": HW.OutputWidthSelectMU, "inputwidth1": HW.OutputWidthSelectMU, "otype2" : "TAU", "ocut2": 12, "olist2" : "abi",
- "nleading2": HW.OutputWidthSelectTAU, "inputwidth2": HW.OutputWidthSelectTAU}, # 0DR28-MU10ab-TAU12abi
- { "minDr": 0, "maxDr": 28, "otype1" : "TAU" ,"ocut1": 20, "olist1" : "abi",
- "nleading1": HW.OutputWidthSelectTAU, "inputwidth1": HW.OutputWidthSelectTAU,"otype2" : "TAU", "ocut2": 12, "olist2" : "abi",
- "nleading2": HW.OutputWidthSelectTAU, "inputwidth2": HW.OutputWidthSelectTAU}, # 0DR28-TAU20abi-TAU12abi
- { "minDr": 0, "maxDr": 25, "otype1" : "TAU" ,"ocut1": 20, "olist1" : "abi",
- "nleading1": HW.OutputWidthSelectTAU, "inputwidth1": HW.OutputWidthSelectTAU,"otype2" : "TAU", "ocut2": 12, "olist2" : "abi",
- "nleading2": HW.OutputWidthSelectTAU, "inputwidth2": HW.OutputWidthSelectTAU}, # 0DR25-TAU20abi-TAU12abi
- ]
- for x in algolist:
- class d:
- pass
- for k in x:
- setattr (d, k, x[k])
- obj1 = "%s%s%s" % (d.otype1, str(d.ocut1), d.olist1)
- obj2 = "-%s%s%s" % (d.otype2, str(d.ocut2), d.olist2)
- toponame = "%iDR%i-%s%s" % (d.minDr, d.maxDr, obj1, obj2)
- log.debug("Define %s", toponame)
- inputList = [d.otype1 + d.olist1] if d.otype1==d.otype2 else [d.otype1 + d.olist1, d.otype2 + d.olist2]
- algoname = AlgConf.DeltaRSqrIncl1 if d.otype1==d.otype2 else AlgConf.DeltaRSqrIncl2
- alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ])
- if d.otype1==d.otype2:
- alg.addgeneric('InputWidth', d.inputwidth1)
- alg.addgeneric('MaxTob', d.nleading1)
- else:
- alg.addgeneric('InputWidth1', d.inputwidth1)
- alg.addgeneric('InputWidth2', d.inputwidth2)
- alg.addgeneric('MaxTob1', d.nleading1)
- alg.addgeneric('MaxTob2', d.nleading2)
- alg.addgeneric('NumResultBits', 1)
- if d.otype1==d.otype2:
- alg.addvariable('MinET1', d.ocut1)
- alg.addvariable('MinET2', d.ocut2)
- alg.addvariable('DeltaRMin', d.minDr*d.minDr)
- alg.addvariable('DeltaRMax', d.maxDr*d.maxDr)
- else:
- alg.addvariable('MinET1', d.ocut1, 0)
- alg.addvariable('MinET2', d.ocut2, 0)
- alg.addvariable('DeltaRMin', d.minDr*d.minDr, 0)
- alg.addvariable('DeltaRMax', d.maxDr*d.maxDr, 0)
- tm.registerTopoAlgo(alg)
- #phase1
+ # Tau dR chains
+ # TODO: use eTAU lists with or without isolation selection?
algolist=[
{ "minDr": 0, "maxDr": 28, "otype1" : "eTAU" ,"ocut1": 20, "olist1" : "abi",
"nleading1": HW.OutputWidthSelectTAU, "inputwidth1": HW.OutputWidthSelectTAU,"otype2" : "eTAU", "ocut2": 12, "olist2" : "abi",
@@ -1094,48 +979,17 @@ class TopoAlgoDef:
alg.addgeneric('MaxTob2', d.nleading2)
alg.addgeneric('NumResultBits', 1)
if d.otype1==d.otype2:
- alg.addvariable('MinET1', d.ocut1*_et_conversion )
- alg.addvariable('MinET2', d.ocut2*_et_conversion )
+ alg.addvariable('MinET1', d.ocut1*_et_conversion )
+ alg.addvariable('MinET2', d.ocut2*_et_conversion )
alg.addvariable('DeltaRMin', d.minDr*d.minDr*_dr_conversion*_dr_conversion)
alg.addvariable('DeltaRMax', d.maxDr*d.maxDr*_dr_conversion*_dr_conversion)
else:
- alg.addvariable('MinET1', d.ocut1*_et_conversion , 0)
- alg.addvariable('MinET2', d.ocut2*_et_conversion , 0)
+ alg.addvariable('MinET1', d.ocut1*_et_conversion , 0)
+ alg.addvariable('MinET2', d.ocut2*_et_conversion , 0)
alg.addvariable('DeltaRMin', d.minDr*d.minDr*_dr_conversion*_dr_conversion, 0)
alg.addvariable('DeltaRMax', d.maxDr*d.maxDr*_dr_conversion*_dr_conversion, 0)
tm.registerTopoAlgo(alg)
- # DISAMB 1 and 2 lists
- # legacy
- algolist=[
- { "disamb": 1, "otype1" : "TAU", "ocut1": 12, "olist1" : "abi", "nleading1": HW.OutputWidthSelectTAU,
- "otype2" : "J", "ocut2": 25, "olist2": "ab", "nleading2": HW.OutputWidthSelectJET}, #1DISAMB-TAU12abi-J25ab
- { "disamb": 2, "otype1" : "TAU", "ocut1": 12, "olist1" : "abi", "nleading1": HW.OutputWidthSelectTAU,
- "otype2" : "J", "ocut2": 25, "olist2": "ab", "nleading2": HW.OutputWidthSelectJET}, #2DISAMB-TAU12abi-J25ab
- ]
- for x in algolist:
- class d:
- pass
- for k in x:
- setattr (d, k, x[k])
- obj1 = "%s%s%s" % (d.otype1, str(d.ocut1), d.olist1)
- obj2 = "-%s%s%s" % (d.otype2, str(d.ocut2), d.olist2)
- toponame = "%sDISAMB-%s%s" % ( d.disamb if d.disamb>0 else "", obj1, obj2)
- log.debug("Define %s", toponame)
- inputList = [d.otype1 + d.olist1, d.otype2 + d.olist2]
- alg = AlgConf.DisambiguationIncl2( name = toponame, inputs = inputList, outputs = [ toponame ])
- alg.addgeneric('InputWidth1', d.nleading1 if d.olist1.find("ab")>=0 else -1000)
- alg.addgeneric('InputWidth2', d.nleading2 if d.olist2.find("ab")>=0 else -1000)
- alg.addgeneric('MaxTob1', d.nleading1)
- alg.addgeneric('MaxTob2', d.nleading2)
- alg.addgeneric('NumResultBits', 1)
- alg.addgeneric('ClusterOnly', 1 if (d.otype1=="EM" and d.otype2=="TAU") or (d.otype1=="TAU" and d.otype2=="EM") else 0 )
- alg.addgeneric('ApplyDR', 0)
- alg.addvariable('MinET1', d.ocut1)
- alg.addvariable('MinET2', d.ocut2)
- alg.addvariable('DisambDRSqrMin', d.disamb*d.disamb)
- tm.registerTopoAlgo(alg)
-
# DISAMB 3 lists with DR cut to 2nd and 3rd lists
algolist=[
{ "disamb": 2,
@@ -1154,9 +1008,9 @@ class TopoAlgoDef:
pass
for k in x:
setattr (d, k, x[k])
- obj1 = "-%s%s%s" % (d.otype1, str(d.ocut1), d.olist1.replace('shi','his') + (str(d.nleading1) if d.olist1.find('s')>=0 else ""))
- obj2 = "-%s%s%s" % (d.otype2, str(d.ocut2), d.olist2.replace('shi','his') + (str(d.nleading2) if d.olist2.find('s')>=0 else ""))
- obj3 = "%s%s%s" % (d.otype3, str(d.ocut3), d.olist3)
+ obj1 = "-%s%s%s" % (d.otype1, str(d.ocut1), d.olist1)
+ obj2 = "-%s%s%s" % (d.otype2, str(d.ocut2), d.olist2)
+ obj3 = "%s%s%s" % (d.otype3, str(d.ocut3), d.olist3)
toponame = "%sDISAMB-%s-%dDR%d%s%s" % ( str(d.disamb) if d.disamb>0 else "", obj3, d.drcutmin, d.drcutmax, obj1, obj2)
log.debug("Define %s", toponame)
inputList = [d.otype1 + d.olist1, d.otype2 + d.olist2, d.otype3 + d.olist3]
@@ -1177,13 +1031,8 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
-
- # --------------------
- # VBF items
- # --------------------
-
- # VBF deta
- # legacy
+ # TLA deta
+ # TODO: update to phase1 jets
algoList = [
{ "minDeta": 0, "maxDeta": 20, "otype" : "J", "ocut1" : 50, "olist" : "s",
"nleading1" : 1, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 0, "nleading2": 2}, #0DETA20-J50s1-Js2
@@ -1208,13 +1057,11 @@ class TopoAlgoDef:
alg.addvariable('MaxDeltaEta', d.maxDeta, 0)
tm.registerTopoAlgo(alg)
-
- # INVM_NFF + DPHI
- # legacy
+ # jINVM + DPHI
NFFDphimap = [
- { "minInvm": 400 , "maxInvm": 9999, "minDphi": 0, "maxDphiList": [26, 24, 22, 20],
- "otype1" : "J", "ocut1" : 30, "olist1" : "s", "nleading1" : 6, "inputwidth": HW.OutputWidthSortJET,
- "otype2" : "AJ", "ocut2" : 20, "olist2" : "s", "nleading2" : 6 }
+ { "minInvm": 400 , "minDphi": 0, "maxDphiList": [26, 24, 22, 20],
+ "otype1" : "AjJ", "ocut1" : 30, "olist1" : "s", "nleading1" : 6, "inputwidth": HW.OutputWidthSortJET,
+ "otype2" : "AjJ", "ocut2" : 20, "olist2" : "s", "nleading2" : 6 }
]
for x in NFFDphimap:
class d:
@@ -1224,24 +1071,26 @@ class TopoAlgoDef:
inputList = [d.otype1 + d.olist1, d.otype2 + d.olist1]
toponames=[]
for maxDphi in d.maxDphiList:
- toponames.append ("%iINVM%i-%iDPHI%i-%s%s%s%s-%s%s%s%s" % (d.minInvm, d.maxInvm, d.minDphi, maxDphi,
+ toponames.append ("%iINVM-%iDPHI%i-%s%s%s%s-%s%s%s%s" % (d.minInvm, d.minDphi, maxDphi,
d.otype1, str(d.ocut1) , d.olist1, str(d.nleading1) if d.olist1=="s" else "",
d.otype2, str(d.ocut2) , d.olist2, str(d.nleading2) if d.olist2=="s" else ""))
- alg = AlgConf.InvariantMassDeltaPhiInclusive2( name = 'INVM_DPHI_NFF', inputs = inputList, outputs = toponames)
+ alg = AlgConf.InvariantMassDeltaPhiInclusive2( name = 'jINVM_DPHI', inputs = inputList, outputs = toponames)
alg.addgeneric('InputWidth1', d.inputwidth)
alg.addgeneric('InputWidth2', d.inputwidth)
alg.addgeneric('MaxTob1', d.nleading1)
alg.addgeneric('MaxTob2', d.nleading2)
alg.addgeneric('NumResultBits', len(toponames))
for bitid,maxDphi in enumerate(d.maxDphiList):
- alg.addvariable('MinET1', d.ocut1, bitid)
- alg.addvariable('MinET2', d.ocut2, bitid)
- alg.addvariable('MinMSqr', d.minInvm*d.minInvm , bitid)
- alg.addvariable('MaxMSqr', d.maxInvm*d.maxInvm , bitid)
- alg.addvariable('MinDeltaPhi', d.minDphi, bitid)
- alg.addvariable('MaxDeltaPhi', maxDphi, bitid)
+ alg.addvariable('MinET1', d.ocut1*_et_conversion , bitid)
+ alg.addvariable('MinET2', d.ocut2*_et_conversion , bitid)
+ alg.addvariable('MinMSqr', d.minInvm*d.minInvm *_et_conversion*_et_conversion , bitid)
+ alg.addvariable('MaxMSqr', _no_m_upper_threshold , bitid) # no upper threshold
+ alg.addvariable('MinDeltaPhi', d.minDphi*_phi_conversion , bitid)
+ alg.addvariable('MaxDeltaPhi', maxDphi*_phi_conversion, bitid)
tm.registerTopoAlgo(alg)
- #phase1
+
+
+ # jINVM_NFF + DPHI
NFFDphimap = [
{ "minInvm": 400 , "minDphi": 0, "maxDphiList": [26, 24, 22, 20],
"otype1" : "jJ", "ocut1" : 30, "olist1" : "s", "nleading1" : 6, "inputwidth": HW.OutputWidthSortJET,
@@ -1258,17 +1107,17 @@ class TopoAlgoDef:
toponames.append ("%iINVM-%iDPHI%i-%s%s%s%s-%s%s%s%s" % (d.minInvm, d.minDphi, maxDphi,
d.otype1, str(d.ocut1) , d.olist1, str(d.nleading1) if d.olist1=="s" else "",
d.otype2, str(d.ocut2) , d.olist2, str(d.nleading2) if d.olist2=="s" else ""))
- alg = AlgConf.InvariantMassDeltaPhiInclusive2( name = 'INVM_DPHI_jNFF', inputs = inputList, outputs = toponames)
+ alg = AlgConf.InvariantMassDeltaPhiInclusive2( name = 'jINVM_DPHI_NFF', inputs = inputList, outputs = toponames)
alg.addgeneric('InputWidth1', d.inputwidth)
alg.addgeneric('InputWidth2', d.inputwidth)
alg.addgeneric('MaxTob1', d.nleading1)
alg.addgeneric('MaxTob2', d.nleading2)
alg.addgeneric('NumResultBits', len(toponames))
for bitid,maxDphi in enumerate(d.maxDphiList):
- alg.addvariable('MinET1', d.ocut1*_et_conversion , bitid)
- alg.addvariable('MinET2', d.ocut2*_et_conversion , bitid)
- alg.addvariable('MinMSqr', d.minInvm*d.minInvm *_et_conversion*_et_conversion , bitid)
- alg.addvariable('MaxMSqr', _no_m_upper_threshold , bitid) # no upper threshold
+ alg.addvariable('MinET1', d.ocut1*_et_conversion , bitid)
+ alg.addvariable('MinET2', d.ocut2*_et_conversion , bitid)
+ alg.addvariable('MinMSqr', d.minInvm*d.minInvm *_et_conversion*_et_conversion , bitid)
+ alg.addvariable('MaxMSqr', _no_m_upper_threshold , bitid) # no upper threshold
alg.addvariable('MinDeltaPhi', d.minDphi*_phi_conversion , bitid)
alg.addvariable('MaxDeltaPhi', maxDphi*_phi_conversion, bitid)
tm.registerTopoAlgo(alg)
@@ -1305,41 +1154,8 @@ class TopoAlgoDef:
alg.addvariable('MinMSqr', minInvm * minInvm, bitid)
alg.addvariable('MaxMSqr', d.maxInvm * d.maxInvm, bitid)
tm.registerTopoAlgo(alg)
+
# CF
- #legacy
- algoList = [
- { "minInvm": 400, "maxInvm": 9999, "otype1" : "AJ", "ocut1": 30, "olist1" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET,
- "otype2" : "AJ", "ocut2": 20, "olist2" : "s", "nleading2" : 6, "inputwidth2": HW.OutputWidthSortJET, "applyEtaCut":1,
- "minEta1": 0 ,"maxEta1": 31 , "minEta2": 31 ,"maxEta2": 49 , }, #400INVM9999-AJ30s6pETA31-AJ20s6p31ETA49
- ]
- for x in algoList:
- class d:
- pass
- for k in x:
- setattr (d, k, x[k])
- obj1 = "%s%s%sp%sETA%i" % (d.otype1, str(d.ocut1), d.olist1 + (str(d.nleading1) if d.olist1.find('s')>=0 else ""),str(d.minEta1) if d.minEta1>0 else "", d.maxEta1)
- obj2 = "-%s%s%sp%sETA%i" % (d.otype2, str(d.ocut2), d.olist2 + (str(d.nleading2) if d.olist2.find('s')>=0 else ""),str(d.minEta2) if d.minEta2>0 else "", d.maxEta2)
- inputList = [d.otype1 + d.olist1, d.otype2 + d.olist2]
- toponame = "%iINVM%i-%s%s" % (d.minInvm, d.maxInvm, obj1, obj2)
- alg = AlgConf.InvariantMassInclusive2( name = toponame, inputs = inputList, outputs = toponame)
- alg.addgeneric('InputWidth1', d.inputwidth1)
- alg.addgeneric('InputWidth2', d.inputwidth2)
- alg.addgeneric('MaxTob1', d.nleading1)
- alg.addgeneric('MaxTob2', d.nleading2)
- alg.addgeneric('NumResultBits', 1)
- if (d.applyEtaCut>0):
- alg.addgeneric('ApplyEtaCut', d.applyEtaCut)
- alg.addvariable('MinET1', d.ocut1)
- alg.addvariable('MinET2', d.ocut2)
- alg.addvariable('MinMSqr', d.minInvm * d.minInvm )
- alg.addvariable('MaxMSqr', d.maxInvm * d.maxInvm )
- if (d.applyEtaCut>0):
- alg.addvariable('MinEta1', d.minEta1)
- alg.addvariable('MaxEta1', d.maxEta1)
- alg.addvariable('MinEta2', d.minEta2)
- alg.addvariable('MaxEta2', d.maxEta2)
- tm.registerTopoAlgo(alg)
- # phase 1
algoList = [
{ "minInvm": 400, "otype1" : "AjJ", "ocut1": 30, "olist1" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET,
"otype2" : "AjJ", "ocut2": 20, "olist2" : "s", "nleading2" : 6, "inputwidth2": HW.OutputWidthSortJET, "applyEtaCut":1,
@@ -1362,8 +1178,8 @@ class TopoAlgoDef:
alg.addgeneric('NumResultBits', 1)
if (d.applyEtaCut>0):
alg.addgeneric('ApplyEtaCut', d.applyEtaCut)
- alg.addvariable('MinET1', d.ocut1*_et_conversion )
- alg.addvariable('MinET2', d.ocut2*_et_conversion )
+ alg.addvariable('MinET1', d.ocut1*_et_conversion )
+ alg.addvariable('MinET2', d.ocut2*_et_conversion )
alg.addvariable('MinMSqr', d.minInvm*d.minInvm*_et_conversion*_et_conversion )
alg.addvariable('MaxMSqr', _no_m_upper_threshold )
if (d.applyEtaCut>0):
@@ -1373,38 +1189,37 @@ class TopoAlgoDef:
alg.addvariable('MaxEta2', d.maxEta2*_eta_conversion )
tm.registerTopoAlgo(alg)
-
-
- # INVM_NFF
- # legacy
- invm_nff_map = { "algoname": 'INVM_NFF', "Threlist": [ 500 ], "maxInvm": 9999,
- "otype1" : "J", "ocut1" : 30, "olist1" : "s", "nleading1" : 6, "inputwidth": HW.OutputWidthSortJET,
- "otype2" : "AJ", "ocut2" : 20, "olist2" : "s", "nleading2" : 6 }
- for x in [ invm_nff_map ]:
+ # jINVM
+ NFFmap = [
+ { "minInvmList": [300,400,500,700] ,
+ "otype1" : "AjJ", "ocut1" : 30, "olist1" : "s", "nleading1" : 6, "inputwidth": HW.OutputWidthSortJET,
+ "otype2" : "AjJ", "ocut2" : 20, "olist2" : "s", "nleading2" : 6 }
+ ]
+ for x in NFFmap:
class d:
pass
for k in x:
setattr (d, k, x[k])
inputList = [d.otype1 + d.olist1, d.otype2 + d.olist1]
toponames=[]
- for minInvm in d.Threlist:
- toponame = "%iINVM%i-%s%s%s%s-%s%s%s%s" % (minInvm, d.maxInvm,
- d.otype1, str(d.ocut1) , d.olist1, str(d.nleading1) if d.olist1=="s" else "",
- d.otype2, str(d.ocut2) , d.olist2, str(d.nleading2) if d.olist2=="s" else "")
- toponames.append(toponame)
- alg = AlgConf.InvariantMassInclusive2( name = d.algoname, inputs = inputList, outputs = toponames)
+ for minInvm in d.minInvmList:
+ toponames.append ("%iINVM-%s%s%s%s-%s%s%s%s" % (minInvm,
+ d.otype1, str(d.ocut1) , d.olist1, str(d.nleading1) if d.olist1=="s" else "",
+ d.otype2, str(d.ocut2) , d.olist2, str(d.nleading2) if d.olist2=="s" else ""))
+ alg = AlgConf.InvariantMassDeltaPhiInclusive2( name = 'jINVM', inputs = inputList, outputs = toponames)
alg.addgeneric('InputWidth1', d.inputwidth)
alg.addgeneric('InputWidth2', d.inputwidth)
alg.addgeneric('MaxTob1', d.nleading1)
alg.addgeneric('MaxTob2', d.nleading2)
- alg.addgeneric('NumResultBits', len(toponames))
- for bitid, minInvm in enumerate(d.Threlist):
- alg.addvariable('MinET1', d.ocut1, bitid)
- alg.addvariable('MinET2', d.ocut2, bitid)
- alg.addvariable('MinMSqr', minInvm*minInvm , bitid)
- alg.addvariable('MaxMSqr', d.maxInvm *d.maxInvm , bitid)
+ alg.addgeneric('NumResultBits', len(toponames))
+ for bitid,minInvm in enumerate(d.minInvmList):
+ alg.addvariable('MinET1', d.ocut1*_et_conversion , bitid)
+ alg.addvariable('MinET2', d.ocut2*_et_conversion , bitid)
+ alg.addvariable('MinMSqr', minInvm*minInvm*_et_conversion*_et_conversion , bitid)
+ alg.addvariable('MaxMSqr', _no_m_upper_threshold , bitid) # no upper threshold
tm.registerTopoAlgo(alg)
- # phase 1
+
+ # jINVM_NFF
NFFmap = [
{ "minInvmList": [300,400,500,700] ,
"otype1" : "jJ", "ocut1" : 30, "olist1" : "s", "nleading1" : 6, "inputwidth": HW.OutputWidthSortJET,
@@ -1421,20 +1236,21 @@ class TopoAlgoDef:
toponames.append ("%iINVM-%s%s%s%s-%s%s%s%s" % (minInvm,
d.otype1, str(d.ocut1) , d.olist1, str(d.nleading1) if d.olist1=="s" else "",
d.otype2, str(d.ocut2) , d.olist2, str(d.nleading2) if d.olist2=="s" else ""))
- alg = AlgConf.InvariantMassDeltaPhiInclusive2( name = 'INVM_jNFF', inputs = inputList, outputs = toponames)
+ alg = AlgConf.InvariantMassDeltaPhiInclusive2( name = 'jINVM_NFF', inputs = inputList, outputs = toponames)
alg.addgeneric('InputWidth1', d.inputwidth)
alg.addgeneric('InputWidth2', d.inputwidth)
alg.addgeneric('MaxTob1', d.nleading1)
alg.addgeneric('MaxTob2', d.nleading2)
alg.addgeneric('NumResultBits', len(toponames))
for bitid,minInvm in enumerate(d.minInvmList):
- alg.addvariable('MinET1', d.ocut1*_et_conversion , bitid)
- alg.addvariable('MinET2', d.ocut2*_et_conversion , bitid)
+ alg.addvariable('MinET1', d.ocut1*_et_conversion , bitid)
+ alg.addvariable('MinET2', d.ocut2*_et_conversion , bitid)
alg.addvariable('MinMSqr', minInvm*minInvm*_et_conversion*_et_conversion , bitid)
alg.addvariable('MaxMSqr', _no_m_upper_threshold , bitid) # no upper threshold
tm.registerTopoAlgo(alg)
#ATR-19355
+ # TODO: to be updated with phase1 muons
toponame = "0INVM10-3MU4ab"
log.debug("Define %s", toponame)
inputList = 'MUab'
@@ -1442,64 +1258,67 @@ class TopoAlgoDef:
alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob', HW.OutputWidthSelectMU)
alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinMSqr', 0)
- alg.addvariable('MaxMSqr', 10*10)
- alg.addvariable('MinET1', 4)
+ alg.addvariable('MinMSqr', 0*_et_conversion*_et_conversion)
+ alg.addvariable('MaxMSqr', 10*10*_et_conversion*_et_conversion)
+ alg.addvariable('MinET1', 4*_et_conversion)
tm.registerTopoAlgo(alg)
#ATR-18815
- toponame = "0INVM10-0DR15-eEM8abi-MU10ab"
+ # TODO: to be updated with phase1 muons
+ toponame = "0INVM10-0DR15-eEM8abl-MU10ab"
log.debug("Define %s", toponame)
- inputList = ['eEMabi','MUab']
+ inputList = ['eEMabl','MUab']
alg = AlgConf.InvariantMassInclusiveDeltaRSqrIncl2( name = toponame, inputs = inputList, outputs = toponame )
alg.addgeneric('InputWidth1', HW.OutputWidthSelectEM)
alg.addgeneric('InputWidth2', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob1', HW.OutputWidthSortEM)
alg.addgeneric('MaxTob2', HW.OutputWidthSelectMU)
alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinMSqr', 0)
- alg.addvariable('MaxMSqr', 10*_et_conversion *10*_et_conversion)
- alg.addvariable('MinET1', 8*_et_conversion)
- alg.addvariable('MinET2', 10*_et_conversion)
- alg.addgeneric('ApplyEtaCut', 0)
- alg.addvariable('MinEta1', 0)
- alg.addvariable('MinEta2', 0)
- alg.addvariable('MaxEta1', _etamax_phase1)
- alg.addvariable('MaxEta2', _etamax_phase1)
- alg.addvariable('DeltaRMin', 0)
+ alg.addvariable('MinMSqr', 0*_et_conversion*_et_conversion)
+ alg.addvariable('MaxMSqr', 10*10*_et_conversion*_et_conversion)
+ alg.addvariable('MinET1', 8*_et_conversion)
+ alg.addvariable('MinET2', 10*_et_conversion)
+ alg.addgeneric('ApplyEtaCut', 0)
+ alg.addvariable('MinEta1', 0*_eta_conversion)
+ alg.addvariable('MinEta2', 0*_eta_conversion)
+ alg.addvariable('MaxEta1', 49*_eta_conversion)
+ alg.addvariable('MaxEta2', 49*_eta_conversion)
+ alg.addvariable('DeltaRMin', 0*_dr_conversion*_dr_conversion)
alg.addvariable('DeltaRMax', 15*15*_dr_conversion*_dr_conversion)
tm.registerTopoAlgo(alg)
#ATR-18815
- toponame = "0INVM10-0DR15-eEM12abi-MU6ab"
+ # TODO: to be updated with phase1 muons
+ toponame = "0INVM10-0DR15-eEM12abl-MU6ab"
log.debug("Define %s", toponame)
- inputList = ['eEMabi','MUab']
+ inputList = ['eEMabl','MUab']
alg = AlgConf.InvariantMassInclusiveDeltaRSqrIncl2( name = toponame, inputs = inputList, outputs = toponame )
alg.addgeneric('InputWidth1', HW.OutputWidthSelectEM)
alg.addgeneric('InputWidth2', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob1', HW.OutputWidthSortEM)
alg.addgeneric('MaxTob2', HW.OutputWidthSelectMU)
alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinMSqr', 0)
- alg.addvariable('MaxMSqr', 10*_et_conversion*10*_et_conversion)
- alg.addvariable('MinET1', 12*_et_conversion)
- alg.addvariable('MinET2', 6*_et_conversion)
- alg.addgeneric('ApplyEtaCut', 0)
- alg.addvariable('MinEta1', 0)
- alg.addvariable('MinEta2', 0)
- alg.addvariable('MaxEta1', _etamax_phase1)
- alg.addvariable('MaxEta2', _etamax_phase1)
- alg.addvariable('DeltaRMin', 0)
+ alg.addvariable('MinMSqr', 0*_et_conversion*_et_conversion)
+ alg.addvariable('MaxMSqr', 10*10*_et_conversion*_et_conversion)
+ alg.addvariable('MinET1', 12*_et_conversion)
+ alg.addvariable('MinET2', 6*_et_conversion)
+ alg.addgeneric('ApplyEtaCut', 0)
+ alg.addvariable('MinEta1', 0*_eta_conversion)
+ alg.addvariable('MinEta2', 0*_eta_conversion)
+ alg.addvariable('MaxEta1', 49*_eta_conversion)
+ alg.addvariable('MaxEta2', 49*_eta_conversion)
+ alg.addvariable('DeltaRMin', 0*_dr_conversion*_dr_conversion)
alg.addvariable('DeltaRMax', 15*15*_dr_conversion*_dr_conversion)
tm.registerTopoAlgo(alg)
#ATR-18824 ZAFB-DPHI
+ # TODO: update with fwd electrons
ZAFBDphimap = [
{ "minInvm": 60 , "minDphiList": [4, 25], "maxDphi": 32, "minEta2": 23, "maxEta2": 49,
- "inputwidth1": HW.OutputWidthSortEM, "otype1" : "eEM", "ocut1" : 15, "olist1" : "abhi",
+ "inputwidth1": HW.OutputWidthSortEM, "otype1" : "eEM", "ocut1" : 15, "olist1" : "abm",
"nleading1" : HW.OutputWidthSortEM, "inputwidth2": HW.OutputWidthSortJET, "ocut2" : 15, "nleading2" : 6 }
]
for x in ZAFBDphimap:
@@ -1520,13 +1339,13 @@ class TopoAlgoDef:
alg.addgeneric('MaxTob2', d.nleading2)
alg.addgeneric('NumResultBits', len(toponames))
alg.addgeneric('ApplyEtaCut', 1)
- alg.addvariable('MinEta1', 0)
- alg.addvariable('MaxEta1', _etamax_phase1)
+ alg.addvariable('MinEta1', 0*_eta_conversion)
+ alg.addvariable('MaxEta1', 49*_eta_conversion)
alg.addvariable('MinEta2', 23*_eta_conversion)
alg.addvariable('MaxEta2', 49*_eta_conversion)
for bitid,minDphi in enumerate(d.minDphiList):
- alg.addvariable('MinET1', d.ocut1*_et_conversion, bitid)
- alg.addvariable('MinET2', d.ocut2*_et_conversion, bitid)
+ alg.addvariable('MinET1', d.ocut1*_et_conversion, bitid)
+ alg.addvariable('MinET2', d.ocut2*_et_conversion, bitid)
alg.addvariable('MinMSqr', d.minInvm*d.minInvm*_et_conversion*_et_conversion, bitid)
alg.addvariable('MaxMSqr', _no_m_upper_threshold, bitid)
alg.addvariable('MinDeltaPhi', minDphi*_phi_conversion, bitid)
@@ -1535,52 +1354,51 @@ class TopoAlgoDef:
#ATR-19302:
- toponame = "0INVM70-27DPHI32-eEM10his1-eEM10his6"
+ toponame = "0INVM70-27DPHI32-eEM10sm1-eEM10sm6"
log.debug("Define %s", toponame)
- inputList = ['eEMshi','eEMshi']
+ inputList = ['eEMsm','eEMsm']
alg = AlgConf.InvariantMassDeltaPhiInclusive2( name = toponame, inputs = inputList, outputs = toponame )
alg.addgeneric('InputWidth1', HW.OutputWidthSortEM)
alg.addgeneric('InputWidth2', HW.OutputWidthSortEM)
alg.addgeneric('MaxTob1', 1)
alg.addgeneric('MaxTob2', 6)
alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinMSqr', 0)
- alg.addvariable('MaxMSqr', (70*_et_conversion)*(70*_et_conversion))
- alg.addvariable('MinET1', 10*_et_conversion)
- alg.addvariable('MinET2', 10*_et_conversion)
- alg.addgeneric('ApplyEtaCut', 1)
- alg.addvariable('MinEta1', 0)
- alg.addvariable('MaxEta1', _etamax_phase1)
- alg.addvariable('MinEta2', 0)
- alg.addvariable('MaxEta2', _etamax_phase1)
+ alg.addvariable('MinMSqr', 0*_et_conversion*_et_conversion)
+ alg.addvariable('MaxMSqr', 70*70*_et_conversion*_et_conversion)
+ alg.addvariable('MinET1', 10*_et_conversion)
+ alg.addvariable('MinET2', 10*_et_conversion)
+ alg.addgeneric('ApplyEtaCut', 1)
+ alg.addvariable('MinEta1', 0*_eta_conversion)
+ alg.addvariable('MaxEta1', 49*_eta_conversion)
+ alg.addvariable('MinEta2', 0*_eta_conversion)
+ alg.addvariable('MaxEta2', 49*_eta_conversion)
alg.addvariable('MinDeltaPhi', 27*_phi_conversion)
alg.addvariable('MaxDeltaPhi', 32*_phi_conversion)
tm.registerTopoAlgo(alg)
-
- toponame = "0INVM70-27DPHI32-eEM12his1-eEM12his6"
+ toponame = "0INVM70-27DPHI32-eEM12sm1-eEM12sm6"
log.debug("Define %s", toponame)
- inputList = ['eEMshi','eEMshi']
+ inputList = ['eEMsm','eEMsm']
alg = AlgConf.InvariantMassDeltaPhiInclusive2( name = toponame, inputs = inputList, outputs = toponame )
alg.addgeneric('InputWidth1', HW.OutputWidthSortEM)
alg.addgeneric('InputWidth2', HW.OutputWidthSortEM)
alg.addgeneric('MaxTob1', 1)
alg.addgeneric('MaxTob2', 6)
alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinMSqr', 0)
- alg.addvariable('MaxMSqr', (70*_et_conversion)*(70*_et_conversion))
- alg.addvariable('MinET1', 10*_et_conversion)
- alg.addvariable('MinET2', 12*_et_conversion)
- alg.addgeneric('ApplyEtaCut', 1)
- alg.addvariable('MinEta1', 0)
- alg.addvariable('MaxEta1', _etamax_phase1)
- alg.addvariable('MinEta2', 0)
- alg.addvariable('MaxEta2', _etamax_phase1)
+ alg.addvariable('MinMSqr', 0*_et_conversion*_et_conversion)
+ alg.addvariable('MaxMSqr', 70*70*_et_conversion*_et_conversion)
+ alg.addvariable('MinET1', 12*_et_conversion)
+ alg.addvariable('MinET2', 12*_et_conversion)
+ alg.addgeneric('ApplyEtaCut', 1)
+ alg.addvariable('MinEta1', 0*_eta_conversion)
+ alg.addvariable('MaxEta1', 49*_eta_conversion)
+ alg.addvariable('MinEta2', 0*_eta_conversion)
+ alg.addvariable('MaxEta2', 49*_eta_conversion)
alg.addvariable('MinDeltaPhi', 27*_phi_conversion)
alg.addvariable('MaxDeltaPhi', 32*_phi_conversion)
tm.registerTopoAlgo(alg)
- #ATR-21637, TODO: use loose shower shape cuts
+ #ATR-21637
toponame = "0INVM70-27DPHI32-eEM12s1-eEM12s6"
log.debug("Define %s", toponame)
inputList = ['eEMs','eEMs']
@@ -1590,21 +1408,22 @@ class TopoAlgoDef:
alg.addgeneric('MaxTob1', 1)
alg.addgeneric('MaxTob2', 6)
alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinMSqr', 0)
- alg.addvariable('MaxMSqr', (70*_et_conversion)*(70*_et_conversion))
- alg.addvariable('MinET1', 10*_et_conversion)
- alg.addvariable('MinET2', 12*_et_conversion)
- alg.addgeneric('ApplyEtaCut', 1)
- alg.addvariable('MinEta1', 0)
- alg.addvariable('MaxEta1', _etamax_phase1)
- alg.addvariable('MinEta2', 0)
- alg.addvariable('MaxEta2', _etamax_phase1)
+ alg.addvariable('MinMSqr', 0*_et_conversion*_et_conversion)
+ alg.addvariable('MaxMSqr', 70*70*_et_conversion*_et_conversion)
+ alg.addvariable('MinET1', 12*_et_conversion)
+ alg.addvariable('MinET2', 12*_et_conversion)
+ alg.addgeneric('ApplyEtaCut', 1)
+ alg.addvariable('MinEta1', 0*_eta_conversion)
+ alg.addvariable('MaxEta1', 49*_eta_conversion)
+ alg.addvariable('MinEta2', 0*_eta_conversion)
+ alg.addvariable('MaxEta2', 49*_eta_conversion)
alg.addvariable('MinDeltaPhi', 27*_phi_conversion)
alg.addvariable('MaxDeltaPhi', 32*_phi_conversion)
tm.registerTopoAlgo(alg)
#ATR-19720, L1_BPH-8M15-0DR22-2MU6
+ # TODO: update with phase1 muons
toponame = "8INVM15-0DR22-2MU6ab"
log.debug("Define %s", toponame)
inputList = ['MUab']
@@ -1612,16 +1431,16 @@ class TopoAlgoDef:
alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob', HW.OutputWidthSelectMU)
alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinMSqr', 8*8)
- alg.addvariable('MaxMSqr', 15*15)
- alg.addvariable('MinET1', 6)
- alg.addvariable('MinET2', 6)
- alg.addvariable('DeltaRMin', 0)
- alg.addvariable('DeltaRMax', 22*22)
+ alg.addvariable('MinMSqr', 8*8*_et_conversion*_et_conversion)
+ alg.addvariable('MaxMSqr', 15*15*_et_conversion*_et_conversion)
+ alg.addvariable('MinET1', 6*_et_conversion)
+ alg.addvariable('MinET2', 6*_et_conversion)
+ alg.addvariable('DeltaRMin', 0*_dr_conversion*_dr_conversion)
+ alg.addvariable('DeltaRMax', 22*22*_dr_conversion*_dr_conversion)
tm.registerTopoAlgo(alg)
-
#ATR-19720, L1_BPH-2M9-2DR15-2MU6
+ # TODO: update with phase1 muons
toponame = "2INVM9-2DR15-2MU6ab"
log.debug("Define %s", toponame)
inputList = ['MUab']
@@ -1629,16 +1448,16 @@ class TopoAlgoDef:
alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob', HW.OutputWidthSelectMU)
alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinMSqr', 2*2)
- alg.addvariable('MaxMSqr', 9*9)
- alg.addvariable('MinET1', 6)
- alg.addvariable('MinET2', 6)
- alg.addvariable('DeltaRMin', 2*2)
- alg.addvariable('DeltaRMax', 15*15)
+ alg.addvariable('MinMSqr', 2*2*_et_conversion*_et_conversion)
+ alg.addvariable('MaxMSqr', 9*9*_et_conversion*_et_conversion)
+ alg.addvariable('MinET1', 6*_et_conversion)
+ alg.addvariable('MinET2', 6*_et_conversion)
+ alg.addvariable('DeltaRMin', 2*2*_dr_conversion*_dr_conversion)
+ alg.addvariable('DeltaRMax', 15*15*_dr_conversion*_dr_conversion)
tm.registerTopoAlgo(alg)
-
#ATR-19720, L1_BPH-2M9-0DR15-MU6MU4
+ # TODO: update with phase1 muons
toponame = "2INVM9-0DR15-MU6ab-MU4ab"
log.debug("Define %s", toponame)
inputList = ['MUab']
@@ -1646,16 +1465,16 @@ class TopoAlgoDef:
alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob', HW.OutputWidthSelectMU)
alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinMSqr', 2*2)
- alg.addvariable('MaxMSqr', 9*9)
- alg.addvariable('MinET1', 6)
- alg.addvariable('MinET2', 4)
- alg.addvariable('DeltaRMin', 0)
- alg.addvariable('DeltaRMax', 15*15)
+ alg.addvariable('MinMSqr', 2*2*_et_conversion*_et_conversion)
+ alg.addvariable('MaxMSqr', 9*9*_et_conversion*_et_conversion)
+ alg.addvariable('MinET1', 6*_et_conversion)
+ alg.addvariable('MinET2', 4*_et_conversion)
+ alg.addvariable('DeltaRMin', 0*_dr_conversion*_dr_conversion)
+ alg.addvariable('DeltaRMax', 15*15*_dr_conversion*_dr_conversion)
tm.registerTopoAlgo(alg)
-
#ATR-19720, L1_BPH-8M15-0DR22-MU6MU4-BO
+ # TODO: update with phase1 muons
toponame = "8INVM15-0DR22-MU6ab-MU4ab"
log.debug("Define %s", toponame)
inputList = ['MUab']
@@ -1663,16 +1482,16 @@ class TopoAlgoDef:
alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob', HW.OutputWidthSelectMU)
alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinMSqr', 8*8)
- alg.addvariable('MaxMSqr', 15*15)
- alg.addvariable('MinET1', 6)
- alg.addvariable('MinET2', 4)
- alg.addvariable('DeltaRMin', 0)
- alg.addvariable('DeltaRMax', 22*22)
+ alg.addvariable('MinMSqr', 8*8*_et_conversion*_et_conversion)
+ alg.addvariable('MaxMSqr', 15*15*_et_conversion*_et_conversion)
+ alg.addvariable('MinET1', 6*_et_conversion)
+ alg.addvariable('MinET2', 4*_et_conversion)
+ alg.addvariable('DeltaRMin', 0*_dr_conversion*_dr_conversion)
+ alg.addvariable('DeltaRMax', 22*22*_dr_conversion*_dr_conversion)
tm.registerTopoAlgo(alg)
-
#ATR-19720, L1_BPH-2M9-0DR15-2MU4
+ # TODO: update with phase1 muons
toponame = "2INVM9-0DR15-2MU4ab"
log.debug("Define %s", toponame)
inputList = ['MUab']
@@ -1680,15 +1499,16 @@ class TopoAlgoDef:
alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob', HW.OutputWidthSelectMU)
alg.addgeneric('NumResultBits', 1)
- alg.addvariable('MinMSqr', 2*2)
- alg.addvariable('MaxMSqr', 9*9)
- alg.addvariable('MinET1', 4)
- alg.addvariable('MinET2', 4)
- alg.addvariable('DeltaRMin', 0)
- alg.addvariable('DeltaRMax', 15*15)
+ alg.addvariable('MinMSqr', 2*2*_et_conversion*_et_conversion)
+ alg.addvariable('MaxMSqr', 9*9*_et_conversion*_et_conversion)
+ alg.addvariable('MinET1', 4*_et_conversion)
+ alg.addvariable('MinET2', 4*_et_conversion)
+ alg.addvariable('DeltaRMin', 0*_dr_conversion*_dr_conversion)
+ alg.addvariable('DeltaRMax', 15*15*_dr_conversion*_dr_conversion)
tm.registerTopoAlgo(alg)
# CEP_CJ
+ # TODO: update with phase1 jets, what conversion for Xi?
CEPmap = [
{"algoname": 'CEP_CJ', "minETlist": [50, 60]}
]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefMultiplicity.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefMultiplicity.py
index 269f7be0ce22..cfba12d44808 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefMultiplicity.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefMultiplicity.py
@@ -26,15 +26,23 @@ class TopoAlgoDefMultiplicity(object):
nbits = 3)
tm.registerTopoAlgo(alg)
+ # eTAU 3 bits (4 Thresholds)
+ tauThresholds_3bits = [ "eTAU8", "eTAU12", "eTAU12M", "eTAU20" ]
+ # eTAU 2 bits (max 12 Thresholds, 16 in production)
+ tauThresholds_2bits = [ "eTAU20M", "eTAU25", "eTAU25M", "eTAU30H", "eTAU40", "eTAU60", "eTAU100" ]
- tauThresholds = [ "eTAU12", "eTAU12IM", "eTAU20", "eTAU20IM", "eTAU25IM", "eTAU40", "eTAU60", "eTAU100" ]
-
- for tau in tauThresholds:
+ for tau in tauThresholds_3bits:
alg = TauMultiplicityAlgo( name = tau,
algoId = currentAlgoId,
threshold = tau,
nbits = 3)
tm.registerTopoAlgo(alg)
+ for tau in tauThresholds_2bits:
+ alg = TauMultiplicityAlgo( name = tau,
+ algoId = currentAlgoId,
+ threshold = tau,
+ nbits = 2)
+ tm.registerTopoAlgo(alg)
jJThresholds = [ "jJ12", "jJ12p0ETA25", "jJ15", "jJ15p0ETA25", "jJ20", "jJ25", "jJ25p0ETA23", "jJ30",
"jJ35p0ETA23", "jJ40p0ETA25", "jJ40", "jJ50", "jJ85", "jJ100", "jJ15p31ETA49", "jJ20p31ETA49", "jJ75p31ETA49" ]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_HI_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_HI_v1.py
index f5311e19fce3..9081c013edb9 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_HI_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_HI_v1.py
@@ -62,57 +62,9 @@ def defineMenu():
'L1_3MU4', 'L1_MU6_2MU4', 'L1_3MU6', 'L1_4MU4', 'L1_MU6_3MU4', 'L1_2MU6_3MU4', 'L1_2MU11', 'L1_MU11_2MU10',
'L1_2EM8VH_MU10', 'L1_EM15VH_MU10', 'L1_EM7_MU20',
- # single tau
- 'L1_TAU12', 'L1_TAU12IM', 'L1_TAU20IM', 'L1_TAU40', 'L1_TAU60', 'L1_TAU100',
- 'L1_TAU8_EMPTY', 'L1_TAU8_FIRSTEMPTY', 'L1_TAU8_UNPAIRED_ISO', 'L1_TAU40_EMPTY', 'L1_TAU40_UNPAIRED_ISO',
- # new calo
- 'L1_eTAU12', 'L1_eTAU100',
-
- # multi tau
- 'L1_2TAU8', 'L1_TAU20IM_2TAU12IM', 'L1_TAU60_2TAU40',
- # new calo
- 'L1_eTAU60_2eTAU40',
-
- # combined tau - lepton
- 'L1_EM15VHI_2TAU12IM',
- 'L1_MU10_TAU12IM',
- 'L1_MU10_TAU12IM_J25_2J12',
- 'L1_MU10_TAU12IM_3J12',
- 'L1_EM15VHI_2TAU12IM_J25_3J12',
- 'L1_MU10_TAU20IM',
- 'L1_MU11_TAU20IM',
- 'L1_MU10_TAU20IM_J25_2J20',
- # new calo
- 'L1_MU10_eTAU20IM',
-
- # combined tau - jet
- 'L1_TAU20IM_2TAU12IM_J25_2J20_3J12',
- 'L1_TAU20IM_2TAU12IM_4J12p0ETA25',
- 'L1_TAU25IM_2TAU20IM_2J25_3J20',
- # new calo
- 'L1_eTAU20IM_2jJ20_gXERHO45',
- 'L1_eTAU20IM_2eTAU12IM_4jJ12p0ETA25',
- 'L1_eTAU25IM_2eTAU20IM_2jJ25_3jJ20',
-
- # combined tau - xe
- 'L1_TAU20IM_2J20_XE45',
- 'L1_TAU20IM_2J20_XE50',
- 'L1_EM15VHI_2TAU12IM_XE35',
- 'L1_EM15VHI_2TAU12IM_4J12',
- 'L1_MU10_TAU12IM_XE35',
- 'L1_TAU20IM_2TAU12IM_XE35',
- 'L1_TAU40_2TAU12IM_XE40',
- # new calo
- 'L1_eTAU40_2eTAU12IM_gXERHO40',
-
# combined em - jet
'L1_EM18VHI_3J20',
'L1_EM20VH_3J20',
-
- # combined em / mu - tau - jet / XE
- 'L1_MU10_eTAU12IM_3jJ12',
- 'L1_MU10_eTAU12IM_jJ25_2jJ12',
- 'L1_MU10_eTAU12IM_gXERHO35',
# combined mu - jet
'L1_MU6_J20', 'L1_MU6_J40', 'L1_MU6_J75',
@@ -260,7 +212,6 @@ def defineMenu():
'L1_EM12' : 2,
'L1_EM8VH' : 3,
'L1_EM10VH' : 4,
- 'L1_EM15VHI_2TAU12IM_4J12' : 5,
'L1_EM15' : 6,
'L1_EM15VH' : 7,
'L1_EM18VHI' : 8,
@@ -304,48 +255,9 @@ def defineMenu():
'L1_2EM8VH_MU10' : 43,
'L1_EM15VH_MU10' : 44,
'L1_EM7_MU20' : 483,
- 'L1_TAU12' : 45,
- 'L1_TAU12IM' : 47,
+
'L1_MU11_2MU10' : 49,
- #'L1_TAU5' : 50,
- 'L1_TAU20IM' : 51,
- 'L1_TAU100' : 52,
- #'L1_TAU30' : 53,
- 'L1_TAU40' : 54,
- 'L1_TAU60' : 55,
- 'L1_TAU8_EMPTY' : 57,
- 'L1_TAU8_FIRSTEMPTY' : 391,
- 'L1_TAU8_UNPAIRED_ISO' : 388,
- #'L1_TAU90' : 56,
- 'L1_TAU20IM_2TAU12IM' : 58,
- #'L1_2TAU5' : 59,
- 'L1_2TAU8' : 72,
- 'L1_EM15VHI_2TAU12IM' : 60,
- 'L1_EM15VHI_2TAU12IM_XE35' : 78,
- 'L1_EM15VHI_2TAU12IM_J25_3J12' : 61,
- #'L1_EM15VHI_TAU40_2TAU15' : 62,
- #'L1_EM20VHI_TAU20IM_2TAU20_J25_3J20' : 69,
- 'L1_MU10_TAU12IM' : 63,
- 'L1_MU10_TAU12IM_J25_2J12' : 64,
- 'L1_MU10_TAU12IM_3J12' : 482,
'L1_EM7_MU10':65,
- #'L1_TAU30_EMPTY':341,
- 'L1_MU10_TAU20IM' : 67,
- 'L1_MU11_TAU20IM' : 430,
- 'L1_MU10_TAU20IM_J25_2J20' : 377,
-
-
- 'L1_TAU20IM_2TAU12IM_J25_2J20_3J12' : 70,
- 'L1_TAU20IM_2TAU12IM_4J12p0ETA25' : 316,
- 'L1_TAU20IM_2J20_XE45' : 74,
- #'L1_TAU20IM_2TAU12IM_4J12p0ETA28' : 77,
- 'L1_TAU20IM_2J20_XE50' : 79,
- #'L1_TAU30_UNPAIRED_ISO' : 343,
- 'L1_TAU25IM_2TAU20IM_2J25_3J20' : 398,
- 'L1_TAU60_DR-TAU20ITAU12I' : 76,
- 'L1_MU10_TAU12IM_XE35' : 81,
- 'L1_TAU20IM_2TAU12IM_XE35' : 83,
- 'L1_TAU40_2TAU12IM_XE40' : 429,
'L1_MU6_J20' : 88,
'L1_MU6_J40' : 89,
'L1_MU6_J75' : 90,
@@ -433,7 +345,7 @@ def defineMenu():
'L1_J40_XE60' : 176,
'L1_MU10_2J20' : 278,
'L1_MU20_J50' : 82,
- 'L1_TAU60_2TAU40' : 458,
+
'L1_MU10_2J15_J20' : 255,
'L1_BPH-0M9-EM7-EM5' : 80,
@@ -517,13 +429,6 @@ def defineMenu():
'L1_J4-MATCH' : 336,
'L1_LLP-RO' : 338,
'L1_LLP-NOMATCH' : 339,
- 'L1_DR-MU10TAU12I' : 340,
- 'L1_EM15TAU12I-J25' : 345,
- 'L1_TAU20ITAU12I-J25' : 347,
- 'L1_DR-TAU20ITAU12I' : 348,
- 'L1_DR-TAU20ITAU12I-J25' : 350,
-
- 'L1_30M-EM20ITAU12' : 387,
'L1_jMJJ-400-CF': 397,
'L1_LAR-EM' : 351,
@@ -592,40 +497,7 @@ def defineMenu():
'L1_TRT_FILLED' : 218,
'L1_TRT_EMPTY' : 219,
- # new items
- 'L1_gXERHO20' : 239,
- 'L1_gXERHO50' : 241,
- 'L1_gXEPUFIT20' : 242,
- 'L1_gXEPUFIT50' : 244,
- 'L1_gXE50' : 257,
- 'L1_jXE50' : 265,
-
- 'L1_eTAU12' : 277,
- 'L1_eTAU100' : 283,
-
- 'L1_jJ100' : 284,
- 'L1_2jJ50_gXERHO40' : 287,
- 'L1_3jJ15p0ETA25_gXERHO40' : 289,
- 'L1_3jJ35p0ETA23' : 296,
- 'L1_3jJ50' : 297,
- 'L1_4jJ15' : 298,
- 'L1_4jJ15p0ETA25' : 304,
- 'L1_jJ25p0ETA23_2jJ15p31ETA49' : 306,
- 'L1_jJ40p0ETA25_2jJ25_jJ20p31ETA49' : 307,
- 'L1_jJ75p31ETA49' : 308,
- 'L1_jJ85_3jJ30' : 310,
-
- 'L1_MU10_eTAU12IM_3jJ12' : 498,
- 'L1_MU10_eTAU12IM_jJ25_2jJ12' : 499,
- 'L1_MU10_eTAU12IM_gXERHO35' : 500,
- 'L1_MU10_eTAU20IM' : 501,
- 'L1_MU20_jJ40' : 502,
- 'L1_MU20_gXERHO30' : 503,
- 'L1_eTAU20IM_2jJ20_gXERHO45' : 504,
- 'L1_eTAU20IM_2eTAU12IM_4jJ12p0ETA25' : 505,
- 'L1_eTAU25IM_2eTAU20IM_2jJ25_3jJ20' : 506,
- 'L1_eTAU40_2eTAU12IM_gXERHO40' : 507,
-
+ # ALFA
'L1_ALFA_A7L1L': 492,
'L1_ALFA_A7L1U': 491,
'L1_ALFA_A7R1L': 494,
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py
index de34c91af713..3fab5036904d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py
@@ -67,12 +67,12 @@ def defineMenu():
'L1_TAU8', 'L1_TAU12IM', 'L1_TAU20IM', 'L1_TAU40', 'L1_TAU60', 'L1_TAU100',
'L1_TAU8_EMPTY', 'L1_TAU8_FIRSTEMPTY', 'L1_TAU8_UNPAIRED_ISO', 'L1_TAU40_EMPTY', 'L1_TAU40_UNPAIRED_ISO',
# new calo
- 'L1_eTAU12', 'L1_eTAU100',
+ 'L1_eTAU8', 'L1_eTAU12', 'L1_eTAU12M', 'L1_eTAU20', 'L1_eTAU20M', 'L1_eTAU25', 'L1_eTAU25M',
+ 'L1_eTAU30H',
+ 'L1_eTAU40', 'L1_eTAU60', 'L1_eTAU100',
# multi tau
'L1_2TAU8', 'L1_TAU20IM_2TAU12IM', 'L1_TAU60_2TAU40',
- # new calo
- 'L1_eTAU60_2eTAU40',
# combined tau - lepton
'L1_EM15VHI_2TAU12IM',
@@ -83,17 +83,11 @@ def defineMenu():
'L1_MU10_TAU20IM',
'L1_MU11_TAU20IM',
'L1_MU10_TAU20IM_J25_2J20',
- # new calo
- 'L1_MU10_eTAU20IM',
# combined tau - jet
'L1_TAU20IM_2TAU12IM_J25_2J20_3J12',
'L1_TAU20IM_2TAU12IM_4J12p0ETA25',
'L1_TAU25IM_2TAU20IM_2J25_3J20',
- # new calo
- 'L1_eTAU20IM_2jJ20_gXERHO45',
- 'L1_eTAU20IM_2eTAU12IM_4jJ12p0ETA25',
- 'L1_eTAU25IM_2eTAU20IM_2jJ25_3jJ20',
# combined tau - xe
'L1_TAU20IM_2J20_XE45',
@@ -103,17 +97,10 @@ def defineMenu():
'L1_MU10_TAU12IM_XE35',
'L1_TAU20IM_2TAU12IM_XE35',
'L1_TAU40_2TAU12IM_XE40',
- # new calo
- 'L1_eTAU40_2eTAU12IM_gXERHO40',
# combined em - jet
'L1_EM18VHI_3J20',
'L1_EM20VH_3J20',
-
- # combined em / mu - tau - jet / XE
- 'L1_MU10_eTAU12IM_3jJ12',
- 'L1_MU10_eTAU12IM_jJ25_2jJ12',
- 'L1_MU10_eTAU12IM_gXERHO35',
# combined mu - jet
'L1_MU6_J20', 'L1_MU6_J40', 'L1_MU6_J75',
@@ -301,10 +288,10 @@ def defineMenu():
'L1_DPHI-2eEM3',
'L1_jHT150-jJ20s5pETA31_jMJJ-400-CF',
'L1_DY-BOX-2MU6',
- 'L1_LFV-eEM8I-MU11', 'L1_LFV-eEM12I-MU6',
+ 'L1_LFV-eEM8L-MU11', 'L1_LFV-eEM12L-MU6',
'L1_LFV-MU6',
'L1_LFV-MU11',
- 'L1_LFV-eEM8I', 'L1_LFV-eEM15I',
+ 'L1_LFV-eEM8L', 'L1_LFV-eEM15L',
'L1_jMJJ-700-NFF',
'L1_jMJJ-300-NFF',
'L1_jMJJ-500-NFF',
@@ -332,12 +319,12 @@ def defineMenu():
'L1_BPH-0M10-3MU4',
#ATR-18824
- 'L1_ZAFB-04DPHI-eEM15I',
- 'L1_ZAFB-25DPHI-eEM15I',
+ 'L1_ZAFB-04DPHI-eEM15M',
+ 'L1_ZAFB-25DPHI-eEM15M',
#ATR-22109
- 'L1_ZAFB-25DPHI-eEM18I',
+ 'L1_ZAFB-25DPHI-eEM18M',
- 'L1_DPHI-M70-2eEM10I', 'L1_DPHI-M70-2eEM12I', #ATR-19302
+ 'L1_DPHI-M70-2eEM10M', 'L1_DPHI-M70-2eEM12M', #ATR-19302
'L1_DPHI-M70-2eEM12', # ATR-21637 (no shower shape cuts)
#ATR-19510
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs.py
index 65f3788e8b8d..5eeeccadb5db 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs.py
@@ -82,10 +82,9 @@ def defineInputsMenu():
"nbitsDefault" : 3,
"type" : "optical",
"legacy" : False,
- "thresholds" : [
+ "thresholds" : [ # Topo1A: eFex EM, eFex TAU, gFex Large-R jet, gFex Small-R jet
'eEM3', 'eEM7', 'eEM8', 'eEM8L', 'eEM10', 'eEM10L', 'eEM15', 'eEM15L', 'eEM15M',
'eEM18M', 'eEM20', 'eEM20L', 'eEM20M', 'eEM22', 'eEM22M', 'eEM22T',
- 'eTAU12', 'eTAU12IM', 'eTAU20', 'eTAU20IM', 'eTAU25IM', 'eTAU40', 'eTAU60', 'eTAU100'
]
})
@@ -96,10 +95,9 @@ def defineInputsMenu():
"type" : "optical",
"fpga" : 0,
"legacy" : False,
- "thresholds" : [
- 'jJ12', 'jJ12p0ETA25', 'jJ15', 'jJ15p0ETA25', 'jJ20', 'jJ25', 'jJ25p0ETA23', 'jJ30',
- 'jJ35p0ETA23', 'jJ40p0ETA25', 'jJ40', 'jJ50', 'jJ85', 'jJ100', 'jJ15p31ETA49',
- 'jJ20p31ETA49', 'jJ75p31ETA49'
+ "thresholds" : [ # Topo1A: eFex EM, eFex TAU, gFex Large-R jet, gFex Small-R jet
+ 'eTAU8', 'eTAU12', 'eTAU12M', 'eTAU20',
+ 'eTAU20M', 'eTAU25', 'eTAU25M', 'eTAU30H', 'eTAU40', 'eTAU60', 'eTAU100',
]
})
@@ -110,9 +108,9 @@ def defineInputsMenu():
"type" : "optical",
"fpga" : 1,
"legacy" : False,
- "thresholds" : [
+ "thresholds" : [ # Topo1B: jFex small-R jet, jFex large-R jet, combined eFex/jFex TAU, gFex+jFex EX, gFex+jFex SumET, jFex TAU
'gXERHO20', 'gXERHO30', 'gXERHO35', 'gXERHO40', 'gXERHO45', 'gXERHO50',
- 'gXEPUFIT20', 'gXEPUFIT50', 'gXE50'
+ 'gXEPUFIT20', 'gXEPUFIT50', 'gXE50',
]
})
@@ -123,8 +121,12 @@ def defineInputsMenu():
"type" : "optical",
"fpga" : 1,
"legacy" : False,
- "thresholds" : [
- 'jXE50'
+ "thresholds" : [ # Topo1B: jFex small-R jet, jFex large-R jet, combined eFex/jFex TAU, gFex+jFex EX, gFex+jFex SumET, jFex TAU
+ 'jJ12', 'jJ12p0ETA25', 'jJ15', 'jJ15p0ETA25', 'jJ20', 'jJ25', 'jJ25p0ETA23', 'jJ30',
+ 'jJ35p0ETA23', 'jJ40p0ETA25', 'jJ40', 'jJ50', 'jJ85', 'jJ100', 'jJ15p31ETA49',
+ 'jJ20p31ETA49', 'jJ75p31ETA49',
+
+ 'jXE50',
]
})
@@ -142,17 +144,16 @@ def defineInputsMenu():
"algorithms" : [
TopoMenuDef( '2DISAMB-jJ25ab-0DR25-eTAU20abi-eTAU12abi', outputbits = 0 ),
TopoMenuDef( '2DISAMB-jJ25ab-0DR28-eTAU20abi-eTAU12abi', outputbits = 1 ),
- TopoMenuDef( 'INVM_DPHI_jNFF', outputbits = (2,5), outputlines = ['400INVM-0DPHI26-jJ30s6-AjJ20s6',
+ TopoMenuDef( 'jINVM_DPHI_NFF', outputbits = (2,5), outputlines = ['400INVM-0DPHI26-jJ30s6-AjJ20s6',
'400INVM-0DPHI24-jJ30s6-AjJ20s6',
'400INVM-0DPHI22-jJ30s6-AjJ20s6',
'400INVM-0DPHI20-jJ30s6-AjJ20s6'] ),
TopoMenuDef( '0INVM10-3MU4ab', outputbits = 6 ),
- TopoMenuDef( '2DISAMB-TAU12abi-J25ab', outputbits = 7 ), # not a primary
- TopoMenuDef( 'LATE-MU10s1', outputbits = 8 ),
- TopoMenuDef( 'MULT-CMU4ab', outputbits = (9,10), outputlines = ['MULT-CMU4ab[0]', 'MULT-CMU4ab[1]'] ), # 2bits
- TopoMenuDef( 'MULT-CMU6ab', outputbits = (11,12), outputlines = ['MULT-CMU6ab[0]', 'MULT-CMU6ab[1]'] ), # 2bits
- TopoMenuDef( '0DR04-MU4ab-CJ15ab', outputbits = 13 ), # not a primary
- TopoMenuDef( '0DR04-MU6ab-CJ20ab', outputbits = 14 ), # not a primary
+ TopoMenuDef( 'LATE-MU10s1', outputbits = 7 ),
+ TopoMenuDef( 'MULT-CMU4ab', outputbits = (8,9), outputlines = ['MULT-CMU4ab[0]', 'MULT-CMU4ab[1]'] ), # 2bits # TODO: needed?
+ TopoMenuDef( 'MULT-CMU6ab', outputbits = (10,11), outputlines = ['MULT-CMU6ab[0]', 'MULT-CMU6ab[1]'] ), # 2bits # TODO: needed?
+ TopoMenuDef( '0DR04-MU4ab-CJ15ab', outputbits = 12 ), # not a primary
+ TopoMenuDef( '0DR04-MU6ab-CJ20ab', outputbits = 13 ), # not a primary
]
},
@@ -162,6 +163,14 @@ def defineInputsMenu():
"algorithms" : [
TopoMenuDef( '0DR25-eTAU20abi-eTAU12abi', outputbits = 0 ),
TopoMenuDef( '0DR28-eTAU20abi-eTAU12abi', outputbits = 1 ),
+ TopoMenuDef( 'jINVM', outputbits = (2,5), outputlines = ['300INVM-AjJ30s6-AjJ20s6',
+ '400INVM-AjJ30s6-AjJ20s6',
+ '500INVM-AjJ30s6-AjJ20s6',
+ '700INVM-AjJ30s6-AjJ20s6'] ),
+ TopoMenuDef( 'jINVM_DPHI', outputbits = (6,9), outputlines = ['400INVM-0DPHI26-AjJ30s6-AjJ20s6',
+ '400INVM-0DPHI24-AjJ30s6-AjJ20s6',
+ '400INVM-0DPHI22-AjJ30s6-AjJ20s6',
+ '400INVM-0DPHI20-AjJ30s6-AjJ20s6'] ),
]
},
@@ -175,8 +184,8 @@ def defineInputsMenu():
'KF-XE60-AJall',
'KF-XE65-AJall',
'KF-XE75-AJall'] ),
- TopoMenuDef( 'ZAFB_DPHI', outputbits = (6,7), outputlines = [ '60INVM-04DPHI32-eEM15abhi-FJj15s623ETA49',
- '60INVM-25DPHI32-eEM15abhi-FJj15s623ETA49'] ),
+ TopoMenuDef( 'ZAFB_DPHI', outputbits = (6,7), outputlines = [ '60INVM-04DPHI32-eEM15abm-FJj15s623ETA49',
+ '60INVM-25DPHI32-eEM15abm-FJj15s623ETA49'] ),
TopoMenuDef( 'CEP_CJ', outputbits = (8,9), outputlines = [ 'CEP-CJ50s6',
'CEP-CJ60s6'] ),
TopoMenuDef( 'INVM_eEMs6', outputbits = (10,11), outputlines = [ '1INVM5-eEM7s1-eEMs6',
@@ -208,19 +217,17 @@ def defineInputsMenu():
"fpga" : 0,
"clock" : 0,
"algorithms" : [
- TopoMenuDef( 'HT190-J15s5pETA21', outputbits = 0 ),
+ TopoMenuDef( 'HT190-jJ15s5pETA21', outputbits = 0 ),
TopoMenuDef( '0DR03-eEM7ab-CJ15ab', outputbits = 1 ),
- TopoMenuDef( 'INVM_jNFF', outputbits = (2,5), outputlines = ['300INVM-jJ30s6-AjJ20s6',
+ TopoMenuDef( 'jINVM_NFF', outputbits = (2,5), outputlines = ['300INVM-jJ30s6-AjJ20s6',
'400INVM-jJ30s6-AjJ20s6',
'500INVM-jJ30s6-AjJ20s6',
- '700INVM-jJ30s6-AjJ20s6',] ),
+ '700INVM-jJ30s6-AjJ20s6',] ), # TODO: needed?
TopoMenuDef( 'HT150-jJ20s5pETA31', outputbits = 6 ),
TopoMenuDef( '400INVM-AjJ30s6pETA31-AjJ20s6p31ETA49', outputbits = 7 ),
- TopoMenuDef( '10MINDPHI-J20s2-XE30', outputbits = 8 ),
- TopoMenuDef( '10MINDPHI-J20s2-XE50', outputbits = 9 ),
- TopoMenuDef( 'SC111-CJ15abpETA26', outputbits = 10 ),
- TopoMenuDef( '0DETA20-J50s1-Js2', outputbits = 11 ),
- TopoMenuDef( '0INVM9-eEM7ab-eEMab', outputbits = 12 ),
+ TopoMenuDef( 'SC111-CJ15abpETA26', outputbits = 8 ),
+ TopoMenuDef( '0DETA20-J50s1-Js2', outputbits = 9 ),
+ TopoMenuDef( '0INVM9-eEM7ab-eEMab', outputbits = 10 ),
]
},
@@ -236,11 +243,11 @@ def defineInputsMenu():
"fpga" : 1,
"clock" : 0,
"algorithms" : [
- TopoMenuDef( '100RATIO-0MATCH-TAU30si2-eEMall', outputbits = 0 ),
- TopoMenuDef( 'NOT-0MATCH-TAU30si1-eEMall', outputbits = 1 ),
- TopoMenuDef( '0INVM70-27DPHI32-eEM10his1-eEM10his6', outputbits = 2 ),
- TopoMenuDef( '0INVM70-27DPHI32-eEM12his1-eEM12his6', outputbits = 3 ),
- TopoMenuDef( 'ZEE-eEM20shi2', outputbits = 4 ),
+ TopoMenuDef( '100RATIO-0MATCH-eTAU30si2-eEMall', outputbits = 0 ),
+ TopoMenuDef( 'NOT-0MATCH-eTAU30si1-eEMall', outputbits = 1 ),
+ TopoMenuDef( '0INVM70-27DPHI32-eEM10sm1-eEM10sm6', outputbits = 2 ),
+ TopoMenuDef( '0INVM70-27DPHI32-eEM12sm1-eEM12sm6', outputbits = 3 ),
+ TopoMenuDef( 'ZEE-eEM20sm2', outputbits = 4 ),
TopoMenuDef( '10DR99-2MU6ab', outputbits = 5 ),
]
},
@@ -256,13 +263,13 @@ def defineInputsMenu():
TopoMenuDef( '5DETA99-5DPHI99-2MU4ab', outputbits = 4 ),
TopoMenuDef( '5DETA99-5DPHI99-MU6ab-MU4ab', outputbits = 5 ),
TopoMenuDef( '5DETA99-5DPHI99-2MU6ab', outputbits = 6 ),
- TopoMenuDef( '0DETA04-eEM8abi-MU10ab', outputbits = 7 ),
- TopoMenuDef( '0DPHI03-eEM8abi-MU10ab', outputbits = 8 ),
- TopoMenuDef( '0DETA04-eEM15abi-MUab', outputbits = 9 ),
- TopoMenuDef( '0DPHI03-eEM15abi-MUab', outputbits = 10 ),
- TopoMenuDef( '0INVM10-0DR15-eEM8abi-MU10ab', outputbits = 11 ),
- TopoMenuDef( '0INVM10-0DR15-eEM12abi-MU6ab', outputbits = 12 ),
- TopoMenuDef( '8INVM15-2CMU4ab', outputbits = 13 ),
+ TopoMenuDef( '0DETA04-eEM8abl-MU10ab', outputbits = 7 ),
+ TopoMenuDef( '0DPHI03-eEM8abl-MU10ab', outputbits = 8 ),
+ TopoMenuDef( '0DETA04-eEM15abl-MUab', outputbits = 9 ),
+ TopoMenuDef( '0DPHI03-eEM15abl-MUab', outputbits = 10 ),
+ TopoMenuDef( '0INVM10-0DR15-eEM8abl-MU10ab', outputbits = 11 ),
+ TopoMenuDef( '0INVM10-0DR15-eEM12abl-MU6ab', outputbits = 12 ),
+ TopoMenuDef( '8INVM15-2CMU4ab', outputbits = 13 ), #TODO: needed?
TopoMenuDef( '0DR15-2MU6ab', outputbits = 14 ),
TopoMenuDef( '8INVM15-0DR22-2MU6ab', outputbits = 15 ),
]
--
GitLab
From 00138f0cdc44b2cf6d0873a22a1c4a26f96cc96a Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <stewart.martin-haugh@cern.ch>
Date: Mon, 16 Aug 2021 16:48:30 +0000
Subject: [PATCH 068/272] Remove obsolete (Run-1) L1Calo algorithms
---
Trigger/TrigT1/TrigT1CaloSim/doc/packagedoc.h | 88 ---------------
.../TrigT1CaloSim/src/CPMTowerMaker.cxx | 84 --------------
.../TrigT1/TrigT1CaloSim/src/CPMTowerMaker.h | 84 --------------
.../TrigT1CaloSim/src/JetElementMaker.cxx | 106 ------------------
.../TrigT1CaloSim/src/JetElementMaker.h | 86 --------------
.../src/components/TrigT1CaloSim_entries.cxx | 4 -
6 files changed, 452 deletions(-)
delete mode 100644 Trigger/TrigT1/TrigT1CaloSim/doc/packagedoc.h
delete mode 100755 Trigger/TrigT1/TrigT1CaloSim/src/CPMTowerMaker.cxx
delete mode 100755 Trigger/TrigT1/TrigT1CaloSim/src/CPMTowerMaker.h
delete mode 100755 Trigger/TrigT1/TrigT1CaloSim/src/JetElementMaker.cxx
delete mode 100755 Trigger/TrigT1/TrigT1CaloSim/src/JetElementMaker.h
diff --git a/Trigger/TrigT1/TrigT1CaloSim/doc/packagedoc.h b/Trigger/TrigT1/TrigT1CaloSim/doc/packagedoc.h
deleted file mode 100644
index 509fc823d5b9..000000000000
--- a/Trigger/TrigT1/TrigT1CaloSim/doc/packagedoc.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-
-/**
-@page TrigT1CaloSim_page TrigT1CaloSim Package
-Author: Alan Watson, Ed Moyse, Pete Faulkner<P>
-
-The Package that simulates the first level calorimeter trigger.
-
-@section TrigT1CaloSim_TrigT1CaloSim Introduction
-
-TrigT1CaloSim is composed of 11 core Athena Algorithms, used for simulating
-the trigger and producing RoIs, CTP inputs, CBNTAA and Bytestream data, plus
-3 others for testing or other specialised operations not used in normal
-simulation jobs. The core algorithms are:
-
-TriggerTowerMaker.h <BR>
-CPMTowerMaker.h <BR>
-EmTauTrigger.h <BR>
-CPCMMMaker.h <BR>
-JetElementMaker.h <BR>
-JetTrigger.h <BR>
-EnergyTrigger.h <BR>
-ROD.h <BR>
-JEPCMMMaker.h <BR>
-CBNTAA_LVL1calo.h <BR>
-CBNTAA_LVL1CaloESD.h <BR>
-
-The "Maker" algorithms construct data objects, e.g. Trigger Towers and Jet Elements, which are used by the "Trigger" algorithms to produce "result objects" (i.e. RoIs, CTP words, bytestream data). The CBNTAA routines are used to persistify (save) information to the Combined Ntuple. TriggerTowers and JetElements are persistified to the ESD (outlined below). The Class Overview will be presented linking the important Classes in one group, and then different "functionality" packages in seperate groups (ie the Classes needed to persistify/write-to the ESD will be presented in one block).
-
-These algorithms started life in the TrigT1Calo package, which combined both algorithms and data objects in a single package. To allow more flexible use of the trigger algorithm code (e.g. for monitoring as well as simulation) and avoid dependency loops that package was splits, with the Athena Algorithms being separated from the tools and data objects in a new package, TrigT1CaloSim.
-
-
-@section TrigT1CaloSim_Class Class Overview
-
-*Core Classes(9):<BR>
------------------<BR>
-
-TriggerTowerMaker.h - TriggerTowerMaker is responsible for producing the TriggerTower objects, which are used by EmTauTrigger and JetElementMaker, and are persistified to ESD. TriggerTowerMaker takes as input either GEANT Cells or LAr/Tile TTL1s (simulations of the analogue signal).
-
-EmTauTrigger.h - The algorithm responsible for simulating the Em/tau calo trigger.
-
-JetElementMaker.h - JetElementMaker reads in TriggerTower objects and sums them together to produce JetElement objects.
-
-JetTrigger.h - JetTrigger Simulates the hardware jet trigger. It reads in JetElements and the TriggerMenu (produced by TrigT1Config).
-
-EnergyTrigger.h - EnergyTrigger uses EnergyCrate and JetElement objects in order to closely follow the layout of the hardware.
-
-ROD.h - The algorithm responsible for simulating the Read Out Drivers. Creates S-link words and sends them to the RoI builder simulation (TrigT1RoIB), provides multiplicity counts to the CTP simulation (TrigT1CTP) and performs the "jet estimator energy trigger".
-
-CPMTowerMaker.h - Forms CPMTower objects (simplified version of TriggerTower) for CPM bytestream simulation.
-CPCMMMaker.h - Forms data objects for CP CMM data bytestream simulation.
-JEPCMMMaker.h - Forms data objects for JEP CMM bytestream simulation.
-
-*Other Algorithms (5):<BR>
-----------------------<BR>
-
-MergeSlices.h - Algorithm to merge multiple time slices of data to emulate multi-slice readout in bytestream. Note that normal Athena simulation does not provide a valid set of successive time slices, so this is a fix-up to allow technical tests only.
-
-Tester.h - The Tester algorithm checks the performance of the LVL1 simulation.
-
-CBNTAA_LVL1calo.h - Fills the Athena ntuple with TrigT1Calo information.
-
-CBNTAA_LVL1CaloESD.h - Fills Athena ntuple from objects in TES. This was a "temporary" fix for Rome data, but is still used in ESDtoCBNT job scripts.
-
-DumpTriggerObjects.h - The DumpTriggerObjects algorithm shows how to access EmTauROIs.
-
-*Helpful External Links:<BR>
-----------------------------
-
-<A href="http://atlas-computing.web.cern.ch/atlas-computing/packages/lvl1Trigger/lvl1TriggerCalo.php"> TrigT1Calo Webpage at CERN </A>
-
-<A href="http://www.ep.ph.bham.ac.uk/user/woehrling/T1CaloESD.html"> ESD TriggerTower and JetElement content </A>
-
-<A href="http://atlas.web.cern.ch/Atlas/GROUPS/DAQTRIG/PESA/egamma/rome/ESDcontents.html"> ESD ROI and missing Et content </A>
-
-<A href="https://uimon.cern.ch/twiki/bin/view/Atlas/JobOptions"> JobOptions interface (link to twiki) </A>
-
-<A href=""> xml interface </A>
-
-<A href=""> TriggerMenu </A>
-
-
-
-
-*/
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/CPMTowerMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/CPMTowerMaker.cxx
deleted file mode 100755
index a41b912eabd7..000000000000
--- a/Trigger/TrigT1/TrigT1CaloSim/src/CPMTowerMaker.cxx
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// ================================================
-// CPMTowerMaker class Implementation
-// ================================================
-//
-//
-//
-
-#include <cmath>
-
-// This algorithm includes
-#include "CPMTowerMaker.h"
-
-
-
-namespace LVL1 {
-
-/** This is the constructor for JEMaker and is where you define the relevant
- parameters.
- Currently these are :
- - "TriggerTowerLocation" : the location of the jes in Storegate You shouldn't have to touch this.
- - "CPMTowerLocation" : the location of the CPMT in StoreGate. You shouldn't have to touch this.
-
- Alter the values of these in jobOptions.txt
-*/
-
-CPMTowerMaker::CPMTowerMaker( const std::string& name, ISvcLocator* pSvcLocator )
- : AthAlgorithm( name, pSvcLocator ),
- m_CPMTowerTool("LVL1::L1CPMTowerTools/L1CPMTowerTools")
-{ }
-
-
- /** the initialise() method is called at the start of processing, so we set up any histograms
- etc. here*/
-StatusCode CPMTowerMaker::initialize()
-{
- ATH_CHECK( m_CPMTowerTool.retrieve() );
- ATH_CHECK(m_triggerTowerLocation.initialize());
- ATH_CHECK(m_cpmTowerLocation.initialize());
- return StatusCode::SUCCESS ;
-}
-
-
-/**----------------------------------------------
- execute() method called once per event
- ----------------------------------------------
-
-There is so little to do that this routine does it all itself:
- get TriggerTowers from TES
- form CPMTowers from TriggerTowers
- store CPMTowers in TES
-*/
-
-
-StatusCode CPMTowerMaker::execute( )
-{
-
- // Vector to store CPMTs in
- CPMTCollection* vectorOfCPMTs = new CPMTCollection;
- ATH_CHECK(SG::makeHandle(m_cpmTowerLocation).record( std::unique_ptr<CPMTCollection>(vectorOfCPMTs) ));
- SG::ReadHandle<TriggerTowerCollection> vectorOfTTs = SG::makeHandle(m_triggerTowerLocation);
-
- // Fill a DataVector of CPMTowers using L1CPMTowerTools
- m_CPMTowerTool->makeCPMTowers(&(*vectorOfTTs), &(*vectorOfCPMTs), true);
- ATH_MSG_DEBUG( vectorOfCPMTs->size()<<" CPMTowers have been generated");
-
- if (msgLvl(MSG::DEBUG)) {
- ATH_MSG_DEBUG ( "Formed " << vectorOfCPMTs->size() << " CPM Towers " ) ;
- for (const CPMTower* cpmt : *vectorOfCPMTs)
- ATH_MSG_DEBUG ( "CPMT has coords (" << cpmt->eta() << ", "<< cpmt->phi() << ") and energies : "
- << static_cast<unsigned int>(cpmt->emEnergy()) << ", "<< static_cast<unsigned int>(cpmt->hadEnergy()) <<" (Em,Had)" );
-
- }
-
- return StatusCode::SUCCESS;
-
-}//end execute
-
-} // end of namespace bracket
-
-
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/CPMTowerMaker.h b/Trigger/TrigT1/TrigT1CaloSim/src/CPMTowerMaker.h
deleted file mode 100755
index 3fda6dcbb8b2..000000000000
--- a/Trigger/TrigT1/TrigT1CaloSim/src/CPMTowerMaker.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-// ================================================
-// CPMTowerMaker class descriptionn
-// ================================================
-
-
-
-#ifndef CPMTOWERMAKER_H
-#define CPMTOWERMAKER_H
-
-// STL
-#include <string>
-#include <vector>
-
-// Athena/Gaudi
-#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/ServiceHandle.h"
-#include "AthContainers/DataVector.h"
-#include "GaudiKernel/ToolHandle.h"
-
-#include "TrigT1CaloToolInterfaces/IL1CPMTowerTools.h"
-#include "TrigT1Interfaces/TrigT1CaloDefs.h"
-#include "TrigT1CaloEvent/TriggerTowerCollection.h"
-#include "TrigT1CaloEvent/CPMTower_ClassDEF.h"
-
-
-
-//********************************************
-//Default for parameters of this algorithm
-//These can be overridden by job options.
-//Descriptions are given in the class declaration
-//********************************************
-
-namespace LVL1 {
-
-// CPMTowerMaker class declaration
-/*
- An "Athena algorithm" is something which gets scheduled and controlled
- by the framework In its simplest definition it is something which
- - gets called for each event
- - can get anything it wants out of the Transient Event Store"
- - can put anything it makes into the store
- It must inherit from the AthAlgorithm base class
- */
-/**
-The CPMTowerMaker class takes Trigger Towers from the TES and
-forms CPMTowers, which it then places back into the TES.
-The CPMTowers so formed are used for the bytestream simulation.
-*/
-class CPMTowerMaker : public AthAlgorithm
-{
- typedef DataVector<CPMTower> CPMTCollection;
- typedef DataVector<TriggerTower> TTCollection ;
- public:
-
- //-------------------------
- // Constructors/Destructors
- //
- // Athena requires that the constructor takes certain arguments
- // (and passes them directly to the constructor of the base class)
- //-------------------------
-
- CPMTowerMaker( const std::string& name, ISvcLocator* pSvcLocator ) ;
-
- //------------------------------------------------------
- // Methods used by Athena to run the algorithm
- //------------------------------------------------------
-
- StatusCode initialize() ;
- StatusCode execute() ;
-
- private:
-
- ToolHandle<LVL1::IL1CPMTowerTools> m_CPMTowerTool;
- SG::ReadHandleKey<TTCollection> m_triggerTowerLocation { this, "TriggerTowerLocation", TrigT1CaloDefs::TriggerTowerLocation};
- SG::WriteHandleKey<CPMTCollection> m_cpmTowerLocation { this, "CPMTowerLocation", TrigT1CaloDefs::CPMTowerLocation};
-
-};
-
-} // end of namespace bracket
-#endif
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/JetElementMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/JetElementMaker.cxx
deleted file mode 100755
index 2ffa9ba17211..000000000000
--- a/Trigger/TrigT1/TrigT1CaloSim/src/JetElementMaker.cxx
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// ================================================
-// JetElementMaker class Implementation
-// ================================================
-//
-//
-//
-
-
-// This algorithm includes
-#include "JetElementMaker.h"
-#include "TrigT1Interfaces/TrigT1CaloDefs.h"
-#include "TrigT1CaloEvent/TriggerTowerCollection.h"
-#include "TrigT1CaloEvent/JetElement_ClassDEF.h"
-
-
-namespace LVL1 {
-
-/** This is the constructor for JEMaker and is where you define the relevant
- parameters.
- Currently these are :
- - "TriggerTowerLocation" : the location of the jes in Storegate You shouldn't have to touch this.
- - "JetElementLocation" : the location of the JE in StoreGate. You shouldn't have to touch this.
-
- Alter the values of these in jobOptions.txt
-*/
-
-JetElementMaker::JetElementMaker( const std::string& name, ISvcLocator* pSvcLocator )
- : AthAlgorithm( name, pSvcLocator ),
- m_JetElementTool("LVL1::L1JetElementTools/L1JetElementTools")
-{
- m_triggerTowerLocation = TrigT1CaloDefs::TriggerTowerLocation ;
- m_jetElementLocation = TrigT1CaloDefs::JetElementLocation;
-
- // This is how you declare the parameters to Gaudi so that
- // they can be over-written via the job options file
-
- declareProperty( "TriggerTowerLocation", m_triggerTowerLocation ) ;
- declareProperty( "JetElementLocation", m_jetElementLocation ) ;
-}
-
-
- /** the initialise() method is called at the start of processing, so we set up any histograms
- etc. here*/
-StatusCode JetElementMaker::initialize()
-{
- ATH_MSG_INFO ( "Initialising" );
- ATH_CHECK( m_JetElementTool.retrieve() );
- return StatusCode::SUCCESS ;
-}
-
-
-/** the finalise() method is called at the end of processing, so it is used
-for deleting histograms and general tidying up*/
-StatusCode JetElementMaker::finalize()
-{
-
- ATH_MSG_INFO( "Finalizing" );
- return StatusCode::SUCCESS ;
-}
-
-
-/**----------------------------------------------
- execute() method called once per event
- ----------------------------------------------
-
-Checks that the Cell Type is supported (terminates with errors if not)
-and calls relevant routine to look for the cells.
-*/
-
-
-StatusCode JetElementMaker::execute( )
-{
- ATH_MSG_DEBUG ( "Executing" );
-
- // What we are (hopefully) going to make:
- JECollection* vectorOfJEs = new JECollection;
-
- // Retrieve TriggerTowers from StoreGate
- if (evtStore()->contains<TriggerTowerCollection>(m_triggerTowerLocation)) {
- const DataVector<TriggerTower>* vectorOfTTs;
- StatusCode sc = evtStore()->retrieve(vectorOfTTs, m_triggerTowerLocation);
- if (sc.isSuccess()) {
- // Fill a DataVector of JetElements using L1JetElementTools
- m_JetElementTool->makeJetElements(vectorOfTTs, vectorOfJEs);
- ATH_MSG_DEBUG( vectorOfJEs->size()<<" JetElements have been generated");
- }
- else ATH_MSG_WARNING( "Failed to retrieve TriggerTowers from " << m_triggerTowerLocation );
- }
- else ATH_MSG_WARNING( "No TriggerTowerContainer at " << m_triggerTowerLocation );
-
- // Save JetElements in the TES
- StatusCode sc = evtStore()->overwrite(vectorOfJEs, m_jetElementLocation, true);
- if (sc.isFailure())
- ATH_MSG_WARNING( "Failed to write JetElements to TES at " << m_jetElementLocation );
-
- // and we're done
- vectorOfJEs=0;
- return StatusCode::SUCCESS;
-}//end execute
-
-} // end of namespace bracket
-
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/JetElementMaker.h b/Trigger/TrigT1/TrigT1CaloSim/src/JetElementMaker.h
deleted file mode 100755
index a9b18ae4be64..000000000000
--- a/Trigger/TrigT1/TrigT1CaloSim/src/JetElementMaker.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-// ================================================
-// JetElementMaker class descriptionn
-// ================================================
-
-
-
-#ifndef JETELEMENTMAKER_H
-#define JETELEMENTMAKER_H
-
-// STL
-#include <string>
-#include <vector>
-
-// Athena/Gaudi
-#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/ServiceHandle.h"
-#include "AthContainers/DataVector.h"
-#include "GaudiKernel/ToolHandle.h"
-
-//LVL1 Calo trigger includes
-#include "TrigT1CaloToolInterfaces/IL1JetElementTools.h"
-
-
-//********************************************
-//Default for parameters of this algorithm
-//These can be overridden by job options.
-//Descriptions are given in the class declaration
-//********************************************
-
-namespace LVL1 {
-
-// JetElementMaker class declaration
-/*
- An "Athena algorithm" is something which gets scheduled and controlled
- by the framework In its simplest definition it is something which
- - gets called for each event
- - can get anything it wants out of the Transient Event Store"
- - can put anything it makes into the store
- It must inherit from the Algorithm base class
- */
-/**
-The JetElementMaker class takes Trigger Towers from the TES and
-forms JetElements, which it then places back into the TES.
-*/
-class JetElementMaker : public AthAlgorithm
-{
- typedef DataVector<JetElement> JECollection;
-
- public:
-
- //-------------------------
- // Constructors/Destructors
- //
- // Athena requires that the constructor takes certain arguments
- // (and passes them directly to the constructor of the base class)
- //-------------------------
-
- JetElementMaker( const std::string& name, ISvcLocator* pSvcLocator ) ;
-
-
- //------------------------------------------------------
- // Methods used by Athena to run the algorithm
- //------------------------------------------------------
-
- StatusCode initialize() ;
- StatusCode execute() ;
- StatusCode finalize() ;
-
-
- private:
-
- ToolHandle<LVL1::IL1JetElementTools> m_JetElementTool;
-
- /** location of TriggerTowers in TES */
- std::string m_triggerTowerLocation;
- /** locations within the TES to store collections of JEs*/
- std::string m_jetElementLocation ;
-
-};
-
-} // end of namespace bracket
-#endif
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/components/TrigT1CaloSim_entries.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/components/TrigT1CaloSim_entries.cxx
index 29d2deeab728..921e369500e3 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/components/TrigT1CaloSim_entries.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/components/TrigT1CaloSim_entries.cxx
@@ -1,6 +1,4 @@
#include "../Run2TriggerTowerMaker.h"
-#include "../CPMTowerMaker.h"
-#include "../JetElementMaker.h"
#include "../Run2CPMTowerMaker.h"
#include "../Run2JetElementMaker.h"
#include "../MergeSlices.h"
@@ -22,8 +20,6 @@
using namespace LVL1;
DECLARE_COMPONENT( Run2TriggerTowerMaker )
-DECLARE_COMPONENT( CPMTowerMaker )
-DECLARE_COMPONENT( JetElementMaker )
DECLARE_COMPONENT( Run2CPMTowerMaker )
DECLARE_COMPONENT( Run2JetElementMaker )
DECLARE_COMPONENT( MergeSlices )
--
GitLab
From e755348aa3409d6bacb7cf5177c6a4f67493fd0b Mon Sep 17 00:00:00 2001
From: Mark Sutton <mark.sutton@cern.ch>
Date: Mon, 16 Aug 2021 16:52:55 +0000
Subject: [PATCH 069/272] Yet more fixes for the comparitor and plotting
---
.../Analysis/src/ConfAnalysis.cxx | 12 +++---
.../Analysis/src/comparitor.cxx | 37 +++++++++++++++----
.../Analysis/src/cpucost.cxx | 8 ++++
3 files changed, 43 insertions(+), 14 deletions(-)
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.cxx
index 0eb40f471756..c2c18953d9ee 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.cxx
@@ -204,9 +204,9 @@ void ConfAnalysis::initialiseInternal() {
// std::cout << "ConfAnalysis::initialize() Directory " << gDirectory->GetName() << " package directory, " << name() << std::endl;
- mres.push_back( rnpix_eta = new Resplot( "npix_eta", /* 2* */ etaBins, -tmp_maxEta, tmp_maxEta, 22, -0.5, 21.5 ) );
- mres.push_back( rnsct_eta = new Resplot( "nsct_eta", /* 2* */ etaBins, -tmp_maxEta, tmp_maxEta, 22, -0.5, 21.5 ) );
- mres.push_back( rntrt_eta = new Resplot( "ntrt_eta", /* 2* */ etaBins, -tmp_maxEta, tmp_maxEta, 100, -0.5, 99.5 ) );
+ mres.push_back( rnpix_eta = new Resplot( "npix_eta", 2*etaBins, -tmp_maxEta, tmp_maxEta, 22, -0.5, 21.5 ) );
+ mres.push_back( rnsct_eta = new Resplot( "nsct_eta", 2*etaBins, -tmp_maxEta, tmp_maxEta, 22, -0.5, 21.5 ) );
+ mres.push_back( rntrt_eta = new Resplot( "ntrt_eta", 2*etaBins, -tmp_maxEta, tmp_maxEta, 100, -0.5, 99.5 ) );
mres.push_back( rnsihit_eta= new Resplot( "nsihit_eta",etaBins, -tmp_maxEta, tmp_maxEta, 22, -0.5, 21.5 ) );
mres.push_back( rnpix_lb = new Resplot( "npix_lb", 250, 0, 2500, 22, -0.5, 21.5 ) );
@@ -228,9 +228,9 @@ void ConfAnalysis::initialiseInternal() {
mres.push_back( rntrt_pt_bad = new Resplot( "ntrt_pt_bad", ptnbins, ptbinlims, 100, -0.5, 99.5 ) );
- mres.push_back( rnpix_eta_rec = new Resplot( "npix_eta_rec", /* 2* */ etaBins, -tmp_maxEta, tmp_maxEta, 22, -0.5, 21.5 ) );
- mres.push_back( rnsct_eta_rec = new Resplot( "nsct_eta_rec", /* 2* */ etaBins, -tmp_maxEta, tmp_maxEta, 22, -0.5, 21.5 ) );
- mres.push_back( rntrt_eta_rec = new Resplot( "ntrt_eta_rec", /* 2* */ etaBins, -tmp_maxEta, tmp_maxEta, 100, -0.5, 99.5 ) );
+ mres.push_back( rnpix_eta_rec = new Resplot( "npix_eta_rec", 2*etaBins, -tmp_maxEta, tmp_maxEta, 22, -0.5, 21.5 ) );
+ mres.push_back( rnsct_eta_rec = new Resplot( "nsct_eta_rec", 2*etaBins, -tmp_maxEta, tmp_maxEta, 22, -0.5, 21.5 ) );
+ mres.push_back( rntrt_eta_rec = new Resplot( "ntrt_eta_rec", 2*etaBins, -tmp_maxEta, tmp_maxEta, 100, -0.5, 99.5 ) );
mres.push_back( rnsihit_eta_rec= new Resplot( "nsihit_eta_rec", etaBins, -tmp_maxEta, tmp_maxEta, 22, -0.5, 21.5 ) );
mres.push_back( rnpix_phi_rec = new Resplot( "npix_phi_rec", etaBins, -M_PI, M_PI, 22, -0.5, 21.5 ) );
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/comparitor.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/comparitor.cxx
index c31b0e9153f3..3db9cb726eb1 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/comparitor.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/comparitor.cxx
@@ -69,6 +69,15 @@ void SetZeros( TH2D* h ) {
}
}
+void Scale( TH1* h, double d=1 ) {
+ if ( d==1 ) return;
+ for ( int i=1 ; i<=h->GetNbinsX() ; i++ ) {
+ h->SetBinContent( i, h->GetBinContent(i)*d );
+ h->SetBinError( i, h->GetBinError(i)*d );
+ }
+}
+
+
TH1F* Rebin( TH1F* h, double f ) {
std::cout << "\nREBIN: " << h->GetName() << " :: " << f << std::endl;
@@ -966,6 +975,10 @@ int main(int argc, char** argv) {
NeventRef = 1;
}
+
+ if ( NeventTest>1 ) std::cout << "Nevents Test: " << NeventTest << std::endl;
+ if ( NeventRef>1 ) std::cout << "Nevents Ref: " << NeventRef << std::endl;
+
chainmap_t* chainmap = nullptr;
if ( mapfile == "" ) mapfile = configfile;
@@ -1506,11 +1519,24 @@ int main(int argc, char** argv) {
h2test->GetXaxis()->SetTitle(xaxis.c_str());
h2test->GetYaxis()->SetTitle(yaxis.c_str());
+ AxisInfo xinfo = histo.xaxis();
+ AxisInfo yinfo = histo.yaxis();
+
+
+ std::cout << xinfo << std::endl;
+ std::cout << yinfo << std::endl;
+
SetZeros( h2test );
+ if ( yinfo.rangeset() ) {
+ h2test->GetYaxis()->SetRangeUser( yinfo.lo(), yinfo.hi() );
+ }
+
h2test->DrawCopy("colz");
- gPad->SetLogz(true);
+ if ( histo.detail().find("logz")!=std::string::npos ) gPad->SetLogz(true);
+ else gPad->SetLogz(false);
+
}
else if ( refit_resplots && ( contains(histo.name(),"/sigma") || contains(histo.name(),"/mean") ) ) {
@@ -1724,8 +1750,8 @@ int main(int argc, char** argv) {
if ( fulldbg ) std::cout << __LINE__ << std::endl;
- if ( scalepix && std::string(htest->GetName()).find("npix")!=std::string::npos ) htest->Scale(0.5);
- if ( scalepix && href && std::string(htest->GetName()).find("npix")!=std::string::npos ) href->Scale(0.5);
+ if ( scalepix && std::string(htest->GetName()).find("npix")!=std::string::npos ) Scale(htest,0.5);
+ if ( scalepix && href && std::string(htest->GetName()).find("npix")!=std::string::npos ) Scale(href,0.5);
if ( fulldbg ) std::cout << __LINE__ << std::endl;
@@ -2258,11 +2284,6 @@ int main(int argc, char** argv) {
if ( href ) href->Sumw2();
}
- if ( yinfo.normset() ) {
- htest->Scale(1./NeventTest);
- if ( href ) href->Scale(1./NeventRef);
- }
-
if ( yinfo.normset() ) {
Norm( htest );
if ( href ) Norm( href );
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/cpucost.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/cpucost.cxx
index 15acadcd6b71..3162f0104f6e 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/cpucost.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/cpucost.cxx
@@ -35,6 +35,7 @@
#include "computils.h"
#include "AtlasStyle.h"
+#include "AtlasLabels.h"
/// Prints usage instructions to standard output and returns given status
int usage(const std::string& name, int status) {
@@ -56,6 +57,7 @@ int usage(const std::string& name, int status) {
s << " --logx \t force logx \n";
s << " -w, --binwidth \t normalise by bin width\n";
s << " -as, --atlasstyle \t use the ATLAS style \n\n";
+ s << " -al, --atlaslabel \t show the ATLAS label \n\n";
s << " -v, --verbose \t verbose output\n\n";
s << " -h, --help \t this help\n";
s << std::endl;
@@ -106,6 +108,7 @@ int main(int argc, char** argv) {
TFile* fref = 0;
bool atlasstyle = false;
+ bool atlaslabel = false;
bool ylog = true;
bool nopng = false;
@@ -200,6 +203,9 @@ int main(int argc, char** argv) {
else if (arg == "-as" || arg == "--atlasstyle") {
atlasstyle = true;
}
+ else if (arg == "-al" || arg == "--atlaslabel") {
+ atlaslabel = true;
+ }
else if (arg == "-ap" || arg == "--autopattern") {
if (++argnum < argc) autopattern = argv[argnum];
else return usage(argv[0], -1);
@@ -547,6 +553,8 @@ int main(int argc, char** argv) {
if ( show_directory ) DrawLabel( x1+0.02, y2+0.02, dirtitle, kBlack, legend.TextSize(), legend.TextFont() );
+ if ( atlasstyle && atlaslabel ) ATLASLabel(0.68, 0.88, "Internal");
+
/// could simply run gPad->SetLogyx( logx );
/// but that would interfere with the individual plot
/// setting from the config file
--
GitLab
From 3df18fffd1b01bc9686de01638fdc9fccff8924a Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Mon, 16 Aug 2021 17:00:12 +0000
Subject: [PATCH 070/272] VP1CaloReadoutSystems, VP1Algs: Remove use of
obsolete LAr HV tools.
---
graphics/VP1/VP1Algs/share/vp1.py | 31 +++---
.../VP1CaloReadoutSystems/CMakeLists.txt | 4 +-
.../src/VP1CaloReadoutSystem.cxx | 102 ++++++++++++++----
3 files changed, 102 insertions(+), 35 deletions(-)
diff --git a/graphics/VP1/VP1Algs/share/vp1.py b/graphics/VP1/VP1Algs/share/vp1.py
index 55d094bf729c..977c55d6960d 100644
--- a/graphics/VP1/VP1Algs/share/vp1.py
+++ b/graphics/VP1/VP1Algs/share/vp1.py
@@ -374,9 +374,8 @@ if ( vp1LarHvData ):
from time import time
svcMgr.EventSelector.InitialTimeStamp = int (time())
svcMgr.EventSelector.TimeStampInterval = 1
- from IOVDbSvc.CondDB import conddb
- conddb.addFolder("DCS_OFL","/LAR/DCS/HV/BARREl/I16")
- conddb.addFolder("DCS_OFL","/LAR/DCS/HV/BARREL/I8")
+ include('LArDetDescr/LArDetDescr_joboptions.py')
+ from LArConditionsCommon import LArHVDB
#------------
if (vp1Fatras):
@@ -547,20 +546,28 @@ if vp1NoSortDBReplicas:
#Finally, the VP1 algorithm itself:
from VP1Algs.VP1AlgsConf import VP1Alg
-topSequence += VP1Alg()
+vp1Alg = VP1Alg()
+topSequence += vp1Alg
-VP1Alg.NoGui=vp1NoGui
+vp1Alg.NoGui=vp1NoGui
if vp1CruiseTime > 0:
- VP1Alg.InitialCruiseMode = "EVENT"
- VP1Alg.InitialCruiseModePeriod = vp1CruiseTime
+ vp1Alg.InitialCruiseMode = "EVENT"
+ vp1Alg.InitialCruiseModePeriod = vp1CruiseTime
-VP1Alg.InitiallyLoadedVP1Files = vp1CfgFiles
+vp1Alg.InitiallyLoadedVP1Files = vp1CfgFiles
if (vp1Multinp):
- VP1Alg.MultipleFilesON = True
- VP1Alg.MFSourceDir = vp1Multinpsrc
- VP1Alg.MFLocalCopyDir = vp1Multinpcpy
- VP1Alg.MFAvailableLocalInputDirectories = vp1MultiAvailableSrcDirs
+ vp1Alg.MultipleFilesON = True
+ vp1Alg.MFSourceDir = vp1Multinpsrc
+ vp1Alg.MFLocalCopyDir = vp1Multinpcpy
+ vp1Alg.MFAvailableLocalInputDirectories = vp1MultiAvailableSrcDirs
+
+if ( vp1LarHvData ):
+ vp1Alg.ExtraInputs += [('LArHVIdMapping', 'ConditionStore+LArHVIdMap'),
+ ('CondAttrListCollection', 'ConditionStore+/LAR/DCS/HV/BARREl/I16'),
+ ('CondAttrListCollection', 'ConditionStore+/LAR/DCS/HV/BARREL/I8'),
+ ]
+
topSequence.TimeOut=0
diff --git a/graphics/VP1/VP1Systems/VP1CaloReadoutSystems/CMakeLists.txt b/graphics/VP1/VP1Systems/VP1CaloReadoutSystems/CMakeLists.txt
index bc26bf960611..48a3535798d0 100644
--- a/graphics/VP1/VP1Systems/VP1CaloReadoutSystems/CMakeLists.txt
+++ b/graphics/VP1/VP1Systems/VP1CaloReadoutSystems/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( VP1CaloReadoutSystems )
@@ -21,5 +21,5 @@ atlas_add_library( VP1CaloReadoutSystems VP1CaloReadoutSystems/*.h src/*.h src/*
PUBLIC_HEADERS VP1CaloReadoutSystems
PRIVATE_INCLUDE_DIRS ${COIN3D_INCLUDE_DIRS}
LINK_LIBRARIES VP1Base GL
- PRIVATE_LINK_LIBRARIES ${COIN3D_LIBRARIES} LArHV LArReadoutGeometry VP1Utils )
+ PRIVATE_LINK_LIBRARIES ${COIN3D_LIBRARIES} LArHV LArReadoutGeometry VP1Utils LArRecConditions AthenaPoolUtilities )
diff --git a/graphics/VP1/VP1Systems/VP1CaloReadoutSystems/src/VP1CaloReadoutSystem.cxx b/graphics/VP1/VP1Systems/VP1CaloReadoutSystems/src/VP1CaloReadoutSystem.cxx
index 2ab7b3a52035..9b15c33c3ff6 100755
--- a/graphics/VP1/VP1Systems/VP1CaloReadoutSystems/src/VP1CaloReadoutSystem.cxx
+++ b/graphics/VP1/VP1Systems/VP1CaloReadoutSystems/src/VP1CaloReadoutSystem.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "VP1CaloReadoutSystems/VP1CaloReadoutSystem.h"
@@ -55,6 +55,10 @@
#include "LArHV/HECHVModule.h"
#include "LArHV/HECHVSubgap.h"
#include "LArHV/LArHVManager.h"
+#include "LArRecConditions/LArHVIdMapping.h"
+#include "AthenaPoolUtilities/CondAttrListCollection.h"
+#include "StoreGate/ReadCondHandle.h"
+#include "StoreGate/ReadCondHandleKey.h"
#include "GeoPrimitives/CLHEPtoEigenConverter.h"
@@ -764,17 +768,57 @@ void VP1CaloReadoutSystem::createHV() {
blue->unref();
- int tolerance =m_clockwork->ui.hvToleranceSpinBox->value();
-
const LArHVManager *larHVManager=NULL;
if (!VP1SGAccessHelper(this,true).retrieve(larHVManager,"LArHVManager")) {
message("No Access To HV Information. The LArHVManager is NULL");
return;
}
+ SG::ReadCondHandleKey<LArHVIdMapping> hvCablingKey ("LArHVIdMap");
+ if (hvCablingKey.initialize().isFailure()) {
+ message("No Access To HV Information. Cannot retrieve LArHVIdMap.");
+ return;
+ }
+ if (hvCablingKey.storeHandle()->proxy (ClassID_traits<CondCont<LArHVIdMapping> >::ID(),
+ hvCablingKey.key()) == nullptr)
+ {
+ message("No Access To HV Information. Cannot retrieve LArHVIdMap.");
+ return;
+ }
+ SG::ReadCondHandle<LArHVIdMapping> hvCabling (hvCablingKey);
+
+ std::vector<const CondAttrListCollection*> attrLists;
+ {
+ // Not a typo --- this folder has a lower-case l in the database...
+ SG::ReadCondHandleKey<CondAttrListCollection> i16Key ("/LAR/DCS/HV/BARREl/I16");
+ SG::ReadCondHandleKey<CondAttrListCollection> i8Key ("/LAR/DCS/HV/BARREL/I8");
+ if (i16Key.initialize().isFailure()) {
+ message("No Access To HV Information. Cannot retrieve I16.");
+ return;
+ }
+ if (i8Key.initialize().isFailure()) {
+ message("No Access To HV Information. Cannot retrieve I8.");
+ return;
+ }
+ if (i16Key.storeHandle()->proxy (ClassID_traits<CondCont<CondAttrListCollection> >::ID(),
+ i16Key.key()) == nullptr ||
+ i8Key.storeHandle()->proxy (ClassID_traits<CondCont<CondAttrListCollection> >::ID(),
+ i8Key.key()) == nullptr)
+ {
+ message("No Access To HV Information. Cannot retrieve LArHVIdMap.");
+ return;
+ }
+ SG::ReadCondHandle<CondAttrListCollection> i16 (i16Key);
+ SG::ReadCondHandle<CondAttrListCollection> i8 (i8Key);
+ attrLists.push_back (*i16);
+ attrLists.push_back (*i8);
+ }
+
+ int tolerance =m_clockwork->ui.hvToleranceSpinBox->value();
const EMBHVManager& embHVManager = larHVManager->getEMBHVManager();
- const EMBHVManager::EMBHVData hvdata_EMB = embHVManager.getData();
+ const EMBHVManager::EMBHVData hvdata_EMB = embHVManager.getData(**hvCabling,
+ attrLists);
for (unsigned int e=embHVManager.beginSideIndex();e!=embHVManager.endSideIndex();e++) {
for (unsigned int s=embHVManager.beginSectorIndex();s!=embHVManager.endSectorIndex();s++) {
for (unsigned int y=embHVManager.beginEtaIndex();y!=embHVManager.endEtaIndex();y++) {
@@ -841,7 +885,8 @@ void VP1CaloReadoutSystem::createHV() {
}
const EMBPresamplerHVManager& embPreHVManager = larHVManager->getEMBPresamplerHVManager();
- const EMBPresamplerHVManager::EMBPresamplerHVData hvdata_EMBPS = embPreHVManager.getData();
+ const EMBPresamplerHVManager::EMBPresamplerHVData hvdata_EMBPS = embPreHVManager.getData(**hvCabling,
+ attrLists);
for (unsigned int e=embPreHVManager.beginSideIndex();e!=embPreHVManager.endSideIndex();e++) {
for (unsigned int y=embPreHVManager.beginEtaIndex();y!=embPreHVManager.endEtaIndex();y++) {
for (unsigned int p=embPreHVManager.beginPhiIndex();p!=embPreHVManager.endPhiIndex();p++) {
@@ -907,7 +952,8 @@ void VP1CaloReadoutSystem::createHV() {
QSpinBox **spinBoxes = iotype==EMECHVModule::OUTER ? emecSpinBoxOuter : emecSpinBoxInner;
const EMECHVManager& emecHVManager = larHVManager->getEMECHVManager(iotype);
- const EMECHVManager::EMECHVData hvdata_EMEC = emecHVManager.getData();
+ const EMECHVManager::EMECHVData hvdata_EMEC = emecHVManager.getData(**hvCabling,
+ attrLists);
for (unsigned int e=emecHVManager.beginSideIndex();e!=emecHVManager.endSideIndex();e++) {
double z = e==0 ? -3740:3740;
for (unsigned int s=emecHVManager.beginSectorIndex();s!=emecHVManager.endSectorIndex();s++) {
@@ -978,7 +1024,8 @@ void VP1CaloReadoutSystem::createHV() {
}
const EMECPresamplerHVManager& emecPreHVManager = larHVManager->getEMECPresamplerHVManager();
- const EMECPresamplerHVManager::EMECPresamplerHVData hvdata_EMECPS = emecPreHVManager.getData();
+ const EMECPresamplerHVManager::EMECPresamplerHVData hvdata_EMECPS = emecPreHVManager.getData(**hvCabling,
+ attrLists);
for (unsigned int e=emecPreHVManager.beginSideIndex();e!=emecPreHVManager.endSideIndex();e++) {
double z = e==0 ? -3650:3650;
for (unsigned int p=emecPreHVManager.beginPhiIndex();p!=emecPreHVManager.endPhiIndex();p++) {
@@ -1029,7 +1076,8 @@ void VP1CaloReadoutSystem::createHV() {
const HECDetectorManager *hecManager = VP1DetInfo::hecDetMgr();
const HECHVManager& hecHVManager = larHVManager->getHECHVManager();
- const HECHVManager::HECHVData hvdata_HEC = hecHVManager.getData();
+ const HECHVManager::HECHVData hvdata_HEC = hecHVManager.getData(**hvCabling,
+ attrLists);
for (unsigned int e=hecHVManager.beginSideIndex();e!=hecHVManager.endSideIndex();e++) {
for (unsigned int s=hecHVManager.beginSamplingIndex();s!=hecHVManager.endSamplingIndex();s++) {
for (unsigned int p=hecHVManager.beginPhiIndex();p!=hecHVManager.endPhiIndex();p++) {
@@ -1090,7 +1138,8 @@ void VP1CaloReadoutSystem::createHV() {
}
const FCALHVManager& fcalHVManager = larHVManager->getFCALHVManager();
- const FCALHVManager::FCALHVData hvdata_FCAL = fcalHVManager.getData();
+ const FCALHVManager::FCALHVData hvdata_FCAL = fcalHVManager.getData(**hvCabling,
+ attrLists);
for (unsigned int e=fcalHVManager.beginSideIndex();e!=fcalHVManager.endSideIndex();e++) {
for (unsigned int s=fcalHVManager.beginSamplingIndex();s!=fcalHVManager.endSamplingIndex();s++) {
for (unsigned int x=fcalHVManager.beginSectorIndex(s);x!=fcalHVManager.endSectorIndex(s);x++) {
@@ -1668,10 +1717,10 @@ void VP1CaloReadoutSystem::userClickedOnBgd() {
deselectAll();
}
-void VP1CaloReadoutSystem::userPickedNode(SoNode* mySelectedNode, SoPath */*pickedPath*/)
+void VP1CaloReadoutSystem::userPickedNode(SoNode* /*mySelectedNode*/, SoPath */*pickedPath*/)
{
-
+#if 0
m_clockwork->volatileSeparator->removeAllChildren();
deselectAll();
SoPickStyle *pickStyle = new SoPickStyle();
@@ -1689,7 +1738,8 @@ void VP1CaloReadoutSystem::userPickedNode(SoNode* mySelectedNode, SoPath */*pick
const EMBHVElectrode& electrode = *p->second;
const EMBHVModule& module = electrode.getModule();
const EMBHVManager& manager = module.getManager();
- const EMBHVManager::EMBHVData hvdata = manager.getData();
+ const EMBHVManager::EMBHVData hvdata = manager.getData(**hvCabling,
+ attrLists);
std::ostringstream outstream;
outstream << "Side: " << module.getSideIndex()
<<" Eta: " << module.getEtaIndex()
@@ -1711,7 +1761,8 @@ void VP1CaloReadoutSystem::userPickedNode(SoNode* mySelectedNode, SoPath */*pick
const EMECHVElectrode& electrode = *p->second;
const EMECHVModule& module = electrode.getModule();
const EMECHVManager& manager = module.getManager();
- const EMECHVManager::EMECHVData hvdata = manager.getData();
+ const EMECHVManager::EMECHVData hvdata = manager.getData(**hvCabling,
+ attrLists);
std::ostringstream outstream;
outstream << "Side: " << module.getSideIndex()
<< " Wheel: " << module.getWheelIndex()
@@ -1735,7 +1786,8 @@ void VP1CaloReadoutSystem::userPickedNode(SoNode* mySelectedNode, SoPath */*pick
const HECHVSubgap& subgap = *p->second;
const HECHVModule& module = subgap.getModule();
const HECHVManager& manager = module.getManager();
- const HECHVManager::HECHVData hvdata = manager.getData();
+ const HECHVManager::HECHVData hvdata = manager.getData(**hvCabling,
+ attrLists);
std::ostringstream outstream;
outstream << "Side: " << module.getSideIndex()
<< " Phi: " << module.getPhiIndex()
@@ -1754,7 +1806,8 @@ void VP1CaloReadoutSystem::userPickedNode(SoNode* mySelectedNode, SoPath */*pick
const FCALHVLine& line = *p->second;
const FCALHVModule& module = line.getModule();
const FCALHVManager& manager = module.getManager();
- const FCALHVManager::FCALHVData hvdata = manager.getData();
+ const FCALHVManager::FCALHVData hvdata = manager.getData(**hvCabling,
+ attrLists);
std::ostringstream outstream;
outstream << "Side: " << module.getSideIndex()
<< " Sector: " << module.getSectorIndex()
@@ -1789,7 +1842,8 @@ void VP1CaloReadoutSystem::userPickedNode(SoNode* mySelectedNode, SoPath */*pick
if (line) {
const FCALHVModule& module = line->getModule();
const FCALHVManager& manager = module.getManager();
- const FCALHVManager::FCALHVData hvdata = manager.getData();
+ const FCALHVManager::FCALHVData hvdata = manager.getData(**hvCabling,
+ attrLists);
for (unsigned int i=0;i<element->getNumHVLines();i++) {
std::ostringstream highVoltageStream;
if (element->getHVLine(i)) {
@@ -1919,7 +1973,8 @@ void VP1CaloReadoutSystem::userPickedNode(SoNode* mySelectedNode, SoPath */*pick
if (element->getNumSubgaps() > 0) {
const HECHVModule& module0 = element->getSubgap(0).getModule();
const HECHVManager& manager = module0.getManager();
- const HECHVManager::HECHVData hvdata = manager.getData();
+ const HECHVManager::HECHVData hvdata = manager.getData(**hvCabling,
+ attrLists);
for (unsigned int i=0;i<element->getNumSubgaps();i++) {
if (m_clockwork->ui.highVoltageCheckBox->isChecked()) {
std::ostringstream highVoltageStream;
@@ -2007,7 +2062,8 @@ void VP1CaloReadoutSystem::userPickedNode(SoNode* mySelectedNode, SoPath */*pick
if (m_clockwork->ui.highVoltageCheckBox->isChecked()) {
const EMECPresamplerHVModule& module = element->getPresamplerHVModule();
const EMECPresamplerHVManager& manager = module.getManager();
- const EMECPresamplerHVManager::EMECPresamplerHVData hvdata = manager.getData();
+ const EMECPresamplerHVManager::EMECPresamplerHVData hvdata = manager.getData(**hvCabling,
+ attrLists);
std::ostringstream highVoltageStream;
highVoltageStream << "Presampler cell. HV Status: " << '\n';
message(highVoltageStream.str().c_str());
@@ -2082,7 +2138,8 @@ void VP1CaloReadoutSystem::userPickedNode(SoNode* mySelectedNode, SoPath */*pick
const EMECHVElectrode& electrode = element->getElectrode(0);
const EMECHVModule& module0 = electrode.getModule();
const EMECHVManager& manager = module0.getManager();
- const EMECHVManager::EMECHVData hvdata = manager.getData();
+ const EMECHVManager::EMECHVData hvdata = manager.getData(**hvCabling,
+ attrLists);
if (m_clockwork->ui.highVoltageCheckBox->isChecked()) {
{
std::ostringstream highVoltageStream;
@@ -2199,7 +2256,8 @@ void VP1CaloReadoutSystem::userPickedNode(SoNode* mySelectedNode, SoPath */*pick
if (element->getSamplingIndex()==0) {
const EMBPresamplerHVModule& module = element->getPresamplerHVModule();
const EMBPresamplerHVManager& manager = module.getManager();
- const EMBPresamplerHVManager::EMBPresamplerHVData hvdata = manager.getData();
+ const EMBPresamplerHVManager::EMBPresamplerHVData hvdata = manager.getData(**hvCabling,
+ attrLists);
std::ostringstream highVoltageStream;
highVoltageStream << "Presampler cell. HV Status: " << '\n';
@@ -2268,7 +2326,8 @@ void VP1CaloReadoutSystem::userPickedNode(SoNode* mySelectedNode, SoPath */*pick
if (element->getNumElectrodes() > 0) {
const EMBHVModule& module0 = element->getElectrode(0).getModule();
const EMBHVManager& manager = module0.getManager();
- const EMBHVManager::EMBHVData hvdata = manager.getData();
+ const EMBHVManager::EMBHVData hvdata = manager.getData(**hvCabling,
+ attrLists);
for (unsigned int i=0;i<element->getNumElectrodes();i++) {
highVoltageStream << i << "Status: " << element->getElectrode(i).getElectrodeIndex() << ' '
<< hvdata.hvOn (element->getElectrode(i), 0) << ' '
@@ -2364,6 +2423,7 @@ void VP1CaloReadoutSystem::userPickedNode(SoNode* mySelectedNode, SoPath */*pick
if (m_clockwork->ui.indicesCheckBox->isChecked()) {
message(indexStream.str().c_str());
}
+#endif
}
QByteArray VP1CaloReadoutSystem::saveState()
--
GitLab
From c2f7fef7bd1ee13c29f213ecd2152de90ffc0e4b Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Mon, 16 Aug 2021 17:18:10 +0000
Subject: [PATCH 071/272] TriggerJobOpts: Fix cluster correction configuration.
---
.../egamma/egammaTools/python/egammaSwToolConfig.py | 5 ++++-
.../TriggerJobOpts/share/runHLT_standalone_newJO.py | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Reconstruction/egamma/egammaTools/python/egammaSwToolConfig.py b/Reconstruction/egamma/egammaTools/python/egammaSwToolConfig.py
index 34c530e78e46..95abe054afee 100644
--- a/Reconstruction/egamma/egammaTools/python/egammaSwToolConfig.py
+++ b/Reconstruction/egamma/egammaTools/python/egammaSwToolConfig.py
@@ -21,7 +21,10 @@ def ToolConstantsAlgCfg(flags, prefix, version):
# depending on the flags configure one of the input sources
- if flags.Calo.ClusterCorrection.defaultSource == 'pool':
+ source = flags.Calo.ClusterCorrection.defaultSource
+ if not isinstance (source, list):
+ source = [source]
+ if 'pool' in source:
from EventSelectorAthenaPool.CondProxyProviderConfig import CondProxyProviderCfg
from CaloClusterCorrection.poolfiles import poolfiles
fileID = poolfiles.get("caloswcorr_pool") #TODO figure out how this relates to CalibVersion flag
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_newJO.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_newJO.py
index 032fd68c81cd..94c81b142612 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_newJO.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_newJO.py
@@ -44,7 +44,9 @@ flags.Scheduler.ShowDataDeps = True
flags.Scheduler.ShowDataFlow = True
flags.Scheduler.ShowControlFlow = True
flags.Scheduler.EnableVerboseViews = True
-flags.Calo.ClusterCorrection.defaultSource = 'pool' # temporary, until a complete support for the cool, pool, jo is present
+from CaloClusterCorrection.constants \
+ import CALOCORR_JO, CALOCORR_POOL
+flags.Calo.ClusterCorrection.defaultSource = [CALOCORR_POOL, CALOCORR_JO] # temporary, until a complete support for cool is present
flags.Exec.MaxEvents = 50
# TODO this two should be resolved in a smarter way (i.e. required passing the tag from the driver test, however now, parsing of string with - fails)
--
GitLab
From 5c8b79d77aa93757d98ac33211b2716ce1655637 Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <smh@cern.ch>
Date: Mon, 16 Aug 2021 19:31:46 +0200
Subject: [PATCH 072/272] Add gFEXDriver to phase-1 L1 sim
---
.../TriggerJobOpts/python/Lvl1SimulationConfig.py | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py
index bef09fef615e..222fcf7f0ffc 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py
@@ -107,6 +107,11 @@ def Lvl1SimulationSequence_Common( ConfigFlags ):
l1CaloSimSeq.jFEXDriver.jSuperCellTowerMapperTool.SCell=SCellType
l1CaloSimSeq.jFEXDriver.jFEXSysSimTool.SCell=SCellType
+ l1CaloSimSeq += CfgMgr.LVL1__gFEXDriver('gFEXDriver',
+ SCell=SCellType )
+ l1CaloSimSeq.gFEXDriver.gSuperCellTowerMapperTool.SCell=SCellType
+ l1CaloSimSeq.gFEXDriver.gFEXSysSimTool.SCell=SCellType
+
##################################################
# Muons
##################################################
--
GitLab
From b41d16082c00976fa83b7fc852036d0851e511fd Mon Sep 17 00:00:00 2001
From: Christos Anastopoulos <christos.anastopoulos@cern.ch>
Date: Mon, 16 Aug 2021 18:18:28 +0000
Subject: [PATCH 073/272] ATLASRECTS-6547 : Item 2 ROT_Extractor rm un-needed
dynamic_casts
---
.../TrkEventUtils/src/RoT_Extractor.cxx | 61 ++++++++++++-------
1 file changed, 38 insertions(+), 23 deletions(-)
diff --git a/Tracking/TrkEvent/TrkEventUtils/src/RoT_Extractor.cxx b/Tracking/TrkEvent/TrkEventUtils/src/RoT_Extractor.cxx
index 74b3fd545a78..f626533f716f 100755
--- a/Tracking/TrkEvent/TrkEventUtils/src/RoT_Extractor.cxx
+++ b/Tracking/TrkEvent/TrkEventUtils/src/RoT_Extractor.cxx
@@ -7,41 +7,56 @@
///////////////////////////////////////////////////////////////////
#include "TrkEventUtils/RoT_Extractor.h"
-#include "TrkRIO_OnTrack/RIO_OnTrack.h"
-#include "TrkMeasurementBase/MeasurementBase.h"
#include "TrkCompetingRIOsOnTrack/CompetingRIOsOnTrack.h"
+#include "TrkMeasurementBase/MeasurementBase.h"
+#include "TrkRIO_OnTrack/RIO_OnTrack.h"
-void Trk::RoT_Extractor::extract(std::vector<const RIO_OnTrack*>& rots, const std::vector<const MeasurementBase*>& measurements, bool convertCompRots)
+void
+Trk::RoT_Extractor::extract(
+ std::vector<const RIO_OnTrack*>& rots,
+ const std::vector<const MeasurementBase*>& measurements,
+ bool convertCompRots)
{
using namespace std;
- rots.reserve( rots.size() + measurements.size() );
- vector<const MeasurementBase*>::const_iterator it = measurements.begin();
+ rots.reserve(rots.size() + measurements.size());
+ vector<const MeasurementBase*>::const_iterator it = measurements.begin();
vector<const MeasurementBase*>::const_iterator itEnd = measurements.end();
- for (; it!=itEnd ; ++it)
- {
- const Trk::RIO_OnTrack* rot = dynamic_cast<const RIO_OnTrack*>(*it);
- if ( convertCompRots && nullptr == rot) {
- const Trk::CompetingRIOsOnTrack *comprot =
- dynamic_cast<const Trk::CompetingRIOsOnTrack*>(*it);
+ for (; it != itEnd; ++it) {
+ const Trk::RIO_OnTrack* rot = nullptr;
+ if ((*it)->type(Trk::MeasurementBaseType::RIO_OnTrack)) {
+ rot = static_cast<const RIO_OnTrack*>(*it);
+ }
+ if (convertCompRots && nullptr == rot) {
+ const Trk::CompetingRIOsOnTrack* comprot = nullptr;
+ if ((*it)->type(Trk::MeasurementBaseType::CompetingRIOsOnTrack)) {
+ comprot = static_cast<const Trk::CompetingRIOsOnTrack*>(*it);
+ }
if (comprot) {
rot = &comprot->rioOnTrack(comprot->indexOfMaxAssignProb());
-}
+ }
+ }
+ if (nullptr != rot) {
+ rots.push_back(rot);
}
- if ( nullptr != rot ) { rots.push_back(rot);
-}
- }
}
+}
-void Trk::RoT_Extractor::extract(const Trk::RIO_OnTrack*& rot,
- const Trk::MeasurementBase* meas)
+void
+Trk::RoT_Extractor::extract(const Trk::RIO_OnTrack*& rot,
+ const Trk::MeasurementBase* meas)
{
- rot = dynamic_cast<const RIO_OnTrack*>(meas);
- if (rot==nullptr) {
- const Trk::CompetingRIOsOnTrack *comprot =
- dynamic_cast<const Trk::CompetingRIOsOnTrack*>(meas);
+
+ if (meas->type(Trk::MeasurementBaseType::RIO_OnTrack)) {
+ rot = static_cast<const RIO_OnTrack*>(meas);
+ }
+ if (rot == nullptr) {
+ const Trk::CompetingRIOsOnTrack* comprot = nullptr;
+ if (meas->type(Trk::MeasurementBaseType::CompetingRIOsOnTrack)) {
+ comprot = static_cast<const Trk::CompetingRIOsOnTrack*>(meas);
+ }
if (comprot) {
rot = &comprot->rioOnTrack(comprot->indexOfMaxAssignProb());
-}
- }
+ }
}
+}
--
GitLab
From f1f010217b5d2040883761efa4adb359905ca687 Mon Sep 17 00:00:00 2001
From: abarton <Adam.Edward.Barton@cern.ch>
Date: Mon, 16 Aug 2021 19:18:44 +0100
Subject: [PATCH 074/272] Use single char find
---
.../AthAnalysisBaseComps/AthAnalysisHelper.h | 4 +-
.../AthenaBaseComps/src/AthHistogramming.cxx | 2 +-
.../AthenaBaseComps/src/DynamicDataHelper.cxx | 2 +-
Control/AthenaKernel/src/StoreID.cxx | 2 +-
Control/AthenaKernel/src/errorcheck.cxx | 2 +-
.../AthenaMPTools/src/EvtRangeScatterer.cxx | 4 +-
.../src/ManagedMonitorToolBase.cxx | 8 +--
.../AthenaMonitoring/src/MonitorToolBase.cxx | 2 +-
.../src/HistogramFiller/HistogramFillerTree.h | 2 +-
Control/IOVSvc/src/IOVSvc.cxx | 2 +-
Control/SGComps/src/AddressRemappingSvc.cxx | 10 ++--
Control/SGTools/src/DataStore.cxx | 2 +-
Control/StoreGate/src/SGHiveMgrSvc.cxx | 4 +-
Control/StoreGate/src/VarHandleKey.cxx | 6 +-
.../APR/CollectionUtilities/src/MetaInfo.cpp | 6 +-
.../CollectionUtilities/src/UtilityFuncs.cpp | 2 +-
.../utilities/CollQuery.cpp | 4 +-
.../T_AthenaPoolExtendingCnv.icc | 4 +-
.../AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx | 16 +++---
.../src/AthenaPoolConverter.cxx | 10 ++--
Database/AthenaPOOL/PoolSvc/src/PoolSvc.cxx | 4 +-
.../DBReplicaSvc/src/DBReplicaSvc.cxx | 8 +--
Database/CoraCool/src/CoraCoolDatabase.cxx | 10 ++--
Database/CoraCool/src/CoraCoolFolder.cxx | 4 +-
Database/IOVDbSvc/src/IOVDbParser.cxx | 8 +--
Database/IOVDbSvc/src/IOVDbSvc.cxx | 2 +-
.../GeometryDBSvc/src/TextFileDBReader.cxx | 4 +-
.../PixelCalibAlgs/MultiHisto.icc | 4 +-
.../TRT_CalibAlgs/share/CalibrateTRT.cpp | 34 +++++------
.../SCT_Cabling/utility/openCoraCool.cxx | 2 +-
.../util/postProcessIDPVMHistos.cxx | 2 +-
.../src/LArCaliWaveBuilderXtalk.cxx | 56 +++++++++----------
.../src/InDetTrackSelectionToolWrapper.cxx | 2 +-
.../Root/MuonSFTestHelper.cxx | 6 +-
.../FastChainPileup/Samplers.h | 2 +-
.../TileConditions/src/TileInfoLoader.cxx | 4 +-
Tools/FilePeeker/src/BSFilePeeker.cxx | 2 +-
.../Root/AlgToChainTool.cxx | 2 +-
38 files changed, 125 insertions(+), 125 deletions(-)
diff --git a/Control/AthAnalysisBaseComps/AthAnalysisBaseComps/AthAnalysisHelper.h b/Control/AthAnalysisBaseComps/AthAnalysisBaseComps/AthAnalysisHelper.h
index b0f8645d292f..24f4c8cfe5c9 100644
--- a/Control/AthAnalysisBaseComps/AthAnalysisBaseComps/AthAnalysisHelper.h
+++ b/Control/AthAnalysisBaseComps/AthAnalysisBaseComps/AthAnalysisHelper.h
@@ -202,7 +202,7 @@ public:
/// CHECK( tool.retrieve() );
template<typename W> static W* createTool(const std::string& typeAndName, INamedInterface* parent = 0) {
std::string type = typeAndName; std::string name = typeAndName;
- if(type.find("/")!=std::string::npos) { type = type.substr(0,type.find("/")); name = name.substr(name.find("/")+1,name.length()); }
+ if(type.find('/')!=std::string::npos) { type = type.substr(0,type.find('/')); name = name.substr(name.find('/')+1,name.length()); }
if(parent==0) {
//use ToolSvc as parent
parent = Gaudi::svcLocator()->service( "ToolSvc" );
@@ -225,7 +225,7 @@ public:
//equivalent method for creating an algorithm ... always returns an IAlgorithm though, so not templated
static IAlgorithm* createAlgorithm(const std::string& typeAndName) {
std::string type = typeAndName; std::string name = typeAndName;
- if(type.find("/")!=std::string::npos) { type = type.substr(0,type.find("/")); name = name.substr(name.find("/")+1,name.length()); }
+ if(type.find('/')!=std::string::npos) { type = type.substr(0,type.find('/')); name = name.substr(name.find('/')+1,name.length()); }
IAlgorithm* out = Algorithm::Factory::create(type,name,Gaudi::svcLocator()).release();
out->addRef(); //important to increment the reference count so that Gaudi Garbage collection wont delete alg ahead of time
return out;
diff --git a/Control/AthenaBaseComps/src/AthHistogramming.cxx b/Control/AthenaBaseComps/src/AthHistogramming.cxx
index 21036b1139b0..99ea58c5390a 100644
--- a/Control/AthenaBaseComps/src/AthHistogramming.cxx
+++ b/Control/AthenaBaseComps/src/AthHistogramming.cxx
@@ -465,7 +465,7 @@ void AthHistogramming::buildBookingString( std::string& bookingString,
{
// Massage the final string to book things
if(tDir.empty()) tDir = m_rootDir;
- size_t pos = histName.rfind("/");
+ size_t pos = histName.rfind('/');
if(pos != std::string::npos){
tDir+="/"+histName.substr(0,pos);
histName.erase(0,pos+1);
diff --git a/Control/AthenaBaseComps/src/DynamicDataHelper.cxx b/Control/AthenaBaseComps/src/DynamicDataHelper.cxx
index 1130d23eff7d..10e4cc920678 100644
--- a/Control/AthenaBaseComps/src/DynamicDataHelper.cxx
+++ b/Control/AthenaBaseComps/src/DynamicDataHelper.cxx
@@ -31,7 +31,7 @@ namespace Ath {
}
m_extraOutputIDs.reserve( undeclared_output_data.size() );
for(const std::string &type_and_name : undeclared_output_data) {
- std::string::size_type pos = type_and_name.find("/");
+ std::string::size_type pos = type_and_name.find('/');
if (pos == std::string::npos) {
error << " " << type_and_name;
}
diff --git a/Control/AthenaKernel/src/StoreID.cxx b/Control/AthenaKernel/src/StoreID.cxx
index 87d2a68cb84a..72fcaae7bf53 100644
--- a/Control/AthenaKernel/src/StoreID.cxx
+++ b/Control/AthenaKernel/src/StoreID.cxx
@@ -22,7 +22,7 @@ StoreID::findStoreID(const std::string& storeNamePrefix) {
// Account for AthenaMT stores that start with {digits}_
size_t ist (0);
if (::isdigit(storeNamePrefix.at(0))) {
- ist = storeNamePrefix.find("_",0) +1;
+ ist = storeNamePrefix.find('_',0) +1;
}
//slightly faster
diff --git a/Control/AthenaKernel/src/errorcheck.cxx b/Control/AthenaKernel/src/errorcheck.cxx
index 5e3a47a0df73..1b02884f2f7b 100644
--- a/Control/AthenaKernel/src/errorcheck.cxx
+++ b/Control/AthenaKernel/src/errorcheck.cxx
@@ -138,7 +138,7 @@ std::string munge_names (const std::string& str_in)
std::string munge_filename (const std::string& file, const std::string& pkg)
{
// Extract package name in case there is a version (MyPackage-00-00-00)
- const std::string p = pkg.substr(0, pkg.find("-"));
+ const std::string p = pkg.substr(0, pkg.find('-'));
if (!p.empty()) {
// Find package name in path and remove any leading entries
std::string::size_type ipos = file.find("/"+p+"/");
diff --git a/Control/AthenaMPTools/src/EvtRangeScatterer.cxx b/Control/AthenaMPTools/src/EvtRangeScatterer.cxx
index e40a15b132da..8bfd0b1100ca 100644
--- a/Control/AthenaMPTools/src/EvtRangeScatterer.cxx
+++ b/Control/AthenaMPTools/src/EvtRangeScatterer.cxx
@@ -264,7 +264,7 @@ std::unique_ptr<AthenaInterprocess::ScheduledWork> EvtRangeScatterer::exec_func(
while(endpos!=std::string::npos) {
// Get the Key-Value pair
std::string keyValue(eventRange.substr(startpos,endpos-startpos));
- size_t colonPos = keyValue.find(":");
+ size_t colonPos = keyValue.find(':');
std::string strKey = keyValue.substr(0,colonPos);
std::string strVal = keyValue.substr(colonPos+1);
trimRangeStrings(strKey);
@@ -276,7 +276,7 @@ std::unique_ptr<AthenaInterprocess::ScheduledWork> EvtRangeScatterer::exec_func(
}
// Get the final Key-Value pair
std::string keyValue(eventRange.substr(startpos));
- size_t colonPos = keyValue.find(":");
+ size_t colonPos = keyValue.find(':');
std::string strKey = keyValue.substr(0,colonPos);
std::string strVal = keyValue.substr(colonPos+1);
trimRangeStrings(strKey);
diff --git a/Control/AthenaMonitoring/src/ManagedMonitorToolBase.cxx b/Control/AthenaMonitoring/src/ManagedMonitorToolBase.cxx
index 0db44bea77b4..62cb63ec295f 100644
--- a/Control/AthenaMonitoring/src/ManagedMonitorToolBase.cxx
+++ b/Control/AthenaMonitoring/src/ManagedMonitorToolBase.cxx
@@ -1012,7 +1012,7 @@ registerMetadata(const std::string& streamName, const std::string& hName,
if( m_environment != AthenaMonManager::online ) {
TTree* metadata(0);
std::string mdStreamName( streamName );
- size_t found=mdStreamName.rfind("/");
+ size_t found=mdStreamName.rfind('/');
if ( found != std::string::npos )
mdStreamName.replace( found, mdStreamName.length(), "/metadata" );
@@ -2163,7 +2163,7 @@ getDirectoryName( const ManagedMonitorToolBase* tool, const MonGroup& group, con
parseString(streamName, root, rem);
// Remove object name at the end
// to obtain directory path
- rem.erase(rem.rfind("/"), rem.length());
+ rem.erase(rem.rfind('/'), rem.length());
return rem;
}
@@ -2313,7 +2313,7 @@ getDirectoryName( const ManagedMonitorToolBase* tool, const MonGroup& group, con
parseString(streamName, root, rem);
// Remove object name at the end
// to obtain directory path
- rem.erase(rem.rfind("/"), rem.length());
+ rem.erase(rem.rfind('/'), rem.length());
return rem;
}
@@ -2418,7 +2418,7 @@ getNewStreamNameFcn() const
void
ManagedMonitorToolBase::StreamNameFcn::
parseString(const std::string& streamName, std::string& root, std::string& rem) {
- std::string::size_type pos = streamName.find("/");
+ std::string::size_type pos = streamName.find('/');
if (pos == std::string::npos) {
root = "";
diff --git a/Control/AthenaMonitoring/src/MonitorToolBase.cxx b/Control/AthenaMonitoring/src/MonitorToolBase.cxx
index f6dee072487b..471ca66291d9 100644
--- a/Control/AthenaMonitoring/src/MonitorToolBase.cxx
+++ b/Control/AthenaMonitoring/src/MonitorToolBase.cxx
@@ -140,7 +140,7 @@ MonitorToolBase::setupOutputStreams(std::vector<std::string> Mapping
std::vector<std::string>::iterator itr = m_THistSvc_streamnameMapping.begin();
while( itr != m_THistSvc_streamnameMapping.end() )
{
- std::string::size_type location = itr->find("/", 0);
+ std::string::size_type location = itr->find('/', 0);
if( location == std::string::npos )
{
log << MSG::ERROR
diff --git a/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFillerTree.h b/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFillerTree.h
index 44737932c44b..dbf0a693d761 100644
--- a/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFillerTree.h
+++ b/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFillerTree.h
@@ -78,7 +78,7 @@ namespace Monitored {
std::vector<std::string> tokenized;
boost::split(tokenized, m_histDef->treeDef, [](char c){ return c ==':'; });
for (const auto& token : tokenized) {
- auto ipart = token.find("/");
+ auto ipart = token.find('/');
if (ipart == std::string::npos) {
MsgStream log(Athena::getMessageSvc(), "HistogramFillerTree");
log << MSG::ERROR << "Tree " << m_histDef->alias << ": Badly formed variable definition " << token
diff --git a/Control/IOVSvc/src/IOVSvc.cxx b/Control/IOVSvc/src/IOVSvc.cxx
index f5b8eca17e7c..455db662c264 100755
--- a/Control/IOVSvc/src/IOVSvc.cxx
+++ b/Control/IOVSvc/src/IOVSvc.cxx
@@ -798,7 +798,7 @@ IOVSvc::createCondObj(CondContBase* ccb, const DataObjID& id,
std::string tag;
// remove storename from key
std::string sgKey = id.key();
- auto sep = sgKey.find("+");
+ auto sep = sgKey.find('+');
if (sep != std::string::npos) {
sgKey.erase(0,sep+1);
}
diff --git a/Control/SGComps/src/AddressRemappingSvc.cxx b/Control/SGComps/src/AddressRemappingSvc.cxx
index b5a6030fb314..0c6f98bc56d2 100644
--- a/Control/SGComps/src/AddressRemappingSvc.cxx
+++ b/Control/SGComps/src/AddressRemappingSvc.cxx
@@ -63,7 +63,7 @@ StatusCode AddressRemappingSvc::initialize() {
const std::pair<std::string, std::string> entry(overwrite.substr(p_sep + 2), overwrite.substr(0, p_sep));
ATH_MSG_INFO("TypeKeyOverwriteMaps for: " << entry.second
<< " -> " << entry.first);
- const std::string::size_type p_oldSep = entry.first.find("#");
+ const std::string::size_type p_oldSep = entry.first.find('#');
if (p_oldSep == std::string::npos) {
ATH_MSG_ERROR("Unexpected format in TypeKeyOverwriteMaps: " << overwrite);
return(StatusCode::FAILURE);
@@ -71,12 +71,12 @@ StatusCode AddressRemappingSvc::initialize() {
std::string clidStr = entry.first.substr(0, p_oldSep);
std::set<CLID> symClids;
- for (std::string::size_type p_clidSep = clidStr.rfind(","); p_clidSep != std::string::npos; clidStr = clidStr.substr(0, p_clidSep), p_clidSep = clidStr.rfind(",")) {
+ for (std::string::size_type p_clidSep = clidStr.rfind(','); p_clidSep != std::string::npos; clidStr = clidStr.substr(0, p_clidSep), p_clidSep = clidStr.rfind(',')) {
symClids.insert(getClid(clidStr.substr(p_clidSep + 1)));
}
std::string keyStr = entry.first.substr(p_oldSep + 1);
std::set<std::string> aliases;
- for (std::string::size_type p_keySep = keyStr.rfind(","); p_keySep != std::string::npos; keyStr = keyStr.substr(0, p_keySep), p_keySep = keyStr.rfind(",")) {
+ for (std::string::size_type p_keySep = keyStr.rfind(','); p_keySep != std::string::npos; keyStr = keyStr.substr(0, p_keySep), p_keySep = keyStr.rfind(',')) {
aliases.insert(keyStr.substr(p_keySep + 1));
}
SG::TransientAddress oldTad(getClid(clidStr), keyStr);
@@ -85,7 +85,7 @@ StatusCode AddressRemappingSvc::initialize() {
}
oldTad.setAlias(aliases);
- const std::string::size_type p_newSep = entry.second.find("#");
+ const std::string::size_type p_newSep = entry.second.find('#');
if (p_newSep == std::string::npos) {
ATH_MSG_ERROR("Unexpected format in TypeKeyOverwriteMaps: " << overwrite);
return(StatusCode::FAILURE);
@@ -132,7 +132,7 @@ StatusCode AddressRemappingSvc::initInputRenames()
// Parse input properties.
for (const std::string& remap : m_typeKeyRenameMaps)
{
- std::string::size_type pos1 = remap.find("#");
+ std::string::size_type pos1 = remap.find('#');
std::string::size_type pos2 = remap.find("->");
if (pos1 == std::string::npos || pos2 == std::string::npos || pos2 < pos1)
{
diff --git a/Control/SGTools/src/DataStore.cxx b/Control/SGTools/src/DataStore.cxx
index 71775e6d1ece..f68f1d3b9e60 100755
--- a/Control/SGTools/src/DataStore.cxx
+++ b/Control/SGTools/src/DataStore.cxx
@@ -495,7 +495,7 @@ StatusCode
DataStore::t2pRegister(const void* const pTrans, DataProxy* const pPers)
{
std::string name=pPers->name();
- int i=name.find("/", 0);
+ int i=name.find('/', 0);
name=name.erase(0,i+1);
if (doAudit()) m_pSGAudSvc->SGAudit(name, pPers->clID(), 1, m_storeID);
diff --git a/Control/StoreGate/src/SGHiveMgrSvc.cxx b/Control/StoreGate/src/SGHiveMgrSvc.cxx
index 0fb492a1d773..0580ba810f6c 100644
--- a/Control/StoreGate/src/SGHiveMgrSvc.cxx
+++ b/Control/StoreGate/src/SGHiveMgrSvc.cxx
@@ -149,14 +149,14 @@ bool HiveMgrSvc::exists( const DataObjID& id) {
// this should only get called in error situations, so we
// don't care if it's slow
std::string key = id.key();
- key.erase(0,key.find("+")+1);
+ key.erase(0,key.find('+')+1);
if (id.clid() == 0) {
// this is an ugly hack in case the DataObjID gets munged
// upstream, and we have to re-separate it into (class,key)
// from "class/key"
std::string cl = id.fullKey();
- cl.erase(cl.find("/"),cl.length());
+ cl.erase(cl.find('/'),cl.length());
DataObjID d2(cl,key);
return m_hiveStore->transientContains(d2.clid(), key);
diff --git a/Control/StoreGate/src/VarHandleKey.cxx b/Control/StoreGate/src/VarHandleKey.cxx
index 0c61a311cb79..00fab717078d 100644
--- a/Control/StoreGate/src/VarHandleKey.cxx
+++ b/Control/StoreGate/src/VarHandleKey.cxx
@@ -24,7 +24,7 @@
#include <sstream>
-static const char* const storeSeparator = "+";
+constexpr char const storeSeparator = '+';
namespace SG {
@@ -227,7 +227,7 @@ void VarHandleKey::parseKey (const std::string& key,
std::string sn;
// test if storeName has classname
- std::string::size_type sp = storeName.find("/");
+ std::string::size_type sp = storeName.find('/');
if (sp == std::string::npos) {
sn = storeName;
} else {
@@ -262,7 +262,7 @@ void VarHandleKey::parseKey (const std::string& key,
st = StoreID::findStoreID(sn);
if (st != StoreID::CONDITION_STORE && st != StoreID::METADATA_STORE) {
- if (m_sgKey.find("/") != std::string::npos) {
+ if (m_sgKey.find('/') != std::string::npos) {
throw SG::ExcBadHandleKey("key \"" + key
+ "\": keys with \"/\" only allowed for "
+ StoreID::storeName(StoreID::CONDITION_STORE)
diff --git a/Database/APR/CollectionUtilities/src/MetaInfo.cpp b/Database/APR/CollectionUtilities/src/MetaInfo.cpp
index 801fc74ec3da..81e7f13b0421 100644
--- a/Database/APR/CollectionUtilities/src/MetaInfo.cpp
+++ b/Database/APR/CollectionUtilities/src/MetaInfo.cpp
@@ -105,7 +105,7 @@ MetaInfo::evalArgs(std::vector<std::string>& argv)
m_noMetadata=true;
for( size_t i = 0; i < keepkeys.size() ; ++i) {
// Check for any wildcarding
- std::string::size_type sep = keepkeys[i].find("*");
+ std::string::size_type sep = keepkeys[i].find('*');
if (sep == std::string::npos) {
//std::cerr << "Keeping " << keepkeys[i] << std::endl;
m_wildkeepers.push_back(std::make_pair(keepkeys[i],""));
@@ -115,8 +115,8 @@ MetaInfo::evalArgs(std::vector<std::string>& argv)
std::pair<std::string,std::string> key;
key.first = keepkeys[i].substr(0,sep);
key.second = keepkeys[i].substr(sep+1,keepkeys[i].size());
- if (key.first.find("*")==std::string::npos &&
- key.second.find("*")==std::string::npos) m_wildkeepers.push_back(key);
+ if (key.first.find('*')==std::string::npos &&
+ key.second.find('*')==std::string::npos) m_wildkeepers.push_back(key);
else std::cerr << "Multiple wildcards not supported, disregarding " << keepkeys[i] << std::endl;
}
}
diff --git a/Database/APR/CollectionUtilities/src/UtilityFuncs.cpp b/Database/APR/CollectionUtilities/src/UtilityFuncs.cpp
index 6d9d1712bdf2..454f36b6b58f 100644
--- a/Database/APR/CollectionUtilities/src/UtilityFuncs.cpp
+++ b/Database/APR/CollectionUtilities/src/UtilityFuncs.cpp
@@ -30,7 +30,7 @@ std::string pool::getKey(const std::string& key, const std::string& encoded)
{
size_t keystart = encoded.find(key);
if (keystart!=string::npos) {
- size_t keylen = encoded.find(";",keystart)-keystart;
+ size_t keylen = encoded.find(';',keystart)-keystart;
//cout << "key begins at " << keystart << " with length " << keylen << " for " << encoded << endl;
if (keystart+keylen<encoded.size()) {
return encoded.substr(keystart+key.size(),keylen-key.size());
diff --git a/Database/APR/CollectionUtilities/utilities/CollQuery.cpp b/Database/APR/CollectionUtilities/utilities/CollQuery.cpp
index 1b8ea47797da..11f502079ec5 100644
--- a/Database/APR/CollectionUtilities/utilities/CollQuery.cpp
+++ b/Database/APR/CollectionUtilities/utilities/CollQuery.cpp
@@ -119,7 +119,7 @@ AttributeType::fromString(const std::string& i)
for (std::set<std::string>::iterator it = keys.begin(); it!=keys.end(); ++it) {
flagpos = i.find(*it);
if (flagpos != std::string::npos) {
- endpos = i.find(";",flagpos);
+ endpos = i.find(';',flagpos);
if (endpos != std::string::npos) {
this->setInfoForKey(*it,i.substr(flagpos,endpos));
}
@@ -455,7 +455,7 @@ int main(int argc, const char *argv[])
std::cout.width(widths[j]);
ostringstream lots;
attribList[j].toOutputStream(lots);
- std::string value = lots.str().substr(lots.str().find(":")+1,std::string::npos);
+ std::string value = lots.str().substr(lots.str().find(':')+1,std::string::npos);
std::cout.width(widths[j]);
if (!countOnly) std::cout << value;
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolExtendingCnv.icc b/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolExtendingCnv.icc
index 1dfec4c81058..e2f0a20f252f 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolExtendingCnv.icc
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolExtendingCnv.icc
@@ -99,8 +99,8 @@ T_AthenaPoolExtendingCnv< TRANS, PERS >::writeObject(const std::string& key, con
throw std::runtime_error("Component persistent object write failed");
}
getTopLevelTPCnv()->clearTLPersObject();
- std::size_t cpos = output.find(":");
- std::size_t bpos = output.find("[");
+ std::size_t cpos = output.find(':');
+ std::size_t bpos = output.find('[');
if (cpos == std::string::npos) {
cpos = 0;
} else {
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx
index 674a2f91e05a..5160927a0ba4 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx
@@ -287,7 +287,7 @@ StatusCode AthenaPoolCnvSvc::connectOutput(const std::string& outputConnectionSp
//______________________________________________________________________________
StatusCode AthenaPoolCnvSvc::connectOutput(const std::string& outputConnectionSpec) {
// This is called before DataObjects are being converted.
- std::string outputConnection = outputConnectionSpec.substr(0, outputConnectionSpec.find("["));
+ std::string outputConnection = outputConnectionSpec.substr(0, outputConnectionSpec.find('['));
// Extract the technology
int tech = m_dbType.type();
if (!decodeOutputSpec(outputConnection, tech).isSuccess()) {
@@ -353,10 +353,10 @@ StatusCode AthenaPoolCnvSvc::connectOutput(const std::string& outputConnectionSp
std::string& data = (*iter)[1];
const std::string& file = (*iter)[2];
const std::string& cont = (*iter)[3];
- std::size_t equal = cont.find("="); // Used to remove leading "TTree="
+ std::size_t equal = cont.find('='); // Used to remove leading "TTree="
if (equal == std::string::npos) equal = 0;
else equal++;
- std::size_t colon = m_containerPrefixProp.value().find(":");
+ std::size_t colon = m_containerPrefixProp.value().find(':');
if (colon == std::string::npos) colon = 0; // Used to remove leading technology
else colon++;
if (merge != std::string::npos && opt == "TREE_AUTO_FLUSH" && file == outputConnection.substr(0, merge) && cont.substr(equal) == m_containerPrefixProp.value().substr(colon) && data != "int" && data != "DbLonglong" && data != "double" && data != "string") {
@@ -387,7 +387,7 @@ StatusCode AthenaPoolCnvSvc::connectOutput(const std::string& outputConnectionSp
//______________________________________________________________________________
StatusCode AthenaPoolCnvSvc::commitOutput(const std::string& outputConnectionSpec, bool doCommit) {
// This is called after all DataObjects are converted.
- std::string outputConnection = outputConnectionSpec.substr(0, outputConnectionSpec.find("["));
+ std::string outputConnection = outputConnectionSpec.substr(0, outputConnectionSpec.find('['));
if (!m_outputStreamingTool.empty() && m_outputStreamingTool[0]->isClient()
&& (!m_parallelCompression || outputConnectionSpec.find("[PoolContainerPrefix=" + m_metadataContainerProp.value() + "]") != std::string::npos)) {
auto it = std::find (m_streamClientFiles.begin(),
@@ -675,7 +675,7 @@ StatusCode AthenaPoolCnvSvc::commitOutput(const std::string& outputConnectionSpe
//______________________________________________________________________________
StatusCode AthenaPoolCnvSvc::disconnectOutput(const std::string& outputConnectionSpec) {
- std::string outputConnection = outputConnectionSpec.substr(0, outputConnectionSpec.find("["));
+ std::string outputConnection = outputConnectionSpec.substr(0, outputConnectionSpec.find('['));
if (!m_outputStreamingTool.empty() && m_outputStreamingTool[0]->isClient()
&& (!m_parallelCompression || outputConnectionSpec.find("[PoolContainerPrefix=" + m_metadataContainerProp.value() + "]") != std::string::npos)) {
return(StatusCode::SUCCESS);
@@ -1051,8 +1051,8 @@ StatusCode AthenaPoolCnvSvc::registerCleanUp(IAthenaPoolCleanUp* cnv) {
//______________________________________________________________________________
StatusCode AthenaPoolCnvSvc::cleanUp(const std::string& connection) {
bool retError = false;
- std::size_t cpos = connection.find(":");
- std::size_t bpos = connection.find("[");
+ std::size_t cpos = connection.find(':');
+ std::size_t bpos = connection.find('[');
if (cpos == std::string::npos) {
cpos = 0;
} else {
@@ -1332,7 +1332,7 @@ StatusCode AthenaPoolCnvSvc::processPoolAttributes(std::vector<std::vector<std::
std::string data = (*iter)[1];
const std::string& file = (*iter)[2];
const std::string& cont = (*iter)[3];
- if (!fileName.empty() && (file == fileName.substr(0, fileName.find("?"))
+ if (!fileName.empty() && (file == fileName.substr(0, fileName.find('?'))
|| (file.substr(0, 1) == "*" && file.find("," + fileName + ",") == std::string::npos))) {
if (data == "int" || data == "DbLonglong" || data == "double" || data == "string") {
if (doGet) {
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolConverter.cxx b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolConverter.cxx
index a1fde582cec5..f7ba27e56eaf 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolConverter.cxx
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolConverter.cxx
@@ -152,7 +152,7 @@ AthenaPoolConverter::AthenaPoolConverter(const CLID& myCLID, ISvcLocator* pSvcLo
Placement AthenaPoolConverter::setPlacementWithType(const std::string& tname, const std::string& key, const std::string& output) {
Placement placement;
// Override streaming parameters from StreamTool if requested.
- std::string::size_type pos1 = output.find("[");
+ std::string::size_type pos1 = output.find('[');
std::string outputConnectionSpec = output.substr(0, pos1);
int tech = 0;
m_athenaPoolCnvSvc->decodeOutputSpec(outputConnectionSpec, tech).ignore();
@@ -175,16 +175,16 @@ Placement AthenaPoolConverter::setPlacementWithType(const std::string& tname, co
std::string containerPrefix = containerPrefixProp.value();
std::string dhContainerPrefix = "POOLContainer";
// Get Technology from containerPrefix
- std::size_t colonPos = containerPrefix.find(":");
+ std::size_t colonPos = containerPrefix.find(':');
if (colonPos != std::string::npos) {
dhContainerPrefix = containerPrefix.substr(0, colonPos + 1) + dhContainerPrefix;
}
std::string containerNameHint = containerNameHintProp.value();
std::string branchNameHint = branchNameHintProp.value();
while (pos1 != std::string::npos) {
- const std::string::size_type pos2 = output.find("=", pos1);
+ const std::string::size_type pos2 = output.find('=', pos1);
const std::string key = output.substr(pos1 + 1, pos2 - pos1 - 1);
- const std::string::size_type pos3 = output.find("]", pos2);
+ const std::string::size_type pos3 = output.find(']', pos2);
const std::string value = output.substr(pos2 + 1, pos3 - pos2 - 1);
if (key == "OutputCollection") {
dhContainerPrefix = value;
@@ -195,7 +195,7 @@ Placement AthenaPoolConverter::setPlacementWithType(const std::string& tname, co
} else if (key == "SubLevelBranchName") {
branchNameHint = value;
}
- pos1 = output.find("[", pos3);
+ pos1 = output.find('[', pos3);
}
if (tname.substr(0, 14) == "DataHeaderForm") {
containerName = dhContainerPrefix + "Form" + "(" + tname + ")";
diff --git a/Database/AthenaPOOL/PoolSvc/src/PoolSvc.cxx b/Database/AthenaPOOL/PoolSvc/src/PoolSvc.cxx
index b559b9c02436..d223abd5cd5e 100644
--- a/Database/AthenaPOOL/PoolSvc/src/PoolSvc.cxx
+++ b/Database/AthenaPOOL/PoolSvc/src/PoolSvc.cxx
@@ -854,7 +854,7 @@ StatusCode PoolSvc::setFrontierCache(const std::string& conn) const {
// setup the Frontier cache information for the given logical or physical connection string
// first determine if the connection is logical (no ':')
std::vector<std::string> physcons;
- if (conn.find(":") == std::string::npos) {
+ if (conn.find(':') == std::string::npos) {
// if logical, have to lookup list of physical replicas, and consider each
// need the CORAL ILookupSvc interface which must be loaded if needed
const std::string lookSvcStr("CORAL/Services/XMLLookupService");
@@ -915,7 +915,7 @@ pool::IFileCatalog* PoolSvc::createCatalog() {
for (auto& catalog : m_readCatalog.value()) {
ATH_MSG_DEBUG("POOL ReadCatalog is " << catalog);
if (catalog.substr(0, 8) == "apcfile:" || catalog.substr(0, 7) == "prfile:") {
- std::string::size_type cpos = catalog.find(":");
+ std::string::size_type cpos = catalog.find(':');
// check for file accessed via ATLAS_POOLCOND_PATH
std::string file = poolCondPath(catalog.substr(cpos + 1));
if (!file.empty()) {
diff --git a/Database/ConnectionManagement/DBReplicaSvc/src/DBReplicaSvc.cxx b/Database/ConnectionManagement/DBReplicaSvc/src/DBReplicaSvc.cxx
index f4d15b21d75e..9ac67f2d87e3 100755
--- a/Database/ConnectionManagement/DBReplicaSvc/src/DBReplicaSvc.cxx
+++ b/Database/ConnectionManagement/DBReplicaSvc/src/DBReplicaSvc.cxx
@@ -63,7 +63,7 @@ StatusCode DBReplicaSvc::initialize() {
const char* chost=getenv("HOSTNAME");
if (chost) m_hostname=chost;
// check if the returned host has a .
- if (m_hostname.find(".")==std::string::npos) {
+ if (m_hostname.find('.')==std::string::npos) {
ATH_MSG_DEBUG("HOSTNAME " << m_hostname
<< " has no domain - try hostname --fqdn");
m_hostname="unknown";
@@ -139,7 +139,7 @@ StatusCode DBReplicaSvc::readConfig() {
std::vector<std::string> domains;
std::vector<std::string> servers;
while (iofs1<buf.size()) {
- std::string::size_type iofs2=buf.find(" ",iofs1);
+ std::string::size_type iofs2=buf.find(' ',iofs1);
// allow for trailing linefeed
if (iofs2==std::string::npos) iofs2=buf.size()-1;
std::string token=buf.substr(iofs1,iofs2-iofs1);
@@ -259,10 +259,10 @@ void DBReplicaSvc::sort(std::vector<const
}
// extract the server name (assuming URLs "techno://server/schema")
std::string::size_type ipos1=conn.find("://");
- std::string::size_type ipos2=conn.find("/",ipos1+3);
+ std::string::size_type ipos2=conn.find('/',ipos1+3);
// for Frontier, have to remove the (..) part after the server name
// e.g. frontier://ATLAS_COOLPROD/(serverurl=http://xyzfrontier.cern.ch:8000/atlr)/schema
- std::string::size_type ipos3=conn.find("(",ipos1+3);
+ std::string::size_type ipos3=conn.find('(',ipos1+3);
if (ipos3!=std::string::npos && ipos3<ipos2) ipos2=ipos3;
if (ipos1!=std::string::npos && ipos2!=std::string::npos && !veto) {
const std::string server=conn.substr(ipos1+3,ipos2-ipos1-3);
diff --git a/Database/CoraCool/src/CoraCoolDatabase.cxx b/Database/CoraCool/src/CoraCoolDatabase.cxx
index 0cc775483fd1..06347e470b97 100755
--- a/Database/CoraCool/src/CoraCoolDatabase.cxx
+++ b/Database/CoraCool/src/CoraCoolDatabase.cxx
@@ -83,23 +83,23 @@ bool CoraCoolDatabase::extractCoralConStr(const std::string& coolstr) {
// extract CORAL database string from COOL one
bool dbok=false;
// first check for initial colon - if so, technology-specific string
- std::string::size_type c1=coolstr.find(":");
+ std::string::size_type c1=coolstr.find(':');
if (c1!=std::string::npos) {
std::string techno,server,schema,user,passwd;
techno=coolstr.substr(0,c1);
std::string::size_type c2;
- c2=coolstr.find(";");
+ c2=coolstr.find(';');
if (c2==std::string::npos) c2=coolstr.size();
server=coolstr.substr(c1+3,c2-c1-3);
c1=coolstr.find("schema=");
if (c1!=std::string::npos) {
- c2=coolstr.find(";",c1+7);
+ c2=coolstr.find(';',c1+7);
if (c2==std::string::npos) c2=coolstr.size();
schema=coolstr.substr(c1+7,c2-c1-7);
}
c1=coolstr.find("dbname=");
if (c1!=std::string::npos) {
- c2=coolstr.find(";",c1+7);
+ c2=coolstr.find(';',c1+7);
if (c2==std::string::npos) c2=coolstr.size();
m_dbname=coolstr.substr(c1+7,c2-c1-7);
}
@@ -116,7 +116,7 @@ bool CoraCoolDatabase::extractCoralConStr(const std::string& coolstr) {
}
}
} else {
- c1=coolstr.find("/");
+ c1=coolstr.find('/');
if (c1!=std::string::npos) {
m_dbconn=coolstr.substr(0,c1);
m_dbname=coolstr.substr(c1+1);
diff --git a/Database/CoraCool/src/CoraCoolFolder.cxx b/Database/CoraCool/src/CoraCoolFolder.cxx
index 114f1ef86f5a..a95445bc9352 100755
--- a/Database/CoraCool/src/CoraCoolFolder.cxx
+++ b/Database/CoraCool/src/CoraCoolFolder.cxx
@@ -455,8 +455,8 @@ bool CoraCoolFolder::decodeAttrSpec() {
iofs1=0;
bool last=false;
while (!last) {
- iofs2=spec.find(":",iofs1);
- iofs3=spec.find(",",iofs2);
+ iofs2=spec.find(':',iofs1);
+ iofs3=spec.find(',',iofs2);
if (iofs3==std::string::npos) {
iofs3=spec.size();
last=true;
diff --git a/Database/IOVDbSvc/src/IOVDbParser.cxx b/Database/IOVDbSvc/src/IOVDbParser.cxx
index 745abd8bfa95..e6ce1b1fa1e0 100644
--- a/Database/IOVDbSvc/src/IOVDbParser.cxx
+++ b/Database/IOVDbSvc/src/IOVDbParser.cxx
@@ -22,7 +22,7 @@ IOVDbParser::IOVDbParser(const std::string& input, MsgStream& log) :
std::string::size_type len=input.size();
while (iofs!=std::string::npos && iofs<len) {
// look for the start of the next XML tag
- std::string::size_type iofs1=input.find("<",iofs);
+ std::string::size_type iofs1=input.find('<',iofs);
if (iofs1>iofs && iofs1!=std::string::npos) {
// take any unmarked-up text into the 'outside' data slot
m_keys[""]+=IOVDbNamespace::spaceStrip(input.substr(iofs,iofs1-iofs));
@@ -30,7 +30,7 @@ IOVDbParser::IOVDbParser(const std::string& input, MsgStream& log) :
if (iofs1!=std::string::npos) {
// have an opening XML tag - process it
// first find the end of the tag, either '>' or ' ', whichever first
- std::string::size_type iofs2=input.find(">",iofs1);
+ std::string::size_type iofs2=input.find('>',iofs1);
std::string::size_type iofs3=input.find("/>",iofs1);
bool noClosingTag = (iofs2 == std::string::npos);
if (noClosingTag){
@@ -49,7 +49,7 @@ IOVDbParser::IOVDbParser(const std::string& input, MsgStream& log) :
// found closing tag, store tag and text
m_keys[tag]=IOVDbNamespace::spaceStrip(input.substr(iofs2+1,iofs4-iofs2-1));
// advance to the next part of the string, after '>' on closing tag
- iofs=input.find(">",iofs4);
+ iofs=input.find('>',iofs4);
if (iofs == std::string::npos) {
m_msg << MSG::FATAL <<
"Badly formed XML string, no closing tag in " << input << endmsg;
@@ -69,7 +69,7 @@ IOVDbParser::IOVDbParser(const std::string& input, MsgStream& log) :
} else if (iofs3!=std::string::npos) {
// found a />, so tag is of form <tag values info/>
// find the end of the tag part to see if a value is present
- std::string::size_type iofs4=input.find(" ",iofs1+1);
+ std::string::size_type iofs4=input.find(' ',iofs1+1);
std::string value,tag;
if (iofs4!=std::string::npos && iofs4<iofs3) {
value=IOVDbNamespace::spaceStrip(input.substr(iofs4,iofs3-iofs4));
diff --git a/Database/IOVDbSvc/src/IOVDbSvc.cxx b/Database/IOVDbSvc/src/IOVDbSvc.cxx
index dc0cec0b87f5..3bd167605cae 100644
--- a/Database/IOVDbSvc/src/IOVDbSvc.cxx
+++ b/Database/IOVDbSvc/src/IOVDbSvc.cxx
@@ -1084,7 +1084,7 @@ StatusCode IOVDbSvc::setupFolders() {
for (const auto & folderToWrite : m_par_foldersToWrite) {
// match wildcard * at end of string only (i.e. /A/* matches /A/B, /A/C/D)
std::string match=folderToWrite;
- std::string::size_type idx=folderToWrite.find("*");
+ std::string::size_type idx=folderToWrite.find('*');
if (idx!=std::string::npos) {
match=folderToWrite.substr(0,idx);
}
diff --git a/DetectorDescription/GeometryDBSvc/src/TextFileDBReader.cxx b/DetectorDescription/GeometryDBSvc/src/TextFileDBReader.cxx
index cc70442d5e5c..f4362a21dca4 100644
--- a/DetectorDescription/GeometryDBSvc/src/TextFileDBReader.cxx
+++ b/DetectorDescription/GeometryDBSvc/src/TextFileDBReader.cxx
@@ -127,7 +127,7 @@ TextFileDBReader::formatKey(const std::string & key) const
std::string fieldName;
std::string rowNumber;
bool foundRowNumber = false;
- std::string::size_type pos = key.find(":");
+ std::string::size_type pos = key.find(':');
if (pos != std::string::npos) {
tableName = key.substr(0,pos);
foundRowNumber = getRowNumber(tableName,rowNumber);
@@ -165,7 +165,7 @@ TextFileDBReader::formatKey(const std::string & key) const
bool
TextFileDBReader::getRowNumber(std::string & key, std::string & rowNumber) const
{
- std::string::size_type pos = key.find("#");
+ std::string::size_type pos = key.find('#');
if (pos != std::string::npos) {
rowNumber = key.substr(pos+1);
key = key.substr(0,pos);
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/MultiHisto.icc b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/MultiHisto.icc
index c1864cb19812..87c73bb60648 100644
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/MultiHisto.icc
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/MultiHisto.icc
@@ -302,9 +302,9 @@ template <class ht>
std::string MultiHisto<ht>::NameString(int idiv, int index){
std::ostringstream basename;
std::string name = m_div_names[idiv];
- size_t found = name.find("#");
+ size_t found = name.find('#');
if(found != std::string::npos) name = name.substr(found+1);
- found = name.find(" ");
+ found = name.find(' ');
if(found != std::string::npos) name = name.substr(0,found);
basename << name << (m_div_bins[idiv])[index] << "-" <<
(m_div_bins[idiv])[index+1];
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CalibrateTRT.cpp b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CalibrateTRT.cpp
index 75bdd4fd4637..68a4161bd374 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CalibrateTRT.cpp
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CalibrateTRT.cpp
@@ -797,8 +797,8 @@ int main(int argc, char *argv[]){
for (map<string,BDdetector>::iterator it = trt.t.begin(); it != trt.t.end(); ++it){
TDirectory* dir1 = TRT.Calibrate(file,it->first,SubLev(options,1),startdata);
- if (SubLev(options,1).find("F")!=string::npos && TRT.data[it->first].t0flag) t0calfile << Form("-3 -1 -1 -1 -1 : %e %e",TRT.data[it->first].t0,TRT.data[it->first].t0err) << endl;
- if (SubLev(options,1).find("F")!=string::npos && TRT.data[it->first].rtflag) rtcalfile << Form("-3 -1 -1 -1 -1 : %i %e %e %e %e",rtint,TRT.data[it->first].rtpar[0],TRT.data[it->first].rtpar[1],TRT.data[it->first].rtpar[2],TRT.data[it->first].rtpar[3]) << endl;
+ if (SubLev(options,1).find('F')!=string::npos && TRT.data[it->first].t0flag) t0calfile << Form("-3 -1 -1 -1 -1 : %e %e",TRT.data[it->first].t0,TRT.data[it->first].t0err) << endl;
+ if (SubLev(options,1).find('F')!=string::npos && TRT.data[it->first].rtflag) rtcalfile << Form("-3 -1 -1 -1 -1 : %i %e %e %e %e",rtint,TRT.data[it->first].rtpar[0],TRT.data[it->first].rtpar[1],TRT.data[it->first].rtpar[2],TRT.data[it->first].rtpar[3]) << endl;
for (map<string,BDlayer>::iterator id = (it->second.d).begin() ; id != (it->second.d).end(); ++id){
if(SubLev(selection,2).compare("-")==0) {
@@ -812,22 +812,22 @@ int main(int argc, char *argv[]){
}
if(SubLev(selection,2).compare("*")!=0 && !IsSubLev(id->first,1,SubLev(selection,2))) continue; //skip calibration if not the right id, if * go ahead!
TDirectory* dir2 = Detector.Calibrate(dir1,id->first,SubLev(options,2),TRT.data[it->first]);
- if (SubLev(options,2).find("F")!=string::npos && Detector.data[id->first].t0flag) t0calfile << Form("%i -1 -1 -1 -1 : %e %e",Detector.data[id->first].det,Detector.data[id->first].t0,Detector.data[id->first].t0err) << endl;
- if (SubLev(options,2).find("F")!=string::npos && Detector.data[id->first].rtflag) rtcalfile << Form("%i -1 -1 -1 -1 : %i %e %e %e %e",Detector.data[id->first].det,rtint,Detector.data[id->first].rtpar[0],Detector.data[id->first].rtpar[1],Detector.data[id->first].rtpar[2],Detector.data[id->first].rtpar[3]) << endl;
+ if (SubLev(options,2).find('F')!=string::npos && Detector.data[id->first].t0flag) t0calfile << Form("%i -1 -1 -1 -1 : %e %e",Detector.data[id->first].det,Detector.data[id->first].t0,Detector.data[id->first].t0err) << endl;
+ if (SubLev(options,2).find('F')!=string::npos && Detector.data[id->first].rtflag) rtcalfile << Form("%i -1 -1 -1 -1 : %i %e %e %e %e",Detector.data[id->first].det,rtint,Detector.data[id->first].rtpar[0],Detector.data[id->first].rtpar[1],Detector.data[id->first].rtpar[2],Detector.data[id->first].rtpar[3]) << endl;
for (map<string,BDmodule>::iterator il = (id->second.l).begin(); il != (id->second.l).end(); ++il){
if(SubLev(selection,3).compare("-")==0) break;
if(SubLev(selection,3).compare("*")!=0 && !IsSubLev(il->first,2,SubLev(selection,3))) continue;
TDirectory* dir3 = Layer.Calibrate(dir2,il->first,SubLev(options,3),Detector.data[id->first]);
- if (SubLev(options,3).find("F")!=string::npos && Layer.data[il->first].t0flag) t0calfile << Form("%i %i -1 -1 -1 : %e %e",Layer.data[il->first].det,Layer.data[il->first].lay,Layer.data[il->first].t0,Layer.data[il->first].t0err) << endl;
- if (SubLev(options,3).find("F")!=string::npos && Layer.data[il->first].rtflag) rtcalfile << Form("%i %i -1 -1 -1 : %i %e %e %e %e",Layer.data[il->first].det,Layer.data[il->first].lay,rtint,Layer.data[il->first].rtpar[0],Layer.data[il->first].rtpar[1],Layer.data[il->first].rtpar[2],Layer.data[il->first].rtpar[3]) << endl;
+ if (SubLev(options,3).find('F')!=string::npos && Layer.data[il->first].t0flag) t0calfile << Form("%i %i -1 -1 -1 : %e %e",Layer.data[il->first].det,Layer.data[il->first].lay,Layer.data[il->first].t0,Layer.data[il->first].t0err) << endl;
+ if (SubLev(options,3).find('F')!=string::npos && Layer.data[il->first].rtflag) rtcalfile << Form("%i %i -1 -1 -1 : %i %e %e %e %e",Layer.data[il->first].det,Layer.data[il->first].lay,rtint,Layer.data[il->first].rtpar[0],Layer.data[il->first].rtpar[1],Layer.data[il->first].rtpar[2],Layer.data[il->first].rtpar[3]) << endl;
for (map<string,BDboard>::iterator im = (il->second.m).begin(); im != (il->second.m).end(); ++im){
if(SubLev(selection,4).compare("-")==0) break;
if(SubLev(selection,4).compare("*")!=0 && !IsSubLev(im->first,3,SubLev(selection,4))) continue;
TDirectory* dir4 = Module.Calibrate(dir3,im->first,SubLev(options,4),Layer.data[il->first]);
- if (SubLev(options,4).find("F")!=string::npos && Module.data[im->first].t0flag) t0calfile << Form("%i %i %i -1 -1 : %e %e",Module.data[im->first].det,Module.data[im->first].lay,Module.data[im->first].mod,Module.data[im->first].t0,Module.data[im->first].t0err) << endl;
- if (SubLev(options,4).find("F")!=string::npos && Module.data[im->first].rtflag) rtcalfile << Form("%i %i %i -1 -1 : %i %e %e %e %e",Module.data[im->first].det,Module.data[im->first].lay,Module.data[im->first].mod,rtint,Module.data[im->first].rtpar[0],Module.data[im->first].rtpar[1],Module.data[im->first].rtpar[2],Module.data[im->first].rtpar[3]) << endl;
+ if (SubLev(options,4).find('F')!=string::npos && Module.data[im->first].t0flag) t0calfile << Form("%i %i %i -1 -1 : %e %e",Module.data[im->first].det,Module.data[im->first].lay,Module.data[im->first].mod,Module.data[im->first].t0,Module.data[im->first].t0err) << endl;
+ if (SubLev(options,4).find('F')!=string::npos && Module.data[im->first].rtflag) rtcalfile << Form("%i %i %i -1 -1 : %i %e %e %e %e",Module.data[im->first].det,Module.data[im->first].lay,Module.data[im->first].mod,rtint,Module.data[im->first].rtpar[0],Module.data[im->first].rtpar[1],Module.data[im->first].rtpar[2],Module.data[im->first].rtpar[3]) << endl;
for (map<string,BDchip>::iterator ib = (im->second.b).begin(); ib != (im->second.b).end(); ++ib){
if(SubLev(selection,5).compare("-")==0) break;
@@ -846,10 +846,10 @@ int main(int argc, char *argv[]){
if(SubLev(selection,7).compare("-")==0) break;
if(SubLev(selection,7).compare("*")!=0 && !IsSubLev(is->first,6,SubLev(selection,7))) continue;
TDirectory* dir7 = Straw.Calibrate(dir6,is->first,SubLev(options,7),Chip.data[ic->first]);
- if (SubLev(options,7).find("F")!=string::npos && (Chip.data[ic->first].t0flag || Board.data[ib->first].t0flag)) {
+ if (SubLev(options,7).find('F')!=string::npos && (Chip.data[ic->first].t0flag || Board.data[ib->first].t0flag)) {
t0calfile << Form("%i %i %i %i %i : %e %e",Straw.data[is->first].det,Straw.data[is->first].lay,Straw.data[is->first].mod,Straw.data[is->first].stl,Straw.data[is->first].stw,Straw.data[is->first].t0,Straw.data[is->first].t0err) << endl;
}
- if (SubLev(options,7).find("F")!=string::npos && (Chip.data[ic->first].rtflag || Board.data[ib->first].rtflag))
+ if (SubLev(options,7).find('F')!=string::npos && (Chip.data[ic->first].rtflag || Board.data[ib->first].rtflag))
rtcalfile << Form("%i %i %i %i %i : %i %e %e %e %e",Straw.data[is->first].det,Straw.data[is->first].lay,Straw.data[is->first].mod,Straw.data[is->first].stl,Straw.data[is->first].stw,rtint,Straw.data[is->first].rtpar[0],Straw.data[is->first].rtpar[1],Straw.data[is->first].rtpar[2],Straw.data[is->first].rtpar[3]) << endl;
}
@@ -865,13 +865,13 @@ int main(int argc, char *argv[]){
}
- if ((SubLev(options,1).find("F")!=string::npos)) TRT.WriteStat(file);
- if ((SubLev(options,2).find("F")!=string::npos)) Detector.WriteStat(file);
- if ((SubLev(options,3).find("F")!=string::npos)) Layer.WriteStat(file);
- if ((SubLev(options,4).find("F")!=string::npos)) Module.WriteStat(file);
- if ((SubLev(options,5).find("F")!=string::npos)) Board.WriteStat(file);
- if ((SubLev(options,6).find("F")!=string::npos)) Chip.WriteStat(file);
- if ((SubLev(options,7).find("F")!=string::npos)) Straw.WriteStat(file);
+ if ((SubLev(options,1).find('F')!=string::npos)) TRT.WriteStat(file);
+ if ((SubLev(options,2).find('F')!=string::npos)) Detector.WriteStat(file);
+ if ((SubLev(options,3).find('F')!=string::npos)) Layer.WriteStat(file);
+ if ((SubLev(options,4).find('F')!=string::npos)) Module.WriteStat(file);
+ if ((SubLev(options,5).find('F')!=string::npos)) Board.WriteStat(file);
+ if ((SubLev(options,6).find('F')!=string::npos)) Chip.WriteStat(file);
+ if ((SubLev(options,7).find('F')!=string::npos)) Straw.WriteStat(file);
file->Write();
file->Close();
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/utility/openCoraCool.cxx b/InnerDetector/InDetDetDescr/SCT_Cabling/utility/openCoraCool.cxx
index 87d9f48ebf5d..be52d22e3cdb 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/utility/openCoraCool.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/utility/openCoraCool.cxx
@@ -322,7 +322,7 @@ argumentsOK(const int numArgs, const char **/**argv[]**/){
std::string
transConn(const std::string& inconn) {
std::string result(inconn);
- if (inconn.find("/")==std::string::npos) {
+ if (inconn.find('/')==std::string::npos) {
result= "sqlite://X;schema=/tmp/sroe/mycool.db;dbname="+inconn;
}
return result;
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/util/postProcessIDPVMHistos.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/util/postProcessIDPVMHistos.cxx
index 63bd59d4e719..8a99345601b2 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/util/postProcessIDPVMHistos.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/util/postProcessIDPVMHistos.cxx
@@ -44,7 +44,7 @@ std::pair<std::string, std::string> getObservableAndReso(const TObject* resHelpe
const std::string keyWord {"Helper_"};
const size_t offset = keyWord.size();
auto start = name.find(keyWord)+offset;
- auto sep = name.find("_",start);
+ auto sep = name.find('_',start);
return {name.substr(start, sep-start), name.substr(sep+1)};
}
diff --git a/LArCalorimeter/LArCalibUtils/src/LArCaliWaveBuilderXtalk.cxx b/LArCalorimeter/LArCalibUtils/src/LArCaliWaveBuilderXtalk.cxx
index 39f2f0ce5e0f..7d88066f140d 100644
--- a/LArCalorimeter/LArCalibUtils/src/LArCaliWaveBuilderXtalk.cxx
+++ b/LArCalorimeter/LArCalibUtils/src/LArCaliWaveBuilderXtalk.cxx
@@ -193,10 +193,10 @@ StatusCode LArCaliWaveBuilderXtalk::initializeCabling(const LArOnOffIdMapping* c
if( m_calibPattern.find("StripSingle",0) != std::string::npos ){
HWIdentifier theConsidChannel;
int pulsedSlot = 2;
- if (m_calibPattern.find("1",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,1);
- if (m_calibPattern.find("2",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,2);
- if (m_calibPattern.find("3",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,3);
- if (m_calibPattern.find("4",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,4);
+ if (m_calibPattern.find('1',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,1);
+ if (m_calibPattern.find('2',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,2);
+ if (m_calibPattern.find('3',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,3);
+ if (m_calibPattern.find('4',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,4);
const std::vector<HWIdentifier>& calibLine = clCont->calibSlotLine(theConsidChannel);
@@ -212,14 +212,14 @@ StatusCode LArCaliWaveBuilderXtalk::initializeCabling(const LArOnOffIdMapping* c
if( m_calibPattern.find("MiddleSingle",0) != std::string::npos ){
HWIdentifier theConsidChannel;
int pulsedSlot = 11;
- if (m_calibPattern.find("1",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,3);
- if (m_calibPattern.find("2",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,2);
- if (m_calibPattern.find("3",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,7);
- if (m_calibPattern.find("4",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,6);
- if (m_calibPattern.find("5",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,67);
- if (m_calibPattern.find("6",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,66);
- if (m_calibPattern.find("7",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,71);
- if (m_calibPattern.find("8",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,70);
+ if (m_calibPattern.find('1',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,3);
+ if (m_calibPattern.find('2',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,2);
+ if (m_calibPattern.find('3',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,7);
+ if (m_calibPattern.find('4',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,6);
+ if (m_calibPattern.find('5',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,67);
+ if (m_calibPattern.find('6',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,66);
+ if (m_calibPattern.find('7',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,71);
+ if (m_calibPattern.find('8',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,70);
const std::vector<HWIdentifier>& calibLine = clCont->calibSlotLine(theConsidChannel);
ATH_MSG_INFO ( "Considered Channel " << m_onlineHelper->show_to_string(theConsidChannel) );
@@ -233,10 +233,10 @@ StatusCode LArCaliWaveBuilderXtalk::initializeCabling(const LArOnOffIdMapping* c
if ( m_calibPattern.find("BackSingle",0) != std::string::npos){
HWIdentifier theConsidChannel;
int pulsedSlot = 9;
- if (m_calibPattern.find("1",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,3);
- if (m_calibPattern.find("2",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,2);
- if (m_calibPattern.find("3",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,7);
- if (m_calibPattern.find("4",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,6);
+ if (m_calibPattern.find('1',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,3);
+ if (m_calibPattern.find('2',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,2);
+ if (m_calibPattern.find('3',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,7);
+ if (m_calibPattern.find('4',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,6);
const std::vector<HWIdentifier>& calibLine = clCont->calibSlotLine(theConsidChannel);
ATH_MSG_INFO ( "Considered Channel " << m_onlineHelper->show_to_string(theConsidChannel) );
@@ -264,10 +264,10 @@ StatusCode LArCaliWaveBuilderXtalk::initializeCabling(const LArOnOffIdMapping* c
int pulsedSlot = 2; // EMEC outer wheel standard crates
if (m_isSpecialCrate) pulsedSlot = 5; // EMEC outer wheel special crates
- if (m_calibPattern.find("1",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,1);
- if (m_calibPattern.find("2",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,2);
- if (m_calibPattern.find("3",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,3);
- if (m_calibPattern.find("4",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,4);
+ if (m_calibPattern.find('1',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,1);
+ if (m_calibPattern.find('2',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,2);
+ if (m_calibPattern.find('3',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,3);
+ if (m_calibPattern.find('4',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,4);
const std::vector<HWIdentifier>& calibLine = clCont->calibSlotLine(theConsidChannel);
@@ -296,10 +296,10 @@ StatusCode LArCaliWaveBuilderXtalk::initializeCabling(const LArOnOffIdMapping* c
pulsedCell4 = 3;
}
- if (m_calibPattern.find("1",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,pulsedCell1);
- if (m_calibPattern.find("2",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,pulsedCell2);
- if (m_calibPattern.find("3",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,pulsedCell3);
- if (m_calibPattern.find("4",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,pulsedCell4);
+ if (m_calibPattern.find('1',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,pulsedCell1);
+ if (m_calibPattern.find('2',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,pulsedCell2);
+ if (m_calibPattern.find('3',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,pulsedCell3);
+ if (m_calibPattern.find('4',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,pulsedCell4);
const std::vector<HWIdentifier>& calibLine = clCont->calibSlotLine(theConsidChannel);
@@ -335,10 +335,10 @@ StatusCode LArCaliWaveBuilderXtalk::initializeCabling(const LArOnOffIdMapping* c
pulsedCell4 = 18;
}
- if (m_calibPattern.find("1",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,pulsedCell1);
- if (m_calibPattern.find("2",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,pulsedCell2);
- if (m_calibPattern.find("3",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,pulsedCell3);
- if (m_calibPattern.find("4",0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,pulsedCell4);
+ if (m_calibPattern.find('1',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,pulsedCell1);
+ if (m_calibPattern.find('2',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,pulsedCell2);
+ if (m_calibPattern.find('3',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,pulsedCell3);
+ if (m_calibPattern.find('4',0) != std::string::npos )theConsidChannel = m_onlineHelper->channel_Id(m_barrelEndcap,m_posOrNeg,m_feedthroughNumber,pulsedSlot,pulsedCell4);
const std::vector<HWIdentifier>& calibLine = clCont->calibSlotLine(theConsidChannel);
ATH_MSG_INFO ( "Considered Channel " << m_onlineHelper->show_to_string(theConsidChannel) );
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/InDetTrackSelectionToolWrapper.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/InDetTrackSelectionToolWrapper.cxx
index e778aa7b9a8a..e9d293ff4981 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/InDetTrackSelectionToolWrapper.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/InDetTrackSelectionToolWrapper.cxx
@@ -32,7 +32,7 @@ namespace DerivationFramework {
}
ATH_CHECK( m_tracksKey.initialize() );
- std::string::size_type pos = m_tracksKey.key().find("+");
+ std::string::size_type pos = m_tracksKey.key().find('+');
pos = (pos != std::string::npos) ? pos+1 : 0;
std::string_view container_name( &(m_tracksKey.key().data()[pos]), m_tracksKey.key().size() - pos);
std::string_view decor_name(m_decorationKey.key());
diff --git a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/Root/MuonSFTestHelper.cxx b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/Root/MuonSFTestHelper.cxx
index fc4ff26b83f2..aac99ae62ee6 100644
--- a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/Root/MuonSFTestHelper.cxx
+++ b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/Root/MuonSFTestHelper.cxx
@@ -279,7 +279,7 @@ namespace TestMuonSF {
m_tree_raw_ptr(new TTree("MuonEfficiencyTest", "MuonEfficiencyTest")),
m_Branches(),
m_sel_tool(){
- if (release_name.find("/") != std::string::npos) m_name = "c" + release_name.substr(release_name.rfind("/") + 1, m_name.size()); // branches cannot start with number
+ if (release_name.find('/') != std::string::npos) m_name = "c" + release_name.substr(release_name.rfind('/') + 1, m_name.size()); // branches cannot start with number
m_Branches.push_back(std::make_unique<TestMuonSF::MuonInfoBranches>(tree(),m_sel_tool));
if (HasOwnerShip) m_tree = std::shared_ptr < TTree > (m_tree_raw_ptr);
}
@@ -289,7 +289,7 @@ namespace TestMuonSF {
m_tree_raw_ptr(tree.get()),
m_Branches(),
m_sel_tool(){
- if (release_name.find("/") != std::string::npos) m_name = "c" + release_name.substr(release_name.rfind("/") + 1, m_name.size()); // branches cannot start with number
+ if (release_name.find('/') != std::string::npos) m_name = "c" + release_name.substr(release_name.rfind('/') + 1, m_name.size()); // branches cannot start with number
}
MuonSFTestHelper::MuonSFTestHelper(TTree* tree, const std::string& release_name) :
m_name(release_name),
@@ -297,7 +297,7 @@ namespace TestMuonSF {
m_tree_raw_ptr(tree),
m_Branches(),
m_sel_tool(){
- if (release_name.find("/") != std::string::npos) m_name = "c" + release_name.substr(release_name.rfind("/") + 1, m_name.size()); // branches cannot start with number
+ if (release_name.find('/') != std::string::npos) m_name = "c" + release_name.substr(release_name.rfind('/') + 1, m_name.size()); // branches cannot start with number
}
void MuonSFTestHelper::addTool(const asg::AnaToolHandle<CP::IMuonEfficiencyScaleFactors> &handle) {
addTool(handle.getHandle());
diff --git a/Simulation/FastSimulation/FastChainPileup/FastChainPileup/Samplers.h b/Simulation/FastSimulation/FastChainPileup/FastChainPileup/Samplers.h
index 0a540c16876c..2f19b5af741d 100644
--- a/Simulation/FastSimulation/FastChainPileup/FastChainPileup/Samplers.h
+++ b/Simulation/FastSimulation/FastChainPileup/FastChainPileup/Samplers.h
@@ -223,7 +223,7 @@ class CyclicSeqSampler : public Sampler {
size_t pos = 0;
std::string token;
std::cout << "Initializing CyclicSeqSampler..." << std::endl;
- while ((pos = s.find(",")) != std::string::npos) {
+ while ((pos = s.find(',')) != std::string::npos) {
token = s.substr(0, pos);
m_sequence.push_back(std::stoi(token));
s.erase(0, pos + 1);
diff --git a/TileCalorimeter/TileConditions/src/TileInfoLoader.cxx b/TileCalorimeter/TileConditions/src/TileInfoLoader.cxx
index a2656fd13184..4cf7f7337f06 100644
--- a/TileCalorimeter/TileConditions/src/TileInfoLoader.cxx
+++ b/TileCalorimeter/TileConditions/src/TileInfoLoader.cxx
@@ -290,8 +290,8 @@ StatusCode TileInfoLoader::initialize() {
)) || (run2 == 0); // calibration for all geometries >=RUN2 are the same as in RUN2
if (geo == 0 || comm == 0 || ibl == 0 || run1 == 0 || run2 == 0 || upg == 0 || RUN2) {
- int pos = (atlasVersion.substr(9)).find("-");
- if(run1 == 0 || run2 == 0) pos = (atlasVersion.substr(13)).find("-") + 4;
+ int pos = (atlasVersion.substr(9)).find('-');
+ if(run1 == 0 || run2 == 0) pos = (atlasVersion.substr(13)).find('-') + 4;
std::string geoVersion = atlasVersion.substr(pos+10,2)
+ atlasVersion.substr(pos+13,2)
+ atlasVersion.substr(pos+16,2);
diff --git a/Tools/FilePeeker/src/BSFilePeeker.cxx b/Tools/FilePeeker/src/BSFilePeeker.cxx
index 8ed6de269d14..304dd9fb58fa 100644
--- a/Tools/FilePeeker/src/BSFilePeeker.cxx
+++ b/Tools/FilePeeker/src/BSFilePeeker.cxx
@@ -37,7 +37,7 @@ private:
bool BSFilePeeker::extractValue(const std::string& source, const std::string& key, std::string& value) {
- const size_t sep=source.find(":");
+ const size_t sep=source.find(':');
if (sep==std::string::npos || source.compare(0,sep,key)!=0) {
return false;
}
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/Root/AlgToChainTool.cxx b/Trigger/TrigSteer/TrigCompositeUtils/Root/AlgToChainTool.cxx
index d40e2c4c7d31..33244d251069 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/Root/AlgToChainTool.cxx
+++ b/Trigger/TrigSteer/TrigCompositeUtils/Root/AlgToChainTool.cxx
@@ -143,7 +143,7 @@ StatusCode TrigCompositeUtils::AlgToChainTool::getAllActiveSequences( const Even
if (!d->decisions().empty()){
// Save algorithm to active sequence mapping
for (const std::string& alg : sequence.second) {
- algToSeq[alg.substr(alg.find("/") + 1, alg.size())] = sequence.first;
+ algToSeq[alg.substr(alg.find('/') + 1, alg.size())] = sequence.first;
}
break;
}
--
GitLab
From f153bc88db86f5e24be08c1468f7b6edc7376103 Mon Sep 17 00:00:00 2001
From: Christos Anastopoulos <christos.anastopoulos@cern.ch>
Date: Mon, 16 Aug 2021 18:23:41 +0000
Subject: [PATCH 075/272] LarCalorimeter unitialized member variables fix ,
clang-tidy/cppcheck
---
.../LArCabling/LArCablingLegacyService.h | 4 +-
.../LArCafJobs/LArCafJobs/LArReadCells.h | 18 +++----
.../LArCafJobs/LArCafJobs/LArShapeDumper.h | 2 +-
.../LArCalibDataQuality/LArBadChannelHunter.h | 48 +++++++++----------
.../LArCalibTools/LArCond2NtupleBase.h | 4 +-
.../LArCalibTools/LArDigits2Ntuple.h | 2 +-
.../LArCalibTools/LArPulseShape.h | 42 ++++++++--------
.../LArCalibUtils/LArAutoCorrAlgToDB.h | 2 +-
.../LArCalibUtils/LArAutoCorrMaker.h | 4 +-
.../LArCalibUtils/LArPhysWaveBuilder.h | 8 ++--
.../LArCalibUtils/LArPhysWaveHECTool.h | 10 ++--
.../LArCalibUtils/LArPhysWaveTool.h | 10 ++--
.../LArCalibUtils/LArRampAdHocPatchingAlg.h | 4 +-
.../LArCalibUtils/LArWFParamTool.h | 6 +--
.../src/LArTCMPhysWavePredictor.cxx | 2 +-
.../LArCalibUtils/src/LArWFParamTool.cxx | 10 ++--
.../LArCellRec/src/LArCellDeadOTXCorr.h | 4 +-
.../LArCellRec/src/LArCellEmMiscalib.h | 6 +--
.../LArCellRec/src/LArNoisyROTool.h | 6 +--
.../LArByteStream/LArLATOMEDecoder.h | 4 +-
.../LArLATOMEHeaderContByteStreamCnv.h | 2 +-
.../LArRawDataContByteStreamTool.h | 4 +-
.../LArByteStream/LArRawScContByteStreamCnv.h | 2 +-
.../LArByteStream/LArRodBlockAccumulatedV3.h | 14 +++---
.../LArByteStream/LArRodBlockCalibrationV1.h | 14 +++---
.../LArByteStream/LArRodBlockCalibrationV2.h | 14 +++---
.../LArByteStream/LArRodBlockCalibrationV3.h | 14 +++---
.../LArByteStream/LArRodBlockPhysicsV0.h | 14 +++---
.../LArByteStream/LArRodBlockPhysicsV1.h | 14 +++---
.../LArByteStream/LArRodBlockPhysicsV2.h | 14 +++---
.../LArByteStream/LArRodBlockPhysicsV3.h | 22 ++++-----
.../LArByteStream/LArRodBlockPhysicsV4.h | 26 +++++-----
.../LArByteStream/LArRodBlockPhysicsV5.h | 32 ++++++-------
.../LArByteStream/LArRodBlockPhysicsV6.h | 32 ++++++-------
.../LArByteStream/LArRodDecoder.h | 4 +-
.../LArCnv/LArByteStream/LArByteStream/Mon.h | 20 ++++----
.../src/LArRawCalibDataReadingAlg.h | 8 ++--
.../src/LArRodBlockPhysicsV0.cxx | 4 +-
.../src/LArRodBlockPhysicsV1.cxx | 4 +-
.../src/LArRodBlockPhysicsV2.cxx | 4 +-
.../src/LArRodBlockPhysicsV3.cxx | 8 ++--
.../src/LArRodBlockPhysicsV5.cxx | 6 +--
.../src/LArRodBlockPhysicsV6.cxx | 6 +--
.../LArTPCnv/src/LArRawChannelCnv_p1.cxx | 4 +-
.../LArTPCnv/src/LArRawChannelCnv_p2.cxx | 6 +--
.../LArCondUtils/src/LArHVPathologyDbAlg.cxx | 2 +-
.../LArDetDescr/LArRecoMaterialTool.h | 4 +-
.../LArDetDescr/LArRecoSimpleGeomTool.h | 8 ++--
.../LArDigitization/LArHitFilter.h | 4 +-
.../LArDigitization/LArPileUpTool.h | 6 +--
.../TestLArHardwareID/src/initTTMap_Algo.cxx | 6 +--
.../src/reinitTTMap_Algo.cxx | 4 +-
.../LArG4Barrel/src/LArBarrelCalculator.h | 4 +-
.../src/LArBarrelPresamplerGeometry.h | 4 +-
.../LArG4/LArG4Barrel/src/LArCoudeAbsorbers.h | 8 ++--
.../LArG4Barrel/src/LArCoudeElectrodes.h | 8 ++--
.../LArG4Barrel/src/LArStraightAbsorbers.h | 12 ++---
.../LArG4Barrel/src/LArStraightElectrodes.h | 12 ++---
LArCalorimeter/LArG4/LArG4Barrel/src/MapEta.h | 6 +--
.../LArG4/LArG4Code/LArG4Code/LArG4SDTool.h | 4 +-
.../LArG4/LArG4EC/src/EnergyCalculator.h | 26 +++++-----
.../LArG4H6SD/src/LArG4H6WarmTCCalculator.h | 6 +--
.../src/MiniFCALAssignIdentifier.h | 4 +-
.../LArG4MiniFCAL/src/MiniFCALCalculator.h | 6 +--
.../src/MiniFCALCalibrationCalculator.h | 4 +-
.../LArG4ShowerLib/src/TestShowerLib.cxx | 6 +--
.../src/SingleTrackValidation.cxx | 4 +-
.../src/SingleTrackValidation.h | 4 +-
.../LArGeoCode/LArMaterialManager.h | 4 +-
.../LArGeoCode/src/DatabaseAccessTool.cxx | 4 +-
.../src/ModulesConstructionH62004.h | 4 +-
.../src/WarmTCConstructionH62004.h | 4 +-
.../LArGeoModel/LArHV/src/EMBHVManager.cxx | 6 +--
.../LArGeoModel/LArHV/src/EMBHVModule.cxx | 4 +-
.../LArHV/src/EMBPresamplerHVManager.cxx | 6 +--
.../LArGeoModel/LArHV/src/EMECHVManager.cxx | 6 +--
.../LArHV/src/EMECPresamplerHVManager.cxx | 6 +--
.../LArGeoModel/LArHV/src/FCALHVManager.cxx | 6 +--
.../LArGeoModel/LArHV/src/FCALHVModule.cxx | 4 +-
.../LArGeoModel/LArHV/src/HECHVManager.cxx | 6 +--
.../LArGeoModel/LArHV/src/HECHVModule.cxx | 4 +-
.../LArReadoutGeometry/EMBDetectorManager.h | 4 +-
.../LArReadoutGeometry/EMECDetectorManager.h | 4 +-
.../LArReadoutGeometry/FCALDetectorManager.h | 4 +-
.../LArReadoutGeometry/FCAL_ChannelMap.h | 10 ++--
.../LArReadoutGeometry/HECDetectorManager.h | 4 +-
.../LArL1Sim/LArL1Sim/LArTTL1Maker.h | 2 +-
LArCalorimeter/LArL1Sim/src/LArSCL1Maker.h | 2 +-
.../LArMonitoring/src/LArDigitMonAlg.h | 6 +--
.../LArMonitoring/src/LArFEBMonAlg.h | 4 +-
.../LArOnlDbPrep/LArDSPThresholdFillInline.h | 4 +-
.../LArROD/LArROD/LArRawChannelBuilder.h | 2 +-
.../LArROD/LArROD/LArRawChannelBuilderAlg.h | 4 +-
.../LArROD/LArRawChannelBuilderIterAlg.h | 2 +-
.../LArROD/LArRawChannelSimpleBuilder.h | 10 ++--
LArCalorimeter/LArROD/src/LArHITtoCell.h | 4 +-
.../LArROD/src/LArSuperCellBCIDAlg.h | 2 +-
.../LArRawEvent/LArRawEvent/LArFebHeader.h | 6 +--
.../LArRawEvent/LArRawEvent/LArRawSC.h | 6 +--
.../LArRawUtils/LArRawUtils/LArRoI_Map.h | 12 ++---
.../LArRecUtils/LArOFPeakRecoTool.h | 4 +-
.../LArRecUtils/LArParabolaPeakRecoTool.h | 8 ++--
.../LArRecUtils/src/LArADC2MeVCondAlg.h | 4 +-
.../LArRecUtils/src/LArAutoCorrNoiseCondAlg.h | 4 +-
.../LArRecUtils/src/LArAutoCorrTotalCondAlg.h | 4 +-
.../LArRecUtils/src/LArFlatConditionSvc.cxx | 4 +-
.../LArRecUtils/src/LArHVScaleCorrTool.cxx | 4 +-
.../LArRecUtils/src/LArOFCCondAlg.h | 2 +-
.../LArTBEvent/LArTBEvent/LArTBInstrument.h | 4 +-
.../LArCalibTest/src/LArFakeCellFactor.cxx | 4 +-
.../LArEventTest/DumpLArRawChannels.h | 4 +-
.../LArEventTest/TriggerPatternCount.h | 4 +-
112 files changed, 423 insertions(+), 423 deletions(-)
diff --git a/LArCalorimeter/LArCabling/LArCabling/LArCablingLegacyService.h b/LArCalorimeter/LArCabling/LArCabling/LArCablingLegacyService.h
index 5f16b31aa1aa..82d447ff2db0 100755
--- a/LArCalorimeter/LArCabling/LArCabling/LArCablingLegacyService.h
+++ b/LArCalorimeter/LArCabling/LArCabling/LArCablingLegacyService.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
//Dear emacs, this is -*-c++-*-
@@ -67,7 +67,7 @@ public:
private:
std::vector<std::vector<HWIdentifier> > m_onlHashToCalibLines;
- const uint32_t* m_pFebHashtoROD;
+ const uint32_t* m_pFebHashtoROD = nullptr;
//unsigned m_nFebRod;
std::vector<HWIdentifier> m_readoutModuleIDVec;
const std::vector<HWIdentifier> m_vecEmpty;
diff --git a/LArCalorimeter/LArCafJobs/LArCafJobs/LArReadCells.h b/LArCalorimeter/LArCafJobs/LArCafJobs/LArReadCells.h
index 926e3cf96124..12f2070647fc 100644
--- a/LArCalorimeter/LArCafJobs/LArCafJobs/LArReadCells.h
+++ b/LArCalorimeter/LArCafJobs/LArCafJobs/LArReadCells.h
@@ -32,16 +32,16 @@ class LArReadCells: public ::AthAlgorithm {
Gaudi::Property<double> m_etcut2{this,"etCut2",7500.,"Et cut to dump cells from second layer"};
const DataHandle<CaloIdManager> m_caloIdMgr;
- const CaloCell_ID* m_calo_id;
+ const CaloCell_ID* m_calo_id = nullptr;
- TTree* m_tree;
- int m_runNumber;
- int m_lbNumber;
- int m_eventNumber;
- int m_bcid;
- int m_error;
- int m_ncells;
+ TTree* m_tree = nullptr;
+ int m_runNumber = 0;
+ int m_lbNumber = 0;
+ int m_eventNumber = 0;
+ int m_bcid = 0;
+ int m_error = 0;
+ int m_ncells = 0;
std::vector<float> m_ECell ;
std::vector<float> m_TCell ;
std::vector<float> m_EtaCell ;
@@ -55,7 +55,7 @@ class LArReadCells: public ::AthAlgorithm {
SG::ReadCondHandleKey<LArOnOffIdMapping> m_cablingKey{this,"CablingKey","LArOnOffIdMap","SG Key of LArOnOffIdMapping object"};
SG::ReadCondHandleKey<ILArPedestal> m_pedestalKey{this,"PedestalKey","LArPedestal","SG Key of Pedestal conditions object"};
- const LArOnlineID* m_lar_online_id;
+ const LArOnlineID* m_lar_online_id = nullptr;
};
diff --git a/LArCalorimeter/LArCafJobs/LArCafJobs/LArShapeDumper.h b/LArCalorimeter/LArCafJobs/LArCafJobs/LArShapeDumper.h
index 8bb0bd8bd644..4cfbfbfef93e 100755
--- a/LArCalorimeter/LArCafJobs/LArCafJobs/LArShapeDumper.h
+++ b/LArCalorimeter/LArCafJobs/LArCafJobs/LArShapeDumper.h
@@ -128,7 +128,7 @@ class LArShapeDumper : public AthAlgorithm
bool m_doStream, m_doTrigger, m_doOFCIter,
m_doAllEvents, m_doRoIs, m_doAllLvl1, m_dumpChannelInfos;
bool m_doEM, m_doHEC, m_doFCAL;
- bool m_gains[CaloGain::LARNGAIN];
+ bool m_gains[CaloGain::LARNGAIN]{};
bool m_onlyEmptyBC;
diff --git a/LArCalorimeter/LArCalibDataQuality/LArCalibDataQuality/LArBadChannelHunter.h b/LArCalorimeter/LArCalibDataQuality/LArCalibDataQuality/LArBadChannelHunter.h
index e2c3f6c0ade4..a67ae7e80ce7 100644
--- a/LArCalorimeter/LArCalibDataQuality/LArCalibDataQuality/LArBadChannelHunter.h
+++ b/LArCalorimeter/LArCalibDataQuality/LArCalibDataQuality/LArBadChannelHunter.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
@@ -81,14 +81,14 @@ private:
float m_recalcPer;
//Thresholds:
- float m_lowNoiseTh[CaloGain::LARNGAIN];
- float m_highNoiseTh[CaloGain::LARNGAIN];
+ float m_lowNoiseTh[CaloGain::LARNGAIN]{};
+ float m_highNoiseTh[CaloGain::LARNGAIN]{};
- float m_amplTh[CaloGain::LARNGAIN];
- float m_widTh[CaloGain::LARNGAIN];
- float m_distwidTh[CaloGain::LARNGAIN];
- float m_distampTh[CaloGain::LARNGAIN];
- float m_tmaxampTh[CaloGain::LARNGAIN];
+ float m_amplTh[CaloGain::LARNGAIN]{};
+ float m_widTh[CaloGain::LARNGAIN]{};
+ float m_distwidTh[CaloGain::LARNGAIN]{};
+ float m_distampTh[CaloGain::LARNGAIN]{};
+ float m_tmaxampTh[CaloGain::LARNGAIN]{};
enum AvgType {
FEB,
PHI
@@ -103,27 +103,27 @@ private:
class Average {
public:
- float m_avPedRMS[CaloGain::LARNGAIN];
- float m_avPedRMSSD[CaloGain::LARNGAIN];
- unsigned m_nPed[CaloGain::LARNGAIN];
- float m_avAmpl[CaloGain::LARNGAIN];
- float m_avAmplSD[CaloGain::LARNGAIN];
- unsigned m_nAmpls[CaloGain::LARNGAIN];
- float m_avWid[CaloGain::LARNGAIN];
- float m_avWidSD[CaloGain::LARNGAIN];
- unsigned m_nWids[CaloGain::LARNGAIN];
- float m_avTmax[CaloGain::LARNGAIN];
- float m_avTmaxSD[CaloGain::LARNGAIN];
- unsigned m_nTmaxs[CaloGain::LARNGAIN];
+ float m_avPedRMS[CaloGain::LARNGAIN]{};
+ float m_avPedRMSSD[CaloGain::LARNGAIN]{};
+ unsigned m_nPed[CaloGain::LARNGAIN]{};
+ float m_avAmpl[CaloGain::LARNGAIN]{};
+ float m_avAmplSD[CaloGain::LARNGAIN]{};
+ unsigned m_nAmpls[CaloGain::LARNGAIN]{};
+ float m_avWid[CaloGain::LARNGAIN]{};
+ float m_avWidSD[CaloGain::LARNGAIN]{};
+ unsigned m_nWids[CaloGain::LARNGAIN]{};
+ float m_avTmax[CaloGain::LARNGAIN]{};
+ float m_avTmaxSD[CaloGain::LARNGAIN]{};
+ unsigned m_nTmaxs[CaloGain::LARNGAIN]{};
std::vector<float> m_vmedTmax[CaloGain::LARNGAIN];
std::vector<float> m_vmedWid[CaloGain::LARNGAIN];
std::vector<float> m_vmedAmpl[CaloGain::LARNGAIN];
std::vector<float> m_vmedPedRMS[CaloGain::LARNGAIN];
- float m_medTmax[CaloGain::LARNGAIN];
- float m_medWid[CaloGain::LARNGAIN];
- float m_medAmpl[CaloGain::LARNGAIN];
- float m_medPedRMS[CaloGain::LARNGAIN];
+ float m_medTmax[CaloGain::LARNGAIN]{};
+ float m_medWid[CaloGain::LARNGAIN]{};
+ float m_medAmpl[CaloGain::LARNGAIN]{};
+ float m_medPedRMS[CaloGain::LARNGAIN]{};
Average();
void finish(float);
};
diff --git a/LArCalorimeter/LArCalibTools/LArCalibTools/LArCond2NtupleBase.h b/LArCalorimeter/LArCalibTools/LArCalibTools/LArCond2NtupleBase.h
index 3bb442fb849e..67b4cc680867 100644
--- a/LArCalorimeter/LArCalibTools/LArCalibTools/LArCond2NtupleBase.h
+++ b/LArCalorimeter/LArCalibTools/LArCalibTools/LArCond2NtupleBase.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
//Dear emacs, this is -*-c++-*-
@@ -74,7 +74,7 @@ class LArCond2NtupleBase : public AthAlgorithm {
const LArFCAL_Base_ID* m_fcalId;
const LArOnlineID_Base* m_onlineId;
const CaloCell_Base_ID* m_caloId;
- const CaloDetDescrManager_Base* m_dd_man;
+ const CaloDetDescrManager_Base* m_dd_man = nullptr;
ToolHandle<ILArFEBTempTool> m_FEBTempTool;
SG::ReadCondHandleKey<LArOnOffIdMapping> m_cablingKey{this,"CablingKey","LArOnOffIdMap","SG Key of LArOnOffIdMapping object"};
diff --git a/LArCalorimeter/LArCalibTools/LArCalibTools/LArDigits2Ntuple.h b/LArCalorimeter/LArCalibTools/LArCalibTools/LArDigits2Ntuple.h
index 80c4584546a2..82bdba7f8aa4 100644
--- a/LArCalorimeter/LArCalibTools/LArCalibTools/LArDigits2Ntuple.h
+++ b/LArCalorimeter/LArCalibTools/LArCalibTools/LArDigits2Ntuple.h
@@ -54,7 +54,7 @@ class LArDigits2Ntuple : public LArCond2NtupleBase
NTuple::Array<unsigned short> m_bcidVec_ET_ID;
NTuple::Array<bool> m_saturVec_ET_ID;
- bool m_isSCFlag;
+ bool m_isSCFlag = false;
bool m_fillBCID;
bool m_overwriteEventNumber;
diff --git a/LArCalorimeter/LArCalibTools/LArCalibTools/LArPulseShape.h b/LArCalorimeter/LArCalibTools/LArCalibTools/LArPulseShape.h
index 79ac746efa08..c462a5fd515f 100644
--- a/LArCalorimeter/LArCalibTools/LArCalibTools/LArPulseShape.h
+++ b/LArCalorimeter/LArCalibTools/LArCalibTools/LArPulseShape.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARPULSESHAPE_H
@@ -67,12 +67,12 @@ class LArPulseShape : public AthAlgorithm {
NTuple::Item<short> m_useMgIntercept;
NTuple::Item<short> m_useLgIntercept;
const DataHandle<CaloIdManager> m_caloIdMgr;
- int m_OffId;
- int m_OffId_conv;
- const char * m_id_char;
- int m_isample;
- int m_mindist;
- int m_closestBC;
+ int m_OffId = 0;
+ int m_OffId_conv = 0;
+ const char * m_id_char = nullptr;
+ int m_isample = 0;
+ int m_mindist = 0;
+ int m_closestBC = 0;
ToolHandle<Trig::TrigDecisionTool> m_trigDec;
@@ -81,15 +81,15 @@ class LArPulseShape : public AthAlgorithm {
SG::ReadCondHandleKey<LArBadChannelCont> m_BCKey{this, "BadChanKey", "LArBadChannel", "SG bad channels key"};
SG::ReadHandleKey<xAOD::EventInfo> m_evtInfoKey { this, "EventInfo", "EventInfo", "" };
- const ILArPedestal* m_larPedestal;
+ const ILArPedestal* m_larPedestal = nullptr;
std::map<std::string, TProfile*> m_effhistos;
std::map<int, TProfile*> m_cellHistos;
- TProfile* m_TProfpulse_diff;
+ TProfile* m_TProfpulse_diff = nullptr;
std::map<std::string, TH1*> m_histos;
- TH1D* m_BCID;
- TH1D* m_diffBCID;
- TH1D* m_actualInt;
+ TH1D* m_BCID = nullptr;
+ TH1D* m_diffBCID = nullptr;
+ TH1D* m_actualInt = nullptr;
void addHistogram( TH1* h ) {
std::string name = h->GetName();
m_histos.insert( std::map<std::string, TH1*>::value_type( name, h) );
@@ -100,7 +100,7 @@ class LArPulseShape : public AthAlgorithm {
}
protected:
- bool m_addBC, m_addFEBTemp;
+ bool m_addBC = false, m_addFEBTemp = false;
enum {NOT_VALID = -999};
std::string m_ntpath, m_ntTitle;
@@ -118,16 +118,16 @@ class LArPulseShape : public AthAlgorithm {
NTuple::Item<float> m_FEBTemp1, m_FEBTemp2;
- const LArEM_Base_ID* m_emId;
- const LArHEC_Base_ID* m_hecId;
- const LArFCAL_Base_ID* m_fcalId;
- const LArOnlineID_Base* m_onlineId;
- const CaloCell_ID* m_caloId;
+ const LArEM_Base_ID* m_emId = nullptr;
+ const LArHEC_Base_ID* m_hecId = nullptr;
+ const LArFCAL_Base_ID* m_fcalId = nullptr;
+ const LArOnlineID_Base* m_onlineId = nullptr;
+ const CaloCell_ID* m_caloId = nullptr;
- bool m_isSC;
- bool m_isFlat;
+ bool m_isSC = false;
+ bool m_isFlat = false;
- bool m_addHash;
+ bool m_addHash = false;
};
#endif
diff --git a/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArAutoCorrAlgToDB.h b/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArAutoCorrAlgToDB.h
index d86d05e3ab69..035cb56580a7 100755
--- a/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArAutoCorrAlgToDB.h
+++ b/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArAutoCorrAlgToDB.h
@@ -53,7 +53,7 @@ class LArAutoCorrAlgToDB : public AthAlgorithm
std::string m_acContName;
// number of gains
- unsigned int m_nGains;
+ unsigned int m_nGains = 0U;
};
diff --git a/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArAutoCorrMaker.h b/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArAutoCorrMaker.h
index abc23b7bebc8..df8d4ae1ebfb 100755
--- a/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArAutoCorrMaker.h
+++ b/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArAutoCorrMaker.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
//dear emacs, this is -*-c++-*-
@@ -74,7 +74,7 @@ class LArAutoCorrMaker : public AthAlgorithm
// Number of sigma
int m_rms_cut;
- int m_nsamples;
+ int m_nsamples = 0;
//MGV Decide whether or not to normalize autocorr elements
int m_normalize;
diff --git a/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArPhysWaveBuilder.h b/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArPhysWaveBuilder.h
index cec1a7b741c0..16a93a104d10 100644
--- a/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArPhysWaveBuilder.h
+++ b/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArPhysWaveBuilder.h
@@ -167,7 +167,7 @@ private:
/// that it isn't valid (doesn't exist, isn't connected),
/// then the gains pointers will be set to the special value
/// wave_invalid.
- LArPhysWave* gains[N_GAINS];
+ LArPhysWave* gains[N_GAINS]{};
/// Constructor, to zero the gains[] pointers.
Cellwave();
@@ -186,14 +186,14 @@ private:
TH2F* m_hDigiGainSampling;
/// Histogram of energy per sampling.
- TH1F* m_henergy[N_SAMPLINGS];
+ TH1F* m_henergy[N_SAMPLINGS]{};
/// Histogram of peak significance, in sigma, per sampling.
- TH1F* m_hsigma[N_SAMPLINGS];
+ TH1F* m_hsigma[N_SAMPLINGS]{};
/// Histogram of the (pedestal subtracted) peak sample value,
/// per samplng.
- TH1F* m_hlaymax[N_SAMPLINGS];
+ TH1F* m_hlaymax[N_SAMPLINGS]{};
// Grouping type
std::string m_groupingType;
diff --git a/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArPhysWaveHECTool.h b/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArPhysWaveHECTool.h
index 535d8452de85..8a98da750da9 100755
--- a/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArPhysWaveHECTool.h
+++ b/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArPhysWaveHECTool.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
@@ -66,9 +66,9 @@ class LArPhysWaveHECTool : public AthAlgTool
static const int DEFAULT ;
//LArCaliWave m_gCali;
//LArPhysWave m_gPhys;
- const LArPhysWave* m_gIdealPhys;
+ const LArPhysWave* m_gIdealPhys = nullptr;
- const LArOnlineID* m_onlineHelper;
+ const LArOnlineID* m_onlineHelper = nullptr;
// bool m_verb;
//int m_region, m_layer ;
bool m_normalizeCali , m_timeOriginShift , m_subtractBaseline;
@@ -78,8 +78,8 @@ class LArPhysWaveHECTool : public AthAlgTool
// std::vector<bool> m_injPointCorrLayer, m_injPointUseTauR ;
- double m_Omega0, m_Taur;
- unsigned m_Tstart;
+ double m_Omega0 = 0.0, m_Taur = 0.0;
+ unsigned m_Tstart = 0U;
double m_MinAmp;
//void predict_phys_HEC(const HWIdentifier& chid, unsigned gain);
void predict_phys_HEC(LArWFParams& wfParams, LArCaliWave &caliWave,
diff --git a/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArPhysWaveTool.h b/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArPhysWaveTool.h
index f05f0034fc5e..a559dffb308c 100755
--- a/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArPhysWaveTool.h
+++ b/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArPhysWaveTool.h
@@ -48,15 +48,15 @@ class LArPhysWaveTool : public AthAlgTool
LArPhysWave m_gPhys;
// bool m_verb;
- int m_method;
- int m_region, m_layer ;
+ int m_method = 0;
+ int m_region = 0, m_layer = 0 ;
bool m_injPointCorr , m_normalizeCali ,
m_timeOriginShift , m_subtractBaseline;
std::vector<bool> m_injPointCorrLayer, m_injPointUseTauR ;
- int m_N_FFT ;
- double m_Tdrift, m_Fstep, m_Tcal, m_Omega0, m_Taur, m_MphysMcali ;
- unsigned m_Tstart, m_Tpeak, m_Tcross, m_Tmin, m_Ttail ;
+ int m_N_FFT = 0 ;
+ double m_Tdrift = 0.0, m_Fstep = 0.0, m_Tcal = 0.0, m_Omega0 = 0.0, m_Taur = 0.0, m_MphysMcali = 0.0 ;
+ unsigned m_Tstart = 0U, m_Tpeak = 0U, m_Tcross = 0U, m_Tmin = 0U, m_Ttail = 0U ;
void predict_phys();
LArWave exp2Tri(const LArWave &) const ;
LArWave physPred(LArCaliWave &);
diff --git a/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArRampAdHocPatchingAlg.h b/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArRampAdHocPatchingAlg.h
index ea7919b5fff2..5607adcaa107 100644
--- a/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArRampAdHocPatchingAlg.h
+++ b/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArRampAdHocPatchingAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
//Dear emacs, this is -*-c++-*-
@@ -92,7 +92,7 @@ class LArRampAdHocPatchingAlg : public AthAlgorithm
bool PutTheValues(HWIdentifier chid, std::vector<double>& rvalues, unsigned gain);
StatusCode ApplyAdHocPatches( std::vector<unsigned>& channelsToBePatched, std::vector<unsigned>& patchesTobeApplied, std::vector<std::vector<double> >& valuesToBeApplied, unsigned gain );
- bool m_useCorrChannel;
+ bool m_useCorrChannel = false;
};
diff --git a/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArWFParamTool.h b/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArWFParamTool.h
index f8dbd7d54706..516527c63f45 100644
--- a/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArWFParamTool.h
+++ b/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArWFParamTool.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
@@ -93,8 +93,8 @@ private:
SG::ReadCondHandleKey<LArOnOffIdMapping> m_cablingKey{this,"CablingKey","LArOnOffIdMap","SG Key of LArOnOffIdMapping object"};
- const LArEM_Base_ID* m_emId;
- const LArOnlineID_Base* m_onlineHelper;
+ const LArEM_Base_ID* m_emId = nullptr;
+ const LArOnlineID_Base* m_onlineHelper = nullptr;
LArWaveHelper m_wHelper;
diff --git a/LArCalorimeter/LArCalibUtils/src/LArTCMPhysWavePredictor.cxx b/LArCalorimeter/LArCalibUtils/src/LArTCMPhysWavePredictor.cxx
index 4e592eefa303..e70013d3ef11 100644
--- a/LArCalorimeter/LArCalibUtils/src/LArTCMPhysWavePredictor.cxx
+++ b/LArCalorimeter/LArCalibUtils/src/LArTCMPhysWavePredictor.cxx
@@ -125,7 +125,7 @@ StatusCode LArTCMPhysWavePredictor::stop()
Int_t CAL_nb;
Int_t CAL_chan;
};
- tree_struct ts1;
+ tree_struct ts1{};
const Int_t nlayer = 4;
const Int_t ngain = 3;
diff --git a/LArCalorimeter/LArCalibUtils/src/LArWFParamTool.cxx b/LArCalorimeter/LArCalibUtils/src/LArWFParamTool.cxx
index fd1b6a9289ef..1289b23925ae 100644
--- a/LArCalorimeter/LArCalibUtils/src/LArWFParamTool.cxx
+++ b/LArCalorimeter/LArCalibUtils/src/LArWFParamTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "LArCalibUtils/LArWFParamTool.h"
@@ -287,7 +287,7 @@ StatusCode LArWFParamTool::getLArWaveParams(const LArCaliWave& larCaliWave,
LArWFParamTool::WaveTiming_t LArWFParamTool::timeExtr(LArWave& gCali) const
{
- WaveTiming_t wt; //return object
+ WaveTiming_t wt{}; //return object
wt.Tstart = m_wHelper.getStart(gCali);
@@ -432,7 +432,7 @@ StatusCode LArWFParamTool::RTM_Omega0(const LArWave& gCali, const HWIdentifier c
// Define the (raw) minimum research interval (if the Layer card is not set,
// uses the wider interval, and default value for the first minimum scan)
- omegaScanParams_t OSParams;
+ omegaScanParams_t OSParams{};
// defaults (e.g. to be used in case cosRespScan=true)
OSParams.cosRespScan = true ;
@@ -498,7 +498,7 @@ StatusCode LArWFParamTool::RTM_Omega0(const LArWave& gCali, const HWIdentifier c
LArWFParamTool::omegaScanParams_t LArWFParamTool::OmegaScanHelper(const Identifier id, const WaveTiming_t& wt) const {
- omegaScanParams_t ret;
+ omegaScanParams_t ret{};
// this is a skeleton of the final function: use at your own risk! M.D. & C.G.
// EMEC part modified by L. March - 7 April 2011
@@ -695,7 +695,7 @@ StatusCode LArWFParamTool::RTM_Taur(const LArWave& gCali, LArWFParams& wf, const
ATH_MSG_VERBOSE( "*** Injection point skipped\t--> m_Taur = " << wf.taur() ) ;
} else {
// numerical (Brent) log(chi2) minimization
- waveRange_t range;
+ waveRange_t range{};
if ( m_TtailMin[3]!=0 && m_TtailMax[3]!=0 && m_TtailMin[3]<m_TtailMax[3]) {
range.min=m_TtailMin[3];
range.max=m_TtailMax[3];
diff --git a/LArCalorimeter/LArCellRec/src/LArCellDeadOTXCorr.h b/LArCalorimeter/LArCellRec/src/LArCellDeadOTXCorr.h
index fc15ad58ef0e..2d150ac2dcd5 100644
--- a/LArCalorimeter/LArCellRec/src/LArCellDeadOTXCorr.h
+++ b/LArCalorimeter/LArCellRec/src/LArCellDeadOTXCorr.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -94,7 +94,7 @@ class LArCellDeadOTXCorr
SG::ReadHandleKey<xAOD::TriggerTowerContainer> m_TTLocation;
std::vector<double> m_triggerNoiseCut;
bool m_useL1CaloDBProp;
- mutable std::atomic<bool> m_useL1CaloDB;
+ mutable std::atomic<bool> m_useL1CaloDB{};
mutable std::mutex m_fitMutex;
Constant<CxxUtils::Array<1> > m_etaCalibrationSizes
diff --git a/LArCalorimeter/LArCellRec/src/LArCellEmMiscalib.h b/LArCalorimeter/LArCellRec/src/LArCellEmMiscalib.h
index f1eaf8f794e7..8035a1e37002 100755
--- a/LArCalorimeter/LArCellRec/src/LArCellEmMiscalib.h
+++ b/LArCalorimeter/LArCellRec/src/LArCellEmMiscalib.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARCELLREC_LARCELLEMMISCALIB_H
@@ -55,8 +55,8 @@ class LArCellEmMiscalib : public CaloCellCorrection
void smearingPerRegion();
const LArEM_ID* m_larem_id;
- const CaloIdManager* m_caloIdMgr;
- const CaloDetDescrManager* m_calodetdescrmgr;
+ const CaloIdManager* m_caloIdMgr = nullptr;
+ const CaloDetDescrManager* m_calodetdescrmgr = nullptr;
IAtRndmGenSvc* m_AtRndmGenSvc;
CLHEP::HepRandomEngine* m_engine;
diff --git a/LArCalorimeter/LArCellRec/src/LArNoisyROTool.h b/LArCalorimeter/LArCellRec/src/LArNoisyROTool.h
index 378418f1308a..b594f2c01cdf 100644
--- a/LArCalorimeter/LArCellRec/src/LArNoisyROTool.h
+++ b/LArCalorimeter/LArCellRec/src/LArNoisyROTool.h
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// LArNoisyROTool.h
@@ -127,7 +127,7 @@ class LArNoisyROTool:
bool m_ignore_front_innerwheel_cells;
//** number of bad channels to declare a preamp noisy */
- unsigned int m_BadChanPerPA;
+ unsigned int m_BadChanPerPA = 0U;
//** number of bad channels to declare a FEB noisy */
unsigned int m_BadChanPerFEB;
@@ -151,7 +151,7 @@ class LArNoisyROTool:
unsigned int m_SaturatedCellTightCut;
//** Count events with too many saturated Qfactor cells */
- unsigned int m_SaturatedCellTightCutEvents;
+ unsigned int m_SaturatedCellTightCutEvents = 0U;
unsigned int m_MNBLooseCut;
unsigned int m_MNBTightCut;
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArLATOMEDecoder.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArLATOMEDecoder.h
index 4eed93326306..ba2c159e5f55 100755
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArLATOMEDecoder.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArLATOMEDecoder.h
@@ -142,8 +142,8 @@ private:
std::vector<Word> m_packetEnd;
// rod header
- uint32_t m_latomeSourceID;
- Word m_latomeBCID;
+ uint32_t m_latomeSourceID = 0U;
+ Word m_latomeBCID = 0U;
//// mon header
Word m_latomeID;
Word m_l1ID;
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArLATOMEHeaderContByteStreamCnv.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArLATOMEHeaderContByteStreamCnv.h
index 5b75f5558bf0..28a4df736005 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArLATOMEHeaderContByteStreamCnv.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArLATOMEHeaderContByteStreamCnv.h
@@ -48,7 +48,7 @@ public:
private:
MsgStream* m_log;
- LArLATOMEDecoder* m_scTool;
+ LArLATOMEDecoder* m_scTool = nullptr;
ByteStreamCnvSvc* m_ByteStreamEventAccess;
IROBDataProviderSvc *m_rdpSvc;
StoreGateSvc* m_storeGate;
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRawDataContByteStreamTool.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRawDataContByteStreamTool.h
index c0b207938e8b..4a39cc20bf9c 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRawDataContByteStreamTool.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRawDataContByteStreamTool.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -136,7 +136,7 @@ private:
const Hid2RESrcID& getHid2RESrcID (const LArFebRodMapping& rodMapping) const;
CxxUtils::CachedUniquePtr<Hid2RESrcID> m_hid2re; //!< Contains the mapping from channel to ROD (writing only)
- LArRodDecoder *m_decoder; //!< Pointer to RodDecoder class
+ LArRodDecoder *m_decoder = nullptr; //!< Pointer to RodDecoder class
/** Indicates which version of DSP code should be used for writing.
This is equivalent to the DetectorEventType word in the ROD block header.
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRawScContByteStreamCnv.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRawScContByteStreamCnv.h
index 526dc2b14844..88759cf71d52 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRawScContByteStreamCnv.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRawScContByteStreamCnv.h
@@ -48,7 +48,7 @@ public:
private:
MsgStream* m_log;
- LArLATOMEDecoder* m_scTool;
+ LArLATOMEDecoder* m_scTool = nullptr;
ByteStreamCnvSvc* m_ByteStreamEventAccess;
IROBDataProviderSvc *m_rdpSvc;
StoreGateSvc* m_storeGate;
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockAccumulatedV3.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockAccumulatedV3.h
index 93c5000488c9..98f6d8326ed9 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockAccumulatedV3.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockAccumulatedV3.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARBYTESTREAM_LARRODBLOCKACCUMULATEDV3_H
@@ -93,12 +93,12 @@ private:
//Separated blocks for encoding
//Counter for channels inside of a FEB
- int m_Result1Counter;
- int m_Result1Index;
- int m_Result2Counter;
- int m_Result2Index;
- int m_RawDataCounter;
- int m_RawDataIndex;
+ int m_Result1Counter = 0;
+ int m_Result1Index = 0;
+ int m_Result2Counter = 0;
+ int m_Result2Index = 0;
+ int m_RawDataCounter = 0;
+ int m_RawDataIndex = 0;
//For fixed gain mode
unsigned m_fixedGain;
//FIXME, very ugly hack! See explanation in LArRodDecoder.h
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockCalibrationV1.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockCalibrationV1.h
index d31754edf04a..838ca54c854b 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockCalibrationV1.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockCalibrationV1.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARBYTESTREAM_LARRODBLOCKCALIBRATIONV1_H
@@ -110,12 +110,12 @@ private:
// One raw data block per gain to start with
std::vector<uint32_t> m_RawDataBlock;
//Counter for channels inside of a FEB
- int m_Result1Counter;
- int m_Result1Index;
- int m_Result2Counter;
- int m_Result2Index;
- int m_RawDataCounter;
- int m_RawDataIndex;
+ int m_Result1Counter = 0;
+ int m_Result1Index = 0;
+ int m_Result2Counter = 0;
+ int m_Result2Index = 0;
+ int m_RawDataCounter = 0;
+ int m_RawDataIndex = 0;
//For fixed gain mode
int m_fixedGain;
//FIXME, very ugly hack! See explanation in LArRodDecoder.h
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockCalibrationV2.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockCalibrationV2.h
index 9a7564dd6e4e..9cb71f8547fa 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockCalibrationV2.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockCalibrationV2.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARBYTESTREAM_LARRODBLOCKCALIBRATIONV2_H
@@ -114,12 +114,12 @@ private:
// One raw data block per gain to start with
std::vector<uint32_t> m_RawDataBlock;
//Counter for channels inside of a FEB
- int m_Result1Counter;
- int m_Result1Index;
- int m_Result2Counter;
- int m_Result2Index;
- int m_RawDataCounter;
- int m_RawDataIndex;
+ int m_Result1Counter = 0;
+ int m_Result1Index = 0;
+ int m_Result2Counter = 0;
+ int m_Result2Index = 0;
+ int m_RawDataCounter = 0;
+ int m_RawDataIndex = 0;
//For fixed gain mode
int m_fixedGain;
//FIXME, very ugly hack! See explanation in LArRodDecoder.h
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockCalibrationV3.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockCalibrationV3.h
index 20624b1e5515..36e15d52705e 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockCalibrationV3.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockCalibrationV3.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARBYTESTREAM_LARRODBLOCKCALIBRATIONV3_H
@@ -116,12 +116,12 @@ private:
// One raw data block per gain to start with
std::vector<uint32_t> m_RawDataBlock;
//Counter for channels inside of a FEB
- int m_Result1Counter;
- int m_Result1Index;
- int m_Result2Counter;
- int m_Result2Index;
- int m_RawDataCounter;
- int m_RawDataIndex;
+ int m_Result1Counter = 0;
+ int m_Result1Index = 0;
+ int m_Result2Counter = 0;
+ int m_Result2Index = 0;
+ int m_RawDataCounter = 0;
+ int m_RawDataIndex = 0;
//For fixed gain mode
unsigned m_fixedGain;
//FIXME, very ugly hack! See explanation in LArRodDecoder.h
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV0.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV0.h
index e8adf0d5794e..164665cf1d74 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV0.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV0.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARBYTESTREAM_LARRODBLOCKPYSICSV0_H
@@ -119,12 +119,12 @@ protected:
std::vector<uint32_t> m_HighEnergyBlock;
std::vector<uint32_t> m_RawDataBlock;
//Counter for channels inside of a FEB
- int m_ECounter;
- int m_RawDataCounter;
- int m_LowEIndex;
- int m_RawDataIndex;
- int m_HighEIndex;
- int m_EIndex; //For writing....
+ int m_ECounter = 0;
+ int m_RawDataCounter = 0;
+ int m_LowEIndex = 0;
+ int m_RawDataIndex = 0;
+ int m_HighEIndex = 0;
+ int m_EIndex = 0; //For writing....
const int32_t *m_HighEPtr;
const uint32_t *m_FlagPtr;
const int16_t *m_LowEPtr;
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV1.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV1.h
index ade48bf0c4fd..1a58f171cd12 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV1.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV1.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARBYTESTREAM_LARRODBLOCKPYSICSV1_H
@@ -120,12 +120,12 @@ protected:
std::vector<uint32_t> m_HighEnergyBlock;
std::vector<uint32_t> m_RawDataBlock;
//Counter for channels inside of a FEB
- int m_ECounter;
- int m_RawDataCounter;
- int m_LowEIndex;
- int m_RawDataIndex;
- int m_HighEIndex;
- int m_EIndex; //For writing....
+ int m_ECounter = 0;
+ int m_RawDataCounter = 0;
+ int m_LowEIndex = 0;
+ int m_RawDataIndex = 0;
+ int m_HighEIndex = 0;
+ int m_EIndex = 0; //For writing....
const int32_t *m_HighEPtr;
const uint32_t *m_FlagPtr;
const int16_t *m_LowEPtr;
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV2.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV2.h
index 90b82b66a25a..98a66449cefe 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV2.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV2.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARBYTESTREAM_LARRODBLOCKPYSICSV2_H
@@ -125,12 +125,12 @@ protected:
std::vector<uint32_t> m_HighEnergyBlock;
std::vector<uint32_t> m_RawDataBlock;
//Counter for channels inside of a FEB
- int m_ECounter;
- int m_RawDataCounter;
- int m_LowEIndex;
- int m_RawDataIndex;
- int m_HighEIndex;
- int m_EIndex; //For writing....
+ int m_ECounter = 0;
+ int m_RawDataCounter = 0;
+ int m_LowEIndex = 0;
+ int m_RawDataIndex = 0;
+ int m_HighEIndex = 0;
+ int m_EIndex = 0; //For writing....
const uint16_t *m_RawDataPtr;
const uint32_t *m_RawDataFlagsPtr;
const uint32_t *m_GainPtr;
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV3.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV3.h
index 89008d97a290..abe78bcf86cc 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV3.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV3.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARBYTESTREAM_LARRODBLOCKPYSICSV3_H
@@ -163,14 +163,14 @@ protected:
// Counter for channels inside of a FEB
- int m_RawDataCounter;
- int m_RawDataIndex;
- int m_CounterIndex;
- int m_EnergyIndex;
- int m_FebInfoIndex;
- int m_GainIndex;
- int m_TimeQualityIndex;
- int m_SumBlkIndex; //For writing...
+ int m_RawDataCounter = 0;
+ int m_RawDataIndex = 0;
+ int m_CounterIndex = 0;
+ int m_EnergyIndex = 0;
+ int m_FebInfoIndex = 0;
+ int m_GainIndex = 0;
+ int m_TimeQualityIndex = 0;
+ int m_SumBlkIndex = 0; //For writing...
const uint32_t *m_SumBlkPtr;
const uint16_t *m_CounterPtr;
@@ -189,8 +189,8 @@ protected:
int m_NFlaggingWords;
- uint16_t m_numberHotCell;
- uint16_t m_numberHotCellOffTime;
+ uint16_t m_numberHotCell = 0U;
+ uint16_t m_numberHotCellOffTime = 0U;
uint16_t m_EnergyThreshold;
int16_t m_OffTimeCut;
uint16_t m_HottestCellIndex;
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV4.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV4.h
index 8ec4717b12ee..534d1aeaae28 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV4.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV4.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARBYTESTREAM_LARRODBLOCKPHYSICSV4_H
@@ -100,18 +100,18 @@ private:
virtual void resetPointers();
virtual bool setPointers();
- int m_EnergyIndex;
- int m_RawDataIndex;
- int m_TimeQualityIndex;
- int m_TowerIndex;
- const uint16_t* m_EnergyPointer;
- const uint16_t* m_TimeQualityPointer;
- const uint16_t* m_RawDataPointer;
- const uint32_t* m_GainPointer;
- const uint32_t* m_MaskPointer;
- const uint16_t* m_HotCellsPointer;
- const uint8_t* m_TowerPointer;
- const int32_t* m_SumPointer;
+ int m_EnergyIndex = 0;
+ int m_RawDataIndex = 0;
+ int m_TimeQualityIndex = 0;
+ int m_TowerIndex = 0;
+ const uint16_t* m_EnergyPointer = nullptr;
+ const uint16_t* m_TimeQualityPointer = nullptr;
+ const uint16_t* m_RawDataPointer = nullptr;
+ const uint32_t* m_GainPointer = nullptr;
+ const uint32_t* m_MaskPointer = nullptr;
+ const uint16_t* m_HotCellsPointer = nullptr;
+ const uint8_t* m_TowerPointer = nullptr;
+ const int32_t* m_SumPointer = nullptr;
//For fixed gain mode
int m_fixedGain;
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV5.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV5.h
index 4227107d2685..9eb9878a3c35 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV5.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV5.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARBYTESTREAM_LARRODBLOCKPHYSICSV5_H
@@ -140,26 +140,26 @@ private:
std::vector<uint16_t> m_EnergyBlockEncode;
std::vector<uint16_t> m_DigitsEncode;
- int m_EnergyIndex;
- int m_TimeQualityIndex;
- int m_DigitsIndex;
- int m_DigitsChannel;
- int m_RawDataIndex;
- const uint32_t* m_GainPointer;
- const uint32_t* m_MaskTimeQualityPointer;
- const uint32_t* m_MaskDigitsPointer;
- const uint16_t* m_RaddPointer;
- const uint16_t* m_EnergyPointer;
- const int32_t* m_SumPointer;
- const uint16_t* m_TimeQualityPointer;
- const uint16_t* m_DigitsPointer;
- const uint16_t* m_RawDataPointer;
+ int m_EnergyIndex = 0;
+ int m_TimeQualityIndex = 0;
+ int m_DigitsIndex = 0;
+ int m_DigitsChannel = 0;
+ int m_RawDataIndex = 0;
+ const uint32_t* m_GainPointer = nullptr;
+ const uint32_t* m_MaskTimeQualityPointer = nullptr;
+ const uint32_t* m_MaskDigitsPointer = nullptr;
+ const uint16_t* m_RaddPointer = nullptr;
+ const uint16_t* m_EnergyPointer = nullptr;
+ const int32_t* m_SumPointer = nullptr;
+ const uint16_t* m_TimeQualityPointer = nullptr;
+ const uint16_t* m_DigitsPointer = nullptr;
+ const uint16_t* m_RawDataPointer = nullptr;
//For fixed gain mode
int m_fixedGain;
// If one needs to use a log output not only for MSG::DEBUG
//MsgStream *m_logstr;
- uint16_t m_numberHotCell;
+ uint16_t m_numberHotCell = 0U;
uint16_t m_numberHotCellOffTime;
// Needs one threshold to send time/quality another for samples
uint16_t m_EnergyThreshold1;
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV6.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV6.h
index 9c76411b5e0c..0c89b965a93d 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV6.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodBlockPhysicsV6.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARBYTESTREAM_LARRODBLOCKPHYSICSV6_H
@@ -143,26 +143,26 @@ private:
std::vector<uint16_t> m_EnergyBlockEncode;
std::vector<uint16_t> m_DigitsEncode;
- int m_EnergyIndex;
- int m_TimeQualityIndex;
- int m_DigitsIndex;
- int m_DigitsChannel;
- int m_RawDataIndex;
- const uint32_t* m_GainPointer;
- const uint32_t* m_MaskTimeQualityPointer;
- const uint32_t* m_MaskDigitsPointer;
- const uint16_t* m_RaddPointer;
- const uint16_t* m_EnergyPointer;
- const int32_t* m_SumPointer;
- const uint16_t* m_TimeQualityPointer;
- const uint16_t* m_DigitsPointer;
- const uint16_t* m_RawDataPointer;
+ int m_EnergyIndex = 0;
+ int m_TimeQualityIndex = 0;
+ int m_DigitsIndex = 0;
+ int m_DigitsChannel = 0;
+ int m_RawDataIndex = 0;
+ const uint32_t* m_GainPointer = nullptr;
+ const uint32_t* m_MaskTimeQualityPointer = nullptr;
+ const uint32_t* m_MaskDigitsPointer = nullptr;
+ const uint16_t* m_RaddPointer = nullptr;
+ const uint16_t* m_EnergyPointer = nullptr;
+ const int32_t* m_SumPointer = nullptr;
+ const uint16_t* m_TimeQualityPointer = nullptr;
+ const uint16_t* m_DigitsPointer = nullptr;
+ const uint16_t* m_RawDataPointer = nullptr;
//For fixed gain mode
int m_fixedGain;
// If one needs to use a log output not only for MSG::DEBUG
//MsgStream *m_logstr;
- uint16_t m_numberHotCell;
+ uint16_t m_numberHotCell = 0U;
uint16_t m_numberHotCellOffTime;
// Needs one threshold to send time/quality another for samples
uint16_t m_EnergyThreshold1;
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodDecoder.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodDecoder.h
index 0f8bcb307ffd..cbf6b813994f 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodDecoder.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRodDecoder.h
@@ -231,7 +231,7 @@ private:
bool m_larCell; // set to True if it is used for ConvertingLArCell
bool m_readtdc; // set to True if the tdc phase is read from the upper byte of the nsamples word.
bool m_febExchange; //HW cause, can not be fixed otherwise: Ugly hack for swapped FEB
- unsigned int m_febId1, m_febId2, m_febIdHLT;
+ unsigned int m_febId1, m_febId2, m_febIdHLT = 0U;
int m_firstSample; // FIXED but kept for backward compatibility
// In Auto-Gain mode, the FEB does not send the samples in the right order, but the one first that
@@ -245,7 +245,7 @@ private:
std::vector<int> m_vBEPreselection;
std::vector<int> m_vPosNegPreselection;
std::vector<unsigned int> m_vFinalPreselection;
- uint32_t m_StatusMask, m_StatusNMask;
+ uint32_t m_StatusMask, m_StatusNMask = 0U;
const LArOnlineID* m_onlineHelper;
MakeLArCellFromRaw m_makeCell;
std::vector<std::string> m_LArCellCorrNames;
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/Mon.h b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/Mon.h
index 4cdbe5b17b49..859ba7f523ee 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/Mon.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/Mon.h
@@ -31,21 +31,21 @@ class Mon
void fillTimeShift(uint32_t word, int i);
void fillNActiveSCs(uint32_t word);
- uint32_t LATOMEID;
- uint32_t extendedL1ID;
+ uint32_t LATOMEID = 0U;
+ uint32_t extendedL1ID = 0U;
uint32_t headerMarker;
- int nPackets;
- int packetIndex;
- int packetSize;
+ int nPackets = 0;
+ int packetIndex = 0;
+ int packetSize = 0;
uint32_t debugMarker;
int headerSize = MON_HEADER_SIZE;
- int region;
+ int region = 0;
int nStreams;
int streamNumber;
- std::array<int, 2> dataType;
- std::array<int, 2> nBCs;
- std::array<uint32_t, 2> timeShift;
- int nActiveSCs;
+ std::array<int, 2> dataType{};
+ std::array<int, 2> nBCs{};
+ std::array<uint32_t, 2> timeShift{};
+ int nActiveSCs = 0;
int nthMONHWordPacketDetermined = 3;
std::array<uint32_t, MON_HEADER_SIZE> headerRef = {0, 0, 0xFF1234FF, 0, 0xDEADBEEF, MON_HEADER_SIZE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
std::array<uint32_t, 2> trailerRef = {0xC0FFEE00, 0xAAAAAAAA};
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRawCalibDataReadingAlg.h b/LArCalorimeter/LArCnv/LArByteStream/src/LArRawCalibDataReadingAlg.h
index cadcceb47aba..3f126e0e2d99 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRawCalibDataReadingAlg.h
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRawCalibDataReadingAlg.h
@@ -58,10 +58,10 @@ class LArRawCalibDataReadingAlg : public AthReentrantAlgorithm {
const LArOnlineID* m_onlineId=nullptr;
//Switches set in initialize() based of SG keys of output object
- bool m_doCalibDigits;
- bool m_doAccDigits;
- bool m_doAccCalibDigits;
- bool m_doFebHeaders;
+ bool m_doCalibDigits = false;
+ bool m_doAccDigits = false;
+ bool m_doAccCalibDigits = false;
+ bool m_doFebHeaders = false;
};
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV0.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV0.cxx
index cf37165fed92..ddc945f9ae40 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV0.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV0.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// Implementation of the LArRODBlockStructure_3 class
@@ -172,7 +172,7 @@ void LArRodBlockPhysicsV0::setNextEnergy(const int32_t energy, const int32_t tim
LARBSDBG("LArRodBlockStructure: Setting Energy for channel " << m_EIndex << ". E=" << energy);
if (quality<0 && energy<0x7FFE && gain==0) { //Write into Low Energy block
m_LowEIndex++; //Use m_LowEIndex to count the channels in the Low Energy block
- ShortLong twoValues;
+ ShortLong twoValues{};
twoValues.s[0]=0;
twoValues.s[1]=0;
if (m_LowEIndex%2==1) { //This is an odd number, simply add data at the bottom of the block
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV1.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV1.cxx
index 3f5dfbe7e3eb..e77dd24fc491 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV1.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV1.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// Implementation of the LArRODBlockStructure_3 class
@@ -171,7 +171,7 @@ void LArRodBlockPhysicsV1::setNextEnergy(const int32_t energy, const int32_t tim
LARBSDBG("LArRodBlockStructure: Setting Energy for channel " << m_EIndex << ". E=" << energy);
if (quality<0 && energy<0x7FFE && gain==0) { //Write into Low Energy block
m_LowEIndex++; //Use m_LowEIndex to count the channels in the Low Energy block
- ShortLong twoValues;
+ ShortLong twoValues{};
twoValues.s[0]=0;
twoValues.s[1]=0;
if (m_LowEIndex%2==1) { //This is an odd number, simply add data at the bottom of the block
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV2.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV2.cxx
index 95726fb35b1a..8f837c81cb02 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV2.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV2.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// Implementation of the LArRODBlockStructure_3 class
@@ -205,7 +205,7 @@ void LArRodBlockPhysicsV2::setNextEnergy(const int32_t energy, const int32_t tim
LARBSDBG("LArRodBlockStructure: Setting Energy for channel " << m_EIndex << ". E=" << energy);
if (quality<0 && energy<0x7FFE && gain==0) { //Write into Low Energy block
m_LowEIndex++; //Use m_LowEIndex to count the channels in the Low Energy block
- ShortLong twoValues;
+ ShortLong twoValues{};
twoValues.s[0]=0;
twoValues.s[1]=0;
if (m_LowEIndex%2==1) { //This is an odd number, simply add data at the bottom of the block
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV3.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV3.cxx
index e1cbcb54334b..b5ca2a16f344 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV3.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV3.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// Implementation of the LArRODBlockStructure_3 class
@@ -325,7 +325,7 @@ void LArRodBlockPhysicsV3::setNextEnergy(const uint16_t energy,const int16_t tim
m_EnergyIndex++; //Use m_EIndex to count the channels put in the Energy block
- ShortLong twoValues;
+ ShortLong twoValues{};
if (m_EnergyIndex%2) // m_EIndex-1 is even
{
twoValues.s[0]= energy;
@@ -396,7 +396,7 @@ void LArRodBlockPhysicsV3::setNextEnergy(const uint16_t energy,const int16_t tim
if (abs(time)>m_OffTimeCut) m_numberHotCellOffTime++;
mylocalBitwiseIndex = (m_numberHotCell-1)%2; // 16 bits per channel
- ShortLong twoValues;
+ ShortLong twoValues{};
if (mylocalBitwiseIndex==0) // need for a new 32 bits word to store the time quality of that cell
{
twoValues.s[0]=0;
@@ -523,7 +523,7 @@ void LArRodBlockPhysicsV3::finalizeFEB()
// Counter block....
// fill info from counters
- ShortLong twoValues;
+ ShortLong twoValues{};
twoValues.s[0]=(uint16_t)m_numberHotCell;
twoValues.s[1]=(uint16_t)m_numberHotCellOffTime;
m_CounterBlkBlock.push_back(twoValues.l);
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV5.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV5.cxx
index ff1b24816b19..1399f8914874 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV5.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV5.cxx
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// Implementation of a LArRODBlockStructure class
@@ -960,7 +960,7 @@ if (n)
{
unsigned int imax = n/2;
for(unsigned int i=0;i<imax;i++){
- ShortLong to_push;
+ ShortLong to_push{};
to_push.s[0] = m_TimeQualityBlock[i*2];
to_push.s[1] = m_TimeQualityBlock[i*2+1];
m_vFragment->push_back(to_push.l);
@@ -975,7 +975,7 @@ if (n)
unsigned int imax=m_DigitsEncode.size()/2;
for(unsigned int i=0;i<imax;i++){
// Better by-swap
- ShortLong to_push;
+ ShortLong to_push{};
to_push.s[1]=m_DigitsEncode[i*2];
to_push.s[0]=m_DigitsEncode[i*2+1];
m_vFragment->push_back(to_push.l);
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV6.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV6.cxx
index 6142887dd119..3436740a87a7 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV6.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/LArRodBlockPhysicsV6.cxx
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// Implementation of a LArRODBlockStructure class
@@ -971,7 +971,7 @@ if (n)
{
unsigned int imax = n/2;
for(unsigned int i=0;i<imax;i++){
- ShortLong to_push;
+ ShortLong to_push{};
to_push.s[0] = m_TimeQualityBlock[i*2];
to_push.s[1] = m_TimeQualityBlock[i*2+1];
m_vFragment->push_back(to_push.l);
@@ -986,7 +986,7 @@ if (n)
unsigned int imax=m_DigitsEncode.size()/2;
for(unsigned int i=0;i<imax;i++){
// Better by-swap
- ShortLong to_push;
+ ShortLong to_push{};
to_push.s[1]=m_DigitsEncode[i*2];
to_push.s[0]=m_DigitsEncode[i*2+1];
m_vFragment->push_back(to_push.l);
diff --git a/LArCalorimeter/LArCnv/LArTPCnv/src/LArRawChannelCnv_p1.cxx b/LArCalorimeter/LArCnv/LArTPCnv/src/LArRawChannelCnv_p1.cxx
index f0181c969ee1..31cb70ba0c7d 100644
--- a/LArCalorimeter/LArCnv/LArTPCnv/src/LArRawChannelCnv_p1.cxx
+++ b/LArCalorimeter/LArCnv/LArTPCnv/src/LArRawChannelCnv_p1.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "LArRawEvent/LArRawChannel.h"
@@ -19,7 +19,7 @@ void LArRawChannelCnv_p1::persToTrans(const LArRawChannel_p1* pers, LArRawChanne
union {
int m_quality ;
uint16_t m_qualProv[2];
- } qprov;
+ } qprov{};
// FIXME: persistent data is machine-dependent!
int q = pers->m_qualityandgain & 0xFFFF;
diff --git a/LArCalorimeter/LArCnv/LArTPCnv/src/LArRawChannelCnv_p2.cxx b/LArCalorimeter/LArCnv/LArTPCnv/src/LArRawChannelCnv_p2.cxx
index 5310eb2899a7..0315df378160 100644
--- a/LArCalorimeter/LArCnv/LArTPCnv/src/LArRawChannelCnv_p2.cxx
+++ b/LArCalorimeter/LArCnv/LArTPCnv/src/LArRawChannelCnv_p2.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "LArRawEvent/LArRawChannel.h"
@@ -14,7 +14,7 @@ void LArRawChannelCnv_p2::transToPers(const LArRawChannel* trans, LArRawChannel_
union {
int m_quality ;
uint16_t m_qualProv[2];
- } qprov;
+ } qprov{};
pers->m_channelID = trans->identify().get_identifier32().get_compact();
pers->m_energy = trans->energy();
@@ -34,7 +34,7 @@ void LArRawChannelCnv_p2::persToTrans(const LArRawChannel_p2* pers, LArRawChanne
union {
int m_quality ;
uint16_t m_qualProv[2];
- } qprov;
+ } qprov{};
qprov.m_quality = pers->m_qualityandgain & 0x3FFFFFFF;
diff --git a/LArCalorimeter/LArCondUtils/src/LArHVPathologyDbAlg.cxx b/LArCalorimeter/LArCondUtils/src/LArHVPathologyDbAlg.cxx
index 0ef700f00467..ade8d5595388 100644
--- a/LArCalorimeter/LArCondUtils/src/LArHVPathologyDbAlg.cxx
+++ b/LArCalorimeter/LArCondUtils/src/LArHVPathologyDbAlg.cxx
@@ -245,7 +245,7 @@ StatusCode LArHVPathologyDbAlg::createCondObjects (const EventContext & ctx)
msg(MSG::INFO) << " cellId , elecList size " << cellID << " " << elecList.size() << endmsg;
}
for (unsigned int i=0;i<elecList.size();i++) {
- LArHVPathologiesDb::LArHVElectPathologyDb electPath;
+ LArHVPathologiesDb::LArHVElectPathologyDb electPath{};
electPath.cellID = cellID;
electPath.electInd = elecList[i];
if(m_mode==2) electPath.pathologyType = ((pathologyType&0x0FFF)<<4);
diff --git a/LArCalorimeter/LArDetDescr/LArDetDescr/LArRecoMaterialTool.h b/LArCalorimeter/LArDetDescr/LArDetDescr/LArRecoMaterialTool.h
index fbb06213ade1..88d77bb1da9c 100755
--- a/LArCalorimeter/LArDetDescr/LArDetDescr/LArRecoMaterialTool.h
+++ b/LArCalorimeter/LArDetDescr/LArDetDescr/LArRecoMaterialTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// ***************************************************************************
@@ -76,7 +76,7 @@ private:
/** Private bool set at initialisation :
decides if the GeoModel is parsed or bypassed */
- bool m_parseGeoModelForMaterial;
+ bool m_parseGeoModelForMaterial = false;
/** Private method called at initialisation :
fills all arrays by calling the "optimised" methods */
diff --git a/LArCalorimeter/LArDetDescr/LArDetDescr/LArRecoSimpleGeomTool.h b/LArCalorimeter/LArDetDescr/LArDetDescr/LArRecoSimpleGeomTool.h
index cb562fd4b6b0..44f3d8a1c1cb 100755
--- a/LArCalorimeter/LArDetDescr/LArDetDescr/LArRecoSimpleGeomTool.h
+++ b/LArCalorimeter/LArDetDescr/LArDetDescr/LArRecoSimpleGeomTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// ***************************************************************************
@@ -80,14 +80,14 @@ private:
// mapping between ALIGNVOL and strings (need to retrieve StoredPV-s)
std::string map_av(CaloSubdetNames::ALIGNVOL alvol) const;
- const CaloCell_ID* m_calo_id;
+ const CaloCell_ID* m_calo_id = nullptr;
CaloPhiRange m_phi_range;
// Access to DDDb :
std::string m_geometry;
- IRDBAccessSvc* m_iAccessSvc;
- const IGeoModelSvc* m_geoModelSvc;
+ IRDBAccessSvc* m_iAccessSvc = nullptr;
+ const IGeoModelSvc* m_geoModelSvc = nullptr;
IRDBRecordset_ptr m_recCryoCyl;
IRDBRecordset_ptr m_recPresGeo;
diff --git a/LArCalorimeter/LArDigitization/LArDigitization/LArHitFilter.h b/LArCalorimeter/LArDigitization/LArDigitization/LArHitFilter.h
index f213bd1c5dd2..10964f7ba395 100755
--- a/LArCalorimeter/LArDigitization/LArDigitization/LArHitFilter.h
+++ b/LArCalorimeter/LArDigitization/LArDigitization/LArHitFilter.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARDIGITIZATION_LArHitFilter_H
@@ -40,7 +40,7 @@ class LArHitFilter : public AthAlgorithm
const LArHEC_ID* m_larhec_id;
const LArFCAL_ID* m_larfcal_id;
- double m_ecut[4][4];
+ double m_ecut[4][4]{};
//Configurable Properties
std::string m_SubDetectors; // subdetectors
diff --git a/LArCalorimeter/LArDigitization/LArDigitization/LArPileUpTool.h b/LArCalorimeter/LArDigitization/LArDigitization/LArPileUpTool.h
index cd3fbe6ac867..b13910f6bd1e 100755
--- a/LArCalorimeter/LArDigitization/LArDigitization/LArPileUpTool.h
+++ b/LArCalorimeter/LArDigitization/LArDigitization/LArPileUpTool.h
@@ -206,8 +206,8 @@ class LArPileUpTool : virtual public ILArPileUpTool, public PileUpToolBase
"Pt cut on e/photons for window mode (Default=5GeV)"};
//
enum CaloNum{EM,HEC,FCAL,EMIW};
- double m_LowGainThresh[4]; // energy thresholds for the low gain
- double m_HighGainThresh[4]; // energy thresholds for the high gain
+ double m_LowGainThresh[4]{}; // energy thresholds for the low gain
+ double m_HighGainThresh[4]{}; // energy thresholds for the high gain
Gaudi::Property<double> m_EnergyThresh{this, "EnergyThresh", -99.,
"Hit energy threshold (default=-99)"}; // Zero suppression energy threshold
@@ -293,7 +293,7 @@ class LArPileUpTool : virtual public ILArPileUpTool, public PileUpToolBase
std::vector<double> m_Samples;
std::vector<double> m_Samples_DigiHSTruth;
std::vector<double> m_Noise;
- double m_Rndm[32];
+ double m_Rndm[32]{};
std::vector<bool> m_SubDetFlag;
std::vector<float> m_energySum;
std::vector<float> m_energySum_DigiHSTruth;
diff --git a/LArCalorimeter/LArExample/TestLArHardwareID/src/initTTMap_Algo.cxx b/LArCalorimeter/LArExample/TestLArHardwareID/src/initTTMap_Algo.cxx
index 121a934fe1e7..5b6ead354dea 100644
--- a/LArCalorimeter/LArExample/TestLArHardwareID/src/initTTMap_Algo.cxx
+++ b/LArCalorimeter/LArExample/TestLArHardwareID/src/initTTMap_Algo.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include <stdlib.h>
@@ -216,7 +216,7 @@ StatusCode initTTMap_Algo::initMap(){
if(m_initFromFile == "OFF" || !fcal) {
// fill map only if not FCAL,
// or FCAL not supposed to be init by Gerald's file
- LArTTCell_t t ;
+ LArTTCell_t t{} ;
t.det = cell_det;
t.pn = cell_pn;
@@ -284,7 +284,7 @@ StatusCode initTTMap_Algo::initMap(){
>> slot >> chan
>> TTlabel >> l1_eta >> TTphi) {
iline++;
- LArTTCell_t t ;
+ LArTTCell_t t{} ;
// fields for the offline cell id
int pos_neg=2; // A side
diff --git a/LArCalorimeter/LArExample/TestLArHardwareID/src/reinitTTMap_Algo.cxx b/LArCalorimeter/LArExample/TestLArHardwareID/src/reinitTTMap_Algo.cxx
index 82aa191d9fbd..809392eaa84a 100644
--- a/LArCalorimeter/LArExample/TestLArHardwareID/src/reinitTTMap_Algo.cxx
+++ b/LArCalorimeter/LArExample/TestLArHardwareID/src/reinitTTMap_Algo.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include <stdlib.h>
@@ -232,7 +232,7 @@ StatusCode reinitTTMap_Algo::initMap(){
>> slot >> chan
>> TTlabel >> l1_eta >> TTphi) {
iline++;
- LArTTCell_t t ;
+ LArTTCell_t t{} ;
// fields for the offline cell id
int pos_neg=2; // A side
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelCalculator.h b/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelCalculator.h
index e024cbeef5eb..e1b919c1214b 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelCalculator.h
+++ b/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelCalculator.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// LArBarrelCalculator.hh
@@ -97,7 +97,7 @@ private:
// 0->6 = eta region number (0.2 granularity) (1.2 to 1.475 in same eta bin)
// 0,1 = below, above the electrode (according to phi in global Atlas frame)
- double m_hv[2][1024][7][2];
+ double m_hv[2][1024][7][2]{};
G4bool FiducialCuts(G4double,G4double,G4double) const;
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelPresamplerGeometry.h b/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelPresamplerGeometry.h
index de81a078b788..cb9b71c4818e 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelPresamplerGeometry.h
+++ b/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelPresamplerGeometry.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// LArBarrelPresamplerGeometry.hh
@@ -56,7 +56,7 @@ namespace LArG4 {
#include "PresParameterDef.h"
// end z of the various modules
- G4double m_end_module[8];
+ G4double m_end_module[8]{};
G4double m_zminPS{3.00*Athena::Units::mm}; // FIXME this should come from the database;
G4double m_zpres{1549.*Athena::Units::mm}; // position of mother volume inside nominal Atlas frame
G4double m_cat_th{};
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/LArCoudeAbsorbers.h b/LArCalorimeter/LArG4/LArG4Barrel/src/LArCoudeAbsorbers.h
index 5e911942a78a..6d117aab4f4b 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/src/LArCoudeAbsorbers.h
+++ b/LArCalorimeter/LArG4/LArG4Barrel/src/LArCoudeAbsorbers.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARG4BARREL_LArCoudeAbsorbers_H
@@ -12,9 +12,9 @@
class LArCoudeAbsorbers {
private:
static PhysicalVolumeAccessor* s_theCoudes;
- double m_xcent[1024][15];
- double m_ycent[1024][15];
- double m_phirot[1024][15];
+ double m_xcent[1024][15]{};
+ double m_ycent[1024][15]{};
+ double m_phirot[1024][15]{};
bool m_filled;
static LArCoudeAbsorbers* s_instance;
static std::once_flag s_flag;
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/LArCoudeElectrodes.h b/LArCalorimeter/LArG4/LArG4Barrel/src/LArCoudeElectrodes.h
index 51d6dce12b3c..22a75b6b6e13 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/src/LArCoudeElectrodes.h
+++ b/LArCalorimeter/LArG4/LArG4Barrel/src/LArCoudeElectrodes.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARG4BARREL_LArCoudeElectrodes_H
@@ -12,9 +12,9 @@
class LArCoudeElectrodes {
private:
static PhysicalVolumeAccessor* s_theCoudes;
- double m_xcent[1024][15];
- double m_ycent[1024][15];
- double m_phirot[1024][15];
+ double m_xcent[1024][15]{};
+ double m_ycent[1024][15]{};
+ double m_phirot[1024][15]{};
bool m_filled;
static LArCoudeElectrodes* s_instance;
static std::once_flag s_flag;
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/LArStraightAbsorbers.h b/LArCalorimeter/LArG4/LArG4Barrel/src/LArStraightAbsorbers.h
index 3adc331a5db9..f39a2daa4d77 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/src/LArStraightAbsorbers.h
+++ b/LArCalorimeter/LArG4/LArG4Barrel/src/LArStraightAbsorbers.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARG4BARREL_LArStraightAbsorbers_H
@@ -12,11 +12,11 @@
class LArStraightAbsorbers {
private:
static PhysicalVolumeAccessor* s_theAbsorbers;
- double m_xcent[1024][14];
- double m_ycent[1024][14];
- double m_cosu[1024][14];
- double m_sinu[1024][14];
- double m_halflength[1024][14];
+ double m_xcent[1024][14]{};
+ double m_ycent[1024][14]{};
+ double m_cosu[1024][14]{};
+ double m_sinu[1024][14]{};
+ double m_halflength[1024][14]{};
bool m_filled;
static LArStraightAbsorbers* s_instance;
int m_parity;
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/LArStraightElectrodes.h b/LArCalorimeter/LArG4/LArG4Barrel/src/LArStraightElectrodes.h
index 620530f65d4e..7a57136d4eba 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/src/LArStraightElectrodes.h
+++ b/LArCalorimeter/LArG4/LArG4Barrel/src/LArStraightElectrodes.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARG4BARREL_LArStraightElectrodes_H
@@ -12,11 +12,11 @@
class LArStraightElectrodes {
private:
static PhysicalVolumeAccessor* s_theElectrodes;
- double m_xcent[1024][14];
- double m_ycent[1024][14];
- double m_cosu[1024][14];
- double m_sinu[1024][14];
- double m_halflength[1024][14];
+ double m_xcent[1024][14]{};
+ double m_ycent[1024][14]{};
+ double m_cosu[1024][14]{};
+ double m_sinu[1024][14]{};
+ double m_halflength[1024][14]{};
bool m_filled;
static LArStraightElectrodes* s_instance;
int m_parity;
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/MapEta.h b/LArCalorimeter/LArG4/LArG4Barrel/src/MapEta.h
index a6f6667036f8..9051e918ade5 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/src/MapEta.h
+++ b/LArCalorimeter/LArG4/LArG4Barrel/src/MapEta.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARG4BARREL_MapEta_H
@@ -14,8 +14,8 @@ private:
std::string m_directory;
int m_init;
int m_nx,m_ny;
- float m_xmin,m_xmax,m_ymin,m_ymax;
- float m_deltax,m_deltay;
+ float m_xmin = 0.0F,m_xmax = 0.0F,m_ymin = 0.0F,m_ymax = 0.0F;
+ float m_deltax = 0.0F,m_deltay = 0.0F;
float* m_resp;
float* m_xt0;
float* m_xt1;
diff --git a/LArCalorimeter/LArG4/LArG4Code/LArG4Code/LArG4SDTool.h b/LArCalorimeter/LArG4/LArG4Code/LArG4Code/LArG4SDTool.h
index 06baed1a71b6..46574ecceeb0 100644
--- a/LArCalorimeter/LArG4/LArG4Code/LArG4Code/LArG4SDTool.h
+++ b/LArCalorimeter/LArG4/LArG4Code/LArG4Code/LArG4SDTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARG4BARRELSDTOOL_H
@@ -59,7 +59,7 @@ class LArG4SDTool : public SensitiveDetectorBase
/// What time bin width for regular hits?
float m_timeBinWidth;
/// Is there going to be a fast simulation coming into this SD?
- G4bool m_useFrozenShowers;
+ G4bool m_useFrozenShowers = false;
/// Method actually doing the work to assign all of these SDs
/// FIXME: this argument type is nasty:
diff --git a/LArCalorimeter/LArG4/LArG4EC/src/EnergyCalculator.h b/LArCalorimeter/LArG4/LArG4EC/src/EnergyCalculator.h
index c2cf362a11d8..ace7fa56e764 100644
--- a/LArCalorimeter/LArG4/LArG4EC/src/EnergyCalculator.h
+++ b/LArCalorimeter/LArG4/LArG4EC/src/EnergyCalculator.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// EnergyCalculator.h
@@ -73,9 +73,9 @@ namespace LArG4 {
private:
- G4bool (EnergyCalculator::*m_Process_type) (const G4Step*, std::vector<LArHitData>&) const;
- G4double (EnergyCalculator::*m_GetGapSize_type) (const G4ThreeVector &p) const;
- G4double (EnergyCalculator::*m_distance_to_the_nearest_electrode_type) (const G4ThreeVector &p, G4double /*Barret_PhiStart*/) const;
+ G4bool (EnergyCalculator::*m_Process_type) (const G4Step*, std::vector<LArHitData>&) const{};
+ G4double (EnergyCalculator::*m_GetGapSize_type) (const G4ThreeVector &p) const{};
+ G4double (EnergyCalculator::*m_distance_to_the_nearest_electrode_type) (const G4ThreeVector &p, G4double /*Barret_PhiStart*/) const{};
G4bool Process_Default(const G4Step*, std::vector<LArHitData>&) const;
G4bool Process_Barrett(const G4Step*, std::vector<LArHitData>&) const;
@@ -125,7 +125,7 @@ namespace LArG4 {
UnsignedIntegerProperty m_corrProp;
EnergyCorrection_t m_correction_type;
- G4double (EnergyCalculator::*m_ecorr_method) (G4double, const G4ThreeVector&, const G4ThreeVector&, G4double /*Barret_PhiStart*/) const;
+ G4double (EnergyCalculator::*m_ecorr_method) (G4double, const G4ThreeVector&, const G4ThreeVector&, G4double /*Barret_PhiStart*/) const{};
G4double dummy_correction_method(G4double e, const G4ThreeVector&, const G4ThreeVector&,
G4double /*Barret_PhiStart*/) const {
return e;
@@ -167,12 +167,12 @@ namespace LArG4 {
};
- G4double m_ElectrodeFanHalfThickness; // used as const after init
- G4double m_FanEleThicknessOld; // used as const after init
- G4double m_FanEleFoldRadiusOld; // used as const after init
- G4double m_FanAbsThickness; // used as const after init
- G4double m_FanEleThickness; // used as const after init
- G4double m_WaveLength; // used as const after init
+ G4double m_ElectrodeFanHalfThickness = 0.0; // used as const after init
+ G4double m_FanEleThicknessOld = 0.0; // used as const after init
+ G4double m_FanEleFoldRadiusOld = 0.0; // used as const after init
+ G4double m_FanAbsThickness = 0.0; // used as const after init
+ G4double m_FanEleThickness = 0.0; // used as const after init
+ G4double m_WaveLength = 0.0; // used as const after init
inline G4double ElectrodeFanHalfThickness() const { return m_ElectrodeFanHalfThickness; };
inline G4double FanEleThicknessOld() const { return m_FanEleThicknessOld; };
@@ -215,7 +215,7 @@ namespace LArG4 {
};
static Wheel_Efield_Map s_ChCollInner,s_ChCollOuter; // used as const after init
- Wheel_Efield_Map* m_ChCollWheelType; // used as const after init
+ Wheel_Efield_Map* m_ChCollWheelType = nullptr; // used as const after init
inline const Wheel_Efield_Map* ChCollWheelType() const { return m_ChCollWheelType; };
@@ -318,7 +318,7 @@ namespace LArG4 {
std::string m_suffix;
// Aug 2007 AMS, lost Aug 2008, restored May 2009
- LArWheelCalculator *m_electrode_calculator;
+ LArWheelCalculator *m_electrode_calculator = nullptr;
const LArWheelCalculator * elc() const { return m_electrode_calculator; }
G4double GetCurrent1(const G4ThreeVector &, const G4ThreeVector &, G4double) const;
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCCalculator.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCCalculator.h
index 2bf4393f4112..cba1232ef717 100644
--- a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCCalculator.h
+++ b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCCalculator.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef __LArG4H6WarmTCCalculator_H__
@@ -30,8 +30,8 @@ public:
}
private:
- bool m_isX;
- bool m_isABS;
+ bool m_isX = false;
+ bool m_isABS = false;
};
#endif
diff --git a/LArCalorimeter/LArG4/LArG4MiniFCAL/src/MiniFCALAssignIdentifier.h b/LArCalorimeter/LArG4/LArG4MiniFCAL/src/MiniFCALAssignIdentifier.h
index 58674153d2e0..94069b27d5dd 100644
--- a/LArCalorimeter/LArG4/LArG4MiniFCAL/src/MiniFCALAssignIdentifier.h
+++ b/LArCalorimeter/LArG4/LArG4MiniFCAL/src/MiniFCALAssignIdentifier.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// This class contains the geometry calculations needed to calculate
@@ -54,7 +54,7 @@ namespace LArG4 {
protected:
MiniFCALAssignIdentifier();
- IMessageSvc* m_msgsvc;
+ IMessageSvc* m_msgsvc = nullptr;
private:
static MiniFCALAssignIdentifier *m_instance;
diff --git a/LArCalorimeter/LArG4/LArG4MiniFCAL/src/MiniFCALCalculator.h b/LArCalorimeter/LArG4/LArG4MiniFCAL/src/MiniFCALCalculator.h
index 079cb1e37a32..a2ad536b4126 100644
--- a/LArCalorimeter/LArG4/LArG4MiniFCAL/src/MiniFCALCalculator.h
+++ b/LArCalorimeter/LArG4/LArG4MiniFCAL/src/MiniFCALCalculator.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// MiniFCALCalculator.hh
@@ -46,9 +46,9 @@ public:
private:
- LArG4::MiniFCAL::MiniFCALAssignIdentifier *m_Geometry;
+ LArG4::MiniFCAL::MiniFCALAssignIdentifier *m_Geometry = nullptr;
- G4float m_OOTcut;
+ G4float m_OOTcut = 0.0F;
};
#endif // LARG4MINIFCAL_MINIFCALCALCULATOR_H
diff --git a/LArCalorimeter/LArG4/LArG4MiniFCAL/src/MiniFCALCalibrationCalculator.h b/LArCalorimeter/LArG4/LArG4MiniFCAL/src/MiniFCALCalibrationCalculator.h
index 2c584a9d59fc..8a68b0d8f53c 100644
--- a/LArCalorimeter/LArG4/LArG4MiniFCAL/src/MiniFCALCalibrationCalculator.h
+++ b/LArCalorimeter/LArG4/LArG4MiniFCAL/src/MiniFCALCalibrationCalculator.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// Aug-2008: M.Fincke First implementation for SLHC MiniFCal
@@ -41,7 +41,7 @@ namespace LArG4 {
const eCalculatorProcessing process = kEnergyAndID) const override final;
private:
- MiniFCALAssignIdentifier* m_geometryCalculator;
+ MiniFCALAssignIdentifier* m_geometryCalculator = nullptr;
eMiniFCALAssignIdentifierType m_geometryType;
std::string m_strgeometryType;
diff --git a/LArCalorimeter/LArG4/LArG4ShowerLib/src/TestShowerLib.cxx b/LArCalorimeter/LArG4/LArG4ShowerLib/src/TestShowerLib.cxx
index 8d7489299806..b8979816f71a 100644
--- a/LArCalorimeter/LArG4/LArG4ShowerLib/src/TestShowerLib.cxx
+++ b/LArCalorimeter/LArG4/LArG4ShowerLib/src/TestShowerLib.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
@@ -160,7 +160,7 @@ bool TestShowerLib::storeShower(HepMC::ConstGenParticlePtr genParticle, const Sh
return false;
}
- genInfo theinfo;
+ genInfo theinfo{};
theinfo.vertex = new HepMC::FourVector(genParticle->production_vertex()->position());
theinfo.momentum = new HepMC::FourVector(genParticle->momentum());
@@ -223,7 +223,7 @@ bool TestShowerLib::storeShower(HepMC::ConstGenParticlePtr genParticle, const Sh
int nhits = (int)(e+0.1); // +0.1 just in case - c++ has low round
Shower shower;
shower.setZSize(time);
- genInfo theinfo;
+ genInfo theinfo{};
theinfo.vertex = new HepMC::FourVector(x,y,z,0);
source->GetEntry(entr++);
shower.setRSize(time);
diff --git a/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.cxx b/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.cxx
index 68424cb9602b..e41175c5e20c 100755
--- a/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.cxx
+++ b/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "SingleTrackValidation.h"
@@ -63,7 +63,7 @@ inline int getCpu() {
int cpuTime = 0;
{
static int ticksPerJiffy = sysconf(_SC_CLK_TCK)/100;
- struct tms buff;
+ struct tms buff{};
times(&buff);
cpuTime=(buff.tms_utime + buff.tms_stime + buff.tms_cutime + buff.tms_cstime)/ticksPerJiffy;
}
diff --git a/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.h b/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.h
index 70d2d924acf7..1d3bd0461423 100755
--- a/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.h
+++ b/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARG4VALIDATION_SINGLETRACKVALIDATION_H
@@ -23,7 +23,7 @@ private:
class Clockwork;
Clockwork *m_c;
- TH1F* m_histos[162];
+ TH1F* m_histos[162]{};
SingleTrackValidation (const SingleTrackValidation&);
SingleTrackValidation& operator= (const SingleTrackValidation&);
diff --git a/LArCalorimeter/LArGeoModel/LArGeoCode/LArGeoCode/LArMaterialManager.h b/LArCalorimeter/LArGeoModel/LArGeoCode/LArGeoCode/LArMaterialManager.h
index b4955bc9dbf0..64f403227263 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoCode/LArGeoCode/LArMaterialManager.h
+++ b/LArCalorimeter/LArGeoModel/LArGeoCode/LArGeoCode/LArMaterialManager.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARGEOCODE_LARMATERIALMANAGER_H
@@ -48,7 +48,7 @@ class LArMaterialManager
private:
StoredMaterialManager* m_storedManager;
- IMessageSvc* m_msgSvc;
+ IMessageSvc* m_msgSvc = nullptr;
};
#endif
diff --git a/LArCalorimeter/LArGeoModel/LArGeoCode/src/DatabaseAccessTool.cxx b/LArCalorimeter/LArGeoModel/LArGeoCode/src/DatabaseAccessTool.cxx
index f07169f1b68e..b33c57106295 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoCode/src/DatabaseAccessTool.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoCode/src/DatabaseAccessTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "LArGeoCode/DatabaseAccessTool.h"
@@ -15,7 +15,7 @@ class DatabaseAccessTool::Clockwork {
public:
- IRDBAccessSvc *pAccessSvc;
+ IRDBAccessSvc *pAccessSvc = nullptr;
std::string detectorKey;
std::string detectorNode;
std::map<std::string, IRDBRecordset_ptr> recMap;
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/ModulesConstructionH62004.h b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/ModulesConstructionH62004.h
index f03c007e68b0..c94b32038431 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/ModulesConstructionH62004.h
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/ModulesConstructionH62004.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARGEOH62004ALGS_MODULESCONSTRUCTIONH62004_H
@@ -37,7 +37,7 @@ namespace LArGeo {
// 4 - FCAL2, 5 - ColdTail
GeoFullPhysVol* m_ModulesPhys;
- StoreGateSvc * m_detectorStore;
+ StoreGateSvc * m_detectorStore = nullptr;
const LArGeoTB2004Options *m_Options;
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/WarmTCConstructionH62004.h b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/WarmTCConstructionH62004.h
index 7bc9cccaefbd..264b205df6fb 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/WarmTCConstructionH62004.h
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/WarmTCConstructionH62004.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// WarmTCConstructionH62004
@@ -23,7 +23,7 @@ namespace LArGeo {
private:
GeoFullPhysVol* m_WarmTCPhys;
- StoreGateSvc * m_detectorStore;
+ StoreGateSvc * m_detectorStore = nullptr;
};
}
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/EMBHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/EMBHVManager.cxx
index 2d72e88ad2bf..fb2ee6ebfbaa 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/EMBHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/EMBHVManager.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "LArHV/EMBHVManager.h"
@@ -88,8 +88,8 @@ public:
}
EMBHVDescriptor descriptor{CellBinning(0.0, 1.4, 7, 1),CellBinning(0.0, 2*M_PI, 16)};
std::unique_ptr<const EMBHVModule> moduleArray[2][8][16][2];
- const LArElectrodeID* elecId;
- const LArHVLineID* hvId;
+ const LArElectrodeID* elecId = nullptr;
+ const LArHVLineID* hvId = nullptr;
};
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/EMBHVModule.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/EMBHVModule.cxx
index b74e80bf7383..6d24e3cce543 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/EMBHVModule.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/EMBHVModule.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "LArHV/EMBHVModule.h"
@@ -34,7 +34,7 @@ public:
unsigned int iEta;
unsigned int iPhi;
unsigned int iSector;
- const EMBHVElectrode* electrodes[64];
+ const EMBHVElectrode* electrodes[64]{};
};
EMBHVModule::EMBHVModule(const EMBHVManager* manager
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/EMBPresamplerHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/EMBPresamplerHVManager.cxx
index 5b91cc46220a..f5bee934c896 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/EMBPresamplerHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/EMBPresamplerHVManager.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "LArHV/EMBPresamplerHVManager.h"
@@ -91,8 +91,8 @@ public:
}
std::unique_ptr<EMBPresamplerHVDescriptor> descriptor;
std::unique_ptr<const EMBPresamplerHVModule> moduleArray[2][4][32];
- const LArElectrodeID* elecId;
- const LArHVLineID* hvId;
+ const LArElectrodeID* elecId = nullptr;
+ const LArHVLineID* hvId = nullptr;
};
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/EMECHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/EMECHVManager.cxx
index cedcf32b49eb..3c5a922be2d9 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/EMECHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/EMECHVManager.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "LArHV/EMECHVManager.h"
@@ -93,8 +93,8 @@ public:
std::unique_ptr<EMECHVDescriptor> descriptor;
IOType iWheel;
std::unique_ptr<const EMECHVModule> moduleArray[2][8][8][8]; // not dense
- const LArElectrodeID* elecId;
- const LArHVLineID* hvId;
+ const LArElectrodeID* elecId = nullptr;
+ const LArHVLineID* hvId = nullptr;
};
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/EMECPresamplerHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/EMECPresamplerHVManager.cxx
index a3e84b41fee4..21ef2d0e14f0 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/EMECPresamplerHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/EMECPresamplerHVManager.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "LArHV/EMECPresamplerHVManager.h"
@@ -81,8 +81,8 @@ public:
}
CellBinning phiBinning{0.0, 2*M_PI, 64};
std::unique_ptr<const EMECPresamplerHVModule> moduleArray[2][64]; // not dense
- const LArElectrodeID* elecId;
- const LArHVLineID* hvId;
+ const LArElectrodeID* elecId = nullptr;
+ const LArHVLineID* hvId = nullptr;
};
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/FCALHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/FCALHVManager.cxx
index d380deb64933..7b2808169ac9 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/FCALHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/FCALHVManager.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "LArHV/FCALHVManager.h"
@@ -79,8 +79,8 @@ public:
{
}
std::unique_ptr<const FCALHVModule> moduleArray[2][16][3];
- const LArElectrodeID* elecId;
- const LArHVLineID* hvId;
+ const LArElectrodeID* elecId = nullptr;
+ const LArHVLineID* hvId = nullptr;
};
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/FCALHVModule.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/FCALHVModule.cxx
index 69e4e230a55f..41476691b988 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/FCALHVModule.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/FCALHVModule.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "LArHV/FCALHVModule.h"
@@ -33,7 +33,7 @@ public:
unsigned int iSide;
unsigned int iSector;
unsigned int iSampling;
- const FCALHVLine* hvLine[4];
+ const FCALHVLine* hvLine[4]{};
};
FCALHVModule::FCALHVModule(const FCALHVManager* manager
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/HECHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/HECHVManager.cxx
index aba9ba52aadf..d00421102f7f 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/HECHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/HECHVManager.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "LArHV/HECHVManager.h"
@@ -83,8 +83,8 @@ public:
}
HECHVDescriptor descriptor{CellBinning(0,2*M_PI,32)};
std::unique_ptr<const HECHVModule> moduleArray[2][32][4];
- const LArElectrodeID* elecId;
- const LArHVLineID* hvId;
+ const LArElectrodeID* elecId = nullptr;
+ const LArHVLineID* hvId = nullptr;
};
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/HECHVModule.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/HECHVModule.cxx
index 5c8b45131b64..3eb64246a030 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/HECHVModule.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/HECHVModule.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "LArHV/HECHVModule.h"
@@ -35,7 +35,7 @@ public:
unsigned int iPhi;
unsigned int iSampling;
- const HECHVSubgap* subgaps[4];
+ const HECHVSubgap* subgaps[4]{};
};
HECHVModule::HECHVModule(const HECHVManager *manager
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMBDetectorManager.h b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMBDetectorManager.h
index 4d17023b3a3d..ef803e0e38cf 100755
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMBDetectorManager.h
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMBDetectorManager.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARREADOUTGEOMETRY_EMBDETECTORMANAGER_H
@@ -129,7 +129,7 @@ class EMBDetectorManager : public GeoVDetectorManager
* provide iterative access to any EMBDetectorRegion held
* by this manager.
*/
- EMBDetRegionArray m_DetRegionsRandom;
+ EMBDetRegionArray m_DetRegionsRandom{};
std::unique_ptr<const EMBBasicReadoutNumbers> m_basicReadoutNumbers;
CxxUtils::CachedUniquePtr<EMBAccordionDetails> m_accordionDetails;
const EMBHVManager& m_hvManager;
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMECDetectorManager.h b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMECDetectorManager.h
index a7798cb39ad2..0cfe11801630 100755
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMECDetectorManager.h
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMECDetectorManager.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARREADOUTGEOMETRY_EMECDETECTORMANAGER_H
@@ -205,7 +205,7 @@ class EMECDetectorManager : public GeoVDetectorManager
* provide iterative access to any EMECDetectorRegion held
* by this manager.
*/
- EMECDetRegionArray m_DetRegionsRandom;
+ EMECDetRegionArray m_DetRegionsRandom{};
/**
* @brief A vector of doubles used to hold an array of sampling
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/FCALDetectorManager.h b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/FCALDetectorManager.h
index 778a9a97afc4..f4eb2aebe87f 100755
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/FCALDetectorManager.h
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/FCALDetectorManager.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARREADOUTGEOMETRY_FCALDETECTORMANAGER_H
@@ -106,7 +106,7 @@ class FCALDetectorManager : public GeoVDetectorManager
* @brief This is the array in which three modules in two sides
* are kept. This is for random access to the modules.
*/
- ModulePtr m_Module[2][3];
+ ModulePtr m_Module[2][3]{};
/**
* @brief Vector of FCAL Modules. This is for iterative access to
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/FCAL_ChannelMap.h b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/FCAL_ChannelMap.h
index 073c533a8f8b..a7e221b9e967 100755
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/FCAL_ChannelMap.h
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/FCAL_ChannelMap.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// ***************************************************************************
@@ -158,10 +158,10 @@ private:
/** Geometrical parameters here, in CLHEP::cm please to be compatible with G3 */
static const double m_tubeSpacing[];
- double m_tubeDx[3];
- double m_tubeDy[3];
- double m_tileDx[3];
- double m_tileDy[3];
+ double m_tubeDx[3]{};
+ double m_tubeDy[3]{};
+ double m_tileDx[3]{};
+ double m_tileDy[3]{};
bool m_invert_x; // Some geometry need x inverted
bool m_invert_xy; // Some geometry need xy crossed
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/HECDetectorManager.h b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/HECDetectorManager.h
index 028adfaae840..42a8f9b9f858 100755
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/HECDetectorManager.h
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/HECDetectorManager.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARREADOUTGEOMETRY_HECDETECTORMANAGER_H
@@ -149,7 +149,7 @@ class HECDetectorManager : public GeoVDetectorManager
* provide random access to any HECDetectorRegion held by
* this manager.
*/
- HECDetRegionArray m_DetRegionsRandom;
+ HECDetRegionArray m_DetRegionsRandom{};
diff --git a/LArCalorimeter/LArL1Sim/LArL1Sim/LArTTL1Maker.h b/LArCalorimeter/LArL1Sim/LArL1Sim/LArTTL1Maker.h
index cc8e9f228074..b18aa7520a22 100755
--- a/LArCalorimeter/LArL1Sim/LArL1Sim/LArTTL1Maker.h
+++ b/LArCalorimeter/LArL1Sim/LArL1Sim/LArTTL1Maker.h
@@ -141,7 +141,7 @@ class LArTTL1Maker : public AthAlgorithm,
/** pointer to the offline FCAL helper */
const LArFCAL_ID* m_fcalHelper;
/** pointer to the offline id helper */
- const CaloCell_ID* m_OflHelper;
+ const CaloCell_ID* m_OflHelper = nullptr;
/** Sampling fractions retrieved from DB */
//const DataHandle<ILArfSampl> m_dd_fSampl;
SG::ReadCondHandleKey<ILArfSampl> m_fSamplKey;
diff --git a/LArCalorimeter/LArL1Sim/src/LArSCL1Maker.h b/LArCalorimeter/LArL1Sim/src/LArSCL1Maker.h
index 9dabade38251..a912b7f84312 100644
--- a/LArCalorimeter/LArL1Sim/src/LArSCL1Maker.h
+++ b/LArCalorimeter/LArL1Sim/src/LArSCL1Maker.h
@@ -163,7 +163,7 @@ class LArSCL1Maker : public AthReentrantAlgorithm
/** pointer to the offline TT helper */
const CaloCell_SuperCell_ID* m_scHelper;
/** pointer to the offline id helper */
- const CaloCell_ID* m_OflHelper;
+ const CaloCell_ID* m_OflHelper = nullptr;
/** pointer to the online LAr helper */
const LArOnline_SuperCellID* m_OnlSCHelper;
diff --git a/LArCalorimeter/LArMonitoring/src/LArDigitMonAlg.h b/LArCalorimeter/LArMonitoring/src/LArDigitMonAlg.h
index 330bb246fe4a..f25d82ff85b2 100755
--- a/LArCalorimeter/LArMonitoring/src/LArDigitMonAlg.h
+++ b/LArCalorimeter/LArMonitoring/src/LArDigitMonAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARMONITORING_LARDIGITMON_H
@@ -113,8 +113,8 @@ private:
/* set once, guarded by mutex */
mutable int m_Samplenbr ATLAS_THREAD_SAFE;
mutable std::mutex m_lock;
- mutable int m_SampleRangeLow ATLAS_THREAD_SAFE;
- mutable int m_SampleRangeUp ATLAS_THREAD_SAFE;
+ mutable int m_SampleRangeLow ATLAS_THREAD_SAFE = 0;
+ mutable int m_SampleRangeUp ATLAS_THREAD_SAFE = 0;
int WhatPartition(HWIdentifier id, int side) const;
};
diff --git a/LArCalorimeter/LArMonitoring/src/LArFEBMonAlg.h b/LArCalorimeter/LArMonitoring/src/LArFEBMonAlg.h
index 8dfe63c17852..144385ab3280 100755
--- a/LArCalorimeter/LArMonitoring/src/LArFEBMonAlg.h
+++ b/LArCalorimeter/LArMonitoring/src/LArFEBMonAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARMONITORING_LARFEBMONALG_H
@@ -70,7 +70,7 @@ private:
// Id helper
const LArOnlineID* m_onlineHelper;
- bool m_trigok;
+ bool m_trigok = false;
typedef std::map<std::pair<unsigned int, unsigned int>, unsigned int > MaskedFebs;
diff --git a/LArCalorimeter/LArOnlDbPrep/LArOnlDbPrep/LArDSPThresholdFillInline.h b/LArCalorimeter/LArOnlDbPrep/LArOnlDbPrep/LArDSPThresholdFillInline.h
index 8fe6286645e2..bc194ccec6b5 100644
--- a/LArCalorimeter/LArOnlDbPrep/LArOnlDbPrep/LArDSPThresholdFillInline.h
+++ b/LArCalorimeter/LArOnlDbPrep/LArOnlDbPrep/LArDSPThresholdFillInline.h
@@ -34,8 +34,8 @@ class LArDSPThresholdFillInline:public AthAlgorithm {
std::vector<std::string> m_cellGroupStr;
float m_tqThrsh, m_samplesThrsh;
float m_maskedtqThrsh, m_maskedsamplesThrsh;
- float m_sigmaNoiseSamples, m_sigmaNoiseQt;
- bool m_usePileupNoiseSamples, m_usePileupNoiseQt;
+ float m_sigmaNoiseSamples = 0.0F, m_sigmaNoiseQt = 0.0F;
+ bool m_usePileupNoiseSamples = false, m_usePileupNoiseQt = false;
bool m_dump, m_maskBadChannels;
std::string m_outFileName, m_inFileName;
bool m_fill;
diff --git a/LArCalorimeter/LArROD/LArROD/LArRawChannelBuilder.h b/LArCalorimeter/LArROD/LArROD/LArRawChannelBuilder.h
index e8542213539b..58c071f3fb64 100644
--- a/LArCalorimeter/LArROD/LArROD/LArRawChannelBuilder.h
+++ b/LArCalorimeter/LArROD/LArROD/LArRawChannelBuilder.h
@@ -62,7 +62,7 @@ private:
int m_initialTimeSampleShift;
int m_NOFCPhases;
int m_NOFCTimeBins;
- bool m_useIntercept[4];
+ bool m_useIntercept[4]{};
bool m_useOFCPhase;
bool m_phaseInv ;
float m_ramp_max[3];
diff --git a/LArCalorimeter/LArROD/LArROD/LArRawChannelBuilderAlg.h b/LArCalorimeter/LArROD/LArROD/LArRawChannelBuilderAlg.h
index b726e8d10788..29939706d26e 100644
--- a/LArCalorimeter/LArROD/LArROD/LArRawChannelBuilderAlg.h
+++ b/LArCalorimeter/LArROD/LArROD/LArRawChannelBuilderAlg.h
@@ -1,6 +1,6 @@
//Dear emacs, this is -*-c++-*-
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARROD_LARRAWCHANNELBUILDERALG_H
@@ -76,7 +76,7 @@ class LArRawChannelBuilderAlg : public AthReentrantAlgorithm {
//Identifier helper
- const LArOnlineID_Base* m_onlineId;
+ const LArOnlineID_Base* m_onlineId = nullptr;
/// Geometry manager.
const CaloSuperCellDetDescrManager* m_sem_mgr;
diff --git a/LArCalorimeter/LArROD/LArROD/LArRawChannelBuilderIterAlg.h b/LArCalorimeter/LArROD/LArROD/LArRawChannelBuilderIterAlg.h
index b82bbdd3e474..afc6dfaa070e 100644
--- a/LArCalorimeter/LArROD/LArROD/LArRawChannelBuilderIterAlg.h
+++ b/LArCalorimeter/LArROD/LArROD/LArRawChannelBuilderIterAlg.h
@@ -83,7 +83,7 @@ class LArRawChannelBuilderIterAlg : public AthReentrantAlgorithm {
SG::WriteHandleKey<LArOFIterResultsContainer> m_timingContKey{this, "TimingContainerKey", "LArOFIterResult", "Key of the LArOFIterResultsContainer in StoreGate"};
//Identifier helper
- const LArOnlineID* m_onlineId;
+ const LArOnlineID* m_onlineId = nullptr;
// iterative peak computation
LArOFIterResults peak(const std::vector<float>& samples, // raw data after pedestal subtraction
diff --git a/LArCalorimeter/LArROD/LArROD/LArRawChannelSimpleBuilder.h b/LArCalorimeter/LArROD/LArROD/LArRawChannelSimpleBuilder.h
index ee9f65c820a1..7e2acdfbc6af 100644
--- a/LArCalorimeter/LArROD/LArROD/LArRawChannelSimpleBuilder.h
+++ b/LArCalorimeter/LArROD/LArROD/LArRawChannelSimpleBuilder.h
@@ -68,11 +68,11 @@ private:
int m_averageSamplesEM,m_averageSamplesHEC,m_averageSamplesFCAL;
float m_averageScaleEM,m_averageScaleHEC,m_averageScaleFCAL;
- float m_ADCtoMeVFCAL[3];
- float m_ADCtoMeVHEC[2];
- float m_ADCtoMeVEMECInner[2];
- float m_ADCtoMeVEMECOuter[4];
- float m_ADCtoMeVEMB[4];
+ float m_ADCtoMeVFCAL[3]{};
+ float m_ADCtoMeVHEC[2]{};
+ float m_ADCtoMeVEMECInner[2]{};
+ float m_ADCtoMeVEMECOuter[4]{};
+ float m_ADCtoMeVEMB[4]{};
unsigned int m_iPedestal;
};
diff --git a/LArCalorimeter/LArROD/src/LArHITtoCell.h b/LArCalorimeter/LArROD/src/LArHITtoCell.h
index 66f4e00b16ba..eef78a88cd4e 100755
--- a/LArCalorimeter/LArROD/src/LArHITtoCell.h
+++ b/LArCalorimeter/LArROD/src/LArHITtoCell.h
@@ -87,9 +87,9 @@ private:
const CaloIdManager* m_calo_id_manager;
/** pointer to the offline TT helper */
- const CaloCell_SuperCell_ID* m_scHelper;
+ const CaloCell_SuperCell_ID* m_scHelper = nullptr;
/** pointer to the offline id helper */
- const CaloCell_ID* m_OflHelper;
+ const CaloCell_ID* m_OflHelper = nullptr;
template <class T>
diff --git a/LArCalorimeter/LArROD/src/LArSuperCellBCIDAlg.h b/LArCalorimeter/LArROD/src/LArSuperCellBCIDAlg.h
index 7f5df670a0f3..fd7c266f4e41 100644
--- a/LArCalorimeter/LArROD/src/LArSuperCellBCIDAlg.h
+++ b/LArCalorimeter/LArROD/src/LArSuperCellBCIDAlg.h
@@ -58,7 +58,7 @@ private:
{this,"CablingKey","LArOnOffIdMapSC","SG Key of LArOnOffIdMapping object"};
//Identifier helper
- const LArOnline_SuperCellID* m_laronline_id;
+ const LArOnline_SuperCellID* m_laronline_id = nullptr;
};
diff --git a/LArCalorimeter/LArRawEvent/LArRawEvent/LArFebHeader.h b/LArCalorimeter/LArRawEvent/LArRawEvent/LArFebHeader.h
index 8964dd43f6a5..8a865e050fb7 100755
--- a/LArCalorimeter/LArRawEvent/LArRawEvent/LArFebHeader.h
+++ b/LArCalorimeter/LArRawEvent/LArRawEvent/LArFebHeader.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARFEBHEADER_H
@@ -198,13 +198,13 @@ class LArFebHeader
uint16_t BCId;
uint32_t LVL1TigType;
uint32_t DetEventType;
- } m_RodHeader;
+ } m_RodHeader{};
/** @brief DSP-Header (most of it is actually in the DSP-Trailer) */
struct {
uint32_t CodeVersion; // DSP code version
uint32_t EventCounter; // DSP event counter
- } m_DspHeader;
+ } m_DspHeader{};
/** @brief FEB EventId */
uint16_t m_ELVL1Id;
diff --git a/LArCalorimeter/LArRawEvent/LArRawEvent/LArRawSC.h b/LArCalorimeter/LArRawEvent/LArRawEvent/LArRawSC.h
index 149b38a1f278..dcb51153f2c2 100755
--- a/LArCalorimeter/LArRawEvent/LArRawEvent/LArRawSC.h
+++ b/LArCalorimeter/LArRawEvent/LArRawEvent/LArRawSC.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARRAWSC_H
@@ -23,10 +23,10 @@ class LArRawSC {
HWIdentifier m_hardwareID;
/** @brief Latome channel */
- short m_chan;
+ short m_chan = 0;
/** @brief LATOME source Id*/
- unsigned int m_sourceId;
+ unsigned int m_sourceId = 0U;
/** @brief vector of energies */
std::vector < int > m_energies;
diff --git a/LArCalorimeter/LArRawUtils/LArRawUtils/LArRoI_Map.h b/LArCalorimeter/LArRawUtils/LArRawUtils/LArRoI_Map.h
index 4e5b383741dd..6c7d6cc4183e 100644
--- a/LArCalorimeter/LArRawUtils/LArRawUtils/LArRoI_Map.h
+++ b/LArCalorimeter/LArRawUtils/LArRawUtils/LArRoI_Map.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARRAWEVENT_LARROI_MAP_H
@@ -121,11 +121,11 @@ class ATLAS_NOT_THREAD_SAFE
bool m_loadAtBegin;
bool m_validCache;
- const CaloLVL1_ID* m_TT_ID;
- const LArOnlineID* m_onlineID;
- const LArEM_ID* m_em_id ;
- const LArHEC_ID* m_hec_id ;
- const LArFCAL_ID* m_fcal_id;
+ const CaloLVL1_ID* m_TT_ID = nullptr;
+ const LArOnlineID* m_onlineID = nullptr;
+ const LArEM_ID* m_em_id = nullptr ;
+ const LArHEC_ID* m_hec_id = nullptr ;
+ const LArFCAL_ID* m_fcal_id = nullptr;
};
diff --git a/LArCalorimeter/LArRecUtils/LArRecUtils/LArOFPeakRecoTool.h b/LArCalorimeter/LArRecUtils/LArRecUtils/LArOFPeakRecoTool.h
index a6547cac5341..75e2ad83137c 100755
--- a/LArCalorimeter/LArRecUtils/LArRecUtils/LArOFPeakRecoTool.h
+++ b/LArCalorimeter/LArRecUtils/LArRecUtils/LArOFPeakRecoTool.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARCALIBUTILS_LAROFPEAKRECOTOOL_H
@@ -85,7 +85,7 @@ class LArOFPeakRecoTool: public AthAlgTool
float m_samplingPeriod;
bool m_forceHighGain;
bool m_isSC;
- const LArOnlineID_Base* m_lar_on_id;
+ const LArOnlineID_Base* m_lar_on_id = nullptr;
};
diff --git a/LArCalorimeter/LArRecUtils/LArRecUtils/LArParabolaPeakRecoTool.h b/LArCalorimeter/LArRecUtils/LArRecUtils/LArParabolaPeakRecoTool.h
index 507d63038b5e..a42eb9a144ba 100755
--- a/LArCalorimeter/LArRecUtils/LArRecUtils/LArParabolaPeakRecoTool.h
+++ b/LArCalorimeter/LArRecUtils/LArRecUtils/LArParabolaPeakRecoTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARCALIBUTILS_LARPARABOLAPEAKRECOTOOL_H
@@ -56,9 +56,9 @@ class LArParabolaPeakRecoTool: public AthAlgTool
std::string m_fileShapeName, m_fileADCcorName;
// file and tables for corrections
- FILE* m_fileShape, *m_fileADCcor;
- float m_QT_Shape[4][26];
- float m_QT_ADCcor[4][25];
+ FILE* m_fileShape = nullptr, *m_fileADCcor = nullptr;
+ float m_QT_Shape[4][26]{};
+ float m_QT_ADCcor[4][25]{};
};
diff --git a/LArCalorimeter/LArRecUtils/src/LArADC2MeVCondAlg.h b/LArCalorimeter/LArRecUtils/src/LArADC2MeVCondAlg.h
index 8ddaaca607f7..1d7e468fc1da 100644
--- a/LArCalorimeter/LArRecUtils/src/LArADC2MeVCondAlg.h
+++ b/LArCalorimeter/LArRecUtils/src/LArADC2MeVCondAlg.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
@@ -57,7 +57,7 @@ class LArADC2MeVCondAlg: public AthReentrantAlgorithm {
Gaudi::Property<bool> m_useFEBGainThresholds{this,"UseFEBGainTresholds",true};
Gaudi::Property<bool> m_isSuperCell{this,"isSuperCell",false,"switch to true to use the SuperCell Identfier helper"};
- size_t m_nGains;
+ size_t m_nGains = 0UL;
const LArOnlineID_Base* m_larOnlineID=nullptr;
};
diff --git a/LArCalorimeter/LArRecUtils/src/LArAutoCorrNoiseCondAlg.h b/LArCalorimeter/LArRecUtils/src/LArAutoCorrNoiseCondAlg.h
index 33fca304f7a2..19caa1cffa68 100644
--- a/LArCalorimeter/LArRecUtils/src/LArAutoCorrNoiseCondAlg.h
+++ b/LArCalorimeter/LArRecUtils/src/LArAutoCorrNoiseCondAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARAUTOCORRNOISECONDALG_H
@@ -41,7 +41,7 @@ private:
bool m_isSuperCell;
bool m_MCsym;
- unsigned int m_nGains;
+ unsigned int m_nGains = 0U;
int m_nSampl;
};
diff --git a/LArCalorimeter/LArRecUtils/src/LArAutoCorrTotalCondAlg.h b/LArCalorimeter/LArRecUtils/src/LArAutoCorrTotalCondAlg.h
index fa41987b0548..81e6a07adea4 100644
--- a/LArCalorimeter/LArRecUtils/src/LArAutoCorrTotalCondAlg.h
+++ b/LArCalorimeter/LArRecUtils/src/LArAutoCorrTotalCondAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARAUTOCORRTOTALCONDALG_H
@@ -57,7 +57,7 @@ private:
unsigned int m_firstSample;
int m_deltaBunch;
- size_t m_nGains;
+ size_t m_nGains = 0UL;
};
#endif
diff --git a/LArCalorimeter/LArRecUtils/src/LArFlatConditionSvc.cxx b/LArCalorimeter/LArRecUtils/src/LArFlatConditionSvc.cxx
index 8869252a7730..e2791d3aa457 100644
--- a/LArCalorimeter/LArRecUtils/src/LArFlatConditionSvc.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArFlatConditionSvc.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "LArFlatConditionSvc.h"
@@ -454,7 +454,7 @@ void LArFlatConditionSvc::printCheckSums(const objInfo_t& objInfo, const CondAtt
union {
int sn;
unsigned usn;
- } cnv;
+ } cnv{};
boost::crc_32_type crc32;
diff --git a/LArCalorimeter/LArRecUtils/src/LArHVScaleCorrTool.cxx b/LArCalorimeter/LArRecUtils/src/LArHVScaleCorrTool.cxx
index b3190fd38b0f..7743b1420d69 100644
--- a/LArCalorimeter/LArRecUtils/src/LArHVScaleCorrTool.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArHVScaleCorrTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "LArHVScaleCorrTool.h"
@@ -323,7 +323,7 @@ void LArHVScaleCorrTool::buildFixHVList(const std::vector<std::string>& fixHVStr
float eta_min,eta_max,phi_min,phi_max,corr;
is >> iDetector >> ilayer_min >> ilayer_max >> eta_min >> eta_max >> phi_min >> phi_max >> corr;
- HVfix_t myfix;
+ HVfix_t myfix{};
myfix.subdet = iDetector;
myfix.layer_min = ilayer_min;
myfix.layer_max = ilayer_max;
diff --git a/LArCalorimeter/LArRecUtils/src/LArOFCCondAlg.h b/LArCalorimeter/LArRecUtils/src/LArOFCCondAlg.h
index 3652009f327e..0b5bb82a0138 100644
--- a/LArCalorimeter/LArRecUtils/src/LArOFCCondAlg.h
+++ b/LArCalorimeter/LArRecUtils/src/LArOFCCondAlg.h
@@ -71,7 +71,7 @@ private:
bool m_Dump;
- size_t m_nGains;
+ size_t m_nGains = 0UL;
};
#endif
diff --git a/LArCalorimeter/LArTBEvent/LArTBEvent/LArTBInstrument.h b/LArCalorimeter/LArTBEvent/LArTBEvent/LArTBInstrument.h
index cc83a1636058..ad46f6a8f85f 100755
--- a/LArCalorimeter/LArTBEvent/LArTBEvent/LArTBInstrument.h
+++ b/LArCalorimeter/LArTBEvent/LArTBEvent/LArTBInstrument.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARTBINSTRUMENT_H
@@ -151,7 +151,7 @@ class LArTBInstrument {
long int m_clock; /**< Rate of 1MHz clock */
long int m_pretrig; /**< Signal Rate of pretrigger counters */
long int m_w1w2; /**< Signal Rate of W1*W2 counters */
- bool m_pattern_unit[4][16]; /**< Pattern units */
+ bool m_pattern_unit[4][16]{}; /**< Pattern units */
};
CLASS_DEF(LArTBInstrument,2785,0)
#endif //LARTBINSTRUMENT_H
diff --git a/LArCalorimeter/LArTest/LArCalibTest/src/LArFakeCellFactor.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/LArFakeCellFactor.cxx
index d4635e1fad79..d5d162f34b33 100755
--- a/LArCalorimeter/LArTest/LArCalibTest/src/LArFakeCellFactor.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/LArFakeCellFactor.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "LArCalibTest/LArFakeCellFactor.h"
@@ -43,7 +43,7 @@ StatusCode LArFakeCellFactor::initialize() {
//Helper values to interpret the file
const float etaHalfSize=0.1;
const float phiHalfSize=0.196349546; //pi/8
- struct FileEntry entry;
+ struct FileEntry entry{};
std::vector<FileEntry> valueList;
unsigned num; //Not really used....
std::ifstream infile(m_fileName.c_str());
diff --git a/LArCalorimeter/LArTest/LArEventTest/LArEventTest/DumpLArRawChannels.h b/LArCalorimeter/LArTest/LArEventTest/LArEventTest/DumpLArRawChannels.h
index 0c16266993f7..60a47301fc41 100644
--- a/LArCalorimeter/LArTest/LArEventTest/LArEventTest/DumpLArRawChannels.h
+++ b/LArCalorimeter/LArTest/LArEventTest/LArEventTest/DumpLArRawChannels.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef DUMPLARRAWCHANNEL_H
@@ -46,7 +46,7 @@ class DumpLArRawChannels : public AthAlgorithm
unsigned m_gain=0;
unsigned m_id=0;
bool m_toLog;
- bool m_toFile;
+ bool m_toFile = false;
ServiceHandle<ITHistSvc> m_thistSvc;
diff --git a/LArCalorimeter/LArTest/LArEventTest/LArEventTest/TriggerPatternCount.h b/LArCalorimeter/LArTest/LArEventTest/LArEventTest/TriggerPatternCount.h
index d53fb44b4c72..71021df2122a 100644
--- a/LArCalorimeter/LArTest/LArEventTest/LArEventTest/TriggerPatternCount.h
+++ b/LArCalorimeter/LArTest/LArEventTest/LArEventTest/TriggerPatternCount.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
@@ -43,7 +43,7 @@ class TriggerPatternCount : public AthAlgorithm
int m_event;
int m_pattern_max;
- int m_pattern_count[32];
+ int m_pattern_count[32]{};
};
#endif
--
GitLab
From 3427a8b10ec26f0082764e9c1660e5c51c831a78 Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <stewart.martin-haugh@cern.ch>
Date: Mon, 16 Aug 2021 18:39:57 +0000
Subject: [PATCH 076/272] Migrate L1EtTools etc to JSON
---
.../TrigT1CaloTools/src/L1EnergyCMXTools.cxx | 109 +++++++-----------
.../TrigT1CaloTools/src/L1EnergyCMXTools.h | 3 +-
.../TrigT1/TrigT1CaloTools/src/L1EtTools.cxx | 59 ++--------
.../TrigT1/TrigT1CaloTools/src/L1EtTools.h | 5 +-
.../TrigT1CaloTools/src/L1JEPEtSumsTools.cxx | 29 +----
.../TrigT1CaloTools/src/L1JEPEtSumsTools.h | 3 +-
.../TrigT1CaloUtils/SystemEnergy.h | 10 +-
.../TrigT1CaloUtils/src/SystemEnergy.cxx | 71 +++++-------
.../BStoESD_Tier0_HLTConfig_jobOptions.py | 3 +-
9 files changed, 96 insertions(+), 196 deletions(-)
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.cxx
index 9c50fc0b8e2a..3632d69f06b2 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.cxx
@@ -16,7 +16,6 @@
#include "L1EnergyCMXTools.h"
#include "TrigConfL1Data/TriggerThreshold.h"
#include "TrigConfL1Data/L1DataDef.h"
-#include "TrigConfL1Data/CTPConfig.h"
namespace LVL1
{
@@ -27,12 +26,10 @@ L1EnergyCMXTools::L1EnergyCMXTools(const std::string &type,
const std::string &name,
const IInterface *parent)
: AthAlgTool(type, name, parent),
- m_configSvc("TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", name),
m_jeTool("LVL1::L1JetElementTools/L1JetElementTools"),
m_etTool("LVL1::L1EtTools/L1EtTools")
{
declareInterface<IL1EnergyCMXTools>(this);
- declareProperty("LVL1ConfigSvc", m_configSvc, "LVL1 Config Service");
declareProperty("JetElementTool", m_jeTool);
declareProperty("EtTool", m_etTool);
}
@@ -48,41 +45,14 @@ L1EnergyCMXTools::~L1EnergyCMXTools()
StatusCode L1EnergyCMXTools::initialize()
{
m_debug = msgLvl(MSG::DEBUG);
-
- // Connect to the LVL1ConfigSvc for the trigger configuration:
-
- StatusCode sc = m_configSvc.retrieve();
- if (sc.isFailure())
- {
- ATH_MSG_ERROR("Couldn't connect to " << m_configSvc.typeAndName());
- return sc;
- }
- else
- {
- ATH_MSG_DEBUG("Connected to " << m_configSvc.typeAndName());
- }
+ ATH_CHECK( m_L1MenuKey.initialize() );
// Retrieve jet element tool
- sc = m_jeTool.retrieve();
- if (sc.isFailure())
- {
- ATH_MSG_ERROR("Couldn't retrieve JetElementTool");
- return sc;
- }
+ ATH_CHECK(m_jeTool.retrieve());
+ ATH_CHECK(m_etTool.retrieve());
- // Retrieve energy sums tool
-
- sc = m_etTool.retrieve();
- if (sc.isFailure())
- {
- ATH_MSG_ERROR("Couldn't retrieve EtTool");
- return sc;
- }
-
- ATH_MSG_DEBUG("Initialization completed");
-
- return sc;
+ return StatusCode::SUCCESS;
}
/** Finalisation */
@@ -155,14 +125,15 @@ void L1EnergyCMXTools::formCMXEtSums(const xAOD::JEMEtSumsContainer *jemEtSumsVe
// Process each slice
MultiSliceModuleEnergy::iterator iter = modulesVec.begin();
MultiSliceModuleEnergy::iterator iterE = modulesVec.end();
+
+ auto l1Menu = SG::makeHandle( m_L1MenuKey );
for (; iter != iterE; ++iter)
{
DataVector<ModuleEnergy> *modules = *iter;
DataVector<CrateEnergy> *crates = new DataVector<CrateEnergy>;
cratesVec.push_back(crates);
m_etTool->crateSums(modules, crates);
- //systemVec.push_back(new SystemEnergy(m_etTool->systemSums(crates)));
- systemVec.push_back(new SystemEnergy(crates, m_configSvc));
+ systemVec.push_back(new SystemEnergy(crates, &(*l1Menu)));
delete modules;
}
// Convert back to CMXEtSums
@@ -209,36 +180,38 @@ void L1EnergyCMXTools::findRestrictedEta(uint32_t &maskXE, uint32_t &maskTE) con
bool maskXESet = false;
bool maskTESet = false;
+ auto l1Menu = SG::makeHandle( m_L1MenuKey );
TrigConf::L1DataDef def;
-
- for (auto it : m_configSvc->ctpConfig()->menu().thresholdVector())
- {
- if ((it->type() == def.xeType() || it->type() == def.teType()) && it->thresholdNumber() > 7)
- {
- if (maskXE > 0) maskXESet = true;
- if (maskTE > 0) maskTESet = true;
- for (auto itv : it->thresholdValueVector())
- {
- // Already initialised mask to zero, so only need to check where threshold is active
- if (itv->thresholdValueCount() >= 0x7fff) continue;
- // Set bits for modules within the range of any restricted eta threshold
- if (it->type() == def.xeType() && !maskXESet)
- {
- for (unsigned int bin = 0; bin < 8; ++bin) {
- if (moduleEta[bin] > itv->etamin()*0.1 && moduleEta[bin] < itv->etamax()*0.1)
- maskXE |= (1<<bin);
- }
- }
- else if (it->type() == def.teType() && !maskTESet)
- {
- for (unsigned int bin = 0; bin < 8; ++bin) {
- if (moduleEta[bin] > itv->etamin()*0.1 && moduleEta[bin] < itv->etamax()*0.1)
- maskTE |= (1<<bin);
- }
- }
- } // loop over TTV
- } // Is this XE or TE threshold?
- } //
+ std::vector<std::shared_ptr<TrigConf::L1Threshold>> allThresholds = l1Menu->thresholds();
+ for ( const auto& thresh : allThresholds ) {
+ if ( ( thresh->type() == def.xeType() || thresh->type() == def.teType()) && thresh->mapping() > 7 ) {
+ std::shared_ptr<TrigConf::L1Threshold_Calo> thresh_Calo = std::static_pointer_cast<TrigConf::L1Threshold_Calo>(thresh);
+ auto tvcs = thresh_Calo->thrValuesCounts();
+ // Make sure only set masks from the first valid threshold in the range (for each type)
+ if (maskXE > 0) maskXESet = true;
+ if (maskTE > 0) maskTESet = true;
+ if (tvcs.size() == 0) {
+ tvcs.addRangeValue(thresh_Calo->thrValueCounts(),-49, 49, 1, true);
+ }
+ for (const auto& tVC : tvcs) {
+ // Bits are set false by default, so ignore thresholds that are just doing that
+ if (tVC.value() >= 0x7fff) continue;
+ // Set bits true if module centre between etaMin and etaMax
+ if ( thresh->type() == def.xeType() && !maskXESet ) {
+ for (unsigned int bin = 0; bin < 8; ++bin) {
+ if (moduleEta[bin] > tVC.etaMin()*0.1 && moduleEta[bin] < tVC.etaMax()*0.1)
+ maskXE |= (1<<bin);
+ }
+ }
+ else if ( thresh->type() == def.teType() && !maskTESet ) {
+ for (unsigned int bin = 0; bin < 8; ++bin) {
+ if (moduleEta[bin] > tVC.etaMin()*0.1 && moduleEta[bin] < tVC.etaMax()*0.1)
+ maskTE |= (1<<bin);
+ }
+ }
+ } // loop over TTV
+ } // Is this XE or TE threshold?
+ }
}
void L1EnergyCMXTools::formCMXEtSumsCrate(
const xAOD::CMXEtSumsContainer *cmxEtSumsMod,
@@ -293,6 +266,7 @@ void L1EnergyCMXTools::formCMXEtSumsSystem(
MultiSliceSystemEnergy systemVecFull;
MultiSliceSystemEnergy systemVecRestricted;
+ auto l1Menu = SG::makeHandle( m_L1MenuKey );
etSumsToCrateEnergy(cmxEtSumsCrate, cratesVecFull, cratesVecRestricted, peak);
for (int i = 0; i < 2; i++)
{
@@ -305,7 +279,7 @@ void L1EnergyCMXTools::formCMXEtSumsSystem(
{
DataVector<CrateEnergy> *crates = *iter;
//systemVec.push_back(new SystemEnergy(m_etTool->systemSums(crates)));
- systemVec->push_back(new SystemEnergy(crates, m_configSvc));
+ systemVec->push_back(new SystemEnergy(crates, &(*l1Menu)));
delete crates;
}
}
@@ -477,6 +451,7 @@ void L1EnergyCMXTools::etSumsToSystemEnergy(
const ErrorVector &eyErrVec(sums->eyErrorVec());
const ErrorVector &etErrVec(sums->etErrorVec());
unsigned int slices = et.size();
+ auto l1Menu = SG::makeHandle( m_L1MenuKey );
for (unsigned int sl = 0; sl < slices; ++sl)
{
DataError exErr(exErrVec[sl]);
@@ -487,7 +462,7 @@ void L1EnergyCMXTools::etSumsToSystemEnergy(
exErr.get(DataError::Overflow),
eyErr.get(DataError::Overflow),
source == xAOD::CMXEtSums::TOTAL_RESTRICTED,
- m_configSvc);
+ &(*l1Menu));
// bool srestricted = (systemEnergy->roiWord0() >> 26) & 1;
systemVec.push_back(systemEnergy);
}
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.h
index 30d5d9fd1c53..812886ebf9be 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.h
@@ -116,8 +116,7 @@ class L1EnergyCMXTools : virtual public IL1EnergyCMXTools, public AthAlgTool
void findRestrictedEta(uint32_t &maskXE, uint32_t &maskTE) const;
void dumpCrateEnergies(const std::string& msg, const MultiSliceCrateEnergy& crates) const;
- /** trigger configuration service */
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc;
+ SG::ReadHandleKey<TrigConf::L1Menu> m_L1MenuKey{ this, "L1TriggerMenu", "DetectorStore+L1TriggerMenu", "L1 Menu" };
/** Tool for JetElement map */
ToolHandle<LVL1::IL1JetElementTools> m_jeTool;
/** Tool for energy sums */
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.cxx
index 9de1b9e8dedd..a9e0da567d84 100755
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.cxx
@@ -21,13 +21,10 @@ L1EtTools::L1EtTools(const std::string& t,
const IInterface* p )
:
AthAlgTool(t,n,p),
- m_TEMasks(0),
- m_configSvc("TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", n)
+ m_TEMasks(0)
{
declareInterface<IL1EtTools>(this);
- declareProperty( "LVL1ConfigSvc", m_configSvc, "LVL1 Config Service");
-
// Allow user to specify JetElement thresholds
m_jetElementThresholdEtSum = 0;
m_jetElementThresholdEtMiss = 0;
@@ -47,17 +44,9 @@ L1EtTools::~L1EtTools()
StatusCode L1EtTools::initialize()
{
- ATH_MSG_INFO( "Initialising Algtool" );
-
- ATH_MSG_INFO( "get pointer to config svc " );
- StatusCode sc = m_configSvc.retrieve();
- if ( sc.isFailure() ) {
- ATH_MSG_ERROR( "Couldn't connect to " << m_configSvc.typeAndName() );
- }
- /** Fill map of JE masked out of TE trigger */
- ATH_MSG_INFO( "Initialization completed" );
+ ATH_CHECK( m_L1MenuKey.initialize() );
- return sc;
+ return StatusCode::SUCCESS;
}
//================ Finalisation =================================================
@@ -69,33 +58,6 @@ StatusCode LVL1::L1EtTools::finalize()
return StatusCode::SUCCESS;
}
-//================ Fill map of JE masked out of TE trigger ======================
-
-void L1EtTools::fillMaskedOutMap() {
-
- /** Fill map of JE masked out of TE trigger */
- m_TEMasks = new std::map<int, int>;
- std::vector<TrigConf::TriggerThreshold*> thresholds = m_configSvc->ctpConfig()->menu().thresholdVector();
- std::vector<TrigConf::TriggerThreshold*>::const_iterator it;
- TrigConf::L1DataDef def;
- /// Loop over all thresholds. For each TE threshold check whether the "turn-off" value has been set for any eta bin
- for (it = thresholds.begin(); it != thresholds.end(); ++it) {
- if ( (*it)->type() == def.teType() ) {
- for (int ieta = -49; ieta < 49; ++ieta) {
- TrigConf::TriggerThresholdValue* tv = (*it)->triggerThresholdValue(ieta,0);
- if (tv != 0) {
- int thresholdValue = (*tv).thresholdValueCount();
- if (thresholdValue >= 0x3fff) {
- // Is this one already flagged? If not, flag it
- std::map<int, int>::iterator itMask=m_TEMasks->find( ieta );
- if (itMask == m_TEMasks->end()) m_TEMasks->insert(std::map<int, int>::value_type(ieta,1));
- }
- }
- }
- }
- }
-}
-
//================ Having map of JetElements facilitates JE->JEM association =====
void L1EtTools::mapJetElements(const xAOD::JetElementContainer* jetelements,
@@ -130,9 +92,6 @@ void L1EtTools::moduleSums(const xAOD::JetElementContainer* jetelements,
DataVector<ModuleEnergy>* modules, int slice) const {
modules->clear();
- //if (m_TEMasks) delete m_TEMasks;
- //m_TEMasks = 0;
- //if (!m_TEMasks) fillMaskedOutMap();
// Need map of JetElements as input to ModuleEnergy class creator
xAOD::JetElementMap_t* jeContainer = new xAOD::JetElementMap_t;
@@ -156,9 +115,6 @@ void L1EtTools::moduleSums(const xAOD::JetElementMap_t* jemap,
DataVector<ModuleEnergy>* modules, int slice) const {
modules->clear();
- //if (m_TEMasks) delete m_TEMasks;
- //m_TEMasks = 0;
- //if (!m_TEMasks) fillMaskedOutMap();
// Loop over crates, modules and create set of ModuleEnergy objects
for (int crate = 0; crate < 2; ++crate) {
@@ -200,7 +156,8 @@ void L1EtTools::crateSums(const DataVector<EnergyCMXData>* modules, DataVector<C
SystemEnergy L1EtTools::systemSums(const DataVector<CrateEnergy>* crates) const {
// This class will take crate sums and form system sums, apply thresholds, etc
- SystemEnergy result(crates, m_configSvc);
+ auto l1Menu = SG::makeHandle( m_L1MenuKey );
+ SystemEnergy result(crates, &(*l1Menu));
return result ;
}
@@ -259,7 +216,8 @@ SystemEnergy L1EtTools::systemSums(const xAOD::JetElementContainer* jetelements,
crateSums(jetelements, crates, slice, maskXE, maskTE, restricted);
// Then do the final summing, thresholding etc
- SystemEnergy result(crates, m_configSvc);
+ auto l1Menu = SG::makeHandle( m_L1MenuKey );
+ SystemEnergy result(crates, &(*l1Menu));
delete crates;
return result;
@@ -275,7 +233,8 @@ SystemEnergy L1EtTools::systemSums(const xAOD::JetElementMap_t* jemap, int slice
crateSums(jemap, crates, slice, maskXE, maskTE, restricted);
// Then do the final summing, thresholding etc
- SystemEnergy result(crates, m_configSvc);
+ auto l1Menu = SG::makeHandle( m_L1MenuKey );
+ SystemEnergy result(crates, &(*l1Menu));
delete crates;
return result;
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.h
index e4695122bd50..10c03f6aaaa0 100755
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.h
@@ -20,7 +20,7 @@
#include "TrigT1CaloUtils/CrateEnergy.h"
#include "TrigT1CaloUtils/SystemEnergy.h"
#include "TrigT1CaloEvent/EnergyCMXData.h"
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
+#include "TrigConfData/L1Menu.h"
namespace LVL1
{
@@ -104,9 +104,8 @@ namespace LVL1
/** Map of JetElements masked out of TE trigger */
std::map<int, int>* m_TEMasks;
+ SG::ReadHandleKey<TrigConf::L1Menu> m_L1MenuKey{ this, "L1TriggerMenu", "DetectorStore+L1TriggerMenu", "L1 Menu" };
- /** pointer to LVL1ConfigSvc */
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc;
};
} // end of namespace
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.cxx
index fe790d964af4..739615a0919b 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.cxx
@@ -26,12 +26,10 @@ L1JEPEtSumsTools::L1JEPEtSumsTools(const std::string& type,
const IInterface* parent)
:
AthAlgTool(type, name, parent),
- m_configSvc("TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", name),
m_jeTool("LVL1::L1JetElementTools/L1JetElementTools"),
m_etTool("LVL1::L1EtTools/L1EtTools")
{
declareInterface<IL1JEPEtSumsTools>(this);
- declareProperty( "LVL1ConfigSvc", m_configSvc, "LVL1 Config Service");
declareProperty( "JetElementTool", m_jeTool);
declareProperty( "EtTool", m_etTool);
}
@@ -49,32 +47,16 @@ StatusCode L1JEPEtSumsTools::initialize()
{
// Connect to the LVL1ConfigSvc for the trigger configuration:
- StatusCode sc = m_configSvc.retrieve();
- if ( sc.isFailure() ) {
- ATH_MSG_ERROR( "Couldn't connect to " << m_configSvc.typeAndName() );
- return sc;
- }
- ATH_MSG_DEBUG( "Connected to " << m_configSvc.typeAndName() );
-
+ ATH_CHECK( m_L1MenuKey.initialize() );
// Retrieve jet element tool
- sc = m_jeTool.retrieve();
- if ( sc.isFailure() ) {
- ATH_MSG_ERROR( "Couldn't retrieve JetElementTool" );
- return sc;
- }
+ ATH_CHECK(m_jeTool.retrieve());
// Retrieve energy sums tool
- sc = m_etTool.retrieve();
- if ( sc.isFailure() ) {
- ATH_MSG_ERROR( "Couldn't retrieve EtTool" );
- return sc;
- }
+ ATH_CHECK(m_etTool.retrieve());
- ATH_MSG_INFO( "Initialization completed" );
-
- return sc;
+ return StatusCode::SUCCESS;
}
/** Finalisation */
@@ -347,6 +329,7 @@ void L1JEPEtSumsTools::etSumsToSystemEnergy(
const ErrorVector& eyErrVec(sums->EyErrorVec());
const ErrorVector& etErrVec(sums->EtErrorVec());
unsigned int slices = et.size();
+ auto l1Menu = SG::makeHandle( m_L1MenuKey );
for (unsigned int sl = 0; sl < slices; ++sl) {
DataError exErr(exErrVec[sl]);
DataError eyErr(eyErrVec[sl]);
@@ -356,7 +339,7 @@ void L1JEPEtSumsTools::etSumsToSystemEnergy(
exErr.get(DataError::Overflow),
eyErr.get(DataError::Overflow),
restricted,
- m_configSvc));
+ &(*l1Menu)));
}
}
}
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.h
index 1c7951f52f6f..67674d8bcbe4 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.h
@@ -115,12 +115,11 @@ class L1JEPEtSumsTools : virtual public IL1JEPEtSumsTools, public AthAlgTool
void etMapsToEtSums(const MultiSliceSystemEnergy& systemVec,
DataVector<CMMEtSums>* cmmEtSumsVec, int peak) const;
- /** trigger configuration service */
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc;
/** Tool for JetElement map */
ToolHandle<LVL1::IL1JetElementTools> m_jeTool;
/** Tool for energy sums */
ToolHandle<LVL1::IL1EtTools> m_etTool;
+ SG::ReadHandleKey<TrigConf::L1Menu> m_L1MenuKey{ this, "L1TriggerMenu", "DetectorStore+L1TriggerMenu", "L1 Menu" };
};
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/SystemEnergy.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/SystemEnergy.h
index 5945cb6478f5..c252404a1e06 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/SystemEnergy.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/SystemEnergy.h
@@ -15,9 +15,7 @@
#define SYSTEMENERGY_H
#include "TrigT1CaloUtils/CrateEnergy.h"
- // Include for the configuration service:
-#include "GaudiKernel/ServiceHandle.h"
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
+#include "TrigConfData/L1Menu.h"
@@ -32,11 +30,11 @@ System CMM logic is done in EnergyTrigger*/
class SystemEnergy {
public:
- SystemEnergy(const DataVector<CrateEnergy>* crates, ServiceHandle<TrigConf::ILVL1ConfigSvc> config);
+ SystemEnergy(const DataVector<CrateEnergy>* crates, const TrigConf::L1Menu* l1Menu);
SystemEnergy(unsigned int et, unsigned int exTC, unsigned int eyTC,
unsigned int overflowT, unsigned int overflowX,
unsigned int overflowY, unsigned int restricted,
- ServiceHandle<TrigConf::ILVL1ConfigSvc> config);
+ const TrigConf::L1Menu* l1Menu);
~SystemEnergy();
public:
@@ -61,7 +59,7 @@ public:
unsigned int roiWord2() const;
private:
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc;
+ const TrigConf::L1Menu* m_L1Menu;
int m_systemEx;
int m_systemEy;
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/SystemEnergy.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/SystemEnergy.cxx
index 6566144b9c98..3d4066822fcf 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/SystemEnergy.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/SystemEnergy.cxx
@@ -12,18 +12,13 @@
#include "TrigT1CaloUtils/SystemEnergy.h"
#include "TrigT1Interfaces/TrigT1CaloDefs.h"
#include "TrigConfL1Data/L1DataDef.h"
-#include "TrigConfL1Data/METSigParam.h"
-#include "TrigConfL1Data/CTPConfig.h"
-#include "TrigConfL1Data/Menu.h"
-#include "TrigConfL1Data/TriggerThreshold.h"
-#include "TrigConfL1Data/TriggerThresholdValue.h"
using namespace TrigConf;
namespace LVL1
{
-SystemEnergy::SystemEnergy(const DataVector<CrateEnergy> *crates, ServiceHandle<TrigConf::ILVL1ConfigSvc> config) : m_configSvc(config),
+SystemEnergy::SystemEnergy(const DataVector<CrateEnergy> *crates, const TrigConf::L1Menu* l1Menu) : m_L1Menu(l1Menu),
m_systemEx(0),
m_systemEy(0),
m_systemEt(0),
@@ -102,7 +97,7 @@ SystemEnergy::SystemEnergy(const DataVector<CrateEnergy> *crates, ServiceHandle<
SystemEnergy::SystemEnergy(unsigned int et, unsigned int exTC, unsigned int eyTC,
unsigned int overflowT, unsigned int overflowX,
unsigned int overflowY, unsigned int restricted,
- ServiceHandle<TrigConf::ILVL1ConfigSvc> config) : m_configSvc(config),
+ const TrigConf::L1Menu* l1Menu) : m_L1Menu(l1Menu),
m_systemEx(0),
m_systemEy(0),
m_systemEt(et),
@@ -281,21 +276,16 @@ void SystemEnergy::etMissTrigger()
/// Otherwise see which thresholds were passed
// Get thresholds
- std::vector<TriggerThreshold *> thresholds = m_configSvc->ctpConfig()->menu().thresholdVector();
- std::vector<TriggerThreshold *>::const_iterator it;
- //float etScale = m_configSvc->thresholdConfig()->caloInfo().globalJetScale();
+ std::vector<std::shared_ptr<TrigConf::L1Threshold>> allThresholds = m_L1Menu->thresholds();
// get Threshold values and test
- L1DataDef def;
- for (it = thresholds.begin(); it != thresholds.end(); ++it)
- {
- if ((*it)->type() == def.xeType())
- {
- TriggerThresholdValue *tv = (*it)->triggerThresholdValue(0, 0);
- int thresholdValue = (*tv).thresholdValueCount();
+ for ( const auto& thresh : allThresholds ) {
+ if ( thresh->type() == L1DataDef::xeType()) {
+ std::shared_ptr<TrigConf::L1Threshold_Calo> thresh_Calo = std::static_pointer_cast<TrigConf::L1Threshold_Calo>(thresh);
+ unsigned int thresholdValue = thresh_Calo->thrValueCounts();
uint32_t tvQ = thresholdValue * thresholdValue;
- int threshNumber = (*it)->thresholdNumber();
+ int threshNumber = thresh->mapping();
if (m_restricted == 0 && threshNumber < 8)
{
if (m_etMissQ > tvQ)
@@ -326,23 +316,24 @@ void SystemEnergy::etSumTrigger()
}
// Get thresholds
- std::vector<TriggerThreshold *> thresholds = m_configSvc->ctpConfig()->menu().thresholdVector();
- std::vector<TriggerThreshold *>::const_iterator it;
- //float etScale = m_configSvc->thresholdConfig()->caloInfo().globalJetScale();
+ std::vector<std::shared_ptr<TrigConf::L1Threshold>> allThresholds = m_L1Menu->thresholds();
// get Threshold values and test
// Since eta-dependent values are being used to disable TE in regions, must find lowest value for each threshold
- L1DataDef def;
- for (it = thresholds.begin(); it != thresholds.end(); ++it)
- {
- if ((*it)->type() == def.teType())
- {
- int threshNumber = (*it)->thresholdNumber();
+ for ( const auto& thresh : allThresholds ) {
+ if ( thresh->type() == L1DataDef::xeType()) {
+ int threshNumber = thresh->mapping();
int thresholdValue = m_maxEtSumThr;
- std::vector<TriggerThresholdValue *> tvv = (*it)->thresholdValueVector();
- for (std::vector<TriggerThresholdValue *>::const_iterator ittvv = tvv.begin(); ittvv != tvv.end(); ++ittvv)
- if ((*ittvv)->thresholdValueCount() < thresholdValue)
- thresholdValue = (*ittvv)->thresholdValueCount();
+ std::shared_ptr<TrigConf::L1Threshold_Calo> thresh_Calo = std::static_pointer_cast<TrigConf::L1Threshold_Calo>(thresh);
+ auto tvcs = thresh_Calo->thrValuesCounts();
+ if (tvcs.size() == 0) {
+ tvcs.addRangeValue(thresh_Calo->thrValueCounts(),-49, 49, 1, true);
+ }
+ for (const auto& tVC : tvcs) {
+ if (static_cast<int>(tVC.value()) < thresholdValue) {
+ thresholdValue = tVC.value();
+ }
+ }
if (m_restricted == 0 && threshNumber < 8)
{
@@ -371,7 +362,7 @@ void SystemEnergy::metSigTrigger()
return;
/// Obtain parameters from configuration service
- METSigParam params = m_configSvc->thresholdConfig()->caloInfo().metSigParam();
+ auto& params = m_L1Menu->thrExtraInfo().XS();
unsigned int Scale = params.xsSigmaScale();
unsigned int Offset = params.xsSigmaOffset();
unsigned int XEmin = params.xeMin();
@@ -398,20 +389,16 @@ void SystemEnergy::metSigTrigger()
unsigned long fourbQTE = 4 * bQ * m_systemEt;
// Get thresholds
- std::vector<TriggerThreshold *> thresholds = m_configSvc->ctpConfig()->menu().thresholdVector();
- std::vector<TriggerThreshold *>::const_iterator it;
+ std::vector<std::shared_ptr<TrigConf::L1Threshold>> allThresholds = m_L1Menu->thresholds();
/// get Threshold values and test
/// aQTiQ has to be scaled to hardware precision after product formed
- L1DataDef def;
- for (it = thresholds.begin(); it != thresholds.end(); ++it)
- {
- if ((*it)->type() == def.xsType())
- {
- TriggerThresholdValue *tv = (*it)->triggerThresholdValue(0, 0);
+ for ( const auto& thresh : allThresholds ) {
+ if ( thresh->type() == L1DataDef::xsType()) {
- int threshNumber = (*it)->thresholdNumber();
- unsigned int Ti = (*tv).thresholdValueCount();
+ int threshNumber = thresh->mapping();
+ std::shared_ptr<TrigConf::L1Threshold_Calo> thresh_Calo = std::static_pointer_cast<TrigConf::L1Threshold_Calo>(thresh);
+ unsigned int Ti = thresh_Calo->thrValueCounts();
unsigned long aQTiQ = (0.5 + double(aQ * 1.e-8) * Ti * Ti);
long left = aQTiQ * aQTiQ * fourbQTE;
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/BStoESD_Tier0_HLTConfig_jobOptions.py b/Trigger/TriggerCommon/TriggerJobOpts/share/BStoESD_Tier0_HLTConfig_jobOptions.py
index f0ed4d066650..db9ed22b77b3 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/BStoESD_Tier0_HLTConfig_jobOptions.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/BStoESD_Tier0_HLTConfig_jobOptions.py
@@ -92,7 +92,8 @@ if rec.doTrigger():
if not hasattr(ToolSvc, toolName ):
ToolSvc += eval('calotools.LVL1__%s( toolName )' % toolName)
theTool = getattr(ToolSvc, toolName)
- theTool.LVL1ConfigSvc="TrigConf::TrigConfigSvc/TrigConfigSvc"
+ if 'LVL1ConfigSvc' in theTool.getProperties():
+ theTool.LVL1ConfigSvc="TrigConf::TrigConfigSvc/TrigConfigSvc"
if 'UseNewConfig' in theTool.getProperties():
_log.info("Setting ToolSvc.%s.UseNewConfig to %s", theTool.name(), ConfigFlags.Trigger.readLVL1FromJSON)
theTool.UseNewConfig = ConfigFlags.Trigger.readLVL1FromJSON
--
GitLab
From 54a123cbf4f8026d726697fec723669b7fde52d5 Mon Sep 17 00:00:00 2001
From: Joao Victor Da Fonseca Pinto <joao.victor.da.fonseca.pinto@cern.ch>
Date: Mon, 16 Aug 2021 18:42:32 +0000
Subject: [PATCH 077/272] TrigEgammaEmulatioTool - Round 2 (Bug fix)
---
.../TrigEgammaEmulationL1CaloHypoTool.cxx | 38 ++++++++-------
...ammaEmulationPrecisionElectronHypoTool.cxx | 6 ++-
.../Root/TrigEgammaEmulationToolMT.cxx | 48 ++++++++++---------
.../python/TrigEgammaEmulationToolConfigMT.py | 19 +++-----
.../python/eventLoopHeartBeat.txt | 1 +
.../src/TrigEgammaEmulationToolTest.cxx | 48 ++++++++++++-------
.../python/HLTMenuConfig/Egamma/EgammaDefs.py | 6 +--
7 files changed, 92 insertions(+), 74 deletions(-)
create mode 100644 Trigger/TrigAnalysis/TrigEgammaEmulationTool/python/eventLoopHeartBeat.txt
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationL1CaloHypoTool.cxx b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationL1CaloHypoTool.cxx
index 86a1374affae..9b8aa7b2a057 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationL1CaloHypoTool.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationL1CaloHypoTool.cxx
@@ -36,44 +36,46 @@ bool TrigEgammaEmulationL1CaloHypoTool::decide( const Trig::TrigData &input ) c
std::string l1item = m_l1item;
//for(const auto& l1 : *l1Cont){
- if (l1->roiType() != xAOD::EmTauRoI::EMRoIWord) return true;
-
+ if (l1->roiType() != xAOD::EmTauRoI::EMRoIWord){
+ ATH_MSG_INFO("This roi is not EMRoIWord!");
+ return true;
+ }
float emE = l1->emClus()/Gaudi::Units::GeV; // Cluster energy
float eta = l1->eta(); // eta
float hadCore = l1->hadCore()/Gaudi::Units::GeV; // Hadronic core energy
float emIsol = l1->emIsol()/Gaudi::Units::GeV; // EM Isolation energy
- ATH_MSG_DEBUG("emE = " << emE);
- ATH_MSG_DEBUG("eta = " << eta);
- ATH_MSG_DEBUG("hadCore = " << hadCore);
- ATH_MSG_DEBUG("emIsol = " << emIsol);
+ ATH_MSG_INFO("emE = " << emE);
+ ATH_MSG_INFO("eta = " << eta);
+ ATH_MSG_INFO("hadCore = " << hadCore);
+ ATH_MSG_INFO("emIsol = " << emIsol);
if (boost::contains(l1item,"H")) {
- ATH_MSG_DEBUG("L1 (H) CUT");
+ ATH_MSG_INFO("L1 (H) CUT");
if (!isolationL1(m_hadCoreCutMin,m_hadCoreCutOff,m_hadCoreCutSlope,hadCore,emE)) {
- ATH_MSG_DEBUG("rejected");
+ ATH_MSG_INFO("rejected");
return false;
}
- ATH_MSG_DEBUG("accepted");
+ ATH_MSG_INFO("accepted");
}
if (boost::contains(l1item,"I")) {
- ATH_MSG_DEBUG("L1 (I) CUT");
+ ATH_MSG_INFO("L1 (I) CUT");
if (!isolationL1(m_emIsolCutMin,m_emIsolCutOff,m_emIsolCutSlope,emIsol,emE)) {
- ATH_MSG_DEBUG("rejected");
+ ATH_MSG_INFO("rejected");
return false;
}
- ATH_MSG_DEBUG("accepted");
+ ATH_MSG_INFO("accepted");
}
- ATH_MSG_DEBUG("Apply L1 Et cut " << m_l1threshold << " cluster emE " << emE << " eta " << eta);
+ ATH_MSG_INFO("Apply L1 Et cut " << m_l1threshold << " cluster emE " << emE << " eta " << eta);
if (boost::contains(l1item,"V")) {
- ATH_MSG_DEBUG("L1 (V) CUT");
+ ATH_MSG_INFO("L1 (V) CUT");
if (!variableEtL1(l1item,emE,eta)) {
- ATH_MSG_DEBUG("rejected");
+ ATH_MSG_INFO("rejected");
return false;
}
- ATH_MSG_DEBUG("accepted");
+ ATH_MSG_INFO("accepted");
}
// add new method for this also
else if (emE <= m_l1threshold) { // this cut is confirmed to be <=
@@ -90,7 +92,7 @@ bool TrigEgammaEmulationL1CaloHypoTool::decide( const Trig::TrigData &input ) c
bool TrigEgammaEmulationL1CaloHypoTool::isolationL1(float min, float offset, float slope, float energy, float emE) const
{
if (emE > m_isolMaxCut) {
- ATH_MSG_DEBUG("L1 Isolation skipped, ET > Maximum isolation");
+ ATH_MSG_INFO("L1 Isolation skipped, ET > Maximum isolation");
return true;
}
float isolation = offset + emE*slope;
@@ -102,7 +104,7 @@ bool TrigEgammaEmulationL1CaloHypoTool::isolationL1(float min, float offset, flo
bool value = (energy <= isolation);
- ATH_MSG_DEBUG("L1 Isolation ET = " << energy << " ISOLATION CUT " << isolation);
+ ATH_MSG_INFO("L1 Isolation ET = " << energy << " ISOLATION CUT " << isolation);
return value;
}
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationPrecisionElectronHypoTool.cxx b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationPrecisionElectronHypoTool.cxx
index cfdee07c317d..58a9acd97de6 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationPrecisionElectronHypoTool.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationPrecisionElectronHypoTool.cxx
@@ -67,7 +67,7 @@ bool TrigEgammaEmulationPrecisionElectronHypoTool::decide( const Trig::TrigDat
return false;
}
- ATH_MSG_DEBUG( "; RoI ID = " << roi->roiId() << ": Eta = " << roi->eta() << ", Phi = " << roi->phi() );
+ ATH_MSG_DEBUG( "RoI ID = " << roi->roiId() << ": Eta = " << roi->eta() << ", Phi = " << roi->phi() );
// fill local variables for RoI reference position
double etaRef = roi->eta();
@@ -77,6 +77,8 @@ bool TrigEgammaEmulationPrecisionElectronHypoTool::decide( const Trig::TrigDat
if ( std::abs( phiRef ) > M_PI ) phiRef -= 2*M_PI; // correct phi if outside range
+ ATH_MSG_DEBUG("Electron : et " << el->pt() << " eta = " << el->eta() << " phi = " << el->phi());
+
auto pClus = el->caloCluster();
if(!pClus){
@@ -252,7 +254,7 @@ bool TrigEgammaEmulationPrecisionElectronHypoTool::decide( const Trig::TrigDat
ATH_MSG_DEBUG("relptcone20 = " <<relptcone20 );
ATH_MSG_DEBUG("m_RelPtConeCut = " << m_RelPtConeCut );
- // Evaluating lh *after* retrieving variables for monitoing and debuging purposes
+ // Evaluating lh *after* retrieving variables for monitoing and DEBUGing purposes
ATH_MSG_DEBUG("AthenaLHSelectorTool: TAccept = " << pass);
if ( !pass ){
ATH_MSG_DEBUG("REJECT Likelihood failed");
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationToolMT.cxx b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationToolMT.cxx
index ec94c1bc7b56..3f8c1cff6733 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationToolMT.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationToolMT.cxx
@@ -48,7 +48,7 @@ StatusCode TrigEgammaEmulationToolMT::initialize()
m_accept.addCut("EFTrack" , "Trigger EFTrack step" );
m_accept.addCut("HLT" , "Trigger HLT decision" );
-
+
return StatusCode::SUCCESS;
}
@@ -84,10 +84,11 @@ bool TrigEgammaEmulationToolMT::match( const TrigCompositeUtils::Decision *roi,
output.clear();
if(!roi) {
- ATH_MSG_INFO("no Roi!");
+ ATH_MSG_DEBUG("no Roi!");
return false;
}
+
// Link all selectors with this trig object to easy acesss throut of the chain
// Avoid multiple selectors
output.egammaElectronCBTools=m_egammaElectronCBTools;
@@ -100,8 +101,9 @@ bool TrigEgammaEmulationToolMT::match( const TrigCompositeUtils::Decision *roi,
if(output.signature == "electron"){
for (auto& trigger : m_electronTrigList){
- if(boost::contains(output.trigger,"gsf") && !boost::contains(trigger,"gsf")) continue;
- if(boost::contains(output.trigger,"lrt") && !boost::contains(trigger,"lrt")) continue;
+ if(boost::contains(trigger,"gsf")) continue;
+ if(boost::contains(trigger,"lrt")) continue;
+ ATH_MSG_DEBUG("Matching with " << trigger );
auto vec_el_linkInfo = match()->getFeatures<xAOD::ElectronContainer>(roi,trigger,condition);
@@ -112,9 +114,11 @@ bool TrigEgammaEmulationToolMT::match( const TrigCompositeUtils::Decision *roi,
// Step 5
{
- for(auto&featLinkInfo : vec_el_linkInfo){
+ for(auto&featLinkInfo : vec_el_linkInfo)
+ {
if(!featLinkInfo.isValid()) continue;
- output.electrons.push_back(*featLinkInfo.link);
+ auto el = *featLinkInfo.link;
+ output.electrons.push_back(el);
}
}
@@ -123,7 +127,7 @@ bool TrigEgammaEmulationToolMT::match( const TrigCompositeUtils::Decision *roi,
auto vec_feat = match()->getFeatures<xAOD::CaloClusterContainer>(roi,trigger,condition);
for(auto& featLinkInfo : vec_feat){
if(!featLinkInfo.isValid()) continue;
- output.clusters.push_back(*featLinkInfo.link);
+ output.clusters.push_back(*featLinkInfo.link);
}
}
@@ -138,13 +142,11 @@ bool TrigEgammaEmulationToolMT::match( const TrigCompositeUtils::Decision *roi,
// Step 1
{
- auto featLinkInfo = match()->getFeature<xAOD::TrigEMClusterContainer>(roi,trigger);
- if(featLinkInfo.isValid()){
- output.emCluster = *featLinkInfo.link;
- }
// get rings from container access
output.rings = match()->getRingsFeature(roi);
-
+ if(output.rings){
+ output.emCluster = output.rings->emCluster();
+ }
}
@@ -153,19 +155,19 @@ bool TrigEgammaEmulationToolMT::match( const TrigCompositeUtils::Decision *roi,
{
// L1Calo (step 0)
output.l1 = match()->getL1Feature(roi);
- auto featLinkInfo = match()->getFeature<TrigRoiDescriptorCollection>(roi,trigger);
+ auto featLinkInfo = match()->getFeature<TrigRoiDescriptorCollection>(roi,trigger, condition);
if(featLinkInfo.isValid()){
output.roi = *featLinkInfo.link;
}
}
- ATH_MSG_INFO( "L1 RoI TDET = " << (output.roi?"Yes":"No"));
- ATH_MSG_INFO( "L1 RoI EmTau = " << (output.l1?"Yes":"No"));
- ATH_MSG_INFO( "L2 Cluster = " << (output.emCluster?"Yes":"No"));
- ATH_MSG_INFO( "L2 Rings = " << (output.rings?"Yes":"No"));
- ATH_MSG_INFO( "L2 Electrons = " << (output.trig_electrons.size()));
- ATH_MSG_INFO( "HLT Cluster = " << output.clusters.size());
- ATH_MSG_INFO( "HLT el = " << output.electrons.size());
+ ATH_MSG_DEBUG( "L1 RoI TDET = " << (output.roi?"Yes":"No"));
+ ATH_MSG_DEBUG( "L1 RoI EmTau = " << (output.l1?"Yes":"No"));
+ ATH_MSG_DEBUG( "L2 Cluster = " << (output.emCluster?"Yes":"No"));
+ ATH_MSG_DEBUG( "L2 Rings = " << (output.rings?"Yes":"No"));
+ ATH_MSG_DEBUG( "L2 Electrons = " << (output.trig_electrons.size()));
+ ATH_MSG_DEBUG( "HLT Cluster = " << output.clusters.size());
+ ATH_MSG_DEBUG( "HLT el = " << output.electrons.size());
}// has electron
@@ -272,11 +274,11 @@ void TrigData::clear()
bool TrigData::isValid() const
{
- return (this->roi && this->l1 && this->emCluster && this->rings);
+ bool passed = (this->roi && this->l1 && this->emCluster && this->rings);
if (this->signature == "photon"){
- return (this->trig_photon && !this->photons.empty());
+ return (this->trig_photon && !this->photons.empty() && passed);
}else if (this->signature == "electron"){
- return (!this->trig_electrons.empty() && !this->electrons.empty());
+ return (!this->trig_electrons.empty() && !this->electrons.empty() && passed);
}else{
return false;
}
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/python/TrigEgammaEmulationToolConfigMT.py b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/python/TrigEgammaEmulationToolConfigMT.py
index 98dd9e42e79b..3fbb332a86b6 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/python/TrigEgammaEmulationToolConfigMT.py
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/python/TrigEgammaEmulationToolConfigMT.py
@@ -120,17 +120,11 @@ class TrigEgammaEmulationToolConfig:
def setupL1Calo( self, name , info):
from AthenaConfiguration.ComponentFactory import CompFactory
- from AthenaCommon.SystemOfUnits import GeV
import re
#chainName = info['chainName']
L1Item = info['chainParts'][0]['L1threshold']
L1thr = float( re.findall(r'\d+', L1Item)[0] )
-
- print('AKI JOAO L1')
- print(L1Item)
- print(L1thr)
-
wp = 0 # default
# [Default, Tight , Medium, Loose ]
@@ -145,7 +139,7 @@ class TrigEgammaEmulationToolConfig:
L1CaloTool = CompFactory.Trig.TrigEgammaEmulationL1CaloHypoTool(
name = name,
L1Item = L1Item,
- L1Thr = L1thr * GeV,
+ L1Thr = L1thr,
HadCoreCutMin = HadCoreCutMin[wp],
HadCoreCutOff = HadCoreCutOff[wp],
HadCoreSlope = HadCoreSlope[wp],
@@ -167,10 +161,12 @@ class TrigEgammaEmulationToolConfig:
def TrigEgammaEmulationToolTestConfig(inputFlags):
from AthenaConfiguration.ComponentFactory import CompFactory
- triggerList = [ "HLT_e17_lhvloose_L1EM15VHI",
+ triggerList = [
+ "HLT_e17_lhvloose_L1EM15VHI",
"HLT_e5_etcut_L1EM3",
"HLT_e26_lhtight_L1EM22VHI",
- "HLT_g20_loose_L1EM15"]
+ "HLT_g20_loose_L1EM15"
+ ]
'''Function to configures some algorithms in the monitoring system.'''
# The following class will make a sequence, configure algorithms, and link
@@ -228,8 +224,7 @@ if __name__=='__main__':
# Set the Athena configuration flags
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- path = '/afs/cern.ch/work/j/jodafons/public/valid_sampleA/valid1.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.AOD.e5112_s3214_d1663_r12711_tid25855934_00/AOD.25855934._000067.pool.root.1'
-
+ path = '/afs/cern.ch/work/j/jodafons/public/valid_sampleA/valid1.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.AOD.e5112_s3214_d1664_r12711_tid25855898_00/AOD.25855898._000124.pool.root.1'
ConfigFlags.Input.Files = [path]
ConfigFlags.Input.isMC = True
ConfigFlags.Output.HISTFileName = 'TrigEgammaMonitorOutput.root'
@@ -245,7 +240,7 @@ if __name__=='__main__':
# If you want to turn on more detailed messages ...
cfg.printConfig(withDetails=False) # set True for exhaustive info
- cfg.run(-1) #use cfg.run(20) to only run on first 20 events
+ cfg.run(20) #use cfg.run(20) to only run on first 20 events
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/python/eventLoopHeartBeat.txt b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/python/eventLoopHeartBeat.txt
new file mode 100644
index 000000000000..34a371e5a11b
--- /dev/null
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/python/eventLoopHeartBeat.txt
@@ -0,0 +1 @@
+ done processing event #91575, run #311000 13 events read so far <<<===
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.cxx b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.cxx
index a9a94c04e094..a027c900332b 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.cxx
@@ -27,9 +27,9 @@ TrigEgammaEmulationToolTest::~TrigEgammaEmulationToolTest() { }
StatusCode TrigEgammaEmulationToolTest::initialize() {
- ATH_MSG_INFO("Initializing " << name() << "...");
+ ATH_MSG_DEBUG("Initializing " << name() << "...");
ATH_CHECK(AthMonitorAlgorithm::initialize());
- ATH_MSG_INFO("Retrieving tools...");
+ ATH_MSG_DEBUG("Retrieving tools...");
ATH_CHECK(m_trigdec.retrieve());
ATH_CHECK(m_offElectronKey.initialize());
@@ -56,7 +56,7 @@ StatusCode TrigEgammaEmulationToolTest::initialize() {
StatusCode TrigEgammaEmulationToolTest::fillHistograms( const EventContext &ctx ) const
{
- ATH_MSG_INFO("=============== Start Event ===============");
+ ATH_MSG_DEBUG("=============== Start Event ===============");
SG::ReadHandle<xAOD::EventInfo> eventInfo = GetEventInfo (ctx);
if( !eventInfo.isValid() ){
@@ -75,31 +75,36 @@ StatusCode TrigEgammaEmulationToolTest::fillHistograms( const EventContext &ctx
return StatusCode::SUCCESS;
}
- ATH_MSG_INFO( "Electron size is " << offElectrons->size() );
+ ATH_MSG_DEBUG( "Electron size is " << offElectrons->size() );
for (const auto &trigger : m_electronTriggerList)
{
auto info = getInfo(trigger);
- ATH_MSG_INFO(trigger);
+ ATH_MSG_DEBUG(trigger);
for (const auto &el : *offElectrons)
{
+
+
+ ATH_MSG_DEBUG( "Offline Electron cluster object is "<< el->caloCluster());
const TrigCompositeUtils::Decision *dec=nullptr;
- m_matchTool->match(el,trigger,dec, TrigDefs::includeFailedDecisions);
-
+ //m_matchTool->match(el,trigger,dec, TrigDefs::includeFailedDecisions);
+ m_matchTool->match(el,trigger,dec, TrigDefs::Physics);
+
if (!dec) {
- ATH_MSG_INFO("e/g matching fail. skip...");
+ ATH_MSG_DEBUG("e/g matching fail. skip...");
continue;
}
auto accept = setAccept(dec, info);
auto emu_accept = m_emulatorTool->emulate( dec, info.trigger );
- ATH_MSG_INFO( "trigger: " << info.trigger << " (tdt/emu)");
- ATH_MSG_INFO( "L1Calo : " << accept.getCutResult(0) << " / " << emu_accept.getCutResult(0));
- ATH_MSG_INFO( "L2Calo : " << accept.getCutResult(1) << " / " << emu_accept.getCutResult(1));
- ATH_MSG_INFO( "L2 : " << accept.getCutResult(2) << " / " << emu_accept.getCutResult(2));
- ATH_MSG_INFO( "EFCalo : " << accept.getCutResult(3) << " / " << emu_accept.getCutResult(3));
- ATH_MSG_INFO( "HLT : " << accept.getCutResult(5) << " / " << emu_accept.getCutResult(5));
+ ATH_MSG_DEBUG( "trigger : " << info.trigger << " (tdt/emu)");
+ ATH_MSG_DEBUG( "L1Calo : " << accept.getCutResult(0) << " / " << emu_accept.getCutResult(0));
+ ATH_MSG_DEBUG( "L2Calo : " << accept.getCutResult(1) << " / " << emu_accept.getCutResult(1));
+ ATH_MSG_DEBUG( "L2 : " << accept.getCutResult(2) << " / " << emu_accept.getCutResult(2));
+ ATH_MSG_DEBUG( "EFCalo : " << accept.getCutResult(3) << " / " << emu_accept.getCutResult(3));
+ ATH_MSG_DEBUG( "EFTrack : " << accept.getCutResult(4) << " / " << emu_accept.getCutResult(4));
+ ATH_MSG_DEBUG( "HLT : " << accept.getCutResult(5) << " / " << emu_accept.getCutResult(5));
auto monGroup = getGroup( trigger );
@@ -145,7 +150,7 @@ StatusCode TrigEgammaEmulationToolTest::fillHistograms( const EventContext &ctx
}
- ATH_MSG_INFO("================= End Event =================");
+ ATH_MSG_DEBUG("================= End Event =================");
return StatusCode::SUCCESS;
}
@@ -206,7 +211,8 @@ asg::AcceptData TrigEgammaEmulationToolTest::setAccept( const TrigCompositeUtils
passedEFTrk=true;// Assume true for photons
// Step 6
- if(info.trigger == "electron"){
+ if(info.type == "electron"){
+
if( info.etcut || info.idperf){// etcut or idperf
passedEF = true; // since we dont run the preciseElectron step
}else{
@@ -236,6 +242,7 @@ asg::AcceptData TrigEgammaEmulationToolTest::setAccept( const TrigCompositeUtils
acceptData.setCutResult("EFCalo",passedEFCalo);
acceptData.setCutResult("EFTrack",passedEFTrk);
acceptData.setCutResult("HLT",passedEF);
+
ATH_MSG_DEBUG("Accept results:");
ATH_MSG_DEBUG("L1: "<< passedL1Calo);
ATH_MSG_DEBUG("L2Calo: " << passedL2Calo);
@@ -263,6 +270,15 @@ TrigEgammaEmulationToolTest::TrigInfo TrigEgammaEmulationToolTest::getInfo( std:
std::string str_thr = strs.at(1);
str_thr.erase(0, 1);
float et = atof(str_thr.c_str());
+
+ ATH_MSG_DEBUG("type : " << type );
+ ATH_MSG_DEBUG("idperf : " << (idperf?"Yes":"No"));
+ ATH_MSG_DEBUG("etcut : " << (etcut?"Yes":"No"));
+ ATH_MSG_DEBUG("gsf : " << (gsf?"Yes":"No"));
+ ATH_MSG_DEBUG("lrt : " << (lrt?"Yes":"No"));
+
+
+
return TrigEgammaEmulationToolTest::TrigInfo{trigger,type,et,etcut,idperf,gsf,lrt};
}
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/EgammaDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/EgammaDefs.py
index 698fc6710609..c0521a3b6b13 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/EgammaDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/EgammaDefs.py
@@ -260,7 +260,7 @@ def createTrigEgammaFastCaloSelectors(ConfigFilePath=None):
selectors = []
for pidname , name in SelectorNames.items():
log.debug('Configuring electron ringer PID for %s', pidname)
- SelectorTool=CompFactory.Ringer__AsgRingerSelectorTool(name)
+ SelectorTool=CompFactory.Ringer.AsgRingerSelectorTool(name)
SelectorTool.ConfigFiles = [ (ConfigFilePath+'/'+path) for path in ToolConfigFile[pidname] ]
selectors.append(SelectorTool)
return selectors
@@ -299,7 +299,7 @@ def createTrigEgammaFastElectronSelectors(ConfigFilePath=None):
selectors = []
for pidname , name in SelectorNames.items():
log.debug('Configuring electron ringer PID for %s', pidname)
- SelectorTool=CompFactory.Ringer__AsgRingerSelectorTool(name)
+ SelectorTool=CompFactory.Ringer.AsgRingerSelectorTool(name)
SelectorTool.ConfigFiles = [ (ConfigFilePath+'/'+path) for path in ToolConfigFile[pidname] ]
selectors.append(SelectorTool)
return selectors
@@ -331,7 +331,7 @@ def createTrigEgammaFastPhotonSelectors(ConfigFilePath=None):
selectors = []
for pidname , name in SelectorNames.items():
log.debug('Configuring electron ringer PID for %s', pidname)
- SelectorTool=CompFactory.Ringer__AsgRingerSelectorTool(name)
+ SelectorTool=CompFactory.Ringer.AsgRingerSelectorTool(name)
SelectorTool.ConfigFiles = [ (ConfigFilePath+'/'+path) for path in ToolConfigFile[pidname] ]
selectors.append(SelectorTool)
return selectors
--
GitLab
From 11fc833afb501bc90960df4fa88960a1a45bdaa9 Mon Sep 17 00:00:00 2001
From: Kunihiro Nagano <kunihiro.nagano@cern.ch>
Date: Mon, 16 Aug 2021 18:44:19 +0000
Subject: [PATCH 078/272] redesign HitDV hypo and put protection against large
HitDV space points EDM
---
.../python/TrigFastTrackFinder_Config.py | 7 +-
.../src/TrigFastTrackFinder.cxx | 30 +-
...itDVHypoTool.py => TrigHitDVHypoConfig.py} | 58 +-
.../src/TrigHitDVHypoAlg.cxx | 755 ++++++++++++++++-
.../src/TrigHitDVHypoAlg.h | 28 +-
.../src/TrigHitDVHypoTool.cxx | 765 +++---------------
.../src/TrigHitDVHypoTool.h | 18 +-
.../TriggerEDMAuxAccessors.h | 8 +-
.../HitDVConfiguration.py | 16 +-
9 files changed, 951 insertions(+), 734 deletions(-)
rename Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/python/{TrigHitDVHypoTool.py => TrigHitDVHypoConfig.py} (86%)
diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
index 211035686074..b6ebad037e9e 100755
--- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
+++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
@@ -323,11 +323,8 @@ class TrigFastTrackFinderBase(TrigFastTrackFinder):
if config.doHitDV:
self.doHitDV_Seeding = True
self.RecJetRoI = "HLT_RecJETRoIs"
- # commented out temporarly due to HLT truncation issue (ATR-23958)
- # self.HitDVTrk = recordable("HLT_HitDVTrk")
- # self.HitDVSP = recordable("HLT_HitDVSP")
- self.HitDVTrk = "HLT_HitDVTrk"
- self.HitDVSP = "HLT_HitDVSP"
+ self.HitDVTrk = "HLT_HitDVTrk" # not 'recordable' due to HLT truncation (ATR-23958)
+ self.HitDVSP = "HLT_HitDVSP" # not 'recordable' due to HLT truncation (ATR-23958)
self.doDisappearingTrk = config.doDisappearingTrk
if config.doDisappearingTrk:
diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
index 04b2553127d4..eb2c87575567 100644
--- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
+++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
@@ -1522,11 +1522,15 @@ StatusCode TrigFastTrackFinder::findHitDV(const EventContext& ctx, const std::ve
std::vector<float> v_sp_r;
std::vector<float> v_sp_phi;
std::vector<int> v_sp_layer;
- std::vector<int> v_sp_isPix;
- std::vector<int> v_sp_isSct;
+ std::vector<bool> v_sp_isPix;
+ std::vector<bool> v_sp_isSct;
std::vector<int> v_sp_usedTrkId;
- for(unsigned int iSp=0; iSp<convertedSpacePoints.size(); iSp++) {
+ for(unsigned int iSp=0; iSp<convertedSpacePoints.size(); ++iSp) {
+
+ bool isPix = convertedSpacePoints[iSp].isPixel();
+ bool isSct = convertedSpacePoints[iSp].isSCT();
+ if( ! isPix && ! isSct ) continue;
const Trk::SpacePoint* sp = convertedSpacePoints[iSp].offlineSpacePoint();
const Amg::Vector3D& pos_sp = sp->globalPosition();
@@ -1556,8 +1560,6 @@ StatusCode TrigFastTrackFinder::findHitDV(const EventContext& ctx, const std::ve
n_sp++;
if( usedTrack_id != -1 ) n_sp_usedByTrk++;
int layer = convertedSpacePoints[iSp].layer();
- int isPix = convertedSpacePoints[iSp].isPixel() ? 1 : 0;
- int isSct = convertedSpacePoints[iSp].isSCT() ? 1 : 0;
float sp_r = convertedSpacePoints[iSp].r();
v_sp_eta.push_back(sp_eta);
@@ -1646,6 +1648,8 @@ StatusCode TrigFastTrackFinder::findHitDV(const EventContext& ctx, const std::ve
// space points
const float SPCUT_DELTA_R_TO_SEED = 0.6;
+ unsigned int n_sp_stored = 0;
+ const unsigned int N_MAX_SP_STORED = 100000;
for(unsigned int iSp=0; iSp<v_sp_eta.size(); ++iSp) {
float sp_eta = v_sp_eta[iSp];
float sp_phi = v_sp_phi[iSp];
@@ -1659,16 +1663,18 @@ StatusCode TrigFastTrackFinder::findHitDV(const EventContext& ctx, const std::ve
}
if( ! isNearSeed ) continue;
}
+ ++n_sp_stored;
+ if( n_sp_stored > N_MAX_SP_STORED ) break;
xAOD::TrigComposite *hitDVSP = new xAOD::TrigComposite();
hitDVSP->makePrivateStore();
hitDVSPContainer->push_back(hitDVSP);
- hitDVSP->setDetail<float>("hitDVSP_eta", v_sp_eta[iSp]);
- hitDVSP->setDetail<float>("hitDVSP_r", v_sp_r[iSp]);
- hitDVSP->setDetail<float>("hitDVSP_phi", v_sp_phi[iSp]);
- hitDVSP->setDetail<int> ("hitDVSP_layer", v_sp_layer[iSp]);
- hitDVSP->setDetail<int> ("hitDVSP_isPix", v_sp_isPix[iSp]);
- hitDVSP->setDetail<int> ("hitDVSP_isSct", v_sp_isSct[iSp]);
- hitDVSP->setDetail<int> ("hitDVSP_usedTrkId", v_sp_usedTrkId[iSp]);
+ hitDVSP->setDetail<float> ("hitDVSP_eta", v_sp_eta[iSp]);
+ hitDVSP->setDetail<float> ("hitDVSP_r", v_sp_r[iSp]);
+ hitDVSP->setDetail<float> ("hitDVSP_phi", v_sp_phi[iSp]);
+ hitDVSP->setDetail<int16_t>("hitDVSP_layer", (int16_t)v_sp_layer[iSp]);
+ hitDVSP->setDetail<bool> ("hitDVSP_isPix", v_sp_isPix[iSp]);
+ hitDVSP->setDetail<bool> ("hitDVSP_isSct", v_sp_isSct[iSp]);
+ hitDVSP->setDetail<int16_t>("hitDVSP_usedTrkId", (int16_t)v_sp_usedTrkId[iSp]);
}
// record
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/python/TrigHitDVHypoTool.py b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/python/TrigHitDVHypoConfig.py
similarity index 86%
rename from Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/python/TrigHitDVHypoTool.py
rename to Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/python/TrigHitDVHypoConfig.py
index d460b56236cf..d74b310b4fe3 100644
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/python/TrigHitDVHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/python/TrigHitDVHypoConfig.py
@@ -1,32 +1,33 @@
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.Logging import logging
-log = logging.getLogger("TrigLongLivedParticlesHypo.TrigHitDVHypoTool")
-
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
-log = logging.getLogger('TrigHitDVHypoTool')
+def createTrigHitDVHypoAlg(name):
+ # make the Hypo
+ from TrigLongLivedParticlesHypo.TrigLongLivedParticlesHypoConf import (TrigHitDVHypoAlg)
+
+ # Setup the hypothesis algorithm
+ theHitDVHypo = TrigHitDVHypoAlg(name)
+
+ from TrigEDMConfig.TriggerEDMRun3 import recordable
+ theHitDVHypo.HitDV = recordable("HLT_HitDV")
-def TrigHitDVHypoToolFromDict( chainDict ):
- """ Use menu decoded chain dictionary to configure the tool """
- cparts = [i for i in chainDict['chainParts'] if i['signature']=='UnconventionalTracking']
- thresholds = sum([ [cpart['threshold']]*int(cpart['multiplicity']) for cpart in cparts], [])
-
- name = chainDict['chainName']
- from AthenaConfiguration.ComponentFactory import CompFactory
- tool = CompFactory.TrigHitDVHypoTool(name)
+ if ConfigFlags.Input.isMC:
+ theHitDVHypo.isMC = True
+ else:
+ theHitDVHypo.isMC = False
# monioring
- #
-
monTool = GenericMonitoringTool("IM_MonTool"+name)
monTool.defineHistogram('jet_pt', type='TH1F', path='EXPERT', title="p_{T}^{jet} [GeV];p_{T}^{jet} [GeV];Nevents", xbins=50, xmin=0, xmax=300)
monTool.defineHistogram('jet_eta', type='TH1F', path='EXPERT', title="#eta^{jet} (after p_{T}^{jet} cut);#eta^{jet};Nevents", xbins=50, xmin=-5.0, xmax=5.0)
#
+ monTool.defineHistogram('n_dvtrks', type='TH1F', path='EXPERT', title="Nr of HitDVTrks;N HitDVTrks size;Nevents", xbins=50, xmin=0, xmax=1000)
+ monTool.defineHistogram('n_dvsps', type='TH1F', path='EXPERT', title="Nr of HitDVSPs;N HitDVSPs size;Nevents", xbins=50, xmin=0, xmax=110000)
monTool.defineHistogram('n_jetseeds', type='TH1F', path='EXPERT', title="Nr of Jet Seeds;N jet seeds;Nevents", xbins=50, xmin=0, xmax=100)
monTool.defineHistogram('n_spseeds', type='TH1F', path='EXPERT', title="Nr of Ly6/Ly7 SP-doublet Seeds;N sp seeds;Nevents", xbins=50, xmin=0, xmax=100)
- monTool.defineHistogram('n_passed_jet', type='TH1F', path='EXPERT', title="Nr of BDT passed from jet seed;N passed (jet seed);Nevents", xbins=30, xmin=0, xmax=30)
- monTool.defineHistogram('n_passed_sp', type='TH1F', path='EXPERT', title="Nr of BDT passed from SP-doublet seed;N passed (sp seed);Nevents", xbins=30, xmin=0, xmax=30)
monTool.defineHistogram('average_mu', type='TH1F', path='EXPERT', title="Average mu;Average mu;Nevents", xbins=100, xmin=0, xmax=100)
#
monTool.defineHistogram('eta1_ly0_spfr', type='TH1F', path='EXPERT', title="Layer#0 hit fraction (|#eta|<1);Hit fraction;Nevents", xbins=50, xmin=0.0, xmax=1.0)
@@ -50,11 +51,25 @@ def TrigHitDVHypoToolFromDict( chainDict ):
monTool.defineHistogram('1eta2_n_qtrk', type='TH1F', path='EXPERT', title="Nr of quality tracks (1<|#eta|<2);Nr of quality tracks;Nevents", xbins=20, xmin=0, xmax=20)
monTool.defineHistogram('1eta2_bdtscore', type='TH1F', path='EXPERT', title="BDT score (1<|#eta|<2);BDT score;Nevents", xbins=50, xmin=-1.0, xmax=1.0)
- monTool.HistPath = 'HitDVHypoAlg/'+tool.getName()
- tool.MonTool = monTool
+ monTool.HistPath = 'HitDVHypoAlg'
+ theHitDVHypo.MonTool = monTool
+
+ return theHitDVHypo
+
+
+def TrigHitDVHypoToolFromDict( chainDict ):
+
+ log = logging.getLogger('TrigHitDVHypoTool')
+
+ """ Use menu decoded chain dictionary to configure the tool """
+ cparts = [i for i in chainDict['chainParts'] if i['signature']=='UnconventionalTracking']
+ thresholds = sum([ [cpart['threshold']]*int(cpart['multiplicity']) for cpart in cparts], [])
+
+ name = chainDict['chainName']
+ from AthenaConfiguration.ComponentFactory import CompFactory
+ tool = CompFactory.TrigHitDVHypoTool(name)
# set thresholds
- #
strThr = ""
@@ -102,10 +117,3 @@ def TrigHitDVHypoToolFromName( name, conf ):
decodedDict = dictFromChainName(conf)
return TrigHitDVHypoToolFromDict( decodedDict )
-
-
-
-if __name__ == "__main__":
- tool = TrigHitDVHypoToolFromName("HLT_unconvtrk30_dedx_medium_L1XE50", "HLT_unconvtrk30_dedx_medium_L1XE50")
- assert tool, "Not configured simple tool"
- log.debug("ALL OK")
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoAlg.cxx b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoAlg.cxx
index 9f28c9fffe99..e2ad6be5de2d 100644
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoAlg.cxx
@@ -1,13 +1,16 @@
/*
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
- * Trigger Hypo Tool, that is aimed at triggering large dEdx tracks
+ * Trigger Hypo Tool, that is aimed at triggering displaced vertex
* author Kunihiro Nagano <kunihiro.nagano@cern.ch> - KEK
*/
#include "TrigHitDVHypoAlg.h"
#include "AthViews/ViewHelper.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
#include "GaudiKernel/SystemOfUnits.h"
+#include "AthenaMonitoringKernel/Monitored.h"
+#include "GaudiKernel/PhysicalConstants.h"
+#include "PathResolver/PathResolver.h"
using TrigCompositeUtils::createAndStore;
using TrigCompositeUtils::DecisionContainer;
@@ -26,11 +29,17 @@ using TrigCompositeUtils::allFailed;
using xAOD::JetContainer;
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+
TrigHitDVHypoAlg::TrigHitDVHypoAlg( const std::string& name,
ISvcLocator* pSvcLocator ) :
::HypoBase( name, pSvcLocator ),
m_lumiBlockMuTool("LumiBlockMuTool/LumiBlockMuTool") {}
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+
StatusCode TrigHitDVHypoAlg::initialize()
{
CHECK( m_hypoTools.retrieve() );
@@ -40,30 +49,66 @@ StatusCode TrigHitDVHypoAlg::initialize()
CHECK( m_hitDVKey.initialize());
CHECK( m_lumiDataKey.initialize(!m_isMC) );
+ if ( !m_monTool.empty() ) CHECK( m_monTool.retrieve() );
+
+ m_tmva_reader = new TMVA::Reader( "!Color:!Silent" );
+ m_tmva_reader->AddVariable("n_track_qual", &m_tmva_n_track_qual);
+ m_tmva_reader->AddVariable("ly0_sp_frac", &m_tmva_ly0_sp_frac);
+ m_tmva_reader->AddVariable("ly1_sp_frac", &m_tmva_ly1_sp_frac);
+ m_tmva_reader->AddVariable("ly2_sp_frac", &m_tmva_ly2_sp_frac);
+ m_tmva_reader->AddVariable("ly3_sp_frac", &m_tmva_ly3_sp_frac);
+ m_tmva_reader->AddVariable("ly4_sp_frac", &m_tmva_ly4_sp_frac);
+ m_tmva_reader->AddVariable("ly5_sp_frac", &m_tmva_ly5_sp_frac);
+ m_tmva_reader->AddVariable("ly6_sp_frac", &m_tmva_ly6_sp_frac);
+ m_tmva_reader->AddVariable("ly7_sp_frac", &m_tmva_ly7_sp_frac);
+
+ // --- Book the MVA methods
+ const std::string tuningVer = "v21a";
+ const std::string methodName = "BDT method";
+
+ std::string file = "TrigHitDVHypo/HitDV.BDT.weights." + tuningVer + ".xml";
+ std::string weightfile = PathResolver::find_calib_file(file.c_str());
+ ATH_MSG_DEBUG("opening weightfile = " << weightfile);
+ m_tmva_reader->BookMVA(methodName, weightfile);
+
return StatusCode::SUCCESS;
}
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+
StatusCode TrigHitDVHypoAlg::execute( const EventContext& context ) const
{
+ // monitoring
+ auto mon_n_dvtrks = Monitored::Scalar( "n_dvtrks", -999. );
+ auto mon_n_dvsps = Monitored::Scalar( "n_dvsps", -999. );
+ auto mon_n_jetseeds = Monitored::Scalar( "n_jetseeds", -999. );
+ auto mon_n_spseeds = Monitored::Scalar( "n_spseeds", -999. );
+ auto mon_average_mu = Monitored::Scalar( "average_mu", -999. );
+ auto monitorIt = Monitored::Group( m_monTool, mon_n_dvtrks, mon_n_dvsps, mon_n_jetseeds, mon_n_spseeds, mon_average_mu );
+
+ // previous decisions
+ ATH_MSG_DEBUG( "Retrieving pervious decision: \"" << decisionInput().key() << "\"" );
auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context );
ATH_CHECK( previousDecisionsHandle.isValid() );
- // new output decisions
- ATH_MSG_DEBUG( "Creating new output decision handle" );
- SG::WriteHandle<DecisionContainer> outputHandle = createAndStore(decisionOutput(), context );
- auto decisions = outputHandle.ptr();
-
- // previous decisions
ATH_MSG_DEBUG( "Running with " << previousDecisionsHandle->size() << " previous decisions" );
- if(previousDecisionsHandle->size()!=1) {
- ATH_MSG_ERROR( "Previous decision handle size isn't 1. It is" << previousDecisionsHandle->size() );
+ if( previousDecisionsHandle->size()!=1 ) {
+ ATH_MSG_ERROR( "Previous decision handle size is not 1. It is" << previousDecisionsHandle->size() );
return StatusCode::FAILURE;
}
const Decision * previousDecision = previousDecisionsHandle->at(0);
TrigCompositeUtils::DecisionIDContainer previousDecisionIDs;
TrigCompositeUtils::decisionIDs(previousDecision, previousDecisionIDs);
-
+ ATH_MSG_DEBUG( "IDs of active legs:" );
+ for(auto decisionID: previousDecisionIDs) { ATH_MSG_DEBUG( " " << decisionID ); }
+
+ // new output decisions
+ ATH_MSG_DEBUG( "Creating new output decision handle" );
+ SG::WriteHandle<DecisionContainer> outputHandle = createAndStore(decisionOutput(), context );
+ auto outputDecisions = outputHandle.ptr();
+
// input objects
// jets
@@ -86,6 +131,7 @@ StatusCode TrigHitDVHypoAlg::execute( const EventContext& context ) const
ATH_CHECK( hitDVSPHandle.isValid() );
ATH_MSG_DEBUG( "hitDVSP handle size: " << hitDVSPHandle->size() );
+
const xAOD::TrigCompositeContainer * hitDVTrksContainer = hitDVTrkHandle.get();
const xAOD::TrigCompositeContainer * hitDVSPsContainer = hitDVSPHandle.get();
@@ -98,6 +144,12 @@ StatusCode TrigHitDVHypoAlg::execute( const EventContext& context ) const
return StatusCode::FAILURE;
}
+ mon_n_dvtrks = hitDVTrksContainer->size();
+ mon_n_dvsps = hitDVSPsContainer->size();
+ const unsigned int N_MAX_SP_STORED = 100000;
+ bool isSPOverflow = false;
+ if( hitDVSPsContainer->size() >= N_MAX_SP_STORED ) isSPOverflow = true;
+
// average mu
float averageMu = 0;
if( m_isMC ) {
@@ -111,42 +163,691 @@ StatusCode TrigHitDVHypoAlg::execute( const EventContext& context ) const
averageMu = lcd.cptr()->lbAverageInteractionsPerCrossing();
ATH_MSG_DEBUG( "online averageMu = " << averageMu );
}
+ mon_average_mu = averageMu;
+
+ // find seeds based on HLT jets
+ std::vector<float> jetSeeds_pt;
+ std::vector<float> jetSeeds_eta;
+ std::vector<float> jetSeeds_phi;
+ ATH_CHECK( findJetSeeds(jetsContainer, 30.0, 2.0, jetSeeds_pt, jetSeeds_eta, jetSeeds_phi) );
+ mon_n_jetseeds = jetSeeds_eta.size();
+
+ // find seeds based on SP frac itself
+ std::vector<float> spSeeds_eta;
+ std::vector<float> spSeeds_phi;
+ ATH_CHECK( findSPSeeds(hitDVSPsContainer, spSeeds_eta, spSeeds_phi) );
+ mon_n_spseeds = spSeeds_eta.size();
// output EDM object
auto hitDVContainer = std::make_unique<xAOD::TrigCompositeContainer>();
auto hitDVContainerAux = std::make_unique<xAOD::TrigCompositeAuxContainer>();
hitDVContainer->setStore(hitDVContainerAux.get());
- // create decision
- auto d = newDecisionIn( decisions , previousDecision, hypoAlgNodeName(), context );
- TrigHitDVHypoTool::TrackInfo trkInfo{ d, averageMu, jetsContainer, hitDVTrksContainer, hitDVSPsContainer, hitDVContainer.get(), previousDecisionIDs };
+ xAOD::TrigCompositeContainer* dvContainer = hitDVContainer.get();
+
+ // calculate BDT and create hitDVContainer EDM
+ const float preselBDTthreshold = -0.6;
+
+ int n_passed_jet = 0;
+ int seed_type = 0;
+ ATH_CHECK( calculateBDT(hitDVSPsContainer, hitDVTrksContainer, jetSeeds_pt, jetSeeds_eta, jetSeeds_phi, preselBDTthreshold, seed_type, dvContainer, n_passed_jet) );
+
+ int n_passed_sp = 0;
+ std::vector<float> void_pt;
+ seed_type = 1;
+ ATH_CHECK( calculateBDT(hitDVSPsContainer, hitDVTrksContainer, void_pt, spSeeds_eta, spSeeds_phi, preselBDTthreshold, seed_type, dvContainer, n_passed_sp) );
+
+ ATH_MSG_DEBUG( "nr of dv container / jet-seeded / sp-seed candidates = " << dvContainer->size() << " / " << n_passed_jet << " / " << n_passed_sp );
+
+ // Prepare inputs to HypoTool
+ std::vector<TrigHitDVHypoTool::HitDVHypoInfo> hitDVHypoInputs;
+
+ for ( auto dv : *dvContainer ) {
+ Decision* newDecision = TrigCompositeUtils::newDecisionIn( outputDecisions, previousDecision, TrigCompositeUtils::hypoAlgNodeName(), context);
+
+ ElementLink<xAOD::TrigCompositeContainer> dvEL = ElementLink<xAOD::TrigCompositeContainer>(*outputHandle, dv->index());
+ ATH_CHECK( dvEL.isValid() );
+
+ ATH_CHECK( newDecision->setObjectLink<xAOD::TrigCompositeContainer>(TrigCompositeUtils::featureString(), dvEL) );
+
+ TrigHitDVHypoTool::HitDVHypoInfo hypoInfo{ newDecision, isSPOverflow, averageMu, dv, previousDecisionIDs };
+ hitDVHypoInputs.push_back( hypoInfo );
+ }
+
+ // monitor
+ ATH_CHECK( doMonitor(dvContainer) );
// Loop over all hypoToolinputs and get their decisions
for ( auto & tool: m_hypoTools ) {
- ATH_CHECK( tool->decide( trkInfo ) );
+ ATH_MSG_DEBUG( "+++++ Now computing decision for " << tool->name() );
+ ATH_CHECK( tool->decide( hitDVHypoInputs ) );
}
- DecisionContainer::iterator it = decisions->begin();
- bool isPassed = false;
- while(it != decisions->end()) {
- if (allFailed( *it )) {
- it = decisions->erase(it);
+ DecisionContainer::iterator it = outputDecisions->begin();
+ while(it != outputDecisions->end()) {
+ ATH_MSG_DEBUG( "+++++ outputDecision: " << *it << " +++++" );
+ if ( allFailed( *it ) ) {
+ ATH_MSG_DEBUG( "---> all failed, erasing" );
+ it = outputDecisions->erase(it);
} else {
- isPassed = true;
+ ATH_MSG_DEBUG( "---> not all failed" );
++it;
}
}
- // record link to EDM object if it is passed
- if( isPassed ) {
- // record hitDV object
- SG::WriteHandle<xAOD::TrigCompositeContainer> hitDVHandle(m_hitDVKey, context);
- ATH_CHECK( hitDVHandle.record( std::move( hitDVContainer ), std::move( hitDVContainerAux ) ) );
- ATH_CHECK( d->setObjectLink( featureString(), ElementLink<xAOD::TrigCompositeContainer>( m_hitDVKey.key(), 0) ) );
- }
+ // record hitDV object
+ SG::WriteHandle<xAOD::TrigCompositeContainer> hitDVHandle(m_hitDVKey, context);
+ ATH_CHECK( hitDVHandle.record( std::move( hitDVContainer ), std::move( hitDVContainerAux ) ) );
+ ATH_MSG_DEBUG( "recorded hitDV object to SG" );
+ //
ATH_CHECK( hypoBaseOutputProcessing(outputHandle) );
//
return StatusCode::SUCCESS;
}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+
+float TrigHitDVHypoAlg::deltaR(float eta_1, float phi_1, float eta_2, float phi_2) const
+{
+ float dPhi = phi_1 - phi_2;
+ if (dPhi < -TMath::Pi()) dPhi += 2*TMath::Pi();
+ if (dPhi > TMath::Pi()) dPhi -= 2*TMath::Pi();
+ float dEta = eta_1 - eta_2;
+ return std::sqrt(dPhi*dPhi+dEta*dEta);
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+
+int TrigHitDVHypoAlg::getSPLayer(int layer, float eta) const
+{
+ float abseta = std::fabs(eta);
+
+ // if Pixel/SCT barrel, layer number is as it is
+ if( 0<=layer && layer <=7 ) {
+ ATH_MSG_DEBUG("layer=" << layer << ", eta=" << abseta);
+ return layer;
+ }
+
+ // for Pixel/SCT endcap, assign layer number of 0-7 depending on eta range
+
+ int base = 0;
+
+ //
+ const float PixBR6limit = 1.29612;
+ const float PixBR5limit = 1.45204;
+ const float PixBR4limit = 1.64909;
+ const float PixBR3limit = 1.90036;
+ const float PixBR2limit = 2.2146;
+
+ // Pixel Endcap #1
+ base = 8;
+ if( layer==base || layer==(base+12) ) {
+ ATH_MSG_DEBUG("Pix EC1, eta=" << abseta);
+ if( abseta > PixBR2limit ) return 2;
+ return 3;
+ }
+
+ // Pixel Endcap #2
+ base = 9;
+ if( layer==base || layer==(base+12) ) {
+ ATH_MSG_DEBUG("Pix EC2, eta=" << abseta);
+ if( abseta > PixBR2limit ) return 2;
+ return 3;
+ }
+
+ // Pixel Endcap #3
+ base = 10;
+ if( layer==base || layer==(base+12) ) {
+ ATH_MSG_DEBUG("Pix EC3, eta=" << abseta);
+ return 3;
+ }
+
+ // SCT Endcap #1
+ base = 11;
+ if( layer==base || layer==(base+12) ) {
+ ATH_MSG_DEBUG("Sct EC1, eta=" << abseta);
+ if( abseta < PixBR6limit ) return 7;
+ else if( abseta < PixBR5limit ) return 6;
+ return 5;
+ }
+
+ // SCT Endcap #2
+ base = 12;
+ if( layer==base || layer==(base+12) ) {
+ ATH_MSG_DEBUG("Sct EC2, eta=" << abseta);
+ if( abseta < PixBR5limit ) return 7;
+ else if( abseta < PixBR4limit ) return 6;
+ return 4;
+ }
+
+ // SCT Endcap #3
+ base = 13;
+ if( layer==base || layer==(base+12) ) {
+ ATH_MSG_DEBUG("Sct EC3, eta=" << abseta);
+ if( abseta < PixBR4limit ) return 7;
+ return 5;
+ }
+
+ // SCT Endcap #4
+ base = 14;
+ if( layer==base || layer==(base+12) ) {
+ ATH_MSG_DEBUG("Sct EC4, eta=" << abseta);
+ if( abseta < PixBR4limit ) return 6;
+ else if( abseta < PixBR3limit ) return 6;
+ return 4;
+ }
+
+ // SCT Endcap #5
+ base = 15;
+ if( layer==base || layer==(base+12) ) {
+ ATH_MSG_DEBUG("Sct EC5, eta=" << abseta);
+ if( abseta < PixBR3limit ) return 7;
+ return 5;
+ }
+
+ // SCT Endcap #6
+ base = 16;
+ if( layer==base || layer==(base+12) ) {
+ ATH_MSG_DEBUG("Sct EC6, eta=" << abseta);
+ if( abseta < PixBR3limit ) return 6;
+ return 4;
+ }
+
+ // SCT Endcap #7
+ base = 17;
+ if( layer==base || layer==(base+12) ) {
+ ATH_MSG_DEBUG("Sct EC7, eta=" << abseta);
+ if( abseta < PixBR3limit ) return 7;
+ return 5;
+ }
+
+ // SCT Endcap #8
+ base = 18;
+ if( layer==base || layer==(base+12) ) {
+ ATH_MSG_DEBUG("Sct EC8, eta=" << abseta);
+ if( abseta < PixBR3limit ) return 7;
+ return 6;
+ }
+
+ // SCT Endcap #9
+ base = 19;
+ if( layer==base || layer==(base+12) ) {
+ ATH_MSG_DEBUG("Sct EC9, eta=" << abseta);
+ return 7;
+ }
+
+ return 0;
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+
+StatusCode TrigHitDVHypoAlg::doMonitor(const xAOD::TrigCompositeContainer* dvContainer ) const
+{
+ std::vector<float> mnt_eta1_ly0_spfr;
+ std::vector<float> mnt_eta1_ly1_spfr;
+ std::vector<float> mnt_eta1_ly2_spfr;
+ std::vector<float> mnt_eta1_ly3_spfr;
+ std::vector<float> mnt_eta1_ly4_spfr;
+ std::vector<float> mnt_eta1_ly5_spfr;
+ std::vector<float> mnt_eta1_ly6_spfr;
+ std::vector<float> mnt_eta1_ly7_spfr;
+ std::vector<int> mnt_eta1_n_qtrk;
+ std::vector<float> mnt_eta1_bdtscore;
+ std::vector<float> mnt_1eta2_ly0_spfr;
+ std::vector<float> mnt_1eta2_ly1_spfr;
+ std::vector<float> mnt_1eta2_ly2_spfr;
+ std::vector<float> mnt_1eta2_ly3_spfr;
+ std::vector<float> mnt_1eta2_ly4_spfr;
+ std::vector<float> mnt_1eta2_ly5_spfr;
+ std::vector<float> mnt_1eta2_ly6_spfr;
+ std::vector<float> mnt_1eta2_ly7_spfr;
+ std::vector<int> mnt_1eta2_n_qtrk;
+ std::vector<float> mnt_1eta2_bdtscore;
+ auto mon_eta1_ly0_spfr = Monitored::Collection("eta1_ly0_spfr", mnt_eta1_ly0_spfr);
+ auto mon_eta1_ly1_spfr = Monitored::Collection("eta1_ly1_spfr", mnt_eta1_ly1_spfr);
+ auto mon_eta1_ly2_spfr = Monitored::Collection("eta1_ly2_spfr", mnt_eta1_ly2_spfr);
+ auto mon_eta1_ly3_spfr = Monitored::Collection("eta1_ly3_spfr", mnt_eta1_ly3_spfr);
+ auto mon_eta1_ly4_spfr = Monitored::Collection("eta1_ly4_spfr", mnt_eta1_ly4_spfr);
+ auto mon_eta1_ly5_spfr = Monitored::Collection("eta1_ly5_spfr", mnt_eta1_ly5_spfr);
+ auto mon_eta1_ly6_spfr = Monitored::Collection("eta1_ly6_spfr", mnt_eta1_ly6_spfr);
+ auto mon_eta1_ly7_spfr = Monitored::Collection("eta1_ly7_spfr", mnt_eta1_ly7_spfr);
+ auto mon_eta1_n_qtrk = Monitored::Collection("eta1_n_qtrk", mnt_eta1_n_qtrk);
+ auto mon_eta1_bdtscore = Monitored::Collection("eta1_bdtscore", mnt_eta1_bdtscore);
+ auto mon_1eta2_ly0_spfr = Monitored::Collection("1eta2_ly0_spfr", mnt_1eta2_ly0_spfr);
+ auto mon_1eta2_ly1_spfr = Monitored::Collection("1eta2_ly1_spfr", mnt_1eta2_ly1_spfr);
+ auto mon_1eta2_ly2_spfr = Monitored::Collection("1eta2_ly2_spfr", mnt_1eta2_ly2_spfr);
+ auto mon_1eta2_ly3_spfr = Monitored::Collection("1eta2_ly3_spfr", mnt_1eta2_ly3_spfr);
+ auto mon_1eta2_ly4_spfr = Monitored::Collection("1eta2_ly4_spfr", mnt_1eta2_ly4_spfr);
+ auto mon_1eta2_ly5_spfr = Monitored::Collection("1eta2_ly5_spfr", mnt_1eta2_ly5_spfr);
+ auto mon_1eta2_ly6_spfr = Monitored::Collection("1eta2_ly6_spfr", mnt_1eta2_ly6_spfr);
+ auto mon_1eta2_ly7_spfr = Monitored::Collection("1eta2_ly7_spfr", mnt_1eta2_ly7_spfr);
+ auto mon_1eta2_n_qtrk = Monitored::Collection("1eta2_n_qtrk", mnt_1eta2_n_qtrk);
+ auto mon_1eta2_bdtscore = Monitored::Collection("1eta2_bdtscore", mnt_1eta2_bdtscore);
+ auto monitorIt = Monitored::Group( m_monTool,
+ mon_eta1_ly0_spfr, mon_eta1_ly1_spfr, mon_eta1_ly2_spfr, mon_eta1_ly3_spfr,
+ mon_eta1_ly4_spfr, mon_eta1_ly5_spfr, mon_eta1_ly6_spfr, mon_eta1_ly7_spfr,
+ mon_eta1_n_qtrk, mon_eta1_bdtscore,
+ mon_1eta2_ly0_spfr, mon_1eta2_ly1_spfr, mon_1eta2_ly2_spfr, mon_1eta2_ly3_spfr,
+ mon_1eta2_ly4_spfr, mon_1eta2_ly5_spfr, mon_1eta2_ly6_spfr, mon_1eta2_ly7_spfr,
+ mon_1eta2_n_qtrk, mon_1eta2_bdtscore);
+
+ //
+ for ( auto dv : *dvContainer ) {
+ float seed_eta = dv->getDetail<float>("hitDV_seed_eta");
+ int n_track_qual= dv->getDetail<int> ("hitDV_n_track_qual");
+ float bdt_score = dv->getDetail<float>("hitDV_bdt_score");
+ float ly0_sp_frac = dv->getDetail<float>("hitDV_ly0_sp_frac");
+ float ly1_sp_frac = dv->getDetail<float>("hitDV_ly1_sp_frac");
+ float ly2_sp_frac = dv->getDetail<float>("hitDV_ly2_sp_frac");
+ float ly3_sp_frac = dv->getDetail<float>("hitDV_ly3_sp_frac");
+ float ly4_sp_frac = dv->getDetail<float>("hitDV_ly4_sp_frac");
+ float ly5_sp_frac = dv->getDetail<float>("hitDV_ly5_sp_frac");
+ float ly6_sp_frac = dv->getDetail<float>("hitDV_ly6_sp_frac");
+ float ly7_sp_frac = dv->getDetail<float>("hitDV_ly7_sp_frac");
+
+ if( std::abs(seed_eta) < 1.0 ) {
+ mnt_eta1_ly0_spfr.push_back(ly0_sp_frac);
+ mnt_eta1_ly1_spfr.push_back(ly1_sp_frac);
+ mnt_eta1_ly2_spfr.push_back(ly2_sp_frac);
+ mnt_eta1_ly3_spfr.push_back(ly3_sp_frac);
+ mnt_eta1_ly4_spfr.push_back(ly4_sp_frac);
+ mnt_eta1_ly5_spfr.push_back(ly5_sp_frac);
+ mnt_eta1_ly6_spfr.push_back(ly6_sp_frac);
+ mnt_eta1_ly7_spfr.push_back(ly7_sp_frac);
+ mnt_eta1_n_qtrk.push_back(n_track_qual);
+ mnt_eta1_bdtscore.push_back(bdt_score);
+ }
+ else if( std::abs(seed_eta) < 2.0 ) {
+ mnt_1eta2_ly0_spfr.push_back(ly0_sp_frac);
+ mnt_1eta2_ly1_spfr.push_back(ly1_sp_frac);
+ mnt_1eta2_ly2_spfr.push_back(ly2_sp_frac);
+ mnt_1eta2_ly3_spfr.push_back(ly3_sp_frac);
+ mnt_1eta2_ly4_spfr.push_back(ly4_sp_frac);
+ mnt_1eta2_ly5_spfr.push_back(ly5_sp_frac);
+ mnt_1eta2_ly6_spfr.push_back(ly6_sp_frac);
+ mnt_1eta2_ly7_spfr.push_back(ly7_sp_frac);
+ mnt_1eta2_n_qtrk.push_back(n_track_qual);
+ mnt_1eta2_bdtscore.push_back(bdt_score);
+ }
+ }
+
+ //
+ return StatusCode::SUCCESS;
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+
+StatusCode TrigHitDVHypoAlg::calculateBDT(const xAOD::TrigCompositeContainer* spsContainer,
+ const xAOD::TrigCompositeContainer* trksContainer,
+ const std::vector<float>& seeds_pt, const std::vector<float>& seeds_eta, const std::vector<float>& seeds_phi,
+ const float& cutBDTthreshold, const int seed_type,
+ xAOD::TrigCompositeContainer* dvContainer, int& n_passed) const
+{
+ if( seeds_eta.size() != seeds_phi.size() ) return StatusCode::SUCCESS;
+ n_passed = 0;
+
+ for(unsigned int iseed=0; iseed<seeds_eta.size(); iseed++) {
+
+ float seed_eta = seeds_eta[iseed];
+ float seed_phi = seeds_phi[iseed];
+
+ ATH_MSG_DEBUG("+++++ seed eta: " << seed_eta << ", phi:" << seed_phi << " +++++");
+
+ // loop on space points
+ const int N_LAYER = 8;
+ const float DR_TO_REF_CUT = 0.4;
+
+ int n_sp_injet = 0; int n_pixsp_injet = 0; int n_sctsp_injet = 0;
+ int n_sp_injet_usedByTrk = 0; int n_pixsp_injet_usedByTrk = 0; int n_sctsp_injet_usedByTrk = 0;
+ int v_n_sp_injet[N_LAYER];
+ int v_n_sp_injet_usedByTrk[N_LAYER];
+ for(int i=0; i<N_LAYER; i++) { v_n_sp_injet[i]=0; v_n_sp_injet_usedByTrk[i]=0; }
+
+ for ( auto spData : *spsContainer ) {
+ // match within dR
+ float sp_eta = spData->getDetail<float>("hitDVSP_eta");
+ float sp_phi = spData->getDetail<float>("hitDVSP_phi");
+ float dr = deltaR(sp_eta,sp_phi,seed_eta,seed_phi);
+ if( dr > DR_TO_REF_CUT ) continue;
+
+ //
+ bool isPix = spData->getDetail<bool>("hitDVSP_isPix");
+ bool isSct = spData->getDetail<bool>("hitDVSP_isSct");
+
+ int sp_layer = (int)spData->getDetail<int16_t>("hitDVSP_layer");
+ int sp_trkid = (int)spData->getDetail<int16_t>("hitDVSP_usedTrkId");
+ bool isUsedByTrk = (sp_trkid != -1);
+
+ int ilayer = getSPLayer(sp_layer,sp_eta);
+
+ if( ilayer<=7 ) { // Pixel barrel or Sct barrel
+ n_sp_injet++;
+ v_n_sp_injet[ilayer]++;
+ if( isPix ) n_pixsp_injet++;
+ if( isSct ) n_sctsp_injet++;
+ if( isUsedByTrk ) {
+ n_sp_injet_usedByTrk++;
+ v_n_sp_injet_usedByTrk[ilayer]++;
+ if( isPix ) n_pixsp_injet_usedByTrk++;
+ if( isSct ) n_sctsp_injet_usedByTrk++;
+ }
+ }
+ }
+ ATH_MSG_DEBUG("nr of SPs in jet: usedByTrk / all = " << n_sp_injet_usedByTrk << " / " << n_sp_injet);
+ float v_ly_sp_frac[N_LAYER];
+ for(int i=0; i<N_LAYER; i++) {
+ float frac = 0.;
+ if( v_n_sp_injet[i] > 0 ) frac = 1.0 - (float)v_n_sp_injet_usedByTrk[i] / (float)v_n_sp_injet[i];
+ v_ly_sp_frac[i] = frac;
+ ATH_MSG_DEBUG("Layer " << i << ": frac=" << v_ly_sp_frac[i] << ", n used / all = " << v_n_sp_injet_usedByTrk[i] << " / " << v_n_sp_injet[i]);
+ }
+
+ // loop on tracks
+ const float TRK_PT_CUT = 2.0;
+
+ unsigned int n_qtrk_injet = 0;
+ for ( auto trk : *trksContainer ) {
+ float trk_pt = trk->getDetail<float>("hitDVTrk_pt");
+ trk_pt /= 1000;
+ if( trk_pt < TRK_PT_CUT ) continue;
+ float trk_eta = trk->getDetail<float>("hitDVTrk_eta");
+ float trk_phi = trk->getDetail<float>("hitDVTrk_phi");
+ float dr = deltaR(trk_eta,trk_phi,seed_eta,seed_phi);
+ if( dr > DR_TO_REF_CUT ) continue;
+ n_qtrk_injet++;
+ }
+ ATH_MSG_DEBUG("nr of quality tracks in jet = " << n_qtrk_injet);
+
+ // evaluate BDT
+ m_tmva_n_track_qual = (float)n_qtrk_injet;
+ m_tmva_ly0_sp_frac = v_ly_sp_frac[0];
+ m_tmva_ly1_sp_frac = v_ly_sp_frac[1];
+ m_tmva_ly2_sp_frac = v_ly_sp_frac[2];
+ m_tmva_ly3_sp_frac = v_ly_sp_frac[3];
+ m_tmva_ly4_sp_frac = v_ly_sp_frac[4];
+ m_tmva_ly5_sp_frac = v_ly_sp_frac[5];
+ m_tmva_ly6_sp_frac = v_ly_sp_frac[6];
+ m_tmva_ly7_sp_frac = v_ly_sp_frac[7];
+ float bdt_score = m_tmva_reader->EvaluateMVA("BDT method");
+
+ // BDT threshold
+ if( bdt_score < cutBDTthreshold ) continue;
+
+ // passed selection
+ ATH_MSG_DEBUG("Passed selection");
+ n_passed++;
+
+ // create EDM object
+ xAOD::TrigComposite *dv = new xAOD::TrigComposite();
+ dv->makePrivateStore();
+ dvContainer->push_back(dv);
+
+ float seed_pt = 0;
+ if ( seed_type == 0 ) seed_pt = seeds_pt[iseed];
+ dv->setDetail<float>("hitDV_seed_pt", seed_pt);
+ dv->setDetail<float>("hitDV_seed_eta", seed_eta);
+ dv->setDetail<float>("hitDV_seed_phi", seed_phi);
+ dv->setDetail<int> ("hitDV_seed_type", seed_type);
+ dv->setDetail<int> ("hitDV_n_track_qual", n_qtrk_injet);
+ dv->setDetail<float>("hitDV_ly0_sp_frac", v_ly_sp_frac[0]);
+ dv->setDetail<float>("hitDV_ly1_sp_frac", v_ly_sp_frac[1]);
+ dv->setDetail<float>("hitDV_ly2_sp_frac", v_ly_sp_frac[2]);
+ dv->setDetail<float>("hitDV_ly3_sp_frac", v_ly_sp_frac[3]);
+ dv->setDetail<float>("hitDV_ly4_sp_frac", v_ly_sp_frac[4]);
+ dv->setDetail<float>("hitDV_ly5_sp_frac", v_ly_sp_frac[5]);
+ dv->setDetail<float>("hitDV_ly6_sp_frac", v_ly_sp_frac[6]);
+ dv->setDetail<float>("hitDV_ly7_sp_frac", v_ly_sp_frac[7]);
+ dv->setDetail<float>("hitDV_bdt_score", bdt_score);
+
+ ATH_MSG_DEBUG("Created a new entry EDM");
+ }
+ ATH_MSG_DEBUG("nr of BDT passed = " << n_passed);
+
+ //
+ return StatusCode::SUCCESS;
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+
+StatusCode TrigHitDVHypoAlg::findJetSeeds(const xAOD::JetContainer* jetsContainer, const float cutJetPt, const float cutJetEta,
+ std::vector<float>& jetSeeds_pt, std::vector<float>& jetSeeds_eta, std::vector<float>& jetSeeds_phi) const
+{
+ std::vector<float> mnt_jet_pt;
+ std::vector<float> mnt_jet_eta;
+ auto mon_jet_pt = Monitored::Collection("jet_pt", mnt_jet_pt);
+ auto mon_jet_eta = Monitored::Collection("jet_eta", mnt_jet_eta);
+ auto monitorIt = Monitored::Group( m_monTool, mon_jet_pt, mon_jet_eta );
+
+ ATH_MSG_DEBUG("looking for jet seed with pt cut=" << cutJetPt << ", eta cut=" << cutJetEta);
+ for ( const xAOD::Jet* jet : *jetsContainer ) {
+ float jet_pt = (float)jet->pt() / 1000.0;
+ mnt_jet_pt.push_back(jet_pt);
+ if( jet_pt < cutJetPt ) {
+ ATH_MSG_DEBUG("Fails jet pt cut, pt = " << jet_pt);
+ continue;
+ }
+ float jet_eta = (float)jet->eta();
+ mnt_jet_eta.push_back(jet_eta);
+ if( std::fabs(jet_eta) > cutJetEta ) {
+ ATH_MSG_DEBUG("Fails jet eta cut, eta = " << jet_eta);
+ continue;
+ }
+ float jet_phi = (float)jet->phi();
+ jetSeeds_pt.push_back(jet_pt);
+ jetSeeds_eta.push_back(jet_eta);
+ jetSeeds_phi.push_back(jet_phi);
+ }
+ ATH_MSG_DEBUG("nr of jet seeds=" << jetSeeds_eta.size());
+
+ return StatusCode::SUCCESS;
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+
+StatusCode TrigHitDVHypoAlg::findSPSeeds( const xAOD::TrigCompositeContainer* spsContainer,
+ std::vector<float>& seeds_eta, std::vector<float>& seeds_phi ) const
+{
+ seeds_eta.clear();
+ seeds_phi.clear();
+
+ const int NBINS_ETA = 50;
+ const float ETA_MIN = -2.5;
+ const float ETA_MAX = 2.5;
+
+ const int NBINS_PHI = 80;
+ const float PHI_MIN = -4.0;
+ const float PHI_MAX = 4.0;
+
+ std::string hname;
+
+ hname = "ly6_h2_nsp";
+ std::unique_ptr<TH2F> ly6_h2_nsp = std::make_unique<TH2F>(hname.c_str(),hname.c_str(),NBINS_ETA,ETA_MIN,ETA_MAX,NBINS_PHI,PHI_MIN,PHI_MAX);
+ hname = "ly7_h2_nsp";
+ std::unique_ptr<TH2F> ly7_h2_nsp = std::make_unique<TH2F>(hname.c_str(),hname.c_str(),NBINS_ETA,ETA_MIN,ETA_MAX,NBINS_PHI,PHI_MIN,PHI_MAX);
+
+ hname = "ly6_h2_nsp_notrk";
+ std::unique_ptr<TH2F> ly6_h2_nsp_notrk = std::make_unique<TH2F>(hname.c_str(),hname.c_str(),NBINS_ETA,ETA_MIN,ETA_MAX,NBINS_PHI,PHI_MIN,PHI_MAX);
+ hname = "ly7_h2_nsp_notrk";
+ std::unique_ptr<TH2F> ly7_h2_nsp_notrk = std::make_unique<TH2F>(hname.c_str(),hname.c_str(),NBINS_ETA,ETA_MIN,ETA_MAX,NBINS_PHI,PHI_MIN,PHI_MAX);
+
+ for ( auto spData : *spsContainer ) {
+ int sp_layer = (int)spData->getDetail<int16_t>("hitDVSP_layer");
+ float sp_eta = spData->getDetail<float>("hitDVSP_eta");
+ int ilayer = getSPLayer(sp_layer,sp_eta);
+ if( ilayer<6 ) continue;
+
+ int sp_trkid = (int)spData->getDetail<int16_t>("hitDVSP_usedTrkId");
+ bool isUsedByTrk = (sp_trkid != -1);
+ float sp_phi = spData->getDetail<float>("hitDVSP_phi");
+
+ bool fill_out_of_pi = false;
+ float sp_phi2 = 0;
+ if( sp_phi < 0 ) {
+ sp_phi2 = 2*TMath::Pi() + sp_phi;
+ if( sp_phi2 < PHI_MAX ) fill_out_of_pi = true;
+ }
+ else {
+ sp_phi2 = -2*TMath::Pi() + sp_phi;
+ if( PHI_MIN < sp_phi2 ) fill_out_of_pi = true;
+ }
+ if( ilayer==6 ) {
+ ly6_h2_nsp->Fill(sp_eta,sp_phi);
+ if( fill_out_of_pi ) ly6_h2_nsp->Fill(sp_eta,sp_phi2);
+ if( ! isUsedByTrk ) ly6_h2_nsp_notrk->Fill(sp_eta,sp_phi);
+ if( ! isUsedByTrk && fill_out_of_pi) ly6_h2_nsp_notrk->Fill(sp_eta,sp_phi2);
+ }
+ if( ilayer==7 ) {
+ ly7_h2_nsp->Fill(sp_eta,sp_phi);
+ if( fill_out_of_pi ) ly7_h2_nsp->Fill(sp_eta,sp_phi2);
+ if( ! isUsedByTrk ) ly7_h2_nsp_notrk->Fill(sp_eta,sp_phi);
+ if( ! isUsedByTrk && fill_out_of_pi) ly7_h2_nsp_notrk->Fill(sp_eta,sp_phi2);
+ }
+ }
+
+ ATH_MSG_DEBUG("looking for ly6/ly6 doublet seeds");
+
+ // (idx, sort/weight, eta, phi)
+ std::vector<std::tuple<int,float,float,float>> QT;
+
+ for(int ly6_ieta=1; ly6_ieta<=NBINS_ETA; ly6_ieta++) {
+ float ly6_eta = (ly6_h2_nsp->GetXaxis()->GetBinLowEdge(ly6_ieta) + ly6_h2_nsp->GetXaxis()->GetBinUpEdge(ly6_ieta))/2.0;
+ for(int ly6_iphi=1; ly6_iphi<=NBINS_PHI; ly6_iphi++) {
+ float ly6_phi = (ly6_h2_nsp->GetYaxis()->GetBinLowEdge(ly6_iphi) + ly6_h2_nsp->GetYaxis()->GetBinUpEdge(ly6_iphi))/2.0;
+
+ float ly6_nsp = ly6_h2_nsp ->GetBinContent(ly6_ieta,ly6_iphi);
+ float ly6_nsp_notrk = ly6_h2_nsp_notrk->GetBinContent(ly6_ieta,ly6_iphi);
+ float ly6_frac = ( ly6_nsp > 0 ) ? ly6_nsp_notrk / ly6_nsp : 0;
+ if( ly6_nsp < 10 || ly6_frac < 0.85 ) continue;
+
+ float ly7_frac_max = 0;
+ float ly7_eta_max = 0;
+ float ly7_phi_max = 0;
+ for(int ly7_ieta=std::max(1,ly6_ieta-1); ly7_ieta<std::min(NBINS_ETA,ly6_ieta+1); ly7_ieta++) {
+ for(int ly7_iphi=std::max(1,ly6_iphi-1); ly7_iphi<=std::min(NBINS_PHI,ly6_iphi+1); ly7_iphi++) {
+ float ly7_nsp = ly7_h2_nsp ->GetBinContent(ly7_ieta,ly7_iphi);
+ float ly7_nsp_notrk = ly7_h2_nsp_notrk->GetBinContent(ly7_ieta,ly7_iphi);
+ float ly7_frac = ( ly7_nsp > 0 ) ? ly7_nsp_notrk / ly7_nsp : 0;
+ if( ly7_nsp < 10 ) continue;
+ if( ly7_frac > ly7_frac_max ) {
+ ly7_frac_max = ly7_frac;
+ ly7_eta_max = (ly7_h2_nsp->GetXaxis()->GetBinLowEdge(ly7_ieta) + ly7_h2_nsp->GetXaxis()->GetBinUpEdge(ly7_ieta))/2.0;
+ ly7_phi_max = (ly7_h2_nsp->GetXaxis()->GetBinLowEdge(ly7_iphi) + ly7_h2_nsp->GetXaxis()->GetBinUpEdge(ly7_iphi))/2.0;
+ }
+ }
+ }
+ if( ly7_frac_max < 0.85 ) continue;
+ //
+ float wsum = ly6_frac + ly7_frac_max;
+ float weta = (ly6_eta*ly6_frac + ly7_eta_max*ly7_frac_max) / wsum;
+ float wphi = (ly6_phi*ly6_frac + ly7_phi_max*ly7_frac_max) / wsum;
+ float w = wsum / 2.0;
+ QT.push_back(std::make_tuple(-1,w,weta,wphi));
+ }
+ }
+ ATH_MSG_DEBUG("nr of ly6/ly7 doublet candidate seeds=" << QT.size() << ", doing clustering...");
+
+ // sort
+ std::sort(QT.begin(), QT.end(),
+ [](const std::tuple<int,float,float,float>& lhs, const std::tuple<int,float,float,float>& rhs) {
+ return std::get<1>(lhs) > std::get<1>(rhs); } );
+
+ // clustering
+ const double CLUSTCUT_DIST = 0.2;
+ const double CLUSTCUT_SEED_FRAC = 0.9;
+
+ std::vector<float> seeds_wsum;
+
+ for(unsigned int i=0; i<QT.size(); i++) {
+ float phi = std::get<3>(QT[i]);
+ float eta = std::get<2>(QT[i]);
+ float w = std::get<1>(QT[i]);
+ if(i==0) {
+ seeds_eta.push_back(w*eta); seeds_phi.push_back(w*phi);
+ seeds_wsum.push_back(w);
+ continue;
+ }
+ const int IDX_INITIAL = 100;
+ float dist_min = 100.0;
+ int idx_min = IDX_INITIAL;
+ for(unsigned j=0; j<seeds_eta.size(); j++) {
+ float ceta = seeds_eta[j]/seeds_wsum[j];
+ float cphi = seeds_phi[j]/seeds_wsum[j];
+ // intentionally calculate in this way as phi is defined beyond -Pi/Pi (no boundary)
+ float deta = std::fabs(ceta-eta);
+ float dphi = std::fabs(cphi-phi);
+ float dist = std::sqrt(dphi*dphi+deta*deta);
+ if( dist < dist_min ) {
+ dist_min = dist;
+ idx_min = j;
+ }
+ }
+ int match_idx = IDX_INITIAL;
+ if( idx_min != IDX_INITIAL ) {
+ if( dist_min < CLUSTCUT_DIST ) { match_idx = idx_min; }
+ }
+ if( match_idx == IDX_INITIAL ) {
+ if( w > CLUSTCUT_SEED_FRAC && dist_min > CLUSTCUT_DIST ) {
+ seeds_eta.push_back(w*eta); seeds_phi.push_back(w*phi);
+ seeds_wsum.push_back(w);
+ }
+ continue;
+ }
+ float new_eta = seeds_eta[match_idx] + w*eta;
+ float new_phi = seeds_phi[match_idx] + w*phi;
+ float new_wsum = seeds_wsum[match_idx] + w;
+ seeds_eta[match_idx] = new_eta;
+ seeds_phi[match_idx] = new_phi;
+ seeds_wsum[match_idx] = new_wsum;
+ }
+ QT.clear();
+ for(unsigned int i=0; i<seeds_eta.size(); i++) {
+ float eta = seeds_eta[i] / seeds_wsum[i];
+ float phi = seeds_phi[i] / seeds_wsum[i];
+ seeds_eta[i] = eta;
+ seeds_phi[i] = phi;
+ if( phi < -TMath::Pi() ) phi = 2*TMath::Pi() + phi;
+ if( phi > TMath::Pi() ) phi = -2*TMath::Pi() + phi;
+ seeds_phi[i] = phi;
+ }
+ ATH_MSG_DEBUG("after clustering, nr of seeds = " << seeds_eta.size());
+
+ // delete overlap (can happen at phi=-Pi/Pi bounadry)
+ std::vector<unsigned int> idx_to_delete;
+ for(unsigned int i=0; i<seeds_eta.size(); i++) {
+ if( std::find(idx_to_delete.begin(),idx_to_delete.end(),i) != idx_to_delete.end() ) continue;
+ float eta_i = seeds_eta[i];
+ float phi_i = seeds_phi[i];
+ for(unsigned int j=i+1; j<seeds_eta.size(); j++) {
+ if( std::find(idx_to_delete.begin(),idx_to_delete.end(),j) != idx_to_delete.end() ) continue;
+ float eta_j = seeds_eta[j];
+ float phi_j = seeds_phi[j];
+ float dr = deltaR(eta_i,phi_i,eta_j,phi_j);
+ if( dr < CLUSTCUT_DIST ) idx_to_delete.push_back(j);
+ }
+ }
+ ATH_MSG_DEBUG("nr of duplicated seeds to be removed = " << idx_to_delete.size());
+ if( idx_to_delete.size() > 0 ) {
+ std::sort(idx_to_delete.begin(),idx_to_delete.end());
+ for(unsigned int j=idx_to_delete.size(); j>0; j--) {
+ unsigned int idx = idx_to_delete[j-1];
+ seeds_eta.erase(seeds_eta.begin()+idx);
+ seeds_phi.erase(seeds_phi.begin()+idx);
+ }
+ }
+
+ ATH_MSG_DEBUG("nr of ly6/ly7 seeds=" << seeds_eta.size());
+
+ // return
+ return StatusCode::SUCCESS;
+}
+
+// ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoAlg.h b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoAlg.h
index d219a6e0ed95..a1d3254afc84 100644
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoAlg.h
@@ -29,7 +29,8 @@ public:
virtual StatusCode execute(const EventContext& context) const override;
private:
- ToolHandleArray< TrigHitDVHypoTool > m_hypoTools {this, "HypoTools", {}, "Tools to perfrom selection"};
+
+ ToolHandleArray< TrigHitDVHypoTool > m_hypoTools {this, "HypoTools", {}, "Tools to perform selection"};
// EDMs
SG::ReadHandleKey< xAOD::JetContainer > m_jetsKey {this, "Jets", "HLT_AntiKt4EMTopoJets_subjesIS", ""};
@@ -43,6 +44,31 @@ private:
SG::ReadCondHandleKey<LuminosityCondData> m_lumiDataKey {this, "LuminosityCondDataKey", "LuminosityCondData", ""};
// Property; MC flag.
Gaudi::Property<bool> m_isMC {this, "isMC", false, "Real data or MC"};
+
+ // monitoring
+ ToolHandle<GenericMonitoringTool> m_monTool{ this, "MonTool", "", "Monitoring tool" };
+ StatusCode doMonitor(const xAOD::TrigCompositeContainer*) const;
+
+ //
+ float deltaR(float, float, float, float) const;
+ int getSPLayer(int, float) const;
+ StatusCode findSPSeeds( const xAOD::TrigCompositeContainer*, std::vector<float>&, std::vector<float>& ) const;
+ StatusCode findJetSeeds(const xAOD::JetContainer*, const float, const float, std::vector<float>&, std::vector<float>&, std::vector<float>&) const;
+ StatusCode calculateBDT(const xAOD::TrigCompositeContainer*, const xAOD::TrigCompositeContainer*,
+ const std::vector<float>&, const std::vector<float>&, const std::vector<float>&,
+ const float&, const int, xAOD::TrigCompositeContainer*, int&) const;
+
+ // BDT
+ TMVA::Reader* m_tmva_reader;
+ mutable float m_tmva_n_track_qual ATLAS_THREAD_SAFE;
+ mutable float m_tmva_ly0_sp_frac ATLAS_THREAD_SAFE;
+ mutable float m_tmva_ly1_sp_frac ATLAS_THREAD_SAFE;
+ mutable float m_tmva_ly2_sp_frac ATLAS_THREAD_SAFE;
+ mutable float m_tmva_ly3_sp_frac ATLAS_THREAD_SAFE;
+ mutable float m_tmva_ly4_sp_frac ATLAS_THREAD_SAFE;
+ mutable float m_tmva_ly5_sp_frac ATLAS_THREAD_SAFE;
+ mutable float m_tmva_ly6_sp_frac ATLAS_THREAD_SAFE;
+ mutable float m_tmva_ly7_sp_frac ATLAS_THREAD_SAFE;
};
#endif //> !TRIGLONGLIVEDPARTICLESHYPO_TRIGHITDVHYPOALG_H
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoTool.cxx b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoTool.cxx
index b85878e03601..a72685e034ba 100644
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoTool.cxx
@@ -8,9 +8,7 @@
#include "TrigCompositeUtils/TrigCompositeUtils.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/Combinators.h"
-#include "AthenaMonitoringKernel/Monitored.h"
#include "GaudiKernel/PhysicalConstants.h"
-#include "PathResolver/PathResolver.h"
#include "TrigHitDVHypoTool.h"
using namespace TrigCompositeUtils;
@@ -31,33 +29,12 @@ TrigHitDVHypoTool::~TrigHitDVHypoTool() {}
StatusCode TrigHitDVHypoTool::initialize()
{
- if ( !m_monTool.empty() ) CHECK( m_monTool.retrieve() );
+ ATH_MSG_INFO( "Initialization completed successfully:" );
+ ATH_MSG_INFO( " cutJetPtGeV = " << m_cutJetPtGeV );
+ ATH_MSG_INFO( " cutJetEta = " << m_cutJetEta );
+ ATH_MSG_INFO( " doSPseed = " << m_doSPseed );
- ATH_MSG_INFO("Initialization completed successfully:");
- ATH_MSG_INFO("cutJetPtGeV = " << m_cutJetPtGeV);
- ATH_MSG_INFO("cutJetEta = " << m_cutJetEta);
- ATH_MSG_INFO("doSPseed = " << m_doSPseed);
- ATH_MSG_INFO("Tool configured for chain/id: " << m_decisionId);
-
- m_tmva_reader = new TMVA::Reader( "!Color:!Silent" );
- m_tmva_reader->AddVariable("n_track_qual", &m_tmva_n_track_qual);
- m_tmva_reader->AddVariable("ly0_sp_frac", &m_tmva_ly0_sp_frac);
- m_tmva_reader->AddVariable("ly1_sp_frac", &m_tmva_ly1_sp_frac);
- m_tmva_reader->AddVariable("ly2_sp_frac", &m_tmva_ly2_sp_frac);
- m_tmva_reader->AddVariable("ly3_sp_frac", &m_tmva_ly3_sp_frac);
- m_tmva_reader->AddVariable("ly4_sp_frac", &m_tmva_ly4_sp_frac);
- m_tmva_reader->AddVariable("ly5_sp_frac", &m_tmva_ly5_sp_frac);
- m_tmva_reader->AddVariable("ly6_sp_frac", &m_tmva_ly6_sp_frac);
- m_tmva_reader->AddVariable("ly7_sp_frac", &m_tmva_ly7_sp_frac);
-
- // --- Book the MVA methods
- const std::string tuningVer = "v21a";
- const std::string methodName = "BDT method";
-
- std::string file = "TrigHitDVHypo/HitDV.BDT.weights." + tuningVer + ".xml";
- std::string weightfile = PathResolver::find_calib_file(file.c_str());
- ATH_MSG_DEBUG("opening weightfile = " << weightfile);
- m_tmva_reader->BookMVA(methodName, weightfile);
+ ATH_MSG_INFO( "Tool configured for chain/id: " << m_decisionId );
return StatusCode::SUCCESS;
}
@@ -65,669 +42,179 @@ StatusCode TrigHitDVHypoTool::initialize()
// ------------------------------------------------------------------------------------------------
// ------------------------------------------------------------------------------------------------
-float TrigHitDVHypoTool::deltaR(float eta_1, float phi_1, float eta_2, float phi_2) const
-{
- float dPhi = phi_1 - phi_2;
- if (dPhi < -TMath::Pi()) dPhi += 2*TMath::Pi();
- if (dPhi > TMath::Pi()) dPhi -= 2*TMath::Pi();
- float dEta = eta_1 - eta_2;
- return std::sqrt(dPhi*dPhi+dEta*dEta);
-}
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-
-int TrigHitDVHypoTool::getSPLayer(int layer, float eta) const
+float TrigHitDVHypoTool::getBDTthreshold(float mu) const
{
- float abseta = std::fabs(eta);
-
- // Pixel barrel or SCT barrel
- if( 0<=layer && layer <=7 ) {
- ATH_MSG_DEBUG("layer=" << layer << ", eta=" << abseta);
- return layer;
- }
-
- int base = 0;
-
- //
- const float PixBR6limit = 1.29612;
- const float PixBR5limit = 1.45204;
- const float PixBR4limit = 1.64909;
- const float PixBR3limit = 1.90036;
- const float PixBR2limit = 2.2146;
-
- // Pixel Endcap #1
- base = 8;
- if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Pix EC1, eta=" << abseta);
- if( abseta > PixBR2limit ) return 2;
- return 3;
- }
-
- // Pixel Endcap #2
- base = 9;
- if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Pix EC2, eta=" << abseta);
- if( abseta > PixBR2limit ) return 2;
- return 3;
- }
-
- // Pixel Endcap #3
- base = 10;
- if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Pix EC3, eta=" << abseta);
- return 3;
- }
-
- // SCT Endcap #1
- base = 11;
- if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC1, eta=" << abseta);
- if( abseta < PixBR6limit ) return 7;
- else if( abseta < PixBR5limit ) return 6;
- return 5;
- }
-
- // SCT Endcap #2
- base = 12;
- if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC2, eta=" << abseta);
- if( abseta < PixBR5limit ) return 7;
- else if( abseta < PixBR4limit ) return 6;
- return 4;
- }
-
- // SCT Endcap #3
- base = 13;
- if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC3, eta=" << abseta);
- if( abseta < PixBR4limit ) return 7;
- return 5;
- }
-
- // SCT Endcap #4
- base = 14;
- if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC4, eta=" << abseta);
- if( abseta < PixBR4limit ) return 6;
- else if( abseta < PixBR3limit ) return 6;
- return 4;
- }
-
- // SCT Endcap #5
- base = 15;
- if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC5, eta=" << abseta);
- if( abseta < PixBR3limit ) return 7;
- return 5;
- }
-
- // SCT Endcap #6
- base = 16;
- if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC6, eta=" << abseta);
- if( abseta < PixBR3limit ) return 6;
- return 4;
- }
-
- // SCT Endcap #7
- base = 17;
- if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC7, eta=" << abseta);
- if( abseta < PixBR3limit ) return 7;
- return 5;
- }
-
- // SCT Endcap #8
- base = 18;
- if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC8, eta=" << abseta);
- if( abseta < PixBR3limit ) return 7;
- return 6;
- }
+ const float defaultBDTthreshold = 0.03773; // 70% effi at mu=60
+
+ if( mu<10 || 60<mu ) return defaultBDTthreshold;
- // SCT Endcap #9
- base = 19;
- if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC9, eta=" << abseta);
- return 7;
- }
+ // pol4 fitting
+ const float par0 = 0.404727;
+ const float par1 = -0.00344154;
+ const float par2 = -6.54218e-05;
+ const float par3 = -3.39841e-07;
+ const float par4 = 9.93062e-09;
- return 0;
+ float thres = par0 + par1*mu + par2*mu*mu + par3*mu*mu*mu + par4*mu*mu*mu*mu;
+ return thres;
}
// ------------------------------------------------------------------------------------------------
// ------------------------------------------------------------------------------------------------
-StatusCode TrigHitDVHypoTool::calculateBDT(const xAOD::TrigCompositeContainer* spsContainer,
- const xAOD::TrigCompositeContainer* trksContainer,
- const std::vector<float>& seeds_eta, const std::vector<float>& seeds_phi,
- const float cutBDTthreshold, const int seed_type,
- xAOD::TrigCompositeContainer* dvContainer, int& n_passed) const
+StatusCode TrigHitDVHypoTool::decide( std::vector<HitDVHypoInfo>& toolInputs ) const
{
- if( seeds_eta.size() != seeds_phi.size() ) return StatusCode::SUCCESS;
- n_passed = 0;
-
- // monitoring
- std::vector<float> mnt_eta1_ly0_spfr;
- std::vector<float> mnt_eta1_ly1_spfr;
- std::vector<float> mnt_eta1_ly2_spfr;
- std::vector<float> mnt_eta1_ly3_spfr;
- std::vector<float> mnt_eta1_ly4_spfr;
- std::vector<float> mnt_eta1_ly5_spfr;
- std::vector<float> mnt_eta1_ly6_spfr;
- std::vector<float> mnt_eta1_ly7_spfr;
- std::vector<int> mnt_eta1_n_qtrk;
- std::vector<float> mnt_eta1_bdtscore;
- std::vector<float> mnt_1eta2_ly0_spfr;
- std::vector<float> mnt_1eta2_ly1_spfr;
- std::vector<float> mnt_1eta2_ly2_spfr;
- std::vector<float> mnt_1eta2_ly3_spfr;
- std::vector<float> mnt_1eta2_ly4_spfr;
- std::vector<float> mnt_1eta2_ly5_spfr;
- std::vector<float> mnt_1eta2_ly6_spfr;
- std::vector<float> mnt_1eta2_ly7_spfr;
- std::vector<int> mnt_1eta2_n_qtrk;
- std::vector<float> mnt_1eta2_bdtscore;
- auto mon_eta1_ly0_spfr = Monitored::Collection("eta1_ly0_spfr", mnt_eta1_ly0_spfr);
- auto mon_eta1_ly1_spfr = Monitored::Collection("eta1_ly1_spfr", mnt_eta1_ly1_spfr);
- auto mon_eta1_ly2_spfr = Monitored::Collection("eta1_ly2_spfr", mnt_eta1_ly2_spfr);
- auto mon_eta1_ly3_spfr = Monitored::Collection("eta1_ly3_spfr", mnt_eta1_ly3_spfr);
- auto mon_eta1_ly4_spfr = Monitored::Collection("eta1_ly4_spfr", mnt_eta1_ly4_spfr);
- auto mon_eta1_ly5_spfr = Monitored::Collection("eta1_ly5_spfr", mnt_eta1_ly5_spfr);
- auto mon_eta1_ly6_spfr = Monitored::Collection("eta1_ly6_spfr", mnt_eta1_ly6_spfr);
- auto mon_eta1_ly7_spfr = Monitored::Collection("eta1_ly7_spfr", mnt_eta1_ly7_spfr);
- auto mon_eta1_n_qtrk = Monitored::Collection("eta1_n_qtrk", mnt_eta1_n_qtrk);
- auto mon_eta1_bdtscore = Monitored::Collection("eta1_bdtscore", mnt_eta1_bdtscore);
- auto mon_1eta2_ly0_spfr = Monitored::Collection("1eta2_ly0_spfr", mnt_1eta2_ly0_spfr);
- auto mon_1eta2_ly1_spfr = Monitored::Collection("1eta2_ly1_spfr", mnt_1eta2_ly1_spfr);
- auto mon_1eta2_ly2_spfr = Monitored::Collection("1eta2_ly2_spfr", mnt_1eta2_ly2_spfr);
- auto mon_1eta2_ly3_spfr = Monitored::Collection("1eta2_ly3_spfr", mnt_1eta2_ly3_spfr);
- auto mon_1eta2_ly4_spfr = Monitored::Collection("1eta2_ly4_spfr", mnt_1eta2_ly4_spfr);
- auto mon_1eta2_ly5_spfr = Monitored::Collection("1eta2_ly5_spfr", mnt_1eta2_ly5_spfr);
- auto mon_1eta2_ly6_spfr = Monitored::Collection("1eta2_ly6_spfr", mnt_1eta2_ly6_spfr);
- auto mon_1eta2_ly7_spfr = Monitored::Collection("1eta2_ly7_spfr", mnt_1eta2_ly7_spfr);
- auto mon_1eta2_n_qtrk = Monitored::Collection("1eta2_n_qtrk", mnt_1eta2_n_qtrk);
- auto mon_1eta2_bdtscore = Monitored::Collection("1eta2_bdtscore", mnt_1eta2_bdtscore);
- auto monitorIt = Monitored::Group( m_monTool,
- mon_eta1_ly0_spfr, mon_eta1_ly1_spfr, mon_eta1_ly2_spfr, mon_eta1_ly3_spfr,
- mon_eta1_ly4_spfr, mon_eta1_ly5_spfr, mon_eta1_ly6_spfr, mon_eta1_ly7_spfr,
- mon_eta1_n_qtrk, mon_eta1_bdtscore,
- mon_1eta2_ly0_spfr, mon_1eta2_ly1_spfr, mon_1eta2_ly2_spfr, mon_1eta2_ly3_spfr,
- mon_1eta2_ly4_spfr, mon_1eta2_ly5_spfr, mon_1eta2_ly6_spfr, mon_1eta2_ly7_spfr,
- mon_1eta2_n_qtrk, mon_1eta2_bdtscore);
-
- for(unsigned int iseed=0; iseed<seeds_eta.size(); iseed++) {
-
- float seed_eta = seeds_eta[iseed];
- float seed_phi = seeds_phi[iseed];
-
- ATH_MSG_DEBUG("+++++ seed eta: " << seed_eta << ", phi:" << seed_phi << " +++++");
-
- // loop on space points
- const int N_LAYER = 8;
- const float DR_TO_REF_CUT = 0.4;
-
- int n_sp_injet = 0; int n_pixsp_injet = 0; int n_sctsp_injet = 0;
- int n_sp_injet_usedByTrk = 0; int n_pixsp_injet_usedByTrk = 0; int n_sctsp_injet_usedByTrk = 0;
- int v_n_sp_injet[N_LAYER];
- int v_n_sp_injet_usedByTrk[N_LAYER];
- for(int i=0; i<N_LAYER; i++) { v_n_sp_injet[i]=0; v_n_sp_injet_usedByTrk[i]=0; }
-
- for ( auto spData : *spsContainer ) {
- // match within dR
- float sp_eta = spData->getDetail<float>("hitDVSP_eta");
- float sp_phi = spData->getDetail<float>("hitDVSP_phi");
- float dr = deltaR(sp_eta,sp_phi,seed_eta,seed_phi);
- if( dr > DR_TO_REF_CUT ) continue;
-
- //
- int sp_isPix = spData->getDetail<int>("hitDVSP_isPix");
- int sp_isSct = spData->getDetail<int>("hitDVSP_isSct");
- bool isPix = (sp_isPix == 1);
- bool isSct = (sp_isSct == 1);
-
- int sp_layer = spData->getDetail<int>("hitDVSP_layer");
- int sp_trkid = spData->getDetail<int>("hitDVSP_usedTrkId");
- bool isUsedByTrk = (sp_trkid != -1);
-
- int ilayer = getSPLayer(sp_layer,sp_eta);
-
- if( ilayer<=7 ) { // Pixel barrel or Sct barrel
- n_sp_injet++;
- v_n_sp_injet[ilayer]++;
- if( isPix ) n_pixsp_injet++;
- if( isSct ) n_sctsp_injet++;
- if( isUsedByTrk ) {
- n_sp_injet_usedByTrk++;
- v_n_sp_injet_usedByTrk[ilayer]++;
- if( isPix ) n_pixsp_injet_usedByTrk++;
- if( isSct ) n_sctsp_injet_usedByTrk++;
- }
- }
- }
- ATH_MSG_DEBUG("nr of SPs in jet: usedByTrk / all = " << n_sp_injet_usedByTrk << " / " << n_sp_injet);
- float v_ly_sp_frac[N_LAYER];
- for(int i=0; i<N_LAYER; i++) {
- float frac = 0.;
- if( v_n_sp_injet[i] > 0 ) frac = 1.0 - (float)v_n_sp_injet_usedByTrk[i] / (float)v_n_sp_injet[i];
- v_ly_sp_frac[i] = frac;
- if( std::abs(seed_eta) < 1.0 ) {
- if ( i==0 ) { mnt_eta1_ly0_spfr.push_back(frac); }
- else if( i==1 ) { mnt_eta1_ly1_spfr.push_back(frac); }
- else if( i==2 ) { mnt_eta1_ly2_spfr.push_back(frac); }
- else if( i==3 ) { mnt_eta1_ly3_spfr.push_back(frac); }
- else if( i==4 ) { mnt_eta1_ly4_spfr.push_back(frac); }
- else if( i==5 ) { mnt_eta1_ly5_spfr.push_back(frac); }
- else if( i==6 ) { mnt_eta1_ly6_spfr.push_back(frac); }
- else if( i==7 ) { mnt_eta1_ly7_spfr.push_back(frac); }
- }
- else if( std::abs(seed_eta) < 2.0 ) {
- if ( i==0 ) { mnt_1eta2_ly0_spfr.push_back(frac); }
- else if( i==1 ) { mnt_1eta2_ly1_spfr.push_back(frac); }
- else if( i==2 ) { mnt_1eta2_ly2_spfr.push_back(frac); }
- else if( i==3 ) { mnt_1eta2_ly3_spfr.push_back(frac); }
- else if( i==4 ) { mnt_1eta2_ly4_spfr.push_back(frac); }
- else if( i==5 ) { mnt_1eta2_ly5_spfr.push_back(frac); }
- else if( i==6 ) { mnt_1eta2_ly6_spfr.push_back(frac); }
- else if( i==7 ) { mnt_1eta2_ly7_spfr.push_back(frac); }
- }
- ATH_MSG_DEBUG("Layer " << i << ": frac=" << v_ly_sp_frac[i] << ", n used / all = " << v_n_sp_injet_usedByTrk[i] << " / " << v_n_sp_injet[i]);
- }
+ size_t numTrigger = m_cutJetPtGeV.size();
+ size_t numHitDVs = toolInputs.size();
+
+ ATH_MSG_DEBUG( " Number of HitDVs = " << numHitDVs );
- // loop on tracks
- const float TRK_PT_CUT = 2.0;
-
- unsigned int n_qtrk_injet = 0;
- for ( auto trk : *trksContainer ) {
- float trk_pt = trk->getDetail<float>("hitDVTrk_pt");
- trk_pt /= 1000;
- if( trk_pt < TRK_PT_CUT ) continue;
- float trk_eta = trk->getDetail<float>("hitDVTrk_eta");
- float trk_phi = trk->getDetail<float>("hitDVTrk_phi");
- float dr = deltaR(trk_eta,trk_phi,seed_eta,seed_phi);
- if( dr > DR_TO_REF_CUT ) continue;
- n_qtrk_injet++;
- }
- ATH_MSG_DEBUG("nr of quality tracks in jet = " << n_qtrk_injet);
- if ( std::abs(seed_eta) < 1.0 ) { mnt_eta1_n_qtrk.push_back(n_qtrk_injet); }
- else if( std::abs(seed_eta) < 2.0 ) { mnt_1eta2_n_qtrk.push_back(n_qtrk_injet); }
-
- // evaluate BDT
- m_tmva_n_track_qual = (float)n_qtrk_injet;
- m_tmva_ly0_sp_frac = v_ly_sp_frac[0];
- m_tmva_ly1_sp_frac = v_ly_sp_frac[1];
- m_tmva_ly2_sp_frac = v_ly_sp_frac[2];
- m_tmva_ly3_sp_frac = v_ly_sp_frac[3];
- m_tmva_ly4_sp_frac = v_ly_sp_frac[4];
- m_tmva_ly5_sp_frac = v_ly_sp_frac[5];
- m_tmva_ly6_sp_frac = v_ly_sp_frac[6];
- m_tmva_ly7_sp_frac = v_ly_sp_frac[7];
- float bdt_score = m_tmva_reader->EvaluateMVA("BDT method");
- if ( std::abs(seed_eta) < 1.0 ) { mnt_eta1_bdtscore.push_back(bdt_score); }
- else if( std::abs(seed_eta) < 2.0 ) { mnt_1eta2_bdtscore.push_back(bdt_score); }
-
- // BDT threshold
- if( bdt_score < cutBDTthreshold ) continue;
-
- // passed selection
- ATH_MSG_DEBUG("Passed selection");
- n_passed++;
-
- // create EDM object
- xAOD::TrigComposite *dv = new xAOD::TrigComposite();
- dv->makePrivateStore();
- dvContainer->push_back(dv);
-
- dv->setDetail<float>("hitDV_seed_eta", seed_eta);
- dv->setDetail<float>("hitDV_seed_phi", seed_phi);
- dv->setDetail<int> ("hitDV_seed_type", seed_type);
- dv->setDetail<int> ("hitDV_n_track_qual", n_qtrk_injet);
- dv->setDetail<float>("hitDV_ly0_sp_frac", v_ly_sp_frac[0]);
- dv->setDetail<float>("hitDV_ly1_sp_frac", v_ly_sp_frac[1]);
- dv->setDetail<float>("hitDV_ly2_sp_frac", v_ly_sp_frac[2]);
- dv->setDetail<float>("hitDV_ly3_sp_frac", v_ly_sp_frac[3]);
- dv->setDetail<float>("hitDV_ly4_sp_frac", v_ly_sp_frac[4]);
- dv->setDetail<float>("hitDV_ly5_sp_frac", v_ly_sp_frac[5]);
- dv->setDetail<float>("hitDV_ly6_sp_frac", v_ly_sp_frac[6]);
- dv->setDetail<float>("hitDV_ly7_sp_frac", v_ly_sp_frac[7]);
- dv->setDetail<float>("hitDV_bdt_score", bdt_score);
-
- ATH_MSG_DEBUG("Created a new entry EDM");
+ if ( numTrigger == 1 ) {
+ ATH_MSG_DEBUG( " Applying selection of single for " << m_decisionId );
+ return inclusiveSelection(toolInputs);
+ }
+ else {
+ ATH_MSG_DEBUG( " Applying selection of multiplicity for " << m_decisionId );
+ return multiplicitySelection(toolInputs);
}
- ATH_MSG_DEBUG("nr of BDT passed = " << n_passed);
- //
return StatusCode::SUCCESS;
}
// ------------------------------------------------------------------------------------------------
// ------------------------------------------------------------------------------------------------
-StatusCode TrigHitDVHypoTool::findJetSeeds(const xAOD::JetContainer* jetsContainer, const float cutJetPt, const float cutJetEta,
- std::vector<float>& jetSeeds_eta, std::vector<float>& jetSeeds_phi) const
+StatusCode TrigHitDVHypoTool::inclusiveSelection(std::vector<HitDVHypoInfo>& toolInputs) const
{
- std::vector<float> mnt_jet_pt;
- std::vector<float> mnt_jet_eta;
- auto mon_jet_pt = Monitored::Collection("jet_pt", mnt_jet_pt);
- auto mon_jet_eta = Monitored::Collection("jet_eta", mnt_jet_eta);
- auto monitorIt = Monitored::Group( m_monTool, mon_jet_pt, mon_jet_eta );
-
- ATH_MSG_DEBUG("looking for jet seed with pt cut=" << cutJetPt << ", eta cut=" << cutJetEta);
- for ( const xAOD::Jet* jet : *jetsContainer ) {
- float jet_pt = (float)jet->pt() / 1000.0;
- mnt_jet_pt.push_back(jet_pt);
- if( jet_pt < cutJetPt ) {
- ATH_MSG_DEBUG("Fails jet pt cut, pt = " << jet_pt);
- continue;
- }
- float jet_eta = (float)jet->eta();
- mnt_jet_eta.push_back(jet_eta);
- if( std::fabs(jet_eta) > cutJetEta ) {
- ATH_MSG_DEBUG("Fails jet eta cut, eta = " << jet_eta);
- continue;
+ bool isJetCutPassed = false;
+ for ( auto& input: toolInputs ) {
+ if ( TrigCompositeUtils::passed( m_decisionId.numeric(), input.previousDecisionsIDs ) ) {
+ if ( decideOnSingleObject( input, 0, true )==true ) {
+ isJetCutPassed = true;
+ break;
+ }
}
- float jet_phi = (float)jet->phi();
- jetSeeds_eta.push_back(jet_eta);
- jetSeeds_phi.push_back(jet_phi);
}
- ATH_MSG_DEBUG("nr of jet seeds=" << jetSeeds_eta.size());
-
- return StatusCode::SUCCESS;
+
+ if( ! isJetCutPassed ) return StatusCode::SUCCESS;
+
+ bool isPassed = false;
+ unsigned int idv=0;
+ for ( auto& input: toolInputs ) {
+ ATH_MSG_DEBUG( " --- idv=" << idv << " ---");
+ if ( TrigCompositeUtils::passed( m_decisionId.numeric(), input.previousDecisionsIDs ) ) {
+ if ( decideOnSingleObject( input, 0, false )==true ) {
+ ATH_MSG_DEBUG( " Passed selection --> adding DecisionID");
+ isPassed = true;
+ TrigCompositeUtils::addDecisionID(m_decisionId, input.decision);
+ }
+ } else {
+ ATH_MSG_DEBUG( " Not match DecisionID: " << m_decisionId );
+ }
+ ++idv;
+ }
+
+ ATH_MSG_DEBUG( "Inclusive selection isPassed = " << isPassed);
+ return StatusCode::SUCCESS;
}
// ------------------------------------------------------------------------------------------------
// ------------------------------------------------------------------------------------------------
-StatusCode TrigHitDVHypoTool::findSPSeeds( const xAOD::TrigCompositeContainer* spsContainer,
- std::vector<float>& seeds_eta, std::vector<float>& seeds_phi ) const
+StatusCode TrigHitDVHypoTool::multiplicitySelection(std::vector<HitDVHypoInfo>& toolInputs) const
{
- seeds_eta.clear();
- seeds_phi.clear();
-
- const int NBINS_ETA = 50;
- const float ETA_MIN = -2.5;
- const float ETA_MAX = 2.5;
-
- const int NBINS_PHI = 80;
- const float PHI_MIN = -4.0;
- const float PHI_MAX = 4.0;
-
- std::string hname;
-
- hname = "ly6_h2_nsp";
- TH2F* ly6_h2_nsp = new TH2F(hname.c_str(),hname.c_str(),NBINS_ETA,ETA_MIN,ETA_MAX,NBINS_PHI,PHI_MIN,PHI_MAX);
- hname = "ly7_h2_nsp";
- TH2F* ly7_h2_nsp = new TH2F(hname.c_str(),hname.c_str(),NBINS_ETA,ETA_MIN,ETA_MAX,NBINS_PHI,PHI_MIN,PHI_MAX);
-
- hname = "ly6_h2_nsp_notrk";
- TH2F* ly6_h2_nsp_notrk = new TH2F(hname.c_str(),hname.c_str(),NBINS_ETA,ETA_MIN,ETA_MAX,NBINS_PHI,PHI_MIN,PHI_MAX);
- hname = "ly7_h2_nsp_notrk";
- TH2F* ly7_h2_nsp_notrk = new TH2F(hname.c_str(),hname.c_str(),NBINS_ETA,ETA_MIN,ETA_MAX,NBINS_PHI,PHI_MIN,PHI_MAX);
-
- for ( auto spData : *spsContainer ) {
- int sp_layer = spData->getDetail<int> ("hitDVSP_layer");
- float sp_eta = spData->getDetail<float>("hitDVSP_eta");
- int ilayer = getSPLayer(sp_layer,sp_eta);
- if( ilayer<6 ) continue;
-
- int sp_trkid = spData->getDetail<int>("hitDVSP_usedTrkId");
- bool isUsedByTrk = (sp_trkid != -1);
- float sp_phi = spData->getDetail<float>("hitDVSP_phi");
-
- bool fill_out_of_pi = false;
- float sp_phi2 = 0;
- if( sp_phi < 0 ) {
- sp_phi2 = 2*TMath::Pi() + sp_phi;
- if( sp_phi2 < PHI_MAX ) fill_out_of_pi = true;
- }
- else {
- sp_phi2 = -2*TMath::Pi() + sp_phi;
- if( PHI_MIN < sp_phi2 ) fill_out_of_pi = true;
- }
- if( ilayer==6 ) {
- ly6_h2_nsp->Fill(sp_eta,sp_phi);
- if( fill_out_of_pi ) ly6_h2_nsp->Fill(sp_eta,sp_phi2);
- if( ! isUsedByTrk ) ly6_h2_nsp_notrk->Fill(sp_eta,sp_phi);
- if( ! isUsedByTrk && fill_out_of_pi) ly6_h2_nsp_notrk->Fill(sp_eta,sp_phi2);
- }
- if( ilayer==7 ) {
- ly7_h2_nsp->Fill(sp_eta,sp_phi);
- if( fill_out_of_pi ) ly7_h2_nsp->Fill(sp_eta,sp_phi2);
- if( ! isUsedByTrk ) ly7_h2_nsp_notrk->Fill(sp_eta,sp_phi);
- if( ! isUsedByTrk && fill_out_of_pi) ly7_h2_nsp_notrk->Fill(sp_eta,sp_phi2);
- }
- }
-
- ATH_MSG_DEBUG("looking for ly6/ly6 doublet seeds");
-
- // (idx, sort/weight, eta, phi)
- std::vector<std::tuple<int,float,float,float>> QT;
-
- for(int ly6_ieta=1; ly6_ieta<=NBINS_ETA; ly6_ieta++) {
- float ly6_eta = (ly6_h2_nsp->GetXaxis()->GetBinLowEdge(ly6_ieta) + ly6_h2_nsp->GetXaxis()->GetBinUpEdge(ly6_ieta))/2.0;
- for(int ly6_iphi=1; ly6_iphi<=NBINS_PHI; ly6_iphi++) {
- float ly6_phi = (ly6_h2_nsp->GetYaxis()->GetBinLowEdge(ly6_iphi) + ly6_h2_nsp->GetYaxis()->GetBinUpEdge(ly6_iphi))/2.0;
-
- float ly6_nsp = ly6_h2_nsp ->GetBinContent(ly6_ieta,ly6_iphi);
- float ly6_nsp_notrk = ly6_h2_nsp_notrk->GetBinContent(ly6_ieta,ly6_iphi);
- float ly6_frac = ( ly6_nsp > 0 ) ? ly6_nsp_notrk / ly6_nsp : 0;
- if( ly6_nsp < 10 || ly6_frac < 0.85 ) continue;
-
- float ly7_frac_max = 0;
- float ly7_eta_max = 0;
- float ly7_phi_max = 0;
- for(int ly7_ieta=std::max(1,ly6_ieta-1); ly7_ieta<std::min(NBINS_ETA,ly6_ieta+1); ly7_ieta++) {
- for(int ly7_iphi=std::max(1,ly6_iphi-1); ly7_iphi<=std::min(NBINS_PHI,ly6_iphi+1); ly7_iphi++) {
- float ly7_nsp = ly7_h2_nsp ->GetBinContent(ly7_ieta,ly7_iphi);
- float ly7_nsp_notrk = ly7_h2_nsp_notrk->GetBinContent(ly7_ieta,ly7_iphi);
- float ly7_frac = ( ly7_nsp > 0 ) ? ly7_nsp_notrk / ly7_nsp : 0;
- if( ly7_nsp < 10 ) continue;
- if( ly7_frac > ly7_frac_max ) {
- ly7_frac_max = ly7_frac;
- ly7_eta_max = (ly7_h2_nsp->GetXaxis()->GetBinLowEdge(ly7_ieta) + ly7_h2_nsp->GetXaxis()->GetBinUpEdge(ly7_ieta))/2.0;
- ly7_phi_max = (ly7_h2_nsp->GetXaxis()->GetBinLowEdge(ly7_iphi) + ly7_h2_nsp->GetXaxis()->GetBinUpEdge(ly7_iphi))/2.0;
- }
+ unsigned int n_jetpassed = 0;
+ for ( size_t cutIndex=0; cutIndex < m_cutJetPtGeV.size(); ++cutIndex ) {
+ bool isJetCutPassed = false;
+ for ( auto& input: toolInputs ) {
+ if ( TrigCompositeUtils::passed( m_decisionId.numeric(), input.previousDecisionsIDs ) ) {
+ if ( decideOnSingleObject( input, cutIndex, true )==true ) {
+ isJetCutPassed = true;
+ break;
}
}
- if( ly7_frac_max < 0.85 ) continue;
- //
- float wsum = ly6_frac + ly7_frac_max;
- float weta = (ly6_eta*ly6_frac + ly7_eta_max*ly7_frac_max) / wsum;
- float wphi = (ly6_phi*ly6_frac + ly7_phi_max*ly7_frac_max) / wsum;
- float w = wsum / 2.0;
- QT.push_back(std::make_tuple(-1,w,weta,wphi));
}
+ if( isJetCutPassed ) ++n_jetpassed;
}
- delete ly6_h2_nsp;
- delete ly7_h2_nsp;
- delete ly6_h2_nsp_notrk;
- delete ly7_h2_nsp_notrk;
- ATH_MSG_DEBUG("nr of ly6/ly7 doublet candidate seeds=" << QT.size() << ", doing clustering...");
-
- // sort
- std::sort(QT.begin(), QT.end(),
- [](const std::tuple<int,float,float,float>& lhs, const std::tuple<int,float,float,float>& rhs) {
- return std::get<1>(lhs) > std::get<1>(rhs); } );
-
- // clustering
- const double CLUSTCUT_DIST = 0.2;
- const double CLUSTCUT_SEED_FRAC = 0.9;
-
- std::vector<float> seeds_wsum;
-
- for(unsigned int i=0; i<QT.size(); i++) {
- float phi = std::get<3>(QT[i]);
- float eta = std::get<2>(QT[i]);
- float w = std::get<1>(QT[i]);
- if(i==0) {
- seeds_eta.push_back(w*eta); seeds_phi.push_back(w*phi);
- seeds_wsum.push_back(w);
- continue;
- }
- const int IDX_INITIAL = 100;
- float dist_min = 100.0;
- int idx_min = IDX_INITIAL;
- for(unsigned j=0; j<seeds_eta.size(); j++) {
- float ceta = seeds_eta[j]/seeds_wsum[j];
- float cphi = seeds_phi[j]/seeds_wsum[j];
- // intentionally calculate in this way as phi is defined beyond -Pi/Pi (no boundary)
- float deta = std::fabs(ceta-eta);
- float dphi = std::fabs(cphi-phi);
- float dist = std::sqrt(dphi*dphi+deta*deta);
- if( dist < dist_min ) {
- dist_min = dist;
- idx_min = j;
- }
+ if( n_jetpassed < m_cutJetPtGeV.size() ) return StatusCode::SUCCESS;
+
+ //
+ HLT::Index2DVec passingSelection( m_cutJetPtGeV.size() );
+
+ for ( size_t cutIndex=0; cutIndex < m_cutJetPtGeV.size(); ++cutIndex ) {
+ size_t elementIndex{ 0 };
+ for ( auto& input: toolInputs ) {
+ if ( TrigCompositeUtils::passed( m_decisionId.numeric(), input.previousDecisionsIDs ) ) {
+ if ( decideOnSingleObject( input, cutIndex, false ) == true ) {
+ ATH_MSG_DEBUG( "Pass through selection " << m_decisionId << " : Event[" << elementIndex << "]" );
+ passingSelection[cutIndex].push_back( elementIndex );
+ }
+ }
+ else {
+ ATH_MSG_DEBUG( "Not match DecisionID " << m_decisionId );
+ }
+ elementIndex++;
}
- int match_idx = IDX_INITIAL;
- if( idx_min != IDX_INITIAL ) {
- if( dist_min < CLUSTCUT_DIST ) { match_idx = idx_min; }
+ // If no object passes the selection, multipul selection should stop.
+ if ( passingSelection[cutIndex].empty() ) {
+ ATH_MSG_DEBUG( "No object passed selection " << cutIndex << " rejecting" );
+ return StatusCode::SUCCESS;
}
- if( match_idx == IDX_INITIAL ) {
- if( w > CLUSTCUT_SEED_FRAC && dist_min > CLUSTCUT_DIST ) {
- seeds_eta.push_back(w*eta); seeds_phi.push_back(w*phi);
- seeds_wsum.push_back(w);
- }
- continue;
- }
- float new_eta = seeds_eta[match_idx] + w*eta;
- float new_phi = seeds_phi[match_idx] + w*phi;
- float new_wsum = seeds_wsum[match_idx] + w;
- seeds_eta[match_idx] = new_eta;
- seeds_phi[match_idx] = new_phi;
- seeds_wsum[match_idx] = new_wsum;
- }
- QT.clear();
- for(unsigned int i=0; i<seeds_eta.size(); i++) {
- float eta = seeds_eta[i] / seeds_wsum[i];
- float phi = seeds_phi[i] / seeds_wsum[i];
- seeds_eta[i] = eta;
- seeds_phi[i] = phi;
- if( phi < -TMath::Pi() ) phi = 2*TMath::Pi() + phi;
- if( phi > TMath::Pi() ) phi = -2*TMath::Pi() + phi;
- seeds_phi[i] = phi;
}
- ATH_MSG_DEBUG("after clustering, nr of seeds = " << seeds_eta.size());
-
- // delete overlap (can happen at phi=-Pi/Pi bounadry)
- std::vector<unsigned int> idx_to_delete;
- for(unsigned int i=0; i<seeds_eta.size(); i++) {
- if( std::find(idx_to_delete.begin(),idx_to_delete.end(),i) != idx_to_delete.end() ) continue;
- float eta_i = seeds_eta[i];
- float phi_i = seeds_phi[i];
- for(unsigned int j=i+1; j<seeds_eta.size(); j++) {
- if( std::find(idx_to_delete.begin(),idx_to_delete.end(),j) != idx_to_delete.end() ) continue;
- float eta_j = seeds_eta[j];
- float phi_j = seeds_phi[j];
- float dr = deltaR(eta_i,phi_i,eta_j,phi_j);
- if( dr < CLUSTCUT_DIST ) idx_to_delete.push_back(j);
- }
- }
- ATH_MSG_DEBUG("nr of duplicated seeds to be removed = " << idx_to_delete.size());
- if( idx_to_delete.size() > 0 ) {
- std::sort(idx_to_delete.begin(),idx_to_delete.end());
- for(unsigned int j=idx_to_delete.size(); j>0; j--) {
- unsigned int idx = idx_to_delete[j-1];
- seeds_eta.erase(seeds_eta.begin()+idx);
- seeds_phi.erase(seeds_phi.begin()+idx);
- }
+
+ std::set<size_t> passingIndices;
+ HLT::elementsInUniqueCombinations( passingSelection, passingIndices );
+
+ if ( passingIndices.empty() ) {
+ ATH_MSG_DEBUG( "No track passed through selection " << m_decisionId );
+ return StatusCode::SUCCESS;
}
- ATH_MSG_DEBUG("nr of ly6/ly7 seeds=" << seeds_eta.size());
+ for ( auto idx: passingIndices ) {
+ ATH_MSG_DEBUG( "track[" << idx << "] passes through Chain/ID " << m_decisionId << " with pT" );
+ TrigCompositeUtils::addDecisionID( m_decisionId.numeric(), toolInputs[idx].decision );
+ }
- // return
return StatusCode::SUCCESS;
}
// ------------------------------------------------------------------------------------------------
// ------------------------------------------------------------------------------------------------
-float TrigHitDVHypoTool::getBDTthreshold(float mu) const
+bool TrigHitDVHypoTool::decideOnSingleObject( HitDVHypoInfo& input, size_t cutIndex, bool isOnlyJetCut ) const
{
- const float defaultBDTthreshold = 0.03773; // 70% effi at mu=60
-
- if( mu<10 || 60<mu ) return defaultBDTthreshold;
-
- // pol4 fitting
- const float par0 = 0.404727;
- const float par1 = -0.00344154;
- const float par2 = -6.54218e-05;
- const float par3 = -3.39841e-07;
- const float par4 = 9.93062e-09;
-
- float thres = par0 + par1*mu + par2*mu*mu + par3*mu*mu*mu + par4*mu*mu*mu*mu;
- return thres;
-}
+ float ptThreshold = m_cutJetPtGeV[cutIndex];
+ float etaThreshold = m_cutJetEta[cutIndex];
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
+ const xAOD::TrigComposite* dv = input.hitDV;
+ int seed_type = dv->getDetail<int> ("hitDV_seed_type");
+ float seed_eta = dv->getDetail<float>("hitDV_seed_eta");
+ float seed_pt = dv->getDetail<float>("hitDV_seed_pt");
-StatusCode TrigHitDVHypoTool::decide( TrackInfo& input ) const
-{
- // monitoring
- auto mon_n_jetseeds = Monitored::Scalar( "n_jetseeds", -999. );
- auto mon_n_spseeds = Monitored::Scalar( "n_spseeds", -999. );
- auto mon_n_passed_jet = Monitored::Scalar( "n_passed_jet", -999. );
- auto mon_n_passed_sp = Monitored::Scalar( "n_passed_sp", -999. );
- auto mon_average_mu = Monitored::Scalar( "average_mu", -999. );
- auto monitorIt = Monitored::Group( m_monTool, mon_n_jetseeds, mon_n_spseeds, mon_n_passed_jet, mon_n_passed_sp, mon_average_mu );
-
- // input containers
- float averageMu = input.averageMu;
- const xAOD::JetContainer* jetsContainer = input.jetsContainer;
- const xAOD::TrigCompositeContainer* spsContainer = input.spsContainer;
- const xAOD::TrigCompositeContainer* trksContainer = input.trksContainer;
- xAOD::TrigCompositeContainer* dvContainer = input.dvContainer;
- mon_average_mu = averageMu;
-
- // BDT selection
- const int cutIndex = 0;
-
- // find seeds based on HLT jets
- std::vector<float> jetSeeds_eta;
- std::vector<float> jetSeeds_phi;
- ATH_CHECK( findJetSeeds(jetsContainer, m_cutJetPtGeV[cutIndex], m_cutJetEta[cutIndex], jetSeeds_eta, jetSeeds_phi) );
- mon_n_jetseeds = jetSeeds_eta.size();
-
- // jet presence is required also for SP seed
- if( jetSeeds_eta.size() < 1 ) {
- mon_n_passed_jet = 0;
- return StatusCode::SUCCESS;
+ // if only jet pt/eta cut
+ if( isOnlyJetCut ) {
+ if( seed_type != 0 ) return false;
+ if( std::abs(seed_eta) > etaThreshold ) return false;
+ if( seed_pt < ptThreshold ) return false;
+ // passed
+ return true;
}
- // find seeds based on SP frac itself
- std::vector<float> spSeeds_eta;
- std::vector<float> spSeeds_phi;
- if( m_doSPseed[cutIndex] ) {
- ATH_CHECK( findSPSeeds(spsContainer, spSeeds_eta, spSeeds_phi) );
- mon_n_spseeds = spSeeds_eta.size();
- }
+ if( input.isSPOverflow ) return true;
- // BDT
- float BDTthreshold = getBDTthreshold(averageMu);
+ // normal cut
+ bool doSPseed = m_doSPseed[cutIndex];
+ float BDTthreshold = getBDTthreshold(input.averageMu);
+ float bdt_score = dv->getDetail<float>("hitDV_bdt_score");
- int n_passed_jet = 0;
- int seed_type = 0;
- ATH_CHECK( calculateBDT(spsContainer, trksContainer, jetSeeds_eta, jetSeeds_phi, BDTthreshold, seed_type, dvContainer, n_passed_jet) );
- mon_n_passed_jet = n_passed_jet;
+ if( ! doSPseed && seed_type==1 ) return false;
+ if( seed_type==0 && seed_pt < ptThreshold ) return false;
+ if( std::abs(seed_eta) > etaThreshold ) return false;
+ if( bdt_score < BDTthreshold ) return false;
- int n_passed_sp = 0;
- if( m_doSPseed[cutIndex] ) {
- seed_type = 1;
- ATH_CHECK( calculateBDT(spsContainer, trksContainer, spSeeds_eta, spSeeds_phi,BDTthreshold, seed_type, dvContainer, n_passed_sp) );
- mon_n_passed_sp = n_passed_sp;
- }
+ ATH_MSG_DEBUG( " Selected, cut index / seed_type / seed_eta / bdt_score = " << cutIndex << " / " << seed_type << " / " << seed_eta << " / " << bdt_score);
- // final
- if( (n_passed_jet+n_passed_sp) > 0 ) {
- addDecisionID( m_decisionId.numeric(), input.decision );
- ATH_MSG_DEBUG("REGTEST event accepted");
- return StatusCode::SUCCESS;
- }
- else {
- return StatusCode::SUCCESS;
- }
+ return true;
}
// ------------------------------------------------------------------------------------------------
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoTool.h b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoTool.h
index 383cd462d424..ea53d72e60a9 100644
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoTool.h
@@ -32,29 +32,31 @@ public:
virtual ~TrigHitDVHypoTool();
virtual StatusCode initialize() override;
- struct TrackInfo {
+ struct HitDVHypoInfo {
TrigCompositeUtils::Decision* decision;
+ bool isSPOverflow;
float averageMu;
- const xAOD::JetContainer* jetsContainer;
- const xAOD::TrigCompositeContainer* trksContainer;
- const xAOD::TrigCompositeContainer* spsContainer;
- xAOD::TrigCompositeContainer* dvContainer;
+ const xAOD::TrigComposite* hitDV;
const TrigCompositeUtils::DecisionIDContainer previousDecisionsIDs;
};
/**
* @brief decides upon a collection of tracks
**/
- StatusCode decide( TrackInfo& input ) const;
+ StatusCode decide( std::vector<HitDVHypoInfo>& ) const;
private:
+
HLT::Identifier m_decisionId;
Gaudi::Property< std::vector<float> > m_cutJetPtGeV { this, "cutJetPtGeV", { float(20.0) }, "Jet pT requirement in GeV" };
Gaudi::Property< std::vector<float> > m_cutJetEta { this, "cutJetEta", { float(2.5) }, "Jet Eta requirement" };
Gaudi::Property< std::vector<bool> > m_doSPseed { this, "doSPseed", { true }, "Switch to do SP seeding" };
- ToolHandle<GenericMonitoringTool> m_monTool{ this, "MonTool", "", "Monitoring tool" };
-
+ //
+ StatusCode inclusiveSelection(std::vector<HitDVHypoInfo>& ) const;
+ StatusCode multiplicitySelection(std::vector<HitDVHypoInfo>& ) const;
+ bool decideOnSingleObject( HitDVHypoInfo&, size_t, bool ) const;
+
//
float deltaR(float, float, float, float) const;
int getSPLayer(int, float) const;
diff --git a/Trigger/TrigSteer/TrigOutputHandling/TrigOutputHandling/TriggerEDMAuxAccessors.h b/Trigger/TrigSteer/TrigOutputHandling/TrigOutputHandling/TriggerEDMAuxAccessors.h
index 48c2a0c4e003..794b34f6a856 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/TrigOutputHandling/TriggerEDMAuxAccessors.h
+++ b/Trigger/TrigSteer/TrigOutputHandling/TrigOutputHandling/TriggerEDMAuxAccessors.h
@@ -21,7 +21,8 @@ constexpr auto initAccessors(U... names) {
auto boolAccessors = initAccessors<bool>(
"hasGenericRoiError", "hasGenericDaqError", "hasCrcTobError", "hasCrcFibreError",
- "hasCrcDaqError", "hasRoibDaqDifference", "hasRoibCtpDifference", "hasDaqCtpDifference");
+ "hasCrcDaqError", "hasRoibDaqDifference", "hasRoibCtpDifference", "hasDaqCtpDifference",
+ "hitDVSP_isPix","hitDVSP_isSct");
auto charAccessors = initAccessors<char>(
"IP2D_isDefaults", "IP3D_isDefaults", "SV1_isDefaults", "rnnip_isDefaults",
@@ -39,7 +40,6 @@ auto intAccessors = initAccessors<int>(
"sctSP", "sctSPBarrel", "sctSPEndcapA", "sctSPEndcapC",
"zfinder_tool",
"hitDVTrk_id","hitDVTrk_n_hits_innermost","hitDVTrk_n_hits_pix","hitDVTrk_n_hits_sct",
- "hitDVSP_layer","hitDVSP_isPix","hitDVSP_isSct","hitDVSP_usedTrkId",
"hitDV_seed_type","hitDV_n_track_qual",
"dEdxTrk_id","dEdxTrk_dedx_n_usedhits",
"dEdxTrk_n_hits_innermost","dEdxTrk_n_hits_inner","dEdxTrk_n_hits_pix","dEdxTrk_n_hits_sct",
@@ -58,7 +58,7 @@ auto intAccessors = initAccessors<int>(
"disTrkCand_refit_n_brhits_good_ibl","disTrkCand_refit_n_brhits_good_pix1","disTrkCand_refit_n_brhits_good_pix2","disTrkCand_refit_n_brhits_good_pix3",
"disTrkCand_refit_n_brhits_good_sct1","disTrkCand_refit_n_brhits_good_sct2","disTrkCand_refit_n_brhits_good_sct3","disTrkCand_refit_n_brhits_good_sct4");
-auto int16Accessors = initAccessors<int16_t>("view");
+auto int16Accessors = initAccessors<int16_t>("view", "hitDVSP_layer", "hitDVSP_usedTrkId");
auto int32Accessors = initAccessors<int32_t>("roi");
@@ -104,7 +104,7 @@ auto floatAccessors = initAccessors<float>(
"zfinder_vtx_z", "zfinder_vtx_weight", "caloIso", "calE", "calEta", "calPhi",
"hitDVTrk_pt","hitDVTrk_eta","hitDVTrk_phi","hitDVTrk_a0beam",
"hitDVSP_eta","hitDVSP_r","hitDVSP_phi",
- "hitDV_seed_eta","hitDV_seed_phi","hitDV_ly0_sp_frac","hitDV_ly1_sp_frac","hitDV_ly2_sp_frac",
+ "hitDV_seed_pt","hitDV_seed_eta","hitDV_seed_phi","hitDV_ly0_sp_frac","hitDV_ly1_sp_frac","hitDV_ly2_sp_frac",
"hitDV_ly3_sp_frac","hitDV_ly4_sp_frac","hitDV_ly5_sp_frac","hitDV_ly6_sp_frac","hitDV_ly7_sp_frac","hitDV_bdt_score",
"dEdxTrk_pt","dEdxTrk_eta","dEdxTrk_phi","dEdxTrk_dedx","dEdxTrk_a0beam",
"dEdxHit_dedx","dEdxHit_tot","dEdxHit_trkchi2","dEdxHit_trkndof",
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/HitDVConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/HitDVConfiguration.py
index f9ec7d0a8a17..629e7c4b4ae0 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/HitDVConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/HitDVConfiguration.py
@@ -47,21 +47,11 @@ def JetRecoSequence():
def HitDVHypoSequence():
- from TrigLongLivedParticlesHypo.TrigHitDVHypoTool import TrigHitDVHypoToolFromDict
- from TrigLongLivedParticlesHypo.TrigLongLivedParticlesHypoConf import (TrigHitDVHypoAlg)
+ from TrigLongLivedParticlesHypo.TrigHitDVHypoConfig import TrigHitDVHypoToolFromDict
+ from TrigLongLivedParticlesHypo.TrigHitDVHypoConfig import createTrigHitDVHypoAlg
- # Setup the hypothesis algorithm
- theHitDVHypo = TrigHitDVHypoAlg("HitDV")
+ theHitDVHypo = createTrigHitDVHypoAlg("HitDV")
- from TrigEDMConfig.TriggerEDMRun3 import recordable
- theHitDVHypo.HitDV = recordable("HLT_HitDV")
-
- if ConfigFlags.Input.isMC:
- theHitDVHypo.isMC = True
- else:
- theHitDVHypo.isMC = False
-
- #
from AthenaConfiguration.ComponentAccumulator import conf2toConfigurable
from AthenaConfiguration.ComponentFactory import CompFactory
DummyInputMakerAlg = conf2toConfigurable(CompFactory.InputMakerForRoI( "IM_HitDV_HypoOnlyStep" ))
--
GitLab
From 1ec95ddfc0e7d3c83b3bbe556381674fa30e8751 Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Mon, 16 Aug 2021 21:29:43 +0200
Subject: [PATCH 079/272] Allow to build trackless electrons, in which case no
charge
---
Reconstruction/egamma/egammaAlgs/src/topoEgammaBuilder.cxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Reconstruction/egamma/egammaAlgs/src/topoEgammaBuilder.cxx b/Reconstruction/egamma/egammaAlgs/src/topoEgammaBuilder.cxx
index 9d85b7646222..6906d85f6afc 100644
--- a/Reconstruction/egamma/egammaAlgs/src/topoEgammaBuilder.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/topoEgammaBuilder.cxx
@@ -385,7 +385,10 @@ topoEgammaBuilder::getElectron(const egammaRec* egRec,
}
electron->setTrackParticleLinks(trackLinks);
- electron->setCharge(electron->trackParticle()->charge());
+ const xAOD::TrackParticle* trackParticle = electron->trackParticle();
+ if (trackParticle) {
+ electron->setCharge(trackParticle->charge());
+ }
// Set DeltaEta, DeltaPhi , DeltaPhiRescaled
std::array<double, 4> deltaEta = egRec->deltaEta();
std::array<double, 4> deltaPhi = egRec->deltaPhi();
--
GitLab
From 357dc0600918f1bbd721bdb13fb10da146a27f59 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Thu, 24 Jun 2021 15:23:27 -0400
Subject: [PATCH 080/272] VP1HEPVis: Fix warnings.
Potentially uninitialized variables.
Don't put using directives in the global namespace in headers.
---
graphics/VP1/VP1HEPVis/src/BooleanProcessor.h | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/graphics/VP1/VP1HEPVis/src/BooleanProcessor.h b/graphics/VP1/VP1HEPVis/src/BooleanProcessor.h
index 5074bdf7724f..848b66f67bec 100644
--- a/graphics/VP1/VP1HEPVis/src/BooleanProcessor.h
+++ b/graphics/VP1/VP1HEPVis/src/BooleanProcessor.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/*
@@ -107,7 +107,6 @@ typedef HEPVis::SbPlane HVPlane3D;
// -------------------------------------------- Simplified STL vector ---
//G.Barrand : begin
#include <vector>
-using namespace std;
/*
template<class T>
class vector {
@@ -330,8 +329,8 @@ class BooleanProcessor {
FaceList m_unsuitable_faces; // list of unsuitable faces // VP1 change
FaceList m_unknown_faces; // list of unknown faces // VP1 change
- vector<int> m_external_contours; // heads of external contours // VP1 change
- vector<int> m_internal_contours; // heads of internal contours // VP1 change
+ std::vector<int> m_external_contours; // heads of external contours // VP1 change
+ std::vector<int> m_internal_contours; // heads of internal contours // VP1 change
private:
void takePolyhedron(const HepPolyhedron & p, double, double, double);
@@ -1979,7 +1978,7 @@ HepPolyhedron BooleanProcessor::createPolyhedron()
// S E T F A C E S
- int k, v[4], f[4];
+ int k, v[4]={0}, f[4]={0};
for (i=1; i<(int)m_faces.size(); i++) {
if (m_faces[i].inew == 0) continue;
v[3] = f[3] = k = 0;
--
GitLab
From b4bb6953c0b8776bb425d107ee09eba23547f032 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Sat, 7 Aug 2021 04:45:58 +0200
Subject: [PATCH 081/272] VP1Base: Fix gcc11 warning.
Work around gcc11 false positive warning.
---
.../VP1/VP1Base/src/IVP12DViewTransformation.cxx | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/graphics/VP1/VP1Base/src/IVP12DViewTransformation.cxx b/graphics/VP1/VP1Base/src/IVP12DViewTransformation.cxx
index 01ab269ceb69..1c480f0e4b0c 100644
--- a/graphics/VP1/VP1Base/src/IVP12DViewTransformation.cxx
+++ b/graphics/VP1/VP1Base/src/IVP12DViewTransformation.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////
@@ -98,11 +98,16 @@ void IVP12DViewTransformation::paintItem(QPainter *painter, const QGraphicsItem*
return;
}
}
- painter->setPen(shapeitem?shapeitem->pen():lineitem->pen());
- if (shapeitem)
- painter->setBrush(shapeitem->brush());
QPainterPath path;
- transformPath( (shapeitem?shapeitem->shape():lineitem->shape()), path);
+ if (shapeitem) {
+ painter->setPen(shapeitem->pen());
+ painter->setBrush(shapeitem->brush());
+ transformPath(shapeitem->shape(), path);
+ }
+ else if (lineitem) {
+ painter->setPen(lineitem->pen());
+ transformPath(lineitem->shape(), path);
+ }
painter->drawPath(path);//Fixme:transform
// QPainterPath QGraphicsPolygonItem::shape();
// QPainterPath QGraphicsPathItem::shape();
--
GitLab
From 0174e25b88e95b3f0a1f740dec869add2704acae Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Mon, 16 Aug 2021 16:07:18 +0200
Subject: [PATCH 082/272] L1CaloFEXSim: Fix clang warnings.
Braces in initializers.
---
Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/gFEXSim.cxx | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/gFEXSim.cxx b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/gFEXSim.cxx
index 31d75dd9e47c..fc4179692af6 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/gFEXSim.cxx
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/gFEXSim.cxx
@@ -59,10 +59,10 @@ StatusCode gFEXSim::executegFEXSim(gTowersIDs tmp_gTowersIDs_subset){
std::copy(&tmp_gTowersIDs_subset[0][0], &tmp_gTowersIDs_subset[0][0]+(rows*cols),&m_gTowersIDs[0][0]);
- gTowersCentral Atwr = {0};
- gTowersCentral Btwr = {0};
- gTowersForward CPtwr = {0};
- gTowersForward CNtwr = {0};
+ gTowersCentral Atwr = {{{0}}};
+ gTowersCentral Btwr = {{{0}}};
+ gTowersForward CPtwr = {{{0}}};
+ gTowersForward CNtwr = {{{0}}};
ATH_CHECK( m_gFEXFPGA_Tool.retrieve() );
@@ -222,4 +222,4 @@ std::vector<uint32_t> gFEXSim::getgJetTOBs() const
}
-} // end of namespace bracket
\ No newline at end of file
+} // end of namespace bracket
--
GitLab
From 02d1ba8129795cb4a425d41716c504c8811d0e09 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Tue, 10 Aug 2021 19:56:39 +0200
Subject: [PATCH 083/272] CxxUtils: Update stacktrace test for newer lcg
versions.
With newer lcg versions, the system addr2line doesn't work because it's too old.
Normally that doesn't matter, because we usually use eu-addr2line, which does
work. However, the stacktrace unit test forces the use of /usr/bin/addr2line
(as the output formats are slightly different).
Change stacktrace so that if we don't find /usr/bin/eu-addr2line we
search PATH for addr2line, rather than hardcoding it. Also adjust the
unit test so that it should work with either addr2line or eu-addr2line.
---
Control/CxxUtils/Root/SealDebug.cxx | 29 +++++++++++++++++++----
Control/CxxUtils/test/stacktrace_test.cxx | 28 ++++++++++++++++++----
2 files changed, 49 insertions(+), 8 deletions(-)
diff --git a/Control/CxxUtils/Root/SealDebug.cxx b/Control/CxxUtils/Root/SealDebug.cxx
index cfe05cfbf066..d361e95c0838 100644
--- a/Control/CxxUtils/Root/SealDebug.cxx
+++ b/Control/CxxUtils/Root/SealDebug.cxx
@@ -115,7 +115,7 @@ static const int MAX_BACKTRACE_DEPTH = 128;
namespace {
-std::string addr2LinePath = "/usr/bin/addr2line";
+std::string addr2LinePath = "/usr/bin/eu-addr2line";
struct ATLAS_NOT_THREAD_SAFE BacktraceInit
@@ -127,9 +127,30 @@ struct ATLAS_NOT_THREAD_SAFE BacktraceInit
void* trace[1];
backtrace (trace, 1);
- // Also test for eu-addr2line.
- if (access ("/usr/bin/eu-addr2line", F_OK) == 0)
- addr2LinePath = "/usr/bin/eu-addr2line";
+ if (access (addr2LinePath.c_str(), F_OK) == 0) {
+ return;
+ }
+
+ // Search PATH for addr2line / eu-addr2line.
+ std::string path = getenv ("PATH");
+ while (!path.empty()) {
+ std::string::size_type pos = path.find (':');
+ std::string dir = path.substr (0, pos);
+ if (pos != std::string::npos) ++pos;
+ path.erase (0, pos);
+
+ std::string p1 = dir + "/eu-addr2line";
+ if (access (p1.c_str(), F_OK) == 0) {
+ addr2LinePath = p1;
+ break;
+ }
+
+ std::string p2 = dir + "/addr2line";
+ if (access (p2.c_str(), F_OK) == 0) {
+ addr2LinePath = p2;
+ break;
+ }
+ }
}
};
BacktraceInit backtraceInit;
diff --git a/Control/CxxUtils/test/stacktrace_test.cxx b/Control/CxxUtils/test/stacktrace_test.cxx
index 7f0e3b3ee62d..3d58c44f0820 100644
--- a/Control/CxxUtils/test/stacktrace_test.cxx
+++ b/Control/CxxUtils/test/stacktrace_test.cxx
@@ -10,6 +10,7 @@
*/
+#pragma GCC optimize "-O0"
#undef NDEBUG
#include "CxxUtils/checker_macros.h"
@@ -46,6 +47,7 @@ char* snip (char* buf, char* p, char fill = '\0')
void filter (char* buf)
{
+ char* buf0 = buf;
char* sl = 0;
while (*buf) {
if (buf[0] == '0' && buf[1] == 'x') {
@@ -65,11 +67,24 @@ void filter (char* buf)
++buf;
}
+ else if (buf[0] == ' ' && buf > buf0 && buf[-1] == ' ') {
+ char* p = buf;
+ while (*p == ' ') ++p;
+ buf = snip (buf, p);
+ sl = 0;
+ }
+
else if (buf[0] == ' ') {
++buf;
sl = 0;
}
+ else if (buf[0] == '?') {
+ char* p = buf+1;
+ while (*p == '?') ++p;
+ buf = snip (buf, p);
+ }
+
else if (buf[0] == '[') {
sl = buf;
++buf;
@@ -90,14 +105,20 @@ void filter (char* buf)
// Get rid of file/line number.
// Unfortunate, but we don't get these for opt builds.
- else if (buf[0] == ':' && sl) {
+ else if (buf[0] == ':' && isdigit (buf[1])) {
+ char* p = buf;
++buf;
while (isdigit (*buf))
++buf;
if (*buf == ' ')
++buf;
- buf = snip (sl, buf);
- sl = 0;
+ if (sl) {
+ buf = snip (sl, buf);
+ sl = 0;
+ }
+ else {
+ buf = snip (p, buf);
+ }
}
else
@@ -378,7 +399,6 @@ void testbad()
int main()
{
initpointers();
- Athena::DebugAids::setStackTraceAddr2Line ("/usr/bin/addr2line");
fromhere();
#ifdef HAVE_LINUX_UNWIND_BACKTRACE
testbad();
--
GitLab
From 75ca846b542dc0e4be44d20bc6567ad2ada9bd18 Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Mon, 16 Aug 2021 22:29:16 +0200
Subject: [PATCH 084/272] SuperClusterBuilder. Rename the Base class to
egammaSuperClusterBase. Then we have 3 classes , implementing 3 policies
depending on what we have want. Tracking and Electron
electronSupeClusterBuilder. No Tracking/Tracking and Photons
photonSuperClusterBuilder. No Tracking but generic objects mainly useful for
creating electons when no tracking is there egammaSuperClusterBuilder
---
.../src/components/egammaAlgs_entries.cxx | 2 +
.../src/egammaSuperClusterBuilder.cxx | 888 +++---------------
.../src/egammaSuperClusterBuilder.h | 381 ++------
.../src/egammaSuperClusterBuilderBase.cxx | 797 ++++++++++++++++
.../src/egammaSuperClusterBuilderBase.h | 356 +++++++
.../src/electronSuperClusterBuilder.cxx | 111 ++-
.../src/electronSuperClusterBuilder.h | 59 +-
.../src/photonSuperClusterBuilder.cxx | 105 ++-
.../src/photonSuperClusterBuilder.h | 81 +-
9 files changed, 1577 insertions(+), 1203 deletions(-)
create mode 100644 Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilderBase.cxx
create mode 100644 Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilderBase.h
diff --git a/Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_entries.cxx b/Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_entries.cxx
index a3a53e009471..8236e93c5f34 100644
--- a/Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_entries.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_entries.cxx
@@ -8,6 +8,7 @@
#include "../egammaTopoClusterCopier.h"
#include "../electronSuperClusterBuilder.h"
#include "../photonSuperClusterBuilder.h"
+#include "../egammaSuperClusterBuilder.h"
#include "../egammaSelectedTrackCopy.h"
#include "../EMGSFCaloExtensionBuilder.h"
@@ -21,5 +22,6 @@ DECLARE_COMPONENT( EMVertexBuilder )
DECLARE_COMPONENT( egammaTopoClusterCopier )
DECLARE_COMPONENT( electronSuperClusterBuilder )
DECLARE_COMPONENT( photonSuperClusterBuilder )
+DECLARE_COMPONENT( egammaSuperClusterBuilder )
DECLARE_COMPONENT( egammaSelectedTrackCopy )
DECLARE_COMPONENT( EMGSFCaloExtensionBuilder )
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilder.cxx b/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilder.cxx
index 7bfec040dbd8..321effb86890 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilder.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilder.cxx
@@ -4,795 +4,197 @@
#include "egammaSuperClusterBuilder.h"
-#include "CaloUtils/CaloCellList.h"
-#include "CaloUtils/CaloClusterStoreHelper.h"
-#include "CaloUtils/CaloLayerCalculator.h"
-
-#include "egammaRecEvent/egammaRecContainer.h"
+#include "CaloDetDescr/CaloDetDescrManager.h"
+#include "StoreGate/ReadHandle.h"
+#include "StoreGate/WriteHandle.h"
#include "xAODCaloEvent/CaloCluster.h"
#include "xAODCaloEvent/CaloClusterAuxContainer.h"
-#include "xAODCaloEvent/CaloClusterKineHelper.h"
+#include "xAODEgamma/Egamma.h"
#include "xAODEgamma/EgammaEnums.h"
#include "xAODEgamma/EgammaxAODHelpers.h"
-#include "xAODEgamma/PhotonxAODHelpers.h"
-#include "xAODTracking/TrackParticle.h"
-#include "xAODTracking/Vertex.h"
-
-#include "CaloGeoHelpers/proxim.h"
-#include "FourMomUtils/P4Helpers.h"
#include <cmath>
+#include <memory>
-namespace {
-/**
- * Duplicate code
- * @brief Return eta/phi ranges encompassing +- 1 cell.
- * @param eta Central eta value.
- * @param phi Central phi value.
- * @param sampling The sampling to use.
- * @param[out] deta Range in eta.
- * @param[out] dphi Range in phi.
- *
- * This can be a little tricky due to misalignments and the fact
- * that cells have different sizes in different regions. Also,
- * CaloLayerCalculator takes only a symmetric eta range.
- * We try to find the neighboring cells by starting from the center
- * cell and looking a little bit more than half its width in either
- * direction, and finding the centers of those cells. Then we use
- * the larger of these for the symmetric range.
- */
-void
-etaphi_range(const CaloDetDescrManager& dd_man,
- double eta,
- double phi,
- CaloCell_ID::CaloSample sampling,
- double& deta,
- double& dphi)
-{
- // Should be smaller than the eta half-width of any cell.
- constexpr double eps = 0.001;
- deta = 0;
- dphi = 0;
- // Get the DD element for the central cell.
- const CaloDetDescrElement* elt = dd_man.get_element_raw(sampling, eta, phi);
- if (!elt)
- return;
-
- // Now look in the negative eta direction.
- const CaloDetDescrElement* elt_l =
- dd_man.get_element_raw(sampling, eta - elt->deta() - eps, phi);
- double deta_l = 0; // Eta difference on the low (left) side.
- if (elt_l) {
- deta_l = std::abs(eta - elt_l->eta_raw()) + eps;
- }
- // Now look in the positive eta direction.
- const CaloDetDescrElement* elt_r =
- dd_man.get_element_raw(sampling, eta + elt->deta() + eps, phi);
- double deta_r = 0; // Eta difference on the high (right) side.
- if (elt_r) {
- deta_r = std::abs(eta - elt_r->eta_raw()) + eps;
- }
-
- // Total deta is twice the maximum.
- deta = 2 * std::max(deta_r, deta_l);
- // Now for the phi variation.
- // The phi size can change as a function of eta, but not of phi.
- // Thus we have to look again at the adjacent eta cells, and
- // take the largest variation.
- // Now look in the negative eta direction.
- elt_l = dd_man.get_element_raw(sampling,
- eta - elt->deta() - eps,
- CaloPhiRange::fix(phi - elt->dphi() - eps));
-
- double dphi_l = 0; // Phi difference on the low-eta () side.
- if (elt_l) {
- dphi_l = std::abs(CaloPhiRange::fix(phi - elt_l->phi_raw())) + eps;
- }
- // Now look in the positive eta direction.
- elt_r = dd_man.get_element_raw(sampling,
- eta + elt->deta() + eps,
- CaloPhiRange::fix(phi - elt->dphi() - eps));
- double dphi_r = 0; // Phi difference on the positive (down) side.
- if (elt_r) {
- dphi_r = std::abs(CaloPhiRange::fix(phi - elt_r->phi_raw())) + eps;
- }
- // Total dphi is twice the maximum.
- dphi = 2 * std::max(dphi_l, dphi_r);
-}
-
-/** Find the reference position (eta, phi) relative to which cells are
- restricted.
-*/
-egammaSuperClusterBuilder::CentralPosition
-findCentralPositionEM2(const std::vector<const xAOD::CaloCluster*>& clusters)
-{
- egammaSuperClusterBuilder::CentralPosition cp;
- for (const auto* cluster : clusters) {
- if (cluster->hasSampling(CaloSampling::EMB2)) {
- const float thisEmax = cluster->energy_max(CaloSampling::EMB2);
- if (thisEmax > cp.emaxB) {
- cp.emaxB = thisEmax;
- cp.etaB = cluster->etamax(CaloSampling::EMB2);
- cp.phiB = cluster->phimax(CaloSampling::EMB2);
- }
- }
- if (cluster->hasSampling(CaloSampling::EME2)) {
- const float thisEmax = cluster->energy_max(CaloSampling::EME2);
- if (thisEmax > cp.emaxEC) {
- cp.emaxEC = thisEmax;
- cp.etaEC = cluster->etamax(CaloSampling::EME2);
- cp.phiEC = cluster->phimax(CaloSampling::EME2);
- }
- }
- }
- return cp;
-}
-
-}// end of anonymous namespace
-
-//////////////////////////////////////////////////////////////////////////////
-// Athena interfaces.
-//////////////////////////////////////////////////////////////////////////////
-
-// Constructor.
egammaSuperClusterBuilder::egammaSuperClusterBuilder(const std::string& name,
ISvcLocator* pSvcLocator)
- : AthReentrantAlgorithm(name, pSvcLocator)
-{
-
- m_searchWindowPhiBarrel = m_searchWindowPhiCellsBarrel * s_cellPhiSize * 0.5;
- m_searchWindowEtaBarrel = m_searchWindowEtaCellsBarrel * s_cellEtaSize * 0.5;
- m_searchWindowPhiEndcap = m_searchWindowPhiCellsEndcap * s_cellPhiSize * 0.5;
- m_searchWindowEtaEndcap = m_searchWindowEtaCellsEndcap * s_cellEtaSize * 0.5;
-
- m_addCellsWindowEtaBarrel =
- m_addCellsWindowEtaCellsBarrel * s_cellEtaSize * 0.5;
- m_addCellsWindowEtaEndcap =
- m_addCellsWindowEtaCellsEndcap * s_cellEtaSize * 0.5;
- // The +- to account for the different L3 eta granularity
- m_extraL3EtaSize = m_extraL3EtaSizeCells * s_cellEtaSize * 0.5;
- // the + is to account for different L0/L1 phi granularity
- m_extraL0L1PhiSize = m_extraL0L1PhiSizeCells * s_cellPhiSize;
-}
+ : egammaSuperClusterBuilderBase(name, pSvcLocator)
+{}
StatusCode
egammaSuperClusterBuilder::initialize()
{
- m_searchWindowPhiBarrel = m_searchWindowPhiCellsBarrel * s_cellPhiSize * 0.5;
- m_searchWindowEtaBarrel = m_searchWindowEtaCellsBarrel * s_cellEtaSize * 0.5;
- m_searchWindowPhiEndcap = m_searchWindowPhiCellsEndcap * s_cellPhiSize * 0.5;
- m_searchWindowEtaEndcap = m_searchWindowEtaCellsEndcap * s_cellEtaSize * 0.5;
-
- if (m_addCellsWindowEtaCellsBarrel % 2 == 0 ||
- m_addCellsWindowEtaCellsEndcap % 2 == 0) {
- ATH_MSG_FATAL("For adding cells relative to the hottest cell to be "
- "symmetric in eta, the AddCells "
- "window size needs to be odd");
-
- return StatusCode::FAILURE;
- }
- ATH_CHECK(m_clusterCorrectionTool.retrieve());
- ATH_CHECK(m_MVACalibSvc.retrieve());
-
- if (!m_egammaCheckEnergyDepositTool.empty()) {
- ATH_CHECK(m_egammaCheckEnergyDepositTool.retrieve());
- } else {
- m_egammaCheckEnergyDepositTool.disable();
- }
- m_addCellsWindowEtaBarrel =
- m_addCellsWindowEtaCellsBarrel * s_cellEtaSize * 0.5;
- m_addCellsWindowEtaEndcap =
- m_addCellsWindowEtaCellsEndcap * s_cellEtaSize * 0.5;
- // The +- to account for the different L3 eta granularity
- m_extraL3EtaSize = m_extraL3EtaSizeCells * s_cellEtaSize * 0.5;
-
- // the + is to account for different L0/L1 phi granularity
- m_extraL0L1PhiSize = m_extraL0L1PhiSizeCells * s_cellPhiSize;
- ATH_MSG_INFO(
- '\n'
- << "e/gamma super clusters" << '\n'
- << "--> Eta Window size for L0/L1/L2 cells : " << '\n'
- << "Barrel +- " << m_addCellsWindowEtaBarrel << '\n'
- << "EndCap +- " << m_addCellsWindowEtaEndcap << '\n'
- << "--> Eta Window size for L3 cells : " << '\n'
- << "Barrel +- " << (m_addCellsWindowEtaBarrel + m_extraL3EtaSize) << '\n'
- << "EndCap +- " << (m_addCellsWindowEtaEndcap + m_extraL3EtaSize) << '\n'
- << " -> Phi window is fully dynamic for L2/L3" << '\n'
- << " -> L0/L1 cells in phi will be collected in a window" << '\n'
- << "(L2 neg extend - " << m_extraL0L1PhiSize << " , "
- << "L2 pos extend + " << m_extraL0L1PhiSize << ")");
-
- return StatusCode::SUCCESS;
-}
-
-bool
-egammaSuperClusterBuilder::matchesInWindow(const xAOD::CaloCluster* ref,
- const xAOD::CaloCluster* clus) const
-{
- // First the case where the seed is both endcap and barrel, i.e. in the crack
- // Check around both measurements of the seed
- if (ref->hasSampling(CaloSampling::EMB2) &&
- ref->hasSampling(CaloSampling::EME2)) {
- const float dEta(std::abs(ref->eta() - clus->eta()));
- const float dPhi(std::abs(P4Helpers::deltaPhi(ref->phi(), clus->phi())));
- //
- const float dEtaBarrel(
- std::abs(ref->etaSample(CaloSampling::EMB2) - clus->eta()));
- const float dPhiBarrel(std::abs(
- P4Helpers::deltaPhi(ref->phiSample(CaloSampling::EMB2), clus->phi())));
- //
- const float dEtaEndcap(
- std::abs(ref->etaSample(CaloSampling::EME2) - clus->eta()));
- const float dPhiEndcap(std::abs(
- P4Helpers::deltaPhi(ref->phiSample(CaloSampling::EME2), clus->phi())));
- // Matches any in case of split
- return (
- (dEta < m_searchWindowEtaBarrel && dPhi < m_searchWindowPhiBarrel) ||
- (dEta < m_searchWindowEtaEndcap && dPhi < m_searchWindowPhiEndcap) ||
- (dEtaBarrel < m_searchWindowEtaBarrel &&
- dPhiBarrel < m_searchWindowPhiBarrel) ||
- (dEtaEndcap < m_searchWindowEtaEndcap &&
- dPhiEndcap < m_searchWindowPhiEndcap));
- }
- if (xAOD::EgammaHelpers::isBarrel(clus)) {
- const float dEta(std::abs(ref->eta() - clus->eta()));
- const float dPhi(std::abs(P4Helpers::deltaPhi(ref->phi(), clus->phi())));
- return (dEta < m_searchWindowEtaBarrel && dPhi < m_searchWindowPhiBarrel);
- }
- const float dEta(std::abs(ref->eta() - clus->eta()));
- const float dPhi(std::abs(P4Helpers::deltaPhi(ref->phi(), clus->phi())));
- return (dEta < m_searchWindowEtaEndcap && dPhi < m_searchWindowPhiEndcap);
-}
-
-
-std::unique_ptr<xAOD::CaloCluster>
-egammaSuperClusterBuilder::createNewCluster(
- const EventContext& ctx,
- const std::vector<const xAOD::CaloCluster*>& clusters,
- const CaloDetDescrManager& mgr,
- xAOD::EgammaParameters::EgammaType egType) const
-{
-
- const auto acSize = clusters.size();
- if (clusters.empty()) {
- ATH_MSG_ERROR("Missing the seed cluster! Should not happen.");
- return nullptr;
- }
-
- // create a new empty cluster
- // note: we are not adding any cells here
- std::unique_ptr<xAOD::CaloCluster> newCluster(
- CaloClusterStoreHelper::makeCluster(
- clusters[0]->getCellLinks()->getCellContainer()));
-
- if (!newCluster) {
- ATH_MSG_ERROR("CaloClusterStoreHelper::makeCluster failed.");
- return nullptr;
- }
- newCluster->setClusterSize(xAOD::CaloCluster::SuperCluster);
-
- // Let's try to find the eta and phi of the hottest cell in L2.
- // This will be used as the center for restricting the cluster size.
- // In the future can refine (or add sanity checks) to the selection
- CentralPosition cpRef = findCentralPositionEM2(clusters);
- // these are the same as the reference but in calo frame (after the processing
- // below)
- CentralPosition cp0 = cpRef;
- // Get the hotest in raw co-ordinates
- if (cp0.emaxB > 0) {
- const CaloDetDescrElement* dde =
- mgr.get_element(CaloCell_ID::EMB2, cpRef.etaB, cpRef.phiB);
- if (dde) {
- cp0.etaB = dde->eta_raw();
- cp0.phiB = dde->phi_raw();
- } else {
- ATH_MSG_WARNING("Couldn't get CaloDetDescrElement from mgr for eta = "
- << cpRef.etaB << ", phi = " << cpRef.phiB);
- }
- }
-
- if (cp0.emaxEC > 0) {
- const CaloDetDescrElement* dde =
- mgr.get_element(CaloCell_ID::EME2, cpRef.etaEC, cpRef.phiEC);
- if (dde) {
- cp0.etaEC = dde->eta_raw();
- cp0.phiEC = dde->phi_raw();
- } else {
- ATH_MSG_WARNING("Couldn't get CaloDetDescrElement from mgr for eta = "
- << cpRef.etaEC << ", phi = " << cpRef.phiEC);
- }
- }
-
- // Set the eta0/phi0 based on the references, but in raw coordinates
- if (cp0.emaxB >= cp0.emaxEC) {
- newCluster->setEta0(cp0.etaB);
- newCluster->setPhi0(cp0.phiB);
- } else {
- newCluster->setEta0(cp0.etaEC);
- newCluster->setPhi0(cp0.phiEC);
- }
-
- // Actually fill the cluster here
- if (fillClusterConstrained(*newCluster, clusters, cp0).isFailure()) {
- ATH_MSG_DEBUG(
- "There was problem adding the topocluster cells to the the cluster: "
- "potentially no L2 or L3 cells in cluster");
- return nullptr;
- }
- // Apply SW-style summation of TileGap3 cells (if necessary).
- if (addTileGap3CellsinWindow(*newCluster, mgr).isFailure()) {
- ATH_MSG_ERROR(
- "Problem with the input cluster when running AddTileGap3CellsinWindow?");
- return nullptr;
- }
- /// Calculate the kinematics of the new cluster, after all cells are added
- CaloClusterKineHelper::calculateKine(newCluster.get(), true, true);
-
- // If adding all EM cells we are somehow below the seed threshold then remove
- if (newCluster->et() < m_EtThresholdCut) {
- return nullptr;
- }
-
- // Check to see if cluster pases basic requirements. If not, kill it.
- if (!m_egammaCheckEnergyDepositTool.empty() &&
- !m_egammaCheckEnergyDepositTool->checkFractioninSamplingCluster(
- newCluster.get())) {
- ATH_MSG_DEBUG("Cluster failed sample check");
- return nullptr;
- }
-
- // Apply correction calibration
- if (calibrateCluster(ctx, newCluster.get(), mgr, egType).isFailure()) {
- ATH_MSG_WARNING("There was problem calibrating the object");
- return nullptr;
- }
-
- // Avoid negative energy clusters
- if (newCluster->et() < 0) {
- ATH_MSG_DEBUG("Negative et after calibration/corrections");
- return nullptr;
- }
- // EDM vector to constituent clusters
- std::vector<ElementLink<xAOD::CaloClusterContainer>> constituentLinks;
- static const SG::AuxElement::Accessor<ElementLink<xAOD::CaloClusterContainer>>
- sisterCluster("SisterCluster");
- for (size_t i = 0; i < acSize; i++) {
- // Set the element Link to the constitents
- if (sisterCluster.isAvailable(*clusters[i])) {
- constituentLinks.push_back(sisterCluster(*clusters[i]));
- } else {
- ATH_MSG_WARNING("No sister Link available");
- }
- }
- // Set the link from the super cluster to the constituents (accumulated)
- // clusters used.
- static const SG::AuxElement::Accessor<
- std::vector<ElementLink<xAOD::CaloClusterContainer>>>
- caloClusterLinks("constituentClusterLinks");
- caloClusterLinks(*newCluster) = constituentLinks;
+ ATH_MSG_DEBUG(" Initializing egammaSuperClusterBuilder");
- // return the new cluster
- return newCluster;
+ // the data handle keys
+ ATH_CHECK(m_inputEgammaRecContainerKey.initialize());
+ ATH_CHECK(m_egammaSuperRecCollectionKey.initialize());
+ return egammaSuperClusterBuilderBase::initialize();
}
-
-
StatusCode
-egammaSuperClusterBuilder::fillClusterConstrained(
- xAOD::CaloCluster& tofill,
- const std::vector<const xAOD::CaloCluster*>& clusters,
- const egammaSuperClusterBuilder::CentralPosition& cp0) const
+egammaSuperClusterBuilder::execute(const EventContext& ctx) const
{
- const float addCellsWindowEtaBarrel = m_addCellsWindowEtaBarrel;
- const float addCellsWindowEtaEndcap = m_addCellsWindowEtaEndcap;
- const float addCellsWindowL3EtaBarrel =
- m_addCellsWindowEtaBarrel + m_extraL3EtaSize;
- const float addCellsWindowL3EtaEndcap =
- m_addCellsWindowEtaEndcap + m_extraL3EtaSize;
-
- // Loop for L2/L3
- for (const xAOD::CaloCluster* tocheck : clusters) {
- xAOD::CaloCluster::const_cell_iterator cell_itr = tocheck->begin();
- xAOD::CaloCluster::const_cell_iterator cell_end = tocheck->end();
- // Loop over cells
- for (; cell_itr != cell_end; ++cell_itr) {
- // sanity check on the cell
- const CaloCell* cell = *cell_itr;
- if (!cell) {
- continue;
- }
- const CaloDetDescrElement* dde = cell->caloDDE();
- if (!dde) {
- continue;
- }
- // we want only LAREM
- if (!(dde->getSubCalo() == CaloCell_ID::LAREM)) {
- continue;
- }
- // we want L2 or L3 cells
- const auto sampling = dde->getSampling();
- const bool isL2Cell =
- (CaloCell_ID::EMB2 == sampling || CaloCell_ID::EME2 == sampling);
- const bool isL3Cell =
- (CaloCell_ID::EMB3 == sampling || CaloCell_ID::EME3 == sampling);
- if ((!isL2Cell) && (!isL3Cell)) {
- continue;
- }
- // Also exclude the inner wheel Endcap
- if (dde->is_lar_em_endcap_inner()) {
- continue;
- }
+ // Retrieve input egammaRec container.
+ SG::ReadHandle<EgammaRecContainer> egammaRecs(m_inputEgammaRecContainerKey,
+ ctx);
- bool inEtaRange = false;
- // Check if is inside the eta range wrt to the hottest
- // cell(s) for the cluster we construct
- if (cp0.emaxB > 0) { // barrel
- if (isL2Cell &&
- (std::abs(cp0.etaB - dde->eta_raw()) < addCellsWindowEtaBarrel)) {
- inEtaRange = true;
- }
- if (isL3Cell &&
- (std::abs(cp0.etaB - dde->eta_raw()) < addCellsWindowL3EtaBarrel)) {
- inEtaRange = true;
- }
- }
- if (cp0.emaxEC > 0) { // endcap
- if (isL2Cell &&
- (std::abs(cp0.etaEC - dde->eta_raw()) < addCellsWindowEtaEndcap)) {
- inEtaRange = true;
- }
- if (isL3Cell && (std::abs(cp0.etaEC - dde->eta_raw()) <
- addCellsWindowL3EtaEndcap)) {
- inEtaRange = true;
- }
- }
- if (!inEtaRange) {
- continue;
- }
- tofill.addCell(cell_itr.index(), cell_itr.weight());
- } // Loop over cells for L2/L3
- } // Loop over clusters for L2/L3
-
- // We should have a size here
- if (tofill.size() == 0) {
+ // check is only used for serial running; remove when MT scheduler used
+ if (!egammaRecs.isValid()) {
+ ATH_MSG_ERROR("Failed to retrieve " << m_inputEgammaRecContainerKey.key());
return StatusCode::FAILURE;
}
- // Now calculate the cluster size in 2nd layes
- // use that for constraining the L0/L1 cells we add
- const PhiSize phiSize = findPhiSize(cp0, tofill);
- const float phiPlusB = cp0.phiB + phiSize.plusB + m_extraL0L1PhiSize;
- const float phiMinusB = cp0.phiB - phiSize.minusB - m_extraL0L1PhiSize;
- const float phiPlusEC = cp0.phiEC + phiSize.plusEC + m_extraL0L1PhiSize;
- const float phiMinusEC = cp0.phiEC - phiSize.minusEC - m_extraL0L1PhiSize;
-
- // Loop for L0/L1
- for (const xAOD::CaloCluster* tocheck : clusters) {
- xAOD::CaloCluster::const_cell_iterator cell_itr = tocheck->begin();
- xAOD::CaloCluster::const_cell_iterator cell_end = tocheck->end();
- // Loop over cells
- for (; cell_itr != cell_end; ++cell_itr) {
- // sanity check on the cell
- const CaloCell* cell = *cell_itr;
- if (!cell) {
- continue;
- }
- const CaloDetDescrElement* dde = cell->caloDDE();
- if (!dde) {
- continue;
- }
-
- // only deal with L1 or PS
- const auto sampling = dde->getSampling();
- const bool isL0L1Cell =
- (CaloCell_ID::EMB1 == sampling || CaloCell_ID::EME1 == sampling ||
- CaloCell_ID::PreSamplerB == sampling ||
- CaloCell_ID::PreSamplerE == sampling);
- if (!isL0L1Cell) {
- continue;
- }
-
- bool inEtaRange = false;
- // Check if is inside the eta range wrt to the hottest
- // cell(s) for the cluster we construct
- if (cp0.emaxB > 0) { // barrel
- if (std::abs(cp0.etaB - dde->eta_raw()) < addCellsWindowEtaBarrel) {
- inEtaRange = true;
- }
- }
- if (cp0.emaxEC > 0) { // endcap
- if (std::abs(cp0.etaEC - dde->eta_raw()) < addCellsWindowEtaEndcap) {
- inEtaRange = true;
- }
- }
- if (!inEtaRange) {
- continue;
- }
-
- // Add L0/L1 when we are in the narrow range
- bool inPhiRange = false;
- if (cp0.emaxB > 0) { // barrel
- const double cell_phi = proxim(dde->phi_raw(), cp0.phiB);
- if (cell_phi > phiMinusB && cell_phi < phiPlusB) {
- inPhiRange = true;
- }
- }
- if (cp0.emaxEC > 0) { // endcap
- const double cell_phi = proxim(dde->phi_raw(), cp0.phiEC);
- if (cell_phi > phiMinusEC && cell_phi < phiPlusEC) {
- inPhiRange = true;
- }
- }
- if (!inPhiRange) {
- continue;
- }
-
- tofill.addCell(cell_itr.index(), cell_itr.weight());
- } // Cell Loop for L0/L1
- } // Cluster loop for L0/L1
- return StatusCode::SUCCESS;
-}
-
-StatusCode
-egammaSuperClusterBuilder::addTileGap3CellsinWindow(
- xAOD::CaloCluster& tofill,
- const CaloDetDescrManager& mgr) const
-{
- constexpr double searchWindowEta = 0.2;
- constexpr double searchWindowPhi = 2 * M_PI / 64.0 + M_PI / 64; // ~ 0.15 rad
- std::vector<const CaloCell*> cells;
- cells.reserve(16);
- const CaloCellContainer* inputcells =
- tofill.getCellLinks()->getCellContainer();
+ // Have to register cluster container in order to properly get cluster links.
+ SG::WriteHandle<xAOD::CaloClusterContainer> outputClusterContainer(
+ m_outputegammaSuperClustersKey, ctx);
+ ATH_CHECK(outputClusterContainer.record(
+ std::make_unique<xAOD::CaloClusterContainer>(),
+ std::make_unique<xAOD::CaloClusterAuxContainer>()));
+
+ // Create the new egamma Super Cluster based EgammaRecContainer
+ SG::WriteHandle<EgammaRecContainer> newEgammaRecs(
+ m_egammaSuperRecCollectionKey, ctx);
+ ATH_CHECK(newEgammaRecs.record(std::make_unique<EgammaRecContainer>()));
+
+ // The calo Det Descr manager
+ const CaloDetDescrManager* calodetdescrmgr = nullptr;
+ ATH_CHECK(detStore()->retrieve(calodetdescrmgr, "CaloMgr"));
+
+ // Reserve a vector to keep track of what is used
+ std::vector<bool> isUsed(egammaRecs->size(), false);
+ std::vector<bool> isUsedRevert(egammaRecs->size(), false);
+ // Loop over input egammaRec objects, build superclusters.
+ for (std::size_t i = 0; i < egammaRecs->size(); ++i) {
+ if (isUsed[i])
+ continue;
- if (!inputcells) {
- ATH_MSG_ERROR("No cell container in addRemainingCellsToCluster?");
- return StatusCode::FAILURE;
- }
+ const auto* const egRec = (*egammaRecs)[i];
- CaloCellList myList(inputcells);
+ // Seed selections
+ const auto* const clus = egRec->caloCluster();
- const std::vector<CaloSampling::CaloSample> samples = {
- CaloSampling::TileGap3
- };
- for (auto samp : samples) {
- // quite slow
- myList.select(mgr,
- tofill.eta0(),
- tofill.phi0(),
- searchWindowEta,
- searchWindowPhi,
- samp);
- cells.insert(cells.end(), myList.begin(), myList.end());
- }
-
- for (const auto* cell : cells) {
- if (!cell) {
+ // The seed should have 2nd sampling
+ if (!clus->hasSampling(CaloSampling::EMB2) &&
+ !clus->hasSampling(CaloSampling::EME2)) {
continue;
}
- const CaloDetDescrElement* dde = cell->caloDDE();
- if (!dde) {
+ const double eta2 = std::abs(clus->etaBE(2));
+ if (eta2 > 10) {
continue;
}
-
- if ((CaloCell_ID::TileGap3 == dde->getSampling()) &&
- (std::abs(dde->eta_raw()) > 1.4 && std::abs(dde->eta_raw()) < 1.6)) {
- int index = inputcells->findIndex(dde->calo_hash());
- tofill.addCell(index, 1.);
+ // Accordeon Energy samplings 1 to 3
+ const double EMAccEnergy =
+ clus->energyBE(1) + clus->energyBE(2) + clus->energyBE(3);
+ const double EMAccEt = EMAccEnergy / cosh(eta2);
+ // Require minimum energy for supercluster seeding.
+ if (EMAccEt < m_EtThresholdCut) {
+ continue;
+ }
+ // Passed preliminary custs
+ ATH_MSG_DEBUG("Creating supercluster egammaRec egamma object "
+ << 'n' << "Using cluster Et = " << clus->et()
+ << " EM Accordeon Et " << EMAccEt);
+ // Mark seed as used
+ isUsedRevert = isUsed; // save status in case we fail to create supercluster
+ isUsed[i] = true;
+
+ // Start accumulating the clusters from the seed
+ std::vector<const xAOD::CaloCluster*> accumulatedClusters;
+ accumulatedClusters.push_back(clus);
+
+ const std::vector<std::size_t> secondaryIndices =
+ searchForSecondaryClusters(i, egammaRecs.cptr(), isUsed);
+
+ for (const auto secClusIndex : secondaryIndices) {
+ const auto* const secRec = (*egammaRecs)[secClusIndex];
+ accumulatedClusters.push_back(secRec->caloCluster());
+ // no need to add vertices
}
- }
- return StatusCode::SUCCESS;
-}
-
-StatusCode
-egammaSuperClusterBuilder::calibrateCluster(
- const EventContext& ctx,
- xAOD::CaloCluster* newCluster,
- const CaloDetDescrManager& mgr,
- const xAOD::EgammaParameters::EgammaType egType) const
-{
-
- ATH_CHECK(refineEta1Position(newCluster, mgr));
- // Save the state before the corrections
- newCluster->setAltE(newCluster->e());
- newCluster->setAltEta(newCluster->eta());
- newCluster->setAltPhi(newCluster->phi());
- // first do the corrections
- ATH_CHECK(m_clusterCorrectionTool->execute(
- ctx, newCluster, egType, xAOD::EgammaHelpers::isBarrel(newCluster)));
- newCluster->setRawE(newCluster->e());
- newCluster->setRawEta(newCluster->eta());
- newCluster->setRawPhi(newCluster->phi());
- //
- ATH_CHECK(fillPositionsInCalo(newCluster, mgr));
- ATH_CHECK(m_MVACalibSvc->execute(*newCluster, egType));
-
- return StatusCode::SUCCESS;
-}
-StatusCode
-egammaSuperClusterBuilder::fillPositionsInCalo(
- xAOD::CaloCluster* cluster,
- const CaloDetDescrManager& mgr) const
-{
- const bool isBarrel = xAOD::EgammaHelpers::isBarrel(cluster);
- CaloCell_ID::CaloSample sample =
- isBarrel ? CaloCell_ID::EMB2 : CaloCell_ID::EME2;
- // eta and phi of the cluster in the calorimeter frame
- double eta;
- double phi;
- m_caloCellDetPos.getDetPosition(
- mgr, sample, cluster->eta(), cluster->phi(), eta, phi);
- cluster->insertMoment(xAOD::CaloCluster::ETACALOFRAME, eta);
- cluster->insertMoment(xAOD::CaloCluster::PHICALOFRAME, phi);
- // eta in the second sampling
- m_caloCellDetPos.getDetPosition(
- mgr, sample, cluster->etaBE(2), cluster->phiBE(2), eta, phi);
- cluster->insertMoment(xAOD::CaloCluster::ETA2CALOFRAME, eta);
- cluster->insertMoment(xAOD::CaloCluster::PHI2CALOFRAME, phi);
- // eta in the first sampling
- sample = isBarrel ? CaloCell_ID::EMB1 : CaloCell_ID::EME1;
- m_caloCellDetPos.getDetPosition(
- mgr, sample, cluster->etaBE(1), cluster->phiBE(1), eta, phi);
- cluster->insertMoment(xAOD::CaloCluster::ETA1CALOFRAME, eta);
- cluster->insertMoment(xAOD::CaloCluster::PHI1CALOFRAME, phi);
+ std::unique_ptr<xAOD::CaloCluster> newCluster =
+ createNewCluster(ctx,
+ accumulatedClusters,
+ *calodetdescrmgr,
+ xAOD::EgammaParameters::electron);
- return StatusCode::SUCCESS;
-}
+ if (!newCluster) {
+ ATH_MSG_DEBUG("Creating a new cluster failed");
+ // Revert status of constituent clusters.
+ isUsed.swap(isUsedRevert);
+ continue;
+ }
-StatusCode
-egammaSuperClusterBuilder::refineEta1Position(
- xAOD::CaloCluster* cluster,
- const CaloDetDescrManager& mgr) const
-{
+ // push back the new egamma super cluster to the output container
+ outputClusterContainer->push_back(std::move(newCluster));
+
+ // Add the cluster link to the super cluster
+ ElementLink<xAOD::CaloClusterContainer> clusterLink(
+ *outputClusterContainer, outputClusterContainer->size() - 1, ctx);
+ std::vector<ElementLink<xAOD::CaloClusterContainer>> egCluster{
+ clusterLink
+ };
+
+ // Make egammaRec object, and push it back into output container.
+ auto newEgRec = std::make_unique<egammaRec>(*egRec);
+ if (newEgRec) {
+ newEgRec->setCaloClusters(egCluster);
+ newEgammaRecs->push_back(std::move(newEgRec));
+ ATH_MSG_DEBUG("Finished making egamma egammaRec object");
+ } else {
+ ATH_MSG_FATAL("Couldn't make an egammaRec object");
+ return StatusCode::FAILURE;
+ }
+ } // End loop on egammaRecs
- // This only makes sense if we have cells there
- if (!cluster->hasSampling(CaloSampling::EMB1) &&
- !cluster->hasSampling(CaloSampling::EME1)) {
- return StatusCode::SUCCESS;
- }
- // Now calculare the position using cells in barrel or endcap or both
- const double aeta = std::abs(cluster->etaBE(2));
- if (aeta < 1.6 && cluster->hasSampling(CaloSampling::EMB1)) {
- ATH_CHECK(makeCorrection1(cluster, mgr, CaloSampling::EMB1));
- }
- if (aeta > 1.3 && cluster->hasSampling(CaloSampling::EME1)) {
- ATH_CHECK(makeCorrection1(cluster, mgr, CaloSampling::EME1));
- }
return StatusCode::SUCCESS;
}
-StatusCode
-egammaSuperClusterBuilder::makeCorrection1(
- xAOD::CaloCluster* cluster,
- const CaloDetDescrManager& mgr,
- const CaloSampling::CaloSample sample) const
+// assume egammaRecs != 0, since the ReadHadler is valid
+// assume seed egammaRec has a valid cluster, since it has been already used
+std::vector<std::size_t>
+egammaSuperClusterBuilder::searchForSecondaryClusters(
+ std::size_t seedIndex,
+ const EgammaRecContainer* egammaRecs,
+ std::vector<bool>& isUsed) const
{
- // Protections.
- if (cluster->etamax(sample) == -999. || cluster->phimax(sample) == -999.) {
- return StatusCode::SUCCESS;
- }
- if (std::abs(cluster->etamax(sample)) < 1E-6 &&
- std::abs(cluster->phimax(sample)) < 1E-6) {
- return StatusCode::SUCCESS;
- }
- // Get the hottest in raw co-ordinates
- // We have two kinds of enums ...
- CaloCell_ID::CaloSample xsample =
- (sample == CaloSampling::EMB1) ? CaloCell_ID::EMB1 : CaloCell_ID::EME1;
- //
- const CaloDetDescrElement* dde =
- mgr.get_element(xsample, cluster->etamax(sample), cluster->phimax(sample));
- if (!dde) {
- ATH_MSG_WARNING("Couldn't get CaloDetDescrElement from mgr for: "
- "cluster->etamax(sample): "
- << cluster->etamax(sample)
- << " cluster->phimax(sample): " << cluster->phimax(sample)
- << " will not refine the position in layer1");
- return StatusCode::SUCCESS;
- }
- //
- double etamax = dde->eta_raw();
- double phimax = dde->phi_raw();
- // now Locate the +-1 range
- double detastr(-999);
- double dphistr(-999);
- // Raw co-ordinates used here
- etaphi_range(mgr, etamax, phimax, xsample, detastr, dphistr);
- //
- // Given the range refine the position employing the smaller window
- if (detastr > 0 && dphistr > 0) {
- CaloLayerCalculator helper;
- const auto* const cellLink = cluster->getCellLinks();
- helper.fill(cellLink->begin(),
- cellLink->end(),
- etamax,
- phimax,
- detastr,
- dphistr,
- sample);
-
- // Here is where we (re-)fill the eta in the 1st sampling
- if (helper.etam() != -999.) {
- // This is "real" atlas co-ordinates
- cluster->setEta(sample, helper.etam());
- }
- }
- return StatusCode::SUCCESS;
-}
-egammaSuperClusterBuilder::PhiSize
-egammaSuperClusterBuilder::findPhiSize(
- const egammaSuperClusterBuilder::CentralPosition& cp0,
- const xAOD::CaloCluster& cluster) const
-{
+ std::vector<std::size_t> secondaryIndices;
- PhiSize phiSize;
- auto cell_itr = cluster.cell_cbegin();
- auto cell_end = cluster.cell_cend();
- for (; cell_itr != cell_end; ++cell_itr) {
+ const auto* const seedEgammaRec = (*egammaRecs)[seedIndex];
+ const xAOD::CaloCluster* const seedCaloClus = seedEgammaRec->caloCluster();
- const CaloCell* cell = *cell_itr;
- if (!cell) {
+ // for stats
+ int nWindowClusters = 0;
+ // Now loop over the potential secondary clusters
+ for (std::size_t i = 0; i < egammaRecs->size(); ++i) {
+ // if already used continue
+ if (isUsed[i]) {
continue;
}
-
- const CaloDetDescrElement* dde = cell->caloDDE();
- if (!dde) {
+ const auto* const secEgammaRec = (*egammaRecs)[i];
+ const xAOD::CaloCluster* const secClus = secEgammaRec->caloCluster();
+ if (!secClus) {
+ ATH_MSG_WARNING(
+ "The potentially secondary egammaRec does not have a cluster");
continue;
}
-
- if (cp0.emaxB > 0 && CaloCell_ID::EMB2 == dde->getSampling()) {
- const float phi0 = cp0.phiB;
- double cell_phi = proxim(dde->phi_raw(), phi0);
- if (cell_phi > phi0) {
- auto diff = cell_phi - phi0;
- if (diff > phiSize.plusB) {
- phiSize.plusB = diff;
- }
- } else {
- auto diff = phi0 - cell_phi;
- if (diff > phiSize.minusB) {
- phiSize.minusB = diff;
- }
- }
- } else if (cp0.emaxEC > 0 && CaloCell_ID::EME2 == dde->getSampling()) {
- const float phi0 = cp0.phiEC;
- double cell_phi = proxim(dde->phi_raw(), phi0);
- if (cell_phi > phi0) {
- auto diff = cell_phi - phi0;
- if (diff > phiSize.plusEC) {
- phiSize.plusEC = diff;
- }
- } else {
- auto diff = phi0 - cell_phi;
- if (diff > phiSize.minusEC) {
- phiSize.minusEC = diff;
- }
- }
+ bool addCluster = false;
+ if (matchesInWindow(seedCaloClus, secClus)) {
+ ATH_MSG_DEBUG("Cluster with Et: " << secClus->et()
+ << " matched in window");
+ ++nWindowClusters;
+ addCluster = true;
+ }
+ // Add it to the list of secondary clusters if it matches.
+ if (addCluster) {
+ secondaryIndices.push_back(i);
+ isUsed[i] = true;
}
}
- // some safety checks
- if (phiSize.plusB > 1.0) {
- ATH_MSG_WARNING("phiSizePlusB is large: " << phiSize.plusB
- << ", capping at 1.0");
- phiSize.plusB = 1.0;
- }
- if (phiSize.plusEC > 1.0) {
- ATH_MSG_WARNING("phiSizePlusEC is large: " << phiSize.plusEC
- << ", capping at 1.0");
- phiSize.plusEC = 1.0;
- }
- if (phiSize.minusB > 1.0) {
- ATH_MSG_WARNING("phiSizeMinusB is large: " << phiSize.minusB
- << ", capping at 1.0");
- phiSize.minusB = 1.0;
- }
- if (phiSize.minusEC > 1.0) {
- ATH_MSG_WARNING("phiSizeMinusEC is large: " << phiSize.minusEC
- << ", capping at 1.0");
- phiSize.minusEC = 1.0;
- }
- return phiSize;
+ ATH_MSG_DEBUG("Found: " << secondaryIndices.size() << " secondaries");
+ ATH_MSG_DEBUG("window clusters: " << nWindowClusters);
+ return secondaryIndices;
}
+
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilder.h b/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilder.h
index c99e8801281c..f35221181cff 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilder.h
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilder.h
@@ -5,336 +5,107 @@
#ifndef EGAMMAALGS_EGAMMASUPERCLUSTERBUILDER_H
#define EGAMMAALGS_EGAMMASUPERCLUSTERBUILDER_H
-// INCLUDE HEADER FILES:
-#include "AthenaBaseComps/AthReentrantAlgorithm.h"
-#include "GaudiKernel/EventContext.h"
-#include "GaudiKernel/SystemOfUnits.h"
-#include "GaudiKernel/ToolHandle.h"
+#include "egammaSuperClusterBuilderBase.h"
+#include "GaudiKernel/EventContext.h"
+#include "StoreGate/ReadHandleKey.h"
+#include "StoreGate/WriteHandleKey.h"
// Fwd declarations
-#include "CaloDetDescr/CaloDetDescrManager.h"
-#include "CaloUtils/CaloCellDetPos.h"
-#include "egammaInterfaces/IegammaCheckEnergyDepositTool.h"
-#include "EgammaAnalysisInterfaces/IegammaMVASvc.h"
-#include "egammaInterfaces/IegammaSwTool.h"
#include "egammaRecEvent/egammaRecContainer.h"
-#include "xAODCaloEvent/CaloClusterFwd.h"
+#include "xAODCaloEvent/CaloClusterContainer.h"
#include "xAODEgamma/EgammaEnums.h"
-#include "xAODTracking/TrackParticleContainerFwd.h"
-#include <memory>
+#include <string>
#include <vector>
-class CaloDetDescrManager;
-/** Base class for electronSuperClusterBuilder and photonSuperClusterBuilder.
- * This class cannot be instantiated by itself since the execute method is not
- * implemented.
+/**
+ * @brief Create supercluster under egamma (no tracking) hypothesis
+ * Useful if you want to run electron reconstuction without tracking
+ * (the photon one can run anyhow without tracking)
+ *
+ * The algorithm creates superclusters merging topoclusters.
+ * Input containers:
+ * - \ref egammaSuperClusterBuilder.m_inputEgammaRecContainerKey
+ * "InputEgammaRecContainerName" (default=egammaRecCollection): collection of
+ * EgammaRec objects to be used
+ *
+ * Output containers:
+ * - \ref egammaSuperClusterBuilder.m_egammaSuperRecCollectionKey
+ * "SuperegammaRecCollectionName" (default=egammaSuperRecCollection): collection
+ * of EgammaRec objects with the cluster set to be the supercluster
+ * - \ref egammaSuperClusterBuilder.m_outputegammaSuperClustersKey
+ * "SuperClusterCollectionName" (default=egammaSuperClusters): collection of
+ * clusters (the supercluster)
*
- * This class provides functions which are used to build supercluster and are
- * independet from the nature of the particles, for example a function to decide
- * if two clusters are compatible to be added in a supercluster
- * (egammaSuperClusterBuilder::matchesInWindow) and a function
- * (egammaSuperClusterBuilder::createNewCluster) to create a new
- * supercluster from a collection of clusters.
- **/
-class egammaSuperClusterBuilder : public AthReentrantAlgorithm
+ * The loop is on the clusters of the EgammaRec objects from the input
+ * container. Fist, the first cluster is considered as a seed. The cluster seed
+ * must pass some selection:
+ * - having a second sampling with |eta| not larger than 10
+ * - pT (from the sum of the three accordion layer) not below
+ * \ref egammaSuperClusterBuilderBase.m_EtThresholdCut "EtThresholdCut"
+ *
+ * Clusters to be merged in a supercluster are selected using the
+ * egammaSuperClusterBuilder::searchForSecondaryClusters function. Then the
+ * procedure is redone, testing new seeds, for all the other clusters that have
+ * not been used to make superclusters. The building of the supercluster is done
+ * with egammaSuperClusterBuilderBase::createNewCluster which selects the cells
+ * to be used.
+ */
+class egammaSuperClusterBuilder : public egammaSuperClusterBuilderBase
{
-public:
- struct CentralPosition
- {
- float etaB = 999;
- float phiB = 999;
- float emaxB = -999 * Gaudi::Units::GeV;
- float etaEC = 999;
- float phiEC = 999;
- float emaxEC = -999 * Gaudi::Units::GeV;
- };
- struct PhiSize
- {
- float plusB = 0;
- float minusB = 0;
- float plusEC = 0;
- float minusEC = 0;
- };
-
-protected:
- /** Protected constructor since this class should not be instantiated by
- * itself */
+public:
egammaSuperClusterBuilder(const std::string& name, ISvcLocator* pSvcLocator);
- /** should be called by the derived class in the initialize phase */
- virtual StatusCode initialize() override;
-
- /**
- * @brief Is clus in window center around ref?
- *
- * @param ref: reference cluster
- * @param clus: cluster to be tested
- *
- * The matching is done using delta-eta and delta-phi comparing them
- * with the values of
- * \ref egammaSuperClusterBuilder.m_searchWindowEtaCellsBarrel "SearchWindowEtaCellsBarrel",
- * \ref egammaSuperClusterBuilder.m_searchWindowPhiCellsBarrel "SearchWindowPhiCellsBarrel",
- * \ref egammaSuperClusterBuilder.m_searchWindowEtaCellsEndcap "SearchWindowEtaCellsEndcap" and
- * \ref egammaSuperClusterBuilder.m_searchWindowPhiCellsEndcap "SearchWindowPhiCellsEndcap",
- * depending if the seed is barrel or endcap. If it is in the crack, an OR of the conditions
- * (using both seeds) is used.
- **/
- bool matchesInWindow(const xAOD::CaloCluster* ref,
- const xAOD::CaloCluster* clus) const;
-
- /** Creates a new supercluster out of the input clusters.
- * It decides which cells of the seed and the satellite clusters
- * to add (boxing / cookie cutter).
- *
- * The reference point is computed with findCentralPosition
- * which returns the hottest cells looping on the cells of all the
- * considered topo-clusters. Two references are computed,
- * one for the barrel, one for the endcap. Computations are done in the
- * calo-frame. Once the reference is computed the decision is made by
- * egammaSuperClusterBuilder::fillClusterConstrained which add the cells for
- * the accordeon.
- *
- * Cells from the tile gap are added using
- * egammaSuperClusterBuilder::addTileGap3CellsinWindow.
- *
- * Kinematic properties of the cluster are computed from the property
- * of the cells.
- *
- * If the supercluster has a cluster energy less then EtThresholdCut (also
- * used as threshould for the seed) a null pointer is returned.
- *
- * The supercluster need to pass egammaCheckEnergyDepositTool::checkFractioninSamplingCluster.
- *
- * Calibrations on eta1, energy are applied with egammaSuperClusterBuilder::calibrateCluster
- *
- */
- std::unique_ptr<xAOD::CaloCluster> createNewCluster(
- const EventContext& ctx,
- const std::vector<const xAOD::CaloCluster*>& clusters,
- const CaloDetDescrManager& mgr,
- xAOD::EgammaParameters::EgammaType egType) const;
-
- // some constants to use
- static constexpr float s_cellEtaSize = 0.025;
- static constexpr float s_cellPhiSize = M_PI / 128.;
-
- /** @brief Seed selection requirements */
- Gaudi::Property<float> m_EtThresholdCut{
- this,
- "EtThresholdCut",
- 1.5 * Gaudi::Units::GeV,
- "The minimum EM Et required of SEED clusters (not applied to secondaries)"
- };
-
- // these are calculated search window values
- // half of search window size, converted to units of eta,phi
- float m_searchWindowEtaBarrel;
- float m_searchWindowPhiBarrel;
- float m_searchWindowEtaEndcap;
- float m_searchWindowPhiEndcap;
+ virtual StatusCode initialize() override final;
+ virtual StatusCode execute(const EventContext& ctx) const override final;
private:
- /** Find the size of the cluster in phi using L2 cells.
- *
- * @param cp0: the reference position in calo-coordinates
- * @param cluster: the cluster filled with L2 and L3 cells
+ /** Return extra clusters that can be added to make supercluster
+ * @param egammaInd: index of the EgammaRec object in the input container
+ *corresponding to the seed
+ * @param egammaRecs: input container of EgammaRec
+ * @param isUsed: boolean mask to avoid to reuse clusters (1=already used,
+ *0=not used). When calling this function the element corresponding to the
+ *seed is marked as used
+ * @param nWindowClusters: how many clusters are added by the matchesInWindow
*
- * The window is computed using only cells in the second layer.
- * Asymmetric sizes are computed for barrel and endcap. The size
- * is the maximum difference in phi between the center of a cell
- * and the refence, considering separately cells in the barrel
- * and in the endcap. The computation is done separately for the
- * cells with phi < reference phi or >=. A cutoff value of 1 is used.
- */
- PhiSize findPhiSize(const CentralPosition& cp0,
- const xAOD::CaloCluster& cluster) const;
-
- /**
- * Fill super cluster constraining its size
- * in eta,phi around the overall hottest cell
- * and the its L2 size
- *
- * @param tofill: empty cluster to be filled
- * @param clusters: seed and satellite clusters
- * @param cp0: this specify the eta/phi reference in the calo-frame. In egamma
- * reconstruction the references are the hottest cells in L2, in barrel and endcap.
- *
- * Cells are added if their raw coordinates are inside a window in eta and/or phi centered
- * around the hottest cells specified by cp0. If there are two hottest cells
- * (one in the barrel and one in the endcap) both are used in the tests and an OR
- * of the two is considered.
- *
- * First L2 and L3 LAR EM cells are considered (excluding inner wheel endcap cells).
- * A cut in eta is used. The range of the eta-window depends if the seed cell
- * is in barrel or endcap. For example for the barrel, cells in L2 are added if they are
- * inside +/- (\ref egammaSuperClusterBuilder.m_addCellsWindowEtaCellsBarrel
- * "AddCellsWindowEtaCellsBarrel" * s_cellEtaSize / 2)
- * where \ref egammaSuperClusterBuilder.s_cellEtaSize "s_cellEtaSize" is
- * the eta size of one cell in L2. For L3 the semi-window is increased by
- * (\ref egammaSuperClusterBuilder.m_extraL3EtaSizeCells "ExtraL3EtaSizeCells" * s_cellEtaSize / 2).
- *
- * Then cells in PS and L1 are added if they match a window in eta and phi.
- * The eta requiriment is the same as in L2. The window in phi
- * is computed asymetrically using the cells in layer 2, using the function
- * egammaSuperClusterBuilder::findPhiSize and increading the semi-window by
- * (\ref egammaSuperClusterBuilder.m_extraL0L1PhiSize "ExtraL0L1PhiSize" * s_cellPhiSize) where
- * \ref egammaSuperClusterBuilder.s_cellPhiSize "s_cellPhiSize" is the size
- * in phi of cells in L2.
- */
- StatusCode fillClusterConstrained(
- xAOD::CaloCluster& tofill,
- const std::vector<const xAOD::CaloCluster*>& clusters,
- const CentralPosition& cp0) const;
-
- /** add all tile Gap 3 cells in a window.
- * All the cells in the TileGap3 layer which are in a eta x phi window 0.2, ~0.15
- * centered around the raw position of the cluster param tofill with weight 1.
- */
- StatusCode addTileGap3CellsinWindow(xAOD::CaloCluster& tofill,
- const CaloDetDescrManager& mgr) const;
-
- /** function to calibrate the new clusters energy
+ * The function returns a vector of index corresponding to secondary clusters
+ *to be merged with the seed.
*
- * Calibrate with
- * - egammaSuperClusterBuilder.refineEta1Position
- * - \ref egammaSuperClusterBuilder.m_clusterCorrectionTool "ClusterCorrectionTool" (default=egammaSwTool)
- * - \ref egammaSuperClusterBuilder.fillPositionsInCalo "fillPositionsInCalo"
- * - \ref egammaSuperClusterBuilder.m_MVACalibSvc "MVACalibSvc" (default=egammaMVASvc).
- */
- StatusCode calibrateCluster(
- const EventContext& ctx,
- xAOD::CaloCluster* newCluster,
- const CaloDetDescrManager& mgr,
- const xAOD::EgammaParameters::EgammaType egType) const;
-
- /** Function to decorate the calo cluster with position variables.
- * Filling eta phi in calo-frame:
- * - xAOD::CaloCluster::ETACALOFRAME
- * - xAOD::CaloCluster::PHICALOFRAME
- * - xAOD::CaloCluster::ETA2CALOFRAME
- * - xAOD::CaloCluster::PHI2CALOFRAME
- * - xAOD::CaloCluster::ETA1CALOFRAME
- * - xAOD::CaloCluster::PHI1CALOFRAME
- */
- StatusCode fillPositionsInCalo(xAOD::CaloCluster* cluster,
- const CaloDetDescrManager& mgr) const;
-
- /** functions to refine position in eta1*/
- StatusCode refineEta1Position(xAOD::CaloCluster* cluster,
- const CaloDetDescrManager& mgr) const;
- StatusCode makeCorrection1(xAOD::CaloCluster* cluster,
- const CaloDetDescrManager& mgr,
- const CaloSampling::CaloSample sample) const;
-
- // window values for the windows
- // in which cells of topoclusters are added
- // half of addCells window size, converted in units of eta/phi
- float m_addCellsWindowEtaBarrel;
- float m_addCellsWindowEtaEndcap;
- // Extra opening in phi for L0,L1
- float m_extraL0L1PhiSize;
- // Extra opening in eta for L3 cells
- float m_extraL3EtaSize;
-
- /** @brief Position in Calo frame**/
- CaloCellDetPos m_caloCellDetPos;
-
- /** @brief Size of topocluster search window in eta for the barrel */
- Gaudi::Property<int> m_searchWindowEtaCellsBarrel{
- this,
- "SearchWindowEtaCellsBarrel",
- 5,
- "Number of cells in eta of window in which to search for topoclusters"
- };
-
- /** @brief Size of topocluster search window in phi for the barrel */
- Gaudi::Property<int> m_searchWindowPhiCellsBarrel{
- this,
- "SearchWindowPhiCellsBarrel",
- 5,
- "Number of cells in phi of window in which to search for topoclusters"
- };
-
- /** @brief Size of topocluster search window in eta for the end-cap*/
- Gaudi::Property<int> m_searchWindowEtaCellsEndcap{
- this,
- "SearchWindowEtaCellsEndcap",
- 5,
- "Number of cells in eta of window in which to search for topoclusters"
- };
-
- /** @brief Size of topocluster search window in phi for the end-cap*/
- Gaudi::Property<int> m_searchWindowPhiCellsEndcap{
- this,
- "SearchWindowPhiCellsEndcap",
- 5,
- "Number of cells in phi of window in which to search for topoclusters"
- };
-
- /** @brief Size of windows et eta in which cells of topoclusters are added for
- * the barrel (units of 2nd layer cells) */
- Gaudi::Property<int> m_addCellsWindowEtaCellsBarrel{
- this,
- "AddCellsWindowEtaCellsBarrel",
- 3,
- "Number of cells in eta of window around topocluster center to add cells"
- };
-
- /** @brief Size of windows et eta in which cells of topoclusters are edded for
- * the endcap (units of 2nd layer cells) */
- Gaudi::Property<int> m_addCellsWindowEtaCellsEndcap{
+ * The secondary cluster is added if it pass one of the functions:
+ * - egammaSuperClusterBuilderBase::matchesInWindow
+ **/
+ std::vector<std::size_t> searchForSecondaryClusters(
+ std::size_t egammaInd,
+ const EgammaRecContainer* egammaRecs,
+ std::vector<bool>& isUsed) const;
+
+ // internal variables
+ /** @brief Key for input egammaRec container */
+ SG::ReadHandleKey<EgammaRecContainer> m_inputEgammaRecContainerKey{
this,
- "AddCellsWindowEtaCellsEndcap",
- 5,
- "Number of cells in eta of window around topocluster center to add cells"
+ "InputEgammaRecContainerName",
+ "egammaRecCollection",
+ "input egammaRec container"
};
- /** @brief "When adding L0 (PS) and L1 cells, how much wider than
- * the L2 size of the cluster is the acceptance in phi
- * (units of 2nd layer cells)*/
- Gaudi::Property<int> m_extraL0L1PhiSizeCells{
+ /** @brief Key for output egammaRec container */
+ SG::WriteHandleKey<EgammaRecContainer> m_egammaSuperRecCollectionKey{
this,
- "ExtraL0L1PhiSize",
- 1,
- "When adding L0 (PS) and L1 cells in phi, "
- "how much wider (+/- of the value) than the L2 phi size of the "
- "cluster (in L2 cells units) is the acceptance"
+ "SuperegammaRecCollectionName",
+ "egammaSuperRecCollection",
+ "output egammaRec container"
};
- /** @brief "When adding L3 cells, how much wider in eta than
- * the L2 */
- Gaudi::Property<int> m_extraL3EtaSizeCells{
+ /** @brief Key for output clusters */
+ SG::WriteHandleKey<xAOD::CaloClusterContainer> m_outputegammaSuperClustersKey{
this,
- "ExtraL3EtaSizeCells",
- 0,
- "When adding L3 cells how much wider (+/- 0.5 of the value) "
- "than L2 (in L2 cells "
- "units) is the acceptance in eta"
+ "SuperClusterCollectionName",
+ "egammaSuperClusters",
+ "output calo cluster container"
};
- /** @brief Handle to the MVA calibration service **/
- ServiceHandle<IegammaMVASvc> m_MVACalibSvc{ this,
- "MVACalibSvc",
- "egammaMVASvc",
- "calibration service" };
-
- /** @brief Tool to handle cluster corrections */
- ToolHandle<IegammaSwTool> m_clusterCorrectionTool{
- this,
- "ClusterCorrectionTool",
- "egammaSwTool/egammaswtool",
- "tool that applies cluster corrections"
- };
-
- /** @brief Pointer to the egammaCheckEnergyDepositTool*/
- ToolHandle<IegammaCheckEnergyDepositTool> m_egammaCheckEnergyDepositTool{
- this,
- "egammaCheckEnergyDepositTool",
- "",
- "Optional tool that performs basic checks of viability of cluster"
- };
};
#endif
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilderBase.cxx b/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilderBase.cxx
new file mode 100644
index 000000000000..87803dff1219
--- /dev/null
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilderBase.cxx
@@ -0,0 +1,797 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "egammaSuperClusterBuilderBase.h"
+
+#include "CaloUtils/CaloCellList.h"
+#include "CaloUtils/CaloClusterStoreHelper.h"
+#include "CaloUtils/CaloLayerCalculator.h"
+
+#include "egammaRecEvent/egammaRecContainer.h"
+#include "xAODCaloEvent/CaloCluster.h"
+#include "xAODCaloEvent/CaloClusterAuxContainer.h"
+#include "xAODCaloEvent/CaloClusterKineHelper.h"
+#include "xAODEgamma/EgammaEnums.h"
+#include "xAODEgamma/EgammaxAODHelpers.h"
+#include "xAODEgamma/PhotonxAODHelpers.h"
+#include "xAODTracking/TrackParticle.h"
+#include "xAODTracking/Vertex.h"
+
+#include "CaloGeoHelpers/proxim.h"
+#include "FourMomUtils/P4Helpers.h"
+
+#include <cmath>
+
+namespace {
+/**
+ * Duplicate code
+ * @brief Return eta/phi ranges encompassing +- 1 cell.
+ * @param eta Central eta value.
+ * @param phi Central phi value.
+ * @param sampling The sampling to use.
+ * @param[out] deta Range in eta.
+ * @param[out] dphi Range in phi.
+ *
+ * This can be a little tricky due to misalignments and the fact
+ * that cells have different sizes in different regions. Also,
+ * CaloLayerCalculator takes only a symmetric eta range.
+ * We try to find the neighboring cells by starting from the center
+ * cell and looking a little bit more than half its width in either
+ * direction, and finding the centers of those cells. Then we use
+ * the larger of these for the symmetric range.
+ */
+void
+etaphi_range(const CaloDetDescrManager& dd_man,
+ double eta,
+ double phi,
+ CaloCell_ID::CaloSample sampling,
+ double& deta,
+ double& dphi)
+{
+ // Should be smaller than the eta half-width of any cell.
+ constexpr double eps = 0.001;
+ deta = 0;
+ dphi = 0;
+ // Get the DD element for the central cell.
+ const CaloDetDescrElement* elt = dd_man.get_element_raw(sampling, eta, phi);
+ if (!elt)
+ return;
+
+ // Now look in the negative eta direction.
+ const CaloDetDescrElement* elt_l =
+ dd_man.get_element_raw(sampling, eta - elt->deta() - eps, phi);
+ double deta_l = 0; // Eta difference on the low (left) side.
+ if (elt_l) {
+ deta_l = std::abs(eta - elt_l->eta_raw()) + eps;
+ }
+ // Now look in the positive eta direction.
+ const CaloDetDescrElement* elt_r =
+ dd_man.get_element_raw(sampling, eta + elt->deta() + eps, phi);
+ double deta_r = 0; // Eta difference on the high (right) side.
+ if (elt_r) {
+ deta_r = std::abs(eta - elt_r->eta_raw()) + eps;
+ }
+
+ // Total deta is twice the maximum.
+ deta = 2 * std::max(deta_r, deta_l);
+ // Now for the phi variation.
+ // The phi size can change as a function of eta, but not of phi.
+ // Thus we have to look again at the adjacent eta cells, and
+ // take the largest variation.
+ // Now look in the negative eta direction.
+ elt_l = dd_man.get_element_raw(sampling,
+ eta - elt->deta() - eps,
+ CaloPhiRange::fix(phi - elt->dphi() - eps));
+
+ double dphi_l = 0; // Phi difference on the low-eta () side.
+ if (elt_l) {
+ dphi_l = std::abs(CaloPhiRange::fix(phi - elt_l->phi_raw())) + eps;
+ }
+ // Now look in the positive eta direction.
+ elt_r = dd_man.get_element_raw(sampling,
+ eta + elt->deta() + eps,
+ CaloPhiRange::fix(phi - elt->dphi() - eps));
+ double dphi_r = 0; // Phi difference on the positive (down) side.
+ if (elt_r) {
+ dphi_r = std::abs(CaloPhiRange::fix(phi - elt_r->phi_raw())) + eps;
+ }
+ // Total dphi is twice the maximum.
+ dphi = 2 * std::max(dphi_l, dphi_r);
+}
+
+/** Find the reference position (eta, phi) relative to which cells are
+ restricted.
+*/
+egammaSuperClusterBuilderBase::CentralPosition
+findCentralPositionEM2(const std::vector<const xAOD::CaloCluster*>& clusters)
+{
+ egammaSuperClusterBuilderBase::CentralPosition cp;
+ for (const auto* cluster : clusters) {
+ if (cluster->hasSampling(CaloSampling::EMB2)) {
+ const float thisEmax = cluster->energy_max(CaloSampling::EMB2);
+ if (thisEmax > cp.emaxB) {
+ cp.emaxB = thisEmax;
+ cp.etaB = cluster->etamax(CaloSampling::EMB2);
+ cp.phiB = cluster->phimax(CaloSampling::EMB2);
+ }
+ }
+ if (cluster->hasSampling(CaloSampling::EME2)) {
+ const float thisEmax = cluster->energy_max(CaloSampling::EME2);
+ if (thisEmax > cp.emaxEC) {
+ cp.emaxEC = thisEmax;
+ cp.etaEC = cluster->etamax(CaloSampling::EME2);
+ cp.phiEC = cluster->phimax(CaloSampling::EME2);
+ }
+ }
+ }
+ return cp;
+}
+
+} // end of anonymous namespace
+
+//////////////////////////////////////////////////////////////////////////////
+// Athena interfaces.
+//////////////////////////////////////////////////////////////////////////////
+
+// Constructor.
+egammaSuperClusterBuilderBase::egammaSuperClusterBuilderBase(
+ const std::string& name,
+ ISvcLocator* pSvcLocator)
+ : AthReentrantAlgorithm(name, pSvcLocator)
+{
+
+ m_searchWindowPhiBarrel = m_searchWindowPhiCellsBarrel * s_cellPhiSize * 0.5;
+ m_searchWindowEtaBarrel = m_searchWindowEtaCellsBarrel * s_cellEtaSize * 0.5;
+ m_searchWindowPhiEndcap = m_searchWindowPhiCellsEndcap * s_cellPhiSize * 0.5;
+ m_searchWindowEtaEndcap = m_searchWindowEtaCellsEndcap * s_cellEtaSize * 0.5;
+
+ m_addCellsWindowEtaBarrel =
+ m_addCellsWindowEtaCellsBarrel * s_cellEtaSize * 0.5;
+ m_addCellsWindowEtaEndcap =
+ m_addCellsWindowEtaCellsEndcap * s_cellEtaSize * 0.5;
+ // The +- to account for the different L3 eta granularity
+ m_extraL3EtaSize = m_extraL3EtaSizeCells * s_cellEtaSize * 0.5;
+ // the + is to account for different L0/L1 phi granularity
+ m_extraL0L1PhiSize = m_extraL0L1PhiSizeCells * s_cellPhiSize;
+}
+
+StatusCode
+egammaSuperClusterBuilderBase::initialize()
+{
+ m_searchWindowPhiBarrel = m_searchWindowPhiCellsBarrel * s_cellPhiSize * 0.5;
+ m_searchWindowEtaBarrel = m_searchWindowEtaCellsBarrel * s_cellEtaSize * 0.5;
+ m_searchWindowPhiEndcap = m_searchWindowPhiCellsEndcap * s_cellPhiSize * 0.5;
+ m_searchWindowEtaEndcap = m_searchWindowEtaCellsEndcap * s_cellEtaSize * 0.5;
+
+ if (m_addCellsWindowEtaCellsBarrel % 2 == 0 ||
+ m_addCellsWindowEtaCellsEndcap % 2 == 0) {
+ ATH_MSG_FATAL("For adding cells relative to the hottest cell to be "
+ "symmetric in eta, the AddCells "
+ "window size needs to be odd");
+
+ return StatusCode::FAILURE;
+ }
+ ATH_CHECK(m_clusterCorrectionTool.retrieve());
+ ATH_CHECK(m_MVACalibSvc.retrieve());
+
+ if (!m_egammaCheckEnergyDepositTool.empty()) {
+ ATH_CHECK(m_egammaCheckEnergyDepositTool.retrieve());
+ } else {
+ m_egammaCheckEnergyDepositTool.disable();
+ }
+ m_addCellsWindowEtaBarrel =
+ m_addCellsWindowEtaCellsBarrel * s_cellEtaSize * 0.5;
+ m_addCellsWindowEtaEndcap =
+ m_addCellsWindowEtaCellsEndcap * s_cellEtaSize * 0.5;
+ // The +- to account for the different L3 eta granularity
+ m_extraL3EtaSize = m_extraL3EtaSizeCells * s_cellEtaSize * 0.5;
+
+ // the + is to account for different L0/L1 phi granularity
+ m_extraL0L1PhiSize = m_extraL0L1PhiSizeCells * s_cellPhiSize;
+ ATH_MSG_INFO(
+ '\n'
+ << "e/gamma super clusters" << '\n'
+ << "--> Eta Window size for L0/L1/L2 cells : " << '\n'
+ << "Barrel +- " << m_addCellsWindowEtaBarrel << '\n'
+ << "EndCap +- " << m_addCellsWindowEtaEndcap << '\n'
+ << "--> Eta Window size for L3 cells : " << '\n'
+ << "Barrel +- " << (m_addCellsWindowEtaBarrel + m_extraL3EtaSize) << '\n'
+ << "EndCap +- " << (m_addCellsWindowEtaEndcap + m_extraL3EtaSize) << '\n'
+ << " -> Phi window is fully dynamic for L2/L3" << '\n'
+ << " -> L0/L1 cells in phi will be collected in a window" << '\n'
+ << "(L2 neg extend - " << m_extraL0L1PhiSize << " , "
+ << "L2 pos extend + " << m_extraL0L1PhiSize << ")");
+
+ return StatusCode::SUCCESS;
+}
+
+bool
+egammaSuperClusterBuilderBase::matchesInWindow(
+ const xAOD::CaloCluster* ref,
+ const xAOD::CaloCluster* clus) const
+{
+ // First the case where the seed is both endcap and barrel, i.e. in the crack
+ // Check around both measurements of the seed
+ if (ref->hasSampling(CaloSampling::EMB2) &&
+ ref->hasSampling(CaloSampling::EME2)) {
+ const float dEta(std::abs(ref->eta() - clus->eta()));
+ const float dPhi(std::abs(P4Helpers::deltaPhi(ref->phi(), clus->phi())));
+ //
+ const float dEtaBarrel(
+ std::abs(ref->etaSample(CaloSampling::EMB2) - clus->eta()));
+ const float dPhiBarrel(std::abs(
+ P4Helpers::deltaPhi(ref->phiSample(CaloSampling::EMB2), clus->phi())));
+ //
+ const float dEtaEndcap(
+ std::abs(ref->etaSample(CaloSampling::EME2) - clus->eta()));
+ const float dPhiEndcap(std::abs(
+ P4Helpers::deltaPhi(ref->phiSample(CaloSampling::EME2), clus->phi())));
+ // Matches any in case of split
+ return (
+ (dEta < m_searchWindowEtaBarrel && dPhi < m_searchWindowPhiBarrel) ||
+ (dEta < m_searchWindowEtaEndcap && dPhi < m_searchWindowPhiEndcap) ||
+ (dEtaBarrel < m_searchWindowEtaBarrel &&
+ dPhiBarrel < m_searchWindowPhiBarrel) ||
+ (dEtaEndcap < m_searchWindowEtaEndcap &&
+ dPhiEndcap < m_searchWindowPhiEndcap));
+ }
+ if (xAOD::EgammaHelpers::isBarrel(clus)) {
+ const float dEta(std::abs(ref->eta() - clus->eta()));
+ const float dPhi(std::abs(P4Helpers::deltaPhi(ref->phi(), clus->phi())));
+ return (dEta < m_searchWindowEtaBarrel && dPhi < m_searchWindowPhiBarrel);
+ }
+ const float dEta(std::abs(ref->eta() - clus->eta()));
+ const float dPhi(std::abs(P4Helpers::deltaPhi(ref->phi(), clus->phi())));
+ return (dEta < m_searchWindowEtaEndcap && dPhi < m_searchWindowPhiEndcap);
+}
+
+std::unique_ptr<xAOD::CaloCluster>
+egammaSuperClusterBuilderBase::createNewCluster(
+ const EventContext& ctx,
+ const std::vector<const xAOD::CaloCluster*>& clusters,
+ const CaloDetDescrManager& mgr,
+ xAOD::EgammaParameters::EgammaType egType) const
+{
+
+ const auto acSize = clusters.size();
+ if (clusters.empty()) {
+ ATH_MSG_ERROR("Missing the seed cluster! Should not happen.");
+ return nullptr;
+ }
+
+ // create a new empty cluster
+ // note: we are not adding any cells here
+ std::unique_ptr<xAOD::CaloCluster> newCluster(
+ CaloClusterStoreHelper::makeCluster(
+ clusters[0]->getCellLinks()->getCellContainer()));
+
+ if (!newCluster) {
+ ATH_MSG_ERROR("CaloClusterStoreHelper::makeCluster failed.");
+ return nullptr;
+ }
+ newCluster->setClusterSize(xAOD::CaloCluster::SuperCluster);
+
+ // Let's try to find the eta and phi of the hottest cell in L2.
+ // This will be used as the center for restricting the cluster size.
+ // In the future can refine (or add sanity checks) to the selection
+ CentralPosition cpRef = findCentralPositionEM2(clusters);
+ // these are the same as the reference but in calo frame (after the processing
+ // below)
+ CentralPosition cp0 = cpRef;
+ // Get the hotest in raw co-ordinates
+ if (cp0.emaxB > 0) {
+ const CaloDetDescrElement* dde =
+ mgr.get_element(CaloCell_ID::EMB2, cpRef.etaB, cpRef.phiB);
+ if (dde) {
+ cp0.etaB = dde->eta_raw();
+ cp0.phiB = dde->phi_raw();
+ } else {
+ ATH_MSG_WARNING("Couldn't get CaloDetDescrElement from mgr for eta = "
+ << cpRef.etaB << ", phi = " << cpRef.phiB);
+ }
+ }
+
+ if (cp0.emaxEC > 0) {
+ const CaloDetDescrElement* dde =
+ mgr.get_element(CaloCell_ID::EME2, cpRef.etaEC, cpRef.phiEC);
+ if (dde) {
+ cp0.etaEC = dde->eta_raw();
+ cp0.phiEC = dde->phi_raw();
+ } else {
+ ATH_MSG_WARNING("Couldn't get CaloDetDescrElement from mgr for eta = "
+ << cpRef.etaEC << ", phi = " << cpRef.phiEC);
+ }
+ }
+
+ // Set the eta0/phi0 based on the references, but in raw coordinates
+ if (cp0.emaxB >= cp0.emaxEC) {
+ newCluster->setEta0(cp0.etaB);
+ newCluster->setPhi0(cp0.phiB);
+ } else {
+ newCluster->setEta0(cp0.etaEC);
+ newCluster->setPhi0(cp0.phiEC);
+ }
+
+ // Actually fill the cluster here
+ if (fillClusterConstrained(*newCluster, clusters, cp0).isFailure()) {
+ ATH_MSG_DEBUG(
+ "There was problem adding the topocluster cells to the the cluster: "
+ "potentially no L2 or L3 cells in cluster");
+ return nullptr;
+ }
+ // Apply SW-style summation of TileGap3 cells (if necessary).
+ if (addTileGap3CellsinWindow(*newCluster, mgr).isFailure()) {
+ ATH_MSG_ERROR(
+ "Problem with the input cluster when running AddTileGap3CellsinWindow?");
+ return nullptr;
+ }
+ /// Calculate the kinematics of the new cluster, after all cells are added
+ CaloClusterKineHelper::calculateKine(newCluster.get(), true, true);
+
+ // If adding all EM cells we are somehow below the seed threshold then remove
+ if (newCluster->et() < m_EtThresholdCut) {
+ return nullptr;
+ }
+
+ // Check to see if cluster pases basic requirements. If not, kill it.
+ if (!m_egammaCheckEnergyDepositTool.empty() &&
+ !m_egammaCheckEnergyDepositTool->checkFractioninSamplingCluster(
+ newCluster.get())) {
+ ATH_MSG_DEBUG("Cluster failed sample check");
+ return nullptr;
+ }
+
+ // Apply correction calibration
+ if (calibrateCluster(ctx, newCluster.get(), mgr, egType).isFailure()) {
+ ATH_MSG_WARNING("There was problem calibrating the object");
+ return nullptr;
+ }
+
+ // Avoid negative energy clusters
+ if (newCluster->et() < 0) {
+ ATH_MSG_DEBUG("Negative et after calibration/corrections");
+ return nullptr;
+ }
+ // EDM vector to constituent clusters
+ std::vector<ElementLink<xAOD::CaloClusterContainer>> constituentLinks;
+ static const SG::AuxElement::Accessor<ElementLink<xAOD::CaloClusterContainer>>
+ sisterCluster("SisterCluster");
+ for (size_t i = 0; i < acSize; i++) {
+ // Set the element Link to the constitents
+ if (sisterCluster.isAvailable(*clusters[i])) {
+ constituentLinks.push_back(sisterCluster(*clusters[i]));
+ } else {
+ ATH_MSG_WARNING("No sister Link available");
+ }
+ }
+ // Set the link from the super cluster to the constituents (accumulated)
+ // clusters used.
+ static const SG::AuxElement::Accessor<
+ std::vector<ElementLink<xAOD::CaloClusterContainer>>>
+ caloClusterLinks("constituentClusterLinks");
+ caloClusterLinks(*newCluster) = constituentLinks;
+
+ // return the new cluster
+ return newCluster;
+}
+
+StatusCode
+egammaSuperClusterBuilderBase::fillClusterConstrained(
+ xAOD::CaloCluster& tofill,
+ const std::vector<const xAOD::CaloCluster*>& clusters,
+ const egammaSuperClusterBuilderBase::CentralPosition& cp0) const
+{
+ const float addCellsWindowEtaBarrel = m_addCellsWindowEtaBarrel;
+ const float addCellsWindowEtaEndcap = m_addCellsWindowEtaEndcap;
+ const float addCellsWindowL3EtaBarrel =
+ m_addCellsWindowEtaBarrel + m_extraL3EtaSize;
+ const float addCellsWindowL3EtaEndcap =
+ m_addCellsWindowEtaEndcap + m_extraL3EtaSize;
+
+ // Loop for L2/L3
+ for (const xAOD::CaloCluster* tocheck : clusters) {
+ xAOD::CaloCluster::const_cell_iterator cell_itr = tocheck->begin();
+ xAOD::CaloCluster::const_cell_iterator cell_end = tocheck->end();
+ // Loop over cells
+ for (; cell_itr != cell_end; ++cell_itr) {
+ // sanity check on the cell
+ const CaloCell* cell = *cell_itr;
+ if (!cell) {
+ continue;
+ }
+ const CaloDetDescrElement* dde = cell->caloDDE();
+ if (!dde) {
+ continue;
+ }
+ // we want only LAREM
+ if (!(dde->getSubCalo() == CaloCell_ID::LAREM)) {
+ continue;
+ }
+ // we want L2 or L3 cells
+ const auto sampling = dde->getSampling();
+ const bool isL2Cell =
+ (CaloCell_ID::EMB2 == sampling || CaloCell_ID::EME2 == sampling);
+ const bool isL3Cell =
+ (CaloCell_ID::EMB3 == sampling || CaloCell_ID::EME3 == sampling);
+
+ if ((!isL2Cell) && (!isL3Cell)) {
+ continue;
+ }
+ // Also exclude the inner wheel Endcap
+ if (dde->is_lar_em_endcap_inner()) {
+ continue;
+ }
+
+ bool inEtaRange = false;
+ // Check if is inside the eta range wrt to the hottest
+ // cell(s) for the cluster we construct
+ if (cp0.emaxB > 0) { // barrel
+ if (isL2Cell &&
+ (std::abs(cp0.etaB - dde->eta_raw()) < addCellsWindowEtaBarrel)) {
+ inEtaRange = true;
+ }
+ if (isL3Cell &&
+ (std::abs(cp0.etaB - dde->eta_raw()) < addCellsWindowL3EtaBarrel)) {
+ inEtaRange = true;
+ }
+ }
+ if (cp0.emaxEC > 0) { // endcap
+ if (isL2Cell &&
+ (std::abs(cp0.etaEC - dde->eta_raw()) < addCellsWindowEtaEndcap)) {
+ inEtaRange = true;
+ }
+ if (isL3Cell && (std::abs(cp0.etaEC - dde->eta_raw()) <
+ addCellsWindowL3EtaEndcap)) {
+ inEtaRange = true;
+ }
+ }
+ if (!inEtaRange) {
+ continue;
+ }
+ tofill.addCell(cell_itr.index(), cell_itr.weight());
+ } // Loop over cells for L2/L3
+ } // Loop over clusters for L2/L3
+
+ // We should have a size here
+ if (tofill.size() == 0) {
+ return StatusCode::FAILURE;
+ }
+ // Now calculate the cluster size in 2nd layes
+ // use that for constraining the L0/L1 cells we add
+ const PhiSize phiSize = findPhiSize(cp0, tofill);
+ const float phiPlusB = cp0.phiB + phiSize.plusB + m_extraL0L1PhiSize;
+ const float phiMinusB = cp0.phiB - phiSize.minusB - m_extraL0L1PhiSize;
+ const float phiPlusEC = cp0.phiEC + phiSize.plusEC + m_extraL0L1PhiSize;
+ const float phiMinusEC = cp0.phiEC - phiSize.minusEC - m_extraL0L1PhiSize;
+
+ // Loop for L0/L1
+ for (const xAOD::CaloCluster* tocheck : clusters) {
+ xAOD::CaloCluster::const_cell_iterator cell_itr = tocheck->begin();
+ xAOD::CaloCluster::const_cell_iterator cell_end = tocheck->end();
+ // Loop over cells
+ for (; cell_itr != cell_end; ++cell_itr) {
+ // sanity check on the cell
+ const CaloCell* cell = *cell_itr;
+ if (!cell) {
+ continue;
+ }
+ const CaloDetDescrElement* dde = cell->caloDDE();
+ if (!dde) {
+ continue;
+ }
+
+ // only deal with L1 or PS
+ const auto sampling = dde->getSampling();
+ const bool isL0L1Cell =
+ (CaloCell_ID::EMB1 == sampling || CaloCell_ID::EME1 == sampling ||
+ CaloCell_ID::PreSamplerB == sampling ||
+ CaloCell_ID::PreSamplerE == sampling);
+ if (!isL0L1Cell) {
+ continue;
+ }
+
+ bool inEtaRange = false;
+ // Check if is inside the eta range wrt to the hottest
+ // cell(s) for the cluster we construct
+ if (cp0.emaxB > 0) { // barrel
+ if (std::abs(cp0.etaB - dde->eta_raw()) < addCellsWindowEtaBarrel) {
+ inEtaRange = true;
+ }
+ }
+ if (cp0.emaxEC > 0) { // endcap
+ if (std::abs(cp0.etaEC - dde->eta_raw()) < addCellsWindowEtaEndcap) {
+ inEtaRange = true;
+ }
+ }
+ if (!inEtaRange) {
+ continue;
+ }
+
+ // Add L0/L1 when we are in the narrow range
+ bool inPhiRange = false;
+ if (cp0.emaxB > 0) { // barrel
+ const double cell_phi = proxim(dde->phi_raw(), cp0.phiB);
+ if (cell_phi > phiMinusB && cell_phi < phiPlusB) {
+ inPhiRange = true;
+ }
+ }
+ if (cp0.emaxEC > 0) { // endcap
+ const double cell_phi = proxim(dde->phi_raw(), cp0.phiEC);
+ if (cell_phi > phiMinusEC && cell_phi < phiPlusEC) {
+ inPhiRange = true;
+ }
+ }
+ if (!inPhiRange) {
+ continue;
+ }
+
+ tofill.addCell(cell_itr.index(), cell_itr.weight());
+ } // Cell Loop for L0/L1
+ } // Cluster loop for L0/L1
+ return StatusCode::SUCCESS;
+}
+
+StatusCode
+egammaSuperClusterBuilderBase::addTileGap3CellsinWindow(
+ xAOD::CaloCluster& tofill,
+ const CaloDetDescrManager& mgr) const
+{
+
+ constexpr double searchWindowEta = 0.2;
+ constexpr double searchWindowPhi = 2 * M_PI / 64.0 + M_PI / 64; // ~ 0.15 rad
+ std::vector<const CaloCell*> cells;
+ cells.reserve(16);
+ const CaloCellContainer* inputcells =
+ tofill.getCellLinks()->getCellContainer();
+
+ if (!inputcells) {
+ ATH_MSG_ERROR("No cell container in addRemainingCellsToCluster?");
+ return StatusCode::FAILURE;
+ }
+
+ CaloCellList myList(inputcells);
+
+ const std::vector<CaloSampling::CaloSample> samples = {
+ CaloSampling::TileGap3
+ };
+ for (auto samp : samples) {
+ // quite slow
+ myList.select(mgr,
+ tofill.eta0(),
+ tofill.phi0(),
+ searchWindowEta,
+ searchWindowPhi,
+ samp);
+ cells.insert(cells.end(), myList.begin(), myList.end());
+ }
+
+ for (const auto* cell : cells) {
+ if (!cell) {
+ continue;
+ }
+ const CaloDetDescrElement* dde = cell->caloDDE();
+ if (!dde) {
+ continue;
+ }
+
+ if ((CaloCell_ID::TileGap3 == dde->getSampling()) &&
+ (std::abs(dde->eta_raw()) > 1.4 && std::abs(dde->eta_raw()) < 1.6)) {
+ int index = inputcells->findIndex(dde->calo_hash());
+ tofill.addCell(index, 1.);
+ }
+ }
+ return StatusCode::SUCCESS;
+}
+
+StatusCode
+egammaSuperClusterBuilderBase::calibrateCluster(
+ const EventContext& ctx,
+ xAOD::CaloCluster* newCluster,
+ const CaloDetDescrManager& mgr,
+ const xAOD::EgammaParameters::EgammaType egType) const
+{
+
+ ATH_CHECK(refineEta1Position(newCluster, mgr));
+ // Save the state before the corrections
+ newCluster->setAltE(newCluster->e());
+ newCluster->setAltEta(newCluster->eta());
+ newCluster->setAltPhi(newCluster->phi());
+ // first do the corrections
+ ATH_CHECK(m_clusterCorrectionTool->execute(
+ ctx, newCluster, egType, xAOD::EgammaHelpers::isBarrel(newCluster)));
+ newCluster->setRawE(newCluster->e());
+ newCluster->setRawEta(newCluster->eta());
+ newCluster->setRawPhi(newCluster->phi());
+ //
+ ATH_CHECK(fillPositionsInCalo(newCluster, mgr));
+ ATH_CHECK(m_MVACalibSvc->execute(*newCluster, egType));
+
+ return StatusCode::SUCCESS;
+}
+
+StatusCode
+egammaSuperClusterBuilderBase::fillPositionsInCalo(
+ xAOD::CaloCluster* cluster,
+ const CaloDetDescrManager& mgr) const
+{
+ const bool isBarrel = xAOD::EgammaHelpers::isBarrel(cluster);
+ CaloCell_ID::CaloSample sample =
+ isBarrel ? CaloCell_ID::EMB2 : CaloCell_ID::EME2;
+ // eta and phi of the cluster in the calorimeter frame
+ double eta;
+ double phi;
+ m_caloCellDetPos.getDetPosition(
+ mgr, sample, cluster->eta(), cluster->phi(), eta, phi);
+ cluster->insertMoment(xAOD::CaloCluster::ETACALOFRAME, eta);
+ cluster->insertMoment(xAOD::CaloCluster::PHICALOFRAME, phi);
+ // eta in the second sampling
+ m_caloCellDetPos.getDetPosition(
+ mgr, sample, cluster->etaBE(2), cluster->phiBE(2), eta, phi);
+ cluster->insertMoment(xAOD::CaloCluster::ETA2CALOFRAME, eta);
+ cluster->insertMoment(xAOD::CaloCluster::PHI2CALOFRAME, phi);
+ // eta in the first sampling
+ sample = isBarrel ? CaloCell_ID::EMB1 : CaloCell_ID::EME1;
+ m_caloCellDetPos.getDetPosition(
+ mgr, sample, cluster->etaBE(1), cluster->phiBE(1), eta, phi);
+ cluster->insertMoment(xAOD::CaloCluster::ETA1CALOFRAME, eta);
+ cluster->insertMoment(xAOD::CaloCluster::PHI1CALOFRAME, phi);
+
+ return StatusCode::SUCCESS;
+}
+
+StatusCode
+egammaSuperClusterBuilderBase::refineEta1Position(
+ xAOD::CaloCluster* cluster,
+ const CaloDetDescrManager& mgr) const
+{
+
+ // This only makes sense if we have cells there
+ if (!cluster->hasSampling(CaloSampling::EMB1) &&
+ !cluster->hasSampling(CaloSampling::EME1)) {
+ return StatusCode::SUCCESS;
+ }
+ // Now calculare the position using cells in barrel or endcap or both
+ const double aeta = std::abs(cluster->etaBE(2));
+ if (aeta < 1.6 && cluster->hasSampling(CaloSampling::EMB1)) {
+ ATH_CHECK(makeCorrection1(cluster, mgr, CaloSampling::EMB1));
+ }
+ if (aeta > 1.3 && cluster->hasSampling(CaloSampling::EME1)) {
+ ATH_CHECK(makeCorrection1(cluster, mgr, CaloSampling::EME1));
+ }
+ return StatusCode::SUCCESS;
+}
+
+StatusCode
+egammaSuperClusterBuilderBase::makeCorrection1(
+ xAOD::CaloCluster* cluster,
+ const CaloDetDescrManager& mgr,
+ const CaloSampling::CaloSample sample) const
+{
+ // Protections.
+ if (cluster->etamax(sample) == -999. || cluster->phimax(sample) == -999.) {
+ return StatusCode::SUCCESS;
+ }
+ if (std::abs(cluster->etamax(sample)) < 1E-6 &&
+ std::abs(cluster->phimax(sample)) < 1E-6) {
+ return StatusCode::SUCCESS;
+ }
+ // Get the hottest in raw co-ordinates
+ // We have two kinds of enums ...
+ CaloCell_ID::CaloSample xsample =
+ (sample == CaloSampling::EMB1) ? CaloCell_ID::EMB1 : CaloCell_ID::EME1;
+ //
+ const CaloDetDescrElement* dde =
+ mgr.get_element(xsample, cluster->etamax(sample), cluster->phimax(sample));
+ if (!dde) {
+ ATH_MSG_WARNING("Couldn't get CaloDetDescrElement from mgr for: "
+ "cluster->etamax(sample): "
+ << cluster->etamax(sample)
+ << " cluster->phimax(sample): " << cluster->phimax(sample)
+ << " will not refine the position in layer1");
+ return StatusCode::SUCCESS;
+ }
+ //
+ double etamax = dde->eta_raw();
+ double phimax = dde->phi_raw();
+ // now Locate the +-1 range
+ double detastr(-999);
+ double dphistr(-999);
+ // Raw co-ordinates used here
+ etaphi_range(mgr, etamax, phimax, xsample, detastr, dphistr);
+ //
+ // Given the range refine the position employing the smaller window
+ if (detastr > 0 && dphistr > 0) {
+ CaloLayerCalculator helper;
+ const auto* const cellLink = cluster->getCellLinks();
+ helper.fill(cellLink->begin(),
+ cellLink->end(),
+ etamax,
+ phimax,
+ detastr,
+ dphistr,
+ sample);
+
+ // Here is where we (re-)fill the eta in the 1st sampling
+ if (helper.etam() != -999.) {
+ // This is "real" atlas co-ordinates
+ cluster->setEta(sample, helper.etam());
+ }
+ }
+ return StatusCode::SUCCESS;
+}
+
+egammaSuperClusterBuilderBase::PhiSize
+egammaSuperClusterBuilderBase::findPhiSize(
+ const egammaSuperClusterBuilderBase::CentralPosition& cp0,
+ const xAOD::CaloCluster& cluster) const
+{
+
+ PhiSize phiSize;
+ auto cell_itr = cluster.cell_cbegin();
+ auto cell_end = cluster.cell_cend();
+ for (; cell_itr != cell_end; ++cell_itr) {
+
+ const CaloCell* cell = *cell_itr;
+ if (!cell) {
+ continue;
+ }
+
+ const CaloDetDescrElement* dde = cell->caloDDE();
+ if (!dde) {
+ continue;
+ }
+
+ if (cp0.emaxB > 0 && CaloCell_ID::EMB2 == dde->getSampling()) {
+ const float phi0 = cp0.phiB;
+ double cell_phi = proxim(dde->phi_raw(), phi0);
+ if (cell_phi > phi0) {
+ auto diff = cell_phi - phi0;
+ if (diff > phiSize.plusB) {
+ phiSize.plusB = diff;
+ }
+ } else {
+ auto diff = phi0 - cell_phi;
+ if (diff > phiSize.minusB) {
+ phiSize.minusB = diff;
+ }
+ }
+ } else if (cp0.emaxEC > 0 && CaloCell_ID::EME2 == dde->getSampling()) {
+ const float phi0 = cp0.phiEC;
+ double cell_phi = proxim(dde->phi_raw(), phi0);
+ if (cell_phi > phi0) {
+ auto diff = cell_phi - phi0;
+ if (diff > phiSize.plusEC) {
+ phiSize.plusEC = diff;
+ }
+ } else {
+ auto diff = phi0 - cell_phi;
+ if (diff > phiSize.minusEC) {
+ phiSize.minusEC = diff;
+ }
+ }
+ }
+ }
+ // some safety checks
+ if (phiSize.plusB > 1.0) {
+ ATH_MSG_WARNING("phiSizePlusB is large: " << phiSize.plusB
+ << ", capping at 1.0");
+ phiSize.plusB = 1.0;
+ }
+ if (phiSize.plusEC > 1.0) {
+ ATH_MSG_WARNING("phiSizePlusEC is large: " << phiSize.plusEC
+ << ", capping at 1.0");
+ phiSize.plusEC = 1.0;
+ }
+ if (phiSize.minusB > 1.0) {
+ ATH_MSG_WARNING("phiSizeMinusB is large: " << phiSize.minusB
+ << ", capping at 1.0");
+ phiSize.minusB = 1.0;
+ }
+ if (phiSize.minusEC > 1.0) {
+ ATH_MSG_WARNING("phiSizeMinusEC is large: " << phiSize.minusEC
+ << ", capping at 1.0");
+ phiSize.minusEC = 1.0;
+ }
+ return phiSize;
+}
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilderBase.h b/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilderBase.h
new file mode 100644
index 000000000000..934575f5d6dc
--- /dev/null
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilderBase.h
@@ -0,0 +1,356 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef EGAMMAALGS_EGAMMASUPERCLUSTERBUILDERBASE_H
+#define EGAMMAALGS_EGAMMASUPERCLUSTERBUILDERBASE_H
+
+// INCLUDE HEADER FILES:
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
+#include "GaudiKernel/EventContext.h"
+#include "GaudiKernel/SystemOfUnits.h"
+#include "GaudiKernel/ToolHandle.h"
+
+// Fwd declarations
+#include "CaloDetDescr/CaloDetDescrManager.h"
+#include "CaloUtils/CaloCellDetPos.h"
+#include "EgammaAnalysisInterfaces/IegammaMVASvc.h"
+#include "egammaInterfaces/IegammaCheckEnergyDepositTool.h"
+#include "egammaInterfaces/IegammaSwTool.h"
+#include "egammaRecEvent/egammaRecContainer.h"
+#include "xAODCaloEvent/CaloClusterFwd.h"
+#include "xAODEgamma/EgammaEnums.h"
+#include "xAODTracking/TrackParticleContainerFwd.h"
+
+#include <memory>
+#include <vector>
+
+class CaloDetDescrManager;
+/** Base class for electronSuperClusterBuilder
+ * photonSuperClusterBuilder
+ * egammaSuperClusterBuilder
+ * This class cannot be instantiated by itself since the execute method is not
+ * implemented.
+ *
+ * This class provides functions which are used to build supercluster and are
+ * independet from the nature of the particles, for example a function to decide
+ * if two clusters are compatible to be added in a supercluster
+ * (egammaSuperClusterBuilderBase::matchesInWindow) and a function
+ * (egammaSuperClusterBuilderBase::createNewCluster) to create a new
+ * supercluster from a collection of clusters.
+ **/
+class egammaSuperClusterBuilderBase : public AthReentrantAlgorithm
+{
+public:
+ struct CentralPosition
+ {
+ float etaB = 999;
+ float phiB = 999;
+ float emaxB = -999 * Gaudi::Units::GeV;
+ float etaEC = 999;
+ float phiEC = 999;
+ float emaxEC = -999 * Gaudi::Units::GeV;
+ };
+
+ struct PhiSize
+ {
+ float plusB = 0;
+ float minusB = 0;
+ float plusEC = 0;
+ float minusEC = 0;
+ };
+
+protected:
+ /** Protected constructor since this class should not be instantiated by
+ * itself */
+ egammaSuperClusterBuilderBase(const std::string& name,
+ ISvcLocator* pSvcLocator);
+
+ /** should be called by the derived class in the initialize phase */
+ virtual StatusCode initialize() override;
+
+ /**
+ * @brief Is clus in window center around ref?
+ *
+ * @param ref: reference cluster
+ * @param clus: cluster to be tested
+ *
+ * The matching is done using delta-eta and delta-phi comparing them
+ * with the values of
+ * \ref egammaSuperClusterBuilderBase.m_searchWindowEtaCellsBarrel
+ *"SearchWindowEtaCellsBarrel", \ref
+ *egammaSuperClusterBuilderBase.m_searchWindowPhiCellsBarrel
+ *"SearchWindowPhiCellsBarrel", \ref
+ *egammaSuperClusterBuilderBase.m_searchWindowEtaCellsEndcap
+ *"SearchWindowEtaCellsEndcap" and \ref
+ *egammaSuperClusterBuilderBase.m_searchWindowPhiCellsEndcap
+ *"SearchWindowPhiCellsEndcap", depending if the seed is barrel or endcap. If
+ *it is in the crack, an OR of the conditions (using both seeds) is used.
+ **/
+ bool matchesInWindow(const xAOD::CaloCluster* ref,
+ const xAOD::CaloCluster* clus) const;
+
+ /** Creates a new supercluster out of the input clusters.
+ * It decides which cells of the seed and the satellite clusters
+ * to add (boxing / cookie cutter).
+ *
+ * The reference point is computed with findCentralPosition
+ * which returns the hottest cells looping on the cells of all the
+ * considered topo-clusters. Two references are computed,
+ * one for the barrel, one for the endcap. Computations are done in the
+ * calo-frame. Once the reference is computed the decision is made by
+ * egammaSuperClusterBuilderBase::fillClusterConstrained which add the cells
+ * for the accordeon.
+ *
+ * Cells from the tile gap are added using
+ * egammaSuperClusterBuilderBase::addTileGap3CellsinWindow.
+ *
+ * Kinematic properties of the cluster are computed from the property
+ * of the cells.
+ *
+ * If the supercluster has a cluster energy less then EtThresholdCut (also
+ * used as threshould for the seed) a null pointer is returned.
+ *
+ * The supercluster need to pass
+ * egammaCheckEnergyDepositTool::checkFractioninSamplingCluster.
+ *
+ * Calibrations on eta1, energy are applied with
+ * egammaSuperClusterBuilderBase::calibrateCluster
+ *
+ */
+ std::unique_ptr<xAOD::CaloCluster> createNewCluster(
+ const EventContext& ctx,
+ const std::vector<const xAOD::CaloCluster*>& clusters,
+ const CaloDetDescrManager& mgr,
+ xAOD::EgammaParameters::EgammaType egType) const;
+
+ // some constants to use
+ static constexpr float s_cellEtaSize = 0.025;
+ static constexpr float s_cellPhiSize = M_PI / 128.;
+
+ /** @brief Seed selection requirements */
+ Gaudi::Property<float> m_EtThresholdCut{
+ this,
+ "EtThresholdCut",
+ 1.5 * Gaudi::Units::GeV,
+ "The minimum EM Et required of SEED clusters (not applied to secondaries)"
+ };
+
+ // these are calculated search window values
+ // half of search window size, converted to units of eta,phi
+ float m_searchWindowEtaBarrel;
+ float m_searchWindowPhiBarrel;
+ float m_searchWindowEtaEndcap;
+ float m_searchWindowPhiEndcap;
+
+private:
+ /** Find the size of the cluster in phi using L2 cells.
+ *
+ * @param cp0: the reference position in calo-coordinates
+ * @param cluster: the cluster filled with L2 and L3 cells
+ *
+ * The window is computed using only cells in the second layer.
+ * Asymmetric sizes are computed for barrel and endcap. The size
+ * is the maximum difference in phi between the center of a cell
+ * and the refence, considering separately cells in the barrel
+ * and in the endcap. The computation is done separately for the
+ * cells with phi < reference phi or >=. A cutoff value of 1 is used.
+ */
+ PhiSize findPhiSize(const CentralPosition& cp0,
+ const xAOD::CaloCluster& cluster) const;
+
+ /**
+ * Fill super cluster constraining its size
+ * in eta,phi around the overall hottest cell
+ * and the its L2 size
+ *
+ * @param tofill: empty cluster to be filled
+ * @param clusters: seed and satellite clusters
+ * @param cp0: this specify the eta/phi reference in the calo-frame. In egamma
+ * reconstruction the references are the hottest cells in L2, in barrel and
+ * endcap.
+ *
+ * Cells are added if their raw coordinates are inside a window in eta and/or
+ * phi centered around the hottest cells specified by cp0. If there are two
+ * hottest cells (one in the barrel and one in the endcap) both are used in
+ * the tests and an OR of the two is considered.
+ *
+ * First L2 and L3 LAR EM cells are considered (excluding inner wheel endcap
+ * cells). A cut in eta is used. The range of the eta-window depends if the
+ * seed cell is in barrel or endcap. For example for the barrel, cells in L2
+ * are added if they are inside +/- (\ref
+ * egammaSuperClusterBuilderBase.m_addCellsWindowEtaCellsBarrel
+ * "AddCellsWindowEtaCellsBarrel" * s_cellEtaSize / 2)
+ * where \ref egammaSuperClusterBuilderBase.s_cellEtaSize "s_cellEtaSize" is
+ * the eta size of one cell in L2. For L3 the semi-window is increased by
+ * (\ref egammaSuperClusterBuilderBase.m_extraL3EtaSizeCells
+ * "ExtraL3EtaSizeCells" * s_cellEtaSize / 2).
+ *
+ * Then cells in PS and L1 are added if they match a window in eta and phi.
+ * The eta requiriment is the same as in L2. The window in phi
+ * is computed asymetrically using the cells in layer 2, using the function
+ * egammaSuperClusterBuilderBase::findPhiSize and increading the semi-window
+ * by
+ * (\ref egammaSuperClusterBuilderBase.m_extraL0L1PhiSize "ExtraL0L1PhiSize" *
+ * s_cellPhiSize) where \ref egammaSuperClusterBuilderBase.s_cellPhiSize
+ * "s_cellPhiSize" is the size in phi of cells in L2.
+ */
+ StatusCode fillClusterConstrained(
+ xAOD::CaloCluster& tofill,
+ const std::vector<const xAOD::CaloCluster*>& clusters,
+ const CentralPosition& cp0) const;
+
+ /** add all tile Gap 3 cells in a window.
+ * All the cells in the TileGap3 layer which are in a eta x phi window 0.2,
+ * ~0.15 centered around the raw position of the cluster param tofill with
+ * weight 1.
+ */
+ StatusCode addTileGap3CellsinWindow(xAOD::CaloCluster& tofill,
+ const CaloDetDescrManager& mgr) const;
+
+ /** function to calibrate the new clusters energy
+ *
+ * Calibrate with
+ * - egammaSuperClusterBuilderBase.refineEta1Position
+ * - \ref egammaSuperClusterBuilderBase.m_clusterCorrectionTool
+ * "ClusterCorrectionTool" (default=egammaSwTool)
+ * - \ref egammaSuperClusterBuilderBase.fillPositionsInCalo
+ * "fillPositionsInCalo"
+ * - \ref egammaSuperClusterBuilderBase.m_MVACalibSvc "MVACalibSvc"
+ * (default=egammaMVASvc).
+ */
+ StatusCode calibrateCluster(
+ const EventContext& ctx,
+ xAOD::CaloCluster* newCluster,
+ const CaloDetDescrManager& mgr,
+ const xAOD::EgammaParameters::EgammaType egType) const;
+
+ /** Function to decorate the calo cluster with position variables.
+ * Filling eta phi in calo-frame:
+ * - xAOD::CaloCluster::ETACALOFRAME
+ * - xAOD::CaloCluster::PHICALOFRAME
+ * - xAOD::CaloCluster::ETA2CALOFRAME
+ * - xAOD::CaloCluster::PHI2CALOFRAME
+ * - xAOD::CaloCluster::ETA1CALOFRAME
+ * - xAOD::CaloCluster::PHI1CALOFRAME
+ */
+ StatusCode fillPositionsInCalo(xAOD::CaloCluster* cluster,
+ const CaloDetDescrManager& mgr) const;
+
+ /** functions to refine position in eta1*/
+ StatusCode refineEta1Position(xAOD::CaloCluster* cluster,
+ const CaloDetDescrManager& mgr) const;
+ StatusCode makeCorrection1(xAOD::CaloCluster* cluster,
+ const CaloDetDescrManager& mgr,
+ const CaloSampling::CaloSample sample) const;
+
+ // window values for the windows
+ // in which cells of topoclusters are added
+ // half of addCells window size, converted in units of eta/phi
+ float m_addCellsWindowEtaBarrel;
+ float m_addCellsWindowEtaEndcap;
+ // Extra opening in phi for L0,L1
+ float m_extraL0L1PhiSize;
+ // Extra opening in eta for L3 cells
+ float m_extraL3EtaSize;
+
+ /** @brief Position in Calo frame**/
+ CaloCellDetPos m_caloCellDetPos;
+
+ /** @brief Size of topocluster search window in eta for the barrel */
+ Gaudi::Property<int> m_searchWindowEtaCellsBarrel{
+ this,
+ "SearchWindowEtaCellsBarrel",
+ 5,
+ "Number of cells in eta of window in which to search for topoclusters"
+ };
+
+ /** @brief Size of topocluster search window in phi for the barrel */
+ Gaudi::Property<int> m_searchWindowPhiCellsBarrel{
+ this,
+ "SearchWindowPhiCellsBarrel",
+ 5,
+ "Number of cells in phi of window in which to search for topoclusters"
+ };
+
+ /** @brief Size of topocluster search window in eta for the end-cap*/
+ Gaudi::Property<int> m_searchWindowEtaCellsEndcap{
+ this,
+ "SearchWindowEtaCellsEndcap",
+ 5,
+ "Number of cells in eta of window in which to search for topoclusters"
+ };
+
+ /** @brief Size of topocluster search window in phi for the end-cap*/
+ Gaudi::Property<int> m_searchWindowPhiCellsEndcap{
+ this,
+ "SearchWindowPhiCellsEndcap",
+ 5,
+ "Number of cells in phi of window in which to search for topoclusters"
+ };
+
+ /** @brief Size of windows et eta in which cells of topoclusters are added for
+ * the barrel (units of 2nd layer cells) */
+ Gaudi::Property<int> m_addCellsWindowEtaCellsBarrel{
+ this,
+ "AddCellsWindowEtaCellsBarrel",
+ 3,
+ "Number of cells in eta of window around topocluster center to add cells"
+ };
+
+ /** @brief Size of windows et eta in which cells of topoclusters are edded for
+ * the endcap (units of 2nd layer cells) */
+ Gaudi::Property<int> m_addCellsWindowEtaCellsEndcap{
+ this,
+ "AddCellsWindowEtaCellsEndcap",
+ 5,
+ "Number of cells in eta of window around topocluster center to add cells"
+ };
+
+ /** @brief "When adding L0 (PS) and L1 cells, how much wider than
+ * the L2 size of the cluster is the acceptance in phi
+ * (units of 2nd layer cells)*/
+ Gaudi::Property<int> m_extraL0L1PhiSizeCells{
+ this,
+ "ExtraL0L1PhiSize",
+ 1,
+ "When adding L0 (PS) and L1 cells in phi, "
+ "how much wider (+/- of the value) than the L2 phi size of the "
+ "cluster (in L2 cells units) is the acceptance"
+ };
+
+ /** @brief "When adding L3 cells, how much wider in eta than
+ * the L2 */
+ Gaudi::Property<int> m_extraL3EtaSizeCells{
+ this,
+ "ExtraL3EtaSizeCells",
+ 0,
+ "When adding L3 cells how much wider (+/- 0.5 of the value) "
+ "than L2 (in L2 cells "
+ "units) is the acceptance in eta"
+ };
+
+ /** @brief Handle to the MVA calibration service **/
+ ServiceHandle<IegammaMVASvc> m_MVACalibSvc{ this,
+ "MVACalibSvc",
+ "egammaMVASvc",
+ "calibration service" };
+
+ /** @brief Tool to handle cluster corrections */
+ ToolHandle<IegammaSwTool> m_clusterCorrectionTool{
+ this,
+ "ClusterCorrectionTool",
+ "egammaSwTool/egammaswtool",
+ "tool that applies cluster corrections"
+ };
+
+ /** @brief Pointer to the egammaCheckEnergyDepositTool*/
+ ToolHandle<IegammaCheckEnergyDepositTool> m_egammaCheckEnergyDepositTool{
+ this,
+ "egammaCheckEnergyDepositTool",
+ "",
+ "Optional tool that performs basic checks of viability of cluster"
+ };
+};
+
+#endif
diff --git a/Reconstruction/egamma/egammaAlgs/src/electronSuperClusterBuilder.cxx b/Reconstruction/egamma/egammaAlgs/src/electronSuperClusterBuilder.cxx
index 3d0532ac7e9e..9d457509cdd5 100644
--- a/Reconstruction/egamma/egammaAlgs/src/electronSuperClusterBuilder.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/electronSuperClusterBuilder.cxx
@@ -17,12 +17,13 @@
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
-#include <memory>
#include <cmath>
+#include <memory>
-electronSuperClusterBuilder::electronSuperClusterBuilder(const std::string& name,
- ISvcLocator* pSvcLocator)
- : egammaSuperClusterBuilder(name, pSvcLocator)
+electronSuperClusterBuilder::electronSuperClusterBuilder(
+ const std::string& name,
+ ISvcLocator* pSvcLocator)
+ : egammaSuperClusterBuilderBase(name, pSvcLocator)
{
// Additional Window we search in
m_maxDelPhi = m_maxDelPhiCells * s_cellPhiSize * 0.5;
@@ -34,7 +35,7 @@ electronSuperClusterBuilder::initialize()
{
ATH_MSG_DEBUG(" Initializing electronSuperClusterBuilder");
// Call initialize of base
- ATH_CHECK(egammaSuperClusterBuilder::initialize());
+ ATH_CHECK(egammaSuperClusterBuilderBase::initialize());
// the data handle keys
ATH_CHECK(m_inputEgammaRecContainerKey.initialize());
ATH_CHECK(m_electronSuperRecCollectionKey.initialize());
@@ -51,17 +52,12 @@ electronSuperClusterBuilder::initialize()
return StatusCode::SUCCESS;
}
-StatusCode
-electronSuperClusterBuilder::finalize()
-{
- return StatusCode::SUCCESS;
-}
-
StatusCode
electronSuperClusterBuilder::execute(const EventContext& ctx) const
{
- SG::ReadHandle<EgammaRecContainer> egammaRecs(m_inputEgammaRecContainerKey, ctx);
+ SG::ReadHandle<EgammaRecContainer> egammaRecs(m_inputEgammaRecContainerKey,
+ ctx);
// check is only used for serial running; remove when MT scheduler used
if (!egammaRecs.isValid()) {
ATH_MSG_ERROR("Failed to retrieve " << m_inputEgammaRecContainerKey.key());
@@ -72,11 +68,13 @@ electronSuperClusterBuilder::execute(const EventContext& ctx) const
SG::WriteHandle<xAOD::CaloClusterContainer> outputClusterContainer(
m_outputElectronSuperClustersKey, ctx);
- ATH_CHECK(outputClusterContainer.record(std::make_unique<xAOD::CaloClusterContainer>(),
- std::make_unique<xAOD::CaloClusterAuxContainer>()));
+ ATH_CHECK(outputClusterContainer.record(
+ std::make_unique<xAOD::CaloClusterContainer>(),
+ std::make_unique<xAOD::CaloClusterAuxContainer>()));
// Create the new Electron Super Cluster based EgammaRecContainer
- SG::WriteHandle<EgammaRecContainer> newEgammaRecs(m_electronSuperRecCollectionKey, ctx);
+ SG::WriteHandle<EgammaRecContainer> newEgammaRecs(
+ m_electronSuperRecCollectionKey, ctx);
ATH_CHECK(newEgammaRecs.record(std::make_unique<EgammaRecContainer>()));
// The calo Det Descr manager
@@ -88,14 +86,16 @@ electronSuperClusterBuilder::execute(const EventContext& ctx) const
std::vector<bool> isUsedRevert(egammaRecs->size(), false);
// Loop over input egammaRec objects, build superclusters.
for (std::size_t i = 0; i < egammaRecs->size(); ++i) {
- if (isUsed[i]) continue;
+ if (isUsed[i])
+ continue;
- const auto *egRec = (*egammaRecs)[i];
+ const auto* egRec = (*egammaRecs)[i];
// Seed selections
const xAOD::CaloCluster* clus = egRec->caloCluster();
// The seed should have 2nd sampling
- if (!clus->hasSampling(CaloSampling::EMB2) && !clus->hasSampling(CaloSampling::EME2)) {
+ if (!clus->hasSampling(CaloSampling::EMB2) &&
+ !clus->hasSampling(CaloSampling::EME2)) {
continue;
}
const double eta2 = std::abs(clus->etaBE(2));
@@ -103,7 +103,8 @@ electronSuperClusterBuilder::execute(const EventContext& ctx) const
continue;
}
// Accordeon Energy samplings 1 to 3
- const double EMAccEnergy = clus->energyBE(1) + clus->energyBE(2) + clus->energyBE(3);
+ const double EMAccEnergy =
+ clus->energyBE(1) + clus->energyBE(2) + clus->energyBE(3);
const double EMAccEt = EMAccEnergy / cosh(eta2);
// Require minimum energy for supercluster seeding.
if (EMAccEt < m_EtThresholdCut) {
@@ -117,10 +118,12 @@ electronSuperClusterBuilder::execute(const EventContext& ctx) const
// with possible pixel
uint8_t nPixelHits(0);
uint8_t uint8_value(0);
- if (egRec->trackParticle(0)->summaryValue(uint8_value, xAOD::numberOfPixelDeadSensors)) {
+ if (egRec->trackParticle(0)->summaryValue(uint8_value,
+ xAOD::numberOfPixelDeadSensors)) {
nPixelHits += uint8_value;
}
- if (egRec->trackParticle(0)->summaryValue(uint8_value, xAOD::numberOfPixelHits)) {
+ if (egRec->trackParticle(0)->summaryValue(uint8_value,
+ xAOD::numberOfPixelHits)) {
nPixelHits += uint8_value;
}
if (nPixelHits < m_numberOfPixelHits) {
@@ -129,19 +132,21 @@ electronSuperClusterBuilder::execute(const EventContext& ctx) const
// and with silicon (add SCT to pixel)
uint8_t nSiHits = nPixelHits;
- if (egRec->trackParticle(0)->summaryValue(uint8_value, xAOD::numberOfSCTHits)) {
+ if (egRec->trackParticle(0)->summaryValue(uint8_value,
+ xAOD::numberOfSCTHits)) {
nSiHits += uint8_value;
}
if (nSiHits < m_numberOfSiHits) {
continue;
}
- ATH_MSG_DEBUG("Creating supercluster egammaRec electron using cluster Et = "
- << egRec->caloCluster()->et() << " eta " << egRec->caloCluster()->eta() << " phi "
- << egRec->caloCluster()->phi() << " EM Accordeon Et " << EMAccEt << " pixel hits "
- << static_cast<unsigned int>(nPixelHits) << " silicon hits "
- << static_cast<unsigned int>(nSiHits));
+ ATH_MSG_DEBUG(
+ "Creating supercluster egammaRec electron using cluster Et = "
+ << egRec->caloCluster()->et() << " eta " << egRec->caloCluster()->eta()
+ << " phi " << egRec->caloCluster()->phi() << " EM Accordeon Et "
+ << EMAccEt << " pixel hits " << static_cast<unsigned int>(nPixelHits)
+ << " silicon hits " << static_cast<unsigned int>(nSiHits));
// Mark seed as used
- isUsedRevert = isUsed; // save status in case we fail to create supercluster
+ isUsedRevert = isUsed; // save status in case we fail to create supercluster
isUsed[i] = true;
// Start accumulating the clusters from the seed
@@ -153,15 +158,19 @@ electronSuperClusterBuilder::execute(const EventContext& ctx) const
searchForSecondaryClusters(i, egammaRecs.cptr(), isUsed);
for (const auto& secClusIndex : secondaryIndices) {
- const auto *const secRec = (*egammaRecs)[secClusIndex];
+ const auto* const secRec = (*egammaRecs)[secClusIndex];
accumulatedClusters.push_back(secRec->caloCluster());
}
ATH_MSG_DEBUG("Total clusters " << accumulatedClusters.size());
- // Create the new cluster: take the full list of cluster and add their cells together
- std::unique_ptr<xAOD::CaloCluster> newCluster = createNewCluster(
- ctx, accumulatedClusters, *calodetdescrmgr, xAOD::EgammaParameters::electron);
+ // Create the new cluster: take the full list of cluster and add their cells
+ // together
+ std::unique_ptr<xAOD::CaloCluster> newCluster =
+ createNewCluster(ctx,
+ accumulatedClusters,
+ *calodetdescrmgr,
+ xAOD::EgammaParameters::electron);
if (!newCluster) {
ATH_MSG_DEBUG("Creating a new cluster failed");
@@ -174,9 +183,11 @@ electronSuperClusterBuilder::execute(const EventContext& ctx) const
outputClusterContainer->push_back(std::move(newCluster));
// Add the cluster link to the super cluster
- ElementLink<xAOD::CaloClusterContainer> clusterLink(*outputClusterContainer,
- outputClusterContainer->size() - 1, ctx);
- std::vector<ElementLink<xAOD::CaloClusterContainer>> elClusters{ clusterLink };
+ ElementLink<xAOD::CaloClusterContainer> clusterLink(
+ *outputClusterContainer, outputClusterContainer->size() - 1, ctx);
+ std::vector<ElementLink<xAOD::CaloClusterContainer>> elClusters{
+ clusterLink
+ };
// Make egammaRec object, and push it back into output container.
auto newEgRec = std::make_unique<egammaRec>(*egRec);
@@ -197,15 +208,16 @@ electronSuperClusterBuilder::execute(const EventContext& ctx) const
}
std::vector<std::size_t>
-electronSuperClusterBuilder::searchForSecondaryClusters(const std::size_t seedIndex,
- const EgammaRecContainer* egammaRecs,
- std::vector<bool>& isUsed) const
+electronSuperClusterBuilder::searchForSecondaryClusters(
+ const std::size_t seedIndex,
+ const EgammaRecContainer* egammaRecs,
+ std::vector<bool>& isUsed) const
{
// assume egammaRecs != 0, since the ReadHadler is valid
// assume seed egammaRec has a valid cluster, since it has been already used
std::vector<std::size_t> secondaryIndices;
- const auto *const seedEgammaRec = (*egammaRecs)[seedIndex];
+ const auto* const seedEgammaRec = (*egammaRecs)[seedIndex];
const xAOD::CaloCluster* const seedCaloClus = seedEgammaRec->caloCluster();
const xAOD::TrackParticle* seedTrackParticle = seedEgammaRec->trackParticle();
@@ -214,18 +226,22 @@ electronSuperClusterBuilder::searchForSecondaryClusters(const std::size_t seedIn
for (std::size_t i = 0; i < egammaRecs->size(); ++i) {
// if already used continue
- if (isUsed[i]) { continue; }
+ if (isUsed[i]) {
+ continue;
+ }
- const auto *const secEgammaRec = (*egammaRecs)[i];
+ const auto* const secEgammaRec = (*egammaRecs)[i];
const xAOD::CaloCluster* const secClus = secEgammaRec->caloCluster();
// Now perform a number of tests to see if the cluster should be added
const auto seedSecdEta = std::abs(seedCaloClus->eta() - secClus->eta());
- const auto seedSecdPhi = std::abs(P4Helpers::deltaPhi(seedCaloClus->phi(), secClus->phi()));
+ const auto seedSecdPhi =
+ std::abs(P4Helpers::deltaPhi(seedCaloClus->phi(), secClus->phi()));
- const bool addCluster = (matchesInWindow(seedCaloClus, secClus) ||
- ((seedSecdEta < m_maxDelEta && seedSecdPhi < m_maxDelPhi) &&
- (matchSameTrack(*seedTrackParticle, *secEgammaRec))));
+ const bool addCluster =
+ (matchesInWindow(seedCaloClus, secClus) ||
+ ((seedSecdEta < m_maxDelEta && seedSecdPhi < m_maxDelPhi) &&
+ (matchSameTrack(*seedTrackParticle, *secEgammaRec))));
// Add it to the list of secondary clusters if it matches.
if (addCluster) {
secondaryIndices.push_back(i);
@@ -237,8 +253,9 @@ electronSuperClusterBuilder::searchForSecondaryClusters(const std::size_t seedIn
}
bool
-electronSuperClusterBuilder::matchSameTrack(const xAOD::TrackParticle& seedTrack,
- const egammaRec& sec)
+electronSuperClusterBuilder::matchSameTrack(
+ const xAOD::TrackParticle& seedTrack,
+ const egammaRec& sec)
{
const xAOD::TrackParticle* secTrack = sec.trackParticle();
if (secTrack) {
diff --git a/Reconstruction/egamma/egammaAlgs/src/electronSuperClusterBuilder.h b/Reconstruction/egamma/egammaAlgs/src/electronSuperClusterBuilder.h
index 3f006ead7a0f..5ea8ba226d9b 100644
--- a/Reconstruction/egamma/egammaAlgs/src/electronSuperClusterBuilder.h
+++ b/Reconstruction/egamma/egammaAlgs/src/electronSuperClusterBuilder.h
@@ -5,7 +5,7 @@
#ifndef EGAMMAALGS_ELECTRONSUPERCLUSTERBUILDER_H
#define EGAMMAALGS_ELECTRONSUPERCLUSTERBUILDER_H
-#include "egammaSuperClusterBuilder.h"
+#include "egammaSuperClusterBuilderBase.h"
#include "GaudiKernel/EventContext.h"
#include "StoreGate/ReadHandleKey.h"
@@ -17,47 +17,53 @@
#include "xAODCaloEvent/CaloClusterContainer.h"
#include "xAODCaloEvent/CaloClusterFwd.h"
-#include <vector>
#include <string>
+#include <vector>
/**
* @brief Create supercluster under electron hypothesis
*
* The algorithm creates superclusters for electrons merging topoclusters.
* Input containers:
- * - \ref electronSuperClusterBuilder.m_inputEgammaRecContainerKey "InputEgammaRecContainerName"
- * (default=egammaRecCollection): collection of EgammaRec objects to be used
+ * - \ref electronSuperClusterBuilder.m_inputEgammaRecContainerKey
+ * "InputEgammaRecContainerName" (default=egammaRecCollection): collection of
+ * EgammaRec objects to be used
*
* Output containers:
- * - \ref electronSuperClusterBuilder.m_electronSuperRecCollectionKey "SuperElectronRecCollectionName"
- * (default=ElectronSuperRecCollection): collection of EgammaRec objects with the cluster set to
- * be the supercluster
- * - \ref electronSuperClusterBuilder.m_outputElectronSuperClustersKey "SuperClusterCollectionName"
- * (default=ElectronSuperClusters): collection of clusters (the supercluster)
+ * - \ref electronSuperClusterBuilder.m_electronSuperRecCollectionKey
+ * "SuperElectronRecCollectionName" (default=ElectronSuperRecCollection):
+ * collection of EgammaRec objects with the cluster set to be the supercluster
+ * - \ref electronSuperClusterBuilder.m_outputElectronSuperClustersKey
+ * "SuperClusterCollectionName" (default=ElectronSuperClusters): collection of
+ * clusters (the supercluster)
*
- * The loop is on the clusters of the EgammaRec objects from the input container. Fist, the first
- * cluster is considered as a seed. The cluster seed must pass some selection:
+ * The loop is on the clusters of the EgammaRec objects from the input
+ * container. Fist, the first cluster is considered as a seed. The cluster seed
+ * must pass some selection:
* - having a second sampling with |eta| not larger than 10
* - pT (from the sum of the three accordion layer) not below
- * \ref egammaSuperClusterBuilder.m_EtThresholdCut "EtThresholdCut"
+ * \ref egammaSuperClusterBuilderBase.m_EtThresholdCut "EtThresholdCut"
* - having at least one track with minimum number of Pixel and Si hits (
* \ref electronSuperClusterBuilder.m_numberOfPixelHits "NumberOfReqPixelHits",
* \ref electronSuperClusterBuilder.m_numberOfSiHits "NumberOfReqSiHits")
*
* Clusters to be merged in a supercluster are selected using the
- * electronSuperClusterBuilder::searchForSecondaryClusters function. Then the procedure is redone,
- * testing new seeds, for all the other clusters that have not been used to make superclusters.
- * The building of the supercluster is done with egammaSuperClusterBuilder::createNewCluster
- * which selects the cells to be used.
+ * electronSuperClusterBuilder::searchForSecondaryClusters function. Then the
+ * procedure is redone, testing new seeds, for all the other clusters that have
+ * not been used to make superclusters. The building of the supercluster is done
+ * with egammaSuperClusterBuilderBase::createNewCluster which selects the cells
+ * to be used.
+ *
+ * Add the end, if the property \ref
+ * electronSuperClusterBuilder.m_doTrackMatching "doTrackMatching" is true the
+ * track matching is redone on top of new superclusters, using the tool
+ * configured by the property TrackMatchBuilderTool, by default
+ * EMTrackMatchBuilder.
*
- * Add the end, if the property \ref electronSuperClusterBuilder.m_doTrackMatching "doTrackMatching"
- * is true the track matching is redone on top of new superclusters, using the tool configured by
- * the property TrackMatchBuilderTool, by default EMTrackMatchBuilder.
- *
* \see photonSuperClusterBuilder
*/
-class electronSuperClusterBuilder : public egammaSuperClusterBuilder
+class electronSuperClusterBuilder : public egammaSuperClusterBuilderBase
{
public:
@@ -67,12 +73,11 @@ public:
// Tool standard routines.
virtual StatusCode initialize() override final;
- virtual StatusCode finalize() override final;
StatusCode execute(const EventContext& ctx) const override final;
private:
static bool matchSameTrack(const xAOD::TrackParticle& seedTrack,
- const egammaRec& sec) ;
+ const egammaRec& sec);
/**
* @brief Search for secondary clusters
@@ -86,9 +91,11 @@ private:
* - matches the seed in a narrow window OR
* - is inside the window for additonal criteria AND matches the same track
*
- * The first condition is evaluated with egammaSuperClusterBuilder.matchesInWindow.
- * The second condition is evaluated using \ref electronSuperClusterBuilder.m_maxDelEtaCells "MaxWindowDelEtaCells" and
- * \ref electronSuperClusterBuilder.m_maxDelPhi "MaxWindowDelPhiCells" and electronSuperClusterBuilder.matchSameTrack
+ * The first condition is evaluated with
+ * egammaSuperClusterBuilderBase.matchesInWindow. The second condition is
+ * evaluated using \ref electronSuperClusterBuilder.m_maxDelEtaCells
+ * "MaxWindowDelEtaCells" and \ref electronSuperClusterBuilder.m_maxDelPhi
+ * "MaxWindowDelPhiCells" and electronSuperClusterBuilder.matchSameTrack
*/
std::vector<std::size_t> searchForSecondaryClusters(
const size_t i,
diff --git a/Reconstruction/egamma/egammaAlgs/src/photonSuperClusterBuilder.cxx b/Reconstruction/egamma/egammaAlgs/src/photonSuperClusterBuilder.cxx
index 5d3267565189..4fa283b161eb 100644
--- a/Reconstruction/egamma/egammaAlgs/src/photonSuperClusterBuilder.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/photonSuperClusterBuilder.cxx
@@ -16,13 +16,12 @@
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
-#include <memory>
#include <cmath>
-
+#include <memory>
photonSuperClusterBuilder::photonSuperClusterBuilder(const std::string& name,
ISvcLocator* pSvcLocator)
- : egammaSuperClusterBuilder(name, pSvcLocator)
+ : egammaSuperClusterBuilderBase(name, pSvcLocator)
{}
StatusCode
@@ -40,13 +39,7 @@ photonSuperClusterBuilder::initialize()
ATH_CHECK(m_conversionBuilder.retrieve());
}
- return egammaSuperClusterBuilder::initialize();
-}
-
-StatusCode
-photonSuperClusterBuilder::finalize()
-{
- return StatusCode::SUCCESS;
+ return egammaSuperClusterBuilderBase::initialize();
}
StatusCode
@@ -54,7 +47,8 @@ photonSuperClusterBuilder::execute(const EventContext& ctx) const
{
// Retrieve input egammaRec container.
- SG::ReadHandle<EgammaRecContainer> egammaRecs(m_inputEgammaRecContainerKey, ctx);
+ SG::ReadHandle<EgammaRecContainer> egammaRecs(m_inputEgammaRecContainerKey,
+ ctx);
// check is only used for serial running; remove when MT scheduler used
if (!egammaRecs.isValid()) {
@@ -64,12 +58,14 @@ photonSuperClusterBuilder::execute(const EventContext& ctx) const
// Have to register cluster container in order to properly get cluster links.
SG::WriteHandle<xAOD::CaloClusterContainer> outputClusterContainer(
- m_outputPhotonSuperClustersKey,ctx);
- ATH_CHECK(outputClusterContainer.record(std::make_unique<xAOD::CaloClusterContainer>(),
- std::make_unique<xAOD::CaloClusterAuxContainer>()));
+ m_outputPhotonSuperClustersKey, ctx);
+ ATH_CHECK(outputClusterContainer.record(
+ std::make_unique<xAOD::CaloClusterContainer>(),
+ std::make_unique<xAOD::CaloClusterAuxContainer>()));
// Create the new Photon Super Cluster based EgammaRecContainer
- SG::WriteHandle<EgammaRecContainer> newEgammaRecs(m_photonSuperRecCollectionKey,ctx);
+ SG::WriteHandle<EgammaRecContainer> newEgammaRecs(
+ m_photonSuperRecCollectionKey, ctx);
ATH_CHECK(newEgammaRecs.record(std::make_unique<EgammaRecContainer>()));
// The calo Det Descr manager
@@ -81,15 +77,17 @@ photonSuperClusterBuilder::execute(const EventContext& ctx) const
std::vector<bool> isUsedRevert(egammaRecs->size(), false);
// Loop over input egammaRec objects, build superclusters.
for (std::size_t i = 0; i < egammaRecs->size(); ++i) {
- if (isUsed[i]) continue;
+ if (isUsed[i])
+ continue;
- const auto *const egRec = (*egammaRecs)[i];
+ const auto* const egRec = (*egammaRecs)[i];
// Seed selections
- const auto *const clus = egRec->caloCluster();
+ const auto* const clus = egRec->caloCluster();
// The seed should have 2nd sampling
- if (!clus->hasSampling(CaloSampling::EMB2) && !clus->hasSampling(CaloSampling::EME2)) {
+ if (!clus->hasSampling(CaloSampling::EMB2) &&
+ !clus->hasSampling(CaloSampling::EME2)) {
continue;
}
const double eta2 = std::abs(clus->etaBE(2));
@@ -97,7 +95,8 @@ photonSuperClusterBuilder::execute(const EventContext& ctx) const
continue;
}
// Accordeon Energy samplings 1 to 3
- const double EMAccEnergy = clus->energyBE(1) + clus->energyBE(2) + clus->energyBE(3);
+ const double EMAccEnergy =
+ clus->energyBE(1) + clus->energyBE(2) + clus->energyBE(3);
const double EMAccEt = EMAccEnergy / cosh(eta2);
// Require minimum energy for supercluster seeding.
if (EMAccEt < m_EtThresholdCut) {
@@ -105,28 +104,30 @@ photonSuperClusterBuilder::execute(const EventContext& ctx) const
}
// Passed preliminary custs
ATH_MSG_DEBUG("Creating supercluster egammaRec photon object "
- << 'n' << "Using cluster Et = " << clus->et() << " EM Accordeon Et " << EMAccEt);
+ << 'n' << "Using cluster Et = " << clus->et()
+ << " EM Accordeon Et " << EMAccEt);
// Mark seed as used
- isUsedRevert = isUsed; // save status in case we fail to create supercluster
+ isUsedRevert = isUsed; // save status in case we fail to create supercluster
isUsed[i] = true;
// Start accumulating the clusters from the seed
std::vector<const xAOD::CaloCluster*> accumulatedClusters;
accumulatedClusters.push_back(clus);
-
const std::vector<std::size_t> secondaryIndices =
searchForSecondaryClusters(i, egammaRecs.cptr(), isUsed);
for (const auto secClusIndex : secondaryIndices) {
- const auto *const secRec = (*egammaRecs)[secClusIndex];
+ const auto* const secRec = (*egammaRecs)[secClusIndex];
accumulatedClusters.push_back(secRec->caloCluster());
// no need to add vertices
}
- // Create the new cluster: take the full list of cluster and add their cells together
- auto egType = (egRec->getNumberOfVertices() > 0) ? xAOD::EgammaParameters::convertedPhoton
- : xAOD::EgammaParameters::unconvertedPhoton;
+ // Create the new cluster: take the full list of cluster and add their cells
+ // together
+ auto egType = (egRec->getNumberOfVertices() > 0)
+ ? xAOD::EgammaParameters::convertedPhoton
+ : xAOD::EgammaParameters::unconvertedPhoton;
std::unique_ptr<xAOD::CaloCluster> newCluster =
createNewCluster(ctx, accumulatedClusters, *calodetdescrmgr, egType);
@@ -142,9 +143,11 @@ photonSuperClusterBuilder::execute(const EventContext& ctx) const
outputClusterContainer->push_back(std::move(newCluster));
// Add the cluster link to the super cluster
- ElementLink<xAOD::CaloClusterContainer> clusterLink(*outputClusterContainer,
- outputClusterContainer->size() - 1, ctx);
- std::vector<ElementLink<xAOD::CaloClusterContainer>> phCluster{ clusterLink };
+ ElementLink<xAOD::CaloClusterContainer> clusterLink(
+ *outputClusterContainer, outputClusterContainer->size() - 1, ctx);
+ std::vector<ElementLink<xAOD::CaloClusterContainer>> phCluster{
+ clusterLink
+ };
// Make egammaRec object, and push it back into output container.
auto newEgRec = std::make_unique<egammaRec>(*egRec);
@@ -174,20 +177,22 @@ photonSuperClusterBuilder::execute(const EventContext& ctx) const
// assume egammaRecs != 0, since the ReadHadler is valid
// assume seed egammaRec has a valid cluster, since it has been already used
std::vector<std::size_t>
-photonSuperClusterBuilder::searchForSecondaryClusters(std::size_t seedIndex,
- const EgammaRecContainer* egammaRecs,
- std::vector<bool>& isUsed) const
+photonSuperClusterBuilder::searchForSecondaryClusters(
+ std::size_t seedIndex,
+ const EgammaRecContainer* egammaRecs,
+ std::vector<bool>& isUsed) const
{
std::vector<std::size_t> secondaryIndices;
- const auto *const seedEgammaRec = (*egammaRecs)[seedIndex];
+ const auto* const seedEgammaRec = (*egammaRecs)[seedIndex];
const xAOD::CaloCluster* const seedCaloClus = seedEgammaRec->caloCluster();
// let's determine some things about the seed
std::vector<const xAOD::Vertex*> seedVertices;
std::vector<xAOD::EgammaParameters::ConversionType> seedVertexType;
- std::vector<const xAOD::TrackParticle*> seedVertexTracks; // tracks from conversion vertex
+ std::vector<const xAOD::TrackParticle*>
+ seedVertexTracks; // tracks from conversion vertex
auto numVertices = seedEgammaRec->getNumberOfVertices();
if (m_useOnlyLeadingVertex && numVertices > 0) {
@@ -195,11 +200,12 @@ photonSuperClusterBuilder::searchForSecondaryClusters(std::size_t seedIndex,
}
for (std::size_t vx = 0; vx < numVertices; ++vx) {
- const auto *const vertex = seedEgammaRec->vertex(vx);
+ const auto* const vertex = seedEgammaRec->vertex(vx);
const auto convType = xAOD::EgammaHelpers::conversionType(vertex);
seedVertices.push_back(vertex);
seedVertexType.push_back(convType);
- const bool addTracks = !m_useOnlySi || convType == xAOD::EgammaParameters::singleSi ||
+ const bool addTracks = !m_useOnlySi ||
+ convType == xAOD::EgammaParameters::singleSi ||
convType == xAOD::EgammaParameters::doubleSi;
if (addTracks) {
for (unsigned int tp = 0; tp < vertex->nTrackParticles(); ++tp) {
@@ -216,26 +222,32 @@ photonSuperClusterBuilder::searchForSecondaryClusters(std::size_t seedIndex,
for (std::size_t i = 0; i < egammaRecs->size(); ++i) {
// if already used continue
- if (isUsed[i]) { continue; }
+ if (isUsed[i]) {
+ continue;
+ }
- const auto *const secEgammaRec = (*egammaRecs)[i];
+ const auto* const secEgammaRec = (*egammaRecs)[i];
const xAOD::CaloCluster* const secClus = secEgammaRec->caloCluster();
if (!secClus) {
- ATH_MSG_WARNING("The potentially secondary egammaRec does not have a cluster");
+ ATH_MSG_WARNING(
+ "The potentially secondary egammaRec does not have a cluster");
continue;
}
bool addCluster = false;
- if (m_addClustersInWindow && matchesInWindow(seedCaloClus, secClus)) {
- ATH_MSG_DEBUG("Cluster with Et: " << secClus->et() << " matched in window");
+ if (matchesInWindow(seedCaloClus, secClus)) {
+ ATH_MSG_DEBUG("Cluster with Et: " << secClus->et()
+ << " matched in window");
++nWindowClusters;
addCluster = true;
- } else if (m_addClustersMatchingVtx && matchesVtx(seedVertices, seedVertexType, secEgammaRec)) {
+ } else if (m_addClustersMatchingVtx &&
+ matchesVtx(seedVertices, seedVertexType, secEgammaRec)) {
ATH_MSG_DEBUG("conversion vertices match");
addCluster = true;
++nExtraClusters;
- } else if (m_addClustersMatchingVtxTracks && matchesVtxTrack(seedVertexTracks, secEgammaRec)) {
+ } else if (m_addClustersMatchingVtxTracks &&
+ matchesVtxTrack(seedVertexTracks, secEgammaRec)) {
ATH_MSG_DEBUG("conversion track match");
addCluster = true;
++nExtraClusters;
@@ -265,7 +277,8 @@ photonSuperClusterBuilder::matchesVtx(
numTestVertices = 1;
}
for (size_t seedVx = 0; seedVx < seedVertices.size(); ++seedVx) {
- if (!m_useOnlySi || seedVertexType[seedVx] == xAOD::EgammaParameters::singleSi ||
+ if (!m_useOnlySi ||
+ seedVertexType[seedVx] == xAOD::EgammaParameters::singleSi ||
seedVertexType[seedVx] == xAOD::EgammaParameters::doubleSi) {
for (size_t testVx = 0; testVx < numTestVertices; ++testVx) {
@@ -287,7 +300,7 @@ photonSuperClusterBuilder::matchesVtxTrack(
if (m_useOnlyLeadingTrack && numTestTracks > 0) {
numTestTracks = 1;
}
- for (const auto *seedVertexTrack : seedVertexTracks) {
+ for (const auto* seedVertexTrack : seedVertexTracks) {
// selected tracks alread are just Si if we are only looking at Si tracks
for (size_t testTk = 0; testTk < numTestTracks; ++testTk) {
if (seedVertexTrack == egRec->trackParticle(testTk)) {
diff --git a/Reconstruction/egamma/egammaAlgs/src/photonSuperClusterBuilder.h b/Reconstruction/egamma/egammaAlgs/src/photonSuperClusterBuilder.h
index ee686c305f18..01e9a83b413a 100644
--- a/Reconstruction/egamma/egammaAlgs/src/photonSuperClusterBuilder.h
+++ b/Reconstruction/egamma/egammaAlgs/src/photonSuperClusterBuilder.h
@@ -5,11 +5,11 @@
#ifndef EGAMMAALGS_PHOTONSUPERCLUSTERBUILDER_H
#define EGAMMAALGS_PHOTONSUPERCLUSTERBUILDER_H
-#include "egammaSuperClusterBuilder.h"
+#include "egammaSuperClusterBuilderBase.h"
+#include "GaudiKernel/EventContext.h"
#include "StoreGate/ReadHandleKey.h"
#include "StoreGate/WriteHandleKey.h"
-#include "GaudiKernel/EventContext.h"
// Fwd declarations
#include "egammaInterfaces/IEMConversionBuilder.h"
@@ -25,68 +25,77 @@
*
* The algorithm creates superclusters for photons merging topoclusters.
* Input containers:
- * - \ref photonSuperClusterBuilder.m_inputEgammaRecContainerKey "InputEgammaRecContainerName"
- * (default=egammaRecCollection): collection of
+ * - \ref photonSuperClusterBuilder.m_inputEgammaRecContainerKey
+ * "InputEgammaRecContainerName" (default=egammaRecCollection): collection of
* EgammaRec objects to be used
*
* Output containers:
- * - \ref photonSuperClusterBuilder.m_photonSuperRecCollectionKey "SuperPhotonRecCollectionName"
- * (default=PhotonSuperRecCollection): collection of
- * EgammaRec objects with the cluster set to be the supercluster
- * - \ref photonSuperClusterBuilder.m_outputPhotonSuperClustersKey "SuperClusterCollectionName"
- * (default=PhotonSuperClusters): collection of clusters (the supercluster)
+ * - \ref photonSuperClusterBuilder.m_photonSuperRecCollectionKey
+ * "SuperPhotonRecCollectionName" (default=PhotonSuperRecCollection): collection
+ * of EgammaRec objects with the cluster set to be the supercluster
+ * - \ref photonSuperClusterBuilder.m_outputPhotonSuperClustersKey
+ * "SuperClusterCollectionName" (default=PhotonSuperClusters): collection of
+ * clusters (the supercluster)
*
- * The loop is on the clusters of the EgammaRec objects from the input container. Fist, the first
- * cluster is considered as a seed. The cluster seed must pass some selection:
+ * The loop is on the clusters of the EgammaRec objects from the input
+ * container. Fist, the first cluster is considered as a seed. The cluster seed
+ * must pass some selection:
* - having a second sampling with |eta| not larger than 10
* - pT (from the sum of the three accordion layer) not below
- * \ref egammaSuperClusterBuilder.m_EtThresholdCut "EtThresholdCut"
+ * \ref egammaSuperClusterBuilderBase.m_EtThresholdCut "EtThresholdCut"
*
* Clusters to be merged in a supercluster are selected using the
- * photonSuperClusterBuilder::searchForSecondaryClusters function. Then the procedure is redone,
- * testing new seeds, for all the other clusters that have not been used to make superclusters.
- * The building of the supercluster is done with egammaSuperClusterBuilder::createNewCluster
- * which selects the cells to be used.
+ * photonSuperClusterBuilder::searchForSecondaryClusters function. Then the
+ * procedure is redone, testing new seeds, for all the other clusters that have
+ * not been used to make superclusters. The building of the supercluster is done
+ * with egammaSuperClusterBuilderBase::createNewCluster which selects the cells
+ * to be used.
+ *
+ * Add the end, if the property doConversions is true, the conversion matching
+ * is redone on top of new superclusters, using the tool configured by the
+ * property \ref photonSuperClusterBuilder::m_conversionBuilder
+ * "ConversionBuilderTool", by default EMConversionBuilder.
*
- * Add the end, if the property doConversions is true, the conversion matching is redone on top of new
- * superclusters, using the tool configured by the property
- * \ref photonSuperClusterBuilder::m_conversionBuilder "ConversionBuilderTool", by default EMConversionBuilder.
- *
* \see electronSuperClusterBuilder
*/
-class photonSuperClusterBuilder : public egammaSuperClusterBuilder
+class photonSuperClusterBuilder : public egammaSuperClusterBuilderBase
{
public:
photonSuperClusterBuilder(const std::string& name, ISvcLocator* pSvcLocator);
virtual StatusCode initialize() override final;
- virtual StatusCode finalize() override final;
virtual StatusCode execute(const EventContext& ctx) const override final;
private:
/** Return extra clusters that can be added to make supercluster
- * @param photonInd: index of the EgammaRec object in the input container corresponding to the seed
+ * @param photonInd: index of the EgammaRec object in the input container
+ *corresponding to the seed
* @param egammaRecs: input container of EgammaRec
- * @param isUsed: boolean mask to avoid to reuse clusters (1=already used, 0=not used). When calling this
- * function the element corresponding to the seed is marked as used
+ * @param isUsed: boolean mask to avoid to reuse clusters (1=already used,
+ *0=not used). When calling this function the element corresponding to the
+ *seed is marked as used
* @param nWindowClusters: how many clusters are added by the matchesInWindow
* @param nExtraClusters how many clusters are added by the other methods
*
- * The function returns a vector of index corresponding to secondary clusters to be merged with the seed.
+ * The function returns a vector of index corresponding to secondary clusters
+ *to be merged with the seed.
*
- * If there is a conversion associated to the seed cluster the conversion tracks are considered
- * only if the conversion is single or double Si or if the \ref photonSuperClusterBuilder.m_useOnlySi "UseOnlySi"
- * property is false.
+ * If there is a conversion associated to the seed cluster the conversion
+ *tracks are considered only if the conversion is single or double Si or if
+ *the \ref photonSuperClusterBuilder.m_useOnlySi "UseOnlySi" property is
+ *false.
*
* The secondary cluster is added if it pass one of the functions:
- * - egammaSuperClusterBuilder::matchesInWindow
- * - photonSuperClusterBuilder::matchesVtx: if satellite cluster and seed cluster share a common conversion vertex
- * - photonSuperClusterBuilder::matchesVtxTrack: if satellite cluster and seed cluster share a common track, considering the track
- * from the conversion vertex of the seed and the ones associated to the satellite cluster
- * each one can be disabled using the property AddClustersInWindow, AddClustersMatchingVtx and
- * AddClustrsMatchingVtxTracks.
- *
+ * - egammaSuperClusterBuilderBase::matchesInWindow
+ * - photonSuperClusterBuilder::matchesVtx: if satellite cluster and seed
+ *cluster share a common conversion vertex
+ * - photonSuperClusterBuilder::matchesVtxTrack: if satellite cluster and seed
+ *cluster share a common track, considering the track from the conversion
+ *vertex of the seed and the ones associated to the satellite cluster each one
+ *can be disabled using the property AddClustersInWindow,
+ *AddClustersMatchingVtx and AddClustrsMatchingVtxTracks.
+ *
**/
std::vector<std::size_t> searchForSecondaryClusters(
std::size_t photonInd,
--
GitLab
From 3a627359e85b155cc5e67d53d144c7a7c323d5a3 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Sun, 8 Aug 2021 11:09:51 -0400
Subject: [PATCH 085/272] TrkSurfaces: Suppress cppcheck warning.
Suppress cppcheck warning.
---
Tracking/TrkDetDescr/TrkSurfaces/src/AnnulusBounds.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Tracking/TrkDetDescr/TrkSurfaces/src/AnnulusBounds.cxx b/Tracking/TrkDetDescr/TrkSurfaces/src/AnnulusBounds.cxx
index 9b4ba449ab19..81f0420d407b 100644
--- a/Tracking/TrkDetDescr/TrkSurfaces/src/AnnulusBounds.cxx
+++ b/Tracking/TrkDetDescr/TrkSurfaces/src/AnnulusBounds.cxx
@@ -301,8 +301,7 @@ Trk::AnnulusBounds::inside(const Amg::Vector2D& locpo, const BoundaryCheck& bchk
AmgMatrix(2, 2) normal;
// cppcheck-suppress constStatement
- normal << 0, -1,
- 1, 0;
+ normal << 0, -1, 1, 0;
// ellipse is always at (0,0), surface is moved to ellipse position and then rotated
Amg::Vector2D p;
--
GitLab
From 1c53ce1b91e93c02290a518daa3214e10afea762 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Sun, 8 Aug 2021 11:16:58 -0400
Subject: [PATCH 086/272] xAODMissingET: Fix cppcheck warnings.
Fix printf format for size_t.
---
Event/xAOD/xAODMissingET/Root/MissingETComposition.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Event/xAOD/xAODMissingET/Root/MissingETComposition.cxx b/Event/xAOD/xAODMissingET/Root/MissingETComposition.cxx
index d952260505a8..9d7d6cd9a2f9 100644
--- a/Event/xAOD/xAODMissingET/Root/MissingETComposition.cxx
+++ b/Event/xAOD/xAODMissingET/Root/MissingETComposition.cxx
@@ -191,7 +191,7 @@ namespace xAOD {
{ printf("MissingETComposition::add - ERROR - possible invalid pointer values: MissingETAssociationMap* = %p, Jet* = %p\n",(void*)pMap,(void*)pJet); return false; }
// check if jet already in map
if ( pMap->find(pJet) != pMap->end() )
- { printf("MissingETComposition::add - WARNING - jet with index %lu already in map, not added again\n",pJet->index()); return false; }
+ { printf("MissingETComposition::add - WARNING - jet with index %zu already in map, not added again\n",pJet->index()); return false; }
// insert object
size_t nextIdx = pMap->size();
pMap->push_back(new MissingETAssociation(pJet));
@@ -208,7 +208,7 @@ namespace xAOD {
{ printf("MissingETComposition::add - ERROR - possible invalid pointer values: MissingETAssociationMap* = %p, Jet* = %p\n",(void*)pMap,(void*)pJet); return false; }
// check if jet already in map
if ( pMap->find(pJet) != pMap->end() )
- { printf("MissingETComposition::add - WARNING - jet with index %lu already in map, not added again\n",pJet->index()); return false; }
+ { printf("MissingETComposition::add - WARNING - jet with index %zu already in map, not added again\n",pJet->index()); return false; }
// insert object
// size_t nextIdx = pMap->size();
std::vector<ElementLink<IParticleContainer> > jetconst = pJet->constituentLinks();
--
GitLab
From 760427f7ee251f0dfca2ea016fdb27331431d2d1 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Sun, 8 Aug 2021 13:46:33 -0400
Subject: [PATCH 087/272] TruthConverters: Fix gcc11 warnings.
Null pointer dereference.
---
Generators/TruthConverters/Root/xAODtoHepMCTool.cxx | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/Generators/TruthConverters/Root/xAODtoHepMCTool.cxx b/Generators/TruthConverters/Root/xAODtoHepMCTool.cxx
index 63764b8d0e07..2caacc61a223 100644
--- a/Generators/TruthConverters/Root/xAODtoHepMCTool.cxx
+++ b/Generators/TruthConverters/Root/xAODtoHepMCTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
@@ -138,7 +138,7 @@ HepMC::GenEvent xAODtoHepMCTool::createHepMCEvent(const xAOD::TruthEvent* xEvt,
#ifdef HEPMC3
hepmcProdVtx->add_particle_out(hepmcParticle);
#else
- hepmcProdVtx->add_particle_out(hepmcParticle.release());
+ hepmcProdVtx->add_particle_out(hepmcParticle.get());
#endif
// Insert into Event
if (!prodVtxSeenBefore){
@@ -167,7 +167,7 @@ HepMC::GenEvent xAODtoHepMCTool::createHepMCEvent(const xAOD::TruthEvent* xEvt,
#ifdef HEPMC3
hepmcDecayVtx->add_particle_in(hepmcParticle);
#else
- hepmcDecayVtx->add_particle_in(hepmcParticle.release());
+ hepmcDecayVtx->add_particle_in(hepmcParticle.get());
#endif
// Insert into Event
if (!decayVtxSeenBefore){
@@ -186,6 +186,9 @@ HepMC::GenEvent xAODtoHepMCTool::createHepMCEvent(const xAOD::TruthEvent* xEvt,
bcpart = 0;
}
}
+#ifndef HEPMC3
+ hepmcParticle.release();
+#endif
} // end of particle loop
--
GitLab
From e60bd03ab5f9071114dc74b85c5f55c3c3e16baa Mon Sep 17 00:00:00 2001
From: James Catmore <james.catmore@cern.ch>
Date: Mon, 16 Aug 2021 21:45:25 +0000
Subject: [PATCH 088/272] Changes to allow DAOD_PHYSLITE to be made from
DAOD_PHYS
---
.../python/DerivationFrameworkProdFlags.py | 17 +-
.../python/PhysCommon.py | 50 ------
.../python/PhysCommonTrigger.py | 64 +++++++
.../DerivationFrameworkPhys/share/PHYS.py | 5 +-
.../DerivationFrameworkPhys/share/PHYSLITE.py | 161 ++++++++++--------
5 files changed, 163 insertions(+), 134 deletions(-)
create mode 100644 PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PhysCommonTrigger.py
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/DerivationFrameworkProdFlags.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/DerivationFrameworkProdFlags.py
index 1bfe6b103bd4..72e40f57b20e 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/DerivationFrameworkProdFlags.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/DerivationFrameworkProdFlags.py
@@ -33,7 +33,7 @@ listAODtoDPD.append(WriteDAOD_PHYSVALStream.StreamName)
####################################
class WriteDAOD_PHYSStream(JobProperty):
- """ DAOD_PHYS - prototype format for Run 3 """
+ """ DAOD_PHYS - main analysis format for Run 3 """
statusOn = True
allowedTypes = ['bool']
StoredValue = False
@@ -46,7 +46,7 @@ jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_PHYSStream)
listAODtoDPD.append(WriteDAOD_PHYSStream.StreamName)
class WriteDAOD_PHYSLITEStream(JobProperty):
- """ DAOD_PHYSLITE - prototype format for Run 3 """
+ """ DAOD_PHYSLITE - prototype format for Run 4 """
statusOn = True
allowedTypes = ['bool']
StoredValue = False
@@ -58,18 +58,19 @@ class WriteDAOD_PHYSLITEStream(JobProperty):
jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_PHYSLITEStream)
listAODtoDPD.append(WriteDAOD_PHYSLITEStream.StreamName)
-class WriteDAOD_NANOStream(JobProperty):
- """ DAOD_NANO - prototype format for Run 3 """
+# Second entry needed for PHYS->PHYSLITE case
+class WriteD2AOD_PHYSLITEStream(JobProperty):
+ """ D2AOD_PHYSLITE - prototype format for Run 4 """
statusOn = True
allowedTypes = ['bool']
StoredValue = False
- StreamName = "StreamDAOD_NANO"
+ StreamName = "StreamD2AOD_PHYSLITE"
FileName = ""
isVirtual = False
- DPDMakerScript = "DerivationFrameworkExamples/NANO.py"
+ DPDMakerScript = "DerivationFrameworkPhys/PHYSLITE.py"
pass
-jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_NANOStream)
-listAODtoDPD.append(WriteDAOD_NANOStream.StreamName)
+jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteD2AOD_PHYSLITEStream)
+listAODtoDPD.append(WriteD2AOD_PHYSLITEStream.StreamName)
class WriteDAOD_TRIGStream(JobProperty):
""" DAOD_TRIG - trigger prototype format for Run 3 """
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PhysCommon.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PhysCommon.py
index 01d9faf85311..61053aafed17 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PhysCommon.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PhysCommon.py
@@ -59,56 +59,6 @@ if (DerivationFrameworkIsMonteCarlo):
# Set appropriate truth jet collection for tau truth matching
ToolSvc.DFCommonTauTruthMatchingTool.TruthJetContainerName = "AntiKt4TruthDressedWZJets"
-#====================================================================
-# TRIGGER CONTENT
-#====================================================================
-## See https://twiki.cern.ch/twiki/bin/view/Atlas/TriggerAPI
-## Get single and multi mu, e, photon triggers
-## Jet, tau, multi-object triggers not available in the matching code
-allperiods = TriggerPeriod.y2015 | TriggerPeriod.y2016 | TriggerPeriod.y2017 | TriggerPeriod.y2018 | TriggerPeriod.future2e34
-trig_el = TriggerAPI.getLowestUnprescaledAnyPeriod(allperiods, triggerType=TriggerType.el, livefraction=0.8)
-trig_mu = TriggerAPI.getLowestUnprescaledAnyPeriod(allperiods, triggerType=TriggerType.mu, livefraction=0.8)
-trig_g = TriggerAPI.getLowestUnprescaledAnyPeriod(allperiods, triggerType=TriggerType.g, livefraction=0.8)
-trig_tau = TriggerAPI.getLowestUnprescaledAnyPeriod(allperiods, triggerType=TriggerType.tau, livefraction=0.8)
-## Add cross-triggers for some sets
-trig_em = TriggerAPI.getLowestUnprescaledAnyPeriod(allperiods, triggerType=TriggerType.el, additionalTriggerType=TriggerType.mu, livefraction=0.8)
-trig_et = TriggerAPI.getLowestUnprescaledAnyPeriod(allperiods, triggerType=TriggerType.el, additionalTriggerType=TriggerType.tau, livefraction=0.8)
-trig_mt = TriggerAPI.getLowestUnprescaledAnyPeriod(allperiods, triggerType=TriggerType.mu, additionalTriggerType=TriggerType.tau, livefraction=0.8)
-## Note that this seems to pick up both isolated and non-isolated triggers already, so no need for extra grabs
-trig_txe = TriggerAPI.getLowestUnprescaledAnyPeriod(allperiods, triggerType=TriggerType.tau, additionalTriggerType=TriggerType.xe, livefraction=0.8)
-#
-## Merge and remove duplicates
-trigger_names_full_notau = list(set(trig_el+trig_mu+trig_g+trig_em+trig_et+trig_mt))
-trigger_names_full_tau = list(set(trig_tau+trig_txe))
-#
-## Now reduce the list...
-trigger_names_notau = []
-trigger_names_tau = []
-from AthenaConfiguration.AutoConfigFlags import GetFileMD
-from AthenaConfiguration.AllConfigFlags import ConfigFlags
-
-if ConfigFlags.Trigger.EDMVersion == 3:
- r_tau = re.compile("HLT_.*tau.*")
- r_notau = re.compile("HLT_[1-9]*(e|mu).*")
- r_veto = re.compile("HLT_.*(LRT).*")
- for chain_name in GetFileMD(ConfigFlags.Input.Files)['TriggerMenu']['HLTChains']:
- result_tau = r_tau.match(chain_name)
- result_notau = r_notau.match(chain_name)
- result_veto = r_veto.match(chain_name)
- if result_tau is not None and result_veto is None: trigger_names_tau.append(chain_name)
- if result_notau is not None and result_veto is None: trigger_names_notau.append(chain_name)
- trigger_names_notau = set(trigger_names_notau) - set(trigger_names_tau)
- trigger_names_notau = list(trigger_names_notau)
-else:
- for chain_name in GetFileMD(ConfigFlags.Input.Files)['TriggerMenu']['HLTChains']:
- if chain_name in trigger_names_full_notau: trigger_names_notau.append(chain_name)
- if chain_name in trigger_names_full_tau: trigger_names_tau.append(chain_name)
-# Create trigger matching decorations
-PhysCommon_trigmatching_helper_notau = TriggerMatchingHelper(name='PhysCommonTriggerMatchingToolNoTau',
- trigger_list = trigger_names_notau, add_to_df_job=True)
-PhysCommon_trigmatching_helper_tau = TriggerMatchingHelper(name='PhysCommonTriggerMatchingToolTau',
- trigger_list = trigger_names_tau, add_to_df_job=True, DRThreshold=0.2)
-
#====================================================================
# JET/MET
#====================================================================
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PhysCommonTrigger.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PhysCommonTrigger.py
new file mode 100644
index 000000000000..1288a720d299
--- /dev/null
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PhysCommonTrigger.py
@@ -0,0 +1,64 @@
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+#====================================================================
+# PhysCommonTrigger.py
+# This defines the common trigger matching shared by PHYS and PHYSLITE
+# Using it avoids name clashes when running in trains
+# In principle it can also be used by other formats who want to take
+# advantage of PHYS/PHYSLITE containers
+#====================================================================
+from TriggerMenuMT.TriggerAPI.TriggerAPI import TriggerAPI
+from TriggerMenuMT.TriggerAPI.TriggerEnums import TriggerPeriod, TriggerType
+from DerivationFrameworkTrigger.TriggerMatchingHelper import TriggerMatchingHelper
+import re
+
+#====================================================================
+# TRIGGER CONTENT
+#====================================================================
+## See https://twiki.cern.ch/twiki/bin/view/Atlas/TriggerAPI
+## Get single and multi mu, e, photon triggers
+## Jet, tau, multi-object triggers not available in the matching code
+allperiods = TriggerPeriod.y2015 | TriggerPeriod.y2016 | TriggerPeriod.y2017 | TriggerPeriod.y2018 | TriggerPeriod.future2e34
+trig_el = TriggerAPI.getLowestUnprescaledAnyPeriod(allperiods, triggerType=TriggerType.el, livefraction=0.8)
+trig_mu = TriggerAPI.getLowestUnprescaledAnyPeriod(allperiods, triggerType=TriggerType.mu, livefraction=0.8)
+trig_g = TriggerAPI.getLowestUnprescaledAnyPeriod(allperiods, triggerType=TriggerType.g, livefraction=0.8)
+trig_tau = TriggerAPI.getLowestUnprescaledAnyPeriod(allperiods, triggerType=TriggerType.tau, livefraction=0.8)
+## Add cross-triggers for some sets
+trig_em = TriggerAPI.getLowestUnprescaledAnyPeriod(allperiods, triggerType=TriggerType.el, additionalTriggerType=TriggerType.mu, livefraction=0.8)
+trig_et = TriggerAPI.getLowestUnprescaledAnyPeriod(allperiods, triggerType=TriggerType.el, additionalTriggerType=TriggerType.tau, livefraction=0.8)
+trig_mt = TriggerAPI.getLowestUnprescaledAnyPeriod(allperiods, triggerType=TriggerType.mu, additionalTriggerType=TriggerType.tau, livefraction=0.8)
+## Note that this seems to pick up both isolated and non-isolated triggers already, so no need for extra grabs
+trig_txe = TriggerAPI.getLowestUnprescaledAnyPeriod(allperiods, triggerType=TriggerType.tau, additionalTriggerType=TriggerType.xe, livefraction=0.8)
+#
+## Merge and remove duplicates
+trigger_names_full_notau = list(set(trig_el+trig_mu+trig_g+trig_em+trig_et+trig_mt))
+trigger_names_full_tau = list(set(trig_tau+trig_txe))
+#
+## Now reduce the list...
+trigger_names_notau = []
+trigger_names_tau = []
+from AthenaConfiguration.AutoConfigFlags import GetFileMD
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
+
+if ConfigFlags.Trigger.EDMVersion == 3:
+ r_tau = re.compile("HLT_.*tau.*")
+ r_notau = re.compile("HLT_[1-9]*(e|mu).*")
+ r_veto = re.compile("HLT_.*(LRT).*")
+ for chain_name in GetFileMD(ConfigFlags.Input.Files)['TriggerMenu']['HLTChains']:
+ result_tau = r_tau.match(chain_name)
+ result_notau = r_notau.match(chain_name)
+ result_veto = r_veto.match(chain_name)
+ if result_tau is not None and result_veto is None: trigger_names_tau.append(chain_name)
+ if result_notau is not None and result_veto is None: trigger_names_notau.append(chain_name)
+ trigger_names_notau = set(trigger_names_notau) - set(trigger_names_tau)
+ trigger_names_notau = list(trigger_names_notau)
+else:
+ for chain_name in GetFileMD(ConfigFlags.Input.Files)['TriggerMenu']['HLTChains']:
+ if chain_name in trigger_names_full_notau: trigger_names_notau.append(chain_name)
+ if chain_name in trigger_names_full_tau: trigger_names_tau.append(chain_name)
+# Create trigger matching decorations
+trigmatching_helper_notau = TriggerMatchingHelper(name='PhysCommonTriggerMatchingToolNoTau',
+ trigger_list = trigger_names_notau, add_to_df_job=True)
+trigmatching_helper_tau = TriggerMatchingHelper(name='PhysCommonTriggerMatchingToolTau',
+ trigger_list = trigger_names_tau, add_to_df_job=True, DRThreshold=0.2)
+
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py
index ea666bf55ed7..749f7153a853 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py
@@ -14,6 +14,7 @@ nanolog = Logging.logging.getLogger('PHYS')
from DerivationFrameworkCore.DerivationFrameworkMaster import buildFileName
from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkIsMonteCarlo, DerivationFrameworkJob
from DerivationFrameworkPhys import PhysCommon
+from DerivationFrameworkPhys import PhysCommonTrigger
from DerivationFrameworkEGamma import ElectronsCPDetailedContent
from DerivationFrameworkJetEtMiss import METCommon
from DerivationFrameworkJetEtMiss.METCommon import scheduleMETAssocAlg
@@ -218,8 +219,8 @@ PHYSSlimmingHelper.ExtraVariables += ["AntiKt10TruthTrimmedPtFrac5SmallR20Jets.T
"InDetTrackParticles.TTVA_AMVFVertices.TTVA_AMVFWeights"]
# Add trigger matching
-PhysCommon.PhysCommon_trigmatching_helper_notau.add_to_slimming(PHYSSlimmingHelper)
-PhysCommon.PhysCommon_trigmatching_helper_tau.add_to_slimming(PHYSSlimmingHelper)
+PhysCommonTrigger.trigmatching_helper_notau.add_to_slimming(PHYSSlimmingHelper)
+PhysCommonTrigger.trigmatching_helper_tau.add_to_slimming(PHYSSlimmingHelper)
# Final construction of output stream
PHYSSlimmingHelper.AppendContentToStream(PHYSStream)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYSLITE.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYSLITE.py
index 775e7d000bdc..e5685ab3dc32 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYSLITE.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYSLITE.py
@@ -9,18 +9,30 @@ nanolog = Logging.logging.getLogger('PHYSLITE')
from DerivationFrameworkCore.DerivationFrameworkMaster import buildFileName
from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkIsMonteCarlo, DerivationFrameworkJob
-from DerivationFrameworkPhys import PhysCommon
+# Is input AOD or DAOD?
+inputIsDAODPHYS = False
+from RecExConfig.InputFilePeeker import inputFileSummary
+if inputFileSummary['stream_names'][0] == 'StreamDAOD_PHYS': inputIsDAODPHYS = True
+if (inputIsDAODPHYS==False):
+ # Only schedule these is input is AOD
+ from DerivationFrameworkPhys import PhysCommon
+ from DerivationFrameworkCore import LHE3WeightMetadata
+from DerivationFrameworkPhys import PhysCommonTrigger
from DerivationFrameworkEGamma import ElectronsCPDetailedContent
from DerivationFrameworkJetEtMiss import METCommon
from DerivationFrameworkJetEtMiss.METCommon import scheduleMETAssocAlg
-from DerivationFrameworkCore import LHE3WeightMetadata
import re
#====================================================================
# SET UP STREAM
#====================================================================
-streamName = derivationFlags.WriteDAOD_PHYSLITEStream.StreamName
-fileName = buildFileName( derivationFlags.WriteDAOD_PHYSLITEStream )
+if(inputIsDAODPHYS):
+ streamName = derivationFlags.WriteD2AOD_PHYSLITEStream.StreamName
+ fileName = buildFileName( derivationFlags.WriteD2AOD_PHYSLITEStream )
+else:
+ streamName = derivationFlags.WriteDAOD_PHYSLITEStream.StreamName
+ fileName = buildFileName( derivationFlags.WriteDAOD_PHYSLITEStream )
+
PHYSLITEStream = MSMgr.NewPoolRootStream( streamName, fileName )
PHYSLITEStream.AcceptAlgs(["PHYSLITEKernel"])
@@ -82,74 +94,75 @@ if DerivationFrameworkIsMonteCarlo:
# https://twiki.cern.ch/twiki/bin/viewauth/AtlasProtected/DaodRecommendations
# Inner detector group recommendations for indet tracks in analysis
-PHYSLITE_thinning_expression = "InDetTrackParticles.DFCommonTightPrimary && abs(DFCommonInDetTrackZ0AtPV)*sin(InDetTrackParticles.theta) < 3.0*mm && InDetTrackParticles.pt > 10*GeV"
-from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning
-PHYSLITETrackParticleThinningTool = DerivationFramework__TrackParticleThinning(name = "PHYSLITETrackParticleThinningTool",
- StreamName = PHYSLITEStream.Name,
- SelectionString = PHYSLITE_thinning_expression,
- InDetTrackParticlesKey = "InDetTrackParticles")
-
-ToolSvc += PHYSLITETrackParticleThinningTool
-thinningTools.append(PHYSLITETrackParticleThinningTool)
-
-# Include inner detector tracks associated with muons
-from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__MuonTrackParticleThinning
-PHYSLITEMuonTPThinningTool = DerivationFramework__MuonTrackParticleThinning(name = "PHYSLITEMuonTPThinningTool",
- StreamName = PHYSLITEStream.Name,
- MuonKey = "Muons",
- InDetTrackParticlesKey = "InDetTrackParticles")
-
-ToolSvc += PHYSLITEMuonTPThinningTool
-thinningTools.append(PHYSLITEMuonTPThinningTool)
-
-# TauJets thinning
-tau_thinning_expression = "(TauJets.ptFinalCalib >= 13.*GeV) && (TauJets.nTracks>=1) && (TauJets.nTracks<=3) && (TauJets.RNNJetScoreSigTrans>0.01)"
-from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__GenericObjectThinning
-PHYSLITETauJetsThinningTool = DerivationFramework__GenericObjectThinning(name = "PHYSLITETauJetsThinningTool",
- StreamName = PHYSLITEStream.Name,
- ContainerName = "TauJets",
- SelectionString = tau_thinning_expression)
-ToolSvc += PHYSLITETauJetsThinningTool
-thinningTools.append(PHYSLITETauJetsThinningTool)
-
-# Only keep tau tracks (and associated ID tracks) classified as charged tracks
-from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TauTrackParticleThinning
-PHYSLITETauTPThinningTool = DerivationFramework__TauTrackParticleThinning(name = "PHYSLITETauTPThinningTool",
- StreamName = PHYSLITEStream.Name,
- TauKey = "TauJets",
- InDetTrackParticlesKey = "InDetTrackParticles",
- SelectionString = tau_thinning_expression,
- DoTauTracksThinning = True,
- TauTracksKey = "TauTracks")
-ToolSvc += PHYSLITETauTPThinningTool
-thinningTools.append(PHYSLITETauTPThinningTool)
-
-# ID tracks associated with high-pt di-tau
-from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__DiTauTrackParticleThinning
-PHYSLITEDiTauTPThinningTool = DerivationFramework__DiTauTrackParticleThinning(name = "PHYSLITEDiTauTPThinningTool",
+if (inputIsDAODPHYS == False):
+ PHYSLITE_thinning_expression = "InDetTrackParticles.DFCommonTightPrimary && abs(DFCommonInDetTrackZ0AtPV)*sin(InDetTrackParticles.theta) < 3.0*mm && InDetTrackParticles.pt > 10*GeV"
+ from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning
+ PHYSLITETrackParticleThinningTool = DerivationFramework__TrackParticleThinning(name = "PHYSLITETrackParticleThinningTool",
+ StreamName = PHYSLITEStream.Name,
+ SelectionString = PHYSLITE_thinning_expression,
+ InDetTrackParticlesKey = "InDetTrackParticles")
+
+ ToolSvc += PHYSLITETrackParticleThinningTool
+ thinningTools.append(PHYSLITETrackParticleThinningTool)
+
+ # Include inner detector tracks associated with muons
+ from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__MuonTrackParticleThinning
+ PHYSLITEMuonTPThinningTool = DerivationFramework__MuonTrackParticleThinning(name = "PHYSLITEMuonTPThinningTool",
StreamName = PHYSLITEStream.Name,
- DiTauKey = "DiTauJets",
+ MuonKey = "Muons",
InDetTrackParticlesKey = "InDetTrackParticles")
-ToolSvc += PHYSLITEDiTauTPThinningTool
-thinningTools.append(PHYSLITEDiTauTPThinningTool)
-
-# Low-pt di-tau thinning
-from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__GenericObjectThinning
-PHYSLITEDiTauLowPtThinningTool = DerivationFramework__GenericObjectThinning(name = "PHYSLITEDiTauLowPtThinningTool",
- StreamName = PHYSLITEStream.Name,
- ContainerName = "DiTauJetsLowPt",
- SelectionString = "DiTauJetsLowPt.nSubjets > 1")
-ToolSvc += PHYSLITEDiTauLowPtThinningTool
-thinningTools.append(PHYSLITEDiTauLowPtThinningTool)
-
-# ID tracks associated with low-pt ditau
-PHYSLITEDiTauLowPtTPThinningTool = DerivationFramework__DiTauTrackParticleThinning(name = "PHYSLITEDiTauLowPtTPThinningTool",
- StreamName = PHYSLITEStream.Name,
- DiTauKey = "DiTauJetsLowPt",
- InDetTrackParticlesKey = "InDetTrackParticles",
- SelectionString = "DiTauJetsLowPt.nSubjets > 1")
-ToolSvc += PHYSLITEDiTauLowPtTPThinningTool
-thinningTools.append(PHYSLITEDiTauLowPtTPThinningTool)
+
+ ToolSvc += PHYSLITEMuonTPThinningTool
+ thinningTools.append(PHYSLITEMuonTPThinningTool)
+
+ # TauJets thinning
+ tau_thinning_expression = "(TauJets.ptFinalCalib >= 13.*GeV) && (TauJets.nTracks>=1) && (TauJets.nTracks<=3) && (TauJets.RNNJetScoreSigTrans>0.01)"
+ from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__GenericObjectThinning
+ PHYSLITETauJetsThinningTool = DerivationFramework__GenericObjectThinning(name = "PHYSLITETauJetsThinningTool",
+ StreamName = PHYSLITEStream.Name,
+ ContainerName = "TauJets",
+ SelectionString = tau_thinning_expression)
+ ToolSvc += PHYSLITETauJetsThinningTool
+ thinningTools.append(PHYSLITETauJetsThinningTool)
+
+ # Only keep tau tracks (and associated ID tracks) classified as charged tracks
+ from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TauTrackParticleThinning
+ PHYSLITETauTPThinningTool = DerivationFramework__TauTrackParticleThinning(name = "PHYSLITETauTPThinningTool",
+ StreamName = PHYSLITEStream.Name,
+ TauKey = "TauJets",
+ InDetTrackParticlesKey = "InDetTrackParticles",
+ SelectionString = tau_thinning_expression,
+ DoTauTracksThinning = True,
+ TauTracksKey = "TauTracks")
+ ToolSvc += PHYSLITETauTPThinningTool
+ thinningTools.append(PHYSLITETauTPThinningTool)
+
+ # ID tracks associated with high-pt di-tau
+ from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__DiTauTrackParticleThinning
+ PHYSLITEDiTauTPThinningTool = DerivationFramework__DiTauTrackParticleThinning(name = "PHYSLITEDiTauTPThinningTool",
+ StreamName = PHYSLITEStream.Name,
+ DiTauKey = "DiTauJets",
+ InDetTrackParticlesKey = "InDetTrackParticles")
+ ToolSvc += PHYSLITEDiTauTPThinningTool
+ thinningTools.append(PHYSLITEDiTauTPThinningTool)
+
+ # Low-pt di-tau thinning
+ from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__GenericObjectThinning
+ PHYSLITEDiTauLowPtThinningTool = DerivationFramework__GenericObjectThinning(name = "PHYSLITEDiTauLowPtThinningTool",
+ StreamName = PHYSLITEStream.Name,
+ ContainerName = "DiTauJetsLowPt",
+ SelectionString = "DiTauJetsLowPt.nSubjets > 1")
+ ToolSvc += PHYSLITEDiTauLowPtThinningTool
+ thinningTools.append(PHYSLITEDiTauLowPtThinningTool)
+
+ # ID tracks associated with low-pt ditau
+ PHYSLITEDiTauLowPtTPThinningTool = DerivationFramework__DiTauTrackParticleThinning(name = "PHYSLITEDiTauLowPtTPThinningTool",
+ StreamName = PHYSLITEStream.Name,
+ DiTauKey = "DiTauJetsLowPt",
+ InDetTrackParticlesKey = "InDetTrackParticles",
+ SelectionString = "DiTauJetsLowPt.nSubjets > 1")
+ ToolSvc += PHYSLITEDiTauLowPtTPThinningTool
+ thinningTools.append(PHYSLITEDiTauLowPtTPThinningTool)
#==============================================================================
# Analysis-level variables
@@ -237,12 +250,12 @@ scheduleMETAssocAlg(sequence=SeqPHYSLITE,configlist="AnalysisMET")
from DerivationFrameworkTrigger.TriggerMatchingHelper import TriggerMatchingHelper
PHYSLITEtrigmatching_helper_notau = TriggerMatchingHelper(name='PHYSLITETriggerMatchingToolNoTau',
OutputContainerPrefix = "Analysis",
- trigger_list = PhysCommon.trigger_names_notau, add_to_df_job=False,
+ trigger_list = PhysCommonTrigger.trigger_names_notau, add_to_df_job=False,
InputElectrons="AnalysisElectrons",InputPhotons="AnalysisPhotons",
InputMuons="AnalysisMuons",InputTaus="AnalysisTauJets")
PHYSLITEtrigmatching_helper_tau = TriggerMatchingHelper(name='PHYSLITETriggerMatchingToolTau',
OutputContainerPrefix = "Analysis",
- trigger_list = PhysCommon.trigger_names_tau, add_to_df_job=False, DRThreshold=0.2,
+ trigger_list = PhysCommonTrigger.trigger_names_tau, add_to_df_job=False, DRThreshold=0.2,
InputElectrons="AnalysisElectrons",InputPhotons="AnalysisPhotons",
InputMuons="AnalysisMuons",InputTaus="AnalysisTauJets")
SeqPHYSLITE += PHYSLITEtrigmatching_helper_notau.alg
@@ -341,8 +354,8 @@ if DerivationFrameworkIsMonteCarlo:
addTruth3ContentToSlimmerTool(PHYSLITESlimmingHelper)
# Add trigger matching
-PhysCommon.PhysCommon_trigmatching_helper_notau.add_to_slimming(PHYSLITESlimmingHelper)
-PhysCommon.PhysCommon_trigmatching_helper_tau.add_to_slimming(PHYSLITESlimmingHelper)
+PhysCommonTrigger.trigmatching_helper_notau.add_to_slimming(PHYSLITESlimmingHelper)
+PhysCommonTrigger.trigmatching_helper_tau.add_to_slimming(PHYSLITESlimmingHelper)
PHYSLITEtrigmatching_helper_notau.add_to_slimming(PHYSLITESlimmingHelper)
PHYSLITEtrigmatching_helper_tau.add_to_slimming(PHYSLITESlimmingHelper)
--
GitLab
From 491214d88f8fe24708a8513ce699b1a3c29f5aa4 Mon Sep 17 00:00:00 2001
From: Nils Erik Krumnack <nils.erik.krumnack@cern.ch>
Date: Mon, 16 Aug 2021 14:33:22 +0000
Subject: [PATCH 089/272] Merge branch '21.2-AT-FFtoolUpdate' into '21.2'
AnalysisTop: Updating default FF config file for JMR
See merge request atlas/athena!45776
(cherry picked from commit a04622cbac99835aa3ef792f55e2299775ab1cca)
1b298a3c AnalysisTop: Updating default FF config file for JMR
---
.../TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx | 4 ++--
.../xAOD/TopConfiguration/Root/ConfigurationSettings.cxx | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx
index d7b4b4fda7c2..c8f8ad5ed4fa 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx
@@ -494,11 +494,11 @@ namespace top {
if(m_config->largeRJESJMSConfig() != "UFOSDMass"){
m_jetUncertaintiesToolLargeR
- = setupJetUncertaintiesTool("JetUncertaintiesToolLargeR",
+ = setupJetUncertaintiesTool("JetUncertaintiesToolLargeR",
jetCalibrationNameLargeR,
MC_type,
m_config->isMC(),
- configDir + "/R10_" + largeRJESJERJMS_unc_config + ".config",
+ configDir + "/R10_" + largeRJESJERJMS_unc_config + ".config",
nullptr,
"",
calibArea);
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/ConfigurationSettings.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/ConfigurationSettings.cxx
index 78dcafd3aa04..c1d8c1387fb7 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/ConfigurationSettings.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/ConfigurationSettings.cxx
@@ -235,8 +235,8 @@ namespace top {
"Input form: {A}JES_{B}JER_{C}JMS, see https://twiki.cern.ch/twiki/bin/view/AtlasProtected/JetUncertaintiesRel21ConsolidatedLargeRScaleRes for configuration options, - for LCTopo large-R jet energy scale, energy resolution, and mass scale uncertainties",
"CategoryJES_FullJER_FullJMS");
registerParameter("LargeRJetUncertainties_JMR_NPModel",
- "Full (10 NP; aimed at the most precise jet-dependent measurements), Simple (1 NP; flat 20 percent uncertainty, as it was recommended in the past) - for LCTopo large-R jet mass resolution uncertainties",
- "FullJMR_COMB");
+ "FullJMR_COMB_newBinning (10 NP; aimed at the most precise jet-dependent measurements), SimpleJMR_COMB_newBinning (1 NP; flat 20 percent uncertainty, as it was recommended in the past) - for LCTopo large-R jet mass resolution uncertainties",
+ "FullJMR_COMB_newBinning", {"FullJMR_COMB_newBinning", "SimpleJMR_COMB_newBinning"});
registerParameter("AdvancedUsage_LargeRJetUncertaintiesConfigDir",
"Path to directory containing large-R jet uncertainties config",
"rel21/Winter2021");
--
GitLab
From 0bce8c39fd861739ce5c25eacd017580a8deb33d Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Wed, 30 Jun 2021 17:25:28 +0200
Subject: [PATCH 090/272] TrigT1CTP: remove support of legacy trigger
configuration
Remove the support of the legacy XML trigger configuration. No
functional change as we were running already with `UseNewConfig=True`
for quite some time.
Relates to ATR-21862.
---
Trigger/TrigT1/TrigT1CTP/CMakeLists.txt | 2 +-
.../TrigT1CTP/python/CTPSimulationConfig.py | 9 +-
.../TrigT1CTP/python/TrigT1CTPConfig.py | 4 -
.../TrigT1/TrigT1CTP/src/CTPSimulation.cxx | 751 ++++--------------
Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.h | 37 +-
.../TrigT1/TrigT1CTP/src/ResultBuilder.cxx | 82 +-
Trigger/TrigT1/TrigT1CTP/src/ResultBuilder.h | 18 +-
.../python/Lvl1SimulationConfig.py | 5 -
8 files changed, 202 insertions(+), 706 deletions(-)
diff --git a/Trigger/TrigT1/TrigT1CTP/CMakeLists.txt b/Trigger/TrigT1/TrigT1CTP/CMakeLists.txt
index d6c8989ddd1b..ab943fd20db5 100644
--- a/Trigger/TrigT1/TrigT1CTP/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CTP/CMakeLists.txt
@@ -14,7 +14,7 @@ atlas_add_component( TrigT1CTP
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps AthenaKernel AthenaMonitoringKernelLib GaudiKernel StoreGateLib TrigConfData TrigConfInterfaces TrigConfL1Data TrigT1CaloUtilsLib TrigT1Interfaces TrigT1Result xAODTrigCalo xAODTrigger )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps AthenaKernel AthenaMonitoringKernelLib GaudiKernel StoreGateLib TrigConfData TrigConfL1Data TrigT1CaloUtilsLib TrigT1Interfaces TrigT1Result xAODTrigCalo xAODTrigger )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Trigger/TrigT1/TrigT1CTP/python/CTPSimulationConfig.py b/Trigger/TrigT1/TrigT1CTP/python/CTPSimulationConfig.py
index e4557f84f6bf..52c58bed1e25 100644
--- a/Trigger/TrigT1/TrigT1CTP/python/CTPSimulationConfig.py
+++ b/Trigger/TrigT1/TrigT1CTP/python/CTPSimulationConfig.py
@@ -6,14 +6,9 @@ def CTPSimulationCfg(flags):
from AthenaCommon.Logging import logging
log = logging.getLogger("CTPMCSimulationCfg")
acc = ComponentAccumulator()
- from TrigConfigSvc.TrigConfigSvcCfg import L1ConfigSvcCfg
- acc.merge(L1ConfigSvcCfg(flags))
- configSvc = acc.getService("LVL1ConfigSvc")
- acc.addEventAlgo(CompFactory.LVL1CTP.CTPSimulation("CTPSimulation",
+ acc.addEventAlgo(CompFactory.LVL1CTP.CTPSimulation("CTPSimulation",
#DoL1Topo = not flags.Trigger.enableL1Phase1, #TODO confirm that this setting exists actually
- DoL1CaloLegacy = flags.Trigger.enableL1CaloLegacy,
- UseNewConfig = flags.Trigger.readLVL1FromJSON,
- TrigConfigSvc = configSvc,
+ DoL1CaloLegacy = flags.Trigger.enableL1CaloLegacy,
#TODO enable when input are also simulatedDetectors (and remove message)
jFexJetInput = "",
jFexLJetInput = "",
diff --git a/Trigger/TrigT1/TrigT1CTP/python/TrigT1CTPConfig.py b/Trigger/TrigT1/TrigT1CTP/python/TrigT1CTPConfig.py
index e17f33f9bc90..d3ad86c3e25e 100755
--- a/Trigger/TrigT1/TrigT1CTP/python/TrigT1CTPConfig.py
+++ b/Trigger/TrigT1/TrigT1CTP/python/TrigT1CTPConfig.py
@@ -19,10 +19,6 @@ class CTPSimulationOnData(CTPSimulation):
self.IsData = True
self.ForceBunchGroupPattern = False # on data we will take the bunchgroups from COOL
- from AthenaCommon.AppMgr import ServiceMgr as svcMgr
- if hasattr(svcMgr,'DSConfigSvc'):
- # this case is still needed for reading Run 2 data configuration from the TriggerDB
- self.TrigConfigSvc = "TrigConfigSvc"
class CTPSimulationInReco(CTPSimulation):
diff --git a/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.cxx b/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.cxx
index 0ac17adc0b8b..1f5a641f7582 100644
--- a/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.cxx
+++ b/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.cxx
@@ -3,17 +3,11 @@
*/
#include "./CTPSimulation.h"
-
-#include "TrigConfL1Data/CTPConfig.h"
-#include "TrigConfL1Data/L1DataDef.h"
-#include "TrigConfL1Data/ClusterThresholdValue.h"
-#include "TrigT1Interfaces/TrigT1StoreGateKeys.h"
-#include "TrigConfData/L1BunchGroupSet.h"
-
#include "./CTPTriggerThreshold.h"
#include "./CTPTriggerItem.h"
#include "./CTPUtil.h"
+#include "TrigConfData/L1BunchGroupSet.h"
#include "TrigT1Result/CTP_RDO.h"
#include "TrigT1Interfaces/CTPSLink.h"
#include "TrigT1Result/RoIBResult.h"
@@ -95,7 +89,6 @@ LVL1CTP::CTPSimulation::initialize() {
ATH_CHECK( m_oKeySLink.initialize( ! m_oKeySLink.empty() ) );
// services
- ATH_CHECK( m_configSvc.retrieve() );
ATH_CHECK( m_histSvc.retrieve() );
// tools
@@ -109,32 +102,14 @@ LVL1CTP::CTPSimulation::initialize() {
StatusCode
LVL1CTP::CTPSimulation::start() {
- bool delayConfig = false;
-
const TrigConf::L1Menu * l1menu = nullptr;
- if( m_useNewConfig ) {
- ATH_CHECK( detStore()->retrieve(l1menu) );
- ATH_MSG_INFO( "start(): use new-style L1 menu (json)" );
- if(l1menu == nullptr) { // if no L1 configuration is available yet
- delayConfig = true;
- }
- } else {
- ATH_MSG_INFO( "start(): use old-style L1 menu (xml))" );
- if( (m_configSvc->ctpConfig()==nullptr) ||
- (m_configSvc->ctpConfig()->menu().itemVector().size() == 0) ) { // if no L1 configuration is available yet
- delayConfig = true;
- }
- }
+ ATH_CHECK( detStore()->retrieve(l1menu) );
bookHists().ignore();
- if( ! delayConfig ) {
- // configure the CTP ResultBuilder
- // currently both types of configuration can be given (transition period towards Run 3)
- std::call_once(m_onceflag, [this, l1menu]{
- m_resultBuilder->setConfiguration( m_configSvc->ctpConfig(), l1menu ).ignore();
- setHistLabels().ignore();
- });
- }
+
+ // configure the CTP ResultBuilder
+ ATH_CHECK( m_resultBuilder->setConfiguration( *l1menu ) );
+ setHistLabels(*l1menu).ignore();
return StatusCode::SUCCESS;
}
@@ -144,15 +119,6 @@ LVL1CTP::CTPSimulation::execute( const EventContext& context ) const {
ATH_MSG_DEBUG("execute");
- std::call_once(m_onceflag, [this]{
- const TrigConf::L1Menu * l1menu = nullptr;
- if( m_useNewConfig ) {
- detStore()->retrieve(l1menu).ignore();
- }
- m_resultBuilder->setConfiguration( m_configSvc->ctpConfig(), l1menu ).ignore();
- setHistLabels().ignore();
- });
-
fillInputHistograms(context).ignore();
std::map<std::string, unsigned int> thrMultiMap;
@@ -168,65 +134,47 @@ StatusCode
LVL1CTP::CTPSimulation::createMultiplicityHist(const std::string & type, unsigned int maxMult ) const {
StatusCode sc;
- if( m_useNewConfig ) {
- std::map<std::string,std::vector<std::string>> typeMapping = {
- { "muon", {"MU"} },
- { "jet", {"JET", "jJ", "gJ"} },
- { "xe", {"XE", "gXE", "jXE"} },
- { "te", {"TE"} },
- { "xs", {"XS"} },
- { "em", {"EM", "eEM"} },
- { "tau", {"TAU", "eTAU"} }
- };
- std::vector<TrigConf::L1Threshold> thrV;
- for( const std::string & t : typeMapping[type] ) {
- size_t xsize = 1;
- TH2* hist = new TH2I( Form("%sMult", t.c_str()),
- Form("%s threshold multiplicity", t.c_str()), xsize, 0, xsize, maxMult, 0, maxMult);
- sc = hbook( "/multi/" + type, std::unique_ptr<TH2>(hist));
- }
- } else {
+
+ std::map<std::string,std::vector<std::string>> typeMapping = {
+ { "muon", {"MU"} },
+ { "jet", {"JET", "jJ", "gJ"} },
+ { "xe", {"XE", "gXE", "jXE"} },
+ { "te", {"TE"} },
+ { "xs", {"XS"} },
+ { "em", {"EM", "eEM"} },
+ { "tau", {"TAU", "eTAU"} }
+ };
+ std::vector<TrigConf::L1Threshold> thrV;
+ for( const std::string & t : typeMapping[type] ) {
size_t xsize = 1;
- TH2* hist = new TH2I( Form("%sMult", type.c_str()),
- Form("%s threshold multiplicity", type.c_str()), xsize, 0, xsize, maxMult, 0, maxMult);
+ TH2* hist = new TH2I( Form("%sMult", t.c_str()),
+ Form("%s threshold multiplicity", t.c_str()), xsize, 0, xsize, maxMult, 0, maxMult);
sc = hbook( "/multi/" + type, std::unique_ptr<TH2>(hist));
}
+
return sc;
}
StatusCode
-LVL1CTP::CTPSimulation::setMultiplicityHistLabels(const ConfigSource & cfgSrc, const std::string & type, TrigConf::L1DataDef::TriggerType tt ) const {
+LVL1CTP::CTPSimulation::setMultiplicityHistLabels(const TrigConf::L1Menu& l1menu, const std::string & type) const {
StatusCode sc;
- const TrigConf::CTPConfig* ctpConfig = cfgSrc.ctpConfig();
- const TrigConf::L1Menu* l1menu = cfgSrc.l1menu();
- if( l1menu ) {
- std::map<std::string,std::vector<std::string>> typeMapping = {
- { "muon", {"MU"} },
- { "jet", {"JET", "jJ", "gJ"} },
- { "xe", {"XE", "gXE", "jXE"} },
- { "te", {"TE"} },
- { "xs", {"XS"} },
- { "em", {"EM", "eEM"} },
- { "tau", {"TAU", "eTAU"} }
- };
- std::vector<TrigConf::L1Threshold> thrV;
- for( const std::string & t : typeMapping[type] ) {
- auto hist = get2DHist( "/multi/" + type + "/" + t + "Mult" );
- auto & thrV = l1menu->thresholds(t);
- while( hist->GetNbinsX() < (int)thrV.size() ) {
- hist->LabelsInflate("xaxis");
- }
- for(auto thr : thrV) {
- hist->GetXaxis()->SetBinLabel(thr->mapping()+1, thr->name().c_str() );
- }
- }
- } else {
- auto hist = get2DHist( "/multi/" + type + "/" + type + "Mult" );
- const auto & thrV = ctpConfig->menu().thresholdConfig().getThresholdVector(tt);
- while( hist->GetNbinsX() < (int) thrV.size() ) {
+ std::map<std::string,std::vector<std::string>> typeMapping = {
+ { "muon", {"MU"} },
+ { "jet", {"JET", "jJ", "gJ"} },
+ { "xe", {"XE", "gXE", "jXE"} },
+ { "te", {"TE"} },
+ { "xs", {"XS"} },
+ { "em", {"EM", "eEM"} },
+ { "tau", {"TAU", "eTAU"} }
+ };
+ std::vector<TrigConf::L1Threshold> thrV;
+ for( const std::string & t : typeMapping[type] ) {
+ auto hist = get2DHist( "/multi/" + type + "/" + t + "Mult" );
+ auto & thrV = l1menu.thresholds(t);
+ while( hist->GetNbinsX() < (int)thrV.size() ) {
hist->LabelsInflate("xaxis");
}
- for(const TrigConf::TriggerThreshold * thr: thrV) {
+ for(auto thr : thrV) {
hist->GetXaxis()->SetBinLabel(thr->mapping()+1, thr->name().c_str() );
}
}
@@ -306,76 +254,40 @@ LVL1CTP::CTPSimulation::get2DHist(const std::string & histName) const {
}
StatusCode
-LVL1CTP::CTPSimulation::setHistLabels() const {
-
- ATH_MSG_DEBUG("enter setHistLabels()");
+LVL1CTP::CTPSimulation::setHistLabels(const TrigConf::L1Menu& l1menu) const {
- const TrigConf::L1Menu * l1menu = nullptr;
- if( m_useNewConfig ) {
- ATH_CHECK( detStore()->retrieve(l1menu) );
- ATH_MSG_DEBUG("setHistLabels(). L1 menu " << l1menu->size() << " items" );
- } else {
- ATH_MSG_DEBUG("setHistLabels(). ConfigSvc with " << m_configSvc->ctpConfig()->menu().itemVector().size() << " items");
- }
- ConfigSource cfgSrc(m_configSvc->ctpConfig(), l1menu);
+ ATH_MSG_DEBUG("setHistLabels(). L1 menu " << l1menu.size() << " items" );
// threshold multiplicities
- ATH_CHECK ( setMultiplicityHistLabels( cfgSrc, "muon", L1DataDef::MUON) );
- ATH_CHECK ( setMultiplicityHistLabels( cfgSrc, "jet", L1DataDef::JET ) );
- ATH_CHECK ( setMultiplicityHistLabels( cfgSrc, "xe", L1DataDef::XE ) );
- ATH_CHECK ( setMultiplicityHistLabels( cfgSrc, "te", L1DataDef::TE ) );
- ATH_CHECK ( setMultiplicityHistLabels( cfgSrc, "xs", L1DataDef::XS ) );
- ATH_CHECK ( setMultiplicityHistLabels( cfgSrc, "em", L1DataDef::EM ) );
- ATH_CHECK ( setMultiplicityHistLabels( cfgSrc, "tau", L1DataDef::TAU ) );
+ ATH_CHECK ( setMultiplicityHistLabels( l1menu, "muon" ) );
+ ATH_CHECK ( setMultiplicityHistLabels( l1menu, "jet" ) );
+ ATH_CHECK ( setMultiplicityHistLabels( l1menu, "xe" ) );
+ ATH_CHECK ( setMultiplicityHistLabels( l1menu, "te" ) );
+ ATH_CHECK ( setMultiplicityHistLabels( l1menu, "xs" ) );
+ ATH_CHECK ( setMultiplicityHistLabels( l1menu, "em" ) );
+ ATH_CHECK ( setMultiplicityHistLabels( l1menu, "tau" ) );
// Topo
- if ( l1menu ) {
- std::vector<std::string> connNames = l1menu->connectorNames();
- for( const std::string connName : {"LegacyTopo0", "LegacyTopo1", "Topo1El", "Topo2El", "Topo3El", "Topo1Opt0", "Topo1Opt1", "Topo1Opt2", "Topo1Opt3"}) {
- if( find(connNames.begin(), connNames.end(), connName) == connNames.end() ) {
- continue;
- }
- auto hTopo = *get1DHist("/input/topo/" + connName);
- for(uint fpga : {0,1}) {
- for(uint clock : {0,1}) {
- for(auto & tl : l1menu->connector(connName).triggerLines(fpga,clock)) {
- //uint flatIndex = 32*tl.fpga() + 2*tl.startbit() + tl.clock(); // activate later
- uint flatIndex = 32*tl.fpga() + tl.startbit() + 16*tl.clock();
- hTopo->GetXaxis()->SetBinLabel(flatIndex+1,tl.name().c_str());
- }
- }
- }
+ std::vector<std::string> connNames = l1menu.connectorNames();
+ for( const std::string connName : {"LegacyTopo0", "LegacyTopo1", "Topo1El", "Topo2El", "Topo3El", "Topo1Opt0", "Topo1Opt1", "Topo1Opt2", "Topo1Opt3"}) {
+ if( find(connNames.begin(), connNames.end(), connName) == connNames.end() ) {
+ continue;
}
- } else {
- auto hTopo0 = *get1DHist("/input/topo/LegacyTopo0");
- auto hTopo1 = *get1DHist("/input/topo/LegacyTopo1");
- for(const TIP * tip : m_configSvc->ctpConfig()->menu().tipVector() ) {
- if ( tip->tipNumber() < 384 )
- continue;
- unsigned int tipNumber = (unsigned int) ( tip->tipNumber() - 384 );
- switch(tipNumber / 64) {
- case 0:
- hTopo0->GetXaxis()->SetBinLabel(1+ tipNumber % 64, tip->thresholdName().c_str() );
- break;
- case 1:
- hTopo1->GetXaxis()->SetBinLabel(1+ tipNumber % 64, tip->thresholdName().c_str() );
- break;
- default:
- break;
+ auto hTopo = *get1DHist("/input/topo/" + connName);
+ for(uint fpga : {0,1}) {
+ for(uint clock : {0,1}) {
+ for(auto & tl : l1menu.connector(connName).triggerLines(fpga,clock)) {
+ //uint flatIndex = 32*tl.fpga() + 2*tl.startbit() + tl.clock(); // activate later
+ uint flatIndex = 32*tl.fpga() + tl.startbit() + 16*tl.clock();
+ hTopo->GetXaxis()->SetBinLabel(flatIndex+1,tl.name().c_str());
+ }
}
}
}
std::vector<std::string> orderedItemnames;
- if( l1menu ) {
- orderedItemnames.reserve( l1menu->size() );
- for( const auto & item : *l1menu ) {
- orderedItemnames.emplace_back(item.name());
- }
- } else {
- orderedItemnames.reserve(m_configSvc->ctpConfig()->menu().items().size());
- for( const auto & item : m_configSvc->ctpConfig()->menu().items() ) {
- orderedItemnames.emplace_back(item->name());
- }
+ orderedItemnames.reserve( l1menu.size() );
+ for( const auto & item : l1menu ) {
+ orderedItemnames.emplace_back(item.name());
}
std::sort(orderedItemnames.begin(), orderedItemnames.end());
@@ -389,13 +301,8 @@ LVL1CTP::CTPSimulation::setHistLabels() const {
unsigned int bin = 1;
for ( const std::string & itemname : orderedItemnames ) {
unsigned int ctpId(0);
- if (l1menu) {
- TrigConf::L1Item item = l1menu->item( itemname );
- ctpId = item.ctpId();
- } else {
- const TrigConf::TriggerItem * item = m_configSvc->ctpConfig()->menu().item( itemname );
- ctpId = item->ctpId();
- }
+ TrigConf::L1Item item = l1menu.item( itemname );
+ ctpId = item.ctpId();
tbpById->GetXaxis()->SetBinLabel( ctpId+1, itemname.c_str() );
tapById->GetXaxis()->SetBinLabel( ctpId+1, itemname.c_str() );
tavById->GetXaxis()->SetBinLabel( ctpId+1, itemname.c_str() );
@@ -688,110 +595,91 @@ LVL1CTP::CTPSimulation::fillInputHistograms(const EventContext& context) const {
return StatusCode::SUCCESS;
}
-namespace {
- bool containsBunch(unsigned int bcid, const TrigConf::BunchGroup & bg) {
- return std::find(bg.bunches().begin(), bg.bunches().end(), bcid) != bg.bunches().end();
- }
-}
-
StatusCode
LVL1CTP::CTPSimulation::extractMultiplicities(std::map<std::string, unsigned int> & thrMultiMap, const EventContext& context) const {
const TrigConf::L1Menu * l1menu = nullptr;
- if( m_useNewConfig ) {
- ATH_CHECK( detStore()->retrieve(l1menu) );
- }
+ ATH_CHECK( detStore()->retrieve(l1menu) );
thrMultiMap.clear();
- if( l1menu ) {
- std::vector<std::string> connNames = l1menu->connectorNames();
- for( const std::string connName : {"LegacyTopo0", "LegacyTopo1", "Topo1El", "Topo2El", "Topo3El", "Topo1Opt0", "Topo1Opt1", "Topo1Opt2", "Topo1Opt3"}) {
- if( find(connNames.begin(), connNames.end(), connName) == connNames.end() ) {
+ std::vector<std::string> connNames = l1menu->connectorNames();
+ for( const std::string connName : {"LegacyTopo0", "LegacyTopo1", "Topo1El", "Topo2El", "Topo3El", "Topo1Opt0", "Topo1Opt1", "Topo1Opt2", "Topo1Opt3"}) {
+ if( find(connNames.begin(), connNames.end(), connName) == connNames.end() ) {
+ continue;
+ }
+ uint64_t cable {0};
+ if (connName.find("Legacy")==0) { // legacy topo
+ if (m_iKeyLegacyTopo.empty() || !m_doL1CaloLegacy )
+ {
continue;
}
- uint64_t cable {0};
- if (connName.find("Legacy")==0) { // legacy topo
- if (m_iKeyLegacyTopo.empty() || !m_doL1CaloLegacy )
- {
- continue;
- }
- auto topoInput = SG::makeHandle( m_iKeyLegacyTopo, context );
- if (not topoInput.isValid()) {
- continue;
- }
- if(connName == "LegacyTopo0") {
- cable = ( (uint64_t)topoInput->cableWord1( 1 ) << 32) + topoInput->cableWord1( 0 );
- } else if (connName == "LegacyTopo1") {
- cable = ( (uint64_t)topoInput->cableWord2( 1 ) << 32) + topoInput->cableWord2( 0 );
- }
- } else { // new topo
- if (m_iKeyTopo.empty())
- {
- continue;
- }
- auto topoInput = SG::makeHandle( m_iKeyTopo, context );
- if (not topoInput.isValid()) {
- continue;
- }
- if(connName == "Topo1El") {
- cable = ( (uint64_t)topoInput->cableWord0( 1 ) << 32) + topoInput->cableWord0( 0 );
- } else if(connName == "Topo2El") {
- cable = ( (uint64_t)topoInput->cableWord1( 1 ) << 32) + topoInput->cableWord1( 0 );
- } else if (connName == "Topo3El") {
- cable = ( (uint64_t)topoInput->cableWord2( 1 ) << 32) + topoInput->cableWord2( 0 );
- } else if(connName == "Topo1Opt0") {
- ATH_MSG_DEBUG("BIT word Topo1Opt0: " << topoInput->optcableWord( connName ));
- } else if(connName == "Topo1Opt1") {
- ATH_MSG_DEBUG("BIT word Topo1Opt1: " << topoInput->optcableWord( connName ));
- } else if(connName == "Topo1Opt2") {
- ATH_MSG_DEBUG("BIT word Topo1Opt2: " << topoInput->optcableWord( connName ));
- } else if(connName == "Topo1Opt3") {
- ATH_MSG_DEBUG("BIT word Topo1Opt3: " << topoInput->optcableWord( connName ));
- }
+ auto topoInput = SG::makeHandle( m_iKeyLegacyTopo, context );
+ if (not topoInput.isValid()) {
+ continue;
}
- auto & conn = l1menu->connector(connName);
- for(uint fpga : {0,1}) {
- for(uint clock : {0,1}) {
- for(auto & tl : conn.triggerLines(fpga,clock)) {
- //uint flatIndex = 32*tl.fpga() + 2*tl.startbit() + tl.clock(); // activate later
- uint flatIndex = 32*tl.fpga() + tl.startbit() + 16*tl.clock();
- uint pass = (cable & (uint64_t(0x1) << flatIndex)) == 0 ? 0 : 1;
- if(size_t pos = tl.name().find('['); pos == std::string::npos) {
- thrMultiMap[tl.name()] = pass;
- ATH_MSG_DEBUG(tl.name() << " MULT calculated mult for topo " << pass);
- } else {
- auto thrName = tl.name().substr(0,pos);
- int bit = std::stoi(tl.name().substr(pos+1));
- thrMultiMap.try_emplace(thrName, 0);
- thrMultiMap[thrName] += (pass << bit);
- ATH_MSG_DEBUG(thrName << " MULT updated mult for topo " << pass);
- }
- }
- }
+ if(connName == "LegacyTopo0") {
+ cable = ( (uint64_t)topoInput->cableWord1( 1 ) << 32) + topoInput->cableWord1( 0 );
+ } else if (connName == "LegacyTopo1") {
+ cable = ( (uint64_t)topoInput->cableWord2( 1 ) << 32) + topoInput->cableWord2( 0 );
+ }
+ } else { // new topo
+ if (m_iKeyTopo.empty())
+ {
+ continue;
+ }
+ auto topoInput = SG::makeHandle( m_iKeyTopo, context );
+ if (not topoInput.isValid()) {
+ continue;
+ }
+ if(connName == "Topo1El") {
+ cable = ( (uint64_t)topoInput->cableWord0( 1 ) << 32) + topoInput->cableWord0( 0 );
+ } else if(connName == "Topo2El") {
+ cable = ( (uint64_t)topoInput->cableWord1( 1 ) << 32) + topoInput->cableWord1( 0 );
+ } else if (connName == "Topo3El") {
+ cable = ( (uint64_t)topoInput->cableWord2( 1 ) << 32) + topoInput->cableWord2( 0 );
+ } else if(connName == "Topo1Opt0") {
+ ATH_MSG_DEBUG("BIT word Topo1Opt0: " << topoInput->optcableWord( connName ));
+ } else if(connName == "Topo1Opt1") {
+ ATH_MSG_DEBUG("BIT word Topo1Opt1: " << topoInput->optcableWord( connName ));
+ } else if(connName == "Topo1Opt2") {
+ ATH_MSG_DEBUG("BIT word Topo1Opt2: " << topoInput->optcableWord( connName ));
+ } else if(connName == "Topo1Opt3") {
+ ATH_MSG_DEBUG("BIT word Topo1Opt3: " << topoInput->optcableWord( connName ));
}
}
- for ( auto & thr : l1menu->thresholds() ) {
- if(thr->type() == "TOPO" or thr->type()== "R2TOPO" or thr->type() == "MULTTOPO" or thr->type() == "MUTOPO") {
- continue;
+ auto & conn = l1menu->connector(connName);
+ for(uint fpga : {0,1}) {
+ for(uint clock : {0,1}) {
+ for(auto & tl : conn.triggerLines(fpga,clock)) {
+ //uint flatIndex = 32*tl.fpga() + 2*tl.startbit() + tl.clock(); // activate later
+ uint flatIndex = 32*tl.fpga() + tl.startbit() + 16*tl.clock();
+ uint pass = (cable & (uint64_t(0x1) << flatIndex)) == 0 ? 0 : 1;
+ if(size_t pos = tl.name().find('['); pos == std::string::npos) {
+ thrMultiMap[tl.name()] = pass;
+ ATH_MSG_DEBUG(tl.name() << " MULT calculated mult for topo " << pass);
+ } else {
+ auto thrName = tl.name().substr(0,pos);
+ int bit = std::stoi(tl.name().substr(pos+1));
+ thrMultiMap.try_emplace(thrName, 0);
+ thrMultiMap[thrName] += (pass << bit);
+ ATH_MSG_DEBUG(thrName << " MULT updated mult for topo " << pass);
+ }
+ }
}
- // get the multiplicity for each threshold
- unsigned int multiplicity = calculateMultiplicity( *thr, l1menu, context );
- // and record in threshold--> multiplicity map (to be used for item decision)
- thrMultiMap[thr->name()] = multiplicity;
- ATH_MSG_DEBUG( thr->name() << " MULT calculated mult for topo " << multiplicity);
}
- } else {
- for ( const TrigConf::TriggerThreshold * thr : m_configSvc->ctpConfig()->menu().thresholdVector() ) {
- // get the multiplicity for each threshold
- unsigned int multiplicity = calculateMultiplicity( thr, context );
- // and record in threshold--> multiplicity map (to be used for item decision)
- thrMultiMap[thr->name()] = multiplicity;
- ATH_MSG_DEBUG( thr->name() << " MULT calculated mult for topo " << multiplicity);
+ }
+ for ( auto & thr : l1menu->thresholds() ) {
+ if(thr->type() == "TOPO" or thr->type()== "R2TOPO" or thr->type() == "MULTTOPO" or thr->type() == "MUTOPO") {
+ continue;
}
+ // get the multiplicity for each threshold
+ unsigned int multiplicity = calculateMultiplicity( *thr, l1menu, context );
+ // and record in threshold--> multiplicity map (to be used for item decision)
+ thrMultiMap[thr->name()] = multiplicity;
+ ATH_MSG_DEBUG( thr->name() << " MULT calculated mult for topo " << multiplicity);
}
-
// internal triggers
auto bcid = context.eventID().bunch_crossing_id();
if( m_forceBunchGroupPattern ) {
@@ -803,28 +691,20 @@ LVL1CTP::CTPSimulation::extractMultiplicities(std::map<std::string, unsigned int
}
} else {
// use bunchgroup definition from configuration and pick according to the BCID
- if( m_useNewConfig ) {
- const TrigConf::L1BunchGroupSet *l1bgs = nullptr;
- detStore()->retrieve(l1bgs).ignore();
- if (l1bgs)
- {
- for (size_t i = 0; i < l1bgs->maxNBunchGroups(); ++i)
- {
- std::shared_ptr<TrigConf::L1BunchGroup> bg = l1bgs->getBunchGroup(i);
- thrMultiMap[std::string("BGRP") + std::to_string(i)] = bg->contains(bcid) ? 1 : 0;
- }
- }
- else
+ const TrigConf::L1BunchGroupSet *l1bgs = nullptr;
+ detStore()->retrieve(l1bgs).ignore();
+ if (l1bgs)
+ {
+ for (size_t i = 0; i < l1bgs->maxNBunchGroups(); ++i)
{
- ATH_MSG_ERROR("Did not find L1BunchGroupSet in DetectorStore");
- }
- } else {
- for( const TrigConf::BunchGroup & bg : m_configSvc->ctpConfig()->bunchGroupSet().bunchGroups() ) {
- std::string bgName("BGRP");
- bgName += std::to_string(bg.internalNumber());
- thrMultiMap[bgName] = containsBunch(bcid,bg) ? 1 : 0;
+ std::shared_ptr<TrigConf::L1BunchGroup> bg = l1bgs->getBunchGroup(i);
+ thrMultiMap[std::string("BGRP") + std::to_string(i)] = bg->contains(bcid) ? 1 : 0;
}
}
+ else
+ {
+ ATH_MSG_ERROR("Did not find L1BunchGroupSet in DetectorStore");
+ }
}
// all RNDM triggers run with 40MHz, so they are always in
@@ -908,67 +788,6 @@ LVL1CTP::CTPSimulation::calculateJetMultiplicity( const TrigConf::L1Threshold &
}
-unsigned int
-LVL1CTP::CTPSimulation::calculateJetMultiplicity( const TrigConf::TriggerThreshold * confThr, const EventContext& context ) const {
- unsigned int multiplicity = 0;
- if( confThr->name().find("J") == 0 ) {
- if(m_doL1CaloLegacy) {
- auto ctpinJet = SG::makeHandle( m_iKeyCtpinJet, context );
- if ( ctpinJet.isValid() ) {
- if ( confThr->cableName() == "JEP1" || confThr->cableName() == "JET1" ) {
- multiplicity = CTPUtil::getMult( ctpinJet->cableWord0(), confThr->cableStart(), confThr->cableEnd() );
- } else if ( confThr->cableName() == "JEP2" || confThr->cableName() == "JET2" ) {
- multiplicity = CTPUtil::getMult( ctpinJet->cableWord1(), confThr->cableStart(), confThr->cableEnd() );
- }
- }
- }
- } else {
- // Run-3 threshold
- const SG::ReadHandleKey< xAOD::JetRoIContainer > * rhk { nullptr };
- if( confThr->name().find("g") == 0 ) {
- rhk = & m_iKeyGFexJets;
- } else if( confThr->name().find("jL") == 0 ) {
- rhk = & m_iKeyJFexLJets;
- } else if( confThr->name().find("j") == 0 ) {
- rhk = & m_iKeyJFexJets;
- } else {
- ATH_MSG_ERROR( "Unexpected threshold name " << confThr->name() << ". Should start with j, jL, g, or J.");
- }
- if(!rhk->empty()) {
- auto jets = SG::makeHandle( *rhk, context );
- if ( jets.isValid() ) {
- for ( const auto jet : *jets ) {
- float eta = jet->eta();
- float phi = jet->phi();
- if ( phi < 0 ) phi += 2*M_PI;
- if ( phi >= 2*M_PI ) phi -= 2*M_PI;
- LVL1::Coordinate coord(phi, eta);
- LVL1::CoordToHardware converter;
- unsigned int jepCoord = converter.jepCoordinateWord(coord);
- uint32_t roiword = jepCoord << 19;
- auto coordRange = m_jetDecoder->coordinate(roiword);
- int ieta =
- int((coordRange.eta() + ((coordRange.eta() > 0.01) ? 0.025 : -0.025)) / 0.1) - 1;
- // Adjustment due to irregular geometries
- if (ieta > 24)
- ieta += 2;
- int iphi = int((coordRange.phiRange().min() + 0.025) * 32 / M_PI);
- // copied from
- // https://acode-browser.usatlas.bnl.gov/lxr/source/athena/Trigger/TrigT1/TrigT1CaloUtils/src/JetAlgorithm.cxx#0337
- //int ieta = int((eta + (eta>0 ? 0.005 : -0.005))/0.1);
- //int iphi = 0; // int((m_refPhi-0.005)*32/M_PI); iphi = 16*(iphi/16) + 8;
- bool pass = ((unsigned int) (jet->et8x8()/1000.)) > confThr->triggerThresholdValue( ieta, iphi )->ptcut();
- multiplicity += pass ? 1 : 0;
- }
- }
- }
- }
- get2DHist( "/multi/jet/jetMult" )->Fill(confThr->mapping(), multiplicity);
- ATH_MSG_DEBUG("JET MULT calculated mult for threshold " << confThr->name() << " : " << multiplicity);
- return multiplicity;
-}
-
-
unsigned int
LVL1CTP::CTPSimulation::calculateEMMultiplicity( const TrigConf::L1Threshold & confThr, const TrigConf::L1Menu * l1menu, const EventContext& context ) const {
unsigned int multiplicity (0);
@@ -1006,41 +825,6 @@ LVL1CTP::CTPSimulation::calculateEMMultiplicity( const TrigConf::L1Threshold & c
}
-unsigned int
-LVL1CTP::CTPSimulation::calculateEMMultiplicity( const TrigConf::TriggerThreshold * confThr, const EventContext& context ) const {
- unsigned int multiplicity (0);
- if ( confThr->name()[0]=='e' ) {
- // new EM threshold from eFEX
- auto eFexCluster = SG::makeHandle( m_iKeyEFexCluster, context );
- for ( const auto cl : *eFexCluster ) {
- float eta = cl->eta();
- int ieta = int((eta + (eta>0 ? 0.005 : -0.005))/0.1);
- int iphi = 0;
- const TrigConf::TriggerThresholdValue * thrV = confThr->triggerThresholdValue( ieta, iphi );
- const ClusterThresholdValue *ctv = dynamic_cast<const ClusterThresholdValue *>(thrV);
- float scale = ctv->caloInfo().globalEmScale();
- bool clusterPasses = ( ((unsigned int) cl->et()) > thrV->ptcut()*scale ); // need to add cut on isolation and other variables, once available
- multiplicity += clusterPasses ? 1 : 0;
- }
- } else {
- // old EM threshold from data
- if(m_doL1CaloLegacy) {
- auto ctpinEM = SG::makeHandle( m_iKeyCtpinEM, context );
- if ( ctpinEM.isValid() ) {
- if ( confThr->cableName() == "CP1" || confThr->cableName() == "EM1" ) {
- multiplicity = CTPUtil::getMult( ctpinEM->cableWord0(), confThr->cableStart(), confThr->cableEnd() );
- } else if ( confThr->cableName() == "CP2" || confThr->cableName() == "EM2" ) {
- multiplicity = CTPUtil::getMult( ctpinEM->cableWord1(), confThr->cableStart(), confThr->cableEnd() );
- }
- }
- }
- }
- get2DHist( "/multi/em/emMult" )->Fill(confThr->mapping(), multiplicity);
- ATH_MSG_DEBUG("EM MULT calculated mult for threshold " << confThr->name() << " : " << multiplicity);
- return multiplicity;
-}
-
-
unsigned int
LVL1CTP::CTPSimulation::calculateTauMultiplicity( const TrigConf::L1Threshold & confThr, const TrigConf::L1Menu * l1menu, const EventContext& context ) const {
unsigned int multiplicity = 0;
@@ -1079,45 +863,6 @@ LVL1CTP::CTPSimulation::calculateTauMultiplicity( const TrigConf::L1Threshold &
}
-unsigned int
-LVL1CTP::CTPSimulation::calculateTauMultiplicity( const TrigConf::TriggerThreshold * confThr, const EventContext& context ) const {
- unsigned int multiplicity = 0;
- if ( confThr->name()[0]=='e' ) {
- // new TAU threshold from eFEX
- auto eFexTaus = SG::makeHandle( m_iKeyEFexTau, context );
- const static SG::AuxElement::ConstAccessor<float> accR3ClET ("R3ClusterET");
- const static SG::AuxElement::ConstAccessor<float> accR3ClIso ("R3ClusterIso");
- if( eFexTaus.isValid() ) {
- for ( const auto tau : *eFexTaus ) {
- unsigned int eT = (unsigned int) (accR3ClET(*tau)/1000.); // tau eT is in MeV while the cut is in GeV - this is only temporary and needs to be made consistent for all L1Calo
- //float iso = accR3ClIso(*tau);
- float eta = tau->eta();
- int ieta = int((eta + (eta>0 ? 0.005 : -0.005))/0.1);
- int iphi = 0;
- const TrigConf::TriggerThresholdValue * thrV = confThr->triggerThresholdValue( ieta, iphi );
- bool tauPasses = ( eT >= thrV->ptcut() ); // need to add cut on isolation and other variables, once available
- multiplicity += tauPasses ? 1 : 0;
- }
- }
- } else {
- // old TAU threshold
- if(m_doL1CaloLegacy) {
- auto ctpinEM = SG::makeHandle( m_iKeyCtpinEM, context );
- if ( ctpinEM.isValid() ) {
- if ( confThr->cableName() == "TAU1" ) {
- multiplicity = CTPUtil::getMult( ctpinEM->cableWord2(), confThr->cableStart(), confThr->cableEnd() );
- } else if ( confThr->cableName() == "TAU2" ) {
- multiplicity = CTPUtil::getMult( ctpinEM->cableWord3(), confThr->cableStart(), confThr->cableEnd() );
- }
- }
- }
- }
- get2DHist( "/multi/tau/tauMult" )->Fill(confThr->mapping(), multiplicity);
- ATH_MSG_DEBUG("TAU MULT calculated mult for threshold " << confThr->name() << " : " << multiplicity);
- return multiplicity;
-}
-
-
unsigned int
LVL1CTP::CTPSimulation::calculateMETMultiplicity( const TrigConf::L1Threshold & confThr, const TrigConf::L1Menu * l1menu, const EventContext& context ) const {
unsigned int multiplicity = 0;
@@ -1170,76 +915,6 @@ LVL1CTP::CTPSimulation::calculateMETMultiplicity( const TrigConf::L1Threshold &
}
-unsigned int
-LVL1CTP::CTPSimulation::calculateMETMultiplicity( const TrigConf::TriggerThreshold * confThr, const EventContext& context ) const {
- unsigned int multiplicity = 0;
- if ( confThr->name().find("XE")==0 ) {
- // old XE
- if(m_doL1CaloLegacy) {
- auto ctpinEnergy = SG::makeHandle( m_iKeyCtpinXE, context );
- if ( ctpinEnergy.isValid() ) {
- if ( confThr->cableName() == "JEP3" || confThr->cableName() == "EN1") {
- multiplicity = CTPUtil::getMult( ctpinEnergy->cableWord0(), confThr->cableStart(), confThr->cableEnd() );
- } else if ( confThr->cableName() == "EN2") {
- multiplicity = CTPUtil::getMult( ctpinEnergy->cableWord1(), confThr->cableStart(), confThr->cableEnd() );
- }
- }
- }
- } else if ( confThr->name().find("TE")==0 ) {
- // old TE
- if(m_doL1CaloLegacy) {
- auto ctpinEnergy = SG::makeHandle( m_iKeyCtpinXE, context );
- if ( ctpinEnergy.isValid() ) {
- if ( confThr->cableName() == "JEP3" || confThr->cableName() == "EN1") {
- multiplicity = CTPUtil::getMult( ctpinEnergy->cableWord0(), confThr->cableStart(), confThr->cableEnd() );
- } else if ( confThr->cableName() == "EN2") {
- multiplicity = CTPUtil::getMult( ctpinEnergy->cableWord1(), confThr->cableStart(), confThr->cableEnd() );
- }
- }
- }
- } else if ( confThr->name().find("XS")==0 ) {
- // old XS
- if(m_doL1CaloLegacy) {
- auto ctpinEnergy = SG::makeHandle( m_iKeyCtpinXE, context );
- if ( ctpinEnergy.isValid() ) {
- if ( confThr->cableName() == "EN1" ) {
- multiplicity = CTPUtil::getMult( ctpinEnergy->cableWord0(), confThr->cableStart(), confThr->cableEnd() );
- }
- }
- }
- } else {
- // new XE
- const SG::ReadHandleKey< xAOD::EnergySumRoI > * rhk { nullptr };
- if ( confThr->name().find("gXEPUFIT")==0 ) {
- rhk = & m_iKeyGFexMETPufit;
- ATH_MSG_DEBUG("Using Pufit input for threshold " << confThr->name() );
- } else if ( confThr->name().find("gXERHO")==0 ) {
- rhk = & m_iKeyGFexMETRho;
- ATH_MSG_DEBUG("Using Rho input for threshold " << confThr->name() );
- } else if ( confThr->name().find("gXEJWOJ")==0 ) {
- rhk = & m_iKeyGFexMETJwoJ;
- ATH_MSG_DEBUG("Using JwoJ input for threshold " << confThr->name() );
- } else {
- rhk = & m_iKeyGFexMETJwoJ;
- ATH_MSG_DEBUG("Using default input JwoJ for threshold " << confThr->name() );
- }
- if(!rhk->empty()) {
- auto met = SG::makeHandle( *rhk, context );
- multiplicity = ( met->energyT()/1000. < confThr->thresholdValueVector()[0]->ptcut() ) ? 0 : 1; // energyT value is in MeV, cut in GeV
- }
- }
- if ( confThr->name().find("TE")==0 ) {
- get2DHist( "/multi/te/teMult" )->Fill(confThr->mapping(), multiplicity);
- } else if ( confThr->name().find("XE")==0 ) {
- get2DHist( "/multi/xe/xeMult" )->Fill(confThr->mapping(), multiplicity);
- } else {
- get2DHist( "/multi/xs/xsMult" )->Fill(confThr->mapping(), multiplicity);
- }
- ATH_MSG_DEBUG("XE/TE/XS MULT calculated mult for threshold " << confThr->name() << " : " << multiplicity);
- return multiplicity;
-}
-
-
unsigned int
LVL1CTP::CTPSimulation::calculateMuonMultiplicity( const TrigConf::L1Threshold & confThr, const TrigConf::L1Menu * l1menu, const EventContext& context ) const {
if(m_iKeyMuctpi.empty()) {
@@ -1257,22 +932,6 @@ LVL1CTP::CTPSimulation::calculateMuonMultiplicity( const TrigConf::L1Threshold &
}
-unsigned int
-LVL1CTP::CTPSimulation::calculateMuonMultiplicity( const TrigConf::TriggerThreshold * confThr, const EventContext& context ) const {
- if(m_iKeyMuctpi.empty()) {
- return 0;
- }
- unsigned int multiplicity = 0;
- auto ctpinMuon = SG::makeHandle( m_iKeyMuctpi, context );
- if ( ctpinMuon.isValid() ) {
- multiplicity = CTPUtil::getMuonMult( ctpinMuon->muCTPIWord(), confThr->cableStart(), confThr->cableEnd() );
- }
- get2DHist( "/multi/muon/muonMult" )->Fill(confThr->mapping(), multiplicity);
- ATH_MSG_DEBUG("MU MULT calculated mult for threshold " << confThr->name() << " : " << multiplicity);
- return multiplicity;
-}
-
-
unsigned int
LVL1CTP::CTPSimulation::calculateTopoOptMultiplicity( const TrigConf::L1Threshold & confThr, const TrigConf::L1Menu * l1menu, const EventContext& context ) const {
if(m_iKeyTopo.empty()) {
@@ -1336,59 +995,6 @@ LVL1CTP::CTPSimulation::calculateTopoMultiplicity( const TrigConf::L1Threshold &
}
-unsigned int
-LVL1CTP::CTPSimulation::calculateTopoMultiplicity( const TrigConf::TriggerThreshold * confThr, const EventContext& context ) const {
- if( m_iKeyTopo.empty() ) {
- return 0;
- }
- unsigned int multiplicity = 0;
- // topo
- auto topoInput = SG::makeHandle( m_iKeyTopo, context );
- if(topoInput.isValid()) {
- uint64_t cable = 0;
- if ( confThr->cableName() == "TOPO1" ) {
- cable = ( (uint64_t)topoInput->cableWord1( 1 ) << 32) + topoInput->cableWord1( 0 );
- } else {
- cable = ( (uint64_t)topoInput->cableWord2( 1 ) << 32) + topoInput->cableWord2( 0 );
- }
- ATH_MSG_DEBUG( " ---> Topo input " << confThr->name() << " on module " << confThr->cableName() << " with clock " << confThr->clock()
- << ", cable start " << confThr->cableStart() << " and end " << confThr->cableEnd()
- << " double word 0x" << std::setw(16) << std::setfill('0') << std::hex << cable << std::dec << std::setfill(' ') );
- multiplicity = CTPUtil::getMultTopo( cable, confThr->cableStart(), confThr->cableEnd(), confThr->clock() );
- }
- return multiplicity;
-}
-
-
-unsigned int
-LVL1CTP::CTPSimulation::calculateMultiplicity( const TrigConf::TriggerThreshold * confThr, const EventContext& context ) const {
- unsigned int multiplicity = 0;
- if( confThr->cableName() == "CTPCAL" ||
- confThr->cableName() == "ALFA" ||
- confThr->cableName() == "NIM1" ||
- confThr->cableName() == "NIM2" ||
- confThr->type() == "NIM") {
- return 0;
- }
- // here we need to write specific code for the different types of L1 FEX objects
- if ( confThr->ttype() == TrigConf::L1DataDef::EM ) {
- multiplicity = calculateEMMultiplicity( confThr, context );
- } else if ( confThr->ttype() == TrigConf::L1DataDef::TAU ) {
- multiplicity = calculateTauMultiplicity( confThr, context );
- } else if ( confThr->ttype() == TrigConf::L1DataDef::XE ||
- confThr->ttype() == TrigConf::L1DataDef::TE ||
- confThr->ttype() == TrigConf::L1DataDef::XS ) {
- multiplicity = calculateMETMultiplicity( confThr, context );
- } else if ( confThr->ttype() == TrigConf::L1DataDef::JET ) {
- multiplicity = calculateJetMultiplicity( confThr, context );
- } else if ( confThr->ttype() == TrigConf::L1DataDef::MUON ) {
- multiplicity = calculateMuonMultiplicity( confThr, context );
- } else if ( confThr->ttype() == TrigConf::L1DataDef::TOPO ) {
- multiplicity = calculateTopoMultiplicity( confThr, context );
- }
- return multiplicity;
-}
-
unsigned int
LVL1CTP::CTPSimulation::calculateMultiplicity( const TrigConf::L1Threshold & confThr, const TrigConf::L1Menu * l1menu, const EventContext& context ) const {
unsigned int multiplicity = 0;
@@ -1475,9 +1081,7 @@ StatusCode
LVL1CTP::CTPSimulation::finalize() {
const TrigConf::L1Menu * l1menu = nullptr;
- if( m_useNewConfig ) {
- ATH_CHECK( detStore()->retrieve(l1menu) );
- }
+ ATH_CHECK( detStore()->retrieve(l1menu) );
constexpr unsigned int sizeOfCTPOutput = 512;
@@ -1502,20 +1106,11 @@ LVL1CTP::CTPSimulation::finalize() {
auto htbp = *get1DHist( "/output/tbpByName" );
auto htap = *get1DHist( "/output/tapByName" );
auto htav = *get1DHist( "/output/tavByName" );
- if(l1menu) {
- for( auto & item : *l1menu ) {
- unsigned int ctpId = item.ctpId();
- htbp->Fill( item.name().c_str(), tbp[ctpId]);
- htap->Fill( item.name().c_str(), tap[ctpId]);
- htav->Fill( item.name().c_str(), tav[ctpId]);
- }
- } else {
- for(const TriggerItem * item : m_configSvc->ctpConfig()->menu().items()) {
- unsigned int ctpId = item->ctpId();
- htbp->Fill( item->name().c_str(), tbp[ctpId]);
- htap->Fill( item->name().c_str(), tap[ctpId]);
- htav->Fill( item->name().c_str(), tav[ctpId]);
- }
+ for( auto & item : *l1menu ) {
+ unsigned int ctpId = item.ctpId();
+ htbp->Fill( item.name().c_str(), tbp[ctpId]);
+ htap->Fill( item.name().c_str(), tap[ctpId]);
+ htav->Fill( item.name().c_str(), tav[ctpId]);
}
htbp->Sumw2(0);
htap->Sumw2(0);
@@ -1529,12 +1124,7 @@ LVL1CTP::CTPSimulation::finalize() {
// fill the threshold summary hists
{
// run 2 thresholds (legacy + muon)
- std::vector<std::string> thrHists;
- if( l1menu ) {
- thrHists = { "em/EM", "muon/MU", "tau/TAU", "jet/JET", "xe/XE", "te/TE", "xs/XS" };
- } else {
- thrHists = { "em/em", "muon/muon", "tau/tau", "jet/jet", "xe/xe", "te/te", "xs/xs" };
- }
+ std::vector<std::string> thrHists{ "em/EM", "muon/MU", "tau/TAU", "jet/JET", "xe/XE", "te/TE", "xs/XS" };
auto hist = * get2DHist( "/multi/all/LegacyMult" );
for(const std::string & histpath : thrHists) {
auto h = * get2DHist( "/multi/" + histpath + "Mult" );
@@ -1556,43 +1146,34 @@ LVL1CTP::CTPSimulation::finalize() {
}
{
// run 3 thresholds
- if( l1menu ) {
- auto hist = * get2DHist( "/multi/all/R3Mult" );
- std::vector<std::string> thrHists = { "em/eEM", "muon/MU", "tau/eTAU", "jet/jJ", "jet/gJ", "xe/gXE", "xe/jXE" };
- for(const std::string & histpath : thrHists) {
- auto h = * get2DHist( "/multi/" + histpath + "Mult" );
- auto xaxis = h->GetXaxis();
- size_t xsize = xaxis->GetNbins();
- size_t ysize = h->GetNbinsY();
- for(size_t x = 1; x<=xsize; x++) {
- std::string s("");
- for(size_t y = 1; y<=ysize; y++) {
- size_t binContent = h->GetBinContent(x,y);
- hist->Fill(xaxis->GetBinLabel(x) ,y-1, binContent);
- s += std::to_string(binContent) + " ";
- }
- ATH_MSG_DEBUG( "REGTEST CTPSim " << xaxis->GetBinLabel(x) << " MULT " << s);
+ auto hist = * get2DHist( "/multi/all/R3Mult" );
+ std::vector<std::string> thrHists = { "em/eEM", "muon/MU", "tau/eTAU", "jet/jJ", "jet/gJ", "xe/gXE", "xe/jXE" };
+ for(const std::string & histpath : thrHists) {
+ auto h = * get2DHist( "/multi/" + histpath + "Mult" );
+ auto xaxis = h->GetXaxis();
+ size_t xsize = xaxis->GetNbins();
+ size_t ysize = h->GetNbinsY();
+ for(size_t x = 1; x<=xsize; x++) {
+ std::string s("");
+ for(size_t y = 1; y<=ysize; y++) {
+ size_t binContent = h->GetBinContent(x,y);
+ hist->Fill(xaxis->GetBinLabel(x) ,y-1, binContent);
+ s += std::to_string(binContent) + " ";
}
+ ATH_MSG_DEBUG( "REGTEST CTPSim " << xaxis->GetBinLabel(x) << " MULT " << s);
}
- hist->Sumw2(0);
- hist->LabelsDeflate();
}
+ hist->Sumw2(0);
+ hist->LabelsDeflate();
}
- if(l1menu) {
+ if ( msgLvl(MSG::DEBUG) ) {
for( auto & item : *l1menu ) {
ATH_MSG_DEBUG( "REGTEST CTPSim " << item.name() << " " << item.ctpId() <<
" TBP " << tbp[item.ctpId()] <<
" TAP " << tap[item.ctpId()] <<
" TAV " << tav[item.ctpId()]);
}
- } else {
- for(const TriggerItem * item : m_configSvc->ctpConfig()->menu().items()) {
- ATH_MSG_DEBUG( "REGTEST CTPSim " << item->name() << " " << item->ctpId() <<
- " TBP " << tbp[item->ctpId()] <<
- " TAP " << tap[item->ctpId()] <<
- " TAV " << tav[item->ctpId()]);
- }
}
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.h b/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.h
index 52719bc3c9df..20e3903ad181 100644
--- a/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.h
+++ b/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CTP_CTPSIMULATION_H
#define TRIGT1CTP_CTPSIMULATION_H
@@ -11,7 +11,6 @@
#include "GaudiKernel/ToolHandle.h"
#include "Gaudi/Property.h"
#include "StoreGate/DataHandle.h"
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
// monitoring from HLT
@@ -33,8 +32,6 @@
#include "xAODTrigger/MuonRoIContainer.h"
#include "xAODTrigCalo/TrigEMClusterContainer.h"
#include "xAODTrigger/EmTauRoIContainer.h"
-#include "TrigConfL1Data/L1DataDef.h"
-#include "TrigConfL1Data/TriggerThreshold.h"
#include "TrigT1Result/CTP_RDO.h"
#include "TrigT1Interfaces/CTPSLink.h"
@@ -81,21 +78,11 @@ namespace LVL1CTP {
private:
-
- struct ConfigSource {
- ConfigSource(const TrigConf::CTPConfig* ctpConfig, const TrigConf::L1Menu* l1menu) : m_ctpConfig(ctpConfig), m_l1menu(l1menu) {}
- const TrigConf::CTPConfig* m_ctpConfig {nullptr}; // run 2
- const TrigConf::L1Menu * m_l1menu { nullptr }; // run 3
- const TrigConf::CTPConfig* ctpConfig() const { return m_ctpConfig; }
- const TrigConf::L1Menu* l1menu() const { return m_l1menu; }
- };
-
-
- // histogramming related
+ // histogramming related
StatusCode bookHists() const;
- StatusCode setHistLabels() const;
+ StatusCode setHistLabels(const TrigConf::L1Menu& l1menu) const;
StatusCode createMultiplicityHist(const std::string & type, unsigned int maxMult = 10 ) const;
- StatusCode setMultiplicityHistLabels(const ConfigSource & cfgSrc, const std::string & type, TrigConf::L1DataDef::TriggerType tt ) const;
+ StatusCode setMultiplicityHistLabels(const TrigConf::L1Menu& l1menu, const std::string & type) const;
StatusCode hbook(const std::string & path, std::unique_ptr<TH1> hist) const;
StatusCode hbook(const std::string & path, std::unique_ptr<TH2> hist) const;
StatusCode storeMetadata() const;
@@ -110,15 +97,6 @@ namespace LVL1CTP {
StatusCode simulateItems(const std::map<std::string, unsigned int> & thrMultiMap, const EventContext& context) const;
- // private member functions
- unsigned int calculateMultiplicity ( const TrigConf::TriggerThreshold * confThr, const EventContext& context ) const;
- unsigned int calculateJetMultiplicity ( const TrigConf::TriggerThreshold * confThr, const EventContext& context ) const;
- unsigned int calculateEMMultiplicity ( const TrigConf::TriggerThreshold * confThr, const EventContext& context ) const;
- unsigned int calculateTauMultiplicity ( const TrigConf::TriggerThreshold * confThr, const EventContext& context ) const;
- unsigned int calculateMETMultiplicity ( const TrigConf::TriggerThreshold * confThr, const EventContext& context ) const;
- unsigned int calculateMuonMultiplicity( const TrigConf::TriggerThreshold * confThr, const EventContext& context ) const;
- unsigned int calculateTopoMultiplicity( const TrigConf::TriggerThreshold * confThr, const EventContext& context ) const;
-
unsigned int calculateMultiplicity ( const TrigConf::L1Threshold & confThr, const TrigConf::L1Menu * l1menu, const EventContext& context ) const;
unsigned int calculateJetMultiplicity ( const TrigConf::L1Threshold & confThr, const TrigConf::L1Menu * l1menu, const EventContext& context ) const;
unsigned int calculateEMMultiplicity ( const TrigConf::L1Threshold & confThr, const TrigConf::L1Menu * l1menu, const EventContext& context ) const;
@@ -128,13 +106,9 @@ namespace LVL1CTP {
unsigned int calculateTopoMultiplicity( const TrigConf::L1Threshold & confThr, const TrigConf::L1Menu * l1menu, const EventContext& context ) const;
unsigned int calculateTopoOptMultiplicity( const TrigConf::L1Threshold & confThr, const TrigConf::L1Menu * l1menu, const EventContext& context ) const;
- // member variables
- mutable std::once_flag m_onceflag;
-
// Needed services and tools
ServiceHandle<ITHistSvc> m_histSvc { this, "THistSvc", "THistSvc/THistSvc", "Histogramming svc" };
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc { this, "TrigConfigSvc", "LVL1ConfigSvc", "Trigger configuration service" };
- // ServiceHandle<StoreGateSvc> m_detStore { this, "DetectorStore", "StoreGateSvc/DetectorStore", "Detector store to get the menu" };
+
ToolHandle<LVL1CTP::ResultBuilder> m_resultBuilder { this, "ResultBuilder", "LVL1CTP__ResultBuilder/ResultBuilder", "Builds the CTP result" };
// random engine for calculating prescales
@@ -176,7 +150,6 @@ namespace LVL1CTP {
// properties
Gaudi::Property<bool> m_isData { this, "IsData", false, "emulate CTP as part of MC or rerun on data" };
Gaudi::Property<std::string> m_histPath { this, "HistPath", "/EXPERT/L1", "Booking path for the histogram" };
- Gaudi::Property<bool> m_useNewConfig { this, "UseNewConfig", false, "When true, read the menu from detector store, when false use the L1ConfigSvc" };
Gaudi::Property<bool> m_forceBunchGroupPattern { this, "ForceBunchGroupPattern", true, "When true, ignore the bunchgroups and use the provided BunchGroupPattern" };
Gaudi::Property<unsigned int> m_bunchGroupPattern { this, "BunchGroupPattern", 0x0003, "Bunchgroup pattern applied at every event, useful for simulation. Bit x corresponds to bunchgroup x" };
diff --git a/Trigger/TrigT1/TrigT1CTP/src/ResultBuilder.cxx b/Trigger/TrigT1/TrigT1CTP/src/ResultBuilder.cxx
index 78a8f419f534..48912bb50d27 100644
--- a/Trigger/TrigT1/TrigT1CTP/src/ResultBuilder.cxx
+++ b/Trigger/TrigT1/TrigT1CTP/src/ResultBuilder.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// Local includes:
@@ -21,6 +21,9 @@
#include "CLHEP/Random/RandomEngine.h"
#include "CLHEP/Random/RandFlat.h"
+// L1 configuration data
+#include "TrigConfL1Data/PrescaleSet.h"
+
// STL includes:
#include <vector>
#include <map>
@@ -45,74 +48,39 @@ LVL1CTP::ResultBuilder::~ResultBuilder() {
StatusCode
-LVL1CTP::ResultBuilder::setConfiguration( const TrigConf::CTPConfig* ctpConfig,
- const TrigConf::L1Menu* l1menu ) const
+LVL1CTP::ResultBuilder::setConfiguration( const TrigConf::L1Menu& l1menu ) const
{
ATH_MSG_DEBUG( "Set configuration with CTP version " << m_ctpVersionNumber );
- ConfigSource cfgsrc(ctpConfig, l1menu);
-
- StatusCode sc = createTriggerConfigMaps(cfgsrc);
-
- return sc;
+ return createTriggerConfigMaps(l1menu);
}
StatusCode
-LVL1CTP::ResultBuilder::createTriggerConfigMaps(const ConfigSource & cfgSrc) const {
-
- if( cfgSrc.l1menu() != nullptr ) {
-
- ATH_MSG_DEBUG("Creating trigger configuration maps from run-3-style menu");
+LVL1CTP::ResultBuilder::createTriggerConfigMaps(const TrigConf::L1Menu& l1menu) const
+{
+ ATH_MSG_DEBUG("Creating trigger configuration maps from run-3-style menu");
- std::vector<unsigned int> bg; bg.push_back( 1 );
- std::vector<unsigned int> bgEmpty; bgEmpty.push_back( 1 );
+ std::vector<unsigned int> bg{1};
+ std::vector<unsigned int> bgEmpty{1};
- // declare internal bunch group triggers
- for (size_t i = 0; i < 16; ++i) {
- auto bgrp = new BunchGroupTrigger(i, bg, m_ctpDataFormat);
- m_internalTrigger[ bgrp->name() ] = bgrp;
- }
+ // declare internal bunch group triggers
+ for (size_t i = 0; i < 16; ++i) {
+ auto bgrp = new BunchGroupTrigger(i, bg, m_ctpDataFormat);
+ m_internalTrigger[ bgrp->name() ] = bgrp;
+ }
- // declare internal random triggers
- for(int rndmIdx = 0; rndmIdx<4; rndmIdx++) {
- auto rndm = new RandomTrigger(rndmIdx, m_ctpDataFormat);
- m_internalTrigger[ rndm->name() ] = rndm;
- }
-
- // build map of name to ctp thresholds
- m_thrConfigMap = std::make_unique<ThresholdMap>( cfgSrc.l1menu() );
-
- // build map of name to ctp items
- m_itemConfigMap = std::make_unique<ItemMap>( cfgSrc.l1menu() );
-
- } else if( cfgSrc.ctpConfig() != nullptr ) {
-
- ATH_MSG_DEBUG("Creating trigger configuration maps from run-2-style menu");
-
- const std::vector<TrigConf::BunchGroup> & bunchGroups(cfgSrc.ctpConfig()->bunchGroupSet().bunchGroups());
- for (size_t i = 0; i < bunchGroups.size(); ++i) {
- std::vector<unsigned int> bunches;
- for(int b : bunchGroups[i].bunches()) {
- bunches.push_back(b);
- }
- auto bgrp = new BunchGroupTrigger(i, bunches, m_ctpDataFormat);
- m_internalTrigger[bgrp->name()] = bgrp;
- }
-
- for(int rndmIdx = 0; rndmIdx<4; rndmIdx++) {
- auto rndm = new RandomTrigger(rndmIdx, m_ctpDataFormat);
- m_internalTrigger[ rndm->name() ] = rndm;
- }
+ // declare internal random triggers
+ for(int rndmIdx = 0; rndmIdx<4; rndmIdx++) {
+ auto rndm = new RandomTrigger(rndmIdx, m_ctpDataFormat);
+ m_internalTrigger[ rndm->name() ] = rndm;
+ }
- m_thrConfigMap = std::make_unique<ThresholdMap>( cfgSrc.ctpConfig()->menu().thresholdVector());
+ // build map of name to ctp thresholds
+ m_thrConfigMap = std::make_unique<ThresholdMap>( &l1menu );
- m_itemConfigMap = std::make_unique<ItemMap>( cfgSrc.ctpConfig()->menu().itemVector(),
- cfgSrc.ctpConfig()->prescaleSet() );
- } else {
- ATH_MSG_FATAL("No L1 trigger menu was provided");
- return StatusCode::FAILURE;
- }
+ // build map of name to ctp items
+ m_itemConfigMap = std::make_unique<ItemMap>( &l1menu );
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigT1/TrigT1CTP/src/ResultBuilder.h b/Trigger/TrigT1/TrigT1CTP/src/ResultBuilder.h
index 3694457bd1e8..89597de0516a 100644
--- a/Trigger/TrigT1/TrigT1CTP/src/ResultBuilder.h
+++ b/Trigger/TrigT1/TrigT1CTP/src/ResultBuilder.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
@@ -21,9 +21,6 @@
// L1 configuration data
#include "TrigConfData/L1Menu.h"
-#include "TrigConfL1Data/CTPConfig.h"
-#include "TrigConfL1Data/Menu.h"
-#include "TrigConfL1Data/TriggerItem.h"
// Output to the RoIB:
#include "TrigT1Interfaces/CTPSLink.h"
@@ -49,8 +46,7 @@ namespace LVL1CTP {
void setRandomEngine( CLHEP::HepRandomEngine* rndmEngine );
- StatusCode setConfiguration( const TrigConf::CTPConfig* ctpConfig,
- const TrigConf::L1Menu* l1menu ) const;
+ StatusCode setConfiguration( const TrigConf::L1Menu& l1menu ) const;
StatusCode buildItemDecision( const std::map<std::string, unsigned int> & thrMultiMap,
std::map<std::string, unsigned int> & itemDecisionMap,
@@ -79,17 +75,9 @@ namespace LVL1CTP {
private:
- struct ConfigSource {
- ConfigSource(const TrigConf::CTPConfig* ctpConfig, const TrigConf::L1Menu* l1menu) : m_ctpConfig(ctpConfig), m_l1menu(l1menu) {}
- const TrigConf::CTPConfig* m_ctpConfig {nullptr}; // run 2
- const TrigConf::L1Menu * m_l1menu { nullptr }; // run 3
- const TrigConf::CTPConfig* ctpConfig() const { return m_ctpConfig; }
- const TrigConf::L1Menu* l1menu() const { return m_l1menu; }
- };
-
enum WrdType { TBP = 0x01, TAP = 0x02, TAV = 0x04 };
- StatusCode createTriggerConfigMaps(const ConfigSource & cfgSrc) const;
+ StatusCode createTriggerConfigMaps(const TrigConf::L1Menu& l1menu) const;
//! build list of fired items and dump to string
std::vector<std::string> firedItems(const std::vector<uint32_t>& triggerWords) const;
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py
index bef09fef615e..5018285a0069 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py
@@ -7,7 +7,6 @@
from AthenaCommon.Logging import logging
from AthenaCommon.CFElements import seqAND
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
from AthenaCommon import CfgMgr
def Lvl1SimulationSequence_Common( ConfigFlags ):
@@ -137,8 +136,6 @@ def Lvl1SimulationSequence_Common( ConfigFlags ):
if ConfigFlags.Trigger.L1.doCTP:
from TrigT1CTP.TrigT1CTPConfig import CTPSimulationInReco
ctp = CTPSimulationInReco("CTPSimulation")
- ctp.UseNewConfig = ConfigFlags.Trigger.readLVL1FromJSON
- ctp.TrigConfigSvc = svcMgr.LVL1ConfigSvc
ctp.DoL1CaloLegacy = ConfigFlags.Trigger.enableL1CaloLegacy # to en/disable all L1CaloLegacy treatment (Mult and Topo)
if ConfigFlags.Beam.Type == 'cosmics' and ConfigFlags.Input.isMC: # this is to allow the simulation of cosmics triggers in MC
@@ -188,7 +185,6 @@ def Lvl1SimulationSequence( ConfigFlags ):
Configure L1 simulation for Athena MT jobs
"""
- log = logging.getLogger('TriggerJobOpts.L1Simulation')
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
from TriggerJobOpts.TriggerFlags import TriggerFlags
from AthenaConfiguration.ComponentAccumulator import conf2toConfigurable
@@ -199,7 +195,6 @@ def Lvl1SimulationSequence( ConfigFlags ):
TriggerFlags.outputLVL1configFile = None
svcMgr += conf2toConfigurable(getL1ConfigSvc(ConfigFlags))
- log.info("UseNewConfig = %s", ConfigFlags.Trigger.readLVL1FromJSON)
l1SimSeq = Lvl1SimulationSequence_Common( ConfigFlags )
return l1SimSeq
--
GitLab
From 178b3fa26b68cb519f6073d0fb3811d5b21bfff1 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Wed, 30 Jun 2021 15:08:23 +0200
Subject: [PATCH 091/272] TrigT1CTMonitoring: remove support of legacy trigger
configuration
Remove usage of the legacy XML trigger configuration. Also apply some
minor package cleanups.
Relates to ATR-21862.
---
.../TrigT1/TrigT1CTMonitoring/CMakeLists.txt | 6 +-
.../data/LVL1ConfigCosmic.xml | 1645 -----------------
.../share/NtupleFragment.py | 68 -
...MonitoringJobOptions_forRecExCommission.py | 9 +-
.../TrigT1CTMonitoring/src/BSMonitoring.cxx | 102 +-
.../TrigT1CTMonitoring/src/BSMonitoring.h | 6 -
6 files changed, 30 insertions(+), 1806 deletions(-)
delete mode 100644 Trigger/TrigT1/TrigT1CTMonitoring/data/LVL1ConfigCosmic.xml
delete mode 100644 Trigger/TrigT1/TrigT1CTMonitoring/share/NtupleFragment.py
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/CMakeLists.txt b/Trigger/TrigT1/TrigT1CTMonitoring/CMakeLists.txt
index 584fadba3621..ca80d051d4cf 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/CMakeLists.txt
@@ -4,7 +4,6 @@
atlas_subdir( TrigT1CTMonitoring )
# External dependencies:
-find_package( Boost )
find_package( COOL COMPONENTS CoolKernel )
find_package( CORAL COMPONENTS CoralBase )
find_package( ROOT COMPONENTS Core MathCore Hist )
@@ -12,11 +11,10 @@ find_package( ROOT COMPONENTS Core MathCore Hist )
# Component(s) in the package:
atlas_add_component( TrigT1CTMonitoring
src/*.h src/*.cxx src/components/*.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${COOL_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${COOL_LIBRARIES} ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaMonitoringLib AthenaPoolUtilities CoraCool EventInfo GaudiKernel LWHists MuonDigitContainer MuonRDO MuonTrigCoinData TrigConfData TrigConfInterfaces TrigConfL1Data TrigConfStorage TrigT1CaloEventLib TrigT1Interfaces TrigT1Result )
+ INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${COOL_LIBRARIES} ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaMonitoringLib AthenaPoolUtilities CoraCool xAODEventInfo GaudiKernel LWHists MuonDigitContainer MuonRDO MuonTrigCoinData TrigConfData TrigConfInterfaces TrigConfL1Data TrigT1CaloEventLib TrigT1Interfaces TrigT1Result )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
-atlas_install_xmls( data/*.xml )
atlas_install_scripts( scripts/*.py )
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/data/LVL1ConfigCosmic.xml b/Trigger/TrigT1/TrigT1CTMonitoring/data/LVL1ConfigCosmic.xml
deleted file mode 100644
index 78b0d2e2e331..000000000000
--- a/Trigger/TrigT1/TrigT1CTMonitoring/data/LVL1ConfigCosmic.xml
+++ /dev/null
@@ -1,1645 +0,0 @@
-<?xml version="1.0" ?>
-<LVL1Config>
- <TriggerMenu>
- <TriggerItem ctpid="32" name="iMU00">
- <TriggerCondition multi="1" name="MU00_x1" triggerthreshold="MU00"/>
- </TriggerItem>
- <TriggerItem ctpid="33" name="iMU06">
- <TriggerCondition multi="1" name="MU06_x1" triggerthreshold="MU06"/>
- </TriggerItem>
- <TriggerItem ctpid="34" name="iMU10">
- <TriggerCondition multi="1" name="MU10_x1" triggerthreshold="MU10"/>
- </TriggerItem>
- </TriggerMenu>
- <TriggerThresholdList>
- <TriggerThreshold active="1" bitnum="3" mapping="0" name="MU00" type="MUON">
- <TriggerThresholdValue em_isolation="63" etamax="49" etamin="-49" had_isolation="63" had_veto="63" phimax="64" phimin="0" thresholdval="0" type="MUON" window="0"/>
- <Cable connector="CON0" ctpin="SLOT9" name="MU">
- <Signal range_begin="0" range_end="2"/>
- </Cable>
- </TriggerThreshold>
- <TriggerThreshold active="1" bitnum="3" mapping="1" name="MU06" type="MUON">
- <TriggerThresholdValue em_isolation="63" etamax="49" etamin="-49" had_isolation="63" had_veto="63" phimax="64" phimin="0" thresholdval="6" type="MUON" window="0"/>
- <Cable connector="CON0" ctpin="SLOT9" name="MU">
- <Signal range_begin="3" range_end="5"/>
- </Cable>
- </TriggerThreshold>
- <TriggerThreshold active="1" bitnum="3" mapping="2" name="MU10" type="MUON">
- <TriggerThresholdValue em_isolation="63" etamax="49" etamin="-49" had_isolation="63" had_veto="63" phimax="64" phimin="0" thresholdval="10" type="MUON" window="0"/>
- <Cable connector="CON0" ctpin="SLOT9" name="MU">
- <Signal range_begin="6" range_end="8"/>
- </Cable>
- </TriggerThreshold>
- <TriggerThreshold active="1" bitnum="3" mapping="3" name="MU11" type="MUON">
- <TriggerThresholdValue em_isolation="63" etamax="49" etamin="-49" had_isolation="63" had_veto="63" phimax="64" phimin="0" thresholdval="11" type="MUON" window="0"/>
- <Cable connector="CON0" ctpin="SLOT9" name="MU">
- <Signal range_begin="9" range_end="11"/>
- </Cable>
- </TriggerThreshold>
- <TriggerThreshold active="1" bitnum="3" mapping="4" name="MU20" type="MUON">
- <TriggerThresholdValue em_isolation="63" etamax="49" etamin="-49" had_isolation="63" had_veto="63" phimax="64" phimin="0" thresholdval="20" type="MUON" window="0"/>
- <Cable connector="CON0" ctpin="SLOT9" name="MU">
- <Signal range_begin="12" range_end="14"/>
- </Cable>
- </TriggerThreshold>
- <TriggerThreshold active="1" bitnum="3" mapping="5" name="MU40" type="MUON">
- <TriggerThresholdValue em_isolation="63" etamax="49" etamin="-49" had_isolation="63" had_veto="63" phimax="64" phimin="0" thresholdval="40" type="MUON" window="0"/>
- <Cable connector="CON0" ctpin="SLOT9" name="MU">
- <Signal range_begin="15" range_end="17"/>
- </Cable>
- </TriggerThreshold>
- </TriggerThresholdList>
- <PrescaleSet>
- <Prescale ctpid="0">
- 1
- </Prescale>
- <Prescale ctpid="1">
- 1
- </Prescale>
- <Prescale ctpid="2">
- 1
- </Prescale>
- <Prescale ctpid="3">
- 1
- </Prescale>
- <Prescale ctpid="4">
- 1
- </Prescale>
- <Prescale ctpid="5">
- 1
- </Prescale>
- <Prescale ctpid="6">
- 1
- </Prescale>
- <Prescale ctpid="7">
- 1
- </Prescale>
- <Prescale ctpid="8">
- 1
- </Prescale>
- <Prescale ctpid="9">
- 1
- </Prescale>
- <Prescale ctpid="10">
- 1
- </Prescale>
- <Prescale ctpid="11">
- 1
- </Prescale>
- <Prescale ctpid="12">
- 1
- </Prescale>
- <Prescale ctpid="13">
- 1
- </Prescale>
- <Prescale ctpid="14">
- 1
- </Prescale>
- <Prescale ctpid="15">
- 1
- </Prescale>
- <Prescale ctpid="16">
- 1
- </Prescale>
- <Prescale ctpid="17">
- 1
- </Prescale>
- <Prescale ctpid="18">
- 1
- </Prescale>
- <Prescale ctpid="19">
- 1
- </Prescale>
- <Prescale ctpid="20">
- 1
- </Prescale>
- <Prescale ctpid="21">
- 1
- </Prescale>
- <Prescale ctpid="22">
- 1
- </Prescale>
- <Prescale ctpid="23">
- 1
- </Prescale>
- <Prescale ctpid="24">
- 1
- </Prescale>
- <Prescale ctpid="25">
- 1
- </Prescale>
- <Prescale ctpid="26">
- 1
- </Prescale>
- <Prescale ctpid="27">
- 1
- </Prescale>
- <Prescale ctpid="28">
- 1
- </Prescale>
- <Prescale ctpid="29">
- 1
- </Prescale>
- <Prescale ctpid="30">
- 1
- </Prescale>
- <Prescale ctpid="31">
- 1
- </Prescale>
- <Prescale ctpid="32">
- 1
- </Prescale>
- <Prescale ctpid="33">
- 1
- </Prescale>
- <Prescale ctpid="34">
- 1
- </Prescale>
- <Prescale ctpid="35">
- 1
- </Prescale>
- <Prescale ctpid="36">
- 1
- </Prescale>
- <Prescale ctpid="37">
- 1
- </Prescale>
- <Prescale ctpid="38">
- 1
- </Prescale>
- <Prescale ctpid="39">
- 1
- </Prescale>
- <Prescale ctpid="40">
- 1
- </Prescale>
- <Prescale ctpid="41">
- 1
- </Prescale>
- <Prescale ctpid="42">
- 1
- </Prescale>
- <Prescale ctpid="43">
- 1
- </Prescale>
- <Prescale ctpid="44">
- 1
- </Prescale>
- <Prescale ctpid="45">
- 1
- </Prescale>
- <Prescale ctpid="46">
- 1
- </Prescale>
- <Prescale ctpid="47">
- 1
- </Prescale>
- <Prescale ctpid="48">
- 1
- </Prescale>
- <Prescale ctpid="49">
- 1
- </Prescale>
- <Prescale ctpid="50">
- 1
- </Prescale>
- <Prescale ctpid="51">
- 1
- </Prescale>
- <Prescale ctpid="52">
- 1
- </Prescale>
- <Prescale ctpid="53">
- 1
- </Prescale>
- <Prescale ctpid="54">
- 1
- </Prescale>
- <Prescale ctpid="55">
- 1
- </Prescale>
- <Prescale ctpid="56">
- 1
- </Prescale>
- <Prescale ctpid="57">
- 1
- </Prescale>
- <Prescale ctpid="58">
- 1
- </Prescale>
- <Prescale ctpid="59">
- 1
- </Prescale>
- <Prescale ctpid="60">
- 1
- </Prescale>
- <Prescale ctpid="61">
- 1
- </Prescale>
- <Prescale ctpid="62">
- 1
- </Prescale>
- <Prescale ctpid="63">
- 1
- </Prescale>
- <Prescale ctpid="64">
- 1
- </Prescale>
- <Prescale ctpid="65">
- 1
- </Prescale>
- <Prescale ctpid="66">
- 1
- </Prescale>
- <Prescale ctpid="67">
- 1
- </Prescale>
- <Prescale ctpid="68">
- 1
- </Prescale>
- <Prescale ctpid="69">
- 1
- </Prescale>
- <Prescale ctpid="70">
- 1
- </Prescale>
- <Prescale ctpid="71">
- 1
- </Prescale>
- <Prescale ctpid="72">
- 1
- </Prescale>
- <Prescale ctpid="73">
- 1
- </Prescale>
- <Prescale ctpid="74">
- 1
- </Prescale>
- <Prescale ctpid="75">
- 1
- </Prescale>
- <Prescale ctpid="76">
- 1
- </Prescale>
- <Prescale ctpid="77">
- 1
- </Prescale>
- <Prescale ctpid="78">
- 1
- </Prescale>
- <Prescale ctpid="79">
- 1
- </Prescale>
- <Prescale ctpid="80">
- 1
- </Prescale>
- <Prescale ctpid="81">
- 1
- </Prescale>
- <Prescale ctpid="82">
- 1
- </Prescale>
- <Prescale ctpid="83">
- 1
- </Prescale>
- <Prescale ctpid="84">
- 1
- </Prescale>
- <Prescale ctpid="85">
- 1
- </Prescale>
- <Prescale ctpid="86">
- 1
- </Prescale>
- <Prescale ctpid="87">
- 1
- </Prescale>
- <Prescale ctpid="88">
- 1
- </Prescale>
- <Prescale ctpid="89">
- 1
- </Prescale>
- <Prescale ctpid="90">
- 1
- </Prescale>
- <Prescale ctpid="91">
- 1
- </Prescale>
- <Prescale ctpid="92">
- 1
- </Prescale>
- <Prescale ctpid="93">
- 1
- </Prescale>
- <Prescale ctpid="94">
- 1
- </Prescale>
- <Prescale ctpid="95">
- 1
- </Prescale>
- <Prescale ctpid="96">
- 1
- </Prescale>
- <Prescale ctpid="97">
- 1
- </Prescale>
- <Prescale ctpid="98">
- 1
- </Prescale>
- <Prescale ctpid="99">
- 1
- </Prescale>
- <Prescale ctpid="100">
- 1
- </Prescale>
- <Prescale ctpid="101">
- 1
- </Prescale>
- <Prescale ctpid="102">
- 1
- </Prescale>
- <Prescale ctpid="103">
- 1
- </Prescale>
- <Prescale ctpid="104">
- 1
- </Prescale>
- <Prescale ctpid="105">
- 1
- </Prescale>
- <Prescale ctpid="106">
- 1
- </Prescale>
- <Prescale ctpid="107">
- 1
- </Prescale>
- <Prescale ctpid="108">
- 1
- </Prescale>
- <Prescale ctpid="109">
- 1
- </Prescale>
- <Prescale ctpid="110">
- 1
- </Prescale>
- <Prescale ctpid="111">
- 1
- </Prescale>
- <Prescale ctpid="112">
- 1
- </Prescale>
- <Prescale ctpid="113">
- 1
- </Prescale>
- <Prescale ctpid="114">
- 1
- </Prescale>
- <Prescale ctpid="115">
- 1
- </Prescale>
- <Prescale ctpid="116">
- 1
- </Prescale>
- <Prescale ctpid="117">
- 1
- </Prescale>
- <Prescale ctpid="118">
- 1
- </Prescale>
- <Prescale ctpid="119">
- 1
- </Prescale>
- <Prescale ctpid="120">
- 1
- </Prescale>
- <Prescale ctpid="121">
- 1
- </Prescale>
- <Prescale ctpid="122">
- 1
- </Prescale>
- <Prescale ctpid="123">
- 1
- </Prescale>
- <Prescale ctpid="124">
- 1
- </Prescale>
- <Prescale ctpid="125">
- 1
- </Prescale>
- <Prescale ctpid="126">
- 1
- </Prescale>
- <Prescale ctpid="127">
- 1
- </Prescale>
- <Prescale ctpid="128">
- 1
- </Prescale>
- <Prescale ctpid="129">
- 1
- </Prescale>
- <Prescale ctpid="130">
- 1
- </Prescale>
- <Prescale ctpid="131">
- 1
- </Prescale>
- <Prescale ctpid="132">
- 1
- </Prescale>
- <Prescale ctpid="133">
- 1
- </Prescale>
- <Prescale ctpid="134">
- 1
- </Prescale>
- <Prescale ctpid="135">
- 1
- </Prescale>
- <Prescale ctpid="136">
- 1
- </Prescale>
- <Prescale ctpid="137">
- 1
- </Prescale>
- <Prescale ctpid="138">
- 1
- </Prescale>
- <Prescale ctpid="139">
- 1
- </Prescale>
- <Prescale ctpid="140">
- 1
- </Prescale>
- <Prescale ctpid="141">
- 1
- </Prescale>
- <Prescale ctpid="142">
- 1
- </Prescale>
- <Prescale ctpid="143">
- 1
- </Prescale>
- <Prescale ctpid="144">
- 1
- </Prescale>
- <Prescale ctpid="145">
- 1
- </Prescale>
- <Prescale ctpid="146">
- 1
- </Prescale>
- <Prescale ctpid="147">
- 1
- </Prescale>
- <Prescale ctpid="148">
- 1
- </Prescale>
- <Prescale ctpid="149">
- 1
- </Prescale>
- <Prescale ctpid="150">
- 1
- </Prescale>
- <Prescale ctpid="151">
- 1
- </Prescale>
- <Prescale ctpid="152">
- 1
- </Prescale>
- <Prescale ctpid="153">
- 1
- </Prescale>
- <Prescale ctpid="154">
- 1
- </Prescale>
- <Prescale ctpid="155">
- 1
- </Prescale>
- <Prescale ctpid="156">
- 1
- </Prescale>
- <Prescale ctpid="157">
- 1
- </Prescale>
- <Prescale ctpid="158">
- 1
- </Prescale>
- <Prescale ctpid="159">
- 1
- </Prescale>
- <Prescale ctpid="160">
- 1
- </Prescale>
- <Prescale ctpid="161">
- 1
- </Prescale>
- <Prescale ctpid="162">
- 1
- </Prescale>
- <Prescale ctpid="163">
- 1
- </Prescale>
- <Prescale ctpid="164">
- 1
- </Prescale>
- <Prescale ctpid="165">
- 1
- </Prescale>
- <Prescale ctpid="166">
- 1
- </Prescale>
- <Prescale ctpid="167">
- 1
- </Prescale>
- <Prescale ctpid="168">
- 1
- </Prescale>
- <Prescale ctpid="169">
- 1
- </Prescale>
- <Prescale ctpid="170">
- 1
- </Prescale>
- <Prescale ctpid="171">
- 1
- </Prescale>
- <Prescale ctpid="172">
- 1
- </Prescale>
- <Prescale ctpid="173">
- 1
- </Prescale>
- <Prescale ctpid="174">
- 1
- </Prescale>
- <Prescale ctpid="175">
- 1
- </Prescale>
- <Prescale ctpid="176">
- 1
- </Prescale>
- <Prescale ctpid="177">
- 1
- </Prescale>
- <Prescale ctpid="178">
- 1
- </Prescale>
- <Prescale ctpid="179">
- 1
- </Prescale>
- <Prescale ctpid="180">
- 1
- </Prescale>
- <Prescale ctpid="181">
- 1
- </Prescale>
- <Prescale ctpid="182">
- 1
- </Prescale>
- <Prescale ctpid="183">
- 1
- </Prescale>
- <Prescale ctpid="184">
- 1
- </Prescale>
- <Prescale ctpid="185">
- 1
- </Prescale>
- <Prescale ctpid="186">
- 1
- </Prescale>
- <Prescale ctpid="187">
- 1
- </Prescale>
- <Prescale ctpid="188">
- 1
- </Prescale>
- <Prescale ctpid="189">
- 1
- </Prescale>
- <Prescale ctpid="190">
- 1
- </Prescale>
- <Prescale ctpid="191">
- 1
- </Prescale>
- <Prescale ctpid="192">
- 1
- </Prescale>
- <Prescale ctpid="193">
- 1
- </Prescale>
- <Prescale ctpid="194">
- 1
- </Prescale>
- <Prescale ctpid="195">
- 1
- </Prescale>
- <Prescale ctpid="196">
- 1
- </Prescale>
- <Prescale ctpid="197">
- 1
- </Prescale>
- <Prescale ctpid="198">
- 1
- </Prescale>
- <Prescale ctpid="199">
- 1
- </Prescale>
- <Prescale ctpid="200">
- 1
- </Prescale>
- <Prescale ctpid="201">
- 1
- </Prescale>
- <Prescale ctpid="202">
- 1
- </Prescale>
- <Prescale ctpid="203">
- 1
- </Prescale>
- <Prescale ctpid="204">
- 1
- </Prescale>
- <Prescale ctpid="205">
- 1
- </Prescale>
- <Prescale ctpid="206">
- 1
- </Prescale>
- <Prescale ctpid="207">
- 1
- </Prescale>
- <Prescale ctpid="208">
- 1
- </Prescale>
- <Prescale ctpid="209">
- 1
- </Prescale>
- <Prescale ctpid="210">
- 1
- </Prescale>
- <Prescale ctpid="211">
- 1
- </Prescale>
- <Prescale ctpid="212">
- 1
- </Prescale>
- <Prescale ctpid="213">
- 1
- </Prescale>
- <Prescale ctpid="214">
- 1
- </Prescale>
- <Prescale ctpid="215">
- 1
- </Prescale>
- <Prescale ctpid="216">
- 1
- </Prescale>
- <Prescale ctpid="217">
- 1
- </Prescale>
- <Prescale ctpid="218">
- 1
- </Prescale>
- <Prescale ctpid="219">
- 1
- </Prescale>
- <Prescale ctpid="220">
- 1
- </Prescale>
- <Prescale ctpid="221">
- 1
- </Prescale>
- <Prescale ctpid="222">
- 1
- </Prescale>
- <Prescale ctpid="223">
- 1
- </Prescale>
- <Prescale ctpid="224">
- 1
- </Prescale>
- <Prescale ctpid="225">
- 1
- </Prescale>
- <Prescale ctpid="226">
- 1
- </Prescale>
- <Prescale ctpid="227">
- 1
- </Prescale>
- <Prescale ctpid="228">
- 1
- </Prescale>
- <Prescale ctpid="229">
- 1
- </Prescale>
- <Prescale ctpid="230">
- 1
- </Prescale>
- <Prescale ctpid="231">
- 1
- </Prescale>
- <Prescale ctpid="232">
- 1
- </Prescale>
- <Prescale ctpid="233">
- 1
- </Prescale>
- <Prescale ctpid="234">
- 1
- </Prescale>
- <Prescale ctpid="235">
- 1
- </Prescale>
- <Prescale ctpid="236">
- 1
- </Prescale>
- <Prescale ctpid="237">
- 1
- </Prescale>
- <Prescale ctpid="238">
- 1
- </Prescale>
- <Prescale ctpid="239">
- 1
- </Prescale>
- <Prescale ctpid="240">
- 1
- </Prescale>
- <Prescale ctpid="241">
- 1
- </Prescale>
- <Prescale ctpid="242">
- 1
- </Prescale>
- <Prescale ctpid="243">
- 1
- </Prescale>
- <Prescale ctpid="244">
- 1
- </Prescale>
- <Prescale ctpid="245">
- 1
- </Prescale>
- <Prescale ctpid="246">
- 1
- </Prescale>
- <Prescale ctpid="247">
- 1
- </Prescale>
- <Prescale ctpid="248">
- 1
- </Prescale>
- <Prescale ctpid="249">
- 1
- </Prescale>
- <Prescale ctpid="250">
- 1
- </Prescale>
- <Prescale ctpid="251">
- 1
- </Prescale>
- <Prescale ctpid="252">
- 1
- </Prescale>
- <Prescale ctpid="253">
- 1
- </Prescale>
- <Prescale ctpid="254">
- 1
- </Prescale>
- <Prescale ctpid="255">
- 1
- </Prescale>
- </PrescaleSet>
- <PrioritySet>
- <Priority ctpid="0">
- LOW
- </Priority>
- <Priority ctpid="1">
- LOW
- </Priority>
- <Priority ctpid="2">
- LOW
- </Priority>
- <Priority ctpid="3">
- LOW
- </Priority>
- <Priority ctpid="4">
- LOW
- </Priority>
- <Priority ctpid="5">
- LOW
- </Priority>
- <Priority ctpid="6">
- LOW
- </Priority>
- <Priority ctpid="7">
- LOW
- </Priority>
- <Priority ctpid="8">
- LOW
- </Priority>
- <Priority ctpid="9">
- LOW
- </Priority>
- <Priority ctpid="10">
- LOW
- </Priority>
- <Priority ctpid="11">
- LOW
- </Priority>
- <Priority ctpid="12">
- LOW
- </Priority>
- <Priority ctpid="13">
- LOW
- </Priority>
- <Priority ctpid="14">
- LOW
- </Priority>
- <Priority ctpid="15">
- LOW
- </Priority>
- <Priority ctpid="16">
- LOW
- </Priority>
- <Priority ctpid="17">
- LOW
- </Priority>
- <Priority ctpid="18">
- LOW
- </Priority>
- <Priority ctpid="19">
- LOW
- </Priority>
- <Priority ctpid="20">
- LOW
- </Priority>
- <Priority ctpid="21">
- LOW
- </Priority>
- <Priority ctpid="22">
- LOW
- </Priority>
- <Priority ctpid="23">
- LOW
- </Priority>
- <Priority ctpid="24">
- LOW
- </Priority>
- <Priority ctpid="25">
- LOW
- </Priority>
- <Priority ctpid="26">
- LOW
- </Priority>
- <Priority ctpid="27">
- LOW
- </Priority>
- <Priority ctpid="28">
- LOW
- </Priority>
- <Priority ctpid="29">
- LOW
- </Priority>
- <Priority ctpid="30">
- LOW
- </Priority>
- <Priority ctpid="31">
- LOW
- </Priority>
- <Priority ctpid="32">
- LOW
- </Priority>
- <Priority ctpid="33">
- LOW
- </Priority>
- <Priority ctpid="34">
- LOW
- </Priority>
- <Priority ctpid="35">
- LOW
- </Priority>
- <Priority ctpid="36">
- LOW
- </Priority>
- <Priority ctpid="37">
- LOW
- </Priority>
- <Priority ctpid="38">
- LOW
- </Priority>
- <Priority ctpid="39">
- LOW
- </Priority>
- <Priority ctpid="40">
- LOW
- </Priority>
- <Priority ctpid="41">
- LOW
- </Priority>
- <Priority ctpid="42">
- LOW
- </Priority>
- <Priority ctpid="43">
- LOW
- </Priority>
- <Priority ctpid="44">
- LOW
- </Priority>
- <Priority ctpid="45">
- LOW
- </Priority>
- <Priority ctpid="46">
- LOW
- </Priority>
- <Priority ctpid="47">
- LOW
- </Priority>
- <Priority ctpid="48">
- LOW
- </Priority>
- <Priority ctpid="49">
- LOW
- </Priority>
- <Priority ctpid="50">
- LOW
- </Priority>
- <Priority ctpid="51">
- LOW
- </Priority>
- <Priority ctpid="52">
- LOW
- </Priority>
- <Priority ctpid="53">
- LOW
- </Priority>
- <Priority ctpid="54">
- LOW
- </Priority>
- <Priority ctpid="55">
- LOW
- </Priority>
- <Priority ctpid="56">
- LOW
- </Priority>
- <Priority ctpid="57">
- LOW
- </Priority>
- <Priority ctpid="58">
- LOW
- </Priority>
- <Priority ctpid="59">
- LOW
- </Priority>
- <Priority ctpid="60">
- LOW
- </Priority>
- <Priority ctpid="61">
- LOW
- </Priority>
- <Priority ctpid="62">
- LOW
- </Priority>
- <Priority ctpid="63">
- LOW
- </Priority>
- <Priority ctpid="64">
- LOW
- </Priority>
- <Priority ctpid="65">
- LOW
- </Priority>
- <Priority ctpid="66">
- LOW
- </Priority>
- <Priority ctpid="67">
- LOW
- </Priority>
- <Priority ctpid="68">
- LOW
- </Priority>
- <Priority ctpid="69">
- LOW
- </Priority>
- <Priority ctpid="70">
- LOW
- </Priority>
- <Priority ctpid="71">
- LOW
- </Priority>
- <Priority ctpid="72">
- LOW
- </Priority>
- <Priority ctpid="73">
- LOW
- </Priority>
- <Priority ctpid="74">
- LOW
- </Priority>
- <Priority ctpid="75">
- LOW
- </Priority>
- <Priority ctpid="76">
- LOW
- </Priority>
- <Priority ctpid="77">
- LOW
- </Priority>
- <Priority ctpid="78">
- LOW
- </Priority>
- <Priority ctpid="79">
- LOW
- </Priority>
- <Priority ctpid="80">
- LOW
- </Priority>
- <Priority ctpid="81">
- LOW
- </Priority>
- <Priority ctpid="82">
- LOW
- </Priority>
- <Priority ctpid="83">
- LOW
- </Priority>
- <Priority ctpid="84">
- LOW
- </Priority>
- <Priority ctpid="85">
- LOW
- </Priority>
- <Priority ctpid="86">
- LOW
- </Priority>
- <Priority ctpid="87">
- LOW
- </Priority>
- <Priority ctpid="88">
- LOW
- </Priority>
- <Priority ctpid="89">
- LOW
- </Priority>
- <Priority ctpid="90">
- LOW
- </Priority>
- <Priority ctpid="91">
- LOW
- </Priority>
- <Priority ctpid="92">
- LOW
- </Priority>
- <Priority ctpid="93">
- LOW
- </Priority>
- <Priority ctpid="94">
- LOW
- </Priority>
- <Priority ctpid="95">
- LOW
- </Priority>
- <Priority ctpid="96">
- LOW
- </Priority>
- <Priority ctpid="97">
- LOW
- </Priority>
- <Priority ctpid="98">
- LOW
- </Priority>
- <Priority ctpid="99">
- LOW
- </Priority>
- <Priority ctpid="100">
- LOW
- </Priority>
- <Priority ctpid="101">
- LOW
- </Priority>
- <Priority ctpid="102">
- LOW
- </Priority>
- <Priority ctpid="103">
- LOW
- </Priority>
- <Priority ctpid="104">
- LOW
- </Priority>
- <Priority ctpid="105">
- LOW
- </Priority>
- <Priority ctpid="106">
- LOW
- </Priority>
- <Priority ctpid="107">
- LOW
- </Priority>
- <Priority ctpid="108">
- LOW
- </Priority>
- <Priority ctpid="109">
- LOW
- </Priority>
- <Priority ctpid="110">
- LOW
- </Priority>
- <Priority ctpid="111">
- LOW
- </Priority>
- <Priority ctpid="112">
- LOW
- </Priority>
- <Priority ctpid="113">
- LOW
- </Priority>
- <Priority ctpid="114">
- LOW
- </Priority>
- <Priority ctpid="115">
- LOW
- </Priority>
- <Priority ctpid="116">
- LOW
- </Priority>
- <Priority ctpid="117">
- LOW
- </Priority>
- <Priority ctpid="118">
- LOW
- </Priority>
- <Priority ctpid="119">
- LOW
- </Priority>
- <Priority ctpid="120">
- LOW
- </Priority>
- <Priority ctpid="121">
- LOW
- </Priority>
- <Priority ctpid="122">
- LOW
- </Priority>
- <Priority ctpid="123">
- LOW
- </Priority>
- <Priority ctpid="124">
- LOW
- </Priority>
- <Priority ctpid="125">
- LOW
- </Priority>
- <Priority ctpid="126">
- LOW
- </Priority>
- <Priority ctpid="127">
- LOW
- </Priority>
- <Priority ctpid="128">
- LOW
- </Priority>
- <Priority ctpid="129">
- LOW
- </Priority>
- <Priority ctpid="130">
- LOW
- </Priority>
- <Priority ctpid="131">
- LOW
- </Priority>
- <Priority ctpid="132">
- LOW
- </Priority>
- <Priority ctpid="133">
- LOW
- </Priority>
- <Priority ctpid="134">
- LOW
- </Priority>
- <Priority ctpid="135">
- LOW
- </Priority>
- <Priority ctpid="136">
- LOW
- </Priority>
- <Priority ctpid="137">
- LOW
- </Priority>
- <Priority ctpid="138">
- LOW
- </Priority>
- <Priority ctpid="139">
- LOW
- </Priority>
- <Priority ctpid="140">
- LOW
- </Priority>
- <Priority ctpid="141">
- LOW
- </Priority>
- <Priority ctpid="142">
- LOW
- </Priority>
- <Priority ctpid="143">
- LOW
- </Priority>
- <Priority ctpid="144">
- LOW
- </Priority>
- <Priority ctpid="145">
- LOW
- </Priority>
- <Priority ctpid="146">
- LOW
- </Priority>
- <Priority ctpid="147">
- LOW
- </Priority>
- <Priority ctpid="148">
- LOW
- </Priority>
- <Priority ctpid="149">
- LOW
- </Priority>
- <Priority ctpid="150">
- LOW
- </Priority>
- <Priority ctpid="151">
- LOW
- </Priority>
- <Priority ctpid="152">
- LOW
- </Priority>
- <Priority ctpid="153">
- LOW
- </Priority>
- <Priority ctpid="154">
- LOW
- </Priority>
- <Priority ctpid="155">
- LOW
- </Priority>
- <Priority ctpid="156">
- LOW
- </Priority>
- <Priority ctpid="157">
- LOW
- </Priority>
- <Priority ctpid="158">
- LOW
- </Priority>
- <Priority ctpid="159">
- LOW
- </Priority>
- <Priority ctpid="160">
- LOW
- </Priority>
- <Priority ctpid="161">
- LOW
- </Priority>
- <Priority ctpid="162">
- LOW
- </Priority>
- <Priority ctpid="163">
- LOW
- </Priority>
- <Priority ctpid="164">
- LOW
- </Priority>
- <Priority ctpid="165">
- LOW
- </Priority>
- <Priority ctpid="166">
- LOW
- </Priority>
- <Priority ctpid="167">
- LOW
- </Priority>
- <Priority ctpid="168">
- LOW
- </Priority>
- <Priority ctpid="169">
- LOW
- </Priority>
- <Priority ctpid="170">
- LOW
- </Priority>
- <Priority ctpid="171">
- LOW
- </Priority>
- <Priority ctpid="172">
- LOW
- </Priority>
- <Priority ctpid="173">
- LOW
- </Priority>
- <Priority ctpid="174">
- LOW
- </Priority>
- <Priority ctpid="175">
- LOW
- </Priority>
- <Priority ctpid="176">
- LOW
- </Priority>
- <Priority ctpid="177">
- LOW
- </Priority>
- <Priority ctpid="178">
- LOW
- </Priority>
- <Priority ctpid="179">
- LOW
- </Priority>
- <Priority ctpid="180">
- LOW
- </Priority>
- <Priority ctpid="181">
- LOW
- </Priority>
- <Priority ctpid="182">
- LOW
- </Priority>
- <Priority ctpid="183">
- LOW
- </Priority>
- <Priority ctpid="184">
- LOW
- </Priority>
- <Priority ctpid="185">
- LOW
- </Priority>
- <Priority ctpid="186">
- LOW
- </Priority>
- <Priority ctpid="187">
- LOW
- </Priority>
- <Priority ctpid="188">
- LOW
- </Priority>
- <Priority ctpid="189">
- LOW
- </Priority>
- <Priority ctpid="190">
- LOW
- </Priority>
- <Priority ctpid="191">
- LOW
- </Priority>
- <Priority ctpid="192">
- LOW
- </Priority>
- <Priority ctpid="193">
- LOW
- </Priority>
- <Priority ctpid="194">
- LOW
- </Priority>
- <Priority ctpid="195">
- LOW
- </Priority>
- <Priority ctpid="196">
- LOW
- </Priority>
- <Priority ctpid="197">
- LOW
- </Priority>
- <Priority ctpid="198">
- LOW
- </Priority>
- <Priority ctpid="199">
- LOW
- </Priority>
- <Priority ctpid="200">
- LOW
- </Priority>
- <Priority ctpid="201">
- LOW
- </Priority>
- <Priority ctpid="202">
- LOW
- </Priority>
- <Priority ctpid="203">
- LOW
- </Priority>
- <Priority ctpid="204">
- LOW
- </Priority>
- <Priority ctpid="205">
- LOW
- </Priority>
- <Priority ctpid="206">
- LOW
- </Priority>
- <Priority ctpid="207">
- LOW
- </Priority>
- <Priority ctpid="208">
- LOW
- </Priority>
- <Priority ctpid="209">
- LOW
- </Priority>
- <Priority ctpid="210">
- LOW
- </Priority>
- <Priority ctpid="211">
- LOW
- </Priority>
- <Priority ctpid="212">
- LOW
- </Priority>
- <Priority ctpid="213">
- LOW
- </Priority>
- <Priority ctpid="214">
- LOW
- </Priority>
- <Priority ctpid="215">
- LOW
- </Priority>
- <Priority ctpid="216">
- LOW
- </Priority>
- <Priority ctpid="217">
- LOW
- </Priority>
- <Priority ctpid="218">
- LOW
- </Priority>
- <Priority ctpid="219">
- LOW
- </Priority>
- <Priority ctpid="220">
- LOW
- </Priority>
- <Priority ctpid="221">
- LOW
- </Priority>
- <Priority ctpid="222">
- LOW
- </Priority>
- <Priority ctpid="223">
- LOW
- </Priority>
- <Priority ctpid="224">
- LOW
- </Priority>
- <Priority ctpid="225">
- LOW
- </Priority>
- <Priority ctpid="226">
- LOW
- </Priority>
- <Priority ctpid="227">
- LOW
- </Priority>
- <Priority ctpid="228">
- LOW
- </Priority>
- <Priority ctpid="229">
- LOW
- </Priority>
- <Priority ctpid="230">
- LOW
- </Priority>
- <Priority ctpid="231">
- LOW
- </Priority>
- <Priority ctpid="232">
- LOW
- </Priority>
- <Priority ctpid="233">
- LOW
- </Priority>
- <Priority ctpid="234">
- LOW
- </Priority>
- <Priority ctpid="235">
- LOW
- </Priority>
- <Priority ctpid="236">
- LOW
- </Priority>
- <Priority ctpid="237">
- LOW
- </Priority>
- <Priority ctpid="238">
- LOW
- </Priority>
- <Priority ctpid="239">
- LOW
- </Priority>
- <Priority ctpid="240">
- LOW
- </Priority>
- <Priority ctpid="241">
- LOW
- </Priority>
- <Priority ctpid="242">
- LOW
- </Priority>
- <Priority ctpid="243">
- LOW
- </Priority>
- <Priority ctpid="244">
- LOW
- </Priority>
- <Priority ctpid="245">
- LOW
- </Priority>
- <Priority ctpid="246">
- LOW
- </Priority>
- <Priority ctpid="247">
- LOW
- </Priority>
- <Priority ctpid="248">
- LOW
- </Priority>
- <Priority ctpid="249">
- LOW
- </Priority>
- <Priority ctpid="250">
- LOW
- </Priority>
- <Priority ctpid="251">
- LOW
- </Priority>
- <Priority ctpid="252">
- LOW
- </Priority>
- <Priority ctpid="253">
- LOW
- </Priority>
- <Priority ctpid="254">
- LOW
- </Priority>
- <Priority ctpid="255">
- LOW
- </Priority>
- </PrioritySet>
- <Random rate1="0" rate2="0"/>
- <BunchGroupSet/>
- <PrescaledClock clock1="0" clock2="0"/>
- <MuctpiInfo>
- <low_pt>
- 1
- </low_pt>
- <high_pt>
- 1
- </high_pt>
- <max_cand>
- 13
- </max_cand>
- </MuctpiInfo>
- <CaloInfo global_scale="1.0">
- <JetWeight num="1">
- 0
- </JetWeight>
- <JetWeight num="2">
- 0
- </JetWeight>
- <JetWeight num="3">
- 0
- </JetWeight>
- <JetWeight num="4">
- 0
- </JetWeight>
- <JetWeight num="5">
- 0
- </JetWeight>
- <JetWeight num="6">
- 0
- </JetWeight>
- <JetWeight num="7">
- 0
- </JetWeight>
- <JetWeight num="8">
- 0
- </JetWeight>
- <JetWeight num="9">
- 0
- </JetWeight>
- <JetWeight num="10">
- 0
- </JetWeight>
- <JetWeight num="11">
- 0
- </JetWeight>
- <JetWeight num="12">
- 0
- </JetWeight>
- </CaloInfo>
- <Deadtime complex1_level="0" complex1_rate="0" complex2_level="0" complex2_rate="0" simple="0"/>
-</LVL1Config>
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/share/NtupleFragment.py b/Trigger/TrigT1/TrigT1CTMonitoring/share/NtupleFragment.py
deleted file mode 100644
index 912be4803f1d..000000000000
--- a/Trigger/TrigT1/TrigT1CTMonitoring/share/NtupleFragment.py
+++ /dev/null
@@ -1,68 +0,0 @@
-#==============================================================
-#
-# Job options file
-#
-# @file NtupleFragment.py
-#
-# @brief Includes CTP and MuCTPI ntuple algorithms.
-#
-# @author David Berge <berge@cern.ch>
-#
-#==============================================================
-
-include( "TrigT1CTMonitoring/CTPFlags.py" )
-
-## to decode the MuCTPI bytestream
-from TrigT1ResultByteStream.TrigT1ResultByteStreamConf import MuCTPIByteStreamTool,RecMuCTPIByteStreamTool
-## to decode the CTP bytestream
-from TrigT1ResultByteStream.TrigT1ResultByteStreamConf import CTPByteStreamTool,RecCTPByteStreamTool
-
-
-if hasattr(svcMgr,"LVL1ConfigSvc"):
- log.info("From TrigT1CTMonitoring NtupleFragment, ServiceMgr already includes LVL1ConfigSvc")
-else:
- log.info("From TrigT1CTMonitoring NtupleFragment, setup LVL1ConfigSvc and add instance to ServiceMgr")
- from TrigConfigSvc.TrigConfigSvcConfig import LVL1ConfigSvc
- LVL1ConfigSvc = LVL1ConfigSvc('LVL1ConfigSvc')
- svcMgr += LVL1ConfigSvc
-
-svcMgr.LVL1ConfigSvc.ConfigSource = "XML"
-from TriggerJobOpts.TriggerFlags import TriggerFlags as tf
-tf.inputLVL1configFile = "LVL1config_SingleBeam_v1_7-bit_trigger_types_20080905.xml"
-svcMgr.LVL1ConfigSvc.XMLFile = tf.inputLVL1configFile()
-svcMgr.LVL1ConfigSvc.CreateLegacyObjects = True
-svcMgr.LVL1ConfigSvc.DumpTTVmap = False
-
-if CBNTAthenaAware :
-
- if CTPFlags.doMuRDO:
- if not "CBNTAA_ReadMuCTPI_RDO/CBNTAA_ReadMuCTPI_RDO" in CBNT_AthenaAware.Members :
- from TrigT1Muctpi.TrigT1MuctpiConf import CBNTAA_ReadMuCTPI_RDO
- CBNTAA_ReadMuCTPI_RDO = CBNTAA_ReadMuCTPI_RDO()
- CBNTAA_ReadMuCTPI_RDO.StoreRawData = False
- CBNT_AthenaAware += CBNTAA_ReadMuCTPI_RDO
-
- if CTPFlags.doMuRIO:
- if not "CBNTAA_ReadMuCTPI_RIO/CBNTAA_ReadMuCTPI_RIO" in CBNT_AthenaAware.Members :
- from TrigT1Muctpi.TrigT1MuctpiConf import CBNTAA_ReadMuCTPI_RIO
- CBNTAA_ReadMuCTPI_RIO = CBNTAA_ReadMuCTPI_RIO()
- CBNT_AthenaAware += CBNTAA_ReadMuCTPI_RIO
-
- if rec.doMuon:
- if not "CBNTAA_MuctpiRoI/CBNTAA_MuctpiRoI" in CBNT_AthenaAware.Members :
- from TrigT1Muctpi.TrigT1MuctpiConf import CBNTAA_MuctpiRoI
- CBNTAA_MuctpiRoI = CBNTAA_MuctpiRoI()
- # CBNTAA_MuctpiRoI.RoISource = "roi"
- CBNT_AthenaAware += CBNTAA_MuctpiRoI
-
- if CTPFlags.doCTRDO:
- if not "LVL1CTP::CBNTAA_CTP_RDO/LVL1CTP::CBNTAA_CTP_RDO" in CBNT_AthenaAware.Members :
- from TrigT1CTP.TrigT1CTPConf import LVL1CTP__CBNTAA_CTP_RDO
- CBNTAA_CTP_RDO = LVL1CTP__CBNTAA_CTP_RDO("CBNTAA_CTP_RDO")
- CBNT_AthenaAware += CBNTAA_CTP_RDO
-
- if CTPFlags.doCTRIO:
- if not "LVL1CTP::CBNTAA_ReadCTP_RIO/LVL1CTP::CBNTAA_ReadCTP_RIO" in CBNT_AthenaAware.Members :
- from TrigT1CTP.TrigT1CTPConf import LVL1CTP__CBNTAA_ReadCTP_RIO
- LVL1CTP__CBNTAA_ReadCTP_RIO = LVL1CTP__CBNTAA_ReadCTP_RIO()
- CBNT_AthenaAware += LVL1CTP__CBNTAA_ReadCTP_RIO
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions_forRecExCommission.py b/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions_forRecExCommission.py
index 0f5133b45664..d7a2a47c02f0 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions_forRecExCommission.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions_forRecExCommission.py
@@ -163,9 +163,8 @@ if athenaCommonFlags.isOnline():
ProcessCTPData=True,
ProcessRoIBResult=True,
InclusiveTriggerThresholds=True,
- FillStateCoolFolderName=UsedFillStateCoolFolderName,
- UseNewConfig = ConfigFlags.Trigger.readLVL1FromJSON )
-
+ FillStateCoolFolderName=UsedFillStateCoolFolderName )
+
printfunc (topSequence)
printfunc (svcMgr)
@@ -259,10 +258,6 @@ else:
CompareRerun = False,
FillStateCoolFolderName=UsedFillStateCoolFolderName)
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
- CTBSMonTool.UseNewConfig = ConfigFlags.Trigger.readLVL1FromJSON
-
-
processByteStream = True
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.cxx b/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.cxx
index ecec3ad91244..4d1c55728f9f 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.cxx
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.cxx
@@ -2,9 +2,6 @@
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-/// Gaudi includes
-#include "GaudiKernel/GaudiException.h"
-
// Package includes
#include "BSMonitoring.h"
#include "TrigT1Result/MuCTPI_DataWord_Decoder.h"
@@ -12,9 +9,6 @@
#include "TrigT1Result/CTP_Decoder.h"
// TrigConf includes
-#include "TrigConfL1Data/CTPConfig.h"
-#include "TrigConfL1Data/Menu.h"
-#include "TrigConfStorage/TrigConfCoolFolderSpec.h"
#include "TrigConfData/L1Menu.h"
// COOL includes
@@ -31,8 +25,6 @@
#include "CoraCool/CoraCoolObject.h"
#include "CoralBase/Blob.h"
-#include "AthenaPoolUtilities/CondAttrListCollection.h"
-
// ROOT includes
#include "Rtypes.h" // for Int_t
#include "TH1F.h" // for SetRangeUser
@@ -47,8 +39,6 @@
#include "AthenaMonitoring/AthenaMonManager.h" //for environment
#include <cmath>
-#include "boost/lexical_cast.hpp"
-
using namespace std;
@@ -62,10 +52,6 @@ TrigT1CTMonitoring::BSMonitoring::initialize()
// make sure to call initialize of the base class!
ATH_CHECK( ManagedMonitorToolBase::initialize() );
-
- // connect to the config service
- ATH_CHECK( m_configSvc.retrieve() );
-
// connect to RPC and TGC RoI tools
if ( m_processMuctpi ) {
ATH_CHECK( m_rpcRoiTool.retrieve() );
@@ -440,19 +426,11 @@ TrigT1CTMonitoring::BSMonitoring::initCtpHistograms()
// bin lables
TH1F_LW* l1ItemsBPSimMismatch = getTH1("l1ItemsBPSimMismatch");
- if(m_useNewConfig) {
- const TrigConf::L1Menu * l1menu = nullptr;
- ATH_CHECK(detStore()->retrieve(l1menu));
- for(const TrigConf::L1Item & item : *l1menu) {
- string label = item.name() + " (CTP ID " + boost::lexical_cast<string,int>(item.ctpId())+ ")";
- l1ItemsBPSimMismatch->GetXaxis()->SetBinLabel(item.ctpId()+1,label.c_str());
- }
- } else {
- for(const TrigConf::TriggerItem * item : m_configSvc->ctpConfig()->menu().itemVector()) {
- if(item==nullptr) continue;
- string label = item->name() + " (CTP ID " + boost::lexical_cast<string,int>(item->ctpId())+ ")";
- l1ItemsBPSimMismatch->GetXaxis()->SetBinLabel(item->ctpId()+1,label.c_str());
- }
+ const TrigConf::L1Menu * l1menu = nullptr;
+ ATH_CHECK(detStore()->retrieve(l1menu));
+ for(const TrigConf::L1Item & item : *l1menu) {
+ string label = item.name() + " (CTP ID " + std::to_string(item.ctpId())+ ")";
+ l1ItemsBPSimMismatch->GetXaxis()->SetBinLabel(item.ctpId()+1,label.c_str());
}
std::map<int, std::string> errorSummaryBinLabels;
errorSummaryBinLabels[1] = "CTP/ROD BCID Offset";
@@ -1704,57 +1682,29 @@ TrigT1CTMonitoring::BSMonitoring::compareRerun(const CTP_BC &bunchCrossing)
const std::bitset<512> currentTBP_rerun(ctp_bc_rerun.at(0).getTBP());
if ( currentTBP != currentTBP_rerun ) {
- if(m_useNewConfig) {
- const TrigConf::L1Menu * l1menu = nullptr;
- ATH_CHECK(detStore()->retrieve(l1menu));
- for(const TrigConf::L1Item & item : *l1menu) {
-
- //do not include random and non-simulated triggers in this test (can be configured)
- bool skip = item.definition().find("RNDM") != string::npos;
- for(const std::string & p : m_ignorePatterns) {
- if(item.name().find(p) != string::npos) {
- skip = true;
- break;
- }
- }
- if( skip ) continue;
-
- bool tbp = currentTBP.test( item.ctpId() );
- bool tbp_rerun = currentTBP_rerun.test( item.ctpId() );
- if ( tbp != tbp_rerun) {
- ATH_MSG_WARNING( "CTPSimulation TBP / TPB_rerun mismatch!! For L1Item '" << item.name()
- << "' (CTP ID " << item.ctpId() << "): data="
- << (tbp?"pass":"fail") << " != simulation=" << (tbp_rerun?"pass":"fail"));
- itemMismatch=true;
- l1ItemsBPSimMismatch->Fill(item.ctpId(),1);
- l1ItemsBPSimMismatchItems->getROOTHist()->Fill( (item.name()).c_str(), 1 );
+ const TrigConf::L1Menu * l1menu = nullptr;
+ ATH_CHECK(detStore()->retrieve(l1menu));
+ for(const TrigConf::L1Item & item : *l1menu) {
+
+ //do not include random and non-simulated triggers in this test (can be configured)
+ bool skip = item.definition().find("RNDM") != string::npos;
+ for(const std::string & p : m_ignorePatterns) {
+ if(item.name().find(p) != string::npos) {
+ skip = true;
+ break;
}
}
- } else {
- for ( TrigConf::TriggerItem* item: m_configSvc->ctpConfig()->menu().items() ) {
- std::vector<unsigned int> randoms;
- item->topNode()->getAllRandomTriggers(randoms);
-
- //do not include random and non-simulated triggers in this test (can be configured)
- bool skip = randoms.size()>0;
- for(const std::string & p : m_ignorePatterns) {
- if(item->name().find(p) != string::npos) {
- skip = true;
- break;
- }
- }
- if( skip ) continue;
-
- bool tbp = currentTBP.test( item->ctpId() );
- bool tbp_rerun = currentTBP_rerun.test( item->ctpId() );
- if ( tbp != tbp_rerun) {
- ATH_MSG_WARNING( "CTPSimulation TBP / TPB_rerun mismatch!! For L1Item '" << item->name()
- << "' (CTP ID " << item->ctpId() << "): data="
- << (tbp?"pass":"fail") << " != simulation=" << (tbp_rerun?"pass":"fail"));
- itemMismatch=true;
- l1ItemsBPSimMismatch->Fill(item->ctpId(),1);
- l1ItemsBPSimMismatchItems->getROOTHist()->Fill( (item->name()).c_str(), 1 );
- }
+ if( skip ) continue;
+
+ bool tbp = currentTBP.test( item.ctpId() );
+ bool tbp_rerun = currentTBP_rerun.test( item.ctpId() );
+ if ( tbp != tbp_rerun) {
+ ATH_MSG_WARNING( "CTPSimulation TBP / TPB_rerun mismatch!! For L1Item '" << item.name()
+ << "' (CTP ID " << item.ctpId() << "): data="
+ << (tbp?"pass":"fail") << " != simulation=" << (tbp_rerun?"pass":"fail"));
+ itemMismatch=true;
+ l1ItemsBPSimMismatch->Fill(item.ctpId(),1);
+ l1ItemsBPSimMismatchItems->getROOTHist()->Fill( (item.name()).c_str(), 1 );
}
}
}
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.h b/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.h
index c6773b8a33f0..a6c522653a7e 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.h
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.h
@@ -15,7 +15,6 @@
#include "AthenaMonitoring/ManagedMonitorToolBase.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
#include "CoolKernel/IFolder.h"
#include "CoolKernel/ChannelSelection.h"
#include "CoolKernel/IObjectIterator.h"
@@ -34,8 +33,6 @@
#include "MuonRDO/RpcSectorLogicContainer.h"
#include "MuonDigitContainer/TgcDigit.h"
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
-
class CTP_RDO;
class CTP_RIO;
class MuCTPI_RDO;
@@ -167,7 +164,6 @@ namespace TrigT1CTMonitoring {
unsigned int m_runNumber{0};
unsigned int m_eventNumber{0};
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc{ this, "TrigConfigSvc", "TrigConf::TrigConfigSvc/TrigConfigSvc", "Trigger Config Service" };
ToolHandle< LVL1::ITrigT1MuonRecRoiTool > m_rpcRoiTool{ this, "RPCRecRoiTool", "LVL1::TrigT1RPCRecRoiTool/TrigT1RPCRecRoiTool", "RPC Rec Roi Tool"};
ToolHandle< LVL1::ITrigT1MuonRecRoiTool > m_tgcRoiTool{ this, "TGCRecRoiTool", "LVL1::TrigT1TGCRecRoiTool/TrigT1TGCRecRoiTool", "TGC Rec Roi Tool"};
@@ -181,8 +177,6 @@ namespace TrigT1CTMonitoring {
SG::ReadHandleKey<Muon::TgcCoinDataContainer> m_TGCContainerKey{ this, "TGCContainerKey", "TrigT1CoinDataCollection" };
SG::ReadHandleKey<xAOD::EventInfo> m_EventInfoKey{ this,"EventInfoKey", "EventInfo" };
- Gaudi::Property<bool> m_useNewConfig { this, "UseNewConfig", false, "When true, read the menu from detector store, when false use the L1ConfigSvc" };
-
Gaudi::Property<std::string> m_baseDirName{ this, "DirectoryName", "CT/", "Directory in output root file where the histograms will be stored." };
Gaudi::Property<bool> m_inclusiveTriggerThresholds{ this, "InclusiveTriggerThresholds", true, "Flag to activate the inclusive counting of PT thresholds in trigger patterns" };
Gaudi::Property<bool> m_processMuctpi{ this, "ProcessMuctpiData", true, "Flag to activate the processing of Muctpi data" };
--
GitLab
From e3aee6576fa7dc3216f89f8c35350934e880b687 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Thu, 1 Jul 2021 16:44:18 +0200
Subject: [PATCH 092/272] TrigT1MBTS: remove support of legacy trigger
configuration
Remove support of obsolete XML trigger configuration in MBTS simulation.
Relates to ATR-21862.
---
.../python/TrigT1CaloSimRun2Config.py | 2 +-
Trigger/TrigT1/TrigT1MBTS/src/TrigT1MBTS.cxx | 205 +++++-------------
Trigger/TrigT1/TrigT1MBTS/src/TrigT1MBTS.h | 9 +-
.../python/Lvl1SimulationConfig.py | 4 +-
4 files changed, 53 insertions(+), 167 deletions(-)
diff --git a/Trigger/TrigT1/TrigT1CaloSim/python/TrigT1CaloSimRun2Config.py b/Trigger/TrigT1/TrigT1CaloSim/python/TrigT1CaloSimRun2Config.py
index 64aa2705a0c5..5db64bf333b1 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/python/TrigT1CaloSimRun2Config.py
+++ b/Trigger/TrigT1/TrigT1CaloSim/python/TrigT1CaloSimRun2Config.py
@@ -137,7 +137,7 @@ def L1LegacyCaloSimCfg(flags):
acc.addEventAlgo(CompFactory.LVL1.EnergyCMX('EnergyCMX'))
acc.addEventAlgo(CompFactory.LVL1.RoIROD('RoIROD'))
if flags.Input.isMC:
- acc.addEventAlgo(CompFactory.LVL1.TrigT1MBTS(UseNewConfig = flags.Trigger.readLVL1FromJSON))
+ acc.addEventAlgo(CompFactory.LVL1.TrigT1MBTS())
return acc
if __name__ == '__main__':
diff --git a/Trigger/TrigT1/TrigT1MBTS/src/TrigT1MBTS.cxx b/Trigger/TrigT1/TrigT1MBTS/src/TrigT1MBTS.cxx
index 6d254c8e11ac..f3817a584f7e 100644
--- a/Trigger/TrigT1/TrigT1MBTS/src/TrigT1MBTS.cxx
+++ b/Trigger/TrigT1/TrigT1MBTS/src/TrigT1MBTS.cxx
@@ -1,9 +1,8 @@
-// Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+// Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
#include "TrigT1MBTS.h"
#include "TrigT1Interfaces/MbtsCTP.h"
-#include "TrigConfL1Data/ThresholdConfig.h"
#include "TrigT1Interfaces/TrigT1StoreGateKeys.h"
#include "TrigConfData/L1Menu.h"
@@ -19,9 +18,6 @@ StatusCode
LVL1::TrigT1MBTS::initialize()
{
ATH_MSG_INFO("Initialising TrigT1MBTS, name = " << name());
- ATH_MSG_INFO("UseNewConfig set to " << (m_useNewConfig ? "True" : "False"));
-
- ATH_CHECK(AthAlgorithm::initialize());
m_thresholds_a.clear();
m_thresholds_c.clear();
@@ -40,172 +36,71 @@ LVL1::TrigT1MBTS::initialize()
m_cablestarts_a.resize(16,0);// default is bit 0
m_cablestarts_c.resize(16,0);// default is bit 0
- // Connect to the LVL1ConfigSvc to retrieve threshold settings.
- ATH_CHECK(m_configSvc.retrieve());
-
// Retrieve TileTBID helper from det store
// (The MBTS was added to the Test Beam (TB) list.)
ATH_CHECK(detStore()->retrieve(m_tileTBID));
const TrigConf::L1Menu * l1menu = nullptr;
- if(m_useNewConfig) {
- // Run 3 menu
- ATH_CHECK( detStore()->retrieve(l1menu) );
- }
+ ATH_CHECK( detStore()->retrieve(l1menu) );
- if(m_useNewConfig) {
- // Run 3 menu
- // MBTS
- for (std::shared_ptr<TrigConf::L1Threshold> thr : l1menu->thresholds("MBTS")) {
- if(thr->name() != "MBTS_A" && thr->name() != "MBTS_C") {
- continue;
+ // MBTS
+ for (std::shared_ptr<TrigConf::L1Threshold> thr : l1menu->thresholds("MBTS")) {
+ if(thr->name() != "MBTS_A" && thr->name() != "MBTS_C") {
+ continue;
+ }
+ std::string connName = l1menu->connectorNameFromThreshold(thr->name());
+ unsigned int startbit = l1menu->connector(connName).triggerLine(thr->name()).startbit();
+ m_ThrVecSize12 = true; // TODO: check for (thresholds[0]->thresholdValueVector().size() == 12);
+ std::vector<float> hwThrValues; // TODO need to add configuration access in TrigConfData/Threshold.h
+ if(thr->name() == "MBTS_A") {
+ m_cablestart_a = startbit;
+ if(m_ThrVecSize12) {
+ m_thresholds_short_a = hwThrValues;
+ } else {
+ m_thresholds_a = hwThrValues;
}
- std::string connName = l1menu->connectorNameFromThreshold(thr->name());
- unsigned int startbit = l1menu->connector(connName).triggerLine(thr->name()).startbit();
- m_ThrVecSize12 = true; // TODO: check for (thresholds[0]->thresholdValueVector().size() == 12);
- std::vector<float> hwThrValues; // TODO need to add configuration access in TrigConfData/Threshold.h
- if(thr->name() == "MBTS_A") {
- m_cablestart_a = startbit;
- if(m_ThrVecSize12) {
- m_thresholds_short_a = hwThrValues;
- } else {
- m_thresholds_a = hwThrValues;
- }
+ } else {
+ m_cablestart_c = startbit;
+ if(m_ThrVecSize12) {
+ m_thresholds_short_c = hwThrValues;
} else {
- m_cablestart_c = startbit;
- if(m_ThrVecSize12) {
- m_thresholds_short_c = hwThrValues;
- } else {
- m_thresholds_c = hwThrValues;
- }
+ m_thresholds_c = hwThrValues;
}
}
+ }
- // MBTSSI
- for (std::shared_ptr<TrigConf::L1Threshold> thr : l1menu->thresholds("MBTSSI")) {
- //m_singleCounterInputs = true;
- std::string thrname = thr->name();
- // figure out module number from threshold name
- size_t module = std::stoi(thrname.substr(6));
- float hwValue = 0; // TODO implement access
- std::string connName = l1menu->connectorNameFromThreshold(thr->name());
- unsigned int startbit = l1menu->connector(connName).triggerLine(thr->name()).startbit();
- ATH_MSG_INFO("Read " << thrname << " with voltage " << hwValue << "mV at bit " << startbit << " on " << connName);
- // Get the discriminator threshold settings (single inputs) for the C side.
- bool isCSide = thrname.find("MBTS_C")==0;
- if(isCSide) {
- if(module >= m_thresholds_c.size()) {
- ATH_MSG_WARNING("Module number " << module << " on side C out of range");
- } else {
- m_thresholds_c[module] = hwValue;
- m_cablestarts_c[module] = startbit;
- }
- } else if(thrname.find("MBTS_A")==0 && thrname.size()>6) {
- // Get the discriminator threshold settings (single inputs) for the A side.
- // figure out module number from threshold name
- if(module >= m_thresholds_a.size()) {
- ATH_MSG_WARNING("Module number " << module << " on side A out of range");
- } else {
- m_thresholds_a[module] = hwValue;
- m_cablestarts_a[module] = startbit;
- }
- }
- }
-
- } else {
- // Get level 1 MBTS threshold settings from the level 1
- // configuration service for the discriminators on the
- // multiplicity inputs. All discriminators are assumed to have
- // the same setting. The thresholds are in mV and are not a
- // ptcut. The ptcut() methods just returns the value in the xml
- // file.
- const std::vector<TrigConf::TriggerThreshold*> & thresholds = m_configSvc->thresholdConfig()->getMbtsThresholdVector();
- m_ThrVecSize12 = (thresholds[0]->thresholdValueVector().size() == 12);
- ATH_MSG_INFO("Size of thresholdValueVector: " << thresholds[0]->thresholdValueVector().size());
- for(const TrigConf::TriggerThreshold* thr : thresholds) {
-
- // Get the discriminator threshold settings (multiplicity input) for the C side.
- if( thr->name() == "MBTS_C" ) {
- const std::vector<TrigConf::TriggerThresholdValue*>& thrValues = thr->thresholdValueVector();
-
- for(size_t ii = 0; ii<thrValues.size(); ++ii) {
- float hwThresholdValue = thrValues[ii]->ptcut();
-
- if(m_ThrVecSize12) {
- m_thresholds_short_c[ii] = hwThresholdValue;
- } else {
- m_thresholds_c[ii] = hwThresholdValue;
- }
- ATH_MSG_INFO( "Multiplicity input side C, counter " << ii << ", read threshold in mV of " << hwThresholdValue);
- }
- m_cablestart_c = thr->cableStart();
- ATH_MSG_DEBUG("CableStart: " << m_cablestart_c << ", CableEnd: " << thr->cableEnd());
-
- } else if( thr->name() == "MBTS_A" ) {
-
- // Get the discriminator threshold settings (multiplicity input) for the A side.
- const std::vector<TrigConf::TriggerThresholdValue*>& thrValues = thr->thresholdValueVector();
-
- for(size_t ii = 0; ii<thrValues.size();++ii) {
- float hwThresholdValue = thrValues[ii]->ptcut();
- if(m_ThrVecSize12) {
- m_thresholds_short_a[ii] = hwThresholdValue;
- } else {
- m_thresholds_a[ii] = hwThresholdValue;
- }
- ATH_MSG_INFO("Multiplicity input side A, counter " << ii << ", read threshold in mV of " << hwThresholdValue);
- }
- m_cablestart_a = thr->cableStart();
- ATH_MSG_DEBUG("CableStart: " << m_cablestart_a << ", CableEnd: " << thr->cableEnd());
+ // MBTSSI
+ for (std::shared_ptr<TrigConf::L1Threshold> thr : l1menu->thresholds("MBTSSI")) {
+ //m_singleCounterInputs = true;
+ std::string thrname = thr->name();
+ // figure out module number from threshold name
+ size_t module = std::stoi(thrname.substr(6));
+ float hwValue = 0; // TODO implement access
+ std::string connName = l1menu->connectorNameFromThreshold(thr->name());
+ unsigned int startbit = l1menu->connector(connName).triggerLine(thr->name()).startbit();
+ ATH_MSG_INFO("Read " << thrname << " with voltage " << hwValue << "mV at bit " << startbit << " on " << connName);
+ // Get the discriminator threshold settings (single inputs) for the C side.
+ bool isCSide = thrname.find("MBTS_C")==0;
+ if(isCSide) {
+ if(module >= m_thresholds_c.size()) {
+ ATH_MSG_WARNING("Module number " << module << " on side C out of range");
+ } else {
+ m_thresholds_c[module] = hwValue;
+ m_cablestarts_c[module] = startbit;
}
- }
-
- // Get level 1 MBTS threshold settings from the level 1
- // configuration service for the discriminators on the single
- // inputs. There are 32 physical discriminator inputs these can
- // only be set to one value each. These are the same 32
- // discriminators used for the multiplicity inputs. Each one the
- // thresholds are in mV and are not a ptcut. The ptcut() methods
- // just returns the value in the xml file.
- ATH_MSG_DEBUG( "Size of MbtssiThresholdValueVector: " << m_configSvc->thresholdConfig()->getMbtssiThresholdVector().size());
- for(const TrigConf::TriggerThreshold* thr : m_configSvc->thresholdConfig()->getMbtssiThresholdVector()) {
- //m_singleCounterInputs = true;
- std::string thrname = thr->name();
-
- // Get the discriminator threshold settings (single inputs) for the C side.
- if(thrname.find("MBTS_C")==0 && thrname.size()>6) {
- // figure out module number from threshold name
- ATH_MSG_INFO("Single input threshold name " << thrname);
- thrname.replace(thrname.find("MBTS_C"),6,"");
- size_t module = std::stoi(thrname);
- ATH_MSG_INFO(" converts to Module number " << module);
- if(module >= m_thresholds_c.size()) {
- ATH_MSG_WARNING("Module number " << module << " on side C out of range");
- } else {
- m_thresholds_c[module] = thr->triggerThresholdValue(0, 0)->ptcut();
- m_cablestarts_c[module] = thr->cableStart();
- ATH_MSG_INFO(", read threshold in mV of " << m_thresholds_c[module]);
- ATH_MSG_DEBUG("CableStart: " << m_cablestarts_c[module] << ", CableEnd: " << thr->cableEnd());
- }
- } else if(thrname.find("MBTS_A")==0 && thrname.size()>6) {
- // Get the discriminator threshold settings (single inputs) for the A side.
- // figure out module number from threshold name
- ATH_MSG_INFO("Single input threshold name " << thrname);
- thrname.replace(thrname.find("MBTS_A"),6,"");
- size_t module = std::stoi(thrname);
- ATH_MSG_DEBUG(", moduel number " << module);
- if(module >= m_thresholds_a.size()) {
- ATH_MSG_WARNING("Module number " << module << " on side A out of range");
- } else {
- m_thresholds_a[module] = thr->triggerThresholdValue(0, 0)->ptcut();
- m_cablestarts_a[module] = thr->cableStart();
- ATH_MSG_INFO(", read threshold in mV of " << m_thresholds_a[module]);
- ATH_MSG_DEBUG("CableStart: " << m_cablestarts_a[module] << ", CableEnd: " << thr->cableEnd());
- }
+ } else if(thrname.find("MBTS_A")==0 && thrname.size()>6) {
+ // Get the discriminator threshold settings (single inputs) for the A side.
+ // figure out module number from threshold name
+ if(module >= m_thresholds_a.size()) {
+ ATH_MSG_WARNING("Module number " << module << " on side A out of range");
+ } else {
+ m_thresholds_a[module] = hwValue;
+ m_cablestarts_a[module] = startbit;
}
}
}
+
// MBTS_A, MBTS_C or MBTS_A, MBTS_C, MBTS_0, MBTS_1,...,MBTS_15 are used.
// Therefore thess messages are just INFO rather than warning.
if(m_thresholds_a.size() != 16) {
diff --git a/Trigger/TrigT1/TrigT1MBTS/src/TrigT1MBTS.h b/Trigger/TrigT1/TrigT1MBTS/src/TrigT1MBTS.h
index d3be347d8f64..75819ec3a378 100644
--- a/Trigger/TrigT1/TrigT1MBTS/src/TrigT1MBTS.h
+++ b/Trigger/TrigT1/TrigT1MBTS/src/TrigT1MBTS.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1MBTS_H
@@ -12,8 +12,6 @@
#include "TileEvent/TileContainer.h"
#include "TileIdentifier/TileTBID.h"
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
-
#include <string>
#include <vector>
@@ -35,11 +33,6 @@ namespace LVL1 {
StatusCode execute();
private:
- /** A data member to retain a connection to the level 1
- configuration service */
- Gaudi::Property<bool> m_useNewConfig{this, "UseNewConfig", false, "When true, read the menu from detector store, when false use the L1ConfigSvc"};
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc{this, "LVL1ConfigSvc", "LVL1ConfigSvc", "The LVL1ConfigSvc providing L1 configuration for Run 2"};
-
/** A data member to retain a pointer to the Tile Test Beam
Identifier service. The MBTS identifiers were added after the
other tile identifiers. To avoid confusion and extra work they
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py
index bef09fef615e..ad6ff7a52c4d 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py
@@ -77,9 +77,7 @@ def Lvl1SimulationSequence_Common( ConfigFlags ):
if ConfigFlags.Input.isMC:
from TrigT1MBTS.TrigT1MBTSConf import LVL1__TrigT1MBTS
- l1CaloSimSeq += [
- LVL1__TrigT1MBTS(UseNewConfig = ConfigFlags.Trigger.readLVL1FromJSON),
- ]
+ l1CaloSimSeq += [ LVL1__TrigT1MBTS() ]
if ConfigFlags.Trigger.L1.doCalo and ConfigFlags.Trigger.enableL1CaloPhase1:
if not l1CaloSimSeq:
--
GitLab
From ce6d6ec1f92bcf524c286e93e51f65a5a0b30642 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Thu, 12 Aug 2021 15:05:40 +0200
Subject: [PATCH 093/272] TrigT1CaloFexPerf: remove hard-coded log levels
---
Trigger/TrigT1/TrigT1CaloFexPerf/python/EFexConfig.py | 3 +--
.../TrigT1/TrigT1CaloFexPerf/python/L1PerfControlFlags.py | 5 +----
.../TrigT1/TrigT1CaloFexPerf/python/Rel22L1PerfSequence.py | 1 -
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/python/EFexConfig.py b/Trigger/TrigT1/TrigT1CaloFexPerf/python/EFexConfig.py
index 264e4de41c57..d3aa2b994266 100644
--- a/Trigger/TrigT1/TrigT1CaloFexPerf/python/EFexConfig.py
+++ b/Trigger/TrigT1/TrigT1CaloFexPerf/python/EFexConfig.py
@@ -1,10 +1,9 @@
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.Logging import logging
def enableEfexAlgorithms( algSequence, SuperCellContainer='SCell',
- doEle=True, doTau=True, logLevel = logging.INFO):
+ doEle=True, doTau=True):
log = logging.getLogger( 'TrigT1CaloFexPerf.EFexConfig' )
- log.setLevel(logLevel)
from TrigT1CaloFexPerf.L1PerfControlFlags import L1Phase1PerfFlags as perfFlags
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/python/L1PerfControlFlags.py b/Trigger/TrigT1/TrigT1CaloFexPerf/python/L1PerfControlFlags.py
index 48eec7e6f64d..638544beb8d2 100644
--- a/Trigger/TrigT1/TrigT1CaloFexPerf/python/L1PerfControlFlags.py
+++ b/Trigger/TrigT1/TrigT1CaloFexPerf/python/L1PerfControlFlags.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
""" Flags to control the L1 calo upgrade simulation """
@@ -7,9 +7,6 @@ from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer
# get logger for this file
from AthenaCommon.Logging import logging
log = logging.getLogger( 'TrigT1CaloFexPerf.L1PerfControlFlags' )
-log.setLevel(logging.DEBUG)
-
-
_caloflags = list()
_ctpflags = list()
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/python/Rel22L1PerfSequence.py b/Trigger/TrigT1/TrigT1CaloFexPerf/python/Rel22L1PerfSequence.py
index 070b7bdf4dfc..350c438e901a 100644
--- a/Trigger/TrigT1/TrigT1CaloFexPerf/python/Rel22L1PerfSequence.py
+++ b/Trigger/TrigT1/TrigT1CaloFexPerf/python/Rel22L1PerfSequence.py
@@ -21,7 +21,6 @@ def setupRun3L1CaloPerfSequence(
from AthenaCommon.Logging import logging
log = logging.getLogger("TrigT1CaloFexPerf.L1Perf")
- log.setLevel(logging.INFO)
## print some information about the conditions the simulation is running in
from RecExConfig.RecFlags import rec
--
GitLab
From 40d4b8a23eef2b681e7df3afbd961fb8bd97c0df Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Thu, 12 Aug 2021 15:06:04 +0200
Subject: [PATCH 094/272] L1TopoConfig: remove hard-coded log level
---
.../TrigT1/L1Topo/L1TopoConfig/python/L1TopoConfigUtils.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/Trigger/TrigT1/L1Topo/L1TopoConfig/python/L1TopoConfigUtils.py b/Trigger/TrigT1/L1Topo/L1TopoConfig/python/L1TopoConfigUtils.py
index 6299155e45dc..2c04efb38f13 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoConfig/python/L1TopoConfigUtils.py
+++ b/Trigger/TrigT1/L1Topo/L1TopoConfig/python/L1TopoConfigUtils.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
from xml.dom import minidom
import re
import os
@@ -15,9 +15,8 @@ except NameError:
from AthenaCommon.Logging import logging
from AthenaCommon.Utils.unixtools import FindFile
-log = logging.getLogger( "TrigConfigSvcUtils.py" )
-if log.level==0: log.setLevel(logging.INFO)
-
+log = logging.getLogger( "L1TopoConfigUtils" )
+
#**
# In this section:
#
--
GitLab
From 53032808d8c06171166577afcf02f25d56de9b02 Mon Sep 17 00:00:00 2001
From: James Richard Catmore <james.catmore@cern.ch>
Date: Tue, 17 Aug 2021 11:05:45 +0200
Subject: [PATCH 095/272] Fixing compilation warnings caused by unused imports
in PhysCommon
Some imports were not removed from the PhysCommon.py config file when the relevant code was moved to a new file in !45798, leading to compilation warnings. This is fixed in this MR.
---
.../DerivationFrameworkPhys/python/PhysCommon.py | 4 ----
1 file changed, 4 deletions(-)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PhysCommon.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PhysCommon.py
index 61053aafed17..5286dd31b9d5 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PhysCommon.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PhysCommon.py
@@ -20,10 +20,6 @@ MuonsCommon.makeMuonsDFCommon()
from DerivationFrameworkJetEtMiss.JetCommon import OutputJets
from DerivationFrameworkJetEtMiss.ExtendedJetCommon import addDAODJets, addDefaultTrimmedJets, addJetTruthLabel, addQGTaggerTool, getPFlowfJVT, addEventCleanFlags
from DerivationFrameworkJetEtMiss.METCommon import scheduleStandardMETContent
-from TriggerMenuMT.TriggerAPI.TriggerAPI import TriggerAPI
-from TriggerMenuMT.TriggerAPI.TriggerEnums import TriggerPeriod, TriggerType
-from DerivationFrameworkTrigger.TriggerMatchingHelper import TriggerMatchingHelper
-import re
### Augmentation tools lists
AugmentationTools = []
--
GitLab
From c4bc8204afa09d3195193a1d087d55c0d1897ac7 Mon Sep 17 00:00:00 2001
From: Mark Hodgkinson <m.hodgkinson@sheffield.ac.uk>
Date: Tue, 17 Aug 2021 14:49:30 +0200
Subject: [PATCH 096/272] Add dictionary to PFlowUtils needed in analysis
release.
---
Reconstruction/PFlow/PFlowUtils/CMakeLists.txt | 6 ++++++
.../PFlow/PFlowUtils/PFlowUtils/PFlowUtilsDict.h | 11 +++++++++++
.../PFlow/PFlowUtils/PFlowUtils/selection.xml | 6 ++++++
3 files changed, 23 insertions(+)
create mode 100644 Reconstruction/PFlow/PFlowUtils/PFlowUtils/PFlowUtilsDict.h
create mode 100644 Reconstruction/PFlow/PFlowUtils/PFlowUtils/selection.xml
diff --git a/Reconstruction/PFlow/PFlowUtils/CMakeLists.txt b/Reconstruction/PFlow/PFlowUtils/CMakeLists.txt
index eb531fa72de0..7decaf1ad528 100644
--- a/Reconstruction/PFlow/PFlowUtils/CMakeLists.txt
+++ b/Reconstruction/PFlow/PFlowUtils/CMakeLists.txt
@@ -9,6 +9,12 @@ atlas_add_library( PFlowUtilsLib
PUBLIC_HEADERS PFlowUtils
LINK_LIBRARIES AsgTools xAODPFlow )
+atlas_add_dictionary( PFlowUtilsDict
+ PFlowUtils/PFlowUtilsDict.h
+ PFlowUtils/selection.xml
+ LINK_LIBRARIES PFlowUtilsLib )
+
+
if( NOT XAOD_ANALYSIS )
atlas_add_component( PFlowUtils
src/*.h src/*.cxx src/components/*.cxx
diff --git a/Reconstruction/PFlow/PFlowUtils/PFlowUtils/PFlowUtilsDict.h b/Reconstruction/PFlow/PFlowUtils/PFlowUtils/PFlowUtilsDict.h
new file mode 100644
index 000000000000..35997cf1a0f6
--- /dev/null
+++ b/Reconstruction/PFlow/PFlowUtils/PFlowUtils/PFlowUtilsDict.h
@@ -0,0 +1,11 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef PFLOWUTISLDICT_H
+#define PFLOWUTILSDICT_H
+
+#include "PFlowUtils/IWeightPFOTool.h"
+#include "PFlowUtils/WeightPFOTool.h"
+
+#endif
diff --git a/Reconstruction/PFlow/PFlowUtils/PFlowUtils/selection.xml b/Reconstruction/PFlow/PFlowUtils/PFlowUtils/selection.xml
new file mode 100644
index 000000000000..b63706fde459
--- /dev/null
+++ b/Reconstruction/PFlow/PFlowUtils/PFlowUtils/selection.xml
@@ -0,0 +1,6 @@
+<lcgdict>
+
+ <class name="CP::IWeightPFOTool" />
+ <class name="CP::WeightPFOTool" />
+
+</lcgdict>
--
GitLab
From 172bbece23f5b6410fd56d10c8a6aa49cd96b558 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Tue, 17 Aug 2021 15:19:59 +0200
Subject: [PATCH 097/272] TrigHLTJetHypo+TriggerMenuMT: use exception for empty
HypoTool
Throw a `NoHypoToolCreated` exception in case no HypoTool was created in
the generator function. Returning `None` as in the previous code results
in duplicate empty tool names in the ToolHandleArray (ATR-23920).
In addition remove the redundant copy of tool names and `getTools` accessors in
`MenuSequence` (the `ToolHandleArrary` already ensures we are not adding
any duplicates).
Also remove an explicitly set log-level in `Cabling.py`.
---
.../python/TrigJetHypoToolConfig.py | 13 ++++---
.../HLTMenuConfig/Menu/MenuComponents.py | 37 ++++++++-----------
.../python/LVL1MenuConfig/LVL1/Cabling.py | 3 +-
3 files changed, 24 insertions(+), 29 deletions(-)
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
index 8e3881d77765..f764043d59c5 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
@@ -1,8 +1,8 @@
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-from __future__ import print_function
from AthenaConfiguration.ComponentFactory import CompFactory
+from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import NoHypoToolCreated
from TrigHLTJetHypo.hypoConfigBuilder import hypotool_from_chaindict
from AthenaCommon.Logging import logging
@@ -27,7 +27,7 @@ def trigJetHypoToolFromDict(chain_dict):
# This single HypoTool gets configured to perform the selection for _all_ of the jet legs, and to report
# the per-jet passing status for all of these legs.
#
- # Here we determine if this is the 2nd+ jet leg of a multi-leg chain which has jet legs, and return None tool if it is
+ # Here we determine if this is the 2nd+ jet leg of a multi-leg chain which has jet legs, and return no tool if it is
# Can we fetch this from elsewhere?
@@ -59,10 +59,13 @@ def trigJetHypoToolFromDict(chain_dict):
first_leg_index = min(first_leg_index, chain_dict['signatures'].index(signature))
if leg_id > first_leg_index:
- logger.debug("Not returning a HypoTool for {} as this isn't the first leg with any of {} (leg signatures are {})".format(chain_name,tuple(jet_signature_identifiers),tuple(chain_dict['signatures'])))
- return None
+ logger.debug("Not returning a HypoTool for %s as this is not the first leg "
+ "with any of %s (leg signatures are %s)",
+ chain_name, tuple(jet_signature_identifiers), tuple(chain_dict['signatures']))
+ raise NoHypoToolCreated("No HypoTool created for %s" % chain_name)
- logger.debug("Returning a HypoTool for {} as this is the first leg with any of {} (leg signatures are {})".format(chain_name,tuple(jet_signature_identifiers),tuple(chain_dict['signatures'])))
+ logger.debug("Returning a HypoTool for %s as this is the first leg with any of %s (leg signatures are %s)",
+ chain_name, tuple(jet_signature_identifiers), tuple(chain_dict['signatures']))
hypo_tool = hypotool_from_chaindict(chain_dict)
hypo_tool.visit_debug = debug
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
index ea35e965b236..cf2577ff6226 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
@@ -25,6 +25,11 @@ log = logging.getLogger( __name__ )
RoRSeqFilter=CompFactory.RoRSeqFilter
PassFilter = CompFactory.PassFilter
+
+class NoHypoToolCreated(Exception):
+ """Exception thrown by HypoTool generators if no HypoTool is needed""" # see ATR-23920
+
+
class Node(object):
"""base class representing one Alg + inputs + outputs, to be used to Draw dot diagrams and connect objects"""
def __init__(self, Alg):
@@ -181,7 +186,6 @@ class HypoAlgNode(AlgNode):
def __init__(self, Alg):
assert isHypoBase(Alg), "Error in creating HypoAlgNode from Alg " + compName(Alg)
AlgNode.__init__(self, Alg, 'HypoInputDecisions', 'HypoOutputDecisions')
- self.tools = []
self.previous=[]
def addOutput(self, name):
@@ -196,17 +200,11 @@ class HypoAlgNode(AlgNode):
def addHypoTool (self, hypoToolConf):
- log.debug(" Adding HypoTool %s to %s", hypoToolConf.chainDict['chainName'], compName(self.Alg))
- if hypoToolConf.chainDict['chainName'] not in self.tools:
- ## HypoTools are private, so need to be created when added to the Alg
- ## this incantation may seem strange, however it is the only one which works
- ## trying tool = hypoToolConf.create() and then assignement does not work! will be no problem in run3 config
- tools = self.Alg.HypoTools
- self.Alg.HypoTools = tools+[hypoToolConf.create()]
- self.tools.append( self.Alg.HypoTools[-1].getName() ) # should not be needed anymore
- else:
- raise RuntimeError("The hypo tool of name "+ hypoToolConf.chainDict['chainName'] +" already present")
-
+ log.debug("Adding HypoTool %s to %s", hypoToolConf.chainDict['chainName'], compName(self.Alg))
+ try:
+ self.Alg.HypoTools = self.Alg.HypoTools + [hypoToolConf.create()] # see ATEAM-773
+ except NoHypoToolCreated as e:
+ log.debug("%s returned empty tool: %s", hypoToolConf.name, e)
def setPreviousDecision(self,prev):
self.previous.append(prev)
@@ -218,10 +216,11 @@ class HypoAlgNode(AlgNode):
self.resetInput()
def __repr__(self):
- return "HypoAlg::%s [%s] -> [%s], previous = [%s], HypoTools=[%s]"%(compName(self.Alg),' '.join(map(str, self.getInputList())),
- ' '.join(map(str, self.getOutputList())),
- ' '.join(map(str, self.previous)),
- ' '.join(map(str, self.tools)))
+ return "HypoAlg::%s [%s] -> [%s], previous = [%s], HypoTools=[%s]" % \
+ (compName(self.Alg),' '.join(map(str, self.getInputList())),
+ ' '.join(map(str, self.getOutputList())),
+ ' '.join(map(str, self.previous)),
+ ' '.join([t.getName() for t in self.Alg.HypoTools]))
class SequenceFilterNode(AlgNode):
@@ -443,9 +442,6 @@ class EmptyMenuSequence(object):
return cfseq_algs, all_hypos, last_step_hypo_nodes
- def getTools(self):
- log.debug("No tools for empty menu sequences")
-
def setSeed( self, seed ):
self._seed = seed
@@ -614,9 +610,6 @@ class MenuSequence(object):
return cfseq_algs, all_hypos, last_step_hypo_nodes
- def getTools(self):
- return self._hypo.tools
-
def setSeed( self, seed ):
self._seed = seed
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Cabling.py b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Cabling.py
index a9408608a7bd..64a1e2f52043 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Cabling.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Cabling.py
@@ -1,10 +1,9 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
from .Limits import Limits
from AthenaCommon.Logging import logging
log = logging.getLogger(__name__)
-log.setLevel(logging.INFO)
"""
Thilo's proposal in the CTP meeting Oct 13
--
GitLab
From e356e7c6bede514a360bd7f3790bc9081d760f72 Mon Sep 17 00:00:00 2001
From: Sergi Rodriguez Bosca <sergi.rodriguez@cern.ch>
Date: Tue, 17 Aug 2021 15:37:51 +0200
Subject: [PATCH 098/272] Adding the jFEX jets thresholds read from the
Database (L1Menu)
---
.../L1CaloFEXSim/L1CaloFEXSim/jFEXFPGA.h | 3 +
.../share/jFEXDriverJobOptions.py | 137 +++++------
.../L1CaloFEX/L1CaloFEXSim/src/jFEXFPGA.cxx | 217 ++++++++++--------
.../L1CaloFEXSim/src/jFEXPileupAndNoise.cxx | 3 -
.../L1CaloFEXToolInterfaces/IjFEXFPGA.h | 1 +
5 files changed, 191 insertions(+), 170 deletions(-)
diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/L1CaloFEXSim/jFEXFPGA.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/L1CaloFEXSim/jFEXFPGA.h
index 64e0ad8b6c56..0237710cf299 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/L1CaloFEXSim/jFEXFPGA.h
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/L1CaloFEXSim/jFEXFPGA.h
@@ -32,6 +32,7 @@
#include "L1CaloFEXSim/FEXAlgoSpaceDefs.h"
#include <vector>
+#include "TrigConfData/L1Menu.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ISvcLocator.h"
@@ -128,6 +129,7 @@ namespace LVL1 {
CaloCellContainer m_sCellsCollection;
SG::ReadHandleKey<LVL1::jTowerContainer> m_jFEXFPGA_jTowerContainerKey {this, "MyETowers", "jTowerContainer", "Input container for jTowers"};
+ SG::ReadHandleKey<TrigConf::L1Menu> m_l1MenuKey{this, "L1TriggerMenu", "DetectorStore+L1TriggerMenu","Name of the L1Menu object to read configuration from"};
SG::WriteHandleKey<LVL1::jFEXOutputCollection> m_jFEXFPGA_jFEXOutputCollectionKey {this, "jFEXOutputCollection", "jFEXOutputCollection", "Input container for jFEXOutputCollection"};
@@ -143,6 +145,7 @@ namespace LVL1 {
int getTTowerET_SG(unsigned int TTID);
+
};
} // end of namespace
diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/share/jFEXDriverJobOptions.py b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/share/jFEXDriverJobOptions.py
index 240aaf08bf90..4e5e0e44b798 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/share/jFEXDriverJobOptions.py
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/share/jFEXDriverJobOptions.py
@@ -48,80 +48,87 @@ DetFlags.detdescr.all_setOff()
DetFlags.detdescr.Calo_setOn()
include("RecExCond/AllDet_detDescr.py")
+# menu with default configuration for testing
+from TrigConfigSvc.TrigConfigSvcCfg import getL1ConfigSvc
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
+svcMgr += getL1ConfigSvc(ConfigFlags)
+
svcMgr += CfgMgr.THistSvc()
svcMgr.THistSvc.Output += ["ANALYSIS DATAFILE='myfile_jfex.root' OPT='RECREATE'"]
+
from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
-xaodStream = MSMgr.NewPoolRootStream( "StreamXAOD", "xAOD.jFEX.output.root" )
+StreamAOD_Augmented = MSMgr.NewPoolRootStream( "StreamAOD", "xAOD.jFEX.output.root" )
+StreamAOD = StreamAOD_Augmented.GetEventStream()
# the jFex containers
-xaodStream.AddItem( ["xAOD::jFexSRJetRoIContainer#*"] )
-xaodStream.AddItem( ["xAOD::jFexSRJetRoIAuxContainer#*"] )
-xaodStream.AddItem( ["xAOD::jFexLRJetRoIContainer#*"] )
-xaodStream.AddItem( ["xAOD::jFexLRJetRoIAuxContainer#*"] )
-xaodStream.AddItem( ["xAOD::jFexTauRoIContainer#*"] )
-xaodStream.AddItem( ["xAOD::jFexTauRoIAuxContainer#*"] )
-xaodStream.AddItem( ["xAOD::jFexSumETRoIContainer#*"] )
-xaodStream.AddItem( ["xAOD::jFexSumETRoIAuxContainer#*"] )
-xaodStream.AddItem( ["xAOD::jFexMETRoIContainer#*"] )
-xaodStream.AddItem( ["xAOD::jFexMETRoIAuxContainer#*"] )
-
-
+StreamAOD.ItemList+=["xAOD::jFexSRJetRoIContainer#*"]
+StreamAOD.ItemList+=["xAOD::jFexSRJetRoIAuxContainer#*"]
+StreamAOD.ItemList+=["xAOD::jFexLRJetRoIContainer#*"]
+StreamAOD.ItemList+=["xAOD::jFexLRJetRoIAuxContainer#*"]
+StreamAOD.ItemList+=["xAOD::jFexTauRoIContainer#*"]
+StreamAOD.ItemList+=["xAOD::jFexTauRoIAuxContainer#*"]
+StreamAOD.ItemList+=["xAOD::jFexSumETRoIContainer#*"]
+StreamAOD.ItemList+=["xAOD::jFexSumETRoIAuxContainer#*"]
+StreamAOD.ItemList+=["xAOD::jFexMETRoIContainer#*"]
+StreamAOD.ItemList+=["xAOD::jFexMETRoIAuxContainer#*"]
+
+
+# a random selection of containers/keys from parsing checkSG output from original MC, ignoring Aux and removing those
+# that seemed to give a crash
# Generic event info
-xaodStream.AddItem( ["xAOD::EventInfo#*"] )
-xaodStream.AddItem( ["xAOD::EventAuxInfo#*"])
-xaodStream.AddItem( ["xAOD::EventShape#Kt4EMTopoOriginEventShape"])
-xaodStream.AddItem( ["xAOD::EventShapeAuxInfo#Kt4EMTopoOriginEventShapeAux."])
-
+StreamAOD.ItemList+=["xAOD::EventInfo#*"]
+StreamAOD.ItemList+=["xAOD::EventAuxInfo#*"]
+StreamAOD.ItemList+=["xAOD::EventShape#Kt4EMTopoOriginEventShape"]
+StreamAOD.ItemList+=["xAOD::EventShapeAuxInfo#Kt4EMTopoOriginEventShapeAux."]
#Physics Objects
-xaodStream.AddItem( ["xAOD::JetContainer#AntiKt4EMTopoJets"])
-xaodStream.AddItem( ["xAOD::JetAuxContainer#AntiKt4EMTopoJetsAux."])
-xaodStream.AddItem( ["xAOD::MuonContainer#Muons"])
-xaodStream.AddItem( ["xAOD::MuonAuxContainer#MuonsAux."])
-xaodStream.AddItem( ["xAOD::ElectronContainer#Electrons"])
-xaodStream.AddItem( ["xAOD::ElectronAuxContainer#ElectronsAux."])
-xaodStream.AddItem( ["xAOD::PhotonContainer#Photons"])
-xaodStream.AddItem( ["xAOD::PhotonAuxContainer#PhotonsAux."])
-xaodStream.AddItem( ["xAOD::TauJetContainer#TauJets"])
-xaodStream.AddItem( ["xAOD::TauJetAuxContainer#TauJetsAux.-VertexedClusters."])
-xaodStream.AddItem( ["xAOD::MissingETContainer#MET_Reference_AntiKt4EMTopo"])
-xaodStream.AddItem( ["xAOD::MissingETAuxContainer#MET_Reference_AntiKt4EMTopoAux.-ConstitObjectLinks.-ConstitObjectWeights"])
-xaodStream.AddItem( ["xAOD::VertexContainer#PrimaryVertices"])
-xaodStream.AddItem( ["xAOD::VertexAuxContainer#PrimaryVerticesAux.-vxTrackAtVertex.-MvfFitInfo.-isInitialized.-VTAV"])
-xaodStream.AddItem( ["xAOD::MissingETAssociationMap#METAssoc_AntiKt4EMTopo"])
-xaodStream.AddItem( ["xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4EMTopoAux."])
-xaodStream.AddItem( ["xAOD::MissingETContainer#MET_Core_AntiKt4EMTopo"])
-xaodStream.AddItem( ["xAOD::MissingETAuxContainer#MET_Core_AntiKt4EMTopoAux.name.mpx.mpy.sumet.source"])
-xaodStream.AddItem( ["xAOD::MissingETContainer#MET_Track"])
-xaodStream.AddItem( ["xAOD::MissingETAuxContainer#MET_TrackAux.name.mpx.mpy"])
-
-
-
-xaodStream.AddItem( ["xAOD::MissingETComponentMap#METMap_Truth"])
-xaodStream.AddItem( ["xAOD::EmTauRoIContainer#LVL1EmTauRoIs"])
-xaodStream.AddItem( ["xAOD::EmTauRoIAuxContainer#LVL1EmTauRoIsAux."])
-xaodStream.AddItem( ["xAOD::EnergySumRoI#LVL1EnergySumRoI"])
-xaodStream.AddItem( ["xAOD::EnergySumRoIAuxInfo#LVL1EnergySumRoIAux."])
-xaodStream.AddItem( ["xAOD::JetRoIContainer#LVL1JetRoIs"])
-xaodStream.AddItem( ["xAOD::JetRoIAuxContainer#LVL1JetRoIsAux."])
-
-
-xaodStream.AddItem( ["xAOD::TruthParticleContainer#*"])
-xaodStream.AddItem( ["xAOD::TruthParticleAuxContainer#TruthParticlesAux.-caloExtension"])
-xaodStream.AddItem( ["xAOD::TruthVertexContainer#*"])
-xaodStream.AddItem( ["xAOD::TruthVertexAuxContainer#*"])
-xaodStream.AddItem( ["xAOD::TruthEventContainer#*"])
-xaodStream.AddItem( ["xAOD::TruthEventAuxContainer#*"])
-
-xaodStream.AddItem( ["TileCellContainer#MBTSContainer"])
-xaodStream.AddItem( ["xAOD::TrigDecision#xTrigDecision"])
-xaodStream.AddItem( ["xAOD::TrigNavigation#TrigNavigation"])
-xaodStream.AddItem( ["xAOD::TrigConfKeys#TrigConfKeys"])
-xaodStream.AddItem( ["HLT::HLTResult#HLTResult_HLT"])
-xaodStream.AddItem( ["xAOD::TrigDecisionAuxInfo#xTrigDecisionAux."])
-xaodStream.AddItem( ["xAOD::TrigNavigationAuxInfo#TrigNavigationAux."])
-
+StreamAOD.ItemList+=["xAOD::JetContainer#AntiKt4EMTopoJets"]
+StreamAOD.ItemList+=["xAOD::JetAuxContainer#AntiKt4EMTopoJetsAux."]
+StreamAOD.ItemList+=["xAOD::MuonContainer#Muons"]
+StreamAOD.ItemList+=["xAOD::MuonAuxContainer#MuonsAux."]
+StreamAOD.ItemList+=["xAOD::ElectronContainer#Electrons"]
+StreamAOD.ItemList+=["xAOD::ElectronAuxContainer#ElectronsAux."]
+StreamAOD.ItemList+=["xAOD::PhotonContainer#Photons"]
+StreamAOD.ItemList+=["xAOD::PhotonAuxContainer#PhotonsAux."]
+StreamAOD.ItemList+=["xAOD::TauJetContainer#TauJets"]
+StreamAOD.ItemList+=["xAOD::TauJetAuxContainer#TauJetsAux.-VertexedClusters."]
+StreamAOD.ItemList+=["xAOD::MissingETContainer#MET_Reference_AntiKt4EMTopo"]
+StreamAOD.ItemList+=["xAOD::MissingETAuxContainer#MET_Reference_AntiKt4EMTopoAux.-ConstitObjectLinks.-ConstitObjectWeights"]
+StreamAOD.ItemList+=["xAOD::VertexContainer#PrimaryVertices"]
+StreamAOD.ItemList+=["xAOD::VertexAuxContainer#PrimaryVerticesAux.-vxTrackAtVertex.-MvfFitInfo.-isInitialized.-VTAV"]
+StreamAOD.ItemList+=["xAOD::MissingETAssociationMap#METAssoc_AntiKt4EMTopo"]
+StreamAOD.ItemList+=["xAOD::MissingETAuxAssociationMap#METAssoc_AntiKt4EMTopoAux."]
+StreamAOD.ItemList+=["xAOD::MissingETContainer#MET_Core_AntiKt4EMTopo"]
+StreamAOD.ItemList+=["xAOD::MissingETAuxContainer#MET_Core_AntiKt4EMTopoAux.name.mpx.mpy.sumet.source"]
+StreamAOD.ItemList+=["xAOD::MissingETContainer#MET_Track"]
+StreamAOD.ItemList+=["xAOD::MissingETAuxContainer#MET_TrackAux.name.mpx.mpy"]
+
+
+
+StreamAOD.ItemList+=["xAOD::MissingETComponentMap#METMap_Truth"]
+StreamAOD.ItemList+=["xAOD::EmTauRoIContainer#LVL1EmTauRoIs"]
+StreamAOD.ItemList+=["xAOD::EmTauRoIAuxContainer#LVL1EmTauRoIsAux."]
+StreamAOD.ItemList+=["xAOD::EnergySumRoI#LVL1EnergySumRoI"]
+StreamAOD.ItemList+=["xAOD::EnergySumRoIAuxInfo#LVL1EnergySumRoIAux."]
+StreamAOD.ItemList+=["xAOD::JetRoIContainer#LVL1JetRoIs"]
+StreamAOD.ItemList+=["xAOD::JetRoIAuxContainer#LVL1JetRoIsAux."]
+
+
+StreamAOD.ItemList+=["xAOD::TruthParticleContainer#*"]
+StreamAOD.ItemList+=["xAOD::TruthParticleAuxContainer#TruthParticlesAux.-caloExtension"]
+StreamAOD.ItemList+=["xAOD::TruthVertexContainer#*"]
+StreamAOD.ItemList+=["xAOD::TruthVertexAuxContainer#*"]
+StreamAOD.ItemList+=["xAOD::TruthEventContainer#*"]
+StreamAOD.ItemList+=["xAOD::TruthEventAuxContainer#*"]
+
+StreamAOD.ItemList+=["TileCellContainer#MBTSContainer"]
+StreamAOD.ItemList+=["xAOD::TrigDecision#xTrigDecision"]
+StreamAOD.ItemList+=["xAOD::TrigNavigation#TrigNavigation"]
+StreamAOD.ItemList+=["xAOD::TrigConfKeys#TrigConfKeys"]
+StreamAOD.ItemList+=["HLT::HLTResult#HLTResult_HLT"]
+StreamAOD.ItemList+=["xAOD::TrigDecisionAuxInfo#xTrigDecisionAux."]
+StreamAOD.ItemList+=["xAOD::TrigNavigationAuxInfo#TrigNavigationAux."]
diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXFPGA.cxx b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXFPGA.cxx
index 39536a0f8d41..dbf3c1f850fa 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXFPGA.cxx
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXFPGA.cxx
@@ -42,6 +42,8 @@
#include "SGTools/TestStore.h"
#include "StoreGate/StoreGateSvc.h"
+#include "TrigConfData/L1Menu.h"
+
namespace LVL1 {
// default constructor for persistency
@@ -64,6 +66,7 @@ StatusCode jFEXFPGA::initialize()
ATH_CHECK(m_jFEXFPGA_jTowerContainerKey.initialize());
ATH_CHECK(m_jFEXFPGA_jFEXOutputCollectionKey.initialize());
+ ATH_CHECK(m_l1MenuKey.initialize());
return StatusCode::SUCCESS;
}
@@ -96,12 +99,11 @@ StatusCode jFEXFPGA::execute() {
ATH_MSG_FATAL("Could not retrieve jk_jFEXFPGA_jTowerContainer " << m_jFEXFPGA_jTowerContainerKey.key() );
return StatusCode::FAILURE;
}
-
jFEXOutputCollection* jFEXOutputs = nullptr;
ATH_CHECK( evtStore()->retrieve(jFEXOutputs, "jFEXOutputCollection") );
- ATH_CHECK( m_jFEXPileupAndNoiseTool.retrieve());
+ //ATH_CHECK( m_jFEXPileupAndNoiseTool.retrieve());
ATH_CHECK( m_jFEXPileupAndNoiseTool->safetyTest());
ATH_CHECK( m_jFEXPileupAndNoiseTool->reset());
if(m_jfexid == 0 || m_jfexid == 5){
@@ -138,10 +140,10 @@ StatusCode jFEXFPGA::execute() {
if(m_id==0 || m_id==2){
- ATH_CHECK( m_jFEXsumETAlgoTool.retrieve());
+ //ATH_CHECK( m_jFEXsumETAlgoTool.retrieve());
ATH_CHECK( m_jFEXsumETAlgoTool->safetyTest());
ATH_CHECK( m_jFEXsumETAlgoTool->reset());
- ATH_CHECK( m_jFEXmetAlgoTool.retrieve());
+ //ATH_CHECK( m_jFEXmetAlgoTool.retrieve());
ATH_CHECK( m_jFEXmetAlgoTool->safetyTest());
ATH_CHECK( m_jFEXmetAlgoTool->reset());
m_jFEXsumETAlgoTool->setFPGAEnergy(m_map_Etvalues_FPGA);
@@ -264,7 +266,6 @@ StatusCode jFEXFPGA::execute() {
jFEXOutputs->addValue_smallRJet("smallRJet_clusterET", smallClusterET);
-
if(!SRJet_LM){continue;}
std::unique_ptr<jFEXSmallRJetTOB> tmp_SRJet_tob = m_jFEXSmallRJetAlgoTool->getSmallRJetTOBs();
@@ -581,124 +582,136 @@ std::vector <uint32_t> jFEXFPGA::getLargeRJetTOBs()
}
-uint32_t jFEXFPGA::formSmallRJetTOB(int &iphi, int &ieta)
-{
- uint32_t tobWord = 0;
- const unsigned int jFEXETResolution = 200; //LSB is 200MeV
- int eta = 0;
- int phi = 0;
- unsigned int et = 0;
- unsigned int jFEXSmallRJetTOBEt = 0;
- int Res = 0; // 11 bits reserved
- int Sat = 0; // 1 bit for saturation. Set to 1 when jet energy is saturated
-
- if(m_jfexid > 0 && m_jfexid < 5){
- et = m_jFEXSmallRJetAlgoTool->getSmallClusterET();
- jFEXSmallRJetTOBEt = et/jFEXETResolution;
- eta = ieta -8;
- phi = iphi -8;
- }
+uint32_t jFEXFPGA::formSmallRJetTOB(int &iphi, int &ieta) {
+ uint32_t tobWord = 0;
+ const unsigned int jFEXETResolution = 200; //LSB is 200MeV
+ int eta = 0;
+ int phi = 0;
+ unsigned int et = 0;
+ unsigned int jFEXSmallRJetTOBEt = 0;
+ int Res = 0; // 11 bits reserved
+ int Sat = 0; // 1 bit for saturation. Set to 1 when jet energy is saturated
+
+ if(m_jfexid > 0 && m_jfexid < 5) {
+ et = m_jFEXSmallRJetAlgoTool->getSmallClusterET();
+ jFEXSmallRJetTOBEt = et/jFEXETResolution;
+ eta = ieta -8;
+ phi = iphi -8;
+ }
- if(m_jfexid ==0 || m_jfexid ==5){
- for(std::map<int, jFEXForwardJetsInfo>::iterator it = m_FCALJets.begin(); it!=(m_FCALJets.end()); ++it){
- jFEXForwardJetsInfo FCALJetInfo = it->second;
- eta = ieta -8;
- phi = iphi -8;
- et = FCALJetInfo.getSeedET() + FCALJetInfo.getFirstEnergyRingET();
- jFEXSmallRJetTOBEt = et/jFEXETResolution;
- }
- }
+ if(m_jfexid ==0 || m_jfexid ==5) {
+ for(std::map<int, jFEXForwardJetsInfo>::iterator it = m_FCALJets.begin(); it!=(m_FCALJets.end()); ++it) {
+ jFEXForwardJetsInfo FCALJetInfo = it->second;
+ eta = ieta -8;
+ phi = iphi -8;
+ et = FCALJetInfo.getSeedET() + FCALJetInfo.getFirstEnergyRingET();
+ jFEXSmallRJetTOBEt = et/jFEXETResolution;
+ }
+ }
- if (jFEXSmallRJetTOBEt > 0x7ff){
- jFEXSmallRJetTOBEt = 0x7ff;
- Sat = 1;
- }
+ if (jFEXSmallRJetTOBEt > 0x7ff) {
+ jFEXSmallRJetTOBEt = 0x7ff;
+ Sat = 1;
+ }
- //create basic tobword with 32 bits
- tobWord = tobWord + (eta<<27) + (phi << 23) + (jFEXSmallRJetTOBEt << 12) + (Res<<1) + (Sat);
- ATH_MSG_DEBUG("tobword smallRJet with et, phi, eta, res and sat : " << std::bitset<32>(tobWord) );
-
- //arbitary et threshold to not overflow the TOBs
- unsigned int minEtThreshold = 30;
- if (et < minEtThreshold) return 0;
- else return tobWord;
+ //create basic tobword with 32 bits
+ tobWord = tobWord + (eta<<27) + (phi << 23) + (jFEXSmallRJetTOBEt << 12) + (Res<<1) + (Sat);
+ ATH_MSG_DEBUG("tobword smallRJet with et, phi, eta, res and sat : " << std::bitset<32>(tobWord) );
+ // Retrieve the L1 menu configuration
+ SG::ReadHandle<TrigConf::L1Menu> l1Menu (m_l1MenuKey/*, ctx*/);
+ auto & thr_jJ = l1Menu->thrExtraInfo().jJ();
+ unsigned int minEtThreshold = thr_jJ.ptMinToTopoSmallMeV()/jFEXETResolution;
+
+ if (jFEXSmallRJetTOBEt < minEtThreshold) return 0;
+ else return tobWord;
}
-uint32_t jFEXFPGA::formLargeRJetTOB(int & iphi, int &ieta)
-{
- uint32_t tobWord = 0;
- const unsigned int jFEXETResolution = 200; //LSB is 200MeV
- int eta = 0;
- int phi = 0;
- unsigned int et = 0;
- unsigned int jFEXLargeRJetTOBEt = 0;
- int Res = 0; // 9 bits reserved
- int Sat = 0; // 1 bit for saturation. Set to 1 when jet energy is saturated
-
- if(m_jfexid > 0 && m_jfexid < 5){
- et = m_jFEXLargeRJetAlgoTool->getLargeClusterET(m_jFEXSmallRJetAlgoTool->getSmallClusterET(),m_jFEXLargeRJetAlgoTool->getRingET());
- jFEXLargeRJetTOBEt = et/jFEXETResolution;
- eta = ieta -8;
- phi = iphi -8;
- }
-
- if(m_jfexid ==0 || m_jfexid ==5){
- for(std::map<int, jFEXForwardJetsInfo>::iterator it = m_FCALJets.begin(); it!=(m_FCALJets.end()); ++it){
- jFEXForwardJetsInfo FCALJetInfo = it->second;
- eta = ieta -8;
- phi = iphi -8;
- et = FCALJetInfo.getSeedET() + FCALJetInfo.getFirstEnergyRingET() + FCALJetInfo.getSecondEnergyRingET();
- jFEXLargeRJetTOBEt = et/jFEXETResolution;
+uint32_t jFEXFPGA::formLargeRJetTOB(int & iphi, int &ieta) {
+
+ uint32_t tobWord = 0;
+ const unsigned int jFEXETResolution = 200; //LSB is 200MeV
+ int eta = 0;
+ int phi = 0;
+ unsigned int et = 0;
+ unsigned int jFEXLargeRJetTOBEt = 0;
+ int Res = 0; // 9 bits reserved
+ int Sat = 0; // 1 bit for saturation. Set to 1 when jet energy is saturated
+
+ if(m_jfexid > 0 && m_jfexid < 5) {
+ et = m_jFEXLargeRJetAlgoTool->getLargeClusterET(m_jFEXSmallRJetAlgoTool->getSmallClusterET(),m_jFEXLargeRJetAlgoTool->getRingET());
+ jFEXLargeRJetTOBEt = et/jFEXETResolution;
+ eta = ieta -8;
+ phi = iphi -8;
}
- }
- if (jFEXLargeRJetTOBEt > 0x1fff){
- jFEXLargeRJetTOBEt = 0x1fff; //0x1fff is 13 bits
- Sat = 1;
- }
- //create basic tobword with 32 bits
- tobWord = tobWord + (eta<<27) + (phi << 23) + (jFEXLargeRJetTOBEt << 10) + (Res<<1) + (Sat);
- ATH_MSG_DEBUG("tobword largeRJet with et, phi, eta, sub and sat : " << std::bitset<32>(tobWord) );
+ if(m_jfexid ==0 || m_jfexid ==5) {
+ for(std::map<int, jFEXForwardJetsInfo>::iterator it = m_FCALJets.begin(); it!=(m_FCALJets.end()); ++it) {
+ jFEXForwardJetsInfo FCALJetInfo = it->second;
+ eta = ieta -8;
+ phi = iphi -8;
+ et = FCALJetInfo.getSeedET() + FCALJetInfo.getFirstEnergyRingET() + FCALJetInfo.getSecondEnergyRingET();
+ jFEXLargeRJetTOBEt = et/jFEXETResolution;
+ }
+ }
- //arbitary et threshold to not overflow the TOBs
- unsigned int minEtThreshold = 30;
- if (et < minEtThreshold) return 0;
- else return tobWord;
+ if (jFEXLargeRJetTOBEt > 0x1fff) {
+ jFEXLargeRJetTOBEt = 0x1fff; //0x1fff is 13 bits
+ Sat = 1;
+ }
+ //create basic tobword with 32 bits
+ tobWord = tobWord + (eta<<27) + (phi << 23) + (jFEXLargeRJetTOBEt << 10) + (Res<<1) + (Sat);
+ ATH_MSG_DEBUG("tobword largeRJet with et, phi, eta, sub and sat : " << std::bitset<32>(tobWord) );
+
+ // Retrieve the L1 menu configuration
+ SG::ReadHandle<TrigConf::L1Menu> l1Menu (m_l1MenuKey/*, ctx*/);
+ auto & thr_jJ = l1Menu->thrExtraInfo().jJ();
+ unsigned int minEtThreshold = thr_jJ.ptMinToTopoLargeMeV()/jFEXETResolution;
+ if (jFEXLargeRJetTOBEt < minEtThreshold) return 0;
+ else return tobWord;
}
uint32_t jFEXFPGA::formTauTOB(int & iphi, int &ieta )
{
- uint32_t tobWord = 0;
- const unsigned int jFEXETResolution = 200; //LSB is 200MeV
+ uint32_t tobWord = 0;
+ const unsigned int jFEXETResolution = 200; //LSB is 200MeV
+
+ int eta = ieta-8; // needed to substract 8 to be in the FPGA core area
+ int phi = iphi-8; // needed to substract 8 to be in the FPGA core area
+ int sat = 0; //1 bit for saturation flag, not coded yet
+
+ unsigned int et = m_jFEXtauAlgoTool->getClusterEt()/jFEXETResolution;
+ if (et > 0x7ff) { //0x7ff is 11 bits
+ ATH_MSG_DEBUG("Et saturated: " << et );
+ et = 0x7ff;
+ sat=1;
+ }
- int eta = ieta-8; // needed to substract 8 to be in the FPGA core area
- int phi = iphi-8; // needed to substract 8 to be in the FPGA core area
- int sat = 0; //1 bit for saturation flag, not coded yet
- unsigned int et = m_jFEXtauAlgoTool->getClusterEt()/jFEXETResolution;
- if (et > 0x7ff) { //0x7ff is 11 bits
- ATH_MSG_DEBUG("Et saturated: " << et );
- et = 0x7ff;
- sat=1;
- }
+ unsigned int iso = m_jFEXtauAlgoTool->getFirstEtRing()/jFEXETResolution;
+ if (iso > 0x7ff) iso = 0x7ff; //0x7ff is 11 bits
- unsigned int iso = m_jFEXtauAlgoTool->getFirstEtRing()/jFEXETResolution;
- if (iso > 0x7ff) iso = 0x7ff; //0x7ff is 11 bits
+ //create basic tobword with 32 bits
+ tobWord = tobWord + (eta << 27) + (phi << 23) + (et << 12) + (iso << 1) + sat ;
-
- //create basic tobword with 32 bits
- tobWord = tobWord + (eta << 27) + (phi << 23) + (et << 12) + (iso << 1) + sat ;
-
- ATH_MSG_DEBUG("tobword tau with eta, phi, et, iso and sat : " << std::bitset<32>(tobWord) );
+ ATH_MSG_DEBUG("tobword tau with eta, phi, et, iso and sat : " << std::bitset<32>(tobWord) );
+
+ //arbitary et threshold to not overflow the TOBs
- //arbitary et threshold to not overflow the TOBs
- unsigned int minEtThreshold = 30;
- if (et < minEtThreshold) return 0;
- else return tobWord;
+ /***************** NEEDS TO BE IMPLEMENTED IN THE FUTURE (JIRA TICKED OPENED) *****************/
+ // Retrieve the L1 menu configuration
+ //SG::ReadHandle<TrigConf::L1Menu> l1Menu (m_l1MenuKey/*, ctx*/);
+ //auto & thr_jTAU = l1Menu->thrExtraInfo().jTAU();
+ //unsigned int minEtThreshold = thr_jTAU.ptMinToTopo()/jFEXETResolution;
+
+ //arbitary et threshold to not overflow the TOBs
+ unsigned int minEtThreshold = 100;
+
+ if (et < minEtThreshold) return 0;
+ else return tobWord;
}
diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXPileupAndNoise.cxx b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXPileupAndNoise.cxx
index 9b1f38d5e9b1..f1fa26ecc744 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXPileupAndNoise.cxx
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXPileupAndNoise.cxx
@@ -530,7 +530,6 @@ int LVL1::jFEXPileupAndNoise::getTTowerEta(unsigned int TTID) {
//Gets ET of the TT
int LVL1::jFEXPileupAndNoise::getTTowerET(unsigned int TTID) {
- return 10000. ;
SG::ReadHandle<jTowerContainer> jk_jFEXPileupAndNoise_jTowerContainer(m_jFEXPileupAndNoise_jTowerContainerKey);
const LVL1::jTower * tmpTower = jk_jFEXPileupAndNoise_jTowerContainer->findTower(TTID);
return tmpTower->getTotalET();
@@ -538,7 +537,6 @@ int LVL1::jFEXPileupAndNoise::getTTowerET(unsigned int TTID) {
//Gets EM ET of the TT
int LVL1::jFEXPileupAndNoise::getET_EM(unsigned int TTID) {
-return 2000. ;
SG::ReadHandle<jTowerContainer> jk_jFEXPileupAndNoise_jTowerContainer(m_jFEXPileupAndNoise_jTowerContainerKey);
const LVL1::jTower * tmpTower = jk_jFEXPileupAndNoise_jTowerContainer->findTower(TTID);
return tmpTower->getET_EM();
@@ -546,7 +544,6 @@ return 2000. ;
//Gets HAD ET of the TT
int LVL1::jFEXPileupAndNoise::getET_HAD(unsigned int TTID) {
-return 1000. ;
SG::ReadHandle<jTowerContainer> jk_jFEXPileupAndNoise_jTowerContainer(m_jFEXPileupAndNoise_jTowerContainerKey);
const LVL1::jTower * tmpTower = jk_jFEXPileupAndNoise_jTowerContainer->findTower(TTID);
return tmpTower->getET_HAD();
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXFPGA.h b/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXFPGA.h
index abf35540fddf..b2110d6a816e 100644
--- a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXFPGA.h
+++ b/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXFPGA.h
@@ -19,6 +19,7 @@
#include "CaloIdentifier/CaloIdManager.h"
#include "CaloIdentifier/CaloCell_SuperCell_ID.h"
#include "L1CaloFEXSim/FEXAlgoSpaceDefs.h"
+#include "TrigConfData/L1Menu.h"
namespace LVL1 {
--
GitLab
From 2757b0f3048b7dbc629c23862789ad276048173b Mon Sep 17 00:00:00 2001
From: Rafal Bielski <rafal.bielski@cern.ch>
Date: Tue, 17 Aug 2021 15:59:36 +0200
Subject: [PATCH 099/272] Disable online monitoring of Filter algorithms by
default
---
.../DecisionHandling/python/DecisionHandlingConfig.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/Trigger/TrigSteer/DecisionHandling/python/DecisionHandlingConfig.py b/Trigger/TrigSteer/DecisionHandling/python/DecisionHandlingConfig.py
index c03f42391f68..1162bcf5ad7f 100644
--- a/Trigger/TrigSteer/DecisionHandling/python/DecisionHandlingConfig.py
+++ b/Trigger/TrigSteer/DecisionHandling/python/DecisionHandlingConfig.py
@@ -1,9 +1,11 @@
#
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
#
-def setupFilterMonitoring( filterAlg ):
- if not hasattr(filterAlg, "Input"):
+EnableFilterMonitoring = False # Can be changed in a precommand/preExec
+
+def setupFilterMonitoring( filterAlg ):
+ if not EnableFilterMonitoring or not hasattr(filterAlg, "Input"):
return
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
monTool = GenericMonitoringTool('MonTool')
--
GitLab
From ae4db1b813790e3e2865fe95aa1fcdec9dfec265 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Tue, 17 Aug 2021 17:42:52 +0200
Subject: [PATCH 100/272] L1TopoSimulation: remove support of legacy trigger
configuration
Remove support of XML-based trigger configuration (ATR-21862).
---
.../L1Topo/L1TopoSimulation/CMakeLists.txt | 4 +--
.../python/L1TopoSimulationConfig.py | 19 +++++---------
.../src/MuonInputProvider.cxx | 25 +++----------------
.../L1TopoSimulation/src/MuonInputProvider.h | 7 ------
.../src/MuonInputProviderLegacy.cxx | 25 +++----------------
.../src/MuonInputProviderLegacy.h | 7 ------
6 files changed, 16 insertions(+), 71 deletions(-)
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/CMakeLists.txt b/Trigger/TrigT1/L1Topo/L1TopoSimulation/CMakeLists.txt
index a8380b459c7e..2ef6ec30674b 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/CMakeLists.txt
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/CMakeLists.txt
@@ -19,12 +19,12 @@ atlas_add_library( L1TopoSimulationLib
atlas_add_component( L1TopoSimulation
src/*.h src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaMonitoringLib GaudiKernel L1TopoConfig L1TopoCoreSim L1TopoEvent L1TopoInterfaces L1TopoRDO L1TopoSimulationLib StoreGateLib TrigConfBase TrigConfInterfaces TrigConfData TrigConfL1Data TrigT1CaloEventLib TrigT1CaloUtilsLib TrigT1Interfaces TrigT1Result xAODTrigger )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaMonitoringLib GaudiKernel L1TopoConfig L1TopoCoreSim L1TopoEvent L1TopoInterfaces L1TopoRDO L1TopoSimulationLib StoreGateLib TrigConfBase TrigConfData TrigT1CaloEventLib TrigT1CaloUtilsLib TrigT1Interfaces TrigT1Result xAODTrigger )
atlas_add_component( L1TopoSimulationTest
src/test/*.h src/test/*.cxx src/test/components/*.cxx src/AthenaL1TopoHistSvc.h src/AthenaL1TopoHistSvc.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaMonitoringLib GaudiKernel L1TopoConfig L1TopoCoreSim L1TopoEvent L1TopoInterfaces StoreGateLib TrigConfBase TrigConfInterfaces TrigConfData TrigConfIO)
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaMonitoringLib GaudiKernel L1TopoConfig L1TopoCoreSim L1TopoEvent L1TopoInterfaces StoreGateLib TrigConfBase TrigConfData TrigConfIO)
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/python/L1TopoSimulationConfig.py b/Trigger/TrigT1/L1Topo/L1TopoSimulation/python/L1TopoSimulationConfig.py
index e1f303149d65..ead29f180e1b 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/python/L1TopoSimulationConfig.py
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/python/L1TopoSimulationConfig.py
@@ -46,15 +46,12 @@ def L1LegacyTopoSimulationCfg(flags):
muProvider = CompFactory.LVL1.MuonInputProvider("MuonInputProvider",
ROIBResultLocation = "", #disable input from RoIBResult
MuctpiSimTool = muctpiTool,
- MuonEncoding = 1 if flags.Input.isMC else 0,
- UseNewConfig = flags.Trigger.readLVL1FromJSON)
+ MuonEncoding = 1 if flags.Input.isMC else 0)
else:
muProvider = CompFactory.LVL1.MuonInputProviderLegacy("MuonInputProviderLegacy",
ROIBResultLocation = "", #disable input from RoIBResult
MuctpiSimTool = muctpiTool,
- MuonEncoding = 1 if flags.Input.isMC else 0,
- UseNewConfig = flags.Trigger.readLVL1FromJSON)
-
+ MuonEncoding = 1 if flags.Input.isMC else 0)
#Configure the MuonRoiTools for the MIP
from TrigT1MuonRecRoiTool.TrigT1MuonRecRoiToolConfig import getRun3RPCRecRoiTool, getRun3TGCRecRoiTool
@@ -81,8 +78,7 @@ def L1TopoSimulationCfg(flags):
if flags.Trigger.enableL1MuonPhase1:
muProvider = CompFactory.LVL1.MuonInputProvider("MuonInputProvider",
ROIBResultLocation = "", #disable input from RoIBResult
- MuonEncoding = 1 if flags.Input.isMC else 0,
- UseNewConfig = flags.Trigger.readLVL1FromJSON)
+ MuonEncoding = 1 if flags.Input.isMC else 0)
else:
#Grab the MUCTPI tool
from TrigT1Muctpi.TrigT1MuctpiConfig import L1MuctpiToolRDOCfg
@@ -93,9 +89,8 @@ def L1TopoSimulationCfg(flags):
muProvider = CompFactory.LVL1.MuonInputProviderLegacy("MuonInputProviderLegacy",
ROIBResultLocation = "", #disable input from RoIBResult
MuctpiSimTool = muctpiTool,
- MuonEncoding = 1 if flags.Input.isMC else 0,
- UseNewConfig = flags.Trigger.readLVL1FromJSON)
-
+ MuonEncoding = 1 if flags.Input.isMC else 0)
+
#Configure the MuonRoiTools for the MIP
from TrigT1MuonRecRoiTool.TrigT1MuonRecRoiToolConfig import getRun3RPCRecRoiTool, getRun3TGCRecRoiTool
muProvider.RecRpcRoiTool = getRun3RPCRecRoiTool("RPCRecRoiTool", useRun3Config = flags.Trigger.enableL1MuonPhase1)
@@ -120,7 +115,6 @@ def L1TopoSimulationOldStyleCfg(flags, isLegacy):
topoSimSeq.EnableInputDump = flags.Trigger.enableL1TopoDump
topoSimSeq.IsLegacyTopo = isLegacy
topoSimSeq.MonHistBaseDir = 'L1/L1'+key+'TopoAlgorithms'
- topoSimSeq.MuonInputProvider.UseNewConfig = flags.Trigger.readLVL1FromJSON
# Calo inputs
if flags.Trigger.enableL1CaloPhase1 and not isLegacy:
@@ -130,8 +124,7 @@ def L1TopoSimulationOldStyleCfg(flags, isLegacy):
# Muon inputs
from L1TopoSimulation.L1TopoSimulationConfig import MuonInputProviderLegacy
- ToolSvc += MuonInputProviderLegacy('MuonInputProviderLegacy')
- ToolSvc.MuonInputProviderLegacy.UseNewConfig = flags.Trigger.readLVL1FromJSON
+ ToolSvc += MuonInputProviderLegacy('MuonInputProviderLegacy')
if flags.Trigger.doLVL1:
# TODO: the legacy simulation should not need to deal with muon inputs
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/MuonInputProvider.cxx b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/MuonInputProvider.cxx
index 5cca1471f5f3..277561afd8a5 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/MuonInputProvider.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/MuonInputProvider.cxx
@@ -17,8 +17,6 @@
#include "TrigT1Result/Header.h"
#include "TrigT1Result/Trailer.h"
-#include "TrigConfL1Data/L1DataDef.h"
-#include "TrigConfL1Data/CTPConfig.h"
#include "TrigConfData/L1Menu.h"
using namespace LVL1;
@@ -33,17 +31,11 @@ MuonInputProvider::MuonInputProvider( const std::string& type, const std::string
StatusCode
MuonInputProvider::initialize() {
- ATH_MSG_DEBUG("Retrieving LVL1ConfigSvc " << m_configSvc);
- CHECK( m_configSvc.retrieve() );
// Get the RPC and TGC RecRoI tool
ATH_CHECK( m_recRPCRoiTool.retrieve() );
ATH_CHECK( m_recTGCRoiTool.retrieve() );
-
- ATH_MSG_INFO("UseNewConfig set to " << (m_useNewConfig ? "True" : "False"));
- if(! m_useNewConfig) {
- m_MuonThresholds = m_configSvc->ctpConfig()->menu().thresholdConfig().getThresholdVector(TrigConf::L1DataDef::MUON);
- }
+
CHECK(m_histSvc.retrieve());
ServiceHandle<IIncidentSvc> incidentSvc("IncidentSvc", "MuonInputProvider");
@@ -154,12 +146,7 @@ MuonInputProvider::handle(const Incident& incident) {
TCS::MuonTOB
MuonInputProvider::createMuonTOB(uint32_t roiword, const TrigConf::L1Menu * l1menu) const {
- LVL1::RecMuonRoI roi;
- if(m_useNewConfig) {
- roi.construct( roiword, m_recRPCRoiTool.get(), m_recTGCRoiTool.operator->(), l1menu );
- } else {
- roi.construct( roiword, m_recRPCRoiTool.operator->(), m_recTGCRoiTool.operator->(), &m_MuonThresholds );
- }
+ LVL1::RecMuonRoI roi( roiword, m_recRPCRoiTool.get(), m_recTGCRoiTool.operator->(), l1menu );
ATH_MSG_DEBUG("Muon ROI: thrvalue = " << roi.getThresholdValue() << " eta = " << roi.eta() << " phi = " << roi.phi() << ", w = " << MSG::hex << std::setw( 8 ) << roi.roiWord() << MSG::dec);
@@ -299,9 +286,7 @@ MuonInputProvider::fillTopoInputEvent(TCS::TopoInputEvent& inputEvent) const {
if( roibResult ) {
const TrigConf::L1Menu * l1menu = nullptr;
- if( m_useNewConfig ) {
- ATH_CHECK( detStore()->retrieve(l1menu) );
- }
+ ATH_CHECK( detStore()->retrieve(l1menu) );
const std::vector< ROIB::MuCTPIRoI >& rois = roibResult->muCTPIResult().roIVec();
@@ -320,9 +305,7 @@ MuonInputProvider::fillTopoInputEvent(TCS::TopoInputEvent& inputEvent) const {
} else if( muctpi_slink ) {
const TrigConf::L1Menu * l1menu = nullptr;
- if( m_useNewConfig ) {
- ATH_CHECK( detStore()->retrieve(l1menu) );
- }
+ ATH_CHECK( detStore()->retrieve(l1menu) );
ATH_MSG_DEBUG("Filling the input event. Number of Muon ROIs: " << muctpi_slink->getMuCTPIToRoIBWords().size() - ROIB::Header::wordsPerHeader - ROIB::Trailer::wordsPerTrailer - 1);
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/MuonInputProvider.h b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/MuonInputProvider.h
index 83aa596a137a..74658e8b0387 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/MuonInputProvider.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/MuonInputProvider.h
@@ -15,7 +15,6 @@
#include "TrigT1Interfaces/MuCTPIToRoIBSLink.h"
#include "TrigT1Interfaces/TrigT1StoreGateKeys.h"
#include "TrigT1Interfaces/ITrigT1MuonRecRoiTool.h"
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
#include "TH1.h"
#include "TH2.h"
@@ -26,7 +25,6 @@ class ITHistSvc;
namespace TrigConf
{
- class TriggerThreshold;
class L1Menu;
} // namespace TrigConf
@@ -82,14 +80,9 @@ namespace LVL1 {
ServiceHandle<ITHistSvc> m_histSvc;
- Gaudi::Property<bool> m_useNewConfig{this, "UseNewConfig", false, "When true, read the menu from detector store, when false use the L1ConfigSvc"};
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc{this, "LVL1ConfigSvc", "LVL1ConfigSvc", "The LVL1ConfigSvc providing L1 configuration for Run 2"};
-
ToolHandle<LVL1::ITrigT1MuonRecRoiTool> m_recRPCRoiTool{this, "RecRpcRoiTool", "LVL1::TrigT1RPCRecRoiTool/TrigT1RPCRecRoiTool", "RPC RoI reconstruction tool"};
ToolHandle<LVL1::ITrigT1MuonRecRoiTool> m_recTGCRoiTool{this, "RecTgcRoiTool", "LVL1::TrigT1TGCRecRoiTool/TrigT1TGCRecRoiTool", "TGC RoI reconstruction tool"};
- std::vector< TrigConf::TriggerThreshold* > m_MuonThresholds;
-
SG::ReadHandleKey<L1MUINT::MuCTPIToRoIBSLink> m_muonROILocation { this, "MuonROILocation", LVL1MUCTPI::DEFAULT_MuonRoIBLocation, "Storegate key for the Muon ROIs" };
SG::ReadHandleKey<ROIB::RoIBResult> m_roibLocation{ this, "ROIBResultLocation", ROIB::DEFAULT_RoIBRDOLocation, "Storegate key for the reading the ROIBResult" };
SG::ReadHandleKey<LVL1::MuCTPIL1Topo> m_MuCTPItoL1TopoLocation { this, "locationMuCTPItoL1Topo", LVL1MUCTPI::DEFAULT_MuonL1TopoLocation, "Storegate key for MuCTPItoL1Topo "};
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/MuonInputProviderLegacy.cxx b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/MuonInputProviderLegacy.cxx
index 64165e729751..d4eee4cd904a 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/MuonInputProviderLegacy.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/MuonInputProviderLegacy.cxx
@@ -17,8 +17,6 @@
#include "TrigT1Result/Header.h"
#include "TrigT1Result/Trailer.h"
-#include "TrigConfL1Data/L1DataDef.h"
-#include "TrigConfL1Data/CTPConfig.h"
#include "TrigConfData/L1Menu.h"
using namespace std;
@@ -34,17 +32,11 @@ MuonInputProviderLegacy::MuonInputProviderLegacy( const std::string& type, const
StatusCode
MuonInputProviderLegacy::initialize() {
- ATH_MSG_DEBUG("Retrieving LVL1ConfigSvc " << m_configSvc);
- CHECK( m_configSvc.retrieve() );
// Get the RPC and TGC RecRoI tool
ATH_CHECK( m_recRPCRoiTool.retrieve() );
ATH_CHECK( m_recTGCRoiTool.retrieve() );
-
- ATH_MSG_INFO("UseNewConfig set to " << (m_useNewConfig ? "True" : "False"));
- if(! m_useNewConfig) {
- m_MuonThresholds = m_configSvc->ctpConfig()->menu().thresholdConfig().getThresholdVector(TrigConf::L1DataDef::MUON);
- }
+
CHECK(m_histSvc.retrieve());
ServiceHandle<IIncidentSvc> incidentSvc("IncidentSvc", "MuonInputProviderLegacy");
@@ -104,12 +96,7 @@ MuonInputProviderLegacy::handle(const Incident& incident) {
TCS::MuonTOB
MuonInputProviderLegacy::createMuonTOB(uint32_t roiword, const TrigConf::L1Menu * l1menu) const {
- LVL1::RecMuonRoI roi;
- if(m_useNewConfig) {
- roi.construct( roiword, m_recRPCRoiTool.get(), m_recTGCRoiTool.operator->(), l1menu );
- } else {
- roi.construct( roiword, m_recRPCRoiTool.operator->(), m_recTGCRoiTool.operator->(), &m_MuonThresholds );
- }
+ LVL1::RecMuonRoI roi( roiword, m_recRPCRoiTool.get(), m_recTGCRoiTool.operator->(), l1menu );
ATH_MSG_DEBUG("Muon ROI: thrvalue = " << roi.getThresholdValue() << " eta = " << roi.eta() << " phi = " << roi.phi() << ", w = " << MSG::hex << std::setw( 8 ) << roi.roiWord() << MSG::dec);
@@ -213,9 +200,7 @@ MuonInputProviderLegacy::fillTopoInputEvent(TCS::TopoInputEvent& inputEvent) con
if( roibResult ) {
const TrigConf::L1Menu * l1menu = nullptr;
- if( m_useNewConfig ) {
- ATH_CHECK( detStore()->retrieve(l1menu) );
- }
+ ATH_CHECK( detStore()->retrieve(l1menu) );
const std::vector< ROIB::MuCTPIRoI >& rois = roibResult->muCTPIResult().roIVec();
@@ -234,9 +219,7 @@ MuonInputProviderLegacy::fillTopoInputEvent(TCS::TopoInputEvent& inputEvent) con
} else if( muctpi_slink ) {
const TrigConf::L1Menu * l1menu = nullptr;
- if( m_useNewConfig ) {
- ATH_CHECK( detStore()->retrieve(l1menu) );
- }
+ ATH_CHECK( detStore()->retrieve(l1menu) );
ATH_MSG_DEBUG("Filling the input event. Number of Muon ROIs: " << muctpi_slink->getMuCTPIToRoIBWords().size() - ROIB::Header::wordsPerHeader - ROIB::Trailer::wordsPerTrailer - 1);
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/MuonInputProviderLegacy.h b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/MuonInputProviderLegacy.h
index aa3ae806df4a..cba64f3b7a4c 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/MuonInputProviderLegacy.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/MuonInputProviderLegacy.h
@@ -16,7 +16,6 @@
#include "TrigT1Interfaces/TrigT1StoreGateKeys.h"
#include "TrigT1Interfaces/ITrigT1MuonRecRoiTool.h"
#include "TrigT1Interfaces/IMuctpiSimTool.h"
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
#include "TH1.h"
#include "TH2.h"
@@ -27,7 +26,6 @@ class ITHistSvc;
namespace TrigConf
{
- class TriggerThreshold;
class L1Menu;
} // namespace TrigConf
@@ -70,16 +68,11 @@ namespace LVL1 {
ServiceHandle<ITHistSvc> m_histSvc;
- Gaudi::Property<bool> m_useNewConfig{this, "UseNewConfig", false, "When true, read the menu from detector store, when false use the L1ConfigSvc"};
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc{this, "LVL1ConfigSvc", "LVL1ConfigSvc", "The LVL1ConfigSvc providing L1 configuration for Run 2"};
-
ToolHandle<LVL1::ITrigT1MuonRecRoiTool> m_recRPCRoiTool{this, "RecRpcRoiTool", "LVL1::TrigT1RPCRecRoiTool/TrigT1RPCRecRoiTool", "RPC RoI reconstruction tool"};
ToolHandle<LVL1::ITrigT1MuonRecRoiTool> m_recTGCRoiTool{this, "RecTgcRoiTool", "LVL1::TrigT1TGCRecRoiTool/TrigT1TGCRecRoiTool", "TGC RoI reconstruction tool"};
ToolHandle<LVL1MUCTPI::IMuctpiSimTool> m_MuctpiSimTool{this, "MuctpiSimTool", "LVL1MUCTPI::L1MuctpiTool/LVL1MUCTPI__L1MuctpiTool", "Tool for MUCTPIsimulation"};
- std::vector< TrigConf::TriggerThreshold* > m_MuonThresholds;
-
SG::ReadHandleKey<L1MUINT::MuCTPIToRoIBSLink> m_muonROILocation { this, "MuonROILocation", LVL1MUCTPI::DEFAULT_MuonRoIBLocation, "Storegate key for the Muon ROIs" };
SG::ReadHandleKey<ROIB::RoIBResult> m_roibLocation{ this, "ROIBResultLocation", ROIB::DEFAULT_RoIBRDOLocation, "Storegate key for the reading the ROIBResult" };
SG::ReadHandleKey<LVL1::MuCTPIL1Topo> m_MuCTPItoL1TopoLocation { this, "locationMuCTPItoL1Topo", LVL1MUCTPI::DEFAULT_MuonL1TopoLocation, "Storegate key for MuCTPItoL1Topo "};
--
GitLab
From 44ab4cc96f03dca4fdf24b0b64fdb7ef8d6522a8 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Tue, 17 Aug 2021 17:56:00 +0200
Subject: [PATCH 101/272] RoIBResultToxAOD: remove support of legacy trigger
configuration (ATR-21862)
---
.../AnalysisTriggerAlgs/CMakeLists.txt | 4 +-
.../python/AnalysisTriggerAlgsConfig.py | 2 -
.../src/RoIBResultToxAOD.cxx | 175 +++---------------
.../src/RoIBResultToxAOD.h | 9 -
4 files changed, 32 insertions(+), 158 deletions(-)
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/CMakeLists.txt b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/CMakeLists.txt
index 3292323d2d6a..0e9043c41efc 100644
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/CMakeLists.txt
@@ -8,8 +8,8 @@ atlas_add_component( AnalysisTriggerAlgs
src/*.h src/*.cxx src/components/*.cxx
LINK_LIBRARIES AthenaBaseComps AthenaKernel StoreGateLib
xAODTrigL1Calo xAODTrigger GaudiKernel
- TrigConfData TrigConfL1Data TrigT1CaloEventLib TrigT1CaloToolInterfaces TrigT1Interfaces
- TrigT1Result TrigConfInterfaces TrigT1CaloUtilsLib )
+ TrigConfData TrigT1CaloEventLib TrigT1CaloToolInterfaces TrigT1Interfaces
+ TrigT1Result TrigT1CaloUtilsLib )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/python/AnalysisTriggerAlgsConfig.py b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/python/AnalysisTriggerAlgsConfig.py
index 31962d66e8cd..3168c6c132f5 100644
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/python/AnalysisTriggerAlgsConfig.py
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/python/AnalysisTriggerAlgsConfig.py
@@ -33,9 +33,7 @@ class RoIBResultToxAOD( Conf.RoIBResultToxAOD ):
# later on in the job configuration...
# Set the handle for the algorithm:
- self.LVL1ConfigSvc = lvl1ConfigSvc
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- self.UseNewConfig = ConfigFlags.Trigger.readLVL1FromJSON
#
# Set up the L1Calo tools:
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/RoIBResultToxAOD.cxx b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/RoIBResultToxAOD.cxx
index 3d682058d586..0bd50db17804 100644
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/RoIBResultToxAOD.cxx
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/RoIBResultToxAOD.cxx
@@ -24,11 +24,6 @@
#include "TrigT1CaloUtils/JEMJetAlgorithm.h"
// Trigger configuration interface includes:
-#include "TrigConfL1Data/CTPConfig.h"
-#include "TrigConfL1Data/Menu.h"
-#include "TrigConfL1Data/TriggerItem.h"
-#include "TrigConfL1Data/L1DataDef.h"
-#include "TrigConfL1Data/TriggerThreshold.h"
#include "TrigConfData/L1Menu.h"
// xAOD include(s):
@@ -60,10 +55,6 @@ StatusCode RoIBResultToxAOD::initialize() {
ATH_MSG_INFO( "Inputs from LVL1 Muon systems switched off" );
}
- // Connect to the LVL1ConfigSvc for the trigger configuration.
- ATH_CHECK( m_configSvc.retrieve() );
- ATH_MSG_DEBUG( "Connected to " << m_configSvc.typeAndName() );
-
if( m_doMuon ) {
// Get the RPC RecRoI tool
ATH_CHECK( m_recRPCRoiTool.retrieve() );
@@ -135,37 +126,18 @@ StatusCode RoIBResultToxAOD::createEmTauRoI( const ROIB::RoIBResult& result,
auto emtau_aux = std::make_unique< xAOD::EmTauRoIAuxContainer >();
emtau_xaod->setStore( emtau_aux.get() );
- /// Digit scale for calorimeter trigger
- float caloTrigScale = 1;
const TrigConf::L1Menu * l1menu = nullptr;
- std::vector< TrigConf::TriggerThreshold* > caloThresholds;
std::map< int, std::string > emThresholdNames;
std::map< int, std::string > tauThresholdNames;
- if( m_useNewConfig ) {
- ATH_CHECK( detStore()->retrieve(l1menu) );
- caloTrigScale = (float)l1menu->thrExtraInfo().EM().resolutionMeV();
- for( auto thr : l1menu->thresholds("EM")) {
- emThresholdNames[ thr->mapping() ] = thr->name();
- }
- for( auto thr : l1menu->thresholds("TAU")) {
- tauThresholdNames[ thr->mapping() ] = thr->name();
- }
- } else {
- caloTrigScale = GeV / m_configSvc->thresholdConfig()->caloInfo().globalEmScale();
- /** Get EmTau Thresholds from configSvc. Also fill a map of threshold names while
- we are here - will be useful later */
- const std::vector< TrigConf::TriggerThreshold* >& thresholds =
- m_configSvc->ctpConfig()->menu().thresholdVector();
- for( TrigConf::TriggerThreshold* tt : thresholds ) {
- if( tt->type() == TrigConf::L1DataDef::emType() ) {
- caloThresholds.push_back( tt );
- emThresholdNames[ tt->thresholdNumber() ] = tt->name();
- }
- else if( tt->type() == TrigConf::L1DataDef::tauType() ) {
- caloThresholds.push_back( tt );
- tauThresholdNames[ tt->thresholdNumber() ] = tt->name();
- }
- }
+
+ ATH_CHECK( detStore()->retrieve(l1menu) );
+ // Digit scale for calorimeter trigger
+ float caloTrigScale = static_cast<float>(l1menu->thrExtraInfo().EM().resolutionMeV());
+ for( auto thr : l1menu->thresholds("EM")) {
+ emThresholdNames[ thr->mapping() ] = thr->name();
+ }
+ for( auto thr : l1menu->thresholds("TAU")) {
+ tauThresholdNames[ thr->mapping() ] = thr->name();
}
// Tool to reconstruct EM/tau cluster & isolation sums
@@ -190,12 +162,7 @@ StatusCode RoIBResultToxAOD::createEmTauRoI( const ROIB::RoIBResult& result,
<< std::setw( 8 ) << roIWord << MSG::dec );
// RecRoI
- LVL1::RecEmTauRoI recRoI;
- if( l1menu ) {
- recRoI = LVL1::RecEmTauRoI( roIWord, l1menu );
- } else {
- recRoI = LVL1::RecEmTauRoI( roIWord, &caloThresholds );
- }
+ LVL1::RecEmTauRoI recRoI( roIWord, l1menu );
// xAOD component
// ATLAS standard phi convention differs from L1 hardware convention
@@ -273,28 +240,13 @@ RoIBResultToxAOD::createJetEnergyRoI( const ROIB::RoIBResult& result,
jetet_xaod->setStore( jetet_aux.get() );
const TrigConf::L1Menu * l1menu = nullptr;
- if( m_useNewConfig ) {
- ATH_CHECK( detStore()->retrieve(l1menu) );
- }
+ ATH_CHECK( detStore()->retrieve(l1menu) );
// Digit scale for calorimeter trigger
- float caloTrigScale{0};
- if( m_useNewConfig ) {
- caloTrigScale = (float)l1menu->thrExtraInfo().JET().resolutionMeV();
- } else {
- caloTrigScale = GeV / m_configSvc->thresholdConfig()->caloInfo().globalJetScale();
- }
+ float caloTrigScale = static_cast<float>(l1menu->thrExtraInfo().JET().resolutionMeV());
ATH_MSG_DEBUG( "caloTrigScale = " << caloTrigScale );
- /** Get Jet/Energy Thresholds from configSvc. Also fill maps of threshold names while
- we are here - will be useful later.
-
- Unfortunately there are 3 types of jet threshold and 3 types of ET trigger threshold,
- so this bit doesn't look very elegant */
-
- std::vector<TrigConf::TriggerThreshold*> jetThresholds;
- std::vector<TrigConf::TriggerThreshold*> energyThresholds;
- std::vector<TrigConf::TriggerThreshold*> jetEnergyThresholds;
+ // Fill maps of threshold names
std::map<int, std::string> jetNames;
std::map<int, std::string> jfNames;
std::map<int, std::string> jbNames;
@@ -302,52 +254,17 @@ RoIBResultToxAOD::createJetEnergyRoI( const ROIB::RoIBResult& result,
std::map<int, std::string> teNames;
std::map<int, std::string> xsNames;
std::map<int, std::string> jeNames;
- if ( m_useNewConfig ) {
- for( auto thr : l1menu->thresholds("JET")) {
- jetNames[ thr->mapping() ] = thr->name();
- }
- for( auto thr : l1menu->thresholds("XE")) {
- xeNames[ thr->mapping() ] = thr->name();
- }
- for( auto thr : l1menu->thresholds("TE")) {
- teNames[ thr->mapping() ] = thr->name();
- }
- for( auto thr : l1menu->thresholds("XS")) {
- xsNames[ thr->mapping() ] = thr->name();
- }
- } else {
- const std::vector< TrigConf::TriggerThreshold* >& thresholds =
- m_configSvc->ctpConfig()->menu().thresholdVector();
- for( TrigConf::TriggerThreshold* tt : thresholds ) {
- if( tt->type() == TrigConf::L1DataDef::jetType() ) {
- jetThresholds.push_back( tt );
- jetNames[ tt->thresholdNumber() ] = tt->name();
- }
- else if( tt->type() == TrigConf::L1DataDef::jfType() ) {
- jetThresholds.push_back( tt );
- jfNames[ tt->thresholdNumber() ] = tt->name();
- }
- else if( tt->type() == TrigConf::L1DataDef::jbType() ) {
- jetThresholds.push_back( tt );
- jbNames[ tt->thresholdNumber() ] = tt->name();
- }
- else if( tt->type() == TrigConf::L1DataDef::xeType() ) {
- energyThresholds.push_back( tt );
- xeNames[ tt->thresholdNumber() ] = tt->name();
- }
- else if( tt->type() == TrigConf::L1DataDef::teType() ) {
- energyThresholds.push_back( tt );
- teNames[ tt->thresholdNumber() ] = tt->name();
- }
- else if( tt->type() == TrigConf::L1DataDef::xsType() ) {
- energyThresholds.push_back( tt );
- xsNames[ tt->thresholdNumber() ] = tt->name();
- }
- else if( tt->type() == TrigConf::L1DataDef::jeType() ) {
- jetEnergyThresholds.push_back( tt );
- jeNames[ tt->thresholdNumber() ] = tt->name();
- }
- }
+ for( auto thr : l1menu->thresholds("JET")) {
+ jetNames[ thr->mapping() ] = thr->name();
+ }
+ for( auto thr : l1menu->thresholds("XE")) {
+ xeNames[ thr->mapping() ] = thr->name();
+ }
+ for( auto thr : l1menu->thresholds("TE")) {
+ teNames[ thr->mapping() ] = thr->name();
+ }
+ for( auto thr : l1menu->thresholds("XS")) {
+ xsNames[ thr->mapping() ] = thr->name();
}
// Tool to reconstruct Jet cluster ET sums
@@ -384,12 +301,7 @@ RoIBResultToxAOD::createJetEnergyRoI( const ROIB::RoIBResult& result,
// Jet ROI
if( roiType == LVL1::TrigT1CaloDefs::JetRoIWordType ) {
// RecRoI
- LVL1::RecJetRoI recRoI;
- if( m_useNewConfig) {
- recRoI = LVL1::RecJetRoI( roIWord, l1menu );
- } else {
- recRoI = LVL1::RecJetRoI( roIWord, &jetThresholds );
- }
+ LVL1::RecJetRoI recRoI( roIWord, l1menu );
// xAOD component
// Convert to ATLAS phi convention
@@ -476,12 +388,7 @@ RoIBResultToxAOD::createJetEnergyRoI( const ROIB::RoIBResult& result,
<< roiWord2 << MSG::dec );
// RecRoI
- LVL1::RecEnergyRoI recRoI;
- if( m_useNewConfig) {
- recRoI = LVL1::RecEnergyRoI( roiWord0, roiWord1, roiWord2, l1menu );
- } else {
- recRoI = LVL1::RecEnergyRoI( roiWord0, roiWord1, roiWord2, &energyThresholds );
- }
+ LVL1::RecEnergyRoI recRoI( roiWord0, roiWord1, roiWord2, l1menu );
// Overflow bits
unsigned int overflows = 0;
@@ -550,9 +457,7 @@ StatusCode RoIBResultToxAOD::createMuonRoI( const ROIB::RoIBResult& result,
ATH_MSG_DEBUG( "in buildMuonRoI()" );
const TrigConf::L1Menu * l1menu = nullptr;
- if( m_useNewConfig ) {
- ATH_CHECK( detStore()->retrieve(l1menu) );
- }
+ ATH_CHECK( detStore()->retrieve(l1menu) );
// Create the xAOD container.
auto mu_xaod = std::make_unique< xAOD::MuonRoIContainer >();
@@ -562,21 +467,8 @@ StatusCode RoIBResultToxAOD::createMuonRoI( const ROIB::RoIBResult& result,
std::vector< TrigConf::TriggerThreshold* > muonThresholds;
std::map< int, std::string > thresholdNames;
- if( m_useNewConfig ) {
- for( auto thr : l1menu->thresholds("MU")) {
- thresholdNames[ thr->mapping() ] = thr->name();
- }
- } else {
- /** Get Muon Thresholds from configSvc. Also fill a map of threshold names while
- we are here - will be useful later */
- const std::vector< TrigConf::TriggerThreshold* >& thresholds =
- m_configSvc->ctpConfig()->menu().thresholdVector();
- for( TrigConf::TriggerThreshold* tt : thresholds ) {
- if( tt->type() == TrigConf::L1DataDef::muonType() ) {
- muonThresholds.push_back( tt );
- thresholdNames[ tt->thresholdNumber() ] = tt->name();
- }
- }
+ for( auto thr : l1menu->thresholds("MU")) {
+ thresholdNames[ thr->mapping() ] = thr->name();
}
// get Muon ROI
@@ -592,14 +484,7 @@ StatusCode RoIBResultToxAOD::createMuonRoI( const ROIB::RoIBResult& result,
ATH_MSG_DEBUG( MSG::hex << std::setw( 8 ) << roIWord );
// RecRoI
- LVL1::RecMuonRoI recRoI;
- if( m_useNewConfig ) {
- recRoI = LVL1::RecMuonRoI( roIWord, m_recRPCRoiTool.get(),
- m_recTGCRoiTool.get(), l1menu );
- } else {
- recRoI = LVL1::RecMuonRoI( roIWord, m_recRPCRoiTool.get(),
- m_recTGCRoiTool.get(), &muonThresholds );
- }
+ LVL1::RecMuonRoI recRoI( roIWord, m_recRPCRoiTool.get(), m_recTGCRoiTool.get(), l1menu );
const double thrValue = recRoI.getThresholdValue() * GeV;
const int index = recRoI.getThresholdNumber() - 1;
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/RoIBResultToxAOD.h b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/RoIBResultToxAOD.h
index af76f177d5ac..d7588ca489b9 100644
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/RoIBResultToxAOD.h
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/RoIBResultToxAOD.h
@@ -14,7 +14,6 @@
#include "StoreGate/WriteHandleKey.h"
// Tool/service include(s):
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
#include "TrigT1Interfaces/ITrigT1MuonRecRoiTool.h"
#include "TrigT1Interfaces/TrigT1CaloDefs.h"
#include "TrigT1CaloToolInterfaces/IL1CPMTools.h"
@@ -75,11 +74,6 @@ private:
/// @name Services
/// @{
- /// The trigger configuration service
- ServiceHandle< TrigConf::ILVL1ConfigSvc > m_configSvc {
- this, "LVL1ConfigSvc", "TrigConf::LVL1ConfigSvc/LVL1ConfigSvc",
- "Service providing the LVL1 trigger configuration" };
-
/// The RPC RoI reconstruction tool
ToolHandle<LVL1::ITrigT1MuonRecRoiTool> m_recRPCRoiTool { this, "RecRpcRoiTool", "LVL1::TrigT1RPCRecRoiTool/TrigT1RPCRecRoiTool"};
/// The TGC RoI reconstruction service
@@ -150,9 +144,6 @@ private:
/// @name Other properties
/// @{
- /// Use new-style menu
- Gaudi::Property<bool> m_useNewConfig { this, "UseNewConfig", true, "When true, read the menu from detector store, when false use the L1ConfigSvc" };
-
/// Use inputs from the Calo system
Gaudi::Property< bool > m_doCalo {
this, "DoCalo", true, "Use inputs from the Calo system" };
--
GitLab
From bc2a97603effb8bf19f6d01ea92a389c582cc3f3 Mon Sep 17 00:00:00 2001
From: Nils Krumnack <krumnack@iastate.edu>
Date: Tue, 17 Aug 2021 12:41:40 -0500
Subject: [PATCH 102/272] add likely branch hints for status code checks in
AnalysisBase
Honestly I didn't really check how much difference this makes, but it
ought to be safe and not hurt anything. Essentially I only marked
non-recoverable failures and initialization on first use as unlikely.
---
.../AsgMessaging/AsgMessaging/Check.h | 8 +++++---
.../AsgMessaging/AsgMessaging/MessageCheck.h | 6 ++++--
.../AthToolSupport/AsgTools/AsgTools/SgTEvent.icc | 14 ++++++++------
.../SelectionHelpers/OutOfValidityEventHelper.h | 3 ++-
.../SelectionHelpers/OutOfValidityHelper.h | 3 ++-
.../PATInterfaces/PATInterfaces/SystematicsCache.h | 3 ++-
6 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/Control/AthToolSupport/AsgMessaging/AsgMessaging/Check.h b/Control/AthToolSupport/AsgMessaging/AsgMessaging/Check.h
index 44491dc1a64d..ef2414cd31f5 100644
--- a/Control/AthToolSupport/AsgMessaging/AsgMessaging/Check.h
+++ b/Control/AthToolSupport/AsgMessaging/AsgMessaging/Check.h
@@ -8,6 +8,8 @@
// Local include(s):
#include "AsgMessaging/MsgStreamMacros.h"
+#include "CxxUtils/AthUnlikelyMacros.h"
+
/// Helper macro for checking the status code returned by a function call
///
/// To be able to write code in a compact form, we can use this macro to
@@ -40,7 +42,7 @@
#define ASG_CHECK_1( EXP ) \
do { \
const StatusCode sc__(EXP); \
- if( ! sc__.isSuccess() ) { \
+ if( ATH_UNLIKELY ( ! sc__.isSuccess() ) ) { \
ATH_MSG_ERROR( "Failed to call \"" << #EXP << "\"" ); \
return sc__; \
} \
@@ -49,7 +51,7 @@
#define ASG_CHECK_2( EXP, RET ) \
do { \
const StatusCode sc__(EXP); \
- if( ! sc__.isSuccess() ) { \
+ if( ATH_UNLIKELY ( ! sc__.isSuccess() ) ) { \
ATH_MSG_ERROR( "Failed to call \"" << #EXP << "\"" ); \
return RET; \
} \
@@ -67,7 +69,7 @@
#define ASG_CHECK_SA( SOURCE, EXP ) \
do { \
const StatusCode sc__(EXP); \
- if( ! sc__.isSuccess() ) { \
+ if( ATH_UNLIKELY ( ! sc__.isSuccess() ) ) { \
static MsgStream msg( SOURCE ); \
msg << MSGSTREAM_REPORT_PREFIX << MSG::ERROR \
<< "Failed to call \"" << #EXP << "\"" << endmsg; \
diff --git a/Control/AthToolSupport/AsgMessaging/AsgMessaging/MessageCheck.h b/Control/AthToolSupport/AsgMessaging/AsgMessaging/MessageCheck.h
index 80e65b29aa20..26c51a59fa7d 100644
--- a/Control/AthToolSupport/AsgMessaging/AsgMessaging/MessageCheck.h
+++ b/Control/AthToolSupport/AsgMessaging/AsgMessaging/MessageCheck.h
@@ -9,6 +9,8 @@
#ifndef ASG_MESSAGING__MESSAGE_CHECK_H
#define ASG_MESSAGING__MESSAGE_CHECK_H
+#include "CxxUtils/AthUnlikelyMacros.h"
+
/// \file MessageCheck.h
/// \brief macros for messaging and checking status codes
///
@@ -321,7 +323,7 @@ typedef StatusCode AsgToolsCheckResultType;
#define ANA_CHECK(EXP) \
{ const auto sc__ = EXP; \
typedef typename std::decay<decltype(sc__)>::type scType__; \
- if (!::asg::CheckHelper<scType__>::isSuccess (sc__)) { \
+ if (ATH_UNLIKELY(!::asg::CheckHelper<scType__>::isSuccess (sc__))) { \
ANA_MSG_ERROR ("Failed to call \"" << #EXP << "\""); \
return ::asg::CheckHelper<AsgToolsCheckResultType>::failureCode(); \
} }
@@ -336,7 +338,7 @@ typedef StatusCode AsgToolsCheckResultType;
#define ANA_CHECK_THROW(EXP) \
{ const auto sc__ = EXP; \
typedef typename std::decay<decltype(sc__)>::type scType__; \
- if (!::asg::CheckHelper<scType__>::isSuccess (sc__)) { \
+ if (ATH_UNLIKELY(!::asg::CheckHelper<scType__>::isSuccess (sc__))) { \
std::ostringstream str; \
str << #EXP; \
ANA_MSG_ERROR ("Failed to call \"" << str.str() << "\", throwing exception"); \
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/SgTEvent.icc b/Control/AthToolSupport/AsgTools/AsgTools/SgTEvent.icc
index 0e5ec6332fbf..770f91200c84 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/SgTEvent.icc
+++ b/Control/AthToolSupport/AsgTools/AsgTools/SgTEvent.icc
@@ -8,6 +8,8 @@
// System include(s):
#include <iostream>
+#include <CxxUtils/AthUnlikelyMacros.h>
+
// xAOD include(s):
#ifdef XAOD_STANDALONE
# include "xAODRootAccess/TEvent.h"
@@ -23,7 +25,7 @@ namespace asg {
bool SgTEvent::contains( const std::string& name ) const {
// Make sure the object is initialised:
- if( ( ! m_pevm ) && initialize().isFailure() ) {
+ if( ATH_UNLIKELY ( ! m_pevm ) && initialize().isFailure() ) {
std::cout << ERROR_SOURCE << "Couldn't initialise the tool"
<< std::endl;
return false;
@@ -42,7 +44,7 @@ namespace asg {
bool SgTEvent::transientContains( const std::string& name ) const {
// Make sure the object is initialised:
- if( ( ! m_pevm ) && initialize().isFailure() ) {
+ if( ATH_UNLIKELY ( ! m_pevm ) && initialize().isFailure() ) {
std::cout << ERROR_SOURCE << "Couldn't initialise the tool"
<< std::endl;
return false;
@@ -61,7 +63,7 @@ namespace asg {
T* SgTEvent::retrieve( const std::string& name ) const {
// Make sure the object is initialised:
- if( ( ! m_pevm ) && initialize().isFailure() ) {
+ if( ATH_UNLIKELY ( ! m_pevm ) && initialize().isFailure() ) {
std::cout << ERROR_SOURCE << "Couldn't initialise the tool"
<< std::endl;
return 0;
@@ -91,7 +93,7 @@ namespace asg {
StatusCode SgTEvent::retrieve( T*& pobj, const std::string& name ) {
pobj = retrieve< T >( name );
- if( pobj ) {
+ if( ATH_LIKELY( pobj ) ) {
return StatusCode::SUCCESS;
} else {
return StatusCode::FAILURE;
@@ -103,7 +105,7 @@ namespace asg {
const std::string& name ) const {
pobj = retrieve< const T >( name );
- if( pobj ) {
+ if( ATH_LIKELY( pobj ) ) {
return StatusCode::SUCCESS;
} else {
return StatusCode::FAILURE;
@@ -114,7 +116,7 @@ namespace asg {
StatusCode SgTEvent::record( std::unique_ptr<T> pobj, const std::string& name ) {
// Make sure the object is initialised:
- if( ( ! m_pevm ) && initialize().isFailure() ) {
+ if( ATH_UNLIKELY ( ! m_pevm ) && initialize().isFailure() ) {
std::cout << ERROR_SOURCE << "Couldn't initialise the tool"
<< std::endl;
return StatusCode::FAILURE;
diff --git a/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/OutOfValidityEventHelper.h b/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/OutOfValidityEventHelper.h
index 356a60ebb486..b4270ac6b2c6 100644
--- a/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/OutOfValidityEventHelper.h
+++ b/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/OutOfValidityEventHelper.h
@@ -10,6 +10,7 @@
#include <AsgMessaging/MsgStream.h>
#include <AthContainers/AuxElement.h>
+#include <CxxUtils/AthUnlikelyMacros.h>
#include <SelectionHelpers/ISelectionAccessor.h>
#include <SelectionHelpers/OutOfValidityHelper.h>
#include <xAODBase/IParticle.h>
@@ -85,7 +86,7 @@ namespace CP
/// \brief a helper check macro to work with \ref OutOfValidityEventHelper
#define ANA_CHECK_CORRECTION_EVENT(helper,expr) \
- { if ((helper).check ((expr), #expr).isFailure()) \
+ { if (ATH_UNLIKELY((helper).check ((expr), #expr).isFailure())) \
return StatusCode::FAILURE; }
#endif
diff --git a/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/OutOfValidityHelper.h b/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/OutOfValidityHelper.h
index aa6523f7e774..fc298a19a792 100644
--- a/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/OutOfValidityHelper.h
+++ b/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/OutOfValidityHelper.h
@@ -10,6 +10,7 @@
#include <AsgMessaging/MsgStream.h>
#include <AthContainers/AuxElement.h>
+#include <CxxUtils/AthUnlikelyMacros.h>
#include <SelectionHelpers/ISelectionAccessor.h>
#include <xAODBase/IParticle.h>
#include <memory>
@@ -132,7 +133,7 @@ namespace CP
/// \brief a helper check macro to work with \ref OutOfValidityHelper
#define ANA_CHECK_CORRECTION(helper,object,expr) \
- { if ((helper).check ((object), (expr), #expr).isFailure()) \
+ { if (ATH_UNLIKELY((helper).check ((object), (expr), #expr).isFailure())) \
return StatusCode::FAILURE; }
#endif
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicsCache.h b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicsCache.h
index 4fde47e3e9b0..821292fde9eb 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicsCache.h
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicsCache.h
@@ -10,6 +10,7 @@
#include <AsgMessaging/AsgMessagingForward.h>
#include <AsgMessaging/MessageCheck.h>
+#include <CxxUtils/AthUnlikelyMacros.h>
#include <PATInterfaces/SystematicSet.h>
#include <functional>
#include <tbb/concurrent_unordered_map.h>
@@ -183,7 +184,7 @@ namespace CP
{
// fast-path, check if we already calculated this
auto iter = m_cache.find (sys);
- if (iter != m_cache.end()) //[[likely]], removed until C++20 support
+ if (ATH_LIKELY (iter != m_cache.end())) //[[likely]], removed until C++20 support
{
result = iter->second.get();
return StatusCode::SUCCESS;
--
GitLab
From 531996fba70a4c70cb2072855227c5bdc9dfc711 Mon Sep 17 00:00:00 2001
From: Gianantonio Pezzullo <g.pezzullo@yale.edu>
Date: Tue, 17 Aug 2021 17:48:17 +0000
Subject: [PATCH 103/272] updates to the egamma Trigger Menu ATR-23974
---
.../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 585 ++++++++++++------
.../share/ref_data_v1Dev_build.ref | 172 ++---
.../python/HLTMenuConfig/Menu/LS2_v1.py | 45 +-
.../HLTMenuConfig/Menu/Physics_pp_run3_v1.py | 21 -
4 files changed, 467 insertions(+), 356 deletions(-)
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 079be15c4d0f..3ada39a58ca1 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -1453,70 +1453,20 @@ HLT_e120_lhvloose_L1EM22VHI:
eventCount: 0
HLT_e12_lhloose_2mu10_L12MU10:
eventCount: 0
-HLT_e12_lhvloose_L1EM10VH:
- eventCount: 5
- stepCounts:
- 0: 7
- 1: 6
- 2: 5
- 3: 5
- 4: 5
- stepFeatures:
- 0: 8
- 1: 16
- 2: 6
- 3: 6
- 4: 5
+HLT_e140_dnnloose_L1EM22VHI:
+ eventCount: 0
+HLT_e140_gsf_dnnloose_L1EM22VHI:
+ eventCount: 0
HLT_e140_lhloose_L1EM22VHI:
eventCount: 0
HLT_e140_lhloose_L1eEM22M:
eventCount: 0
HLT_e140_lhloose_noringer_L1EM22VHI:
eventCount: 0
-HLT_e14_etcut_L1EM7:
- eventCount: 14
- stepCounts:
- 0: 17
- 1: 16
- 2: 14
- 3: 14
- stepFeatures:
- 0: 37
- 1: 179
- 2: 40
- 3: 30
-HLT_e14_lhtight_L1EM7:
- eventCount: 4
- stepCounts:
- 0: 6
- 1: 5
- 2: 5
- 3: 5
- 4: 4
- stepFeatures:
- 0: 7
- 1: 12
- 2: 6
- 3: 6
- 4: 4
HLT_e14_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM12:
eventCount: 0
stepFeatures:
0: 14
-HLT_e14_lhtight_noringer_L1EM7:
- eventCount: 4
- stepCounts:
- 0: 9
- 1: 8
- 2: 8
- 3: 8
- 4: 4
- stepFeatures:
- 0: 9
- 1: 16
- 2: 8
- 3: 8
- 4: 4
HLT_e14_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM12:
eventCount: 0
stepCounts:
@@ -1529,30 +1479,6 @@ HLT_e14_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM12:
1: 18
2: 12
3: 7
-HLT_e15_etcut_L1EM7:
- eventCount: 14
- stepCounts:
- 0: 17
- 1: 16
- 2: 14
- 3: 14
- stepFeatures:
- 0: 35
- 1: 168
- 2: 37
- 3: 29
-HLT_e15_etcut_idperf_L1EM7:
- eventCount: 15
- stepCounts:
- 0: 17
- 1: 17
- 2: 15
- 3: 15
- stepFeatures:
- 0: 35
- 1: 35
- 2: 38
- 3: 30
HLT_e15_lhvloose_L1EM10VH:
eventCount: 5
stepCounts:
@@ -1714,20 +1640,6 @@ HLT_e17_lhmedium_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1EM15VHI_2TAU12IM
8: 5
9: 3
10: 1
-HLT_e17_lhvloose_L1EM15VHI:
- eventCount: 4
- stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 4
- stepFeatures:
- 0: 5
- 1: 6
- 2: 4
- 3: 4
- 4: 4
HLT_e20_lhloose_L1EM7:
eventCount: 5
stepCounts:
@@ -1746,20 +1658,6 @@ HLT_e20_lhloose_L1EM7_AFP_A_AND_C:
eventCount: 0
HLT_e20_lhloose_L1EM7_AFP_A_OR_C:
eventCount: 0
-HLT_e20_lhtight_ivarloose_L1EM15VH:
- eventCount: 3
- stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- stepFeatures:
- 0: 5
- 1: 6
- 2: 4
- 3: 4
- 4: 3
HLT_e20_lhtight_ivarloose_L1ZAFB-25DPHI-eEM18M:
eventCount: 0
HLT_e20_lhvloose_L1EM15VH:
@@ -1905,20 +1803,6 @@ HLT_e24_lhvloose_2e12_lhvloose_L1EM20VH_3EM10VH:
eventCount: 0
stepFeatures:
0: 3
-HLT_e24_lhvloose_L1EM20VH:
- eventCount: 4
- stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 4
- stepFeatures:
- 0: 5
- 1: 6
- 2: 4
- 3: 4
- 4: 4
HLT_e250_etcut_L1EM22VHI:
eventCount: 0
HLT_e25_mergedtight_g35_medium_Heg_02dRAB_L12EM20VH:
@@ -1972,6 +1856,20 @@ HLT_e26_dnntight_L1EM22VHI:
2: 4
3: 4
4: 3
+HLT_e26_gsf_dnntight_ivarloose_L1EM22VHI:
+ eventCount: 4
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 4
HLT_e26_gsf_lhtight_ivarloose_L1EM22VHI:
eventCount: 4
stepCounts:
@@ -2180,6 +2078,178 @@ HLT_e26_lhtight_ivarloose_L1eEM22M:
eventCount: 0
HLT_e26_lhtight_ivarloose_L1eEM22T:
eventCount: 0
+HLT_e26_lhtight_ivarloose_e12_lhvloose_probe_L1EM22VHI:
+ eventCount: 0
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 1
+ 6: 1
+ 7: 1
+ 8: 1
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 4
+ 6: 7
+ 7: 2
+ 8: 2
+ 9: 1
+HLT_e26_lhtight_ivarloose_e14_etcut_probe_L1EM22VHI:
+ eventCount: 2
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 2
+ 6: 2
+ 7: 2
+ 8: 2
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 11
+ 6: 40
+ 7: 14
+ 8: 10
+HLT_e26_lhtight_ivarloose_e14_lhtight_noringer_probe_L1EM22VHI:
+ eventCount: 0
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 3
+HLT_e26_lhtight_ivarloose_e14_lhtight_probe_L1EM22VHI:
+ eventCount: 0
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 1
+ 6: 1
+ 7: 1
+ 8: 1
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 4
+ 6: 7
+ 7: 2
+ 8: 2
+ 9: 1
+HLT_e26_lhtight_ivarloose_e15_etcut_idperf_probe_L1EM22VHI:
+ eventCount: 2
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 2
+ 6: 2
+ 7: 2
+ 8: 2
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 11
+ 6: 10
+ 7: 13
+ 8: 10
+HLT_e26_lhtight_ivarloose_e15_etcut_probe_L1EM22VHI:
+ eventCount: 2
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 2
+ 6: 2
+ 7: 2
+ 8: 2
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 11
+ 6: 40
+ 7: 13
+ 8: 10
+HLT_e26_lhtight_ivarloose_e17_lhvloose_probe_L1EM22VHI:
+ eventCount: 0
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 3
+HLT_e26_lhtight_ivarloose_e20_lhtight_ivarloose_probe_L1EM22VHI:
+ eventCount: 0
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 3
+HLT_e26_lhtight_ivarloose_e24_lhvloose_probe_L1EM22VHI:
+ eventCount: 0
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 3
HLT_e26_lhtight_ivarloose_e26_lhloose_nopix_lrttight_probe_L1EM22VHI:
eventCount: 0
stepCounts:
@@ -2195,6 +2265,89 @@ HLT_e26_lhtight_ivarloose_e26_lhloose_nopix_lrttight_probe_L1EM22VHI:
3: 4
4: 3
5: 3
+HLT_e26_lhtight_ivarloose_e26_lhtight_probe_L1EM22VHI:
+ eventCount: 0
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 3
+HLT_e26_lhtight_ivarloose_e4_etcut_probe_L1EM22VHI:
+ eventCount: 3
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 3
+ 6: 3
+ 7: 3
+ 8: 3
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 34
+ 6: 100
+ 7: 55
+ 8: 28
+HLT_e26_lhtight_ivarloose_e5_lhtight_noringer_probe_L1EM22VHI:
+ eventCount: 0
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 2
+ 6: 2
+ 7: 2
+ 8: 2
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 13
+ 6: 29
+ 7: 5
+ 8: 5
+ 9: 2
+HLT_e26_lhtight_ivarloose_e5_lhtight_probe_L1EM22VHI:
+ eventCount: 0
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 2
+ 6: 2
+ 7: 2
+ 8: 2
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 15
+ 6: 27
+ 7: 5
+ 8: 5
+ 9: 2
HLT_e26_lhtight_ivarloose_e5_lhvloose_idperf_probe_L1EM22VHI:
eventCount: 2
stepCounts:
@@ -2243,6 +2396,74 @@ HLT_e26_lhtight_ivarloose_e5_lhvloose_nopix_lrtloose_idperf_probe_L1EM22VHI:
7: 6
8: 6
9: 6
+HLT_e26_lhtight_ivarloose_e9_etcut_probe_L1EM22VHI:
+ eventCount: 3
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 3
+ 6: 3
+ 7: 3
+ 8: 3
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 14
+ 6: 48
+ 7: 22
+ 8: 13
+HLT_e26_lhtight_ivarloose_e9_lhtight_noringer_probe_L1EM22VHI:
+ eventCount: 0
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 2
+ 6: 2
+ 7: 2
+ 8: 2
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 7
+ 6: 12
+ 7: 5
+ 8: 5
+ 9: 2
+HLT_e26_lhtight_ivarloose_e9_lhtight_probe_L1EM22VHI:
+ eventCount: 0
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 1
+ 6: 1
+ 7: 1
+ 8: 1
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 6
+ 6: 9
+ 7: 3
+ 8: 3
+ 9: 1
HLT_e26_lhtight_ivarloose_noringer_L1EM22VHI:
eventCount: 3
stepCounts:
@@ -2619,6 +2840,34 @@ HLT_e26_lhtight_ivarloose_tau80_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI:
7: 2
8: 2
9: 1
+HLT_e26_lhtight_ivarmedium_L1EM22VHI:
+ eventCount: 3
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 3
+HLT_e26_lhtight_ivartight_L1EM22VHI:
+ eventCount: 3
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 3
HLT_e28_idperf_loose_L1EM24VHI:
eventCount: 5
stepCounts:
@@ -2683,18 +2932,6 @@ HLT_e40_lhvloose_L1EM22VHI:
2: 3
3: 3
4: 3
-HLT_e4_etcut_L1EM3:
- eventCount: 20
- stepCounts:
- 0: 20
- 1: 20
- 2: 20
- 3: 20
- stepFeatures:
- 0: 170
- 1: 545
- 2: 276
- 3: 140
HLT_e50_etcut_L1EM22VHI:
eventCount: 4
stepCounts:
@@ -2821,20 +3058,6 @@ HLT_e5_idperf_tight_L1EM3:
2: 24
3: 24
4: 24
-HLT_e5_lhtight_L1EM3:
- eventCount: 4
- stepCounts:
- 0: 18
- 1: 15
- 2: 14
- 3: 14
- 4: 4
- stepFeatures:
- 0: 59
- 1: 120
- 2: 22
- 3: 22
- 4: 4
HLT_e5_lhtight_e14_etcut_Jpsiee_L1JPSI-1M5-EM12:
eventCount: 0
stepCounts:
@@ -2859,20 +3082,6 @@ HLT_e5_lhtight_e9_etcut_Jpsiee_L1JPSI-1M5-EM7:
1: 48
2: 10
3: 9
-HLT_e5_lhtight_noringer_L1EM3:
- eventCount: 4
- stepCounts:
- 0: 15
- 1: 11
- 2: 10
- 3: 10
- 4: 4
- stepFeatures:
- 0: 44
- 1: 100
- 2: 20
- 3: 19
- 4: 4
HLT_e5_lhtight_noringer_e14_etcut_Jpsiee_L1JPSI-1M5-EM12:
eventCount: 0
stepCounts:
@@ -2911,7 +3120,21 @@ HLT_e5_lhvloose_j70_0eta320_j50_0eta490_j0_DJMASS1000j50_xe50_tcpufit_L1MJJ-500-
5: 1
HLT_e5_lhvloose_nopix_lrtloose_idperf_probe_g25_medium_L1EM20VH:
eventCount: 0
-HLT_e60_dnnloose_L1EM22VHI:
+HLT_e60_dnnmedium_L1EM22VHI:
+ eventCount: 1
+ stepCounts:
+ 0: 2
+ 1: 2
+ 2: 2
+ 3: 2
+ 4: 1
+ stepFeatures:
+ 0: 2
+ 1: 2
+ 2: 2
+ 3: 2
+ 4: 1
+HLT_e60_gsf_dnnmedium_L1EM22VHI:
eventCount: 2
stepCounts:
0: 2
@@ -3049,32 +3272,6 @@ HLT_e7_lhmedium_mu24_L1MU20:
8: 1
HLT_e80_lhvloose_L1EM22VHI:
eventCount: 0
-HLT_e9_etcut_L1EM3:
- eventCount: 20
- stepCounts:
- 0: 20
- 1: 20
- 2: 20
- 3: 20
- stepFeatures:
- 0: 64
- 1: 281
- 2: 81
- 3: 54
-HLT_e9_lhtight_L1EM3:
- eventCount: 4
- stepCounts:
- 0: 13
- 1: 12
- 2: 7
- 3: 7
- 4: 4
- stepFeatures:
- 0: 18
- 1: 36
- 2: 9
- 3: 9
- 4: 4
HLT_e9_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM7:
eventCount: 0
stepCounts:
@@ -3093,20 +3290,6 @@ HLT_e9_lhtight_e4_etcut_L1JPSI-1M5-EM7:
0: 32
1: 88
2: 22
-HLT_e9_lhtight_noringer_L1EM3:
- eventCount: 4
- stepCounts:
- 0: 11
- 1: 10
- 2: 9
- 3: 9
- 4: 4
- stepFeatures:
- 0: 21
- 1: 55
- 2: 17
- 3: 16
- 4: 4
HLT_e9_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM7:
eventCount: 0
stepCounts:
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index 246a4c5c688c..e270fc1fa64a 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -576,70 +576,20 @@ HLT_e120_lhvloose_L1EM22VHI:
eventCount: 0
HLT_e12_lhloose_2mu10_L12MU10:
eventCount: 0
-HLT_e12_lhvloose_L1EM10VH:
+HLT_e140_dnnloose_L1EM22VHI:
+ eventCount: 0
+HLT_e140_gsf_dnnloose_L1EM22VHI:
eventCount: 0
- stepCounts:
- 0: 2
- 1: 2
- stepFeatures:
- 0: 2
- 1: 6
HLT_e140_lhloose_L1EM22VHI:
eventCount: 0
HLT_e140_lhloose_L1eEM22M:
eventCount: 0
HLT_e140_lhloose_noringer_L1EM22VHI:
eventCount: 0
-HLT_e14_etcut_L1EM7:
- eventCount: 4
- stepCounts:
- 0: 4
- 1: 4
- 2: 4
- 3: 4
- stepFeatures:
- 0: 5
- 1: 9
- 2: 5
- 3: 4
-HLT_e14_lhtight_L1EM7:
- eventCount: 0
- stepCounts:
- 0: 1
- 1: 1
- stepFeatures:
- 0: 1
- 1: 4
HLT_e14_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM12:
eventCount: 0
-HLT_e14_lhtight_noringer_L1EM7:
- eventCount: 0
HLT_e14_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM12:
eventCount: 0
-HLT_e15_etcut_L1EM7:
- eventCount: 4
- stepCounts:
- 0: 4
- 1: 4
- 2: 4
- 3: 4
- stepFeatures:
- 0: 5
- 1: 9
- 2: 4
- 3: 4
-HLT_e15_etcut_idperf_L1EM7:
- eventCount: 4
- stepCounts:
- 0: 4
- 1: 4
- 2: 4
- 3: 4
- stepFeatures:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
HLT_e15_lhvloose_L1EM10VH:
eventCount: 0
stepCounts:
@@ -660,16 +610,12 @@ HLT_e17_lhmedium_tau25_mediumRNN_tracktwoMVABDT_xe50_cell_03dRAB_L1EM15VHI_2TAU1
eventCount: 0
HLT_e17_lhmedium_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1EM15VHI_2TAU12IM_XE35:
eventCount: 0
-HLT_e17_lhvloose_L1EM15VHI:
- eventCount: 0
HLT_e20_lhloose_L1EM7:
eventCount: 0
HLT_e20_lhloose_L1EM7_AFP_A_AND_C:
eventCount: 0
HLT_e20_lhloose_L1EM7_AFP_A_OR_C:
eventCount: 0
-HLT_e20_lhtight_ivarloose_L1EM15VH:
- eventCount: 0
HLT_e20_lhtight_ivarloose_L1ZAFB-25DPHI-eEM18M:
eventCount: 0
HLT_e20_lhvloose_L1EM15VH:
@@ -690,8 +636,6 @@ HLT_e24_lhtight_ivarloose_L1EM22VHI:
eventCount: 0
HLT_e24_lhvloose_2e12_lhvloose_L1EM20VH_3EM10VH:
eventCount: 0
-HLT_e24_lhvloose_L1EM20VH:
- eventCount: 0
HLT_e250_etcut_L1EM22VHI:
eventCount: 0
HLT_e25_mergedtight_g35_medium_Heg_02dRAB_L12EM20VH:
@@ -702,6 +646,8 @@ HLT_e26_dnnmedium_L1EM22VHI:
eventCount: 0
HLT_e26_dnntight_L1EM22VHI:
eventCount: 0
+HLT_e26_gsf_dnntight_ivarloose_L1EM22VHI:
+ eventCount: 0
HLT_e26_gsf_lhtight_ivarloose_L1EM22VHI:
eventCount: 0
HLT_e26_idperf_gsf_tight_L1EM22VHI:
@@ -742,12 +688,44 @@ HLT_e26_lhtight_ivarloose_L1eEM22M:
eventCount: 0
HLT_e26_lhtight_ivarloose_L1eEM22T:
eventCount: 0
+HLT_e26_lhtight_ivarloose_e12_lhvloose_probe_L1EM22VHI:
+ eventCount: 0
+HLT_e26_lhtight_ivarloose_e14_etcut_probe_L1EM22VHI:
+ eventCount: 0
+HLT_e26_lhtight_ivarloose_e14_lhtight_noringer_probe_L1EM22VHI:
+ eventCount: 0
+HLT_e26_lhtight_ivarloose_e14_lhtight_probe_L1EM22VHI:
+ eventCount: 0
+HLT_e26_lhtight_ivarloose_e15_etcut_idperf_probe_L1EM22VHI:
+ eventCount: 0
+HLT_e26_lhtight_ivarloose_e15_etcut_probe_L1EM22VHI:
+ eventCount: 0
+HLT_e26_lhtight_ivarloose_e17_lhvloose_probe_L1EM22VHI:
+ eventCount: 0
+HLT_e26_lhtight_ivarloose_e20_lhtight_ivarloose_probe_L1EM22VHI:
+ eventCount: 0
+HLT_e26_lhtight_ivarloose_e24_lhvloose_probe_L1EM22VHI:
+ eventCount: 0
HLT_e26_lhtight_ivarloose_e26_lhloose_nopix_lrttight_probe_L1EM22VHI:
eventCount: 0
+HLT_e26_lhtight_ivarloose_e26_lhtight_probe_L1EM22VHI:
+ eventCount: 0
+HLT_e26_lhtight_ivarloose_e4_etcut_probe_L1EM22VHI:
+ eventCount: 0
+HLT_e26_lhtight_ivarloose_e5_lhtight_noringer_probe_L1EM22VHI:
+ eventCount: 0
+HLT_e26_lhtight_ivarloose_e5_lhtight_probe_L1EM22VHI:
+ eventCount: 0
HLT_e26_lhtight_ivarloose_e5_lhvloose_idperf_probe_L1EM22VHI:
eventCount: 0
HLT_e26_lhtight_ivarloose_e5_lhvloose_nopix_lrtloose_idperf_probe_L1EM22VHI:
eventCount: 0
+HLT_e26_lhtight_ivarloose_e9_etcut_probe_L1EM22VHI:
+ eventCount: 0
+HLT_e26_lhtight_ivarloose_e9_lhtight_noringer_probe_L1EM22VHI:
+ eventCount: 0
+HLT_e26_lhtight_ivarloose_e9_lhtight_probe_L1EM22VHI:
+ eventCount: 0
HLT_e26_lhtight_ivarloose_noringer_L1EM22VHI:
eventCount: 0
HLT_e26_lhtight_ivarloose_tau100_mediumRNN_tracktwoLLP_03dRAB_L1EM22VHI:
@@ -786,6 +764,10 @@ HLT_e26_lhtight_ivarloose_tau80_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI:
eventCount: 0
HLT_e26_lhtight_ivarloose_tau80_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI:
eventCount: 0
+HLT_e26_lhtight_ivarmedium_L1EM22VHI:
+ eventCount: 0
+HLT_e26_lhtight_ivartight_L1EM22VHI:
+ eventCount: 0
HLT_e28_idperf_loose_L1EM24VHI:
eventCount: 0
HLT_e28_lhmedium_mu8noL1_L1EM24VHI:
@@ -798,18 +780,6 @@ HLT_e30_lhvloose_L1EM22VHI:
eventCount: 0
HLT_e40_lhvloose_L1EM22VHI:
eventCount: 0
-HLT_e4_etcut_L1EM3:
- eventCount: 12
- stepCounts:
- 0: 14
- 1: 13
- 2: 12
- 3: 12
- stepFeatures:
- 0: 47
- 1: 62
- 2: 60
- 3: 30
HLT_e50_etcut_L1EM22VHI:
eventCount: 0
HLT_e5_dnnloose_L1EM3:
@@ -930,36 +900,12 @@ HLT_e5_idperf_tight_L1EM3:
2: 5
3: 5
4: 5
-HLT_e5_lhtight_L1EM3:
- eventCount: 0
- stepCounts:
- 0: 9
- 1: 7
- 2: 3
- 3: 3
- stepFeatures:
- 0: 17
- 1: 17
- 2: 3
- 3: 3
HLT_e5_lhtight_e14_etcut_Jpsiee_L1JPSI-1M5-EM12:
eventCount: 0
HLT_e5_lhtight_e9_etcut_Jpsiee_L1JPSI-1M5-EM7:
eventCount: 0
stepFeatures:
0: 3
-HLT_e5_lhtight_noringer_L1EM3:
- eventCount: 0
- stepCounts:
- 0: 9
- 1: 7
- 2: 4
- 3: 4
- stepFeatures:
- 0: 13
- 1: 20
- 2: 4
- 3: 4
HLT_e5_lhtight_noringer_e14_etcut_Jpsiee_L1JPSI-1M5-EM12:
eventCount: 0
HLT_e5_lhtight_noringer_e9_etcut_Jpsiee_L1JPSI-1M5-EM7:
@@ -970,7 +916,9 @@ HLT_e5_lhvloose_j70_0eta320_j50_0eta490_j0_DJMASS1000j50_xe50_tcpufit_L1MJJ-500-
eventCount: 0
HLT_e5_lhvloose_nopix_lrtloose_idperf_probe_g25_medium_L1EM20VH:
eventCount: 0
-HLT_e60_dnnloose_L1EM22VHI:
+HLT_e60_dnnmedium_L1EM22VHI:
+ eventCount: 0
+HLT_e60_gsf_dnnmedium_L1EM22VHI:
eventCount: 0
HLT_e60_gsf_lhmedium_L1EM22VHI:
eventCount: 0
@@ -992,26 +940,6 @@ HLT_e7_lhmedium_mu24_L1MU20:
eventCount: 0
HLT_e80_lhvloose_L1EM22VHI:
eventCount: 0
-HLT_e9_etcut_L1EM3:
- eventCount: 6
- stepCounts:
- 0: 7
- 1: 7
- 2: 6
- 3: 6
- stepFeatures:
- 0: 10
- 1: 17
- 2: 10
- 3: 7
-HLT_e9_lhtight_L1EM3:
- eventCount: 0
- stepCounts:
- 0: 3
- 1: 2
- stepFeatures:
- 0: 3
- 1: 5
HLT_e9_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM7:
eventCount: 0
stepFeatures:
@@ -1020,18 +948,6 @@ HLT_e9_lhtight_e4_etcut_L1JPSI-1M5-EM7:
eventCount: 0
stepFeatures:
0: 5
-HLT_e9_lhtight_noringer_L1EM3:
- eventCount: 0
- stepCounts:
- 0: 3
- 1: 3
- 2: 1
- 3: 1
- stepFeatures:
- 0: 3
- 1: 6
- 2: 1
- 3: 1
HLT_e9_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM7:
eventCount: 0
stepFeatures:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 26e067810cf2..2272c8d226ac 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -45,6 +45,7 @@ from TriggerMenuMT.HLTMenuConfig.Menu.Physics_pp_run3_v1 import (PhysicsStream,
PrimaryPhIGroup,
SupportLegGroup,
SupportPhIGroup,
+ TagAndProbeLegGroup,
LowMuGroup,
EOFBPhysL1MuGroup,
EOFTLALegGroup,
@@ -237,16 +238,48 @@ def setupMenu():
ChainProp(name='HLT_e26_dnnmedium_L1EM22VHI', groups=SingleElectronGroup),
ChainProp(name='HLT_e26_dnntight_L1EM22VHI', groups=SingleElectronGroup),
- ChainProp(name='HLT_e60_dnnloose_L1EM22VHI', groups=SingleElectronGroup),
+ ChainProp(name='HLT_e60_dnnmedium_L1EM22VHI', groups=SingleElectronGroup),
+ ChainProp(name='HLT_e140_dnnloose_L1EM22VHI', groups=SingleElectronGroup),
+
+ ChainProp(name='HLT_e26_gsf_dnntight_ivarloose_L1EM22VHI', groups=PrimaryLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e60_gsf_dnnmedium_L1EM22VHI', groups=PrimaryLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e140_gsf_dnnloose_L1EM22VHI', groups=PrimaryLegGroup+SingleElectronGroup),
+
+ #------------ support chains
+ ChainProp(name='HLT_e26_lhtight_L1EM22VHI', groups=SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarmedium_L1EM22VHI', groups=SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivartight_L1EM22VHI', groups=SingleElectronGroup),
+
+
# Generic test T&P chain
- ChainProp(name='HLT_e26_lhtight_ivarloose_e5_lhvloose_idperf_probe_L1EM22VHI',l1SeedThresholds=['EM22VHI','PROBEEM3'],groups=MultiElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e5_lhvloose_idperf_probe_L1EM22VHI',l1SeedThresholds=['EM22VHI','PROBEEM3'],groups=TagAndProbeLegGroup),
# T&P chains for displaced electrons
- ChainProp(name='HLT_e26_lhtight_ivarloose_e5_lhvloose_nopix_lrtloose_idperf_probe_L1EM22VHI',l1SeedThresholds=['EM22VHI','PROBEEM3'],groups=MultiElectronGroup+SupportLegGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_e26_lhloose_nopix_lrttight_probe_L1EM22VHI',l1SeedThresholds=['EM22VHI','PROBEEM22VHI'],groups=MultiElectronGroup+SupportLegGroup),
- ChainProp(name='HLT_e5_lhvloose_nopix_lrtloose_idperf_probe_g25_medium_L1EM20VH',l1SeedThresholds=['PROBEEM3','EM20VH'],groups=MultiPhotonGroup+SupportLegGroup),
- ChainProp(name='HLT_e26_lhloose_nopix_lrttight_probe_g25_medium_L1EM20VH',l1SeedThresholds=['PROBEEM22VHI','EM20VH'],groups=MultiPhotonGroup+SupportLegGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e5_lhvloose_nopix_lrtloose_idperf_probe_L1EM22VHI',l1SeedThresholds=['EM22VHI','PROBEEM3'],groups=TagAndProbeLegGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e26_lhloose_nopix_lrttight_probe_L1EM22VHI',l1SeedThresholds=['EM22VHI','PROBEEM22VHI'],groups=TagAndProbeLegGroup),
+ ChainProp(name='HLT_e5_lhvloose_nopix_lrtloose_idperf_probe_g25_medium_L1EM20VH',l1SeedThresholds=['PROBEEM3','EM20VH'],groups=TagAndProbeLegGroup),
+ ChainProp(name='HLT_e26_lhloose_nopix_lrttight_probe_g25_medium_L1EM20VH',l1SeedThresholds=['PROBEEM22VHI','EM20VH'],groups=TagAndProbeLegGroup),
+ #----------- egamma Tag&Probe
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e12_lhvloose_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM10VH'], groups=TagAndProbeLegGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e17_lhvloose_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM15VHI'], groups=TagAndProbeLegGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e24_lhvloose_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM20VHI'], groups=TagAndProbeLegGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e26_lhtight_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM22VHI'], groups=TagAndProbeLegGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e20_lhtight_ivarloose_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM15VHI'], groups=TagAndProbeLegGroup),
+
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e15_etcut_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM7'], groups=TagAndProbeLegGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e15_etcut_idperf_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM7'], groups=TagAndProbeLegGroup),
+
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e14_lhtight_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM7'], groups=TagAndProbeLegGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e14_lhtight_noringer_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM7'], groups=TagAndProbeLegGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e14_etcut_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM7'], groups=TagAndProbeLegGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e9_lhtight_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM3'], groups=TagAndProbeLegGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e9_lhtight_noringer_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM3'], groups=TagAndProbeLegGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e9_etcut_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM3'], groups=TagAndProbeLegGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e5_lhtight_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM3'], groups=TagAndProbeLegGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e5_lhtight_noringer_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM3'], groups=TagAndProbeLegGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e4_etcut_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM3'], groups=TagAndProbeLegGroup),
+
# Late stream for LLP
ChainProp(name='HLT_g35_medium_g25_medium_L1EM7_EMPTY', l1SeedThresholds=['EM7']*2, stream=['Late'], groups=PrimaryLegGroup+MultiPhotonGroup),
ChainProp(name='HLT_g35_medium_g25_medium_L1EM7_UNPAIRED_ISO', l1SeedThresholds=['EM7']*2, stream=['Late'], groups=PrimaryLegGroup+MultiPhotonGroup),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
index c3bb5490cf9f..6d11e5fdb824 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
@@ -158,27 +158,6 @@ def setupMenu():
ChainProp(name='HLT_e14_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM12', l1SeedThresholds=['EM12','EM3'], groups=SupportLegGroup+MultiElectronGroup),
ChainProp(name='HLT_e5_lhtight_noringer_e14_etcut_Jpsiee_L1JPSI-1M5-EM12', l1SeedThresholds=['EM3','EM12'], groups=SupportLegGroup+MultiElectronGroup),
- #------------ support legs of multi-electrons
- ChainProp(name='HLT_e15_etcut_idperf_L1EM7', groups=SupportLegGroup+SingleElectronGroup),
-
- ChainProp(name='HLT_e4_etcut_L1EM3', groups=SupportLegGroup+SingleElectronGroup),
- ChainProp(name='HLT_e9_etcut_L1EM3', groups=SupportLegGroup+SingleElectronGroup),
- ChainProp(name='HLT_e14_etcut_L1EM7', groups=SupportLegGroup+SingleElectronGroup),
- ChainProp(name='HLT_e15_etcut_L1EM7', groups=SupportLegGroup+SingleElectronGroup),
-
- ChainProp(name='HLT_e12_lhvloose_L1EM10VH', groups=SupportLegGroup+SingleElectronGroup),
- ChainProp(name='HLT_e17_lhvloose_L1EM15VHI', groups=SupportLegGroup+SingleElectronGroup),
- ChainProp(name='HLT_e24_lhvloose_L1EM20VH', groups=SupportLegGroup+SingleElectronGroup),
-
- ChainProp(name='HLT_e5_lhtight_L1EM3', groups=SupportLegGroup+SingleElectronGroup),
- ChainProp(name='HLT_e5_lhtight_noringer_L1EM3', groups=SupportLegGroup+SingleElectronGroup),
- ChainProp(name='HLT_e9_lhtight_L1EM3', groups=SupportLegGroup+SingleElectronGroup),
- ChainProp(name='HLT_e9_lhtight_noringer_L1EM3', groups=SupportLegGroup+SingleElectronGroup),
- ChainProp(name='HLT_e14_lhtight_L1EM7', groups=SupportLegGroup+SingleElectronGroup),
- ChainProp(name='HLT_e14_lhtight_noringer_L1EM7', groups=SupportLegGroup+SingleElectronGroup),
- ChainProp(name='HLT_e20_lhtight_ivarloose_L1EM15VH', groups=SupportLegGroup+SingleElectronGroup),
- ChainProp(name='HLT_e26_lhtight_L1EM22VHI', groups=SupportLegGroup+SingleElectronGroup),
-
#------------ support validation of tag-and-probe mass cuts
ChainProp(name='HLT_e26_lhtight_e15_etcut_L1EM22VHI', l1SeedThresholds=['EM22VHI','EM7'], groups=SupportLegGroup+SingleElectronGroup),
ChainProp(name='HLT_e9_lhtight_e4_etcut_L1JPSI-1M5-EM7', l1SeedThresholds=['EM7','EM3'], groups=SupportLegGroup+SingleElectronGroup),
--
GitLab
From 7b2c00a814df8302450c03555d26bf44ad3b7ec6 Mon Sep 17 00:00:00 2001
From: Mark Hodgkinson <m.hodgkinson@sheffield.ac.uk>
Date: Tue, 17 Aug 2021 17:50:24 +0000
Subject: [PATCH 104/272] Update ART HI tests to use latest conditions tags
---
.../RecJobTransformTests/test/test_data15_heavy_ion.sh | 2 +-
.../test/test_data15_heavy_ion_MultipleThreads.sh | 2 +-
.../test/test_data18_heavy_ion_notrigger.sh | 2 +-
.../test/test_data18_heavy_ion_notrigger_MultipleThreads.sh | 2 +-
.../RecExample/RecJobTransformTests/test/test_mc15_heavy_ion.sh | 2 +-
.../test/test_mc15_heavy_ion_MultipleThreads.sh | 2 +-
.../RecJobTransformTests/test/test_mc18_heavy_ion_notrigger.sh | 1 +
.../test/test_mc18_heavy_ion_notrigger_MultipleThreads.sh | 1 +
8 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion.sh
index 31e9e4e4ccba..434683de472b 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion.sh
@@ -10,7 +10,7 @@
# art-include: 21.9/Athena
-export TRF_ECHO=True; Reco_tf.py --athenaopts="--threads=1" --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_hi.00286711.physics_MinBiasOverlay.daq.RAW._lb0217._SFO-2._0001.data --outputESDFile=ESD.root --outputAODFile=AOD.root --maxEvents=25 --conditionsTag 'default:CONDBR2-BLKPA-2016-07' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --autoConfiguration 'everything' --preExec 'all:rec.doHeavyIon.set_Value_and_Lock(True);rec.doZdc.set_Value_and_Lock(False);rec.doTrigger.set_Value_and_Lock(False);'
+export TRF_ECHO=True; Reco_tf.py --athenaopts="--threads=1" --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_hi.00286711.physics_MinBiasOverlay.daq.RAW._lb0217._SFO-2._0001.data --outputESDFile=ESD.root --outputAODFile=AOD.root --maxEvents=25 --conditionsTag 'default:CONDBR2-BLKPA-RUN-06' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --autoConfiguration 'everything' --preExec 'all:rec.doHeavyIon.set_Value_and_Lock(True);rec.doZdc.set_Value_and_Lock(False);rec.doTrigger.set_Value_and_Lock(False);'
RES=$?
echo "art-result: $RES Reco"
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion_MultipleThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion_MultipleThreads.sh
index e109d0b899b5..ad0906f2f16d 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion_MultipleThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion_MultipleThreads.sh
@@ -9,7 +9,7 @@
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-export TRF_ECHO=True; Reco_tf.py --athenaopts="--threads=8" --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_hi.00286711.physics_MinBiasOverlay.daq.RAW._lb0217._SFO-2._0001.data --outputESDFile=ESD.root --outputAODFile=AOD.root --maxEvents=25 --conditionsTag 'default:CONDBR2-BLKPA-2016-07' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --autoConfiguration 'everything' --preExec 'all:rec.doHeavyIon.set_Value_and_Lock(True);rec.doZdc.set_Value_and_Lock(False);rec.doTrigger.set_Value_and_Lock(False);'
+export TRF_ECHO=True; Reco_tf.py --athenaopts="--threads=8" --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_hi.00286711.physics_MinBiasOverlay.daq.RAW._lb0217._SFO-2._0001.data --outputESDFile=ESD.root --outputAODFile=AOD.root --maxEvents=25 --conditionsTag 'default:CONDBR2-BLKPA-RUN2-06' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --autoConfiguration 'everything' --preExec 'all:rec.doHeavyIon.set_Value_and_Lock(True);rec.doZdc.set_Value_and_Lock(False);rec.doTrigger.set_Value_and_Lock(False);'
RES=$?
echo "art-result: $RES Reco"
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger.sh
index 6a8f492f1c85..34d591c05cab 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger.sh
@@ -12,7 +12,7 @@ export TRF_ECHO=True; Reco_tf.py \
--outputESDFile=ESD.pool.root \
--outputAODFile=AOD.pool.root \
--maxEvents=20 \
---conditionsTag 'default:CONDBR2-BLKPA-2018-12' \
+--conditionsTag 'default:CONDBR2-BLKPA-RUN2-06' \
--geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
--autoConfiguration 'everything' \
--steering='doRAWtoALL' \
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger_MultipleThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger_MultipleThreads.sh
index 73032c7dd432..decc4861a5d9 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger_MultipleThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger_MultipleThreads.sh
@@ -11,7 +11,7 @@ export TRF_ECHO=True; Reco_tf.py \
--outputESDFile=ESD.pool.root \
--outputAODFile=AOD.pool.root \
--maxEvents=20 \
---conditionsTag 'default:CONDBR2-BLKPA-2018-12' \
+--conditionsTag 'default:CONDBR2-BLKPA-RUN2-06' \
--geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
--autoConfiguration 'everything' \
--steering='doRAWtoALL' \
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc15_heavy_ion.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc15_heavy_ion.sh
index 63be4a7b670f..cabce041cae9 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc15_heavy_ion.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc15_heavy_ion.sh
@@ -10,7 +10,7 @@
# art-include: 21.9/Athena
-export TRF_ECHO=True; Reco_tf.py --athenaopts="--threads=1" --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc15_5TeV.420000.Hijing_PbPb_5p02TeV_MinBias_Flow_JJFV6.merge.HITS.e4962_s3004_s2921/HITS.09732013._000496.pool.root.1 --outputESDFile=ESD.pool.root --outputAODFile=AOD.pool.root --maxEvents=25 --conditionsTag 'all:OFLCOND-MC15c-SDR-11' --postInclude 'all:RecJobTransforms/UseFrontier.py,SimulationJobOptions/postInclude.HijingPars.py' --preExec 'all:rec.doHeavyIon.set_Value_and_Lock(True);rec.doZdc.set_Value_and_Lock(False);from CaloRec.CaloRecFlags import jobproperties;jobproperties.CaloRecFlags.doCaloTopoCluster.set_Value_and_Lock(True);from AthenaMonitoring.DQMonFlags import jobproperties; jobproperties.DQMonFlagsCont.doHIMon.set_Value_and_Lock(False);from ParticleBuilderOptions.AODFlags import AODFlags;AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False); AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False); AODFlags.AddEgammaMuonTracksInAOD.set_Value_and_Lock(False);AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False);' --autoConfiguration 'everything' --triggerConfig 'MCRECO:MC_HI_v3_tight_mc_prescale' --DataRunNumber '226000' --geometryVersion 'all:ATLAS-R2-2015-03-01-00'
+export TRF_ECHO=True; Reco_tf.py --athenaopts="--threads=1" --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc15_5TeV.420000.Hijing_PbPb_5p02TeV_MinBias_Flow_JJFV6.merge.HITS.e4962_s3004_s2921/HITS.09732013._000496.pool.root.1 --outputESDFile=ESD.pool.root --outputAODFile=AOD.pool.root --maxEvents=25 --conditionsTag 'all:OFLCOND-MC16-SDR-RUN2-08' --postInclude 'all:RecJobTransforms/UseFrontier.py,SimulationJobOptions/postInclude.HijingPars.py' --preExec 'all:rec.doHeavyIon.set_Value_and_Lock(True);rec.doZdc.set_Value_and_Lock(False);from CaloRec.CaloRecFlags import jobproperties;jobproperties.CaloRecFlags.doCaloTopoCluster.set_Value_and_Lock(True);from AthenaMonitoring.DQMonFlags import jobproperties; jobproperties.DQMonFlagsCont.doHIMon.set_Value_and_Lock(False);from ParticleBuilderOptions.AODFlags import AODFlags;AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False); AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False); AODFlags.AddEgammaMuonTracksInAOD.set_Value_and_Lock(False);AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False);' --autoConfiguration 'everything' --triggerConfig 'MCRECO:MC_HI_v3_tight_mc_prescale' --DataRunNumber '226000' --geometryVersion 'all:ATLAS-R2-2015-03-01-00'
RES=$?
echo "art-result: $RES Reco"
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc15_heavy_ion_MultipleThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc15_heavy_ion_MultipleThreads.sh
index 5087fa95e9cb..991da3d08e4a 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc15_heavy_ion_MultipleThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc15_heavy_ion_MultipleThreads.sh
@@ -9,7 +9,7 @@
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-export TRF_ECHO=True; Reco_tf.py --athenaopts="--threads=8" --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc15_5TeV.420000.Hijing_PbPb_5p02TeV_MinBias_Flow_JJFV6.merge.HITS.e4962_s3004_s2921/HITS.09732013._000496.pool.root.1 --outputESDFile=ESD.pool.root --outputAODFile=AOD.pool.root --maxEvents=25 --conditionsTag 'all:OFLCOND-MC15c-SDR-11' --postInclude 'all:RecJobTransforms/UseFrontier.py,SimulationJobOptions/postInclude.HijingPars.py' --preExec 'all:rec.doHeavyIon.set_Value_and_Lock(True);rec.doZdc.set_Value_and_Lock(False);from CaloRec.CaloRecFlags import jobproperties;jobproperties.CaloRecFlags.doCaloTopoCluster.set_Value_and_Lock(True);from AthenaMonitoring.DQMonFlags import jobproperties; jobproperties.DQMonFlagsCont.doHIMon.set_Value_and_Lock(False);from ParticleBuilderOptions.AODFlags import AODFlags;AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False); AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False); AODFlags.AddEgammaMuonTracksInAOD.set_Value_and_Lock(False);AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False);' --autoConfiguration 'everything' --triggerConfig 'MCRECO:MC_HI_v3_tight_mc_prescale' --DataRunNumber '226000' --geometryVersion 'all:ATLAS-R2-2015-03-01-00'
+export TRF_ECHO=True; Reco_tf.py --athenaopts="--threads=8" --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc15_5TeV.420000.Hijing_PbPb_5p02TeV_MinBias_Flow_JJFV6.merge.HITS.e4962_s3004_s2921/HITS.09732013._000496.pool.root.1 --outputESDFile=ESD.pool.root --outputAODFile=AOD.pool.root --maxEvents=25 --conditionsTag 'all:OFLCOND-MC16-SDR-RUN2-08' --postInclude 'all:RecJobTransforms/UseFrontier.py,SimulationJobOptions/postInclude.HijingPars.py' --preExec 'all:rec.doHeavyIon.set_Value_and_Lock(True);rec.doZdc.set_Value_and_Lock(False);from CaloRec.CaloRecFlags import jobproperties;jobproperties.CaloRecFlags.doCaloTopoCluster.set_Value_and_Lock(True);from AthenaMonitoring.DQMonFlags import jobproperties; jobproperties.DQMonFlagsCont.doHIMon.set_Value_and_Lock(False);from ParticleBuilderOptions.AODFlags import AODFlags;AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False); AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False); AODFlags.AddEgammaMuonTracksInAOD.set_Value_and_Lock(False);AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False);' --autoConfiguration 'everything' --triggerConfig 'MCRECO:MC_HI_v3_tight_mc_prescale' --DataRunNumber '226000' --geometryVersion 'all:ATLAS-R2-2015-03-01-00'
RES=$?
echo "art-result: $RES Reco"
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger.sh
index ed1d2595586b..9780d11108c1 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger.sh
@@ -12,6 +12,7 @@ export TRF_ECHO=True; Reco_tf.py \
--outputESDFile=ESD.pool.root \
--outputAODFile=AOD.pool.root \
--maxEvents=20 \
+--conditionsTag 'all:OFLCOND-MC16-SDR-RUN2-08' \
--postInclude 'all:RecJobTransforms/UseFrontier.py,SimulationJobOptions/postInclude.HijingPars.py' \
--postExec 'r2a:y=(StreamAOD.ItemList if "StreamAOD" in dir() else []);y+=["xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList.CELL_SIGNIFICANCE.CELL_SIG_SAMPLING"];' \
--preExec 'r2a:from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.cutLevel.set_Value_and_Lock(4);jobproperties.Beam.bunchSpacing.set_Value_and_Lock(100);rec.doDPD.set_Value_and_Lock(True);' 'all:from AthenaMonitoring.DQMonFlags import jobproperties; jobproperties.DQMonFlagsCont.doHIMon.set_Value_and_Lock(False);rec.doZdc.set_Value_and_Lock(False);rec.doHeavyIon.set_Value_and_Lock(True);rec.doTrigger.set_Value_and_Lock(False);' \
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger_MultipleThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger_MultipleThreads.sh
index 992174970fc1..3b58dbb64938 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger_MultipleThreads.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger_MultipleThreads.sh
@@ -11,6 +11,7 @@ export TRF_ECHO=True; Reco_tf.py \
--outputESDFile=ESD.pool.root \
--outputAODFile=AOD.pool.root \
--maxEvents=20 \
+--conditionsTag 'all:OFLCOND-MC16-SDR-RUN2-08' \
--postInclude 'all:RecJobTransforms/UseFrontier.py,SimulationJobOptions/postInclude.HijingPars.py' \
--postExec 'r2a:y=(StreamAOD.ItemList if "StreamAOD" in dir() else []);y+=["xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_POS.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.BadChannelList.CELL_SIGNIFICANCE.CELL_SIG_SAMPLING"];' \
--preExec 'r2a:from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.cutLevel.set_Value_and_Lock(4);jobproperties.Beam.bunchSpacing.set_Value_and_Lock(100);rec.doDPD.set_Value_and_Lock(True);' 'all:from AthenaMonitoring.DQMonFlags import jobproperties; jobproperties.DQMonFlagsCont.doHIMon.set_Value_and_Lock(False);rec.doZdc.set_Value_and_Lock(False);rec.doHeavyIon.set_Value_and_Lock(True);rec.doTrigger.set_Value_and_Lock(False);' \
--
GitLab
From edd23ab65bb75e4cd842078861d357e6ca63fe11 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Wed, 4 Aug 2021 12:02:21 -0400
Subject: [PATCH 105/272] TrigCompositeUtils: Fix rounding.
Round properly in calculating expected result.
Fixes failure seen in alternate builds.
---
.../TrigSteer/TrigCompositeUtils/test/Combinators_test.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/test/Combinators_test.cxx b/Trigger/TrigSteer/TrigCompositeUtils/test/Combinators_test.cxx
index aa1c60c69790..0735baa11cca 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/test/Combinators_test.cxx
+++ b/Trigger/TrigSteer/TrigCompositeUtils/test/Combinators_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include <iostream>
@@ -178,7 +178,7 @@ void _count( size_t from, size_t choose) {
++counter;
};
std::cout << from << " choose " << choose << " " << counter << std::endl;
- VALUE ( counter) EXPECTED ( std::tgamma(from+1)/( std::tgamma(from-choose+1)* std::tgamma(choose+1)) );
+ VALUE ( counter) EXPECTED ( static_cast<int> (std::tgamma(from+1)/( std::tgamma(from-choose+1)* std::tgamma(choose+1)) + 0.5) );
}
void countUniqueCombinations() {
--
GitLab
From cc57f23a29100c81da25a154ef38cb103c2880c2 Mon Sep 17 00:00:00 2001
From: abarton <Adam.Edward.Barton@cern.ch>
Date: Tue, 17 Aug 2021 17:05:07 +0100
Subject: [PATCH 106/272] Prevent copying by taking reference
---
Event/xAOD/xAODCore/Root/AuxCompression.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Event/xAOD/xAODCore/Root/AuxCompression.cxx b/Event/xAOD/xAODCore/Root/AuxCompression.cxx
index 0ec906339ae2..8d1b6fecea01 100644
--- a/Event/xAOD/xAODCore/Root/AuxCompression.cxx
+++ b/Event/xAOD/xAODCore/Root/AuxCompression.cxx
@@ -57,7 +57,7 @@ namespace xAOD {
// Set helper variables
const unsigned int nmantissa = val.first;
- const std::set< std::string > names = val.second;
+ const std::set< std::string > &names = val.second;
// Start from an empty list
SG::auxid_set_t auxids;
--
GitLab
From a9c1391f05fd5bb072af5aed2734d4a03c20c000 Mon Sep 17 00:00:00 2001
From: abarton <Adam.Edward.Barton@cern.ch>
Date: Tue, 17 Aug 2021 17:05:17 +0100
Subject: [PATCH 107/272] Use single char find
---
Control/AthenaMP/src/AthMpEvtLoopMgr.cxx | 2 +-
Control/AthenaMPTools/src/EvtRangeScatterer.cxx | 6 +++---
Control/AthenaServices/src/AthenaMtesEventLoopMgr.cxx | 10 +++++-----
Control/AthenaServices/src/AthenaOutputStream.cxx | 2 +-
Control/AthenaServices/src/AthenaOutputStreamTool.cxx | 2 +-
.../AthenaServices/src/OutputStreamSequencerSvc.cxx | 2 +-
Control/StoreGate/src/VarHandleKey.cxx | 2 +-
Control/Valkyrie/src/ValgrindAuditor.cxx | 4 ++--
Database/APR/StorageSvc/src/DbDatabaseObj.cpp | 4 ++--
.../AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.icc | 4 ++--
.../AthenaPoolCnvSvc/src/AthenaRootSharedWriterSvc.cxx | 4 ++--
.../AthenaPoolUtilities/AthenaAttributeType.h | 2 +-
.../GeoModel/GeoModelSvc/src/GeoModelSvc.cxx | 4 ++--
.../TrigOnlineMonitor/src/TrigOpMonitor.cxx | 2 +-
.../PixelCalibAlgs/run2/src/PixelRIOs.cxx | 2 +-
LumiBlock/LumiCalc/src/CoolQuery.cxx | 2 +-
.../TrigConfHLTData/Root/HLTChain.cxx | 2 +-
17 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/Control/AthenaMP/src/AthMpEvtLoopMgr.cxx b/Control/AthenaMP/src/AthMpEvtLoopMgr.cxx
index 48a6217e52f0..8a962da727ac 100644
--- a/Control/AthenaMP/src/AthMpEvtLoopMgr.cxx
+++ b/Control/AthenaMP/src/AthMpEvtLoopMgr.cxx
@@ -198,7 +198,7 @@ StatusCode AthMpEvtLoopMgr::executeRun(int maxevt)
srand((unsigned)time(0));
std::ostringstream randname;
randname << rand();
- std::string backupDir = (m_workerTopDir.rfind("/")==(m_workerTopDir.size()-1)?m_workerTopDir.substr(0,m_workerTopDir.size()-1):m_workerTopDir)+std::string("-bak-")+randname.str();
+ std::string backupDir = (m_workerTopDir.rfind('/')==(m_workerTopDir.size()-1)?m_workerTopDir.substr(0,m_workerTopDir.size()-1):m_workerTopDir)+std::string("-bak-")+randname.str();
ATH_MSG_WARNING("The top directory " << m_workerTopDir << " already exists");
ATH_MSG_WARNING("The job will attempt to save it with the name " << backupDir << " and create new top directory from scratch");
diff --git a/Control/AthenaMPTools/src/EvtRangeScatterer.cxx b/Control/AthenaMPTools/src/EvtRangeScatterer.cxx
index 8bfd0b1100ca..19dc1af57e1d 100644
--- a/Control/AthenaMPTools/src/EvtRangeScatterer.cxx
+++ b/Control/AthenaMPTools/src/EvtRangeScatterer.cxx
@@ -459,13 +459,13 @@ void EvtRangeScatterer::trimRangeStrings(std::string& str)
// Get rid of them!
if(str.find("u\'")==0) {
str = str.substr(2);
- if(str.rfind("\'")==str.size()-1) {
+ if(str.rfind('\'')==str.size()-1) {
str = str.substr(0,str.size()-1);
}
}
- else if(str.find("\"")==0) {
+ else if(str.find('\"')==0) {
str = str.substr(1);
- if(str.rfind("\"")==str.size()-1) {
+ if(str.rfind('\"')==str.size()-1) {
str = str.substr(0,str.size()-1);
}
}
diff --git a/Control/AthenaServices/src/AthenaMtesEventLoopMgr.cxx b/Control/AthenaServices/src/AthenaMtesEventLoopMgr.cxx
index 9284f916770b..bb818f0f5459 100644
--- a/Control/AthenaServices/src/AthenaMtesEventLoopMgr.cxx
+++ b/Control/AthenaServices/src/AthenaMtesEventLoopMgr.cxx
@@ -1385,7 +1385,7 @@ std::unique_ptr<AthenaMtesEventLoopMgr::RangeStruct> AthenaMtesEventLoopMgr::get
while(endpos!=std::string::npos) {
// Get the Key-Value pair
std::string keyValue(range.substr(startpos,endpos-startpos));
- size_t colonPos = keyValue.find(":");
+ size_t colonPos = keyValue.find(':');
std::string strKey = keyValue.substr(0,colonPos);
std::string strVal = keyValue.substr(colonPos+1);
trimRangeStrings(strKey);
@@ -1399,7 +1399,7 @@ std::unique_ptr<AthenaMtesEventLoopMgr::RangeStruct> AthenaMtesEventLoopMgr::get
// Get the final Key-Value pair
std::string keyValue(range.substr(startpos));
- size_t colonPos = keyValue.find(":");
+ size_t colonPos = keyValue.find(':');
std::string strKey = keyValue.substr(0,colonPos);
std::string strVal = keyValue.substr(colonPos+1);
trimRangeStrings(strKey);
@@ -1501,13 +1501,13 @@ void AthenaMtesEventLoopMgr::trimRangeStrings(std::string& str)
// Get rid of them!
if(str.find("u\'")==0) {
str = str.substr(2);
- if(str.rfind("\'")==str.size()-1) {
+ if(str.rfind('\'')==str.size()-1) {
str = str.substr(0,str.size()-1);
}
}
- else if(str.find("\"")==0) {
+ else if(str.find('\"')==0) {
str = str.substr(1);
- if(str.rfind("\"")==str.size()-1) {
+ if(str.rfind('\"')==str.size()-1) {
str = str.substr(0,str.size()-1);
}
}
diff --git a/Control/AthenaServices/src/AthenaOutputStream.cxx b/Control/AthenaServices/src/AthenaOutputStream.cxx
index 8dc48946f073..d8e681318624 100644
--- a/Control/AthenaServices/src/AthenaOutputStream.cxx
+++ b/Control/AthenaServices/src/AthenaOutputStream.cxx
@@ -991,7 +991,7 @@ AthenaOutputStream::buildCompressionSet (const ToolHandle<SG::IFolder>& handle,
continue;
}
// Then find the compression item key and the compression list string
- size_t seppos = iter->key().find(".");
+ size_t seppos = iter->key().find('.');
string comp_item_key{""}, comp_str{""};
if(seppos != string::npos) {
comp_item_key = iter->key().substr(0, seppos+1);
diff --git a/Control/AthenaServices/src/AthenaOutputStreamTool.cxx b/Control/AthenaServices/src/AthenaOutputStreamTool.cxx
index e5426d851c50..4a560b51b563 100644
--- a/Control/AthenaServices/src/AthenaOutputStreamTool.cxx
+++ b/Control/AthenaServices/src/AthenaOutputStreamTool.cxx
@@ -86,7 +86,7 @@ StatusCode AthenaOutputStreamTool::initialize() {
if( (pos != std::string::npos) ) {
ATH_MSG_INFO("The AttrListKey will be overwritten/set by the value from the OutputName: " << m_outputName);
const std::string attrListKey = m_outputName.value().substr(pos + keyword.size(),
- m_outputName.value().find("]", pos + keyword.size()) - pos - keyword.size());
+ m_outputName.value().find(']', pos + keyword.size()) - pos - keyword.size());
m_attrListKey = attrListKey;
}
}
diff --git a/Control/AthenaServices/src/OutputStreamSequencerSvc.cxx b/Control/AthenaServices/src/OutputStreamSequencerSvc.cxx
index 2a6fa02cc81c..519e61b87fd5 100644
--- a/Control/AthenaServices/src/OutputStreamSequencerSvc.cxx
+++ b/Control/AthenaServices/src/OutputStreamSequencerSvc.cxx
@@ -156,7 +156,7 @@ std::string OutputStreamSequencerSvc::buildSequenceFileName(const std::string& o
std::lock_guard lockg( m_mutex );
// build the full output file name for this event range
std::string fileNameCore = orgFileName, fileNameExt;
- std::size_t sepPos = orgFileName.find("[");
+ std::size_t sepPos = orgFileName.find('[');
if (sepPos != std::string::npos) {
fileNameCore = orgFileName.substr(0, sepPos);
fileNameExt = orgFileName.substr(sepPos);
diff --git a/Control/StoreGate/src/VarHandleKey.cxx b/Control/StoreGate/src/VarHandleKey.cxx
index 00fab717078d..4e7c8c7258b9 100644
--- a/Control/StoreGate/src/VarHandleKey.cxx
+++ b/Control/StoreGate/src/VarHandleKey.cxx
@@ -270,7 +270,7 @@ void VarHandleKey::parseKey (const std::string& key,
+ sn + "\"");
}
} else {
- sp = m_sgKey.rfind("/");
+ sp = m_sgKey.rfind('/');
if (sp != std::string::npos) {
if (sp == 0
&& m_sgKey.size() == 1) {
diff --git a/Control/Valkyrie/src/ValgrindAuditor.cxx b/Control/Valkyrie/src/ValgrindAuditor.cxx
index 22fb289dae03..373d2511ac3a 100644
--- a/Control/Valkyrie/src/ValgrindAuditor.cxx
+++ b/Control/Valkyrie/src/ValgrindAuditor.cxx
@@ -268,7 +268,7 @@ namespace {
StatusCode decodeNameEvt(const std::string& s, ValgrindAuditor::NameEvt& nameEvt)
{
// Find last(!) "." delimiter (earlier ones might be part of regexp)
- string::size_type loc = s.rfind(".");
+ string::size_type loc = s.rfind('.');
if ( loc==string::npos ) return StatusCode::FAILURE;
try {
@@ -292,7 +292,7 @@ StatusCode ValgrindAuditor::decodeIntervals()
std::vector<string>::const_iterator iter = m_intervals.begin();
for (; iter!=m_intervals.end(); ++iter) {
const string& spec = *iter;
- string::size_type loc = spec.find(":");
+ string::size_type loc = spec.find(':');
// If there is no delimiter interpret as [a,a]
string s1, s2;
diff --git a/Database/APR/StorageSvc/src/DbDatabaseObj.cpp b/Database/APR/StorageSvc/src/DbDatabaseObj.cpp
index f3c76b7859e3..31d1b969c982 100644
--- a/Database/APR/StorageSvc/src/DbDatabaseObj.cpp
+++ b/Database/APR/StorageSvc/src/DbDatabaseObj.cpp
@@ -424,8 +424,8 @@ DbStatus DbDatabaseObj::open() {
size_t id1 = dsc.find("[NAME=");
size_t id2 = dsc.find("[VALUE=");
if ( id1 != string::npos && id2 != string::npos ) {
- size_t id11 = dsc.find("]", id1+6);
- size_t id22 = dsc.find("]", id2+7);
+ size_t id11 = dsc.find(']', id1+6);
+ size_t id22 = dsc.find(']', id2+7);
if ( id11 != string::npos && id22 != string::npos ) {
string n = dsc.substr(id1+6, id11-id1-6);
string v = dsc.substr(id2+7, id22-id2-7);
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.icc b/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.icc
index d8280505a772..d7e26f7d70f0 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.icc
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.icc
@@ -60,8 +60,8 @@ StatusCode T_AthenaPoolCustomCnvWithKey<TRANS, PERS>::DataObjectToPool(IOpaqueAd
ATH_MSG_ERROR("failed to get Token for " << pObj->name());
return(StatusCode::FAILURE);
}
- std::size_t cpos = pAddr->par()->find(":");
- std::size_t bpos = pAddr->par()->find("[");
+ std::size_t cpos = pAddr->par()->find(':');
+ std::size_t bpos = pAddr->par()->find('[');
if (cpos == std::string::npos) {
cpos = 0;
} else {
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaRootSharedWriterSvc.cxx b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaRootSharedWriterSvc.cxx
index 035486a0ecef..0b8d201d31cb 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaRootSharedWriterSvc.cxx
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaRootSharedWriterSvc.cxx
@@ -175,7 +175,7 @@ StatusCode AthenaRootSharedWriterSvc::initialize() {
if (propertyServer->getProperty(&streamPortStringProp).isFailure()) {
ATH_MSG_INFO("Conversion service does not have StreamPortString property, using default: " << streamPort);
} else {
- streamPort = atoi(streamPortStringProp.value().substr(streamPortStringProp.value().find(":") + 1).c_str());
+ streamPort = atoi(streamPortStringProp.value().substr(streamPortStringProp.value().find(':') + 1).c_str());
}
m_rootServerSocket = new TServerSocket(streamPort, (streamPort == 0 ? false : true), 100);
if (m_rootServerSocket == nullptr || !m_rootServerSocket->IsValid()) {
@@ -183,7 +183,7 @@ StatusCode AthenaRootSharedWriterSvc::initialize() {
return StatusCode::FAILURE;
}
streamPort = m_rootServerSocket->GetLocalPort();
- const std::string newStreamPortString{streamPortStringProp.value().substr(0,streamPortStringProp.value().find(":")+1) + std::to_string(streamPort)};
+ const std::string newStreamPortString{streamPortStringProp.value().substr(0,streamPortStringProp.value().find(':')+1) + std::to_string(streamPort)};
if(propertyServer->setProperty(propertyName,newStreamPortString).isFailure()) {
ATH_MSG_FATAL("Could not set Conversion Service property " << propertyName << " from " << streamPortString << " to " << newStreamPortString);
return StatusCode::FAILURE;
diff --git a/Database/AthenaPOOL/AthenaPoolUtilities/AthenaPoolUtilities/AthenaAttributeType.h b/Database/AthenaPOOL/AthenaPoolUtilities/AthenaPoolUtilities/AthenaAttributeType.h
index d7d92999432f..b77564d13db4 100644
--- a/Database/AthenaPOOL/AthenaPoolUtilities/AthenaPoolUtilities/AthenaAttributeType.h
+++ b/Database/AthenaPOOL/AthenaPoolUtilities/AthenaPoolUtilities/AthenaAttributeType.h
@@ -109,7 +109,7 @@ AthenaAttributeType::fromString(const std::string& i)
for (std::set<std::string>::iterator it = keys.begin(); it!=keys.end(); ++it) {
flagpos = i.find(*it);
if (flagpos != std::string::npos) {
- endpos = i.find(";",flagpos);
+ endpos = i.find(';',flagpos);
if (endpos != std::string::npos) {
this->setInfoForKey(*it,i.substr(flagpos,endpos));
}
diff --git a/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.cxx b/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.cxx
index c05b20ad9281..39543a4c1432 100755
--- a/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.cxx
+++ b/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.cxx
@@ -405,7 +405,7 @@ StatusCode GeoModelSvc::compareTags()
// Parse Tag Info tag
std::string::size_type startpos = 0;
std::string currStr = pair.second;
- for(std::string::size_type endpos=currStr.find("-"); endpos!=std::string::npos; endpos=currStr.find("-",startpos)) {
+ for(std::string::size_type endpos=currStr.find('-'); endpos!=std::string::npos; endpos=currStr.find('-',startpos)) {
tokensTagInfo.push_back(currStr.substr(startpos,endpos-startpos));
startpos = endpos+1;
}
@@ -421,7 +421,7 @@ StatusCode GeoModelSvc::compareTags()
// Parse Job Options tag
startpos = 0;
currStr = m_AtlasVersion;
- for(std::string::size_type endpos=currStr.find("-"); endpos!=std::string::npos; endpos=currStr.find("-",startpos)) {
+ for(std::string::size_type endpos=currStr.find('-'); endpos!=std::string::npos; endpos=currStr.find('-',startpos)) {
tokensJobOpt.push_back(currStr.substr(startpos,endpos-startpos));
startpos = endpos+1;
}
diff --git a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigOpMonitor.cxx b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigOpMonitor.cxx
index 0a788bf19ef0..8e54745d77c5 100644
--- a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigOpMonitor.cxx
+++ b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigOpMonitor.cxx
@@ -41,7 +41,7 @@ namespace {
std::string line;
while (getline(f, line)) {
// Format: name:value
- std::string::size_type loc = line.find(":");
+ std::string::size_type loc = line.find(':');
if (loc == std::string::npos || loc == 0) continue;
result[line.substr(0, loc)] = line.substr(loc + 1);
}
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/PixelRIOs.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/PixelRIOs.cxx
index 5e20e278cb24..a3bfac33b1bd 100644
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/PixelRIOs.cxx
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/PixelRIOs.cxx
@@ -531,7 +531,7 @@ void PixelRIOs::Analyze(const std::string& reference,
std::string errorfilename = "PixelClusterOnTrackErrorData"
- + m_FinalTag.substr(m_FinalTag.find("-"));
+ + m_FinalTag.substr(m_FinalTag.find('-'));
m_Validation->WriteErrorsFile(errorfilename);
std::string histofilename = m_FinalTag + std::string(".root");
diff --git a/LumiBlock/LumiCalc/src/CoolQuery.cxx b/LumiBlock/LumiCalc/src/CoolQuery.cxx
index 4abe10a2ce7a..d7684d3ad203 100644
--- a/LumiBlock/LumiCalc/src/CoolQuery.cxx
+++ b/LumiBlock/LumiCalc/src/CoolQuery.cxx
@@ -68,7 +68,7 @@ bool CoolQuery::openDbConn() {
std::string CoolQuery::transConn(const std::string& inconn) {
// translate simple connection string (no slash) to mycool.db with given
// instance name, all others are left alone
- if (inconn.find("/")==std::string::npos) {
+ if (inconn.find('/')==std::string::npos) {
return "sqlite://X;schema=mycool.db;dbname="+inconn;
} else {
return inconn;
diff --git a/Trigger/TrigConfiguration/TrigConfHLTData/Root/HLTChain.cxx b/Trigger/TrigConfiguration/TrigConfHLTData/Root/HLTChain.cxx
index b8de58c4c6d4..1967aae12aab 100644
--- a/Trigger/TrigConfiguration/TrigConfHLTData/Root/HLTChain.cxx
+++ b/Trigger/TrigConfiguration/TrigConfHLTData/Root/HLTChain.cxx
@@ -103,7 +103,7 @@ TrigConf::HLTChain::~HLTChain() {
bool
TrigConf::HLTChain::hasMultipleLowerChains() const {
- return m_lower_chain_name.find(",")!=std::string::npos;
+ return m_lower_chain_name.find(',')!=std::string::npos;
}
--
GitLab
From 50878f21e5929a7e4bdbeaa388dbeb9be362727d Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Fri, 6 Aug 2021 12:20:01 -0400
Subject: [PATCH 108/272] FlavorTagDiscriminants: Fix clang warning.
Unused typedef.
---
.../JetTagging/FlavorTagDiscriminants/Root/customGetter.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/customGetter.cxx b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/customGetter.cxx
index 363a7eef3982..e8048d7ad8c5 100644
--- a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/customGetter.cxx
+++ b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/customGetter.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "FlavorTagDiscriminants/customGetter.h"
#include "FlavorTagDiscriminants/BTagTrackIpAccessor.h"
@@ -70,7 +70,6 @@ namespace {
using Tp = xAOD::TrackParticle;
using Jet = xAOD::Jet;
- typedef std::vector<const xAOD::TrackParticle*> Tracks;
BTagTrackIpAccessor a(prefix);
if (name == "IP3D_signed_d0_significance") {
--
GitLab
From e32638dab47c6f4e3d133cf49e26bfc9b594ffce Mon Sep 17 00:00:00 2001
From: Timothee Theveneaux-Pelzer <timothee.theveneaux-pelzer@cern.ch>
Date: Tue, 17 Aug 2021 18:05:02 +0000
Subject: [PATCH 109/272] Master: powheg log issues and ttj mi nnlops first
implementation
---
.../python/algorithms/generators/multicore.py | 5 +-
.../algorithms/generators/singlecore.py | 5 +-
.../algorithms/postprocessors/madspin.py | 3 +-
.../python/processes/powheg/Wj_MiNNLO.py | 6 +-
.../python/processes/powheg/Zj_MiNNLO.py | 7 +-
.../python/processes/powheg/__init__.py | 1 +
.../python/processes/powheg/ttj_MiNNLO.py | 164 ++++++++++++++++++
.../python/processes/powheg_RES.py | 5 +-
.../python/processes/powheg_V1.py | 5 +-
.../python/processes/powheg_V2.py | 7 +-
.../python/processes/powheg_base.py | 46 ++++-
.../python/utility/process_handling.py | 28 ++-
.../PowhegControl_ttj_MiNNLO_Common.py | 4 +
...c.PhPy8EG_A14NNPDF23_ttj_MiNNLO_example.py | 30 ++++
14 files changed, 300 insertions(+), 16 deletions(-)
create mode 100644 Generators/PowhegControl/python/processes/powheg/ttj_MiNNLO.py
create mode 100644 Generators/PowhegControl/share/control/PowhegControl_ttj_MiNNLO_Common.py
create mode 100644 Generators/PowhegControl/share/example/processes/ttj_MiNNLO/mc.PhPy8EG_A14NNPDF23_ttj_MiNNLO_example.py
diff --git a/Generators/PowhegControl/python/algorithms/generators/multicore.py b/Generators/PowhegControl/python/algorithms/generators/multicore.py
index a6531d6f0525..959ec7a43fcd 100644
--- a/Generators/PowhegControl/python/algorithms/generators/multicore.py
+++ b/Generators/PowhegControl/python/algorithms/generators/multicore.py
@@ -136,7 +136,10 @@ def multicore_untimed(process):
"""
if not os.path.isfile(process.executable):
raise OSError("Powheg executable {} not found!".format(process.executable))
- threads = [SingleProcessThread(process.executable, seed_index=idx) for idx in range(1, process.cores + 1)]
+ threads = [SingleProcessThread(process.executable, seed_index=idx,
+ warning_output=(process.warning_output if hasattr(process,"warning_output") else None),
+ info_output=(process.info_output if hasattr(process,"info_output") else None),
+ error_output=(process.error_output if hasattr(process,"error_output") else None)) for idx in range(1, process.cores + 1)]
manager = ProcessManager(threads)
while manager.monitor():
pass
diff --git a/Generators/PowhegControl/python/algorithms/generators/singlecore.py b/Generators/PowhegControl/python/algorithms/generators/singlecore.py
index dbc6391b6673..f4011fcc059f 100644
--- a/Generators/PowhegControl/python/algorithms/generators/singlecore.py
+++ b/Generators/PowhegControl/python/algorithms/generators/singlecore.py
@@ -25,7 +25,10 @@ def singlecore_untimed(process):
"""
if not os.path.isfile(process.executable):
raise OSError("Powheg executable {} not found!".format(process.executable))
- threads = [SingleProcessThread(process.executable)]
+ threads = [SingleProcessThread(process.executable,
+ warning_output=(process.warning_output if hasattr(process,"warning_output") else None),
+ info_output=(process.info_output if hasattr(process,"info_output") else None),
+ error_output=(process.error_output if hasattr(process,"error_output") else None))]
manager = ProcessManager(threads)
while manager.monitor():
pass
diff --git a/Generators/PowhegControl/python/algorithms/postprocessors/madspin.py b/Generators/PowhegControl/python/algorithms/postprocessors/madspin.py
index b9b937fb4e2b..a6198b2a7df5 100644
--- a/Generators/PowhegControl/python/algorithms/postprocessors/madspin.py
+++ b/Generators/PowhegControl/python/algorithms/postprocessors/madspin.py
@@ -254,7 +254,8 @@ def __run_executable(executable):
raise OSError("MadSpin executable {} not found!".format(executable))
logger.info("MadSpin executable: {}".format(executable))
with open("madspin_runcard.txt", "r") as runcard_input:
- processes = [SingleProcessThread([executable], stdin=runcard_input, ignore_output=["INFO:", "MadSpin>"])]
+ processes = [SingleProcessThread([executable], stdin=runcard_input, ignore_output=["INFO:", "MadSpin>"],
+ error_output=["Command \"launch\" interrupted with error:", "MadSpinError", "generating the production square matrix element"])]
manager = ProcessManager(processes)
while manager.monitor():
pass
diff --git a/Generators/PowhegControl/python/processes/powheg/Wj_MiNNLO.py b/Generators/PowhegControl/python/processes/powheg/Wj_MiNNLO.py
index dedf1ec39668..2fe9ac4da9a8 100644
--- a/Generators/PowhegControl/python/processes/powheg/Wj_MiNNLO.py
+++ b/Generators/PowhegControl/python/processes/powheg/Wj_MiNNLO.py
@@ -23,7 +23,11 @@ class Wj_MiNNLO(PowhegV2):
@param kwargs dictionary of arguments from Generate_tf.
"""
- super(Wj_MiNNLO, self).__init__(base_directory, os.path.join("Wj", "WjMiNNLO"), powheg_executable="pwhg_main", **kwargs)
+ # this is very hacky
+ warnings = super(Wj_MiNNLO, self).hoppet_warning()
+ infos = super(Wj_MiNNLO, self).hoppet_info()
+
+ super(Wj_MiNNLO, self).__init__(base_directory, os.path.join("Wj", "WjMiNNLO"), powheg_executable="pwhg_main", warning_output=warnings, info_output=infos, **kwargs)
# Add algorithms to the sequence
diff --git a/Generators/PowhegControl/python/processes/powheg/Zj_MiNNLO.py b/Generators/PowhegControl/python/processes/powheg/Zj_MiNNLO.py
index 90ed9b9430ba..45dea4aabe52 100644
--- a/Generators/PowhegControl/python/processes/powheg/Zj_MiNNLO.py
+++ b/Generators/PowhegControl/python/processes/powheg/Zj_MiNNLO.py
@@ -22,7 +22,12 @@ class Zj_MiNNLO(PowhegV2):
@param base_directory: path to PowhegBox code.
@param kwargs dictionary of arguments from Generate_tf.
"""
- super(Zj_MiNNLO, self).__init__(base_directory, os.path.join("Zj", "ZjMiNNLO"), powheg_executable="pwhg_main", **kwargs)
+
+ # this is very hacky
+ warnings = super(Zj_MiNNLO, self).hoppet_warning()
+ infos = super(Zj_MiNNLO, self).hoppet_info()
+
+ super(Zj_MiNNLO, self).__init__(base_directory, os.path.join("Zj", "ZjMiNNLO"), powheg_executable="pwhg_main", warning_output=warnings, info_output=infos, **kwargs)
# Add algorithms to the sequence
diff --git a/Generators/PowhegControl/python/processes/powheg/__init__.py b/Generators/PowhegControl/python/processes/powheg/__init__.py
index ce70f38a7d21..b1e9074c79b1 100644
--- a/Generators/PowhegControl/python/processes/powheg/__init__.py
+++ b/Generators/PowhegControl/python/processes/powheg/__init__.py
@@ -31,6 +31,7 @@ from .tt_NLOdecays import tt_NLOdecays
from .ttbb import ttbb
from .ttH import ttH
from .ttj import ttj
+from .ttj_MiNNLO import ttj_MiNNLO
from .ttWm_EW import ttWm_EW
from .ttWm_QCD import ttWm_QCD
from .ttWp_EW import ttWp_EW
diff --git a/Generators/PowhegControl/python/processes/powheg/ttj_MiNNLO.py b/Generators/PowhegControl/python/processes/powheg/ttj_MiNNLO.py
new file mode 100644
index 000000000000..4e8a10b3a709
--- /dev/null
+++ b/Generators/PowhegControl/python/processes/powheg/ttj_MiNNLO.py
@@ -0,0 +1,164 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon import Logging
+from ..powheg_V2 import PowhegV2
+
+## Get handle to Athena logging
+logger = Logging.logging.getLogger("PowhegControl")
+
+
+class ttj_MiNNLO(PowhegV2):
+ """! Default Powheg configuration for top pair production plus one jet with MiNNLO.
+
+ Create a configurable object with all applicable Powheg options.
+
+ @author Timothee Theveneaux-Pelzer <tpelzer@cern.ch>
+ """
+
+ def __init__(self, base_directory, **kwargs):
+ """! Constructor: all process options are set here.
+
+ @param base_directory: path to PowhegBox code.
+ @param kwargs dictionary of arguments from Generate_tf.
+ """
+
+ # this is very hacky
+ errors = super(ttj_MiNNLO, self).openloops_error()
+ warnings = super(ttj_MiNNLO, self).hoppet_warning()
+ infos = super(ttj_MiNNLO, self).hoppet_info()
+
+ super(ttj_MiNNLO, self).__init__(base_directory, "ttJ_MiNNLOPS_v1.0_beta1", powheg_executable="pwhg_main-gnu", warning_output=warnings, info_output=infos, error_output=errors, **kwargs)
+
+ # Add parameter validation functions
+ self.validation_functions.append("validate_decays")
+
+ ## List of allowed decay modes
+ self.allowed_decay_modes = ["t t~ > all", "t t~ > b j j b~ j j", "t t~ > b l+ vl b~ l- vl~", "t t~ > b emu+ vemu b~ emu- vemu~", "t t~ > semileptonic"]
+
+ # Add all keywords for this process, overriding defaults if required
+ self.add_keyword("alphaem")
+ self.add_keyword("bcut")
+ self.add_keyword("bornktmin", 5.0)
+ self.add_keyword("bornonly")
+ self.add_keyword("bornsuppfact", 100.0)
+ self.add_keyword("bornzerodamp")
+ self.add_keyword("bottommass")
+ self.add_keyword("bottomthr")
+ self.add_keyword("bottomthrpdf")
+ self.add_keyword("charmthr")
+ self.add_keyword("charmthrpdf")
+ self.add_keyword("CKM_Vcb")
+ self.add_keyword("CKM_Vcd")
+ self.add_keyword("CKM_Vcs")
+ self.add_keyword("CKM_Vtb")
+ self.add_keyword("CKM_Vtd")
+ self.add_keyword("CKM_Vts")
+ self.add_keyword("CKM_Vub")
+ self.add_keyword("CKM_Vud")
+ self.add_keyword("CKM_Vus")
+ self.add_keyword("clobberlhe")
+ self.add_keyword('collremnsamp"')
+ self.add_keyword("colltest")
+ self.add_keyword("compute_rwgt")
+ self.add_keyword("doublefsr")
+ self.add_keyword("elbranching")
+ self.add_keyword("facscfact", self.default_scales[0])
+ self.add_keyword("fastbtlbound")
+ self.add_keyword("ffltest")
+ self.add_keyword("flg_debug")
+ self.add_keyword("foldcsi", 2)
+ self.add_keyword("foldphi", 2)
+ self.add_keyword("foldy", 2)
+ self.add_keyword("fullrwgt")
+ self.add_keyword("fullrwgtmode")
+ self.add_keyword("ggproc")
+ self.add_keyword("gqbproc")
+ self.add_keyword("hdamp")
+ self.add_keyword("hfact")
+ self.add_keyword("icsimax", 3)
+ self.add_keyword("ih1")
+ self.add_keyword("ih2")
+ self.add_keyword("itmx1")
+ self.add_keyword("itmx2", 4)
+ self.add_keyword("iupperfsr")
+ self.add_keyword("iupperisr")
+ self.add_keyword("iymax", 3)
+ self.add_keyword("jacsing")
+ self.add_keyword("largecorrfact")
+ self.add_keyword("lhans1", self.default_PDFs)
+ self.add_keyword("lhans2", self.default_PDFs)
+ self.add_keyword("lhfm/bmass")
+ self.add_keyword("lhfm/cmass")
+ self.add_keyword("lhfm/emass")
+ self.add_keyword("lhfm/mumass")
+ self.add_keyword("lhfm/taumass")
+ self.add_keyword("manyseeds")
+ self.add_keyword("masswindow_high")
+ self.add_keyword("masswindow_low")
+ self.add_keyword("minlo", 1)
+ self.add_keyword("minnlo", 1)
+ self.add_keyword("ncall1", 51000)
+ self.add_keyword("ncall2", 91000)
+ self.add_keyword("nubound", 11000)
+ self.add_keyword("par_2gsupp")
+ self.add_keyword("par_diexp")
+ self.add_keyword("par_dijexp")
+ self.add_keyword("par_fsrtinycsi")
+ self.add_keyword("par_fsrtinyy")
+ self.add_keyword("par_isrtinycsi")
+ self.add_keyword("par_isrtinyy")
+ self.add_keyword("parallelstage")
+ self.add_keyword("pdfreweight")
+ self.add_keyword("psgen")
+ self.add_keyword("ptmin_jet", 20.0)
+ self.add_keyword("ptsqmin")
+ self.add_keyword("ptsupp")
+ self.add_keyword("qgproc")
+ self.add_keyword("qqbproc")
+ self.add_keyword("qqpproc")
+ self.add_keyword("qqproc")
+ self.add_keyword("R_jet")
+ self.add_keyword("radregion")
+ self.add_keyword("rand1")
+ self.add_keyword("rand2")
+ self.add_keyword("renscfact", self.default_scales[1])
+ self.add_keyword("runningscale")
+ self.add_keyword("rwl_add")
+ self.add_keyword("rwl_file")
+ self.add_keyword("rwl_format_rwgt")
+ self.add_keyword("rwl_group_events")
+ self.add_keyword("semileptonic", hidden=True)
+ self.add_keyword("smartsig")
+ self.add_keyword("softtest")
+ self.add_keyword("sthw2")
+ self.add_keyword("storeinfo_rwgt")
+ self.add_keyword("testplots")
+ self.add_keyword("testsuda")
+ self.add_keyword("topdecaymode", self.allowed_decay_modes[0], name="decay_mode")
+ self.add_keyword("topmass")
+ self.add_keyword("topwidth")
+ self.add_keyword("ubsigmadetails")
+ self.add_keyword("use-old-grid")
+ self.add_keyword("use-old-ubound")
+ self.add_keyword("use-OLP-interface")
+ self.add_keyword("withdamp")
+ self.add_keyword("withnegweights")
+ self.add_keyword("withsubtr")
+ self.add_keyword("Wmass")
+ self.add_keyword("Wwidth")
+ self.add_keyword("xupbound", 6)
+ self.add_keyword("zerowidth")
+ self.add_keyword("Zmass")
+ self.add_keyword("Zwidth")
+
+ def validate_decays(self):
+ """! Validate semileptonic and topdecaymode keywords."""
+ self.expose() # convenience call to simplify syntax
+ if self.decay_mode not in self.allowed_decay_modes:
+ logger.warning("Decay mode {} not recognised!".format(self.decay_mode))
+ raise ValueError("Decay mode {} not recognised!".format(self.decay_mode))
+ # Calculate appropriate decay mode numbers
+ __decay_mode_lookup = {"t t~ > all": "22222", "t t~ > b j j b~ j j": "00022", "t t~ > b l+ vl b~ l- vl~": "22200", "t t~ > b emu+ vemu b~ emu- vemu~": "22000", "t t~ > semileptonic": "11111"}
+ self.parameters_by_keyword("topdecaymode")[0].value = __decay_mode_lookup[self.decay_mode]
+ if self.decay_mode == "semileptonic":
+ self.parameters_by_keyword("semileptonic")[0].value = 1
diff --git a/Generators/PowhegControl/python/processes/powheg_RES.py b/Generators/PowhegControl/python/processes/powheg_RES.py
index 8ef2974fb922..bb4239f37df5 100644
--- a/Generators/PowhegControl/python/processes/powheg_RES.py
+++ b/Generators/PowhegControl/python/processes/powheg_RES.py
@@ -18,8 +18,11 @@ class PowhegRES(PowhegBase):
@param base_directory path to PowhegBox code.
@param executable_name folder containing appropriate PowhegBox executable.
@param is_LO True if this is a leading-order process.
+ @param warning_output list of patterns which if found in the output will be treated as warning in the log.
+ @param error_output list of patterns which if found in the output will be treated as error in the log.
+ @param info_output list of patterns which if found in the output will be treated as info in the log.
"""
- super(PowhegRES, self).__init__(base_directory, "POWHEG-BOX-RES", executable_name, **kwargs)
+ super(PowhegRES, self).__init__(base_directory, "POWHEG-BOX-RES", executable_name, warning_output = [], info_output = [], error_output = [], **kwargs)
@property
def default_PDFs(self):
diff --git a/Generators/PowhegControl/python/processes/powheg_V1.py b/Generators/PowhegControl/python/processes/powheg_V1.py
index 994bc603e87b..214a3d93403d 100644
--- a/Generators/PowhegControl/python/processes/powheg_V1.py
+++ b/Generators/PowhegControl/python/processes/powheg_V1.py
@@ -16,8 +16,11 @@ class PowhegV1(PowhegBase):
@param base_directory path to PowhegBox code.
@param executable_name folder containing appropriate PowhegBox executable.
+ @param warning_output list of patterns which if found in the output will be treated as warning in the log.
+ @param error_output list of patterns which if found in the output will be treated as error in the log.
+ @param info_output list of patterns which if found in the output will be treated as info in the log.
"""
- super(PowhegV1, self).__init__(base_directory, "POWHEG-BOX", executable_name, is_reweightable=False, **kwargs)
+ super(PowhegV1, self).__init__(base_directory, "POWHEG-BOX", executable_name, is_reweightable=False, warning_output = [], info_output = [], error_output = [], **kwargs)
@property
def default_PDFs(self):
diff --git a/Generators/PowhegControl/python/processes/powheg_V2.py b/Generators/PowhegControl/python/processes/powheg_V2.py
index 9cedf510d7dd..36a7f2423ae2 100644
--- a/Generators/PowhegControl/python/processes/powheg_V2.py
+++ b/Generators/PowhegControl/python/processes/powheg_V2.py
@@ -11,14 +11,17 @@ class PowhegV2(PowhegBase):
@author James Robinson <james.robinson@cern.ch>
"""
- def __init__(self, base_directory, executable_name, **kwargs):
+ def __init__(self, base_directory, executable_name, warning_output = [], info_output = [], error_output = [], **kwargs):
"""! Constructor.
@param base_directory path to PowhegBox code.
@param executable_name folder containing appropriate PowhegBox executable.
@param is_LO True if this is a leading-order process.
+ @param warning_output list of patterns which if found in the output will be treated as warning in the log.
+ @param error_output list of patterns which if found in the output will be treated as error in the log.
+ @param info_output list of patterns which if found in the output will be treated as info in the log.
"""
- super(PowhegV2, self).__init__(base_directory, "POWHEG-BOX-V2", executable_name, **kwargs)
+ super(PowhegV2, self).__init__(base_directory, "POWHEG-BOX-V2", executable_name=executable_name, warning_output=warning_output, info_output=info_output, error_output=error_output, **kwargs)
@property
def default_PDFs(self):
diff --git a/Generators/PowhegControl/python/processes/powheg_base.py b/Generators/PowhegControl/python/processes/powheg_base.py
index 2b7a7491399c..4e4b89b34f1b 100644
--- a/Generators/PowhegControl/python/processes/powheg_base.py
+++ b/Generators/PowhegControl/python/processes/powheg_base.py
@@ -20,6 +20,41 @@ class PowhegBase(Configurable):
@author Stefan Richter <stefan.richter@cern.ch>
"""
+ def hoppet_info(self):
+ '''
+ Returns a list of strings to be treated as info messages in the log
+ They otherwise throw an error with HOPPET v. 1.2.0
+ Cf. AGENE-2016
+ '''
+ return ["-----------------------------------------------------------",
+ "Welcome to HOPPET v. 1.2.0",
+ "Higher Order Perturbative Parton Evolution Toolkit",
+ "Written by Gavin P. Salam (2001-2012)",
+ "with contributions from Juan Rojo",
+ "Frederic Dreyer and Alexander Karlberg",
+ "It is made available under the GNU public license,",
+ "with the additional request that if you use it or any",
+ "derivative of it in scientific work then you should cite:",
+ "G.P. Salam & J. Rojo, CPC 180(2009)120 (arXiv:0804.3755).",
+ "You are also encouraged to cite the original references,",
+ "for LO, NLO and NNLO splitting functions, the QCD",
+ "1, 2 and 3 loop beta functions and the coupling and",
+ "PDF and coupling mass threshold matching functions."]
+
+ def hoppet_warning(self):
+ '''
+ Returns a list of strings to be treated as warning messages in the log
+ They otherwise throw an error
+ '''
+ return ["WARNING in InitMTMNNLO: using parametrisation (less accuracte) for A2PShg"]
+
+ def openloops_error(self):
+ '''
+ Returns a list of strings to be treated as error messages in the log
+ They otherwise do not throw an error
+ '''
+ return ["[POWHEG-BOX+OpenLoops] Process not found!"]
+
def manually_set_openloops_paths(self):
'''
Manual fix for OpenLoops libraries path, avoiding issues when /afs not available
@@ -66,12 +101,16 @@ class PowhegBase(Configurable):
else:
logger.info("Local directory \"virtual\" now points to {}".format(MadLoop_virtual))
- def __init__(self, base_directory, version, executable_name, cores, powheg_executable="pwhg_main", is_reweightable=True, **kwargs):
+ def __init__(self, base_directory, version, executable_name, cores, powheg_executable="pwhg_main", is_reweightable=True, warning_output = [], info_output = [], error_output = [], **kwargs):
"""! Constructor.
@param base_directory path to PowhegBox code.
@param version PowhegBox version.
@param executable_name folder containing appropriate PowhegBox executable.
+ @param powheg_executable name of the powheg executable.
+ @param warning_output list of patterns which if found in the output will be treated as warning in the log.
+ @param error_output list of patterns which if found in the output will be treated as error in the log.
+ @param info_output list of patterns which if found in the output will be treated as info in the log.
"""
super(PowhegBase, self).__init__()
@@ -121,6 +160,11 @@ class PowhegBase(Configurable):
## Switch to determine if the #rwgt and #pdf comments should be kept in lhe files despite using xml reweighting
self.remove_oldStyle_rwt_comments = None
+ ## Special treatment for some log messages
+ self.warning_output = warning_output
+ self.info_output = info_output
+ self.error_output = error_output
+
def add_algorithm(self, alg_or_process):
"""! Add an algorithm or external process to the sequence.
diff --git a/Generators/PowhegControl/python/utility/process_handling.py b/Generators/PowhegControl/python/utility/process_handling.py
index 30eb626c550f..ec2609da6947 100644
--- a/Generators/PowhegControl/python/utility/process_handling.py
+++ b/Generators/PowhegControl/python/utility/process_handling.py
@@ -47,15 +47,18 @@ class SingleProcessThread(object):
__output_prefix = " | "
__ignore_output = []
- def __init__(self, command_list, seed_index=None, stdin=None, ignore_output=None):
+ def __init__(self, command_list, seed_index=None, stdin=None, ignore_output=None, warning_output=[], info_output=[], error_output=[]):
"""! Constructor.
Setup underlying process together with non-blocking readers for stdout and stderr.
- @param command_list Command that will be run (possibly with options).
- @param seed_index Which seed from pwgseeds.dat to use.
- @param stdin An open file handle providing input.
- @param ignore_output List of strings to filter out from messages.
+ @param command_list Command that will be run (possibly with options).
+ @param seed_index Which seed from pwgseeds.dat to use.
+ @param stdin An open file handle providing input.
+ @param ignore_output List of strings to filter out from messages.
+ @param warning_output List of strings which would always trigger a warning only, even if produced in stderr.
+ @param info_output List of strings which would always trigger an info only, even if produced in stderr.
+ @param error_output List of strings which would always trigger an error, even if produced in stdout.
"""
if not isinstance(command_list, list):
command_list = [command_list]
@@ -63,6 +66,11 @@ class SingleProcessThread(object):
# Set up messages to ignore
if ignore_output is not None:
self.__ignore_output = ignore_output
+ # Set up messages with special treatment
+ self.__warning_output = warning_output
+ self.__info_output = info_output
+ self.__error_output = error_output
+ ignore_output
# Usual case, where no open file handle is provided
if stdin is None:
self.__process = subprocess.Popen(command_list, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
@@ -81,6 +89,8 @@ class SingleProcessThread(object):
self.__stdout = NonBlockingStreamReader(self.__process.stdout)
self.__stderr = NonBlockingStreamReader(self.__process.stderr)
+
+
def has_output(self):
"""! Write queued output and return process status."""
status = self.is_running()
@@ -111,7 +121,13 @@ class SingleProcessThread(object):
for stream in ["stdout", "stderr"]:
while True:
output, queue_size = getattr(self, stream).readline(timeout=0.1)
- if not (output is None or len(output) == 0):
+ if output is not None and any([(pattern in output) for pattern in self.__error_output]):
+ self.log(output, "error")
+ elif output is not None and any([(pattern in output) for pattern in self.__warning_output]):
+ self.log(output, "warning")
+ elif output is not None and any([(pattern in output) for pattern in self.__info_output]):
+ self.log(output, "info")
+ elif not (output is None or len(output) == 0):
self.log(output, self.log_level[stream])
if queue_size == 0:
break
diff --git a/Generators/PowhegControl/share/control/PowhegControl_ttj_MiNNLO_Common.py b/Generators/PowhegControl/share/control/PowhegControl_ttj_MiNNLO_Common.py
new file mode 100644
index 000000000000..843c3c02daa3
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_ttj_MiNNLO_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="ttj_MiNNLO", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/example/processes/ttj_MiNNLO/mc.PhPy8EG_A14NNPDF23_ttj_MiNNLO_example.py b/Generators/PowhegControl/share/example/processes/ttj_MiNNLO/mc.PhPy8EG_A14NNPDF23_ttj_MiNNLO_example.py
new file mode 100644
index 000000000000..04eca84af71f
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/ttj_MiNNLO/mc.PhPy8EG_A14NNPDF23_ttj_MiNNLO_example.py
@@ -0,0 +1,30 @@
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# This is an example joboption to generate events with Powheg
+# using ATLAS' interface. Users should optimise and carefully
+# validate the settings before making an official sample request.
+#--------------------------------------------------------------
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 tt+jet production with MiNNLO and A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "top", "1jet"]
+evgenConfig.contact = ["tpelzer@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg ttj_MiNNLO process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_ttj_MiNNLO_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune, main31 routine
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg_Main31.py")
--
GitLab
From abc6f53b1faa582102d43297b430400dfa58b8dd Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <stewart.martin-haugh@cern.ch>
Date: Tue, 17 Aug 2021 18:26:36 +0000
Subject: [PATCH 110/272] Fix data dependencies for L1Calo simulation
(ATR-20535)
---
.../TrigT1CaloSim/src/Run2CPMTowerMaker.cxx | 9 ---
.../TrigT1CaloSim/src/Run2CPMTowerMaker.h | 3 -
.../TrigT1CaloSim/src/Run2JetElementMaker.cxx | 71 ++++---------------
.../TrigT1CaloSim/src/Run2JetElementMaker.h | 9 +--
.../python/Lvl1SimulationConfig.py | 7 ++
5 files changed, 23 insertions(+), 76 deletions(-)
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/Run2CPMTowerMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/Run2CPMTowerMaker.cxx
index e29fc01fa592..cb488fb9d76d 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/Run2CPMTowerMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/Run2CPMTowerMaker.cxx
@@ -35,15 +35,6 @@ StatusCode Run2CPMTowerMaker::initialize()
}
-/** the finalise() method is called at the end of processing, so it is used
-for deleting histograms and general tidying up*/
-StatusCode Run2CPMTowerMaker::finalize()
-{
- ATH_MSG_INFO("Finalizing" );
- return StatusCode::SUCCESS ;
-}
-
-
/**----------------------------------------------
execute() method called once per event
----------------------------------------------
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/Run2CPMTowerMaker.h b/Trigger/TrigT1/TrigT1CaloSim/src/Run2CPMTowerMaker.h
index 052dc928f5b6..256625db872d 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/Run2CPMTowerMaker.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/Run2CPMTowerMaker.h
@@ -72,9 +72,6 @@ class Run2CPMTowerMaker : public AthAlgorithm
StatusCode initialize() ;
StatusCode execute() ;
- StatusCode finalize() ;
-
-
private:
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/Run2JetElementMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/Run2JetElementMaker.cxx
index 462e2462fb01..1decf070d8a1 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/Run2JetElementMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/Run2JetElementMaker.cxx
@@ -12,32 +12,14 @@
// This algorithm includes
#include "Run2JetElementMaker.h"
-#include "TrigT1Interfaces/TrigT1CaloDefs.h"
namespace LVL1 {
-/** This is the constructor for JEMaker and is where you define the relevant
- parameters.
- Currently these are :
- - "TriggerTowerLocation" : the location of the jes in Storegate You shouldn't have to touch this.
- - "JetElementLocation" : the location of the JE in StoreGate. You shouldn't have to touch this.
-
- Alter the values of these in jobOptions.txt
-*/
-
Run2JetElementMaker::Run2JetElementMaker( const std::string& name, ISvcLocator* pSvcLocator )
: AthAlgorithm( name, pSvcLocator ),
m_JetElementTool("LVL1::L1JetElementTools/L1JetElementTools")
{
- m_triggerTowerLocation = TrigT1CaloDefs::xAODTriggerTowerLocation;
- m_jetElementLocation = TrigT1CaloDefs::JetElementLocation;
-
- // This is how you declare the parameters to Gaudi so that
- // they can be over-written via the job options file
-
- declareProperty( "TriggerTowerLocation", m_triggerTowerLocation ) ;
- declareProperty( "JetElementLocation", m_jetElementLocation ) ;
}
@@ -45,22 +27,9 @@ Run2JetElementMaker::Run2JetElementMaker( const std::string& name, ISvcLocator*
etc. here*/
StatusCode Run2JetElementMaker::initialize()
{
- // We must here instantiate items which can only be made after
- // any job options have been set
-
- ATH_MSG_INFO ( "Initialising" ) ;
-
- // Retrieve L1JetElementTool
ATH_CHECK( m_JetElementTool.retrieve() );
- return StatusCode::SUCCESS ;
-}
-
-
-/** the finalise() method is called at the end of processing, so it is used
-for deleting histograms and general tidying up*/
-StatusCode Run2JetElementMaker::finalize()
-{
- ATH_MSG_INFO( "Finalizing" );
+ ATH_CHECK(m_triggerTowerKey.initialize());
+ ATH_CHECK(m_jetElementKey.initialize());
return StatusCode::SUCCESS ;
}
@@ -78,34 +47,20 @@ StatusCode Run2JetElementMaker::execute( )
{
ATH_MSG_DEBUG ( "Executing" ) ;
- // What we are (hopefully) going to make:
- JECollection* vectorOfJEs = new JECollection;
- JEAuxCollection* jeAuxVector = new JEAuxCollection;
- vectorOfJEs->setStore(jeAuxVector);
+ // Vectors to store JetElements in
+ auto jetElements = SG::makeHandle(m_jetElementKey);
+ auto vectorOfJEs = std::make_unique<JECollection>();
+ auto jeAuxVector = std::make_unique<JEAuxCollection>();
+ vectorOfJEs->setStore(jeAuxVector.get());
// Retrieve TriggerTowers from StoreGate
- if (evtStore()->contains<xAOD::TriggerTowerContainer>(m_triggerTowerLocation)) {
- const DataVector<xAOD::TriggerTower>* vectorOfTTs;
- StatusCode sc = evtStore()->retrieve(vectorOfTTs, m_triggerTowerLocation);
- if (sc.isSuccess()) {
- // Fill a DataVector of JetElements using L1JetElementTools
- m_JetElementTool->makeJetElements(vectorOfTTs, vectorOfJEs);
- ATH_MSG_DEBUG( vectorOfJEs->size()<<" JetElements have been generated") ;
- }
- else ATH_MSG_WARNING( "Failed to retrieve TriggerTowers from " << m_triggerTowerLocation );
- }
- else ATH_MSG_WARNING( "No TriggerTowerContainer at " << m_triggerTowerLocation );
+ auto vectorOfTTs = SG::makeHandle(m_triggerTowerKey);
+ ATH_CHECK(vectorOfTTs.isValid());
+ // Fill a DataVector of JetElements using L1JetElementTools
+ m_JetElementTool->makeJetElements(vectorOfTTs.get(), vectorOfJEs.get());
+ ATH_MSG_DEBUG( vectorOfJEs->size()<<" JetElements have been generated") ;
+ ATH_CHECK(jetElements.record(std::move(vectorOfJEs), std::move(jeAuxVector)));
- // Save JetElements in the TES
- CHECK( evtStore()->record( jeAuxVector, m_jetElementLocation + "Aux." ) );
- CHECK( evtStore()->record( vectorOfJEs, m_jetElementLocation ) );
-
- // Report success for debug purposes
- ATH_MSG_DEBUG("Stored JetElements in TES at "<< m_jetElementLocation );
-
- // and we're done
- vectorOfJEs=0;
- jeAuxVector=0;
return StatusCode::SUCCESS;
}//end execute
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/Run2JetElementMaker.h b/Trigger/TrigT1/TrigT1CaloSim/src/Run2JetElementMaker.h
index 0bf3325e5152..3a88122f765f 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/Run2JetElementMaker.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/Run2JetElementMaker.h
@@ -23,6 +23,7 @@
#include "xAODTrigL1Calo/TriggerTowerContainer.h"
#include "xAODTrigL1Calo/JetElementContainer.h"
#include "xAODTrigL1Calo/JetElementAuxContainer.h"
+#include "TrigT1Interfaces/TrigT1CaloDefs.h"
//LVL1 Calo trigger includes
#include "TrigT1CaloToolInterfaces/IL1JetElementTools.h"
@@ -71,17 +72,13 @@ class Run2JetElementMaker : public AthAlgorithm
StatusCode initialize() ;
StatusCode execute() ;
- StatusCode finalize() ;
-
private:
ToolHandle<LVL1::IL1JetElementTools> m_JetElementTool;
- /** location of TriggerTowers in TES */
- std::string m_triggerTowerLocation;
- /** locations within the TES to store collections of JEs*/
- std::string m_jetElementLocation ;
+ SG::ReadHandleKey<xAOD::TriggerTowerContainer> m_triggerTowerKey{this, "TriggerTowerLocation", TrigT1CaloDefs::xAODTriggerTowerLocation};
+ SG::WriteHandleKey<JECollection> m_jetElementKey{this, "JetElementLocation", TrigT1CaloDefs::JetElementLocation};
};
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py
index bef09fef615e..65f917611ba8 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py
@@ -50,6 +50,13 @@ def Lvl1SimulationSequence_Common( ConfigFlags ):
caloTowerMaker.ZeroSuppress = True
caloTowerMaker.CellType = 3
l1CaloSimSeq += caloTowerMaker
+
+ from SGComps.SGInputLoaderConfig import SGInputLoaderCfg
+ sgil_load=[('LArTTL1Container', 'StoreGateSvc+LArTTL1EM'),
+ ('LArTTL1Container', 'StoreGateSvc+LArTTL1HAD'),
+ ('TileTTL1Container', 'StoreGateSvc+TileTTL1Cnt')]
+ CAtoGlobalWrapper(SGInputLoaderCfg, ConfigFlags, Load=sgil_load)
+
from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__Run2CPMTowerMaker
l1CaloSimSeq += LVL1__Run2CPMTowerMaker( 'CPMTowerMaker')
from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__Run2JetElementMaker
--
GitLab
From 35d9ea2de9da0055214136f255b359ce59f219e1 Mon Sep 17 00:00:00 2001
From: Margherita Spalla <margherita.spalla@cern.ch>
Date: Tue, 17 Aug 2021 18:42:08 +0000
Subject: [PATCH 111/272] Remove one TEfficiency plot
---
.../python/CaloMonTransforms.py | 39 +++++++++++++++----
.../CaloMonitoring/python/LArCellMonAlg.py | 7 ----
.../data/postprocessing/CaloMonPostProc.yaml | 10 ++++-
3 files changed, 41 insertions(+), 15 deletions(-)
diff --git a/Calorimeter/CaloMonitoring/python/CaloMonTransforms.py b/Calorimeter/CaloMonitoring/python/CaloMonTransforms.py
index 4964b10fb017..4618db4eb475 100644
--- a/Calorimeter/CaloMonitoring/python/CaloMonTransforms.py
+++ b/Calorimeter/CaloMonitoring/python/CaloMonTransforms.py
@@ -21,16 +21,16 @@ def divideHistCaloMon(inputs,doPercentage=False):
cl = inputs[0][1][0].Clone()
cl.Divide(inputs[0][1][1])
- label=inputs[0][0]['thr']
+ label = inputs[0][0]['thr']
- hnorm=inputs[0][1][2].Clone()
- n0=hnorm.GetNbinsX()
- fbin=hnorm.GetXaxis().FindBin(label)
+ hnorm = inputs[0][1][2].Clone()
+ n0 = hnorm.GetNbinsX()
+ fbin = hnorm.GetXaxis().FindBin(label)
if fbin>=n0 or fbin<=0:
return [cl]
- thenorm=hnorm.GetBinContent(fbin)
+ thenorm = hnorm.GetBinContent(fbin)
cl.SetEntries(thenorm)
if not doPercentage or thenorm==0:
@@ -65,10 +65,10 @@ def divideByOccupancy(inputs,titleToReplace="",replaceTitWith=""):
if titleToReplace!="":
tit = cl.GetTitle()
- tit=tit.replace(titleToReplace,replaceTitWith)
+ tit = tit.replace(titleToReplace,replaceTitWith)
cl.SetTitle(tit)
- nCells=cl.GetNcells()
+ nCells = cl.GetNcells()
assert(nCells==inputs[0][1][1].GetNcells())
cppyy.gbl.binbybinDiv(nCells,cl,inputs[0][1][0],inputs[0][1][1])
@@ -84,3 +84,28 @@ def divideByOccupancy(inputs,titleToReplace="",replaceTitWith=""):
cl.SetEntries(inputs[0][1][0].GetEntries())
return [cl]
+
+
+def divideByAcceptedEvts(inputs):
+ """ This function divides the input histogram by the number of events that passed a given selection"""
+ assert len(inputs) == 1
+ assert len(inputs[0][1]) == 2
+
+ cl = inputs[0][1][0].Clone()
+
+ label = inputs[0][0]['thr']
+
+ hnorm = inputs[0][1][1].Clone()
+ n0 = hnorm.GetNbinsX()
+ fbin = hnorm.GetXaxis().FindBin(label)
+
+ if fbin>=n0 or fbin<=0: #threshold not found
+ return [cl]
+
+ thenorm = hnorm.GetBinContent(fbin)
+
+ if thenorm==0:
+ return [cl]
+ cl.Scale(100.0/thenorm)
+
+ return [cl]
diff --git a/Calorimeter/CaloMonitoring/python/LArCellMonAlg.py b/Calorimeter/CaloMonitoring/python/LArCellMonAlg.py
index 2f27547cf866..649da9913cdf 100644
--- a/Calorimeter/CaloMonitoring/python/LArCellMonAlg.py
+++ b/Calorimeter/CaloMonitoring/python/LArCellMonAlg.py
@@ -420,13 +420,6 @@ def LArCellMonConfigCore(helper, algclass, inputFlags, isCosmics=False, isMC=Fal
ybins = lArCellBinningScheme.phiRange[part],
pattern=[(part, _) for _ in LArCellMonAlg.DoEtaPhiTotalOccupancyNames])
- allMonArray.defineHistogram('passThrCut,celleta,cellphi;CellOccupancyFractionVsEtaPhi',
- title='Fraction of events in (#eta,#phi) for '+part+';cell #eta;cell #phi',
- type='TEfficiency', path="2d_Occupancy/",
- xbins = lArCellBinningScheme.etaRange[part],
- ybins = lArCellBinningScheme.phiRange[part],
- pattern=[(part, _) for _ in LArCellMonAlg.DoEtaPhiPercentageOccupancyNames])
-
allMonArray.defineHistogram('celleta;RAW_CellOccupancyVsEta', #needs weightedAverage/weightedEff
title='No. of events in (#eta) for '+part+';cell #eta;',
type='TH1F', path="1d_Occupancy/",
diff --git a/DataQuality/DataQualityUtils/data/postprocessing/CaloMonPostProc.yaml b/DataQuality/DataQualityUtils/data/postprocessing/CaloMonPostProc.yaml
index 5a1da950aabc..72a9615e74e0 100644
--- a/DataQuality/DataQualityUtils/data/postprocessing/CaloMonPostProc.yaml
+++ b/DataQuality/DataQualityUtils/data/postprocessing/CaloMonPostProc.yaml
@@ -68,4 +68,12 @@ Description: average_quality
Input: [ 'CaloMonitoring/LArCellMon_NoTrigSel/2d_PoorQualityFraction/RAW_fractionOverQthVsEtaPhi_(?P<lay>EMBP|EMB1|EMB2|EMB3|HEC0|HEC1|HEC2|HEC3|EMECP|EMEC1|EMEC2|EMEC3|FCAL1|FCAL2|FCAL3)(?P<side>A|C)_(?P<thr>noEth_CSCveto|medEth_CSCveto|noEth_rndm_CSCveto|5Sigma_CSCveto|hiEth_CSCveto|hiEth_noVeto|met_CSCveto)','CaloMonitoring/LArCellMon_NoTrigSel/2d_Occupancy/CellOccupancyVsEtaPhi_(?P<lay>EMBP|EMB1|EMB2|EMB3|HEC0|HEC1|HEC2|HEC3|EMECP|EMEC1|EMEC2|EMEC3|FCAL1|FCAL2|FCAL3)(?P<side>A|C)_(?P<thr>noEth_CSCveto|medEth_CSCveto|noEth_rndm_CSCveto|5Sigma_CSCveto|hiEth_CSCveto|hiEth_noVeto|met_CSCveto)' ]
Output: [ 'CaloMonitoring/LArCellMon_NoTrigSel/2d_PoorQualityFraction/fractionOverQthVsEtaPhi_{lay}{side}_{thr}' ]
Function: CaloMonitoring.CaloMonTransforms.divideByOccupancy
-Description: poorQuality_fraction
\ No newline at end of file
+Description: poorQuality_fraction
+
+
+#2D percentage occupancy (only the thresholds for which percentage occupancy is required
+---
+Input: [ 'CaloMonitoring/LArCellMon_NoTrigSel/2d_Occupancy/CellOccupancyVsEtaPhi_(?P<lay>EMBP|EMB1|EMB2|EMB3|HEC0|HEC1|HEC2|HEC3|EMECP|EMEC1|EMEC2|EMEC3|FCAL1|FCAL2|FCAL3)(?P<side>A|C)_(?P<thr>noEth_CSCveto|medEth_CSCveto)','CaloMonitoring/LArCellMon_NoTrigSel/Summary/nEvtsPerThreshold']
+Output: [ 'CaloMonitoring/LArCellMon_NoTrigSel/2d_Occupancy/PercentCellOccupancyVsEtaPhi_{lay}{side}_{thr}' ]
+Function: CaloMonitoring.CaloMonTransforms.divideByAcceptedEvts
+Description: 2D_percentage_occupancy
\ No newline at end of file
--
GitLab
From 323f330a232c2d9b912499cd4bd38952cf2a3c01 Mon Sep 17 00:00:00 2001
From: Alexander Leopold <alexander.leopold@cern.ch>
Date: Tue, 17 Aug 2021 18:48:04 +0000
Subject: [PATCH 112/272] Mirroring module position to comply with baseline
layout
---
.../HGTD_GeoModel/HGTD_DetectorFactory.h | 2 ++
.../HGTD_GeoModel/src/HGTD_DetectorFactory.cxx | 14 +++++++++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_GeoModel/HGTD_GeoModel/HGTD_DetectorFactory.h b/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_GeoModel/HGTD_GeoModel/HGTD_DetectorFactory.h
index 7059fe461dc2..ac9294f1c198 100644
--- a/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_GeoModel/HGTD_GeoModel/HGTD_DetectorFactory.h
+++ b/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_GeoModel/HGTD_GeoModel/HGTD_DetectorFactory.h
@@ -107,6 +107,8 @@ public:
// 2-ring layout
std::vector<ModulePosition> prepareModulePositionsInRowTwoRing(int row, bool back = false);
+ void mirrorPositionsAroundYaxis(std::array< PositionsInQuadrant, 4 >& arr);
+
HGTD_DetectorManager* m_detectorManager;
HGTD_GeoModelAthenaComps* m_athComps;
StoredMaterialManager* m_materialMgr;
diff --git a/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_GeoModel/src/HGTD_DetectorFactory.cxx b/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_GeoModel/src/HGTD_DetectorFactory.cxx
index cf5126d41241..6c9bf6af3275 100644
--- a/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_GeoModel/src/HGTD_DetectorFactory.cxx
+++ b/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_GeoModel/src/HGTD_DetectorFactory.cxx
@@ -615,6 +615,8 @@ GeoVPhysVol* HGTD_DetectorFactory::build( const GeoLogVol* logicalEnvelope, bool
std::array< PositionsInQuadrant, 4 > positions = prepareLayersFromQuadrants( maxRows ) ;
// inside m_geomVersion implicitly control 3-ring layout vs 2-ring
+ mirrorPositionsAroundYaxis(positions);
+
// for now create the SiCommonItems here
// These are items that are shared by all detector elements
std::unique_ptr<SiCommonItems> commonItems{std::make_unique<SiCommonItems>(m_athComps->getIdHelper())};
@@ -818,7 +820,6 @@ std::string HGTD_DetectorFactory::formModuleName( int layer, int quadrant, unsig
eta = mod + 1;
//module_string = "_R" + std::to_string(phi) + "_M" + std::to_string(eta); //This was the previous string, but doesn't match expectations of HGTDSensorSD
module_string = "_layer_" + std::to_string(layer) + "_" + std::to_string(phi) + "_" + std::to_string(eta);
- myx = -myx;
}
// two-ring layout
else {
@@ -1054,6 +1055,17 @@ int HGTD_DetectorFactory::reorderRows( PositionsInQuadrant* quadrant ) {
return xchng;
}
+void HGTD_DetectorFactory::mirrorPositionsAroundYaxis(std::array< PositionsInQuadrant, 4 >& arr) {
+ for (auto& layer : arr) {
+ for (auto& row : layer) {
+ for (auto& module : row) {
+ module.x = -module.x;
+ }
+ }
+ }
+}
+
+
InDetDD::HGTD_ModuleDesign* HGTD_DetectorFactory::createHgtdDesign( double thickness ) {
double phiPitch = 1.3; // mm
--
GitLab
From 82720b9692ed43e006ade77ab3f4bf12b6fa4e44 Mon Sep 17 00:00:00 2001
From: Matthew Thomas Anthony <matthew.thomas.anthony@cern.ch>
Date: Tue, 17 Aug 2021 18:50:19 +0000
Subject: [PATCH 113/272] add remap file to Run3 config to avoid overwriting
locked container
---
.../eflowRec/python/PFRun3Config.py | 6 +++
.../eflowRec/python/PFRun3Remaps.py | 44 +++++++++++++++++++
2 files changed, 50 insertions(+)
create mode 100644 Reconstruction/eflowRec/python/PFRun3Remaps.py
diff --git a/Reconstruction/eflowRec/python/PFRun3Config.py b/Reconstruction/eflowRec/python/PFRun3Config.py
index 4d216548dfab..5eb1cae42143 100644
--- a/Reconstruction/eflowRec/python/PFRun3Config.py
+++ b/Reconstruction/eflowRec/python/PFRun3Config.py
@@ -163,5 +163,11 @@ if __name__=="__main__":
from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
cfg.merge(PoolReadCfg(cfgFlags))
cfg.merge(PFCfg(cfgFlags))
+
+ from eflowRec.PFRun3Remaps import ListRemaps
+
+ list_remaps=ListRemaps()
+ for mapping in list_remaps:
+ cfg.merge(mapping)
cfg.run()
diff --git a/Reconstruction/eflowRec/python/PFRun3Remaps.py b/Reconstruction/eflowRec/python/PFRun3Remaps.py
new file mode 100644
index 000000000000..bb83be31755e
--- /dev/null
+++ b/Reconstruction/eflowRec/python/PFRun3Remaps.py
@@ -0,0 +1,44 @@
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+def ListRemaps():
+ #function to get all of the remapped names needed in PFRun3Config.py
+ from SGComps.AddressRemappingConfig import InputRenameCfg
+ list_remaps=[
+ InputRenameCfg ('xAOD::FlowElementContainer','JetETMissChargedFlowElements.FE_ElectronLinks','JetETMissChargedFlowElements.FE_ElectronLinks_renamed'),
+ InputRenameCfg ('xAOD::FlowElementContainer','JetETMissChargedFlowElements.FE_PhotonLinks','JetETMissChargedFlowElements.FE_PhotonLinks_renamed'),
+ InputRenameCfg ('xAOD::FlowElementContainer','JetETMissNeutralFlowElements.FE_ElectronLinks','JetETMissNeutralFlowElements.FE_ElectronLinks_renamed'),
+ InputRenameCfg ('xAOD::FlowElementContainer','JetETMissNeutralFlowElements.FE_PhotonLinks','JetETMissNeutralFlowElements.FE_PhotonLinks_renamed'),
+ InputRenameCfg ('xAOD::PFOContainer','JetETMissChargedParticleFlowObjects.pfo_ElectronLinks','JetETMissChargedParticleFlowObjects.pfo_ElectronLinks_renamed'),
+ InputRenameCfg ('xAOD::PFOContainer','JetETMissChargedParticleFlowObjects.pfo_PhotonLinks','JetETMissChargedParticleFlowObjects.pfo_PhotonLinks_renamed'),
+ InputRenameCfg ('xAOD::PFOContainer','JetETMissNeutralParticleFlowObjects.pfo_ElectronLinks','JetETMissNeutralParticleFlowObjects.pfo_ElectronLinks_renamed'),
+ InputRenameCfg ('xAOD::PFOContainer','JetETMissNeutralParticleFlowObjects.pfo_PhotonLinks','JetETMissNeutralParticleFlowObjects.pfo_PhotonLinks_renamed'),
+ InputRenameCfg ('xAOD::ElectronContainer','Electrons.chargedFELinks','Electrons.chargedFELinks_renamed'),
+ InputRenameCfg ('xAOD::ElectronContainer','Electrons.neutralFELinks','Electrons.neutralFELinks_renamed'),
+ InputRenameCfg ('xAOD::PhotonContainer','Photons.chargedFELinks','Photons.chargedFELinks_renamed'),
+ InputRenameCfg ('xAOD::PhotonContainer','Photons.neutralFELinks','Photons.neutralFELinks_renamed'),
+ InputRenameCfg ('xAOD::ElectronContainer','Electrons.neutralpfoLinks','Electrons.neutralpfoLinks_renamed'),
+ InputRenameCfg ('xAOD::ElectronContainer','Electrons.chargedpfoLinks','Electrons.chargedpfoLinks_renamed'),
+ InputRenameCfg ('xAOD::PhotonContainer','Photons.neutralpfoLinks','Photons.neutralpfoLinks_renamed'),
+ InputRenameCfg ('xAOD::PhotonContainer','Photons.chargedpfoLinks','Photons.chargedpfoLinks_renamed'),
+ #Remap the Muon decorations for FE
+ InputRenameCfg ('xAOD::MuonContainer','Muons.chargedFELinks','Muons.chargedFELinks_renamed'),
+ InputRenameCfg ('xAOD::MuonContainer','Muons.neutralFELinks','Muons.neutralFELinks_renamed'),
+ InputRenameCfg ('xAOD::MuonContainer','Muons.muon_efrac_matched_FE','Muons.muon_efrac_matched_FE_renamed'),
+ InputRenameCfg ('xAOD::MuonContainer','Muons.ClusterInfo_deltaR','Muons.ClusterInfo_deltaR_renamed'),
+ InputRenameCfg ('xAOD::FlowElementContainer','JetETMissChargedFlowElements.FE_MuonLinks','JetETMissChargedFlowElements.FE_MuonLinks_renamed'),
+ InputRenameCfg ('xAOD::FlowElementContainer','JetETMissNeutralFlowElements.FE_MuonLinks','JetETMissNeutralFlowElements.FE_MuonLinks_renamed'),
+ InputRenameCfg ('xAOD::FlowElementContainer','JetETMissNeutralFlowElements.FE_efrac_matched_muon_MuonLinks','JetETMissNeutralFlowElements.FE_efrac_matched_muon_renamed'),
+ InputRenameCfg ('xAOD::FlowElementContainer','JetETMissNeutralFlowElements.FE_nMatchedMuons','JetETMissNeutralFlowElements.FE_nMatchedMuons_renamed'),
+ #Remap the Tau decorations for FE
+ InputRenameCfg ('xAOD::TauJetContainer','TauJets.neutralFELinks','TauJets.neutralFELinks_renamed'),
+ InputRenameCfg ('xAOD::TauJetContainer','TauJets.chargedFELinks','TauJets.chargedFELinks_renamed'),
+ InputRenameCfg ('xAOD::FlowElementContainer','JetETMissChargedFlowElements.FE_TauLinks','JetETMissChargedFlowElements.FE_TauLinks_renamed'),
+ InputRenameCfg ('xAOD::FlowElementContainer','JetETMissNeutralFlowElements.FE_TauLinks','JetETMissNeutralFlowElements.FE_TauLinks_renamed'),
+ #Remap the origin corrected topoclusters
+ InputRenameCfg ('xAOD::CaloClusterContainer','LCOriginTopoClusters','LCOriginTopoClusters_renamed'),
+ InputRenameCfg ('xAOD::CaloClusterContainer','EMOriginTopoClusters','EMOriginTopoClusters_renamed'),
+ #Remap the muon cluster links to topoclusters
+ InputRenameCfg ('xAOD::CaloClusterContainer','MuonClusterCollection.constituentClusterLinks','MuonClusterCollection.constituentClusterLinks_renamed')
+ ]
+
+ return list_remaps
--
GitLab
From a5cf792d7fb54cc0491bd8618d08c5f4c7c3faee Mon Sep 17 00:00:00 2001
From: Antonio De Maria <antonio.de.maria@cern.ch>
Date: Tue, 17 Aug 2021 18:52:44 +0000
Subject: [PATCH 114/272] fixing 2D histograms in Run3 TauTrigger monitoring
---
.../python/TrigTauMonitoringConfigMT.py | 63 ++++++-------------
1 file changed, 20 insertions(+), 43 deletions(-)
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfigMT.py b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfigMT.py
index f55893984c85..500f7d53694a 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfigMT.py
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfigMT.py
@@ -164,17 +164,12 @@ class TrigTauMonAlgBuilder:
# tau0
'HLT_tau0_ptonly_L1TAU8',
'HLT_tau0_ptonly_L1TAU60',
- 'HLT_tau0_ptonly_L1TAU100',
# tau25
'HLT_tau25_ptonly_L1TAU12IM',
- 'HLT_tau25_idperf_track_L1TAU12IM',
'HLT_tau25_idperf_tracktwo_L1TAU12IM',
- 'HLT_tau25_idperf_tracktwoEF_L1TAU12IM',
'HLT_tau25_idperf_tracktwoMVA_L1TAU12IM',
'HLT_tau25_idperf_tracktwoMVABDT_L1TAU12IM',
- 'HLT_tau25_perf_track_L1TAU12IM',
'HLT_tau25_perf_tracktwo_L1TAU12IM',
- 'HLT_tau25_perf_tracktwoEF_L1TAU12IM',
'HLT_tau25_perf_tracktwoMVA_L1TAU12IM',
'HLT_tau25_perf_tracktwoMVABDT_L1TAU12IM',
'HLT_tau25_looseRNN_tracktwoMVA_L1TAU12IM',
@@ -183,46 +178,34 @@ class TrigTauMonAlgBuilder:
'HLT_tau25_mediumRNN_tracktwoMVABDT_L1TAU12IM',
'HLT_tau25_tightRNN_tracktwoMVA_L1TAU12IM',
'HLT_tau25_tightRNN_tracktwoMVABDT_L1TAU12IM',
- 'HLT_tau25_medium1_track_L1TAU12IM',
'HLT_tau25_medium1_tracktwo_L1TAU12IM',
- 'HLT_tau25_medium1_tracktwoEF_L1TAU12IM',
# tau35
- 'HLT_tau35_ptonly_L1TAU12IM',
- 'HLT_tau35_idperf_track_L1TAU12IM',
- 'HLT_tau35_idperf_tracktwo_L1TAU12IM',
- 'HLT_tau35_idperf_tracktwoEF_L1TAU12IM',
- 'HLT_tau35_idperf_tracktwoMVA_L1TAU12IM',
- 'HLT_tau35_idperf_tracktwoMVABDT_L1TAU12IM',
- 'HLT_tau35_perf_track_L1TAU12IM',
- 'HLT_tau35_perf_tracktwo_L1TAU12IM',
- 'HLT_tau35_perf_tracktwoEF_L1TAU12IM',
- 'HLT_tau35_perf_tracktwoMVA_L1TAU12IM',
- 'HLT_tau35_perf_tracktwoMVABDT_L1TAU12IM',
- 'HLT_tau35_looseRNN_tracktwoMVA_L1TAU12IM',
- 'HLT_tau35_looseRNN_tracktwoMVABDT_L1TAU12IM',
- 'HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM',
- 'HLT_tau35_mediumRNN_tracktwoMVABDT_L1TAU12IM',
- 'HLT_tau35_tightRNN_tracktwoMVA_L1TAU12IM',
- 'HLT_tau35_tightRNN_tracktwoMVABDT_L1TAU12IM',
+ 'HLT_tau35_ptonly_L1TAU20IM',
+ 'HLT_tau35_idperf_tracktwo_L1TAU20IM',
+ 'HLT_tau35_idperf_tracktwoMVA_L1TAU20IM',
+ 'HLT_tau35_idperf_tracktwoMVABDT_L1TAU20IM',
+ 'HLT_tau35_perf_tracktwo_L1TAU20IM',
+ 'HLT_tau35_perf_tracktwoMVA_L1TAU20IM',
+ 'HLT_tau35_perf_tracktwoMVABDT_L1TAU20IM',
+ 'HLT_tau35_looseRNN_tracktwoMVA_L1TAU20IM',
+ 'HLT_tau35_looseRNN_tracktwoMVABDT_L1TAU20IM',
+ 'HLT_tau35_mediumRNN_tracktwoMVA_L1TAU20IM',
+ 'HLT_tau35_mediumRNN_tracktwoMVABDT_L1TAU20IM',
+ 'HLT_tau35_tightRNN_tracktwoMVA_L1TAU20IM',
+ 'HLT_tau35_tightRNN_tracktwoMVABDT_L1TAU20IM',
# tau80
'HLT_tau80_medium1_tracktwo_L1TAU60',
# tau160
'HLT_tau160_ptonly_L1TAU100',
- 'HLT_tau160_idperf_track_L1TAU100',
'HLT_tau160_idperf_tracktwo_L1TAU100',
- 'HLT_tau160_idperf_tracktwoEF_L1TAU100',
'HLT_tau160_idperf_tracktwoMVA_L1TAU100',
'HLT_tau160_idperf_tracktwoMVABDT_L1TAU100',
- 'HLT_tau160_perf_track_L1TAU100',
'HLT_tau160_perf_tracktwo_L1TAU100',
- 'HLT_tau160_perf_tracktwoEF_L1TAU100',
'HLT_tau160_perf_tracktwoMVA_L1TAU100',
'HLT_tau160_perf_tracktwoMVABDT_L1TAU100',
'HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100',
'HLT_tau160_mediumRNN_tracktwoMVABDT_L1TAU100',
- 'HLT_tau160_medium1_track_L1TAU100',
'HLT_tau160_medium1_tracktwo_L1TAU100',
- 'HLT_tau160_medium1_tracktwoEF_L1TAU100',
# tau180
'HLT_tau180_mediumRNN_tracktwoLLP_L1TAU100',
'HLT_tau180_tightRNN_tracktwoLLP_L1TAU100',
@@ -230,14 +213,12 @@ class TrigTauMonAlgBuilder:
'HLT_tau200_ptonly_L1TAU100',
'HLT_tau200_mediumRNN_tracktwoMVA_L1TAU100',
'HLT_tau200_mediumRNN_tracktwoMVABDT_L1TAU100',
- 'HLT_tau200_medium1_track_L1TAU100',
'HLT_tau200_medium1_tracktwo_L1TAU100',
- 'HLT_tau200_medium1_tracktwoEF_L1TAU100',
'HLT_tau200_mediumRNN_tracktwoLLP_L1TAU100',
'HLT_tau200_tightRNN_tracktwoLLP_L1TAU100',
# ditau
- 'HLT_tau80_mediumRNN_tracktwoMVA_tau60_mediumRNN_tracktwoMVA_L1TAU60_2TAU40',
- 'HLT_tau80_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_L1TAU60_DR-TAU20ITAU12I',
+ 'HLT_tau80_mediumRNN_tracktwoMVA_tau60_mediumRNN_tracktwoMVA_03dRAB_L1TAU60_2TAU40',
+ 'HLT_tau80_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB30_L1TAU60_DR-TAU20ITAU12I',
'HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_L1DR-TAU20ITAU12I-J25',
'HLT_tau80_mediumRNN_tracktwoLLP_tau60_mediumRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40',
'HLT_tau80_mediumRNN_tracktwoLLP_tau60_tightRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40',
@@ -475,16 +456,12 @@ class TrigTauMonAlgBuilder:
monGroup.defineHistogram('hEFPhi', title='EF TrigCaloCluster Phi; #phi ; Nevents',xbins=16,xmin=-3.2,xmax=3.2)
monGroup.defineHistogram('hEFnTrack', title='EF number of tracks;number of tracks;Nevents',xbins=10,xmin=0,xmax=10)
- monGroup.defineHistogram('hEFEta,hEFPhi', type='TH2F', title='EF TrigCaloCluster Eta vs Phi; #eta ; #phi',
- path=monGroupPath,
+ monGroup.defineHistogram('hEFEta,hEFPhi', type='TH2F', title='Eta vs Phi; #eta ; #phi',
xbins=26,xmin=-2.6,xmax=2.6,ybins=16,ymin=-3.2,ymax=3.2)
- monGroup.defineHistogram('hEFEt,hEFPhi', type='TH2F', title='Et from tau Jet vs #phi; #phi^{EF}; Raw E_{T} [GeV]',
- path=monGroupPath,
- xbins=16,xmin=-3.2,xmax=3.2,ybins=50,ymin=0,ymax=100)
-
- monGroup.defineHistogram('hEFEta,hEFEt', type='TH2F', title='Et from tau Jet vs #eta; #eta^{EF}; Raw E_{T}[GeV]',
- path=monGroupPath,
- xbins=26,xmin=-2.6,xmax=2.6,ybins=50,ymin=0,ymax=100)
+ monGroup.defineHistogram('hEFEt,hEFPhi', type='TH2F', title='Et vs Phi; E_{T} [GeV]; #phi',
+ xbins=50,xmin=etmin,xmax=etmax,ybins=16,ymin=-3.2,ymax=3.2)
+ monGroup.defineHistogram('hEFEt,hEFEta', type='TH2F', title='Et vs Eta; E_{T} [GeV]; #eta',
+ xbins=50,xmin=etmin,xmax=etmax,ybins=26,ymin=-2.6,ymax=2.6)
monGroup.defineHistogram('hEFEtRaw', title='EF Et Raw;Uncalibrated E_{T}[GeV];Nevents',xbins=50,xmin=0,xmax=100)
monGroup.defineHistogram('hEFnWideTrack', title='EF number of wide tracks;number of tracks;Nevents',xbins=10,xmin=0,xmax=10)
--
GitLab
From 3712849b4298b590fc29c39a04ab60f5da9ba109 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Mon, 16 Aug 2021 21:32:48 +0200
Subject: [PATCH 115/272] TriggerJobOpts: Increase test timeout.
Test has been timing out in dbg builds.
---
Trigger/TriggerCommon/TriggerJobOpts/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/CMakeLists.txt b/Trigger/TriggerCommon/TriggerJobOpts/CMakeLists.txt
index 85f065d9d447..b10b9bbf25c5 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/CMakeLists.txt
+++ b/Trigger/TriggerCommon/TriggerJobOpts/CMakeLists.txt
@@ -22,7 +22,7 @@ atlas_add_test( TriggerConfigFlags_AutoConfTest
atlas_add_test( NewJOL1SimSetup
SCRIPT python -m TriggerJobOpts.Lvl1SimulationConfig
- PROPERTIES TIMEOUT 300
+ PROPERTIES TIMEOUT 600
POST_EXEC_SCRIPT nopost.sh )
atlas_add_test( NewJOL1MuonSimSetup
--
GitLab
From 42dae5e20def3543e858eb9ff19731117c5b609a Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Mon, 16 Aug 2021 22:21:42 +0200
Subject: [PATCH 116/272] ISF_FastCaloSimServices: Increase test timeout.
Test has been timing out in dbg builds.
---
.../ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt
index 2f7914781d80..1e362ec120fd 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt
@@ -21,4 +21,4 @@ atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_add_test( ISF_FastCaloSimServices_Config_test
SCRIPT test/FastCaloSimServicesTest.py -n 3
- PROPERTIES TIMEOUT 1500)
+ PROPERTIES TIMEOUT 2000)
--
GitLab
From 5a6ebcf0822c7365301d71cdac66726113b15feb Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Sat, 7 Aug 2021 00:13:15 -0400
Subject: [PATCH 117/272] TrigEgammaEmulationTool: Fix clang12 warning.
Spurious copy in range-for.
---
.../TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.cxx b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.cxx
index a027c900332b..0dc78ac30c79 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.cxx
@@ -81,7 +81,7 @@ StatusCode TrigEgammaEmulationToolTest::fillHistograms( const EventContext &ctx
{
auto info = getInfo(trigger);
ATH_MSG_DEBUG(trigger);
- for (const auto &el : *offElectrons)
+ for (const auto el : *offElectrons)
{
--
GitLab
From 15f33545812dabba777244bb1fc67d4f1c9bb1ab Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Fri, 6 Aug 2021 23:34:24 -0400
Subject: [PATCH 118/272] TrigHLTJetHypoUnitTests: Fix compilation warnings.
Signed/unsigned comparison.
---
.../tests/ConditionFilterTest.cxx | 6 +++---
.../tests/MultiFilterTest.cxx | 2 +-
.../tests/PassThroughFilterTest.cxx | 4 ++--
.../tests/RangeFilterTest.cxx | 12 ++++++------
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/tests/ConditionFilterTest.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/tests/ConditionFilterTest.cxx
index 8dd3cad83bce..3e16e62ea8f5 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/tests/ConditionFilterTest.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/tests/ConditionFilterTest.cxx
@@ -59,7 +59,7 @@ TEST(ConditionFilterTester, zerojets_zeroconditions) {
std::unique_ptr<ITrigJetHypoInfoCollector> deb(nullptr);
auto fj = rf.filter(tv, deb);
- EXPECT_EQ(fj.size(), 0);
+ EXPECT_EQ(fj.size(), 0u);
}
@@ -73,7 +73,7 @@ TEST(ConditionFilterTester, zerojets_onecondition) {
std::unique_ptr<ITrigJetHypoInfoCollector> deb(nullptr);
auto fj = filter.filter(tv, deb);
- EXPECT_EQ(fj.size(), 0);
+ EXPECT_EQ(fj.size(), 0u);
}
TEST(ConditionFilterTester, twojets_zeroconditions) {
@@ -119,7 +119,7 @@ TEST(ConditionFilterTester, twojets_onecondition) {
HypoJetVector tv = makeHypoJets(jet_eta);
auto fj = filter.filter(tv, deb);
- EXPECT_EQ(fj.size(), 2);
+ EXPECT_EQ(fj.size(), 2u);
auto etas = std::vector<double> {};
etas.reserve(fj.size());
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/tests/MultiFilterTest.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/tests/MultiFilterTest.cxx
index 8277e0f521fc..93ed54087d2d 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/tests/MultiFilterTest.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/tests/MultiFilterTest.cxx
@@ -48,7 +48,7 @@ TEST(MultiFilterTester, fourjets_twofilters) {
fj = fp->filter(tv, deb);
}
- EXPECT_EQ(fj.size(), 2);
+ EXPECT_EQ(fj.size(), 2u);
auto etas = std::vector<double> {};
etas.reserve(fj.size());
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/tests/PassThroughFilterTest.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/tests/PassThroughFilterTest.cxx
index a71877a030ef..1ab77098e6e7 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/tests/PassThroughFilterTest.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/tests/PassThroughFilterTest.cxx
@@ -26,7 +26,7 @@ TEST(PassThroughFilterTester, zerojets) {
std::unique_ptr<ITrigJetHypoInfoCollector> deb(nullptr);
auto fj = rf.filter(tv, deb);
- EXPECT_EQ(fj.size(), 0);
+ EXPECT_EQ(fj.size(), 0u);
}
TEST(PassThroughFilterTester, twojets) {
@@ -38,7 +38,7 @@ TEST(PassThroughFilterTester, twojets) {
HypoJetVector tv = makeHypoJets(eta);
auto fj = rf.filter(tv, deb);
- EXPECT_EQ(fj.size(), 2);
+ EXPECT_EQ(fj.size(), 2u);
EXPECT_EQ(fj.front()->eta(), tv.front()->eta());
EXPECT_EQ(fj.back()->eta(), tv.back()->eta());
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/tests/RangeFilterTest.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/tests/RangeFilterTest.cxx
index a60cca4662a7..5ed415512bae 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/tests/RangeFilterTest.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/tests/RangeFilterTest.cxx
@@ -35,22 +35,22 @@ TEST(RangeFilterTester, insufficient0) {
std::unique_ptr<ITrigJetHypoInfoCollector> deb(nullptr);
auto fj = rf.filter(tv, deb);
- EXPECT_EQ(fj.size(), 0);
+ EXPECT_EQ(fj.size(), 0u);
tv.push_back(make_jet(0, 2.));
fj = rf.filter(tv, deb);
- EXPECT_EQ(fj.size(), 0);
+ EXPECT_EQ(fj.size(), 0u);
tv.push_back(make_jet(0, 1.));
fj = rf.filter(tv, deb);
- EXPECT_EQ(fj.size(), 0);
+ EXPECT_EQ(fj.size(), 0u);
tv.push_back(make_jet(0, 3.));
fj = rf.filter(tv, deb);
- EXPECT_EQ(fj.size(), 3);
+ EXPECT_EQ(fj.size(), 3u);
EXPECT_GT(fj[0]->pt(), fj[1]->pt());
EXPECT_GT(fj[1]->pt(), fj[2]->pt());
@@ -65,7 +65,7 @@ TEST(RangeFilterTester, insufficient1) {
std::unique_ptr<ITrigJetHypoInfoCollector> deb(nullptr);
auto fj = rf.filter(tv, deb);
- EXPECT_EQ(fj.size(), 0);
+ EXPECT_EQ(fj.size(), 0u);
}
@@ -79,6 +79,6 @@ TEST(RangeFilterTester, run2TLA) {
std::unique_ptr<ITrigJetHypoInfoCollector> deb(nullptr);
auto fj = rf.filter(tv, deb);
- EXPECT_EQ(fj.size(), 2);
+ EXPECT_EQ(fj.size(), 2u);
}
--
GitLab
From eedb1e847ebf796938eb2298da6b9b42df5c8a3f Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Tue, 17 Aug 2021 23:34:48 +0200
Subject: [PATCH 119/272] Factor in common code
---
.../src/egammaSuperClusterBuilder.cxx | 28 +++-------------
.../src/egammaSuperClusterBuilderBase.cxx | 20 ++++++++++++
.../src/egammaSuperClusterBuilderBase.h | 7 +++-
.../src/electronSuperClusterBuilder.cxx | 32 +++----------------
.../src/photonSuperClusterBuilder.cxx | 29 +++--------------
5 files changed, 41 insertions(+), 75 deletions(-)
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilder.cxx b/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilder.cxx
index 321effb86890..51f5e7069091 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilder.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilder.cxx
@@ -67,35 +67,17 @@ egammaSuperClusterBuilder::execute(const EventContext& ctx) const
std::vector<bool> isUsedRevert(egammaRecs->size(), false);
// Loop over input egammaRec objects, build superclusters.
for (std::size_t i = 0; i < egammaRecs->size(); ++i) {
- if (isUsed[i])
+ if (isUsed[i]){
continue;
+ }
const auto* const egRec = (*egammaRecs)[i];
-
- // Seed selections
- const auto* const clus = egRec->caloCluster();
-
- // The seed should have 2nd sampling
- if (!clus->hasSampling(CaloSampling::EMB2) &&
- !clus->hasSampling(CaloSampling::EME2)) {
- continue;
- }
- const double eta2 = std::abs(clus->etaBE(2));
- if (eta2 > 10) {
- continue;
- }
- // Accordeon Energy samplings 1 to 3
- const double EMAccEnergy =
- clus->energyBE(1) + clus->energyBE(2) + clus->energyBE(3);
- const double EMAccEt = EMAccEnergy / cosh(eta2);
- // Require minimum energy for supercluster seeding.
- if (EMAccEt < m_EtThresholdCut) {
+ // check for good seed cluster
+ const xAOD::CaloCluster* clus = egRec->caloCluster();
+ if (!seedClusterSelection(clus)) {
continue;
}
// Passed preliminary custs
- ATH_MSG_DEBUG("Creating supercluster egammaRec egamma object "
- << 'n' << "Using cluster Et = " << clus->et()
- << " EM Accordeon Et " << EMAccEt);
// Mark seed as used
isUsedRevert = isUsed; // save status in case we fail to create supercluster
isUsed[i] = true;
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilderBase.cxx b/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilderBase.cxx
index 87803dff1219..61837fe02760 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilderBase.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilderBase.cxx
@@ -375,6 +375,26 @@ egammaSuperClusterBuilderBase::createNewCluster(
// return the new cluster
return newCluster;
}
+bool
+egammaSuperClusterBuilderBase::seedClusterSelection(
+ const xAOD::CaloCluster* clus) const
+{
+ // The seed should have 2nd sampling
+ if (!clus->hasSampling(CaloSampling::EMB2) &&
+ !clus->hasSampling(CaloSampling::EME2)) {
+ return false;
+ }
+ const double eta2 = std::abs(clus->etaBE(2));
+ if (eta2 > 10) {
+ return false;
+ }
+ // Accordeon Energy samplings 1 to 3
+ const double EMAccEnergy =
+ clus->energyBE(1) + clus->energyBE(2) + clus->energyBE(3);
+ const double EMAccEt = EMAccEnergy / cosh(eta2);
+ // Require minimum energy for supercluster seeding.
+ return EMAccEt >= m_EtThresholdCut;
+}
StatusCode
egammaSuperClusterBuilderBase::fillClusterConstrained(
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilderBase.h b/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilderBase.h
index 934575f5d6dc..d8a41c85ed87 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilderBase.h
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilderBase.h
@@ -26,7 +26,7 @@
#include <vector>
class CaloDetDescrManager;
-/** Base class for electronSuperClusterBuilder
+/** Base class for electronSuperClusterBuilder
* photonSuperClusterBuilder
* egammaSuperClusterBuilder
* This class cannot be instantiated by itself since the execute method is not
@@ -124,6 +124,11 @@ protected:
const CaloDetDescrManager& mgr,
xAOD::EgammaParameters::EgammaType egType) const;
+ /** check if we pass the basic criteria for
+ * a seed cluster
+ */
+ bool seedClusterSelection(const xAOD::CaloCluster* clus) const;
+
// some constants to use
static constexpr float s_cellEtaSize = 0.025;
static constexpr float s_cellPhiSize = M_PI / 128.;
diff --git a/Reconstruction/egamma/egammaAlgs/src/electronSuperClusterBuilder.cxx b/Reconstruction/egamma/egammaAlgs/src/electronSuperClusterBuilder.cxx
index 9d457509cdd5..b34866e8d3ea 100644
--- a/Reconstruction/egamma/egammaAlgs/src/electronSuperClusterBuilder.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/electronSuperClusterBuilder.cxx
@@ -86,35 +86,20 @@ electronSuperClusterBuilder::execute(const EventContext& ctx) const
std::vector<bool> isUsedRevert(egammaRecs->size(), false);
// Loop over input egammaRec objects, build superclusters.
for (std::size_t i = 0; i < egammaRecs->size(); ++i) {
- if (isUsed[i])
+
+ if (isUsed[i]){
continue;
-
+ }
const auto* egRec = (*egammaRecs)[i];
-
- // Seed selections
+ // check for good seed cluster
const xAOD::CaloCluster* clus = egRec->caloCluster();
- // The seed should have 2nd sampling
- if (!clus->hasSampling(CaloSampling::EMB2) &&
- !clus->hasSampling(CaloSampling::EME2)) {
- continue;
- }
- const double eta2 = std::abs(clus->etaBE(2));
- if (eta2 > 10) {
- continue;
- }
- // Accordeon Energy samplings 1 to 3
- const double EMAccEnergy =
- clus->energyBE(1) + clus->energyBE(2) + clus->energyBE(3);
- const double EMAccEt = EMAccEnergy / cosh(eta2);
- // Require minimum energy for supercluster seeding.
- if (EMAccEt < m_EtThresholdCut) {
+ if (!seedClusterSelection(clus)) {
continue;
}
// We need tracks
if (egRec->getNumberOfTrackParticles() == 0) {
continue;
}
-
// with possible pixel
uint8_t nPixelHits(0);
uint8_t uint8_value(0);
@@ -129,7 +114,6 @@ electronSuperClusterBuilder::execute(const EventContext& ctx) const
if (nPixelHits < m_numberOfPixelHits) {
continue;
}
-
// and with silicon (add SCT to pixel)
uint8_t nSiHits = nPixelHits;
if (egRec->trackParticle(0)->summaryValue(uint8_value,
@@ -139,12 +123,6 @@ electronSuperClusterBuilder::execute(const EventContext& ctx) const
if (nSiHits < m_numberOfSiHits) {
continue;
}
- ATH_MSG_DEBUG(
- "Creating supercluster egammaRec electron using cluster Et = "
- << egRec->caloCluster()->et() << " eta " << egRec->caloCluster()->eta()
- << " phi " << egRec->caloCluster()->phi() << " EM Accordeon Et "
- << EMAccEt << " pixel hits " << static_cast<unsigned int>(nPixelHits)
- << " silicon hits " << static_cast<unsigned int>(nSiHits));
// Mark seed as used
isUsedRevert = isUsed; // save status in case we fail to create supercluster
isUsed[i] = true;
diff --git a/Reconstruction/egamma/egammaAlgs/src/photonSuperClusterBuilder.cxx b/Reconstruction/egamma/egammaAlgs/src/photonSuperClusterBuilder.cxx
index 4fa283b161eb..fa8dc64620ad 100644
--- a/Reconstruction/egamma/egammaAlgs/src/photonSuperClusterBuilder.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/photonSuperClusterBuilder.cxx
@@ -77,35 +77,17 @@ photonSuperClusterBuilder::execute(const EventContext& ctx) const
std::vector<bool> isUsedRevert(egammaRecs->size(), false);
// Loop over input egammaRec objects, build superclusters.
for (std::size_t i = 0; i < egammaRecs->size(); ++i) {
- if (isUsed[i])
+ if (isUsed[i]){
continue;
+ }
const auto* const egRec = (*egammaRecs)[i];
-
- // Seed selections
- const auto* const clus = egRec->caloCluster();
-
- // The seed should have 2nd sampling
- if (!clus->hasSampling(CaloSampling::EMB2) &&
- !clus->hasSampling(CaloSampling::EME2)) {
- continue;
- }
- const double eta2 = std::abs(clus->etaBE(2));
- if (eta2 > 10) {
- continue;
- }
- // Accordeon Energy samplings 1 to 3
- const double EMAccEnergy =
- clus->energyBE(1) + clus->energyBE(2) + clus->energyBE(3);
- const double EMAccEt = EMAccEnergy / cosh(eta2);
- // Require minimum energy for supercluster seeding.
- if (EMAccEt < m_EtThresholdCut) {
+ // Seed cluster selections
+ const xAOD::CaloCluster* clus = egRec->caloCluster();
+ if (!seedClusterSelection(clus)) {
continue;
}
// Passed preliminary custs
- ATH_MSG_DEBUG("Creating supercluster egammaRec photon object "
- << 'n' << "Using cluster Et = " << clus->et()
- << " EM Accordeon Et " << EMAccEt);
// Mark seed as used
isUsedRevert = isUsed; // save status in case we fail to create supercluster
isUsed[i] = true;
@@ -120,7 +102,6 @@ photonSuperClusterBuilder::execute(const EventContext& ctx) const
for (const auto secClusIndex : secondaryIndices) {
const auto* const secRec = (*egammaRecs)[secClusIndex];
accumulatedClusters.push_back(secRec->caloCluster());
- // no need to add vertices
}
// Create the new cluster: take the full list of cluster and add their cells
--
GitLab
From bb9ef5e3acacdc7cb9a7ce46deca4f7f0e073c69 Mon Sep 17 00:00:00 2001
From: Emil Haines <emil.harry.haines@cern.ch>
Date: Tue, 17 Aug 2021 22:40:02 +0000
Subject: [PATCH 120/272] Add track information to evaluation of vertex finding
performance
---
.../TrigInDetAnalysis/TIDAVertex.h | 3 +
.../TrigInDetAnalysis/TIDAVertexNew.h | 62 ++++++
.../TrigInDetAnalysis/src/TIDAVertexNew.cxx | 75 +++++++
.../src/AnalysisConfigMT_Ntuple.cxx | 77 +++++--
.../Analysis/src/ConfVtxAnalysis.cxx | 200 ++++++++++--------
.../Analysis/src/ConfVtxAnalysis.h | 17 +-
.../Analysis/src/rmain.cxx | 169 ++++++++++-----
.../TrigTrackSelector.h | 2 +
.../TrigInDetAnalysisUtils/VertexMatcher.h | 1 -
.../TrigInDetAnalysisUtils/VertexNewMatcher.h | 57 +++++
.../src/TrigTrackSelector.cxx | 6 +
11 files changed, 507 insertions(+), 162 deletions(-)
create mode 100644 Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAVertexNew.h
create mode 100644 Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDAVertexNew.cxx
create mode 100644 Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/VertexNewMatcher.h
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAVertex.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAVertex.h
index 0f6fa91b97d0..1e7735d78283 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAVertex.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAVertex.h
@@ -69,6 +69,9 @@ public:
double chi2() const { return m_chi2; }
int ndof() const { return m_ndof; }
+protected:
+
+ void setNtracks( int nTracks ) { m_Ntracks = nTracks; }
private:
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAVertexNew.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAVertexNew.h
new file mode 100644
index 000000000000..ac40d680dc61
--- /dev/null
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAVertexNew.h
@@ -0,0 +1,62 @@
+/* emacs: this is -*- c++ -*- */
+/**
+ ** @file TIDAVertexNew.h
+ **
+ ** @author emil haines
+ ** @date Wed 28 Jul 2021
+ **
+** Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ **/
+
+
+#ifndef TIDAVERTEXNEW_H
+#define TIDAVERTEXNEW_H
+
+#include <iostream>
+#include <vector>
+
+#include "TrigInDetAnalysis/TIDAVertex.h"
+#include "TrigInDetAnalysis/TrackTrigObject.h"
+#include "TrigInDetAnalysis/Track.h"
+
+namespace TIDA {
+
+ class VertexNew : public TIDA::Vertex {
+
+ public:
+
+ VertexNew( const TIDA::Vertex& v ) : Vertex(v) {}
+
+ VertexNew( const TIDA::Vertex& v,
+ const TrackTrigObject& tobject,
+ const std::vector<TIDA::Track*>* refTracks=0 );
+
+ // copy constructor
+ VertexNew( const TIDA::VertexNew& v,
+ const std::vector<TIDA::Track*>* refTracks=0,
+ const TrackTrigObject* tobject = 0 );
+
+ virtual ~VertexNew() {}
+
+ void selectTracks( const std::vector<TIDA::Track*>* refTracks,
+ const TrackTrigObject* tobject = 0 );
+
+ const std::vector<TIDA::Track*>& tracks() const { return m_tracks; }
+
+ const std::vector<unsigned long>& ids() const { return m_ids; }
+
+ private:
+
+ void selectTracksInternal( const std::vector<TIDA::Track*>* refTracks );
+
+ void addTrack(TIDA::Track* trk) { m_tracks.push_back(trk); }
+
+ std::vector<TIDA::Track*> m_tracks;
+
+ std::vector<unsigned long> m_ids;
+
+ };
+
+}
+
+#endif // TIDAVERTEXNEW.H
\ No newline at end of file
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDAVertexNew.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDAVertexNew.cxx
new file mode 100644
index 000000000000..e35233e3441a
--- /dev/null
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDAVertexNew.cxx
@@ -0,0 +1,75 @@
+/**
+ ** @file TIDAVertexNew.cxx
+ **
+ ** @author emil haines
+ ** @date Wed 28 Jul 2021
+ **
+ ** Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ **/
+
+#include "TrigInDetAnalysis/TIDAVertexNew.h"
+
+
+TIDA::VertexNew::VertexNew(
+ const TIDA::Vertex& v,
+ const TrackTrigObject& tobject,
+ const std::vector<TIDA::Track*>* refTracks )
+ : TIDA::Vertex(v) {
+
+ const std::vector<unsigned long>& ids = tobject.children();
+ m_ids = ids;
+ if ( refTracks ) selectTracks( refTracks );
+}
+
+
+TIDA::VertexNew::VertexNew(
+ const TIDA::VertexNew& v,
+ const std::vector<TIDA::Track*>* refTracks,
+ const TrackTrigObject* tobject )
+ : TIDA::Vertex( v ),
+ m_tracks( v.tracks() ),
+ m_ids( v.ids() ) {
+
+ if ( tobject ) {
+ const std::vector<unsigned long>& ids = tobject->children();
+ m_ids = ids;
+ }
+
+ if ( refTracks ) selectTracks( refTracks );
+}
+
+
+void TIDA::VertexNew::selectTracks(
+ const std::vector<TIDA::Track*>* refTracks,
+ const TrackTrigObject* tobject ) {
+
+ if ( tobject ) {
+ const std::vector<unsigned long>& ids = tobject->children();
+ m_ids = ids;
+ }
+
+ if ( m_ids.size() == 0 ) {
+ return;
+ }
+
+ m_tracks.clear();
+ selectTracksInternal( refTracks );
+}
+
+
+void TIDA::VertexNew::selectTracksInternal(
+ const std::vector<TIDA::Track*>* refTracks ) {
+
+ int trackcount = 0;
+ for ( size_t iid = 0; iid < m_ids.size(); iid++ ) {
+ for (unsigned itr = 0; itr < refTracks->size(); itr++) {
+ TIDA::Track* tr = (*refTracks)[itr];
+ if ( tr->id() == m_ids[iid] ) {
+ addTrack( tr );
+ trackcount++;
+ break;
+ }
+ }
+ }
+ setNtracks( trackcount );
+}
\ No newline at end of file
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfigMT_Ntuple.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfigMT_Ntuple.cxx
index cdef72cbd82c..b64ac82d37a1 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfigMT_Ntuple.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfigMT_Ntuple.cxx
@@ -474,6 +474,10 @@ void AnalysisConfigMT_Ntuple::loop() {
std::vector<TIDA::Vertex> vertices;
+ // store offline vertex track ids along with vertices
+
+ std::vector<TrackTrigObject> offVertexTracks;
+
// std::vector<TIDA::Vertex> vertices;
m_provider->msg(MSG::VERBOSE) << "fetching AOD Primary vertex container" << endmsg;
@@ -496,18 +500,35 @@ void AnalysisConfigMT_Ntuple::loop() {
// std::cout << "SUTT xAOD::Vertex::type() " << (*vtxitr)->type() << "\tvtxtype " << (*vtxitr)->vertexType() << "\tntrax " << (*vtxitr)->nTrackParticles() << std::endl;
if ( (*vtxitr)->nTrackParticles()>0 && (*vtxitr)->vertexType()!=0 ) {
- vertices.push_back( TIDA::Vertex( (*vtxitr)->x(),
- (*vtxitr)->y(),
- (*vtxitr)->z(),
- /// variances
- (*vtxitr)->covariancePosition()(Trk::x,Trk::x),
- (*vtxitr)->covariancePosition()(Trk::y,Trk::y),
- (*vtxitr)->covariancePosition()(Trk::z,Trk::z),
- (*vtxitr)->nTrackParticles(),
- /// quality
- (*vtxitr)->chiSquared(),
- (*vtxitr)->numberDoF() ) );
- }
+ vertices.push_back( TIDA::Vertex( (*vtxitr)->x(),
+ (*vtxitr)->y(),
+ (*vtxitr)->z(),
+ /// variances
+ (*vtxitr)->covariancePosition()(Trk::x,Trk::x),
+ (*vtxitr)->covariancePosition()(Trk::y,Trk::y),
+ (*vtxitr)->covariancePosition()(Trk::z,Trk::z),
+ (*vtxitr)->nTrackParticles(),
+ /// quality
+ (*vtxitr)->chiSquared(),
+ (*vtxitr)->numberDoF() ) );
+
+
+ // get tracks associated to vertex
+ const std::vector< ElementLink< xAOD::TrackParticleContainer > >& tracks = (*vtxitr)->trackParticleLinks();
+
+ // convert from xAOD into TIDA::Track
+ TrigTrackSelector selector( &filter_etaPT ); // not sure about the filter, copied line 147
+ selector.selectTracks( tracks );
+ const std::vector<TIDA::Track*>& tidatracks = selector.tracks();
+
+ // Store ids of tracks belonging to vertex in TrackTrigObject
+ TrackTrigObject vertexTracks = TrackTrigObject();
+ for ( auto trkitr = tidatracks.begin(); trkitr != tidatracks.end(); ++trkitr ) {
+ vertexTracks.addChild( (*trkitr)->id() );
+ }
+ offVertexTracks.push_back( vertexTracks );
+
+ }
}
}
@@ -552,6 +573,7 @@ void AnalysisConfigMT_Ntuple::loop() {
m_event->addChain( "Vertex" );
m_event->back().addRoi(TIDARoiDescriptor(true));
m_event->back().back().addVertices( vertices );
+ m_event->back().back().addObjects( offVertexTracks );
}
@@ -1049,6 +1071,10 @@ void AnalysisConfigMT_Ntuple::loop() {
/// fetch vertices if available ...
std::vector<TIDA::Vertex> tidavertices;
+
+ // store trigger vertex track ids along with vertices
+
+ std::vector<TrackTrigObject> tidaVertexTracks;
if ( vtx_name!="" ) {
@@ -1069,7 +1095,7 @@ void AnalysisConfigMT_Ntuple::loop() {
xAOD::VertexContainer::const_iterator vtxitr = vtx_itrpair.first;
- for ( ; vtxitr!=vtx_itrpair.second ; vtxitr++ ) {
+ for ( ; vtxitr!=vtx_itrpair.second ; vtxitr++ ) {
/// leave this code commented so that we have a record of the change - as soon as we can
/// fix the missing track multiplicity from the vertex this will need to go back
@@ -1086,12 +1112,29 @@ void AnalysisConfigMT_Ntuple::loop() {
/// quality
(*vtxitr)->chiSquared(),
(*vtxitr)->numberDoF() ) );
+
+
+ // get tracks associated to vertex
+ const std::vector< ElementLink< xAOD::TrackParticleContainer > >& tracks = (*vtxitr)->trackParticleLinks();
+
+ // covert from xAOD into TIDA::Track
+ TrigTrackSelector selector( &filter ); // not sure about the filter, copied line 148
+ selector.selectTracks( tracks );
+ const std::vector<TIDA::Track*>& tidatracks = selector.tracks();
+
+ // Store ids of tracks belonging to vertex in TrackTrigObject
+ TrackTrigObject vertexTracks = TrackTrigObject();
+ for ( auto trkitr = tidatracks.begin(); trkitr != tidatracks.end(); ++trkitr ) {
+ vertexTracks.addChild( (*trkitr)->id() );
+ }
+ tidaVertexTracks.push_back( vertexTracks );
+
}
- }
+ }
- }
+ }
- }
+}
#if 0
//// not yet ready to get the jet yet - this can come once everything else is working
@@ -1118,10 +1161,10 @@ void AnalysisConfigMT_Ntuple::loop() {
}
-
chain.addRoi( *roi_tmp );
chain.back().addTracks(testTracks);
chain.back().addVertices(tidavertices);
+ chain.back().addObjects(tidaVertexTracks);
#if 0
/// jets can't be added yet
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.cxx
index 0ad11562ed68..5e9554ba7b58 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.cxx
@@ -11,6 +11,7 @@
#include "ConfVtxAnalysis.h"
#include "TrigInDetAnalysisUtils/VertexMatcher.h"
+#include "TrigInDetAnalysisUtils/VertexNewMatcher.h"
#include "TrigInDetAnalysis/TIDAEvent.h"
@@ -164,119 +165,152 @@ void ConfVtxAnalysis::execute( const std::vector<TIDA::Vertex*>& vtx0,
std::cout << "\ttest: " << vtx1 << std::endl;
#endif
+ VertexMatcher m( "vtx_matcher", 3 );
+ execute_internal<TIDA::Vertex, VertexMatcher>(vtx0, vtx1, m, tevt);
- VertexMatcher m( "vtx_matcher", 3 );
+}
- m.match( vtx0, vtx1 );
- hnvtx->Fill( vtx0.size() );
- hnvtx_rec->Fill( vtx1.size() );
-
- rnvtxrec_nvtx->Fill( vtx0.size(), vtx1.size() );
+void ConfVtxAnalysis::execute( const std::vector<TIDA::VertexNew*>& vtx0,
+ const std::vector<TIDA::VertexNew*>& vtx1,
+ const TIDA::Event* tevt ) {
- // std::cout << "gevent " << gevent << std::endl;
+ if ( !m_initialised ) return;
- /// pass in a parameter now, rather than using a global
- // double mu = gevent->mu();
- // double lb = gevent->lumi_block();
- double mu = tevt->mu();
- double lb = tevt->lumi_block();
+#if 0
+ std::cout << "ConfVtxAnalysis::execute() " << name()
+ << "\tvtx0.size() " << vtx0.size()
+ << "\tvtx1.size() " << vtx1.size()
+ << std::endl;
- for ( unsigned i=0 ; i<vtx0.size() ; i++ ) {
+ std::cout << "\tref: " << vtx0 << std::endl;
+ std::cout << "\ttest: " << vtx1 << std::endl;
+#endif
- /// reject vertices with no tracks in the Roi ...
- if ( vtx0[i]->Ntracks() == 0 ) continue;
+ // use new matcher if tracks included
+ if ( vtx0[0]->tracks().size() > 0 ) {
+ VertexNewMatcher m( "vtx_matcher", 0.5 );
+ execute_internal<TIDA::VertexNew, VertexNewMatcher>(vtx0, vtx1, m, tevt);
+ }
+ else {
+ VertexMatcher m("vtx_matcher", 3 );
+ // m.match() requires std::vector<TIDA::Vertex*>
+ std::vector<TIDA::Vertex*> vtx0_(vtx0.begin(), vtx0.end());
+ std::vector<TIDA::Vertex*> vtx1_(vtx1.begin(), vtx1.end());
+ execute_internal<TIDA::Vertex, VertexMatcher>(vtx0_, vtx1_, m, tevt);
+ }
+}
- hzed->Fill( vtx0[i]->z() );
- hntrax->Fill( vtx0[i]->Ntracks() );
+template<typename Vertex, typename Matcher>
+void ConfVtxAnalysis::execute_internal( const std::vector<Vertex*>& vtx0,
+ const std::vector<Vertex*>& vtx1,
+ Matcher& m,
+ const TIDA::Event* tevt ) {
+
+ m.match( vtx0, vtx1 );
+ hnvtx->Fill( vtx0.size() );
+ hnvtx_rec->Fill( vtx1.size() );
+
+ rnvtxrec_nvtx->Fill( vtx0.size(), vtx1.size() );
- hlb->Fill( lb );
- hmu->Fill( mu );
-
- const TIDA::Vertex* mv = m.matched( vtx0[i] );
-
- // std::cout << "\tvtx match: " << i << " " << mv << std::endl;
+ // keep alternate functionality commented
+ // std::cout << "gevent " << gevent << std::endl;
- if ( mv ) {
- // std::cout << "\ttest z " << mv->z() << " : delta z " << (mv->z()-vtx0[i]->z()) << std::endl;
-
- /// ah ha ! can fill some silly old histograms here
- /// ...
+ /// pass in a parameter now, rather than using a global
+ // double mu = gevent->mu();
+ // double lb = gevent->lumi_block();
+ double mu = tevt->mu();
+ double lb = tevt->lumi_block();
- hzed_rec->Fill( mv->z() );
- hntrax_rec->Fill( mv->Ntracks() );
+ for ( unsigned i=0 ; i<vtx0.size() ; i++ ) {
- hzed_res->Fill( mv->z() - vtx0[i]->z() );
+ /// reject vertices with no tracks in the Roi ...
+ if ( vtx0[i]->Ntracks() == 0 ) continue;
-
- rdz_vs_zed->Fill( vtx0[i]->z(), mv->z() - vtx0[i]->z() );
- rdz_vs_ntrax->Fill( vtx0[i]->Ntracks(), mv->z() - vtx0[i]->z() );
- rdz_vs_nvtx->Fill( vtx0.size(), mv->z() - vtx0[i]->z() ); /// this isn't really legitimate
- rdz_vs_mu->Fill( mu, mv->z() - vtx0[i]->z() ); /// this isn't really legitimate
- eff_zed->Fill( vtx0[i]->z() );
- eff_ntrax->Fill( vtx0[i]->Ntracks() );
- eff_nvtx->Fill( vtx0.size() );
+ hzed->Fill( vtx0[i]->z() );
+ hntrax->Fill( vtx0[i]->Ntracks() );
- eff_mu->Fill( mu );
- eff_lb->Fill( lb );
- // std::cout << "found vtx ref vertex size " << vtx0.size() << "\tonline " << vtx1.size() << std::endl;
- // std::cout << "\tref: " << *vtx0[i] << std::endl;
- // for ( unsigned iv=0 ; iv<vtx1.size() ; iv++ ) if ( vtx1[iv] ) std::cout << "\t" << iv << " : " << *vtx1[iv] << std::endl;
-
- /// what about beam tilts etc? where are these defined with respect to ?
- rdz_vs_lb->Fill( lb, mv->z() - vtx0[i]->z() );
- rdx_vs_lb->Fill( lb, mv->x() - vtx0[i]->x() );
- rdy_vs_lb->Fill( lb, mv->y() - vtx0[i]->y() );
+ hlb->Fill( lb );
+ hmu->Fill( mu );
+
+ const Vertex* mv = m.matched( vtx0[i] );
+
+ // std::cout << "\tvtx match: " << i << " " << mv << std::endl;
+ if ( mv ) {
+ // std::cout << "\ttest z " << mv->z() << " : delta z " << (mv->z()-vtx0[i]->z()) << std::endl;
+
+ /// ah ha ! can fill some silly old histograms here
+ /// ...
+ hzed_rec->Fill( mv->z() );
+ hntrax_rec->Fill( mv->Ntracks() );
+
+ hzed_res->Fill( mv->z() - vtx0[i]->z() );
+
+
+ rdz_vs_zed->Fill( vtx0[i]->z(), mv->z() - vtx0[i]->z() );
+ rdz_vs_ntrax->Fill( vtx0[i]->Ntracks(), mv->z() - vtx0[i]->z() );
+ rdz_vs_nvtx->Fill( vtx0.size(), mv->z() - vtx0[i]->z() ); /// this isn't really legitimate
+ rdz_vs_mu->Fill( mu, mv->z() - vtx0[i]->z() ); /// this isn't really legitimate
+
+ eff_zed->Fill( vtx0[i]->z() );
+ eff_ntrax->Fill( vtx0[i]->Ntracks() );
+ eff_nvtx->Fill( vtx0.size() );
+
+ eff_mu->Fill( mu );
+ eff_lb->Fill( lb );
+
+ // std::cout << "found vtx ref vertex size " << vtx0.size() << "\tonline " << vtx1.size() << std::endl;
+ // std::cout << "\tref: " << *vtx0[i] << std::endl;
+ // for ( unsigned iv=0 ; iv<vtx1.size() ; iv++ ) if ( vtx1[iv] ) std::cout << "\t" << iv << " : " << *vtx1[iv] << std::endl;
+
+ /// what about beam tilts etc? where are these defined with respect to ?
+ rdz_vs_lb->Fill( lb, mv->z() - vtx0[i]->z() );
+ rdx_vs_lb->Fill( lb, mv->x() - vtx0[i]->x() );
+ rdy_vs_lb->Fill( lb, mv->y() - vtx0[i]->y() );
- }
- else {
- // std::cout << "\t" << "------" << std::endl;
-
- // std::cout << "missing vtx ref vertex size " << vtx0.size() << "\tonline " << vtx1.size() << std::endl;
- // std::cout << "\tref: " << *vtx0[i] << std::endl;
- // for ( unsigned iv=0 ; iv<vtx1.size() ; iv++ ) if ( vtx1[iv] ) std::cout << "\t" << iv << " : " << *vtx1[iv] << std::endl;
+ } else {
+ // std::cout << "\t" << "------" << std::endl;
+
+ // std::cout << "missing vtx ref vertex size " << vtx0.size() << "\tonline " << vtx1.size() << std::endl;
+ // std::cout << "\tref: " << *vtx0[i] << std::endl;
+ // for ( unsigned iv=0 ; iv<vtx1.size() ; iv++ ) if ( vtx1[iv] ) std::cout << "\t" << iv << " : " << *vtx1[iv] << std::endl;
#if 0
- static int vtxcount=0;
-
- if ( vtxcount<100 ) {
- std::cout << "ConfVtxAnalysis::execute() " << name() << "\tnomatch\n"
- << "\tvtx0.size() " << vtx0.size()
- << "\tvtx1.size() " << vtx1.size()
- << std::endl;
-
- std::cout << "\tref: " << vtx0 << std::endl;
- std::cout << "\ttest: " << vtx1 << std::endl;
-
- vtxcount++;
-
- // std::cout << *gevent << std::endl;
- }
+ static int vtxcount=0;
+
+ if ( vtxcount<100 ) {
+ std::cout << "ConfVtxAnalysis::execute() " << name() << "\tnomatch\n"
+ << "\tvtx0.size() " << vtx0.size()
+ << "\tvtx1.size() " << vtx1.size()
+ << std::endl;
+
+ std::cout << "\tref: " << vtx0 << std::endl;
+ std::cout << "\ttest: " << vtx1 << std::endl;
+
+ vtxcount++;
+
+ // std::cout << *gevent << std::endl;
+ }
-
+
#endif
- eff_zed->FillDenom( vtx0[i]->z() );
- eff_ntrax->FillDenom( vtx0[i]->Ntracks() );
- eff_nvtx->FillDenom( vtx0.size() );
+ eff_zed->FillDenom( vtx0[i]->z() );
+ eff_ntrax->FillDenom( vtx0[i]->Ntracks() );
+ eff_nvtx->FillDenom( vtx0.size() );
- eff_mu->FillDenom( mu );
- eff_lb->FillDenom( lb );
+ eff_mu->FillDenom( mu );
+ eff_lb->FillDenom( lb );
- }
-
}
-
+ }
}
-
-
-
void ConfVtxAnalysis::finalise() {
if ( !m_initialised ) return;
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.h
index dfc9d455426b..66ff5c26fcbf 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.h
@@ -15,6 +15,7 @@
#include <iostream>
#include "TrigInDetAnalysis/VertexAnalysis.h"
+#include "TrigInDetAnalysis/TIDAVertexNew.h"
#include "TrigInDetAnalysis/TIDDirectory.h"
#include "TrigInDetAnalysis/Efficiency.h"
@@ -31,13 +32,23 @@ public:
void initialise();
void execute(const std::vector<TIDA::Vertex*>& vtx0,
- const std::vector<TIDA::Vertex*>& vtx1,
- const TIDA::Event* tevt=0 );
-
+ const std::vector<TIDA::Vertex*>& vtx1,
+ const TIDA::Event* tevt=0 );
+
+ void execute(const std::vector<TIDA::VertexNew*>& vtx0,
+ const std::vector<TIDA::VertexNew*>& vtx1,
+ const TIDA::Event* tevt=0 );
+
void finalise();
private:
+ template<typename Vertex, typename Matcher>
+ void execute_internal(const std::vector<Vertex*>& vtx0,
+ const std::vector<Vertex*>& vtx1,
+ Matcher& m,
+ const TIDA::Event* tevt=0);
+
bool m_initialised;
bool m_finalised;
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/rmain.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/rmain.cxx
index eaef88c9a244..fe902aafbd21 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/rmain.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/rmain.cxx
@@ -31,6 +31,7 @@
#include "TrigInDetAnalysis/Track.h"
#include "TrigInDetAnalysis/TIDAEvent.h"
#include "TrigInDetAnalysis/TrackSelector.h"
+#include "TrigInDetAnalysis/TIDAVertexNew.h"
#include "TrigInDetAnalysisUtils/Associator_BestMatch.h"
#include "TrigInDetAnalysisUtils/Filters.h"
@@ -575,7 +576,6 @@ int main(int argc, char** argv)
//bool printflag = false; // JK removed (unused)
-
bool rotate_testtracks = false;
if ( inputdata.isTagDefined("RotateTestTracks") ) rotate_testtracks = ( inputdata.GetValue("RotateTestTracks") ? true : false );
@@ -860,7 +860,9 @@ int main(int argc, char** argv)
#endif
-
+ /// option to use updated vertex matching with tracks
+ bool useVertexTracks = false;
+ if ( inputdata.isTagDefined("UseVertexTracks") ) useVertexTracks = ( inputdata.GetValue("UseVertexTracks") > 0 );
/// is this option needed any longer ???
int NVtxTrackCut = 2;
@@ -1653,8 +1655,10 @@ int main(int argc, char** argv)
/// select the reference offline vertices
+
+ std::vector<TIDA::Vertex> vertices; // keep for now as needed for line 1709
- std::vector<TIDA::Vertex> vertices;
+ std::vector<TIDA::VertexNew> vertices_new;
// const std::vector<TIDA::Vertex>& mv = track_ev->vertices();
@@ -1663,6 +1667,7 @@ int main(int argc, char** argv)
if ( vtxchain && vtxchain->size()>0 ) {
const std::vector<TIDA::Vertex>& mv = vtxchain->at(0).vertices();
+ const std::vector<TrackTrigObject>& mvTracks = vtxchain->at(0).objects();
int selectvtx = -1;
double selection = 0;
@@ -1674,25 +1679,35 @@ int main(int argc, char** argv)
for ( size_t iv=0 ; iv<mv.size() ; iv++ ) {
if ( mv[iv].Ntracks()==0 ) continue;
double selection_ = 0.0;
- for (unsigned itr=0; itr<offTracks.tracks().size(); itr++){
- TIDA::Track* tr = offTracks.tracks().at(itr);
- if( std::fabs(mv[iv].z()-tr->z0()) < 1.5 ) {
- if ( bestPTVtx ) selection_ += std::fabs(tr->pT());
- else if ( bestPT2Vtx ) selection_ += std::fabs(tr->pT())*std::fabs(tr->pT());
- }
+ TIDA::VertexNew vtx_temp( mv[iv], mvTracks[iv], &offTracks.tracks() );
+ for (unsigned itr=0; itr<vtx_temp.tracks().size(); itr++) {
+ TIDA::Track* tr = vtx_temp.tracks().at(itr);
+ if ( bestPTVtx ) selection_ += std::fabs(tr->pT());
+ else if ( bestPT2Vtx ) selection_ += std::fabs(tr->pT())*std::fabs(tr->pT());
}
- if( selection_>selection) {
+ if( selection_>selection ) {
selection = selection_;
selectvtx = iv;
}
}
- if ( selectvtx!=-1 ) vertices.push_back( mv[selectvtx] );
+ if ( selectvtx!=-1 ) {
+ vertices.push_back( mv[selectvtx] );
+ vertices_new.push_back( TIDA::VertexNew( mv[selectvtx], mvTracks[selectvtx] ) );
+ }
}
else if ( vtxind>=0 ) {
- if ( size_t(vtxind)<mv.size() ) vertices.push_back( mv[vtxind] );
+ if ( size_t(vtxind)<mv.size() ) {
+ vertices.push_back( mv[vtxind] );
+ TIDA::VertexNew vtx( mv[vtxind], mvTracks[vtxind] );
+ vertices_new.push_back( vtx );
+ }
}
else {
- for ( size_t iv=0 ; iv<mv.size() ; iv++ ) vertices.push_back( mv[iv] );
+ for ( size_t iv=0 ; iv<mv.size() ; iv++ ) {
+ vertices.push_back( mv[iv] );
+ TIDA::VertexNew vtx( mv[iv], mvTracks[iv] );
+ vertices_new.push_back( vtx );
+ }
}
// if ( vertices.size()>0 ) std::cout << "vertex " << vertices[0] << std::endl;
@@ -1829,6 +1844,12 @@ int main(int argc, char** argv)
TnP_tool->FillMinvHisto( chain.name(), ir );
}
+ testTracks.clear();
+
+ testTracks.selectTracks( troi.tracks() );
+
+ /// trigger tracks already restricted by roi - so no roi filtering required
+ std::vector<TIDA::Track*> testp = testTracks.tracks();
/// do we want to filter on the RoI properties?
/// If so, if the RoI fails the cuts, then skip this roi
@@ -1837,44 +1858,65 @@ int main(int argc, char** argv)
/// select the test sample (trigger) vertices
const std::vector<TIDA::Vertex>& mvt = troi.vertices();
+ const std::vector<TrackTrigObject>& mvtTracks = troi.objects();
-
- std::vector<TIDA::Vertex> vertices_test;
+ std::vector<TIDA::VertexNew> vertices_new_test;
int selectvtx = -1;
double selection = 0;
if ( bestPTVtx_rec || bestPT2Vtx_rec ) {
- const std::vector<TIDA::Track>& recTracks = troi.tracks();
+ // const std::vector<TIDA::Track>& recTracks = troi.tracks();
for ( unsigned iv=0 ; iv<mvt.size() ; iv++ ) {
double selection_ = 0.0;
- for (unsigned itr=0; itr<recTracks.size(); itr++){
- const TIDA::Track* tr = &recTracks[itr];
- if( std::fabs(mvt[iv].z()-tr->z0()) < 1.5 ) {
- if ( bestPTVtx_rec ) selection_ += std::fabs(tr->pT());
- else if ( bestPT2Vtx_rec ) selection_ += std::fabs(tr->pT())*std::fabs(tr->pT());
- }
+ TIDA::VertexNew vtx_temp( mvt[iv], mvtTracks[iv], &testp );
+ for (unsigned itr=0; itr<vtx_temp.tracks().size(); itr++) {
+ TIDA::Track* tr = vtx_temp.tracks().at(itr);
+ if ( bestPTVtx ) selection_ += std::fabs(tr->pT());
+ else if ( bestPT2Vtx ) selection_ += std::fabs(tr->pT())*std::fabs(tr->pT());
}
if( selection_>selection){
selection = selection_;
selectvtx = iv;
}
}
- if ( selectvtx!=-1 ) vertices_test.push_back( mvt[selectvtx] );
+ if ( selectvtx!=-1 ) {
+ if ( useVertexTracks ) {
+ TIDA::VertexNew selected( mvt[selectvtx], mvtTracks[selectvtx], &testp );
+ vertices_new_test.push_back( selected );
+ }
+ else {
+ TIDA::VertexNew selected( mvt[selectvtx] );
+ vertices_new_test.push_back( selected );
+ }
+ }
}
else if ( vtxind_rec!=-1 ) {
- if ( unsigned(vtxind_rec)<mvt.size() ) vertices_test.push_back( mvt[vtxind] );
+ if ( unsigned(vtxind_rec)<mvt.size() ) {
+ if ( useVertexTracks ) {
+ TIDA::VertexNew selected( mvt[vtxind], mvtTracks[vtxind], &testp );
+ vertices_new_test.push_back( selected );
+ }
+ else {
+ TIDA::VertexNew selected( mvt[vtxind] );
+ vertices_new_test.push_back( selected );
+ }
+ }
}
else {
- for ( unsigned iv=0 ; iv<mvt.size() ; iv++ ) vertices_test.push_back( mvt[iv] );
+ for ( unsigned iv=0 ; iv<mvt.size() ; iv++ ) {
+ if ( useVertexTracks ) {
+ TIDA::VertexNew selected( mvt[iv], mvtTracks[iv], &testp );
+ vertices_new_test.push_back( selected );
+ }
+ else {
+ TIDA::VertexNew selected( mvt[iv] );
+ vertices_new_test.push_back( selected );
+ }
+ }
}
-
-
-
-
-
//extract beamline position values from rois
// const std::vector<double>& beamline = chain.rois()[ir].user();
@@ -1912,12 +1954,13 @@ int main(int argc, char** argv)
}
- testTracks.clear();
+ // EMIL - I've moved this bit of code up to have access to trigger tracks above
+ // testTracks.clear();
- testTracks.selectTracks( troi.tracks() );
+ // testTracks.selectTracks( troi.tracks() );
- /// trigger tracks already restricted by roi - so no roi filtering required
- std::vector<TIDA::Track*> testp = testTracks.tracks();
+ // /// trigger tracks already restricted by roi - so no roi filtering required
+ // std::vector<TIDA::Track*> testp = testTracks.tracks();
/// here we set the roi for the filter so we can request only those tracks
/// inside the roi
@@ -2072,8 +2115,8 @@ int main(int argc, char** argv)
/// the count how many of these reference tracks are on each of the
/// offline vertices
-
- std::vector<TIDA::Vertex> vertices_roi;
+ // new vertex class containing tracks, offline
+ std::vector<TIDA::VertexNew> vertices_new_roi;
/// do for all vertices now ...
// if ( chain.name().find("SuperRoi") ) {
@@ -2081,15 +2124,16 @@ int main(int argc, char** argv)
/// select the reference offline vertices
- vertices_roi.clear();
+ vertices_new_roi.clear();
- const std::vector<TIDA::Vertex>& mv = vertices;
+ const std::vector<TIDA::VertexNew>& mv = vertices_new;
- // std::cout << "vertex filtering " << mv.size() << std::endl;
+ // std::cout << "vertex filtering " << mv.size() << std::endl;
+
for ( unsigned iv=0 ; iv<mv.size() ; iv++ ) {
- const TIDA::Vertex& vx = mv[iv];
+ const TIDA::VertexNew& vx = mv[iv];
// reject all vertices that are not in the roi
@@ -2109,26 +2153,36 @@ int main(int argc, char** argv)
int trackcount = 0;
- for (unsigned itr=0; itr<refp.size(); itr++){
- TIDA::Track* tr = refp[itr];
- double theta_ = 2*std::atan(std::exp(-tr->eta()));
- double dzsintheta = std::fabs( (vx.z()-tr->z0()) * std::sin(theta_) );
- if( dzsintheta < 1.5 ) trackcount++;
+ if ( useVertexTracks ) {
+ // refp contains roi filtered tracks, vx contains ids of tracks belonging to vertex
+ TIDA::VertexNew vertex_new_roi( vx, &refp );
+ trackcount = vertex_new_roi.Ntracks();
+ if ( trackcount>=ntracks && trackcount>0 ) {
+ vertices_new_roi.push_back(vertex_new_roi);
+ }
}
-
+ else {
+ for (unsigned itr=0; itr<refp.size(); itr++){
+ TIDA::Track* tr = refp[itr];
+ double theta_ = 2*std::atan(std::exp(-tr->eta()));
+ double dzsintheta = std::fabs( (vx.z()-tr->z0()) * std::sin(theta_) );
+ if( dzsintheta < 1.5 ) trackcount++;
+ }
/// don't add vertices with no matching tracks - remember the
/// tracks are filtered by Roi already so some vertices may have
/// no tracks in the Roi - ntracks set to 0 by default
- if ( trackcount>=ntracks && trackcount>0 ) {
- vertices_roi.push_back( TIDA::Vertex( vx.x(), vx.y(), vx.z(),
- vx.dx(), vx.dy(), vx.dz(),
- trackcount,
- vx.chi2(), vx.ndof() ) ); // ndof not valid for only Roi tracks
+ if ( trackcount>=ntracks && trackcount>0 ) {
+ vertices_new_roi.push_back(
+ TIDA::VertexNew( TIDA::Vertex( vx.x(), vx.y(), vx.z(),
+ vx.dx(), vx.dy(), vx.dz(),
+ trackcount,
+ vx.chi2(), vx.ndof() ) ) );// ndof not valid for only Roi tracks
// std::cout << "\t \t" << vertices_roi.back() << std::endl;
+ }
}
+
}
-
}
// else vertices_roi = vertices;
@@ -2167,7 +2221,7 @@ int main(int argc, char** argv)
/// so we now use a handy wrapper function to do the conversion for us ...
- if ( vertices_roi.size()>0 ) vtxanal->execute( pointers(vertices_roi), pointers(vertices_test), track_ev );
+ if ( vertices_new_roi.size()>0 ) vtxanal->execute( pointers(vertices_new_roi), pointers(vertices_new_test), track_ev );
}
@@ -2229,10 +2283,9 @@ int main(int argc, char** argv)
static int ecounter = 0;
ecounter++;
}
- }
-
- }
- }
+ } // loop through rois
+ } // loop through chanines
+ } // loop through nentries
delete track_ev;
delete data;
@@ -2240,7 +2293,7 @@ int main(int argc, char** argv)
// std::cout << "run: " << run << std::endl;
- }
+ } // loop through files
std::cout << "done " << time_str() << "\tprocessed " << event_counter << " events"
<< "\ttimes " << mintime << " " << maxtime
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TrigTrackSelector.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TrigTrackSelector.h
index 0e9a3faf39dc..dc351432db4b 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TrigTrackSelector.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TrigTrackSelector.h
@@ -146,6 +146,8 @@ public:
xAOD::TrackParticleContainer::const_iterator trackend, void* =0);
+ typedef std::vector< ElementLink< xAOD::TrackParticleContainer > > TrackParticleLinks_t;
+ void selectTracks( TrackParticleLinks_t tracks, void* =0 );
void correctToBeamline( double& z0, double& dz0,
double& d0, double& dd0,
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/VertexMatcher.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/VertexMatcher.h
index 371fb1c65144..931b87f4067d 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/VertexMatcher.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/VertexMatcher.h
@@ -19,7 +19,6 @@
#include "TrigInDetAnalysis/TIDAVertex.h"
-
class VertexMatcher : public BestMatcher<TIDA::Vertex> {
public:
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/VertexNewMatcher.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/VertexNewMatcher.h
new file mode 100644
index 000000000000..86ca1f48e011
--- /dev/null
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/VertexNewMatcher.h
@@ -0,0 +1,57 @@
+/* emacs: this is -*- c++ -*- */
+/**
+ ** @file VertexNewMatcher.h
+ **
+ ** @author emil haines
+ ** @date Thu 29 Jul 2021
+ **
+** Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ **/
+
+#ifndef VERTEXNEWMATCHER_H
+#define VERTEXNEWMATCHER_H
+
+#include <iostream>
+
+#include "TrigInDetAnalysisUtils/BestMatcher.h"
+#include "TrigInDetAnalysisUtils/Associator_BestMatch.h"
+
+#include "TrigInDetAnalysis/TIDAVertex.h"
+#include "TrigInDetAnalysis/TIDAVertexNew.h"
+
+
+class VertexNewMatcher : public BestMatcher<TIDA::VertexNew> {
+
+public:
+
+ VertexNewMatcher( const std::string& s, double d=0.5 ) : BestMatcher<TIDA::VertexNew>( s, d*d ) { }
+
+ ~VertexNewMatcher() { }
+
+ virtual double distance( const TIDA::VertexNew* v0, const TIDA::VertexNew* v1 ) const {
+
+ // vectors of pointers to tracks belonging to ref and test vertices
+ const std::vector<TIDA::Track*>& refTracks= v0->tracks();
+ const std::vector<TIDA::Track*>& testTracks = v1->tracks();
+
+ // match offline to trigger tracks using delta R
+ Associator_DeltaRMatcher track_matcher( "track_matcher", 0.05 );
+ track_matcher.match( refTracks, testTracks );
+
+ double n_matches = (double)track_matcher.size();
+ double eff = n_matches/refTracks.size();
+
+ // 1-eff as BestMatcher uses lower than threshold, squared as BestMatcer takes d*d
+ return (1-eff)*(1-eff);
+ };
+
+};
+
+inline std::ostream& operator<<( std::ostream& s, const VertexNewMatcher& /* _v */ ) {
+ return s;
+}
+
+#endif // VERTEXNEWMATCHER_H
+
+
+
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/TrigTrackSelector.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/TrigTrackSelector.cxx
index 4da2b58f7bbd..04d5b6cab5aa 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/TrigTrackSelector.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/TrigTrackSelector.cxx
@@ -1184,6 +1184,12 @@ void TrigTrackSelector::selectTracks( xAOD::TrackParticleContainer::const_iterat
}
+void TrigTrackSelector::selectTracks( TrackParticleLinks_t tracks, void* ) {
+ for( const auto& track : tracks ) {
+ const xAOD::TrackParticle* trkp = *track;
+ selectTrack( trkp );
+ }
+}
#endif
--
GitLab
From 2005435abcae65386160a2a416b1cc8ab2c5f7aa Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Wed, 18 Aug 2021 00:59:31 +0200
Subject: [PATCH 121/272] ATLASRECTS-6547 Item 4: Remove some more
dynamic_casts
---
.../src/PRDtoTrackMapTool.cxx | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/Tracking/TrkTools/TrkAssociationTools/src/PRDtoTrackMapTool.cxx b/Tracking/TrkTools/TrkAssociationTools/src/PRDtoTrackMapTool.cxx
index 1161d01d8fda..d755a9266031 100644
--- a/Tracking/TrkTools/TrkAssociationTools/src/PRDtoTrackMapTool.cxx
+++ b/Tracking/TrkTools/TrkAssociationTools/src/PRDtoTrackMapTool.cxx
@@ -137,8 +137,11 @@ Trk::PRDtoTrackMapTool::getPrdsOnTrack(Trk::PRDtoTrackMap &virt_prd_to_track_map
vec.reserve(track.measurementsOnTrack()->size());
for (const MeasurementBase* meas : *track.measurementsOnTrack())
{
- const RIO_OnTrack* rot = dynamic_cast<const RIO_OnTrack*>(meas);
- if (rot){
+ const Trk::RIO_OnTrack* rot = nullptr;
+ if (meas->type(Trk::MeasurementBaseType::RIO_OnTrack)) {
+ rot = static_cast<const RIO_OnTrack*>(meas);
+ }
+ if (rot) {
if(m_idHelperSvc->isMuon(rot->identify())){
//only use precision hits for muon track overlap
if( !m_idHelperSvc->isMdt(rot->identify())
@@ -146,10 +149,12 @@ Trk::PRDtoTrackMapTool::getPrdsOnTrack(Trk::PRDtoTrackMap &virt_prd_to_track_map
&& !m_idHelperSvc->measuresPhi(rot->identify()))) continue;
}
vec.push_back(rot->prepRawData());
- }
- else{
- const Trk::CompetingRIOsOnTrack* competingROT = dynamic_cast <const Trk::CompetingRIOsOnTrack*> (meas);
- if(competingROT){
+ } else {
+ const Trk::CompetingRIOsOnTrack* competingROT = nullptr;
+ if (meas->type(Trk::MeasurementBaseType::CompetingRIOsOnTrack)) {
+ competingROT = static_cast<const Trk::CompetingRIOsOnTrack*>(meas);
+ }
+ if (competingROT) {
const unsigned int numROTs = competingROT->numberOfContainedROTs();
for( unsigned int i=0;i<numROTs;++i ){
const Trk::RIO_OnTrack* rot = &competingROT->rioOnTrack(i);
--
GitLab
From 822426764bcaabb924885701173f713462be149b Mon Sep 17 00:00:00 2001
From: ecarquin <e.carquin.pphysics@gmail.com>
Date: Wed, 18 Aug 2021 03:48:53 +0200
Subject: [PATCH 122/272] Fix histograms names and ranges
---
.../python/TrigTauMonitoringConfigMT.py | 14 +++---
.../src/TrigTauMonitorAlgorithm.cxx | 47 ++++++++++---------
2 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfigMT.py b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfigMT.py
index 500f7d53694a..1d08dcc7f605 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfigMT.py
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfigMT.py
@@ -204,6 +204,7 @@ class TrigTauMonAlgBuilder:
'HLT_tau160_perf_tracktwoMVA_L1TAU100',
'HLT_tau160_perf_tracktwoMVABDT_L1TAU100',
'HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100',
+ 'HLT_tau160_mediumRNN_tracktwoMVATest_L1TAU100',
'HLT_tau160_mediumRNN_tracktwoMVABDT_L1TAU100',
'HLT_tau160_medium1_tracktwo_L1TAU100',
# tau180
@@ -418,7 +419,7 @@ class TrigTauMonAlgBuilder:
monGroup = self.helper.addGroup( monAlg, monGroupName,
self.basePath+'/'+monGroupPath )
-
+
monGroup.defineHistogram('cluster_et_log',title='cluster_et_log; cluster_et_log;Events',xbins=30,xmin=0,xmax=6)
monGroup.defineHistogram('cluster_pt_jetseed_log',title='cluster_pt_jetseed_log; cluster_pt_jetseed_log;Events',xbins=50,xmin=2,xmax=7)
monGroup.defineHistogram('cluster_dEta',title='cluster_dEta; cluster_dEta;Events',xbins=100,xmin=-0.5,xmax=0.5)
@@ -479,7 +480,7 @@ class TrigTauMonAlgBuilder:
monGroup = self.helper.addGroup( monAlg, monGroupName,
self.basePath+'/'+monGroupPath )
- monGroup.defineHistogram('BDTJetScore', title='BDT Score ('+nProng+') ; HLT BDT Score; Candidates',xbins=50,xmin=0,xmax=1)
+ monGroup.defineHistogram('BDTJetScore', title='BDT Score ('+nProng+') ; HLT BDT Score; Candidates',xbins=50,xmin=-1,xmax=1)
monGroup.defineHistogram('BDTJetScoreSigTrans', title='Flattened BDT Score ('+nProng+') ; HLT BDT Score; Candidates',xbins=50,xmin=0,xmax=1)
@@ -493,16 +494,15 @@ class TrigTauMonAlgBuilder:
monGroup.defineHistogram('CentFrac', title='Centrality Fraction ('+nProng+') non-corrected; centFrac; Candidates',xbins=50,xmin=-0.05,xmax=1.2)
monGroup.defineHistogram('ChPiEMEOverCaloEME', title='ChPiEMEOverCaloEME ('+nProng+') non-corrected; ChPiEMEOverCaloEME; Candidates',xbins=51,xmin=-20,xmax=20)
monGroup.defineHistogram('EMPOverTrkSys', title='EMPOverTrkSys ('+nProng+') non-corrected; EMPOverTrkSys; Candidates',xbins=41,xmin=0,xmax=40)
- monGroup.defineHistogram('etOverPtLeadTrk', title='etOverPtLeadTrk ('+nProng+') non-corrected; etOverPtLeadTrk; Candidates',xbins=51,xmin=-0.1,xmax=25)
- monGroup.defineHistogram('innerTrkAvgDist', title='innerTrkAvgDist ('+nProng+') non-corrected; innerTrkAvgDist; Candidates',xbins=50,xmin=-0.05,xmax=0.5)
+ monGroup.defineHistogram('etOverPtLeadTrk', title='etOverPtLeadTrk ('+nProng+') non-corrected; etOverPtLeadTrk; Candidates',xbins=50,xmin=-2.5,xmax=2.5)
+ monGroup.defineHistogram('innerTrkAvgDist', title='innerTrkAvgDist ('+nProng+') non-corrected; innerTrkAvgDist; Candidates',xbins=50,xmin=-0.05,xmax=0.2)
monGroup.defineHistogram('ptRatioEflowApprox', title='ptRatioEflowApprox ('+nProng+') non-corrected; ptRatioEflowApprox; Candidates',xbins=50,xmin=0,xmax=2)
- monGroup.defineHistogram('massTrkSys;massTrkSys_log', title='massTrkSys log ('+nProng+'); massTrkSys_log; Events',xbins=50,xmin=0.,xmax=3.)
if nProng=='1P':
monGroup.defineHistogram('SumPtTrkFrac', title='SumPtTrkFrac ('+nProng+') non-corrected; SumPtTrkFrac; Candidates',xbins=50,xmin=-0.5,xmax=1.1)
if nProng=='MP':
monGroup.defineHistogram('dRmax', title='dRmax ('+nProng+') non-corrected; dRmax; Candidates',xbins=50,xmin=-0.1,xmax=0.3)
- monGroup.defineHistogram('massTrkSys', title='massTrkSys ('+nProng+') non-corrected; massTrkSys; Candidates',xbins=50,xmin=-0.1,xmax=15)
- monGroup.defineHistogram('mEflowApprox', title='mEflowApprox ('+nProng+') non-corrected; mEflowApprox; Candidates',xbins=61,xmin=-0.2,xmax=60.2)
+ monGroup.defineHistogram('massTrkSys', title='massTrkSys ('+nProng+') non-corrected; massTrkSys; Candidates',xbins=50,xmin=2.0,xmax=6.)
+ monGroup.defineHistogram('mEflowApprox', title='mEflowApprox ('+nProng+') non-corrected; mEflowApprox; Candidates',xbins=50,xmin=0.0,xmax=10.)
monGroup.defineHistogram('trFlightPathSig', title='trFlightPathSig ('+nProng+') non-corrected; trFlightPathSig; Candidates',xbins=50,xmin=-20,xmax=20)
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.cxx b/Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.cxx
index 8aa0a22fd133..ea67fd214227 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.cxx
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.cxx
@@ -112,8 +112,9 @@ StatusCode TrigTauMonitorAlgorithm::executeNavigation( const EventContext& ctx,
if(trigItem.find("MVA_")!=std::string::npos || trigItem.find("MVABDT_")!=std::string::npos) {
tauContainerName="HLT_TrigTauRecMerged_MVA";
}else if(trigItem.find("LLP_") != std::string::npos){
- tauContainerName="HLT_TrigTauRecMerged_LLP";
- }else if(trigItem.find("ptonly") != std::string::npos) tauContainerName="HLT_TrigTauRecMerged_CaloOnly";
+ tauContainerName="HLT_TrigTauRecMerged_LLP";
+ }else if(trigItem.find("ptonly") != std::string::npos)
+ tauContainerName="HLT_TrigTauRecMerged_CaloOnly";
for(const auto Tau : *offTaus ){
@@ -191,10 +192,11 @@ void TrigTauMonitorAlgorithm::fillDistributions(const EventContext& ctx, std::ve
std::string tauContainerName = "HLT_TrigTauRecMerged_Precision";
if(trigger.find("MVA_")!=std::string::npos || trigger.find("MVABDT_")!=std::string::npos){
- tauContainerName="HLT_TrigTauRecMerged_MVA";
+ tauContainerName="HLT_TrigTauRecMerged_MVA";
}else if(trigger.find("LLP_") != std::string::npos){
- tauContainerName="HLT_TrigTauRecMerged_LLP";
- }else if(trigger.find("ptonly") != std::string::npos) tauContainerName="HLT_TrigTauRecMerged_CaloOnly";
+ tauContainerName="HLT_TrigTauRecMerged_LLP";
+ }else if(trigger.find("ptonly") != std::string::npos)
+ tauContainerName="HLT_TrigTauRecMerged_CaloOnly";
ATH_MSG_DEBUG("Tau ContainerName is: " << tauContainerName);
@@ -414,8 +416,7 @@ void TrigTauMonitorAlgorithm::fillBDTNoCorr(const std::string trigger, std::vect
auto monGroup = getGroup(monGroupName);
-
- auto centFrac = Monitored::Collection("centFrac", tau_vec, [] (const xAOD::TauJet* tau){
+ auto CentFrac = Monitored::Collection("CentFrac", tau_vec, [] (const xAOD::TauJet* tau){
float detail = -999;
if (tau->detail(xAOD::TauJetParameters::centFrac, detail)){
detail = std::min(detail, 1.0f);
@@ -424,7 +425,7 @@ void TrigTauMonitorAlgorithm::fillBDTNoCorr(const std::string trigger, std::vect
float detail = -999;
if (tau->detail(xAOD::TauJetParameters::ChPiEMEOverCaloEME, detail)){
} return detail;});
- auto emPOverTrkSysP = Monitored::Collection("emPOverTrkSysP", tau_vec, [] (const xAOD::TauJet* tau){
+ auto EMPOverTrkSys = Monitored::Collection("EMPOverTrkSys", tau_vec, [] (const xAOD::TauJet* tau){
float detail = -999;
if (tau->detail(xAOD::TauJetParameters::EMPOverTrkSysP, detail)){
detail = TMath::Log10(std::max(detail, 1e-3f));
@@ -444,11 +445,11 @@ void TrigTauMonitorAlgorithm::fillBDTNoCorr(const std::string trigger, std::vect
detail = std::min(detail, 4.0f);
} return detail;});
if(nProng=="1P"){
- auto sumPtTrkFrac = Monitored::Collection("sumPtTrkFrac", tau_vec, [] (const xAOD::TauJet* tau){
+ auto SumPtTrkFrac = Monitored::Collection("SumPtTrkFrac", tau_vec, [] (const xAOD::TauJet* tau){
float detail = -999;
if (tau->detail(xAOD::TauJetParameters::SumPtTrkFrac, detail)){
} return detail;});
- fill(monGroup, centFrac,ChPiEMEOverCaloEME,emPOverTrkSysP,etOverPtLeadTrk,innerTrkAvgDist,ptRatioEflowApprox,sumPtTrkFrac);
+ fill(monGroup, CentFrac,ChPiEMEOverCaloEME,EMPOverTrkSys,etOverPtLeadTrk,innerTrkAvgDist,ptRatioEflowApprox,SumPtTrkFrac);
}
else if(nProng=="MP"){
@@ -470,7 +471,7 @@ void TrigTauMonitorAlgorithm::fillBDTNoCorr(const std::string trigger, std::vect
float detail = -999;
if (tau->detail(xAOD::TauJetParameters::trFlightPathSig, detail)){
} return detail;});
- fill(monGroup, centFrac,ChPiEMEOverCaloEME,emPOverTrkSysP,etOverPtLeadTrk,innerTrkAvgDist,ptRatioEflowApprox,dRmax,massTrkSys,mEflowApprox,trFlightPathSig);
+ fill(monGroup, CentFrac,ChPiEMEOverCaloEME,EMPOverTrkSys,etOverPtLeadTrk,innerTrkAvgDist,ptRatioEflowApprox,dRmax,massTrkSys,mEflowApprox,trFlightPathSig);
}
}
@@ -581,15 +582,15 @@ void TrigTauMonitorAlgorithm::fillRNNTrack(const std::string trigger, std::vecto
auto track_pt_log = Monitored::Collection("track_pt_log", tracks, [](const xAOD::TauTrack *track){return TMath::Log10( track->pt()); });
- auto track_dEta = Monitored::Collection("tracks_dEta", tracks, [&tau](const xAOD::TauTrack *track){auto ddeta=track->eta()- tau->eta();return ddeta; });
+ auto track_dEta = Monitored::Collection("track_dEta", tracks, [&tau](const xAOD::TauTrack *track){auto ddeta=track->eta()- tau->eta();return ddeta; });
- auto track_dPhi = Monitored::Collection("tracks_dPhi", tracks, [&tau](const xAOD::TauTrack *track){return track->p4().DeltaPhi(tau->p4());});
+ auto track_dPhi = Monitored::Collection("track_dPhi", tracks, [&tau](const xAOD::TauTrack *track){return track->p4().DeltaPhi(tau->p4());});
- auto track_z0sinThetaTJVA_abs_log = Monitored::Collection("tracks_z0sinThetaTJVA_abs_log", tracks, [&tau](const xAOD::TauTrack *track){return track->z0sinThetaTJVA(*tau); });
+ auto track_z0sinThetaTJVA_abs_log = Monitored::Collection("track_z0sinThetaTJVA_abs_log", tracks, [&tau](const xAOD::TauTrack *track){return track->z0sinThetaTJVA(*tau); });
- auto track_d0_abs_log = Monitored::Collection("tracks_d0_abs_log", tracks, [](const xAOD::TauTrack *track){return TMath::Log10( TMath::Abs(track->track()->d0()) + 1e-6); });
+ auto track_d0_abs_log = Monitored::Collection("track_d0_abs_log", tracks, [](const xAOD::TauTrack *track){return TMath::Log10( TMath::Abs(track->track()->d0()) + 1e-6); });
- auto track_nIBLHitsAndExp = Monitored::Collection("tracks_nIBLHitsAndExp", tracks, [](const xAOD::TauTrack *track){
+ auto track_nIBLHitsAndExp = Monitored::Collection("track_nIBLHitsAndExp", tracks, [](const xAOD::TauTrack *track){
uint8_t inner_pixel_hits, inner_pixel_exp;
const auto success1_innerPixel_hits = track->track()->summaryValue(inner_pixel_hits, xAOD::numberOfInnermostPixelLayerHits);
const auto success2_innerPixel_exp = track->track()->summaryValue(inner_pixel_exp, xAOD::expectInnermostPixelLayerHit);
@@ -597,7 +598,7 @@ void TrigTauMonitorAlgorithm::fillRNNTrack(const std::string trigger, std::vecto
if (success1_innerPixel_hits && success2_innerPixel_exp) {detail=inner_pixel_exp ? inner_pixel_hits : 1.;};
return detail; });
- auto track_nPixelHitsPlusDeadSensors = Monitored::Collection("tracks_nPixelHitsPlusDeadSensors", tracks, [](const xAOD::TauTrack *track){
+ auto track_nPixelHitsPlusDeadSensors = Monitored::Collection("track_nPixelHitsPlusDeadSensors", tracks, [](const xAOD::TauTrack *track){
uint8_t pixel_hits, pixel_dead;
const auto success1_pixel_hits = track->track()->summaryValue(pixel_hits, xAOD::numberOfPixelHits);
const auto success2_pixel_dead = track->track()->summaryValue(pixel_dead, xAOD::numberOfPixelDeadSensors);
@@ -605,7 +606,7 @@ void TrigTauMonitorAlgorithm::fillRNNTrack(const std::string trigger, std::vecto
if (success1_pixel_hits && success2_pixel_dead) {detail=pixel_hits + pixel_dead;};
return detail; });
- auto track_nSCTHitsPlusDeadSensors = Monitored::Collection("tracks_nSCTHitsPlusDeadSensors", tracks, [](const xAOD::TauTrack *track){
+ auto track_nSCTHitsPlusDeadSensors = Monitored::Collection("track_nSCTHitsPlusDeadSensors", tracks, [](const xAOD::TauTrack *track){
uint8_t sct_hits, sct_dead;
const auto success1_sct_hits = track->track()->summaryValue(sct_hits, xAOD::numberOfSCTHits);
const auto success2_sct_dead = track->track()->summaryValue(sct_dead, xAOD::numberOfSCTDeadSensors);
@@ -623,7 +624,7 @@ void TrigTauMonitorAlgorithm::fillRNNTrack(const std::string trigger, std::vecto
void TrigTauMonitorAlgorithm::fillRNNCluster(const std::string trigger, std::vector<const xAOD::TauJet*> tau_vec, bool online) const
{
- ATH_MSG_DEBUG("Fill RNN input Cluster: " << trigger);
+ ATH_MSG_DEBUG("Fill RNN input Cluster: " << trigger << " for online/offline " << online);
auto monGroup = getGroup(trigger+( online ? "_RNN_HLT_InputCluster" : "_RNN_Offline_InputCluster"));
@@ -677,25 +678,25 @@ void TrigTauMonitorAlgorithm::fillRNNCluster(const std::string trigger, std::vec
auto cluster_et_log = Monitored::Collection("cluster_et_log",clusters, [](const xAOD::CaloCluster *cluster){return TMath::Log10( cluster->et()); });
auto cluster_dEta = Monitored::Collection("cluster_dEta", clusters, [&tau](const xAOD::CaloCluster *cluster){auto ddeta=cluster->eta()- tau->eta();return ddeta; });
auto cluster_dPhi = Monitored::Collection("cluster_dPhi", clusters, [&tau](const xAOD::CaloCluster *cluster){return cluster->p4().DeltaPhi(tau->p4()); });
- auto cluster_log_SECOND_R = Monitored::Collection("cluster_log_SECOND_R", clusters, [](const xAOD::CaloCluster *cluster){
+ auto cluster_SECOND_R_log10 = Monitored::Collection("cluster_SECOND_R_log10", clusters, [](const xAOD::CaloCluster *cluster){
double detail = -999.;
const auto success_SECOND_R = cluster->retrieveMoment(xAOD::CaloCluster::MomentType::SECOND_R,detail);
if (success_SECOND_R) detail = TMath::Log10(detail + 0.1);
return detail;});
- auto cluster_SECOND_LAMBDA = Monitored::Collection("cluster_SECOND_LAMBDA", clusters, [](const xAOD::CaloCluster *cluster){
+ auto cluster_SECOND_LAMBDA_log10 = Monitored::Collection("cluster_SECOND_LAMBDA_log10", clusters, [](const xAOD::CaloCluster *cluster){
double detail = -999.;
const auto success_SECOND_LAMBDA = cluster->retrieveMoment(xAOD::CaloCluster::MomentType::SECOND_LAMBDA, detail);
if (success_SECOND_LAMBDA) detail = TMath::Log10(detail + 0.1);
return detail;});
- auto cluster_CENTER_LAMBDA = Monitored::Collection("cluster_CENTER_LAMBDA", clusters, [](const xAOD::CaloCluster *cluster){
+ auto cluster_CENTER_LAMBDA_log10 = Monitored::Collection("cluster_CENTER_LAMBDA_log10", clusters, [](const xAOD::CaloCluster *cluster){
double detail = -999.;
const auto success_CENTER_LAMBDA = cluster->retrieveMoment(xAOD::CaloCluster::MomentType::CENTER_LAMBDA, detail);
if (success_CENTER_LAMBDA) detail = TMath::Log10(detail + 1e-6);
return detail;});
- fill(monGroup,cluster_pt_jetseed_log,cluster_et_log,cluster_dEta,cluster_dPhi,cluster_log_SECOND_R,cluster_SECOND_LAMBDA,cluster_CENTER_LAMBDA);
+ fill(monGroup,cluster_pt_jetseed_log,cluster_et_log,cluster_dEta,cluster_dPhi,cluster_SECOND_R_log10,cluster_SECOND_LAMBDA_log10,cluster_CENTER_LAMBDA_log10);
}
ATH_MSG_DEBUG("After fill RNN input Cluster: " << trigger);
--
GitLab
From eeaf3017752ca01cb6dfbe6b94587ee36f1ca0e7 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Wed, 18 Aug 2021 08:10:22 +0200
Subject: [PATCH 123/272] TrigDecisionMakerMT: remove support of legacy trigger
configuration
Remove support of XML-based trigger configuration in
`TrigDecisionMakerMT` (ATR-21862).
---
.../TrigDecisionMaker/CMakeLists.txt | 2 +-
.../python/TrigDecisionMakerConfig.py | 3 -
.../src/Lvl1ResultAccessTool.h | 2 +-
.../src/TrigDecisionMakerMT.cxx | 62 +++++--------------
.../src/TrigDecisionMakerMT.h | 8 ---
5 files changed, 19 insertions(+), 58 deletions(-)
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/CMakeLists.txt b/Trigger/TrigAnalysis/TrigDecisionMaker/CMakeLists.txt
index 0a404ae1819f..53f81b265fe2 100644
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/CMakeLists.txt
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/CMakeLists.txt
@@ -18,7 +18,7 @@ atlas_add_component( TrigDecisionMaker
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps EventInfo TrigConfData TrigConfHLTData TrigConfInterfaces TrigConfL1Data TrigDecisionEvent TrigDecisionMakerLib TrigOutputHandlingLib TrigSteeringEvent TrigT1Interfaces TrigT1Result xAODEventInfo xAODTrigger )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps EventInfo GaudiKernel TrigConfData TrigConfHLTData TrigConfInterfaces TrigConfL1Data TrigDecisionEvent TrigDecisionMakerLib TrigOutputHandlingLib TrigSteeringEvent TrigT1Interfaces TrigT1Result xAODEventInfo xAODTrigger )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/python/TrigDecisionMakerConfig.py b/Trigger/TrigAnalysis/TrigDecisionMaker/python/TrigDecisionMakerConfig.py
index 64cd37e28125..b71877e3ae48 100644
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/python/TrigDecisionMakerConfig.py
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/python/TrigDecisionMakerConfig.py
@@ -23,10 +23,7 @@ class TrigDecisionMakerMT( TrigDec__TrigDecisionMakerMT ):
__slots__ = []
def __init__(self, name = "TrigDecMakerMT"):
super( TrigDecisionMakerMT, self ).__init__( name )
- log = logging.getLogger( 'TrigDecisionMakerMT' )
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- log.info("Setting UseNewConfig to %s", ConfigFlags.Trigger.readLVL1FromJSON)
- self.UseNewConfigL1 = ConfigFlags.Trigger.readLVL1FromJSON
self.Lvl1ResultAccessTool.UseNewConfig = ConfigFlags.Trigger.readLVL1FromJSON
# Schedule also the prescale conditions algs
from AthenaCommon.Configurable import Configurable
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/src/Lvl1ResultAccessTool.h b/Trigger/TrigAnalysis/TrigDecisionMaker/src/Lvl1ResultAccessTool.h
index 5ae4746b7ae5..ffe037b202bd 100755
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/src/Lvl1ResultAccessTool.h
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/src/Lvl1ResultAccessTool.h
@@ -11,6 +11,7 @@
#include "TrigConfData/L1PrescalesSet.h"
#include "TrigT1Interfaces/CPRoIDecoder.h"
#include "TrigT1Interfaces/JEPRoIDecoder.h"
+#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
#include <vector>
#include <bitset>
@@ -18,7 +19,6 @@
// forward declarations
namespace TrigConf {
- class ILVL1ConfigSvc;
class TriggerThreshold;
}
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.cxx b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.cxx
index ca13b8d76752..3007a5d9d5b1 100644
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.cxx
@@ -23,9 +23,6 @@
#include "xAODTrigger/TrigDecisionAuxInfo.h"
-#include "TrigConfL1Data/BunchGroupSet.h"
-#include "TrigConfHLTData/HLTChainList.h"
-#include "TrigConfHLTData/HLTUtils.h"
#include "TrigConfData/L1BunchGroupSet.h"
#include <boost/dynamic_bitset.hpp>
@@ -60,8 +57,6 @@ TrigDec::TrigDecisionMakerMT::initialize()
ATH_CHECK( m_trigDecisionKeyOut.initialize() );
ATH_CHECK( m_lvl1Tool.retrieve() );
- ATH_CHECK(m_l1ConfigSvc.retrieve());
- ATH_CHECK(m_hltConfigSvc.retrieve());
return StatusCode::SUCCESS;
}
@@ -92,16 +87,9 @@ TrigDec::TrigDecisionMakerMT::execute(const EventContext &context) const
std::unique_ptr<xAOD::TrigDecisionAuxInfo> trigDecAux = std::make_unique<xAOD::TrigDecisionAuxInfo>();
trigDec->setStore(trigDecAux.get());
- if (m_useNewConfigHLT)
- {
- SG::ReadHandle<TrigConf::HLTMenu> hltMenu(m_HLTMenuKey, context);
- ATH_CHECK(hltMenu.isValid());
- trigDec->setSMK(hltMenu->smk());
- }
- else
- {
- trigDec->setSMK(m_hltConfigSvc->masterKey());
- }
+ SG::ReadHandle<TrigConf::HLTMenu> hltMenu(m_HLTMenuKey, context);
+ ATH_CHECK(hltMenu.isValid());
+ trigDec->setSMK(hltMenu->smk());
if (m_doL1) {
const LVL1CTP::Lvl1Result* l1Result = nullptr;
@@ -214,41 +202,25 @@ TrigDec::TrigDecisionMakerMT::getL1Result(const LVL1CTP::Lvl1Result *&result, co
char TrigDec::TrigDecisionMakerMT::getBGByte(unsigned int bcId) const
{
- if (bcId >= 3564)
- { // LHC has 3564 bunch crossings
+ if (bcId >= 3564) { // LHC has 3564 bunch crossings
ATH_MSG_WARNING("Could not return BGCode for bunch crossing ID " << bcId << ", which is outside allowed range 0..3563 ");
return 0;
}
- if (m_useNewConfigL1)
- {
- const TrigConf::L1BunchGroupSet *l1bgs = nullptr;
- detStore()->retrieve(l1bgs).ignore();
- if (l1bgs)
- {
- char bgword = 0;
- for (size_t i = 0; i < l1bgs->maxNBunchGroups(); ++i)
- {
- auto bg = l1bgs->getBunchGroup(i);
- if (bg->contains(bcId))
- {
- bgword += 1 << i;
- }
+
+ const TrigConf::L1BunchGroupSet *l1bgs = nullptr;
+ detStore()->retrieve(l1bgs).ignore();
+ if (l1bgs) {
+ char bgword = 0;
+ for (size_t i = 0; i < l1bgs->maxNBunchGroups(); ++i) {
+ auto bg = l1bgs->getBunchGroup(i);
+ if (bg->contains(bcId)) {
+ bgword += 1 << i;
}
- return bgword;
- }
- else
- {
- ATH_MSG_WARNING("Did not find L1BunchGroupSet in DetectorStore");
- return 0;
}
+ return bgword;
}
- else
- {
- const TrigConf::BunchGroupSet *bgs = m_l1ConfigSvc->bunchGroupSet();
- if (!bgs) {
- ATH_MSG_WARNING ("Could not get BunchGroupSet to calculate BGByte");
- return 0;
- }
- return bgs->bgPattern()[bcId];
+ else {
+ ATH_MSG_WARNING("Did not find L1BunchGroupSet in DetectorStore");
+ return 0;
}
}
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.h b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.h
index 9d24b4170e1c..3bc06fe2e5b0 100644
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.h
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.h
@@ -34,8 +34,6 @@
#include "TrigT1Result/RoIBResult.h"
#include "TrigSteeringEvent/HLTResultMT.h"
#include "TrigOutputHandling/ITriggerBitsMakerTool.h"
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
-#include "TrigConfInterfaces/IHLTConfigSvc.h"
#include "TrigConfData/HLTMenu.h"
// containers
@@ -82,13 +80,7 @@ namespace TrigDec {
Gaudi::Property<bool> m_doL1{this, "doL1", true, "Read L1 trigger information"};
Gaudi::Property<bool> m_doHLT{this, "doHLT", true, "Read HLT trigger information"};
- Gaudi::Property<bool> m_useNewConfigL1{this, "UseNewConfigL1", true, "When true, read the menu from detector store, when false use the L1ConfigSvc"};
- Gaudi::Property<bool> m_useNewConfigHLT{this, "UseNewConfigHLT", true, "When true, read the menu from detector store, when false use the HLTConfigSvc"};
-
// Tools & services
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_l1ConfigSvc{this, "LVL1ConfigSvc", "LVL1ConfigSvc", "The LVL1ConfigSvc providing L1 configuration for Run 2"};
- ServiceHandle<TrigConf::IHLTConfigSvc> m_hltConfigSvc{this, "HLTConfigSvc", "HLTConfigSvc", "The HLTConfigSvc providing HLT configuration for Run 2"};
-
ToolHandle<HLT::ILvl1ResultAccessTool> m_lvl1Tool{this, "Lvl1ResultAccessTool", "HLT::Lvl1ResultAccessTool/Lvl1ResultAccessTool", "L1 tool to fetch"}; //!< tool to ease the access to the L1 results (RoIs, items, etc)
ToolHandle<ITriggerBitsMakerTool> m_bitsMakerTool{this, "BitsMakerTool", "", "Tool to create trigger bits for MC"};
--
GitLab
From 365155d5bc43980fcc3a9a02ac666a3b50e582ac Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Wed, 18 Aug 2021 10:50:58 +0200
Subject: [PATCH 124/272] TrigT1Result: delete RecRoIBResult
Delete unused `RecRoIBResult` class and its converter (tool). Even in
Run-2 this class was not being used. Instead the individual RoI classes
were used directly in the HLT.
---
.../share/BSAddProvSvc_RIO_jobOptions.py | 1 -
.../share/Level1Overlay_jobOptions.py | 1 -
Trigger/TrigT1/TrigT1Result/CMakeLists.txt | 7 +-
.../TrigT1Result/TrigT1Result/RecRoIBResult.h | 58 -----
Trigger/TrigT1/TrigT1Result/doc/packagedoc.h | 3 +-
.../TrigT1/TrigT1Result/src/RecRoIBResult.cxx | 35 ----
.../TrigT1Result/test/type_trait_tests.cxx | 4 +-
.../TrigT1ResultByteStream/CMakeLists.txt | 2 +-
.../src/RecRoIBResultByteStreamCnv.h | 64 ------
.../src/RecRoIBResultByteStreamCnv.icc | 95 ---------
.../src/RecRoIBResultByteStreamTool.cxx | 198 ------------------
.../src/RecRoIBResultByteStreamTool.h | 117 -----------
.../TrigT1ResultByteStream_entries.cxx | 5 -
Trigger/TrigT1/TrigT1RoIB/doc/packagedoc.h | 2 +-
14 files changed, 8 insertions(+), 584 deletions(-)
delete mode 100755 Trigger/TrigT1/TrigT1Result/TrigT1Result/RecRoIBResult.h
delete mode 100755 Trigger/TrigT1/TrigT1Result/src/RecRoIBResult.cxx
delete mode 100644 Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamCnv.h
delete mode 100755 Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamCnv.icc
delete mode 100755 Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamTool.cxx
delete mode 100644 Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamTool.h
diff --git a/Event/ByteStreamCnvSvcBase/share/BSAddProvSvc_RIO_jobOptions.py b/Event/ByteStreamCnvSvcBase/share/BSAddProvSvc_RIO_jobOptions.py
index d0356bb32b7d..af9729696e86 100755
--- a/Event/ByteStreamCnvSvcBase/share/BSAddProvSvc_RIO_jobOptions.py
+++ b/Event/ByteStreamCnvSvcBase/share/BSAddProvSvc_RIO_jobOptions.py
@@ -56,7 +56,6 @@ if DetFlags.readRIOBS.CSC_on():
if DetFlags.readRIOBS.LVL1_on():
svcMgr.ByteStreamAddressProviderSvc.TypeNames += [
- "ROIB::RecRoIBResult/RecRoIBResult",
"MuCTPI_RIO/MUCTPI_RIO",
"CTP_RIO/CTP_RIO"
]
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Level1Overlay_jobOptions.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Level1Overlay_jobOptions.py
index cbb10b07fb31..788e0d678f6a 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Level1Overlay_jobOptions.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Level1Overlay_jobOptions.py
@@ -17,7 +17,6 @@ if DetFlags.overlay.LVL1_on():
"MuCTPI_RDO/MUCTPI_RDO",
"L2Result/L2Result",
"CTP_RDO/CTP_RDO",
- "ROIB::RecRoIBResult/RecRoIBResult",
"MuCTPI_RIO/MUCTPI_RIO",
"CTP_RIO/CTP_RIO"
]
diff --git a/Trigger/TrigT1/TrigT1Result/CMakeLists.txt b/Trigger/TrigT1/TrigT1Result/CMakeLists.txt
index e538f9a9105d..79bd23a7822a 100644
--- a/Trigger/TrigT1/TrigT1Result/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1Result/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigT1Result )
@@ -11,14 +11,15 @@ atlas_add_library( TrigT1Result
src/*.cxx
PUBLIC_HEADERS TrigT1Result
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthenaKernel L1TopoRDO TrigT1Interfaces TrigT1MuctpiBits
- PRIVATE_LINK_LIBRARIES GaudiKernel )
+ LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthenaKernel AthenaBaseComps L1TopoRDO TrigT1MuctpiBits
+ PRIVATE_LINK_LIBRARIES GaudiKernel TrigT1Interfaces )
atlas_add_dictionary( TrigT1ResultDict
TrigT1Result/TrigT1ResultDict.h
TrigT1Result/selection.xml
LINK_LIBRARIES TrigT1Result )
+# Tests in the package:
atlas_add_test( TrigT1Result_test
SOURCES test/type_trait_tests.cxx
LINK_LIBRARIES TrigT1Result )
diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/RecRoIBResult.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/RecRoIBResult.h
deleted file mode 100755
index ad3bece1b2ed..000000000000
--- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/RecRoIBResult.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-/* **********************************************************
-*
-* RecRoIBResult is the L1 reconstructed RDO structure
-* Author: Thomas Schoerner-Sadenius <thomas.schoerner@cern.ch>
-*
-********************************************************** */
-#ifndef TRIGT1RESULT_RECROIBRESULT_H
-#define TRIGT1RESULT_RECROIBRESULT_H
-
-// STL include(s):
-#include <vector>
-
-// TrigT1 include(s):
-#include "TrigT1Interfaces/RecEmTauRoI.h"
-#include "TrigT1Interfaces/RecMuonRoI.h"
-#include "TrigT1Interfaces/RecJetRoI.h"
-
-namespace ROIB {
-
- class RecRoIBResult {
-
- public:
-
- /* Empty constructor */
- RecRoIBResult() = default;
-
- /* Full Constructor */
- RecRoIBResult( std::vector< LVL1::RecEmTauRoI >&& recEmTauRoIs,
- std::vector< LVL1::RecMuonRoI >&& recMuonRoIs,
- std::vector< LVL1::RecJetRoI >&& recJetRoIs );
-
-
- /* Gets the RecEmTauRoI part of the L1 reconstructed RDO */
- const std::vector< LVL1::RecEmTauRoI >& recEmTauRoIVector() const;
- /* Gets the RecMuonRoI part of the L1 reconstructed RDO */
- const std::vector< LVL1::RecMuonRoI >& recMuonRoIVector() const;
- /* Gets the RecJetRoI part of the L1 reconstructed RDO */
- const std::vector< LVL1::RecJetRoI >& recJetRoIVector() const;
-
- private:
- /* The members - vectors for Muon, EmTau, Jet and Energy RoIs */
- std::vector<LVL1::RecEmTauRoI> m_recRoIBResult_RecEmTauRoIVector;
- std::vector<LVL1::RecMuonRoI> m_recRoIBResult_RecMuonRoIVector;
- std::vector<LVL1::RecJetRoI> m_recRoIBResult_RecJetRoIVector;
-
- }; // class RecRoIBResult
-
-} // namespace ROIB
-
-/* The RecRoIBResult class_def part, defining a CLID of 6001 */
-#include "AthenaKernel/CLASS_DEF.h"
-CLASS_DEF( ROIB::RecRoIBResult , 6001 , 0 )
-
-#endif // TRIGT1RESULT_RECROIBRESULT_H
diff --git a/Trigger/TrigT1/TrigT1Result/doc/packagedoc.h b/Trigger/TrigT1/TrigT1Result/doc/packagedoc.h
index a1eb411ee336..d2e787e2c2cf 100644
--- a/Trigger/TrigT1/TrigT1Result/doc/packagedoc.h
+++ b/Trigger/TrigT1/TrigT1Result/doc/packagedoc.h
@@ -20,7 +20,6 @@ Usually they are written to RDO or BS files.
Result classes:
- ROIB::RoIBResult
- - ROIB::RecRoIBResult
- ROIB::CTPResult
- ROIB::MuCTPIResult
- ROIB::EMTauResult
@@ -44,7 +43,7 @@ Usually they are written to RDO or BS files.
- ROIB::Header
- ROIB::Trailer
- For all classes, except ROIB::RecRoIBResult, a dictionary exist.
+ For all classes a dictionary exists.
See @link TrigT1ResultDict.h @endlink and @link selection.xml @endlink for more details.
@section TrigT1Result_TrigT1Result Extra Pages
diff --git a/Trigger/TrigT1/TrigT1Result/src/RecRoIBResult.cxx b/Trigger/TrigT1/TrigT1Result/src/RecRoIBResult.cxx
deleted file mode 100755
index d7002a720bba..000000000000
--- a/Trigger/TrigT1/TrigT1Result/src/RecRoIBResult.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-
-// Local include(s):
-#include "TrigT1Result/RecRoIBResult.h"
-
-using namespace std;
-
-namespace ROIB {
-
- RecRoIBResult::RecRoIBResult( std::vector< LVL1::RecEmTauRoI >&& recEmTauRoIs,
- std::vector< LVL1::RecMuonRoI >&& recMuonRoIs,
- std::vector< LVL1::RecJetRoI >&& recJetRoIs )
- : m_recRoIBResult_RecEmTauRoIVector( std::move(recEmTauRoIs) ),
- m_recRoIBResult_RecMuonRoIVector( std::move(recMuonRoIs) ),
- m_recRoIBResult_RecJetRoIVector( std::move(recJetRoIs) ) {
-
- }
-
-
- const vector< LVL1::RecEmTauRoI >& RecRoIBResult::recEmTauRoIVector() const {
- return m_recRoIBResult_RecEmTauRoIVector;
- }
-
- const vector< LVL1::RecMuonRoI >& RecRoIBResult::recMuonRoIVector() const {
- return m_recRoIBResult_RecMuonRoIVector;
- }
-
- const vector< LVL1::RecJetRoI >& RecRoIBResult::recJetRoIVector() const {
- return m_recRoIBResult_RecJetRoIVector;
- }
-
-} // namespace ROIB
diff --git a/Trigger/TrigT1/TrigT1Result/test/type_trait_tests.cxx b/Trigger/TrigT1/TrigT1Result/test/type_trait_tests.cxx
index 27dba986eeed..8dde489c1cb4 100755
--- a/Trigger/TrigT1/TrigT1Result/test/type_trait_tests.cxx
+++ b/Trigger/TrigT1/TrigT1Result/test/type_trait_tests.cxx
@@ -2,7 +2,6 @@
#include "TrigT1Result/MuCTPIRoI.h"
#include "TrigT1Result/MuCTPIResult.h"
#include "TrigT1Result/MuCTPI_RDO.h"
-#include "TrigT1Result/RecRoIBResult.h"
#include "TrigT1Result/RoIBResult.h"
#include "TrigT1Result/MuCTPI_MultiplicityWord_Decoder.h"
#include "TrigT1Result/MuCTPI_DataWord_Decoder.h"
@@ -33,7 +32,6 @@ int main(){
- static_assert(std::is_nothrow_move_constructible<RecRoIBResult>::value);
static_assert(std::is_nothrow_move_constructible<RoIBResult>::value);
static_assert(std::is_trivially_copy_constructible<MuCTPI_MultiplicityWord_Decoder>::value);
static_assert(std::is_trivially_destructible<MuCTPI_MultiplicityWord_Decoder>::value);
@@ -59,4 +57,4 @@ int main(){
// static_assert(std::is_trivially_copy_constructible<CTP_RIO>::value);
// static_assert(std::is_trivially_copy_constructible<CTP_RDO>::value);
return 0;
-}
\ No newline at end of file
+}
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/CMakeLists.txt b/Trigger/TrigT1/TrigT1ResultByteStream/CMakeLists.txt
index 90af52a29357..2fe1f120756e 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/CMakeLists.txt
@@ -17,7 +17,7 @@ atlas_add_component( TrigT1ResultByteStream
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps AthenaKernel ByteStreamCnvSvcBaseLib ByteStreamCnvSvcLib ByteStreamData GaudiKernel L1TopoRDO StoreGateLib TrigConfInterfaces TrigConfL1Data TrigT1Interfaces TrigT1Result TrigT1ResultByteStreamLib xAODTrigger )
+ LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps AthenaKernel ByteStreamCnvSvcBaseLib ByteStreamData GaudiKernel L1TopoRDO StoreGateLib TrigConfInterfaces TrigConfL1Data TrigT1Interfaces TrigT1Result TrigT1ResultByteStreamLib xAODTrigger )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamCnv.h
deleted file mode 100644
index 360d2846f8c4..000000000000
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamCnv.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGT1RESULTBYTESTREAM_RECROIBRESULTBYTESTREAMCNV_H
-#define TRIGT1RESULTBYTESTREAM_RECROIBRESULTBYTESTREAMCNV_H
-
-// Local includes
-#include "RecRoIBResultByteStreamTool.h"
-
-// Athena includes
-#include "AthenaBaseComps/AthMessaging.h"
-#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
-
-// Gaudi includes
-#include "GaudiKernel/Converter.h"
-#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/ToolHandle.h"
-
-
-/**
- * @short ByteStream converter for the RecRoIBResult object
- *
- * This converter takes care of creating the RecRoIBResult objects
- * from BS data. It's kind of tricky as multiple ROB fragments are
- * needed to create a single RecRoIBResult object.
- *
- * @see RecRoIBResultByteStreamTool
- *
- * @author Tadashi Maeno
- * @author Attila Krasznahorkay
- * @date $Date: 2009-02-23 21:23:03 $
- */
-template< class ROBF >
-class RecRoIBResultByteStreamCnv : public Converter, public AthMessaging {
-
-public:
- /// Standard constructor
- RecRoIBResultByteStreamCnv( ISvcLocator* svcloc );
-
- /// Function connecting to all the needed services/tools
- virtual StatusCode initialize();
- /// Function creating the RecRoIBResult object from the RoIB ROB fragments
- virtual StatusCode createObj( IOpaqueAddress* pAddr, DataObject*& pObj );
-
- /// Function needed by the framework
- virtual long repSvcType() const { return i_repSvcType(); }
- /// Function needed by the framework
- static long storageType();
- /// Function needed by the framework
- static const CLID& classID();
-
-private:
- /// Tool doing the actual conversion
- ToolHandle< RecRoIBResultByteStreamTool > m_tool;
- /// Service used when reading the BS data
- ServiceHandle< IROBDataProviderSvc > m_robDataProviderSvc;
-
-}; // class RecRoIBResultByteStreamCnv
-
-// Include the implementation:
-#include "RecRoIBResultByteStreamCnv.icc"
-
-#endif // TRIGT1RESULTBYTESTREAM_RECROIBRESULTBYTESTREAMCNV_H
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamCnv.icc b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamCnv.icc
deleted file mode 100755
index 7528bc3a33aa..000000000000
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamCnv.icc
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGT1RESULTBYTESTREAM_RECROIBRESULTBYTESTREAMCNV_ICC
-#define TRIGT1RESULTBYTESTREAM_RECROIBRESULTBYTESTREAMCNV_ICC
-
-// Trigger includes
-#include "TrigT1Result/RecRoIBResult.h"
-
-// Athena includes
-#include "ByteStreamCnvSvc/ByteStreamCnvSvc.h"
-#include "AthenaKernel/StorableConversions.h"
-
-/**
- * The constructor sets up the ToolHandle object(s) and initialises the
- * base class in the correct way.
- */
-template< class ROBF >
-RecRoIBResultByteStreamCnv< ROBF >::RecRoIBResultByteStreamCnv( ISvcLocator* svcloc )
- : Converter( storageType(), classID(), svcloc ),
- AthMessaging( msgSvc(), "RecRoIBResultByteStreamCnv" ),
- m_tool( "RecRoIBResultByteStreamTool" ),
- m_robDataProviderSvc( "ROBDataProviderSvc", "RoIBResultByteStreamCnv" ) {
-
-}
-
-/**
- * Function telling the framework the Class ID of the object that this converter
- * is for (RecRoIBResult).
- */
-template< class ROBF >
-const CLID& RecRoIBResultByteStreamCnv< ROBF >::classID() {
-
- return ClassID_traits<ROIB::RecRoIBResult>::ID();
-
-}
-
-template< class ROBF >
-long RecRoIBResultByteStreamCnv< ROBF >::storageType() {
- return ByteStreamAddress::storageType();
-}
-
-/**
- * Init method gets all necessary services etc.
- */
-template< class ROBF >
-StatusCode RecRoIBResultByteStreamCnv< ROBF >::initialize() {
- //
- // Initialise the base class:
- //
- ATH_CHECK( Converter::initialize() );
- ATH_MSG_DEBUG("In initialize()");
-
- //
- // Get ROBDataProviderSvc:
- //
- ATH_CHECK( m_robDataProviderSvc.retrieve() );
- ATH_MSG_DEBUG("Retrieved ROBDataProviderSvc");
-
- //
- // Get RecRoIBResultByteStreamTool:
- //
- ATH_CHECK( m_tool.retrieve() );
- ATH_MSG_DEBUG("Retrieved RecRoIBResultByteStreamTool");
-
- return StatusCode::SUCCESS;
-
-}
-
-/**
- * This function creates the RecRoIBResult object from the BS data. It collects all the
- * ROB fragments coming from the RoI Builder and gives them to RecRoIBResultByteStreamTool
- * for conversion.
- */
-template< class ROBF >
-StatusCode RecRoIBResultByteStreamCnv< ROBF >::createObj( IOpaqueAddress* /*pAddr*/, DataObject*& pObj ) {
- ATH_MSG_DEBUG("createObj() called");
-
- ROIB::RecRoIBResult* result = new ROIB::RecRoIBResult;
-
- IROBDataProviderSvc::VROBFRAG vrobf;
- m_robDataProviderSvc->getROBData(m_tool->configuredROBIds(), vrobf, "RecRoIBResultByteStreamCnv");
-
- // Convert to Object
- ATH_CHECK( m_tool->convert( vrobf, *result ) );
-
- ATH_MSG_DEBUG("Conversion done");
-
- pObj = SG::asStorable( result );
- return StatusCode::SUCCESS;
-
-}
-
-#endif // TRIGT1RESULTBYTESTREAM_RECROIBRESULTBYTESTREAMCNV_ICC
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamTool.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamTool.cxx
deleted file mode 100755
index 059cd2887f38..000000000000
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamTool.cxx
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
-
-// Local includes:
-#include "RecRoIBResultByteStreamTool.h"
-
-// Trigger includes:
-#include "TrigConfL1Data/CTPConfig.h"
-#include "TrigConfL1Data/L1DataDef.h"
-#include "TrigT1Interfaces/RecEmTauRoI.h"
-#include "TrigT1Interfaces/RecMuonRoI.h"
-#include "TrigT1Interfaces/RecJetRoI.h"
-#include "TrigT1Result/RecRoIBResult.h"
-
-// TDAQ includes:
-#include "eformat/SourceIdentifier.h"
-
-// System includes
-#include <sstream>
-
-using DataType = OFFLINE_FRAGMENTS_NAMESPACE::PointerType;
-using OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment;
-
-/**
- * The constructor takes care of correctly constructing the base class and
- * declaring the tool's interface to the framework.
- */
-RecRoIBResultByteStreamTool::RecRoIBResultByteStreamTool( const std::string& type,
- const std::string& name,
- const IInterface* parent )
- : AthAlgTool( type, name, parent ) {}
-
-/**
- * @brief Initialise the tool
- *
- * Retrieve services and thresholds configuration, fill the vector of configured ROB IDs and print the module IDs
- * to debug message stream
- */
-StatusCode RecRoIBResultByteStreamTool::initialize() {
- ATH_MSG_DEBUG("Initialising RecRoIBResultByteStreamTool");
- // ---------------------------------------------------------------------------
- // Initialise service handles
- // ---------------------------------------------------------------------------
- ATH_CHECK(m_configSvc.retrieve());
- ATH_CHECK(m_rpcRoITool.retrieve());
- ATH_CHECK(m_tgcRoITool.retrieve());
-
- // ---------------------------------------------------------------------------
- // Load the threshold vectors
- // ---------------------------------------------------------------------------
- const std::vector<TrigConf::TriggerThreshold*> &thresholds = m_configSvc->ctpConfig()->menu().thresholdVector();
- for (TrigConf::TriggerThreshold* threshold : thresholds) {
- switch (threshold->ttype()) {
- case TrigConf::L1DataDef::TriggerType::MUON:
- m_muonConfig.push_back(threshold);
- break;
- case TrigConf::L1DataDef::TriggerType::EM:
- case TrigConf::L1DataDef::TriggerType::TAU:
- m_emtauConfig.push_back(threshold);
- break;
- case TrigConf::L1DataDef::TriggerType::JET:
- case TrigConf::L1DataDef::TriggerType::JF:
- case TrigConf::L1DataDef::TriggerType::JB:
- m_jetConfig.push_back(threshold);
- break;
- default:
- break;
- }
- }
-
- // ---------------------------------------------------------------------------
- // Fill the vector of configured ROB IDs and print the module IDs to debug message stream
- // ---------------------------------------------------------------------------
- std::vector<eformat::helper::SourceIdentifier> configuredROBSIDs;
- std::ostringstream str;
- ATH_MSG_DEBUG("Configured module IDs for:");
-
- // MUCTPI
- configuredROBSIDs.emplace_back(eformat::TDAQ_MUON_CTP_INTERFACE, m_muCTPIModuleID);
- ATH_MSG_DEBUG(" muCTPi = 0x" << MSG::hex << m_muCTPIModuleID.value() << MSG::dec);
-
- // Jet/Energy
- str.str("");
- for (const uint16_t module_id : m_jetModuleID) {
- configuredROBSIDs.emplace_back(eformat::TDAQ_CALO_JET_PROC_ROI, module_id);
- str << "0x" << std::hex << module_id << std::dec << " ";
- }
- ATH_MSG_DEBUG(" Calorimeter Jet/Energy Processor RoI = " << str.str());
-
- // EM/Tau
- str.str("");
- for (const uint16_t module_id : m_emModuleID) {
- configuredROBSIDs.emplace_back(eformat::TDAQ_CALO_CLUSTER_PROC_ROI, module_id);
- str << "0x" << std::hex << module_id << std::dec << " ";
- }
- ATH_MSG_DEBUG(" Calorimeter Cluster Processor RoI = " << str.str());
-
- // Fill the ROB ID vector
- for (const auto& sid : configuredROBSIDs) {
- m_configuredROBIds.push_back( sid.code() );
- }
-
- return StatusCode::SUCCESS;
-}
-
-/**
- * @brief Conversion from eformat::ROBFragments to RIO
- *
- * This will be called from the decoder algorithm RecRoIBResultByteStreamDecoderAlg when implemented
- */
-StatusCode RecRoIBResultByteStreamTool::convert(const std::vector<const ROBFragment*>& vrobf,
- ROIB::RecRoIBResult& resultToFill) const {
- ATH_MSG_DEBUG("Executing convert() from ROBFragments to RIO");
-
- // Create containers for objects to be filled
- std::vector<LVL1::RecMuonRoI> muonContent;
- std::vector<LVL1::RecEmTauRoI> emTauContent;
- std::vector<LVL1::RecJetRoI> jetContent;
-
- // Loop over ROB fragments
- for (const ROBFragment* p_robf : vrobf) {
- const ROBFragment& robf = *p_robf;
- eformat::helper::SourceIdentifier rodSID(robf.rod_source_id());
- eformat::SubDetector rodSubdetId = rodSID.subdetector_id();
- uint16_t rodModuleId = rodSID.module_id();
-
- switch (rodSubdetId) {
- // -----------------------------------------------------------------------
- // MUCTPI
- // -----------------------------------------------------------------------
- case eformat::TDAQ_MUON_CTP_INTERFACE: {
- // Check if the current ROD module ID matches the configured MuCTPI module ID
- if (rodModuleId != m_muCTPIModuleID) continue;
- ATH_MSG_DEBUG(" Found MuCTPI ROD with source ID " << MSG::hex << rodSID.code() << MSG::dec);
-
- // Create RecMuonRoI object
- DataType it_data;
- robf.rod_data(it_data);
- const uint32_t ndata = robf.rod_ndata();
- for (uint32_t i=0; i<ndata; ++i, ++it_data) {
- muonContent.emplace_back(static_cast<uint32_t>(*it_data),
- m_rpcRoITool.get(),
- m_tgcRoITool.get(),
- &m_muonConfig);
- }
- break;
- }
-
- // -----------------------------------------------------------------------
- // Jet/Energy
- // -----------------------------------------------------------------------
- case eformat::TDAQ_CALO_JET_PROC_ROI: {
- // Check if the current ROD module ID matches the configured Jet/Energy module IDs
- auto it = std::find(m_jetModuleID.begin(), m_jetModuleID.end(), rodModuleId);
- if (it == m_jetModuleID.end()) continue;
- ATH_MSG_DEBUG(" Found Jet/Energy ROD with source ID " << MSG::hex << rodSID.code() << MSG::dec);
-
- // Create RecJetRoI object
- DataType it_data;
- robf.rod_data(it_data);
- const uint32_t ndata = robf.rod_ndata();
- for (uint32_t i=0; i<ndata; ++i, ++it_data) {
- emTauContent.emplace_back(static_cast<uint32_t>(*it_data), &m_jetConfig);
- }
- break;
- }
-
- // -----------------------------------------------------------------------
- // EM/Tau
- // -----------------------------------------------------------------------
- case eformat::TDAQ_CALO_CLUSTER_PROC_ROI: {
- // Check if the current ROD module ID matches the configured EM/Tau module IDs
- auto it = std::find(m_emModuleID.begin(), m_emModuleID.end(), rodModuleId);
- if (it == m_emModuleID.end()) continue;
- ATH_MSG_DEBUG(" Found EM/Tau ROD with source ID " << MSG::hex << rodSID.code() << MSG::dec);
-
- // Create RecEmTauRoI object
- DataType it_data;
- robf.rod_data(it_data);
- const uint32_t ndata = robf.rod_ndata();
- for (uint32_t i=0; i<ndata; ++i, ++it_data) {
- emTauContent.emplace_back(static_cast<uint32_t>(*it_data), &m_emtauConfig);
- }
- break;
- }
-
- default: {
- ATH_MSG_DEBUG("Skipping ROD with SubDetID " << rodSID.human_detector());
- break;
- }
- }
- }
- ATH_MSG_DEBUG("Building RecRoIBResult with " << emTauContent.size() << " EM/Tau RoIs, "
- << muonContent.size() << " Muon RoIs, " << jetContent.size() << " Jet/Energy RoIs");
- resultToFill = ROIB::RecRoIBResult(std::move(emTauContent), std::move(muonContent), std::move(jetContent));
- return StatusCode::SUCCESS;
-}
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamTool.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamTool.h
deleted file mode 100644
index 4121c9664827..000000000000
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamTool.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGT1RESULTBYTESTREAM_RECROIBRESULTBYTESTREAMTOOL_H
-#define TRIGT1RESULTBYTESTREAM_RECROIBRESULTBYTESTREAMTOOL_H
-
-// Trigger includes
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
-#include "TrigConfL1Data/TriggerThreshold.h"
-#include "TrigT1Interfaces/ITrigT1MuonRecRoiTool.h"
-
-// Athena includes:
-#include "AthenaBaseComps/AthAlgTool.h"
-#include "ByteStreamData/RawEvent.h"
-
-// System includes
-#include <vector>
-
-// Forward declaration(s):
-namespace ROIB {
- class RecRoIBResult;
-}
-
-/**
- * @short Tool doing the ByteStream -> RecRoIBResult conversion
- *
- * The actual work of translating the information in a RoIB ROB fragments
- * into a RecRoIBResult object is done with this tool.
- *
- * @see RecRoIBResultByteStreamCnv
- *
- * @author Tadashi Maeno
- * @author Attila Krasznahorkay
- */
-class RecRoIBResultByteStreamTool : public AthAlgTool {
-
-public:
- /// Standard constructor
- RecRoIBResultByteStreamTool( const std::string& type, const std::string& name,
- const IInterface* parent );
- /// Standard destructor
- virtual ~RecRoIBResultByteStreamTool() = default;
-
- /// Function to initialise the tool
- virtual StatusCode initialize() override;
-
- /// Convert ROB fragments to RecRoIBResult
- StatusCode convert( const std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>& vrobf,
- ROIB::RecRoIBResult& resultToFill ) const;
- /// Convert ROBFragments to RecRoIBResult (legacy Run-2 interface)
- template< class ROBF > [[deprecated("Use the non-template version instead")]]
- StatusCode convert( const std::vector< ROBF >& robs, ROIB::RecRoIBResult*& cont ) const;
-
- /// Vector of ROB IDs corresponding to the modules configured for decoding
- const std::vector<uint32_t>& configuredROBIds() const {return m_configuredROBIds;}
-
-private:
-
- // ------------------------- Properties --------------------------------------
- /// @name Properties holding module IDs for L1 RoI ROBs
- /// @{
- /// MUCTPI Module ID to decode
- Gaudi::Property<uint16_t> m_muCTPIModuleID {
- this, "MUCTPIModuleId", 1,
- "Module ID of MUCTPI ROB with RoI information"
- };
- /// Jet Module IDs to decode
- Gaudi::Property<std::vector<uint16_t>> m_jetModuleID {
- this, "JetModuleIds", {0xac, 0xad},
- "Vector of module IDs of Jet RoI ROBs"
- };
- /// EM Module IDs to decode
- Gaudi::Property<std::vector<uint16_t>> m_emModuleID {
- this, "EMModuleIds", {0xa8, 0xa9, 0xaa, 0xab},
- "Vector of module IDs of EM RoI ROBs"
- };
- // CTP and L1Topo ROBs are currently not used in RecRoIBResult
- /// @}
-
- // ------------------------- Service/Tool handles ---------------------------------
- /// Handle to the Lvl1ConfigSvc interface
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc {
- this, "LVL1ConfigSvc", "TrigConf::TrigConfigSvc/TrigConfigSvc", "LVL1 Trigger configuration service"
- };
- /// Handle to the RPC RecRoITool
- ToolHandle<LVL1::ITrigT1MuonRecRoiTool> m_rpcRoITool {
- this, "RPCRecRoiSvc", "LVL1::TrigT1RPCRecRoiTool/TrigT1RPCRecRoiTool", "RPC RoI reconstruction tool"
- };
- /// Handle to the TGC RecRoITool
- ToolHandle<LVL1::ITrigT1MuonRecRoiTool> m_tgcRoITool {
- this, "TGCRecRoiSvc", "LVL1::TrigT1TGCRecRoiTool/TrigT1TGCRecRoiTool", "TGC RoI reconstruction tool"
- };
-
- // ------------------------- Other private members ---------------------------
- /// Vector of ROB IDs corresponding to the modules configured for decoding
- std::vector<uint32_t> m_configuredROBIds;
- /// L1 Muon configuration cache
- std::vector<TrigConf::TriggerThreshold*> m_muonConfig;
- /// L1 EM/Tau configuration cache
- std::vector<TrigConf::TriggerThreshold*> m_emtauConfig;
- /// L1 Jet configuration cache
- std::vector<TrigConf::TriggerThreshold*> m_jetConfig;
-
-}; // class RecRoIBResultByteStreamTool
-
-// Implementation of the legacy template method has to be included in the header file to avoid linking errors
-template< class ROBF >
-StatusCode RecRoIBResultByteStreamTool::convert(const std::vector< ROBF >& robs,
- ROIB::RecRoIBResult*& result ) const {
- ATH_MSG_WARNING("This convert method is deprecated! Use the non-template version instead");
- std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*> vrobf;
- for (const ROBF& robf : robs) vrobf.push_back(&robf);
- return convert(vrobf,*result);
-}
-
-#endif // TRIGT1RESULTBYTESTREAM_RECROIBRESULTBYTESTREAMTOOL_H
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/components/TrigT1ResultByteStream_entries.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/components/TrigT1ResultByteStream_entries.cxx
index 0bc86fd1e98d..94b0b7d99e38 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/components/TrigT1ResultByteStream_entries.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/components/TrigT1ResultByteStream_entries.cxx
@@ -1,6 +1,5 @@
#include "../L1TriggerResultByteStreamCnv.h"
#include "../RoIBResultByteStreamCnv.h"
-#include "../RecRoIBResultByteStreamCnv.h"
#include "../MuCTPIByteStreamCnv.h"
#include "../CTPByteStreamCnv.h"
@@ -11,7 +10,6 @@
#include "../MuCTPIByteStreamTool.h"
#include "../RecCTPByteStreamTool.h"
#include "../RecMuCTPIByteStreamTool.h"
-#include "../RecRoIBResultByteStreamTool.h"
#include "../RoIBResultByteStreamTool.h"
#include "../L1TriggerByteStreamDecoderAlg.h"
@@ -23,12 +21,10 @@ typedef OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment ROBF;
// converter for offline
typedef RoIBResultByteStreamCnv<ROBF> RoIBResultByteStreamCnvT ;
-typedef RecRoIBResultByteStreamCnv<ROBF> RecRoIBResultByteStreamCnvT ;
// declare
DECLARE_CONVERTER( L1TriggerResultByteStreamCnv )
DECLARE_CONVERTER( RoIBResultByteStreamCnvT )
-DECLARE_CONVERTER( RecRoIBResultByteStreamCnvT )
DECLARE_CONVERTER( MuCTPIByteStreamCnv )
DECLARE_CONVERTER( CTPByteStreamCnv )
DECLARE_CONVERTER( RecMuCTPIByteStreamCnv )
@@ -38,7 +34,6 @@ DECLARE_COMPONENT( CTPByteStreamTool )
DECLARE_COMPONENT( MuCTPIByteStreamTool )
DECLARE_COMPONENT( RecCTPByteStreamTool )
DECLARE_COMPONENT( RecMuCTPIByteStreamTool )
-DECLARE_COMPONENT( RecRoIBResultByteStreamTool )
DECLARE_COMPONENT( RoIBResultByteStreamTool )
DECLARE_COMPONENT( L1TriggerByteStreamDecoderAlg )
diff --git a/Trigger/TrigT1/TrigT1RoIB/doc/packagedoc.h b/Trigger/TrigT1/TrigT1RoIB/doc/packagedoc.h
index 2051ecd86875..abb505dc5a01 100644
--- a/Trigger/TrigT1/TrigT1RoIB/doc/packagedoc.h
+++ b/Trigger/TrigT1/TrigT1RoIB/doc/packagedoc.h
@@ -15,7 +15,7 @@
This package contains the simulation of the RoIBuilder running between LVL1
and LVL2 producing the RoIBResult. In addition it contains helper
-algorithms to access the ROIB::RoIBResult and ROIB::RecRoIBResult objects.
+algorithms to access the ROIB::RoIBResult object.
@section TrigT1RoIB_TrigT1RoIBOverview Class Overview
The TrigT1RoIB package contains of following classes:
--
GitLab
From e066143896ce7c68bc3efbb20f0b328611133df1 Mon Sep 17 00:00:00 2001
From: Goetz Gaycken <goetz.gaycken@cern.ch>
Date: Thu, 15 Jul 2021 21:11:52 +0200
Subject: [PATCH 125/272] Fix IDTIDE and IDTRKVALID content and conflicts when
writing both.
- fix configuration when writing both, IDTIDE and IDTRKVALID,
- fix detection whether IDTIDE or IDTRKVALID is written,
- re-add missing truth and SDO content when processing MC,
- re-add NN variables when writing IDTIDE,
- remove IDTIDE and IDTRKVALID track and truth particle decorations
from the AOD.
- remove btagging decorations from IDTIDE and IDTRKVALID.
---
.../python/InDetDxAODUtils.py | 4 +-
.../share/InDetDxAOD.py | 37 +++++------
.../InDetRecExample/share/WriteInDetAOD.py | 14 ++++-
.../DerivationFrameworkInDet/share/IDTIDE1.py | 62 ++++++++++---------
.../share/RecoOutputAODList_jobOptions.py | 7 ++-
5 files changed, 74 insertions(+), 50 deletions(-)
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/python/InDetDxAODUtils.py b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/python/InDetDxAODUtils.py
index 5a300313a835..40086cc2934a 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/python/InDetDxAODUtils.py
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/python/InDetDxAODUtils.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
from InDetPrepRawDataToxAOD.InDetDxAODJobProperties import InDetDxAODFlags
from InDetRecExample.TrackingCommon import setDefaults
from InDetRecExample.InDetJobProperties import InDetFlags
@@ -30,7 +30,7 @@ def getPixelPrepDataToxAOD(name='xAOD_PixelPrepDataToxAOD', **kwargs) :
condSeq += PixelDCSCondStatusAlg(name="PixelDCSCondStatusAlg")
isIdTrkDxAODSimulation = globalflags.DataSource == 'geant4'
- add_IDTIDE_content = kwargs.pop('AddIDTIDEContent', jobproperties.PrimaryDPDFlags.WriteDAOD_IDTIDEStream is True )
+ add_IDTIDE_content = kwargs.pop('AddIDTIDEContent', jobproperties.PrimaryDPDFlags.WriteDAOD_IDTIDEStream.get_Value() is True )
need_pix_ToTList =add_IDTIDE_content or (InDetDxAODFlags.DumpPixelRdoInfo() or InDetDxAODFlags.DumpPixelNNInfo() )
topSequence = AlgSequence()
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
index f14188fad01f..8cfb63cd7582 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
@@ -20,6 +20,7 @@ dumpPixInfo = InDetDxAODFlags.DumpPixelInfo()
dumpSctInfo = True or InDetDxAODFlags.DumpSctInfo()
dumpTrtInfo = InDetDxAODFlags.DumpTrtInfo()
select_aux_items=True
+
need_pix_ToTList = dumpPixInfo and ( InDetDxAODFlags.DumpPixelRdoInfo() or InDetDxAODFlags.DumpPixelNNInfo() )
## Autoconfiguration adjustements
@@ -427,7 +428,7 @@ if dumpSctInfo:
if dumpPixInfo:
- add_IDTIDE_content = jobproperties.PrimaryDPDFlags.WriteDAOD_IDTIDEStream == True
+ add_IDTIDE_content = jobproperties.PrimaryDPDFlags.WriteDAOD_IDTIDEStream.get_Value() is True
xAOD_PixelPrepDataToxAOD = getPixelPrepDataToxAOD( UseTruthInfo = dumpTruthInfo or (add_IDTIDE_content and isIdTrkDxAODSimulation))
IDDerivationSequenceAfterPresel += xAOD_PixelPrepDataToxAOD
if (printIdTrkDxAODConf):
@@ -498,6 +499,7 @@ if InDetFlags.doR3LargeD0() and InDetFlags.storeSeparateLargeD0Container():
StorePixel = dumpPixInfo,
PixelMsosName = 'Pixel_LargeD0Tracks_MSOSs',
IsSimulation = isIdTrkDxAODSimulation,
+ AddExtraEventInfo = False, # can only be done once per job
PRDtoTrackMap= "PRDtoTrackMap" + InDetKeys.ExtendedLargeD0Tracks(),
TRT_ToT_dEdx = TrackingCommon.getInDetTRT_dEdxTool() if dumpTrtInfo else "",
OutputLevel = INFO)
@@ -524,6 +526,7 @@ if makeSplitTracks:
StorePixel = dumpPixInfo,
PixelMsosName = 'Pixel_SplitTracks_MSOSs',
IsSimulation = isIdTrkDxAODSimulation,
+ AddExtraEventInfo = False, # can only be done once per job
PRDtoTrackMap= "PRDtoTrackMap" + InDetKeys.UnslimmedTracks(),
TRT_ToT_dEdx = TrackingCommon.getInDetTRT_dEdxTool() if dumpTrtInfo else "",
OutputLevel = INFO)
@@ -726,28 +729,23 @@ evtStream = augStream.GetEventStream()
excludedAuxData = "-caloExtension.-cellAssociation.-clusterAssociation.-trackParameterCovarianceMatrices.-parameterX.-parameterY.-parameterZ.-parameterPX.-parameterPY.-parameterPZ.-parameterPosition"
excludedVtxAuxData = "-vxTrackAtVertex.-MvfFitInfo.-isInitialized.-VTAV"
+# exclude b-tagging decoration
+excludedAuxData += '.-TrackCompatibility.-JetFitter_TrackCompatibility_antikt4emtopo.-JetFitter_TrackCompatibility_antikt4empflow' \
+ + '.-btagIp_d0Uncertainty.-btagIp_z0SinThetaUncertainty.-btagIp_z0SinTheta.-btagIp_d0.-btagIp_trackMomentum.-btagIp_trackDisplacement'
+
+# exclude IDTIDE decorations
+excludedAuxData += '.-IDTIDE1_biased_PVd0Sigma.-IDTIDE1_biased_PVz0Sigma.-IDTIDE1_biased_PVz0SigmaSinTheta.-IDTIDE1_biased_d0.-IDTIDE1_biased_d0Sigma' \
+ +'.-IDTIDE1_biased_z0.-IDTIDE1_biased_z0Sigma.-IDTIDE1_biased_z0SigmaSinTheta.-IDTIDE1_biased_z0SinTheta.-IDTIDE1_unbiased_PVd0Sigma.-IDTIDE1_unbiased_PVz0Sigma' \
+ +'.-IDTIDE1_unbiased_PVz0SigmaSinTheta.-IDTIDE1_unbiased_d0.-IDTIDE1_unbiased_d0Sigma.-IDTIDE1_unbiased_z0.-IDTIDE1_unbiased_z0Sigma.-IDTIDE1_unbiased_z0SigmaSinTheta' \
+ +'.-IDTIDE1_unbiased_z0SinTheta'
+
# Add generic event information
IDTRKVALIDStream.AddItem("xAOD::EventInfo#*")
IDTRKVALIDStream.AddItem("xAOD::EventAuxInfo#*")
# Add track particles collection and traclets (if available)
IDTRKVALIDStream.AddItem("xAOD::TrackParticleContainer#InDetTrackParticles")
-if not select_aux_items :
- IDTRKVALIDStream.AddItem("xAOD::TrackParticleAuxContainer#InDetTrackParticlesAux."+excludedAuxData)
-else :
- IDTRKVALIDStream.AddItem("xAOD::TrackParticleAuxContainer#InDetTrackParticlesAux"
- + '.TRTTrackOccupancy.TRTdEdx.TRTdEdxUsedHits.TTVA_AMVFVertices_forReco.TTVA_AMVFWeights_forReco.TrkBLX.TrkBLY.TrkBLZ.TrkIBLX.TrkIBLY.TrkIBLZ.TrkL1X.TrkL1Y'
- + '.TrkL1Z.TrkL2X.TrkL2Y.TrkL2Z.beamlineTiltX.beamlineTiltY.btagIp_d0.btagIp_d0Uncertainty.btagIp_trackDisplacement.btagIp_trackMomentum.btagIp_z0SinTheta.btagIp_z0SinThetaUncertainty'
- + '.chiSquared.d0.definingParametersCovMatrixDiag.definingParametersCovMatrixOffDiag.eProbabilityComb.eProbabilityHT.eProbabilityNN.expectInnermostPixelLayerHit'
- + '.expectNextToInnermostPixelLayerHit.hitPattern.identifierOfFirstHit.msosLink.nBC_meas.numberDoF.numberOfContribPixelLayers.numberOfDBMHits.numberOfGangedFlaggedFakes'
- + '.numberOfGangedPixels.numberOfIBLOverflowsdEdx.numberOfInnermostPixelLayerHits.numberOfInnermostPixelLayerOutliers.numberOfInnermostPixelLayerSharedHits'
- + '.numberOfInnermostPixelLayerSplitHits.numberOfNextToInnermostPixelLayerHits.numberOfNextToInnermostPixelLayerOutliers.numberOfNextToInnermostPixelLayerSharedHits'
- + '.numberOfNextToInnermostPixelLayerSplitHits.numberOfOutliersOnTrack.numberOfPhiHoleLayers.numberOfPhiLayers.numberOfPixelDeadSensors.numberOfPixelHits.numberOfPixelHoles'
- + '.numberOfPixelOutliers.numberOfPixelSharedHits.numberOfPixelSplitHits.numberOfPixelSpoiltHits.numberOfPrecisionHoleLayers.numberOfPrecisionLayers.numberOfSCTDeadSensors'
- + '.numberOfSCTDoubleHoles.numberOfSCTHits.numberOfSCTHoles.numberOfSCTOutliers.numberOfSCTSharedHits.numberOfSCTSpoiltHits.numberOfTRTDeadStraws.numberOfTRTHighThresholdHits'
- + '.numberOfTRTHighThresholdHitsTotal.numberOfTRTHighThresholdOutliers.numberOfTRTHits.numberOfTRTHoles.numberOfTRTOutliers.numberOfTRTSharedHits.numberOfTRTTubeHits'
- + '.numberOfTRTXenonHits.numberOfTriggerEtaHoleLayers.numberOfTriggerEtaLayers.numberOfUsedHitsdEdx.particleHypothesis.patternRecoInfo.phi.pixeldEdx.qOverP.radiusOfFirstHit'
- + '.standardDeviationOfChi2OS.theta.trackFitter.trackLink.trackProperties.truthMatchProbability.truthParticleLink.vx.vy.vz.z0')
+IDTRKVALIDStream.AddItem("xAOD::TrackParticleAuxContainer#InDetTrackParticlesAux."+excludedAuxData)
if InDetFlags.doTrackSegmentsPixel():
IDTRKVALIDStream.AddItem("xAOD::TrackParticleContainer#InDetPixelTrackParticles")
@@ -772,12 +770,15 @@ for key in keys :
IDTRKVALIDStream.AddItem("xAOD::TrackStateValidationAuxContainer#%s*" % prefixName+key)
keys = []
-if dumpPixInfo and not select_aux_items :
+if dumpPixInfo and not select_aux_items:
keys += ['PixelClusters'] if dumpPixInfo else []
elif dumpPixInfo :
keys += ['PixelClustersAux'
+ '.LVL1A.ToT.bec.broken.charge.detectorElementID.eta_module.eta_pixel_index.gangedPixel.globalX.globalY.globalZ.identifier.isFake.isSplit.layer.localX.localXError'
+ '.localXYCorrelation.localY.localYError.nRDO.phi_module.phi_pixel_index.rdoIdentifierList.sihit_barcode.sizePhi.sizeZ.splitProbability1.splitProbability2' ]
+ if dumpTruthInfo :
+ keys[-1] += '.sdo_depositsBarcode.sdo_depositsEnergy.sdo_words.sihit_endPosX.sihit_endPosY.sihit_endPosZ.sihit_energyDeposit.sihit_meanTime.sihit_pdgid' \
+ + '.sihit_startPosX.sihit_startPosY.sihit_startPosZ.truth_barcode'
keys+= ['SCT_Clusters'] if dumpSctInfo else []
keys+= ['TRT_DriftCircles'] if dumpTrtInfo else []
for key in keys :
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/WriteInDetAOD.py b/InnerDetector/InDetExample/InDetRecExample/share/WriteInDetAOD.py
index 9ddbc521452a..81c00fe125d8 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/WriteInDetAOD.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/WriteInDetAOD.py
@@ -16,7 +16,19 @@ if InDetFlags.doxAOD():
excludedVertexAuxData = "-vxTrackAtVertex.-MvfFitInfo.-isInitialized.-VTAV"
# remove track decorations used internally by FTAG software
- excludedAuxData += ".-TrackCompatibility.-JetFitter_TrackCompatibility_antikt4emtopo.-JetFitter_TrackCompatibility_antikt4empflow.-VxTrackAtVertex.-btagIp_d0Uncertainty.-btagIp_z0SinThetaUncertainty.-btagIp_z0SinTheta.-btagIp_d0.-btagIp_trackMomentum.-btagIp_trackDisplacement"
+ excludedAuxData += '.-TrackCompatibility.-JetFitter_TrackCompatibility_antikt4emtopo.-JetFitter_TrackCompatibility_antikt4empflow' \
+ + '.-btagIp_d0Uncertainty.-btagIp_z0SinThetaUncertainty.-btagIp_z0SinTheta.-btagIp_d0.-btagIp_trackMomentum.-btagIp_trackDisplacement' \
+ + '.-VxTrackAtVertex'
+ # @TODO the exclusion of VxTrackAtVertex for InDetTrackParticles is presumably not necessary
+
+ # exclude IDTIDE decorations
+ excludedAuxData += '.-IDTIDE1_biased_PVd0Sigma.-IDTIDE1_biased_PVz0Sigma.-IDTIDE1_biased_PVz0SigmaSinTheta.-IDTIDE1_biased_d0.-IDTIDE1_biased_d0Sigma' \
+ +'.-IDTIDE1_biased_z0.-IDTIDE1_biased_z0Sigma.-IDTIDE1_biased_z0SigmaSinTheta.-IDTIDE1_biased_z0SinTheta.-IDTIDE1_unbiased_PVd0Sigma.-IDTIDE1_unbiased_PVz0Sigma' \
+ +'.-IDTIDE1_unbiased_PVz0SigmaSinTheta.-IDTIDE1_unbiased_d0.-IDTIDE1_unbiased_d0Sigma.-IDTIDE1_unbiased_z0.-IDTIDE1_unbiased_z0Sigma.-IDTIDE1_unbiased_z0SigmaSinTheta' \
+ +'.-IDTIDE1_unbiased_z0SinTheta'
+
+ # exclude IDTIDE/IDTRKVALID decorations
+ excludedAuxData += '.-TrkBLX.-TrkBLY.-TrkBLZ.-TrkIBLX.-TrkIBLY.-TrkIBLZ.-TrkL1X.-TrkL1Y.-TrkL1Z.-TrkL2X.-TrkL2Y.-TrkL2Z.-msosLink'
InDetAODList+=['xAOD::TrackParticleContainer#'+InDetKeys.xAODTrackParticleContainer()]
InDetAODList+=['xAOD::TrackParticleAuxContainer#'+InDetKeys.xAODTrackParticleContainer()+'Aux.' + excludedAuxData]
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/share/IDTIDE1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/share/IDTIDE1.py
index 783e14549ce7..0b260c80bb3f 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/share/IDTIDE1.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/share/IDTIDE1.py
@@ -32,14 +32,10 @@ select_aux_items=True
from AthenaCommon.JobProperties import jobproperties
from InDetPrepRawDataToxAOD.InDetDxAODJobProperties import InDetDxAODFlags
-print('DEBUG IDTRKVALID stream = %s' % jobproperties.PrimaryDPDFlags.WriteDAOD_IDTRKVALIDStream)
-pix_from_InDetDxAOD = InDetDxAODFlags.DumpPixelInfo() and jobproperties.PrimaryDPDFlags.WriteDAOD_IDTRKVALIDStream
-sct_from_InDetDxAOD = InDetDxAODFlags.DumpSctInfo() and jobproperties.PrimaryDPDFlags.WriteDAOD_IDTRKVALIDStream
-trt_from_InDetDxAOD = InDetDxAODFlags.DumpTrtInfo() and jobproperties.PrimaryDPDFlags.WriteDAOD_IDTRKVALIDStream
+pix_from_InDetDxAOD = InDetDxAODFlags.DumpPixelInfo() and jobproperties.PrimaryDPDFlags.WriteDAOD_IDTRKVALIDStream.get_Value() is True
+sct_from_InDetDxAOD = InDetDxAODFlags.DumpSctInfo() and jobproperties.PrimaryDPDFlags.WriteDAOD_IDTRKVALIDStream.get_Value() is True
+trt_from_InDetDxAOD = InDetDxAODFlags.DumpTrtInfo() and jobproperties.PrimaryDPDFlags.WriteDAOD_IDTRKVALIDStream.get_Value() is True
need_pix_ToTList = idDxAOD_doPix and ( InDetDxAODFlags.DumpPixelRdoInfo() or InDetDxAODFlags.DumpPixelNNInfo() )
-print('DEBUG IDTRKVALID dump pix: %s [rdo: %s nn: %s ->%s] sct: %s trt: %s ' % (InDetDxAODFlags.DumpPixelInfo() ,InDetDxAODFlags.DumpPixelRdoInfo(), InDetDxAODFlags.DumpPixelNNInfo(), need_pix_ToTList,
- InDetDxAODFlags.DumpSctInfo(),
- InDetDxAODFlags.DumpTrtInfo()))
# IsMonteCarlo=(globalflags.DataSource == 'geant4')
@@ -113,7 +109,7 @@ DFTSOS = DerivationFramework__TrackStateOnSurfaceDecorator(name = "DFTrackStateO
DecorationPrefix = "",
StoreTRT = idDxAOD_doTrt,
TRT_ToT_dEdx = TrackingCommon.getInDetTRT_dEdxTool() if idDxAOD_doTrt else "",
- PRDtoTrackMap= "PRDtoTrackMap" + InDetKeys.UnslimmedTracks() if jobproperties.PrimaryDPDFlags.WriteDAOD_IDTRKVALIDStream else "",
+ PRDtoTrackMap= "PRDtoTrackMap" + InDetKeys.UnslimmedTracks() if jobproperties.PrimaryDPDFlags.WriteDAOD_IDTRKVALIDStream.get_Value() else "",
StoreSCT = idDxAOD_doSct,
StorePixel = idDxAOD_doPix,
OutputLevel =INFO)
@@ -396,24 +392,28 @@ IDTIDE1Stream.AddItem("xAOD::TrackParticleContainer#InDetTrackParticles")
if not select_aux_items :
IDTIDE1Stream.AddItem("xAOD::TrackParticleAuxContainer#InDetTrackParticlesAux.-caloExtension.-cellAssociation.-clusterAssociation.-trackParameterCovarianceMatrices.-parameterX.-parameterY.-parameterZ.-parameterPX.-parameterPY.-parameterPZ.-parameterPosition")
else :
- IDTIDE1Stream.AddItem("xAOD::TrackParticleAuxContainer#InDetTrackParticlesAux" \
- +'.IDTIDE1_biased_PVd0Sigma.IDTIDE1_biased_PVz0Sigma.IDTIDE1_biased_PVz0SigmaSinTheta.IDTIDE1_biased_d0.IDTIDE1_biased_d0Sigma.IDTIDE1_biased_z0.IDTIDE1_biased_z0Sigma' \
- + '.IDTIDE1_biased_z0SigmaSinTheta.IDTIDE1_biased_z0SinTheta.IDTIDE1_unbiased_PVd0Sigma.IDTIDE1_unbiased_PVz0Sigma.IDTIDE1_unbiased_PVz0SigmaSinTheta.IDTIDE1_unbiased_d0' \
- + '.IDTIDE1_unbiased_d0Sigma.IDTIDE1_unbiased_z0.IDTIDE1_unbiased_z0Sigma.IDTIDE1_unbiased_z0SigmaSinTheta.IDTIDE1_unbiased_z0SinTheta' \
- + '.TRTTrackOccupancy.TRTdEdx.TRTdEdxUsedHits.TTVA_AMVFVertices_forReco.TTVA_AMVFWeights_forReco' \
- + '.TrkBLX.TrkBLY.TrkBLZ.TrkIBLX.TrkIBLY.TrkIBLZ.TrkL1X.TrkL1Y.TrkL1Z.TrkL2X.TrkL2Y.TrkL2Z' \
- + '.beamlineTiltX.beamlineTiltY.btagIp_d0.btagIp_d0Uncertainty.btagIp_trackDisplacement.btagIp_trackMomentum.btagIp_z0SinTheta.btagIp_z0SinThetaUncertainty' \
- + '.chiSquared.d0.definingParametersCovMatrixDiag.definingParametersCovMatrixOffDiag.eProbabilityComb.eProbabilityHT.eProbabilityNN' \
- + '.expectInnermostPixelLayerHit.expectNextToInnermostPixelLayerHit.hitPattern.identifierOfFirstHit.msosLink.nBC_meas.numberDoF.numberOfContribPixelLayers' \
- + '.numberOfDBMHits.numberOfGangedFlaggedFakes.numberOfGangedPixels.numberOfIBLOverflowsdEdx.numberOfInnermostPixelLayerHits.numberOfInnermostPixelLayerOutliers' \
- + '.numberOfInnermostPixelLayerSharedHits.numberOfInnermostPixelLayerSplitHits.numberOfNextToInnermostPixelLayerHits.numberOfNextToInnermostPixelLayerOutliers' \
- + '.numberOfNextToInnermostPixelLayerSharedHits.numberOfNextToInnermostPixelLayerSplitHits.numberOfOutliersOnTrack.numberOfPhiHoleLayers.numberOfPhiLayers' \
- + '.numberOfPixelDeadSensors.numberOfPixelHits.numberOfPixelHoles.numberOfPixelOutliers.numberOfPixelSharedHits.numberOfPixelSplitHits.numberOfPixelSpoiltHits' \
- + '.numberOfPrecisionHoleLayers.numberOfPrecisionLayers.numberOfSCTDeadSensors.numberOfSCTDoubleHoles.numberOfSCTHits.numberOfSCTHoles.numberOfSCTOutliers' \
- + '.numberOfSCTSharedHits.numberOfSCTSpoiltHits.numberOfTRTDeadStraws.numberOfTRTHighThresholdHits.numberOfTRTHighThresholdHitsTotal.numberOfTRTHighThresholdOutliers' \
- + '.numberOfTRTHits.numberOfTRTHoles.numberOfTRTOutliers.numberOfTRTSharedHits.numberOfTRTTubeHits.numberOfTRTXenonHits.numberOfTriggerEtaHoleLayers' \
- + '.numberOfTriggerEtaLayers.numberOfUsedHitsdEdx' \
- + '.particleHypothesis.patternRecoInfo.phi.pixeldEdx.qOverP.radiusOfFirstHit.standardDeviationOfChi2OS.theta.trackFitter.trackLink.trackProperties.truthMatchProbability.truthParticleLink.vx.vy.vz.z0')
+ tp_items = '.IDTIDE1_biased_PVd0Sigma.IDTIDE1_biased_PVz0Sigma.IDTIDE1_biased_PVz0SigmaSinTheta.IDTIDE1_biased_d0.IDTIDE1_biased_d0Sigma.IDTIDE1_biased_z0.IDTIDE1_biased_z0Sigma' \
+ + '.IDTIDE1_biased_z0SigmaSinTheta.IDTIDE1_biased_z0SinTheta.IDTIDE1_unbiased_PVd0Sigma.IDTIDE1_unbiased_PVz0Sigma.IDTIDE1_unbiased_PVz0SigmaSinTheta.IDTIDE1_unbiased_d0' \
+ + '.IDTIDE1_unbiased_d0Sigma.IDTIDE1_unbiased_z0.IDTIDE1_unbiased_z0Sigma.IDTIDE1_unbiased_z0SigmaSinTheta.IDTIDE1_unbiased_z0SinTheta' \
+ + '.TRTTrackOccupancy.TRTdEdx.TRTdEdxUsedHits.TTVA_AMVFVertices_forReco.TTVA_AMVFWeights_forReco' \
+ + '.TrkBLX.TrkBLY.TrkBLZ.TrkIBLX.TrkIBLY.TrkIBLZ.TrkL1X.TrkL1Y.TrkL1Z.TrkL2X.TrkL2Y.TrkL2Z' \
+ + '.beamlineTiltX.beamlineTiltY.btagIp_d0.btagIp_d0Uncertainty.btagIp_trackDisplacement.btagIp_trackMomentum.btagIp_z0SinTheta.btagIp_z0SinThetaUncertainty' \
+ + '.chiSquared.d0.definingParametersCovMatrixDiag.definingParametersCovMatrixOffDiag.eProbabilityComb.eProbabilityHT.eProbabilityNN' \
+ + '.expectInnermostPixelLayerHit.expectNextToInnermostPixelLayerHit.hitPattern.identifierOfFirstHit.msosLink.nBC_meas.numberDoF.numberOfContribPixelLayers' \
+ + '.numberOfDBMHits.numberOfGangedFlaggedFakes.numberOfGangedPixels.numberOfIBLOverflowsdEdx.numberOfInnermostPixelLayerHits.numberOfInnermostPixelLayerOutliers' \
+ + '.numberOfInnermostPixelLayerSharedHits.numberOfInnermostPixelLayerSplitHits.numberOfNextToInnermostPixelLayerHits.numberOfNextToInnermostPixelLayerOutliers' \
+ + '.numberOfNextToInnermostPixelLayerSharedHits.numberOfNextToInnermostPixelLayerSplitHits.numberOfOutliersOnTrack.numberOfPhiHoleLayers.numberOfPhiLayers' \
+ + '.numberOfPixelDeadSensors.numberOfPixelHits.numberOfPixelHoles.numberOfPixelOutliers.numberOfPixelSharedHits.numberOfPixelSplitHits.numberOfPixelSpoiltHits' \
+ + '.numberOfPrecisionHoleLayers.numberOfPrecisionLayers.numberOfSCTDeadSensors.numberOfSCTDoubleHoles.numberOfSCTHits.numberOfSCTHoles.numberOfSCTOutliers' \
+ + '.numberOfSCTSharedHits.numberOfSCTSpoiltHits.numberOfTRTDeadStraws.numberOfTRTHighThresholdHits.numberOfTRTHighThresholdHitsTotal.numberOfTRTHighThresholdOutliers' \
+ + '.numberOfTRTHits.numberOfTRTHoles.numberOfTRTOutliers.numberOfTRTSharedHits.numberOfTRTTubeHits.numberOfTRTXenonHits.numberOfTriggerEtaHoleLayers' \
+ + '.numberOfTriggerEtaLayers.numberOfUsedHitsdEdx' \
+ + '.particleHypothesis.patternRecoInfo.phi.pixeldEdx.qOverP.radiusOfFirstHit.standardDeviationOfChi2OS.theta.trackFitter.trackLink.trackProperties' \
+ + '.vx.vy.vz.z0'
+ if IsMonteCarlo :
+ tp_items += '.truthMatchProbability.truthParticleLink.truthOrigin.truthType'
+ IDTIDE1Stream.AddItem("xAOD::TrackParticleAuxContainer#InDetTrackParticlesAux" + tp_items)
+
IDTIDE1Stream.AddItem("xAOD::TrackParticleClusterAssociationContainer#InDetTrackParticlesClusterAssociations*")
IDTIDE1Stream.AddItem("xAOD::TrackParticleClusterAssociationAuxContainer#InDetTrackParticlesClusterAssociations*")
@@ -427,12 +427,18 @@ keys = []
if idDxAOD_doPix and not select_aux_items :
keys += ['PixelClusters'] if idDxAOD_doPix else []
elif idDxAOD_doPix :
- keys += ['PixelClustersAux.' \
+ keys += ['PixelClustersAux' \
+'.BiasVoltage.DCSState.DepletionVoltage.LVL1A.LorentzShift.NN_etaPixelIndexWeightedPosition.NN_localEtaPixelIndexWeightedPosition.NN_localPhiPixelIndexWeightedPosition' \
+ '.NN_matrixOfCharge.NN_matrixOfToT.NN_phiBS.NN_phiPixelIndexWeightedPosition.NN_sizeX.NN_sizeY.NN_thetaBS.NN_vectorOfPitchesY.Temperature.ToT.bec.broken.charge.detectorElementID' \
+ '.eta_module.eta_pixel_index.gangedPixel.globalX.globalY.globalZ.hasBSError.identifier.isFake.isSplit.layer.localX.localXError.localXYCorrelation.localY.localYError.nRDO.phi_module' \
+ '.phi_pixel_index.rdoIdentifierList.rdo_Aterm.rdo_Cterm.rdo_Eterm.rdo_charge.rdo_eta_pixel_index.rdo_phi_pixel_index.rdo_tot.sihit_barcode.sizePhi.sizeZ.splitProbability1' \
- + '.splitProbability2.truth_barcode']
+ + '.splitProbability2.truth_barcode'
+ ]
+ if IsMonteCarlo :
+ keys[-1] += '.NN_barcode.NN_energyDep.NN_motherBarcode.NN_motherPdgid.NN_pathlengthX.NN_pathlengthY.NN_pathlengthZ.NN_pdgid.NN_phi.NN_positionsX.NN_positionsY' \
+ + '.NN_positions_indexX.NN_positions_indexY.NN_theta.NN_trueP.sdo_depositsBarcode.sdo_depositsEnergy.sdo_words.sihit_endPosX.sihit_endPosY.sihit_endPosZ.sihit_energyDeposit' \
+ + '.sihit_meanTime.sihit_pdgid.sihit_startPosX.sihit_startPosY.sihit_startPosZ'
+
keys+= ['SCT_Clusters'] if idDxAOD_doSct else []
keys+= ['TRT_DriftCircles'] if idDxAOD_doTrt else []
print('DEBUG keys %s' % (keys))
diff --git a/Reconstruction/RecExample/RecExPers/share/RecoOutputAODList_jobOptions.py b/Reconstruction/RecExample/RecExPers/share/RecoOutputAODList_jobOptions.py
index 6fe00500106b..dd78296f9f86 100644
--- a/Reconstruction/RecExample/RecExPers/share/RecoOutputAODList_jobOptions.py
+++ b/Reconstruction/RecExample/RecExPers/share/RecoOutputAODList_jobOptions.py
@@ -70,10 +70,15 @@ except Exception:
# MC Event Collection. Should be moved to a separate jobO
if rec.doTruth():
+ TP_excludedAuxData='.-caloExtension'
+ if not rec.doPhysicsValidationAugmentation() :
+ # when not doing PhysVal exclude decorations meant for extra outputs
+ TP_excludedAuxData += '.-d0.-phi.-prodR.-prodZ.-qOverP.-theta.-z0.-z0st'
+
McTruthAODList=["xAOD::TruthEventContainer#TruthEvents",
"xAOD::TruthEventAuxContainer#TruthEventsAux.",
"xAOD::TruthParticleContainer#TruthParticles",
- "xAOD::TruthParticleAuxContainer#TruthParticlesAux.-caloExtension",
+ "xAOD::TruthParticleAuxContainer#TruthParticlesAux"+TP_excludedAuxData,
"xAOD::TruthParticleContainer#TruthPileupParticles",
"xAOD::TruthParticleAuxContainer#TruthPileupParticlesAux.",
"xAOD::TruthVertexContainer#TruthVertices",
--
GitLab
From 8684fc53e504a34a5cfb3e7d4d79b5a3606d4ee7 Mon Sep 17 00:00:00 2001
From: Cristiano Alpigiani <cristiano.alpigiani@cern.ch>
Date: Wed, 18 Aug 2021 12:22:10 +0200
Subject: [PATCH 126/272] Updating valid1 TCT with a more recent AOD input file
This MR updates the valid1TCT with an AOD file produced with 22.0.40 (the same AOD used for the mc16 TCT).
---
Tools/Tier0ChainTests/test/test_valid1PHYS_mp.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Tools/Tier0ChainTests/test/test_valid1PHYS_mp.sh b/Tools/Tier0ChainTests/test/test_valid1PHYS_mp.sh
index 6d25d25af811..fc7b720a0a20 100755
--- a/Tools/Tier0ChainTests/test/test_valid1PHYS_mp.sh
+++ b/Tools/Tier0ChainTests/test/test_valid1PHYS_mp.sh
@@ -11,7 +11,7 @@
set -e
-Reco_tf.py --athenaopts='--nprocs=2' --athenaMPMergeTargetSize 'DAOD_*:0' --inputAODFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.recon.AOD.e6337_e5984_s3126_d1663_r12711/AOD.25927986._000001.pool.root.1 --outputDAODFile art.pool.root --reductionConf PHYS --maxEvents -1 --preExec 'from AthenaCommon.DetFlags import DetFlags; DetFlags.detdescr.all_setOff(); DetFlags.BField_setOn(); DetFlags.pileup.all_setOff(); DetFlags.overlay.all_setOff(); from AthenaCommon.AlgSequence import AlgSequence; topSequence = AlgSequence(); topSequence += CfgMgr.xAODMaker__DynVarFixerAlg("BTaggingELFixer", Containers = ["BTagging_AntiKt4EMTopoAux."] ); topSequence += CfgMgr.xAODMaker__DynVarFixerAlg("JetELFixer", Containers = ["AntiKt4EMTopoJetsAux."] ); topSequence += CfgMgr.xAODMaker__DynVarFixerAlg("ElectronELFixer", Containers = ["ForwardElectronClustersAux."] );'
+Reco_tf.py --athenaopts='--nprocs=2' --athenaMPMergeTargetSize 'DAOD_*:0' --inputAODFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.recon.AOD.e3601_s3126_r12885/* --outputDAODFile art.pool.root --reductionConf PHYS --maxEvents -1 --preExec 'from AthenaCommon.DetFlags import DetFlags; DetFlags.detdescr.all_setOff(); DetFlags.BField_setOn(); DetFlags.pileup.all_setOff(); DetFlags.overlay.all_setOff();'
echo "art-result: $? reco"
--
GitLab
From 9eba2085a5387c8d6cb0a74034842a0252e4f65a Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Wed, 18 Aug 2021 13:13:52 +0200
Subject: [PATCH 127/272] TrigT1Lucid: delete Lucid trigger simulation
The Lucid trigger simulation has not been used in many years and is not
needed for Run-3. In case, a new Lucid trigger simulation is needed for
the new Run-4 geometry, this package can be resurrected.
Closes ATR-24026.
---
.../share/L1Signal_jobOptions.py | 8 -
.../share/Level1Overlay_jobOptions.py | 7 -
.../share/DigitizationRTT_lucid.py | 3 -
.../LUCID_LVL1Digitization_JobOptions.py | 33 ----
.../Digitization/share/LVL1Digitization.py | 7 -
.../TrigT1Lucid/ATLAS_CHECK_THREAD_SAFETY | 1 -
Trigger/TrigT1/TrigT1Lucid/CMakeLists.txt | 10 -
.../TrigT1/TrigT1Lucid/src/TrigT1Lucid.cxx | 186 ------------------
Trigger/TrigT1/TrigT1Lucid/src/TrigT1Lucid.h | 67 -------
.../src/components/TrigT1Lucid_entries.cxx | 4 -
10 files changed, 326 deletions(-)
delete mode 100644 ForwardDetectors/LUCID/LUCID_Digitization/share/LUCID_LVL1Digitization_JobOptions.py
delete mode 100644 Trigger/TrigT1/TrigT1Lucid/ATLAS_CHECK_THREAD_SAFETY
delete mode 100644 Trigger/TrigT1/TrigT1Lucid/CMakeLists.txt
delete mode 100644 Trigger/TrigT1/TrigT1Lucid/src/TrigT1Lucid.cxx
delete mode 100644 Trigger/TrigT1/TrigT1Lucid/src/TrigT1Lucid.h
delete mode 100644 Trigger/TrigT1/TrigT1Lucid/src/components/TrigT1Lucid_entries.cxx
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/L1Signal_jobOptions.py b/Event/EventOverlay/EventOverlayJobTransforms/share/L1Signal_jobOptions.py
index 7e5c5a216658..ec4fcc9c95bd 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/L1Signal_jobOptions.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/L1Signal_jobOptions.py
@@ -98,14 +98,6 @@ if DetFlags.overlay.LVL1_on():
job += LVL1__TrigT1BCM("newTrigT1BCM")
job.newTrigT1BCM.EvtStore = "BkgEvent_0_SG"
- #-------------------------------------------------------
- # TrigT1LUCID Alg
- #-------------------------------------------------------
- if DetFlags.simulateLVL1.Lucid_on():
- from TrigT1Lucid.TrigT1LucidConf import LVL1__TrigT1Lucid
- job += LVL1__TrigT1Lucid("newTrigT1Lucid")
- job.newTrigT1Lucid.EvtStore = "BkgEvent_0_SG"
-
#-------------------------------------------------------
# TrigT1CTP Algos
#-------------------------------------------------------
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Level1Overlay_jobOptions.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Level1Overlay_jobOptions.py
index cbb10b07fb31..2bf862a8a4c9 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Level1Overlay_jobOptions.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Level1Overlay_jobOptions.py
@@ -171,13 +171,6 @@ if DetFlags.overlay.LVL1_on():
from TrigT1BCM.TrigT1BCMConf import LVL1__TrigT1BCM
job += LVL1__TrigT1BCM()
- # -------------------------------------------------------
- # TrigT1LUCID Alg
- # -------------------------------------------------------
- if DetFlags.simulateLVL1.Lucid_on():
- from TrigT1Lucid.TrigT1LucidConf import LVL1__TrigT1Lucid
- job += LVL1__TrigT1Lucid()
-
# -------------------------------------------------------
# TrigT1CTP Algos
# -------------------------------------------------------
diff --git a/ForwardDetectors/LUCID/LUCID_Digitization/share/DigitizationRTT_lucid.py b/ForwardDetectors/LUCID/LUCID_Digitization/share/DigitizationRTT_lucid.py
index 55b674d2243b..7b0204215c80 100755
--- a/ForwardDetectors/LUCID/LUCID_Digitization/share/DigitizationRTT_lucid.py
+++ b/ForwardDetectors/LUCID/LUCID_Digitization/share/DigitizationRTT_lucid.py
@@ -64,6 +64,3 @@ if (lucid.fillRootTree):
THistSvc = THistSvc()
THistSvc.Output = ["AANT DATAFILE='cali.root' OPT='RECREATE'"]
ServiceMgr += THistSvc
-
-if DetFlags.LVL1_on():
- include("LUCID_Digitization/LUCID_LVL1Digitization_JobOptions.py")
diff --git a/ForwardDetectors/LUCID/LUCID_Digitization/share/LUCID_LVL1Digitization_JobOptions.py b/ForwardDetectors/LUCID/LUCID_Digitization/share/LUCID_LVL1Digitization_JobOptions.py
deleted file mode 100644
index 0f6d733e1f92..000000000000
--- a/ForwardDetectors/LUCID/LUCID_Digitization/share/LUCID_LVL1Digitization_JobOptions.py
+++ /dev/null
@@ -1,33 +0,0 @@
-
-from AthenaCommon.Configurable import Configurable
-
-Configurable.allConfigurables.get('CTPSimulation').OutputLevel = ERROR
-
-from TrigT1Lucid.TrigT1LucidConf import LVL1__TrigT1Lucid
-
-Lucid = LVL1__TrigT1Lucid("LVL1::TrigT1Lucid")
-Lucid.OutputLevel = ERROR
-Lucid.qdcThreshold = 500
-
-theApp.Dlls += ["RootHistCnv"]
-theApp.HistogramPersistency = "ROOT"
-
-from CBNT_Athena.CBNT_AthenaConf import *
-from CBNT_Utils.CBNT_UtilsConf import *
-
-CBNT_AthenaAware = CBNT_AthenaAware()
-topSequence += CBNT_AthenaAware
-
-from CBNT_Athena.CBNT_AthenaConf import *
-from CBNT_Utils.CBNT_UtilsConf import *
-from TrigT1Lucid.TrigT1LucidConf import *
-
-topSequence.CBNT_AthenaAware.Members += ["CBNTAA_EventInfo"]
-topSequence.CBNT_AthenaAware.Members += ["LVL1CTP::CBNTAA_CTP_RDO/CTP_RDO"]
-topSequence.CBNT_AthenaAware.Members += ["LVL1::CBNTAA_TrigT1Lucid/CBNTAA_TrigT1Lucid"]
-
-from AnalysisTools.AnalysisToolsConf import AANTupleStream
-
-topSequence += AANTupleStream()
-AANTupleStream = topSequence.AANTupleStream
-AANTupleStream.ExistDataHeader = False
diff --git a/Simulation/Digitization/share/LVL1Digitization.py b/Simulation/Digitization/share/LVL1Digitization.py
index eb8e44ed6a59..593abbebba1b 100755
--- a/Simulation/Digitization/share/LVL1Digitization.py
+++ b/Simulation/Digitization/share/LVL1Digitization.py
@@ -148,13 +148,6 @@ if DetFlags.digitize.LVL1_on():
from TrigT1BCM.TrigT1BCMConf import LVL1__TrigT1BCM
topSequence += LVL1__TrigT1BCM()
- #-------------------------------------------------------
- # TrigT1LUCID Alg
- #-------------------------------------------------------
- if DetFlags.simulateLVL1.Lucid_on():
- from TrigT1Lucid.TrigT1LucidConf import LVL1__TrigT1Lucid
- topSequence += LVL1__TrigT1Lucid()
-
#-------------------------------------------------------
# TrigT1CTP Algos
#-------------------------------------------------------
diff --git a/Trigger/TrigT1/TrigT1Lucid/ATLAS_CHECK_THREAD_SAFETY b/Trigger/TrigT1/TrigT1Lucid/ATLAS_CHECK_THREAD_SAFETY
deleted file mode 100644
index 2479bba19da2..000000000000
--- a/Trigger/TrigT1/TrigT1Lucid/ATLAS_CHECK_THREAD_SAFETY
+++ /dev/null
@@ -1 +0,0 @@
-Trigger/TrigT1/TrigT1Lucid
diff --git a/Trigger/TrigT1/TrigT1Lucid/CMakeLists.txt b/Trigger/TrigT1/TrigT1Lucid/CMakeLists.txt
deleted file mode 100644
index 9ae8aa2c39c8..000000000000
--- a/Trigger/TrigT1/TrigT1Lucid/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
-# Declare the package name:
-atlas_subdir( TrigT1Lucid )
-
-# Component(s) in the package:
-atlas_add_component( TrigT1Lucid
- src/*.cxx
- src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps GaudiKernel LUCID_RawEvent TrigConfInterfaces TrigConfL1Data TrigT1Interfaces )
diff --git a/Trigger/TrigT1/TrigT1Lucid/src/TrigT1Lucid.cxx b/Trigger/TrigT1/TrigT1Lucid/src/TrigT1Lucid.cxx
deleted file mode 100644
index c09e14e6b114..000000000000
--- a/Trigger/TrigT1/TrigT1Lucid/src/TrigT1Lucid.cxx
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "TrigT1Lucid.h"
-#include "TrigT1Interfaces/LucidCTP.h"
-#include "TrigT1Interfaces/TrigT1StoreGateKeys.h"
-#include "TrigConfL1Data/ThresholdConfig.h"
-#include "TrigT1Interfaces/BitOp.h"
-
-namespace LVL1 {
-
- //---------------------------------------------------------------------
-
- TrigT1Lucid::TrigT1Lucid(const std::string& name,
- ISvcLocator* pSvcLocator):
- AthAlgorithm(name, pSvcLocator),
- m_configSvc("TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", name),
- m_LUCID_LVL1T1ContainerName("Lucid_Digits"),
- m_digitContainer(0),
- m_threshold_a (-1),
- m_threshold_c (-1),
- m_cablestart_a(-1),
- m_cablestart_c(-1),
- m_qdcThreshold(500),
- m_badDataFound(false)
- {
- declareProperty("LVL1ConfigSvc" , m_configSvc, "LVL1 Config Service");
- declareProperty("LVL1T1ContainerName", m_LUCID_LVL1T1ContainerName = "Lucid_Digits");
- declareProperty("qdcThreshold" , m_qdcThreshold);
- }
-
- //---------------------------------------------------------------------
-
- StatusCode TrigT1Lucid::initialize() {
- if(msgLvl(MSG::INFO)) msg(MSG::INFO) << "entering intialize()" << endmsg;
-
- if (AthAlgorithm::initialize().isFailure()) {
- if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't initialize Algorithm base class." << endmsg;
- return StatusCode::FAILURE;
- }
-
- StatusCode sc;
-
- // Connect to the LVL1ConfigSvc to retrieve threshold settings.
- sc = m_configSvc.retrieve();
- if (sc.isFailure()) {
- if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "Couldn't connect to "
- << m_configSvc.typeAndName()
- << endmsg;
- return sc;
- }
- else if(msgLvl(MSG::DEBUG)) {
- msg(MSG::DEBUG) << "Connected to " << m_configSvc.typeAndName()
- << endmsg;
- }
-
- // Get level 1 LUCID threshold settings from the level 1
- // configuration service. The thresholds are in QDC and are not a
- // ptcut. The ptcut() methods just returns the value in the xml file.
- std::vector<TrigConf::TriggerThreshold*> thresholds = m_configSvc->thresholdConfig()->getLucidThresholdVector();
- std::vector<TrigConf::TriggerThreshold*>::iterator th_itr = thresholds.begin();
- std::vector<TrigConf::TriggerThreshold*>::iterator th_itr_end = thresholds.end();
-
- for(; th_itr!=th_itr_end; th_itr++) {
- if(msgLvl(MSG::DEBUG)) {
- msg(MSG::DEBUG) << "Threshold name =" << (*th_itr)->name() << endmsg;
- msg(MSG::DEBUG) << "Threshold value =" << (*th_itr)->triggerThresholdValue(0, 0)->ptcut() << endmsg;
- }
-
- if ((*th_itr)->name() == "LUCID_A"){
- m_cablestart_a = (*th_itr)->cableStart();
- m_threshold_a = (*th_itr)->triggerThresholdValue(0, 0)->ptcut();
- } else if((*th_itr)->name() == "LUCID_C"){
- m_cablestart_c = (*th_itr)->cableStart();
- m_threshold_c = (*th_itr)->triggerThresholdValue(0, 0)->ptcut();
- }
-
- }
- if (msgLvl(MSG::INFO)) msg(MSG::INFO) << "Cable positions: "
- << m_cablestart_a << ", "
- << m_cablestart_c << endmsg;
-
- return StatusCode::SUCCESS;
- }
-
- //---------------------------------------------------------------------
-
- StatusCode TrigT1Lucid::execute() {
- if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "execute()" << endmsg;
-
- m_digitContainer = 0;
- std::string containerName = m_LUCID_LVL1T1ContainerName;
-
- if(m_badDataFound) return StatusCode::SUCCESS;
-
- StatusCode sc = evtStore()->retrieve(m_digitContainer, containerName);
-
- if (sc.isFailure() || !m_digitContainer) {
- if(msgLvl(MSG::WARNING)) {
- msg(MSG::WARNING) << "BAD DATA!!! Input data does not include " << containerName << endmsg;
- msg(MSG::WARNING) << "Alogrithm will shut down for the rest of the run." << endmsg;
- }
- m_badDataFound = true;
- return StatusCode::SUCCESS;
- }
- else if(msgLvl(MSG::DEBUG)) {
- msg(MSG::DEBUG) << containerName << " Container Successfully Retrieved"
- << endmsg;
- }
-
-
- LUCID_DigitConstIterator itr = m_digitContainer->begin();
- LUCID_DigitConstIterator itr_end = m_digitContainer->end();
-
- unsigned short nHitsA = 0;
- unsigned short nHitsC = 0;
-
- for (; itr!=itr_end; itr++) {
-
- unsigned short tubeID = (*itr)->getTubeID();
- unsigned short qdcCount = (*itr)->getQDC();
- const bool isSideA = (*itr)->isSideA();
- const bool isSideC = (*itr)->isSideC();
- m_qdcThreshold = isSideA ? m_threshold_a : m_threshold_c;
-
-// Instead of reading the threshold from menu, use the isHit method from Digitization where thresholds are correct
-// const bool isHit = (qdcCount > m_qdcThreshold );
- const bool isHit = (*itr)->isHit();
-
- if (isHit && isSideA) nHitsA++;
- else if (isHit && isSideC) nHitsC++;
-
- if(msgLvl(MSG::DEBUG)) {
- msg(MSG::DEBUG) << " tubeID : " << tubeID
- << " qdcCount : " << qdcCount
- << " isSideA : " << isSideA
- << " isSideC : " << isSideC
- << " qdcThresold: " << m_qdcThreshold
- << " isHit : " << isHit << endmsg;
- }
- }
-
- unsigned int cableWord0 = 0;
-
- if (nHitsA) cableWord0 += 1 << m_cablestart_a;
- if (nHitsC) cableWord0 += 1 << m_cablestart_c;
-
- if(msgLvl(MSG::DEBUG)) {
- msg(MSG::DEBUG) << " nHitsA " << nHitsA << " ,"
- << " nHitsC " << nHitsC << " ,"
- << " lucid cableWord0 " << cableWord0 << " ,"
- << " bits " << std::setw(6)
- << BitOp::printBits(cableWord0, 0, 20) << endmsg;
- }
-
- LucidCTP* lucidCTP = new LucidCTP(cableWord0);
-
- if(msgLvl(MSG::DEBUG)) {
- msg(MSG::DEBUG) << lucidCTP->print();
- msg(MSG::DEBUG) << lucidCTP->dump();
- }
-
- containerName = DEFAULT_LucidCTPLocation;
-
- sc = evtStore()->record(lucidCTP, containerName, false);
-
- if (sc.isFailure()) {
- if(msgLvl(MSG::ERROR)) {
- msg(MSG::ERROR) << containerName << " failed to register. "
- << endmsg;
- }
- return StatusCode::FAILURE;
- }
- else if(msgLvl(MSG::DEBUG)) {
- msg(MSG::DEBUG) << containerName << " registered successfully. "
- << endmsg;
- }
-
- return StatusCode::SUCCESS;
- }
-
- //---------------------------------------------------------------------
-
- StatusCode TrigT1Lucid::finalize() { return StatusCode::SUCCESS; }
-}
diff --git a/Trigger/TrigT1/TrigT1Lucid/src/TrigT1Lucid.h b/Trigger/TrigT1/TrigT1Lucid/src/TrigT1Lucid.h
deleted file mode 100644
index 3c63de97fe3e..000000000000
--- a/Trigger/TrigT1/TrigT1Lucid/src/TrigT1Lucid.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIG_T1_LUCID_H
-#define TRIG_T1_LUCID_H
-
-#include "AthenaBaseComps/AthAlgorithm.h"
-
-#include "GaudiKernel/ServiceHandle.h"
-
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
-
-#include "LUCID_RawEvent/LUCID_DigitContainer.h"
-#include <string>
-
-namespace LVL1 {
-
- /* @class TrigT1Lucid
-
- @author Jacob Groth-Jensen <jacob.groth-jensen@hep.lu.se>
-
- An algorithm to simulate the level 1 LUCID trigger. This algorithm
- records a data object of LucidCTP type into StoreGate. The object
- contains the input bits for the CTP simulation. */
-
- class TrigT1Lucid: public AthAlgorithm {
-
- public:
-
- TrigT1Lucid(const std::string& name, ISvcLocator* pSvcLocator);
-
- StatusCode initialize();
- StatusCode execute();
- StatusCode finalize();
-
- private:
-
- /** A data member to retain a connection to the level 1
- configuration service */
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc;
-
- /** A data member to contain the name of the LUCID digit container
- that contains the input LUCID information. This data member is
- used as a job option property
- */
- std::string m_LUCID_LVL1T1ContainerName;
-
- /** A data member to contain a pointer to the LUCID_DigitContainer
- that contains the input LUCID information. */
- const LUCID_DigitContainer* m_digitContainer;
-
- /** thresholds for the level 1 LUCID trigger */
- float m_threshold_a;
- float m_threshold_c;
- int m_cablestart_a;
- int m_cablestart_c;
- unsigned short m_qdcThreshold;
-
- /** A flag to prevent the trigger simulation from running over bad
- input data. */
- bool m_badDataFound;
-
- };
-}
-
-#endif
diff --git a/Trigger/TrigT1/TrigT1Lucid/src/components/TrigT1Lucid_entries.cxx b/Trigger/TrigT1/TrigT1Lucid/src/components/TrigT1Lucid_entries.cxx
deleted file mode 100644
index becf009d0e56..000000000000
--- a/Trigger/TrigT1/TrigT1Lucid/src/components/TrigT1Lucid_entries.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "../TrigT1Lucid.h"
-
-DECLARE_COMPONENT( LVL1::TrigT1Lucid )
-
--
GitLab
From 34c3ba8e963d9a515abf8791aeed466efc0a4782 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Wed, 18 Aug 2021 13:18:19 +0200
Subject: [PATCH 128/272] TrigT1Interfaces: delete LucidCTP class
After the removal of the Lucid trigger simulation (TrigT1Lucid), the
`LucidCTP` class is no longer needed.
---
.../TrigT1CTMonitoring/src/BSMonitoring.h | 1 -
.../src/DeriveSimulationInputs.cxx | 20 +------
.../src/DeriveSimulationInputs.h | 1 -
.../TrigT1Interfaces/LucidCTP.h | 56 -------------------
.../TrigT1Interfaces/TrigT1InterfacesDict.h | 1 -
.../TrigT1Interfaces/TrigT1StoreGateKeys.h | 2 -
.../TrigT1Interfaces/selection.xml | 3 -
.../TrigT1/TrigT1Interfaces/src/LucidCTP.cxx | 40 -------------
8 files changed, 2 insertions(+), 122 deletions(-)
delete mode 100644 Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/LucidCTP.h
delete mode 100644 Trigger/TrigT1/TrigT1Interfaces/src/LucidCTP.cxx
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.h b/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.h
index a6c522653a7e..04ef93a22cb4 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.h
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.h
@@ -60,7 +60,6 @@ namespace LVL1 {
class EnergyCTP;
class MbtsCTP;
class BcmCTP;
- class LucidCTP;
class BptxCTP;
class NimCTP;
class RecMuonRoiSvc;
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/src/DeriveSimulationInputs.cxx b/Trigger/TrigT1/TrigT1CTMonitoring/src/DeriveSimulationInputs.cxx
index a3db87b8c169..c83dd15149ec 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/src/DeriveSimulationInputs.cxx
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/src/DeriveSimulationInputs.cxx
@@ -55,7 +55,6 @@
#include "TrigT1Interfaces/EnergyCTP.h"
#include "TrigT1Interfaces/MbtsCTP.h"
#include "TrigT1Interfaces/BcmCTP.h"
-#include "TrigT1Interfaces/LucidCTP.h"
#include "TrigT1Interfaces/NimCTP.h"
#include "TrigT1Interfaces/BptxCTP.h"
#include "TrigT1Interfaces/FrontPanelCTP.h"
@@ -329,7 +328,6 @@ TrigT1CTMonitoring::DeriveSimulationInputs::fillStoreGate(unsigned int ctpVersio
unsigned int energyCables = 0;
unsigned int bcmCables = 0;
unsigned int bptxCables = 0;
- unsigned int lucidCables = 0;
unsigned int mbtsCablesA = 0;
unsigned int mbtsCablesC = 0;
unsigned int nimCables0 = 0;
@@ -428,8 +426,6 @@ TrigT1CTMonitoring::DeriveSimulationInputs::fillStoreGate(unsigned int ctpVersio
energyCables |= cable;
else if (!thr->type().find("BCM"))
bcmCables |= cable;
- else if (thr->type() == "LUCID")
- lucidCables |= cable;
//belof 4 are a hack but I don't think there is another way other than connecting threshold->pit
else if ((thr->type().find("MBTS") != std::string::npos)&&(thr->cableConnector() == "CON0"))
@@ -625,20 +621,8 @@ TrigT1CTMonitoring::DeriveSimulationInputs::fillStoreGate(unsigned int ctpVersio
ATH_MSG_ERROR(" could not register object " << LVL1::DEFAULT_BcmCTPLocation);
return sc;
}
-
- LVL1::LucidCTP* newLUCID{nullptr};
- if (ctpVersionNumber<=3) {
- newLUCID = new LVL1::LucidCTP(lucidCables);
- } else {
- newLUCID = new LVL1::LucidCTP(calCable);
- ATH_MSG_DEBUG(" 0x" << hex << setfill('0') << setw(8) << calCable << dec << " SLOT 8 / CONN 3 => CTPCAL");
- }
- sc = evtStore()->record(newLUCID, LVL1::DEFAULT_LucidCTPLocation);
- if ( sc.isFailure() ) {
- ATH_MSG_ERROR(" could not register object " << LVL1::DEFAULT_LucidCTPLocation);
- return sc;
- }
-
+
+
LVL1::BptxCTP* newBPTX = new LVL1::BptxCTP(bptxCables);
if (ctpVersionNumber<=3) {
newBPTX = new LVL1::BptxCTP(bptxCables);
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/src/DeriveSimulationInputs.h b/Trigger/TrigT1/TrigT1CTMonitoring/src/DeriveSimulationInputs.h
index 94e8def77ee9..ba2c348f4149 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/src/DeriveSimulationInputs.h
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/src/DeriveSimulationInputs.h
@@ -35,7 +35,6 @@ namespace LVL1 {
class EnergyCTP;
class MbtsCTP;
class BcmCTP;
- class LucidCTP;
class BptxCTP;
class NimCTP;
class FrontPanelCTP;
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/LucidCTP.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/LucidCTP.h
deleted file mode 100644
index db57e90cb4b4..000000000000
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/LucidCTP.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Dear emacs, this is -*- c++ -*-
-#ifndef TRIGT1INTERFACES_LUCID_CTP_H
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-#define TRIGT1INTERFACES_LUCID_CTP_H
-
-#include <stdint.h>
-#include <string>
-
-namespace LVL1 {
-
- /** @class LucidCTP
- * @short Lucid input class to the CTP simulation
- *
- * A StoreGate class to contain the output status of the
- * level 1 LUCID trigger simulation for input into the CTP
- * simulation. This class contains two trigger bits in one
- * 32 bit unsigned int.
- *
- * @author Jacob Groth-Jensen <jacob.groth-jensen@hep.lu.se>
- *
- * $Revision: 187728 $
- * $Date: 2009-05-27 18:18:06 +0200 (Wed, 27 May 2009) $
- */
- class LucidCTP {
- public:
- LucidCTP( uint32_t word0 = 0 );
-
- /**
- * Returns an unsigned integer trigger word containing two trigger
- * bits.
- */
- uint32_t cableWord0(void) const {
- return m_cableWord0;
- }
-
- //! dump raw object content to string
- const std::string dump() const;
-
- //! print object content in a human readable form to string
- const std::string print() const;
-
- private:
- //! A data member to contain two trigger bits
- const uint32_t m_cableWord0;
-
- }; // class LucidCTP
-
-} // namespace LVL1
-
-#include "AthenaKernel/CLASS_DEF.h"
-CLASS_DEF( LVL1::LucidCTP , 48467911 , 1 )
-
-#endif // TRIGT1INTERFACES_LUCID_CTP_H
-
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1InterfacesDict.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1InterfacesDict.h
index 8c8e5326376c..e787021ab659 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1InterfacesDict.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1InterfacesDict.h
@@ -11,7 +11,6 @@
#include "TrigT1Interfaces/JetCTP.h"
#include "TrigT1Interfaces/MbtsCTP.h"
#include "TrigT1Interfaces/BcmCTP.h"
-#include "TrigT1Interfaces/LucidCTP.h"
#include "TrigT1Interfaces/RecMuonRoI.h"
#include "TrigT1Interfaces/RecEmTauRoI.h"
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1StoreGateKeys.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1StoreGateKeys.h
index 6409b8efe8bc..ec4438b56082 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1StoreGateKeys.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/TrigT1StoreGateKeys.h
@@ -29,8 +29,6 @@ namespace LVL1 {
static const std::string DEFAULT_MbtsCCTPLocation = "L1MBTSCtoCTPLocation";
//! default StoreGate location for BCM to CTP input
static const std::string DEFAULT_BcmCTPLocation = "L1BCMtoCTPLocation";
- //! default StoreGate location for Lucid to CTP input
- static const std::string DEFAULT_LucidCTPLocation = "L1LucidtoCTPLocation";
//! default StoreGate location for BPTX to CTP input
static const std::string DEFAULT_BptxCTPLocation = "L1BPTXtoCTPLocation";
//! default StoreGate location for NIM to CTP input
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/selection.xml b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/selection.xml
index 4f8cf9a1eb77..65201ae86227 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/selection.xml
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/selection.xml
@@ -18,9 +18,6 @@
<!-- BCM CTP input -->
<class name="LVL1::BcmCTP" id="2C1AC071-7948-48C9-B6C0-B3f913B4E790"/>
- <!-- LUCID CTP input -->
- <class name="LVL1::LucidCTP" id="BAC7215E-DEA2-4B43-B722-E170AC4223D5"/>
-
<!-- Reconstructed RoI classes for the HLT -->
<class name="LVL1::RecMuonRoI" id="B61E8B53-846D-42F9-A730-5ADA865E3D99" />
<class name="LVL1::RecEmTauRoI" id="66F831E5-17BB-404B-9E4D-709317EF8B22" />
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/LucidCTP.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/LucidCTP.cxx
deleted file mode 100644
index 1166f528aa40..000000000000
--- a/Trigger/TrigT1/TrigT1Interfaces/src/LucidCTP.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-#include "TrigT1Interfaces/LucidCTP.h"
-
-#include <sstream>
-#include <iomanip>
-
-#include "TrigT1Interfaces/BitOp.h"
-
-namespace LVL1 {
-
- LucidCTP::LucidCTP( unsigned int word0 )
- : m_cableWord0(word0)
- {
- }
-
- const std::string LucidCTP::dump() const
- {
- std::ostringstream s;
-
- s << " 0x" << std::hex << std::setw(8) << std::setfill( '0' ) << m_cableWord0
- << std::dec << std::setfill(' ') << std::endl;
-
- return s.str();
- }
-
- const std::string LucidCTP::print() const
- {
- std::ostringstream s;
-
- s << std::setfill( '0' )
- << " Side C:" << std::setw(1) << BitOp::printBits(m_cableWord0, 0, 0)
- << " Side A:" << std::setw(1) << BitOp::printBits(m_cableWord0, 1, 1)
- << std::setfill(' ') << std::endl;
-
- return s.str();
- }
-
-}
--
GitLab
From da68855f904418fce13df3dd6cb2aa275631941f Mon Sep 17 00:00:00 2001
From: tstreble <thomas.strebler@cern.ch>
Date: Wed, 18 Aug 2021 15:17:29 +0200
Subject: [PATCH 129/272] Configured ITkClusterError condition access
---
.../python/ITkPixelConditionsConfig.py | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py
index 092697806881..9e42c9a2989b 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py
@@ -152,7 +152,13 @@ def ITkPixelDistortionAlgCfg(flags, name="ITkPixelDistortionAlg", **kwargs):
def ITkPixelOfflineCalibCondAlgCfg(flags, name="ITkPixelOfflineCalibCondAlg", **kwargs):
"""Return a ComponentAccumulator with configured ITkPixelOfflineCalibCondAlg"""
acc = ComponentAccumulator()
- acc.merge(addFolders(flags, "/PIXEL/ITkClusterError", "PIXEL_OFL", className="CondAttrListCollection"))
+
+ CoolDataBaseFolder = '/PIXEL/ITkClusterError'
+ DetDescrVersion = flags.GeoModel.AtlasVersion
+ ctag = 'PixelITkError_v4_' + DetDescrVersion
+ cfoldertag = CoolDataBaseFolder+' <tag>'+ctag+'</tag>'
+ acc.merge( addFoldersSplitOnline(flags,'PIXEL',[cfoldertag],[cfoldertag],splitMC=True) )
+
kwargs.setdefault("ReadKey", "/PIXEL/ITkClusterError")
kwargs.setdefault("WriteKey", "ITkPixelOfflineCalibData")
kwargs.setdefault("InputSource", 2)
--
GitLab
From bcc8a86d28da707fb99535216e12faabf6467da8 Mon Sep 17 00:00:00 2001
From: abarton <Adam.Edward.Barton@cern.ch>
Date: Wed, 18 Aug 2021 13:59:47 +0100
Subject: [PATCH 130/272] Optimize string operations in VarHandles
---
.../StoreGate/ShallowCopyDecorDeps.icc | 4 +--
Control/StoreGate/StoreGate/VarHandleBase.h | 4 +--
Control/StoreGate/StoreGate/VarHandleKey.icc | 19 ++++++++++++
Control/StoreGate/src/DecorKeyHelpers.cxx | 4 +--
Control/StoreGate/src/SGImplSvc.cxx | 4 +--
Control/StoreGate/src/VarHandleBase.cxx | 8 ++---
Control/StoreGate/src/VarHandleKey.cxx | 30 ++++---------------
7 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/Control/StoreGate/StoreGate/ShallowCopyDecorDeps.icc b/Control/StoreGate/StoreGate/ShallowCopyDecorDeps.icc
index 8944a4347cae..2847358dac46 100644
--- a/Control/StoreGate/StoreGate/ShallowCopyDecorDeps.icc
+++ b/Control/StoreGate/StoreGate/ShallowCopyDecorDeps.icc
@@ -47,8 +47,8 @@ ShallowCopyDecorDeps<T>::initialize (const SG::ReadHandleKey<T>& origKey,
m_readKeys.clear();
if (used) {
for (SG::WriteHandleKey<T>& k : m_writeKeys) {
- m_readKeys.emplace_back (origKey.key() + "." + k.key());
- k = copyKey.key() + "." + k.key();
+ m_readKeys.emplace_back (origKey.key() + '.' + k.key());
+ k = copyKey.key() + '.' + k.key();
}
CHECK( m_readKeys.initialize() );
CHECK( m_writeKeys.initialize() );
diff --git a/Control/StoreGate/StoreGate/VarHandleBase.h b/Control/StoreGate/StoreGate/VarHandleBase.h
index 1015e4e9a721..5d15cd99e55a 100644
--- a/Control/StoreGate/StoreGate/VarHandleBase.h
+++ b/Control/StoreGate/StoreGate/VarHandleBase.h
@@ -144,7 +144,7 @@ namespace SG {
/**
* @brief Move constructor.
*/
- VarHandleBase( VarHandleBase&& rhs );
+ VarHandleBase( VarHandleBase&& rhs ) noexcept;
/**
@@ -156,7 +156,7 @@ namespace SG {
/**
* @brief Move operator.
*/
- VarHandleBase& operator=( VarHandleBase&& rhs );
+ VarHandleBase& operator=( VarHandleBase&& rhs ) noexcept;
/**
diff --git a/Control/StoreGate/StoreGate/VarHandleKey.icc b/Control/StoreGate/StoreGate/VarHandleKey.icc
index c130972b2b3f..a47e9bb7bb6e 100644
--- a/Control/StoreGate/StoreGate/VarHandleKey.icc
+++ b/Control/StoreGate/StoreGate/VarHandleKey.icc
@@ -84,4 +84,23 @@ SG::sgkey_t VarHandleKey::hashedKey() const
}
+/**
+ * @brief Return the StoreGate ID for the referenced object.
+ */
+inline const std::string& VarHandleKey::key() const
+{
+ return m_sgKey;
+}
+
+
+/**
+ * @brief Test if the key is blank.
+ */
+inline bool VarHandleKey::empty() const
+{
+ return m_sgKey.empty();
+}
+
+
+
} // namespace SG
diff --git a/Control/StoreGate/src/DecorKeyHelpers.cxx b/Control/StoreGate/src/DecorKeyHelpers.cxx
index d4e13833945c..2417d1549e92 100644
--- a/Control/StoreGate/src/DecorKeyHelpers.cxx
+++ b/Control/StoreGate/src/DecorKeyHelpers.cxx
@@ -24,7 +24,7 @@ namespace SG {
*/
std::string contKeyFromKey (const std::string& key)
{
- std::string::size_type ipos = key.find (".");
+ std::string::size_type ipos = key.find ('.');
if (ipos == std::string::npos)
return key;
return key.substr (0, ipos);
@@ -39,7 +39,7 @@ std::string contKeyFromKey (const std::string& key)
*/
std::string decorKeyFromKey (const std::string& key)
{
- std::string::size_type ipos = key.find (".");
+ std::string::size_type ipos = key.find ('.');
if (ipos == std::string::npos)
return "";
return key.substr (ipos+1, std::string::npos);
diff --git a/Control/StoreGate/src/SGImplSvc.cxx b/Control/StoreGate/src/SGImplSvc.cxx
index 6d47e687ff4b..06bed0ac2d31 100644
--- a/Control/StoreGate/src/SGImplSvc.cxx
+++ b/Control/StoreGate/src/SGImplSvc.cxx
@@ -1470,12 +1470,12 @@ SGImplSvc::record_HistObj(const CLID& id, const std::string& key,
std::string idname;
StatusCode sc = m_pCLIDSvc->getTypeNameOfID(id, idname);
- if (sc.isFailure() || idname == "" ) {
+ if (sc.isFailure() || idname.empty() ) {
std::ostringstream ost;
ost << id;
idname = ost.str();
}
- idname = idname + "/" + key;
+ idname = idname + '/' + key;
DataObject* obj = SG::asStorable(dho);
diff --git a/Control/StoreGate/src/VarHandleBase.cxx b/Control/StoreGate/src/VarHandleBase.cxx
index a6911d56d91b..5c9bcb290fbc 100644
--- a/Control/StoreGate/src/VarHandleBase.cxx
+++ b/Control/StoreGate/src/VarHandleBase.cxx
@@ -216,7 +216,7 @@ namespace SG {
/**
* @brief Move constructor.
*/
- VarHandleBase::VarHandleBase( VarHandleBase&& rhs ) :
+ VarHandleBase::VarHandleBase( VarHandleBase&& rhs ) noexcept :
IResetable(),
m_ptr(rhs.m_ptr),
m_proxy(nullptr),
@@ -285,7 +285,7 @@ namespace SG {
* @brief Move operator.
*/
VarHandleBase&
- VarHandleBase::operator=( VarHandleBase&& rhs )
+ VarHandleBase::operator=( VarHandleBase&& rhs ) noexcept
{
if (this != &rhs) {
m_ownedKey = std::move (rhs.m_ownedKey);
@@ -725,7 +725,7 @@ namespace SG {
m_storeWasSet = false;
}
- if (this->name() == "") {
+ if (this->name().empty()) {
REPORT_ERROR (StatusCode::FAILURE) << "Attempt to record an object with a null key";
return StatusCode::FAILURE;
}
@@ -788,7 +788,7 @@ namespace SG {
bool returnExisting,
IProxyDict* & store) const
{
- if (this->name() == "") {
+ if (this->name().empty()) {
REPORT_ERROR (StatusCode::FAILURE) << "Attempt to record an object with a null key";
return nullptr;
}
diff --git a/Control/StoreGate/src/VarHandleKey.cxx b/Control/StoreGate/src/VarHandleKey.cxx
index 00fab717078d..b010f8c846d6 100644
--- a/Control/StoreGate/src/VarHandleKey.cxx
+++ b/Control/StoreGate/src/VarHandleKey.cxx
@@ -115,13 +115,13 @@ StatusCode VarHandleKey::initialize (bool used /*= true*/)
{
if (!used) {
Gaudi::DataHandle::updateKey ( "" );
- m_sgKey = "";
+ m_sgKey.clear();
m_hashedKey = 0;
return StatusCode::SUCCESS;
}
// if (Gaudi::DataHandle::objKey() == "") {
- if (key() == "") {
+ if (key().empty()) {
REPORT_ERROR (StatusCode::FAILURE)
<< "Cannot initialize a Read/Write/Update handle with a null key.";
return StatusCode::FAILURE;
@@ -168,24 +168,6 @@ CLID VarHandleKey::clid() const
}
-/**
- * @brief Return the StoreGate ID for the referenced object.
- */
-const std::string& VarHandleKey::key() const
-{
- return m_sgKey;
-}
-
-
-/**
- * @brief Test if the key is blank.
- */
-bool VarHandleKey::empty() const
-{
- return m_sgKey.empty();
-}
-
-
/**
* @brief Prevent this method from being called.
*/
@@ -234,10 +216,10 @@ void VarHandleKey::parseKey (const std::string& key,
sn = storeName.substr(sp+1,storeName.length()-sp+1);
}
- if (key.length() == 0) {
+ if (key.empty()) {
this->updateHandle(sn);
Gaudi::DataHandle::updateKey("");
- m_sgKey = "";
+ m_sgKey.clear();
return;
}
@@ -275,7 +257,7 @@ void VarHandleKey::parseKey (const std::string& key,
if (sp == 0
&& m_sgKey.size() == 1) {
// Replace '\' with blank key
- m_sgKey = "";
+ m_sgKey.clear();
} else if ( sp == m_sgKey.length()-1) {
throw SG::ExcBadHandleKey("key \"" + key
+ "\": must not end with a \"/\"");
@@ -283,7 +265,7 @@ void VarHandleKey::parseKey (const std::string& key,
}
}
- if (m_sgKey.length() == 0) {
+ if (m_sgKey.empty()) {
Gaudi::DataHandle::updateKey("");
} else {
Gaudi::DataHandle::updateKey(sn + storeSeparator + m_sgKey);
--
GitLab
From 7d4e3b916f15c53ce0f5036513f1ed30f94454cc Mon Sep 17 00:00:00 2001
From: Rafal Bielski <rafal.bielski@cern.ch>
Date: Wed, 18 Aug 2021 18:46:25 +0200
Subject: [PATCH 131/272] Schedule decoding of phase-1 MUCTPI DAQ ROB in
offline reconstruction
---
.../python/TrigT1ResultByteStreamConfig.py | 10 +++++-----
.../TrigEDMConfig/python/TriggerEDMRun3.py | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/python/TrigT1ResultByteStreamConfig.py b/Trigger/TrigT1/TrigT1ResultByteStream/python/TrigT1ResultByteStreamConfig.py
index 4a6ed36e3924..0e470a161bb2 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/python/TrigT1ResultByteStreamConfig.py
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/python/TrigT1ResultByteStreamConfig.py
@@ -60,8 +60,9 @@ def ExampleL1TriggerByteStreamToolCfg(name, writeBS=False):
return tool
def MuonRoIByteStreamToolCfg(name, flags, writeBS=False):
- tool = CompFactory.MuonRoIByteStreamTool(name)
- muctpi_moduleid = 1 # RoIB ROB
+ tool_name = name if flags.Trigger.doHLT else name+"DAQ"
+ tool = CompFactory.MuonRoIByteStreamTool(tool_name)
+ muctpi_moduleid = 1 if flags.Trigger.doHLT else 0 # RoIB ROB for HLT, DAQ ROB for offline
muctpi_robid = int(SourceIdentifier(SubDetector.TDAQ_MUON_CTP_INTERFACE, muctpi_moduleid))
tool.MUCTPIModuleId = muctpi_moduleid
tool.ROBIDs = [muctpi_robid]
@@ -72,7 +73,7 @@ def MuonRoIByteStreamToolCfg(name, flags, writeBS=False):
else:
# read BS == write xAOD
tool.MuonRoIContainerReadKey=""
- tool.MuonRoIContainerWriteKey="LVL1MuonRoIs"
+ tool.MuonRoIContainerWriteKey = "LVL1MuonRoIs" if flags.Trigger.doHLT else "LVL1MuonRoIsDAQ"
tool.UseRun3Config = flags.Trigger.enableL1MuonPhase1
tool.RPCRecRoiTool = getRun3RPCRecRoiTool(name="RPCRecRoiTool",useRun3Config=flags.Trigger.enableL1MuonPhase1)
@@ -126,8 +127,7 @@ def L1TriggerByteStreamDecoderCfg(flags):
maybeMissingRobs.append(int(SourceIdentifier(SubDetector.TDAQ_CALO_TOPO_PROC, module_id)))
# Run-3 L1Muon decoding
- if flags.Trigger.enableL1MuonPhase1 and flags.Trigger.doHLT:
- # Currently added only when running in HLT selection, not in offline reco (ATR-23992)
+ if flags.Trigger.enableL1MuonPhase1:
muonRoiTool = MuonRoIByteStreamToolCfg(name="L1MuonBSDecoderTool", flags=flags, writeBS=False)
decoderTools += [muonRoiTool]
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
index efab9635c466..4319a7b969d2 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
@@ -208,8 +208,6 @@ TriggerHLTListRun3 = [
('TrigRoiDescriptorCollection#HLT_Roi_LArPEBHLT', 'BS ESD AODFULL AODSLIM', 'Steer'),
# Run-2 L1 (temporary)
- ('xAOD::MuonRoIContainer#LVL1MuonRoIs' , 'ESD AODFULL AODSLIM AODVERYSLIM AODBLSSLIM', 'L1'),
- ('xAOD::MuonRoIAuxContainer#LVL1MuonRoIsAux.' , 'ESD AODFULL AODSLIM AODVERYSLIM AODBLSSLIM', 'L1'),
('xAOD::EmTauRoIContainer#LVL1EmTauRoIs' , 'ESD AODFULL AODSLIM AODVERYSLIM AODBLSSLIM', 'L1'),
('xAOD::EmTauRoIAuxContainer#LVL1EmTauRoIsAux.' , 'ESD AODFULL AODSLIM AODVERYSLIM AODBLSSLIM', 'L1'),
('xAOD::JetRoIContainer#LVL1JetRoIs' , 'ESD AODFULL AODSLIM AODVERYSLIM AODBLSSLIM', 'L1'),
@@ -225,6 +223,8 @@ TriggerHLTListRun3 = [
('xAOD::MuonRoIContainer#LVL1MuonRoIs', 'BS ESD AODFULL', 'L1'),
('xAOD::MuonRoIAuxContainer#LVL1MuonRoIsAux.thresholdPatterns', 'BS ESD AODFULL', 'L1'),
+ ('xAOD::MuonRoIContainer#LVL1MuonRoIsDAQ', 'ESD AODFULL', 'L1'),
+ ('xAOD::MuonRoIAuxContainer#LVL1MuonRoIsDAQAux.', 'ESD AODFULL', 'L1'),
('xAOD::eFexEMRoIContainer#L1_eEMRoI', 'BS ESD AODFULL', 'L1'),
('xAOD::eFexEMRoIAuxContainer#L1_eEMRoIAux.thresholdPatterns', 'BS ESD AODFULL', 'L1'),
--
GitLab
From 9aedb297c5f95014a8d106a07b0f522f8f36f693 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Wed, 18 Aug 2021 17:38:49 +0000
Subject: [PATCH 132/272] egammaTools: Clean up cluster correction
configuration.
---
.../egammaConfig/python/egammaConfigFlags.py | 3 +-
.../egammaTools/python/egammaSwToolConfig.py | 182 ++----------------
2 files changed, 21 insertions(+), 164 deletions(-)
diff --git a/Reconstruction/egamma/egammaConfig/python/egammaConfigFlags.py b/Reconstruction/egamma/egammaConfig/python/egammaConfigFlags.py
index ab8b23e16bfb..2e9212b461ed 100644
--- a/Reconstruction/egamma/egammaConfig/python/egammaConfigFlags.py
+++ b/Reconstruction/egamma/egammaConfig/python/egammaConfigFlags.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# this is based on MuonConfigFlags as a guide
@@ -30,6 +30,7 @@ def createEgammaConfigFlags():
# The cluster corrections/calib
egcf.addFlag("Egamma.Calib.ClusterCorrectionVersion", 'v12phiflip_noecorrnogap')
+ egcf.addFlag("Egamma.Calib.SuperClusterCorrectionVersion", 'v12phiflip_supercluster')
egcf.addFlag("Egamma.Calib.MVAVersion", 'egammaMVACalib/offline/v7')
##################################################
diff --git a/Reconstruction/egamma/egammaTools/python/egammaSwToolConfig.py b/Reconstruction/egamma/egammaTools/python/egammaSwToolConfig.py
index 95abe054afee..ba2dbc7dbd43 100644
--- a/Reconstruction/egamma/egammaTools/python/egammaSwToolConfig.py
+++ b/Reconstruction/egamma/egammaTools/python/egammaSwToolConfig.py
@@ -8,167 +8,36 @@ import GaudiKernel.GaudiHandles as GaudiHandles
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-
-#TODO move out generators for these tools to CaloClustercorrections package
-def ToolConstantsAlgCfg(flags, prefix, version):
- acc = ComponentAccumulator()
- version = f'-{version}' if version != '' else ''
- folder = f'CaloSwClusterCorrections.{prefix}{version}'
- cond = CompFactory.ToolConstantsCondAlg(f'ToolConstantsCondAlg_CaloSwClusterCorrections_{prefix}{version}',
- DetStoreKey = folder,
- ToolConstantsKey = folder) # this is realy the folder name
- acc.addCondAlgo(cond)
-
-
- # depending on the flags configure one of the input sources
- source = flags.Calo.ClusterCorrection.defaultSource
- if not isinstance (source, list):
- source = [source]
- if 'pool' in source:
- from EventSelectorAthenaPool.CondProxyProviderConfig import CondProxyProviderCfg
- from CaloClusterCorrection.poolfiles import poolfiles
- fileID = poolfiles.get("caloswcorr_pool") #TODO figure out how this relates to CalibVersion flag
- acc.merge (CondProxyProviderCfg (flags, [fileID]))
-
- #TODO prepare tools when reading from COOL and JO
- return acc
-
-def CaloScaleClusterCfg(flags, prefix, clusterType, suffix, version):
- acc = ComponentAccumulator()
- tool = CompFactory.CaloScaleCluster(f'{prefix}_{version}_{clusterType}{suffix}',
- DBHandleKey = f'CaloSwClusterCorrections.{prefix}-{version}',
- prefix = clusterType.split('_')[0]+'.')
- acc.setPrivateTools(tool)
- acc.merge( ToolConstantsAlgCfg(flags, prefix, version))
-
- return acc
-
-def CaloSwEtaoff_v3Cfg(flags, prefix, clusterType, suffix, version):
- acc = ComponentAccumulator()
- prefix1,prefix2 = prefix.split('_')
-
- tool = CompFactory.CaloSwEtaoff_v3(f'{prefix1}{prefix2}_{version}_{clusterType}{suffix}',
- DBHandleKey = f'CaloSwClusterCorrections.{prefix1}-{version}',
- prefix = clusterType.split('_')[0]+prefix.split('_')[1]+'.')
- acc.setPrivateTools(tool)
- acc.merge( ToolConstantsAlgCfg(flags, prefix1, version))
-
- return acc
-
-
-def CaloSwPhioff_v2Cfg(flags, prefix, clusterType, suffix, version):
- acc = ComponentAccumulator()
- prefix1,prefix2 = prefix.split('_')
- tool = CompFactory.CaloSwPhioff_v2(f'{prefix1}{prefix2}_{version}_{clusterType}{suffix}',
- DBHandleKey = f'CaloSwClusterCorrections.{prefix1}-{version}',
- prefix = clusterType.split('_')[0]+prefix.split('_')[1]+'.')
- acc.setPrivateTools(tool)
- acc.merge( ToolConstantsAlgCfg(flags, prefix1, version))
- return acc
-
-
-def CaloClusterUpdateCfg(flags, prefix, clusterType, suffix, version):
- acc = ComponentAccumulator()
- tool = CompFactory.CaloClusterUpdate(f'{prefix}_{clusterType}{suffix}',
- DBHandleKey = f'CaloSwClusterCorrections.larupdate',
- prefix = clusterType.split('_')[0]+'.')
- acc.setPrivateTools(tool)
- acc.merge(ToolConstantsAlgCfg(flags, prefix, ''))
- return acc
-
-def CaloSwTimeCfg(flags, prefix, clusterType, suffix, version):
- acc = ComponentAccumulator()
- tool = CompFactory.CaloSwTime(f'{prefix}_{clusterType}{suffix}',
- order = 801 )#TODO figure out how to pick this number
- acc.setPrivateTools(tool)
-
- return acc
-
-def CaloClusterBadChannelListCfg(flags, prefix, clusterType, suffix, version):
- acc = ComponentAccumulator()
- tool = CompFactory.CaloClusterBadChannelList(f'{prefix}_{clusterType}{suffix}',
- badChannelTool = CompFactory.CaloBadChanTool(),
- order = 820) #TODO figure out how to get this number
- acc.setPrivateTools(tool)
- return acc
-
-def CaloSwCorrecionsCfg(flags, clusterType, suffix='EGCluster', toolsGen=[]):
- """
- Configures multiple correction tools following the same pattern
- The toolsGen is expected to be list of tuples with: function generating accumulator with the tool, prefix to pass to the function, version to pass to the function
- All these private tools are then repackaged into new acc.
- """
- acc = ComponentAccumulator()
- algTools = []
- for gen, prefix, ver in toolsGen:
- toolAcc = gen(flags, prefix=prefix, clusterType=clusterType, suffix=suffix, version=ver)
- if toolAcc:
- algTools.append(acc.popToolsAndMerge(toolAcc))
- acc.setPrivateTools(algTools)
- return acc
-
-
-def _desiredCorrections(flags, clusterType, suffix):
- # generator # prefix #version
- return CaloSwCorrecionsCfg(flags,
- clusterType=clusterType,
- suffix=suffix,
- toolsGen=[
- (CaloScaleClusterCfg, 'rfac', 'v5'),
- (CaloSwEtaoff_v3Cfg, 'etaoff_b1', 'v5'),
- (CaloSwEtaoff_v3Cfg, 'etaoff_e1', 'v5'),
- (CaloSwEtaoff_v3Cfg, 'etaoff_b2', 'v5'),
- (CaloSwEtaoff_v3Cfg, 'etaoff_e2', 'v5'),
- (CaloSwPhioff_v2Cfg, 'phioff_b2', 'v5data'),
- (CaloSwPhioff_v2Cfg, 'phioff_e2', 'v5data'),
- (CaloClusterUpdateCfg, 'larupdate', ''),
- (CaloSwTimeCfg, 'time', ''),
- (CaloClusterBadChannelListCfg, 'listBadChannels', '')
- ])
-
-
-
-
def _configureClusterCorrections(flags, swTool):
"Add attributes ClusterCorrectionToolsXX to egammaSwTool object"
acc= ComponentAccumulator()
- from CaloClusterCorrection.CaloSwCorrections import make_CaloSwCorrectionsCfg#, rfac, etaoff_b1, etaoff_e1, \
-# etaoff_b2, etaoff_e2, phioff_b2, phioff_e2, update, time, listBadChannel
+ from CaloClusterCorrection.CaloSwCorrections import make_CaloSwCorrectionsCfg
clusterTypes = dict(
Ele35='ele35', Ele55='ele55', Ele37='ele37',
Gam35='gam35_unconv', Gam55='gam55_unconv', Gam37='gam37_unconv',
Econv35='gam35_conv', Econv55='gam55_conv', Econv37='gam37_conv'
)
- #TODO expers check if this logic here is correct (i.e. we configure either one or the other)
- if not flags.Egamma.doSuperclusters:
- for attrName, clName in clusterTypes.items():
- attrName = 'ClusterCorrectionTools' + attrName
- if not hasattr(swTool, attrName):
- continue
- toolAcc = make_CaloSwCorrectionsCfg(flags, clName, suffix='EG',
- version=flags.Egamma.Calib.ClusterCorrectionVersion,
- cells_name=flags.Egamma.Keys.Input.CaloCells)
- tool = toolAcc.popPrivateTools()
- acc.merge(toolAcc)
- setattr( swTool, attrName, GaudiHandles.PrivateToolHandleArray(tool) )
-
- # Super cluster position only corrections
+
if flags.Egamma.doSuperclusters:
- for attrName, clName in clusterTypes.items():
- attrName = 'ClusterCorrectionToolsSuperCluster' + attrName
- if not hasattr(swTool, attrName):
- continue
- toolsAcc = _desiredCorrections(flags, clusterType=clName, suffix='EGSuperCluster')
- #TODO once debugged we may restore the old way of doing the config
- # toolsAcc = make_CaloSwCorrectionsCfg(flags, clName, suffix='EGSuperCluster',
- # corrlist=[[rfac, 'v5'], [etaoff_b1, 'v5'], [etaoff_e1, 'v5'],
- # [etaoff_b2, 'v5'], [etaoff_e2, 'v5'], [phioff_b2, 'v5data'],
- # [phioff_e2, 'v5data'], [update], [time], [listBadChannel]],
- # cells_name=flags.Egamma.Keys.Input.CaloCells) #TODO hack to assure we use COOL for data
- tools = acc.popToolsAndMerge(toolsAcc)
- setattr( swTool, attrName, GaudiHandles.PrivateToolHandleArray(tools) )
+ version = flags.Egamma.Calib.SuperClusterCorrectionVersion
+ suffix = 'EGSuperCluster'
+ attrPref = 'ClusterCorrectionToolsSuperCluster'
+ else:
+ version = flags.Egamma.Calib.ClusterCorrectionVersion
+ suffix = 'EG'
+ attrPref = 'ClusterCorrectionTools'
+
+ for attrName, clName in clusterTypes.items():
+ attrName = attrPref + attrName
+ if not hasattr(swTool, attrName):
+ continue
+ toolsAcc = make_CaloSwCorrectionsCfg (flags, clName, suffix = suffix,
+ version = version,
+ cells_name = flags.Egamma.Keys.Input.CaloCells)
+ tools = acc.popToolsAndMerge(toolsAcc)
+ setattr( swTool, attrName, GaudiHandles.PrivateToolHandleArray(tools) )
return acc
@@ -189,16 +58,3 @@ def egammaSwToolCfg(flags, name='egammaSwTool', **kwargs):
return acc
-if __name__ == '__main__':
- from AthenaCommon.Configurable import Configurable
- Configurable.configurableRun3Behavior = 1
-
- from AthenaConfiguration.AllConfigFlags import ConfigFlags as flags
- from AthenaConfiguration.TestDefaults import defaultTestFiles
- flags.Input.Files = defaultTestFiles.RAW
- flags.lock()
-
- acc = _desiredCorrections(flags, 'ele37')
- acc.printConfig(withDetails=True, summariseProps=True)
- acc.popPrivateTools()
- acc.wasMerged()
--
GitLab
From 63d1cee54162ae4401a4ac2c7795c163bdc2e541 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Wed, 18 Aug 2021 17:40:31 +0000
Subject: [PATCH 133/272] PyDumper, etc: Consistent rounding with python 3.9.
---
Event/PyDumper/python/Dumpers.py | 4 ++--
.../InDetEventCnv/InDetEventAthenaPool/CMakeLists.txt | 4 ++--
MuonSpectrometer/MuonCnv/MuonEventAthenaPool/CMakeLists.txt | 2 +-
Reconstruction/Jet/JetEventAthenaPool/CMakeLists.txt | 4 ++--
Reconstruction/TrackParticleAthenaPool/CMakeLists.txt | 2 +-
Reconstruction/tauEventAthenaPool/CMakeLists.txt | 4 ++--
Tracking/TrkEventCnv/TrkEventAthenaPool/CMakeLists.txt | 4 ++--
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Event/PyDumper/python/Dumpers.py b/Event/PyDumper/python/Dumpers.py
index d9e7d3c33a8c..924c2aeb5748 100644
--- a/Event/PyDumper/python/Dumpers.py
+++ b/Event/PyDumper/python/Dumpers.py
@@ -287,7 +287,7 @@ def dump_AmgMatrix (m, f, thresh=1e-38):
for c in range(m.cols()):
v = m(r,c)
if abs(v) < thresh: v = 0
- fprint (f, '%6.3g' % v)
+ fprint (f, '%#6.3g' % v)
fprint (f, ']')
fprint (f, ']')
return
@@ -300,7 +300,7 @@ def dump_AmgVector (m, f, thresh=1e-38):
for r in range(m.rows()):
v = m(r)
if abs(v) < thresh: v = 0
- fprint (f, '%6.3g' % v)
+ fprint (f, '%#6.3g' % v)
fprint (f, ']')
return
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/CMakeLists.txt b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/CMakeLists.txt
index 2d1d44da7516..c0e3ba640caf 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/CMakeLists.txt
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetEventAthenaPool )
@@ -43,7 +43,7 @@ atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
find_package( AthenaPoolUtilitiesTest )
if( ATHENAPOOLUTILITIESTEST_FOUND )
set( INDETEVENTATHENAPOOL_REFERENCE_TAG
- InDetEventAthenaPoolReference-02-00-00 )
+ InDetEventAthenaPoolReference-03-00-00 )
run_tpcnv_test( InDetEventTPCnv_16.6.2.1 ESD-16.6.2.1
REFERENCE_TAG ${INDETEVENTATHENAPOOL_REFERENCE_TAG} )
else()
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/CMakeLists.txt b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/CMakeLists.txt
index cb8f37c08589..1a2a1054d9e8 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/CMakeLists.txt
@@ -75,7 +75,7 @@ find_package( AthenaPoolUtilitiesTest )
if( ATHENAPOOLUTILITIESTEST_FOUND )
set( MUONEVENTATHENAPOOL_REFERENCE_TAG
- MuonEventAthenaPoolReference-03-01-00 )
+ MuonEventAthenaPoolReference-04-00-00 )
run_tpcnv_test( MuonEventTPCnv_17.0.0 ESD-17.0.0
REFERENCE_TAG ${MUONEVENTATHENAPOOL_REFERENCE_TAG} )
run_tpcnv_test( MuonEventTPCnv_20.1.7.2 ESD-20.1.7.2
diff --git a/Reconstruction/Jet/JetEventAthenaPool/CMakeLists.txt b/Reconstruction/Jet/JetEventAthenaPool/CMakeLists.txt
index 845cfc433fff..f6f9adc5e994 100644
--- a/Reconstruction/Jet/JetEventAthenaPool/CMakeLists.txt
+++ b/Reconstruction/Jet/JetEventAthenaPool/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( JetEventAthenaPool )
@@ -20,7 +20,7 @@ find_package( AthenaPoolUtilitiesTest )
if( ATHENAPOOLUTILITIESTEST_FOUND )
set( JETEVENTATHENAPOOL_REFERENCE_TAG
- JetEventAthenaPoolReference-01-00-01 )
+ JetEventAthenaPoolReference-02-00-00 )
run_tpcnv_test( JetTPCnv_15.9.0.5 AOD-15.9.0.5-full
REFERENCE_TAG ${JETEVENTATHENAPOOL_REFERENCE_TAG} )
run_tpcnv_test( JetTPCnv_17.0.0 AOD-17.0.0-full
diff --git a/Reconstruction/TrackParticleAthenaPool/CMakeLists.txt b/Reconstruction/TrackParticleAthenaPool/CMakeLists.txt
index 674dc6724b09..b28f4247f198 100644
--- a/Reconstruction/TrackParticleAthenaPool/CMakeLists.txt
+++ b/Reconstruction/TrackParticleAthenaPool/CMakeLists.txt
@@ -19,7 +19,7 @@ atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
find_package( AthenaPoolUtilitiesTest )
if( ATHENAPOOLUTILITIESTEST_FOUND )
set( TRACKPARTICLEATHENAPOOL_REFERENCE_TAG
- TrackParticleAthenaPoolReference-01-00-00 )
+ TrackParticleAthenaPoolReference-03-00-00 )
run_tpcnv_test( TrackParticleTPCnv_16.6.3 AOD-16.6.3-full
REFERENCE_TAG ${TRACKPARTICLEATHENAPOOL_REFERENCE_TAG} )
run_tpcnv_test( TrackParticleTPCnv_17.2.8 AOD-17.2.8-full
diff --git a/Reconstruction/tauEventAthenaPool/CMakeLists.txt b/Reconstruction/tauEventAthenaPool/CMakeLists.txt
index 13e8a7366855..26ed9c4aef36 100644
--- a/Reconstruction/tauEventAthenaPool/CMakeLists.txt
+++ b/Reconstruction/tauEventAthenaPool/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( tauEventAthenaPool )
@@ -20,7 +20,7 @@ find_package( AthenaPoolUtilitiesTest )
if( ATHENAPOOLUTILITIESTEST_FOUND )
set( TAUEVENTATHENAPOOL_REFERENCE_TAG
- tauEventAthenaPoolReference-01-00-01 )
+ tauEventAthenaPoolReference-02-00-00 )
run_tpcnv_test( tauEventTPCnv_15.0.0 AOD-15.0.0-full
REFERENCE_TAG ${TAUEVENTATHENAPOOL_REFERENCE_TAG} )
run_tpcnv_test( tauEventTPCnv_15.6.9 AOD-15.6.9-full
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/CMakeLists.txt b/Tracking/TrkEventCnv/TrkEventAthenaPool/CMakeLists.txt
index 2645bce66e43..469e8a600ef3 100644
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/CMakeLists.txt
+++ b/Tracking/TrkEventCnv/TrkEventAthenaPool/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkEventAthenaPool )
@@ -22,7 +22,7 @@ find_package( AthenaPoolUtilitiesTest )
if( ATHENAPOOLUTILITIESTEST_FOUND )
set( TRKEVENTATHENAPOOL_REFERENCE_TAG
- TrkEventAthenaPoolReference-03-00-00 )
+ TrkEventAthenaPoolReference-05-00-00 )
run_tpcnv_test( TrkEventTPCnv_14.5.0 AOD-14.5.0-full
REQUIRED_LIBRARIES TrackParticleAthenaPoolPoolCnv
REFERENCE_TAG ${TRKEVENTATHENAPOOL_REFERENCE_TAG} )
--
GitLab
From 32b422e48f47859087e65586b5718c198034fdb0 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Wed, 18 Aug 2021 17:45:03 +0000
Subject: [PATCH 134/272] HGTD_ReadoutGeometry+HGTD_GeoModel: Fix placement of
using directive.
---
.../src/HGTD_DetectorFactory.cxx | 1 +
.../HGTD_DetectorManager.h | 27 +++++++++----------
.../src/HGTD_DetectorManager.cxx | 4 +++
3 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_GeoModel/src/HGTD_DetectorFactory.cxx b/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_GeoModel/src/HGTD_DetectorFactory.cxx
index cf5126d41241..7c840adb9f9c 100644
--- a/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_GeoModel/src/HGTD_DetectorFactory.cxx
+++ b/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_GeoModel/src/HGTD_DetectorFactory.cxx
@@ -53,6 +53,7 @@
#include "RDBAccessSvc/IRDBRecord.h"
using namespace std;
+using namespace InDetDD;
namespace HGTDGeo {
diff --git a/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_ReadoutGeometry/HGTD_ReadoutGeometry/HGTD_DetectorManager.h b/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_ReadoutGeometry/HGTD_ReadoutGeometry/HGTD_DetectorManager.h
index 4b9d42cc6b26..b21fcfd106de 100644
--- a/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_ReadoutGeometry/HGTD_ReadoutGeometry/HGTD_DetectorManager.h
+++ b/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_ReadoutGeometry/HGTD_ReadoutGeometry/HGTD_DetectorManager.h
@@ -20,7 +20,6 @@
// Message Stream Member
#include "AthenaKernel/MsgStreamMember.h"
-using namespace InDetDD;
class StoreGateSvc;
@@ -53,24 +52,24 @@ public:
//
/** access to individual elements : via Identifier */
- virtual HGTD_DetectorElement * getDetectorElement(const Identifier &id) const;
+ virtual InDetDD::HGTD_DetectorElement * getDetectorElement(const Identifier &id) const;
/** access to individual elements : via IdentifierHash */
- virtual HGTD_DetectorElement * getDetectorElement(const IdentifierHash &idHash) const;
+ virtual InDetDD::HGTD_DetectorElement * getDetectorElement(const IdentifierHash &idHash) const;
/** access to individual elements : via element identification */
- HGTD_DetectorElement * getDetectorElement(int endcap,
- int layer,
- int phi_module,
- int eta_module) const;
+ InDetDD::HGTD_DetectorElement * getDetectorElement(int endcap,
+ int layer,
+ int phi_module,
+ int eta_module) const;
/** access to whole collection via Iterators */
- virtual const HGTD_DetectorElementCollection * getDetectorElementCollection() const;
- virtual HGTD_DetectorElementCollection::const_iterator getDetectorElementBegin() const;
- virtual HGTD_DetectorElementCollection::const_iterator getDetectorElementEnd() const;
+ virtual const InDetDD::HGTD_DetectorElementCollection * getDetectorElementCollection() const;
+ virtual InDetDD::HGTD_DetectorElementCollection::const_iterator getDetectorElementBegin() const;
+ virtual InDetDD::HGTD_DetectorElementCollection::const_iterator getDetectorElementEnd() const;
/** Add elememts */
- virtual void addDetectorElement(HGTD_DetectorElement * element);
+ virtual void addDetectorElement(InDetDD::HGTD_DetectorElement * element);
/** Invalidate cache for all detector elements */
virtual void invalidateAll() const;
@@ -79,7 +78,7 @@ public:
virtual void updateAll() const;
/** Set SiCommonItems */
- void setCommonItems(std::unique_ptr<const SiCommonItems>&& commonItems);
+ void setCommonItems(std::unique_ptr<const InDetDD::SiCommonItems>&& commonItems);
/** Declaring the Message method for further use */
MsgStream& msg (MSG::Level lvl) const { return m_msg.get() << lvl; }
@@ -97,10 +96,10 @@ private:
// Private member data
std::vector<PVLink> m_volume;
- HGTD_DetectorElementCollection m_elementCollection;
+ InDetDD::HGTD_DetectorElementCollection m_elementCollection;
const HGTD_ID* m_idHelper;
- std::unique_ptr<const SiCommonItems> m_commonItems;
+ std::unique_ptr<const InDetDD::SiCommonItems> m_commonItems;
//Declaring private message stream member.
mutable Athena::MsgStreamMember m_msg;
diff --git a/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_ReadoutGeometry/src/HGTD_DetectorManager.cxx b/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_ReadoutGeometry/src/HGTD_DetectorManager.cxx
index c96b1daeebf2..6771ea6c051c 100644
--- a/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_ReadoutGeometry/src/HGTD_DetectorManager.cxx
+++ b/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_ReadoutGeometry/src/HGTD_DetectorManager.cxx
@@ -7,6 +7,10 @@
#include "StoreGate/StoreGateSvc.h"
#include "AthenaBaseComps/AthMsgStreamMacros.h"
+using InDetDD::HGTD_DetectorElementCollection;
+using InDetDD::HGTD_DetectorElement;
+using InDetDD::SiCommonItems;
+
HGTD_DetectorManager::HGTD_DetectorManager(StoreGateSvc* detStore)
: m_idHelper(0)
{
--
GitLab
From 9321297acdaa953ce286262121ca66a5f40af57d Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Wed, 18 Aug 2021 17:46:06 +0000
Subject: [PATCH 135/272] TrkDetDescrTools, etc: Migrate LayerMaterialProvider
to use CondHandle.
---
.../python/ISF_FatrasServicesConfig.py | 9 +-
.../python/AtlasTrackingGeometryCondAlg.py | 11 +-
.../AtlasTrackingGeometryCondAlgConfig.py | 3 +-
.../python/AtlasTrackingGeometrySvcConfig.py | 6 +-
.../python/AtlasTrackingGeometrySvc.py | 3 +-
.../TrkDetDescrTools/LayerMaterialProvider.h | 32 +-
.../src/LayerMaterialProvider.cxx | 148 ++---
.../TrkGeometry/LayerMaterialMap.h | 4 +-
.../share/AdaptiveMultiVertexFitter_test.py | 13 +-
.../share/AdaptiveMultiVertexFitter_test.ref | 2 +
.../share/AdaptiveVertexFitter_test.py | 13 +-
.../share/AdaptiveVertexFitter_test.ref | 2 +
.../src/AdaptiveVertexFitterTestAlg.cxx | 14 +-
.../share/CrossDistancesSeedFinder.ref | 434 +--------------
.../share/CrossDistancesSeedFinder_test.py | 3 +-
.../share/DummySeedFinder.ref | 397 +-------------
.../share/IndexedCrossDistancesSeedFinder.ref | 442 +--------------
.../share/MCTrueSeedFinder.ref | 400 +-------------
.../share/TrackDensitySeedFinder.ref | 396 +-------------
.../share/VertexSeedFinderTestCommon.py | 7 +-
.../share/ZScanSeedFinder.ref | 517 +-----------------
.../share/ZScanSeedFinder_test.py | 9 +-
22 files changed, 187 insertions(+), 2678 deletions(-)
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasServicesConfig.py b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasServicesConfig.py
index b8d80d8d4b6a..27f151a5cf05 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasServicesConfig.py
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasServicesConfig.py
@@ -50,7 +50,8 @@ def initialiseCoolDataBaseFolder():
MagicTag = TrkDetFlags.MaterialMagicTag()
DataBaseConnection = '<dbConnection>sqlite://X;schema='+DataBasePath+DataBaseName+';dbname=OFLP200</dbConnection>'
conddb.blockFolder('/GLOBAL/TrackingGeo/LayerMaterial')
- conddb.addFolderWithTag('',DataBaseConnection+CoolDataBaseFolder,AtlasMaterialTag+MagicTag,force=True)
+ conddb.addFolderWithTag('',DataBaseConnection+CoolDataBaseFolder,AtlasMaterialTag+MagicTag,force=True,
+ className = 'Trk::LayerMaterialMap')
if TrkDetFlags.ConfigurationOutputLevel() < 3 :
print ('[ TrackingGeometrySvc ] Using Local Database: '+DataBaseConnection)
# make sure that the pool files are in the catalog
@@ -61,11 +62,13 @@ def initialiseCoolDataBaseFolder():
CoolDataBaseFolder = '/GLOBAL/TrackingGeo/SLHC_LayerMaterial'
ctag = AtlasMaterialTag+TrkDetFlags.MaterialMagicTag()
cfoldertag = CoolDataBaseFolder+' <tag>'+ctag+'</tag>'
- conddb.addFolderSplitMC('GLOBAL',cfoldertag,cfoldertag)
+ conddb.addFolderSplitMC('GLOBAL',cfoldertag,cfoldertag,
+ className = 'Trk::LayerMaterialMap')
else :
# load the right folders (preparation for calo inclusion)
cfolder = CoolDataBaseFolder +'<tag>TagInfoMajor/'+AtlasMaterialTag+'/GeoAtlas</tag>'
- conddb.addFolderSplitMC('GLOBAL',cfolder,cfolder)
+ conddb.addFolderSplitMC('GLOBAL',cfolder,cfolder,
+ className = 'Trk::LayerMaterialMap')
#HACK: CoolDataBaseFolder may not be set at this point! Is this right? -KG
return CoolDataBaseFolder
diff --git a/Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlg.py b/Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlg.py
index ce9666700bc7..ae4392ace17d 100644
--- a/Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlg.py
+++ b/Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlg.py
@@ -136,7 +136,7 @@ class ConfiguredTrackingGeometryCondAlg( Trk__TrackingGeometryCondAlg ) :
from TrkDetDescrTools.TrkDetDescrToolsConf import Trk__LayerMaterialProvider as LayerMaterialProvider
AtlasMaterialProvider = LayerMaterialProvider('AtlasMaterialProvider')
AtlasMaterialProvider.OutputLevel = TrkDetFlags.ConfigurationOutputLevel()
- AtlasMaterialProvider.LayerMaterialMapName = TrkDetFlags.MaterialStoreGateKey()
+ AtlasMaterialProvider.LayerMaterialMapKey = TrkDetFlags.MaterialStoreGateKey()
AtlasGeometryProcessors += [ AtlasMaterialProvider ]
@@ -157,7 +157,8 @@ class ConfiguredTrackingGeometryCondAlg( Trk__TrackingGeometryCondAlg ) :
MagicTag = TrkDetFlags.MaterialMagicTag()
DataBaseConnection = '<dbConnection>sqlite://X;schema='+DataBasePath+DataBaseName+';dbname=OFLP200</dbConnection>'
conddb.blockFolder('/GLOBAL/TrackingGeo/LayerMaterialV2')
- conddb.addFolderWithTag('',DataBaseConnection+CoolDataBaseFolder,AtlasMaterialTag+MagicTag,force=True)
+ conddb.addFolderWithTag('',DataBaseConnection+CoolDataBaseFolder,AtlasMaterialTag+MagicTag,force=True,
+ className = 'Trk::LayerMaterialMap')
if TrkDetFlags.ConfigurationOutputLevel() < 3 :
print ('[ TrackingGeometryCondAlg ] Using Local Database: '+DataBaseConnection)
# make sure that the pool files are in the catalog
@@ -166,13 +167,15 @@ class ConfiguredTrackingGeometryCondAlg( Trk__TrackingGeometryCondAlg ) :
CoolDataBaseFolder = '/GLOBAL/TrackingGeo/LayerMaterialITK'
ctag = AtlasMaterialTag+TrkDetFlags.MaterialMagicTag()
cfoldertag = CoolDataBaseFolder+' <tag>'+ctag+'</tag>'
- conddb.addFolderSplitMC('GLOBAL',cfoldertag,cfoldertag)
+ conddb.addFolderSplitMC('GLOBAL',cfoldertag,cfoldertag,
+ className = 'Trk::LayerMaterialMap')
else :
print ('[ TrackingGeometryCondAlg ] base material tag : ', AtlasMaterialTag)
cfolder = CoolDataBaseFolder +'<tag>TagInfoMajor/'+AtlasMaterialTag+'/GeoAtlas</tag>'
print ('[ TrackingGeometryCondAlg ] translated to COOL: ', cfolder)
# load the right folders (preparation for calo inclusion)
- conddb.addFolderSplitMC('GLOBAL',cfolder,cfolder)
+ conddb.addFolderSplitMC('GLOBAL',cfolder,cfolder,
+ className = 'Trk::LayerMaterialMap')
elif TrkDetFlags.MaterialSource() == 'Input' :
# the material provider
diff --git a/Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlgConfig.py b/Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlgConfig.py
index f779c1a39be7..6d3612253425 100644
--- a/Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlgConfig.py
+++ b/Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlgConfig.py
@@ -27,7 +27,8 @@ def _setupCondDB(flags, CoolDataBaseFolder, quiet=True):
# print('[ TrackingGeometrySvc ] translated to COOL: ' + cfolder)
# load the right folders
- result.merge( addFoldersSplitOnline(flags,'GLOBAL',[cfolder],[cfolder],splitMC=True) )
+ result.merge( addFoldersSplitOnline(flags,'GLOBAL',[cfolder],[cfolder],splitMC=True,
+ className = 'Trk::LayerMaterialMap') )
return result
def _getInDetTrackingGeometryBuilder(name, flags,result, envelopeDefinitionSvc, namePrefix='', nameSuffix='',setLayerAssociation = True, buildTrtStrawLayers = False):
diff --git a/Tracking/TrkConfig/python/AtlasTrackingGeometrySvcConfig.py b/Tracking/TrkConfig/python/AtlasTrackingGeometrySvcConfig.py
index 490506f894af..3df2543aa479 100644
--- a/Tracking/TrkConfig/python/AtlasTrackingGeometrySvcConfig.py
+++ b/Tracking/TrkConfig/python/AtlasTrackingGeometrySvcConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
@@ -274,14 +274,14 @@ def TrackingGeometrySvcCfg( flags , name = 'AtlasTrackingGeometrySvc', doMateria
CoolDataBaseFolder = '/GLOBAL/TrackingGeo/LayerMaterialV2' # Was from TrkDetFlags.MaterialStoreGateKey()
# the material provider
Trk__LayerMaterialProvider=CompFactory.Trk.LayerMaterialProvider
- atlasMaterialProvider = Trk__LayerMaterialProvider('AtlasMaterialProvider', LayerMaterialMapName=CoolDataBaseFolder)
+ atlasMaterialProvider = Trk__LayerMaterialProvider('AtlasMaterialProvider', LayerMaterialMapName=CoolDataBaseFolder, LayerMaterialMapKey='')
atlas_geometry_processors += [ atlasMaterialProvider ]
# Setup DBs
result.merge(_setupCondDB(flags, CoolDataBaseFolder))
elif flags.TrackingGeometry.MaterialSource == 'Input':
Trk__InputLayerMaterialProvider=CompFactory.Trk.InputLayerMaterialProvider
- atlasMaterialProvider = Trk__InputLayerMaterialProvider('AtlasMaterialProvider')
+ atlasMaterialProvider = Trk__InputLayerMaterialProvider('AtlasMaterialProvider', LayerMaterialMapKey='')
atlas_geometry_processors += [ atlasMaterialProvider ]
if doMaterialValidation:
diff --git a/Tracking/TrkDetDescr/TrkDetDescrSvc/python/AtlasTrackingGeometrySvc.py b/Tracking/TrkDetDescr/TrkDetDescrSvc/python/AtlasTrackingGeometrySvc.py
index 4ca4f7fe7408..6a91eb6f2ba7 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrSvc/python/AtlasTrackingGeometrySvc.py
+++ b/Tracking/TrkDetDescr/TrkDetDescrSvc/python/AtlasTrackingGeometrySvc.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
##################################################################################
# The AtlasTrackingGeometry Svc fragment
@@ -115,6 +115,7 @@ class ConfiguredTrackingGeometrySvc( Trk__TrackingGeometrySvc ) :
AtlasMaterialProvider = LayerMaterialProvider('AtlasMaterialProvider')
AtlasMaterialProvider.OutputLevel = TrkDetFlags.ConfigurationOutputLevel()
AtlasMaterialProvider.LayerMaterialMapName = TrkDetFlags.MaterialStoreGateKey()
+ AtlasMaterialProvider.LayerMaterialMapKey = ''
AtlasGeometryProcessors += [ AtlasMaterialProvider ]
diff --git a/Tracking/TrkDetDescr/TrkDetDescrTools/TrkDetDescrTools/LayerMaterialProvider.h b/Tracking/TrkDetDescr/TrkDetDescrTools/TrkDetDescrTools/LayerMaterialProvider.h
index 08660cc5a6e8..f29af5ba0ef4 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrTools/TrkDetDescrTools/LayerMaterialProvider.h
+++ b/Tracking/TrkDetDescr/TrkDetDescrTools/TrkDetDescrTools/LayerMaterialProvider.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -11,8 +11,10 @@
// Trk
#include "TrkDetDescrInterfaces/IGeometryProcessor.h"
+#include "TrkGeometry/LayerMaterialMap.h"
// Gaudi & Athena
#include "AthenaBaseComps/AthAlgTool.h"
+#include "StoreGate/ReadCondHandleKey.h"
#include "CxxUtils/checker_macros.h"
@@ -34,7 +36,7 @@ namespace Trk {
*/
class LayerMaterialProvider //process methods call non-safe code
- : public AthAlgTool, virtual public IGeometryProcessor {
+ : public extends<AthAlgTool, IGeometryProcessor> {
public:
/** Constructor */
@@ -43,6 +45,8 @@ namespace Trk {
/** Destructor */
virtual ~LayerMaterialProvider();
+ virtual StatusCode initialize() override;
+
/** Processor Action to work on TrackingGeometry& tgeo */
virtual StatusCode process
ATLAS_NOT_THREAD_SAFE(const TrackingGeometry& tgeo) const;
@@ -53,24 +57,32 @@ namespace Trk {
ATLAS_NOT_THREAD_SAFE(const TrackingVolume& tvol,
size_t level = 0) const;
+ StatusCode process
+ ATLAS_NOT_THREAD_SAFE(const TrackingVolume& lay,
+ const LayerMaterialMap& layerMaterialMap,
+ size_t level) const;
+
/** Processor Action to work on Layers */
virtual StatusCode process
ATLAS_NOT_THREAD_SAFE(const Layer& lay, size_t level = 0) const;
+ StatusCode process
+ ATLAS_NOT_THREAD_SAFE(const Layer& lay,
+ const LayerMaterialMap& layerMaterialMap,
+ size_t level) const;
+
/** Processor Action to work on Surfaces */
- virtual StatusCode process(const Surface& surf, size_t level = 0) const;
+ virtual StatusCode process(const Surface& surf, size_t level = 0) const override;
private:
- StatusCode loadMaterialMap() const; //!< reatrieve the Material map from the detector store
+ void dumpMaterialMap (const LayerMaterialMap& layerMaterialMap) const;
- //!< boolean switch for assignLayerMaterial
+ SG::ReadCondHandleKey<LayerMaterialMap> m_layerMaterialMapKey
+ { this, "LayerMaterialMapKey", "/GLOBAL/TrackingGeo/LayerMaterialV2",
+ "COOL folder for material map" };
- mutable std::once_flag m_loadMapOnceFlag ATLAS_THREAD_SAFE;
- mutable const LayerMaterialMap* m_layerMaterialMap ATLAS_THREAD_SAFE;
- std::string m_layerMaterialMapName;
-
-
+ std::string m_layerMaterialMapName;
};
} // end of namespace
diff --git a/Tracking/TrkDetDescr/TrkDetDescrTools/src/LayerMaterialProvider.cxx b/Tracking/TrkDetDescr/TrkDetDescrTools/src/LayerMaterialProvider.cxx
index 46f4b1aef011..aaf85e47f641 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrTools/src/LayerMaterialProvider.cxx
+++ b/Tracking/TrkDetDescr/TrkDetDescrTools/src/LayerMaterialProvider.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -8,6 +8,7 @@
// STL
#include <sstream>
+#include <atomic>
// Trk include
#include "TrkDetDescrTools/LayerMaterialProvider.h"
#include "TrkGeometry/TrackingGeometry.h"
@@ -16,18 +17,15 @@
#include "TrkGeometry/LayerMaterialMap.h"
#include "TrkVolumes/Volume.h"
#include "TrkSurfaces/Surface.h"
+#include "StoreGate/ReadCondHandle.h"
+#include "CxxUtils/checker_macros.h"
// constructor
Trk::LayerMaterialProvider::LayerMaterialProvider(const std::string& t, const std::string& n, const IInterface* p)
-: AthAlgTool(t,n,p),
- m_layerMaterialMap(nullptr),
- m_layerMaterialMapName("/GLOBAL/TrackingGeo/LayerMaterialV2")
+: base_class(t,n,p)
{
- declareInterface<Trk::IGeometryProcessor>(this);
-
- // Name specification from outside
- declareProperty("LayerMaterialMapName", m_layerMaterialMapName);
-
+ declareProperty ("LayerMaterialMapName", m_layerMaterialMapName,
+ "If LayerMaterialMapKey is not set, then fall back to retrieving this from the detector store.");
}
// destructor
@@ -35,9 +33,27 @@ Trk::LayerMaterialProvider::~LayerMaterialProvider()
{}
+StatusCode Trk::LayerMaterialProvider::initialize()
+{
+ ATH_CHECK( m_layerMaterialMapKey.initialize (SG::AllowEmpty) );
+ return StatusCode::SUCCESS;
+}
+
+
// Processor Action to work on TrackingGeometry
-StatusCode Trk::LayerMaterialProvider::process(const Trk::TrackingGeometry& tgeo) const{
-
+StatusCode Trk::LayerMaterialProvider::process
+ATLAS_NOT_THREAD_SAFE(const Trk::TrackingGeometry& tgeo) const
+{
+ const LayerMaterialMap* layerMaterialMap = nullptr;
+ if (!m_layerMaterialMapKey.key().empty()) {
+ SG::ReadCondHandle<LayerMaterialMap> layerMaterialMapH (m_layerMaterialMapKey);
+ layerMaterialMap = *layerMaterialMapH;
+ }
+ else {
+ ATH_CHECK( detStore()->retrieve (layerMaterialMap, m_layerMaterialMapName) );
+ }
+ dumpMaterialMap (*layerMaterialMap);
+
ATH_MSG_VERBOSE("Start processing the TrackingGeometry recursively");
// retrieve the highest tracking volume
const Trk::TrackingVolume* worldVolume = tgeo.highestTrackingVolume();
@@ -45,7 +61,7 @@ StatusCode Trk::LayerMaterialProvider::process(const Trk::TrackingGeometry& tgeo
if (worldVolume){
// TrackingVolume : confined layers
ATH_MSG_VERBOSE("TrackingVolume '" << worldVolume->volumeName() << "' retrieved as highest level node.");
- if (process(*worldVolume, 0).isFailure() ) {
+ if (process(*worldVolume, *layerMaterialMap, 0).isFailure() ) {
ATH_MSG_FATAL("Could not load material maps for provided TrackingGeometry, abort job.");
return StatusCode::FAILURE;
}
@@ -60,7 +76,7 @@ StatusCode Trk::LayerMaterialProvider::process(const Trk::TrackingGeometry& tgeo
int layIndex = lay->layerIndex().value();
// only move on if layer index is different from 0
if (layIndex){
- StatusCode sc( process(*lay, 0) );
+ StatusCode sc( process(*lay, *layerMaterialMap, 0) );
// @TODO Currently recoverable errors are treated as failure. Is this the intended behaviour ? Elsewhere recoverable errors are treated as recoverable
if (sc.isSuccess())
ATH_MSG_DEBUG("---[B] Boundary layer with " << layCount << " references : successfully loaded material map for layer " << layIndex );
@@ -81,18 +97,29 @@ StatusCode Trk::LayerMaterialProvider::process(const Trk::TrackingGeometry& tgeo
}
// Processor Action to work on TrackingVolumes
-StatusCode Trk::LayerMaterialProvider::process(const Trk::TrackingVolume& tvol, size_t level) const {
-
- // load the material map if not done yet
- bool loadMapFailed = false;
- std::call_once(m_loadMapOnceFlag, [&](){
- loadMapFailed = loadMaterialMap().isFailure();
- });
- if (loadMapFailed){
- ATH_MSG_DEBUG( "Problems loading the LayerMaterialMap - check name or call sequence." );
- return StatusCode::FAILURE;
+StatusCode Trk::LayerMaterialProvider::process
+ATLAS_NOT_THREAD_SAFE(const Trk::TrackingVolume& tvol, size_t level) const
+{
+ const LayerMaterialMap* layerMaterialMap = nullptr;
+ if (!m_layerMaterialMapKey.key().empty()) {
+ SG::ReadCondHandle<LayerMaterialMap> layerMaterialMapH (m_layerMaterialMapKey);
+ layerMaterialMap = *layerMaterialMapH;
}
-
+ else {
+ ATH_CHECK( detStore()->retrieve (layerMaterialMap, m_layerMaterialMapName) );
+ }
+ dumpMaterialMap (*layerMaterialMap);
+ ATH_CHECK( process (tvol, *layerMaterialMap, level) );
+ return StatusCode::SUCCESS;
+}
+
+
+StatusCode
+Trk::LayerMaterialProvider::process
+ATLAS_NOT_THREAD_SAFE(const Trk::TrackingVolume& tvol,
+ const LayerMaterialMap& layerMaterialMap,
+ size_t level) const
+{
std::stringstream displayBuffer;
for (size_t il = 0; il < level; ++il) displayBuffer << " ";
// formatted screen output
@@ -113,7 +140,7 @@ StatusCode Trk::LayerMaterialProvider::process(const Trk::TrackingVolume& tvol,
// get the layer index and only process if it's an indexed layer
int layIndex = layIter->layerIndex().value();
if (layIndex){
- StatusCode sc = process(*layIter, level);
+ StatusCode sc = process(*layIter, layerMaterialMap, level);
if (sc.isSuccess())
ATH_MSG_DEBUG(displayBuffer.str() << "---[M] Material layer: successfully loaded material map for layer " << layIndex );
else if (sc.isRecoverable())
@@ -137,7 +164,7 @@ StatusCode Trk::LayerMaterialProvider::process(const Trk::TrackingVolume& tvol,
for (; volumesIter != volumes.end(); ++volumesIter){
if (!(*volumesIter))
ATH_MSG_WARNING("Zero-pointer found in VolumeArray - indicates problem !");
- if ((*volumesIter) && process(**volumesIter, ++level).isFailure() ){
+ if ((*volumesIter) && process(**volumesIter, layerMaterialMap, ++level).isFailure() ){
ATH_MSG_FATAL("Failed to call process(const TrackingVolume&) on confined volumes. Aborting.");
return StatusCode::FAILURE;
}
@@ -150,22 +177,28 @@ StatusCode Trk::LayerMaterialProvider::process(const Trk::TrackingVolume& tvol,
}
// Processor Action to work on Layers
-StatusCode Trk::LayerMaterialProvider::process(const Trk::Layer& lay, size_t level) const {
-
- // load the material map if not done yet
- bool loadMapFailed = false;
- std::call_once(m_loadMapOnceFlag, [&](){
- loadMapFailed = loadMaterialMap().isFailure();
- });
- if (loadMapFailed){
- ATH_MSG_DEBUG( "Problems loading the LayerMaterialMap - check name or call sequence." );
- return StatusCode::FAILURE;
- }
- // is the pointer still null?
- if (!m_layerMaterialMap) {
- ATH_MSG_WARNING( "The LayerMaterialMap pointer is NULL - check name or call sequence." );
- return StatusCode::FAILURE;
- }
+StatusCode Trk::LayerMaterialProvider::process
+ATLAS_NOT_THREAD_SAFE(const Trk::Layer& lay, size_t level) const
+{
+ const LayerMaterialMap* layerMaterialMap = nullptr;
+ if (!m_layerMaterialMapKey.key().empty()) {
+ SG::ReadCondHandle<LayerMaterialMap> layerMaterialMapH (m_layerMaterialMapKey);
+ layerMaterialMap = *layerMaterialMapH;
+ }
+ else {
+ ATH_CHECK( detStore()->retrieve (layerMaterialMap, m_layerMaterialMapName) );
+ }
+ dumpMaterialMap (*layerMaterialMap);
+ ATH_CHECK( process (lay, *layerMaterialMap, level) );
+ return StatusCode::SUCCESS;
+}
+
+StatusCode
+Trk::LayerMaterialProvider::process
+ATLAS_NOT_THREAD_SAFE(const Trk::Layer& lay,
+ const LayerMaterialMap& layerMaterialMap,
+ size_t level) const
+{
// skip Layers w/o material
if (!lay.layerMaterialProperties())
return StatusCode::SUCCESS;
@@ -178,8 +211,8 @@ StatusCode Trk::LayerMaterialProvider::process(const Trk::Layer& lay, size_t lev
for (size_t il = 0; il < level; ++il) displayBuffer << " ";
// find the layer and assign the material properties
- auto lmIter= m_layerMaterialMap->find(lIndex);
- if ( lmIter != m_layerMaterialMap->end() ){
+ auto lmIter= layerMaterialMap.find(lIndex);
+ if ( lmIter != layerMaterialMap.end() ){
ATH_MSG_VERBOSE(displayBuffer.str() << "---[+] found material for Layer with Index: " << lIndex.value());
if ( lay.surfaceRepresentation().isFree() )
ATH_MSG_VERBOSE(displayBuffer.str() << "---[!] the Layer is not owned by the TrackingGeometry, could indicate problem.");
@@ -198,25 +231,18 @@ StatusCode Trk::LayerMaterialProvider::process(const Trk::Surface&, size_t) cons
return StatusCode::SUCCESS;
}
-// load the material map from StoreGate
-StatusCode Trk::LayerMaterialProvider::loadMaterialMap() const {
-
- // -------------------------------------------------------------------------------
- if (detStore()->retrieve(m_layerMaterialMap, m_layerMaterialMapName).isFailure()){
- ATH_MSG_FATAL( "Could not retrieve LayerMaterialMap wiht name '" << m_layerMaterialMapName << "'. Aborting.");
- return StatusCode::FAILURE;
- } else
- ATH_MSG_DEBUG( "Retrieved LayerMaterialMap wiht name '" << m_layerMaterialMapName
- << "' for " << m_layerMaterialMap->size() << " layers.");
-
- // screen output as most VERBOSE debugging
+
+void
+Trk::LayerMaterialProvider::dumpMaterialMap (const LayerMaterialMap& layerMaterialMap) const
+{
if (msgLvl (MSG::VERBOSE)) {
+ static std::atomic_flag flag ATLAS_THREAD_SAFE = ATOMIC_FLAG_INIT;
+ if (!flag.test_and_set()) {
ATH_MSG_VERBOSE("Listing the layer indeces found in the loaded LayerMaterialMap");
- for ( const auto & lmIter : (*m_layerMaterialMap) ){
- ATH_MSG_VERBOSE(" -> Found map for layer with index " << lmIter.first);
+ for ( const auto & lmIter : layerMaterialMap ){
+ ATH_MSG_VERBOSE(" -> Found map for layer with index " << lmIter.first);
}
- }
-
- return StatusCode::SUCCESS;
+ }
+ }
}
diff --git a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/LayerMaterialMap.h b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/LayerMaterialMap.h
index eca5133c78dc..43b93126df34 100644
--- a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/LayerMaterialMap.h
+++ b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/LayerMaterialMap.h
@@ -96,7 +96,7 @@ inline void LayerMaterialMap::synchronizeElementTable() {
} // namespace Trk
CLASS_DEF(Trk::LayerMaterialMap, 142190734, 1)
-
-// 142190734 Trk::LayerMaterialMap None
+#include "AthenaKernel/CondCont.h"
+CONDCONT_DEF( Trk::LayerMaterialMap, 139083292 );
#endif
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitters/share/AdaptiveMultiVertexFitter_test.py b/Tracking/TrkVertexFitter/TrkVertexFitters/share/AdaptiveMultiVertexFitter_test.py
index 01a1c002b6d8..a2b3f9bb7ce5 100644
--- a/Tracking/TrkVertexFitter/TrkVertexFitters/share/AdaptiveMultiVertexFitter_test.py
+++ b/Tracking/TrkVertexFitter/TrkVertexFitters/share/AdaptiveMultiVertexFitter_test.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration.
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration.
#
# File: TrkVertexFitters/share/AdaptiveMultiVertexFitter_test.py
# Author: scott snyder <snyder@bnl.gov>
@@ -52,14 +52,23 @@ topSequence += eialg
from AthenaCommon import Constants
GeoModelSvc().OutputLevel=Constants.WARNING
-from TrkExTools.AtlasExtrapolator import AtlasExtrapolator
+
+from InDetRecExample.TrackingCommon import getInDetExtrapolator, getInDetFullLinearizedTrackFactory
+
+from TrkVertexFitterUtils.TrkVertexFitterUtilsConf import Trk__ImpactPoint3dEstimator
+InDetImpactPoint3dEstimator = Trk__ImpactPoint3dEstimator(name = "InDetImpactPoint3dEstimator",
+ Extrapolator = getInDetExtrapolator())
+ToolSvc += InDetImpactPoint3dEstimator
from TrkVertexFitters.TrkVertexFittersConf import \
Trk__AdaptiveMultiVertexFitterTestAlg, Trk__AdaptiveMultiVertexFitter
fitter = Trk__AdaptiveMultiVertexFitter ('AdaptiveMultiVertexFitter',
+ ImpactPoint3dEstimator = InDetImpactPoint3dEstimator,
+ LinearizedTrackFactory = getInDetFullLinearizedTrackFactory(),
OutputLevel = INFO)
testalg1 = Trk__AdaptiveMultiVertexFitterTestAlg ('testalg1',
OutputLevel = VERBOSE,
Tool = fitter)
topSequence += testalg1
+
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitters/share/AdaptiveMultiVertexFitter_test.ref b/Tracking/TrkVertexFitter/TrkVertexFitters/share/AdaptiveMultiVertexFitter_test.ref
index 973203c71168..1f9c7fae087a 100644
--- a/Tracking/TrkVertexFitter/TrkVertexFitters/share/AdaptiveMultiVertexFitter_test.ref
+++ b/Tracking/TrkVertexFitter/TrkVertexFitters/share/AdaptiveMultiVertexFitter_test.ref
@@ -1,2 +1,4 @@
+[ TrackingGeometryCondAlg ] base material tag : AtlasLayerMat_v21_
+[ TrackingGeometryCondAlg ] translated to COOL: /GLOBAL/TrackingGeo/LayerMaterialV2<tag>TagInfoMajor/AtlasLayerMat_v21_/GeoAtlas</tag>
testalg1 VERBOSE execute
testalg1 VERBOSE execute
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitters/share/AdaptiveVertexFitter_test.py b/Tracking/TrkVertexFitter/TrkVertexFitters/share/AdaptiveVertexFitter_test.py
index 512b0307e3d1..19b939b7d125 100644
--- a/Tracking/TrkVertexFitter/TrkVertexFitters/share/AdaptiveVertexFitter_test.py
+++ b/Tracking/TrkVertexFitter/TrkVertexFitters/share/AdaptiveVertexFitter_test.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration.
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration.
#
# File: TrkVertexFitters/share/AdaptiveVertexFitter_test.py
# Author: scott snyder <snyder@bnl.gov>
@@ -52,15 +52,18 @@ topSequence += eialg
from AthenaCommon import Constants
GeoModelSvc().OutputLevel=Constants.WARNING
-#from AthenaCommon.GlobalFlags import globalflags
-#from InDetRecExample.InDetJobProperties import InDetFlags
-#include ('InDetRecExample/InDetRecLoadTools.py')
-from TrkExTools.AtlasExtrapolator import AtlasExtrapolator
+from InDetRecExample.TrackingCommon import getInDetExtrapolator, getInDetFullLinearizedTrackFactory
+from TrkVertexFitterUtils.TrkVertexFitterUtilsConf import Trk__ImpactPoint3dEstimator
+InDetImpactPoint3dEstimator = Trk__ImpactPoint3dEstimator(name = "InDetImpactPoint3dEstimator",
+ Extrapolator = getInDetExtrapolator())
+ToolSvc += InDetImpactPoint3dEstimator
from TrkVertexFitters.TrkVertexFittersConf import \
Trk__AdaptiveVertexFitterTestAlg, Trk__AdaptiveVertexFitter
fitter = Trk__AdaptiveVertexFitter ('AdaptiveVertexFitter',
+ ImpactPoint3dEstimator = InDetImpactPoint3dEstimator,
+ LinearizedTrackFactory = getInDetFullLinearizedTrackFactory(),
OutputLevel = INFO)
testalg1 = Trk__AdaptiveVertexFitterTestAlg ('testalg1',
OutputLevel = VERBOSE,
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitters/share/AdaptiveVertexFitter_test.ref b/Tracking/TrkVertexFitter/TrkVertexFitters/share/AdaptiveVertexFitter_test.ref
index 973203c71168..1f9c7fae087a 100644
--- a/Tracking/TrkVertexFitter/TrkVertexFitters/share/AdaptiveVertexFitter_test.ref
+++ b/Tracking/TrkVertexFitter/TrkVertexFitters/share/AdaptiveVertexFitter_test.ref
@@ -1,2 +1,4 @@
+[ TrackingGeometryCondAlg ] base material tag : AtlasLayerMat_v21_
+[ TrackingGeometryCondAlg ] translated to COOL: /GLOBAL/TrackingGeo/LayerMaterialV2<tag>TagInfoMajor/AtlasLayerMat_v21_/GeoAtlas</tag>
testalg1 VERBOSE execute
testalg1 VERBOSE execute
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitters/src/AdaptiveVertexFitterTestAlg.cxx b/Tracking/TrkVertexFitter/TrkVertexFitters/src/AdaptiveVertexFitterTestAlg.cxx
index 75f121284f73..c6ee66c1895e 100644
--- a/Tracking/TrkVertexFitter/TrkVertexFitters/src/AdaptiveVertexFitterTestAlg.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexFitters/src/AdaptiveVertexFitterTestAlg.cxx
@@ -464,15 +464,15 @@ StatusCode AdaptiveVertexFitterTestAlg::test2()
{
xAOD::Vertex exp_v0;
exp_v0.makePrivateStore();
- exp_v0.setPosition ({-0.664619, 1.88247, -4.28452});
- exp_v0.setFitQuality (1.36786, 6.60783);
+ exp_v0.setPosition ({-0.666051, 1.88126, -4.2844});
+ exp_v0.setFitQuality (1.36804, 6.60783);
exp_v0.setCovariance (std::vector<float>
{25.8826, 26.6122, 91.0458, 6.34189, 14.6174, 13.9884});
setRefittedPerigee(
exp_v0,
0,
1,
- { 1.5885284, 0.3823804, -10.2058300 },
+ { 1.58753, 0.380882, -10.2063 },
{ 399.6301520, 600.2463141, 200.0002601 },
{ 1.58278, -0.618193, -0.821391, 0.00010879, -0.171884, -0.618193,
2.32566, 0.908938, 0.800925, 0.346876, -0.821391, 0.908938,
@@ -484,7 +484,7 @@ StatusCode AdaptiveVertexFitterTestAlg::test2()
exp_v0,
1,
-1,
- { -0.2079830, 1.1957289, -2.5975002 },
+ { -0.209537, 1.1947, -2.59698 },
{ 600.4814296, 399.2766328, -200.0005578 },
{ 3.53014, 0.466334, -2.04043, 0.000621337, -0.653413, 0.466334,
3.53405, -0.415368, 1.56192, -0.206492, -2.04043, -0.415368,
@@ -495,7 +495,7 @@ StatusCode AdaptiveVertexFitterTestAlg::test2()
setRefittedPerigee(exp_v0,
2,
-1,
- { 1.2063615, 1.3212056, -6.9978818 },
+ { 1.20591, 1.3197, -6.99803 },
{ 299.9873170, 1000.0038041, 100.0000072 },
{ 1.00049,
0.00413671,
@@ -556,8 +556,8 @@ StatusCode AdaptiveVertexFitterTestAlg::test3()
{
xAOD::Vertex exp_v0;
exp_v0.makePrivateStore();
- exp_v0.setPosition ({4.85215, 5.94893, -3.13472});
- exp_v0.setFitQuality (2.38431, 8.54327);
+ exp_v0.setPosition ({4.85208, 5.949, -3.1349});
+ exp_v0.setFitQuality (2.38503, 8.54327);
exp_v0.setCovariance (std::vector<float>
{1.183, 0.0323074, 1.21271,
0.00903037, 0.0167373, 1.12584});
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/CrossDistancesSeedFinder.ref b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/CrossDistancesSeedFinder.ref
index 99bf7e853489..8b4eb2247bc8 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/CrossDistancesSeedFinder.ref
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/CrossDistancesSeedFinder.ref
@@ -1,153 +1,7 @@
-Sat Mar 7 19:24:38 CET 2020
-Preloading tcmalloc_minimal.so
-Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.12] [x86_64-centos7-gcc8-dbg] [atlas-work3/d935ebad997] -- built on [2020-03-07T1715]
-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 "TrkVertexSeedFinderTools/CrossDistancesSeedFinder_test.py"
-Py:Athena INFO including file "TrkVertexSeedFinderTools/VertexSeedFinderTestCommon.py"
-Py:Athena INFO SetGeometryVersion.py obtained major release version 22
-Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5514 configurables from 60 genConfDb files
-Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.12
-Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
-Py:ConfiguredFactory INFO imported 138 confDb modules in 1.31 seconds
-Py:Athena INFO Importing MagFieldServices.SetupField
-Py:Athena INFO Importing MagFieldServices.MagFieldServicesSetup
[ TrackingGeometrySvc ] base material tag : AtlasLayerMat_v21_
[ TrackingGeometrySvc ] translated to COOL: /GLOBAL/TrackingGeo/LayerMaterialV2<tag>TagInfoMajor/AtlasLayerMat_v21_/GeoAtlas</tag>
-Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr SUCCESS
-====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r0)
- running on lxplus7100.cern.ch on Sat Mar 7 19:24:51 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 3736 CLIDRegistry entries for module ALL
-CoreDumpSvc INFO install f-a-t-a-l handler... (flag = -1)
-CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
-MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
-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://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier01.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier05.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://atlasfrontier2-ai.cern.ch:8000/atlr)(serverurl=http://atlasfrontier1-ai.cern.ch:8000/atlr)(proxyurl=http://ccatlassquid.in2p3.fr:3128)(proxyurl=http://ccatlassquid02.in2p3.fr:3128)(proxyurl=http://ccatlassquid04.in2p3.fr: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-26T2140/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 1 servers found for host ccwige0002.in2p3.fr [ATLF ]
-PoolSvc INFO Successfully setup replica sorting algorithm
-PoolSvc INFO Setting up APR FileCatalog and Streams
-PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
-PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
-DbSession INFO Open DbSession
-Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
-MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
-IOVDbSvc INFO Only 5 POOL conditions files will be open at once
-IOVDbSvc INFO Cache alignment will be done in 3 slices
-IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
-IOVDbFolder INFO Read from meta data only for folder /TagInfo
-IOVDbFolder INFO Inputfile tag override disabled for /GLOBAL/BField/Maps
-IOVDbSvc INFO Initialised with 5 connections and 8 folders
-IOVDbSvc INFO Service IOVDbSvc initialised successfully
-ClassIDSvc INFO getRegistryEntries: read 1914 CLIDRegistry entries for module ALL
-IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
-IOVDbSvc INFO Opening COOL connection for COOLOFL_INDET/OFLP200
-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_TRT/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_INDET/OFLP200
-IOVDbSvc INFO Opening COOL connection for COOLOFL_GLOBAL/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_TRT/OFLP200
-IOVDbSvc INFO Opening COOL connection for COOLOFL_DCS/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_GLOBAL/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_DCS/OFLP200
-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 /GLOBAL/TrackingGeo/LayerMaterialV2
-IOVDbSvc INFO Added taginfo remove for /Indet/Align
-IOVDbSvc INFO Added taginfo remove for /Indet/IBLDist
-IOVDbSvc INFO Added taginfo remove for /Indet/PixelDist
-IOVDbSvc INFO Added taginfo remove for /TRT/Align
-ClassIDSvc INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 35 CLIDRegistry entries for module ALL
-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::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
-IBLParameterSvc INFO IBL geometry
-EventPersistenc... INFO Added successfully Conversion service:DetDescrCnvSvc
-PixelIDDetDescrCnv INFO in createObj: creating a PixelID helper 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
-PixelID INFO Initialize from dictionary
-AtlasDetectorID INFO initialize_from_dictionary - OK
+[ TrackingGeometryCondAlg ] base material tag : AtlasLayerMat_v21_
+[ TrackingGeometryCondAlg ] translated to COOL: /GLOBAL/TrackingGeo/LayerMaterialV2<tag>TagInfoMajor/AtlasLayerMat_v21_/GeoAtlas</tag>
indet 1 2,4,5,7,10,11,12,13 7 1fffffffffffffff 61 3 0 min/max 2 13 values 2 4 5 7 10 11 12 13 indexes 0 0 1 2 0 3 0 0 4 5 6 7 indices 8 prev 0 next 0 mode enumerated cont mode none
pixel 1 1:3 3 e7ffffffffffffff 59 2 3 min/max 1 3 values indexes indices 3 prev 0 next 0 mode both_bounded cont mode none
bec 1 -4,-2,0,2,4 7 f8ffffffffffffff 56 3 5 min/max -4 4 values -4 -2 0 2 4 indexes 0 0 1 0 2 0 3 0 4 indices 5 prev 0 next 0 mode enumerated cont mode none
@@ -170,298 +24,14 @@ phi_module 4
eta_module 5
phi_index 6
eta_index 7
-InDetGeometryDBSvc INFO GeometryDBSvc Initialized
-PixelGeoModel INFO Retrieving Record Sets from database ...
-PixelGeoModel INFO Key = ATLAS-R2-2016-01-00-01 Node = ATLAS
-PixelGeoModel INFO ... Record Sets retrieved.
-PixelGeoModel INFO DBM switch = SetDBMFlag: 1
-PixelGeoModel INFO Building Pixel Detector
-PixelGeoModel INFO Version: Pixel-IBL3D25-33, Name: IBL, Layout: IBL, Code Version: 5.01.00, Description: IBL_Geometry
GEOPIXELSERVICES pixel : 28.995 245 // 3460
GEOPIXELSERVICES barrel : 28.997 143 // -460 460
GEOPIXELSERVICES endcap : 82 175 // 484 670
-PixelGeoModel INFO Build detailed stave support description : layout 5
-PixelGeoModel INFO Si3D/SiPl radial shift : -0.015
-PixelGeoModel INFO Module thicknesses : SiPl P/N 0.31 0.44 20.86 SiPl P/N 0.31 1.72 20.86 // 0.325 1.705
-PixelGeoModel INFO Pixel modules 12 -> planar/3D : 12 8
-PixelGeoModel INFO Module length/gap : 41.3 / 20.45 0.205 -> Stave length : 748
-PixelGeoModel INFO planar/3D/endblock/NonActive lengths : 497.855 165.24 69.8 7.5525
-PixelGeoModel INFO Flex thickness (max) : 0.45 computed for 16 modules
-PixelGeoModel INFO Omega MidStaveCenterX = 1.55
-PixelGeoModel INFO Omega MidStaveAngle = 0.296706
-PixelGeoModel INFO Omega MidStaveRadius = 1.655
-PixelGeoModel INFO Omega EndStaveCenterX = -1.25
-PixelGeoModel INFO Omega EndStaveCenterY = 7.45
-PixelGeoModel INFO Omega EndStaveAngle = 2.35619
-PixelGeoModel INFO Omega EndStaveRadius = 2.155
-PixelGeoModel INFO Omega Thickness = 0.145
-PixelGeoModel INFO MechanicalStaveWidth = 18.8
-PixelGeoModel INFO MechanicalStaveLength = 748
-PixelGeoModel INFO MechanicalStaveOffset = -0.95
-PixelGeoModel INFO StaveModuleOffset = 0.01
-PixelGeoModel INFO MechanicalStaveEndBlockLength = 34.9
-PixelGeoModel INFO FacePlateThick = 0.215
-PixelGeoModel INFO TubeOuterDiam = 1.75
-PixelGeoModel INFO TubeInnerDiam = 1.5
-PixelGeoModel INFO TubeMiddlePos = 1.3
-PixelGeoModel INFO FlexBaseThick = 0.45
-PixelGeoModel INFO FlexLayerThick = 0.02
-PixelGeoModel INFO FlexWidth = 11.5
-PixelGeoModel INFO FlexOffset = 0.6
-PixelGeoModel INFO XOffset / ladder = 0.01
-PixelGeoModel INFO ** OMEGA : with Stycast 0.1
-PixelGeoModel INFO ***> new material : OmegaGlue_IBL 3.31517
-PixelGeoModel INFO ** FacePlate : with Stycast 0.1 grease : 0.07
-PixelGeoModel INFO ***> new material : FacePlateGlue_IBL 3.31517
-PixelGeoModel INFO ** FacePlate : with grease
-PixelGeoModel INFO ***> new material : FacePlateGlueGrease_IBL 3.04977
-PixelGeoModel INFO Flex angle : 0.296641 Flex pos. in Z : (2.60312,4.19227,22.9025) 0.45 / (2.60312,4.19227,62.2575) 0.45 / (2.60312,4.19227,103.762) 0.45 / (2.60312,4.19227,145.267) 0.45 / (2.60312,4.19227,186.772) 0.45 / (2.60312,4.19227,228.277) 0.45 / (2.60312,4.19227,269.782) 0.45 / (2.60312,4.19227,314.817) 0.45 /
-PixelGeoModel INFO ** TUBE : with Stycast 0.1 diam 0.875 0.75
-PixelGeoModel INFO ***> new material : CoolingPipeGlue_IBL 6.72585
-PixelGeoModel INFO IBL EOS : mechanical stave length : 374
-PixelGeoModel INFO IBL EOS : service Zpos : 366.552
-PixelGeoModel INFO IBL EOS : endblock Zpos : 356.552
-PixelGeoModel INFO IBL EOS : endblock length : 34.896
-PixelGeoModel INFO IBL EOS : endblock srv length : 20
-PixelGeoModel INFO Flex half thickness srv : 0.45
-PixelGeoModel INFO stave xoffset = 0.32
-PixelGeoModel INFO stave yoffset = -0.95
-PixelGeoModel INFO Stave envelop length : 748 -> 339.101
-PixelGeoModel INFO *** LAYER 0 planar/3D modules : 12 8
-PixelGeoModel INFO Layer IBL / stave ring : outer radius max 42.001
-PixelGeoModel INFO Layer 0 in/out radius 29.7573 42.001
-PixelGeoModel INFO IBL stave ring support
-PixelGeoModel INFO Build IBL stave ring services
-PixelGeoModel INFO Build detailed stave ring support : Brl0A_StaveRing AC
-PixelGeoModel INFO Build detailed stave ring support - logVol : Brl0A_StaveRing
-PixelGeoModel INFO Build detailed stave ring support : Brl0C_StaveRing AC
-PixelGeoModel INFO Build detailed stave ring support - logVol : Brl0C_StaveRing
-PixelGeoModel INFO Build detailed stave ring support : Brl0M_StaveRing Mid
-PixelGeoModel INFO Build detailed stave ring support - logVol : Brl0M_StaveRing
-PixelGeoModel INFO Build IBL I-Flex services
-PixelGeoModel INFO *** LAYER 1 planar/3D modules : 0 0
-PixelGeoModel INFO Layer 1 in/out radius 46.2723 64.1329
-PixelGeoModel INFO *** LAYER 2 planar/3D modules : 0 0
-PixelGeoModel INFO Layer 2 in/out radius 83.7078 102.132
-PixelGeoModel INFO *** LAYER 3 planar/3D modules : 0 0
-PixelGeoModel INFO Layer 3 in/out radius 117.51 136.132
-PixelGeoModel INFO Build IBL I-Flex services
-PixelGeoModel INFO Build IBL I-Flex services
-PixelGeoModel INFO Build IBL I-Flex services
-PixelGeoModel INFO Build IBL fwd services - CAD tool design / S. model1 : 0/0
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/ID, level 2, with frame global.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIX, level 1, with frame global.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXB1, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXB2, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXB3, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXB4, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEA1, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEA2, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEA3, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEC1, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEC2, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEC3, level 0, with frame local.
-PixelGeoModel INFO Doing consistency checks.
-PixelGeoModel INFO Number of barrel elements : 1736
-PixelGeoModel INFO Number of endcap elements : 288
-PixelGeoModel INFO Number of endcap elements (DBM) : 24
-PixelGeoModel INFO Total : 2048
-PixelGeoModel INFO MaxHash : 2048
-SCT_IDDetDescrCnv INFO in createObj: creating a SCT_ID helper object in the detector store
-SCT_ID INFO
-AtlasDetectorID INFO initialize_from_dictionary - OK
-SCT_GeoModel INFO Retrieving Record Sets from database ...
-SCT_GeoModel INFO Building SCT Detector.
-SCT_GeoModel INFO Version: SCT-GEO-00, Name: GEO, Layout: Final, Code Version: 3.06.00, Description: Atlas Geometry 2008
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/ID, level 3, with frame global.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCT, level 2, with frame global.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTB1, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTB2, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTB3, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTB4, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA1, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA2, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA3, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA4, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA5, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA6, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA7, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA8, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA9, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC1, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC2, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC3, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC4, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC5, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC6, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC7, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC8, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC9, level 1, with frame local.
-ClassIDSvc INFO getRegistryEntries: read 3566 CLIDRegistry entries for module ALL
-AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 2837 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 1169 CLIDRegistry entries for module ALL
-CondInputLoader INFO Initializing CondInputLoader...
-CondInputLoader INFO Adding base classes:
- + ( 'AlignableTransformContainer' , 'ConditionStore+/Indet/Align' ) -> no bases
- + ( 'AlignableTransformContainer' , 'ConditionStore+/TRT/Align' ) -> no bases
- + ( 'CondAttrListCollection' , 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/Indet/IBLDist' ) ->
- + ( 'DetCondCFloat' , 'ConditionStore+/Indet/PixelDist' ) -> no bases
-CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
- + ( 'AlignableTransformContainer' , 'ConditionStore+/Indet/Align' )
- + ( 'AlignableTransformContainer' , 'ConditionStore+/TRT/Align' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/Indet/IBLDist' )
- + ( 'DetCondCFloat' , 'ConditionStore+/Indet/PixelDist' )
-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 440 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 764 CLIDRegistry entries for module ALL
-xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
-xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
-xAODMaker::Even...WARNING Beam conditions service not available
-xAODMaker::Even...WARNING Will not fill beam spot information into xAOD::EventInfo
-testalg1 DEBUG Property update for OutputLevel : new value = 1
-testalg1 VERBOSE ServiceLocatorHelper::service: found service EventDataSvc
-testalg1 VERBOSE ServiceLocatorHelper::service: found service TimelineSvc
-testalg1.CrossD... DEBUG Property update for OutputLevel : new value = 1
-testalg1.CrossD... INFO Initialize successfull
-testalg1.CrossD... INFO Initialize successfull
-ClassIDSvc INFO getRegistryEntries: read 967 CLIDRegistry entries for module ALL
-testalg1.CrossD... INFO Initialize successful
-testalg1 VERBOSE ServiceLocatorHelper::service: found service AlgExecStateSvc
-testalg1 DEBUG input handles: 0
-testalg1 DEBUG output handles: 1
-testalg1 DEBUG Adding private ToolHandle tool testalg1.CrossDistancesSeedFinder (Trk::CrossDistancesSeedFinder)
-testalg1 DEBUG Data Deps for testalg1
- + OUTPUT IGNORED ( 'McEventCollection' , '' )
-ApplicationMgr INFO Application Manager Initialized successfully
-CondInputLoader INFO created CondCont<AlignableTransformContainer> with key 'ConditionStore+/Indet/Align'
-CondInputLoader INFO created CondCont<AlignableTransformContainer> with key 'ConditionStore+/TRT/Align'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/Indet/IBLDist'
-CondInputLoader INFO created CondCont<DetCondCFloat> with key 'ConditionStore+/Indet/PixelDist'
-ApplicationMgr INFO Application Manager Started successfully
-AthenaEventLoopMgr INFO ===>>> start of run 1 <<<===
-EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
-EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
-ClassIDSvc INFO getRegistryEntries: read 118 CLIDRegistry entries for module ALL
-IOVDbSvc INFO Opening COOL connection for COOLOFL_INDET/OFLP200
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to InDetAlign_IOVDEP-03 for folder /Indet/Align
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to IBLDist-NULL for folder /Indet/IBLDist
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to InDetPixelDist-nominal for folder /Indet/PixelDist
-IOVDbSvc INFO Disconnecting from COOLOFL_INDET/OFLP200
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] D0709FD7-6A55-E011-925D-002481043EC0
-Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0001.pool.root
-RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0001.pool.root File version:52600
-PixelDetectorMa...WARNING Cannot set AlignableTransform for identifier [2.1.0.0.0] at level 2
-PixelDetectorMa...WARNING Subsequent WARNINGS will be printed at DEBUG level.
-PixelDetectorMa... INFO Processing IBLDist alignment container with key (/Indet/IBLDist) and alignment folder pointing to /Indet/Align
-PixelDetectorMa...WARNING Invalid HashID for identifier [2.1.0.0.0]
-PixelDetectorMa...WARNING No IBLDist corrections can be applied for invalid HashID's - exiting
-AthenaEventLoopMgr INFO ===>>> start processing event #1, run #1 0 events processed so far <<<===
-IOVDbSvc INFO Opening COOL connection for COOLOFL_TRT/OFLP200
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TRTAlign_Nominal2 for folder /TRT/Align
-IOVDbSvc INFO Disconnecting from COOLOFL_TRT/OFLP200
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 0E3CF1E5-143D-DB11-92C7-000CF1DA62DD
-Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.simul.pool.v0000/oflcond.000002.conditions.simul.pool.v0000._0029.pool.root__DQ2-1250194490
-Warning in <TClass::Init>: no dictionary for class DataHeader_p1 is available
-Warning in <TClass::Init>: no dictionary for class DataHeaderElement_p1 is available
-RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.simul.pool.v0000/oflcond.000002.conditions.simul.pool.v0000._0029.pool.root__DQ2-1250194490 File version:51000
-IOVDbSvc INFO Opening COOL connection for COOLOFL_DCS/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_DCS/OFLP200
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8C5D7155-23E9-DC11-99B4-001320DCF58D
-Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.recon.pool.v0000/oflcond.000001.conditions.recon.pool.v0000._0058.pool.root
-Warning in <TClass::Init>: no dictionary for class DataHeader_p2 is available
-Warning in <TClass::Init>: no dictionary for class DataHeaderElement_p2 is available
-Warning in <TClass::Init>: no dictionary for class PoolToken_p1 is available
-RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.recon.pool.v0000/oflcond.000001.conditions.recon.pool.v0000._0058.pool.root File version:51400
-SCT_AlignCondAlg INFO recorded new CDO SCTAlignmentStore with range {[INVALID] - [1,l:4294967294]} into Conditions Store
-SCT_DetectorEle... INFO recorded new CDO SCT_DetectorElementCollection with range {[INVALID] - [1,l:4294967294]} with size of 8176 into Conditions Store
-PixelDetectorMa... INFO Processing IBLDist alignment container with key /Indet/IBLDist
-PixelAlignCondAlg INFO recorded new CDO PixelAlignmentStore with range {[0,t:0,l:0] - [1,l:4294967294]} into Conditions Store
-PixelDetectorEl... INFO recorded new CDO PixelDetectorElementCollection with range {[0,t:0,l:0] - [1,l:4294967294]} with size of 2048 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:0] - [t:4294967294.854775807]}
-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 , 7730
-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 , 20400
-AtlasFieldCache... INFO UpdateCurrentFromConditions: Trying to read from DCS: [channel name, index, value] Toroids_SCurrent , 4 , 20400
-AtlasFieldCache... INFO UpdateCurrentFromConditions: Currents read from DCS - solenoid 7730 toroid 20400
-AtlasFieldCache... INFO scaleField: Solenoid field scale factor 1. Solenoid and map currents: 7730,7730
-AtlasFieldCache... INFO scaleField: Toroid field scale factor 1. Toroid and map currents: 20400,20400
-AtlasFieldCache... INFO execute: initialized AtlasFieldCacheCondObj and cache with SFs - sol/tor 1/1
-AtlasFieldCache... INFO execute: solenoid zone id 7000
testalg1 VERBOSE execute
testalg1 VERBOSE testing 1
testalg1 VERBOSE testing 2
testalg1 VERBOSE testing 3
-AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 1 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #2, run #1 1 events processed so far <<<===
testalg1 VERBOSE execute
testalg1 VERBOSE testing 1
testalg1 VERBOSE testing 2
testalg1 VERBOSE testing 3
-AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 2 events processed so far <<<===
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 0E3CF1E5-143D-DB11-92C7-000CF1DA62DD
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] D0709FD7-6A55-E011-925D-002481043EC0
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8C5D7155-23E9-DC11-99B4-001320DCF58D
-Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
-ApplicationMgr INFO Application Manager Stopped successfully
-IncidentProcAlg1 INFO Finalize
-CondInputLoader INFO Finalizing CondInputLoader...
-IncidentProcAlg2 INFO Finalize
-IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /EXT/DCS/MAGNETS/SENSORDATA (AttrListColl) db-read 1/1 objs/chan/bytes 4/4/20 (( 3.56 ))s
-IOVDbFolder INFO Folder /GLOBAL/BField/Maps (AttrListColl) db-read 1/1 objs/chan/bytes 3/3/202 (( 6.30 ))s
-IOVDbFolder INFO Folder /GLOBAL/TrackingGeo/LayerMaterialV2 (PoolRef) db-read 1/0 objs/chan/bytes 1/1/231 (( 0.10 ))s
-IOVDbFolder WARNING Folder /GLOBAL/TrackingGeo/LayerMaterialV2 is requested but no data retrieved
-IOVDbFolder INFO Folder /Indet/Align (PoolRefColl) db-read 1/2 objs/chan/bytes 34/43/5440 (( 0.09 ))s
-IOVDbFolder INFO Folder /Indet/IBLDist (AttrListColl) db-read 1/2 objs/chan/bytes 14/14/280 (( 2.75 ))s
-IOVDbFolder INFO Folder /Indet/PixelDist (PoolRef) db-read 1/1 objs/chan/bytes 1/1/179 (( 0.04 ))s
-IOVDbFolder INFO Folder /TRT/Align (PoolRefColl) db-read 1/1 objs/chan/bytes 32/32/5120 (( 0.09 ))s
-IOVDbSvc INFO bytes in (( 12.93 ))s
-IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_INDET/OFLP200 : nConnect: 2 nFolders: 3 ReadTime: (( 2.87 ))s
-IOVDbSvc INFO Connection COOLOFL_TRT/OFLP200 : nConnect: 2 nFolders: 1 ReadTime: (( 0.09 ))s
-IOVDbSvc INFO Connection COOLOFL_GLOBAL/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 6.40 ))s
-IOVDbSvc INFO Connection COOLOFL_DCS/OFLP200 : nConnect: 2 nFolders: 1 ReadTime: (( 3.56 ))s
-AthDictLoaderSvc INFO in finalize...
-ToolSvc INFO Removing all tools created by ToolSvc
-testalg1.CrossD... INFO Finalize successfull
-testalg1.CrossD... INFO Finalize successfull
-testalg1.CrossD... INFO Finalize successful
-*****Chrono***** INFO ****************************************************************************************************
-*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
-*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 210 [ms] Ave/Min/Max= 2.08(+- 16.1)/ 0/ 160 [ms] #=101
-cObj_ALL INFO Time User : Tot= 240 [ms] Ave/Min/Max= 26.7(+- 55.2)/ 0/ 180 [ms] #= 9
-ChronoStatSvc INFO Time User : Tot= 36.6 [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"
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/CrossDistancesSeedFinder_test.py b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/CrossDistancesSeedFinder_test.py
index 1a315c6466ea..e8770ff1c72d 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/CrossDistancesSeedFinder_test.py
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/CrossDistancesSeedFinder_test.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration.
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration.
#
# File: TrkVertexSeedFinderTools/share/CrossDistancesSeedFinder_test.py
# Author: scott snyder <snyder@bnl.gov>
@@ -13,7 +13,6 @@ from __future__ import print_function
include ('TrkVertexSeedFinderTools/VertexSeedFinderTestCommon.py')
-
from TrkVertexSeedFinderTools.TrkVertexSeedFinderToolsConf import \
Trk__VertexSeedFinderTestAlg, Trk__CrossDistancesSeedFinder
finder = Trk__CrossDistancesSeedFinder ('CrossDistancesSeedFinder', OutputLevel = INFO)
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/DummySeedFinder.ref b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/DummySeedFinder.ref
index 69162be017b8..8b4eb2247bc8 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/DummySeedFinder.ref
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/DummySeedFinder.ref
@@ -1,153 +1,7 @@
-Sat Mar 7 19:08:44 CET 2020
-Preloading tcmalloc_minimal.so
-Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.12] [x86_64-centos7-gcc8-dbg] [atlas-work3/d935ebad997] -- built on [2020-03-07T1715]
-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 "TrkVertexSeedFinderTools/DummySeedFinder_test.py"
-Py:Athena INFO including file "TrkVertexSeedFinderTools/VertexSeedFinderTestCommon.py"
-Py:Athena INFO SetGeometryVersion.py obtained major release version 22
-Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5514 configurables from 60 genConfDb files
-Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.12
-Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
-Py:ConfiguredFactory INFO imported 138 confDb modules in 1.49 seconds
-Py:Athena INFO Importing MagFieldServices.SetupField
-Py:Athena INFO Importing MagFieldServices.MagFieldServicesSetup
[ TrackingGeometrySvc ] base material tag : AtlasLayerMat_v21_
[ TrackingGeometrySvc ] translated to COOL: /GLOBAL/TrackingGeo/LayerMaterialV2<tag>TagInfoMajor/AtlasLayerMat_v21_/GeoAtlas</tag>
-Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr SUCCESS
-====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r0)
- running on lxplus7100.cern.ch on Sat Mar 7 19:08:57 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 3736 CLIDRegistry entries for module ALL
-CoreDumpSvc INFO install f-a-t-a-l handler... (flag = -1)
-CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
-MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
-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/2020-03-06T2143/Athena/22.0.12/InstallArea/x86_64-centos7-gcc8-dbg/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus7100.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
-PoolSvc INFO Successfully setup replica sorting algorithm
-PoolSvc INFO Setting up APR FileCatalog and Streams
-PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
-PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
-DbSession INFO Open DbSession
-Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
-MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
-IOVDbSvc INFO Only 5 POOL conditions files will be open at once
-IOVDbSvc INFO Cache alignment will be done in 3 slices
-IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
-IOVDbFolder INFO Read from meta data only for folder /TagInfo
-IOVDbFolder INFO Inputfile tag override disabled for /GLOBAL/BField/Maps
-IOVDbSvc INFO Initialised with 5 connections and 8 folders
-IOVDbSvc INFO Service IOVDbSvc initialised successfully
-ClassIDSvc INFO getRegistryEntries: read 1914 CLIDRegistry entries for module ALL
-IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
-IOVDbSvc INFO Opening COOL connection for COOLOFL_INDET/OFLP200
-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_TRT/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_INDET/OFLP200
-IOVDbSvc INFO Opening COOL connection for COOLOFL_GLOBAL/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_TRT/OFLP200
-IOVDbSvc INFO Opening COOL connection for COOLOFL_DCS/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_GLOBAL/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_DCS/OFLP200
-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 /GLOBAL/TrackingGeo/LayerMaterialV2
-IOVDbSvc INFO Added taginfo remove for /Indet/Align
-IOVDbSvc INFO Added taginfo remove for /Indet/IBLDist
-IOVDbSvc INFO Added taginfo remove for /Indet/PixelDist
-IOVDbSvc INFO Added taginfo remove for /TRT/Align
-ClassIDSvc INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 35 CLIDRegistry entries for module ALL
-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::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
-IBLParameterSvc INFO IBL geometry
-EventPersistenc... INFO Added successfully Conversion service:DetDescrCnvSvc
-PixelIDDetDescrCnv INFO in createObj: creating a PixelID helper 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
-PixelID INFO Initialize from dictionary
-AtlasDetectorID INFO initialize_from_dictionary - OK
+[ TrackingGeometryCondAlg ] base material tag : AtlasLayerMat_v21_
+[ TrackingGeometryCondAlg ] translated to COOL: /GLOBAL/TrackingGeo/LayerMaterialV2<tag>TagInfoMajor/AtlasLayerMat_v21_/GeoAtlas</tag>
indet 1 2,4,5,7,10,11,12,13 7 1fffffffffffffff 61 3 0 min/max 2 13 values 2 4 5 7 10 11 12 13 indexes 0 0 1 2 0 3 0 0 4 5 6 7 indices 8 prev 0 next 0 mode enumerated cont mode none
pixel 1 1:3 3 e7ffffffffffffff 59 2 3 min/max 1 3 values indexes indices 3 prev 0 next 0 mode both_bounded cont mode none
bec 1 -4,-2,0,2,4 7 f8ffffffffffffff 56 3 5 min/max -4 4 values -4 -2 0 2 4 indexes 0 0 1 0 2 0 3 0 4 indices 5 prev 0 next 0 mode enumerated cont mode none
@@ -170,261 +24,14 @@ phi_module 4
eta_module 5
phi_index 6
eta_index 7
-InDetGeometryDBSvc INFO GeometryDBSvc Initialized
-PixelGeoModel INFO Retrieving Record Sets from database ...
-PixelGeoModel INFO Key = ATLAS-R2-2016-01-00-01 Node = ATLAS
-PixelGeoModel INFO ... Record Sets retrieved.
-PixelGeoModel INFO DBM switch = SetDBMFlag: 1
-PixelGeoModel INFO Building Pixel Detector
-PixelGeoModel INFO Version: Pixel-IBL3D25-33, Name: IBL, Layout: IBL, Code Version: 5.01.00, Description: IBL_Geometry
GEOPIXELSERVICES pixel : 28.995 245 // 3460
GEOPIXELSERVICES barrel : 28.997 143 // -460 460
GEOPIXELSERVICES endcap : 82 175 // 484 670
-PixelGeoModel INFO Build detailed stave support description : layout 5
-PixelGeoModel INFO Si3D/SiPl radial shift : -0.015
-PixelGeoModel INFO Module thicknesses : SiPl P/N 0.31 0.44 20.86 SiPl P/N 0.31 1.72 20.86 // 0.325 1.705
-PixelGeoModel INFO Pixel modules 12 -> planar/3D : 12 8
-PixelGeoModel INFO Module length/gap : 41.3 / 20.45 0.205 -> Stave length : 748
-PixelGeoModel INFO planar/3D/endblock/NonActive lengths : 497.855 165.24 69.8 7.5525
-PixelGeoModel INFO Flex thickness (max) : 0.45 computed for 16 modules
-PixelGeoModel INFO Omega MidStaveCenterX = 1.55
-PixelGeoModel INFO Omega MidStaveAngle = 0.296706
-PixelGeoModel INFO Omega MidStaveRadius = 1.655
-PixelGeoModel INFO Omega EndStaveCenterX = -1.25
-PixelGeoModel INFO Omega EndStaveCenterY = 7.45
-PixelGeoModel INFO Omega EndStaveAngle = 2.35619
-PixelGeoModel INFO Omega EndStaveRadius = 2.155
-PixelGeoModel INFO Omega Thickness = 0.145
-PixelGeoModel INFO MechanicalStaveWidth = 18.8
-PixelGeoModel INFO MechanicalStaveLength = 748
-PixelGeoModel INFO MechanicalStaveOffset = -0.95
-PixelGeoModel INFO StaveModuleOffset = 0.01
-PixelGeoModel INFO MechanicalStaveEndBlockLength = 34.9
-PixelGeoModel INFO FacePlateThick = 0.215
-PixelGeoModel INFO TubeOuterDiam = 1.75
-PixelGeoModel INFO TubeInnerDiam = 1.5
-PixelGeoModel INFO TubeMiddlePos = 1.3
-PixelGeoModel INFO FlexBaseThick = 0.45
-PixelGeoModel INFO FlexLayerThick = 0.02
-PixelGeoModel INFO FlexWidth = 11.5
-PixelGeoModel INFO FlexOffset = 0.6
-PixelGeoModel INFO XOffset / ladder = 0.01
-PixelGeoModel INFO ** OMEGA : with Stycast 0.1
-PixelGeoModel INFO ***> new material : OmegaGlue_IBL 3.31517
-PixelGeoModel INFO ** FacePlate : with Stycast 0.1 grease : 0.07
-PixelGeoModel INFO ***> new material : FacePlateGlue_IBL 3.31517
-PixelGeoModel INFO ** FacePlate : with grease
-PixelGeoModel INFO ***> new material : FacePlateGlueGrease_IBL 3.04977
-PixelGeoModel INFO Flex angle : 0.296641 Flex pos. in Z : (2.60312,4.19227,22.9025) 0.45 / (2.60312,4.19227,62.2575) 0.45 / (2.60312,4.19227,103.762) 0.45 / (2.60312,4.19227,145.267) 0.45 / (2.60312,4.19227,186.772) 0.45 / (2.60312,4.19227,228.277) 0.45 / (2.60312,4.19227,269.782) 0.45 / (2.60312,4.19227,314.817) 0.45 /
-PixelGeoModel INFO ** TUBE : with Stycast 0.1 diam 0.875 0.75
-PixelGeoModel INFO ***> new material : CoolingPipeGlue_IBL 6.72585
-PixelGeoModel INFO IBL EOS : mechanical stave length : 374
-PixelGeoModel INFO IBL EOS : service Zpos : 366.552
-PixelGeoModel INFO IBL EOS : endblock Zpos : 356.552
-PixelGeoModel INFO IBL EOS : endblock length : 34.896
-PixelGeoModel INFO IBL EOS : endblock srv length : 20
-PixelGeoModel INFO Flex half thickness srv : 0.45
-PixelGeoModel INFO stave xoffset = 0.32
-PixelGeoModel INFO stave yoffset = -0.95
-PixelGeoModel INFO Stave envelop length : 748 -> 339.101
-PixelGeoModel INFO *** LAYER 0 planar/3D modules : 12 8
-PixelGeoModel INFO Layer IBL / stave ring : outer radius max 42.001
-PixelGeoModel INFO Layer 0 in/out radius 29.7573 42.001
-PixelGeoModel INFO IBL stave ring support
-PixelGeoModel INFO Build IBL stave ring services
-PixelGeoModel INFO Build detailed stave ring support : Brl0A_StaveRing AC
-PixelGeoModel INFO Build detailed stave ring support - logVol : Brl0A_StaveRing
-PixelGeoModel INFO Build detailed stave ring support : Brl0C_StaveRing AC
-PixelGeoModel INFO Build detailed stave ring support - logVol : Brl0C_StaveRing
-PixelGeoModel INFO Build detailed stave ring support : Brl0M_StaveRing Mid
-PixelGeoModel INFO Build detailed stave ring support - logVol : Brl0M_StaveRing
-PixelGeoModel INFO Build IBL I-Flex services
-PixelGeoModel INFO *** LAYER 1 planar/3D modules : 0 0
-PixelGeoModel INFO Layer 1 in/out radius 46.2723 64.1329
-PixelGeoModel INFO *** LAYER 2 planar/3D modules : 0 0
-PixelGeoModel INFO Layer 2 in/out radius 83.7078 102.132
-PixelGeoModel INFO *** LAYER 3 planar/3D modules : 0 0
-PixelGeoModel INFO Layer 3 in/out radius 117.51 136.132
-PixelGeoModel INFO Build IBL I-Flex services
-PixelGeoModel INFO Build IBL I-Flex services
-PixelGeoModel INFO Build IBL I-Flex services
-PixelGeoModel INFO Build IBL fwd services - CAD tool design / S. model1 : 0/0
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/ID, level 2, with frame global.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIX, level 1, with frame global.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXB1, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXB2, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXB3, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXB4, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEA1, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEA2, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEA3, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEC1, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEC2, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEC3, level 0, with frame local.
-PixelGeoModel INFO Doing consistency checks.
-PixelGeoModel INFO Number of barrel elements : 1736
-PixelGeoModel INFO Number of endcap elements : 288
-PixelGeoModel INFO Number of endcap elements (DBM) : 24
-PixelGeoModel INFO Total : 2048
-PixelGeoModel INFO MaxHash : 2048
-SCT_IDDetDescrCnv INFO in createObj: creating a SCT_ID helper object in the detector store
-SCT_ID INFO
-AtlasDetectorID INFO initialize_from_dictionary - OK
-SCT_GeoModel INFO Retrieving Record Sets from database ...
-SCT_GeoModel INFO Building SCT Detector.
-SCT_GeoModel INFO Version: SCT-GEO-00, Name: GEO, Layout: Final, Code Version: 3.06.00, Description: Atlas Geometry 2008
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/ID, level 3, with frame global.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCT, level 2, with frame global.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTB1, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTB2, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTB3, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTB4, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA1, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA2, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA3, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA4, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA5, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA6, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA7, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA8, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA9, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC1, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC2, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC3, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC4, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC5, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC6, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC7, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC8, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC9, level 1, with frame local.
-ClassIDSvc INFO getRegistryEntries: read 3566 CLIDRegistry entries for module ALL
-AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 2837 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 1169 CLIDRegistry entries for module ALL
-CondInputLoader INFO Initializing CondInputLoader...
-CondInputLoader INFO Adding base classes:
- + ( 'AlignableTransformContainer' , 'ConditionStore+/Indet/Align' ) -> no bases
- + ( 'AlignableTransformContainer' , 'ConditionStore+/TRT/Align' ) -> no bases
- + ( 'CondAttrListCollection' , 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/Indet/IBLDist' ) ->
- + ( 'DetCondCFloat' , 'ConditionStore+/Indet/PixelDist' ) -> no bases
-CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
- + ( 'AlignableTransformContainer' , 'ConditionStore+/Indet/Align' )
- + ( 'AlignableTransformContainer' , 'ConditionStore+/TRT/Align' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/Indet/IBLDist' )
- + ( 'DetCondCFloat' , 'ConditionStore+/Indet/PixelDist' )
-ClassIDSvc INFO getRegistryEntries: read 440 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 764 CLIDRegistry entries for module ALL
-xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
-xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
-xAODMaker::Even...WARNING Beam conditions service not available
-xAODMaker::Even...WARNING Will not fill beam spot information into xAOD::EventInfo
-testalg1 DEBUG Property update for OutputLevel : new value = 1
-testalg1 VERBOSE ServiceLocatorHelper::service: found service EventDataSvc
-testalg1 VERBOSE ServiceLocatorHelper::service: found service TimelineSvc
-testalg1.DummyS... DEBUG Property update for OutputLevel : new value = 1
-testalg1.DummyS... INFO Initialize successful
-testalg1 VERBOSE ServiceLocatorHelper::service: found service AlgExecStateSvc
-testalg1 DEBUG input handles: 0
-testalg1 DEBUG output handles: 1
-testalg1 DEBUG Adding private ToolHandle tool testalg1.DummySeedFinder (Trk::DummySeedFinder)
-testalg1 DEBUG Data Deps for testalg1
- + OUTPUT IGNORED ( 'McEventCollection' , '' )
-ApplicationMgr INFO Application Manager Initialized successfully
-CondInputLoader INFO created CondCont<AlignableTransformContainer> with key 'ConditionStore+/Indet/Align'
-CondInputLoader INFO created CondCont<AlignableTransformContainer> with key 'ConditionStore+/TRT/Align'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/Indet/IBLDist'
-CondInputLoader INFO created CondCont<DetCondCFloat> with key 'ConditionStore+/Indet/PixelDist'
-ApplicationMgr INFO Application Manager Started successfully
-AthenaEventLoopMgr INFO ===>>> start of run 1 <<<===
-EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
-EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
-ClassIDSvc INFO getRegistryEntries: read 118 CLIDRegistry entries for module ALL
-IOVDbSvc INFO Opening COOL connection for COOLOFL_INDET/OFLP200
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to InDetAlign_IOVDEP-03 for folder /Indet/Align
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to IBLDist-NULL for folder /Indet/IBLDist
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to InDetPixelDist-nominal for folder /Indet/PixelDist
-IOVDbSvc INFO Disconnecting from COOLOFL_INDET/OFLP200
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] D0709FD7-6A55-E011-925D-002481043EC0
-Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0001.pool.root
-RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0001.pool.root File version:52600
-PixelDetectorMa...WARNING Cannot set AlignableTransform for identifier [2.1.0.0.0] at level 2
-PixelDetectorMa...WARNING Subsequent WARNINGS will be printed at DEBUG level.
-PixelDetectorMa... INFO Processing IBLDist alignment container with key (/Indet/IBLDist) and alignment folder pointing to /Indet/Align
-PixelDetectorMa...WARNING Invalid HashID for identifier [2.1.0.0.0]
-PixelDetectorMa...WARNING No IBLDist corrections can be applied for invalid HashID's - exiting
-AthenaEventLoopMgr INFO ===>>> start processing event #1, run #1 0 events processed so far <<<===
-IOVDbSvc INFO Opening COOL connection for COOLOFL_TRT/OFLP200
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TRTAlign_Nominal2 for folder /TRT/Align
-IOVDbSvc INFO Disconnecting from COOLOFL_TRT/OFLP200
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 0E3CF1E5-143D-DB11-92C7-000CF1DA62DD
-Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.simul.pool.v0000/oflcond.000002.conditions.simul.pool.v0000._0029.pool.root__DQ2-1250194490
-Warning in <TClass::Init>: no dictionary for class DataHeader_p1 is available
-Warning in <TClass::Init>: no dictionary for class DataHeaderElement_p1 is available
-RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.simul.pool.v0000/oflcond.000002.conditions.simul.pool.v0000._0029.pool.root__DQ2-1250194490 File version:51000
-IOVDbSvc INFO Opening COOL connection for COOLOFL_DCS/OFLP200
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to ExtDCSMagnetsSensorData-001 for folder /EXT/DCS/MAGNETS/SENSORDATA
-IOVDbSvc INFO Disconnecting from COOLOFL_DCS/OFLP200
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8C5D7155-23E9-DC11-99B4-001320DCF58D
-Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.recon.pool.v0000/oflcond.000001.conditions.recon.pool.v0000._0058.pool.root
-Warning in <TClass::Init>: no dictionary for class DataHeader_p2 is available
-Warning in <TClass::Init>: no dictionary for class DataHeaderElement_p2 is available
-Warning in <TClass::Init>: no dictionary for class PoolToken_p1 is available
-RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.recon.pool.v0000/oflcond.000001.conditions.recon.pool.v0000._0058.pool.root File version:51400
-SCT_AlignCondAlg INFO recorded new CDO SCTAlignmentStore with range {[INVALID] - [1,l:4294967294]} into Conditions Store
-SCT_DetectorEle... INFO recorded new CDO SCT_DetectorElementCollection with range {[INVALID] - [1,l:4294967294]} with size of 8176 into Conditions Store
-PixelDetectorMa... INFO Processing IBLDist alignment container with key /Indet/IBLDist
-PixelAlignCondAlg INFO recorded new CDO PixelAlignmentStore with range {[0,t:0,l:0] - [1,l:4294967294]} into Conditions Store
-PixelDetectorEl... INFO recorded new CDO PixelDetectorElementCollection with range {[0,t:0,l:0] - [1,l:4294967294]} with size of 2048 into Conditions Store
testalg1 VERBOSE execute
testalg1 VERBOSE testing 1
testalg1 VERBOSE testing 2
testalg1 VERBOSE testing 3
-AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 1 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #2, run #1 1 events processed so far <<<===
testalg1 VERBOSE execute
testalg1 VERBOSE testing 1
testalg1 VERBOSE testing 2
testalg1 VERBOSE testing 3
-AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 2 events processed so far <<<===
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 0E3CF1E5-143D-DB11-92C7-000CF1DA62DD
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] D0709FD7-6A55-E011-925D-002481043EC0
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8C5D7155-23E9-DC11-99B4-001320DCF58D
-Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
-ApplicationMgr INFO Application Manager Stopped successfully
-IncidentProcAlg1 INFO Finalize
-CondInputLoader INFO Finalizing CondInputLoader...
-IncidentProcAlg2 INFO Finalize
-IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /EXT/DCS/MAGNETS/SENSORDATA (AttrListColl) db-read 1/1 objs/chan/bytes 4/4/20 (( 0.12 ))s
-IOVDbFolder INFO Folder /GLOBAL/BField/Maps (AttrListColl) db-read 0/0 objs/chan/bytes 0/3/0 (( 0.00 ))s
-IOVDbFolder INFO Folder /GLOBAL/TrackingGeo/LayerMaterialV2 (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
-IOVDbFolder INFO Folder /Indet/Align (PoolRefColl) db-read 1/2 objs/chan/bytes 34/43/5440 (( 0.04 ))s
-IOVDbFolder INFO Folder /Indet/IBLDist (AttrListColl) db-read 1/2 objs/chan/bytes 14/14/280 (( 0.02 ))s
-IOVDbFolder INFO Folder /Indet/PixelDist (PoolRef) db-read 1/1 objs/chan/bytes 1/1/179 (( 0.02 ))s
-IOVDbFolder INFO Folder /TRT/Align (PoolRefColl) db-read 1/1 objs/chan/bytes 32/32/5120 (( 0.14 ))s
-IOVDbSvc INFO bytes in (( 0.33 ))s
-IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_INDET/OFLP200 : nConnect: 2 nFolders: 3 ReadTime: (( 0.08 ))s
-IOVDbSvc INFO Connection COOLOFL_TRT/OFLP200 : nConnect: 2 nFolders: 1 ReadTime: (( 0.14 ))s
-IOVDbSvc INFO Connection COOLOFL_GLOBAL/OFLP200 : nConnect: 1 nFolders: 2 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_DCS/OFLP200 : nConnect: 2 nFolders: 1 ReadTime: (( 0.12 ))s
-AthDictLoaderSvc INFO in finalize...
-ToolSvc INFO Removing all tools created by ToolSvc
-testalg1.DummyS... INFO Finalize successful
-*****Chrono***** INFO ****************************************************************************************************
-*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
-*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 240 [ms] Ave/Min/Max= 2.38(+- 18.2)/ 0/ 180 [ms] #=101
-cObj_ALL INFO Time User : Tot= 260 [ms] Ave/Min/Max= 37.1(+- 68)/ 0/ 200 [ms] #= 7
-ChronoStatSvc INFO Time User : Tot= 16 [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"
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/IndexedCrossDistancesSeedFinder.ref b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/IndexedCrossDistancesSeedFinder.ref
index 3f63932aed14..8b4eb2247bc8 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/IndexedCrossDistancesSeedFinder.ref
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/IndexedCrossDistancesSeedFinder.ref
@@ -1,153 +1,7 @@
-Sat Mar 7 19:21:22 CET 2020
-Preloading tcmalloc_minimal.so
-Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.12] [x86_64-centos7-gcc8-dbg] [atlas-work3/d935ebad997] -- built on [2020-03-07T1715]
-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 "TrkVertexSeedFinderTools/IndexedCrossDistancesSeedFinder_test.py"
-Py:Athena INFO including file "TrkVertexSeedFinderTools/VertexSeedFinderTestCommon.py"
-Py:Athena INFO SetGeometryVersion.py obtained major release version 22
-Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5514 configurables from 60 genConfDb files
-Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.12
-Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
-Py:ConfiguredFactory INFO imported 138 confDb modules in 1.54 seconds
-Py:Athena INFO Importing MagFieldServices.SetupField
-Py:Athena INFO Importing MagFieldServices.MagFieldServicesSetup
[ TrackingGeometrySvc ] base material tag : AtlasLayerMat_v21_
[ TrackingGeometrySvc ] translated to COOL: /GLOBAL/TrackingGeo/LayerMaterialV2<tag>TagInfoMajor/AtlasLayerMat_v21_/GeoAtlas</tag>
-Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr SUCCESS
-====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r0)
- running on lxplus7100.cern.ch on Sat Mar 7 19:21:36 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 3736 CLIDRegistry entries for module ALL
-CoreDumpSvc INFO install f-a-t-a-l handler... (flag = -1)
-CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
-MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
-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://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier01.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier05.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://atlasfrontier2-ai.cern.ch:8000/atlr)(serverurl=http://atlasfrontier1-ai.cern.ch:8000/atlr)(proxyurl=http://ccatlassquid.in2p3.fr:3128)(proxyurl=http://ccatlassquid02.in2p3.fr:3128)(proxyurl=http://ccatlassquid04.in2p3.fr: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-26T2140/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 1 servers found for host ccwige0002.in2p3.fr [ATLF ]
-PoolSvc INFO Successfully setup replica sorting algorithm
-PoolSvc INFO Setting up APR FileCatalog and Streams
-PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
-PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
-DbSession INFO Open DbSession
-Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
-MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
-IOVDbSvc INFO Only 5 POOL conditions files will be open at once
-IOVDbSvc INFO Cache alignment will be done in 3 slices
-IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
-IOVDbFolder INFO Read from meta data only for folder /TagInfo
-IOVDbFolder INFO Inputfile tag override disabled for /GLOBAL/BField/Maps
-IOVDbSvc INFO Initialised with 5 connections and 8 folders
-IOVDbSvc INFO Service IOVDbSvc initialised successfully
-ClassIDSvc INFO getRegistryEntries: read 1914 CLIDRegistry entries for module ALL
-IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
-IOVDbSvc INFO Opening COOL connection for COOLOFL_INDET/OFLP200
-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_TRT/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_INDET/OFLP200
-IOVDbSvc INFO Opening COOL connection for COOLOFL_GLOBAL/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_TRT/OFLP200
-IOVDbSvc INFO Opening COOL connection for COOLOFL_DCS/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_GLOBAL/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_DCS/OFLP200
-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 /GLOBAL/TrackingGeo/LayerMaterialV2
-IOVDbSvc INFO Added taginfo remove for /Indet/Align
-IOVDbSvc INFO Added taginfo remove for /Indet/IBLDist
-IOVDbSvc INFO Added taginfo remove for /Indet/PixelDist
-IOVDbSvc INFO Added taginfo remove for /TRT/Align
-ClassIDSvc INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 35 CLIDRegistry entries for module ALL
-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::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
-IBLParameterSvc INFO IBL geometry
-EventPersistenc... INFO Added successfully Conversion service:DetDescrCnvSvc
-PixelIDDetDescrCnv INFO in createObj: creating a PixelID helper 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
-PixelID INFO Initialize from dictionary
-AtlasDetectorID INFO initialize_from_dictionary - OK
+[ TrackingGeometryCondAlg ] base material tag : AtlasLayerMat_v21_
+[ TrackingGeometryCondAlg ] translated to COOL: /GLOBAL/TrackingGeo/LayerMaterialV2<tag>TagInfoMajor/AtlasLayerMat_v21_/GeoAtlas</tag>
indet 1 2,4,5,7,10,11,12,13 7 1fffffffffffffff 61 3 0 min/max 2 13 values 2 4 5 7 10 11 12 13 indexes 0 0 1 2 0 3 0 0 4 5 6 7 indices 8 prev 0 next 0 mode enumerated cont mode none
pixel 1 1:3 3 e7ffffffffffffff 59 2 3 min/max 1 3 values indexes indices 3 prev 0 next 0 mode both_bounded cont mode none
bec 1 -4,-2,0,2,4 7 f8ffffffffffffff 56 3 5 min/max -4 4 values -4 -2 0 2 4 indexes 0 0 1 0 2 0 3 0 4 indices 5 prev 0 next 0 mode enumerated cont mode none
@@ -170,306 +24,14 @@ phi_module 4
eta_module 5
phi_index 6
eta_index 7
-InDetGeometryDBSvc INFO GeometryDBSvc Initialized
-PixelGeoModel INFO Retrieving Record Sets from database ...
-PixelGeoModel INFO Key = ATLAS-R2-2016-01-00-01 Node = ATLAS
-PixelGeoModel INFO ... Record Sets retrieved.
-PixelGeoModel INFO DBM switch = SetDBMFlag: 1
-PixelGeoModel INFO Building Pixel Detector
-PixelGeoModel INFO Version: Pixel-IBL3D25-33, Name: IBL, Layout: IBL, Code Version: 5.01.00, Description: IBL_Geometry
GEOPIXELSERVICES pixel : 28.995 245 // 3460
GEOPIXELSERVICES barrel : 28.997 143 // -460 460
GEOPIXELSERVICES endcap : 82 175 // 484 670
-PixelGeoModel INFO Build detailed stave support description : layout 5
-PixelGeoModel INFO Si3D/SiPl radial shift : -0.015
-PixelGeoModel INFO Module thicknesses : SiPl P/N 0.31 0.44 20.86 SiPl P/N 0.31 1.72 20.86 // 0.325 1.705
-PixelGeoModel INFO Pixel modules 12 -> planar/3D : 12 8
-PixelGeoModel INFO Module length/gap : 41.3 / 20.45 0.205 -> Stave length : 748
-PixelGeoModel INFO planar/3D/endblock/NonActive lengths : 497.855 165.24 69.8 7.5525
-PixelGeoModel INFO Flex thickness (max) : 0.45 computed for 16 modules
-PixelGeoModel INFO Omega MidStaveCenterX = 1.55
-PixelGeoModel INFO Omega MidStaveAngle = 0.296706
-PixelGeoModel INFO Omega MidStaveRadius = 1.655
-PixelGeoModel INFO Omega EndStaveCenterX = -1.25
-PixelGeoModel INFO Omega EndStaveCenterY = 7.45
-PixelGeoModel INFO Omega EndStaveAngle = 2.35619
-PixelGeoModel INFO Omega EndStaveRadius = 2.155
-PixelGeoModel INFO Omega Thickness = 0.145
-PixelGeoModel INFO MechanicalStaveWidth = 18.8
-PixelGeoModel INFO MechanicalStaveLength = 748
-PixelGeoModel INFO MechanicalStaveOffset = -0.95
-PixelGeoModel INFO StaveModuleOffset = 0.01
-PixelGeoModel INFO MechanicalStaveEndBlockLength = 34.9
-PixelGeoModel INFO FacePlateThick = 0.215
-PixelGeoModel INFO TubeOuterDiam = 1.75
-PixelGeoModel INFO TubeInnerDiam = 1.5
-PixelGeoModel INFO TubeMiddlePos = 1.3
-PixelGeoModel INFO FlexBaseThick = 0.45
-PixelGeoModel INFO FlexLayerThick = 0.02
-PixelGeoModel INFO FlexWidth = 11.5
-PixelGeoModel INFO FlexOffset = 0.6
-PixelGeoModel INFO XOffset / ladder = 0.01
-PixelGeoModel INFO ** OMEGA : with Stycast 0.1
-PixelGeoModel INFO ***> new material : OmegaGlue_IBL 3.31517
-PixelGeoModel INFO ** FacePlate : with Stycast 0.1 grease : 0.07
-PixelGeoModel INFO ***> new material : FacePlateGlue_IBL 3.31517
-PixelGeoModel INFO ** FacePlate : with grease
-PixelGeoModel INFO ***> new material : FacePlateGlueGrease_IBL 3.04977
-PixelGeoModel INFO Flex angle : 0.296641 Flex pos. in Z : (2.60312,4.19227,22.9025) 0.45 / (2.60312,4.19227,62.2575) 0.45 / (2.60312,4.19227,103.762) 0.45 / (2.60312,4.19227,145.267) 0.45 / (2.60312,4.19227,186.772) 0.45 / (2.60312,4.19227,228.277) 0.45 / (2.60312,4.19227,269.782) 0.45 / (2.60312,4.19227,314.817) 0.45 /
-PixelGeoModel INFO ** TUBE : with Stycast 0.1 diam 0.875 0.75
-PixelGeoModel INFO ***> new material : CoolingPipeGlue_IBL 6.72585
-PixelGeoModel INFO IBL EOS : mechanical stave length : 374
-PixelGeoModel INFO IBL EOS : service Zpos : 366.552
-PixelGeoModel INFO IBL EOS : endblock Zpos : 356.552
-PixelGeoModel INFO IBL EOS : endblock length : 34.896
-PixelGeoModel INFO IBL EOS : endblock srv length : 20
-PixelGeoModel INFO Flex half thickness srv : 0.45
-PixelGeoModel INFO stave xoffset = 0.32
-PixelGeoModel INFO stave yoffset = -0.95
-PixelGeoModel INFO Stave envelop length : 748 -> 339.101
-PixelGeoModel INFO *** LAYER 0 planar/3D modules : 12 8
-PixelGeoModel INFO Layer IBL / stave ring : outer radius max 42.001
-PixelGeoModel INFO Layer 0 in/out radius 29.7573 42.001
-PixelGeoModel INFO IBL stave ring support
-PixelGeoModel INFO Build IBL stave ring services
-PixelGeoModel INFO Build detailed stave ring support : Brl0A_StaveRing AC
-PixelGeoModel INFO Build detailed stave ring support - logVol : Brl0A_StaveRing
-PixelGeoModel INFO Build detailed stave ring support : Brl0C_StaveRing AC
-PixelGeoModel INFO Build detailed stave ring support - logVol : Brl0C_StaveRing
-PixelGeoModel INFO Build detailed stave ring support : Brl0M_StaveRing Mid
-PixelGeoModel INFO Build detailed stave ring support - logVol : Brl0M_StaveRing
-PixelGeoModel INFO Build IBL I-Flex services
-PixelGeoModel INFO *** LAYER 1 planar/3D modules : 0 0
-PixelGeoModel INFO Layer 1 in/out radius 46.2723 64.1329
-PixelGeoModel INFO *** LAYER 2 planar/3D modules : 0 0
-PixelGeoModel INFO Layer 2 in/out radius 83.7078 102.132
-PixelGeoModel INFO *** LAYER 3 planar/3D modules : 0 0
-PixelGeoModel INFO Layer 3 in/out radius 117.51 136.132
-PixelGeoModel INFO Build IBL I-Flex services
-PixelGeoModel INFO Build IBL I-Flex services
-PixelGeoModel INFO Build IBL I-Flex services
-PixelGeoModel INFO Build IBL fwd services - CAD tool design / S. model1 : 0/0
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/ID, level 2, with frame global.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIX, level 1, with frame global.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXB1, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXB2, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXB3, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXB4, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEA1, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEA2, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEA3, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEC1, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEC2, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEC3, level 0, with frame local.
-PixelGeoModel INFO Doing consistency checks.
-PixelGeoModel INFO Number of barrel elements : 1736
-PixelGeoModel INFO Number of endcap elements : 288
-PixelGeoModel INFO Number of endcap elements (DBM) : 24
-PixelGeoModel INFO Total : 2048
-PixelGeoModel INFO MaxHash : 2048
-SCT_IDDetDescrCnv INFO in createObj: creating a SCT_ID helper object in the detector store
-SCT_ID INFO
-AtlasDetectorID INFO initialize_from_dictionary - OK
-SCT_GeoModel INFO Retrieving Record Sets from database ...
-SCT_GeoModel INFO Building SCT Detector.
-SCT_GeoModel INFO Version: SCT-GEO-00, Name: GEO, Layout: Final, Code Version: 3.06.00, Description: Atlas Geometry 2008
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/ID, level 3, with frame global.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCT, level 2, with frame global.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTB1, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTB2, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTB3, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTB4, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA1, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA2, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA3, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA4, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA5, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA6, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA7, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA8, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA9, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC1, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC2, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC3, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC4, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC5, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC6, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC7, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC8, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC9, level 1, with frame local.
-ClassIDSvc INFO getRegistryEntries: read 3566 CLIDRegistry entries for module ALL
-AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 2837 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 1169 CLIDRegistry entries for module ALL
-CondInputLoader INFO Initializing CondInputLoader...
-CondInputLoader INFO Adding base classes:
- + ( 'AlignableTransformContainer' , 'ConditionStore+/Indet/Align' ) -> no bases
- + ( 'AlignableTransformContainer' , 'ConditionStore+/TRT/Align' ) -> no bases
- + ( 'CondAttrListCollection' , 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/GLOBAL/BField/Maps' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/Indet/IBLDist' ) ->
- + ( 'DetCondCFloat' , 'ConditionStore+/Indet/PixelDist' ) -> no bases
-CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
- + ( 'AlignableTransformContainer' , 'ConditionStore+/Indet/Align' )
- + ( 'AlignableTransformContainer' , 'ConditionStore+/TRT/Align' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/GLOBAL/BField/Maps' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/Indet/IBLDist' )
- + ( 'DetCondCFloat' , 'ConditionStore+/Indet/PixelDist' )
-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 440 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 764 CLIDRegistry entries for module ALL
-xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
-xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
-xAODMaker::Even...WARNING Beam conditions service not available
-xAODMaker::Even...WARNING Will not fill beam spot information into xAOD::EventInfo
-testalg1 DEBUG Property update for OutputLevel : new value = 1
-testalg1 VERBOSE ServiceLocatorHelper::service: found service EventDataSvc
-testalg1 VERBOSE ServiceLocatorHelper::service: found service TimelineSvc
-testalg1.Indexe... DEBUG Property update for OutputLevel : new value = 1
-testalg1.Indexe... INFO Initialize successful
-ClassIDSvc INFO getRegistryEntries: read 967 CLIDRegistry entries for module ALL
-testalg1.Indexe... INFO Initialize successful
-testalg1 VERBOSE ServiceLocatorHelper::service: found service AlgExecStateSvc
-testalg1 DEBUG input handles: 0
-testalg1 DEBUG output handles: 1
-testalg1 DEBUG Adding private ToolHandle tool testalg1.IndexedCrossDistancesSeedFinder (Trk::IndexedCrossDistancesSeedFinder)
-testalg1 DEBUG Data Deps for testalg1
- + INPUT ( 'AtlasFieldCacheCondObj' , 'ConditionStore+fieldCondObj' )
- + OUTPUT IGNORED ( 'McEventCollection' , '' )
-ApplicationMgr INFO Application Manager Initialized successfully
-CondInputLoader INFO created CondCont<AlignableTransformContainer> with key 'ConditionStore+/Indet/Align'
-CondInputLoader INFO created CondCont<AlignableTransformContainer> with key 'ConditionStore+/TRT/Align'
-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+/Indet/IBLDist'
-CondInputLoader INFO created CondCont<DetCondCFloat> with key 'ConditionStore+/Indet/PixelDist'
-ApplicationMgr INFO Application Manager Started successfully
-AthenaEventLoopMgr INFO ===>>> start of run 1 <<<===
-EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
-EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
-ClassIDSvc INFO getRegistryEntries: read 118 CLIDRegistry entries for module ALL
-IOVDbSvc INFO Opening COOL connection for COOLOFL_INDET/OFLP200
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to InDetAlign_IOVDEP-03 for folder /Indet/Align
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to IBLDist-NULL for folder /Indet/IBLDist
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to InDetPixelDist-nominal for folder /Indet/PixelDist
-IOVDbSvc INFO Disconnecting from COOLOFL_INDET/OFLP200
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] D0709FD7-6A55-E011-925D-002481043EC0
-Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0001.pool.root
-RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0001.pool.root File version:52600
-PixelDetectorMa...WARNING Cannot set AlignableTransform for identifier [2.1.0.0.0] at level 2
-PixelDetectorMa...WARNING Subsequent WARNINGS will be printed at DEBUG level.
-PixelDetectorMa... INFO Processing IBLDist alignment container with key (/Indet/IBLDist) and alignment folder pointing to /Indet/Align
-PixelDetectorMa...WARNING Invalid HashID for identifier [2.1.0.0.0]
-PixelDetectorMa...WARNING No IBLDist corrections can be applied for invalid HashID's - exiting
-AthenaEventLoopMgr INFO ===>>> start processing event #1, run #1 0 events processed so far <<<===
-IOVDbSvc INFO Opening COOL connection for COOLOFL_TRT/OFLP200
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TRTAlign_Nominal2 for folder /TRT/Align
-IOVDbSvc INFO Disconnecting from COOLOFL_TRT/OFLP200
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 0E3CF1E5-143D-DB11-92C7-000CF1DA62DD
-Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.simul.pool.v0000/oflcond.000002.conditions.simul.pool.v0000._0029.pool.root__DQ2-1250194490
-Warning in <TClass::Init>: no dictionary for class DataHeader_p1 is available
-Warning in <TClass::Init>: no dictionary for class DataHeaderElement_p1 is available
-RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.simul.pool.v0000/oflcond.000002.conditions.simul.pool.v0000._0029.pool.root__DQ2-1250194490 File version:51000
-IOVDbSvc INFO Opening COOL connection for COOLOFL_DCS/OFLP200
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to ExtDCSMagnetsSensorData-001 for folder /EXT/DCS/MAGNETS/SENSORDATA
-IOVDbSvc INFO Disconnecting from COOLOFL_DCS/OFLP200
-IOVDbSvc INFO Opening COOL connection for COOLOFL_GLOBAL/OFLP200
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to BFieldMap-Run1-14m-v01 for folder /GLOBAL/BField/Maps
-IOVDbSvc INFO Disconnecting from COOLOFL_GLOBAL/OFLP200
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8C5D7155-23E9-DC11-99B4-001320DCF58D
-Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.recon.pool.v0000/oflcond.000001.conditions.recon.pool.v0000._0058.pool.root
-Warning in <TClass::Init>: no dictionary for class DataHeader_p2 is available
-Warning in <TClass::Init>: no dictionary for class DataHeaderElement_p2 is available
-Warning in <TClass::Init>: no dictionary for class PoolToken_p1 is available
-RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.recon.pool.v0000/oflcond.000001.conditions.recon.pool.v0000._0058.pool.root File version:51400
-SCT_AlignCondAlg INFO recorded new CDO SCTAlignmentStore with range {[INVALID] - [1,l:4294967294]} into Conditions Store
-SCT_DetectorEle... INFO recorded new CDO SCT_DetectorElementCollection with range {[INVALID] - [1,l:4294967294]} with size of 8176 into Conditions Store
-PixelDetectorMa... INFO Processing IBLDist alignment container with key /Indet/IBLDist
-PixelAlignCondAlg INFO recorded new CDO PixelAlignmentStore with range {[0,t:0,l:0] - [1,l:4294967294]} into Conditions Store
-PixelDetectorEl... INFO recorded new CDO PixelDetectorElementCollection with range {[0,t:0,l:0] - [1,l:4294967294]} with size of 2048 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:0] - [t:4294967294.854775807]}
-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 , 7730
-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 , 20400
-AtlasFieldCache... INFO UpdateCurrentFromConditions: Trying to read from DCS: [channel name, index, value] Toroids_SCurrent , 4 , 20400
-AtlasFieldCache... INFO UpdateCurrentFromConditions: Currents read from DCS - solenoid 7730 toroid 20400
-AtlasFieldCache... INFO scaleField: Solenoid field scale factor 1. Solenoid and map currents: 7730,7730
-AtlasFieldCache... INFO scaleField: Toroid field scale factor 1. Toroid and map currents: 20400,20400
-AtlasFieldCache... INFO execute: initialized AtlasFieldCacheCondObj and cache with SFs - sol/tor 1/1
-AtlasFieldCache... INFO execute: solenoid zone id 7000
testalg1 VERBOSE execute
testalg1 VERBOSE testing 1
testalg1 VERBOSE testing 2
testalg1 VERBOSE testing 3
-AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 1 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #2, run #1 1 events processed so far <<<===
testalg1 VERBOSE execute
testalg1 VERBOSE testing 1
testalg1 VERBOSE testing 2
testalg1 VERBOSE testing 3
-AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 2 events processed so far <<<===
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] D0709FD7-6A55-E011-925D-002481043EC0
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 0E3CF1E5-143D-DB11-92C7-000CF1DA62DD
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8C5D7155-23E9-DC11-99B4-001320DCF58D
-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
-IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /EXT/DCS/MAGNETS/SENSORDATA (AttrListColl) db-read 1/1 objs/chan/bytes 4/4/20 (( 0.17 ))s
-IOVDbFolder INFO Folder /GLOBAL/BField/Maps (AttrListColl) db-read 1/1 objs/chan/bytes 3/3/202 (( 0.09 ))s
-IOVDbFolder INFO Folder /GLOBAL/TrackingGeo/LayerMaterialV2 (PoolRef) db-read 1/0 objs/chan/bytes 1/1/231 (( 0.05 ))s
-IOVDbFolder WARNING Folder /GLOBAL/TrackingGeo/LayerMaterialV2 is requested but no data retrieved
-IOVDbFolder INFO Folder /Indet/Align (PoolRefColl) db-read 1/2 objs/chan/bytes 34/43/5440 (( 0.04 ))s
-IOVDbFolder INFO Folder /Indet/IBLDist (AttrListColl) db-read 1/2 objs/chan/bytes 14/14/280 (( 0.02 ))s
-IOVDbFolder INFO Folder /Indet/PixelDist (PoolRef) db-read 1/1 objs/chan/bytes 1/1/179 (( 0.02 ))s
-IOVDbFolder INFO Folder /TRT/Align (PoolRefColl) db-read 1/1 objs/chan/bytes 32/32/5120 (( 2.23 ))s
-IOVDbSvc INFO bytes in (( 2.48 ))s
-IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_INDET/OFLP200 : nConnect: 2 nFolders: 3 ReadTime: (( 0.08 ))s
-IOVDbSvc INFO Connection COOLOFL_TRT/OFLP200 : nConnect: 2 nFolders: 1 ReadTime: (( 2.23 ))s
-IOVDbSvc INFO Connection COOLOFL_GLOBAL/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.08 ))s
-IOVDbSvc INFO Connection COOLOFL_DCS/OFLP200 : nConnect: 3 nFolders: 1 ReadTime: (( 0.09 ))s
-AthDictLoaderSvc INFO in finalize...
-ToolSvc INFO Removing all tools created by ToolSvc
-testalg1.Indexe... INFO Finalize successful
-testalg1.Indexe... INFO Finalize successful
-*****Chrono***** INFO ****************************************************************************************************
-*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
-*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 210 [ms] Ave/Min/Max= 2.08(+- 17.9)/ 0/ 180 [ms] #=101
-cObj_ALL INFO Time User : Tot= 250 [ms] Ave/Min/Max= 27.8(+- 61.4)/ 0/ 200 [ms] #= 9
-ChronoStatSvc INFO Time User : Tot= 61.1 [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"
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/MCTrueSeedFinder.ref b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/MCTrueSeedFinder.ref
index b6d4174deec7..c1b91a5c8bbc 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/MCTrueSeedFinder.ref
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/MCTrueSeedFinder.ref
@@ -1,153 +1,7 @@
-Sat Mar 7 19:13:23 CET 2020
-Preloading tcmalloc_minimal.so
-Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.12] [x86_64-centos7-gcc8-dbg] [atlas-work3/d935ebad997] -- built on [2020-03-07T1715]
-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 "TrkVertexSeedFinderTools/MCTrueSeedFinder_test.py"
-Py:Athena INFO including file "TrkVertexSeedFinderTools/VertexSeedFinderTestCommon.py"
-Py:Athena INFO SetGeometryVersion.py obtained major release version 22
-Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5514 configurables from 60 genConfDb files
-Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.12
-Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
-Py:ConfiguredFactory INFO imported 138 confDb modules in 0.28 seconds
-Py:Athena INFO Importing MagFieldServices.SetupField
-Py:Athena INFO Importing MagFieldServices.MagFieldServicesSetup
[ TrackingGeometrySvc ] base material tag : AtlasLayerMat_v21_
[ TrackingGeometrySvc ] translated to COOL: /GLOBAL/TrackingGeo/LayerMaterialV2<tag>TagInfoMajor/AtlasLayerMat_v21_/GeoAtlas</tag>
-Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr SUCCESS
-====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r0)
- running on lxplus7100.cern.ch on Sat Mar 7 19:13:33 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 3736 CLIDRegistry entries for module ALL
-CoreDumpSvc INFO install f-a-t-a-l handler... (flag = -1)
-CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
-MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
-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/2020-03-06T2143/Athena/22.0.12/InstallArea/x86_64-centos7-gcc8-dbg/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus7100.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
-PoolSvc INFO Successfully setup replica sorting algorithm
-PoolSvc INFO Setting up APR FileCatalog and Streams
-PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
-PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
-DbSession INFO Open DbSession
-Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
-MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
-IOVDbSvc INFO Only 5 POOL conditions files will be open at once
-IOVDbSvc INFO Cache alignment will be done in 3 slices
-IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
-IOVDbFolder INFO Read from meta data only for folder /TagInfo
-IOVDbFolder INFO Inputfile tag override disabled for /GLOBAL/BField/Maps
-IOVDbSvc INFO Initialised with 5 connections and 8 folders
-IOVDbSvc INFO Service IOVDbSvc initialised successfully
-ClassIDSvc INFO getRegistryEntries: read 1914 CLIDRegistry entries for module ALL
-IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
-IOVDbSvc INFO Opening COOL connection for COOLOFL_INDET/OFLP200
-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_TRT/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_INDET/OFLP200
-IOVDbSvc INFO Opening COOL connection for COOLOFL_GLOBAL/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_TRT/OFLP200
-IOVDbSvc INFO Opening COOL connection for COOLOFL_DCS/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_GLOBAL/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_DCS/OFLP200
-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 /GLOBAL/TrackingGeo/LayerMaterialV2
-IOVDbSvc INFO Added taginfo remove for /Indet/Align
-IOVDbSvc INFO Added taginfo remove for /Indet/IBLDist
-IOVDbSvc INFO Added taginfo remove for /Indet/PixelDist
-IOVDbSvc INFO Added taginfo remove for /TRT/Align
-ClassIDSvc INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 35 CLIDRegistry entries for module ALL
-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::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
-IBLParameterSvc INFO IBL geometry
-EventPersistenc... INFO Added successfully Conversion service:DetDescrCnvSvc
-PixelIDDetDescrCnv INFO in createObj: creating a PixelID helper 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
-PixelID INFO Initialize from dictionary
-AtlasDetectorID INFO initialize_from_dictionary - OK
+[ TrackingGeometryCondAlg ] base material tag : AtlasLayerMat_v21_
+[ TrackingGeometryCondAlg ] translated to COOL: /GLOBAL/TrackingGeo/LayerMaterialV2<tag>TagInfoMajor/AtlasLayerMat_v21_/GeoAtlas</tag>
indet 1 2,4,5,7,10,11,12,13 7 1fffffffffffffff 61 3 0 min/max 2 13 values 2 4 5 7 10 11 12 13 indexes 0 0 1 2 0 3 0 0 4 5 6 7 indices 8 prev 0 next 0 mode enumerated cont mode none
pixel 1 1:3 3 e7ffffffffffffff 59 2 3 min/max 1 3 values indexes indices 3 prev 0 next 0 mode both_bounded cont mode none
bec 1 -4,-2,0,2,4 7 f8ffffffffffffff 56 3 5 min/max -4 4 values -4 -2 0 2 4 indexes 0 0 1 0 2 0 3 0 4 indices 5 prev 0 next 0 mode enumerated cont mode none
@@ -170,261 +24,11 @@ phi_module 4
eta_module 5
phi_index 6
eta_index 7
-InDetGeometryDBSvc INFO GeometryDBSvc Initialized
-PixelGeoModel INFO Retrieving Record Sets from database ...
-PixelGeoModel INFO Key = ATLAS-R2-2016-01-00-01 Node = ATLAS
-PixelGeoModel INFO ... Record Sets retrieved.
-PixelGeoModel INFO DBM switch = SetDBMFlag: 1
-PixelGeoModel INFO Building Pixel Detector
-PixelGeoModel INFO Version: Pixel-IBL3D25-33, Name: IBL, Layout: IBL, Code Version: 5.01.00, Description: IBL_Geometry
GEOPIXELSERVICES pixel : 28.995 245 // 3460
GEOPIXELSERVICES barrel : 28.997 143 // -460 460
GEOPIXELSERVICES endcap : 82 175 // 484 670
-PixelGeoModel INFO Build detailed stave support description : layout 5
-PixelGeoModel INFO Si3D/SiPl radial shift : -0.015
-PixelGeoModel INFO Module thicknesses : SiPl P/N 0.31 0.44 20.86 SiPl P/N 0.31 1.72 20.86 // 0.325 1.705
-PixelGeoModel INFO Pixel modules 12 -> planar/3D : 12 8
-PixelGeoModel INFO Module length/gap : 41.3 / 20.45 0.205 -> Stave length : 748
-PixelGeoModel INFO planar/3D/endblock/NonActive lengths : 497.855 165.24 69.8 7.5525
-PixelGeoModel INFO Flex thickness (max) : 0.45 computed for 16 modules
-PixelGeoModel INFO Omega MidStaveCenterX = 1.55
-PixelGeoModel INFO Omega MidStaveAngle = 0.296706
-PixelGeoModel INFO Omega MidStaveRadius = 1.655
-PixelGeoModel INFO Omega EndStaveCenterX = -1.25
-PixelGeoModel INFO Omega EndStaveCenterY = 7.45
-PixelGeoModel INFO Omega EndStaveAngle = 2.35619
-PixelGeoModel INFO Omega EndStaveRadius = 2.155
-PixelGeoModel INFO Omega Thickness = 0.145
-PixelGeoModel INFO MechanicalStaveWidth = 18.8
-PixelGeoModel INFO MechanicalStaveLength = 748
-PixelGeoModel INFO MechanicalStaveOffset = -0.95
-PixelGeoModel INFO StaveModuleOffset = 0.01
-PixelGeoModel INFO MechanicalStaveEndBlockLength = 34.9
-PixelGeoModel INFO FacePlateThick = 0.215
-PixelGeoModel INFO TubeOuterDiam = 1.75
-PixelGeoModel INFO TubeInnerDiam = 1.5
-PixelGeoModel INFO TubeMiddlePos = 1.3
-PixelGeoModel INFO FlexBaseThick = 0.45
-PixelGeoModel INFO FlexLayerThick = 0.02
-PixelGeoModel INFO FlexWidth = 11.5
-PixelGeoModel INFO FlexOffset = 0.6
-PixelGeoModel INFO XOffset / ladder = 0.01
-PixelGeoModel INFO ** OMEGA : with Stycast 0.1
-PixelGeoModel INFO ***> new material : OmegaGlue_IBL 3.31517
-PixelGeoModel INFO ** FacePlate : with Stycast 0.1 grease : 0.07
-PixelGeoModel INFO ***> new material : FacePlateGlue_IBL 3.31517
-PixelGeoModel INFO ** FacePlate : with grease
-PixelGeoModel INFO ***> new material : FacePlateGlueGrease_IBL 3.04977
-PixelGeoModel INFO Flex angle : 0.296641 Flex pos. in Z : (2.60312,4.19227,22.9025) 0.45 / (2.60312,4.19227,62.2575) 0.45 / (2.60312,4.19227,103.762) 0.45 / (2.60312,4.19227,145.267) 0.45 / (2.60312,4.19227,186.772) 0.45 / (2.60312,4.19227,228.277) 0.45 / (2.60312,4.19227,269.782) 0.45 / (2.60312,4.19227,314.817) 0.45 /
-PixelGeoModel INFO ** TUBE : with Stycast 0.1 diam 0.875 0.75
-PixelGeoModel INFO ***> new material : CoolingPipeGlue_IBL 6.72585
-PixelGeoModel INFO IBL EOS : mechanical stave length : 374
-PixelGeoModel INFO IBL EOS : service Zpos : 366.552
-PixelGeoModel INFO IBL EOS : endblock Zpos : 356.552
-PixelGeoModel INFO IBL EOS : endblock length : 34.896
-PixelGeoModel INFO IBL EOS : endblock srv length : 20
-PixelGeoModel INFO Flex half thickness srv : 0.45
-PixelGeoModel INFO stave xoffset = 0.32
-PixelGeoModel INFO stave yoffset = -0.95
-PixelGeoModel INFO Stave envelop length : 748 -> 339.101
-PixelGeoModel INFO *** LAYER 0 planar/3D modules : 12 8
-PixelGeoModel INFO Layer IBL / stave ring : outer radius max 42.001
-PixelGeoModel INFO Layer 0 in/out radius 29.7573 42.001
-PixelGeoModel INFO IBL stave ring support
-PixelGeoModel INFO Build IBL stave ring services
-PixelGeoModel INFO Build detailed stave ring support : Brl0A_StaveRing AC
-PixelGeoModel INFO Build detailed stave ring support - logVol : Brl0A_StaveRing
-PixelGeoModel INFO Build detailed stave ring support : Brl0C_StaveRing AC
-PixelGeoModel INFO Build detailed stave ring support - logVol : Brl0C_StaveRing
-PixelGeoModel INFO Build detailed stave ring support : Brl0M_StaveRing Mid
-PixelGeoModel INFO Build detailed stave ring support - logVol : Brl0M_StaveRing
-PixelGeoModel INFO Build IBL I-Flex services
-PixelGeoModel INFO *** LAYER 1 planar/3D modules : 0 0
-PixelGeoModel INFO Layer 1 in/out radius 46.2723 64.1329
-PixelGeoModel INFO *** LAYER 2 planar/3D modules : 0 0
-PixelGeoModel INFO Layer 2 in/out radius 83.7078 102.132
-PixelGeoModel INFO *** LAYER 3 planar/3D modules : 0 0
-PixelGeoModel INFO Layer 3 in/out radius 117.51 136.132
-PixelGeoModel INFO Build IBL I-Flex services
-PixelGeoModel INFO Build IBL I-Flex services
-PixelGeoModel INFO Build IBL I-Flex services
-PixelGeoModel INFO Build IBL fwd services - CAD tool design / S. model1 : 0/0
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/ID, level 2, with frame global.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIX, level 1, with frame global.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXB1, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXB2, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXB3, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXB4, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEA1, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEA2, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEA3, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEC1, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEC2, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEC3, level 0, with frame local.
-PixelGeoModel INFO Doing consistency checks.
-PixelGeoModel INFO Number of barrel elements : 1736
-PixelGeoModel INFO Number of endcap elements : 288
-PixelGeoModel INFO Number of endcap elements (DBM) : 24
-PixelGeoModel INFO Total : 2048
-PixelGeoModel INFO MaxHash : 2048
-SCT_IDDetDescrCnv INFO in createObj: creating a SCT_ID helper object in the detector store
-SCT_ID INFO
-AtlasDetectorID INFO initialize_from_dictionary - OK
-SCT_GeoModel INFO Retrieving Record Sets from database ...
-SCT_GeoModel INFO Building SCT Detector.
-SCT_GeoModel INFO Version: SCT-GEO-00, Name: GEO, Layout: Final, Code Version: 3.06.00, Description: Atlas Geometry 2008
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/ID, level 3, with frame global.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCT, level 2, with frame global.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTB1, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTB2, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTB3, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTB4, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA1, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA2, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA3, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA4, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA5, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA6, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA7, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA8, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA9, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC1, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC2, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC3, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC4, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC5, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC6, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC7, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC8, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC9, level 1, with frame local.
-ClassIDSvc INFO getRegistryEntries: read 3566 CLIDRegistry entries for module ALL
-AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 2837 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 1169 CLIDRegistry entries for module ALL
-CondInputLoader INFO Initializing CondInputLoader...
-CondInputLoader INFO Adding base classes:
- + ( 'AlignableTransformContainer' , 'ConditionStore+/Indet/Align' ) -> no bases
- + ( 'AlignableTransformContainer' , 'ConditionStore+/TRT/Align' ) -> no bases
- + ( 'CondAttrListCollection' , 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/Indet/IBLDist' ) ->
- + ( 'DetCondCFloat' , 'ConditionStore+/Indet/PixelDist' ) -> no bases
-CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
- + ( 'AlignableTransformContainer' , 'ConditionStore+/Indet/Align' )
- + ( 'AlignableTransformContainer' , 'ConditionStore+/TRT/Align' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/Indet/IBLDist' )
- + ( 'DetCondCFloat' , 'ConditionStore+/Indet/PixelDist' )
-ClassIDSvc INFO getRegistryEntries: read 440 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 764 CLIDRegistry entries for module ALL
-xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
-xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
-xAODMaker::Even...WARNING Beam conditions service not available
-xAODMaker::Even...WARNING Will not fill beam spot information into xAOD::EventInfo
-testalg1 DEBUG Property update for OutputLevel : new value = 1
-testalg1 VERBOSE ServiceLocatorHelper::service: found service EventDataSvc
-testalg1 VERBOSE ServiceLocatorHelper::service: found service TimelineSvc
-testalg1.MCTrue... DEBUG Property update for OutputLevel : new value = 1
-testalg1.MCTrue... INFO Initialize successful
-testalg1 VERBOSE ServiceLocatorHelper::service: found service AlgExecStateSvc
-testalg1 DEBUG input handles: 0
-testalg1 DEBUG output handles: 1
-testalg1 DEBUG Adding private ToolHandle tool testalg1.MCTrueSeedFinder (Trk::MCTrueSeedFinder)
-testalg1 WARNING Implicit circular data dependency detected for id ( 'McEventCollection' , 'StoreGateSvc+G4Truth' )
-testalg1 DEBUG Data Deps for testalg1
- + OUTPUT ( 'McEventCollection' , 'StoreGateSvc+G4Truth' )
-ApplicationMgr INFO Application Manager Initialized successfully
-CondInputLoader INFO created CondCont<AlignableTransformContainer> with key 'ConditionStore+/Indet/Align'
-CondInputLoader INFO created CondCont<AlignableTransformContainer> with key 'ConditionStore+/TRT/Align'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/Indet/IBLDist'
-CondInputLoader INFO created CondCont<DetCondCFloat> with key 'ConditionStore+/Indet/PixelDist'
-ApplicationMgr INFO Application Manager Started successfully
-AthenaEventLoopMgr INFO ===>>> start of run 1 <<<===
-EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
-EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
-ClassIDSvc INFO getRegistryEntries: read 118 CLIDRegistry entries for module ALL
-IOVDbSvc INFO Opening COOL connection for COOLOFL_INDET/OFLP200
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to InDetAlign_IOVDEP-03 for folder /Indet/Align
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to IBLDist-NULL for folder /Indet/IBLDist
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to InDetPixelDist-nominal for folder /Indet/PixelDist
-IOVDbSvc INFO Disconnecting from COOLOFL_INDET/OFLP200
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] D0709FD7-6A55-E011-925D-002481043EC0
-Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0001.pool.root
-RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0001.pool.root File version:52600
-PixelDetectorMa...WARNING Cannot set AlignableTransform for identifier [2.1.0.0.0] at level 2
-PixelDetectorMa...WARNING Subsequent WARNINGS will be printed at DEBUG level.
-PixelDetectorMa... INFO Processing IBLDist alignment container with key (/Indet/IBLDist) and alignment folder pointing to /Indet/Align
-PixelDetectorMa...WARNING Invalid HashID for identifier [2.1.0.0.0]
-PixelDetectorMa...WARNING No IBLDist corrections can be applied for invalid HashID's - exiting
-AthenaEventLoopMgr INFO ===>>> start processing event #1, run #1 0 events processed so far <<<===
-IOVDbSvc INFO Opening COOL connection for COOLOFL_TRT/OFLP200
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TRTAlign_Nominal2 for folder /TRT/Align
-IOVDbSvc INFO Disconnecting from COOLOFL_TRT/OFLP200
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 0E3CF1E5-143D-DB11-92C7-000CF1DA62DD
-Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.simul.pool.v0000/oflcond.000002.conditions.simul.pool.v0000._0029.pool.root__DQ2-1250194490
-Warning in <TClass::Init>: no dictionary for class DataHeader_p1 is available
-Warning in <TClass::Init>: no dictionary for class DataHeaderElement_p1 is available
-RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.simul.pool.v0000/oflcond.000002.conditions.simul.pool.v0000._0029.pool.root__DQ2-1250194490 File version:51000
-IOVDbSvc INFO Opening COOL connection for COOLOFL_DCS/OFLP200
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to ExtDCSMagnetsSensorData-001 for folder /EXT/DCS/MAGNETS/SENSORDATA
-IOVDbSvc INFO Disconnecting from COOLOFL_DCS/OFLP200
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8C5D7155-23E9-DC11-99B4-001320DCF58D
-Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.recon.pool.v0000/oflcond.000001.conditions.recon.pool.v0000._0058.pool.root
-Warning in <TClass::Init>: no dictionary for class DataHeader_p2 is available
-Warning in <TClass::Init>: no dictionary for class DataHeaderElement_p2 is available
-Warning in <TClass::Init>: no dictionary for class PoolToken_p1 is available
-RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.recon.pool.v0000/oflcond.000001.conditions.recon.pool.v0000._0058.pool.root File version:51400
-SCT_AlignCondAlg INFO recorded new CDO SCTAlignmentStore with range {[INVALID] - [1,l:4294967294]} into Conditions Store
-SCT_DetectorEle... INFO recorded new CDO SCT_DetectorElementCollection with range {[INVALID] - [1,l:4294967294]} with size of 8176 into Conditions Store
-PixelDetectorMa... INFO Processing IBLDist alignment container with key /Indet/IBLDist
-PixelAlignCondAlg INFO recorded new CDO PixelAlignmentStore with range {[0,t:0,l:0] - [1,l:4294967294]} into Conditions Store
-PixelDetectorEl... INFO recorded new CDO PixelDetectorElementCollection with range {[0,t:0,l:0] - [1,l:4294967294]} with size of 2048 into Conditions Store
testalg1 VERBOSE execute
testalg1 VERBOSE testing 3
-PartPropSvc INFO No table format type specified for "PDGTABLE.MeV". Assuming PDG
- --------------- HepPDT Version 2.06.01 ---------------
found 298 particles
-AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 1 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #2, run #1 1 events processed so far <<<===
testalg1 VERBOSE execute
testalg1 VERBOSE testing 3
-AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 2 events processed so far <<<===
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 0E3CF1E5-143D-DB11-92C7-000CF1DA62DD
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] D0709FD7-6A55-E011-925D-002481043EC0
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8C5D7155-23E9-DC11-99B4-001320DCF58D
-Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
-ApplicationMgr INFO Application Manager Stopped successfully
-IncidentProcAlg1 INFO Finalize
-CondInputLoader INFO Finalizing CondInputLoader...
-IncidentProcAlg2 INFO Finalize
-IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /EXT/DCS/MAGNETS/SENSORDATA (AttrListColl) db-read 1/1 objs/chan/bytes 4/4/20 (( 0.04 ))s
-IOVDbFolder INFO Folder /GLOBAL/BField/Maps (AttrListColl) db-read 0/0 objs/chan/bytes 0/3/0 (( 0.00 ))s
-IOVDbFolder INFO Folder /GLOBAL/TrackingGeo/LayerMaterialV2 (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
-IOVDbFolder INFO Folder /Indet/Align (PoolRefColl) db-read 1/2 objs/chan/bytes 34/43/5440 (( 0.04 ))s
-IOVDbFolder INFO Folder /Indet/IBLDist (AttrListColl) db-read 1/2 objs/chan/bytes 14/14/280 (( 0.02 ))s
-IOVDbFolder INFO Folder /Indet/PixelDist (PoolRef) db-read 1/1 objs/chan/bytes 1/1/179 (( 0.02 ))s
-IOVDbFolder INFO Folder /TRT/Align (PoolRefColl) db-read 1/1 objs/chan/bytes 32/32/5120 (( 0.04 ))s
-IOVDbSvc INFO bytes in (( 0.16 ))s
-IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_INDET/OFLP200 : nConnect: 2 nFolders: 3 ReadTime: (( 0.08 ))s
-IOVDbSvc INFO Connection COOLOFL_TRT/OFLP200 : nConnect: 2 nFolders: 1 ReadTime: (( 0.04 ))s
-IOVDbSvc INFO Connection COOLOFL_GLOBAL/OFLP200 : nConnect: 1 nFolders: 2 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_DCS/OFLP200 : nConnect: 2 nFolders: 1 ReadTime: (( 0.04 ))s
-AthDictLoaderSvc INFO in finalize...
-ToolSvc INFO Removing all tools created by ToolSvc
-testalg1.MCTrue... INFO Finalize successful
-*****Chrono***** INFO ****************************************************************************************************
-*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
-*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 210 [ms] Ave/Min/Max= 2.08(+- 16.1)/ 0/ 160 [ms] #=101
-cObj_ALL INFO Time User : Tot= 250 [ms] Ave/Min/Max= 35.7(+- 63.9)/ 0/ 190 [ms] #= 7
-ChronoStatSvc INFO Time User : Tot= 16 [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"
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/TrackDensitySeedFinder.ref b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/TrackDensitySeedFinder.ref
index 8ffe16bb85fa..8b4eb2247bc8 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/TrackDensitySeedFinder.ref
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/TrackDensitySeedFinder.ref
@@ -1,153 +1,7 @@
-Sat Mar 7 19:09:18 CET 2020
-Preloading tcmalloc_minimal.so
-Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.12] [x86_64-centos7-gcc8-dbg] [atlas-work3/d935ebad997] -- built on [2020-03-07T1715]
-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 "TrkVertexSeedFinderTools/TrackDensitySeedFinder_test.py"
-Py:Athena INFO including file "TrkVertexSeedFinderTools/VertexSeedFinderTestCommon.py"
-Py:Athena INFO SetGeometryVersion.py obtained major release version 22
-Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5514 configurables from 60 genConfDb files
-Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.12
-Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
-Py:ConfiguredFactory INFO imported 138 confDb modules in 0.37 seconds
-Py:Athena INFO Importing MagFieldServices.SetupField
-Py:Athena INFO Importing MagFieldServices.MagFieldServicesSetup
[ TrackingGeometrySvc ] base material tag : AtlasLayerMat_v21_
[ TrackingGeometrySvc ] translated to COOL: /GLOBAL/TrackingGeo/LayerMaterialV2<tag>TagInfoMajor/AtlasLayerMat_v21_/GeoAtlas</tag>
-Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr SUCCESS
-====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r0)
- running on lxplus7100.cern.ch on Sat Mar 7 19:09:28 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 3736 CLIDRegistry entries for module ALL
-CoreDumpSvc INFO install f-a-t-a-l handler... (flag = -1)
-CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
-MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
-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/2020-03-06T2143/Athena/22.0.12/InstallArea/x86_64-centos7-gcc8-dbg/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus7100.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
-PoolSvc INFO Successfully setup replica sorting algorithm
-PoolSvc INFO Setting up APR FileCatalog and Streams
-PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
-PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
-DbSession INFO Open DbSession
-Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
-MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
-IOVDbSvc INFO Only 5 POOL conditions files will be open at once
-IOVDbSvc INFO Cache alignment will be done in 3 slices
-IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
-IOVDbFolder INFO Read from meta data only for folder /TagInfo
-IOVDbFolder INFO Inputfile tag override disabled for /GLOBAL/BField/Maps
-IOVDbSvc INFO Initialised with 5 connections and 8 folders
-IOVDbSvc INFO Service IOVDbSvc initialised successfully
-ClassIDSvc INFO getRegistryEntries: read 1914 CLIDRegistry entries for module ALL
-IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
-IOVDbSvc INFO Opening COOL connection for COOLOFL_INDET/OFLP200
-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_TRT/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_INDET/OFLP200
-IOVDbSvc INFO Opening COOL connection for COOLOFL_GLOBAL/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_TRT/OFLP200
-IOVDbSvc INFO Opening COOL connection for COOLOFL_DCS/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_GLOBAL/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_DCS/OFLP200
-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 /GLOBAL/TrackingGeo/LayerMaterialV2
-IOVDbSvc INFO Added taginfo remove for /Indet/Align
-IOVDbSvc INFO Added taginfo remove for /Indet/IBLDist
-IOVDbSvc INFO Added taginfo remove for /Indet/PixelDist
-IOVDbSvc INFO Added taginfo remove for /TRT/Align
-ClassIDSvc INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 35 CLIDRegistry entries for module ALL
-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::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
-IBLParameterSvc INFO IBL geometry
-EventPersistenc... INFO Added successfully Conversion service:DetDescrCnvSvc
-PixelIDDetDescrCnv INFO in createObj: creating a PixelID helper 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
-PixelID INFO Initialize from dictionary
-AtlasDetectorID INFO initialize_from_dictionary - OK
+[ TrackingGeometryCondAlg ] base material tag : AtlasLayerMat_v21_
+[ TrackingGeometryCondAlg ] translated to COOL: /GLOBAL/TrackingGeo/LayerMaterialV2<tag>TagInfoMajor/AtlasLayerMat_v21_/GeoAtlas</tag>
indet 1 2,4,5,7,10,11,12,13 7 1fffffffffffffff 61 3 0 min/max 2 13 values 2 4 5 7 10 11 12 13 indexes 0 0 1 2 0 3 0 0 4 5 6 7 indices 8 prev 0 next 0 mode enumerated cont mode none
pixel 1 1:3 3 e7ffffffffffffff 59 2 3 min/max 1 3 values indexes indices 3 prev 0 next 0 mode both_bounded cont mode none
bec 1 -4,-2,0,2,4 7 f8ffffffffffffff 56 3 5 min/max -4 4 values -4 -2 0 2 4 indexes 0 0 1 0 2 0 3 0 4 indices 5 prev 0 next 0 mode enumerated cont mode none
@@ -170,260 +24,14 @@ phi_module 4
eta_module 5
phi_index 6
eta_index 7
-InDetGeometryDBSvc INFO GeometryDBSvc Initialized
-PixelGeoModel INFO Retrieving Record Sets from database ...
-PixelGeoModel INFO Key = ATLAS-R2-2016-01-00-01 Node = ATLAS
-PixelGeoModel INFO ... Record Sets retrieved.
-PixelGeoModel INFO DBM switch = SetDBMFlag: 1
-PixelGeoModel INFO Building Pixel Detector
-PixelGeoModel INFO Version: Pixel-IBL3D25-33, Name: IBL, Layout: IBL, Code Version: 5.01.00, Description: IBL_Geometry
GEOPIXELSERVICES pixel : 28.995 245 // 3460
GEOPIXELSERVICES barrel : 28.997 143 // -460 460
GEOPIXELSERVICES endcap : 82 175 // 484 670
-PixelGeoModel INFO Build detailed stave support description : layout 5
-PixelGeoModel INFO Si3D/SiPl radial shift : -0.015
-PixelGeoModel INFO Module thicknesses : SiPl P/N 0.31 0.44 20.86 SiPl P/N 0.31 1.72 20.86 // 0.325 1.705
-PixelGeoModel INFO Pixel modules 12 -> planar/3D : 12 8
-PixelGeoModel INFO Module length/gap : 41.3 / 20.45 0.205 -> Stave length : 748
-PixelGeoModel INFO planar/3D/endblock/NonActive lengths : 497.855 165.24 69.8 7.5525
-PixelGeoModel INFO Flex thickness (max) : 0.45 computed for 16 modules
-PixelGeoModel INFO Omega MidStaveCenterX = 1.55
-PixelGeoModel INFO Omega MidStaveAngle = 0.296706
-PixelGeoModel INFO Omega MidStaveRadius = 1.655
-PixelGeoModel INFO Omega EndStaveCenterX = -1.25
-PixelGeoModel INFO Omega EndStaveCenterY = 7.45
-PixelGeoModel INFO Omega EndStaveAngle = 2.35619
-PixelGeoModel INFO Omega EndStaveRadius = 2.155
-PixelGeoModel INFO Omega Thickness = 0.145
-PixelGeoModel INFO MechanicalStaveWidth = 18.8
-PixelGeoModel INFO MechanicalStaveLength = 748
-PixelGeoModel INFO MechanicalStaveOffset = -0.95
-PixelGeoModel INFO StaveModuleOffset = 0.01
-PixelGeoModel INFO MechanicalStaveEndBlockLength = 34.9
-PixelGeoModel INFO FacePlateThick = 0.215
-PixelGeoModel INFO TubeOuterDiam = 1.75
-PixelGeoModel INFO TubeInnerDiam = 1.5
-PixelGeoModel INFO TubeMiddlePos = 1.3
-PixelGeoModel INFO FlexBaseThick = 0.45
-PixelGeoModel INFO FlexLayerThick = 0.02
-PixelGeoModel INFO FlexWidth = 11.5
-PixelGeoModel INFO FlexOffset = 0.6
-PixelGeoModel INFO XOffset / ladder = 0.01
-PixelGeoModel INFO ** OMEGA : with Stycast 0.1
-PixelGeoModel INFO ***> new material : OmegaGlue_IBL 3.31517
-PixelGeoModel INFO ** FacePlate : with Stycast 0.1 grease : 0.07
-PixelGeoModel INFO ***> new material : FacePlateGlue_IBL 3.31517
-PixelGeoModel INFO ** FacePlate : with grease
-PixelGeoModel INFO ***> new material : FacePlateGlueGrease_IBL 3.04977
-PixelGeoModel INFO Flex angle : 0.296641 Flex pos. in Z : (2.60312,4.19227,22.9025) 0.45 / (2.60312,4.19227,62.2575) 0.45 / (2.60312,4.19227,103.762) 0.45 / (2.60312,4.19227,145.267) 0.45 / (2.60312,4.19227,186.772) 0.45 / (2.60312,4.19227,228.277) 0.45 / (2.60312,4.19227,269.782) 0.45 / (2.60312,4.19227,314.817) 0.45 /
-PixelGeoModel INFO ** TUBE : with Stycast 0.1 diam 0.875 0.75
-PixelGeoModel INFO ***> new material : CoolingPipeGlue_IBL 6.72585
-PixelGeoModel INFO IBL EOS : mechanical stave length : 374
-PixelGeoModel INFO IBL EOS : service Zpos : 366.552
-PixelGeoModel INFO IBL EOS : endblock Zpos : 356.552
-PixelGeoModel INFO IBL EOS : endblock length : 34.896
-PixelGeoModel INFO IBL EOS : endblock srv length : 20
-PixelGeoModel INFO Flex half thickness srv : 0.45
-PixelGeoModel INFO stave xoffset = 0.32
-PixelGeoModel INFO stave yoffset = -0.95
-PixelGeoModel INFO Stave envelop length : 748 -> 339.101
-PixelGeoModel INFO *** LAYER 0 planar/3D modules : 12 8
-PixelGeoModel INFO Layer IBL / stave ring : outer radius max 42.001
-PixelGeoModel INFO Layer 0 in/out radius 29.7573 42.001
-PixelGeoModel INFO IBL stave ring support
-PixelGeoModel INFO Build IBL stave ring services
-PixelGeoModel INFO Build detailed stave ring support : Brl0A_StaveRing AC
-PixelGeoModel INFO Build detailed stave ring support - logVol : Brl0A_StaveRing
-PixelGeoModel INFO Build detailed stave ring support : Brl0C_StaveRing AC
-PixelGeoModel INFO Build detailed stave ring support - logVol : Brl0C_StaveRing
-PixelGeoModel INFO Build detailed stave ring support : Brl0M_StaveRing Mid
-PixelGeoModel INFO Build detailed stave ring support - logVol : Brl0M_StaveRing
-PixelGeoModel INFO Build IBL I-Flex services
-PixelGeoModel INFO *** LAYER 1 planar/3D modules : 0 0
-PixelGeoModel INFO Layer 1 in/out radius 46.2723 64.1329
-PixelGeoModel INFO *** LAYER 2 planar/3D modules : 0 0
-PixelGeoModel INFO Layer 2 in/out radius 83.7078 102.132
-PixelGeoModel INFO *** LAYER 3 planar/3D modules : 0 0
-PixelGeoModel INFO Layer 3 in/out radius 117.51 136.132
-PixelGeoModel INFO Build IBL I-Flex services
-PixelGeoModel INFO Build IBL I-Flex services
-PixelGeoModel INFO Build IBL I-Flex services
-PixelGeoModel INFO Build IBL fwd services - CAD tool design / S. model1 : 0/0
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/ID, level 2, with frame global.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIX, level 1, with frame global.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXB1, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXB2, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXB3, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXB4, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEA1, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEA2, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEA3, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEC1, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEC2, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEC3, level 0, with frame local.
-PixelGeoModel INFO Doing consistency checks.
-PixelGeoModel INFO Number of barrel elements : 1736
-PixelGeoModel INFO Number of endcap elements : 288
-PixelGeoModel INFO Number of endcap elements (DBM) : 24
-PixelGeoModel INFO Total : 2048
-PixelGeoModel INFO MaxHash : 2048
-SCT_IDDetDescrCnv INFO in createObj: creating a SCT_ID helper object in the detector store
-SCT_ID INFO
-AtlasDetectorID INFO initialize_from_dictionary - OK
-SCT_GeoModel INFO Retrieving Record Sets from database ...
-SCT_GeoModel INFO Building SCT Detector.
-SCT_GeoModel INFO Version: SCT-GEO-00, Name: GEO, Layout: Final, Code Version: 3.06.00, Description: Atlas Geometry 2008
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/ID, level 3, with frame global.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCT, level 2, with frame global.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTB1, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTB2, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTB3, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTB4, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA1, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA2, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA3, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA4, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA5, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA6, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA7, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA8, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA9, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC1, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC2, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC3, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC4, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC5, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC6, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC7, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC8, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC9, level 1, with frame local.
-ClassIDSvc INFO getRegistryEntries: read 3566 CLIDRegistry entries for module ALL
-AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 2837 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 1169 CLIDRegistry entries for module ALL
-CondInputLoader INFO Initializing CondInputLoader...
-CondInputLoader INFO Adding base classes:
- + ( 'AlignableTransformContainer' , 'ConditionStore+/Indet/Align' ) -> no bases
- + ( 'AlignableTransformContainer' , 'ConditionStore+/TRT/Align' ) -> no bases
- + ( 'CondAttrListCollection' , 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/Indet/IBLDist' ) ->
- + ( 'DetCondCFloat' , 'ConditionStore+/Indet/PixelDist' ) -> no bases
-CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
- + ( 'AlignableTransformContainer' , 'ConditionStore+/Indet/Align' )
- + ( 'AlignableTransformContainer' , 'ConditionStore+/TRT/Align' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/Indet/IBLDist' )
- + ( 'DetCondCFloat' , 'ConditionStore+/Indet/PixelDist' )
-ClassIDSvc INFO getRegistryEntries: read 440 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 764 CLIDRegistry entries for module ALL
-xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
-xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
-xAODMaker::Even...WARNING Beam conditions service not available
-xAODMaker::Even...WARNING Will not fill beam spot information into xAOD::EventInfo
-testalg1 DEBUG Property update for OutputLevel : new value = 1
-testalg1 VERBOSE ServiceLocatorHelper::service: found service EventDataSvc
-testalg1 VERBOSE ServiceLocatorHelper::service: found service TimelineSvc
-testalg1.TrackD... DEBUG Property update for OutputLevel : new value = 1
-testalg1 VERBOSE ServiceLocatorHelper::service: found service AlgExecStateSvc
-testalg1 DEBUG input handles: 0
-testalg1 DEBUG output handles: 1
-testalg1 DEBUG Adding private ToolHandle tool testalg1.TrackDensitySeedFinder (Trk::TrackDensitySeedFinder)
-testalg1 DEBUG Data Deps for testalg1
- + OUTPUT IGNORED ( 'McEventCollection' , '' )
-ApplicationMgr INFO Application Manager Initialized successfully
-ClassIDSvc INFO getRegistryEntries: read 953 CLIDRegistry entries for module ALL
-CondInputLoader INFO created CondCont<AlignableTransformContainer> with key 'ConditionStore+/Indet/Align'
-CondInputLoader INFO created CondCont<AlignableTransformContainer> with key 'ConditionStore+/TRT/Align'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/Indet/IBLDist'
-CondInputLoader INFO created CondCont<DetCondCFloat> with key 'ConditionStore+/Indet/PixelDist'
-ApplicationMgr INFO Application Manager Started successfully
-AthenaEventLoopMgr INFO ===>>> start of run 1 <<<===
-EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
-EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
-ClassIDSvc INFO getRegistryEntries: read 118 CLIDRegistry entries for module ALL
-IOVDbSvc INFO Opening COOL connection for COOLOFL_INDET/OFLP200
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to InDetAlign_IOVDEP-03 for folder /Indet/Align
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to IBLDist-NULL for folder /Indet/IBLDist
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to InDetPixelDist-nominal for folder /Indet/PixelDist
-IOVDbSvc INFO Disconnecting from COOLOFL_INDET/OFLP200
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] D0709FD7-6A55-E011-925D-002481043EC0
-Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0001.pool.root
-RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0001.pool.root File version:52600
-PixelDetectorMa...WARNING Cannot set AlignableTransform for identifier [2.1.0.0.0] at level 2
-PixelDetectorMa...WARNING Subsequent WARNINGS will be printed at DEBUG level.
-PixelDetectorMa... INFO Processing IBLDist alignment container with key (/Indet/IBLDist) and alignment folder pointing to /Indet/Align
-PixelDetectorMa...WARNING Invalid HashID for identifier [2.1.0.0.0]
-PixelDetectorMa...WARNING No IBLDist corrections can be applied for invalid HashID's - exiting
-AthenaEventLoopMgr INFO ===>>> start processing event #1, run #1 0 events processed so far <<<===
-IOVDbSvc INFO Opening COOL connection for COOLOFL_TRT/OFLP200
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TRTAlign_Nominal2 for folder /TRT/Align
-IOVDbSvc INFO Disconnecting from COOLOFL_TRT/OFLP200
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 0E3CF1E5-143D-DB11-92C7-000CF1DA62DD
-Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.simul.pool.v0000/oflcond.000002.conditions.simul.pool.v0000._0029.pool.root__DQ2-1250194490
-Warning in <TClass::Init>: no dictionary for class DataHeader_p1 is available
-Warning in <TClass::Init>: no dictionary for class DataHeaderElement_p1 is available
-RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.simul.pool.v0000/oflcond.000002.conditions.simul.pool.v0000._0029.pool.root__DQ2-1250194490 File version:51000
-IOVDbSvc INFO Opening COOL connection for COOLOFL_DCS/OFLP200
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to ExtDCSMagnetsSensorData-001 for folder /EXT/DCS/MAGNETS/SENSORDATA
-IOVDbSvc INFO Disconnecting from COOLOFL_DCS/OFLP200
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8C5D7155-23E9-DC11-99B4-001320DCF58D
-Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.recon.pool.v0000/oflcond.000001.conditions.recon.pool.v0000._0058.pool.root
-Warning in <TClass::Init>: no dictionary for class DataHeader_p2 is available
-Warning in <TClass::Init>: no dictionary for class DataHeaderElement_p2 is available
-Warning in <TClass::Init>: no dictionary for class PoolToken_p1 is available
-RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.recon.pool.v0000/oflcond.000001.conditions.recon.pool.v0000._0058.pool.root File version:51400
-SCT_AlignCondAlg INFO recorded new CDO SCTAlignmentStore with range {[INVALID] - [1,l:4294967294]} into Conditions Store
-SCT_DetectorEle... INFO recorded new CDO SCT_DetectorElementCollection with range {[INVALID] - [1,l:4294967294]} with size of 8176 into Conditions Store
-PixelDetectorMa... INFO Processing IBLDist alignment container with key /Indet/IBLDist
-PixelAlignCondAlg INFO recorded new CDO PixelAlignmentStore with range {[0,t:0,l:0] - [1,l:4294967294]} into Conditions Store
-PixelDetectorEl... INFO recorded new CDO PixelDetectorElementCollection with range {[0,t:0,l:0] - [1,l:4294967294]} with size of 2048 into Conditions Store
testalg1 VERBOSE execute
testalg1 VERBOSE testing 1
testalg1 VERBOSE testing 2
testalg1 VERBOSE testing 3
-AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 1 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #2, run #1 1 events processed so far <<<===
testalg1 VERBOSE execute
testalg1 VERBOSE testing 1
testalg1 VERBOSE testing 2
testalg1 VERBOSE testing 3
-AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 2 events processed so far <<<===
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] D0709FD7-6A55-E011-925D-002481043EC0
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 0E3CF1E5-143D-DB11-92C7-000CF1DA62DD
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8C5D7155-23E9-DC11-99B4-001320DCF58D
-Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
-ApplicationMgr INFO Application Manager Stopped successfully
-IncidentProcAlg1 INFO Finalize
-CondInputLoader INFO Finalizing CondInputLoader...
-IncidentProcAlg2 INFO Finalize
-IdDictDetDescrCnv INFO in finalize
-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 0/0 objs/chan/bytes 0/3/0 (( 0.00 ))s
-IOVDbFolder INFO Folder /GLOBAL/TrackingGeo/LayerMaterialV2 (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
-IOVDbFolder INFO Folder /Indet/Align (PoolRefColl) db-read 1/2 objs/chan/bytes 34/43/5440 (( 0.37 ))s
-IOVDbFolder INFO Folder /Indet/IBLDist (AttrListColl) db-read 1/2 objs/chan/bytes 14/14/280 (( 0.29 ))s
-IOVDbFolder INFO Folder /Indet/PixelDist (PoolRef) db-read 1/1 objs/chan/bytes 1/1/179 (( 0.26 ))s
-IOVDbFolder INFO Folder /TRT/Align (PoolRefColl) db-read 1/1 objs/chan/bytes 32/32/5120 (( 0.09 ))s
-IOVDbSvc INFO bytes in (( 1.10 ))s
-IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_INDET/OFLP200 : nConnect: 2 nFolders: 3 ReadTime: (( 0.93 ))s
-IOVDbSvc INFO Connection COOLOFL_TRT/OFLP200 : nConnect: 2 nFolders: 1 ReadTime: (( 0.09 ))s
-IOVDbSvc INFO Connection COOLOFL_GLOBAL/OFLP200 : nConnect: 1 nFolders: 2 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_DCS/OFLP200 : nConnect: 2 nFolders: 1 ReadTime: (( 0.08 ))s
-AthDictLoaderSvc INFO in finalize...
-ToolSvc INFO Removing all tools created by ToolSvc
-*****Chrono***** INFO ****************************************************************************************************
-*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
-*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 240 [ms] Ave/Min/Max= 2.38(+- 18)/ 0/ 180 [ms] #=101
-cObj_ALL INFO Time User : Tot= 260 [ms] Ave/Min/Max= 37.1(+- 67.3)/ 0/ 200 [ms] #= 7
-ChronoStatSvc INFO Time User : Tot= 71 [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"
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/VertexSeedFinderTestCommon.py b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/VertexSeedFinderTestCommon.py
index 45cd079f00f9..929ab6851237 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/VertexSeedFinderTestCommon.py
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/VertexSeedFinderTestCommon.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration.
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration.
#
# File: TrkVertexSeedFinderTools/share/VertexSeedFinderTestCommon.py
# Author: scott snyder <snyder@bnl.gov>
@@ -46,6 +46,11 @@ from xAODEventInfoCnv.xAODEventInfoCnvConf import xAODMaker__EventInfoCnvAlg
eialg = xAODMaker__EventInfoCnvAlg ()
topSequence += eialg
+from TrackingGeometryCondAlg.AtlasTrackingGeometryCondAlg import ConfiguredTrackingGeometryCondAlg
+TrkGeoCondAlg = ConfiguredTrackingGeometryCondAlg('AtlasTrackingGeometryCondAlg')
+from AthenaCommon.AlgSequence import AthSequencer
+condSeq = AthSequencer("AthCondSeq")
+condSeq+= TrkGeoCondAlg
# Suppress useless GeoModelSvc messages.
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/ZScanSeedFinder.ref b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/ZScanSeedFinder.ref
index a36511c01900..8b4eb2247bc8 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/ZScanSeedFinder.ref
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/ZScanSeedFinder.ref
@@ -1,152 +1,7 @@
-Wed May 27 21:26:22 CEST 2020
-Preloading tcmalloc_minimal.so
-Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.14] [x86_64-centos7-gcc8-opt] [magFieldCache-fixes-testCleanupAgain/836569f] -- built on [2020-05-27T1922]
-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 "TrkVertexSeedFinderTools/ZScanSeedFinder_test.py"
-Py:Athena INFO including file "TrkVertexSeedFinderTools/VertexSeedFinderTestCommon.py"
-Py:Athena INFO SetGeometryVersion.py obtained major release version 22
-Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5528 configurables from 19 genConfDb files
-Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.14
-Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
-Py:ConfiguredFactory INFO imported 269 confDb modules in 1.07 seconds
-Py:Athena INFO Importing MagFieldServices.SetupField
-Py:Athena INFO Importing MagFieldServices.MagFieldServicesSetup
[ TrackingGeometrySvc ] base material tag : AtlasLayerMat_v21_
[ TrackingGeometrySvc ] translated to COOL: /GLOBAL/TrackingGeo/LayerMaterialV2<tag>TagInfoMajor/AtlasLayerMat_v21_/GeoAtlas</tag>
-Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr SUCCESS
-====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on ccwige0002 on Wed May 27 21:26:37 2020
-====================================================================================================================================
-ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-AthDictLoaderSvc INFO in initialize...
-AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3736 CLIDRegistry entries for module ALL
-CoreDumpSvc INFO install f-a-t-a-l handler... (flag = -1)
-CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
-MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
-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://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier01.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier05.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://atlasfrontier2-ai.cern.ch:8000/atlr)(serverurl=http://atlasfrontier1-ai.cern.ch:8000/atlr)(proxyurl=http://ccatlassquid.in2p3.fr:3128)(proxyurl=http://ccatlassquid02.in2p3.fr:3128)(proxyurl=http://ccatlassquid04.in2p3.fr: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-26T2140/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 1 servers found for host ccwige0002.in2p3.fr [ATLF ]
-PoolSvc INFO Successfully setup replica sorting algorithm
-PoolSvc INFO Setting up APR FileCatalog and Streams
-PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
-PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
-DbSession INFO Open DbSession
-Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
-MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
-IOVDbSvc INFO Only 5 POOL conditions files will be open at once
-IOVDbSvc INFO Cache alignment will be done in 3 slices
-IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
-IOVDbFolder INFO Read from meta data only for folder /TagInfo
-IOVDbFolder INFO Inputfile tag override disabled for /GLOBAL/BField/Maps
-IOVDbSvc INFO Initialised with 5 connections and 8 folders
-IOVDbSvc INFO Service IOVDbSvc initialised successfully
-ClassIDSvc INFO getRegistryEntries: read 1967 CLIDRegistry entries for module ALL
-IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
-IOVDbSvc INFO Opening COOL connection for COOLOFL_INDET/OFLP200
-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_TRT/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_INDET/OFLP200
-IOVDbSvc INFO Opening COOL connection for COOLOFL_GLOBAL/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_TRT/OFLP200
-IOVDbSvc INFO Opening COOL connection for COOLOFL_DCS/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_GLOBAL/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_DCS/OFLP200
-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 /GLOBAL/TrackingGeo/LayerMaterialV2
-IOVDbSvc INFO Added taginfo remove for /Indet/Align
-IOVDbSvc INFO Added taginfo remove for /Indet/IBLDist
-IOVDbSvc INFO Added taginfo remove for /Indet/PixelDist
-IOVDbSvc INFO Added taginfo remove for /TRT/Align
-ClassIDSvc INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 35 CLIDRegistry entries for module ALL
-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::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
-IBLParameterSvc INFO IBL geometry
-EventPersistenc... INFO Added successfully Conversion service:DetDescrCnvSvc
-PixelIDDetDescrCnv INFO in createObj: creating a PixelID helper 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
-PixelID INFO Initialize from dictionary
-AtlasDetectorID INFO initialize_from_dictionary - OK
+[ TrackingGeometryCondAlg ] base material tag : AtlasLayerMat_v21_
+[ TrackingGeometryCondAlg ] translated to COOL: /GLOBAL/TrackingGeo/LayerMaterialV2<tag>TagInfoMajor/AtlasLayerMat_v21_/GeoAtlas</tag>
indet 1 2,4,5,7,10,11,12,13 7 1fffffffffffffff 61 3 0 min/max 2 13 values 2 4 5 7 10 11 12 13 indexes 0 0 1 2 0 3 0 0 4 5 6 7 indices 8 prev 0 next 0 mode enumerated cont mode none
pixel 1 1:3 3 e7ffffffffffffff 59 2 3 min/max 1 3 values indexes indices 3 prev 0 next 0 mode both_bounded cont mode none
bec 1 -4,-2,0,2,4 7 f8ffffffffffffff 56 3 5 min/max -4 4 values -4 -2 0 2 4 indexes 0 0 1 0 2 0 3 0 4 indices 5 prev 0 next 0 mode enumerated cont mode none
@@ -169,382 +24,14 @@ phi_module 4
eta_module 5
phi_index 6
eta_index 7
-InDetGeometryDBSvc INFO GeometryDBSvc Initialized
-PixelGeoModel INFO Retrieving Record Sets from database ...
-PixelGeoModel INFO Key = ATLAS-R2-2016-01-00-01 Node = ATLAS
-PixelGeoModel INFO ... Record Sets retrieved.
-PixelGeoModel INFO DBM switch = SetDBMFlag: 1
-PixelGeoModel INFO Building Pixel Detector
-PixelGeoModel INFO Version: Pixel-IBL3D25-33, Name: IBL, Layout: IBL, Code Version: 5.01.00, Description: IBL_Geometry
GEOPIXELSERVICES pixel : 28.995 245 // 3460
GEOPIXELSERVICES barrel : 28.997 143 // -460 460
GEOPIXELSERVICES endcap : 82 175 // 484 670
-PixelGeoModel INFO Build detailed stave support description : layout 5
-PixelGeoModel INFO Si3D/SiPl radial shift : -0.015
-PixelGeoModel INFO Module thicknesses : SiPl P/N 0.31 0.44 20.86 SiPl P/N 0.31 1.72 20.86 // 0.325 1.705
-PixelGeoModel INFO Pixel modules 12 -> planar/3D : 12 8
-PixelGeoModel INFO Module length/gap : 41.3 / 20.45 0.205 -> Stave length : 748
-PixelGeoModel INFO planar/3D/endblock/NonActive lengths : 497.855 165.24 69.8 7.5525
-PixelGeoModel INFO Flex thickness (max) : 0.45 computed for 16 modules
-PixelGeoModel INFO Omega MidStaveCenterX = 1.55
-PixelGeoModel INFO Omega MidStaveAngle = 0.296706
-PixelGeoModel INFO Omega MidStaveRadius = 1.655
-PixelGeoModel INFO Omega EndStaveCenterX = -1.25
-PixelGeoModel INFO Omega EndStaveCenterY = 7.45
-PixelGeoModel INFO Omega EndStaveAngle = 2.35619
-PixelGeoModel INFO Omega EndStaveRadius = 2.155
-PixelGeoModel INFO Omega Thickness = 0.145
-PixelGeoModel INFO MechanicalStaveWidth = 18.8
-PixelGeoModel INFO MechanicalStaveLength = 748
-PixelGeoModel INFO MechanicalStaveOffset = -0.95
-PixelGeoModel INFO StaveModuleOffset = 0.01
-PixelGeoModel INFO MechanicalStaveEndBlockLength = 34.9
-PixelGeoModel INFO FacePlateThick = 0.215
-PixelGeoModel INFO TubeOuterDiam = 1.75
-PixelGeoModel INFO TubeInnerDiam = 1.5
-PixelGeoModel INFO TubeMiddlePos = 1.3
-PixelGeoModel INFO FlexBaseThick = 0.45
-PixelGeoModel INFO FlexLayerThick = 0.02
-PixelGeoModel INFO FlexWidth = 11.5
-PixelGeoModel INFO FlexOffset = 0.6
-PixelGeoModel INFO XOffset / ladder = 0.01
-PixelGeoModel INFO ** OMEGA : with Stycast 0.1
-PixelGeoModel INFO ***> new material : OmegaGlue_IBL 3.31517
-PixelGeoModel INFO ** FacePlate : with Stycast 0.1 grease : 0.07
-PixelGeoModel INFO ***> new material : FacePlateGlue_IBL 3.31517
-PixelGeoModel INFO ** FacePlate : with grease
-PixelGeoModel INFO ***> new material : FacePlateGlueGrease_IBL 3.04977
-PixelGeoModel INFO Flex angle : 0.296641 Flex pos. in Z : (2.60312,4.19227,22.9025) 0.45 / (2.60312,4.19227,62.2575) 0.45 / (2.60312,4.19227,103.762) 0.45 / (2.60312,4.19227,145.267) 0.45 / (2.60312,4.19227,186.772) 0.45 / (2.60312,4.19227,228.277) 0.45 / (2.60312,4.19227,269.782) 0.45 / (2.60312,4.19227,314.817) 0.45 /
-PixelGeoModel INFO ** TUBE : with Stycast 0.1 diam 0.875 0.75
-PixelGeoModel INFO ***> new material : CoolingPipeGlue_IBL 6.72585
-PixelGeoModel INFO IBL EOS : mechanical stave length : 374
-PixelGeoModel INFO IBL EOS : service Zpos : 366.552
-PixelGeoModel INFO IBL EOS : endblock Zpos : 356.552
-PixelGeoModel INFO IBL EOS : endblock length : 34.896
-PixelGeoModel INFO IBL EOS : endblock srv length : 20
-PixelGeoModel INFO Flex half thickness srv : 0.45
-PixelGeoModel INFO stave xoffset = 0.32
-PixelGeoModel INFO stave yoffset = -0.95
-PixelGeoModel INFO Stave envelop length : 748 -> 339.101
-PixelGeoModel INFO *** LAYER 0 planar/3D modules : 12 8
-PixelGeoModel INFO Layer IBL / stave ring : outer radius max 42.001
-PixelGeoModel INFO Layer 0 in/out radius 29.7573 42.001
-PixelGeoModel INFO IBL stave ring support
-PixelGeoModel INFO Build IBL stave ring services
-PixelGeoModel INFO Build detailed stave ring support : Brl0A_StaveRing AC
-PixelGeoModel INFO Build detailed stave ring support - logVol : Brl0A_StaveRing
-PixelGeoModel INFO Build detailed stave ring support : Brl0C_StaveRing AC
-PixelGeoModel INFO Build detailed stave ring support - logVol : Brl0C_StaveRing
-PixelGeoModel INFO Build detailed stave ring support : Brl0M_StaveRing Mid
-PixelGeoModel INFO Build detailed stave ring support - logVol : Brl0M_StaveRing
-PixelGeoModel INFO Build IBL I-Flex services
-PixelGeoModel INFO *** LAYER 1 planar/3D modules : 0 0
-PixelGeoModel INFO Layer 1 in/out radius 46.2723 64.1329
-PixelGeoModel INFO *** LAYER 2 planar/3D modules : 0 0
-PixelGeoModel INFO Layer 2 in/out radius 83.7078 102.132
-PixelGeoModel INFO *** LAYER 3 planar/3D modules : 0 0
-PixelGeoModel INFO Layer 3 in/out radius 117.51 136.132
-PixelGeoModel INFO Build IBL I-Flex services
-PixelGeoModel INFO Build IBL I-Flex services
-PixelGeoModel INFO Build IBL I-Flex services
-PixelGeoModel INFO Build IBL fwd services - CAD tool design / S. model1 : 0/0
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/ID, level 2, with frame global.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIX, level 1, with frame global.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXB1, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXB2, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXB3, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXB4, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEA1, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEA2, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEA3, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEC1, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEC2, level 0, with frame local.
-PixelDetectorMa... INFO Registering alignment channel with key /Indet/Align/PIXEC3, level 0, with frame local.
-PixelGeoModel INFO Doing consistency checks.
-PixelGeoModel INFO Number of barrel elements : 1736
-PixelGeoModel INFO Number of endcap elements : 288
-PixelGeoModel INFO Number of endcap elements (DBM) : 24
-PixelGeoModel INFO Total : 2048
-PixelGeoModel INFO MaxHash : 2048
-SCT_IDDetDescrCnv INFO in createObj: creating a SCT_ID helper object in the detector store
-SCT_ID INFO
-AtlasDetectorID INFO initialize_from_dictionary - OK
-SCT_GeoModel INFO Retrieving Record Sets from database ...
-SCT_GeoModel INFO Building SCT Detector.
-SCT_GeoModel INFO Version: SCT-GEO-00, Name: GEO, Layout: Final, Code Version: 3.06.00, Description: Atlas Geometry 2008
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/ID, level 3, with frame global.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCT, level 2, with frame global.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTB1, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTB2, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTB3, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTB4, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA1, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA2, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA3, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA4, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA5, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA6, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA7, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA8, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEA9, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC1, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC2, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC3, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC4, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC5, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC6, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC7, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC8, level 1, with frame local.
-SCTDetectorManager INFO Registering alignment channel with key /Indet/Align/SCTEC9, level 1, with frame local.
-ClassIDSvc INFO getRegistryEntries: read 3566 CLIDRegistry entries for module ALL
-AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 2841 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 1232 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 291 CLIDRegistry entries for module ALL
-CondInputLoader INFO Initializing CondInputLoader...
-CondInputLoader INFO Adding base classes:
- + ( 'AlignableTransformContainer' , 'ConditionStore+/Indet/Align' ) -> no bases
- + ( 'AlignableTransformContainer' , 'ConditionStore+/TRT/Align' ) -> no bases
- + ( 'CondAttrListCollection' , 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/GLOBAL/BField/Maps' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/Indet/IBLDist' ) ->
- + ( 'DetCondCFloat' , 'ConditionStore+/Indet/PixelDist' ) -> no bases
-CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
- + ( 'AlignableTransformContainer' , 'ConditionStore+/Indet/Align' )
- + ( 'AlignableTransformContainer' , 'ConditionStore+/TRT/Align' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/GLOBAL/BField/Maps' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/Indet/IBLDist' )
- + ( 'DetCondCFloat' , 'ConditionStore+/Indet/PixelDist' )
-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 440 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 764 CLIDRegistry entries for module ALL
-xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
-xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
-xAODMaker::Even...WARNING Beam conditions service not available
-xAODMaker::Even...WARNING Will not fill beam spot information into xAOD::EventInfo
-testalg1 DEBUG Property update for OutputLevel : new value = 1
-testalg1 VERBOSE ServiceLocatorHelper::service: found service EventDataSvc
-testalg1 VERBOSE ServiceLocatorHelper::service: found service TimelineSvc
-testalg1.ZScanS... DEBUG Property update for OutputLevel : new value = 1
-testalg1.ZScanS... INFO Initialize successfull
-ClassIDSvc INFO getRegistryEntries: read 2304 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 926 CLIDRegistry entries for module ALL
-AtlasTrackingGe... INFO initialize() successful!
-testalg1.ZScanS... INFO Successfully retrieved TrackingGeometrySvc = ServiceHandle('AtlasTrackingGeometrySvc')
-testalg1.ZScanS... INFO Minimal momentum cut for material update : 50 MeV
-ToolSvc.AtlasEn... INFO initialize()
-ToolSvc.AtlasMu... INFO initialize() successful
-ClassIDSvc INFO getRegistryEntries: read 111 CLIDRegistry entries for module ALL
-testalg1.ZScanS... INFO initialize() successful
-testalg1.ZScanS... INFO initialize()
-testalg1.ZScanS... INFO Retrieved tool Extrapolator = PrivateToolHandle('Trk::Extrapolator/Trk::Extrapolator')
-testalg1.ZScanS... INFO Retrieved tool VertexUpdator = PrivateToolHandle('Trk::KalmanVertexUpdator/Trk::KalmanVertexUpdator')
-testalg1.ZScanS... INFO Successfully retrieved TrackingGeometrySvc = ServiceHandle('AtlasTrackingGeometrySvc')
-testalg1.ZScanS... INFO Minimal momentum cut for material update : 50 MeV
-testalg1.ZScanS... INFO initialize() successful
-testalg1.ZScanS... INFO initialize()
-testalg1.ZScanS... INFO Initialize successful
-testalg1.ZScanS... INFO Retrieved tool LinearizedTrackFactory = PrivateToolHandle('Trk::FullLinearizedTrackFactory/Trk::FullLinearizedTrackFactory')
-testalg1.ZScanS... INFO Retrieved tools Mode1dFinder = PrivateToolHandle('Trk::FsmwMode1dFinder/Trk::FsmwMode1dFinder') and IPEstimator = PrivateToolHandle('Trk::TrackToVertexIPEstimator/Trk::TrackToVertexIPEstimator')
-testalg1 VERBOSE ServiceLocatorHelper::service: found service AlgExecStateSvc
-testalg1 DEBUG input handles: 0
-testalg1 DEBUG output handles: 1
-testalg1 DEBUG Adding private ToolHandle tool testalg1.ZScanSeedFinder (Trk::ZScanSeedFinder)
-testalg1 DEBUG Data Deps for testalg1
- + INPUT ( 'AtlasFieldCacheCondObj' , 'ConditionStore+fieldCondObj' )
- + INPUT ( 'xAOD::EventInfo' , 'StoreGateSvc+EventInfo' )
- + OUTPUT IGNORED ( 'McEventCollection' , '' )
-ApplicationMgr INFO Application Manager Initialized successfully
-CondInputLoader INFO created CondCont<AlignableTransformContainer> with key 'ConditionStore+/Indet/Align'
-CondInputLoader INFO created CondCont<AlignableTransformContainer> with key 'ConditionStore+/TRT/Align'
-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+/Indet/IBLDist'
-CondInputLoader INFO created CondCont<DetCondCFloat> with key 'ConditionStore+/Indet/PixelDist'
-ApplicationMgr INFO Application Manager Started successfully
-AthenaEventLoopMgr INFO ===>>> start of run 1 <<<===
-EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
-EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
-ClassIDSvc INFO getRegistryEntries: read 118 CLIDRegistry entries for module ALL
-IOVDbSvc INFO Opening COOL connection for COOLOFL_INDET/OFLP200
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to InDetAlign_IOVDEP-03 for folder /Indet/Align
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to IBLDist-NULL for folder /Indet/IBLDist
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to InDetPixelDist-nominal for folder /Indet/PixelDist
-IOVDbSvc INFO Disconnecting from COOLOFL_INDET/OFLP200
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] D0709FD7-6A55-E011-925D-002481043EC0
-Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0001.pool.root
-RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0001.pool.root File version:52600
-PixelDetectorMa...WARNING Cannot set AlignableTransform for identifier [2.1.0.0.0] at level 2
-PixelDetectorMa...WARNING Subsequent WARNINGS will be printed at DEBUG level.
-PixelDetectorMa... INFO Processing IBLDist alignment container with key (/Indet/IBLDist) and alignment folder pointing to /Indet/Align
-PixelDetectorMa...WARNING Invalid HashID for identifier [2.1.0.0.0]
-PixelDetectorMa...WARNING No IBLDist corrections can be applied for invalid HashID's - exiting
-ToolSvc.Trackin... INFO initialize()
-ToolSvc.Trackin... INFO initialize()
-ToolSvc.LayerAr... INFO initialize()
-ToolSvc.Trackin... INFO Retrieved tool LayerArrayCreator = PublicToolHandle('Trk::LayerArrayCreator/LayerArrayCreator')
-ToolSvc.Trackin... INFO Retrieved tool TrackingVolumeArrayCreator = PublicToolHandle('Trk::TrackingVolumeArrayCreator/TrackingVolumeArrayCreator')
-AtlasGeometry_E... INFO Initializing ...
-AtlasGeometry_E... INFO No entries for table 'InDetEnvelope' in Detector Description Database (DDDB). Maybe you are using Python-based envelope definitions...
-AtlasGeometry_E... INFO Unable to retrieve envelope definitions from DDDB. Enabling Python-based fallback definitions.
-AtlasGeometry_E... INFO Sucessfully read Python-based envelope definition for 'InDetEnvelope'.
-AtlasGeometry_E... INFO No entries for table 'BeamPipeEnvelope' in Detector Description Database (DDDB). Maybe you are using Python-based envelope definitions...
-AtlasGeometry_E... INFO Sucessfully read Python-based envelope definition for 'BeamPipeEnvelope'.
-AtlasGeometry_E... INFO No entries for table 'CaloEnvelope' in Detector Description Database (DDDB). Maybe you are using Python-based envelope definitions...
-AtlasGeometry_E... INFO Sucessfully read Python-based envelope definition for 'CaloEnvelope'.
-AtlasGeometry_E... INFO No entries for table 'MuonEnvelope' in Detector Description Database (DDDB). Maybe you are using Python-based envelope definitions...
-AtlasGeometry_E... INFO Sucessfully read Python-based envelope definition for 'MuonEnvelope'.
-AtlasGeometry_E... INFO No entries for table 'CavernEnvelope' in Detector Description Database (DDDB). Maybe you are using Python-based envelope definitions...
-AtlasGeometry_E... INFO Sucessfully read Python-based envelope definition for 'CavernEnvelope'.
-AtlasGeometry_E... INFO Initialize successful.
-ToolSvc.InDetLa... INFO initialize()
-ToolSvc.InDetTr... INFO initialize()
-ToolSvc.InDetTr... INFO initialize()
-ToolSvc.InDetTr... INFO Retrieved tool LayerArrayCreator = PublicToolHandle('Trk::LayerArrayCreator/LayerArrayCreator')
-ToolSvc.InDetTr... INFO Retrieved tool TrackingVolumeArrayCreator = PublicToolHandle('Trk::TrackingVolumeArrayCreator/TrackingVolumeArrayCreator')
-ToolSvc.InDetCy... INFO initialize() successful
-AtlasTrackingGe... INFO Retrieved tool LayerArrayCreator = PublicToolHandle('Trk::LayerArrayCreator/InDetLayerArrayCreator')
-AtlasTrackingGe... INFO initialize() succesful
-IOVDbSvc INFO Opening COOL connection for COOLOFL_GLOBAL/OFLP200
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to BFieldMap-Run1-14m-v01 for folder /GLOBAL/BField/Maps
-IOVDbSvc INFO Disconnecting from COOLOFL_GLOBAL/OFLP200
-ElementTableCnv INFO LayerMaterialMapCnv::initialize()
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 2B8BB54A-2F81-7B49-8484-60F83666998E
-Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000126.gen.COND/cond09_mc.000126.gen.COND._0001.pool.root
-RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000126.gen.COND/cond09_mc.000126.gen.COND._0001.pool.root File version:60416
-AthenaEventLoopMgr INFO ===>>> start processing event #1, run #1 0 events processed so far <<<===
-IOVDbSvc INFO Opening COOL connection for COOLOFL_TRT/OFLP200
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TRTAlign_Nominal2 for folder /TRT/Align
-IOVDbSvc INFO Disconnecting from COOLOFL_TRT/OFLP200
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 0E3CF1E5-143D-DB11-92C7-000CF1DA62DD
-Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.simul.pool.v0000/oflcond.000002.conditions.simul.pool.v0000._0029.pool.root__DQ2-1250194490
-Warning in <TClass::Init>: no dictionary for class DataHeader_p1 is available
-Warning in <TClass::Init>: no dictionary for class DataHeaderElement_p1 is available
-RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.simul.pool.v0000/oflcond.000002.conditions.simul.pool.v0000._0029.pool.root__DQ2-1250194490 File version:51000
-IOVDbSvc INFO Opening COOL connection for COOLOFL_DCS/OFLP200
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to ExtDCSMagnetsSensorData-001 for folder /EXT/DCS/MAGNETS/SENSORDATA
-IOVDbSvc INFO Disconnecting from COOLOFL_DCS/OFLP200
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8C5D7155-23E9-DC11-99B4-001320DCF58D
-Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.recon.pool.v0000/oflcond.000001.conditions.recon.pool.v0000._0058.pool.root
-Warning in <TClass::Init>: no dictionary for class DataHeader_p2 is available
-Warning in <TClass::Init>: no dictionary for class DataHeaderElement_p2 is available
-Warning in <TClass::Init>: no dictionary for class PoolToken_p1 is available
-RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.recon.pool.v0000/oflcond.000001.conditions.recon.pool.v0000._0058.pool.root File version:51400
-SCT_AlignCondAlg INFO recorded new CDO SCTAlignmentStore with range {[INVALID] - [1,l:4294967294]} into Conditions Store
-SCT_DetectorEle... INFO recorded new CDO SCT_DetectorElementCollection with range {[INVALID] - [1,l:4294967294]} with size of 8176 into Conditions Store
-PixelDetectorMa... INFO Processing IBLDist alignment container with key /Indet/IBLDist
-PixelAlignCondAlg INFO recorded new CDO PixelAlignmentStore with range {[0,t:0,l:0] - [1,l:4294967294]} into Conditions Store
-PixelDetectorEl... INFO recorded new CDO PixelDetectorElementCollection with range {[0,t:0,l:0] - [1,l:4294967294]} with size of 2048 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:0] - [t:4294967294.854775807]}
-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 , 7730
-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 , 20400
-AtlasFieldCache... INFO UpdateCurrentFromConditions: Trying to read from DCS: [channel name, index, value] Toroids_SCurrent , 4 , 20400
-AtlasFieldCache... INFO UpdateCurrentFromConditions: Currents read from DCS - solenoid 7730 toroid 20400
-AtlasFieldCache... INFO scaleField: Solenoid field scale factor 1. Solenoid and map currents: 7730,7730
-AtlasFieldCache... INFO scaleField: Toroid field scale factor 1. Toroid and map currents: 20400,20400
-AtlasFieldCache... INFO execute: initialized AtlasFieldCacheCondObj and cache with SFs - sol/tor 1/1
-AtlasFieldCache... INFO execute: solenoid zone id 7000
testalg1 VERBOSE execute
testalg1 VERBOSE testing 1
testalg1 VERBOSE testing 2
testalg1 VERBOSE testing 3
-AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 1 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #2, run #1 1 events processed so far <<<===
testalg1 VERBOSE execute
testalg1 VERBOSE testing 1
testalg1 VERBOSE testing 2
testalg1 VERBOSE testing 3
-AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 2 events processed so far <<<===
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] D0709FD7-6A55-E011-925D-002481043EC0
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 2B8BB54A-2F81-7B49-8484-60F83666998E
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 0E3CF1E5-143D-DB11-92C7-000CF1DA62DD
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8C5D7155-23E9-DC11-99B4-001320DCF58D
-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
-AtlasTrackingGe... INFO finalize() successful.
-IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /EXT/DCS/MAGNETS/SENSORDATA (AttrListColl) db-read 1/1 objs/chan/bytes 4/4/20 (( 0.17 ))s
-IOVDbFolder INFO Folder /GLOBAL/BField/Maps (AttrListColl) db-read 1/1 objs/chan/bytes 3/3/202 (( 0.15 ))s
-IOVDbFolder INFO Folder /GLOBAL/TrackingGeo/LayerMaterialV2 (PoolRef) db-read 1/1 objs/chan/bytes 1/1/231 (( 0.08 ))s
-IOVDbFolder INFO Folder /Indet/Align (PoolRefColl) db-read 1/2 objs/chan/bytes 34/43/5440 (( 0.39 ))s
-IOVDbFolder INFO Folder /Indet/IBLDist (AttrListColl) db-read 1/2 objs/chan/bytes 14/14/280 (( 2.82 ))s
-IOVDbFolder INFO Folder /Indet/PixelDist (PoolRef) db-read 1/1 objs/chan/bytes 1/1/179 (( 0.08 ))s
-IOVDbFolder INFO Folder /TRT/Align (PoolRefColl) db-read 1/1 objs/chan/bytes 32/32/5120 (( 0.21 ))s
-IOVDbSvc INFO bytes in (( 3.90 ))s
-IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_INDET/OFLP200 : nConnect: 2 nFolders: 3 ReadTime: (( 3.29 ))s
-IOVDbSvc INFO Connection COOLOFL_TRT/OFLP200 : nConnect: 2 nFolders: 1 ReadTime: (( 0.21 ))s
-IOVDbSvc INFO Connection COOLOFL_GLOBAL/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.23 ))s
-IOVDbSvc INFO Connection COOLOFL_DCS/OFLP200 : nConnect: 2 nFolders: 1 ReadTime: (( 0.17 ))s
-AthDictLoaderSvc INFO in finalize...
-ToolSvc INFO Removing all tools created by ToolSvc
-ToolSvc.InDetTr... INFO finalize() successful
-ToolSvc.InDetTr... INFO finalize() successful
-ToolSvc.InDetCy... INFO finalize() successful
-AtlasTrackingGe... INFO finalize() successful
-ToolSvc.Trackin... INFO finalize() successful
-testalg1.ZScanS... INFO finalize() successful
-testalg1.ZScanS... INFO finalize() successful
-testalg1.ZScanS... INFO finalize() successful
-testalg1.ZScanS... INFO Trk::Extrapolator::Cache s_navigSurfsMax = 0
-testalg1.ZScanS... INFO Trk::Extrapolator::Cache s_navigSurfsMax = 0
-testalg1.ZScanS... INFO Trk::Extrapolator::Cache s_navigVolsMax = 0
-testalg1.ZScanS... INFO Trk::Extrapolator::Cache s_navigVolsIntMax = 0
-testalg1.ZScanS... INFO Trk::Extrapolator::Cache s_containerSizeMax = 3
-testalg1.ZScanS... INFO finalize() successful
-testalg1.ZScanS... INFO Finalize successful
-testalg1.ZScanS... INFO Finalize successful
-testalg1.ZScanS... INFO finalize() successful
-testalg1.ZScanS... INFO finalize() successful
-testalg1.ZScanS... INFO finalize() successful
-testalg1.ZScanS... INFO finalize() successful
-testalg1.ZScanS... INFO Finalize successful
-testalg1.ZScanS... INFO Finalize successfull
-ToolSvc.InDetLa... INFO finalize() successful
-ToolSvc.LayerAr... INFO finalize() successful
-ToolSvc.AtlasMu... INFO finalize() successful
-ToolSvc.AtlasEn... INFO finalize() successful
-ToolSvc.Trackin... INFO finalize() successful
-*****Chrono***** INFO ****************************************************************************************************
-*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
-*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 130 [ms] Ave/Min/Max= 1.27(+- 9.97)/ 0/ 100 [ms] #=102
-cObj_ALL INFO Time User : Tot= 160 [ms] Ave/Min/Max= 17.8(+- 33.9)/ 0/ 110 [ms] #= 9
-ChronoStatSvc INFO Time User : Tot= 2.86 [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"
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/ZScanSeedFinder_test.py b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/ZScanSeedFinder_test.py
index c588081b9fdc..a42be2676c0b 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/ZScanSeedFinder_test.py
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/share/ZScanSeedFinder_test.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration.
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration.
#
# File: TrkVertexSeedFinderTools/share/ZScanSeedFinder_test.py
# Author: scott snyder <snyder@bnl.gov>
@@ -13,10 +13,14 @@ from __future__ import print_function
include ('TrkVertexSeedFinderTools/VertexSeedFinderTestCommon.py')
+from InDetRecExample.TrackingCommon import getTrackToVertexIPEstimator
+
from TrkVertexSeedFinderTools.TrkVertexSeedFinderToolsConf import \
Trk__VertexSeedFinderTestAlg, Trk__ZScanSeedFinder
-finder = Trk__ZScanSeedFinder ('ZScanSeedFinder', OutputLevel = INFO)
+finder = Trk__ZScanSeedFinder ('ZScanSeedFinder',
+ IPEstimator = getTrackToVertexIPEstimator(),
+ OutputLevel = INFO)
testalg1 = Trk__VertexSeedFinderTestAlg ('testalg1',
OutputLevel = VERBOSE,
VertexSeedFinderTool = finder,
@@ -24,3 +28,4 @@ testalg1 = Trk__VertexSeedFinderTestAlg ('testalg1',
Expected2 = [1.7, 1.3, -7.82529],
Expected3 = [0, 0, 11.6246])
topSequence += testalg1
+
--
GitLab
From 59672b20347244537f06bd00a3e752df4ebaeccb Mon Sep 17 00:00:00 2001
From: Nils Krumnack <krumnack@iastate.edu>
Date: Wed, 18 Aug 2021 12:47:17 -0500
Subject: [PATCH 136/272] fix dictionary warnings in EventLoop CP algorithm
jobs
Not sure if those indicated that something broke or not, but this
should fix things (at least it does for me locally).
---
.../AthToolSupport/AsgTools/AsgTools/selection_standalone.xml | 1 +
.../Algorithms/SelectionHelpers/SelectionHelpers/selection.xml | 2 ++
2 files changed, 3 insertions(+)
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/selection_standalone.xml b/Control/AthToolSupport/AsgTools/AsgTools/selection_standalone.xml
index 3c79056e7b36..3bf69f42092e 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/selection_standalone.xml
+++ b/Control/AthToolSupport/AsgTools/AsgTools/selection_standalone.xml
@@ -8,6 +8,7 @@
<class name="asg::AsgComponentConfig" />
<class name="asg::AsgToolConfig" />
+ <class name="tuple<asg::AsgToolConfig,string>" />
<class name="std::map<std::string,std::tuple<asg::AsgToolConfig,std::string>>" />
<class name="std::map<std::string,std::vector<std::string>>" />
diff --git a/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/selection.xml b/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/selection.xml
index 9f977b4433e0..21f867e88d9c 100644
--- a/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/selection.xml
+++ b/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/selection.xml
@@ -3,4 +3,6 @@
<class name="CP::ISelectionAccessor" />
<class name="CP::OutOfValidityAction" />
+ <class name="std::tuple<CP::ISelectionAccessor*,std::default_delete<CP::ISelectionAccessor> >" />
+
</lcgdict>
--
GitLab
From f879c456a8896079ffafeddf067739a9250bb157 Mon Sep 17 00:00:00 2001
From: Debottam Bakshi Gupta <debottam.bakshi.gupta@cern.ch>
Date: Wed, 18 Aug 2021 17:56:50 +0000
Subject: [PATCH 137/272] Fixing: Online el->caloCluster() method returns
always nullptr
---
Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py | 4 ++++
.../TriggerMenuMT/python/HLTMenuConfig/Egamma/EgammaDefs.py | 3 +--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
index efab9635c466..7ae55d30af76 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
@@ -358,6 +358,10 @@ TriggerHLTListRun3 = [
('xAOD::TrigRNNOutputContainer#HLT_TrigTRTHTCounts', 'BS ESD AODFULL', 'Egamma', 'inViews:TRTHitGeneratorViews'),
('xAOD::TrigRNNOutputAuxContainer#HLT_TrigTRTHTCountsAux.', 'BS ESD AODFULL', 'Egamma'),
+ # CaloCluster object written by EMClusterTool
+ ('xAOD::CaloClusterContainer#HLT_TrigEMClusters', 'BS ESD AODFULL', 'Egamma', 'inViews:precisionElectronViews,precisionElectronViews_LRT,precisionElectronViews_GSF,precisionPhotonViews'),
+ ('xAOD::CaloClusterTrigAuxContainer#HLT_TrigEMClustersAux.', 'BS ESD AODFULL', 'Egamma'),
+
# Muon
# Id track particles
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/EgammaDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/EgammaDefs.py
index c0521a3b6b13..2a15cbba29b4 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/EgammaDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/EgammaDefs.py
@@ -26,9 +26,8 @@ class TrigEgammaKeys(object):
SuperPhotonRecCollectionName = 'HLT_PhotonSuperRecCollection'
EgammaRecKey = 'HLT_egammaRecCollection'
outputPhotonKey = recordable('HLT_egamma_Photons')
- outputClusterKey = 'HLT_egammaClusters'
outputTopoSeededClusterKey = 'HLT_egammaTopoSeededClusters'
- TrigEMClusterToolOutputContainer = 'HLT_TrigEMClusterOutput'
+ TrigEMClusterToolOutputContainer = recordable('HLT_TrigEMClusters')
TrigElectronTracksCollectionName = recordable('HLT_IDTrack_Electron_IDTrig')
pidVersion = 'rel22_20210611'
dnnVersion = 'mc16_20210430'
--
GitLab
From 5a833e6463288c9ef643469c33fd4c822c46f920 Mon Sep 17 00:00:00 2001
From: Teng Jian Khoo <teng.jian.khoo@cern.ch>
Date: Wed, 18 Aug 2021 18:09:02 +0000
Subject: [PATCH 138/272] Harmonisation of di-object topological trigger
selections [ATR-23983], [ATR-23984]
---
.../FourMomUtils/FourMomUtils/xAODP4Helpers.h | 30 +-
.../TrigHypoCommonTools/CMakeLists.txt | 6 +-
.../src/TrigComboHypoTool.cxx | 418 ++++++++++--------
.../src/TrigComboHypoTool.h | 86 +++-
.../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 226 +++++++++-
.../share/ref_data_v1Dev_build.ref | 80 +++-
.../HLTMenuConfig/Menu/ComboHypoHandling.py | 282 ++++++------
.../python/HLTMenuConfig/Menu/LS2_v1.py | 30 ++
.../HLTMenuConfig/Menu/MenuComponents.py | 2 +-
.../HLTMenuConfig/Menu/Physics_pp_run3_v1.py | 2 +-
.../HLTMenuConfig/Menu/SignatureDicts.py | 7 +-
11 files changed, 808 insertions(+), 361 deletions(-)
diff --git a/Event/FourMomUtils/FourMomUtils/xAODP4Helpers.h b/Event/FourMomUtils/FourMomUtils/xAODP4Helpers.h
index 5364bc0a3163..199929b513dc 100644
--- a/Event/FourMomUtils/FourMomUtils/xAODP4Helpers.h
+++ b/Event/FourMomUtils/FourMomUtils/xAODP4Helpers.h
@@ -106,18 +106,24 @@ namespace xAOD
+ /// @f$ \Delta{R}^2 @f$ from bare rapidity,phi
+ inline
+ double deltaR2( double rapidity1, double phi1, double rapidity2, double phi2 )
+ {
+ const double dPhi = xAOD::P4Helpers::deltaPhi( phi1, phi2 );
+ const double dRapidity = rapidity1-rapidity2;
+ return dRapidity*dRapidity + dPhi*dPhi;
+ }
+
/// @f$ \Delta{R}^2 @f$ from 1 @c xAOD::IParticle
inline
double deltaR2( const xAOD::IParticle& p4, double rapidity, double phi, bool useRapidity=true )
{
- const double dPhi = xAOD::P4Helpers::deltaPhi( p4, phi );
if (useRapidity) {
- const double dRapidity = p4.rapidity() - rapidity;
- return dRapidity*dRapidity + dPhi*dPhi;
+ return xAOD::P4Helpers::deltaR2(p4.rapidity(),p4.phi(),rapidity,phi);
}
else {
- const double dEta = p4.eta() - rapidity;
- return dEta*dEta + dPhi*dPhi;
+ return xAOD::P4Helpers::deltaR2(p4.eta(),p4.phi(),rapidity,phi);
}
}
@@ -125,24 +131,24 @@ namespace xAOD
inline
double deltaR2( const xAOD::IParticle& pA, const xAOD::IParticle& pB, bool useRapidity=true )
{
- const double dPhi = xAOD::P4Helpers::deltaPhi( pA, pB );
- const double dPhiSq = dPhi*dPhi;
if (useRapidity) {
- const double dRapidity = xAOD::P4Helpers::deltaRapidity( pA, pB );
- return dRapidity*dRapidity + dPhiSq;
+ return xAOD::P4Helpers::deltaR2(pA.rapidity(),pA.phi(),pB.rapidity(),pB.phi());
}
else {
- const double dEta = xAOD::P4Helpers::deltaEta( pA, pB );
- return dEta*dEta + dPhiSq;
+ return xAOD::P4Helpers::deltaR2(pA.eta(),pA.phi(),pB.eta(),pB.phi());
}
}
- /** delta R from two xAOD::IParticle pointers */
+ /** delta R^2 from two xAOD::IParticle pointers */
inline
double deltaR2( const xAOD::IParticle * const pA, const xAOD::IParticle * const pB, bool useRapidity=true )
{ return xAOD::P4Helpers::deltaR2( *pA, *pB, useRapidity ); }
+ /// @f$ \Delta{R} @f$ from bare bare rapidity,phi
+ inline
+ double deltaR( double rapidity1, double phi1, double rapidity2, double phi2 )
+ { return std::sqrt( xAOD::P4Helpers::deltaR2( rapidity1, phi1, rapidity2, phi2 ) ); }
/// @f$ \Delta{R} @f$ from 1 @c xAOD::IParticle
inline
diff --git a/Trigger/TrigHypothesis/TrigHypoCommonTools/CMakeLists.txt b/Trigger/TrigHypothesis/TrigHypoCommonTools/CMakeLists.txt
index c36e7f111374..4a6be0796776 100644
--- a/Trigger/TrigHypothesis/TrigHypoCommonTools/CMakeLists.txt
+++ b/Trigger/TrigHypothesis/TrigHypoCommonTools/CMakeLists.txt
@@ -3,11 +3,15 @@
# Declare the package name:
atlas_subdir( TrigHypoCommonTools )
+# External reqs
+find_package( ROOT COMPONENTS Core GenVector )
+
# Component(s) in the package:
atlas_add_component( TrigHypoCommonTools
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AsgTools AthLinks AthenaBaseComps AthenaMonitoringKernelLib DecisionHandlingLib GaudiKernel HLTSeedingLib TrigCompositeUtilsLib TrigT1Result xAODBase )
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools AthLinks AthenaBaseComps AthenaMonitoringKernelLib DecisionHandlingLib FourMomUtils GaudiKernel HLTSeedingLib TrigCompositeUtilsLib TrigT1Result xAODBase )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
diff --git a/Trigger/TrigHypothesis/TrigHypoCommonTools/src/TrigComboHypoTool.cxx b/Trigger/TrigHypothesis/TrigHypoCommonTools/src/TrigComboHypoTool.cxx
index f456e6dd75e6..761c0e828f7b 100644
--- a/Trigger/TrigHypothesis/TrigHypoCommonTools/src/TrigComboHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigHypoCommonTools/src/TrigComboHypoTool.cxx
@@ -3,26 +3,59 @@
*/
#include "TrigComboHypoTool.h"
+#include "GaudiKernel/SystemOfUnits.h"
+#include <Math/Vector4D.h> // for LorentzVector
+#include <Math/Vector4Dfwd.h> // PtEtaPhiM typedef
+#include <Math/Vector2D.h> // for DisplacementVector
+#include <Math/Vector2Dfwd.h> // Polar2DVectorF typedef
+
#include "xAODTrigMissingET/TrigMissingETContainer.h"
+#include "FourMomUtils/xAODP4Helpers.h"
#include <vector>
+#include <algorithm>
#include <cmath>
+constexpr float invGeV = 1. / Gaudi::Units::GeV;
+
using namespace TrigCompositeUtils;
+// Translate strings into enum values
+const std::map<std::string, TrigComboHypoTool::ComboHypoVars> VarMap = {
+ {"dR", TrigComboHypoTool::ComboHypoVars::DR},
+ {"invm", TrigComboHypoTool::ComboHypoVars::INVM},
+ {"dphi", TrigComboHypoTool::ComboHypoVars::DPHI},
+ {"mT", TrigComboHypoTool::ComboHypoVars::MT}
+};
+
TrigComboHypoTool::TrigComboHypoTool(const std::string& type,
const std::string& name,
const IInterface* parent)
: ComboHypoToolBase(type, name, parent)
{}
-void TrigComboHypoTool::fillVarMap(){
- m_varMap["dR"] = comboHypoVars::DR;
- m_varMap["invm"] = comboHypoVars::INVM;
- m_varMap["dphi"] = comboHypoVars::DPHI;
- m_varMap["mT"] = comboHypoVars::MT;
+
+bool TrigComboHypoTool::VarInfo::validate(std::string& errmsg) const {
+ if (legA==0){
+ errmsg = "legA ID not set!";
+ return false;
+ }
+ if (legB==0){
+ errmsg="legB ID not set!";
+ return false;
+ }
+ if ((!useMin) && (!useMax)){
+ errmsg="Trying to configure the Tool without setting at least one of UseMin or UseMax!";
+ return false;
+ }
+ if (legA==legB && (legA_is_MET || legB_is_MET)) {
+ errmsg = "Cannot specify the same MET leg for both sides!";
+ return false;
+ }
+ return true;
}
+
StatusCode TrigComboHypoTool::initialize()
{
ATH_MSG_DEBUG("Variable = " << m_varTag_vec );
@@ -36,235 +69,268 @@ StatusCode TrigComboHypoTool::initialize()
ATH_CHECK( m_monTool_vec.retrieve() );
if (m_legA_vec.size() != m_legB_vec.size()) {
- ATH_MSG_ERROR("Trying to configure the Tool with legA and legB with different size!");
+ ATH_MSG_ERROR("Trying to configure the Tool with legA and legB vectors of different size!");
return StatusCode::FAILURE;
}
if (m_useMin_vec.size() != m_useMax_vec.size()) {
- ATH_MSG_ERROR("Trying to configure the Tool with UseMin and UseMax with different size!");
+ ATH_MSG_ERROR("Trying to configure the Tool with UseMin and UseMax vectors of different size!");
return StatusCode::FAILURE;
}
if (m_legA_vec.size() != m_useMax_vec.size()) {
- ATH_MSG_ERROR("Trying to configure the Tool with legA/B and UseMax/Min with different size!");
+ ATH_MSG_ERROR("Trying to configure the Tool with legA/B and UseMax/Min vectors of different size!");
return StatusCode::FAILURE;
}
if (m_varTag_vec.size() != m_useMax_vec.size()) {
- ATH_MSG_ERROR("Trying to configure the Tool with varTag and UseMax/Min(LegA/B) with different size!");
+ ATH_MSG_ERROR("Trying to configure the Tool with varTag and UseMax/Min(LegA/B) vectors of different size!");
return StatusCode::FAILURE;
}
- fillVarMap();
- for (size_t i=0; i<m_legA_vec.size(); ++i){
- if (m_legA_vec[i]==""){
- ATH_MSG_ERROR("Array of legA IDs not set!");
- return StatusCode::FAILURE;
- }
- if (m_legB_vec[i]==""){
- ATH_MSG_ERROR("Array of legB IDs not set!");
- return StatusCode::FAILURE;
+ for (size_t i=0; i<m_varTag_vec.size(); ++i){
+ VarInfo info;
+ info.index = i;
+ if(!m_monTool_vec.empty()) {
+ info.monToolName = m_monTool_vec[i].name();
}
- if ((!m_useMin_vec[i]) && (!m_useMax_vec[i])){
- ATH_MSG_ERROR("Trying to configure the Tool without setting UseMin and UseMax!");
+ if (VarMap.find(m_varTag_vec[i]) == VarMap.end()){
+ ATH_MSG_ERROR("The variable is not present in the ComboHypoVars list");
return StatusCode::FAILURE;
}
- if (m_varMap.find(m_varTag_vec[i]) == m_varMap.end()){
- ATH_MSG_ERROR("The variable is not present in the comboHypoVars list");
+ info.varTag = (m_varTag_vec[i]);
+ info.var = VarMap.at(m_varTag_vec[i]);
+ //
+ info.useMin = m_useMin_vec[i];
+ if(info.useMin) {info.varMin=m_varMin_vec[i];}
+ info.useMax = m_useMax_vec[i];
+ if(info.useMax) {info.varMax=m_varMax_vec[i];}
+ //
+ info.legA = m_legA_vec[i];
+ info.legA_is_MET = m_isLegA_MET_vec[i];
+ info.legB = m_legB_vec[i];
+ info.legB_is_MET = m_isLegB_MET_vec[i];
+ info.legsAreEqual = info.legA==info.legB;
+
+ std::string validmsg{""};
+ if(!info.validate(validmsg)) {
+ ATH_MSG_ERROR(validmsg);
return StatusCode::FAILURE;
}
- m_var_vec.push_back(m_varMap[m_varTag_vec[i]]);
+
+ m_varInfo_vec.push_back(info);
}
ATH_MSG_DEBUG("Initialization completed successfully");
return StatusCode::SUCCESS;
}
-bool TrigComboHypoTool::executeAlg(const std::vector<Combo::LegDecision>& combination) const {
+
+bool TrigComboHypoTool::executeAlg(const Combination& combination) const {
//loop over all the hypos
- bool lastDecision(true);
- std::vector<float> values;
- values.reserve(m_varTag_vec.size());
+ bool lastDecision(true);
+ std::vector<float> values;
+ values.reserve(m_varInfo_vec.size());
- for (size_t i=0; i<m_varTag_vec.size() && lastDecision; ++i){
- lastDecision = executeAlgStep(combination, i, values);
+ for (auto varInfo = m_varInfo_vec.cbegin(); varInfo!=m_varInfo_vec.cend() && lastDecision; ++varInfo){
+ lastDecision = executeAlgStep(combination, *varInfo, values);
}
-
- //now fill the monitoring histograms with the accepted values
- for (size_t i=0; i<m_varTag_vec.size() && lastDecision; ++i){
- std::string monToolName=m_varTag_vec[i];
- if (m_varTag_vec.size()>1){
- monToolName = monToolName + m_legA_vec[i] + m_legB_vec[i];
+
+ // Monitoring of variables for only accepted events
+ if(lastDecision && !m_monTool_vec.empty()) {
+ for (auto varInfo = m_varInfo_vec.cbegin(); varInfo!=m_varInfo_vec.cend(); ++varInfo){
+ float value = values[varInfo->index];
+ auto varOfAccepted = Monitored::Scalar(varInfo->monToolName+"OfAccepted", value );
+ auto monitorIt = Monitored::Group (m_monTool_vec[varInfo->index], varOfAccepted);
+ ATH_MSG_DEBUG( varInfo->varTag << " = " << value << " is in range " << varInfo->rangeStr() << ".");
}
- auto varOfAccepted = Monitored::Scalar(monToolName+"OfAccepted" , -1.0 );
- auto monitorIt = Monitored::Group (m_monTool_vec[i], varOfAccepted);
- varOfAccepted = values[i];
- ATH_MSG_DEBUG( m_varTag_vec[i] <<"= "<< varOfAccepted << " is within [" <<m_varMin_vec[i]<< "," << m_varMax_vec[i] << "] This selection passed! ");
}
-
return lastDecision;
}
-bool TrigComboHypoTool::executeAlgStep(const std::vector<Combo::LegDecision>& combination, size_t index, std::vector<float> &vals) const {
- ATH_MSG_DEBUG("On combination executeAlg");
- std::string monToolName=m_varTag_vec[index];
- if (m_varTag_vec.size()>1){
- monToolName = monToolName + m_legA_vec[index] + m_legB_vec[index];
- }
- auto varOfProcessed = Monitored::Scalar(monToolName+"OfProcessed" , -1.0 );
- auto monitorIt = Monitored::Group (m_monTool_vec[index], varOfProcessed);
- //check that we found the two legs
- int nCombs(combination.size());
- if (nCombs < 2){
- ATH_MSG_ERROR("Number of Decision Objects passed is less than 2! Sum over decision objects on all legs = " << combination.size() );
+bool TrigComboHypoTool::executeAlgStep(const Combination& combination, const VarInfo& varInfo, std::vector<float> &vals) const {
+ ATH_MSG_DEBUG("Executing selection " << varInfo.index << " of " << m_varInfo_vec.size() << ": " << varInfo.rangeStr());
+
+ std::pair<KineInfo,KineInfo> kinepair;
+ if(!fillPairKinematics(kinepair, combination, varInfo)) {
+ ATH_MSG_ERROR("Failed to extract kinematics of feature pair!");
return false;
}
- int legA_index(-1), legB_index(-1);
-
- ATH_MSG_DEBUG("Decision objects available = "<< combination);
- for (int i=0; i<nCombs; ++i){
- auto combId = HLT::Identifier(combination[i].first);
- if (!TrigCompositeUtils::isLegId(combId))
- continue;
- std::string legName = combId.name().substr(0,6);
- if (legName == m_legA_vec[index]){
- if (legA_index != -1) {
- ATH_MSG_WARNING("More than one Decision Object supplied on " << legName
- << "! E.g. from a 2muX leg or similar. Do not know which one to use, will take the last one!");
- }
- legA_index = i;
- }else if (legName == m_legB_vec[index]){
- if (legB_index != -1) {
- ATH_MSG_WARNING("More than one Decision Object supplied on " << legName
- << "! E.g. from a 2muX leg or similar. Do not know which one to use, will take the last one!");
- }
- legB_index = i;
- }
- ATH_MSG_DEBUG("\t Leg: "<< legName <<", full name:"<<combId.name());
+
+ if(msgLvl(MSG::DEBUG)) {
+ float eta_check, phi_check, pt_check;
+ std::tie(eta_check,phi_check,pt_check) = kinepair.first;
+ msg() << MSG::DEBUG << "Test filled legA kinematics: pt " << pt_check*invGeV << ", eta " << eta_check << ", phi " << phi_check << endmsg;
+
+ std::tie(eta_check,phi_check,pt_check) = kinepair.second;
+ msg() << MSG::DEBUG << "Test filled legB kinematics: pt " << pt_check*invGeV << ", eta " << eta_check << ", phi " << phi_check << endmsg;
}
- if ( legA_index<0){
- ATH_MSG_ERROR("legA = "<< m_legA_vec[index] << " NOT FOUND!");
- return false;
+ // apply the cut
+ float value = compute(kinepair,varInfo.var);
+ if(!m_monTool_vec.empty()) {
+ auto varOfProcessed = Monitored::Scalar(varInfo.monToolName+"OfProcessed" , value );
+ auto monitorIt = Monitored::Group (m_monTool_vec[varInfo.index], varOfProcessed);
}
- if ( legB_index<0){
- ATH_MSG_ERROR("legB = "<< m_legB_vec[index] << " NOT FOUND!");
+ vals.push_back(value);
+ bool pass = varInfo.test(value);
+
+ ATH_MSG_DEBUG("Found a combination with " << value);
+ if(!pass) {
+ ATH_MSG_DEBUG("Combination failed var cut: " << varInfo.varTag << " = " << value << " not in range " << varInfo.rangeStr());
+ }
+ return pass;
+}
+
+
+/// Test function to compare decision ID with the legs to be used in var computation
+bool testLegId(const Combo::LegDecision& d, uint32_t targetleg) {
+ auto combId = HLT::Identifier(d.first);
+ if(!TrigCompositeUtils::isLegId(combId)) return false;
+ return combId.numeric() == targetleg;
+}
+
+
+bool TrigComboHypoTool::fillLegDecisions_sameLeg(std::pair<Combo::LegDecision,Combo::LegDecision>& legpair, const Combination& combination, uint32_t leg) const {
+ Combination leg_features;
+ if(m_skipLegCheck) {
+ // If there is only one leg, the decision IDs don't have a leg ID
+ std::copy(combination.begin(),combination.end(),std::back_inserter(leg_features));
+ } else {
+ // Extract the features matching the legs
+ // We take all of them, so as to be able to check if there is any ambiguity
+ auto isMyLeg = [&leg](const Combo::LegDecision& d) { return testLegId(d,leg); };
+ std::copy_if(combination.begin(),combination.end(),std::back_inserter(leg_features),isMyLeg);
+ }
+
+ if (leg_features.size()==2) {
+ legpair.first = leg_features[0];
+ legpair.second = leg_features[1];
+ } else {
+ ATH_MSG_ERROR(leg_features.size() << " Decision Objects supplied on leg " << leg
+ << ", must be 2 for same-leg topo selection!");
return false;
}
- float eta1, phi1, pt1;
- float eta2, phi2, pt2;
-
- auto EL= combination[legA_index].second;
+ return true;
+}
- if (m_isLegA_MET_vec[index]) {
- auto legA_pLink = TrigCompositeUtils::findLink<xAOD::TrigMissingETContainer>( *EL, featureString() ).link;
- if (!legA_pLink.isValid()){
- ATH_MSG_ERROR("link for "<<m_legA_vec[index]<<"is MET");
- ATH_MSG_ERROR("link for "<<m_legA_vec[index]<<" not valid");
- return false;
- }
- float ex = (*legA_pLink)[0].ex()/1000.;//converting to GeV
- float ey = (*legA_pLink)[0].ey()/1000.;//converting to GeV
- eta1 = -9999.;
- phi1 = ex==0.0 && ey==0.0 ? 0.0: std::atan2(ey,ex);
- pt1 = std::sqrt(ex*ex+ey*ey);
- }else {
- auto legA_pLink = TrigCompositeUtils::findLink<xAOD::IParticleContainer>( *EL, featureString() ).link;
- if (!legA_pLink.isValid()){
- ATH_MSG_ERROR("link for "<<m_legA_vec[index]<<"is not MET");
- ATH_MSG_ERROR("link for "<<m_legA_vec[index]<<" not valid");
- return false;
- }
- eta1 = (*legA_pLink)->p4().Eta();
- phi1 = (*legA_pLink)->p4().Phi();
- pt1 = (*legA_pLink)->p4().Pt();
+bool TrigComboHypoTool::fillLegDecisions_diffLeg(std::pair<Combo::LegDecision,Combo::LegDecision>& legpair, const Combination& combination, uint32_t legA, uint32_t legB) const {
+ // Extract the features matching the legs
+ // We take all of them, so as to be able to check if there is any ambiguity
+ auto isLegA = [&legA](const Combo::LegDecision& d) { return testLegId(d,legA); };
+ auto isLegB = [&legB](const Combo::LegDecision& d) { return testLegId(d,legB); };
+ Combination legA_features, legB_features;
+
+ std::copy_if(combination.begin(),combination.end(),std::back_inserter(legA_features),isLegA);
+ if(legA_features.size()!=1) {
+ ATH_MSG_ERROR(legA_features.size() << " Decision Objects supplied on leg " << legA
+ << ", must be 1 for different-leg topo selection!");
+ return false;
+ }
+
+ std::copy_if(combination.begin(),combination.end(),std::back_inserter(legB_features),isLegB);
+ if (legB_features.size()!=1) {
+ ATH_MSG_ERROR(legB_features.size() << " Decision Objects supplied on leg " << legB
+ << ", must be 1 for different-leg topo selection!");
+ return false;
}
- ATH_MSG_DEBUG("link for legA: "<<m_legA_vec[index]<<" is valid");
- EL = combination[legB_index].second;
+ legpair.first = legA_features[0];
+ legpair.second = legB_features[0];
- if (m_isLegB_MET_vec[index]) {
- auto legB_pLink = TrigCompositeUtils::findLink<xAOD::TrigMissingETContainer>( *EL, featureString() ).link;
- if (!legB_pLink.isValid()){
- ATH_MSG_ERROR("link for "<<m_legB_vec[index]<<" not valid");
+ return true;
+}
+
+
+bool TrigComboHypoTool::fillPairKinematics(std::pair<KineInfo,KineInfo>& kinepair, const Combination& combination, const VarInfo& varInfo) const {
+ ATH_MSG_DEBUG("Decision objects available = "<< combination);
+ // Check that there are enough features
+ size_t nFeatures(combination.size());
+ if (nFeatures < 2){
+ ATH_MSG_ERROR("Number of Decision Objects passed is less than 2! Sum over decision objects on all legs = " << combination.size() );
return false;
}
- float ex = (*legB_pLink)[0].ex()/1000.;//converting to GeV
- float ey = (*legB_pLink)[0].ey()/1000.;//converting to GeV
- eta2 = -9999.;
- phi2 = ex==0.0 && ey==0.0 ? 0.0: std::atan2(ey,ex);
- pt2 = std::sqrt(ex*ex+ey*ey);
- }else {
- auto legB_pLink = TrigCompositeUtils::findLink<xAOD::IParticleContainer>( *EL, featureString() ).link;
- if (!legB_pLink.isValid()){
- ATH_MSG_ERROR("link for "<<m_legB_vec[index]<<"is not MET");
- ATH_MSG_ERROR("link for "<<m_legB_vec[index]<<" not valid");
+ std::pair<Combo::LegDecision,Combo::LegDecision> legpair;
+ if (varInfo.legsAreEqual) {fillLegDecisions_sameLeg(legpair,combination,varInfo.legA);}
+ else {fillLegDecisions_diffLeg(legpair,combination,varInfo.legA,varInfo.legB);}
+ ATH_MSG_DEBUG("Fill leg A kinematics");
+ if(!fillKineInfo(kinepair.first,legpair.first,varInfo.legA_is_MET)) {
+ ATH_MSG_ERROR("Failed to extract requisite kinematic info from leg " << varInfo.legA << "!");
return false;
}
- eta2 = (*legB_pLink)->p4().Eta();
- phi2 = (*legB_pLink)->p4().Phi();
- pt2 = (*legB_pLink)->p4().Pt();
- }
- ATH_MSG_DEBUG("link for legB: "<<m_legB_vec[index]<<" is valid");
-
- // apply the cut
- bool pass(true);
- float value(-9999.);
-
- switch(m_var_vec[index]){
- case comboHypoVars::DR:
- {
- float dEta = eta2 - eta1;
- float dPhi = -remainder( -phi1 + phi2, 2*M_PI );
- value = std::sqrt(dEta*dEta + dPhi*dPhi);
- break;
- }
- case comboHypoVars::INVM:
- {
- value = std::sqrt(2.*pt1*pt2*(std::cosh(eta1 - eta2) - std::cos(phi1 - phi2) ) )*1e-3; // Convert to GeV
- break;
- }
- case comboHypoVars::DPHI:
- {
- value = std::fabs(remainder( -phi1 + phi2, 2*M_PI ));
- break;
- }
- case comboHypoVars::MT:
- {
- float ex = pt1*std::cos(phi1) + pt2*std::cos(phi2);
- float ey = pt1*std::sin(phi1) + pt2*std::sin(phi2);
- value = std::sqrt(ex*ex + ey*ey)/1000.;//converting to GeV
- break;
+ ATH_MSG_DEBUG("Fill leg B kinematics");
+ if(!fillKineInfo(kinepair.second,legpair.second,varInfo.legB_is_MET)) {
+ ATH_MSG_ERROR("Failed to extract requisite kinematic info from leg " << varInfo.legB << "!");
+ return false;
}
- default:
- ATH_MSG_ERROR("m_varTag = "<<m_varTag_vec[index]<<" not present in the list of comboHypoVars");
- return false;
+ return true;
}
- varOfProcessed = value;
- vals.push_back(value);
- ATH_MSG_DEBUG("Found a combination with " << varOfProcessed);
- if (m_useMin_vec[index] && m_useMax_vec[index]){
- if (varOfProcessed < m_varMin_vec[index] || varOfProcessed > m_varMax_vec[index]){
- ATH_MSG_DEBUG("Combination failed var cut: "<< m_varTag_vec[index] <<"= "<< varOfProcessed << " not in [" << m_varMin_vec[index] << "," << m_varMax_vec[index] << "]");
- pass=false;
- }
- }else if (m_useMin_vec[index]){
- if (varOfProcessed < m_varMin_vec[index] ){
- ATH_MSG_DEBUG("Combination failed var cut: "<< m_varTag_vec[index] <<"= "<< varOfProcessed << " not > " << m_varMin_vec[index]);
- pass=false;
+bool TrigComboHypoTool::fillKineInfo(TrigComboHypoTool::KineInfo& kinematics, Combo::LegDecision decision, bool isMET) const {
+ float eta, phi, pt;
+ if (isMET) {
+ auto pLink = TrigCompositeUtils::findLink<xAOD::TrigMissingETContainer>( *decision.second, featureString() ).link;
+ if (!pLink.isValid()){
+ ATH_MSG_ERROR("link for MET not valid");
+ return false;
}
- }else if (m_useMax_vec[index]){
- if (varOfProcessed > m_varMax_vec[index]){
- ATH_MSG_DEBUG("Combination failed var cut: "<< m_varTag_vec[index] <<"= "<< varOfProcessed << " not < " << m_varMax_vec[index]);
- pass=false;
+ ROOT::Math::XYVectorF metv((*pLink)->ex(),(*pLink)->ey());
+ eta = FLOATDEFAULT;
+ phi = metv.phi();
+ pt = metv.r();
+ } else {
+ auto pLink = TrigCompositeUtils::findLink<xAOD::IParticleContainer>( *decision.second, featureString() ).link;
+ if (!pLink.isValid()){
+ ATH_MSG_ERROR("link for IParticle not valid");
+ return false;
}
+ eta = (*pLink)->p4().Eta();
+ phi = (*pLink)->p4().Phi();
+ pt = (*pLink)->p4().Pt();
}
- return pass;
-
+ ATH_MSG_DEBUG("Filled kinematics with pt " << pt*invGeV << ", eta " << eta << ", phi " << phi);
+ kinematics = std::make_tuple(eta,phi,pt);
+ return true;
}
+float TrigComboHypoTool::compute(const std::pair<KineInfo,KineInfo>& kinepair, ComboHypoVars var) const {
+ const auto& [legA_kine,legB_kine] = kinepair;
+ const auto& [eta1,phi1,pt1] = legA_kine;
+ const auto& [eta2,phi2,pt2] = legB_kine;
+ ATH_MSG_DEBUG("Leg A has pt " << pt1*invGeV << ", eta " << eta1 << ", phi " << phi1);
+ ATH_MSG_DEBUG("Leg B has pt " << pt2*invGeV << ", eta " << eta2 << ", phi " << phi2);
+ float value(0);
+ switch(var) {
+ case ComboHypoVars::DR:
+ {
+ value = xAOD::P4Helpers::deltaR(eta1,phi1,eta2,phi2);
+ break;
+ }
+ case ComboHypoVars::DPHI:
+ {
+ value = xAOD::P4Helpers::deltaPhi(phi1,phi2);
+ break;
+ }
+ case ComboHypoVars::INVM:
+ {
+ ROOT::Math::PtEtaPhiMVector p1(pt1,eta1,phi1,0.), p2(pt2,eta2,phi2,0.);
+ value = (p1+p2).M()*invGeV; // Convert to GeV
+ break;
+ }
+ case ComboHypoVars::MT:
+ {
+ ROOT::Math::Polar2DVectorF p1(pt1,phi1), p2(pt2,phi2);
+ value = sqrt((p1+p2).Mag2())*invGeV; // Convert to GeV
+ break;
+ }
+ default:
+ {
+ ATH_MSG_ERROR("Undefined variable requested -- should never happen!");
+ }
+ }
+ return value;
+}
\ No newline at end of file
diff --git a/Trigger/TrigHypothesis/TrigHypoCommonTools/src/TrigComboHypoTool.h b/Trigger/TrigHypothesis/TrigHypoCommonTools/src/TrigComboHypoTool.h
index 3b5bfca80d9c..c9100bb114fd 100644
--- a/Trigger/TrigHypothesis/TrigHypoCommonTools/src/TrigComboHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigHypoCommonTools/src/TrigComboHypoTool.h
@@ -7,6 +7,8 @@
#include <string>
#include <vector>
+#include <tuple>
+#include <limits>
#include "DecisionHandling/ComboHypoToolBase.h"
@@ -29,7 +31,9 @@
class TrigComboHypoTool: public ComboHypoToolBase {
+
public:
+ enum ComboHypoVars { UNDEF=-1, DR=0, DPHI, INVM, MT};
TrigComboHypoTool(const std::string& type,
const std::string& name,
@@ -38,35 +42,83 @@ class TrigComboHypoTool: public ComboHypoToolBase {
virtual ~TrigComboHypoTool() {};
virtual StatusCode initialize() override;
- enum comboHypoVars { DR=0, INVM, DPHI, MT};
-
private:
-
- virtual bool executeAlg(const std::vector<Combo::LegDecision>& combination) const override;
- bool executeAlgStep(const std::vector<Combo::LegDecision>& combination, size_t index, std::vector<float>& values) const;
-
+
+ static constexpr float FLOATDEFAULT = std::numeric_limits<float>::lowest();
+
+ /// Organise info per var selection in a struct
+ struct VarInfo {
+ std::string varTag{""};
+ ComboHypoVars var{UNDEF};
+ size_t index{0};
+ std::string monToolName{""};
+
+ bool useMin{false};
+ float varMin{FLOATDEFAULT};
+ bool useMax{false};
+ float varMax{FLOATDEFAULT};
+
+ bool legA_is_MET{false};
+ uint32_t legA{0};
+ bool legB_is_MET{false};
+ uint32_t legB{0};
+ bool legsAreEqual{false};
+
+ /// Check consistency of single var config
+ bool validate(std::string& errmsg) const;
+ /// Generate range string for printing
+ std::string rangeStr() const {
+ return (useMin ? std::to_string(varMin) + " < " : "") + varTag + (useMax ? " < " + std::to_string(varMax): "");
+ }
+ bool test(float value) const {
+ return (useMin ? value > varMin : true) && (useMax ? value < varMax : true);
+ }
+
+ };
+
+ /// Typedef for convenience, will contain eta/phi/pt info
+ typedef std::tuple<float,float,float> KineInfo;
+ typedef std::vector<Combo::LegDecision> Combination;
+
+ /// Top-level function to make chain-level decision
+ /// This applies the AND of all configured var selections
+ virtual bool executeAlg(const Combination& combination) const override;
+
+ /// Implementation of selection on individual variables
+ bool executeAlgStep(const Combination& combination, const VarInfo&, std::vector<float>& values) const;
+ /// Computation of the variables from the specified kinematics
+ float compute(const std::pair<KineInfo,KineInfo>& kinepair, ComboHypoVars var) const;
+
+ /// Helpers to extract kinematics from the specified legs of the chain
+ /// Specialised for two cases -- exactly two objects from the same leg
+ /// or exactly one object each from two legs.
+ bool fillLegDecisions_sameLeg(std::pair<Combo::LegDecision,Combo::LegDecision>& legpair, const Combination& combination, uint32_t leg) const;
+ bool fillLegDecisions_diffLeg(std::pair<Combo::LegDecision,Combo::LegDecision>& legpair, const Combination& combination, uint32_t legA, uint32_t legB) const;
+ bool fillPairKinematics(std::pair<KineInfo,KineInfo>& kinepair, const Combination& combination, const VarInfo& varInfo) const;
+ bool fillKineInfo(KineInfo& kinematics, Combo::LegDecision decision, bool isMET) const;
+
+ /// Gaudi configuration hooks
// flags
- Gaudi::Property<std::vector<std::string>> m_varTag_vec {this, "Variables" , { ""}, "Variables to cut on"};
- Gaudi::Property< std::vector<bool> > m_useMin_vec {this, "UseMinVec" , {false}, "Array with the apply_min_cut setting"};
- Gaudi::Property< std::vector<bool> > m_useMax_vec {this, "UseMaxVec" , {false}, "Array with the apply_max_cut setting"};
+ Gaudi::Property<std::vector<std::string>> m_varTag_vec {this, "Variables" , {""}, "Variables to cut on"};
+ Gaudi::Property<std::vector<bool> > m_useMin_vec {this, "UseMinVec" , {false}, "Array with the apply_min_cut setting"};
+ Gaudi::Property<std::vector<bool> > m_useMax_vec {this, "UseMaxVec" , {false}, "Array with the apply_max_cut setting"};
//legs
- Gaudi::Property<std::vector<std::string>> m_legA_vec {this, "LegAVec" , { ""}, "Array with the first Leg ID"};
- Gaudi::Property<std::vector<std::string>> m_legB_vec {this, "LegBVec" , { ""}, "Array with the second Leg ID"};
+ Gaudi::Property<std::vector<uint32_t>> m_legA_vec {this, "LegAVec" , {0}, "Array with the first Leg ID"};
+ Gaudi::Property<std::vector<uint32_t>> m_legB_vec {this, "LegBVec" , {0}, "Array with the second Leg ID"};
Gaudi::Property<std::vector< bool >> m_isLegA_MET_vec {this, "IsLegA_METVec", {false}, "Array with the first Leg MET identifier"};
Gaudi::Property<std::vector< bool >> m_isLegB_MET_vec {this, "IsLegB_METVec", {false}, "Array with the second Leg MET identifier"};
+ Gaudi::Property<bool> m_skipLegCheck {this, "SkipLegCheck" , {false}, "Ignore leg IDs for chains with only one leg"};
// cuts
- Gaudi::Property<std::vector<float>> m_varMin_vec {this, "LowerCutVec", {-9999.}, "Array with the lower cut for legs pair"};
- Gaudi::Property<std::vector<float>> m_varMax_vec {this, "UpperCutVec", {-9999.}, "Array with the upper cut for legs pair"};
+ Gaudi::Property<std::vector<float>> m_varMin_vec {this, "LowerCutVec", {FLOATDEFAULT}, "Array with the lower cut for legs pair"};
+ Gaudi::Property<std::vector<float>> m_varMax_vec {this, "UpperCutVec", {FLOATDEFAULT}, "Array with the upper cut for legs pair"};
// monitoring
ToolHandleArray<GenericMonitoringTool> m_monTool_vec {this, "MonTools", {}, "Monitoring tools" };
- std::map<std::string, comboHypoVars> m_varMap;
- std::vector<comboHypoVars> m_var_vec;
-
- void fillVarMap();
+ /// Internal variables for more efficient config lookup
+ std::vector<VarInfo> m_varInfo_vec;
}; // TRIGCOMBOHYPO_TRIGCOMBOHYPOTOOL_H
#endif
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 3ada39a58ca1..71163814dcda 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -74,8 +74,14 @@ HLT_2g10_loose_mu20_L1MU20:
stepFeatures:
0: 14
1: 1
+HLT_2g15_loose_25dphiAA_invmAA80_L1DPHI-M70-2eEM12M:
+ eventCount: 0
HLT_2g15_loose_dPhi25_m80_L1DPHI-M70-2eEM12M:
eventCount: 0
+HLT_2g15_tight_25dphiAA_L1DPHI-M70-2eEM12M:
+ eventCount: 0
+HLT_2g15_tight_25dphiAA_invmAA80_L1DPHI-M70-2eEM12M:
+ eventCount: 0
HLT_2g15_tight_L1DPHI-M70-2eEM12M:
eventCount: 0
HLT_2g15_tight_dPhi25_L1DPHI-M70-2eEM12M:
@@ -621,6 +627,18 @@ HLT_2mu6_10invm70_L1MU6:
1: 6
2: 8
3: 8
+HLT_2mu6_10invmAA70_L1MU6:
+ eventCount: 2
+ stepCounts:
+ 0: 4
+ 1: 3
+ 2: 3
+ 3: 2
+ stepFeatures:
+ 0: 8
+ 1: 6
+ 2: 8
+ 3: 8
HLT_2mu6_2j50_0eta490_j0_DJMASS900j50_L1MJJ-500-NFF:
eventCount: 0
HLT_2mu6_L12MU6:
@@ -1463,10 +1481,28 @@ HLT_e140_lhloose_L1eEM22M:
eventCount: 0
HLT_e140_lhloose_noringer_L1EM22VHI:
eventCount: 0
+HLT_e14_lhtight_e4_etcut_1invmAB3_L1JPSI-1M5-EM12:
+ eventCount: 0
+ stepFeatures:
+ 0: 14
HLT_e14_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM12:
eventCount: 0
stepFeatures:
0: 14
+HLT_e14_lhtight_e4_etcut_probe_1invmAB3_L1JPSI-1M5-EM12:
+ eventCount: 0
+HLT_e14_lhtight_noringer_e4_etcut_1invmAB3_L1JPSI-1M5-EM12:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 15
+ 1: 18
+ 2: 12
+ 3: 7
HLT_e14_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM12:
eventCount: 0
stepCounts:
@@ -1479,6 +1515,18 @@ HLT_e14_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM12:
1: 18
2: 12
3: 7
+HLT_e14_lhtight_noringer_e4_etcut_probe_1invmAB3_L1JPSI-1M5-EM12:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 1
+ 1: 2
+ 2: 1
+ 3: 1
HLT_e15_lhvloose_L1EM10VH:
eventCount: 5
stepCounts:
@@ -1674,15 +1722,15 @@ HLT_e20_lhvloose_L1EM15VH:
2: 4
3: 4
4: 4
-HLT_e24_lhmedium_2g12_loose_02dRAB_L1EM20VH_3EM10VH:
+HLT_e24_lhmedium_g12_loose_g12_loose_02dRAB_02dRAC_L1EM20VH_3EM10VH:
eventCount: 0
stepCounts:
0: 1
1: 1
stepFeatures:
- 0: 7
- 1: 3
- 2: 3
+ 0: 13
+ 1: 5
+ 2: 5
HLT_e24_lhmedium_g25_medium_02dRAB_L12EM20VH:
eventCount: 0
stepCounts:
@@ -1998,6 +2046,20 @@ HLT_e26_lhtight_L1EM22VHI:
2: 4
3: 4
4: 4
+HLT_e26_lhtight_e15_etcut_50invmAB130_L1EM22VHI:
+ eventCount: 3
+ stepCounts:
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
+ 4: 3
+ stepFeatures:
+ 0: 23
+ 1: 65
+ 2: 19
+ 3: 16
+ 4: 3
HLT_e26_lhtight_e15_etcut_L1EM22VHI:
eventCount: 3
stepCounts:
@@ -2040,6 +2102,28 @@ HLT_e26_lhtight_e15_etcut_idperf_Zee_L1EM22VHI:
2: 19
3: 16
4: 3
+HLT_e26_lhtight_e15_etcut_probe_50invmAB130_L1EM22VHI:
+ eventCount: 3
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 3
+ 6: 3
+ 7: 3
+ 8: 3
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 14
+ 6: 61
+ 7: 16
+ 8: 13
HLT_e26_lhtight_ivarloose_2j20_0eta290_020jvt_pf_ftf_boffperf_L1EM22VHI:
eventCount: 3
stepCounts:
@@ -3058,6 +3142,18 @@ HLT_e5_idperf_tight_L1EM3:
2: 24
3: 24
4: 24
+HLT_e5_lhtight_e14_etcut_1invmAB3_L1JPSI-1M5-EM12:
+ eventCount: 0
+ stepCounts:
+ 0: 2
+ 1: 2
+ 2: 2
+ 3: 2
+ stepFeatures:
+ 0: 8
+ 1: 23
+ 2: 4
+ 3: 4
HLT_e5_lhtight_e14_etcut_Jpsiee_L1JPSI-1M5-EM12:
eventCount: 0
stepCounts:
@@ -3070,6 +3166,30 @@ HLT_e5_lhtight_e14_etcut_Jpsiee_L1JPSI-1M5-EM12:
1: 23
2: 4
3: 4
+HLT_e5_lhtight_e14_etcut_probe_1invmAB3_L1JPSI-1M5-EM12:
+ eventCount: 0
+ stepCounts:
+ 0: 2
+ 1: 2
+ 2: 2
+ 3: 2
+ stepFeatures:
+ 0: 4
+ 1: 5
+ 2: 2
+ 3: 2
+HLT_e5_lhtight_e9_etcut_1invmAB3_L1JPSI-1M5-EM7:
+ eventCount: 0
+ stepCounts:
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 2
+ stepFeatures:
+ 0: 17
+ 1: 48
+ 2: 10
+ 3: 9
HLT_e5_lhtight_e9_etcut_Jpsiee_L1JPSI-1M5-EM7:
eventCount: 0
stepCounts:
@@ -3082,6 +3202,27 @@ HLT_e5_lhtight_e9_etcut_Jpsiee_L1JPSI-1M5-EM7:
1: 48
2: 10
3: 9
+HLT_e5_lhtight_e9_etcut_probe_1invmAB3_L1JPSI-1M5-EM7:
+ eventCount: 0
+ stepCounts:
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
+ stepFeatures:
+ 0: 10
+ 1: 22
+ 2: 3
+ 3: 3
+HLT_e5_lhtight_noringer_e14_etcut_1invmAB3_L1JPSI-1M5-EM12:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ stepFeatures:
+ 0: 5
+ 1: 10
+ 2: 2
HLT_e5_lhtight_noringer_e14_etcut_Jpsiee_L1JPSI-1M5-EM12:
eventCount: 0
stepCounts:
@@ -3091,6 +3232,30 @@ HLT_e5_lhtight_noringer_e14_etcut_Jpsiee_L1JPSI-1M5-EM12:
0: 5
1: 10
2: 2
+HLT_e5_lhtight_noringer_e14_etcut_probe_1invmAB3_L1JPSI-1M5-EM12:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 1
+ 1: 2
+ 2: 1
+ 3: 1
+HLT_e5_lhtight_noringer_e9_etcut_1invmAB3_L1JPSI-1M5-EM7:
+ eventCount: 0
+ stepCounts:
+ 0: 2
+ 1: 2
+ 2: 2
+ 3: 1
+ stepFeatures:
+ 0: 10
+ 1: 21
+ 2: 6
+ 3: 5
HLT_e5_lhtight_noringer_e9_etcut_Jpsiee_L1JPSI-1M5-EM7:
eventCount: 0
stepCounts:
@@ -3103,6 +3268,18 @@ HLT_e5_lhtight_noringer_e9_etcut_Jpsiee_L1JPSI-1M5-EM7:
1: 21
2: 6
3: 5
+HLT_e5_lhtight_noringer_e9_etcut_probe_1invmAB3_L1JPSI-1M5-EM7:
+ eventCount: 0
+ stepCounts:
+ 0: 2
+ 1: 2
+ 2: 2
+ 3: 2
+ stepFeatures:
+ 0: 3
+ 1: 9
+ 2: 2
+ 3: 2
HLT_e5_lhvloose_j70_0eta320_j50_0eta490_j0_DJMASS1000j50_xe50_tcpufit_L1MJJ-500-NFF:
eventCount: 0
stepCounts:
@@ -3272,6 +3449,15 @@ HLT_e7_lhmedium_mu24_L1MU20:
8: 1
HLT_e80_lhvloose_L1EM22VHI:
eventCount: 0
+HLT_e9_lhtight_e4_etcut_1invmAB3_L1JPSI-1M5-EM7:
+ eventCount: 0
+ stepCounts:
+ 0: 2
+ 1: 2
+ stepFeatures:
+ 0: 32
+ 1: 88
+ 2: 22
HLT_e9_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM7:
eventCount: 0
stepCounts:
@@ -3290,6 +3476,26 @@ HLT_e9_lhtight_e4_etcut_L1JPSI-1M5-EM7:
0: 32
1: 88
2: 22
+HLT_e9_lhtight_e4_etcut_probe_1invmAB3_L1JPSI-1M5-EM7:
+ eventCount: 0
+ stepCounts:
+ 0: 2
+ 1: 2
+ stepFeatures:
+ 0: 2
+ 1: 6
+HLT_e9_lhtight_noringer_e4_etcut_1invmAB3_L1JPSI-1M5-EM7:
+ eventCount: 0
+ stepCounts:
+ 0: 2
+ 1: 2
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 32
+ 1: 86
+ 2: 29
+ 3: 7
HLT_e9_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM7:
eventCount: 0
stepCounts:
@@ -3302,6 +3508,18 @@ HLT_e9_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM7:
1: 86
2: 29
3: 7
+HLT_e9_lhtight_noringer_e4_etcut_probe_1invmAB3_L1JPSI-1M5-EM7:
+ eventCount: 0
+ stepCounts:
+ 0: 2
+ 1: 2
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 2
+ 1: 6
+ 2: 1
+ 3: 1
HLT_e9_lhvloose_mu20_mu8noL1_L1MU20:
eventCount: 0
stepCounts:
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index e270fc1fa64a..608d39b9b2a7 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -36,8 +36,14 @@ HLT_2e5_lhvloose_bBeeM6000_L12EM3:
3: 2
HLT_2g10_loose_mu20_L1MU20:
eventCount: 0
+HLT_2g15_loose_25dphiAA_invmAA80_L1DPHI-M70-2eEM12M:
+ eventCount: 0
HLT_2g15_loose_dPhi25_m80_L1DPHI-M70-2eEM12M:
eventCount: 0
+HLT_2g15_tight_25dphiAA_L1DPHI-M70-2eEM12M:
+ eventCount: 0
+HLT_2g15_tight_25dphiAA_invmAA80_L1DPHI-M70-2eEM12M:
+ eventCount: 0
HLT_2g15_tight_L1DPHI-M70-2eEM12M:
eventCount: 0
HLT_2g15_tight_dPhi25_L1DPHI-M70-2eEM12M:
@@ -255,6 +261,12 @@ HLT_2mu6_10invm70_L1MU6:
0: 1
stepFeatures:
0: 2
+HLT_2mu6_10invmAA70_L1MU6:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_2mu6_2j50_0eta490_j0_DJMASS900j50_L1MJJ-500-NFF:
eventCount: 0
HLT_2mu6_L12MU6:
@@ -586,10 +598,18 @@ HLT_e140_lhloose_L1eEM22M:
eventCount: 0
HLT_e140_lhloose_noringer_L1EM22VHI:
eventCount: 0
+HLT_e14_lhtight_e4_etcut_1invmAB3_L1JPSI-1M5-EM12:
+ eventCount: 0
HLT_e14_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM12:
eventCount: 0
+HLT_e14_lhtight_e4_etcut_probe_1invmAB3_L1JPSI-1M5-EM12:
+ eventCount: 0
+HLT_e14_lhtight_noringer_e4_etcut_1invmAB3_L1JPSI-1M5-EM12:
+ eventCount: 0
HLT_e14_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM12:
eventCount: 0
+HLT_e14_lhtight_noringer_e4_etcut_probe_1invmAB3_L1JPSI-1M5-EM12:
+ eventCount: 0
HLT_e15_lhvloose_L1EM10VH:
eventCount: 0
stepCounts:
@@ -620,7 +640,7 @@ HLT_e20_lhtight_ivarloose_L1ZAFB-25DPHI-eEM18M:
eventCount: 0
HLT_e20_lhvloose_L1EM15VH:
eventCount: 0
-HLT_e24_lhmedium_2g12_loose_02dRAB_L1EM20VH_3EM10VH:
+HLT_e24_lhmedium_g12_loose_g12_loose_02dRAB_02dRAC_L1EM20VH_3EM10VH:
eventCount: 0
HLT_e24_lhmedium_g25_medium_02dRAB_L12EM20VH:
eventCount: 0
@@ -668,6 +688,10 @@ HLT_e26_lhmedium_nopix_lrttight_L1EM22VHI:
eventCount: 0
HLT_e26_lhtight_L1EM22VHI:
eventCount: 0
+HLT_e26_lhtight_e15_etcut_50invmAB130_L1EM22VHI:
+ eventCount: 0
+ stepFeatures:
+ 0: 1
HLT_e26_lhtight_e15_etcut_L1EM22VHI:
eventCount: 0
stepFeatures:
@@ -680,6 +704,8 @@ HLT_e26_lhtight_e15_etcut_idperf_Zee_L1EM22VHI:
eventCount: 0
stepFeatures:
0: 1
+HLT_e26_lhtight_e15_etcut_probe_50invmAB130_L1EM22VHI:
+ eventCount: 0
HLT_e26_lhtight_ivarloose_2j20_0eta290_020jvt_pf_ftf_boffperf_L1EM22VHI:
eventCount: 0
HLT_e26_lhtight_ivarloose_L1EM22VHI:
@@ -900,18 +926,58 @@ HLT_e5_idperf_tight_L1EM3:
2: 5
3: 5
4: 5
+HLT_e5_lhtight_e14_etcut_1invmAB3_L1JPSI-1M5-EM12:
+ eventCount: 0
HLT_e5_lhtight_e14_etcut_Jpsiee_L1JPSI-1M5-EM12:
eventCount: 0
+HLT_e5_lhtight_e14_etcut_probe_1invmAB3_L1JPSI-1M5-EM12:
+ eventCount: 0
+HLT_e5_lhtight_e9_etcut_1invmAB3_L1JPSI-1M5-EM7:
+ eventCount: 0
+ stepFeatures:
+ 0: 3
HLT_e5_lhtight_e9_etcut_Jpsiee_L1JPSI-1M5-EM7:
eventCount: 0
stepFeatures:
0: 3
+HLT_e5_lhtight_e9_etcut_probe_1invmAB3_L1JPSI-1M5-EM7:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 3
+ 1: 6
+ 2: 1
+ 3: 1
+HLT_e5_lhtight_noringer_e14_etcut_1invmAB3_L1JPSI-1M5-EM12:
+ eventCount: 0
HLT_e5_lhtight_noringer_e14_etcut_Jpsiee_L1JPSI-1M5-EM12:
eventCount: 0
+HLT_e5_lhtight_noringer_e14_etcut_probe_1invmAB3_L1JPSI-1M5-EM12:
+ eventCount: 0
+HLT_e5_lhtight_noringer_e9_etcut_1invmAB3_L1JPSI-1M5-EM7:
+ eventCount: 0
+ stepFeatures:
+ 0: 2
HLT_e5_lhtight_noringer_e9_etcut_Jpsiee_L1JPSI-1M5-EM7:
eventCount: 0
stepFeatures:
0: 2
+HLT_e5_lhtight_noringer_e9_etcut_probe_1invmAB3_L1JPSI-1M5-EM7:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 2
+ 1: 4
+ 2: 1
+ 3: 1
HLT_e5_lhvloose_j70_0eta320_j50_0eta490_j0_DJMASS1000j50_xe50_tcpufit_L1MJJ-500-NFF:
eventCount: 0
HLT_e5_lhvloose_nopix_lrtloose_idperf_probe_g25_medium_L1EM20VH:
@@ -940,6 +1006,10 @@ HLT_e7_lhmedium_mu24_L1MU20:
eventCount: 0
HLT_e80_lhvloose_L1EM22VHI:
eventCount: 0
+HLT_e9_lhtight_e4_etcut_1invmAB3_L1JPSI-1M5-EM7:
+ eventCount: 0
+ stepFeatures:
+ 0: 5
HLT_e9_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM7:
eventCount: 0
stepFeatures:
@@ -948,10 +1018,18 @@ HLT_e9_lhtight_e4_etcut_L1JPSI-1M5-EM7:
eventCount: 0
stepFeatures:
0: 5
+HLT_e9_lhtight_e4_etcut_probe_1invmAB3_L1JPSI-1M5-EM7:
+ eventCount: 0
+HLT_e9_lhtight_noringer_e4_etcut_1invmAB3_L1JPSI-1M5-EM7:
+ eventCount: 0
+ stepFeatures:
+ 0: 5
HLT_e9_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM7:
eventCount: 0
stepFeatures:
0: 5
+HLT_e9_lhtight_noringer_e4_etcut_probe_1invmAB3_L1JPSI-1M5-EM7:
+ eventCount: 0
HLT_e9_lhvloose_mu20_mu8noL1_L1MU20:
eventCount: 0
HLT_eb_low_L1RD2_FILLED:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ComboHypoHandling.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ComboHypoHandling.py
index 551146debfe7..c2b5c1752124 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ComboHypoHandling.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ComboHypoHandling.py
@@ -8,6 +8,8 @@ from AthenaCommon.Logging import logging
log = logging.getLogger(__name__)
logging.getLogger().info("Importing %s",__name__)
import math
+import re
+from TrigConfHLTData.HLTUtils import string2hash
topoLegIndices = "ABCDEF"
@@ -47,161 +49,145 @@ def TrigComboHypoToolFromDict(chainDict):
from TrigHypoCommonTools.TrigHypoCommonToolsConf import TrigComboHypoTool
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool, defineHistogram
- name = chainDict['chainName']
- log.debug("[TrigComboHypoToolFromDict] chain %s, combo hypos to be processed: %s, t", name, chainDict['extraComboHypos'])
+ chainName = chainDict['chainName']
+ log.debug("[TrigComboHypoToolFromDict] chain %s, combo hypos to be processed: %s, t", chainName, chainDict['extraComboHypos'])
#define the list for housing all the info needed to initialize the TrigComboHypoTool module in the form of a dict
topoDefs = []
- for topoID in range(len(chainDict['extraComboHypos'])):
- topoInfo = chainDict['extraComboHypos'][topoID]
- #here we need to decompress the name to get: variable_name, min, max
- log.debug("[TrigComboHypoToolFromDict] new combo hypo name: %s, topoInfo = %s", name, topoInfo)
- singleTopoDef = {}
-
- isLegMET = []
- for chId in range(len(chainDict['chainParts'])):
- if chainDict['chainParts'][chId]['signature'] == 'MET':
- isLegMET.append(True)
- else:
- isLegMET.append(False)
- log.debug("[TrigComboHypoToolFromDict] chainParts[%i]: %s", chId, chainDict['chainParts'][chId])
-
- import re
- # get the variable
- obs_to_use = []
- for obs in allowed_obs.keys():
- if obs in topoInfo:
- obs_to_use.append(obs)
- if len(obs_to_use)!=1:
- log.error("[TrigComboHypoToolFromDict] N of vars found in he hypo name = %d in chain name %s", len(obs_to_use), name)
- raise Exception("[TrigComboHypoToolFromDict] N of vars found in the hypo name is different from 1")
- singleTopoDef['var'] = obs_to_use[0]
-
- #get the limits
- l_min = re.findall(r"\d+"+obs_to_use[0], topoInfo)
- if len(l_min)==1:
- l_min[0] = l_min[0].replace(obs_to_use[0],"")
- if obs_to_use[0] in ['dR','dPhi']:
- cut_min = float(l_min[0])/10.
- else:
- cut_min = float(l_min[0])
- if len(l_min)>1:
- log.error("[TrigComboHypoToolFromDict] unable to get min value: N min = %d, l_min = %d", len(l_min), l_min)
- raise Exception("[TrigComboHypoToolFromDict] cannot set min value")
-
- if len(l_min)==1:#remove the min value from the string name
- l_max = re.findall(r"\d+", topoInfo.replace(l_min[0],""))
- else:#no min value was found
- l_max = re.findall(r"\d+", topoInfo)
- if len(l_max)>1:
- log.error("[TrigComboHypoToolFromDict] unable to get max value: N max = %d, l_max = %d", len(l_max), l_max)
- raise Exception("[TrigComboHypoToolFromDict] cannot set max value")
- if len(l_max)==1:
- if obs_to_use[0] in ['dR','dPhi']:
- cut_max = float(l_max[0])/10.
- else:
- cut_max = float(l_min[0])
-
- #get the legs
- l_names = topoInfo.replace(obs_to_use[0], "")
- if len(l_min)>0:
- l_names = l_names.replace(l_min[0], "")
- if len(l_max)>0:
- l_names = l_names.replace(l_max[0], "")
-
- if len(l_names)!=2:
- log.error("[TrigComboHypoToolFromDict] N_legs = %d, legs_name = %s", len(l_names), l_names)
- raise Exception("[TrigComboHypoToolFromDict] Number of legs is different from 2")
-
- legA = -1
- legB = -1
- for i in range(len(topoLegIndices)):
- if topoLegIndices[i] == l_names[0]:
- legA = i
- elif topoLegIndices[i] == l_names[1]:
- legB = i
- if legA<0 or legB<0:
- log.error("[TrigComboHypoToolFromDict] Didn't find leg indexes in %s", l_names)
- raise Exception("[TrigComboHypoToolFromDict] Didn't find leg indexes")
- singleTopoDef['legA'] = "leg{:03d}".format(legA)
- singleTopoDef['legB'] = "leg{:03d}".format(legB)
-
- #count the number of MET legs used in the hypo
- n_MET_legs=0
- if isLegMET[legA]:
- n_MET_legs += 1
- if isLegMET[legB]:
- n_MET_legs += 1
+ # Define regex for parsing the topoInfo
+ # Pattern is: min cut, var, legA, legB, max cut
+ # Min and max are both optional, check afterwards that at least one is filled
+ # Only the allowed vars and legs will be recognised, anything else fails to match
+ theregex = fr"(\d*)({'|'.join(allowed_obs.keys())})([{topoLegIndices}])([{topoLegIndices}])(\d*)"
+ matcher = re.compile(theregex)
+
+ for iTopo, topoInfo in enumerate(chainDict['extraComboHypos']):
+ log.debug("[TrigComboHypoToolFromDict] new combo hypo for chain: %s, topoInfo = %s", chainName, topoInfo)
+ # Attempt to regex-match the topo specification
+ result = matcher.match(topoInfo)
+ if not result:
+ log.error("[TrigComboHypoToolFromDict] Topo expression %s does not conform to format (min?)(var)(legA)(legB)(max?).",topoInfo)
+ log.error("[TrigComboHypoToolFromDict] Must use leg IDs in %s, vars in {allowed_obs.keys()}",topoLegIndices)
+ raise ValueError(f"[TrigComboHypoToolFromDict] Invalid topo expression {topoInfo} received in 'extraComboHypos'!")
+
+ # Extract the matched info and validate
+ str_min, var, char_legA, char_legB, str_max = result.groups()
+ # Manipulation of the cuts
+ # At least one must be filled
+ use_min = bool(str_min)
+ use_max = bool(str_max)
+ if not (use_min or use_max):
+ log.error("[TrigComboHypoToolFromDict] Topo expression %s does not specify a min or max cut value.",topoInfo)
+ raise ValueError(f"[TrigComboHypoToolFromDict] Invalid topo expression {topoInfo} received in 'extraComboHypos'!")
+ # Convert into float values, dividing for 0.1 precision as needed
+ if var in ['dR','dphi']:
+ cut_min = float(str_min)/10. if use_min else float('nan')
+ cut_max = float(str_max)/10. if use_max else float('nan')
+ else:
+ cut_min = float(str_min) if use_min else float('nan')
+ cut_max = float(str_max) if use_max else float('nan')
+
+ # Convert char leg representation to int
+ i_legA = topoLegIndices.find(char_legA)
+ i_legB = topoLegIndices.find(char_legB)
+
+ # Fill info for each leg, looking up in chainParts
+ # Convert leg name into HLT identifier for matching in the tool
+ legInfo = []
+ for ileg in [i_legA,i_legB]:
+ cpart = chainDict['chainParts'][ileg]
+ legname = f"leg{ileg:03d}_{chainName}"
+ legInfo.append({
+ 'index' : ileg,
+ 'legname' : legname,
+ 'HLTId' : string2hash(legname),
+ 'isMET' : cpart['signature']=='MET',
+ 'multiplicity': int(cpart['multiplicity'])
+ })
+
+ # Count how many input legs are MET, for consistency checks
+ n_MET_legs = legInfo[0]['isMET'] + legInfo[1]['isMET']
+
+ # Check multiplicity of the configured legs
+ # For chains like "HLT_2muX_10invm70AA", no leg ID will be attached
+ # in which case set a flag to use all objects in the combination list
+ skipLegCheck = False
+ if i_legA==i_legB:
+ if legInfo[0]['multiplicity'] != 2:
+ log.error("[TrigComboHypoToolFromDict] Error configuring topo for chain %s!",chainName)
+ log.error("[TrigComboHypoToolFromDict] Topo selection %s requires multiplicity 2 on leg %d, found %d!",topoInfo,i_legA,legInfo[0]['multiplicity'])
+ raise Exception("[TrigComboHypoToolFromDict] Invalid multiplicity")
+ if n_MET_legs==2:
+ log.error("[TrigComboHypoToolFromDict] Configured with the same MET leg on both sides -- impossible to satisfy!")
+ raise Exception("[TrigComboHypoToolFromDict] Identical MET legs for topo selection")
+ if len(chainDict['chainParts'])==1:
+ skipLegCheck=True
+ else:
+ for li in legInfo:
+ if li['multiplicity'] != 1:
+ log.error("[TrigComboHypoToolFromDict] Error configuring topo for chain %s!",chainName)
+ log.error("[TrigComboHypoToolFromDict] Topo selection %s requires multiplicity 1 on leg %d, found %d!",topoInfo,li['index'],li['multiplicity'])
+ raise Exception("[TrigComboHypoToolFromDict] Invalid multiplicity")
+
#now check that the variable we plan to use allows the use of the MET
- if n_MET_legs not in allowed_obs[obs_to_use[0]]['n_MET_legs']:
- log.error("[TrigComboHypoToolFromDict] Attempting to use the MET leg in var %s. N_MET_legs = %d", obs_to_use[0], isLegMET.count(True))
+ if n_MET_legs not in allowed_obs[var]['n_MET_legs']:
+ log.error("[TrigComboHypoToolFromDict] Attempting var %s with %d MET legs, %s allowed", var, n_MET_legs, allowed_obs[var]['n_MET_legs'])
raise Exception("[TrigComboHypoToolFromDict] Attempting to use the MET leg in var")
- singleTopoDef['isLegA_MET'] = isLegMET[legA]
- singleTopoDef['isLegB_MET'] = isLegMET[legB]
-
+
if len(chainDict['extraComboHypos'])==1:#to avoid breaking changes in the ref files
- monToolName = "MonTool_"+name
- histNameTag = obs_to_use[0]
+ monToolName = "MonTool_"+chainName
+ histNameTag = var
else:
- monToolName = "MonTool_"+name+"_"+chainDict['extraComboHypos'][topoID]
- histNameTag = obs_to_use[0] + "leg{:03d}".format(legA) + "leg{:03d}".format(legB)
+ monToolName = f"MonTool_{chainName}_{chainDict['extraComboHypos'][iTopo]}"
+ histNameTag = f"{var}leg{i_legA:03d}leg{i_legB:03d}"
monTool = GenericMonitoringTool(monToolName)
- monTool.Histograms = [defineHistogram(histNameTag+'OfAccepted', type='TH1F', path='EXPERT',
- title=obs_to_use[0]+" in accepted combinations; {}".format(obs_to_use[0]),
- xbins=allowed_obs[obs_to_use[0]]['hist_nbins'],
- xmin=allowed_obs[obs_to_use[0]]['hist_min'],
- xmax=allowed_obs[obs_to_use[0]]['hist_max']),
- defineHistogram(histNameTag+'OfProcessed', type='TH1F', path='EXPERT',
- title=obs_to_use[0]+" in processed combinations; {}".format(obs_to_use[0]),
- xbins=allowed_obs[obs_to_use[0]]['hist_nbins'],
- xmin=allowed_obs[obs_to_use[0]]['hist_min'],
- xmax=allowed_obs[obs_to_use[0]]['hist_max'])]
- log.debug("[TrigComboHypoToolFromDict] tool configured for hypo name: %s, topoInfo = %s", name, topoInfo)
- #now fill the holders needed to initialize the TrigComboHypoTool
- if len(l_min)==1:
- singleTopoDef['useMin'] = True
- singleTopoDef['lowerCut'] = cut_min
- else:
- singleTopoDef['useMin'] = False
- singleTopoDef['lowerCut'] = 0.
-
- if len(l_max)==1:
- singleTopoDef['useMax'] = True
- singleTopoDef['upperCut'] = cut_max
- else:
- singleTopoDef['useMax'] = False
- singleTopoDef['upperCut'] = 0.
+ monTool.Histograms = [defineHistogram(histNameTag+'OfAccepted', type='TH1F', path='EXPERT',
+ title=var+" in accepted combinations; {}".format(var),
+ xbins=allowed_obs[var]['hist_nbins'],
+ xmin=allowed_obs[var]['hist_min'],
+ xmax=allowed_obs[var]['hist_max']),
+ defineHistogram(histNameTag+'OfProcessed', type='TH1F', path='EXPERT',
+ title=var+" in processed combinations; {}".format(var),
+ xbins=allowed_obs[var]['hist_nbins'],
+ xmin=allowed_obs[var]['hist_min'],
+ xmax=allowed_obs[var]['hist_max'])]
+ log.debug("[TrigComboHypoToolFromDict] tool configured for hypo name: %s, topoInfo = %s", chainName, topoInfo)
if len(chainDict['extraComboHypos'])==1:#to avoid breaking changes in the ref files
- monTool.HistPath = 'ComboHypo/'+name
+ monTool.HistPath = f'ComboHypo/{chainName}'
else:
- monTool.HistPath = 'ComboHypo/'+name+"_detail_"+singleTopoDef['var'] + singleTopoDef['legA'] + singleTopoDef['legB']
- singleTopoDef['monTool'] = monTool
-
+ monTool.HistPath = f'ComboHypo/{chainName}_detail_{histNameTag}'
+
+ # Set keys of dict to match tool config properties
+ singleTopoDef = {
+ "Variables" : var,
+ "UseMinVec" : use_min,
+ "UseMaxVec" : use_max,
+ "LowerCutVec" : cut_min,
+ "UpperCutVec" : cut_max,
+ "LegAVec" : legInfo[0]["HLTId"],
+ "LegBVec" : legInfo[1]["HLTId"],
+ "IsLegA_METVec": legInfo[0]["isMET"],
+ "IsLegB_METVec": legInfo[1]["isMET"],
+ "MonTools" : monTool,
+ }
topoDefs.append(singleTopoDef)
#some debug info
- log.debug("[TrigComboHypoToolFromDict] tool configured for hypo name: %s, topoInfo = %s", name, topoInfo)
- log.debug("[TrigComboHypoToolFromDict] var = %s", singleTopoDef['var'])
- log.debug("[TrigComboHypoToolFromDict] legA = %d", singleTopoDef['legA'])
- log.debug("[TrigComboHypoToolFromDict] legB = %d", singleTopoDef['legB'])
- if len(l_min)==1:
- log.debug("[TrigComboHypoToolFromDict] min = %10.3f", singleTopoDef['lowerCut'])
- if len(l_max)==1:
- log.debug("[TrigComboHypoToolFromDict] max = %10.3f", singleTopoDef['upperCut'])
+ log.debug("[TrigComboHypoToolFromDict] tool configured for hypo name: %s, topoInfo = %s", chainName, topoInfo)
+ log.debug("[TrigComboHypoToolFromDict] var = %s", singleTopoDef['Variables'])
+ log.debug("[TrigComboHypoToolFromDict] legA = %s", singleTopoDef['LegAVec'])
+ log.debug("[TrigComboHypoToolFromDict] legB = %s", singleTopoDef['LegBVec'])
+ if use_min:
+ log.debug("[TrigComboHypoToolFromDict] min = %10.3f", singleTopoDef['LowerCutVec'])
+ if use_max:
+ log.debug("[TrigComboHypoToolFromDict] max = %10.3f", singleTopoDef['UpperCutVec'])
#end of the loop over the hypos
- tool= TrigComboHypoTool(name)
- tool.Variables = [x['var'] for x in topoDefs]
- tool.LegAVec = [x['legA'] for x in topoDefs]
- tool.IsLegA_METVec = [x['isLegA_MET'] for x in topoDefs]
- tool.LegBVec = [x['legB'] for x in topoDefs]
- tool.IsLegB_METVec = [x['isLegB_MET'] for x in topoDefs]
- tool.UseMinVec = [x['useMin'] for x in topoDefs]
- tool.LowerCutVec = [x['lowerCut'] for x in topoDefs]
- tool.UseMaxVec = [x['useMax'] for x in topoDefs]
- tool.UpperCutVec = [x['upperCut'] for x in topoDefs]
- tool.MonTools = [x['monTool'] for x in topoDefs]
+
+ # convert list of dicts into dict of lists
+ toolProps = {k:[thedef[k] for thedef in topoDefs] for k in topoDefs[0]}
+ tool = TrigComboHypoTool(chainName, SkipLegCheck=skipLegCheck, **toolProps)
return tool
@@ -214,6 +200,7 @@ comboConfigurator = {
}
def addTopoInfo(theChainConfig, mainChainDict, listOfChainDefs, lengthOfChainConfigs):
+ log.debug("[addTopoInfo] Adding topo info to chain %s", theChainConfig)
def findStepIndexInChain(chain, step):
for istep,chainstep in enumerate(chain.steps):
@@ -222,7 +209,8 @@ def addTopoInfo(theChainConfig, mainChainDict, listOfChainDefs, lengthOfChainCon
return None
for step,(topoCfg,topoExpr) in theChainConfig.topoMap.items():
- thestep = -1 if step=="last" else findStepIndexInChain(theChainConfig,step)
+ thestep = theChainConfig.steps[-1] if step=="last" else theChainConfig.steps[findStepIndexInChain(theChainConfig,step)]
+ log.debug("[addTopoInfo] Adding %s to step %s",topoExpr,thestep)
if thestep is None:
log.error("Failed to find step %s in Chain! ChainDict follows:", step)
log.error(mainChainDict)
@@ -237,16 +225,16 @@ def addTopoInfo(theChainConfig, mainChainDict, listOfChainDefs, lengthOfChainCon
# No need to add if it has been added previously
# Handle better and avoid doing this repeatedly on the same steps?
- if topoCfg not in theChainConfig.steps[thestep].comboToolConfs:
- if len(theChainConfig.steps[thestep].comboToolConfs) > 0:
- log.warning("[addTopoInfo] step %s already has ComboHypo tools %s",theChainConfig.steps[thestep],theChainConfig.steps[thestep].comboToolConfs)
+ if topoCfg not in thestep.comboToolConfs:
+ if len(thestep.comboToolConfs) > 0:
+ log.warning("[addTopoInfo] step %s already has ComboHypo tools %s",thestep,thestep.comboToolConfs)
log.warning("[addTopoInfo] these will be added to, make sure this is the behaviour you want.")
- theChainConfig.steps[thestep].addComboHypoTools(topoCfg)
- theChainConfig.steps[thestep].name = theChainConfig.steps[thestep].name+'_combo_'+topoExpr
+ thestep.name = thestep.name+'_combo_'+topoExpr
+ thestep.addComboHypoTools(topoCfg)
- theChainConfig.steps[thestep].makeCombo()
- log.debug("[addTopoInfo] new combo hypo name: %s",theChainConfig.steps[thestep].combo.name)
+ thestep.makeCombo()
+ log.debug("[addTopoInfo] new combo hypo name: %s",thestep.combo.name)
if bonus_debug:
log.debug("[addTopoInfo] new theChainConfig %s", theChainConfig)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 2272c8d226ac..bb8051ace40e 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -86,6 +86,8 @@ def setupMenu():
ChainProp(name='HLT_mu6_msonly_L1MU6', groups=SingleMuonGroup, monGroups=['muonMon:shifter','muonMon:val','idMon:t0']),
ChainProp(name='HLT_2mu6_10invm70_L1MU6', groups=SingleMuonGroup),
+ # Using generic hypo
+ ChainProp(name='HLT_2mu6_10invmAA70_L1MU6', groups=SingleMuonGroup),
ChainProp(name='HLT_mu10_lateMu_L1LATE-MU10_XE50', l1SeedThresholds=['FSNOSEED'], groups=SingleMuonGroup),
# ATR-20049
@@ -200,6 +202,10 @@ def setupMenu():
#Support photon chains ATR-23425
ChainProp(name='HLT_2g15_loose_dPhi25_m80_L1DPHI-M70-2eEM12M', l1SeedThresholds=['eEM10L'], groups=SupportPhIGroup+MultiPhotonGroup), # TODO: mismatch between L1topo threshold and L1 seed to be fixed
ChainProp(name='HLT_2g20_loose_L12EM15VH', groups=SupportLegGroup+MultiPhotonGroup),
+ # Copy with generic TrigComboHypoTool
+ ChainProp(name='HLT_2g15_tight_25dphiAA_invmAA80_L1DPHI-M70-2eEM12M', l1SeedThresholds=['eEM10L'], groups=PrimaryPhIGroup+MultiPhotonGroup),
+ ChainProp(name='HLT_2g15_loose_25dphiAA_invmAA80_L1DPHI-M70-2eEM12M', l1SeedThresholds=['eEM10L'], groups=SupportPhIGroup+MultiPhotonGroup),
+ ChainProp(name='HLT_2g15_tight_25dphiAA_L1DPHI-M70-2eEM12M', l1SeedThresholds=['eEM10L'], groups=PrimaryPhIGroup+MultiPhotonGroup),
#------------ 1e_1g HEG ATR-23158
ChainProp(name='HLT_e25_mergedtight_g35_medium_Heg_02dRAB_L12EM20VH',l1SeedThresholds=['EM20VH','EM20VH'], groups=PrimaryLegGroup+MultiElectronGroup),
@@ -287,6 +293,30 @@ def setupMenu():
ChainProp(name='HLT_2g22_tight_L1EM7_UNPAIRED_ISO', l1SeedThresholds=['EM7'], stream=['Late'], groups=PrimaryLegGroup+MultiPhotonGroup),
ChainProp(name='HLT_2g50_tight_L1EM7_EMPTY', l1SeedThresholds=['EM7'], stream=['Late'], groups=PrimaryLegGroup+MultiPhotonGroup),
ChainProp(name='HLT_2g50_tight_L1EM7_UNPAIRED_ISO', l1SeedThresholds=['EM7'], stream=['Late'], groups=PrimaryLegGroup+MultiPhotonGroup),
+
+ # Alternative formulation of T&P chains with generic mass cut combohypotool
+ # With & without 'probe' expression to check count consistency
+ # Zee
+ ChainProp(name='HLT_e26_lhtight_e15_etcut_probe_50invmAB130_L1EM22VHI', l1SeedThresholds=['EM22VHI','EM7'], groups=TagAndProbeLegGroup+MultiElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_e15_etcut_50invmAB130_L1EM22VHI', l1SeedThresholds=['EM22VHI','EM7'], groups=MultiElectronGroup),
+ # Jpsiee
+ ChainProp(name='HLT_e9_lhtight_e4_etcut_probe_1invmAB3_L1JPSI-1M5-EM7', l1SeedThresholds=['EM7','EM3'], groups=SupportLegGroup+MultiElectronGroup),
+ ChainProp(name='HLT_e5_lhtight_e9_etcut_probe_1invmAB3_L1JPSI-1M5-EM7', l1SeedThresholds=['EM3','EM7'], groups=SupportLegGroup+MultiElectronGroup),
+ ChainProp(name='HLT_e14_lhtight_e4_etcut_probe_1invmAB3_L1JPSI-1M5-EM12', l1SeedThresholds=['EM12','EM3'], groups=SupportLegGroup+MultiElectronGroup),
+ ChainProp(name='HLT_e5_lhtight_e14_etcut_probe_1invmAB3_L1JPSI-1M5-EM12', l1SeedThresholds=['EM3','EM12'], groups=SupportLegGroup+MultiElectronGroup),
+ ChainProp(name='HLT_e9_lhtight_noringer_e4_etcut_probe_1invmAB3_L1JPSI-1M5-EM7', l1SeedThresholds=['EM7','EM3'], groups=SupportLegGroup+MultiElectronGroup),
+ ChainProp(name='HLT_e5_lhtight_noringer_e9_etcut_probe_1invmAB3_L1JPSI-1M5-EM7', l1SeedThresholds=['EM3','EM7'], groups=SupportLegGroup+MultiElectronGroup),
+ ChainProp(name='HLT_e14_lhtight_noringer_e4_etcut_probe_1invmAB3_L1JPSI-1M5-EM12', l1SeedThresholds=['EM12','EM3'], groups=SupportLegGroup+MultiElectronGroup),
+ ChainProp(name='HLT_e5_lhtight_noringer_e14_etcut_probe_1invmAB3_L1JPSI-1M5-EM12', l1SeedThresholds=['EM3','EM12'], groups=SupportLegGroup+MultiElectronGroup),
+ #
+ ChainProp(name='HLT_e9_lhtight_e4_etcut_1invmAB3_L1JPSI-1M5-EM7', l1SeedThresholds=['EM7','EM3'], groups=MultiElectronGroup),
+ ChainProp(name='HLT_e5_lhtight_e9_etcut_1invmAB3_L1JPSI-1M5-EM7', l1SeedThresholds=['EM3','EM7'], groups=MultiElectronGroup),
+ ChainProp(name='HLT_e14_lhtight_e4_etcut_1invmAB3_L1JPSI-1M5-EM12', l1SeedThresholds=['EM12','EM3'], groups=MultiElectronGroup),
+ ChainProp(name='HLT_e5_lhtight_e14_etcut_1invmAB3_L1JPSI-1M5-EM12', l1SeedThresholds=['EM3','EM12'], groups=MultiElectronGroup),
+ ChainProp(name='HLT_e9_lhtight_noringer_e4_etcut_1invmAB3_L1JPSI-1M5-EM7', l1SeedThresholds=['EM7','EM3'], groups=MultiElectronGroup),
+ ChainProp(name='HLT_e5_lhtight_noringer_e9_etcut_1invmAB3_L1JPSI-1M5-EM7', l1SeedThresholds=['EM3','EM7'], groups=MultiElectronGroup),
+ ChainProp(name='HLT_e14_lhtight_noringer_e4_etcut_1invmAB3_L1JPSI-1M5-EM12', l1SeedThresholds=['EM12','EM3'], groups=MultiElectronGroup),
+ ChainProp(name='HLT_e5_lhtight_noringer_e14_etcut_1invmAB3_L1JPSI-1M5-EM12', l1SeedThresholds=['EM3','EM12'], groups=MultiElectronGroup),
]
TriggerFlags.METSlice.signatures = TriggerFlags.METSlice.signatures() + [
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
index ea35e965b236..aaac56749f9a 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
@@ -928,7 +928,7 @@ class ChainStep(object):
log.debug("[ChainStep] onlyJets, sig_set: %s, %s",self.onlyJets, sig_set)
self.multiplicity = multiplicity
self.comboHypoCfg=comboHypoCfg
- self.comboToolConfs=comboToolConfs
+ self.comboToolConfs = list(comboToolConfs)
self.stepDicts = chainDicts # one dict per leg
self.isEmpty=(sum(multiplicity)==0 or isEmpty)
if not self.isEmpty:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
index 6d11e5fdb824..3151e490f701 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
@@ -231,7 +231,7 @@ def setupMenu():
#------- Electron+Photon Chains
# primary e-g chains: electron + photon stay in the same step - these need to be parallel merged!
ChainProp(name='HLT_e24_lhmedium_g25_medium_02dRAB_L12EM20VH', l1SeedThresholds=['EM20VH','EM20VH'], stream=[PhysicsStream], groups=PrimaryLegGroup+MultiElectronGroup),
- ChainProp(name='HLT_e24_lhmedium_2g12_loose_02dRAB_L1EM20VH_3EM10VH', l1SeedThresholds=['EM20VH','EM10VH'], stream=[PhysicsStream], groups=PrimaryLegGroup+MultiElectronGroup), # unsure about l1SeedThresholds
+ ChainProp(name='HLT_e24_lhmedium_g12_loose_g12_loose_02dRAB_02dRAC_L1EM20VH_3EM10VH', l1SeedThresholds=['EM20VH','EM10VH','EM10VH'], stream=[PhysicsStream], groups=PrimaryLegGroup+MultiElectronGroup), # unsure about l1SeedThresholds
# Electron LRT chains
ChainProp(name='HLT_e26_lhloose_nopix_lrttight_L1EM22VHI', groups=PrimaryLegGroup+SingleElectronGroup),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
index 6103c8965b4a..51611e330760 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
@@ -1028,7 +1028,12 @@ UnconventionalTrackingChainParts_Default = {
#==========================================================
# Combined Chains
#==========================================================
-AllowedTopos_comb = ['03dRAB','03dRAB30','02dRAB','50invmAB','60invmAB','afpdijet','18dphiAB','18dphiAC','80mTAC']
+AllowedTopos_comb = [
+ '03dRAB','03dRAB30','02dRAB','02dRAC','50invmAB','60invmAB','afpdijet','18dphiAB','18dphiAC','80mTAC',
+ '1invmAB3','50invmAB130', # Jpsiee, Zee/Zeg
+ '25dphiAA','invmAA80', # Low-mass diphoton
+ '10invmAA70', # Low-mass dimuon
+ ]
# ---- Combined Dictionary of all allowed Values ----
CombinedChainParts = deepcopy(PhotonChainParts)
--
GitLab
From 906bc4a75ff833e766a3a456c7b0b29cae608aef Mon Sep 17 00:00:00 2001
From: Christian Sander <christian.sander@desy.de>
Date: Wed, 18 Aug 2021 18:30:37 +0000
Subject: [PATCH 139/272] Sctcalib 210816
---
.../SCT_CalibAlgs/scripts/sct_calib_tf.py | 14 +++++++-------
.../SCT_CalibAlgs/share/SCTCalibConfig.py | 4 ++--
.../SCT_CalibAlgs/share/skeleton.sct_calib.py | 6 ++++++
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/scripts/sct_calib_tf.py b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/scripts/sct_calib_tf.py
index 2ccad6638e02..1e866866da36 100755
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/scripts/sct_calib_tf.py
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/scripts/sct_calib_tf.py
@@ -59,7 +59,7 @@ def getDsFileName(file,input=False):
ds=file.split('#')[0]
name=file.split('#')[1]
else:
- if file.find('/') is not -1:
+ if file.find('/')!=-1:
fileparts=file.split('/')
ds=fileparts[len(fileparts)-1]
else:
@@ -380,7 +380,7 @@ class SCTCalibExecutor( athenaExecutor ):
self.conf.addToArgdict('EventNumber', trfArgClasses.argInt(0))
# Set STAGE_SVCCLASS
- if not SvcClass is '' and not SvcClass is None:
+ if not SvcClass == '' and not SvcClass == None:
os.environ['STAGE_SVCCLASS']=SvcClass
# Check input type
@@ -408,7 +408,7 @@ class SCTCalibExecutor( athenaExecutor ):
# set job number
jobnb=''
# find seperator for jobnumber
- if prefix is not '' :
+ if prefix != '' :
sep=prefix.find('._')
if ( sep != -1 ) :
jobnb=prefix[sep+1:]
@@ -456,7 +456,7 @@ class SCTCalibExecutor( athenaExecutor ):
self._trf.generateReport(fast=True)
sys.exit(0)
- if jobnb is not '':
+ if jobnb != '':
self.conf.addToArgdict('JobNumber', trfArgClasses.argString(jobnb))
# get RunNumber from datasetName
@@ -571,7 +571,7 @@ class SCTCalibExecutor( athenaExecutor ):
super(SCTCalibExecutor, self).execute()
- if self._rc is not 0:
+ if self._rc != 0:
try:
if 'less than the required minimum number of events' in open('log.sctcalib').read():
@@ -731,11 +731,11 @@ class SCTCalibExecutor( athenaExecutor ):
else:
jobnb=''
- if prefix is not '':
+ if prefix != '':
try:
if runArgs['splitHitMap']._value !=1:
os.rename('mycool.db',prefix+'.mycool.db')
- if jobnb is not '':
+ if jobnb != '':
prefixTmp = prefix + "."+ jobnb
else :
prefixTmp = prefix
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/SCTCalibConfig.py b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/SCTCalibConfig.py
index f2c0cd207b62..0f5b6f8cbd9c 100755
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/SCTCalibConfig.py
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/SCTCalibConfig.py
@@ -37,9 +37,10 @@ ReadBS = True
# - Set only one flag to True and others to False
#------------------------------------------------------------
#--- Algs using TrkVal or BS
-DoHitMap = True
+DoHitMaps = False
DoHitMapsLB = False
DoHV = False
+DoNoisyStrip = True
DoDeadStrip = False
DoDeadChip = False
DoQuietStrip = False
@@ -60,7 +61,6 @@ UseConfiguration = True
UseCalibration = True
UseMajority = True
UseBSError = False
-DoHitMaps = True
ReadHitMaps = True # True = 2 steps of HitMap production and analysis, False = simultaneous production and analysis
DoBSErrors = False
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/skeleton.sct_calib.py b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/skeleton.sct_calib.py
index f5cade09cb6c..222bfdeee5ed 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/skeleton.sct_calib.py
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/skeleton.sct_calib.py
@@ -101,6 +101,11 @@ if hasattr( runArgs, 'splitHitMap' ) :
ReadHitMaps = True
if EvtMax != 1 :
print("WARNING! EvtMax is not 1, although HitMap analysis is run!")
+else :
+ DoHitMapsLB = False
+ DoHitMaps = False
+ ReadHitMaps = False
+
#--- Setting which algorithms to be run
if hasattr( runArgs, 'part' ) :
@@ -255,6 +260,7 @@ if DoDeadStrip or DoDeadChip :
#--- set flag for creating hitmaps
if DoHV or DoHIST :
DoHitMaps = False
+ DoHitMapsLB = False
#--- set flag for creating BSErrors map
if DoDeadStrip or DoDeadChip :
DoBSErrors = True
--
GitLab
From fe9e03dc34edd94558072095cb8aacd3e9323b32 Mon Sep 17 00:00:00 2001
From: Jakob Novak <jakob.novak@cern.ch>
Date: Wed, 18 Aug 2021 18:34:19 +0000
Subject: [PATCH 140/272] BCM' GeoModelXml
---
.../InDetConfig/python/ITkConfigFlags.py | 1 +
.../BCMPrimeDetectorFactory.h | 45 +++++
.../BCMPrimeDetectorTool.h | 53 ++++++
.../BCMPrimeGmxInterface.h | 35 ++++
.../BCMPrimeGeoModelXml/BCMPrimeOptions.h | 76 ++++++++
.../BCMPrimeGeoModelXml/CMakeLists.txt | 22 +++
.../python/BCMPrimeGeoModelConfig.py | 23 +++
.../src/BCMPrimeDetectorFactory.cxx | 102 +++++++++++
.../src/BCMPrimeDetectorTool.cxx | 163 ++++++++++++++++++
.../src/BCMPrimeGmxInterface.cxx | 62 +++++++
.../BCMPrimeGeoModelXml_entries.cxx | 3 +
.../BCMPrimeDetectorManager.h | 83 +++++++++
.../BCMPrimeReadoutGeometry/CMakeLists.txt | 14 ++
.../src/BCMPrimeDetectorManager.cxx | 52 ++++++
14 files changed, 734 insertions(+)
create mode 100644 InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/BCMPrimeGeoModelXml/BCMPrimeDetectorFactory.h
create mode 100644 InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/BCMPrimeGeoModelXml/BCMPrimeDetectorTool.h
create mode 100644 InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/BCMPrimeGeoModelXml/BCMPrimeGmxInterface.h
create mode 100644 InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/BCMPrimeGeoModelXml/BCMPrimeOptions.h
create mode 100644 InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/CMakeLists.txt
create mode 100644 InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/python/BCMPrimeGeoModelConfig.py
create mode 100644 InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/src/BCMPrimeDetectorFactory.cxx
create mode 100644 InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/src/BCMPrimeDetectorTool.cxx
create mode 100644 InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/src/BCMPrimeGmxInterface.cxx
create mode 100644 InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/src/components/BCMPrimeGeoModelXml_entries.cxx
create mode 100644 InnerDetector/InDetDetDescr/BCMPrimeReadoutGeometry/BCMPrimeReadoutGeometry/BCMPrimeDetectorManager.h
create mode 100644 InnerDetector/InDetDetDescr/BCMPrimeReadoutGeometry/CMakeLists.txt
create mode 100644 InnerDetector/InDetDetDescr/BCMPrimeReadoutGeometry/src/BCMPrimeDetectorManager.cxx
diff --git a/InnerDetector/InDetConfig/python/ITkConfigFlags.py b/InnerDetector/InDetConfig/python/ITkConfigFlags.py
index 9e22248894f3..3eb9e05f4b3a 100644
--- a/InnerDetector/InDetConfig/python/ITkConfigFlags.py
+++ b/InnerDetector/InDetConfig/python/ITkConfigFlags.py
@@ -9,6 +9,7 @@ def createITkConfigFlags():
# take geometry XML files from local instance rather than Detector Database, for development
itkcf.addFlag("ITk.pixelGeometryFilename", "ITKLayouts/Pixel/ITkPixel.gmx")
itkcf.addFlag("ITk.stripGeometryFilename", "ITKLayouts/Strip/ITkStrip.gmx")
+ itkcf.addFlag("ITk.bcmPrimeGeometryFilename", "ITKLayouts/Pixel/BCMPrime.gmx")
itkcf.addFlag("ITk.doPrintConfigurables",False) # if this is on all the print(ITkXYZ) lines are activated
itkcf.addFlag("ITk.doSplitReco", False ) # Turn running of the truth seeded pseudo tracking only for pileup on and off. Only makes sense to run on RDO file where SplitDigi was used!
diff --git a/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/BCMPrimeGeoModelXml/BCMPrimeDetectorFactory.h b/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/BCMPrimeGeoModelXml/BCMPrimeDetectorFactory.h
new file mode 100644
index 000000000000..9d0f349e66f0
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/BCMPrimeGeoModelXml/BCMPrimeDetectorFactory.h
@@ -0,0 +1,45 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef BCMPRIMEGEOMODELXML_BCMPRIMEDETECTORFACTORY_H
+#define BCMPRIMEGEOMODELXML_BCMPRIMEDETECTORFACTORY_H
+
+#include "InDetGeoModelUtils/InDetDetectorFactoryBase.h"
+#include "BCMPrimeReadoutGeometry/BCMPrimeDetectorManager.h"
+
+namespace InDetDD {class AthenaComps;}
+class GeoPhysVol;
+
+namespace InDetDDSLHC {
+ class BCMPrimeOptions;
+
+ //
+ // Main routine to build the GeoModel geometry, and handle the GeometryManager and
+ // DetectorManager.
+ //
+ class BCMPrimeDetectorFactory : public InDetDD::DetectorFactoryBase {
+ public:
+
+ BCMPrimeDetectorFactory(InDetDD::AthenaComps *athenaComps,
+ BCMPrimeOptions &options);
+ virtual ~BCMPrimeDetectorFactory();
+
+ /** Creation of geometry */
+ virtual void create(GeoPhysVol *world);
+
+ /** Access to the results */
+ virtual InDetDD::BCMPrimeDetectorManager * getDetectorManager() const;
+
+ private:
+
+ // Copy and assignments operations illegal and so are made private
+ BCMPrimeDetectorFactory(BCMPrimeDetectorFactory &right);
+ BCMPrimeDetectorFactory & operator=(BCMPrimeDetectorFactory &right);
+
+ InDetDD::BCMPrimeDetectorManager *m_detectorManager;
+ InDetDD::AthenaComps *m_athenaComps;
+ BCMPrimeOptions *m_options;
+ };
+}
+#endif
diff --git a/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/BCMPrimeGeoModelXml/BCMPrimeDetectorTool.h b/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/BCMPrimeGeoModelXml/BCMPrimeDetectorTool.h
new file mode 100644
index 000000000000..7f3fef9652e4
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/BCMPrimeGeoModelXml/BCMPrimeDetectorTool.h
@@ -0,0 +1,53 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef BCMPRIMEGEOMODELXML_BCMPRIMEDETECTORTOOL_H
+#define BCMPRIMEGEOMODELXML_BCMPRIMEDETECTORTOOL_H
+
+#include "GeoModelUtilities/GeoModelTool.h"
+#include "GaudiKernel/ServiceHandle.h"
+#include "GaudiKernel/ToolHandle.h"
+
+#include <string>
+
+class IGeoModelSvc;
+class IRDBAccessSvc;
+class IGeoDbTagSvc;
+class IGeometryDBSvc;
+
+namespace InDetDD {
+ class AthenaComps;
+ class BCMPrimeDetectorManager;
+}
+
+/** @class BCMPrimeDetectorTool
+
+ Create an Athena Tool; handle Athena services and Tools needed for
+ building the BCM' geometry. Then create the geometry using the BCMPrimeDetectorFactory.
+
+ @author Jakob Novak <jakob.novak@cern.ch>
+
+ */
+
+class BCMPrimeDetectorTool : public GeoModelTool {
+ public:
+ BCMPrimeDetectorTool(const std::string &type, const std::string &name, const IInterface *parent);
+ virtual ~BCMPrimeDetectorTool();
+ StatusCode create() override final;
+ StatusCode clear() override final;
+ StatusCode registerCallback() override final;
+ virtual StatusCode align(IOVSVC_CALLBACK_ARGS_P(I,keys)) override;
+
+ private:
+ std::string m_detectorName;
+ bool m_alignable;
+ std::string m_gmxFilename;
+ const InDetDD::BCMPrimeDetectorManager *m_manager;
+ InDetDD::AthenaComps *m_athenaComps;
+ ServiceHandle<IRDBAccessSvc> m_rdbAccessSvc;
+ ServiceHandle<IGeometryDBSvc> m_geometryDBSvc;
+ ServiceHandle< IGeoDbTagSvc > m_geoDbTagSvc;
+};
+
+#endif // BCMPRIMEGEOMODELXML_BCMPRIMEDETECTORTOOL_H
diff --git a/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/BCMPrimeGeoModelXml/BCMPrimeGmxInterface.h b/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/BCMPrimeGeoModelXml/BCMPrimeGmxInterface.h
new file mode 100644
index 000000000000..2935d6c6a08e
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/BCMPrimeGeoModelXml/BCMPrimeGmxInterface.h
@@ -0,0 +1,35 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef BCMPRIMEGEOMODELXML_BCMPRIMEGMXINTERFACE_H
+#define BCMPRIMEGEOMODELXML_BCMPRIMEGMXINTERFACE_H
+
+#include "GeoModelXml/GmxInterface.h"
+
+#include <map>
+#include <memory>
+#include <sstream>
+#include <string>
+
+class MsgStream;
+namespace InDetDD {class BCMPrimeDetectorManager;}
+
+namespace ITk {
+
+ class BCMPrimeGmxInterface: public GmxInterface {
+ public:
+ BCMPrimeGmxInterface(InDetDD::BCMPrimeDetectorManager *detectorManager);
+ ~BCMPrimeGmxInterface();
+ virtual int sensorId(std::map<std::string, int> &index) const override final;
+ virtual void addAlignable(int /*level*/, std::map<std::string, int> &index,
+ GeoVFullPhysVol *fpv, GeoAlignableTransform *transform) override final;
+
+ private:
+ InDetDD::BCMPrimeDetectorManager *m_detectorManager;
+ std::unique_ptr<MsgStream> m_log;
+ };
+
+} // namespace ITk
+
+#endif // BCMPRIMEGEOMODELXML_BCMPRIMEGMXINTERFACE_H
diff --git a/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/BCMPrimeGeoModelXml/BCMPrimeOptions.h b/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/BCMPrimeGeoModelXml/BCMPrimeOptions.h
new file mode 100644
index 000000000000..fe3a0c729cf2
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/BCMPrimeGeoModelXml/BCMPrimeOptions.h
@@ -0,0 +1,76 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef BCMPRIMEGEOMODELXML_BCMPRIMEOPTIONS_H
+#define BCMPRIMEGEOMODELXML_BCMPRIMEOPTIONS_H
+#include <string>
+
+namespace InDetDDSLHC {
+
+ //
+ // Class to store run time options.
+ //
+ class BCMPrimeOptions {
+ public:
+ BCMPrimeOptions();
+ bool alignable() const;
+ bool alignAtModuleLevel() const;
+ std::string gmxFilename() const;
+ std::string detectorName() const;
+ void setAlignable(bool flag = true);
+ void setAlignAtModuleLevel(bool flag = true);
+ void setGmxFilename(std::string filename);
+ void setDetectorName(std::string detectorname);
+
+ private:
+ bool m_alignable;
+ bool m_alignModule;
+ std::string m_gmxFilename;
+ std::string m_detectorName;
+ };
+
+ //
+ // Inlined methods
+ //
+ inline BCMPrimeOptions::BCMPrimeOptions() :
+ m_alignable(true),
+ m_alignModule(true),
+ m_gmxFilename(""),
+ m_detectorName("BCMPrime")
+ {}
+
+ inline bool BCMPrimeOptions::alignable() const {
+ return m_alignable;
+ }
+
+ inline bool BCMPrimeOptions::alignAtModuleLevel() const {
+ return m_alignModule;
+ }
+
+ inline std::string BCMPrimeOptions::gmxFilename() const {
+ return m_gmxFilename;
+ }
+
+ inline std::string BCMPrimeOptions::detectorName() const {
+ return m_detectorName;
+ }
+
+ inline void BCMPrimeOptions::setAlignable(bool flag) {
+ m_alignable = flag;
+ }
+
+ inline void BCMPrimeOptions::setAlignAtModuleLevel(bool flag) {
+ m_alignModule = flag;
+ }
+
+ inline void BCMPrimeOptions::setGmxFilename(std::string filename) {
+ m_gmxFilename = filename;
+ }
+
+ inline void BCMPrimeOptions::setDetectorName(std::string detectorname) {
+ m_detectorName = detectorname;
+ }
+
+}
+#endif // BCMPRIMEGEOMODELXML_BCMPRIMEOPTIONS_H
diff --git a/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/CMakeLists.txt b/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/CMakeLists.txt
new file mode 100644
index 000000000000..3317939b6f1c
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+# Declare the package name:
+atlas_subdir( BCMPrimeGeoModelXml )
+
+# External dependencies:
+find_package( GeoModel COMPONENTS GeoModelKernel )
+
+# Component(s) in the package:
+atlas_add_library( BCMPrimeGeoModelXmlLib
+ src/*.cxx
+ PUBLIC_HEADERS BCMPrimeGeoModelXml
+ PRIVATE_INCLUDE_DIRS ${GEOMODEL_INCLUDE_DIRS}
+ LINK_LIBRARIES GaudiKernel GeoModelUtilities GeoModelXml InDetGeoModelUtils BCMPrimeReadoutGeometry
+ PRIVATE_LINK_LIBRARIES ${GEOMODEL_LIBRARIES} AthenaPoolUtilities DetDescrConditions GeoModelInterfaces GeometryDBSvcLib InDetSimEvent PathResolver RDBAccessSvcLib SGTools StoreGateLib )
+
+atlas_add_component( BCMPrimeGeoModelXml
+ src/components/*.cxx
+ LINK_LIBRARIES BCMPrimeGeoModelXmlLib )
+
+# Install files from the package:
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/python/BCMPrimeGeoModelConfig.py b/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/python/BCMPrimeGeoModelConfig.py
new file mode 100644
index 000000000000..ca94302ae4b3
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/python/BCMPrimeGeoModelConfig.py
@@ -0,0 +1,23 @@
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+from AthenaConfiguration.ComponentFactory import CompFactory
+
+
+def BCMPrimeGeometryCfg(flags):
+ from AtlasGeoModel.GeoModelConfig import GeoModelCfg
+ acc = GeoModelCfg(flags)
+ geoModelSvc = acc.getPrimary()
+
+ GeometryDBSvc = CompFactory.GeometryDBSvc
+ acc.addService(GeometryDBSvc("BCMPrimeGeometryDBSvc"))
+
+ BCMPrimeDetectorTool = CompFactory.BCMPrimeDetectorTool
+ bcmPrimeDetectorTool = BCMPrimeDetectorTool()
+ bcmPrimeDetectorTool.Alignable = False # make this a flag? Set true as soon as decided on folder structure
+ bcmPrimeDetectorTool.DetectorName = "BCMPrime"
+ if flags.GeoModel.useLocalGeometry:
+ # Setting this filename triggers reading from local file rather than DB
+ bcmPrimeDetectorTool.GmxFilename = flags.ITk.bcmPrimeGeometryFilename
+ geoModelSvc.DetectorTools += [ bcmPrimeDetectorTool ]
+
+ return acc
diff --git a/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/src/BCMPrimeDetectorFactory.cxx b/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/src/BCMPrimeDetectorFactory.cxx
new file mode 100644
index 000000000000..3e46bc301682
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/src/BCMPrimeDetectorFactory.cxx
@@ -0,0 +1,102 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "BCMPrimeGeoModelXml/BCMPrimeDetectorFactory.h"
+#include "BCMPrimeReadoutGeometry/BCMPrimeDetectorManager.h"
+
+#include <string>
+#include <sstream>
+
+#include "StoreGate/StoreGateSvc.h" // For alignment getAlignableFolderType()
+#include "AthenaPoolUtilities/CondAttrListCollection.h"
+#include "DetDescrConditions/AlignableTransformContainer.h"
+
+#include "InDetGeoModelUtils/InDetDDAthenaComps.h"
+#include "GeoModelKernel/GeoPhysVol.h"
+#include "GeoModelInterfaces/IGeoModelSvc.h"
+
+#include "RDBAccessSvc/IRDBAccessSvc.h"
+#include "RDBAccessSvc/IRDBRecordset.h"
+#include "RDBAccessSvc/IRDBRecord.h"
+
+#include "BCMPrimeGeoModelXml/BCMPrimeOptions.h"
+#include "GeoModelXml/Gmx2Geo.h"
+#include "BCMPrimeGeoModelXml/BCMPrimeGmxInterface.h"
+#include "GeoModelXml/GmxInterface.h"
+
+#include "PathResolver/PathResolver.h"
+
+using namespace std;
+
+namespace InDetDDSLHC {
+
+ BCMPrimeDetectorFactory::BCMPrimeDetectorFactory(InDetDD::AthenaComps *athenaComps,
+ BCMPrimeOptions &options) :
+ InDetDD::DetectorFactoryBase(athenaComps),
+ m_athenaComps(athenaComps),
+ m_options(&options)
+ {
+
+ // Create the detector manager
+ m_detectorManager = new InDetDD::BCMPrimeDetectorManager(detStore(),m_options->detectorName());
+ }
+
+ BCMPrimeDetectorFactory::~BCMPrimeDetectorFactory() {
+ // NB the detector manager (m_detectorManager) is stored in the detector store by the Tool and so we don't delete it.
+ }
+
+ void BCMPrimeDetectorFactory::create(GeoPhysVol *world) {
+ ATH_MSG_INFO( "C R E A T E W O R L D" );
+
+ ITk::BCMPrimeGmxInterface gmxInterface(m_detectorManager);
+ // To set up solid geometry only, without having to worry about sensitive detectors etc., and get loads of debug output,
+ // comment out above line and uncomment the following line; also, switch header files above.
+ // GmxInterface gmxInterface;
+
+ int flags(0);
+ string gmxInput;
+
+ if (m_options->gmxFilename().empty()) {
+ ATH_MSG_ERROR( "gmxFilename not set; getting .gmx from Geometry database Blob not supported");
+ // gmxInput = getBlob();
+ }
+ else {
+ flags = 0;
+ gmxInput = PathResolver::find_file(m_options->gmxFilename(), "DATAPATH");
+ if (gmxInput.empty()) { // File not found
+ string errMessage("BCMPrimeDetectorFactory::create: Unable to find file " + m_options->gmxFilename() +
+ " with PathResolver; check filename and DATAPATH environment variable");
+ throw runtime_error(errMessage);
+ }
+ }
+
+ Gmx2Geo gmx2Geo(gmxInput, world, gmxInterface, flags);
+
+ //
+ // Add the tree-top to the detector manager.
+ //
+ unsigned int nChildren = world->getNChildVols();
+ bool foundVolume = false;
+
+ for (int iChild = nChildren - 1; iChild>=0; --iChild) {
+ if (world->getNameOfChildVol(iChild) == "BCMPrime") {
+ // The * converts from a ConstPVLink to a reference to a GeoVPhysVol;
+ // the & takes its address.
+ foundVolume = true;
+ m_detectorManager->addTreeTop(&*world->getChildVol(iChild));
+ break;
+ }
+ }
+
+ if(!foundVolume) ATH_MSG_ERROR("Could not find a logicalVolume named \"BCMPrime\" - this is required to provide the Envelope!");
+
+ }
+
+ InDetDD::BCMPrimeDetectorManager * BCMPrimeDetectorFactory::getDetectorManager() const {
+ return m_detectorManager;
+ }
+
+
+}
+
diff --git a/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/src/BCMPrimeDetectorTool.cxx b/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/src/BCMPrimeDetectorTool.cxx
new file mode 100644
index 000000000000..d5a92a63ea88
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/src/BCMPrimeDetectorTool.cxx
@@ -0,0 +1,163 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "BCMPrimeGeoModelXml/BCMPrimeDetectorTool.h"
+#include "BCMPrimeGeoModelXml/BCMPrimeDetectorFactory.h"
+#include "BCMPrimeGeoModelXml/BCMPrimeOptions.h"
+#include "InDetGeoModelUtils/InDetDDAthenaComps.h"
+#include "GeoModelUtilities/GeoModelExperiment.h"
+#include "GeoModelInterfaces/IGeoModelSvc.h"
+#include "StoreGate/StoreGateSvc.h"
+#include "GeometryDBSvc/IGeometryDBSvc.h"
+#include "RDBAccessSvc/IRDBAccessSvc.h"
+#include "RDBAccessSvc/IRDBRecord.h"
+#include "RDBAccessSvc/IRDBRecordset.h"
+#include "DetDescrConditions/AlignableTransformContainer.h"
+#include "SGTools/DataProxy.h"
+
+BCMPrimeDetectorTool::BCMPrimeDetectorTool(const std::string &type,
+ const std::string &name,
+ const IInterface *parent) :
+ GeoModelTool(type, name, parent),
+ m_detectorName("BCMPrime"),
+ m_alignable(false),
+ m_gmxFilename(""),
+ m_manager(nullptr),
+ m_athenaComps(nullptr),
+ m_rdbAccessSvc("RDBAccessSvc", name),
+ m_geometryDBSvc("InDetGeometryDBSvc", name),
+ m_geoDbTagSvc{"GeoDbTagSvc", name}
+
+ {
+
+ //
+ // Get parameter values from jobOptions file
+ //
+ declareProperty("DetectorName", m_detectorName);
+ declareProperty("Alignable", m_alignable);
+ declareProperty("GmxFilename", m_gmxFilename);
+ declareProperty("RDBAccessSvc", m_rdbAccessSvc);
+ declareProperty("GeometryDBSvc", m_geometryDBSvc);
+ declareProperty("GeoDbTagSvc", m_geoDbTagSvc);
+
+}
+
+BCMPrimeDetectorTool::~BCMPrimeDetectorTool() {
+ delete m_athenaComps;
+}
+
+StatusCode BCMPrimeDetectorTool::create() {
+
+ //
+ // Retrieve all services
+ //
+ // Get the detector configuration.
+ ATH_CHECK(m_geoDbTagSvc.retrieve());
+ ATH_CHECK(m_rdbAccessSvc.retrieve());
+ ATH_CHECK(m_geometryDBSvc.retrieve());
+ GeoModelExperiment *theExpt;
+ ATH_CHECK(detStore()->retrieve(theExpt, "ATLAS"));
+
+ //
+ // Get their interfaces to pass to the DetectorFactory
+ //
+ m_athenaComps = new InDetDD::AthenaComps("BCMPrimeGeoModelXml");
+ m_athenaComps->setDetStore(&*(detStore()));
+ m_athenaComps->setRDBAccessSvc(&*m_rdbAccessSvc);
+ m_athenaComps->setGeometryDBSvc(&*m_geometryDBSvc);
+ m_athenaComps->setGeoDbTagSvc(&*m_geoDbTagSvc);
+
+ //
+ // Get options from python
+ //
+ InDetDDSLHC::BCMPrimeOptions options;
+ options.setAlignable(m_alignable);
+ options.setGmxFilename(m_gmxFilename);
+ options.setDetectorName(m_detectorName);
+
+ //
+ // Create the BCMPrimeDetectorFactory
+ //
+ // The * converts a ConstPVLink to a ref to a GeoVPhysVol
+ // The & takes the address of the GeoVPhysVol
+ GeoPhysVol *world = &*theExpt->getPhysVol();
+ InDetDDSLHC::BCMPrimeDetectorFactory bcmPrime(m_athenaComps, options);
+ bcmPrime.create(world);
+
+ //
+ // Get the manager from the factory and store it in the detector store.
+ //
+ m_manager = bcmPrime.getDetectorManager();
+
+ if (!m_manager) {
+ ATH_MSG_ERROR( "PixelDetectorManager not found; not created in BCMPrimeDetectorFactory?" );
+ return(StatusCode::FAILURE);
+ }
+
+ StatusCode sc;
+ sc = detStore()->record(m_manager, m_manager->getName());
+ if (sc.isFailure() ) {
+ ATH_MSG_ERROR( "Could not register BCMPrimeDetectorManager" );
+ return StatusCode::FAILURE;
+ }
+ theExpt->addManager(m_manager);
+
+ return StatusCode::SUCCESS;
+}
+
+StatusCode BCMPrimeDetectorTool::clear() {
+ SG::DataProxy* proxy = detStore()->proxy(ClassID_traits<InDetDD::BCMPrimeDetectorManager>::ID(),m_manager->getName());
+ if(proxy) {
+ proxy->reset();
+ m_manager = nullptr;
+ }
+ return StatusCode::SUCCESS;
+}
+
+StatusCode BCMPrimeDetectorTool::registerCallback() {
+
+ //
+ // Register call-back for software alignment
+ //
+ StatusCode sc = StatusCode::FAILURE;
+ if (m_alignable) {
+ std::string folderName = "/ITk/Align";
+ if (detStore()->contains<AlignableTransformContainer>(folderName)) {
+ ATH_MSG_DEBUG( "Registering callback on AlignableTransformContainer with folder " << folderName );
+ const DataHandle<AlignableTransformContainer> atc;
+ sc = detStore()->regFcn(&IGeoModelTool::align, dynamic_cast<IGeoModelTool *>(this), atc, folderName);
+ if(sc.isFailure()) {
+ ATH_MSG_ERROR( "Could not register callback on AlignableTransformContainer with folder " <<
+ folderName );
+ }
+ }
+ else {
+ ATH_MSG_WARNING( "Unable to register callback on AlignableTransformContainer with folder " <<
+ folderName << ", Alignment disabled (only if no Run2 scheme is loaded)!" );
+ }
+ }
+ else {
+ ATH_MSG_INFO( "Alignment disabled. No callback registered" );
+ // We return failure otherwise it will try and register a GeoModelSvc callback associated with this callback.
+ }
+ return sc;
+}
+
+StatusCode BCMPrimeDetectorTool::align(IOVSVC_CALLBACK_ARGS_P(I, keys)) {
+
+ //
+ // The call-back routine, which just calls the real call-back routine from the manager.
+ //
+ if (!m_manager) {
+ ATH_MSG_WARNING( "Manager does not exist" );
+ return StatusCode::FAILURE;
+ }
+ if (m_alignable) {
+ return m_manager->align(I, keys);
+ }
+ else {
+ ATH_MSG_DEBUG( "Alignment disabled. No alignments applied" );
+ return StatusCode::SUCCESS;
+ }
+}
diff --git a/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/src/BCMPrimeGmxInterface.cxx b/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/src/BCMPrimeGmxInterface.cxx
new file mode 100644
index 000000000000..2a60d023a495
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/src/BCMPrimeGmxInterface.cxx
@@ -0,0 +1,62 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "BCMPrimeGeoModelXml/BCMPrimeGmxInterface.h"
+
+#include <cstdlib>
+#include <sstream>
+
+#include "InDetSimEvent/SiHitIdHelper.h"
+
+#include "GaudiKernel/ServiceHandle.h"
+#include "GaudiKernel/IMessageSvc.h"
+#include "GaudiKernel/MsgStream.h"
+
+#include "BCMPrimeReadoutGeometry/BCMPrimeDetectorManager.h"
+
+using namespace std;
+
+namespace ITk {
+
+ BCMPrimeGmxInterface::BCMPrimeGmxInterface(InDetDD::BCMPrimeDetectorManager *detectorManager):
+ m_detectorManager(detectorManager)
+ {
+ // Logging: ref https://wiki.bnl.gov/dayabay/index.php?title=Logging
+ // Turn on logging in job-options with: MessageSvc.setDebug += {"BCMPrimeGmxInterface"}
+ ServiceHandle<IMessageSvc> msgh("MessageSvc", "BCMPrimeGmxInterface");
+
+ m_log = std::make_unique<MsgStream>(&(*msgh), "BCMPrimeGmxInterface");
+
+ }
+
+ BCMPrimeGmxInterface::~BCMPrimeGmxInterface() {
+ }
+
+ int BCMPrimeGmxInterface::sensorId(map<string, int> &index) const {
+ //
+ // Return the Simulation HitID (nothing to do with "ATLAS Identifiers" aka "Offline Identifiers")
+ //
+
+ int hitIdOfModule = SiHitIdHelper::GetHelper()->buildHitId(0, 0, index["diamond_number"],
+ index["module_number"], 0, 0);
+
+ *m_log << MSG::DEBUG << "Index list: " << index["diamond_number"] << " " << index["module_number"] << endmsg;
+ *m_log << MSG::DEBUG << "hitIdOfModule = " << std::hex << hitIdOfModule << std::dec << endmsg;
+ *m_log << MSG::DEBUG << " dia = " << SiHitIdHelper::GetHelper()->getLayerDisk(hitIdOfModule) <<
+ " mod = " << SiHitIdHelper::GetHelper()->getEtaModule(hitIdOfModule) << endmsg;
+ return hitIdOfModule;
+ }
+
+ void BCMPrimeGmxInterface::addAlignable(int /*level*/, std::map<std::string, int> &index,
+ GeoVFullPhysVol *fpv, GeoAlignableTransform *transform)
+ {
+ *m_log << MSG::DEBUG << "alignable transform added for indices: " << index["diamond_number"] << " " << index["module_number"] << endmsg;
+
+ // A preliminary id scheme
+ int id = index["diamond_number"] + 8*index["module_number"];
+
+ m_detectorManager->addAlignableTransform(id, transform, fpv);
+ }
+
+} // namespace ITk
diff --git a/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/src/components/BCMPrimeGeoModelXml_entries.cxx b/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/src/components/BCMPrimeGeoModelXml_entries.cxx
new file mode 100644
index 000000000000..8b044e46b9f4
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/src/components/BCMPrimeGeoModelXml_entries.cxx
@@ -0,0 +1,3 @@
+#include "BCMPrimeGeoModelXml/BCMPrimeDetectorTool.h"
+
+DECLARE_COMPONENT( BCMPrimeDetectorTool )
diff --git a/InnerDetector/InDetDetDescr/BCMPrimeReadoutGeometry/BCMPrimeReadoutGeometry/BCMPrimeDetectorManager.h b/InnerDetector/InDetDetDescr/BCMPrimeReadoutGeometry/BCMPrimeReadoutGeometry/BCMPrimeDetectorManager.h
new file mode 100644
index 000000000000..959d5f46362b
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/BCMPrimeReadoutGeometry/BCMPrimeReadoutGeometry/BCMPrimeDetectorManager.h
@@ -0,0 +1,83 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef BCMPRIMEREADOUTGEOMETRY_BCMPRIMEDETECTORMANAGER_H
+#define BCMPRIMEREADOUTGEOMETRY_BCMPRIMEDETECTORMANAGER_H
+
+#include "GeoPrimitives/GeoPrimitives.h"
+
+#include "GeoModelKernel/GeoVPhysVol.h"
+#include "GeoModelKernel/GeoVDetectorManager.h"
+
+#include "GeoModelKernel/GeoAlignableTransform.h"
+
+// Message Stream Member
+#include "AthenaKernel/MsgStreamMember.h"
+
+#include "AthenaKernel/IIOVSvc.h"
+
+class StoreGateSvc;
+
+/** @class BCMPrimeDetectorManager
+
+ The Detector manager registers the call backs and infrastructure to
+ associate the alignment transforms with the appropriate alignable
+ transform in GeoModel.
+
+ @author Jakob Novak <jakob.novak@cern.ch>
+
+ */
+
+namespace InDetDD {
+
+ class BCMPrimeDetectorManager : public GeoVDetectorManager {
+ public:
+
+ /** Constructor */
+ BCMPrimeDetectorManager(StoreGateSvc* detStore, const std::string & name);
+
+ /** Destructor */
+ ~BCMPrimeDetectorManager();
+
+ /** Access to raw geometry: */
+ virtual unsigned int getNumTreeTops() const;
+ virtual PVConstLink getTreeTop(unsigned int i) const;
+
+ /** Add a Tree top: */
+ virtual void addTreeTop (PVLink treeTop);
+
+ void addAlignableTransform (int /*id*/, GeoAlignableTransform * /*transform*/, const GeoVPhysVol * /*child*/);
+ StatusCode align( IOVSVC_CALLBACK_ARGS ) const;
+
+ /** Declaring the Message method for further use */
+ MsgStream& msg (MSG::Level lvl) const { return m_msg.get() << lvl; }
+
+ /** Declaring the Method providing Verbosity Level */
+ bool msgLvl (MSG::Level lvl) const { return m_msg.get().level() <= lvl; }
+
+ private:
+
+ /** Prevent copy and assignment */
+ const BCMPrimeDetectorManager & operator=(const BCMPrimeDetectorManager &right);
+ BCMPrimeDetectorManager(const BCMPrimeDetectorManager &right);
+
+ /** Private member data */
+ std::vector<PVLink> m_volume;
+
+ /** Detector store */
+ StoreGateSvc * m_detStore;
+
+ /** Declaring private message stream member */
+ mutable Athena::MsgStreamMember m_msg;
+
+ };
+
+} // namespace InDetDD
+
+#ifndef GAUDI_NEUTRAL
+#include "AthenaKernel/CLASS_DEF.h"
+CLASS_DEF(InDetDD::BCMPrimeDetectorManager, 162824294, 1)
+#endif
+
+#endif // BCMPRIMEREADOUTGEOMETRY_BCMPRIMEDETECTORMANAGER_H
diff --git a/InnerDetector/InDetDetDescr/BCMPrimeReadoutGeometry/CMakeLists.txt b/InnerDetector/InDetDetDescr/BCMPrimeReadoutGeometry/CMakeLists.txt
new file mode 100644
index 000000000000..3840b153e71e
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/BCMPrimeReadoutGeometry/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+# Declare the package name:
+atlas_subdir( BCMPrimeReadoutGeometry )
+
+# External dependencies:
+find_package( GeoModel COMPONENTS GeoModelKernel )
+
+atlas_add_library( BCMPrimeReadoutGeometry
+ src/*.cxx
+ PUBLIC_HEADERS BCMPrimeReadoutGeometry
+ LINK_LIBRARIES ${GEOMODEL_LIBRARIES} AthenaKernel CxxUtils GeoPrimitives
+ PRIVATE_LINK_LIBRARIES AthenaBaseComps AthenaPoolUtilities )
+
diff --git a/InnerDetector/InDetDetDescr/BCMPrimeReadoutGeometry/src/BCMPrimeDetectorManager.cxx b/InnerDetector/InDetDetDescr/BCMPrimeReadoutGeometry/src/BCMPrimeDetectorManager.cxx
new file mode 100644
index 000000000000..333c1eb595f8
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/BCMPrimeReadoutGeometry/src/BCMPrimeDetectorManager.cxx
@@ -0,0 +1,52 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "BCMPrimeReadoutGeometry/BCMPrimeDetectorManager.h"
+
+#include "AthenaBaseComps/AthMsgStreamMacros.h"
+
+namespace InDetDD {
+
+ BCMPrimeDetectorManager::BCMPrimeDetectorManager(StoreGateSvc* detStore, const std::string & name)
+ : m_detStore(detStore)
+ {
+ setName(name);
+ }
+
+ BCMPrimeDetectorManager::~BCMPrimeDetectorManager() {
+
+ //
+ // Clean up
+ //
+ for (size_t i=0; i < m_volume.size(); i++) {
+ m_volume[i]->unref();
+ }
+ }
+
+ unsigned int BCMPrimeDetectorManager::getNumTreeTops() const {
+ return m_volume.size();
+ }
+
+ PVConstLink BCMPrimeDetectorManager::getTreeTop(unsigned int i) const {
+ return m_volume[i];
+ }
+
+ void BCMPrimeDetectorManager::addTreeTop(PVLink vol) {
+ vol->ref();
+ m_volume.push_back(vol);
+ }
+
+ void BCMPrimeDetectorManager::addAlignableTransform(int /*id*/,
+ GeoAlignableTransform * /*transform*/,
+ const GeoVPhysVol * /*child*/)
+ {
+ // Here alignment transforms will be added
+ }
+
+ StatusCode BCMPrimeDetectorManager::align( IOVSVC_CALLBACK_ARGS_P( /*I*/, /*keys*/) ) const {
+ // Here alignment transform deltas will be set
+ return StatusCode::SUCCESS;
+ }
+
+} // namespace InDetDD
--
GitLab
From 971e92363e1666eb8223d06a8bda6622e129a3bd Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Wed, 18 Aug 2021 19:41:47 +0200
Subject: [PATCH 141/272] L1BunchGroupSet: add bgPattern() method
Add the `bgPattern()` method to `L1BunchGroupSet` which returns the
bunchgroup "bit-pattern" that is stored in the `TrigDecision` object.
Also move the `s_maxBunchGroups` constant from `L1BunchGroup` to
`L1BunchGroupSet` where it belongs and make it private. Apply a few
minor code cleanups and inline some trivial functions.
---
.../TrigConfData/L1BunchGroupSet.h | 29 ++++++----
.../TrigConfData/src/L1BunchGroupSet.cxx | 56 ++++++-------------
2 files changed, 35 insertions(+), 50 deletions(-)
diff --git a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1BunchGroupSet.h b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1BunchGroupSet.h
index 8e734111cf55..030a06ab53ac 100644
--- a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1BunchGroupSet.h
+++ b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1BunchGroupSet.h
@@ -35,15 +35,15 @@ namespace TrigConf {
/** Destructor */
virtual ~L1BunchGroup();
- virtual std::string className() const override;
+ virtual std::string className() const override { return "L1BunchGroup"; }
- size_t id() const;
+ size_t id() const { return m_id; }
/** Accessor to the number of bunches */
std::size_t size() const;
/** Accessor to the number of groups of consecutive bunches */
- size_t nGroups() const;
+ size_t nGroups() const { return m_bunchdef.size(); }
/** check if bunchgroup contains a certain bunch */
bool contains(size_t bcid) const;
@@ -52,11 +52,7 @@ namespace TrigConf {
std::vector<uint16_t> bunches() const;
/** bunch trains (pairs: 1st bunch in train, and train length) */
- const std::vector<std::pair<size_t,size_t>>& trains() const;
-
- public:
-
- static const size_t s_maxBunchGroups { 16 }; // this is the hardware-imposed limit
+ const std::vector<std::pair<size_t,size_t>>& trains() const { return m_bunchdef; }
private:
@@ -75,6 +71,9 @@ namespace TrigConf {
class L1BunchGroupSet final : public DataStructure {
public:
+ /** type for bunchgroup pattern bitset */
+ typedef uint16_t bgPattern_t;
+
/** Constructor */
L1BunchGroupSet();
@@ -90,11 +89,11 @@ namespace TrigConf {
/** Destructor */
virtual ~L1BunchGroupSet();
- virtual std::string className() const override;
+ virtual std::string className() const override { return "L1BunchGroupSet"; }
/** setter and getter for the bunch group key */
- unsigned int bgsk() const;
- void setBGSK(unsigned int bgsk);
+ unsigned int bgsk() const { return m_bgsk; }
+ void setBGSK(unsigned int bgsk) { m_bgsk = bgsk; }
/** Accessor to the bunchgroup by name
* @param name - name as used in the L1Menu (BGRP0, BGRP1, ..., BGRP15)
@@ -105,7 +104,7 @@ namespace TrigConf {
const std::shared_ptr<L1BunchGroup> & getBunchGroup(size_t id) const;
/** Maximum number of bunchgroups */
- std::size_t maxNBunchGroups() const { return L1BunchGroup::s_maxBunchGroups; }
+ constexpr std::size_t maxNBunchGroups() const { return L1BunchGroupSet::s_maxBunchGroups; }
/** Accessor to the number of defined bunchgroups */
std::size_t size() const;
@@ -113,6 +112,9 @@ namespace TrigConf {
/** Accessor to the number of non-empty bunchgroups */
std::size_t sizeNonEmpty() const;
+ /** Return word with bit-pattern of fired bunchgroups for given bcid */
+ bgPattern_t bgPattern(size_t bcid) const;
+
/** print a more or less detailed summary */
void printSummary(bool detailed = false) const;
@@ -125,6 +127,9 @@ namespace TrigConf {
virtual void update() override { load(); };
void load();
+ /** Hardware limit for number of bunch group */
+ static const size_t s_maxBunchGroups { 16 };
+
/** the bunch group key */
unsigned int m_bgsk {0};
diff --git a/Trigger/TrigConfiguration/TrigConfData/src/L1BunchGroupSet.cxx b/Trigger/TrigConfiguration/TrigConfData/src/L1BunchGroupSet.cxx
index d98a29c7c57f..c0552fdb27fd 100644
--- a/Trigger/TrigConfiguration/TrigConfData/src/L1BunchGroupSet.cxx
+++ b/Trigger/TrigConfiguration/TrigConfData/src/L1BunchGroupSet.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "TrigConfData/L1BunchGroupSet.h"
@@ -21,11 +21,6 @@ TrigConf::L1BunchGroup::L1BunchGroup( const boost::property_tree::ptree & data )
TrigConf::L1BunchGroup::~L1BunchGroup()
{}
-std::string
-TrigConf::L1BunchGroup::className() const {
- return "L1BunchGroup";
-}
-
void
TrigConf::L1BunchGroup::load()
{
@@ -41,11 +36,6 @@ TrigConf::L1BunchGroup::load()
}
}
-size_t
-TrigConf::L1BunchGroup::id() const {
- return m_id;
-}
-
size_t
TrigConf::L1BunchGroup::size() const {
size_t nb = 0;
@@ -55,11 +45,6 @@ TrigConf::L1BunchGroup::size() const {
return nb;
}
-size_t
-TrigConf::L1BunchGroup::nGroups() const {
- return m_bunchdef.size();
-}
-
bool
TrigConf::L1BunchGroup::contains(size_t bcid) const {
for ( const auto & train : m_bunchdef ) {
@@ -86,18 +71,17 @@ TrigConf::L1BunchGroup::bunches() const
return bunches;
}
-const std::vector<std::pair<size_t,size_t>>&
-TrigConf::L1BunchGroup::trains() const {
- return m_bunchdef;
-}
/*****************************************
L1BunchGroupSet
*****************************************/
+
+
TrigConf::L1BunchGroupSet::L1BunchGroupSet()
-{}
+{
+}
TrigConf::L1BunchGroupSet::L1BunchGroupSet( const boost::property_tree::ptree & data )
: DataStructure(data)
@@ -108,11 +92,6 @@ TrigConf::L1BunchGroupSet::L1BunchGroupSet( const boost::property_tree::ptree &
TrigConf::L1BunchGroupSet::~L1BunchGroupSet()
{}
-std::string
-TrigConf::L1BunchGroupSet::className() const {
- return "L1BunchGroupSet";
-}
-
void
TrigConf::L1BunchGroupSet::load()
{
@@ -120,7 +99,7 @@ TrigConf::L1BunchGroupSet::load()
return;
}
m_name = getAttribute("name", true, m_name);
- m_bunchGroups.resize(L1BunchGroup::s_maxBunchGroups, std::shared_ptr<L1BunchGroup>(nullptr)); // 16 bunchgroups are fix in the hardware
+ m_bunchGroups.resize(s_maxBunchGroups, std::shared_ptr<L1BunchGroup>(nullptr));
for( auto & bg : data().get_child("bunchGroups") ) {
auto bg_sptr = std::make_shared<L1BunchGroup>(bg.second);
m_bunchGroupsByName.emplace( std::piecewise_construct,
@@ -148,17 +127,6 @@ TrigConf::L1BunchGroupSet::getBunchGroup(size_t id) const {
return m_bunchGroups[id];
}
-unsigned int
-TrigConf::L1BunchGroupSet::bgsk() const {
- return m_bgsk;
-}
-
-void
-TrigConf::L1BunchGroupSet::setBGSK(unsigned int bgsk) {
- m_bgsk = bgsk;
-}
-
-
std::size_t
TrigConf::L1BunchGroupSet::size() const {
return std::count_if(m_bunchGroups.begin(), m_bunchGroups.end(), [](const auto &bg){return bg!=nullptr;});
@@ -169,6 +137,18 @@ TrigConf::L1BunchGroupSet::sizeNonEmpty() const {
return std::count_if(m_bunchGroups.begin(), m_bunchGroups.end(), [](const auto &bg){return bg->size()!=0;});
}
+TrigConf::L1BunchGroupSet::bgPattern_t
+TrigConf::L1BunchGroupSet::bgPattern(size_t bcid) const {
+ // sanity check that we have enough bits in bgPattern_t for all bunchgroups
+ static_assert(sizeof(bgPattern_t)*8 >= s_maxBunchGroups);
+
+ bgPattern_t p{0};
+ for (size_t i = 0; i < s_maxBunchGroups; ++i) {
+ if (m_bunchGroups[i]->contains(bcid)) p += (1 << i);
+ }
+ return p;
+}
+
void
TrigConf::L1BunchGroupSet::printSummary(bool detailed) const {
std::cout << "Name '" << name() << "'" << std::endl;
--
GitLab
From 10eb76d39aefbf2d8e6e331016a0c4aba1696c1f Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Wed, 18 Aug 2021 13:45:48 +0200
Subject: [PATCH 142/272] Lvl1ResultAccessTool: remove support for legacy
trigger configuration
---
.../python/TrigDecisionMakerConfig.py | 11 ----
.../src/Lvl1ResultAccessTool.cxx | 63 +++++--------------
.../src/Lvl1ResultAccessTool.h | 9 ---
3 files changed, 16 insertions(+), 67 deletions(-)
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/python/TrigDecisionMakerConfig.py b/Trigger/TrigAnalysis/TrigDecisionMaker/python/TrigDecisionMakerConfig.py
index b71877e3ae48..4f6170a8c83d 100644
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/python/TrigDecisionMakerConfig.py
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/python/TrigDecisionMakerConfig.py
@@ -8,15 +8,6 @@ class TrigDecisionMaker( TrigDec__TrigDecisionMaker ):
__slots__ = []
def __init__(self, name = "TrigDecMaker"):
super( TrigDecisionMaker, self ).__init__( name )
- log = logging.getLogger( 'TrigDecisionMaker' )
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
- log.info("Setting UseNewConfig to %s (based off of ConfigFlags.Trigger.doConfigVersionConversion)", ConfigFlags.Trigger.doConfigVersionConversion)
- self.Lvl1ResultAccessTool.UseNewConfig = ConfigFlags.Trigger.doConfigVersionConversion
- from AthenaCommon.AppMgr import ServiceMgr as svcMgr
- if hasattr(svcMgr,'DSConfigSvc'):
- # this case is still needed for reading Run 2 configuration from the TriggerDB
- self.Lvl1ResultAccessTool.LVL1ConfigSvc = "TrigConfigSvc"
-
class TrigDecisionMakerMT( TrigDec__TrigDecisionMakerMT ):
@@ -24,7 +15,6 @@ class TrigDecisionMakerMT( TrigDec__TrigDecisionMakerMT ):
def __init__(self, name = "TrigDecMakerMT"):
super( TrigDecisionMakerMT, self ).__init__( name )
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- self.Lvl1ResultAccessTool.UseNewConfig = ConfigFlags.Trigger.readLVL1FromJSON
# Schedule also the prescale conditions algs
from AthenaCommon.Configurable import Configurable
Configurable.configurableRun3Behavior += 1
@@ -140,7 +130,6 @@ class WriteTrigDecisionToStream ( object ) :
class WritexAODTrigDecision ( object ) :
def __init__(self):
- from AthenaCommon.Logging import logging
from AthenaCommon.AlgSequence import AlgSequence
from xAODTriggerCnv.xAODTriggerCnvConf import (xAODMaker__TrigDecisionCnvAlg,
xAODMaker__TrigDecisionCnvTool,
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/src/Lvl1ResultAccessTool.cxx b/Trigger/TrigAnalysis/TrigDecisionMaker/src/Lvl1ResultAccessTool.cxx
index 2231d3dd81fc..2b3d866d4db1 100755
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/src/Lvl1ResultAccessTool.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/src/Lvl1ResultAccessTool.cxx
@@ -7,12 +7,6 @@
#include "TrigT1Result/RoIBResult.h"
#include "CTPfragment/CTPdataformatVersion.h"
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
-#include "TrigConfL1Data/CTPConfig.h"
-#include "TrigConfL1Data/ThresholdConfig.h"
-#include "TrigConfL1Data/PrescaleSet.h"
-#include "TrigConfL1Data/Menu.h"
-#include "TrigConfL1Data/TriggerItem.h"
#include "TrigConfData/L1Menu.h"
#include "TrigConfHLTData/HLTUtils.h"
#include "TrigSteeringEvent/Lvl1Result.h"
@@ -26,19 +20,10 @@ HLT::Lvl1ResultAccessTool::Lvl1ResultAccessTool(const std::string& name, const s
StatusCode
HLT::Lvl1ResultAccessTool::initialize() {
- // Get LVL1 Config Svc handle:
- if(m_lvl1ConfigSvc.empty()) {
- ATH_MSG_FATAL("no TrigConfigSvc set in the jobOptions-> abort");
- return StatusCode::FAILURE;
- }
- ATH_MSG_INFO("Initializing with UseNewConfig = " << m_useNewConfig);
- ATH_CHECK( m_l1PrescaleSetInputKey.initialize( m_useNewConfig ) );
+ ATH_CHECK( m_l1PrescaleSetInputKey.initialize( ) );
ATH_CHECK( m_l1ResultKey.initialize( ) );
- ATH_MSG_DEBUG("Retrieving TrigConfigSvc.");
- CHECK( m_lvl1ConfigSvc.retrieve() );
-
return StatusCode::SUCCESS;
}
@@ -54,42 +39,26 @@ HLT::Lvl1ResultAccessTool::makeLvl1ItemConfig(const EventContext& context) const
constexpr size_t numberOfCTPItems = 512; // this is fixed
std::vector<std::unique_ptr<LVL1CTP::Lvl1Item>> lvl1ItemConfig(numberOfCTPItems);
- if( m_useNewConfig ) {
- const TrigConf::L1Menu *l1menu = nullptr;
- if( detStore()->retrieve(l1menu).isFailure() ) {
- ATH_MSG_ERROR("No L1Menu found");
+ const TrigConf::L1Menu *l1menu = nullptr;
+ if( detStore()->retrieve(l1menu).isFailure() ) {
+ ATH_MSG_ERROR("No L1Menu found");
+ } else {
+ SG::ReadCondHandle<TrigConf::L1PrescalesSet> l1psRH(m_l1PrescaleSetInputKey, context);
+ if( !l1psRH.isValid() ) {
+ ATH_MSG_ERROR("No valid L1PrescalesSet handle");
} else {
- SG::ReadCondHandle<TrigConf::L1PrescalesSet> l1psRH(m_l1PrescaleSetInputKey, context);
- if( !l1psRH.isValid() ) {
- ATH_MSG_ERROR("No valid L1PrescalesSet handle");
+ const TrigConf::L1PrescalesSet* l1PrescaleSet{*l1psRH};
+ if(l1PrescaleSet == nullptr) {
+ ATH_MSG_ERROR( "No L1PrescalesSet available");
} else {
- const TrigConf::L1PrescalesSet* l1PrescaleSet{*l1psRH};
- if(l1PrescaleSet == nullptr) {
- ATH_MSG_ERROR( "No L1PrescalesSet available");
- } else {
- for(auto & item : *l1menu) {
- double prescale = l1PrescaleSet->getPrescaleFromCut(l1PrescaleSet->prescale(item.name()).cut);
- lvl1ItemConfig[item.ctpId()] = std::make_unique<LVL1CTP::Lvl1Item>( item.name(),
- TrigConf::HLTUtils::string2hash(item.name()),
- 0, 0, 0, prescale);
- }
+ for(auto & item : *l1menu) {
+ double prescale = l1PrescaleSet->getPrescaleFromCut(l1PrescaleSet->prescale(item.name()).cut);
+ lvl1ItemConfig[item.ctpId()] = std::make_unique<LVL1CTP::Lvl1Item>( item.name(),
+ TrigConf::HLTUtils::string2hash(item.name()),
+ 0, 0, 0, prescale);
}
}
}
- } else {
- const TrigConf::CTPConfig *ctpConfig = m_lvl1ConfigSvc->ctpConfig();
- const auto & prescales = ctpConfig->prescaleSet().prescales_float();
- for(const TrigConf::TriggerItem * item : ctpConfig->menu().items() ) {
- unsigned int pos = item->ctpId();
- if (lvl1ItemConfig[pos] != nullptr && item->name() != lvl1ItemConfig[pos]->name() ) {
- ATH_MSG_ERROR( "LVL1 item: " << item->name() << " uses a CTP id: "
- << pos << " that is already used!! --> ignore this LVL1 item! ");
- } else {
- lvl1ItemConfig[pos] = std::make_unique<LVL1CTP::Lvl1Item>( item->name(),
- TrigConf::HLTUtils::string2hash(item->name()),
- 0, 0, 0, prescales[pos]);
- }
- }
}
return lvl1ItemConfig;
}
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/src/Lvl1ResultAccessTool.h b/Trigger/TrigAnalysis/TrigDecisionMaker/src/Lvl1ResultAccessTool.h
index ffe037b202bd..268862ad3e53 100755
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/src/Lvl1ResultAccessTool.h
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/src/Lvl1ResultAccessTool.h
@@ -11,17 +11,12 @@
#include "TrigConfData/L1PrescalesSet.h"
#include "TrigT1Interfaces/CPRoIDecoder.h"
#include "TrigT1Interfaces/JEPRoIDecoder.h"
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
#include <vector>
#include <bitset>
#include <string>
// forward declarations
-namespace TrigConf {
- class TriggerThreshold;
-}
-
namespace LVL1CTP {
class Lvl1Result;
class Lvl1Item;
@@ -85,14 +80,10 @@ namespace HLT {
LVL1::JEPRoIDecoder m_jepDecoder;
LVL1::CPRoIDecoder m_cpDecoder;
- Gaudi::Property<bool> m_useNewConfig { this, "UseNewConfig", true, "When true, read the menu from detector store, when false use the LVL1ConfigSvc" };
-
/// access to L1Prescales
SG::ReadCondHandleKey<TrigConf::L1PrescalesSet> m_l1PrescaleSetInputKey{ this, "L1Prescales", "L1Prescales", "L1 prescales set"};
SG::WriteHandleKey<LVL1CTP::Lvl1Result> m_l1ResultKey{ this, "L1Result", "L1Result", "L1 result"};
-
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_lvl1ConfigSvc{ this, "LVL1ConfigSvc", "LVL1ConfigSvc", "LVL1 Config Service"}; //!< handle for the LVL1 configuration service
};
} // end namespace
--
GitLab
From 6d9f9bf6aa513e825d3193fc8f8a2bfd4909fd94 Mon Sep 17 00:00:00 2001
From: Thomas Strebler <thomas.strebler@cern.ch>
Date: Wed, 18 Aug 2021 18:37:42 +0000
Subject: [PATCH 143/272] Tracking CA-based config update
---
.../InDetConfig/python/BackTrackingConfig.py | 13 +-
.../InDetConfig/python/ITkTrackRecoConfig.py | 19 +-
.../python/ITkTrackingCommonConfig.py | 4 +-
.../python/ITkTrackingSiPatternConfig.py | 8 +-
.../InDetConfig/python/InDetRecToolConfig.py | 72 ++--
.../python/SiliconPreProcessing.py | 36 +-
.../InDetConfig/python/TRTExtensionConfig.py | 383 +-----------------
.../python/TRTSegmentFindingConfig.py | 6 +-
.../InDetConfig/python/TrackRecoConfig.py | 21 +-
.../python/TrackingCommonConfig.py | 202 ++++-----
.../python/TrackingSiPatternConfig.py | 79 ++--
11 files changed, 231 insertions(+), 612 deletions(-)
diff --git a/InnerDetector/InDetConfig/python/BackTrackingConfig.py b/InnerDetector/InDetConfig/python/BackTrackingConfig.py
index 5f95bbc06f3c..622cf192a488 100644
--- a/InnerDetector/InDetConfig/python/BackTrackingConfig.py
+++ b/InnerDetector/InDetConfig/python/BackTrackingConfig.py
@@ -8,8 +8,7 @@ def SiDetElementsRoadMaker_xkCfg(flags, name = 'InDetTRT_SeededSiRoad', **kwargs
#
# Silicon det elements road maker tool
#
- InDetPatternPropagator = TC.InDetPatternPropagatorCfg()
- acc.addPublicTool(InDetPatternPropagator)
+ InDetPatternPropagator = acc.getPrimaryAndMerge(TC.InDetPatternPropagatorCfg())
kwargs.setdefault("PropagatorTool", InDetPatternPropagator)
kwargs.setdefault("usePixel", flags.InDet.Tracking.usePixel)
@@ -85,11 +84,8 @@ def TRT_SeededTrackFinder_ATLCfg(flags, name='InDetTRT_SeededTrackMaker', InputC
#
# --- TRT seeded back tracking tool
#
- InDetPatternPropagator = TC.InDetPatternPropagatorCfg()
- acc.addPublicTool(InDetPatternPropagator)
-
- InDetPatternUpdator = TC.InDetPatternUpdatorCfg()
- acc.addPublicTool(InDetPatternUpdator)
+ InDetPatternPropagator = acc.getPrimaryAndMerge(TC.InDetPatternPropagatorCfg())
+ InDetPatternUpdator = acc.getPrimaryAndMerge(TC.InDetPatternUpdatorCfg())
InDetSiComTrackFinder = acc.popToolsAndMerge(TC.SiCombinatorialTrackFinder_xkCfg(flags))
acc.addPublicTool(InDetSiComTrackFinder)
@@ -220,8 +216,7 @@ def TrkAmbiguityScoreCfg(flags, name='InDetTRT_SeededAmbiguityScore', **kwargs):
def InDetAmbiTrackSelectionToolCfg(flags, name='InDetTRT_SeededAmbiTrackSelectionTool', **kwargs):
acc = ComponentAccumulator()
- InDetTRTDriftCircleCut = TC.InDetTRTDriftCircleCutForPatternRecoCfg(flags)
- acc.addPublicTool(InDetTRTDriftCircleCut)
+ InDetTRTDriftCircleCut = acc.getPrimaryAndMerge(TC.InDetTRTDriftCircleCutForPatternRecoCfg(flags))
InDetPRDtoTrackMapToolGangedPixels = acc.popToolsAndMerge( TC.InDetPRDtoTrackMapToolGangedPixelsCfg(flags) )
acc.addPublicTool(InDetPRDtoTrackMapToolGangedPixels)
diff --git a/InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py b/InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py
index 302809d8697a..944934441f43 100644
--- a/InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py
+++ b/InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py
@@ -247,16 +247,15 @@ def ITkTrackRecoCfg(flags):
# up to here
# needed for brem/seeding, TODO decided if needed here
# commented for now
- '''
- from LArBadChannelTool.LArBadChannelConfig import LArBadFebCfg
- result.merge(LArBadFebCfg(flags))
- from CaloRec.CaloRecoConfig import CaloRecoCfg
- result.merge(CaloRecoCfg(flags,doLCCalib=True))
- from egammaAlgs.egammaTopoClusterCopierConfig import egammaTopoClusterCopierCfg
- result.merge(egammaTopoClusterCopierCfg(flags))
- from InDetConfig.InDetRecCaloSeededROISelectionConfig import CaloClusterROI_SelectorCfg
- result.merge(CaloClusterROI_SelectorCfg(flags))
- '''
+ if flags.Detector.GeometryLAr:
+ from LArBadChannelTool.LArBadChannelConfig import LArBadFebCfg
+ result.merge(LArBadFebCfg(flags))
+ from CaloRec.CaloRecoConfig import CaloRecoCfg
+ result.merge(CaloRecoCfg(flags,doLCCalib=True))
+ from egammaAlgs.egammaTopoClusterCopierConfig import egammaTopoClusterCopierCfg
+ result.merge(egammaTopoClusterCopierCfg(flags))
+ from InDetConfig.InDetRecCaloSeededROISelectionConfig import CaloClusterROI_SelectorCfg
+ result.merge(CaloClusterROI_SelectorCfg(flags))
from InDetConfig.ITkSiliconPreProcessing import ITkRecPreProcessingSiliconCfg
result.merge(ITkRecPreProcessingSiliconCfg(flags))
diff --git a/InnerDetector/InDetConfig/python/ITkTrackingCommonConfig.py b/InnerDetector/InDetConfig/python/ITkTrackingCommonConfig.py
index fb4b3c31930f..edb3606e120e 100644
--- a/InnerDetector/InDetConfig/python/ITkTrackingCommonConfig.py
+++ b/InnerDetector/InDetConfig/python/ITkTrackingCommonConfig.py
@@ -232,7 +232,9 @@ def ITkTrackPRD_AssociationCfg(flags, name='ITkTrackPRD_Association', **kwargs):
if kwargs.get('TracksName', None) is None :
raise Exception('Not TracksName argument provided')
- kwargs.setdefault("AssociationTool", ITkPRDtoTrackMapToolGangedPixelsCfg(flags) \
+
+ AssociationTool = acc.popToolsAndMerge(ITkPRDtoTrackMapToolGangedPixelsCfg(flags))
+ kwargs.setdefault("AssociationTool", AssociationTool \
if 'AssociationTool' not in kwargs else None )
kwargs.setdefault("AssociationMapName", prefix+'PRDtoTrackMap'+suffix )
acc.addEventAlgo(CompFactory.InDet.InDetTrackPRD_Association(name = the_name, **kwargs))
diff --git a/InnerDetector/InDetConfig/python/ITkTrackingSiPatternConfig.py b/InnerDetector/InDetConfig/python/ITkTrackingSiPatternConfig.py
index ed3dbb8bdf53..327521ef0659 100644
--- a/InnerDetector/InDetConfig/python/ITkTrackingSiPatternConfig.py
+++ b/InnerDetector/InDetConfig/python/ITkTrackingSiPatternConfig.py
@@ -195,9 +195,9 @@ def ITkSiTrackMaker_xkCfg(flags, name="ITkSiTrackMaker", InputCollections = None
kwargs.setdefault("Xi2maxMultiTracks", flags.ITk.Tracking.Xi2max[0])
kwargs.setdefault("useSSSseedsFilter", flags.ITk.doSSSfilter)
kwargs.setdefault("doMultiTracksProd", True)
- kwargs.setdefault("useBremModel", flags.ITk.doBremRecovery and useBremMode) # only for NewTracking the brem is debugged !!!
- kwargs.setdefault("doCaloSeededBrem", flags.ITk.doCaloSeededBrem)
- kwargs.setdefault("doHadCaloSeedSSS", flags.ITk.doHadCaloSeededSSS)
+ kwargs.setdefault("useBremModel", flags.ITk.doBremRecovery and useBremMode and flags.Detector.GeometryLAr) # only for NewTracking the brem is debugged !!!
+ kwargs.setdefault("doCaloSeededBrem", flags.ITk.doCaloSeededBrem and flags.Detector.GeometryLAr)
+ kwargs.setdefault("doHadCaloSeedSSS", flags.ITk.doHadCaloSeededSSS and flags.Detector.GeometryTile)
kwargs.setdefault("phiWidth", flags.ITk.Tracking.phiWidthBrem[0])
kwargs.setdefault("etaWidth", flags.ITk.Tracking.etaWidthBrem[0])
kwargs.setdefault("InputClusterContainerName", 'ITkCaloClusterROIs')
@@ -352,7 +352,7 @@ def ITkAmbiTrackSelectionToolCfg(flags, name="ITkAmbiTrackSelectionTool", **kwar
kwargs.setdefault("phiWidth" , 0.1) #Split cluster ROI size
kwargs.setdefault("etaWidth" , 0.1) #Split cluster ROI size
kwargs.setdefault("InputEmClusterContainerName" , 'ITkCaloClusterROIs')
- kwargs.setdefault("doEmCaloSeed" , True) #Only split in cluster in region of interest
+ kwargs.setdefault("doEmCaloSeed" , flags.Detector.GeometryLAr) #Only split in cluster in region of interest
kwargs.setdefault("minPtConv" , 10000) #Only allow split clusters on track withe pt greater than this MeV
kwargs.setdefault("phiWidthEM" , 0.05) #Split cluster ROI size
kwargs.setdefault("etaWidthEM" , 0.05) #Split cluster ROI size
diff --git a/InnerDetector/InDetConfig/python/InDetRecToolConfig.py b/InnerDetector/InDetConfig/python/InDetRecToolConfig.py
index 21eca1bde6a7..31f78e5ef18d 100644
--- a/InnerDetector/InDetConfig/python/InDetRecToolConfig.py
+++ b/InnerDetector/InDetConfig/python/InDetRecToolConfig.py
@@ -100,9 +100,8 @@ def InDetTrackHoleSearchToolCfg(flags, name = 'InDetHoleSearchTool', **kwargs):
kwargs.setdefault("Extrapolator", result.getPrimaryAndMerge(InDetExtrapolatorCfg(flags)))
if 'BoundaryCheckTool' not in kwargs:
- tmpAcc = InDetBoundaryCheckToolCfg(flags)
- kwargs.setdefault('BoundaryCheckTool', tmpAcc.popPrivateTools())
- result.merge(tmpAcc)
+ BoundaryCheckTool = result.popToolsAndMerge(InDetBoundaryCheckToolCfg(flags))
+ kwargs.setdefault('BoundaryCheckTool', BoundaryCheckTool)
if flags.Beam.Type == "cosmics" :
kwargs.setdefault("Cosmics", True)
@@ -319,30 +318,29 @@ def SCT_ConfigurationCondAlgCfg(flags, name="SCT_ConfigurationCondAlg", **kwargs
kwargs.setdefault("ReadKeyMur", config_folder_prefix+"MUR")
result.merge(addFoldersSplitOnline(flags,
- detDb="SCT",
- online_folders=channelFolder,
- offline_folders=channelFolder,
- className='CondAttrListVec',
- splitMC=True))
+ detDb="SCT",
+ online_folders=channelFolder,
+ offline_folders=channelFolder,
+ className='CondAttrListVec',
+ splitMC=True))
result.merge(addFoldersSplitOnline(flags,
- detDb="SCT",
- online_folders=config_folder_prefix+"Module",
- offline_folders=config_folder_prefix+"Module",
- className='CondAttrListVec',
- splitMC=True))
+ detDb="SCT",
+ online_folders=config_folder_prefix+"Module",
+ offline_folders=config_folder_prefix+"Module",
+ className='CondAttrListVec',
+ splitMC=True))
result.merge(addFoldersSplitOnline(flags,
- detDb="SCT",
- online_folders=config_folder_prefix+"MUR",
- offline_folders=config_folder_prefix+"MUR",
- className='CondAttrListVec',
- splitMC=True))
- acc = SCT_CablingToolCfg(flags)
- kwargs.setdefault("SCT_CablingTool", acc.popPrivateTools())
- result.merge(acc)
-
- acc = SCT_ReadoutToolCfg(flags)
- kwargs.setdefault("SCT_ReadoutTool", acc.popPrivateTools())
- result.merge(acc)
+ detDb="SCT",
+ online_folders=config_folder_prefix+"MUR",
+ offline_folders=config_folder_prefix+"MUR",
+ className='CondAttrListVec',
+ splitMC=True))
+
+ SCT_CablingTool = result.popToolsAndMerge(SCT_CablingToolCfg(flags))
+ kwargs.setdefault("SCT_CablingTool", SCT_CablingTool)
+
+ SCT_ReadoutTool = result.popToolsAndMerge(SCT_ReadoutToolCfg(flags))
+ kwargs.setdefault("SCT_ReadoutTool", SCT_ReadoutTool)
result.addCondAlgo(CompFactory.SCT_ConfigurationCondAlg(name, **kwargs))
return result
@@ -375,9 +373,8 @@ def SCT_ReadCalibDataToolCfg(flags, name="InDetSCT_ReadCalibDataTool", cond_kwar
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)
+ SCT_CablingTool = result.popToolsAndMerge(SCT_CablingToolCfg(flags))
+ kwargs.setdefault("SCT_CablingTool", SCT_CablingTool)
result.setPrivateTools(CompFactory.SCT_ReadCalibDataTool(name,**kwargs))
return result
@@ -441,11 +438,8 @@ def SCT_CablingToolCfg(flags):
return result
def SCT_ReadoutToolCfg(flags, name="SCT_ReadoutTool", **kwargs):
- result = ComponentAccumulator()
-
- acc = SCT_CablingToolCfg(flags)
- kwargs.setdefault("SCT_CablingTool", acc.popPrivateTools())
- result.merge(acc)
+ result = SCT_CablingToolCfg(flags)
+ kwargs.setdefault("SCT_CablingTool", result.popPrivateTools())
tool = CompFactory.SCT_ReadoutTool(**kwargs)
result.setPrivateTools(tool)
@@ -491,8 +485,7 @@ def InDetTestPixelLayerToolCfg(flags, name = "InDetTestPixelLayerTool", **kwargs
kwargs.setdefault("CheckDisabledFEs", flags.InDet.checkDeadElementsOnTrack)
tool = CompFactory.InDet.InDetTestPixelLayerTool( name = the_name, **kwargs)
- result.addPublicTool( tool )
- result.setPrivateTools( tool )
+ result.addPublicTool( tool, primary=True )
return result
def InDetPropagatorCfg(flags, name='InDetPropagator',**kwargs):
@@ -510,8 +503,7 @@ def InDetPropagatorCfg(flags, name='InDetPropagator',**kwargs):
kwargs.setdefault("MaxStraightLineStep", .004) # Fixes a failed fit
tool = CompFactory.Trk.RungeKuttaPropagator( name = the_name, **kwargs)
- result.addPublicTool( tool )
- result.setPrivateTools( tool )
+ result.addPublicTool( tool, primary=True )
return result
def InDetMaterialEffectsUpdatorCfg(flags, name = "InDetMaterialEffectsUpdator", **kwargs):
@@ -524,8 +516,7 @@ def InDetMaterialEffectsUpdatorCfg(flags, name = "InDetMaterialEffectsUpdator",
kwargs.setdefault(ForcedMomentumValue = 1000*Units.MeV)
tool = CompFactory.Trk.MaterialEffectsUpdator( name = the_name, **kwargs)
- result.addPublicTool( tool )
- result.setPrivateTools( tool )
+ result.addPublicTool( tool, primary=True )
return result
def InDetNavigatorCfg(flags, name='InDetNavigator', **kwargs):
@@ -543,8 +534,7 @@ def InDetNavigatorCfg(flags, name='InDetNavigator', **kwargs):
kwargs.setdefault("TrackingGeometryKey", 'AtlasTrackingGeometry')
tool = CompFactory.Trk.Navigator( name = the_name, **kwargs)
- result.addPublicTool( tool )
- result.setPrivateTools( tool )
+ result.addPublicTool( tool, primary=True )
return result
def splitDefaultPrefix(name) :
diff --git a/InnerDetector/InDetConfig/python/SiliconPreProcessing.py b/InnerDetector/InDetConfig/python/SiliconPreProcessing.py
index 73c12b408caa..fa7895e2872e 100644
--- a/InnerDetector/InDetConfig/python/SiliconPreProcessing.py
+++ b/InnerDetector/InDetConfig/python/SiliconPreProcessing.py
@@ -1,10 +1,15 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
def InDetSiElementPropertiesTableCondAlgCfg(flags, name="InDetSiElementPropertiesTableCondAlg", **kwargs):
acc = ComponentAccumulator()
+
+ # For SCT DetectorElementCollection used
+ from SCT_GeoModel.SCT_GeoModelConfig import SCT_GeometryCfg
+ acc.merge(SCT_GeometryCfg(flags))
+
acc.addCondAlgo(CompFactory.InDet.SiElementPropertiesTableCondAlg(name = name, **kwargs))
return acc
@@ -28,6 +33,10 @@ def InDetSiTrackerSpacePointFinderCfg(flags, name = "InDetSiTrackerSpacePointFin
# SiTrackerSpacePointFinder algorithm
#
+ # For SCT DetectorElementCollection used
+ from SCT_GeoModel.SCT_GeoModelConfig import SCT_GeometryCfg
+ acc.merge(SCT_GeometryCfg(flags))
+
InDetSiSpacePointMakerTool = acc.popToolsAndMerge(SiSpacePointMakerToolCfg(flags))
acc.addPublicTool(InDetSiSpacePointMakerTool) ## I decided to merge it
@@ -58,6 +67,13 @@ def InDetSiTrackerSpacePointFinderCfg(flags, name = "InDetSiTrackerSpacePointFin
def InDetPRD_MultiTruthMakerSiCfg(flags, name="InDetPRD_MultiTruthMakerSi", **kwargs):
acc = ComponentAccumulator()
+
+ # For pixel + SCT DetectorElementCollection used
+ from PixelGeoModel.PixelGeoModelConfig import PixelGeometryCfg
+ acc.merge(PixelGeometryCfg( flags ))
+ from SCT_GeoModel.SCT_GeoModelConfig import SCT_GeometryCfg
+ acc.merge(SCT_GeometryCfg( flags ))
+
if flags.InDet.doTruth:
kwargs.setdefault("PixelClusterContainerName", 'PixelClusters') # InDetKeys.PixelClusters()
kwargs.setdefault("SCTClusterContainerName", 'SCT_Clusters') # InDetKeys.SCT_Clusters()
@@ -84,6 +100,13 @@ def InDetPRD_MultiTruthMakerSiCfg(flags, name="InDetPRD_MultiTruthMakerSi", **kw
def InDetPRD_MultiTruthMakerSiPUCfg(flags, name="InDetPRD_MultiTruthMakerSiPU", **kwargs):
acc = ComponentAccumulator()
+
+ # For pixel + SCT DetectorElementCollection used
+ from PixelGeoModel.PixelGeoModelConfig import PixelGeometryCfg
+ acc.merge(PixelGeometryCfg( flags ))
+ from SCT_GeoModel.SCT_GeoModelConfig import SCT_GeometryCfg
+ acc.merge(SCT_GeometryCfg( flags ))
+
if flags.InDet.doTruth:
kwargs.setdefault("PixelClusterContainerName", 'PixelPUClusters') # InDetKeys.PixelPUClusters()
kwargs.setdefault("SCTClusterContainerName", 'SCT_PU_Clusters') # InDetKeys.SCT_PU_Clusters()
@@ -115,8 +138,7 @@ def NnPixelClusterSplitProbToolCfg(flags, name="NnPixelClusterSplitProbTool", **
MultiplicityContent = [1 , 1 , 1]
from InDetConfig.TrackingCommonConfig import NnClusterizationFactoryCfg
- NnClusterizationFactory = NnClusterizationFactoryCfg(flags)
- acc.addPublicTool(NnClusterizationFactory)
+ NnClusterizationFactory = acc.getPrimaryAndMerge(NnClusterizationFactoryCfg(flags))
useBeamConstraint = flags.InDet.useBeamConstraint
@@ -133,8 +155,7 @@ def NnPixelClusterSplitterCfg(flags, name="NnPixelClusterSplitter", **kwargs):
acc = ComponentAccumulator()
from InDetConfig.TrackingCommonConfig import NnClusterizationFactoryCfg
- NnClusterizationFactory = NnClusterizationFactoryCfg(flags)
- acc.addPublicTool(NnClusterizationFactory)
+ NnClusterizationFactory = acc.getPrimaryAndMerge(NnClusterizationFactoryCfg(flags))
useBeamConstraint = flags.InDet.useBeamConstraint
@@ -173,10 +194,9 @@ def InDetRecPreProcessingSiliconCfg(flags, **kwargs):
#
# --- SiLorentzAngleTool
#
- from SiLorentzAngleTool.PixelLorentzAngleConfig import PixelLorentzAngleTool, PixelLorentzAngleCfg
- PixelLorentzAngleTool = PixelLorentzAngleTool(flags)
+ from SiLorentzAngleTool.PixelLorentzAngleConfig import PixelLorentzAngleCfg
+ PixelLorentzAngleTool = acc.popToolsAndMerge(PixelLorentzAngleCfg(flags))
acc.addPublicTool(PixelLorentzAngleTool)
- acc.addPublicTool(acc.popToolsAndMerge(PixelLorentzAngleCfg(flags)))
from SiLorentzAngleTool.SCT_LorentzAngleConfig import SCT_LorentzAngleCfg
SCTLorentzAngleTool = acc.popToolsAndMerge( SCT_LorentzAngleCfg(flags) )
diff --git a/InnerDetector/InDetConfig/python/TRTExtensionConfig.py b/InnerDetector/InDetConfig/python/TRTExtensionConfig.py
index ecae4c6db3e7..4a37b8cf6595 100644
--- a/InnerDetector/InDetConfig/python/TRTExtensionConfig.py
+++ b/InnerDetector/InDetConfig/python/TRTExtensionConfig.py
@@ -2,386 +2,7 @@
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
import InDetConfig.TrackingCommonConfig as TC
-import AthenaCommon.SystemOfUnits as Units
-from InDetConfig import InDetRecToolConfig
-#///////////// Temporary location TrackingSiPatternConfig configurations ///////////////////////
-def SiCombinatorialTrackFinder_xkCfg(flags, name="InDetSiComTrackFinder", **kwargs) :
- acc = ComponentAccumulator()
- #
- # --- Local track finding using sdCaloSeededSSSpace point seed
- #
- # @TODO ensure that PRD association map is used if usePrdAssociationTool is set
- is_dbm = flags.InDet.doDBMstandalone or flags.InDet.Tracking.extension == 'DBM'
- if not is_dbm:
- rot_creator_digital = acc.popToolsAndMerge(TC.InDetRotCreatorDigitalCfg(flags))
- else:
- rot_creator_digital = acc.popToolsAndMerge(TC.InDetRotCreatorDBMCfg(flags))
-
- acc.addPublicTool(rot_creator_digital)
-
- InDetPatternPropagator = TC.InDetPatternPropagatorCfg()
- acc.addPublicTool(InDetPatternPropagator)
-
- InDetPatternUpdator = TC.InDetPatternUpdatorCfg()
- acc.addPublicTool(InDetPatternUpdator)
-
- from InDetConfig.InDetRecToolConfig import InDetBoundaryCheckToolCfg
- boundary_check_tool = acc.popToolsAndMerge(InDetBoundaryCheckToolCfg(flags))
- acc.addPublicTool(boundary_check_tool)
-
- kwargs.setdefault("PropagatorTool", InDetPatternPropagator)
- kwargs.setdefault("UpdatorTool", InDetPatternUpdator)
- kwargs.setdefault("BoundaryCheckTool", boundary_check_tool)
- kwargs.setdefault("RIOonTrackTool", rot_creator_digital)
- kwargs.setdefault("usePixel", flags.Detector.EnablePixel)
- kwargs.setdefault("useSCT", flags.Detector.EnableSCT if not is_dbm else False)
- kwargs.setdefault("PixelClusterContainer", 'PixelClusters') # InDetKeys.PixelClusters()
- kwargs.setdefault("SCT_ClusterContainer", 'SCT_Clusters') # InDetKeys.SCT_Clusters()
-
- if flags.InDet.Tracking.extension == "Offline":
- kwargs.setdefault("writeHolesFromPattern", flags.InDet.useHolesFromPattern)
-
- if is_dbm :
- kwargs.setdefault("MagneticFieldMode", "NoField")
- kwargs.setdefault("TrackQualityCut", 9.3)
-
- if flags.Detector.EnableSCT:
- InDetSCT_ConditionsSummaryTool = acc.popToolsAndMerge( InDetRecToolConfig.InDetSCT_ConditionsSummaryToolCfg(flags) )
- acc.addPublicTool(InDetSCT_ConditionsSummaryTool)
- kwargs.setdefault("SctSummaryTool", InDetSCT_ConditionsSummaryTool )
- else:
- kwargs.setdefault("SctSummaryTool", None)
-
- track_finder = CompFactory.InDet.SiCombinatorialTrackFinder_xk(name = name+flags.InDet.Tracking.extension, **kwargs)
- acc.setPrivateTools(track_finder)
- return acc
-
-def SiDetElementsRoadMaker_xkCfg(flags, name="InDetSiRoadMaker", **kwargs) :
- acc = ComponentAccumulator()
- #
- # --- SCT and Pixel detector elements road builder
- #
- InDetPatternPropagator = TC.InDetPatternPropagatorCfg()
- acc.addPublicTool(InDetPatternPropagator)
-
- kwargs.setdefault("PropagatorTool", InDetPatternPropagator)
- kwargs.setdefault("usePixel", flags.InDet.Tracking.usePixel )
- kwargs.setdefault("PixManagerLocation", 'Pixel')
- kwargs.setdefault("useSCT", flags.InDet.Tracking.useSCT)
- kwargs.setdefault("SCTManagerLocation", 'SCT')
- kwargs.setdefault("RoadWidth", flags.InDet.Tracking.roadWidth)
-
- InDetSiDetElementsRoadMaker = CompFactory.InDet.SiDetElementsRoadMaker_xk(name = name+flags.InDet.Tracking.extension, **kwargs)
- acc.setPrivateTools(InDetSiDetElementsRoadMaker)
- return acc
-
-def SiTrackMaker_xkCfg(flags, name="InDetSiTrackMaker", InputCollections = None, **kwargs) :
- acc = ComponentAccumulator()
- useBremMode = flags.InDet.Tracking.extension == "Offline" or flags.InDet.Tracking.extension == "SLHC" or flags.InDet.Tracking.extension == "DBM"
- InDetSiDetElementsRoadMaker = acc.popToolsAndMerge(SiDetElementsRoadMaker_xkCfg(flags))
- acc.addPublicTool(InDetSiDetElementsRoadMaker)
- if flags.InDet.Tracking.usePixel:
- acc.addCondAlgo( CompFactory.InDet.SiDetElementBoundaryLinksCondAlg_xk( name = "InDetSiDetElementBoundaryLinksPixelCondAlg",
- ReadKey = "PixelDetectorElementCollection",
- WriteKey = "PixelDetElementBoundaryLinks_xk") )
- if flags.InDet.Tracking.useSCT:
- acc.addCondAlgo(CompFactory.InDet.SiDetElementsRoadCondAlg_xk(name = "InDet__SiDetElementsRoadCondAlg_xk"))
-
- acc.addCondAlgo( CompFactory.InDet.SiDetElementBoundaryLinksCondAlg_xk( name = "InDetSiDetElementBoundaryLinksSCTCondAlg",
- ReadKey = "SCT_DetectorElementCollection",
- WriteKey = "SCT_DetElementBoundaryLinks_xk") )
-
-
- track_finder = acc.popToolsAndMerge(SiCombinatorialTrackFinder_xkCfg(flags))
- acc.addPublicTool(track_finder)
-
- #
- # --- decide if use the association tool
- #
- if (len(InputCollections) > 0) and (flags.InDet.Tracking.extension == "LowPt" or flags.InDet.Tracking.extension == "VeryLowPt" or flags.InDet.Tracking.extension == "LargeD0" or flags.InDet.Tracking.extension == "LowPtLargeD0" or flags.InDet.Tracking.extension == "BeamGas" or flags.InDet.Tracking.extension == "ForwardTracks" or flags.InDet.Tracking.extension == "ForwardSLHCTracks" or flags.InDet.Tracking.extension == "Disappearing" or flags.InDet.Tracking.extension == "VeryForwardSLHCTracks" or flags.InDet.Tracking.extension == "SLHCConversionFinding"):
- usePrdAssociationTool = True
- else:
- usePrdAssociationTool = False
-
- kwargs.setdefault("useSCT", flags.InDet.Tracking.useSCT) #flags.InDet.Tracking.useSCT()
- kwargs.setdefault("usePixel", flags.InDet.Tracking.usePixel) #flags.InDet.Tracking.usePixel()
- kwargs.setdefault("RoadTool", InDetSiDetElementsRoadMaker)
- kwargs.setdefault("CombinatorialTrackFinder", track_finder)
- kwargs.setdefault("pTmin", flags.InDet.Tracking.minPT)
- kwargs.setdefault("pTminBrem", flags.InDet.Tracking.minPTBrem)
- kwargs.setdefault("pTminSSS", flags.InDet.Tracking.pT_SSScut)
- kwargs.setdefault("nClustersMin", flags.InDet.Tracking.minClusters)
- kwargs.setdefault("nHolesMax", flags.InDet.Tracking.nHolesMax)
- kwargs.setdefault("nHolesGapMax", flags.InDet.Tracking.nHolesGapMax)
- kwargs.setdefault("SeedsFilterLevel", flags.InDet.Tracking.seedFilterLevel)
- kwargs.setdefault("Xi2max", flags.InDet.Tracking.Xi2max)
- kwargs.setdefault("Xi2maxNoAdd", flags.InDet.Tracking.Xi2maxNoAdd)
- kwargs.setdefault("nWeightedClustersMin", flags.InDet.Tracking.nWeightedClustersMin)
- kwargs.setdefault("CosmicTrack", flags.Beam.Type == 'cosmics')
- kwargs.setdefault("Xi2maxMultiTracks", flags.InDet.Tracking.Xi2max)
- kwargs.setdefault("useSSSseedsFilter", flags.InDet.doSSSfilter)
- kwargs.setdefault("doMultiTracksProd", True)
- kwargs.setdefault("useBremModel", flags.InDet.doBremRecovery and useBremMode) # only for NewTracking the brem is debugged !!!
- kwargs.setdefault("doCaloSeededBrem", flags.InDet.doCaloSeededBrem)
- kwargs.setdefault("doHadCaloSeedSSS", flags.InDet.doHadCaloSeededSSS)
- kwargs.setdefault("phiWidth", flags.InDet.Tracking.phiWidthBrem)
- kwargs.setdefault("etaWidth", flags.InDet.Tracking.etaWidthBrem)
- kwargs.setdefault("InputClusterContainerName", 'InDetCaloClusterROIs') # InDetKeys.CaloClusterROIContainer()
- kwargs.setdefault("InputHadClusterContainerName", 'InDetHadCaloClusterROIs') # InDetKeys.HadCaloClusterROIContainer()
- kwargs.setdefault("UseAssociationTool", usePrdAssociationTool)
-
- if flags.InDet.Tracking.extension == "SLHC" or flags.InDet.Tracking.extension == "ForwardSLHCTracks" or flags.InDet.Tracking.extension == "VeryForwardSLHCTracks" :
- kwargs.setdefault("ITKGeometry", True)
-
- if flags.InDet.Tracking.extension == "DBM":
- kwargs.setdefault("MagneticFieldMode", "NoField")
- kwargs.setdefault("useBremModel", False)
- kwargs.setdefault("doMultiTracksProd", False)
- kwargs.setdefault("TrackPatternRecoInfo", 'SiSPSeededFinder')
- kwargs.setdefault("pTminSSS", -1)
- kwargs.setdefault("CosmicTrack", False)
- kwargs.setdefault("useSSSseedsFilter", False)
- kwargs.setdefault("doCaloSeededBrem", False)
- kwargs.setdefault("doHadCaloSeedSSS", False)
-
- elif flags.Beam.Type == 'cosmics':
- kwargs.setdefault("TrackPatternRecoInfo", 'SiSpacePointsSeedMaker_Cosmic')
-
- elif flags.InDet.doHeavyIon:
- kwargs.setdefault("TrackPatternRecoInfo", 'SiSpacePointsSeedMaker_HeavyIon')
-
- elif flags.InDet.Tracking.extension == "LowPt":
- kwargs.setdefault("TrackPatternRecoInfo", 'SiSpacePointsSeedMaker_LowMomentum')
-
- elif flags.InDet.Tracking.extension == "VeryLowPt" or (flags.InDet.Tracking.extension == "Pixel" and flags.InDet.doMinBias):
- kwargs.setdefault("TrackPatternRecoInfo", 'SiSpacePointsSeedMaker_VeryLowMomentum')
-
- elif flags.InDet.Tracking.extension == "BeamGas":
- kwargs.setdefault("TrackPatternRecoInfo", 'SiSpacePointsSeedMaker_BeamGas')
-
- elif flags.InDet.Tracking.extension == "ForwardTracks":
- kwargs.setdefault("TrackPatternRecoInfo", 'SiSpacePointsSeedMaker_ForwardTracks')
-
- elif flags.InDet.Tracking.extension == "ForwardSLHCTracks":
- kwargs.setdefault("TrackPatternRecoInfo", 'SiSpacePointsSeedMaker_ForwardSLHCTracks')
-
- elif flags.InDet.Tracking.extension == "VeryForwardSLHCTracks":
- kwargs.setdefault("TrackPatternRecoInfo", 'SiSpacePointsSeedMaker_VeryForwardSLHCTracks')
-
- elif flags.InDet.Tracking.extension == "SLHCConversionFinding":
- kwargs.setdefault("TrackPatternRecoInfo", 'SiSpacePointsSeedMaker_SLHCConversionTracks')
-
- elif flags.InDet.Tracking.extension == "LargeD0" or flags.InDet.Tracking.extension == "LowPtLargeD0":
- kwargs.setdefault("TrackPatternRecoInfo", 'SiSpacePointsSeedMaker_LargeD0')
-
- else:
- kwargs.setdefault("TrackPatternRecoInfo", 'SiSPSeededFinder')
-
- if flags.InDet.doStoreTrackSeeds:
- InDet_SeedToTrackConversion = CompFactory.InDet.SeedToTrackConversionTool( name = "InDet_SeedToTrackConversion",
- OutputName = 'SiSPSeedSegments' + flags.InDet.Tracking.extension)
- acc.addPublicTool(InDet_SeedToTrackConversion)
- kwargs.setdefault("SeedToTrackConversion", InDet_SeedToTrackConversion)
- kwargs.setdefault("SeedSegmentsWrite", True)
-
- InDetSiTrackMaker = CompFactory.InDet.SiTrackMaker_xk(name = name+flags.InDet.Tracking.extension, **kwargs)
- acc.setPrivateTools(InDetSiTrackMaker)
- return acc
-
-def SiSpacePointsSeedMakerCfg(flags, name="InDetSpSeedsMaker", InputCollections = None, **kwargs) :
- acc = ComponentAccumulator()
- #
- # --- decide if use the association tool
- #
- if (len(InputCollections) > 0) and (flags.InDet.Tracking.extension == "LowPt" or flags.InDet.Tracking.extension == "VeryLowPt" or flags.InDet.Tracking.extension == "LargeD0" or flags.InDet.Tracking.extension == "LowPtLargeD0" or flags.InDet.Tracking.extension == "BeamGas" or flags.InDet.Tracking.extension == "ForwardTracks" or flags.InDet.Tracking.extension == "ForwardSLHCTracks" or flags.InDet.Tracking.extension == "Disappearing" or flags.InDet.Tracking.extension == "VeryForwardSLHCTracks" or flags.InDet.Tracking.extension == "SLHCConversionFinding"):
- usePrdAssociationTool = True
- else:
- usePrdAssociationTool = False
- #
- # --- get list of already associated hits (always do this, even if no other tracking ran before)
- #
- if usePrdAssociationTool:
- prefix = 'InDet'
- suffix = flags.InDet.Tracking.extension
- #
- # --- Space points seeds maker, use different ones for cosmics and collisions
- #
- if flags.InDet.Tracking.extension == "DBM":
- SiSpacePointsSeedMaker = CompFactory.InDet.SiSpacePointsSeedMaker_ATLxk
- elif flags.Beam.Type == 'cosmics':
- SiSpacePointsSeedMaker = CompFactory.InDet.SiSpacePointsSeedMaker_Cosmic
- elif flags.InDet.doHeavyIon:
- SiSpacePointsSeedMaker = CompFactory.InDet.SiSpacePointsSeedMaker_HeavyIon
- elif flags.InDet.Tracking.extension == "LowPt" or flags.InDet.Tracking.extension == "VeryLowPt" or (flags.InDet.Tracking.extension == "Pixel" and flags.InDet.doMinBias) :
- SiSpacePointsSeedMaker = CompFactory.InDet.SiSpacePointsSeedMaker_LowMomentum
- elif flags.InDet.Tracking.extension == "BeamGas":
- SiSpacePointsSeedMaker = CompFactory.InDet.SiSpacePointsSeedMaker_BeamGas
- elif flags.InDet.Tracking.extension == "SLHC" or flags.InDet.Tracking.extension == "ForwardSLHCTracks" or flags.InDet.Tracking.extension == "VeryForwardSLHCTracks" :
- SiSpacePointsSeedMaker = CompFactory.InDet.SiSpacePointsSeedMaker_ITK
- else:
- SiSpacePointsSeedMaker = CompFactory.InDet.SiSpacePointsSeedMaker_ATLxk
-
- kwargs.setdefault("pTmin", flags.InDet.Tracking.minPT )
- kwargs.setdefault("maxdImpact", flags.InDet.Tracking.maxPrimaryImpact )
- kwargs.setdefault("maxZ", flags.InDet.Tracking.maxZImpact )
- kwargs.setdefault("minZ", -flags.InDet.Tracking.maxZImpact )
- kwargs.setdefault("usePixel", flags.InDet.Tracking.usePixel)
- kwargs.setdefault("SpacePointsPixelName", 'PixelSpacePoints') # InDetKeys.PixelSpacePoints()
- kwargs.setdefault("useSCT", flags.InDet.Tracking.useSCT and flags.InDet.Tracking.useSCTSeeding )
- kwargs.setdefault("SpacePointsSCTName", 'SCT_SpacePoints') # InDetKeys.SCT_SpacePoints()
- kwargs.setdefault("useOverlapSpCollection", flags.InDet.Tracking.useSCT and flags.InDet.Tracking.useSCTSeeding )
- kwargs.setdefault("SpacePointsOverlapName", 'OverlapSpacePoints') # InDetKeys.OverlapSpacePoints()
- kwargs.setdefault("radMax", flags.InDet.Tracking.radMax)
- kwargs.setdefault("RapidityCut", flags.InDet.Tracking.maxEta )
-
-
- if flags.InDet.Tracking.extension == "Offline" or flags.InDet.doHeavyIon or flags.InDet.Tracking.extension == "ForwardTracks":
- kwargs.setdefault("maxdImpactPPS", flags.InDet.Tracking.maxdImpactPPSSeeds)
- kwargs.setdefault("maxdImpactSSS", flags.InDet.Tracking.maxdImpactSSSSeeds)
- if not flags.InDet.doHeavyIon:
- kwargs.setdefault("maxSeedsForSpacePointStrips", flags.InDet.Tracking.maxSeedsPerSP_Strips)
- kwargs.setdefault("maxSeedsForSpacePointPixels", flags.InDet.Tracking.maxSeedsPerSP_Pixels)
- kwargs.setdefault("alwaysKeepConfirmedStripSeeds", flags.InDet.Tracking.keepAllConfirmedStripSeeds)
- kwargs.setdefault("alwaysKeepConfirmedPixelSeeds", flags.InDet.Tracking.keepAllConfirmedPixelSeeds)
- kwargs.setdefault("mindRadius", 10)
- kwargs.setdefault("maxSizeSP", 200)
- kwargs.setdefault("dImpactCutSlopeUnconfirmedSSS", 1.25)
- kwargs.setdefault("dImpactCutSlopeUnconfirmedPPP", 2.0)
-
- if flags.InDet.Tracking.extension == "R3LargeD0":
- kwargs.setdefault("optimisePhiBinning", False)
- kwargs.setdefault("usePixel", False)
- kwargs.setdefault("etaMax", flags.InDet.Tracking.maxEta)
- kwargs.setdefault("maxSeedsForSpacePointStrips", flags.InDet.Tracking.maxSeedsPerSP_Strips)
- kwargs.setdefault("alwaysKeepConfirmedStripSeeds", flags.InDet.Tracking.keepAllConfirmedStripSeeds)
- kwargs.setdefault("maxdRadius", 150)
- kwargs.setdefault("seedScoreBonusConfirmationSeed", -2000)
-
- if usePrdAssociationTool:
- # not all classes have that property !!!
- kwargs.setdefault("PRDtoTrackMap", prefix+'PRDtoTrackMap'+ suffix \
- if usePrdAssociationTool else '')
- if not flags.Beam.Type == 'cosmics':
- kwargs.setdefault("maxRadius1", 0.75*flags.InDet.Tracking.radMax)
- kwargs.setdefault("maxRadius2", flags.InDet.Tracking.radMax)
- kwargs.setdefault("maxRadius3", flags.InDet.Tracking.radMax)
- if flags.InDet.Tracking.extension == "LowPt" or flags.InDet.Tracking.extension == "VeryLowPt" or (flags.InDet.Tracking.extension == "Pixel" and flags.InDet.doMinBias):
- kwargs.setdefault("pTmax", flags.InDet.Tracking.maxPT)
- kwargs.setdefault("mindRadius", 4.0)
- if flags.InDet.Tracking.extension == "SLHC" or flags.InDet.Tracking.extension == "SLHCConversionFinding":
- kwargs.setdefault("minRadius1", 0)
- kwargs.setdefault("minRadius2", 0)
- kwargs.setdefault("minRadius3", 0)
- kwargs.setdefault("maxRadius1", 1000.*Units.mm)
- kwargs.setdefault("maxRadius2", 1000.*Units.mm)
- kwargs.setdefault("maxRadius3", 1000.*Units.mm)
- if flags.InDet.Tracking.extension == "ForwardTracks" or flags.InDet.Tracking.extension == "ForwardSLHCTracks" or flags.InDet.Tracking.extension == "VeryForwardSLHCTracks":
- kwargs.setdefault("checkEta", True)
- kwargs.setdefault("etaMin", flags.InDet.Tracking.minEta)
- kwargs.setdefault("etaMax", flags.InDet.Tracking.maxEta)
- kwargs.setdefault("RapidityCut", flags.InDet.Tracking.maxEta)
- if flags.InDet.Tracking.extension == "DBM":
- kwargs.setdefault("etaMin", flags.InDet.Tracking.minEta)
- kwargs.setdefault("etaMax", flags.InDet.Tracking.maxEta)
- kwargs.setdefault("useDBM", True)
-
- InDetSiSpacePointsSeedMaker = SiSpacePointsSeedMaker (name = name+flags.InDet.Tracking.extension, **kwargs)
-
- acc.setPrivateTools(InDetSiSpacePointsSeedMaker)
- return acc
-
-def SiZvertexMaker_xkCfg(flags, name="InDetZvertexMaker", InputCollections = None, **kwargs) :
- acc = ComponentAccumulator()
-
- kwargs.setdefault("Zmax", flags.InDet.Tracking.maxZImpact)
- kwargs.setdefault("Zmin", -flags.InDet.Tracking.maxZImpact)
- kwargs.setdefault("minRatio", 0.17)
-
- InDetSiSpacePointsSeedMaker = acc.popToolsAndMerge(SiSpacePointsSeedMakerCfg(flags,
- InputCollections = InputCollections))
- acc.addPublicTool(InDetSiSpacePointsSeedMaker)
-
- kwargs.setdefault("SeedMakerTool", InDetSiSpacePointsSeedMaker)
- if flags.InDet.doHeavyIon:
- kwargs.setdefault("HistSize", 2000)
- kwargs.setdefault("minContent", 30)
-
- InDetZvertexMaker = CompFactory.InDet.SiZvertexMaker_xk(name = name+flags.InDet.Tracking.extension, **kwargs)
- acc.setPrivateTools(InDetZvertexMaker)
- return acc
-
-def SiSPSeededTrackFinderCfg(flags, name="InDetSiSpTrackFinder", InputCollections = None, SiSPSeededTrackCollectionKey = None, **kwargs) :
- acc = ComponentAccumulator()
-
- # set output track collection name
- #
- SiTrackCollection = SiSPSeededTrackCollectionKey
- #
- # --- decide if use the association tool
- #
- if (len(InputCollections) > 0) and (flags.InDet.Tracking.extension == "LowPt" or flags.InDet.Tracking.extension == "VeryLowPt" or flags.InDet.Tracking.extension == "LargeD0" or flags.InDet.Tracking.extension == "LowPtLargeD0" or flags.InDet.Tracking.extension == "BeamGas" or flags.InDet.Tracking.extension == "ForwardTracks" or flags.InDet.Tracking.extension == "ForwardSLHCTracks" or flags.InDet.Tracking.extension == "Disappearing" or flags.InDet.Tracking.extension == "VeryForwardSLHCTracks" or flags.InDet.Tracking.extension == "SLHCConversionFinding"):
- usePrdAssociationTool = True
- else:
- usePrdAssociationTool = False
- #
- # --- get list of already associated hits (always do this, even if no other tracking ran before)
- #
- if usePrdAssociationTool:
- prefix = 'InDet'
- suffix = flags.InDet.Tracking.extension
-
- InDetSiTrackMaker = acc.popToolsAndMerge(SiTrackMaker_xkCfg(flags,
- InputCollections = InputCollections))
- acc.addPublicTool(InDetSiTrackMaker)
-
- InDetTrackSummaryToolNoHoleSearch = acc.popToolsAndMerge(TC.InDetTrackSummaryToolNoHoleSearchCfg(flags))
- acc.addPublicTool(InDetTrackSummaryToolNoHoleSearch)
-
- InDetSiSpacePointsSeedMaker = acc.popToolsAndMerge(SiSpacePointsSeedMakerCfg(flags,
- InputCollections = InputCollections))
- acc.addPublicTool(InDetSiSpacePointsSeedMaker)
-
- #
- # --- Z-coordinates primary vertices finder (only for collisions)
- #
- if flags.InDet.useZvertexTool and flags.InDet.Tracking.extension != "DBM":
- InDetZvertexMaker = acc.popToolsAndMerge(SiZvertexMaker_xkCfg(flags,
- InputCollections = InputCollections))
- acc.addPublicTool(InDetZvertexMaker)
- else:
- InDetZvertexMaker = None
-
- #
- # --- Setup Track finder using space points seeds
- #
- kwargs.setdefault("TrackTool", InDetSiTrackMaker)
- kwargs.setdefault("PRDtoTrackMap", prefix+'PRDtoTrackMap'+suffix \
- if usePrdAssociationTool else '')
- kwargs.setdefault("TrackSummaryTool", InDetTrackSummaryToolNoHoleSearch)
- kwargs.setdefault("TracksLocation", SiTrackCollection)
- kwargs.setdefault("SeedsTool", InDetSiSpacePointsSeedMaker)
- kwargs.setdefault("ZvertexTool", InDetZvertexMaker)
- kwargs.setdefault("useMBTSTimeDiff", flags.InDet.useMBTSTimeDiff)
-
- if flags.InDet.Tracking.extension == "ForwardSLHCTracks" or flags.InDet.Tracking.extension == "ForwardTracks":
- kwargs.setdefault("useZvertexTool", flags.InDet.useZvertexTool)
- kwargs.setdefault("useNewStrategy", False)
- kwargs.setdefault("useZBoundFinding", False)
- else:
- kwargs.setdefault("useZvertexTool", flags.InDet.useZvertexTool and flags.InDet.Tracking.extension != "DBM")
- kwargs.setdefault("useNewStrategy", flags.InDet.useNewSiSPSeededTF and flags.InDet.Tracking.extension != "DBM")
- kwargs.setdefault("useZBoundFinding", flags.InDet.Tracking.doZBoundary and flags.InDet.Tracking.extension != "DBM")
-
- if flags.InDet.doHeavyIon :
- kwargs.setdefault("FreeClustersCut",2) #Heavy Ion optimization from Igor
-
- if flags.InDet.Tracking.extension == "Offline":
- kwargs.setdefault("writeHolesFromPattern", flags.InDet.useHolesFromPattern)
-
- InDetSiSPSeededTrackFinder = CompFactory.InDet.SiSPSeededTrackFinder(name = name+flags.InDet.Tracking.extension, **kwargs)
- acc.addEventAlgo(InDetSiSPSeededTrackFinder)
- return acc
#///////////////////////////////////////////////////////////////////////////////////////////////
def TRT_TrackExtensionAlgCfg(flags, name = 'InDetTRT_ExtensionPhase', SiTrackCollection=None, ExtendedTracksMap="ExtendedTracksMap", TrackExtensionTool=None, **kwargs):
acc = ComponentAccumulator()
@@ -418,8 +39,7 @@ def DeterministicAnnealingFilterCfg(flags, name = 'InDetDAF', **kwargs):
InDetExtrapolator = acc.getPrimaryAndMerge(InDetExtrapolatorCfg(flags))
from InDetConfig.TrackingCommonConfig import InDetUpdatorCfg
- InDetUpdator = InDetUpdatorCfg(flags)
- acc.addPublicTool(InDetUpdator)
+ InDetUpdator = acc.getPrimaryAndMerge(InDetUpdatorCfg(flags))
kwargs.setdefault("ToolForExtrapolation", InDetExtrapolator)
kwargs.setdefault("ToolForCompetingROTsCreation", InDetCompetingRotCreator)
@@ -637,6 +257,7 @@ if __name__ == "__main__":
####################### TrackingSiPattern #############################
if ConfigFlags.InDet.doSiSPSeededTrackFinder:
+ from InDetConfig.TrackingSiPatternConfig import SiSPSeededTrackFinderCfg
top_acc.merge(SiSPSeededTrackFinderCfg( ConfigFlags,
InputCollections = InputCollections,
SiSPSeededTrackCollectionKey = InDetSpSeededTracksKey))
diff --git a/InnerDetector/InDetConfig/python/TRTSegmentFindingConfig.py b/InnerDetector/InDetConfig/python/TRTSegmentFindingConfig.py
index 23248199e52f..b401336abb48 100644
--- a/InnerDetector/InDetConfig/python/TRTSegmentFindingConfig.py
+++ b/InnerDetector/InDetConfig/python/TRTSegmentFindingConfig.py
@@ -41,8 +41,7 @@ def TRT_TrackSegmentsMaker_ATLxkCfg(flags, name = 'InDetTRT_SeedsMaker', extensi
#
# --- offline version of TRT segemnt making
#
- InDetPatternPropagator = TC.InDetPatternPropagatorCfg()
- acc.addPublicTool(InDetPatternPropagator)
+ InDetPatternPropagator = acc.getPrimaryAndMerge(TC.InDetPatternPropagatorCfg())
InDetTRTExtensionTool = acc.popToolsAndMerge(TC.InDetTRT_ExtensionToolCfg(flags))
acc.addPublicTool(InDetTRTExtensionTool)
@@ -73,8 +72,7 @@ def TRT_TrackSegmentsMakerCondAlg_ATLxkCfg(flags, name = 'InDetTRT_SeedsMakerCon
# TRT-only/back-tracking segment finding
pTmin = flags.InDet.Tracking.minSecondaryPt
- InDetPatternPropagator = TC.InDetPatternPropagatorCfg()
- acc.addPublicTool(InDetPatternPropagator)
+ InDetPatternPropagator = acc.getPrimaryAndMerge(TC.InDetPatternPropagatorCfg())
kwargs.setdefault("PropagatorTool", InDetPatternPropagator)
kwargs.setdefault("NumberMomentumChannel", flags.InDet.Tracking.TRTSegFinderPtBins)
diff --git a/InnerDetector/InDetConfig/python/TrackRecoConfig.py b/InnerDetector/InDetConfig/python/TrackRecoConfig.py
index e9554bd1cc90..d1b42ac08423 100644
--- a/InnerDetector/InDetConfig/python/TrackRecoConfig.py
+++ b/InnerDetector/InDetConfig/python/TrackRecoConfig.py
@@ -78,6 +78,10 @@ def SCTClusterizationPUCfg(flags, name="InDetSCT_ClusterizationPU", **kwargs) :
##------------------------------------------------------------------------------
def PixelGangedAmbiguitiesFinderCfg(flags) :
acc = ComponentAccumulator()
+
+ from PixelGeoModel.PixelGeoModelConfig import PixelGeometryCfg
+ acc.merge(PixelGeometryCfg(flags))
+
InDetPixelGangedAmbiguitiesFinder = CompFactory.InDet.PixelGangedAmbiguitiesFinder( name = "InDetPixelGangedAmbiguitiesFinder")
acc.addPublicTool( InDetPixelGangedAmbiguitiesFinder, primary=True)
return acc
@@ -239,14 +243,15 @@ def TrackRecoCfg(flags):
# up to here
# needed for brem/seeding, TODO decided if needed here
- from LArBadChannelTool.LArBadChannelConfig import LArBadFebCfg
- result.merge(LArBadFebCfg(flags))
- from CaloRec.CaloRecoConfig import CaloRecoCfg
- result.merge(CaloRecoCfg(flags,doLCCalib=True))
- from egammaAlgs.egammaTopoClusterCopierConfig import egammaTopoClusterCopierCfg
- result.merge(egammaTopoClusterCopierCfg(flags))
- from InDetConfig.InDetRecCaloSeededROISelectionConfig import CaloClusterROI_SelectorCfg
- result.merge(CaloClusterROI_SelectorCfg(flags))
+ if flags.Detector.GeometryLAr:
+ from LArBadChannelTool.LArBadChannelConfig import LArBadFebCfg
+ result.merge(LArBadFebCfg(flags))
+ from CaloRec.CaloRecoConfig import CaloRecoCfg
+ result.merge(CaloRecoCfg(flags,doLCCalib=True))
+ from egammaAlgs.egammaTopoClusterCopierConfig import egammaTopoClusterCopierCfg
+ result.merge(egammaTopoClusterCopierCfg(flags))
+ from InDetConfig.InDetRecCaloSeededROISelectionConfig import CaloClusterROI_SelectorCfg
+ result.merge(CaloClusterROI_SelectorCfg(flags))
from InDetConfig.SiliconPreProcessing import InDetRecPreProcessingSiliconCfg
diff --git a/InnerDetector/InDetConfig/python/TrackingCommonConfig.py b/InnerDetector/InDetConfig/python/TrackingCommonConfig.py
index 71497955cb17..d5388094cb8f 100644
--- a/InnerDetector/InDetConfig/python/TrackingCommonConfig.py
+++ b/InnerDetector/InDetConfig/python/TrackingCommonConfig.py
@@ -110,11 +110,13 @@ def NnClusterizationFactoryCfg(flags, name = 'NnClusterizationFactory', **kwargs
kwargs.setdefault("NnCollectionJSONReadKey", '' if useTTrainedNetworks else 'PixelClusterNNJSON')
NnClusterizationFactory = CompFactory.InDet.NnClusterizationFactory( name = the_name, **kwargs )
-
- return NnClusterizationFactory
+ acc.addPublicTool( NnClusterizationFactory, primary=True)
+ return acc
def InDetPixelClusterOnTrackToolBaseCfg(flags, name="PixelClusterOnTrackTool", **kwargs):
+ acc = ComponentAccumulator()
the_name = makeName(name, kwargs)
+
split_cluster_map_extension = kwargs.pop('SplitClusterMapExtension','')
if (flags.Beam.Type == "cosmics") or flags.InDet.doDBMstandalone:
kwargs.setdefault("ErrorStrategy", 0)
@@ -126,12 +128,16 @@ def InDetPixelClusterOnTrackToolBaseCfg(flags, name="PixelClusterOnTrackTool", *
kwargs.setdefault("SplitClusterAmbiguityMap", 'SplitClusterAmbiguityMap' + split_cluster_map_extension )
kwargs.setdefault("RunningTIDE_Ambi", flags.InDet.doTIDE_Ambi )
- return CompFactory.InDet.PixelClusterOnTrackTool(the_name, **kwargs)
+ acc.setPrivateTools(CompFactory.InDet.PixelClusterOnTrackTool(the_name, **kwargs))
+ return acc
def InDetPixelClusterOnTrackToolDigitalCfg(flags, name='InDetPixelClusterOnTrackToolDigital', **kwargs):
+ acc = ComponentAccumulator()
+
if 'LorentzAngleTool' not in kwargs :
- from SiLorentzAngleTool.PixelLorentzAngleConfig import PixelLorentzAngleTool
- kwargs.setdefault("LorentzAngleTool", PixelLorentzAngleTool(flags, name="PixelLorentzAngleTool") )
+ from SiLorentzAngleTool.PixelLorentzAngleConfig import PixelLorentzAngleCfg
+ PixelLorentzAngleTool = acc.popToolsAndMerge(PixelLorentzAngleCfg(flags))
+ kwargs.setdefault("LorentzAngleTool", PixelLorentzAngleTool)
if flags.InDet.doDigitalROTCreation:
kwargs.setdefault("applyNNcorrection", False )
@@ -141,38 +147,54 @@ def InDetPixelClusterOnTrackToolDigitalCfg(flags, name='InDetPixelClusterOnTrack
kwargs.setdefault("SplitClusterAmbiguityMap", "" )
else :
kwargs.setdefault("SplitClusterAmbiguityMap", "" )
- return InDetPixelClusterOnTrackToolBaseCfg(flags, name=name, **kwargs)
+
+ PixelClusterOnTrackTool = acc.popToolsAndMerge(InDetPixelClusterOnTrackToolBaseCfg(flags, name=name, **kwargs))
+ acc.setPrivateTools(PixelClusterOnTrackTool)
+ return acc
def InDetPixelClusterOnTrackToolNNSplittingCfg(flags, name='InDetPixelClusterOnTrackToolNNSplitting', **kwargs):
+ acc = ComponentAccumulator()
+
if flags.InDet.doPixelClusterSplitting and flags.InDet.pixelClusterSplittingType == 'NeuralNet':
if 'NnClusterizationFactory' not in kwargs :
- NnClusterizationFactory = NnClusterizationFactoryCfg(flags)
+ NnClusterizationFactory = acc.getPrimaryAndMerge(NnClusterizationFactoryCfg(flags))
kwargs.setdefault("NnClusterizationFactory", NnClusterizationFactory)
- return InDetPixelClusterOnTrackToolBaseCfg(flags, name=name, **kwargs)
+ tool = acc.popToolsAndMerge(InDetPixelClusterOnTrackToolBaseCfg(flags, name=name, **kwargs))
+ acc.setPrivateTools(tool)
+ return acc
def InDetPixelClusterOnTrackToolCfg(flags, name='InDetPixelClusterOnTrackTool', **kwargs):
+ acc = ComponentAccumulator()
+
if 'LorentzAngleTool' not in kwargs :
- from SiLorentzAngleTool.PixelLorentzAngleConfig import PixelLorentzAngleTool
- tool = PixelLorentzAngleTool(flags, name="PixelLorentzAngleTool")
- kwargs.setdefault("LorentzAngleTool", tool )
+ from SiLorentzAngleTool.PixelLorentzAngleConfig import PixelLorentzAngleCfg
+ PixelLorentzAngleTool = acc.popToolsAndMerge(PixelLorentzAngleCfg(flags))
+ kwargs.setdefault("LorentzAngleTool", PixelLorentzAngleTool)
+ PixelClusterOnTrackTool = None
if flags.InDet.doDigitalROTCreation:
- return InDetPixelClusterOnTrackToolDigitalCfg(flags, name=name, **kwargs)
+ PixelClusterOnTrackTool = acc.popToolsAndMerge(InDetPixelClusterOnTrackToolDigitalCfg(flags, name=name, **kwargs))
else:
- return InDetPixelClusterOnTrackToolNNSplittingCfg(flags, name=name, **kwargs)
+ PixelClusterOnTrackTool = acc.popToolsAndMerge(InDetPixelClusterOnTrackToolNNSplittingCfg(flags, name=name, **kwargs))
+
+ acc.setPrivateTools(PixelClusterOnTrackTool)
+ return acc
def InDetSCT_ClusterOnTrackToolCfg(flags, name='InDetSCT_ClusterOnTrackTool', **kwargs):
+ acc = ComponentAccumulator()
the_name = makeName(name, kwargs)
if 'LorentzAngleTool' not in kwargs :
from SiLorentzAngleTool.SCT_LorentzAngleConfig import SCT_LorentzAngleCfg
- SCT_LorentzAngle = SCT_LorentzAngleCfg(flags).popPrivateTools()
+ SCT_LorentzAngle = acc.popToolsAndMerge(SCT_LorentzAngleCfg(flags))
kwargs.setdefault("LorentzAngleTool", SCT_LorentzAngle )
kwargs.setdefault("CorrectionStrategy", 0 ) # do correct position bias
kwargs.setdefault("ErrorStrategy", 2 ) # do use phi dependent errors
- return CompFactory.InDet.SCT_ClusterOnTrackTool(the_name, **kwargs)
+
+ acc.setPrivateTools(CompFactory.InDet.SCT_ClusterOnTrackTool(the_name, **kwargs))
+ return acc
def InDetBroadSCT_ClusterOnTrackToolCfg(flags, name='InDetBroadSCT_ClusterOnTrackTool', **kwargs):
kwargs.setdefault("ErrorStrategy", 0)
@@ -235,8 +257,10 @@ def InDetTRT_DriftCircleOnTrackToolCfg(flags, name='TRT_DriftCircleOnTrackTool',
return acc
def InDetBroadTRT_DriftCircleOnTrackToolCfg(name='InDetBroadTRT_DriftCircleOnTrackTool', **kwargs):
+ acc = ComponentAccumulator()
the_name = makeName( name, kwargs)
- return CompFactory.InDet.TRT_DriftCircleOnTrackNoDriftTimeTool(the_name, **kwargs)
+ acc.addPublicTool(CompFactory.InDet.TRT_DriftCircleOnTrackNoDriftTimeTool(the_name, **kwargs), primary = True)
+ return acc
def InDetRotCreatorCfg(flags, name='InDetRotCreator', **kwargs):
acc = ComponentAccumulator()
@@ -252,17 +276,17 @@ def InDetRotCreatorCfg(flags, name='InDetRotCreator', **kwargs):
if 'ToolPixelCluster' not in kwargs :
if use_broad_cluster_pix :
- ToolPixelCluster= InDetBroadPixelClusterOnTrackToolCfg(flags, **pix_cluster_on_track_args)
+ ToolPixelCluster= acc.popToolsAndMerge(InDetBroadPixelClusterOnTrackToolCfg(flags, **pix_cluster_on_track_args))
else:
- ToolPixelCluster= InDetPixelClusterOnTrackToolCfg(flags, **pix_cluster_on_track_args)
+ ToolPixelCluster= acc.popToolsAndMerge(InDetPixelClusterOnTrackToolCfg(flags, **pix_cluster_on_track_args))
acc.addPublicTool(ToolPixelCluster)
kwargs.setdefault("ToolPixelCluster", ToolPixelCluster)
if 'ToolSCT_Cluster' not in kwargs :
if use_broad_cluster_sct :
- ToolSCT_Cluster = InDetBroadSCT_ClusterOnTrackToolCfg(flags)
+ ToolSCT_Cluster = acc.popToolsAndMerge(InDetBroadSCT_ClusterOnTrackToolCfg(flags))
else :
- ToolSCT_Cluster = InDetSCT_ClusterOnTrackToolCfg(flags)
+ ToolSCT_Cluster = acc.popToolsAndMerge(InDetSCT_ClusterOnTrackToolCfg(flags))
kwargs.setdefault("ToolSCT_Cluster", ToolSCT_Cluster)
acc.addPublicTool(ToolSCT_Cluster)
@@ -279,13 +303,11 @@ def InDetTRT_DriftCircleOnTrackUniversalToolCfg(name='InDetTRT_RefitRotCreator',
default_ScaleHitUncertainty = 2.5
if 'RIOonTrackToolDrift' not in kwargs :
- RIOonTrackToolDrift = InDetBroadTRT_DriftCircleOnTrackToolCfg()
+ RIOonTrackToolDrift = acc.getPrimaryAndMerge(InDetBroadTRT_DriftCircleOnTrackToolCfg())
kwargs.setdefault("RIOonTrackToolDrift", RIOonTrackToolDrift)
- acc.addPublicTool(RIOonTrackToolDrift)
if 'RIOonTrackToolTube' not in kwargs :
- RIOonTrackToolTube = InDetBroadTRT_DriftCircleOnTrackToolCfg()
+ RIOonTrackToolTube = acc.getPrimaryAndMerge(InDetBroadTRT_DriftCircleOnTrackToolCfg())
kwargs.setdefault("RIOonTrackToolTube", RIOonTrackToolTube)
- acc.addPublicTool(RIOonTrackToolTube)
kwargs.setdefault("ScaleHitUncertainty", default_ScaleHitUncertainty)
acc.setPrivateTools(CompFactory.InDet.TRT_DriftCircleOnTrackUniversalTool(name = the_name, **kwargs))
return acc
@@ -318,19 +340,23 @@ def InDetTrackPRD_AssociationCfg(flags, name='InDetTrackPRD_Association', **kwar
if kwargs.get('TracksName', None) is None :
raise Exception('Not TracksName argument provided')
- kwargs.setdefault("AssociationTool", InDetPRDtoTrackMapToolGangedPixelsCfg(flags) \
- if 'AssociationTool' not in kwargs else None )
+
+ AssociationTool = acc.popToolsAndMerge(InDetPRDtoTrackMapToolGangedPixelsCfg(flags))
+ kwargs.setdefault("AssociationTool", AssociationTool \
+ if 'AssociationTool' not in kwargs else None )
kwargs.setdefault("AssociationMapName", prefix+'PRDtoTrackMap'+suffix )
acc.addEventAlgo(CompFactory.InDet.InDetTrackPRD_Association(name = the_name, **kwargs))
return acc
def InDetTRTDriftCircleCutForPatternRecoCfg(flags, name='InDetTRTDriftCircleCutForPatternReco', **kwargs):
the_name = makeName( name, kwargs)
-
+ result = ComponentAccumulator()
kwargs.setdefault("MinOffsetDCs", 5)
kwargs.setdefault("UseNewParameterization", flags.InDet.Tracking.useNewParameterizationTRT)
kwargs.setdefault("UseActiveFractionSvc", flags.Detector.EnableTRT)
- return CompFactory.InDet.InDetTrtDriftCircleCutTool(the_name, **kwargs)
+ tool = CompFactory.InDet.InDetTrtDriftCircleCutTool(the_name, **kwargs)
+ result.addPublicTool( tool, primary=True )
+ return result
def InDetSummaryHelperNoHoleSearchCfg(flags, name='InDetSummaryHelperNoHoleSearch', **kwargs):
acc = ComponentAccumulator()
@@ -545,16 +571,22 @@ def InDetTrackSummaryToolSharedHitsCfg(flags, name='InDetTrackSummaryToolSharedH
def InDetUpdatorCfg(flags, name = 'InDetUpdator', **kwargs):
the_name = makeName( name, kwargs )
- if flags.InDet.kalmanUpdator == "fast" :
- return CompFactory.Trk.KalmanUpdator_xk(name = the_name, **kwargs)
- elif flags.InDet.kalmanUpdator == "weight" :
- return CompFactory.Trk.KalmanWeightUpdator(name = the_name, **kwargs)
- elif flags.InDet.kalmanUpdator == "smatrix" :
- return CompFactory.Trk.KalmanUpdatorSMatrix(name = the_name, **kwargs)
- elif flags.InDet.kalmanUpdator == "amg" :
- return CompFactory.Trk.KalmanUpdatorAmg(name = the_name, **kwargs)
+ acc = ComponentAccumulator()
+
+ tool = None
+ if flags.ITk.kalmanUpdator == "fast" :
+ tool = CompFactory.Trk.KalmanUpdator_xk(name = the_name, **kwargs)
+ elif flags.ITk.kalmanUpdator == "weight" :
+ tool = CompFactory.Trk.KalmanWeightUpdator(name = the_name, **kwargs)
+ elif flags.ITk.kalmanUpdator == "smatrix" :
+ tool = CompFactory.Trk.KalmanUpdatorSMatrix(name = the_name, **kwargs)
+ elif flags.ITk.kalmanUpdator == "amg" :
+ tool = CompFactory.Trk.KalmanUpdatorAmg(name = the_name, **kwargs)
else :
- return CompFactory.Trk.KalmanUpdator(name = the_name, **kwargs)
+ tool = CompFactory.Trk.KalmanUpdator(name = the_name, **kwargs)
+
+ acc.addPublicTool(tool, primary = True)
+ return acc
def InDetMultipleScatteringUpdatorCfg(name = "InDetMultipleScatteringUpdator", **kwargs):
acc = ComponentAccumulator()
@@ -572,11 +604,11 @@ def InDetMeasRecalibSTCfg(flags, name='InDetMeasRecalibST', **kwargs) :
pix_cluster_on_track_args = stripArgs(kwargs,['SplitClusterMapExtension','ClusterSplitProbabilityName','nameSuffix'])
if 'BroadPixelClusterOnTrackTool' not in kwargs :
- InDetBroadPixelClusterOnTrackTool = InDetBroadPixelClusterOnTrackToolCfg(flags, **pix_cluster_on_track_args)
+ InDetBroadPixelClusterOnTrackTool = acc.popToolsAndMerge(InDetBroadPixelClusterOnTrackToolCfg(flags, **pix_cluster_on_track_args))
kwargs.setdefault('BroadPixelClusterOnTrackTool', InDetBroadPixelClusterOnTrackTool)
acc.addPublicTool(InDetBroadPixelClusterOnTrackTool)
if 'BroadSCT_ClusterOnTrackTool' not in kwargs :
- InDetBroadSCT_ClusterOnTrackTool = InDetBroadSCT_ClusterOnTrackToolCfg(flags)
+ InDetBroadSCT_ClusterOnTrackTool = acc.popToolsAndMerge(InDetBroadSCT_ClusterOnTrackToolCfg(flags))
acc.addPublicTool(InDetBroadSCT_ClusterOnTrackTool)
kwargs.setdefault('BroadSCT_ClusterOnTrackTool', InDetBroadSCT_ClusterOnTrackTool)
if 'CommonRotCreator' not in kwargs :
@@ -603,8 +635,7 @@ def InDetKalmanTrackFitterBaseCfg(flags, name='InDetKalmanTrackFitterBase',**kwa
acc.addPublicTool(InDetRefitRotCreator)
kwargs.setdefault("RIO_OnTrackCreatorHandle", InDetRefitRotCreator)
- InDetUpdator = InDetUpdatorCfg(flags)
- acc.addPublicTool(InDetUpdator)
+ InDetUpdator = acc.getPrimaryAndMerge(InDetUpdatorCfg(flags))
kwargs.setdefault('MeasurementUpdatorHandle', InDetUpdator)
kwargs.setdefault('KalmanSmootherHandle', InDetBKS())
kwargs.setdefault('KalmanOutlierLogicHandle', InDetKOL())
@@ -674,19 +705,18 @@ def InDetBroadRotCreatorCfg(flags, name='InDetBroadInDetRotCreator', **kwargs) :
if 'ToolPixelCluster' not in kwargs :
pix_cluster_on_track_args = copyArgs(kwargs,['SplitClusterMapExtension','ClusterSplitProbabilityName','nameSuffix'])
- InDetBroadPixelClusterOnTrackTool = InDetBroadPixelClusterOnTrackToolCfg(flags, **pix_cluster_on_track_args)
+ InDetBroadPixelClusterOnTrackTool = acc.popToolsAndMerge(InDetBroadPixelClusterOnTrackToolCfg(flags, **pix_cluster_on_track_args))
acc.addPublicTool(InDetBroadPixelClusterOnTrackTool)
kwargs.setdefault('ToolPixelCluster', InDetBroadPixelClusterOnTrackTool)
if 'ToolSCT_Cluster' not in kwargs :
- InDetBroadSCT_ClusterOnTrackTool = InDetBroadSCT_ClusterOnTrackToolCfg(flags)
+ InDetBroadSCT_ClusterOnTrackTool = acc.popToolsAndMerge(InDetBroadSCT_ClusterOnTrackToolCfg(flags))
acc.addPublicTool(InDetBroadSCT_ClusterOnTrackTool)
kwargs.setdefault('ToolSCT_Cluster', InDetBroadSCT_ClusterOnTrackTool)
if flags.Detector.EnableTRT:
if 'ToolTRT_DriftCircle' not in kwargs :
- InDetBroadTRT_DriftCircleOnTrackTool = InDetBroadTRT_DriftCircleOnTrackToolCfg()
- acc.addPublicTool(InDetBroadTRT_DriftCircleOnTrackTool)
+ InDetBroadTRT_DriftCircleOnTrackTool = acc.getPrimaryAndMerge(InDetBroadTRT_DriftCircleOnTrackToolCfg())
kwargs.setdefault('ToolTRT_DriftCircle', InDetBroadTRT_DriftCircleOnTrackTool)
InDetRotCreator = acc.popToolsAndMerge(InDetRotCreatorCfg(flags, name = name, **kwargs))
@@ -877,7 +907,7 @@ def InDetTrackFitterCfg(flags, name='InDetTrackFitter', **kwargs) :
}[flags.InDet.trackFitterType](flags, name=name, **kwargs)
def InDetGlobalChi2FitterBaseCfg(flags, name='GlobalChi2FitterBase', **kwargs) :
- from InDetConfig.InDetRecToolConfig import InDetNavigatorCfg, InDetPropagatorCfg, InDetExtrapolatorCfg
+ from InDetConfig.InDetRecToolConfig import InDetNavigatorCfg, InDetPropagatorCfg, InDetExtrapolatorCfg, InDetMaterialEffectsUpdatorCfg
acc = ComponentAccumulator()
if 'TrackingGeometrySvc' not in kwargs :
@@ -894,22 +924,14 @@ def InDetGlobalChi2FitterBaseCfg(flags, name='GlobalChi2FitterBase', **kwargs) :
kwargs.setdefault("TrackingGeometryReadKey", 'AtlasTrackingGeometry')
InDetExtrapolator = acc.getPrimaryAndMerge(InDetExtrapolatorCfg(flags))
-
- InDetNavigator = acc.popToolsAndMerge(InDetNavigatorCfg(flags))
- acc.addPublicTool(InDetNavigator)
-
- InDetPropagator = acc.popToolsAndMerge(InDetPropagatorCfg(flags))
- acc.addPublicTool(InDetPropagator)
-
- InDetUpdator = InDetUpdatorCfg(flags)
- acc.addPublicTool(InDetUpdator)
+ InDetNavigator = acc.getPrimaryAndMerge(InDetNavigatorCfg(flags))
+ InDetPropagator = acc.getPrimaryAndMerge(InDetPropagatorCfg(flags))
+ InDetUpdator = acc.getPrimaryAndMerge(InDetUpdatorCfg(flags))
InDetMultipleScatteringUpdator = acc.popToolsAndMerge(InDetMultipleScatteringUpdatorCfg())
acc.addPublicTool(InDetMultipleScatteringUpdator)
- from InDetConfig.InDetRecToolConfig import InDetMaterialEffectsUpdatorCfg
- InDetMaterialEffectsUpdator = acc.popToolsAndMerge(InDetMaterialEffectsUpdatorCfg(flags))
- acc.addPublicTool(InDetMaterialEffectsUpdator)
+ InDetMaterialEffectsUpdator = acc.getPrimaryAndMerge(InDetMaterialEffectsUpdatorCfg(flags))
kwargs.setdefault("ExtrapolationTool", InDetExtrapolator)
kwargs.setdefault("NavigatorTool", InDetNavigator)
@@ -1063,15 +1085,15 @@ def InDetKOL(name = 'InDetKOL', **kwargs):
#############################################################################################
def InDetPatternPropagatorCfg(name='InDetPatternPropagator', **kwargs):
the_name = makeName( name, kwargs)
- return CompFactory.Trk.RungeKuttaPropagator(name = the_name, **kwargs)
+ result = ComponentAccumulator()
+ tool = CompFactory.Trk.RungeKuttaPropagator(name = the_name, **kwargs)
+ result.addPublicTool( tool, primary=True )
+ return result
def InDetTRT_DriftCircleOnTrackUniversalToolCosmicsCfg(name='TRT_DriftCircleOnTrackUniversalTool', **kwargs):
kwargs.setdefault("ScaleHitUncertainty", 2.)
return InDetTRT_DriftCircleOnTrackUniversalToolCfg(name=name, **kwargs)
-def InDetTRT_DriftCircleOnTrackNoDriftTimeToolCfg(**kwargs):
- return InDetBroadTRT_DriftCircleOnTrackToolCfg(**kwargs)
-
def InDetTRT_ExtensionToolCosmicsCfg(flags, name='InDetTRT_ExtensionToolCosmics', **kwargs):
acc = ComponentAccumulator()
the_name = makeName( name, kwargs)
@@ -1092,7 +1114,7 @@ def InDetTRT_ExtensionToolCosmicsCfg(flags, name='InDetTRT_ExtensionToolCosmics'
kwargs.setdefault("RIOonTrackToolYesDr", InDetTRT_DriftCircleOnTrackUniversalToolCosmics)
if 'RIOonTrackToolNoDr' not in kwargs :
- InDetBroadTRT_DriftCircleOnTrackTool = InDetTRT_DriftCircleOnTrackNoDriftTimeToolCfg()
+ InDetBroadTRT_DriftCircleOnTrackTool = acc.getPrimaryAndMerge(InDetBroadTRT_DriftCircleOnTrackToolCfg())
acc.addPublicTool(InDetBroadTRT_DriftCircleOnTrackTool)
kwargs.setdefault("RIOonTrackToolNoDr", InDetBroadTRT_DriftCircleOnTrackTool)
@@ -1104,25 +1126,25 @@ def InDetTRT_ExtensionToolCosmicsCfg(flags, name='InDetTRT_ExtensionToolCosmics'
def InDetPatternUpdatorCfg(name='InDetPatternUpdator', **kwargs):
the_name = makeName(name, kwargs)
- return CompFactory.Trk.KalmanUpdator_xk(name = the_name, **kwargs)
+ result = ComponentAccumulator()
+ tool = CompFactory.Trk.KalmanUpdator_xk(name = the_name, **kwargs)
+ result.addPublicTool( tool, primary=True )
+ return result
def InDetTRT_TrackExtensionTool_xkCfg(flags, name='InDetTRT_ExtensionTool', **kwargs):
acc = ComponentAccumulator()
the_name = makeName( name, kwargs)
if 'PropagatorTool' not in kwargs :
- InDetPatternPropagator = InDetPatternPropagatorCfg()
- acc.addPublicTool(InDetPatternPropagator)
+ InDetPatternPropagator = acc.getPrimaryAndMerge(InDetPatternPropagatorCfg())
kwargs.setdefault("PropagatorTool", InDetPatternPropagator)
if 'UpdatorTool' not in kwargs :
- InDetPatternUpdator = InDetPatternUpdatorCfg()
- acc.addPublicTool(InDetPatternUpdator)
+ InDetPatternUpdator = acc.getPrimaryAndMerge(InDetPatternUpdatorCfg())
kwargs.setdefault("UpdatorTool", InDetPatternUpdator)
if 'DriftCircleCutTool' not in kwargs :
- InDetTRTDriftCircleCutForPatternReco = InDetTRTDriftCircleCutForPatternRecoCfg(flags)
- acc.addPublicTool(InDetTRTDriftCircleCutForPatternReco)
+ InDetTRTDriftCircleCutForPatternReco = acc.getPrimaryAndMerge(InDetTRTDriftCircleCutForPatternRecoCfg(flags))
kwargs.setdefault("DriftCircleCutTool", InDetTRTDriftCircleCutForPatternReco)
if 'RIOonTrackToolYesDr' not in kwargs :
@@ -1152,8 +1174,10 @@ def InDetTRT_TrackExtensionTool_xkCfg(flags, name='InDetTRT_ExtensionTool', **kw
return acc
def InDetWeightCalculatorCfg(name='InDetWeightCalculator', **kwargs):
+ acc = ComponentAccumulator()
the_name = makeName( name, kwargs)
- return CompFactory.Trk.DAF_SimpleWeightCalculator(name = the_name, **kwargs)
+ acc.addPublicTool(CompFactory.Trk.DAF_SimpleWeightCalculator(name = the_name, **kwargs), primary = True)
+ return acc
def InDetCompetingTRT_DC_ToolCfg(flags, name='InDetCompetingTRT_DC_Tool', **kwargs):
acc = ComponentAccumulator()
@@ -1164,8 +1188,7 @@ def InDetCompetingTRT_DC_ToolCfg(flags, name='InDetCompetingTRT_DC_Tool', **kwar
kwargs.setdefault("Extrapolator", acc.getPrimaryAndMerge(InDetExtrapolatorCfg(flags)))
if 'ToolForWeightCalculation' not in kwargs :
- InDetWeightCalculator = InDetWeightCalculatorCfg()
- acc.addPublicTool(InDetWeightCalculator)
+ InDetWeightCalculator = acc.getPrimaryAndMerge(InDetWeightCalculatorCfg())
kwargs.setdefault("ToolForWeightCalculation", InDetWeightCalculator)
if 'ToolForTRT_DriftCircleOnTrackCreation' not in kwargs :
@@ -1178,8 +1201,7 @@ def InDetTRT_RoadMakerCfg(flags, name='InDetTRT_RoadMaker', **kwargs):
acc = ComponentAccumulator()
the_name = makeName( name, kwargs)
- InDetPatternPropagator = InDetPatternPropagatorCfg()
- acc.addPublicTool(InDetPatternPropagator)
+ InDetPatternPropagator = acc.getPrimaryAndMerge(InDetPatternPropagatorCfg())
kwargs.setdefault("RoadWidth", 20.)
kwargs.setdefault("PropagatorTool", InDetPatternPropagator)
acc.setPrivateTools(CompFactory.InDet.TRT_DetElementsRoadMaker_xk(the_name, **kwargs))
@@ -1195,8 +1217,7 @@ def InDetTRT_TrackExtensionTool_DAFCfg(flags, name='TRT_TrackExtensionTool_DAF',
kwargs.setdefault("CompetingDriftCircleTool", InDetCompetingTRT_DC_Tool)
if 'PropagatorTool' not in kwargs :
- InDetPatternPropagator = InDetPatternPropagatorCfg()
- acc.addPublicTool(InDetPatternPropagator)
+ InDetPatternPropagator = acc.getPrimaryAndMerge(InDetPatternPropagatorCfg())
kwargs.setdefault("PropagatorTool", InDetPatternPropagator)
if 'RoadTool' not in kwargs :
@@ -1233,7 +1254,7 @@ def InDetRotCreatorDigitalCfg(flags, name='InDetRotCreatorDigital', **kwargs) :
if 'ToolPixelCluster' not in kwargs :
pix_cluster_on_track_args = copyArgs(kwargs,['SplitClusterMapExtension','ClusterSplitProbabilityName','nameSuffix'])
- ToolPixelCluster = InDetPixelClusterOnTrackToolDigitalCfg(flags, **pix_cluster_on_track_args)
+ ToolPixelCluster = acc.popToolsAndMerge(InDetPixelClusterOnTrackToolDigitalCfg(flags, **pix_cluster_on_track_args))
kwargs.setdefault('ToolPixelCluster', ToolPixelCluster)
acc.addPublicTool(ToolPixelCluster)
@@ -1248,10 +1269,12 @@ def InDetTrackSummaryToolNoHoleSearchCfg(flags, name='InDetTrackSummaryToolNoHol
return acc
def InDetROIInfoVecCondAlgCfg(name='InDetROIInfoVecCondAlg', **kwargs) :
+ acc = ComponentAccumulator()
kwargs.setdefault("InputEmClusterContainerName", 'InDetCaloClusterROIs')
kwargs.setdefault("WriteKey", kwargs.get("namePrefix","") +"ROIInfoVec"+ kwargs.get("nameSuffix","") )
kwargs.setdefault("minPtEM", 5000.0) #in MeV
- return CompFactory.ROIInfoVecAlg(name = name,**kwargs)
+ acc.setPrivateTools(CompFactory.ROIInfoVecAlg(name = name,**kwargs))
+ return acc
def InDetAmbiScoringToolBaseCfg(flags, name='InDetAmbiScoringTool', **kwargs) :
acc = ComponentAccumulator()
@@ -1263,14 +1286,13 @@ def InDetAmbiScoringToolBaseCfg(flags, name='InDetAmbiScoringTool', **kwargs) :
acc.addPublicTool(InDetTrackSummaryTool)
if 'DriftCircleCutTool' not in kwargs :
- InDetTRTDriftCircleCutForPatternReco = InDetTRTDriftCircleCutForPatternRecoCfg(flags)
- acc.addPublicTool(InDetTRTDriftCircleCutForPatternReco)
+ InDetTRTDriftCircleCutForPatternReco = acc.getPrimaryAndMerge(InDetTRTDriftCircleCutForPatternRecoCfg(flags))
kwargs.setdefault("DriftCircleCutTool", InDetTRTDriftCircleCutForPatternReco )
from AthenaCommon.DetFlags import DetFlags
have_calo_rois = flags.InDet.doBremRecovery and flags.InDet.doCaloSeededBrem and DetFlags.detdescr.Calo_allOn()
if have_calo_rois :
- alg = InDetROIInfoVecCondAlgCfg()
+ alg = acc.popToolsAndMerge(InDetROIInfoVecCondAlgCfg())
kwargs.setdefault("CaloROIInfoName", alg.WriteKey )
kwargs.setdefault("SummaryTool", InDetTrackSummaryTool )
kwargs.setdefault("useAmbigFcn", True )
@@ -1319,11 +1341,8 @@ def InDetCosmicExtenScoringToolCfg(flags, name='InDetCosmicExtenScoringTool',**k
def SiCombinatorialTrackFinder_xkCfg(flags, name='InDetSiComTrackFinder', **kwargs):
acc = ComponentAccumulator()
- InDetPatternPropagator = InDetPatternPropagatorCfg()
- acc.addPublicTool(InDetPatternPropagator)
-
- InDetPatternUpdator = InDetPatternUpdatorCfg()
- acc.addPublicTool(InDetPatternUpdator)
+ InDetPatternPropagator = acc.getPrimaryAndMerge(InDetPatternPropagatorCfg())
+ InDetPatternUpdator = acc.getPrimaryAndMerge(InDetPatternUpdatorCfg())
InDetRotCreatorDigital = acc.popToolsAndMerge(InDetRotCreatorDigitalCfg(flags))
acc.addPublicTool(InDetRotCreatorDigital)
@@ -1440,8 +1459,10 @@ def InDetRotCreatorDBMCfg(flags, name='InDetRotCreatorDBM', **kwargs) :
return acc
def PRDtoTrackMapToolCfg(name='PRDtoTrackMapTool',**kwargs) :
+ acc = ComponentAccumulator()
the_name = makeName( name, kwargs)
- return CompFactory.Trk.PRDtoTrackMapTool( name=the_name, **kwargs)
+ acc.addPublicTool(CompFactory.Trk.PRDtoTrackMapTool( name=the_name, **kwargs), primary=True)
+ return acc
def InDetNNScoringToolBaseCfg(flags, name='InDetNNScoringTool', **kwargs) :
acc = ComponentAccumulator()
@@ -1450,7 +1471,7 @@ def InDetNNScoringToolBaseCfg(flags, name='InDetNNScoringTool', **kwargs) :
from AthenaCommon.DetFlags import DetFlags
have_calo_rois = flags.InDet.doBremRecovery and flags.InDet.doCaloSeededBrem and DetFlags.detdescr.Calo_allOn()
if have_calo_rois :
- alg = InDetROIInfoVecCondAlgCfg()
+ alg = acc.popToolsAndMerge(InDetROIInfoVecCondAlgCfg())
kwargs.setdefault("CaloROIInfoName", alg.WriteKey )
from InDetConfig.InDetRecToolConfig import InDetExtrapolatorCfg
@@ -1460,8 +1481,7 @@ def InDetNNScoringToolBaseCfg(flags, name='InDetNNScoringTool', **kwargs) :
acc.addPublicTool(InDetTrackSummaryTool)
if 'DriftCircleCutTool' not in kwargs :
- InDetTRTDriftCircleCutForPatternReco = InDetTRTDriftCircleCutForPatternRecoCfg(flags)
- acc.addPublicTool(InDetTRTDriftCircleCutForPatternReco)
+ InDetTRTDriftCircleCutForPatternReco = acc.getPrimaryAndMerge(InDetTRTDriftCircleCutForPatternRecoCfg(flags))
kwargs.setdefault("DriftCircleCutTool", InDetTRTDriftCircleCutForPatternReco )
kwargs.setdefault("nnCutConfig", "dev/TrackingCP/LRTAmbiNetwork/20200727_225401/nn-config.json" )
diff --git a/InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py b/InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py
index 331a917f51fe..78636d0e7889 100644
--- a/InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py
+++ b/InnerDetector/InDetConfig/python/TrackingSiPatternConfig.py
@@ -2,7 +2,6 @@
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
import InDetConfig.TrackingCommonConfig as TC
-import AthenaCommon.SystemOfUnits as Units
def SiSpacePointsSeedMakerCfg(flags, name="InDetSpSeedsMaker", InputCollections = None, **kwargs) :
acc = ComponentAccumulator()
@@ -16,10 +15,7 @@ def SiSpacePointsSeedMakerCfg(flags, name="InDetSpSeedsMaker", InputCollections
or flags.InDet.Tracking.extension == "LowPtLargeD0" \
or flags.InDet.Tracking.extension == "BeamGas" \
or flags.InDet.Tracking.extension == "ForwardTracks" \
- or flags.InDet.Tracking.extension == "ForwardSLHCTracks" \
- or flags.InDet.Tracking.extension == "Disappearing" \
- or flags.InDet.Tracking.extension == "VeryForwardSLHCTracks" \
- or flags.InDet.Tracking.extension == "SLHCConversionFinding"):
+ or flags.InDet.Tracking.extension == "Disappearing"):
usePrdAssociationTool = True
else:
usePrdAssociationTool = False
@@ -42,8 +38,6 @@ def SiSpacePointsSeedMakerCfg(flags, name="InDetSpSeedsMaker", InputCollections
SiSpacePointsSeedMaker = CompFactory.InDet.SiSpacePointsSeedMaker_LowMomentum
elif flags.InDet.Tracking.extension == "BeamGas":
SiSpacePointsSeedMaker = CompFactory.InDet.SiSpacePointsSeedMaker_BeamGas
- elif flags.InDet.Tracking.extension == "SLHC" or flags.InDet.Tracking.extension == "ForwardSLHCTracks" or flags.InDet.Tracking.extension == "VeryForwardSLHCTracks" :
- SiSpacePointsSeedMaker = CompFactory.InDet.SiSpacePointsSeedMaker_ITK
else:
SiSpacePointsSeedMaker = CompFactory.InDet.SiSpacePointsSeedMaker_ATLxk
@@ -94,14 +88,7 @@ def SiSpacePointsSeedMakerCfg(flags, name="InDetSpSeedsMaker", InputCollections
if flags.InDet.Tracking.extension == "LowPt" or flags.InDet.Tracking.extension == "VeryLowPt" or (flags.InDet.Tracking.extension == "Pixel" and flags.InDet.doMinBias):
kwargs.setdefault("pTmax", flags.InDet.Tracking.maxPT)
kwargs.setdefault("mindRadius", 4.0)
- if flags.InDet.Tracking.extension == "SLHC" or flags.InDet.Tracking.extension == "SLHCConversionFinding":
- kwargs.setdefault("minRadius1", 0)
- kwargs.setdefault("minRadius2", 0)
- kwargs.setdefault("minRadius3", 0)
- kwargs.setdefault("maxRadius1", 1000.*Units.mm)
- kwargs.setdefault("maxRadius2", 1000.*Units.mm)
- kwargs.setdefault("maxRadius3", 1000.*Units.mm)
- if flags.InDet.Tracking.extension == "ForwardTracks" or flags.InDet.Tracking.extension == "ForwardSLHCTracks" or flags.InDet.Tracking.extension == "VeryForwardSLHCTracks":
+ if flags.InDet.Tracking.extension == "ForwardTracks":
kwargs.setdefault("checkEta", True)
kwargs.setdefault("etaMin", flags.InDet.Tracking.minEta)
kwargs.setdefault("etaMax", flags.InDet.Tracking.maxEta)
@@ -141,8 +128,7 @@ def SiDetElementsRoadMaker_xkCfg(flags, name="InDetSiRoadMaker", **kwargs) :
#
# --- SCT and Pixel detector elements road builder
#
- InDetPatternPropagator = TC.InDetPatternPropagatorCfg()
- acc.addPublicTool(InDetPatternPropagator)
+ InDetPatternPropagator = acc.getPrimaryAndMerge(TC.InDetPatternPropagatorCfg())
kwargs.setdefault("PropagatorTool", InDetPatternPropagator)
kwargs.setdefault("usePixel", flags.InDet.Tracking.usePixel )
@@ -169,11 +155,8 @@ def SiCombinatorialTrackFinder_xkCfg(flags, name="InDetSiComTrackFinder", **kwar
acc.addPublicTool(rot_creator_digital)
- InDetPatternPropagator = TC.InDetPatternPropagatorCfg()
- acc.addPublicTool(InDetPatternPropagator)
-
- InDetPatternUpdator = TC.InDetPatternUpdatorCfg()
- acc.addPublicTool(InDetPatternUpdator)
+ InDetPatternPropagator = acc.getPrimaryAndMerge(TC.InDetPatternPropagatorCfg())
+ InDetPatternUpdator = acc.getPrimaryAndMerge(TC.InDetPatternUpdatorCfg())
from InDetConfig.InDetRecToolConfig import InDetBoundaryCheckToolCfg
boundary_check_tool = acc.popToolsAndMerge(InDetBoundaryCheckToolCfg(flags))
@@ -208,7 +191,7 @@ def SiCombinatorialTrackFinder_xkCfg(flags, name="InDetSiComTrackFinder", **kwar
def SiTrackMaker_xkCfg(flags, name="InDetSiTrackMaker", InputCollections = None, **kwargs) :
acc = ComponentAccumulator()
- useBremMode = flags.InDet.Tracking.extension == "Offline" or flags.InDet.Tracking.extension == "SLHC" or flags.InDet.Tracking.extension == "DBM"
+ useBremMode = flags.InDet.Tracking.extension == "Offline" or flags.InDet.Tracking.extension == "DBM"
InDetSiDetElementsRoadMaker = acc.popToolsAndMerge(SiDetElementsRoadMaker_xkCfg(flags))
acc.addPublicTool(InDetSiDetElementsRoadMaker)
@@ -229,7 +212,7 @@ def SiTrackMaker_xkCfg(flags, name="InDetSiTrackMaker", InputCollections = None,
#
# --- decide if use the association tool
#
- if (len(InputCollections) > 0) and (flags.InDet.Tracking.extension == "LowPt" or flags.InDet.Tracking.extension == "VeryLowPt" or flags.InDet.Tracking.extension == "LargeD0" or flags.InDet.Tracking.extension == "LowPtLargeD0" or flags.InDet.Tracking.extension == "BeamGas" or flags.InDet.Tracking.extension == "ForwardTracks" or flags.InDet.Tracking.extension == "ForwardSLHCTracks" or flags.InDet.Tracking.extension == "Disappearing" or flags.InDet.Tracking.extension == "VeryForwardSLHCTracks" or flags.InDet.Tracking.extension == "SLHCConversionFinding"):
+ if (len(InputCollections) > 0) and (flags.InDet.Tracking.extension == "LowPt" or flags.InDet.Tracking.extension == "VeryLowPt" or flags.InDet.Tracking.extension == "LargeD0" or flags.InDet.Tracking.extension == "LowPtLargeD0" or flags.InDet.Tracking.extension == "BeamGas" or flags.InDet.Tracking.extension == "ForwardTracks" or flags.InDet.Tracking.extension == "Disappearing"):
usePrdAssociationTool = True
else:
usePrdAssociationTool = False
@@ -252,18 +235,15 @@ def SiTrackMaker_xkCfg(flags, name="InDetSiTrackMaker", InputCollections = None,
kwargs.setdefault("Xi2maxMultiTracks", flags.InDet.Tracking.Xi2max)
kwargs.setdefault("useSSSseedsFilter", flags.InDet.doSSSfilter)
kwargs.setdefault("doMultiTracksProd", True)
- kwargs.setdefault("useBremModel", flags.InDet.doBremRecovery and useBremMode) # only for NewTracking the brem is debugged !!!
- kwargs.setdefault("doCaloSeededBrem", flags.InDet.doCaloSeededBrem)
- kwargs.setdefault("doHadCaloSeedSSS", flags.InDet.doHadCaloSeededSSS)
+ kwargs.setdefault("useBremModel", flags.InDet.doBremRecovery and useBremMode and flags.Detector.GeometryLAr) # only for NewTracking the brem is debugged !!!
+ kwargs.setdefault("doCaloSeededBrem", flags.InDet.doCaloSeededBrem and flags.Detector.GeometryLAr)
+ kwargs.setdefault("doHadCaloSeedSSS", flags.InDet.doHadCaloSeededSSS and flags.Detector.GeometryTile)
kwargs.setdefault("phiWidth", flags.InDet.Tracking.phiWidthBrem)
kwargs.setdefault("etaWidth", flags.InDet.Tracking.etaWidthBrem)
kwargs.setdefault("InputClusterContainerName", 'InDetCaloClusterROIs') # InDetKeys.CaloClusterROIContainer()
kwargs.setdefault("InputHadClusterContainerName", 'InDetHadCaloClusterROIs') # InDetKeys.HadCaloClusterROIContainer()
kwargs.setdefault("UseAssociationTool", usePrdAssociationTool)
- if flags.InDet.Tracking.extension == "SLHC" or flags.InDet.Tracking.extension == "ForwardSLHCTracks" or flags.InDet.Tracking.extension == "VeryForwardSLHCTracks" :
- kwargs.setdefault("ITKGeometry", True)
-
if flags.InDet.Tracking.extension == "DBM":
kwargs.setdefault("MagneticFieldMode", "NoField")
kwargs.setdefault("useBremModel", False)
@@ -293,15 +273,6 @@ def SiTrackMaker_xkCfg(flags, name="InDetSiTrackMaker", InputCollections = None,
elif flags.InDet.Tracking.extension == "ForwardTracks":
kwargs.setdefault("TrackPatternRecoInfo", 'SiSpacePointsSeedMaker_ForwardTracks')
- elif flags.InDet.Tracking.extension == "ForwardSLHCTracks":
- kwargs.setdefault("TrackPatternRecoInfo", 'SiSpacePointsSeedMaker_ForwardSLHCTracks')
-
- elif flags.InDet.Tracking.extension == "VeryForwardSLHCTracks":
- kwargs.setdefault("TrackPatternRecoInfo", 'SiSpacePointsSeedMaker_VeryForwardSLHCTracks')
-
- elif flags.InDet.Tracking.extension == "SLHCConversionFinding":
- kwargs.setdefault("TrackPatternRecoInfo", 'SiSpacePointsSeedMaker_SLHCConversionTracks')
-
elif flags.InDet.Tracking.extension == "LargeD0" or flags.InDet.Tracking.extension == "LowPtLargeD0":
kwargs.setdefault("TrackPatternRecoInfo", 'SiSpacePointsSeedMaker_LargeD0')
@@ -328,7 +299,7 @@ def SiSPSeededTrackFinderCfg(flags, name="InDetSiSpTrackFinder", InputCollection
#
# --- decide if use the association tool
#
- if (len(InputCollections) > 0) and (flags.InDet.Tracking.extension == "LowPt" or flags.InDet.Tracking.extension == "VeryLowPt" or flags.InDet.Tracking.extension == "LargeD0" or flags.InDet.Tracking.extension == "LowPtLargeD0" or flags.InDet.Tracking.extension == "BeamGas" or flags.InDet.Tracking.extension == "ForwardTracks" or flags.InDet.Tracking.extension == "ForwardSLHCTracks" or flags.InDet.Tracking.extension == "Disappearing" or flags.InDet.Tracking.extension == "VeryForwardSLHCTracks" or flags.InDet.Tracking.extension == "SLHCConversionFinding"):
+ if (len(InputCollections) > 0) and (flags.InDet.Tracking.extension == "LowPt" or flags.InDet.Tracking.extension == "VeryLowPt" or flags.InDet.Tracking.extension == "LargeD0" or flags.InDet.Tracking.extension == "LowPtLargeD0" or flags.InDet.Tracking.extension == "BeamGas" or flags.InDet.Tracking.extension == "ForwardTracks" or flags.InDet.Tracking.extension == "Disappearing"):
usePrdAssociationTool = True
else:
usePrdAssociationTool = False
@@ -372,7 +343,7 @@ def SiSPSeededTrackFinderCfg(flags, name="InDetSiSpTrackFinder", InputCollection
kwargs.setdefault("ZvertexTool", InDetZvertexMaker)
kwargs.setdefault("useMBTSTimeDiff", flags.InDet.useMBTSTimeDiff)
- if flags.InDet.Tracking.extension == "ForwardSLHCTracks" or flags.InDet.Tracking.extension == "ForwardTracks":
+ if flags.InDet.Tracking.extension == "ForwardTracks":
kwargs.setdefault("useZvertexTool", flags.InDet.useZvertexTool)
kwargs.setdefault("useNewStrategy", False)
kwargs.setdefault("useZBoundFinding", False)
@@ -413,14 +384,13 @@ def InDetAmbiTrackSelectionToolCfg(flags, name="InDetAmbiTrackSelectionTool", **
prob2 = flags.InDet.pixelClusterSplitProb2_run1
nhitsToAllowSplitting = 8
- if flags.InDet.doTIDE_Ambi and not (flags.InDet.Tracking.extension == "ForwardSLHCTracks" or flags.InDet.Tracking.extension == "ForwardTracks" or flags.InDet.Tracking.extension == "DBM"):
+ if flags.InDet.doTIDE_Ambi and not (flags.InDet.Tracking.extension == "ForwardTracks" or flags.InDet.Tracking.extension == "DBM"):
AmbiTrackSelectionTool = CompFactory.InDet.InDetDenseEnvAmbiTrackSelectionTool
else:
AmbiTrackSelectionTool = CompFactory.InDet.InDetAmbiTrackSelectionTool
if 'UseParameterization' in kwargs and kwargs.get('UseParameterization',False) :
- InDetTRTDriftCircleCut = TC.InDetTRTDriftCircleCutForPatternRecoCfg(flags)
- acc.addPublicTool(InDetTRTDriftCircleCut)
+ InDetTRTDriftCircleCut = acc.getPrimaryAndMerge(TC.InDetTRTDriftCircleCutForPatternRecoCfg(flags))
kwargs.setdefault("DriftCircleCutTool", InDetTRTDriftCircleCut)
InDetPRDtoTrackMapToolGangedPixels = acc.popToolsAndMerge(TC.InDetPRDtoTrackMapToolGangedPixelsCfg(flags))
@@ -436,7 +406,7 @@ def InDetAmbiTrackSelectionToolCfg(flags, name="InDetAmbiTrackSelectionTool", **
kwargs.setdefault("Cosmics" , flags.Beam.Type == 'cosmics')
kwargs.setdefault("doPixelSplitting" , flags.InDet.doPixelClusterSplitting and flags.InDet.Tracking.extension != "DBM")
- if flags.InDet.doTIDE_Ambi and not (flags.InDet.Tracking.extension == "ForwardSLHCTracks" or flags.InDet.Tracking.extension == "ForwardTracks" or flags.InDet.Tracking.extension == "DBM"):
+ if flags.InDet.doTIDE_Ambi and not (flags.InDet.Tracking.extension == "ForwardTracks" or flags.InDet.Tracking.extension == "DBM"):
kwargs.setdefault("sharedProbCut" , prob1)
kwargs.setdefault("sharedProbCut2" , prob2)
kwargs.setdefault("minSiHitsToAllowSplitting" , nhitsToAllowSplitting)
@@ -451,7 +421,7 @@ def InDetAmbiTrackSelectionToolCfg(flags, name="InDetAmbiTrackSelectionTool", **
kwargs.setdefault("phiWidth" , 0.1) #Split cluster ROI size
kwargs.setdefault("etaWidth" , 0.1) #Split cluster ROI size
kwargs.setdefault("InputEmClusterContainerName" , 'InDetCaloClusterROIs')
- kwargs.setdefault("doEmCaloSeed" , True) #Only split in cluster in region of interest
+ kwargs.setdefault("doEmCaloSeed" , flags.Detector.GeometryLAr) #Only split in cluster in region of interest
kwargs.setdefault("minPtConv" , 10000) #Only allow split clusters on track withe pt greater than this MeV
kwargs.setdefault("phiWidthEM" , 0.05) #Split cluster ROI size
kwargs.setdefault("etaWidthEM" , 0.05) #Split cluster ROI size
@@ -494,8 +464,7 @@ def DenseEnvironmentsAmbiguityScoreProcessorToolCfg(flags, name = "InDetAmbiguit
InDetPRDtoTrackMapToolGangedPixels = acc.popToolsAndMerge(TC.InDetPRDtoTrackMapToolGangedPixelsCfg(flags))
acc.addPublicTool(InDetPRDtoTrackMapToolGangedPixels)
- PRDtoTrackMapTool = TC.PRDtoTrackMapToolCfg()
- acc.addPublicTool(PRDtoTrackMapTool)
+ PRDtoTrackMapTool = acc.getPrimaryAndMerge(TC.PRDtoTrackMapToolCfg())
prob1 = flags.InDet.pixelClusterSplitProb1
prob2 = flags.InDet.pixelClusterSplitProb2
@@ -505,7 +474,7 @@ def DenseEnvironmentsAmbiguityScoreProcessorToolCfg(flags, name = "InDetAmbiguit
prob1 = flags.InDet.pixelClusterSplitProb1_run1
prob2 = flags.InDet.pixelClusterSplitProb2_run1
- if flags.InDet.doTIDE_Ambi and not (flags.InDet.Tracking.extension == "ForwardSLHCTracks" or flags.InDet.Tracking.extension == "ForwardTracks" or flags.InDet.Tracking.extension == "DBM") :
+ if flags.InDet.doTIDE_Ambi and not (flags.InDet.Tracking.extension == "ForwardTracks" or flags.InDet.Tracking.extension == "DBM") :
kwargs.setdefault("sharedProbCut", prob1)
kwargs.setdefault("sharedProbCut2", prob2)
if flags.InDet.Tracking.extension == "":
@@ -532,7 +501,7 @@ def DenseEnvironmentsAmbiguityScoreProcessorToolCfg(flags, name = "InDetAmbiguit
def DenseEnvironmentsAmbiguityProcessorToolCfg(flags, name = "InDetAmbiguityProcessor", ClusterSplitProbContainer='', **kwargs) :
acc = ComponentAccumulator()
- useBremMode = flags.InDet.Tracking.extension == "" or flags.InDet.Tracking.extension == "Offline" or flags.InDet.Tracking.extension == "SLHC" or flags.InDet.Tracking.extension == "DBM"
+ useBremMode = flags.InDet.Tracking.extension == "" or flags.InDet.Tracking.extension == "Offline" or flags.InDet.Tracking.extension == "DBM"
#
# --- set up different Scoring Tool for collisions and cosmics
@@ -625,7 +594,7 @@ def DenseEnvironmentsAmbiguityProcessorToolCfg(flags, name = "InDetAmbiguityProc
def SimpleAmbiguityProcessorToolCfg(flags, name = "InDetAmbiguityProcessor", ClusterSplitProbContainer='', **kwargs) :
acc = ComponentAccumulator()
- useBremMode = flags.InDet.Tracking.extension == "Offline" or flags.InDet.Tracking.extension == "SLHC" or flags.InDet.Tracking.extension == "DBM"
+ useBremMode = flags.InDet.Tracking.extension == "Offline" or flags.InDet.Tracking.extension == "DBM"
#
# --- set up different Scoring Tool for collisions and cosmics
@@ -642,7 +611,7 @@ def SimpleAmbiguityProcessorToolCfg(flags, name = "InDetAmbiguityProcessor", Clu
InDetTrackFitter = acc.popToolsAndMerge(TC.InDetTrackFitterCfg(flags))
acc.addPublicTool(InDetTrackFitter)
- InDetPRDtoTrackMapToolGangedPixels = TC.InDetPRDtoTrackMapToolGangedPixelsCfg(flags)
+ InDetPRDtoTrackMapToolGangedPixels = acc.popToolsAndMerge(TC.InDetPRDtoTrackMapToolGangedPixelsCfg(flags))
acc.addPublicTool(InDetPRDtoTrackMapToolGangedPixels)
ambi_track_summary_tool = acc.popToolsAndMerge(TC.InDetTrackSummaryToolCfg( flags,
@@ -696,7 +665,7 @@ def TrkAmbiguityScoreCfg(flags, name="InDetAmbiguityScore", SiSPSeededTrackColle
#
InputTrackCollection = SiSPSeededTrackCollectionKey
- if flags.InDet.doTIDE_Ambi and not (flags.InDet.Tracking.extension == "ForwardSLHCTracks" or flags.InDet.Tracking.extension == "ForwardTracks" or flags.InDet.Tracking.extension == "DBM"):
+ if flags.InDet.doTIDE_Ambi and not (flags.InDet.Tracking.extension == "ForwardTracks" or flags.InDet.Tracking.extension == "DBM"):
InDetAmbiguityScoreProcessor = acc.popToolsAndMerge(DenseEnvironmentsAmbiguityScoreProcessorToolCfg(flags))
acc.addPublicTool(InDetAmbiguityScoreProcessor)
else:
@@ -717,7 +686,7 @@ def TrkAmbiguitySolverCfg(flags, name="InDetAmbiguitySolver", ResolvedTrackColle
acc = ComponentAccumulator()
SiTrackCollection = ResolvedTrackCollectionKey
- if flags.InDet.doTIDE_Ambi and not (flags.InDet.Tracking.extension == "ForwardSLHCTracks" or flags.InDet.Tracking.extension == "ForwardTracks" or flags.InDet.Tracking.extension == "DBM"):
+ if flags.InDet.doTIDE_Ambi and not (flags.InDet.Tracking.extension == "ForwardTracks" or flags.InDet.Tracking.extension == "DBM"):
# DenseEnvironmentsAmbiguityProcessorTool
InDetAmbiguityProcessor = acc.popToolsAndMerge(DenseEnvironmentsAmbiguityProcessorToolCfg( flags,
ClusterSplitProbContainer=ClusterSplitProbContainer))
@@ -748,7 +717,7 @@ def TrackingSiPatternCfg(flags, InputCollections = None, ResolvedTrackCollection
#
# --- decide if use the association tool
#
- if (len(InputCollections) > 0) and (flags.InDet.Tracking.extension == "LowPt" or flags.InDet.Tracking.extension == "VeryLowPt" or flags.InDet.Tracking.extension == "LargeD0" or flags.InDet.Tracking.extension == "LowPtLargeD0" or flags.InDet.Tracking.extension == "BeamGas" or flags.InDet.Tracking.extension == "ForwardTracks" or flags.InDet.Tracking.extension == "ForwardSLHCTracks" or flags.InDet.Tracking.extension == "Disappearing" or flags.InDet.Tracking.extension == "VeryForwardSLHCTracks" or flags.InDet.Tracking.extension == "SLHCConversionFinding"):
+ if (len(InputCollections) > 0) and (flags.InDet.Tracking.extension == "LowPt" or flags.InDet.Tracking.extension == "VeryLowPt" or flags.InDet.Tracking.extension == "LargeD0" or flags.InDet.Tracking.extension == "LowPtLargeD0" or flags.InDet.Tracking.extension == "BeamGas" or flags.InDet.Tracking.extension == "ForwardTracks" or flags.InDet.Tracking.extension == "Disappearing"):
usePrdAssociationTool = True
else:
usePrdAssociationTool = False
--
GitLab
From 9f5c915dc1f89c2b0e0b8754d5e2ff842d8e1aa0 Mon Sep 17 00:00:00 2001
From: Daniele Zanzi <daniele.zanzi@cern.ch>
Date: Wed, 18 Aug 2021 18:40:36 +0000
Subject: [PATCH 144/272] new run3 L1muon chains (ATR-23227)
---
.../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 382 ++++++++++++++++++
.../share/ref_data_v1Dev_build.ref | 174 ++++++++
.../python/HLTMenuConfig/Menu/LS2_v1.py | 47 +++
.../TriggerMenuMT/python/L1/Config/ItemDef.py | 25 +-
.../python/L1/Menu/Menu_MC_pp_v8.py | 5 +
.../python/L1/Menu/Menu_MC_pp_v8_inputs.py | 7 +-
6 files changed, 638 insertions(+), 2 deletions(-)
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index d833b8878152..96373ebb9d2f 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -304,6 +304,19 @@ HLT_2mu10_bJpsimumu_L12MU10:
2: 2
3: 2
4: 2
+HLT_2mu10_bJpsimumu_L12MU8F:
+ eventCount: 0
+ stepCounts:
+ 0: 3
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 6
+ 1: 6
+ 2: 2
+ 3: 2
+ 4: 2
HLT_2mu10_bUpsimumu_L12MU10:
eventCount: 0
stepCounts:
@@ -317,6 +330,19 @@ HLT_2mu10_bUpsimumu_L12MU10:
2: 2
3: 2
4: 2
+HLT_2mu10_bUpsimumu_L12MU8F:
+ eventCount: 0
+ stepCounts:
+ 0: 3
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 6
+ 1: 6
+ 2: 2
+ 3: 2
+ 4: 2
HLT_2mu10_l2mt_L1MU10:
eventCount: 2
stepCounts:
@@ -341,6 +367,18 @@ HLT_2mu14_L12MU10:
1: 2
2: 2
3: 2
+HLT_2mu14_L12MU8F:
+ eventCount: 1
+ stepCounts:
+ 0: 3
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 6
+ 1: 2
+ 2: 2
+ 3: 2
HLT_2mu14_l2io_L12MU10:
eventCount: 1
stepCounts:
@@ -365,6 +403,18 @@ HLT_2mu15_L12MU10:
1: 2
2: 2
3: 2
+HLT_2mu15_L12MU8F:
+ eventCount: 1
+ stepCounts:
+ 0: 3
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 6
+ 1: 2
+ 2: 2
+ 3: 2
HLT_2mu4_L12MU4:
eventCount: 4
stepCounts:
@@ -813,16 +863,28 @@ HLT_3j65_0eta290_020jvt_pf_ftf_bdl1r85_L1J45p0ETA21_3J15p0ETA25:
2: 6
HLT_3mu4_bDimu2700_L13MU4:
eventCount: 0
+HLT_3mu4_bJpsi_L13MU3V:
+ eventCount: 0
HLT_3mu4_bJpsi_L13MU4:
eventCount: 0
+HLT_3mu4_bPhi_L13MU3V:
+ eventCount: 0
HLT_3mu4_bPhi_L13MU4:
eventCount: 0
+HLT_3mu4_bTau_L13MU3V:
+ eventCount: 0
HLT_3mu4_bTau_L13MU4:
eventCount: 0
+HLT_3mu4_bUpsi_L13MU3V:
+ eventCount: 0
HLT_3mu4_bUpsi_L13MU4:
eventCount: 0
+HLT_3mu6_L13MU5VF:
+ eventCount: 0
HLT_3mu6_L13MU6:
eventCount: 0
+HLT_3mu6_bDimu_L13MU5VF:
+ eventCount: 0
HLT_3mu6_bDimu_L13MU6:
eventCount: 0
HLT_3mu6_bJpsi_L13MU6:
@@ -831,12 +893,16 @@ HLT_3mu6_bTau_L13MU6:
eventCount: 0
HLT_3mu6_bUpsi_L13MU6:
eventCount: 0
+HLT_3mu6_msonly_L13MU5VF:
+ eventCount: 0
HLT_3mu6_msonly_L13MU6:
eventCount: 0
HLT_3mu6_msonly_L1MU4_UNPAIRED_ISO:
eventCount: 0
HLT_3mu6_msonly_L1MU6_EMPTY:
eventCount: 0
+HLT_3mu8_msonly_L13MU5VF:
+ eventCount: 0
HLT_3mu8_msonly_L13MU6:
eventCount: 0
HLT_4j115_ftf_L13J50:
@@ -958,8 +1024,12 @@ HLT_4j85_L13J50:
0: 1
stepFeatures:
0: 4
+HLT_4mu4_L14MU3V:
+ eventCount: 0
HLT_4mu4_L14MU4:
eventCount: 0
+HLT_4mu4_bDimu6000_L14MU3V:
+ eventCount: 0
HLT_4mu4_bDimu6000_L14MU4:
eventCount: 0
HLT_5j24_L14J15:
@@ -6069,6 +6139,20 @@ HLT_mu10_ivarmedium_mu10_10invm70_L12MU10:
2: 8
3: 8
4: 2
+HLT_mu10_ivarmedium_mu10_10invm70_L12MU8F:
+ eventCount: 2
+ stepCounts:
+ 0: 3
+ 1: 2
+ 2: 2
+ 3: 2
+ 4: 2
+ stepFeatures:
+ 0: 12
+ 1: 10
+ 2: 8
+ 3: 8
+ 4: 2
HLT_mu10_lateMu_L1LATE-MU10_XE50:
eventCount: 0
HLT_mu11_mu6_bBmumu_L1LFV-MU11:
@@ -6085,6 +6169,18 @@ HLT_mu11_mu6_bBmumu_L1MU11_2MU6:
2: 8
3: 4
4: 4
+HLT_mu11_mu6_bBmumu_L1MU8VF_2MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 4
+ 1: 1
+ 2: 1
+ stepFeatures:
+ 0: 15
+ 1: 19
+ 2: 8
+ 3: 4
+ 4: 4
HLT_mu11_mu6_bBmumux_BcmumuPi_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -6095,6 +6191,16 @@ HLT_mu11_mu6_bBmumux_BcmumuPi_L1MU11_2MU6:
1: 19
2: 8
3: 4
+HLT_mu11_mu6_bBmumux_BcmumuPi_L1MU8VF_2MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 4
+ 1: 1
+ stepFeatures:
+ 0: 15
+ 1: 19
+ 2: 8
+ 3: 4
HLT_mu11_mu6_bBmumux_BdmumuKst_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -6105,6 +6211,16 @@ HLT_mu11_mu6_bBmumux_BdmumuKst_L1MU11_2MU6:
1: 19
2: 8
3: 4
+HLT_mu11_mu6_bBmumux_BdmumuKst_L1MU8VF_2MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 4
+ 1: 1
+ stepFeatures:
+ 0: 15
+ 1: 19
+ 2: 8
+ 3: 4
HLT_mu11_mu6_bBmumux_BpmumuKp_L1LFV-MU11:
eventCount: 0
HLT_mu11_mu6_bBmumux_BpmumuKp_L1MU11_2MU6:
@@ -6117,6 +6233,16 @@ HLT_mu11_mu6_bBmumux_BpmumuKp_L1MU11_2MU6:
1: 19
2: 8
3: 4
+HLT_mu11_mu6_bBmumux_BpmumuKp_L1MU8VF_2MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 4
+ 1: 1
+ stepFeatures:
+ 0: 15
+ 1: 19
+ 2: 8
+ 3: 4
HLT_mu11_mu6_bBmumux_BsmumuPhi_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -6127,6 +6253,16 @@ HLT_mu11_mu6_bBmumux_BsmumuPhi_L1MU11_2MU6:
1: 19
2: 8
3: 4
+HLT_mu11_mu6_bBmumux_BsmumuPhi_L1MU8VF_2MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 4
+ 1: 1
+ stepFeatures:
+ 0: 15
+ 1: 19
+ 2: 8
+ 3: 4
HLT_mu11_mu6_bBmumux_LbPqKm_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -6137,6 +6273,16 @@ HLT_mu11_mu6_bBmumux_LbPqKm_L1MU11_2MU6:
1: 19
2: 8
3: 4
+HLT_mu11_mu6_bBmumux_LbPqKm_L1MU8VF_2MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 4
+ 1: 1
+ stepFeatures:
+ 0: 15
+ 1: 19
+ 2: 8
+ 3: 4
HLT_mu11_mu6_bDimu2700_L1LFV-MU11:
eventCount: 0
HLT_mu11_mu6_bDimu2700_L1MU11_2MU6:
@@ -6151,6 +6297,18 @@ HLT_mu11_mu6_bDimu2700_L1MU11_2MU6:
2: 8
3: 4
4: 4
+HLT_mu11_mu6_bDimu2700_L1MU8VF_2MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 4
+ 1: 1
+ 2: 1
+ stepFeatures:
+ 0: 15
+ 1: 19
+ 2: 8
+ 3: 4
+ 4: 4
HLT_mu11_mu6_bDimu2700_Lxy0_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -6177,6 +6335,18 @@ HLT_mu11_mu6_bDimu_L1MU11_2MU6:
2: 8
3: 4
4: 4
+HLT_mu11_mu6_bDimu_L1MU8VF_2MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 4
+ 1: 1
+ 2: 1
+ stepFeatures:
+ 0: 15
+ 1: 19
+ 2: 8
+ 3: 4
+ 4: 4
HLT_mu11_mu6_bDimu_Lxy0_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -6203,6 +6373,18 @@ HLT_mu11_mu6_bJpsimumu_L1MU11_2MU6:
2: 8
3: 4
4: 4
+HLT_mu11_mu6_bJpsimumu_L1MU8VF_2MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 4
+ 1: 1
+ 2: 1
+ stepFeatures:
+ 0: 15
+ 1: 19
+ 2: 8
+ 3: 4
+ 4: 4
HLT_mu11_mu6_bJpsimumu_Lxy0_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -6229,6 +6411,18 @@ HLT_mu11_mu6_bPhi_L1MU11_2MU6:
2: 8
3: 4
4: 4
+HLT_mu11_mu6_bPhi_L1MU8VF_2MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 4
+ 1: 1
+ 2: 1
+ stepFeatures:
+ 0: 15
+ 1: 19
+ 2: 8
+ 3: 4
+ 4: 4
HLT_mu11_mu6_bTau_L1LFV-MU11:
eventCount: 0
HLT_mu11_mu6_bTau_L1MU11_2MU6:
@@ -6243,6 +6437,18 @@ HLT_mu11_mu6_bTau_L1MU11_2MU6:
2: 8
3: 4
4: 4
+HLT_mu11_mu6_bTau_L1MU8VF_2MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 4
+ 1: 1
+ 2: 1
+ stepFeatures:
+ 0: 15
+ 1: 19
+ 2: 8
+ 3: 4
+ 4: 4
HLT_mu11_mu6_bUpsimumu_L1LFV-MU11:
eventCount: 0
HLT_mu11_mu6_bUpsimumu_L1MU11_2MU6:
@@ -6257,6 +6463,18 @@ HLT_mu11_mu6_bUpsimumu_L1MU11_2MU6:
2: 8
3: 4
4: 4
+HLT_mu11_mu6_bUpsimumu_L1MU8VF_2MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 4
+ 1: 1
+ 2: 1
+ stepFeatures:
+ 0: 15
+ 1: 19
+ 2: 8
+ 3: 4
+ 4: 4
HLT_mu14_L1MU10:
eventCount: 7
stepCounts:
@@ -6461,6 +6679,20 @@ HLT_mu14_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1MU10_TAU12IM_XE35:
6: 6
7: 6
8: 1
+HLT_mu20_2mu4noL1_L1MU14FCH:
+ eventCount: 0
+ stepCounts:
+ 0: 8
+ 1: 6
+ 2: 6
+ 3: 6
+ 4: 1
+ stepFeatures:
+ 0: 10
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 3
HLT_mu20_2mu4noL1_L1MU20:
eventCount: 0
stepCounts:
@@ -6565,6 +6797,24 @@ HLT_mu20_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRAB_L1MU20:
7: 14
8: 14
9: 2
+HLT_mu20_ivarmedium_mu4noL1_10invm70_L1MU14FCH:
+ eventCount: 2
+ stepCounts:
+ 0: 8
+ 1: 6
+ 2: 6
+ 3: 6
+ 4: 4
+ 5: 2
+ 6: 2
+ stepFeatures:
+ 0: 10
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 4
+ 5: 5
+ 6: 4
HLT_mu20_ivarmedium_mu4noL1_10invm70_L1MU20:
eventCount: 2
stepCounts:
@@ -6583,6 +6833,24 @@ HLT_mu20_ivarmedium_mu4noL1_10invm70_L1MU20:
4: 4
5: 5
6: 4
+HLT_mu20_ivarmedium_mu8noL1_L1MU14FCH:
+ eventCount: 1
+ stepCounts:
+ 0: 8
+ 1: 6
+ 2: 6
+ 3: 6
+ 4: 4
+ 5: 1
+ 6: 1
+ stepFeatures:
+ 0: 10
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 4
+ 5: 2
+ 6: 2
HLT_mu20_ivarmedium_mu8noL1_L1MU20:
eventCount: 1
stepCounts:
@@ -6656,6 +6924,20 @@ HLT_mu20_mu2noL1_invmJPsi_os_L1MU20:
3: 7
4: 7
5: 7
+HLT_mu22_2mu4noL1_L1MU14FCH:
+ eventCount: 0
+ stepCounts:
+ 0: 8
+ 1: 6
+ 2: 6
+ 3: 6
+ 4: 1
+ stepFeatures:
+ 0: 10
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 3
HLT_mu22_2mu4noL1_L1MU20:
eventCount: 0
stepCounts:
@@ -6670,6 +6952,22 @@ HLT_mu22_2mu4noL1_L1MU20:
2: 7
3: 7
4: 3
+HLT_mu22_mu10noL1_L1MU14FCH:
+ eventCount: 2
+ stepCounts:
+ 0: 8
+ 1: 6
+ 2: 6
+ 3: 6
+ 4: 2
+ 5: 2
+ stepFeatures:
+ 0: 10
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 4
+ 5: 4
HLT_mu22_mu10noL1_L1MU20:
eventCount: 2
stepCounts:
@@ -6686,6 +6984,22 @@ HLT_mu22_mu10noL1_L1MU20:
3: 7
4: 4
5: 4
+HLT_mu22_mu8noL1_L1MU14FCH:
+ eventCount: 2
+ stepCounts:
+ 0: 8
+ 1: 6
+ 2: 6
+ 3: 6
+ 4: 2
+ 5: 2
+ stepFeatures:
+ 0: 10
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 4
+ 5: 4
HLT_mu22_mu8noL1_L1MU20:
eventCount: 2
stepCounts:
@@ -6714,6 +7028,16 @@ HLT_mu24_L1MU20:
1: 7
2: 7
3: 7
+HLT_mu24_LRT_d0loose_L1MU14FCH:
+ eventCount: 0
+ stepCounts:
+ 0: 8
+ 1: 1
+ 2: 1
+ stepFeatures:
+ 0: 10
+ 1: 1
+ 2: 1
HLT_mu24_LRT_d0loose_L1MU20:
eventCount: 0
stepCounts:
@@ -6940,6 +7264,22 @@ HLT_mu24_mu6_probe_L1MU20:
5: 5
6: 4
7: 4
+HLT_mu24_mu8noL1_L1MU14FCH:
+ eventCount: 2
+ stepCounts:
+ 0: 8
+ 1: 6
+ 2: 6
+ 3: 6
+ 4: 2
+ 5: 2
+ stepFeatures:
+ 0: 10
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 4
+ 5: 4
HLT_mu24_mu8noL1_L1MU20:
eventCount: 2
stepCounts:
@@ -6988,6 +7328,20 @@ HLT_mu26_ivarmedium_2j20_0eta290_020jvt_pf_ftf_boffperf_L1MU20:
5: 3
6: 24
7: 24
+HLT_mu26_ivarmedium_L1MU14FCH:
+ eventCount: 3
+ stepCounts:
+ 0: 8
+ 1: 6
+ 2: 5
+ 3: 4
+ 4: 3
+ stepFeatures:
+ 0: 10
+ 1: 7
+ 2: 6
+ 3: 5
+ 4: 3
HLT_mu26_ivarmedium_L1MU20:
eventCount: 3
stepCounts:
@@ -7490,6 +7844,18 @@ HLT_mu4_l2io_L1MU4:
1: 23
2: 19
3: 17
+HLT_mu50_L1MU14FCH:
+ eventCount: 1
+ stepCounts:
+ 0: 8
+ 1: 6
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 10
+ 1: 7
+ 2: 1
+ 3: 1
HLT_mu50_L1MU20:
eventCount: 1
stepCounts:
@@ -7516,6 +7882,12 @@ HLT_mu50_RPCPEBSecondaryReadout_L1MU20:
2: 1
3: 1
4: 1
+HLT_mu60_0eta105_msonly_L1MU14FCH:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_mu60_0eta105_msonly_L1MU20:
eventCount: 0
stepCounts:
@@ -7534,8 +7906,12 @@ HLT_mu60_L1MU20:
1: 7
2: 1
3: 1
+HLT_mu6_2mu4_bDimu2700_L1MU5VF_3MU3V:
+ eventCount: 0
HLT_mu6_2mu4_bDimu2700_L1MU6_3MU4:
eventCount: 0
+HLT_mu6_2mu4_bDimu6000_L1MU5VF_3MU3V:
+ eventCount: 0
HLT_mu6_2mu4_bDimu6000_L1MU6_3MU4:
eventCount: 0
HLT_mu6_2mu4_bJpsi_L1MU6_3MU4:
@@ -7708,6 +8084,12 @@ HLT_mu80_L1MU20:
stepFeatures:
0: 10
1: 7
+HLT_mu80_msonly_3layersEC_L1MU14FCH:
+ eventCount: 0
+ stepCounts:
+ 0: 4
+ stepFeatures:
+ 0: 5
HLT_mu80_msonly_3layersEC_L1MU20:
eventCount: 0
stepCounts:
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index e62cf8389782..4f9908242cd1 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -119,16 +119,24 @@ HLT_2j55_0eta290_020jvt_pf_ftf_bdl1r60_2j55_pf_ftf_0eta320_L14J15p0ETA25:
eventCount: 0
HLT_2mu10_bJpsimumu_L12MU10:
eventCount: 0
+HLT_2mu10_bJpsimumu_L12MU8F:
+ eventCount: 0
HLT_2mu10_bUpsimumu_L12MU10:
eventCount: 0
+HLT_2mu10_bUpsimumu_L12MU8F:
+ eventCount: 0
HLT_2mu10_l2mt_L1MU10:
eventCount: 0
HLT_2mu14_L12MU10:
eventCount: 0
+HLT_2mu14_L12MU8F:
+ eventCount: 0
HLT_2mu14_l2io_L12MU10:
eventCount: 0
HLT_2mu15_L12MU10:
eventCount: 0
+HLT_2mu15_L12MU8F:
+ eventCount: 0
HLT_2mu4_L12MU4:
eventCount: 0
stepCounts:
@@ -342,16 +350,28 @@ HLT_3j65_0eta290_020jvt_pf_ftf_bdl1r85_L1J45p0ETA21_3J15p0ETA25:
eventCount: 0
HLT_3mu4_bDimu2700_L13MU4:
eventCount: 0
+HLT_3mu4_bJpsi_L13MU3V:
+ eventCount: 0
HLT_3mu4_bJpsi_L13MU4:
eventCount: 0
+HLT_3mu4_bPhi_L13MU3V:
+ eventCount: 0
HLT_3mu4_bPhi_L13MU4:
eventCount: 0
+HLT_3mu4_bTau_L13MU3V:
+ eventCount: 0
HLT_3mu4_bTau_L13MU4:
eventCount: 0
+HLT_3mu4_bUpsi_L13MU3V:
+ eventCount: 0
HLT_3mu4_bUpsi_L13MU4:
eventCount: 0
+HLT_3mu6_L13MU5VF:
+ eventCount: 0
HLT_3mu6_L13MU6:
eventCount: 0
+HLT_3mu6_bDimu_L13MU5VF:
+ eventCount: 0
HLT_3mu6_bDimu_L13MU6:
eventCount: 0
HLT_3mu6_bJpsi_L13MU6:
@@ -360,12 +380,16 @@ HLT_3mu6_bTau_L13MU6:
eventCount: 0
HLT_3mu6_bUpsi_L13MU6:
eventCount: 0
+HLT_3mu6_msonly_L13MU5VF:
+ eventCount: 0
HLT_3mu6_msonly_L13MU6:
eventCount: 0
HLT_3mu6_msonly_L1MU4_UNPAIRED_ISO:
eventCount: 0
HLT_3mu6_msonly_L1MU6_EMPTY:
eventCount: 0
+HLT_3mu8_msonly_L13MU5VF:
+ eventCount: 0
HLT_3mu8_msonly_L13MU6:
eventCount: 0
HLT_4j115_ftf_L13J50:
@@ -400,8 +424,12 @@ HLT_4j55_L13J50:
eventCount: 0
HLT_4j85_L13J50:
eventCount: 0
+HLT_4mu4_L14MU3V:
+ eventCount: 0
HLT_4mu4_L14MU4:
eventCount: 0
+HLT_4mu4_bDimu6000_L14MU3V:
+ eventCount: 0
HLT_4mu4_bDimu6000_L14MU4:
eventCount: 0
HLT_5j24_L14J15:
@@ -2496,6 +2524,8 @@ HLT_mu10_ivarmedium_j70_0eta320_j50_0eta490_j0_DJMASS900j50_L1MJJ-500-NFF:
eventCount: 0
HLT_mu10_ivarmedium_mu10_10invm70_L12MU10:
eventCount: 0
+HLT_mu10_ivarmedium_mu10_10invm70_L12MU8F:
+ eventCount: 0
HLT_mu10_lateMu_L1LATE-MU10_XE50:
eventCount: 0
HLT_mu11_mu6_bBmumu_L1LFV-MU11:
@@ -2506,18 +2536,36 @@ HLT_mu11_mu6_bBmumu_L1MU11_2MU6:
0: 1
stepFeatures:
0: 3
+HLT_mu11_mu6_bBmumu_L1MU8VF_2MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_mu11_mu6_bBmumux_BcmumuPi_L1MU11_2MU6:
eventCount: 0
stepCounts:
0: 1
stepFeatures:
0: 3
+HLT_mu11_mu6_bBmumux_BcmumuPi_L1MU8VF_2MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_mu11_mu6_bBmumux_BdmumuKst_L1MU11_2MU6:
eventCount: 0
stepCounts:
0: 1
stepFeatures:
0: 3
+HLT_mu11_mu6_bBmumux_BdmumuKst_L1MU8VF_2MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_mu11_mu6_bBmumux_BpmumuKp_L1LFV-MU11:
eventCount: 0
HLT_mu11_mu6_bBmumux_BpmumuKp_L1MU11_2MU6:
@@ -2526,18 +2574,36 @@ HLT_mu11_mu6_bBmumux_BpmumuKp_L1MU11_2MU6:
0: 1
stepFeatures:
0: 3
+HLT_mu11_mu6_bBmumux_BpmumuKp_L1MU8VF_2MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_mu11_mu6_bBmumux_BsmumuPhi_L1MU11_2MU6:
eventCount: 0
stepCounts:
0: 1
stepFeatures:
0: 3
+HLT_mu11_mu6_bBmumux_BsmumuPhi_L1MU8VF_2MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_mu11_mu6_bBmumux_LbPqKm_L1MU11_2MU6:
eventCount: 0
stepCounts:
0: 1
stepFeatures:
0: 3
+HLT_mu11_mu6_bBmumux_LbPqKm_L1MU8VF_2MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_mu11_mu6_bDimu2700_L1LFV-MU11:
eventCount: 0
HLT_mu11_mu6_bDimu2700_L1MU11_2MU6:
@@ -2546,6 +2612,12 @@ HLT_mu11_mu6_bDimu2700_L1MU11_2MU6:
0: 1
stepFeatures:
0: 3
+HLT_mu11_mu6_bDimu2700_L1MU8VF_2MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_mu11_mu6_bDimu2700_Lxy0_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -2560,6 +2632,12 @@ HLT_mu11_mu6_bDimu_L1MU11_2MU6:
0: 1
stepFeatures:
0: 3
+HLT_mu11_mu6_bDimu_L1MU8VF_2MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_mu11_mu6_bDimu_Lxy0_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -2574,6 +2652,12 @@ HLT_mu11_mu6_bJpsimumu_L1MU11_2MU6:
0: 1
stepFeatures:
0: 3
+HLT_mu11_mu6_bJpsimumu_L1MU8VF_2MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_mu11_mu6_bJpsimumu_Lxy0_L1MU11_2MU6:
eventCount: 0
stepCounts:
@@ -2588,6 +2672,12 @@ HLT_mu11_mu6_bPhi_L1MU11_2MU6:
0: 1
stepFeatures:
0: 3
+HLT_mu11_mu6_bPhi_L1MU8VF_2MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_mu11_mu6_bTau_L1LFV-MU11:
eventCount: 0
HLT_mu11_mu6_bTau_L1MU11_2MU6:
@@ -2596,6 +2686,12 @@ HLT_mu11_mu6_bTau_L1MU11_2MU6:
0: 1
stepFeatures:
0: 3
+HLT_mu11_mu6_bTau_L1MU8VF_2MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_mu11_mu6_bUpsimumu_L1LFV-MU11:
eventCount: 0
HLT_mu11_mu6_bUpsimumu_L1MU11_2MU6:
@@ -2604,6 +2700,12 @@ HLT_mu11_mu6_bUpsimumu_L1MU11_2MU6:
0: 1
stepFeatures:
0: 3
+HLT_mu11_mu6_bUpsimumu_L1MU8VF_2MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_mu14_L1MU10:
eventCount: 0
stepCounts:
@@ -2626,6 +2728,12 @@ HLT_mu14_tau25_mediumRNN_tracktwoMVABDT_xe50_cell_03dRAB_L1MU10_TAU12IM_XE35:
eventCount: 0
HLT_mu14_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1MU10_TAU12IM_XE35:
eventCount: 0
+HLT_mu20_2mu4noL1_L1MU14FCH:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 1
HLT_mu20_2mu4noL1_L1MU20:
eventCount: 0
stepCounts:
@@ -2654,12 +2762,24 @@ HLT_mu20_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRAB_L1MU20:
eventCount: 0
stepFeatures:
0: 1
+HLT_mu20_ivarmedium_mu4noL1_10invm70_L1MU14FCH:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 1
HLT_mu20_ivarmedium_mu4noL1_10invm70_L1MU20:
eventCount: 0
stepCounts:
0: 1
stepFeatures:
0: 1
+HLT_mu20_ivarmedium_mu8noL1_L1MU14FCH:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 1
HLT_mu20_ivarmedium_mu8noL1_L1MU20:
eventCount: 0
stepCounts:
@@ -2684,18 +2804,36 @@ HLT_mu20_mu2noL1_invmJPsi_os_L1MU20:
0: 1
stepFeatures:
0: 1
+HLT_mu22_2mu4noL1_L1MU14FCH:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 1
HLT_mu22_2mu4noL1_L1MU20:
eventCount: 0
stepCounts:
0: 1
stepFeatures:
0: 1
+HLT_mu22_mu10noL1_L1MU14FCH:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 1
HLT_mu22_mu10noL1_L1MU20:
eventCount: 0
stepCounts:
0: 1
stepFeatures:
0: 1
+HLT_mu22_mu8noL1_L1MU14FCH:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 1
HLT_mu22_mu8noL1_L1MU20:
eventCount: 0
stepCounts:
@@ -2708,6 +2846,12 @@ HLT_mu24_L1MU20:
0: 1
stepFeatures:
0: 1
+HLT_mu24_LRT_d0loose_L1MU14FCH:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 1
HLT_mu24_LRT_d0loose_L1MU20:
eventCount: 0
stepCounts:
@@ -2802,6 +2946,12 @@ HLT_mu24_mu6_probe_L1MU20:
0: 1
stepFeatures:
0: 1
+HLT_mu24_mu8noL1_L1MU14FCH:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 1
HLT_mu24_mu8noL1_L1MU20:
eventCount: 0
stepCounts:
@@ -2820,6 +2970,12 @@ HLT_mu26_ivarmedium_2j20_0eta290_020jvt_pf_ftf_boffperf_L1MU20:
0: 1
stepFeatures:
0: 1
+HLT_mu26_ivarmedium_L1MU14FCH:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 1
HLT_mu26_ivarmedium_L1MU20:
eventCount: 0
stepCounts:
@@ -2934,6 +3090,12 @@ HLT_mu4_l2io_L1MU4:
0: 1
stepFeatures:
0: 2
+HLT_mu50_L1MU14FCH:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 1
HLT_mu50_L1MU20:
eventCount: 0
stepCounts:
@@ -2946,6 +3108,8 @@ HLT_mu50_RPCPEBSecondaryReadout_L1MU20:
0: 1
stepFeatures:
0: 1
+HLT_mu60_0eta105_msonly_L1MU14FCH:
+ eventCount: 0
HLT_mu60_0eta105_msonly_L1MU20:
eventCount: 0
HLT_mu60_L1MU20:
@@ -2954,8 +3118,12 @@ HLT_mu60_L1MU20:
0: 1
stepFeatures:
0: 1
+HLT_mu6_2mu4_bDimu2700_L1MU5VF_3MU3V:
+ eventCount: 0
HLT_mu6_2mu4_bDimu2700_L1MU6_3MU4:
eventCount: 0
+HLT_mu6_2mu4_bDimu6000_L1MU5VF_3MU3V:
+ eventCount: 0
HLT_mu6_2mu4_bDimu6000_L1MU6_3MU4:
eventCount: 0
HLT_mu6_2mu4_bJpsi_L1MU6_3MU4:
@@ -3049,6 +3217,12 @@ HLT_mu80_L1MU20:
0: 1
stepFeatures:
0: 1
+HLT_mu80_msonly_3layersEC_L1MU14FCH:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 1
HLT_mu80_msonly_3layersEC_L1MU20:
eventCount: 0
stepCounts:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index ece49383baf2..c6c2a2ed83b0 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -147,6 +147,28 @@ def setupMenu():
ChainProp(name='HLT_mu24_ivarmedium_mu6_probe_L1MU20', l1SeedThresholds=['MU20','PROBEMU4'], groups=MultiMuonGroup),
ChainProp(name='HLT_mu24_ivarmedium_mu6_ivarmedium_probe_L1MU20', l1SeedThresholds=['MU20','PROBEMU4'], groups=MultiMuonGroup),
ChainProp(name='HLT_mu24_ivarmedium_mu6_ivarperf_probe_L1MU20', l1SeedThresholds=['MU20','PROBEMU4'], groups=MultiMuonGroup),
+
+
+ # Run3 L1 thresholds
+ ChainProp(name='HLT_mu26_ivarmedium_L1MU14FCH', groups=PrimaryL1MuGroup+SingleMuonGroup),
+ ChainProp(name='HLT_mu50_L1MU14FCH', groups=PrimaryL1MuGroup+SingleMuonGroup),
+ ChainProp(name='HLT_mu60_0eta105_msonly_L1MU14FCH', groups=PrimaryL1MuGroup+SingleMuonGroup),
+ ChainProp(name='HLT_mu80_msonly_3layersEC_L1MU14FCH', groups=PrimaryL1MuGroup+SingleMuonGroup),
+ ChainProp(name='HLT_mu22_mu8noL1_L1MU14FCH', l1SeedThresholds=['MU14FCH','FSNOSEED'], groups=PrimaryL1MuGroup+MultiMuonGroup),
+ ChainProp(name='HLT_mu22_mu10noL1_L1MU14FCH', l1SeedThresholds=['MU14FCH','FSNOSEED'], groups=PrimaryL1MuGroup+MultiMuonGroup),
+ ChainProp(name='HLT_mu24_mu8noL1_L1MU14FCH', l1SeedThresholds=['MU14FCH','FSNOSEED'], groups=PrimaryL1MuGroup+MultiMuonGroup),
+ ChainProp(name='HLT_2mu14_L12MU8F', groups=PrimaryL1MuGroup+MultiMuonGroup),
+ ChainProp(name='HLT_2mu15_L12MU8F', groups=PrimaryL1MuGroup+MultiMuonGroup),
+ ChainProp(name='HLT_mu20_ivarmedium_mu8noL1_L1MU14FCH', l1SeedThresholds=['MU14FCH','FSNOSEED'], groups=PrimaryL1MuGroup+MultiMuonGroup),
+ ChainProp(name='HLT_mu20_ivarmedium_mu4noL1_10invm70_L1MU14FCH', l1SeedThresholds=['MU14FCH','FSNOSEED'], groups=PrimaryL1MuGroup+MultiMuonGroup),
+ ChainProp(name='HLT_mu10_ivarmedium_mu10_10invm70_L12MU8F', groups=PrimaryL1MuGroup+MultiMuonGroup),
+ ChainProp(name='HLT_mu20_2mu4noL1_L1MU14FCH', l1SeedThresholds=['MU14FCH','FSNOSEED'], groups=PrimaryL1MuGroup+MultiMuonGroup),
+ ChainProp(name='HLT_mu22_2mu4noL1_L1MU14FCH', l1SeedThresholds=['MU14FCH','FSNOSEED'], groups=PrimaryL1MuGroup+MultiMuonGroup),
+ ChainProp(name='HLT_3mu6_L13MU5VF', l1SeedThresholds=['MU5VF'], groups=PrimaryL1MuGroup+MultiMuonGroup),
+ ChainProp(name='HLT_3mu6_msonly_L13MU5VF', l1SeedThresholds=['MU5VF'], groups=PrimaryL1MuGroup+MultiMuonGroup),
+ ChainProp(name='HLT_3mu8_msonly_L13MU5VF', groups=PrimaryL1MuGroup+MultiMuonGroup),
+ ChainProp(name='HLT_4mu4_L14MU3V', l1SeedThresholds=['MU3V'], groups=PrimaryL1MuGroup+MultiMuonGroup),
+ ChainProp(name='HLT_mu24_LRT_d0loose_L1MU14FCH', groups=PrimaryL1MuGroup+SingleMuonGroup),
]
TriggerFlags.EgammaSlice.signatures = TriggerFlags.EgammaSlice.signatures() + [
@@ -847,6 +869,31 @@ def setupMenu():
#ChainProp(name='HLT_mu6_bJpsi_MuonTrkPEB_L1MU6', stream =['BphysPEB'], groups=BphysicsGroup+['PS:Online']),
#ChainProp(name='HLT_mu10_bJpsi_MuonTrkPEB_L1MU10', stream =['BphysPEB'], groups=BphysicsGroup+['PS:Online']),
#ChainProp(name='HLT_mu20_bJpsi_MuonTrkPEB_L1MU20', stream =['BphysPEB'], groups=BphysicsGroup+['PS:Online']),
+
+
+ # Run3 thresholds
+ ChainProp(name='HLT_2mu10_bJpsimumu_L12MU8F', stream=["BphysDelayed"], groups=BphysicsGroup+PrimaryL1MuGroup ),
+ ChainProp(name='HLT_mu11_mu6_bJpsimumu_L1MU8VF_2MU5VF', stream=["BphysDelayed"], groups=BphysicsGroup+PrimaryL1MuGroup ),
+ ChainProp(name='HLT_2mu10_bUpsimumu_L12MU8F', stream=["BphysDelayed"], groups=BphysicsGroup+PrimaryL1MuGroup ),
+ ChainProp(name='HLT_mu11_mu6_bUpsimumu_L1MU8VF_2MU5VF', stream=["BphysDelayed"], groups=BphysicsGroup+PrimaryL1MuGroup ),
+ ChainProp(name='HLT_mu11_mu6_bBmumu_L1MU8VF_2MU5VF', stream=["BphysDelayed"], groups=BphysicsGroup+PrimaryL1MuGroup ),
+ ChainProp(name='HLT_mu11_mu6_bDimu_L1MU8VF_2MU5VF', stream=["BphysDelayed"], groups=BphysicsGroup+PrimaryL1MuGroup ),
+ ChainProp(name='HLT_mu11_mu6_bDimu2700_L1MU8VF_2MU5VF', stream=["BphysDelayed"], groups=BphysicsGroup+PrimaryL1MuGroup ),
+ ChainProp(name='HLT_mu11_mu6_bPhi_L1MU8VF_2MU5VF', stream=["BphysDelayed"], groups=BphysicsGroup+PrimaryL1MuGroup ),
+ ChainProp(name='HLT_mu11_mu6_bTau_L1MU8VF_2MU5VF', stream=["BphysDelayed"], groups=BphysicsGroup+PrimaryL1MuGroup ),
+ ChainProp(name='HLT_mu11_mu6_bBmumux_BpmumuKp_L1MU8VF_2MU5VF', stream=["BphysDelayed"], groups=BphysicsGroup+PrimaryL1MuGroup),
+ ChainProp(name='HLT_mu11_mu6_bBmumux_BcmumuPi_L1MU8VF_2MU5VF', stream=["BphysDelayed"], groups=BphysicsGroup+PrimaryL1MuGroup),
+ ChainProp(name='HLT_mu11_mu6_bBmumux_BsmumuPhi_L1MU8VF_2MU5VF', stream=["BphysDelayed"], groups=BphysicsGroup+PrimaryL1MuGroup),
+ ChainProp(name='HLT_mu11_mu6_bBmumux_BdmumuKst_L1MU8VF_2MU5VF', stream=["BphysDelayed"], groups=BphysicsGroup+PrimaryL1MuGroup),
+ ChainProp(name='HLT_mu11_mu6_bBmumux_LbPqKm_L1MU8VF_2MU5VF', stream=["BphysDelayed"], groups=BphysicsGroup+PrimaryL1MuGroup),
+ ChainProp(name='HLT_3mu4_bJpsi_L13MU3V', stream=["BphysDelayed"], groups=BphysicsGroup+PrimaryL1MuGroup),
+ ChainProp(name='HLT_3mu4_bUpsi_L13MU3V', stream=["BphysDelayed"], groups=BphysicsGroup+PrimaryL1MuGroup),
+ ChainProp(name='HLT_3mu4_bTau_L13MU3V', stream=["BphysDelayed"], groups=BphysicsGroup+PrimaryL1MuGroup),
+ ChainProp(name='HLT_3mu4_bPhi_L13MU3V', stream=["BphysDelayed"], groups=BphysicsGroup+PrimaryL1MuGroup),
+ ChainProp(name='HLT_3mu6_bDimu_L13MU5VF', stream=["BphysDelayed"], groups=BphysicsGroup+PrimaryL1MuGroup),
+ ChainProp(name='HLT_mu6_2mu4_bDimu2700_L1MU5VF_3MU3V', stream=["BphysDelayed"], groups=BphysicsGroup+PrimaryL1MuGroup),
+ ChainProp(name='HLT_mu6_2mu4_bDimu6000_L1MU5VF_3MU3V', stream=["BphysDelayed"], groups=BphysicsGroup+PrimaryL1MuGroup),
+ ChainProp(name='HLT_4mu4_bDimu6000_L14MU3V', stream=["BphysDelayed"], groups=BphysicsGroup+PrimaryL1MuGroup),
]
TriggerFlags.CombinedSlice.signatures = TriggerFlags.CombinedSlice.signatures() + [
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
index ae40ef61cb96..3a8d461dfcdd 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
@@ -237,7 +237,30 @@ class ItemDef:
# MUON ctpid=[0x20;0x2f]
- MenuItem('L1_MU0' ).setLogic( d.MU0 & physcond).setTriggerType(TT.muon)
+ # RUn3 thresholds
+ MenuItem('L1_MU0' ).setLogic( d.MU0 & physcond).setTriggerType(TT.muon)
+ MenuItem('L1_MU3V' ).setLogic( d.MU3V & physcond).setTriggerType(TT.muon) # ~ Run2 MU4 eff
+ MenuItem('L1_MU5VF' ).setLogic( d.MU5VF & physcond).setTriggerType(TT.muon) # ~ Run2 MU6
+ MenuItem('L1_MU8F' ).setLogic( d.MU8F & physcond).setTriggerType(TT.muon) # ~ Run2 MU10
+ MenuItem('L1_MU8VF' ).setLogic( d.MU8VF & physcond).setTriggerType(TT.muon) # ~ Run2 MU11
+ MenuItem('L1_MU14FCH' ).setLogic( d.MU14FCH & physcond).setTriggerType(TT.muon) # ~ Run2 MU20
+ MenuItem('L1_MU14FCHR' ).setLogic( d.MU14FCHR & physcond).setTriggerType(TT.muon) # ~ Run2 MU21
+
+ MenuItem('L1_MU3VF' ).setLogic( d.MU3VF & physcond).setTriggerType(TT.muon) # ~ Run2 MU4 rate
+ MenuItem('L1_MU8FC' ).setLogic( d.MU8FC & physcond).setTriggerType(TT.muon) # Backup MU8F
+ MenuItem('L1_MU15VFCH' ).setLogic( d.MU15VFCH & physcond).setTriggerType(TT.muon) #
+
+ MenuItem('L1_MU10BOM' ).setLogic( d.MU10BOM & physcond).setTriggerType(TT.muon) # Barrel-only close-by muons
+ MenuItem('L1_MU20FC' ).setLogic( d.MU20FC & physcond).setTriggerType(TT.muon) # alignment with toroid off
+
+ MenuItem('L1_2MU8F' ).setLogic( d.MU8F.x(2) & physcond).setTriggerType(TT.muon)
+ MenuItem('L1_MU8VF_2MU5VF' ).setLogic( d.MU8F & d.MU5VF.x(2) & physcond).setTriggerType(TT.muon)
+ MenuItem('L1_3MU3V' ).setLogic( d.MU3V.x(3) & physcond).setTriggerType(TT.muon)
+ MenuItem('L1_3MU5VF' ).setLogic( d.MU5VF.x(3) & physcond).setTriggerType(TT.muon)
+ MenuItem('L1_MU5VF_3MU3V' ).setLogic( d.MU5VF & d.MU3V.x(3) & physcond).setTriggerType(TT.muon)
+ MenuItem('L1_4MU3V' ).setLogic( d.MU3V.x(4) & physcond).setTriggerType(TT.muon)
+
+ # To be removed
MenuItem('L1_MU4' ).setLogic( d.MU4 & physcond).setTriggerType(TT.muon)
MenuItem('L1_MU6' ).setLogic( d.MU6 & physcond).setTriggerType(TT.muon)
MenuItem('L1_MU10' ).setLogic( d.MU10 & physcond).setTriggerType(TT.muon)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py
index de34c91af713..a244be9cb5c7 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py
@@ -53,6 +53,11 @@ def defineMenu():
'L1_MU4_EMPTY', 'L1_MU6_EMPTY', 'L1_MU4_FIRSTEMPTY', 'L1_MU11_EMPTY',
'L1_MU4_UNPAIRED_ISO',
+ # Run3
+ 'L1_MU3V', 'L1_MU5VF', 'L1_MU8F', 'L1_MU8VF', 'L1_MU14FCH', 'L1_MU14FCHR',
+ 'L1_MU3VF', 'L1_MU8FC', 'L1_MU15VFCH', 'L1_MU10BOM',
+ 'L1_2MU8F', 'L1_MU8VF_2MU5VF', 'L1_3MU3V', 'L1_3MU5VF', 'L1_MU5VF_3MU3V', 'L1_4MU3V',
+
##
# combined lepton (e and mu)
##
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs.py
index 65f3788e8b8d..c84452f8a136 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs.py
@@ -280,7 +280,12 @@ def defineInputsMenu():
"legacy" : False,
"thresholds" : [
# exactly the first 4 thresholds must be defined with 3 bits, all others use 2 bits automatically
- ('MU4',3), ('MU6',3), ('MU10',3), ('MU11',3), 'MU20', 'MU21',
+ # Run2 thresholds
+ ('MU4',3), ('MU6',3), ('MU10',3), ('MU11',3), 'MU20', 'MU21',
+ # Run3
+ ('MU3V',3), ('MU5VF',3), ('MU8F',3), ('MU8VF',3), 'MU14FCH', 'MU14FCHR',
+ # Run3 test/backup
+ 'MU3VF', 'MU8FC', 'MU15VFCH', 'MU10BOM', 'MU20FC',
]
})
--
GitLab
From 7b7304a3dadba65a91da1e1b8c33e78d62b69a69 Mon Sep 17 00:00:00 2001
From: Charline Rougier <charline.rougier@l2it.in2p3.fr>
Date: Wed, 18 Aug 2021 18:54:44 +0000
Subject: [PATCH 145/272] Merge seedMaker of 21.9 into master
---
.../SiSpacePointForSeedITK.h | 17 +
.../SiSpacePointsSeedMakerEventData.h | 12 +-
.../src/SiSpacePointForSeedITK.cxx | 57 +-
.../SiSpacePointsSeedTool_xk/CMakeLists.txt | 2 +
.../SiSpacePointsSeedMaker_ITK.h | 318 +-
.../src/SiSpacePointsSeedMaker_ITK.cxx | 4476 ++++++++++++-----
6 files changed, 3491 insertions(+), 1391 deletions(-)
diff --git a/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointForSeedITK.h b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointForSeedITK.h
index be68fd5df794..28d3ec7907d4 100644
--- a/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointForSeedITK.h
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointForSeedITK.h
@@ -46,6 +46,11 @@ namespace InDet {
void set(const Trk::SpacePoint*const&,const float*,const float*);
void setQuality(float);
void setParam(const float&);
+ void setDR(const float&);
+ void setDZDR(const float&);
+ void setEta(const float&);
+ void setScorePenalty(const float&);
+ void setPt(const float&);
const Trk::SpacePoint* spacepoint{} ;
const float& x() const {return m_x;}
@@ -57,6 +62,11 @@ namespace InDet {
const float& covz() const {return m_covz;}
const float& param() const {return m_param;}
const float& quality() const {return m_q ;}
+ const float& dzdr() const {return m_dzdr;}
+ const float& eta() const {return m_eta;}
+ const float& pt() const {return m_pt;}
+ const float& scorePenalty() const {return m_scorePenalty;} /// penalty term in the seed score
+ const float& dR() const {return m_dR;} /// distance between top and central SP
const Trk::Surface* sur() const {return m_su;}
const Trk::Surface* sun() const {return m_sn;}
@@ -72,6 +82,12 @@ namespace InDet {
float m_covz{}; //
float m_param{};
float m_q{} ;
+ float m_scorePenalty{}; /// penalty term in the seed score
+ float m_dR{};
+ float m_eta{} ;
+ float m_pt{} ;
+ float m_dzdr{};
+
float m_b0[3]{};
float m_b1[3]{};
@@ -81,6 +97,7 @@ namespace InDet {
const Trk::Surface* m_su{};
const Trk::Surface* m_sn{};
};
+
} // end of name space
diff --git a/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointsSeedMakerEventData.h b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointsSeedMakerEventData.h
index b036fdd90f65..80531162ea40 100644
--- a/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointsSeedMakerEventData.h
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointsSeedMakerEventData.h
@@ -23,6 +23,12 @@
namespace InDet {
+ class FloatInt {
+ public:
+ float Fl;
+ int In;
+ };
+
/**
@class InDet::SiSpacePointsSeedMakerEventData
@@ -95,7 +101,9 @@ namespace InDet {
float zmaxB{0.};
float ftrig{0.};
float ftrigW{0.};
- float maxScore{0.};
+ float maxScore{0.};
+ float RTmin{0.};
+ float RTmax{0.};
/**
* @name Beam geometry
@@ -136,6 +144,7 @@ namespace InDet {
std::vector<float> X;
std::vector<float> Y;
std::vector<float> Er; ///< error component on 1/tan(theta)==dz/dr from the position errors on the space-points
+ std::vector<FloatInt> Tn;
//@}
InDet::SiSpacePointsSeed seedOutput;
@@ -201,6 +210,7 @@ namespace InDet {
SP_ITK.resize(newSize, nullptr);
X.resize(newSize, 0.);
Y.resize(newSize, 0.);
+ Tn.resize(newSize);
} else {
SP.resize(newSize, nullptr);
}
diff --git a/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiSpacePointForSeedITK.cxx b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiSpacePointForSeedITK.cxx
index b244b0bad3e8..f3501a90bada 100644
--- a/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiSpacePointForSeedITK.cxx
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiSpacePointForSeedITK.cxx
@@ -28,6 +28,11 @@ namespace InDet {
m_q = 0.;
m_su = nullptr ;
m_sn = nullptr ;
+ m_scorePenalty = 0.;
+ m_dR = 0.;
+ m_eta = 0.;
+ m_pt = 0.;
+ m_dzdr = 0;
for(int i=0; i!=3; ++i) {m_b0[i]=0.; m_b1[i]=0.; m_dr[i]=0.; m_r0[i]=0.;}
}
@@ -35,16 +40,21 @@ namespace InDet {
(const SiSpacePointForSeedITK& sp)
{
if(&sp!=this) {
- spacepoint = sp.spacepoint;
- m_x = sp.m_x ;
- m_y = sp.m_y ;
- m_z = sp.m_z ;
- m_r = sp.m_r ;
- m_covr = sp.m_covr ;
- m_covz = sp.m_covz ;
- m_q = sp.m_q ;
- m_su = sp.m_su ;
- m_sn = sp.m_sn ;
+ spacepoint = sp.spacepoint ;
+ m_x = sp.m_x ;
+ m_y = sp.m_y ;
+ m_z = sp.m_z ;
+ m_r = sp.m_r ;
+ m_covr = sp.m_covr ;
+ m_covz = sp.m_covz ;
+ m_q = sp.m_q ;
+ m_su = sp.m_su ;
+ m_sn = sp.m_sn ;
+ m_scorePenalty = sp.m_scorePenalty ;
+ m_dR = sp.m_dR ;
+ m_eta = sp.m_eta ;
+ m_pt = sp.m_pt ;
+ m_dzdr = sp.m_dzdr ;
for(int i=0; i!=3; ++i) m_b0[i]=sp.m_b0[i];
for(int i=0; i!=3; ++i) m_b1[i]=sp.m_b1[i];
for(int i=0; i!=3; ++i) m_dr[i]=sp.m_dr[i];
@@ -123,6 +133,33 @@ namespace InDet {
m_su = &sp->clusterList().first->detectorElement()->surface();
}
+
+ void SiSpacePointForSeedITK::setDR(const float& dr)
+ {
+ m_dR = dr;
+ }
+
+ void SiSpacePointForSeedITK::setEta(const float& eta)
+ {
+ m_eta = eta;
+ }
+
+ void SiSpacePointForSeedITK::setDZDR(const float& dzdr)
+ {
+ m_dzdr = dzdr;
+ }
+
+ void SiSpacePointForSeedITK::setPt(const float& pt)
+ {
+ m_pt = pt;
+ }
+
+ void SiSpacePointForSeedITK::setScorePenalty(const float& score)
+ {
+ m_scorePenalty = score;
+ }
+
+
/////////////////////////////////////////////////////////////////////////////////
// Set with error correction
// sc[0] - barrel pixels error correction
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/CMakeLists.txt b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/CMakeLists.txt
index e901b6a054ae..e40f9bda22af 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/CMakeLists.txt
@@ -1,5 +1,7 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
# Declare the package name:
atlas_subdir( SiSpacePointsSeedTool_xk )
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ITK.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ITK.h
index eaba5f80fa29..ddd97e1ed0bf 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ITK.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ITK.h
@@ -23,6 +23,14 @@
#include "TrkSpacePoint/SpacePointOverlapCollection.h"
#include "TrkEventUtils/PRDtoTrackMap.h"
+//for validation
+#include "GaudiKernel/ITHistSvc.h"
+#include "TFile.h"
+#include "TTree.h"
+
+
+
+
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
// MagField cache
#include "MagFieldConditions/AtlasFieldCacheCondObj.h"
@@ -38,6 +46,19 @@ class MsgStream;
namespace InDet {
+ ///////////////////////////////////////////////////////////////////
+ // Object function for ordering space point in R coordinate order
+ ///////////////////////////////////////////////////////////////////
+
+ class SiSpacePointsITKComparison_R {
+
+ public:
+ bool operator () (InDet::SiSpacePointForSeedITK* s1,InDet::SiSpacePointForSeedITK* s2) {
+ return((*s1).radius() < (*s2).radius());
+ }
+ };
+
+
using EventData = SiSpacePointsSeedMakerEventData;
/**
@@ -112,7 +133,6 @@ namespace InDet {
//@}
virtual void writeNtuple(const SiSpacePointsSeed* seed, const Trk::Track* track, int seedType, long eventNumber) const override;
-
virtual bool getWriteNtupleBoolProperty() const override;
///////////////////////////////////////////////////////////////////
@@ -124,14 +144,18 @@ namespace InDet {
private:
/// enum for array sizes
- enum Size {SizeRF=53,
- SizeZ=11,
- SizeRFZ=SizeRF*SizeZ,
- SizeI=9,
- SizeRFV=100,
- SizeZV=3,
- SizeRFZV=SizeRFV*SizeZV,
- SizeIV=6};
+ /// Note that this stores the maximum capacities, the actual binnings
+ /// do not always use the full size. See data members below for the
+ /// actual binning paramaters, which are determined in buildFramework.
+ enum Size {arraySizePhi=200, ///< capacity of the 1D phi arrays
+ arraySizeZ=11, ///< capacity of the 1D z arrays
+ arraySizePhiZ=arraySizePhi*arraySizeZ, ///< capacity for the 2D phi-z arrays
+ arraySizeNeighbourBins=9, ///< array size to store neighbouring phi-z-regions in the seed finding
+ arraySizePhiV=100, ///< array size in phi for vertexing
+ arraySizeZV=3, ///< array size in z for vertexing
+ arraySizePhiZV=arraySizePhiV*arraySizeZV, ///< array size in phi-Z 2D for the vertexing
+ arraySizeNeighbourBinsVertex=6}; ///< array size to store neighbouring phi-z regions for the vertexing
+
///////////////////////////////////////////////////////////////////
// Private data and methods
@@ -166,13 +190,35 @@ namespace InDet {
FloatProperty m_zmin{this, "minZ", -250.};
FloatProperty m_zmax{this , "maxZ", +250.};
FloatProperty m_r_rmin{this, "radMin", 0.};
- FloatProperty m_r_rstep{this, "radStep", 2.};
+ FloatProperty m_binSizeR{this, "radStep", 2.};
FloatProperty m_dzver{this, "maxdZver", 5.};
FloatProperty m_dzdrver{this, "maxdZdRver", 0.02};
- FloatProperty m_diver{this, "maxdImpact", 10.};
- FloatProperty m_diversss{this, "maxdImpactSSS", 20.};
+ FloatProperty m_maxdImpact{this, "maxdImpact", 10.};
+ FloatProperty m_maxdImpactSSS{this, "maxdImpactSSS", 20.};
FloatProperty m_divermax{this, "maxdImpactForDecays", 20.};
FloatProperty m_dzmaxPPP{this, "dZmaxForPPPSeeds", 600.};
+
+ FloatProperty m_maxScore{this, "maximumAcceptedSeedScore", 100.};
+ IntegerProperty m_maxOneSizeSSS{this, "maxSeedsForSpacePointStrips", 5};
+ IntegerProperty m_maxOneSizePPP{this, "maxSeedsForSpacePointPixels", 5};
+ BooleanProperty m_alwaysKeepConfirmedPixelSeeds{this, "alwaysKeepConfirmedPixelSeeds", false};
+ BooleanProperty m_alwaysKeepConfirmedStripSeeds{this, "alwaysKeepConfirmedStripSeeds", false};
+ BooleanProperty m_fastTracking{this, "useFastTracking", false};
+ FloatProperty m_seedScoreBonusPPP{this, "seedScoreBonusPPP", -200.};
+ FloatProperty m_seedScoreBonusSSS{this, "seedScoreBonusSSS", -400.};
+ BooleanProperty m_optimisePhiBinning{this, "optimisePhiBinning", true};
+ FloatProperty m_rminSSS{this, "radMinSSS", 400.};
+ FloatProperty m_rmaxSSS{this, "radMaxSSS", 1000.};
+ BooleanProperty m_isLRT{this, "isLRT", false};
+ FloatProperty m_drminPPP{this, "mindRadiusPPP", 6.};
+ FloatProperty m_drmaxPPP{this, "maxdRadiusPPP", 140.};
+ FloatProperty m_drminSSS{this, "mindRadiusSSS", 20.};
+ FloatProperty m_drmaxSSS{this, "maxdRadiusSSS", 3000.};
+ FloatProperty m_dImpactCutSlopeUnconfirmedSSS{this, "dImpactCutSlopeUnconfirmedSSS", 1.0};
+ FloatProperty m_dImpactCutSlopeUnconfirmedPPP{this, "dImpactCutSlopeUnconfirmedPPP", 0.};
+ FloatProperty m_seedScoreBonusConfirmationSeed{this, "seedScoreBonusConfirmationSeed", -200.};
+ BooleanProperty m_useSeedConfirmation{this, "useSeedConfirmation", false};
+ FloatProperty m_rminPPPFast{this, "m_rminPPPFast", 70.};
//@}
/// @name Properties, which will be updated in initialize
@@ -211,15 +257,15 @@ namespace InDet {
//@{
bool m_initialized{false};
int m_outputlevel{0};
- int m_r_size{0};
+
int m_fNmax{0};
int m_fvNmax{0};
- int m_rfz_b[SizeRFZ]{};
- int m_rfz_t[SizeRFZ]{};
- int m_rfz_ib[SizeRFZ][SizeI]{};
- int m_rfz_it[SizeRFZ][SizeI]{};
- int m_rfzv_n[SizeRFZV]{};
- int m_rfzv_i[SizeRFZV][SizeIV]{};
+ int m_rfz_b[arraySizePhiZ]{};
+ int m_rfz_t[arraySizePhiZ]{};
+ int m_rfz_ib[arraySizePhiZ][arraySizeNeighbourBins]{};
+ int m_rfz_it[arraySizePhiZ][arraySizeNeighbourBins]{};
+ int m_rfzv_n[arraySizePhiZV]{};
+ int m_rfzv_i[arraySizePhiZV][arraySizeNeighbourBinsVertex]{};
float m_dzdrmin0{0.};
float m_dzdrmax0{0.};
float m_ipt{0.};
@@ -227,8 +273,83 @@ namespace InDet {
float m_COF{0.};
float m_sF{0.};
float m_sFv{0.};
+ float m_dzMaxFast {200.};
+ float m_R2MaxFast {2500.};
+ float m_zmaxPPP {2700.};
+ float m_rmaxPPP {140.};
+ float m_zmaxSSS {2700.};
+ float m_dzmaxSSS {900.};
+ float m_drminSeedConf{5.};
+ //@}
+
+ /// @name Properties of writeNTuple for validation purpose
+ //@{
+ Gaudi::Property<bool> m_writeNtuple {this, "WriteNtuple", false, "Flag to write Validation Ntuples"};
+ ///Flag to write validation ntuples. Turned off by default
+ ITHistSvc* m_thistSvc;
+ TTree* m_outputTree;
+ mutable std::mutex m_mutex;
+ mutable std::string m_treeName ATLAS_THREAD_SAFE;
+ mutable TString m_treeFolder ATLAS_THREAD_SAFE;
+ mutable float m_d0 ATLAS_THREAD_SAFE = 0;
+ mutable float m_z0 ATLAS_THREAD_SAFE = 0;
+ mutable float m_pt ATLAS_THREAD_SAFE = 0;
+ mutable float m_eta ATLAS_THREAD_SAFE = 0;
+ mutable double m_x1 ATLAS_THREAD_SAFE = 0;
+ mutable double m_x2 ATLAS_THREAD_SAFE = 0;
+ mutable double m_x3 ATLAS_THREAD_SAFE = 0;
+ mutable double m_y1 ATLAS_THREAD_SAFE = 0;
+ mutable double m_y2 ATLAS_THREAD_SAFE = 0;
+ mutable double m_y3 ATLAS_THREAD_SAFE = 0;
+ mutable double m_z1 ATLAS_THREAD_SAFE = 0;
+ mutable double m_z2 ATLAS_THREAD_SAFE = 0;
+ mutable double m_z3 ATLAS_THREAD_SAFE = 0;
+ mutable double m_r1 ATLAS_THREAD_SAFE = 0;
+ mutable double m_r2 ATLAS_THREAD_SAFE = 0;
+ mutable double m_r3 ATLAS_THREAD_SAFE = 0;
+ mutable float m_quality ATLAS_THREAD_SAFE = 0;
+ mutable int m_type ATLAS_THREAD_SAFE = 0;
+ mutable double m_dzdr_t ATLAS_THREAD_SAFE = 0;
+ mutable double m_dzdr_b ATLAS_THREAD_SAFE = 0;
+ mutable bool m_givesTrack ATLAS_THREAD_SAFE = 0;
+ mutable float m_trackPt ATLAS_THREAD_SAFE = 0;
+ mutable float m_trackEta ATLAS_THREAD_SAFE = 0;
+ mutable long m_eventNumber ATLAS_THREAD_SAFE = 0;
//@}
+
+ /// @name Binning parameters
+ int m_nBinsR{0}; ///< number of bins in the radial coordinate
+ int m_maxPhiBinPPP{0}; ///< number of bins in phi
+ float m_inverseBinSizePhiPPP{0}; ///< cache the inverse bin size in phi which we use - needed to evaluate phi bin locations
+ int m_maxPhiBinSSS{0};
+ float m_inverseBinSizePhiSSS{0};
+
+
+ /** Seed score thresholds defined based on the modifiers defined
+ * as configurables above.
+ * These allow to categorise the seeds based on their quality score.
+ * The modifiers above are much larger than the range of the raw
+ * unmodified scores would be, resulting in a grouping of the scores
+ * based on the modifiers applied. The thresholds are just below
+ * the value reachable without the additional modifier
+ **/
+ float m_seedScoreThresholdPPPConfirmationSeed{0.}; ///< max (score is assigned negative sign) score for PPP seeds with confirmation seed requirement.
+ float m_seedScoreThresholdSSSConfirmationSeed{0.}; ///< max (score is assigned negative sign) score for SSS seeds with confirmation seed requirement.
+
+
+ /// arrays associating bins to each other for SP formation
+ std::array<int,arraySizePhiZ> m_nNeighbourCellsBottomPPP; ///< number of neighbouring phi-z bins to consider when looking for "bottom SP" candidates for each phi-z bin
+ std::array<int,arraySizePhiZ> m_nNeighbourCellsTopPPP; ///< number of neighbouring phi-z bins to consider when looking for "top SP" candidates for each phi-z bin
+ std::array<std::array<int, arraySizeNeighbourBins>, arraySizePhiZ> m_neighbourCellsBottomPPP; ///< mapping of neighbour cells in the 2D phi-z binning to consider for the "bottom SP" search for central SPs in each phi-z bin. Number of valid entries stored in m_nNeighboursPhiZbottom
+ std::array<std::array<int, arraySizeNeighbourBins>, arraySizePhiZ> m_neighbourCellsTopPPP; ///< mapping of neighbour cells in the 2D phi-z binning to consider for the "top SP" search for central SPs in each phi-z bin. Number of valid entries stored in m_nNeighboursPhiZtop
+
+ std::array<int,arraySizePhiZ> m_nNeighbourCellsBottomSSS;
+ std::array<int,arraySizePhiZ> m_nNeighbourCellsTopSSS;
+ std::array<std::array<int, arraySizeNeighbourBins>, arraySizePhiZ> m_neighbourCellsBottomSSS;
+ std::array<std::array<int, arraySizeNeighbourBins>, arraySizePhiZ> m_neighbourCellsTopSSS;
+
+
///////////////////////////////////////////////////////////////////
// Private methods
///////////////////////////////////////////////////////////////////
@@ -243,10 +364,44 @@ namespace InDet {
MsgStream& dumpEvent(EventData& data, MsgStream& out) const;
void buildFrameWork();
+
+ void buildConnectionMaps(std::array<int, arraySizePhiZ>& nNeighbourCellsBottom,
+ std::array<int, arraySizePhiZ>& nNeighbourCellsTop,
+ std::array<std::array<int, arraySizeNeighbourBins>, arraySizePhiZ>& neighbourCellsBottom,
+ std::array<std::array<int, arraySizeNeighbourBins>, arraySizePhiZ>& neighbourCellsTop,
+ int maxPhiBin, bool isSSS);
+
void buildBeamFrameWork(EventData& data) const;
- SiSpacePointForSeedITK* newSpacePoint
- (EventData& data, const Trk::SpacePoint*const&) const;
+ /** Determine the expected azimuthal trajectory displacement
+ * in phi in presence of the magnetic field for a particle
+ * with momentum pTmin and impact parameter maxd0,
+ * moving from a radial coordinate Rmin outward to Rmax.
+ * This method is used to determine the optimal binning
+ * of the phi-z regions we consider in the seed making,
+ * to ensure we contain the hits from our softest tracks
+ * in a set of consecutive bins.
+ * @param[in] pTmin: minimum pt cut applied in MeV
+ * @param[in] maxD0: maximum d0 allowed
+ * @param[in] Rmin: starting radius for trajectory displacement
+ * @param[in] Rmax: end radius for trajectory displacement
+ **/
+ float azimuthalStep(const float pTmin,const float maxd0,const float Rmin,const float Rmax) const;
+
+
+ /** Create a SiSpacePointForSeed from the space point.
+ * This will also add the point to the data object's
+ * l_spforseed list and update its i_spforseed iterator
+ * to point to the entry after the new SP
+ * for further additions.
+ * Returns a nullptr if the SP fails the eta cut,
+ * should we apply one
+ * @param[in,out] data: Provides beam spot location, receives updates to the l_spforseed and i_spforseed members
+ * @param[in] sp: Input space point.
+ **/
+ SiSpacePointForSeedITK* newSpacePoint(EventData& data, const Trk::SpacePoint*const& sp) const;
+ SiSpacePointForSeedITK* newSpacePoint(EventData& data, const Trk::SpacePoint*const& sp, float* r, bool usePixSctInform=false) const;
+
void newSeed
(EventData& data,
SiSpacePointForSeedITK*&,SiSpacePointForSeedITK*&,float) const;
@@ -262,31 +417,95 @@ namespace InDet {
void fillSeeds(EventData& data) const;
void fillLists(EventData& data) const;
+ void fillListsFast(const EventContext& ctx, EventData& data) const;
+ void pixInform(const Trk::SpacePoint* sp, float* r) const;
+ void sctInform(EventData& data,const Trk::SpacePoint* sp, float* r) const;
void erase(EventData& data) const;
void production2Sp(EventData& data) const;
void production3Sp(EventData& data) const;
- void production3SpSSS
- (EventData& data,
- std::list<InDet::SiSpacePointForSeedITK*>::iterator*,
- std::list<InDet::SiSpacePointForSeedITK*>::iterator*,
- std::list<InDet::SiSpacePointForSeedITK*>::iterator*,
- std::list<InDet::SiSpacePointForSeedITK*>::iterator*,
- int,int,int&) const;
- void production3SpPPP
- (EventData& data,
- std::list<InDet::SiSpacePointForSeedITK*>::iterator*,
- std::list<InDet::SiSpacePointForSeedITK*>::iterator*,
- std::list<InDet::SiSpacePointForSeedITK*>::iterator*,
- std::list<InDet::SiSpacePointForSeedITK*>::iterator*,
- int,int,int&) const;
- void production3SpTrigger
- (EventData& data,
- std::list<InDet::SiSpacePointForSeedITK*>::iterator*,
- std::list<InDet::SiSpacePointForSeedITK*>::iterator*,
- std::list<InDet::SiSpacePointForSeedITK*>::iterator*,
- std::list<InDet::SiSpacePointForSeedITK*>::iterator*,
- int,int,int&) const;
+
+ /** \brief: Seed production from space points.
+ *
+ * This method will try to find 3-SP combinations within a
+ * local phi-z region in the detector.
+ *
+ * The central SP of the seed will be taken from this region
+ * (technically via the first entry of the bottom candidate array,
+ * which always points to the phi-z bin of interest itself).
+ *
+ * The top SP is allowed to come from the same or one of several close-by
+ * phi-Z bins, as is the bottom SP.
+ *
+ * All SP collections are expected to be internally sorted in the radial coordinate.
+ *
+ * @param[in,out] data: Event data
+ * @param[in,out] iter_bottomCands: collection of iterators over SP collections for up to 9 phi-z cells to consider for the bottom space-point search
+ * @param[in,out] iter_endBottomCands: collection of end-iterators over the
+ * SP collections for up to 9 phi-z cells to consider for the bottom space-point search
+ * @param[in,out] iter_topCands: collection of iterators over SP collections for up to 9 phi-z cells to consider for the top space-point search
+ * @param[in,out] iter_endTopCands: collection of end-iterators over the
+ * SP collections for up to 9 phi-z cells to consider for the top space-point search
+ * @param[in] numberBottomCells: Number of bottom cells to consider. Determines how many entries in iter_(end)bottomCands are expected to be valid.
+ * @param[in] numberTopCells: Number of top cells to consider.Determines how many entries in iter_(end)topCands are expected to be valid.
+ * @param[out] nseed: Number of seeds found
+ **/
+ void production3SpSSS
+ (EventData& data,
+ std::array<std::list<InDet::SiSpacePointForSeedITK*>::iterator, arraySizeNeighbourBins> & iter_bottomCands,
+ std::array<std::list<InDet::SiSpacePointForSeedITK*>::iterator, arraySizeNeighbourBins> & iter_endBottomCands,
+ std::array<std::list<InDet::SiSpacePointForSeedITK*>::iterator, arraySizeNeighbourBins> & iter_topCands,
+ std::array<std::list<InDet::SiSpacePointForSeedITK*>::iterator, arraySizeNeighbourBins> & iter_endTopCands,
+ const int numberBottomCells, const int numberTopCells, int& nseed) const;
+
+ void production3SpPPP
+ (EventData& data,
+ std::array<std::list<InDet::SiSpacePointForSeedITK*>::iterator, arraySizeNeighbourBins> & iter_bottomCands,
+ std::array<std::list<InDet::SiSpacePointForSeedITK*>::iterator, arraySizeNeighbourBins> & iter_endBottomCands,
+ std::array<std::list<InDet::SiSpacePointForSeedITK*>::iterator, arraySizeNeighbourBins> & iter_topCands,
+ std::array<std::list<InDet::SiSpacePointForSeedITK*>::iterator, arraySizeNeighbourBins> & iter_endTopCands,
+ const int numberBottomCells, const int numberTopCells, int& nseed) const;
+
+ /// as above, but for the trigger
+ void production3SpTrigger
+ (EventData& /*data*/,
+ std::array<std::list<InDet::SiSpacePointForSeedITK*>::iterator, arraySizeNeighbourBins> & /*rb*/,
+ std::array<std::list<InDet::SiSpacePointForSeedITK*>::iterator, arraySizeNeighbourBins> & /*rbe*/,
+ std::array<std::list<InDet::SiSpacePointForSeedITK*>::iterator, arraySizeNeighbourBins> & /*rt*/,
+ std::array<std::list<InDet::SiSpacePointForSeedITK*>::iterator, arraySizeNeighbourBins> & /*rte*/,
+ const int /*numberBottomCells*/, const int /*numberTopCells*/, int& /*nseed*/) const;
+
+ /** This creates all possible seeds with the passed central and bottom SP, using all top SP
+ * candidates which are stored in the data.CmSp member. Seeds are scored by a quality score
+ * seeded by abs(d0), and modified if there is a second-seed confirmation or in case of PPP/SSS
+ * topologies. Then, they are written out via the newOneSeed method.
+ * @param[in] SPb Bottom Space point for the seed creation
+ * @param[in] SP0 Central Space point for the seed creation
+ * @param[in] Zob z0 estimate
+ **/
+ void newOneSeedWithCurvaturesComparisonSSS
+ (EventData& data, SiSpacePointForSeedITK*& SPb, SiSpacePointForSeedITK*& SP0, float Zob) const;
+ void newOneSeedWithCurvaturesComparisonPPP
+ (EventData& data, SiSpacePointForSeedITK*& SPb, SiSpacePointForSeedITK*& SP0, float Zob) const;
+ void newOneSeedWithCurvaturesComparisonSeedConfirmation
+ (EventData& data, SiSpacePointForSeedITK*& SPb, SiSpacePointForSeedITK*& SP0, float Zob) const;
+
+ /** Helper method to determine if a seed
+ * is 'confirmed' - this means that a second
+ * seed exists with compatible curvature,
+ * the same bottom and central SP, but a
+ * different third SP. This information
+ * is stored in a modification of the
+ * seed quality, which we check here.
+ * @param[in] bottomSP: bottom space point
+ * @param[in] topSP: top space point
+ * @param[in] quality: seed quality
+ * @return true if the seed is confirmed, false otherwise
+ **/
+ bool isConfirmedSeed(const InDet::SiSpacePointForSeedITK* bottomSP, const InDet::SiSpacePointForSeedITK* topSP, float quality) const;
+
+
+ void sort(std::vector<FloatInt>& s, int start, int size) const;
bool newVertices(EventData& data, const std::list<Trk::Vertex>&) const;
void findNext(EventData& data) const;
bool isZCompatible(EventData& data, float&,float&,float&) const;
@@ -329,7 +548,20 @@ namespace InDet {
return false;
}
-}
+///////////////////////////////////////////////////////////////////
+ // The procedure sorts the elements into ascending order.
+ ///////////////////////////////////////////////////////////////////
+
+ inline
+ void SiSpacePointsSeedMaker_ITK::sort(std::vector<FloatInt>& s, int start, int size) const
+ {
+ //QuickSort for fast tracking currently buggy
+ //TBC if really faster than std::sort
+ //Using std::sort in all cases for now
+ std::sort(s.begin()+start,s.begin()+start+size,[](const FloatInt a,const FloatInt b)->bool {return a.Fl < b.Fl;});
+ }
+
+}
#endif // SiSpacePointsSeedMaker_ITK_H
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx
index 5bb089e57196..8e4f02d77b81 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ */
///////////////////////////////////////////////////////////////////
// Implementation file for class SiSpacePointsSeedMaker_ITK
@@ -16,19 +16,33 @@
#include "InDetPrepRawData/SiCluster.h"
+
+//for validation
+#include "TrkTrack/Track.h"
+#include "TrkParameters/TrackParameters.h"
+
#include <cmath>
#include <iomanip>
#include <ostream>
+
///////////////////////////////////////////////////////////////////
// Constructor
///////////////////////////////////////////////////////////////////
-InDet::SiSpacePointsSeedMaker_ITK::SiSpacePointsSeedMaker_ITK
-(const std::string& t, const std::string& n, const IInterface* p)
- : base_class(t, n, p)
+InDet::SiSpacePointsSeedMaker_ITK::SiSpacePointsSeedMaker_ITK(const std::string &t, const std::string &n, const IInterface *p)
+ : base_class(t, n, p),
+ m_thistSvc(nullptr),
+ m_outputTree(nullptr),
+ m_treeName(""),
+ m_treeFolder("/valNtuples/")
{
+ if (m_maxOneSize > 0)
+ {
+ m_maxOneSizeSSS = m_maxOneSize;
+ m_maxOneSizePPP = m_maxOneSize;
+ }
}
///////////////////////////////////////////////////////////////////
@@ -47,29 +61,68 @@ StatusCode InDet::SiSpacePointsSeedMaker_ITK::initialize()
//
ATH_CHECK(m_beamSpotKey.initialize());
- ATH_CHECK( m_fieldCondObjInputKey.initialize());
+ ATH_CHECK(m_fieldCondObjInputKey.initialize());
// PRD-to-track association (optional)
- ATH_CHECK( m_prdToTrackMap.initialize( !m_prdToTrackMap.key().empty()));
+ ATH_CHECK(m_prdToTrackMap.initialize(!m_prdToTrackMap.key().empty()));
- if (m_r_rmax < 1100.) m_r_rmax = 1100.;
-
// Build framework
//
buildFrameWork();
// Get output print level
//
- m_outputlevel = msg().level()-MSG::DEBUG;
- if (m_outputlevel<=0) {
+ m_outputlevel = msg().level() - MSG::DEBUG;
+
+ if (msgLvl(MSG::DEBUG)) {
EventData data;
initializeEventData(data);
data.nprint=0;
- dump(data, msg(MSG::DEBUG));
+ dump(data, msg(MSG::DEBUG));
+ }
+
+ m_umax = 100. - std::abs(m_umax) * 300.;
+
+ if (m_writeNtuple) {
+
+ ATH_CHECK( service("THistSvc",m_thistSvc) );
+
+ m_treeName = (std::string("SeedTree_")+name());
+ std::replace( m_treeName.begin(), m_treeName.end(), '.', '_' );
+
+ m_outputTree = new TTree( m_treeName.c_str() , "SeedMakerValTool");
+
+ m_outputTree->Branch("eventNumber", &m_eventNumber);
+ m_outputTree->Branch("d0", &m_d0);
+ m_outputTree->Branch("z0", &m_z0);
+ m_outputTree->Branch("pt", &m_pt);
+ m_outputTree->Branch("eta", &m_eta);
+ m_outputTree->Branch("x1", &m_x1);
+ m_outputTree->Branch("x2", &m_x2);
+ m_outputTree->Branch("x3", &m_x3);
+ m_outputTree->Branch("y1", &m_y1);
+ m_outputTree->Branch("y2", &m_y2);
+ m_outputTree->Branch("y3", &m_y3);
+ m_outputTree->Branch("z1", &m_z1);
+ m_outputTree->Branch("z2", &m_z2);
+ m_outputTree->Branch("z3", &m_z3);
+ m_outputTree->Branch("r1", &m_r1);
+ m_outputTree->Branch("r2", &m_r2);
+ m_outputTree->Branch("r3", &m_r3);
+ m_outputTree->Branch("quality", &m_quality);
+ m_outputTree->Branch("seedType", &m_type);
+ m_outputTree->Branch("givesTrack", &m_givesTrack);
+ m_outputTree->Branch("dzdr_b", &m_dzdr_b);
+ m_outputTree->Branch("dzdr_t", &m_dzdr_t);
+ m_outputTree->Branch("track_pt", &m_trackPt);
+ m_outputTree->Branch("track_eta", &m_trackEta);
+
+ TString fullTreeName = m_treeFolder + m_treeName;
+
+ ATH_CHECK( m_thistSvc->regTree( fullTreeName.Data(), m_outputTree ) );
+
}
- m_umax = 100.-std::abs(m_umax)*300.;
- m_initialized = true;
return sc;
}
@@ -84,157 +137,287 @@ StatusCode InDet::SiSpacePointsSeedMaker_ITK::finalize()
}
///////////////////////////////////////////////////////////////////
-// Initialize tool for new event
+// Initialize tool for new event
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::newEvent(const EventContext& ctx, EventData& data, int iteration) const
+void InDet::SiSpacePointsSeedMaker_ITK::newEvent(const EventContext &ctx, EventData &data, int iteration) const
{
- if (not data.initialized) initializeEventData(data);
- data.iteration0 = iteration;
+ /// if not done so, book the arrays etc inside the event data object
+ if (not data.initialized)
+ initializeEventData(data);
+
data.trigger = false;
- if (!m_pixel && !m_sct) return;
+ if (!m_pixel && !m_sct)
+ return;
- iteration <=0 ? data.iteration = 0 : data.iteration = iteration;
+ /// pass the iteration info into our data object
+ data.iteration = iteration;
+ if (iteration <= 0)
+ data.iteration = 0;
+ /// Erase any existing entries in the data object
erase(data);
+
data.dzdrmin = m_dzdrmin0;
data.dzdrmax = m_dzdrmax0;
+ data.maxScore = m_maxScore; ///< max score, where low scores are "better".
+
+ /// in the first iteration, initialise the beam framework - beam spot position and direction
+ if (data.iteration == 0)
+ {
- if (!data.iteration) {
buildBeamFrameWork(data);
- double f[3], gP[3] ={10.,10.,0.};
+ /// Read the field information
+ double magField[3]{0, 0, 0};
+ double globalPos[3] = {10., 10., 0.};
- MagField::AtlasFieldCache fieldCache;
+ MagField::AtlasFieldCache fieldCache;
- // Get field cache object
SG::ReadCondHandle<AtlasFieldCacheCondObj> readHandle{m_fieldCondObjInputKey, ctx};
- const AtlasFieldCacheCondObj* fieldCondObj{*readHandle};
- if (fieldCondObj == nullptr) {
+ const AtlasFieldCacheCondObj *fieldCondObj{*readHandle};
+ if (fieldCondObj == nullptr)
+ {
ATH_MSG_ERROR("SiSpacePointsSeedMaker_ITK: Failed to retrieve AtlasFieldCacheCondObj with key " << m_fieldCondObjInputKey.key());
return;
}
- fieldCondObj->getInitializedCache (fieldCache);
-
- if (fieldCache.solenoidOn()) {
- fieldCache.getFieldZR(gP, f);
-
- data.K = 2./(300.*f[2]);
- } else {
- data.K = 2./(300.* 5. );
+ fieldCondObj->getInitializedCache(fieldCache);
+
+ if (fieldCache.solenoidOn())
+ {
+ /// retrieve field
+ fieldCache.getFieldZR(globalPos, magField);
+ /**
+ * Knowing the field (note that the field cache returns the field in units of kiloTesla!)
+ * allows to set the circle-radius to pT conversion factor.
+ *
+ * See for example ATLAS-CONF-2010-072
+ * R[mm] =pT[GeV] / (3·10−4×B[T]) = pT[MeV] / (300 *Bz[kT])
+ *
+ * We actually estimate the circle diameter, 2R, in the seeding.
+ * So what we want is: 2R = pT[MeV] x 2 / (300 x Bz) = K x pT[MeV].
+ **/
+ data.K = 2. / (300. * magField[2]);
}
-
- data.ipt2K = m_ipt2/(data.K*data.K);
- data.ipt2C = m_ipt2*m_COF;
- data.COFK = m_COF*(data.K*data.K);
+ else
+ {
+ data.K = 2. / (300. * 5.);
+ }
+ /** helper variables allowing us to directly apply our pt cut on the variables
+ * available at seed level.
+ * ipt2K is 1 / (K * 0.9 * pt cut)²
+ **/
+ data.ipt2K = m_ipt2 / (data.K * data.K);
+ /// related to the mysterious magic number, m_COF{134*.05*9}
+ data.ipt2C = m_ipt2 * m_COF;
+ data.COFK = m_COF * (data.K * data.K);
+
+ /// set the spacepoint iterator to the beginning of the space-point list
data.i_spforseed_ITK = data.l_spforseed_ITK.begin();
- } else {
- data.r_first = 0;
+ // Set the seed multiplicity strategy of the event data to the one configured
+ // by the user for strip seeds
+ data.maxSeedsPerSP = m_maxOneSizeSSS;
+ data.keepAllConfirmedSeeds = m_alwaysKeepConfirmedStripSeeds;
+ } ///< end if-statement for iteration 0
+ else
+ { /// for the second iteration (PPP pass), don't redo the full init required the first time
+ data.r_first = 0; ///< reset the first radial bin
+ // Set the seed multiplicity strategy of the event data to the one configured
+ // by the user for pixel seeds
+ data.maxSeedsPerSP = m_maxOneSizePPP;
+ data.keepAllConfirmedSeeds = m_alwaysKeepConfirmedPixelSeeds;
+
+ /// call fillLists to repopulate the candidate space points and exit
fillLists(data);
return;
}
+ if (m_fastTracking)
+ {
+ fillListsFast(ctx, data);
+ return;
+ }
+
+ /// the following will only happen in the first iteration
data.checketa = data.dzdrmin > 1.;
- float irstep = 1.f/m_r_rstep;
- int irmax = m_r_size-1;
- for (int i=0; i<data.nr; ++i) {
+ /// build the r-binning.
+ float oneOverBinSizeR = 1. / m_binSizeR;
+ int maxBinR = m_nBinsR - 1;
+
+ /** This cleans up remaining entries in the data object.
+ * In standard execution, we only run this in the first
+ * iterations on a newly created data object,
+ * in which case this loop will not ever be entered.
+ * Leaving it in place for nonstandard use cases.
+ **/
+ for (int i = 0; i < data.nr; ++i)
+ {
int n = data.r_index[i];
data.r_map[n] = 0;
data.r_Sorted_ITK[n].clear();
}
data.ns = data.nr = 0;
- SG::ReadHandle<Trk::PRDtoTrackMap> prd_to_track_map;
+ SG::ReadHandle<Trk::PRDtoTrackMap> prd_to_track_map;
const Trk::PRDtoTrackMap *prd_to_track_map_cptr = nullptr;
- if (!m_prdToTrackMap.key().empty()) {
- prd_to_track_map=SG::ReadHandle<Trk::PRDtoTrackMap>(m_prdToTrackMap, ctx);
- if (!prd_to_track_map.isValid()) {
+ if (!m_prdToTrackMap.key().empty())
+ {
+ prd_to_track_map = SG::ReadHandle<Trk::PRDtoTrackMap>(m_prdToTrackMap, ctx);
+ if (!prd_to_track_map.isValid())
+ {
ATH_MSG_ERROR("Failed to read PRD to track association map: " << m_prdToTrackMap.key());
}
prd_to_track_map_cptr = prd_to_track_map.cptr();
}
- // Get pixels space points containers from store gate
- //
+ /////////////////////////////
+ /// Now, we will populate the space point list in the event data object once.
+ /////////////////////////////
+
+ /// reset the first r index
data.r_first = 0;
- if (m_pixel) {
+ /// Get pixels space points containers from store gate
+ if (m_pixel)
+ {
SG::ReadHandle<SpacePointContainer> spacepointsPixel{m_spacepointsPixel, ctx};
- if (spacepointsPixel.isValid()) {
-
- for (const SpacePointCollection* spc: *spacepointsPixel) {
- for (const Trk::SpacePoint* sp: *spc) {
-
- if ((prd_to_track_map_cptr && isUsed(sp,*prd_to_track_map_cptr)) || sp->r() > m_r_rmax || sp->r() < m_r_rmin ) continue;
-
- InDet::SiSpacePointForSeedITK* sps = newSpacePoint(data, sp);
- if (!sps) continue;
-
- int ir = static_cast<int>(sps->radius()*irstep);
- if (ir>irmax) ir = irmax;
- data.r_Sorted_ITK[ir].push_back(sps);
- ++data.r_map[ir];
- if (data.r_map[ir]==1) data.r_index[data.nr++] = ir;
- if (ir > data.r_first) data.r_first = ir;
- ++data.ns;
- }
- }
- }
- ++data.r_first;
- }
-
- // Get sct space points containers from store gate
- //
- if (m_sct) {
+ if (spacepointsPixel.isValid())
+ {
+ /// loop over the pixel space points
+ for (const SpacePointCollection *spc : *spacepointsPixel)
+ {
+ for (const Trk::SpacePoint *sp : *spc)
+ {
+
+ /// if we use the PRD to track map and this SP has already been used in a track, bail out
+ /// also skip any SP outside the r binning
+ if ((prd_to_track_map_cptr && isUsed(sp, *prd_to_track_map_cptr)) || sp->r() > m_r_rmax || sp->r() < m_r_rmin)
+ continue;
+
+ /// Remove DBM space points
+ ///
+ const InDetDD::SiDetectorElement *de =
+ static_cast<const InDetDD::SiDetectorElement *>(sp->clusterList().first->detectorElement());
+ if (!de || de->isDBM())
+ continue;
+
+ /** create a SiSpacePointForSeed from the space point.
+ * This will also add the point to the l_spforseed list and update
+ * the i_spforseed iterator
+ **/
+ InDet::SiSpacePointForSeedITK *sps = newSpacePoint(data, sp);
+ /// this can occur if we fail the eta cut
+ if (!sps)
+ continue;
+
+ /// determine the r-bin of this SP.
+ /// done by dividing the radius by the bin size.
+ int radiusBin = static_cast<int>(sps->radius() * oneOverBinSizeR);
+ /// catch outliers
+ if (radiusBin > maxBinR)
+ radiusBin = maxBinR;
+
+ /// now add the SP to the r-binned vector
+ data.r_Sorted_ITK[radiusBin].push_back(sps);
+ /// increment the counter for this bin
+ ++data.r_map[radiusBin];
+ /// if this is the first time we see this bin in use, we update the index map for this bin
+ /// to the radius bin index
+ if (data.r_map[radiusBin] == 1)
+ data.r_index[data.nr++] = radiusBin;
+ /// if this is the highest bin we saw so far, update the r_first member of the data object to this bin
+ if (radiusBin > data.r_first)
+ data.r_first = radiusBin;
+ /// update the space point counter
+ ++data.ns;
+ } ///< end loop over space points in collection
+ } ///< end loop over pixel SP collections
+ } ///< end if-statement on valid pixel SP container
+ ++data.r_first; ///< increment r_first past the last occupied bin we saw
+ } ///< end pixel case
+
+ /// Get sct space points containers from store gate
+ if (m_sct)
+ {
SG::ReadHandle<SpacePointContainer> spacepointsSCT{m_spacepointsSCT, ctx};
- if (spacepointsSCT.isValid()) {
-
- for (const SpacePointCollection* spc: *spacepointsSCT) {
- for (const Trk::SpacePoint* sp: *spc) {
-
- if ((prd_to_track_map_cptr && isUsed(sp,*prd_to_track_map_cptr)) || sp->r() > m_r_rmax || sp->r() < m_r_rmin ) continue;
-
- InDet::SiSpacePointForSeedITK* sps = newSpacePoint(data, sp);
- if (!sps) continue;
-
- int ir = static_cast<int>(sps->radius()*irstep);
- if (ir>irmax) ir = irmax;
- data.r_Sorted_ITK[ir].push_back(sps);
- ++data.r_map[ir];
- if (data.r_map[ir]==1) data.r_index[data.nr++] = ir;
- ++data.ns;
- }
+ if (spacepointsSCT.isValid())
+ {
+
+ for (const SpacePointCollection *spc : *spacepointsSCT)
+ {
+ for (const Trk::SpacePoint *sp : *spc)
+ {
+ /// as for the pixel, veto already used SP if we are using the PRD to track map in later passes of track finding.
+ /// Also, veto SP outside the maximum and minimum radii
+ if ((prd_to_track_map_cptr && isUsed(sp, *prd_to_track_map_cptr)) || sp->r() > m_r_rmax || sp->r() < m_r_rmin)
+ continue;
+ /// create a space point and write it into the data object's list of points
+ InDet::SiSpacePointForSeedITK *sps = newSpacePoint(data, sp);
+ if (!sps)
+ continue;
+
+ /// as for PIX, determine the radial bin.
+ /// Note that for the SCT we do not update data.r_first.
+ int radiusBin = static_cast<int>(sps->radius() * oneOverBinSizeR);
+ if (radiusBin > maxBinR)
+ radiusBin = maxBinR;
+ /// again store the SP in the r-binned vectors
+ data.r_Sorted_ITK[radiusBin].push_back(sps);
+ /// update the count of SP in the given bin
+ ++data.r_map[radiusBin];
+ /// update the r_index map and data.nr if needed
+ if (data.r_map[radiusBin] == 1)
+ data.r_index[data.nr++] = radiusBin;
+ /// and increment the SP count too.
+ ++data.ns;
+ }
}
}
- // Get sct overlap space points containers from store gate
- //
- if (m_useOverlap) {
+ /// Get sct overlap space points containers from store gate
+ if (m_useOverlap && !data.checketa)
+ {
SG::ReadHandle<SpacePointOverlapCollection> spacepointsOverlap{m_spacepointsOverlap, ctx};
- if (spacepointsOverlap.isValid()) {
-
- for (const Trk::SpacePoint* sp: *spacepointsOverlap) {
-
- if ((prd_to_track_map_cptr && isUsed(sp,*prd_to_track_map_cptr)) || sp->r() > m_r_rmax || sp->r() < m_r_rmin) continue;
-
- InDet::SiSpacePointForSeedITK* sps = newSpacePoint(data, sp);
- if (!sps) continue;
-
- int ir = static_cast<int>(sps->radius()*irstep);
- if (ir>irmax) ir = irmax;
- data.r_Sorted_ITK[ir].push_back(sps);
- ++data.r_map[ir];
- if (data.r_map[ir]==1) data.r_index[data.nr++] = ir;
- ++data.ns;
- }
+ if (spacepointsOverlap.isValid())
+ {
+ for (const Trk::SpacePoint *sp : *spacepointsOverlap)
+ {
+ /// usual rejection of SP used in previous track finding passes if we run with the PRT to track map + check of the max and min radii
+ if ((prd_to_track_map_cptr && isUsed(sp, *prd_to_track_map_cptr)) || sp->r() > m_r_rmax || sp->r() < m_r_rmin)
+ continue;
+
+ /// SP creation, entry into list of the data object
+ InDet::SiSpacePointForSeedITK *sps = newSpacePoint(data, sp);
+ if (!sps)
+ continue;
+
+ /// radial bin determination
+ int radiusBin = static_cast<int>(sps->radius() * oneOverBinSizeR);
+ if (radiusBin > maxBinR)
+ radiusBin = maxBinR;
+ /// insert into the "histogram" vector
+ data.r_Sorted_ITK[radiusBin].push_back(sps);
+ /// update the counter for each bin content
+ ++data.r_map[radiusBin];
+ /// update the bin index list and occupied bin counter
+ if (data.r_map[radiusBin] == 1)
+ data.r_index[data.nr++] = radiusBin;
+ /// and the total SP count too.
+ ++data.ns;
+ }
}
}
}
- if (iteration < 0) data.r_first = 0;
+ /// negative iterations are not used in the current ITk reco
+ if (iteration < 0)
+ data.r_first = 0;
+
+ /// populates the phi-z sorted histograms using the spacepoint lists and r-binning.
+ /// after this call, we have a 3D binning
fillLists(data);
}
@@ -242,112 +425,151 @@ void InDet::SiSpacePointsSeedMaker_ITK::newEvent(const EventContext& ctx, EventD
// Initialize tool for new region
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::newRegion
-(const EventContext& ctx, EventData& data,
- const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const
+void InDet::SiSpacePointsSeedMaker_ITK::newRegion(const EventContext &ctx, EventData &data,
+ const std::vector<IdentifierHash> &vPixel, const std::vector<IdentifierHash> &vSCT) const
{
- if (not data.initialized) initializeEventData(data);
+ if (not data.initialized)
+ initializeEventData(data);
data.iteration = 0;
data.trigger = false;
erase(data);
- if (!m_pixel && !m_sct) return;
+ if (!m_pixel && !m_sct)
+ return;
data.dzdrmin = m_dzdrmin0;
data.dzdrmax = m_dzdrmax0;
+ data.maxScore = m_maxScore;
buildBeamFrameWork(data);
- double f[3], gP[3] ={10.,10.,0.};
+ double magField[3]{0, 0, 0};
+ double globalPos[3] = {10., 10., 0.};
- MagField::AtlasFieldCache fieldCache;
+ MagField::AtlasFieldCache fieldCache;
// Get field cache object
SG::ReadCondHandle<AtlasFieldCacheCondObj> readHandle{m_fieldCondObjInputKey, ctx};
- const AtlasFieldCacheCondObj* fieldCondObj{*readHandle};
- if (fieldCondObj == nullptr) {
+ const AtlasFieldCacheCondObj *fieldCondObj{*readHandle};
+ if (fieldCondObj == nullptr)
+ {
ATH_MSG_ERROR("SiSpacePointsSeedMaker_ITK: Failed to retrieve AtlasFieldCacheCondObj with key " << m_fieldCondObjInputKey.key());
return;
}
- fieldCondObj->getInitializedCache (fieldCache);
+ fieldCondObj->getInitializedCache(fieldCache);
- if (fieldCache.solenoidOn()) {
- fieldCache.getFieldZR(gP, f);
+ if (fieldCache.solenoidOn())
+ {
+ fieldCache.getFieldZR(globalPos, magField);
- data.K = 2./(300.*f[2]);
- } else {
- data.K = 2./(300.* 5. );
+ data.K = 2. / (300. * magField[2]);
+ }
+ else
+ {
+ data.K = 2. / (300. * 5.);
}
- data.ipt2K = m_ipt2/(data.K*data.K);
- data.ipt2C = m_ipt2*m_COF;
- data.COFK = m_COF*(data.K*data.K);
+ data.ipt2K = m_ipt2 / (data.K * data.K);
+ data.ipt2C = m_ipt2 * m_COF;
+ data.COFK = m_COF * (data.K * data.K);
data.i_spforseed_ITK = data.l_spforseed_ITK.begin();
- float irstep = 1.f/m_r_rstep;
- int irmax = m_r_size-1;
+ float oneOverBinSizeR = 1. / m_binSizeR; //was float irstep = 1.f/m_binSizeR;
+ int maxBinR = m_nBinsR - 1; //was int irmax = m_nBinsR-1;
data.r_first = 0;
data.checketa = false;
- for (int i=0; i<data.nr; ++i) {
+ for (int i = 0; i < data.nr; ++i)
+ {
int n = data.r_index[i];
data.r_map[n] = 0;
data.r_Sorted_ITK[n].clear();
}
data.ns = data.nr = 0;
- // Get pixels space points containers from store gate
+ SG::ReadHandle<Trk::PRDtoTrackMap> prd_to_track_map;
+ const Trk::PRDtoTrackMap *prd_to_track_map_cptr = nullptr;
+ if (!m_prdToTrackMap.key().empty())
+ {
+ prd_to_track_map = SG::ReadHandle<Trk::PRDtoTrackMap>(m_prdToTrackMap, ctx);
+ if (!prd_to_track_map.isValid())
+ {
+ ATH_MSG_ERROR("Failed to read PRD to track association map: " << m_prdToTrackMap.key());
+ }
+ prd_to_track_map_cptr = prd_to_track_map.cptr();
+ }
+
+ // Get pixels space points containers from store gate
//
- if (m_pixel && !vPixel.empty()) {
+ if (m_pixel && !vPixel.empty())
+ {
SG::ReadHandle<SpacePointContainer> spacepointsPixel{m_spacepointsPixel, ctx};
- if (spacepointsPixel.isValid()) {
+ if (spacepointsPixel.isValid())
+ {
+ SpacePointContainer::const_iterator spce = spacepointsPixel->end();
// Loop through all trigger collections
//
- for (const IdentifierHash& l: vPixel) {
- const auto *w = spacepointsPixel->indexFindPtr(l);
- if (w==nullptr) continue;
- for (const Trk::SpacePoint* sp: *w) {
- float r = sp->r();
- if (r > m_r_rmax || r < m_r_rmin) continue;
- InDet::SiSpacePointForSeedITK* sps = newSpacePoint(data, sp);
- int ir = static_cast<int>(sps->radius()*irstep);
- if (ir>irmax) ir = irmax;
- data.r_Sorted_ITK[ir].push_back(sps);
+ for (const IdentifierHash &l : vPixel)
+ {
+ auto w = spacepointsPixel->indexFind(l);
+ if (w == spce)
+ continue;
+ for (const Trk::SpacePoint *sp : **w)
+ {
+ float r = sp->r();
+ if ((prd_to_track_map_cptr && isUsed(sp, *prd_to_track_map_cptr)) || r > m_r_rmax || r < m_r_rmin)
+ continue;
+ InDet::SiSpacePointForSeedITK *sps = newSpacePoint(data, sp);
+ int ir = static_cast<int>(sps->radius() * oneOverBinSizeR);
+ if (ir > maxBinR)
+ ir = maxBinR;
+ data.r_Sorted_ITK[ir].push_back(sps);
++data.r_map[ir];
- if (data.r_map[ir]==1) data.r_index[data.nr++] = ir;
- ++data.ns;
- }
+ if (data.r_map[ir] == 1)
+ data.r_index[data.nr++] = ir;
+ ++data.ns;
+ }
}
}
}
- // Get sct space points containers from store gate
+ // Get sct space points containers from store gate
//
- if (m_sct && !vSCT.empty()) {
+ if (m_sct && !vSCT.empty())
+ {
SG::ReadHandle<SpacePointContainer> spacepointsSCT{m_spacepointsSCT, ctx};
- if (spacepointsSCT.isValid()) {
+ if (spacepointsSCT.isValid())
+ {
+
+ SpacePointContainer::const_iterator spce = spacepointsSCT->end();
// Loop through all trigger collections
//
- for (const IdentifierHash& l: vSCT) {
- const auto *w = spacepointsSCT->indexFindPtr(l);
- if (w==nullptr) continue;
- for (const Trk::SpacePoint* sp: *w) {
- float r = sp->r();
- if (r > m_r_rmax || r < m_r_rmin) continue;
- InDet::SiSpacePointForSeedITK* sps = newSpacePoint(data, sp);
- int ir = static_cast<int>(sps->radius()*irstep);
- if (ir>irmax) ir = irmax;
- data.r_Sorted_ITK[ir].push_back(sps);
+ for (const IdentifierHash &l : vSCT)
+ {
+ auto w = spacepointsSCT->indexFind(l);
+ if (w == spce)
+ continue;
+ for (const Trk::SpacePoint *sp : **w)
+ {
+ float r = sp->r();
+ if ((prd_to_track_map_cptr && isUsed(sp, *prd_to_track_map_cptr)) || r > m_r_rmax || r < m_r_rmin)
+ continue;
+ InDet::SiSpacePointForSeedITK *sps = newSpacePoint(data, sp);
+ int ir = static_cast<int>(sps->radius() * oneOverBinSizeR);
+ if (ir > maxBinR)
+ ir = maxBinR;
+ data.r_Sorted_ITK[ir].push_back(sps);
++data.r_map[ir];
- if (data.r_map[ir]==1) data.r_index[data.nr++] = ir;
- ++data.ns;
- }
+ if (data.r_map[ir] == 1)
+ data.r_index[data.nr++] = ir;
+ ++data.ns;
+ }
}
}
}
@@ -358,62 +580,70 @@ void InDet::SiSpacePointsSeedMaker_ITK::newRegion
// Initialize tool for new region
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::newRegion
-(const EventContext& ctx, EventData& data,
- const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT, const IRoiDescriptor& IRD) const
+void InDet::SiSpacePointsSeedMaker_ITK::newRegion(const EventContext &ctx, EventData &data,
+ const std::vector<IdentifierHash> &vPixel, const std::vector<IdentifierHash> &vSCT, const IRoiDescriptor &IRD) const
{
- if (not data.initialized) initializeEventData(data);
+ constexpr float twoPi = 2. * M_PI;
+
+ if (not data.initialized)
+ initializeEventData(data);
newRegion(ctx, data, vPixel, vSCT);
data.trigger = true;
- double dzdrmin = 1.f/std::tan(2.f*std::atan(std::exp(-IRD.etaMinus())));
- double dzdrmax = 1.f/std::tan(2.f*std::atan(std::exp(-IRD.etaPlus ())));
-
- data.zminB = IRD.zedMinus()-data.zbeam[0]; // min bottom Z
- data.zmaxB = IRD.zedPlus ()-data.zbeam[0]; // max bottom Z
- data.zminU = data.zminB+550.*dzdrmin;
- data.zmaxU = data.zmaxB+550.*dzdrmax;
- double fmax = IRD.phiPlus ();
- double fmin = IRD.phiMinus();
- if (fmin > fmax) fmin-=(2.*M_PI);
- data.ftrig = (fmin+fmax)*.5;
- data.ftrigW = (fmax-fmin)*.5;
+ double dzdrmin = 1.f / std::tan(2.f * std::atan(std::exp(-IRD.etaMinus())));
+ double dzdrmax = 1.f / std::tan(2.f * std::atan(std::exp(-IRD.etaPlus())));
+
+ data.zminB = IRD.zedMinus() - data.zbeam[0]; // min bottom Z
+ data.zmaxB = IRD.zedPlus() - data.zbeam[0]; // max bottom Z
+ data.zminU = data.zminB + 550. * dzdrmin;
+ data.zmaxU = data.zmaxB + 550. * dzdrmax;
+ double fmax = IRD.phiPlus();
+ double fmin = IRD.phiMinus();
+ if (fmin > fmax)
+ fmin -= twoPi;
+ data.ftrig = (fmin + fmax) * .5;
+ data.ftrigW = (fmax - fmin) * .5;
}
+
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
// with two space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::find2Sp(EventData& data, const std::list<Trk::Vertex>& lv) const
+void InDet::SiSpacePointsSeedMaker_ITK::find2Sp(EventData &data, const std::list<Trk::Vertex> &lv) const
{
- if (not data.initialized) initializeEventData(data);
+ if (not data.initialized)
+ initializeEventData(data);
data.zminU = m_zmin;
data.zmaxU = m_zmax;
int mode = 0;
- if (lv.begin()!=lv.end()) mode = 1;
+ if (lv.begin() != lv.end())
+ mode = 1;
bool newv = newVertices(data, lv);
-
- if (newv || !data.state || data.nspoint!=2 || data.mode!=mode || data.nlist) {
+
+ if (newv || !data.state || data.nspoint != 2 || data.mode != mode || data.nlist)
+ {
data.i_seede_ITK = data.l_seeds_ITK.begin();
- data.state = 1;
+ data.state = 1;
data.nspoint = 2;
- data.nlist = 0;
- data.mode = mode;
+ data.nlist = 0;
+ data.mode = mode;
data.endlist = true;
- data.fvNmin = 0;
- data.fNmin = 0;
- data.zMin = 0;
+ data.fvNmin = 0;
+ data.fNmin = 0;
+ data.zMin = 0;
production2Sp(data);
}
data.i_seed_ITK = data.l_seeds_ITK.begin();
-
- if (m_outputlevel<=0) {
- data.nprint=1;
+
+ if (m_outputlevel <= 0)
+ {
+ data.nprint = 1;
dump(data, msg(MSG::DEBUG));
}
}
@@ -423,34 +653,45 @@ void InDet::SiSpacePointsSeedMaker_ITK::find2Sp(EventData& data, const std::list
// with three space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::find3Sp(const EventContext&, EventData& data, const std::list<Trk::Vertex>& lv) const
+void InDet::SiSpacePointsSeedMaker_ITK::find3Sp(const EventContext &, EventData &data, const std::list<Trk::Vertex> &lv) const
{
- if (not data.initialized) initializeEventData(data);
+ if (not data.initialized)
+ initializeEventData(data);
+ /// reset the Z interval stored in the data object
data.zminU = m_zmin;
data.zmaxU = m_zmax;
-
+ /// mode 2 if we have no vertices in the list, otherwise mode 3
int mode = 2;
- if (lv.begin()!=lv.end()) mode = 3;
+ if (lv.begin() != lv.end())
+ mode = 3;
+ /** copy the vertices into the data object, if we have any.
+ * Note that by construction, newv will ALWAYS be false, also if we
+ * pass vertices.
+ **/
bool newv = newVertices(data, lv);
-
- if (newv || !data.state || data.nspoint!=3 || data.mode!=mode || data.nlist) {
+ /// update the data object's config
+ if (newv || !data.state || data.nspoint != 3 || data.mode != mode || data.nlist)
+ {
data.i_seede_ITK = data.l_seeds_ITK.begin();
- data.state = 1;
+ data.state = 1;
data.nspoint = 3;
- data.nlist = 0;
- data.mode = mode;
+ data.nlist = 0;
+ data.mode = mode;
data.endlist = true;
- data.fvNmin = 0;
- data.fNmin = 0;
- data.zMin = 0;
- production3Sp(data);
+ data.fvNmin = 0;
+ data.fNmin = 0;
+ data.zMin = 0;
+ production3Sp(data); ///< This performs the actual seed finding
}
+
+ /// reset the i_seed_ITK iterator - this is used to return the seeds to the
+ /// consumer when they call next()
data.i_seed_ITK = data.l_seeds_ITK.begin();
- data.seed_ITK = data.seeds_ITK.begin();
- if (m_outputlevel<=0) {
- data.nprint=1;
+ if (msgLvl(MSG::DEBUG))
+ {
+ data.nprint = 1;
dump(data, msg(MSG::DEBUG));
}
}
@@ -460,36 +701,51 @@ void InDet::SiSpacePointsSeedMaker_ITK::find3Sp(const EventContext&, EventData&
// with three space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::find3Sp(const EventContext&, EventData& data, const std::list<Trk::Vertex>& lv, const double* ZVertex) const
+void InDet::SiSpacePointsSeedMaker_ITK::find3Sp(const EventContext &, EventData &data, const std::list<Trk::Vertex> &lv, const double *ZVertex) const
{
- if (not data.initialized) initializeEventData(data);
+ if (not data.initialized)
+ initializeEventData(data);
+
+ /// Update the data object's Z interval based on the interval passed as arg to this
+ /// function.
data.zminU = ZVertex[0];
- if (data.zminU < m_zmin) data.zminU = m_zmin;
+ if (data.zminU < m_zmin)
+ data.zminU = m_zmin; ///< don't go beyond user-specified intervals
data.zmaxU = ZVertex[1];
- if (data.zmaxU > m_zmax) data.zmaxU = m_zmax;
+ if (data.zmaxU > m_zmax)
+ data.zmaxU = m_zmax; ///< don't go beyond user-specified intervals
+ /// mode 2 when working with the Z constraint
int mode = 2;
- if (lv.begin()!=lv.end()) mode = 3;
+ if (lv.begin() != lv.end())
+ mode = 3;
+ /** copy the vertices into the data object, if we have any.
+ * Note that by construction, newv will ALWAYS be false, also if we
+ * pass vertices.
+ **/
bool newv = newVertices(data, lv);
-
- if (newv || !data.state || data.nspoint!=3 || data.mode!=mode || data.nlist) {
+ /// update the data object's config
+ if (newv || !data.state || data.nspoint != 3 || data.mode != mode || data.nlist)
+ {
data.i_seede_ITK = data.l_seeds_ITK.begin();
- data.state = 1;
+ data.state = 1;
data.nspoint = 3;
- data.nlist = 0;
- data.mode = mode;
+ data.nlist = 0;
+ data.mode = mode;
data.endlist = true;
- data.fvNmin = 0;
- data.fNmin = 0;
- data.zMin = 0;
- production3Sp(data);
+ data.fvNmin = 0;
+ data.fNmin = 0;
+ data.zMin = 0;
+ production3Sp(data); ///< This performs the actual seed finding
}
+ /// reset the i_seed_ITK iterator - this is used to return the seeds to the
+ /// consumer when they call next()
data.i_seed_ITK = data.l_seeds_ITK.begin();
- data.seed_ITK = data.seeds_ITK.begin();
- if (m_outputlevel<=0) {
- data.nprint=1;
+ if (msgLvl(MSG::DEBUG))
+ {
+ data.nprint = 1;
dump(data, msg(MSG::DEBUG));
}
}
@@ -500,35 +756,38 @@ void InDet::SiSpacePointsSeedMaker_ITK::find3Sp(const EventContext&, EventData&
// Variable means (2,3,4,....) any number space points
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::findVSp(const EventContext&, EventData& data, const std::list<Trk::Vertex>& lv) const
+void InDet::SiSpacePointsSeedMaker_ITK::findVSp(const EventContext &, EventData &data, const std::list<Trk::Vertex> &lv) const
{
- if (not data.initialized) initializeEventData(data);
+
+ if (not data.initialized)
+ initializeEventData(data);
data.zminU = m_zmin;
data.zmaxU = m_zmax;
int mode = 5;
- if (lv.begin()!=lv.end()) mode = 6;
+ if (lv.begin() != lv.end())
+ mode = 6;
bool newv = newVertices(data, lv);
-
- if (newv || !data.state || data.nspoint!=4 || data.mode!=mode || data.nlist) {
+ if (newv || !data.state || data.nspoint != 4 || data.mode != mode || data.nlist)
+ {
data.i_seede_ITK = data.l_seeds_ITK.begin();
- data.state = 1;
+ data.state = 1;
data.nspoint = 4;
- data.nlist = 0;
- data.mode = mode;
+ data.nlist = 0;
+ data.mode = mode;
data.endlist = true;
- data.fvNmin = 0;
- data.fNmin = 0;
- data.zMin = 0;
+ data.fvNmin = 0;
+ data.fNmin = 0;
+ data.zMin = 0;
production3Sp(data);
}
data.i_seed_ITK = data.l_seeds_ITK.begin();
- data.seed_ITK = data.seeds_ITK.begin();
- if (m_outputlevel<=0) {
- data.nprint=1;
+ if (msgLvl(MSG::DEBUG))
+ {
+ data.nprint = 1;
dump(data, msg(MSG::DEBUG));
}
}
@@ -537,11 +796,13 @@ void InDet::SiSpacePointsSeedMaker_ITK::findVSp(const EventContext&, EventData&
// Dumps relevant information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SiSpacePointsSeedMaker_ITK::dump(EventData& data, MsgStream& out) const
+MsgStream &InDet::SiSpacePointsSeedMaker_ITK::dump(EventData &data, MsgStream &out) const
{
- if (not data.initialized) initializeEventData(data);
+ if (not data.initialized)
+ initializeEventData(data);
- if (data.nprint) return dumpEvent(data, out);
+ if (data.nprint)
+ return dumpEvent(data, out);
return dumpConditions(data, out);
}
@@ -549,17 +810,24 @@ MsgStream& InDet::SiSpacePointsSeedMaker_ITK::dump(EventData& data, MsgStream& o
// Dumps conditions information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SiSpacePointsSeedMaker_ITK::dumpConditions(EventData& data, MsgStream& out) const
+MsgStream &InDet::SiSpacePointsSeedMaker_ITK::dumpConditions(EventData &data, MsgStream &out) const
{
int n = 42-m_spacepointsPixel.key().size();
- std::string s2; for (int i=0; i<n; ++i) s2.append(" "); s2.append("|");
+ std::string s2;
+ for (int i=0; i<n; ++i) s2.append(" ");
+ s2.append("|");
n = 42-m_spacepointsSCT.key().size();
- std::string s3; for (int i=0; i<n; ++i) s3.append(" "); s3.append("|");
+ std::string s3;
+ for (int i=0; i<n; ++i) s3.append(" ");
+ s3.append("|");
n = 42-m_spacepointsOverlap.key().size();
- std::string s4; for (int i=0; i<n; ++i) s4.append(" "); s4.append("|");
+ std::string s4;
+ for (int i=0; i<n; ++i) s4.append(" ");
+ s4.append("|");
n = 42-m_beamSpotKey.key().size();
- std::string s5; for (int i=0; i<n; ++i) s5.append(" "); s5.append("|");
-
+ std::string s5;
+ for (int i=0; i<n; ++i) s5.append(" ");
+ s5.append("|");
out<<"|---------------------------------------------------------------------|"
<<endmsg;
@@ -586,17 +854,11 @@ MsgStream& InDet::SiSpacePointsSeedMaker_ITK::dumpConditions(EventData& data, Ms
out<<"| pTmin (mev) | "
<<std::setw(12)<<std::setprecision(5)<<m_ptmin
<<" |"<<endmsg;
- out<<"| |rapidity| <= | "
- <<std::setw(12)<<std::setprecision(5)<<m_rapcut
- <<" |"<<endmsg;
out<<"| max radius SP | "
<<std::setw(12)<<std::setprecision(5)<<m_r_rmax
<<" |"<<endmsg;
- out<<"| min radius SP | "
- <<std::setw(12)<<std::setprecision(5)<<m_r_rmin
- <<" |"<<endmsg;
out<<"| radius step | "
- <<std::setw(12)<<std::setprecision(5)<<m_r_rstep
+ <<std::setw(12)<<std::setprecision(5)<<m_binSizeR
<<" |"<<endmsg;
out<<"| min Z-vertex position | "
<<std::setw(12)<<std::setprecision(5)<<m_zmin
@@ -604,42 +866,18 @@ MsgStream& InDet::SiSpacePointsSeedMaker_ITK::dumpConditions(EventData& data, Ms
out<<"| max Z-vertex position | "
<<std::setw(12)<<std::setprecision(5)<<m_zmax
<<" |"<<endmsg;
- out<<"| min radius first SP(3) | "
- <<std::setw(12)<<std::setprecision(5)<<m_r1min
- <<" |"<<endmsg;
- out<<"| min radius second SP(3) | "
- <<std::setw(12)<<std::setprecision(5)<<m_r2min
- <<" |"<<endmsg;
- out<<"| min radius last SP(3) | "
- <<std::setw(12)<<std::setprecision(5)<<m_r3min
- <<" |"<<endmsg;
- out<<"| max radius first SP(3) | "
- <<std::setw(12)<<std::setprecision(4)<<m_r1max
- <<" |"<<endmsg;
- out<<"| max radius second SP(3) | "
- <<std::setw(12)<<std::setprecision(5)<<m_r2max
- <<" |"<<endmsg;
- out<<"| max radius last SP(3) | "
- <<std::setw(12)<<std::setprecision(5)<<m_r3max
- <<" |"<<endmsg;
- out<<"| min radius first SP(2) | "
- <<std::setw(12)<<std::setprecision(5)<<m_r1minv
- <<" |"<<endmsg;
- out<<"| min radius second SP(2) | "
- <<std::setw(12)<<std::setprecision(5)<<m_r2minv
- <<" |"<<endmsg;
- out<<"| max radius first SP(2) | "
- <<std::setw(12)<<std::setprecision(5)<<m_r1maxv
- <<" |"<<endmsg;
- out<<"| max radius second SP(2) | "
- <<std::setw(12)<<std::setprecision(5)<<m_r2maxv
- <<" |"<<endmsg;
- out<<"| min space points dR | "
- <<std::setw(12)<<std::setprecision(5)<<m_drmin
- <<" |"<<endmsg;
- out<<"| max space points dR | "
- <<std::setw(12)<<std::setprecision(5)<<m_drmax
- <<" |"<<endmsg;
+ out<<"| min space points dR SSS | "
+ <<std::setw(12)<<std::setprecision(5)<<m_drminSSS
+ <<" |"<<std::endl;
+ out<<"| max space points dR SSS | "
+ <<std::setw(12)<<std::setprecision(5)<<m_drmaxSSS
+ <<" |"<<std::endl;
+ out<<"| min space points dR PPP | "
+ <<std::setw(12)<<std::setprecision(5)<<m_drminPPP
+ <<" |"<<std::endl;
+ out<<"| max space points dR PPP | "
+ <<std::setw(12)<<std::setprecision(5)<<m_drmaxPPP
+ <<" |"<<std::endl;
out<<"| max dZ impact | "
<<std::setw(12)<<std::setprecision(5)<<m_dzver
<<" |"<<endmsg;
@@ -647,13 +885,10 @@ MsgStream& InDet::SiSpacePointsSeedMaker_ITK::dumpConditions(EventData& data, Ms
<<std::setw(12)<<std::setprecision(5)<<m_dzdrver
<<" |"<<endmsg;
out<<"| max impact | "
- <<std::setw(12)<<std::setprecision(5)<<m_diver
- <<" |"<<endmsg;
- out<<"| max impact pps | "
- <<std::setw(12)<<std::setprecision(5)<<m_diverpps
+ <<std::setw(12)<<std::setprecision(5)<<m_maxdImpact
<<" |"<<endmsg;
out<<"| max impact sss | "
- <<std::setw(12)<<std::setprecision(5)<<m_diversss
+ <<std::setw(12)<<std::setprecision(5)<<m_maxdImpactSSS
<<" |"<<endmsg;
out<<"|---------------------------------------------------------------------|"
<<endmsg;
@@ -684,23 +919,25 @@ MsgStream& InDet::SiSpacePointsSeedMaker_ITK::dumpConditions(EventData& data, Ms
out<<"|---------------------------------------------------------------------|"
<<endmsg;
return out;
+
+
}
///////////////////////////////////////////////////////////////////
// Dumps event information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SiSpacePointsSeedMaker_ITK::dumpEvent(EventData& data, MsgStream& out) const
+MsgStream &InDet::SiSpacePointsSeedMaker_ITK::dumpEvent(EventData &data, MsgStream &out) const
{
out<<"|---------------------------------------------------------------------|"
<<endmsg;
- out<<"| data.ns | "
+ out<<"| ns | "
<<std::setw(12)<<data.ns
<<" |"<<endmsg;
- out<<"| data.nsaz | "
+ out<<"| nsaz | "
<<std::setw(12)<<data.nsaz
<<" |"<<endmsg;
- out<<"| data.nsazv | "
+ out<<"| nsazv | "
<<std::setw(12)<<data.nsazv
<<" |"<<endmsg;
out<<"| seeds | "
@@ -709,51 +946,65 @@ MsgStream& InDet::SiSpacePointsSeedMaker_ITK::dumpEvent(EventData& data, MsgStre
out<<"|---------------------------------------------------------------------|"
<<endmsg;
return out;
+
}
///////////////////////////////////////////////////////////////////
// Find next set space points
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::findNext(EventData& data) const
+void InDet::SiSpacePointsSeedMaker_ITK::findNext(EventData &data) const
{
- if (data.endlist) return;
+ if (data.endlist)
+ return;
data.i_seede_ITK = data.l_seeds_ITK.begin();
- if (data.mode==0 || data.mode==1) production2Sp(data);
- else if (data.mode==2 || data.mode==3) production3Sp(data);
- else if (data.mode==5 || data.mode==6) production3Sp(data);
+ if (data.mode == 2 || data.mode == 3 || data.mode == 5 || data.mode == 6)
+ production3Sp(data);
data.i_seed_ITK = data.l_seeds_ITK.begin();
- data.seed_ITK = data.seeds_ITK.begin();
++data.nlist;
-}
+}
///////////////////////////////////////////////////////////////////
// New and old list vertices comparison
///////////////////////////////////////////////////////////////////
-bool InDet::SiSpacePointsSeedMaker_ITK::newVertices(EventData& data, const std::list<Trk::Vertex>& lV) const
+bool InDet::SiSpacePointsSeedMaker_ITK::newVertices(EventData &data, const std::list<Trk::Vertex> &lV) const
{
+
unsigned int s1 = data.l_vertex.size();
unsigned int s2 = lV.size();
+ /// reset the isvertex flag
data.isvertex = false;
- if (s1==0 && s2==0) return false;
+ /// if we had no vertices before and have none now,
+ /// we can exit right away
+ if (s1 == 0 && s2 == 0)
+ return false;
+ /// clean up the vertex list
data.l_vertex.clear();
- if (s2 == 0) return false;
+ /// if we have no vertices now, we can exit
+ if (s2 == 0)
+ return false;
+ /// otherwise, update the data with the new vertices
data.isvertex = true;
- for (const Trk::Vertex& v: lV) {
+ for (const Trk::Vertex &v : lV)
+ {
data.l_vertex.insert(static_cast<float>(v.position().z()));
}
- data.zminU = (*data.l_vertex. begin())-20.;
- if ( data.zminU < m_zmin) data.zminU = m_zmin;
- data.zmaxU = (*data.l_vertex.rbegin())+20.;
- if ( data.zmaxU > m_zmax) data.zmaxU = m_zmax;
+ /// and also update the z interval, adding 20mm before/after the first/last vertex in z
+ /// make sure not to extend the interval beyond the user-configured z interval.
+ data.zminU = (*data.l_vertex.begin()) - 20.;
+ if (data.zminU < m_zmin)
+ data.zminU = m_zmin;
+ data.zmaxU = (*data.l_vertex.rbegin()) + 20.;
+ if (data.zmaxU > m_zmax)
+ data.zmaxU = m_zmax;
return false;
}
@@ -762,330 +1013,734 @@ bool InDet::SiSpacePointsSeedMaker_ITK::newVertices(EventData& data, const std::
// Initiate frame work for seed generator
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::buildFrameWork()
+void InDet::SiSpacePointsSeedMaker_ITK::buildFrameWork()
{
m_ptmin = std::abs(m_ptmin);
-
- if (m_ptmin < 100.) m_ptmin = 100.;
-
- if (m_diversss < m_diver ) m_diversss = m_diver;
- if (m_divermax < m_diversss) m_divermax = m_diversss;
-
- if (std::abs(m_etamin) < .1) m_etamin = -m_etamax;
- m_dzdrmax0 = 1.f/std::tan(2.f*std::atan(exp(-m_etamax)));
- m_dzdrmin0 = 1.f/std::tan(2.f*std::atan(exp(-m_etamin)));
-
- m_COF = 134*.05*9.;
- m_ipt = 1.f/std::abs(.9f*m_ptmin);
- m_ipt2 = m_ipt*m_ipt;
-
- // Build radius sorted containers
- //
- m_r_size = static_cast<int>((m_r_rmax+.1)/m_r_rstep);
-
- // Build radius-azimuthal sorted containers
- //
- constexpr float pi2 = 2.*M_PI;
- const int NFmax = SizeRF;
- const float sFmax = static_cast<float>(NFmax)/pi2;
- const float sFmin = 100./60.;
- float ptm = 400.;
- if (m_ptmin < ptm) ptm = m_ptmin;
+ if (m_ptmin < 100.)
+ m_ptmin = 100.;
+
+ /// ensure consistency in the transverse IP cuts
+ if (m_maxdImpactSSS < m_maxdImpact)
+ m_maxdImpactSSS = m_maxdImpact;
+
+ /// symmetrise eta cut if eta min not explicitly set
+ if (std::abs(m_etamin) < .1)
+ m_etamin = -m_etamax;
+ /// set dz/dr cut values based on eta cuts
+ m_dzdrmax0 = 1. / std::tan(2. * std::atan(std::exp(-m_etamax)));
+ m_dzdrmin0 = 1. / std::tan(2. * std::atan(std::exp(-m_etamin)));
+
+ /// cache inverse pt cuts
+ m_ipt = 1. / std::abs(m_ptmin);
+ m_ipt2 = m_ipt * m_ipt;
+
+ /// set up the score thresholds based on the user-supplied properties
+ /// The score of any seeds will always be >= the bonus applied,
+ /// since the starting value is |d0|.
+ /// Hence, by subtracting one, we get all seeds which have
+ /// received an additional bonus in addition to the PPP/SSS one,
+ /// which is the confirmation one by construction.
+ m_seedScoreThresholdPPPConfirmationSeed = m_seedScoreBonusPPP - 1.;
+ m_seedScoreThresholdSSSConfirmationSeed = m_seedScoreBonusSSS - 1.;
+
+ /// Build radius sorted containers
+ m_nBinsR = static_cast<int>((m_r_rmax + .1) / m_binSizeR);
+
+ /**
+ * Now we construct the radius-azimuthal sorted containers.
+ * Binning is determined semi-dynamically based on the tool config
+ **/
+
+ /// determine the phi binning
+ constexpr float twoPi = 2. * M_PI;
+
+ /// The max Nb. of bins possible is given by the binning enum
+ const int nPhiBinsMax = arraySizePhi;
+ const float inverseSizePhiMax = static_cast<float>(nPhiBinsMax) / twoPi; ///< for run-3: 200 : 6.28 ~ 31.8, bin size 0.0314
+ constexpr float inverseSizePhiMin = 10. / twoPi;
+
+ /// derive the optimum bin size in phi for our needs.
+ /// We do this by checking the size needed for each of the passes we run,
+ /// and then pick the larger one (more conservative).
+ /// This is slightly less optimal than using separate settings per pass, but avoids
+ /// having to book and store in memory two distinct R-phi-Z maps.
+
+ if (m_optimisePhiBinning)
+ {
+ /// case 1: PPP seeds, if we use them
+ const float radiusPixelStart = m_fastTracking ? 50. : 40.; /// approximate lowest R location of pixel hits (driven by barrel)
+ const float radiusPixelEnd = m_fastTracking ? 250. : 320.; /// approximate largest R location of pixel hits (driven by endcap)
+ const float binSizePhi_PPP = m_pixel ? azimuthalStep(m_ptmin, m_maxdImpact, radiusPixelStart, radiusPixelEnd) / 3. : 0.;
+ /// case 2: SSS seeds, if we use them
+ const float binSizePhi_SSS = m_sct ? azimuthalStep(m_ptmin, m_maxdImpactSSS, m_rminSSS, m_rmaxSSS) / 3. : 0.;
+ m_inverseBinSizePhiPPP = 1. / binSizePhi_PPP;
+ m_inverseBinSizePhiSSS = 1. / binSizePhi_SSS;
+ }
+ else
+ {
+ /// this is the default phi binning as operated in release 21 - optimised for
+ /// a trajectory with 400 MeV, from the origin, and Rmin = 0 / Rmax = 600mm float ptm = 400.;
+ float ptm = 400.;
+ /// if we cut below 400 MeV, adapt the ptm
+ if (m_ptmin < ptm)
+ ptm = m_ptmin;
+ m_inverseBinSizePhiPPP = m_inverseBinSizePhiSSS = ptm / 60.;
+ }
- m_sF = ptm /60.;
- if (m_sF > sFmax) m_sF = sFmax;
- else if (m_sF < sFmin) m_sF = sFmin;
- m_fNmax = static_cast<int>(pi2*m_sF);
- if (m_fNmax >=NFmax) m_fNmax = NFmax-1;
+ /// truncate the bin size to fall within our thresholds
+ if (m_inverseBinSizePhiPPP > inverseSizePhiMax)
+ m_inverseBinSizePhiPPP = inverseSizePhiMax;
+ else if (m_inverseBinSizePhiPPP < inverseSizePhiMin)
+ m_inverseBinSizePhiPPP = inverseSizePhiMin;
+ if (m_inverseBinSizePhiSSS > inverseSizePhiMax)
+ m_inverseBinSizePhiSSS = inverseSizePhiMax;
+ else if (m_inverseBinSizePhiSSS < inverseSizePhiMin)
+ m_inverseBinSizePhiSSS = inverseSizePhiMin;
+
+ /// now we can determine the number of bins by dividing the interval by the bin size
+ m_maxPhiBinPPP = static_cast<int>(twoPi * m_inverseBinSizePhiPPP);
+ /// additional protection against too many bins. Should not happen given constraints above
+ if (m_maxPhiBinPPP >= nPhiBinsMax)
+ m_maxPhiBinPPP = nPhiBinsMax - 1;
+ m_maxPhiBinSSS = static_cast<int>(twoPi * m_inverseBinSizePhiSSS);
+ if (m_maxPhiBinSSS >= nPhiBinsMax)
+ m_maxPhiBinSSS = nPhiBinsMax - 1;
+ /// recompute inverse bin size, taking into account rounding + truncation
+ m_inverseBinSizePhiPPP = m_maxPhiBinPPP / twoPi;
+ m_inverseBinSizePhiSSS = m_maxPhiBinSSS / twoPi;
+
+ buildConnectionMaps(m_nNeighbourCellsBottomPPP, m_nNeighbourCellsTopPPP,
+ m_neighbourCellsBottomPPP, m_neighbourCellsTopPPP,
+ m_maxPhiBinPPP, false);
+
+ buildConnectionMaps(m_nNeighbourCellsBottomSSS, m_nNeighbourCellsTopSSS,
+ m_neighbourCellsBottomSSS, m_neighbourCellsTopSSS,
+ m_maxPhiBinSSS, true);
+}
- // Build radius-azimuthal-Z sorted containers for Z-vertices
- //
- const int NFtmax = SizeRFV;
- const float sFvmax = static_cast<float>(NFtmax)/pi2;
- m_sFv = m_ptmin/120.;
- if (m_sFv>sFvmax) m_sFv = sFvmax;
- m_fvNmax = static_cast<int>(pi2*m_sFv);
- if (m_fvNmax>=NFtmax) m_fvNmax = NFtmax-1;
-
- // Build maps for radius-azimuthal-Z sorted collections
- //
- for (int f=0; f<=m_fNmax; ++f) {
+void InDet::SiSpacePointsSeedMaker_ITK::buildConnectionMaps(std::array<int, arraySizePhiZ> &nNeighbourCellsBottom,
+ std::array<int, arraySizePhiZ> &nNeighbourCellsTop,
+ std::array<std::array<int, arraySizeNeighbourBins>, arraySizePhiZ> &neighbourCellsBottom,
+ std::array<std::array<int, arraySizeNeighbourBins>, arraySizePhiZ> &neighbourCellsTop,
+ int maxPhiBin, bool isSSS)
+{
- int fb = f-1; if (fb<0 ) fb=m_fNmax;
- int ft = f+1; if (ft>m_fNmax) ft=0;
-
- // For each azimuthal region loop through all Z regions
- //
- for (int z=0; z<SizeZ; ++z) {
-
- int a = f *SizeZ+z;
- int b = fb*SizeZ+z;
- int c = ft*SizeZ+z;
- m_rfz_b [a] = 3; m_rfz_t [a] = 3;
- m_rfz_ib[a][0] = a; m_rfz_it[a][0] = a;
- m_rfz_ib[a][1] = b; m_rfz_it[a][1] = b;
- m_rfz_ib[a][2] = c; m_rfz_it[a][2] = c;
- if (z==5) {
-
- m_rfz_t [a] = 9;
- m_rfz_it[a][3] = a+1;
- m_rfz_it[a][4] = b+1;
- m_rfz_it[a][5] = c+1;
- m_rfz_it[a][6] = a-1;
- m_rfz_it[a][7] = b-1;
- m_rfz_it[a][8] = c-1;
- } else if (z> 5) {
-
- m_rfz_b [a] = 6;
- m_rfz_ib[a][3] = a-1;
- m_rfz_ib[a][4] = b-1;
- m_rfz_ib[a][5] = c-1;
-
- if (z<10) {
-
- m_rfz_t [a] = 6;
- m_rfz_it[a][3] = a+1;
- m_rfz_it[a][4] = b+1;
- m_rfz_it[a][5] = c+1;
- }
- } else {
-
- m_rfz_b [a] = 6;
- m_rfz_ib[a][3] = a+1;
- m_rfz_ib[a][4] = b+1;
- m_rfz_ib[a][5] = c+1;
-
- if (z>0) {
-
- m_rfz_t [a] = 6;
- m_rfz_it[a][3] = a-1;
- m_rfz_it[a][4] = b-1;
- m_rfz_it[a][5] = c-1;
- }
+ /// Build maps for radius-azimuthal-Z sorted collections.
+ /// Here, we associate which bins are 'connected' to a given phi-Z bin
+ /// for the seeding
+
+ for (int phiBin = 0; phiBin <= maxPhiBin; ++phiBin)
+ {
+
+ int phiBelow = phiBin - 1;
+ if (phiBelow < 0)
+ phiBelow = maxPhiBin; ///< loop around at edges of range
+
+ int phiAbove = phiBin + 1;
+ if (phiAbove > maxPhiBin)
+ phiAbove = 0; ///< loop around at edges of range
+
+ /// For each azimuthal region loop through all Z regions
+ for (int z = 0; z < arraySizeZ; ++z)
+ {
+
+ /// we always include the two neighbouring phi bins for the top / bottom
+ /// space point search
+
+ int twoDbinSamePhi = phiBin * arraySizeZ + z;
+ int twoDbinLowerPhi = phiBelow * arraySizeZ + z;
+ int twoDbinHigherPhi = phiAbove * arraySizeZ + z;
+
+ nNeighbourCellsBottom[twoDbinSamePhi] = 3;
+ nNeighbourCellsTop[twoDbinSamePhi] = 3;
+
+ neighbourCellsBottom[twoDbinSamePhi][0] = twoDbinSamePhi;
+ neighbourCellsTop[twoDbinSamePhi][0] = twoDbinSamePhi;
+
+ neighbourCellsBottom[twoDbinSamePhi][1] = twoDbinLowerPhi;
+ neighbourCellsTop[twoDbinSamePhi][1] = twoDbinLowerPhi;
+
+ neighbourCellsBottom[twoDbinSamePhi][2] = twoDbinHigherPhi;
+ neighbourCellsTop[twoDbinSamePhi][2] = twoDbinHigherPhi;
+
+ /** in addition, we usually add at least one neighbouring slice
+ * in Z. This depends on where we are in the detector.
+ * Guide for the following:
+ * z == 5: central z region, |z|<250mm
+ * 0 1 2 3 4 5 6 7 8 9 10 z bin index
+ * --------------------------------------> Z[mm]
+ * Z=-2500 IP,Z=0 Z=+2500
+ **/
+ if (z == 5)
+ {
+ nNeighbourCellsTop[twoDbinSamePhi] = 9;
+ // in the central z region, we include the two neighbouring
+ // z slices for the top neighbour search
+
+ neighbourCellsTop[twoDbinSamePhi][3] = twoDbinSamePhi + 1;
+ neighbourCellsTop[twoDbinSamePhi][4] = twoDbinLowerPhi + 1;
+ neighbourCellsTop[twoDbinSamePhi][5] = twoDbinHigherPhi + 1;
+ neighbourCellsTop[twoDbinSamePhi][6] = twoDbinSamePhi - 1;
+ neighbourCellsTop[twoDbinSamePhi][7] = twoDbinLowerPhi - 1;
+ neighbourCellsTop[twoDbinSamePhi][8] = twoDbinHigherPhi - 1;
}
-
- if (z==3) {
- m_rfz_b[a] = 9;
- m_rfz_ib[a][6] = a+2;
- m_rfz_ib[a][7] = b+2;
- m_rfz_ib[a][8] = c+2;
- } else if (z==7) {
- m_rfz_b[a] = 9;
- m_rfz_ib[a][6] = a-2;
- m_rfz_ib[a][7] = b-2;
- m_rfz_ib[a][8] = c-2;
+ // z > 5: positive z values, |z| > 250mm
+ else if (z > 5)
+ {
+ // for the bottom SP search in positive non-central z, we include the
+ // neighbouring Z region on the left (towards the IP) in the bottom
+ // neighbour search
+ nNeighbourCellsBottom[twoDbinSamePhi] = 6;
+ neighbourCellsBottom[twoDbinSamePhi][3] = twoDbinSamePhi - 1;
+ neighbourCellsBottom[twoDbinSamePhi][4] = twoDbinLowerPhi - 1;
+ neighbourCellsBottom[twoDbinSamePhi][5] = twoDbinHigherPhi - 1;
+
+ if (z < 10)
+ {
+ /** for the top SP search in positive z,
+ * if we are not in the outermost z region,
+ * we include the neighbouring Z region on the right (away from the IP).
+ * In z = 10, the most forward, we do not have such a 'right side' neighbour we can add
+ **/
+ nNeighbourCellsTop[twoDbinSamePhi] = 6;
+ neighbourCellsTop[twoDbinSamePhi][3] = twoDbinSamePhi + 1;
+ neighbourCellsTop[twoDbinSamePhi][4] = twoDbinLowerPhi + 1;
+ neighbourCellsTop[twoDbinSamePhi][5] = twoDbinHigherPhi + 1;
+ }
+ }
+ // z < 5: negative z values, |z| > 250mm
+ else
+ {
+ /** for the bottom SP in negative non-central z, we include
+ * the neighbouring z region on the right (towards the IP) in the
+ * bottom neighbour search
+ **/
+ nNeighbourCellsBottom[twoDbinSamePhi] = 6;
+ neighbourCellsBottom[twoDbinSamePhi][3] = twoDbinSamePhi + 1;
+ neighbourCellsBottom[twoDbinSamePhi][4] = twoDbinLowerPhi + 1;
+ neighbourCellsBottom[twoDbinSamePhi][5] = twoDbinHigherPhi + 1;
+
+ if (z > 0)
+ {
+ // if there is a z region on the left (away from the IP), we include it in the top
+ // neighbour search
+ nNeighbourCellsTop[twoDbinSamePhi] = 6;
+ neighbourCellsTop[twoDbinSamePhi][3] = twoDbinSamePhi - 1;
+ neighbourCellsTop[twoDbinSamePhi][4] = twoDbinLowerPhi - 1;
+ neighbourCellsTop[twoDbinSamePhi][5] = twoDbinHigherPhi - 1;
+ }
}
- }
- }
-
- // Build maps for radius-azimuthal-Z sorted collections for Z
- //
- for (int f=0; f<=m_fvNmax; ++f) {
- int fb = f-1;
- if (fb<0) fb=m_fvNmax;
- int ft = f+1;
- if (ft>m_fvNmax) ft=0;
-
- // For each azimuthal region loop through central Z regions
- //
- for (int z=0; z<SizeZV; ++z) {
-
- int a = f *SizeZV+z;
- int b = fb*SizeZV+z;
- int c = ft*SizeZV+z;
- m_rfzv_n[a] = 3;
- m_rfzv_i[a][0] = a;
- m_rfzv_i[a][1] = b;
- m_rfzv_i[a][2] = c;
- if (z>1) {
- m_rfzv_n[a] = 6;
- m_rfzv_i[a][3] = a-1;
- m_rfzv_i[a][4] = b-1;
- m_rfzv_i[a][5] = c-1;
- } else if (z<1) {
- m_rfzv_n[a] = 6;
- m_rfzv_i[a][3] = a+1;
- m_rfzv_i[a][4] = b+1;
- m_rfzv_i[a][5] = c+1;
+ /**
+ * z bins 3 / 7: 450mm < |z| < 925mm.:
+ * also include the central z region in the bottom SP search.
+ * likely for PPP seeds with hits in pixel barrel + endcaps
+ **/
+ /// Only used for strip seeds
+ if (isSSS)
+ {
+ if (z == 3)
+ {
+ nNeighbourCellsBottom[twoDbinSamePhi] = 9;
+ neighbourCellsBottom[twoDbinSamePhi][6] = twoDbinSamePhi + 2;
+ neighbourCellsBottom[twoDbinSamePhi][7] = twoDbinLowerPhi + 2;
+ neighbourCellsBottom[twoDbinSamePhi][8] = twoDbinHigherPhi + 2;
+ }
+ else if (z == 7)
+ {
+ nNeighbourCellsBottom[twoDbinSamePhi] = 9;
+ neighbourCellsBottom[twoDbinSamePhi][6] = twoDbinSamePhi - 2;
+ neighbourCellsBottom[twoDbinSamePhi][7] = twoDbinLowerPhi - 2;
+ neighbourCellsBottom[twoDbinSamePhi][8] = twoDbinHigherPhi - 2;
+ }
}
}
}
}
+float InDet::SiSpacePointsSeedMaker_ITK::azimuthalStep(const float pTmin, const float maxd0, const float Rmin, const float Rmax) const
+{
+ /// here we approximate the largest curvature
+ /// that can be expected for the seeds we build
+ /// using R[mm] ~ pT[MeV] / (0.3 * B[T]), with B == 2T
+ float Rm = pTmin / .6;
+
+ /// for LRT, the maximum allowed d0 may be larger than
+ /// the radius at which the innermost hit is possible.
+ /// In that case, our "worst case" trajectory
+ /// generating the largest phi displacement
+ /// will be the one with a hit at Rmin and
+ /// d0 == Rmin.
+ float worstCaseD0 = maxd0;
+ if (maxd0 > Rmin)
+ worstCaseD0 = Rmin;
+
+ float sI = std::abs(std::asin(worstCaseD0 / Rmin) - std::asin(worstCaseD0 / Rmax));
+ float sF = std::abs(std::asin(std::min(1., Rmax / (2. * Rm))) -
+ std::asin(std::min(1., Rmin / (2. * Rm))));
+ return sI + sF;
+}
+
///////////////////////////////////////////////////////////////////
// Initiate beam frame work for seed generator
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::buildBeamFrameWork(EventData& data) const
-{
- SG::ReadCondHandle<InDet::BeamSpotData> beamSpotHandle { m_beamSpotKey };
+void InDet::SiSpacePointsSeedMaker_ITK::buildBeamFrameWork(EventData &data) const
+{
+ SG::ReadCondHandle<InDet::BeamSpotData> beamSpotHandle{m_beamSpotKey};
const Amg::Vector3D &cb = beamSpotHandle->beamPos();
double tx = std::tan(beamSpotHandle->beamTilt(0));
double ty = std::tan(beamSpotHandle->beamTilt(1));
- double ph = atan2(ty,tx);
- double th = acos(1./sqrt(1.+tx*tx+ty*ty));
- double sint = sin(th);
- double cost = cos(th);
- double sinp = sin(ph);
- double cosp = cos(ph);
-
- data.xbeam[0] = static_cast<float>(cb.x());
- data.xbeam[1] = static_cast<float>(cost*cosp*cosp+sinp*sinp);
- data.xbeam[2] = static_cast<float>(cost*sinp*cosp-sinp*cosp);
- data.xbeam[3] = -static_cast<float>(sint*cosp );
-
- data.ybeam[0] = static_cast<float>(cb.y());
- data.ybeam[1] = static_cast<float>(cost*cosp*sinp-sinp*cosp);
- data.ybeam[2] = static_cast<float>(cost*sinp*sinp+cosp*cosp);
- data.ybeam[3] = -static_cast<float>(sint*sinp );
-
- data.zbeam[0] = static_cast<float>(cb.z());
- data.zbeam[1] = static_cast<float>(sint*cosp);
- data.zbeam[2] = static_cast<float>(sint*sinp);
- data.zbeam[3] = static_cast<float>(cost);
+ double phi = std::atan2(ty, tx);
+ double theta = std::acos(1. / std::sqrt(1. + tx * tx + ty * ty));
+ double sinTheta = std::sin(theta);
+ double cosTheta = std::cos(theta);
+ double sinPhi = std::sin(phi);
+ double cosPhi = std::cos(phi);
+
+ data.xbeam[0] = static_cast<float>(cb.x());
+ data.xbeam[1] = static_cast<float>(cosTheta * cosPhi * cosPhi + sinPhi * sinPhi);
+ data.xbeam[2] = static_cast<float>(cosTheta * sinPhi * cosPhi - sinPhi * cosPhi);
+ data.xbeam[3] = -static_cast<float>(sinTheta * cosPhi);
+
+ data.ybeam[0] = static_cast<float>(cb.y());
+ data.ybeam[1] = static_cast<float>(cosTheta * cosPhi * sinPhi - sinPhi * cosPhi);
+ data.ybeam[2] = static_cast<float>(cosTheta * sinPhi * sinPhi + cosPhi * cosPhi);
+ data.ybeam[3] = -static_cast<float>(sinTheta * sinPhi);
+
+ data.zbeam[0] = static_cast<float>(cb.z());
+ data.zbeam[1] = static_cast<float>(sinTheta * cosPhi);
+ data.zbeam[2] = static_cast<float>(sinTheta * sinPhi);
+ data.zbeam[3] = static_cast<float>(cosTheta);
}
///////////////////////////////////////////////////////////////////
// Initiate beam frame work for seed generator
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::convertToBeamFrameWork
-(EventData& data, const Trk::SpacePoint*const& sp,float* r) const
+void InDet::SiSpacePointsSeedMaker_ITK::convertToBeamFrameWork(EventData &data, const Trk::SpacePoint *const &sp, float *r) const
{
- r[0] = static_cast<float>(sp->globalPosition().x())-data.xbeam[0];
- r[1] = static_cast<float>(sp->globalPosition().y())-data.ybeam[0];
- r[2] = static_cast<float>(sp->globalPosition().z())-data.zbeam[0];
+ r[0] = static_cast<float>(sp->globalPosition().x()) - data.xbeam[0];
+ r[1] = static_cast<float>(sp->globalPosition().y()) - data.ybeam[0];
+ r[2] = static_cast<float>(sp->globalPosition().z()) - data.zbeam[0];
- if (!sp->clusterList().second) return;
+ //not in 21.9 ITk New implementation
+ /*
+ if (!sp->clusterList().second) return;
- // Only for SCT space points
- //
- const InDet::SiCluster* c0 = static_cast<const InDet::SiCluster*>(sp->clusterList().first );
- const InDet::SiCluster* c1 = static_cast<const InDet::SiCluster*>(sp->clusterList().second);
-
- Amg::Vector2D lc0 = c0->localPosition();
- Amg::Vector2D lc1 = c1->localPosition();
-
- std::pair<Amg::Vector3D, Amg::Vector3D > e0 =
- (c0->detectorElement()->endsOfStrip(InDetDD::SiLocalPosition(lc0.y(),lc0.x(),0.)));
- std::pair<Amg::Vector3D, Amg::Vector3D > e1 =
- (c1->detectorElement()->endsOfStrip(InDetDD::SiLocalPosition(lc1.y(),lc1.x(),0.)));
+ // Only for SCT space points
+ //
+ const InDet::SiCluster* c0 = static_cast<const InDet::SiCluster*>(sp->clusterList().first );
+ const InDet::SiCluster* c1 = static_cast<const InDet::SiCluster*>(sp->clusterList().second);
+
+ Amg::Vector2D lc0 = c0->localPosition();
+ Amg::Vector2D lc1 = c1->localPosition();
+
+ std::pair<Amg::Vector3D, Amg::Vector3D > e0 =
+ (c0->detectorElement()->endsOfStrip(InDetDD::SiLocalPosition(lc0.y(),lc0.x(),0.)));
+ std::pair<Amg::Vector3D, Amg::Vector3D > e1 =
+ (c1->detectorElement()->endsOfStrip(InDetDD::SiLocalPosition(lc1.y(),lc1.x(),0.)));
+
+ Amg::Vector3D b0 (e0.second-e0.first);
+ Amg::Vector3D b1 (e1.second-e1.first);
+ Amg::Vector3D d02(e0.first -e1.first);
+
+ // b0
+ r[ 3] = static_cast<float>(b0[0]);
+ r[ 4] = static_cast<float>(b0[1]);
+ r[ 5] = static_cast<float>(b0[2]);
+
+ // b1
+ r[ 6] = static_cast<float>(b1[0]);
+ r[ 7] = static_cast<float>(b1[1]);
+ r[ 8] = static_cast<float>(b1[2]);
+
+ // r0-r2
+ r[ 9] = static_cast<float>(d02[0]);
+ r[10] = static_cast<float>(d02[1]);
+ r[11] = static_cast<float>(d02[2]);
+
+ // r0
+ r[12] = static_cast<float>(e0.first[0])-data.xbeam[0];
+ r[13] = static_cast<float>(e0.first[1])-data.ybeam[0];
+ r[14] = static_cast<float>(e0.first[2])-data.zbeam[0];
+ */
+}
- Amg::Vector3D b0 (e0.second-e0.first);
- Amg::Vector3D b1 (e1.second-e1.first);
- Amg::Vector3D d02(e0.first -e1.first);
+///////////////////////////////////////////////////////////////////
+// Initiate space points seed maker
+///////////////////////////////////////////////////////////////////
- // b0
- r[ 3] = static_cast<float>(b0[0]);
- r[ 4] = static_cast<float>(b0[1]);
- r[ 5] = static_cast<float>(b0[2]);
-
- // b1
- r[ 6] = static_cast<float>(b1[0]);
- r[ 7] = static_cast<float>(b1[1]);
- r[ 8] = static_cast<float>(b1[2]);
+void InDet::SiSpacePointsSeedMaker_ITK::fillLists(EventData &data) const
+{
+ constexpr float twoPi = 2. * M_PI;
+
+ int firstRadialBin = 0;
+ int lastRadialBin = 0;
+ bool endcap = false;
+
+ /**
+ * The following is done separately for each iteration.
+ * We sort the hits in our radially sorted lists into the
+ * z-phi binning, keeping only those we want to consider to reduce
+ * combinatorics
+ *
+ * Note that the use of r_first to start the loop is what ensures that
+ * the first iteration is a pure SSS pass.
+ * In newEvent, r_first is set to the bin after the last
+ * radial bin containing Pixel space points.
+ * For the second iteration, we reset it to zero and thus start in the pixels.
+ **/
+
+ const std::map<float, int> ztoBin{
+ {-2500., 0},
+ {-1400., 1},
+ {-925., 2},
+ {-450., 3},
+ {-250, 4},
+ {250, 5},
+ {450, 6},
+ {925, 7},
+ {1400, 8},
+ {2500, 9},
+ {100000, 10}, ///< if we encounter Si hits at z > +100m, we are probably not in ATLAS anymore...
+ };
+
+ int nPhiBins = data.iteration ? m_maxPhiBinPPP : m_maxPhiBinSSS;
+ float inverseBinSizePhi = data.iteration ? m_inverseBinSizePhiPPP : m_inverseBinSizePhiSSS;
+
+ for (int radialBin = data.r_first; radialBin < m_nBinsR; ++radialBin)
+ {
+
+ /// skip empty radial bins
+ if (!data.r_map[radialBin])
+ continue;
+
+ // Stop when we reach strip SP in PPP iteration #1
+ std::list<InDet::SiSpacePointForSeedITK *>::iterator SP_first = data.r_Sorted_ITK[radialBin].begin();
+ if (data.iteration && (*SP_first)->spacepoint->clusterList().second)
+ break;
+
+ /// remember the first non-empty bin we encounter
+ if (firstRadialBin == 0)
+ firstRadialBin = radialBin;
+ lastRadialBin = radialBin;
+
+ // loop over the space points in the r-bin and sort them into the 2d phi-z binning
+ for (InDet::SiSpacePointForSeedITK *SP : data.r_Sorted_ITK[radialBin])
+ {
+
+ /// Azimuthal angle sort
+ /// find the bin by dividing phi in 0...2pi by the bin size
+ float Phi = SP->phi();
+ if (Phi < 0.)
+ Phi += twoPi; // phi is defined in [0..2pi] for the binning
+ int phiBin = static_cast<int>(Phi * inverseBinSizePhi);
+ /// handle overflows
+ if (phiBin < 0)
+ {
+ phiBin = nPhiBins;
+ }
+ else if (phiBin > nPhiBins)
+ {
+ phiBin = 0;
+ }
- // r0-r2
- r[ 9] = static_cast<float>(d02[0]);
- r[10] = static_cast<float>(d02[1]);
- r[11] = static_cast<float>(d02[2]);
+ float Z = SP->z();
+ endcap = (std::abs(Z) > 1490);
+ /** z-coordinate sort.
+ * Here, we have a variable bin size.
+ * Use a map to replace 5 levels of nested ternaries
+ * for a somewhat more readable notation while retaining
+ * a logN lookup speed
+ **/
+ int zBin{0};
+ auto bound = ztoBin.lower_bound(Z);
+ /// some protection in case things go REALLY wrong
+ if (bound == ztoBin.end())
+ {
+ --bound; ///< z beyond the max: return last bin
+ }
+ zBin = bound->second;
- // r0
- r[12] = static_cast<float>(e0.first[0])-data.xbeam[0];
- r[13] = static_cast<float>(e0.first[1])-data.ybeam[0];
- r[14] = static_cast<float>(e0.first[2])-data.zbeam[0];
+ /// 2D bin index - computed from the 1D using standard 2D array bin arithmetics
+ int twoDbin = phiBin * arraySizeZ + zBin;
+ /// increment total counter of space points.
+ /// This is not reset between iterations.
+ ++data.nsaz;
+ // push our space point into the 2D binned array
+ data.rfz_Sorted_ITK[twoDbin].push_back(SP);
+ /// the conditional seems to always be true. The rfz_index vector stores
+ /// the 2D bin for each SP in the radius-sorted map. This way,
+ /// we obtain effectively a *3D binning* in r(via the r-sorted vector), phi and z (via the 2D index)
+ if (!data.rfz_map[twoDbin]++)
+ data.rfz_index[data.nrfz++] = twoDbin;
+ }
+ }
+
+ data.state = 0;
+ if(data.iteration){ // PPP
+ data.RTmin = m_binSizeR*firstRadialBin+10. ;
+ data.RTmax = m_binSizeR*lastRadialBin-10.;
+ }else{ //SSS
+ if ( endcap and m_isLRT) {
+ data.RTmin = m_binSizeR*firstRadialBin+10. ;
+ data.RTmax = m_binSizeR*lastRadialBin-10.;
+ }
+ else{
+ data.RTmin = m_binSizeR*firstRadialBin+30. ;
+ data.RTmax = m_binSizeR*lastRadialBin-150.;
+ }
+ }
+
}
-
+
///////////////////////////////////////////////////////////////////
-// Initiate space points seed maker
+/// Initiate space points seed maker for fast tracking
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::fillLists(EventData& data) const
+void InDet::SiSpacePointsSeedMaker_ITK::fillListsFast(const EventContext &ctx, EventData &data) const
{
- constexpr float pi2 = 2.*M_PI;
- std::list<InDet::SiSpacePointForSeedITK*>::iterator r, re;
+ constexpr float twoPi = 2. * M_PI;
+
+ /// Erase any existing entries in the data object
+ erase(data);
+
+ SG::ReadHandle<Trk::PRDtoTrackMap> prd_to_track_map;
+ const Trk::PRDtoTrackMap *prd_to_track_map_cptr = nullptr;
+ if (!m_prdToTrackMap.key().empty())
+ {
+ prd_to_track_map = SG::ReadHandle<Trk::PRDtoTrackMap>(m_prdToTrackMap, ctx);
+ if (!prd_to_track_map.isValid())
+ {
+ ATH_MSG_ERROR("Failed to read PRD to track association map: " << m_prdToTrackMap.key());
+ }
+ prd_to_track_map_cptr = prd_to_track_map.cptr();
+ }
- int ir0 =0;
-
- for (int i=data.r_first; i!=m_r_size; ++i) {
+ /**
+ * The following is done separately for each iteration.
+ * We sort the hits in our radially sorted lists into the
+ * z-phi binning, keeping only those we want to consider to reduce
+ * combinatorics
+ *
+ * Note that the use of r_first to start the loop is what ensures that
+ * the first iteration is a pure SSS pass.
+ * In newEvent, r_first is set to the bin after the last
+ * radial bin containing Pixel space points.
+ * For the second iteration, we reset it to zero and thus start in the pixels.
+ **/
+
+ const std::map<float, int> ztoBin{
+ {-2500., 0},
+ {-1400., 1},
+ {-925., 2},
+ {-450., 3},
+ {-250, 4},
+ {250, 5},
+ {450, 6},
+ {925, 7},
+ {1400, 8},
+ {2500, 9},
+ {100000, 10}, ///< if we encounter Si hits at z > +100m, we are probably not in ATLAS anymore...
+ };
+
+ SG::ReadHandle<SpacePointContainer> spacepoints;
+ if (m_sct)
+ {
+ SG::ReadHandle<SpacePointContainer> spacepointsSCT{m_spacepointsSCT, ctx};
+ spacepoints = spacepointsSCT;
+ }
+ else if (m_pixel)
+ {
+ SG::ReadHandle<SpacePointContainer> spacepointsPixel{m_spacepointsPixel, ctx};
+ spacepoints = spacepointsPixel;
+ }
- if (!data.r_map[i]) continue;
- r = data.r_Sorted_ITK[i].begin();
- re = data.r_Sorted_ITK[i].end();
- if (!ir0) ir0 = i;
+ int nPhiBins = m_pixel ? m_maxPhiBinPPP : m_maxPhiBinSSS;
+ float inverseBinSizePhi = m_pixel ? m_inverseBinSizePhiPPP : m_inverseBinSizePhiSSS;
- if (data.iteration && (*r)->spacepoint->clusterList().second) break;
+ if (spacepoints.isValid())
+ {
+ /// loop over the space points
+ for (const SpacePointCollection *spc : *spacepoints)
+ {
- for (; r!=re; ++r) {
-
- // Azimuthal angle sort
- //
- float F = (*r)->phi();
- if (F<0.) F+=pi2;
+ SpacePointCollection::const_iterator spFirst = spc->begin();
+ float r[15];
+ if (m_pixel)
+ pixInform(*spFirst, r);
+ else if (m_sct)
+ sctInform(data, *spFirst, r);
- int f = static_cast<int>(F*m_sF);
- if (f < 0) f = m_fNmax;
- else if (f > m_fNmax) f = 0;
+ for (const Trk::SpacePoint *sp : *spc)
+ {
- int z;
- float Z = (*r)->z();
+ if (prd_to_track_map_cptr && isUsed(sp, *prd_to_track_map_cptr))
+ continue;
- // Azimuthal angle and Z-coordinate sort
- //
- if (Z>0.) {
- Z< 250.?z=5:Z< 450.?z=6:Z< 925.?z=7:Z< 1400.?z=8:Z< 2500.?z=9:z=10;
- } else {
- Z>-250.?z=5:Z>-450.?z=4:Z>-925.?z=3:Z>-1400.?z=2:Z>-2500.?z=1:z= 0;
- }
+ /** create a SiSpacePointForSeedITK from the space point.
+ * This will also add the point to the l_spforseed list and update
+ * the i_spforseed iterator
+ **/
+ InDet::SiSpacePointForSeedITK *sps = newSpacePoint(data, sp, r);
+ if (!sps)
+ continue;
- int n = f*SizeZ+z;
- ++data.nsaz;
- data.rfz_Sorted_ITK[n].push_back(*r);
- if (!data.rfz_map[n]++) data.rfz_index[data.nrfz++] = n;
-
- if (!data.iteration && (*r)->spacepoint->clusterList().second == 0 && z>=3 && z<=7) {
- z<=4 ? z=0 : z>=6 ? z=2 : z=1;
-
- // Azimuthal angle and Z-coordinate sort for fast vertex search
- //
- f = static_cast<int>(F*m_sFv);
- if (f < 0) f += m_fvNmax;
- else if (f> m_fvNmax) f -= m_fvNmax;
-
- n = f*3+z;
- ++data.nsazv;
- data.rfzv_Sorted_ITK[n].push_back(*r);
- if (!data.rfzv_map[n]++) data.rfzv_index[data.nrfzv++] = n;
+ /// Azimuthal angle sort
+ /// find the bin by dividing phi in 0...2pi by the bin size
+ float Phi = sps->phi();
+ if (Phi < 0.)
+ Phi += twoPi; // phi is defined in [0..2pi] for the binning
+ int phiBin = static_cast<int>(Phi * inverseBinSizePhi);
+ /// handle overflows
+ if (phiBin < 0)
+ {
+ phiBin = nPhiBins;
+ }
+ else if (phiBin > nPhiBins)
+ {
+ phiBin = 0;
+ }
+
+ float Z = sps->z();
+ /** z-coordinate sort.
+ * Here, we have a variable bin size.
+ * Use a map to replace 5 levels of nested ternaries
+ * for a somewhat more readable notation while retaining
+ * a logN lookup speed
+ **/
+ int zBin{0};
+ auto bound = ztoBin.lower_bound(Z);
+ /// some protection in case things go REALLY wrong
+ if (bound == ztoBin.end())
+ {
+ --bound; ///< z beyond the max: return last bin
+ }
+ zBin = bound->second;
+
+ /// 2D bin index - computed from the 1D using standard 2D array bin arithmetics
+ int twoDbin = phiBin * arraySizeZ + zBin;
+ /// increment total counter of space points.
+ /// This is not reset between iterations.
+ ++data.nsaz;
+ // push our space point into the 2D binned array
+ data.rfz_Sorted_ITK[twoDbin].push_back(sps);
+ /// the conditional seems to always be true. The rfz_index vector stores
+ /// the 2D bin for each SP in the radius-sorted map. This way,
+ /// we obtain effectively a *3D binning* in r(via the r-sorted vector), phi and z (via the 2D index)
+ if (!data.rfz_map[twoDbin]++)
+ data.rfz_index[data.nrfz++] = twoDbin;
}
}
}
- data.state = 0;
+
+ // Loop through all RZ collections and sort them in radius order
+ //
+ for (int twoDbin(0); twoDbin != arraySizePhiZ; ++twoDbin)
+ {
+ if (data.rfz_Sorted_ITK[twoDbin].size() > 1)
+ {
+ data.rfz_Sorted_ITK[twoDbin].sort(InDet::SiSpacePointsITKComparison_R());
+ }
+ }
+
+ if(m_pixel){
+ data.RTmin = m_rminPPPFast ;
+ //m_RTmax set per zBin in production3Sp
+ }
+ else if(m_sct){
+ data.RTmin = m_rminSSS ;
+ data.RTmax = m_rmaxSSS ;
+ }
}
-
+
+///////////////////////////////////////////////////////////////////
+// Pixels information
+///////////////////////////////////////////////////////////////////
+
+void InDet::SiSpacePointsSeedMaker_ITK::pixInform(const Trk::SpacePoint *sp, float *r) const
+{
+ const InDet::SiCluster *cl = static_cast<const InDet::SiCluster *>(sp->clusterList().first);
+ const InDetDD::SiDetectorElement *de = cl->detectorElement();
+ const Amg::Transform3D &Tp = de->surface().transform();
+ r[3] = float(Tp(0, 2));
+ r[4] = float(Tp(1, 2));
+ r[5] = float(Tp(2, 2));
+}
+
+///////////////////////////////////////////////////////////////////
+// SCT information
+///////////////////////////////////////////////////////////////////
+
+void InDet::SiSpacePointsSeedMaker_ITK::sctInform(EventData &data, const Trk::SpacePoint *sp, float *r) const
+{
+ const InDet::SiCluster *c0 = static_cast<const InDet::SiCluster *>(sp->clusterList().first);
+ const InDet::SiCluster *c1 = static_cast<const InDet::SiCluster *>(sp->clusterList().second);
+ const InDetDD::SiDetectorElement *d0 = c0->detectorElement();
+ const InDetDD::SiDetectorElement *d1 = c1->detectorElement();
+
+ Amg::Vector2D lc0 = c0->localPosition();
+ Amg::Vector2D lc1 = c1->localPosition();
+
+ std::pair<Amg::Vector3D, Amg::Vector3D> e0 =
+ (d0->endsOfStrip(InDetDD::SiLocalPosition(lc0.y(), lc0.x(), 0.)));
+ std::pair<Amg::Vector3D, Amg::Vector3D> e1 =
+ (d1->endsOfStrip(InDetDD::SiLocalPosition(lc1.y(), lc1.x(), 0.)));
+
+ Amg::Vector3D s0(.5 * (e0.first + e0.second));
+ Amg::Vector3D s1(.5 * (e1.first + e1.second));
+
+ Amg::Vector3D b0(.5 * (e0.second - e0.first));
+ Amg::Vector3D b1(.5 * (e1.second - e1.first));
+ Amg::Vector3D d02(s0 - s1);
+
+ // b0
+ r[3] = float(b0[0]);
+ r[4] = float(b0[1]);
+ r[5] = float(b0[2]);
+
+ // b1
+ r[6] = float(b1[0]);
+ r[7] = float(b1[1]);
+ r[8] = float(b1[2]);
+
+ // r0-r2
+ r[9] = float(d02[0]);
+ r[10] = float(d02[1]);
+ r[11] = float(d02[2]);
+
+ // r0
+ r[12] = float(s0[0]) - data.xbeam[0];
+ r[13] = float(s0[1]) - data.ybeam[0];
+ r[14] = float(s0[2]) - data.zbeam[0];
+}
+
///////////////////////////////////////////////////////////////////
// Erase space point information
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::erase(EventData& data) const
+void InDet::SiSpacePointsSeedMaker_ITK::erase(EventData &data) const
{
- for (int i=0; i<data.nrfz; ++i) {
+ for (int i = 0; i < data.nrfz; ++i)
+ {
int n = data.rfz_index[i];
data.rfz_map[n] = 0;
data.rfz_Sorted_ITK[n].clear();
}
-
- for (int i=0; i<data.nrfzv; ++i) {
+
+ for (int i = 0; i < data.nrfzv; ++i)
+ {
int n = data.rfzv_index[i];
data.rfzv_map[n] = 0;
data.rfzv_Sorted_ITK[n].clear();
}
data.state = 0;
- data.nsaz = 0;
+ data.nsaz = 0;
data.nsazv = 0;
- data.nrfz = 0;
+ data.nrfz = 0;
data.nrfzv = 0;
}
@@ -1093,95 +1748,119 @@ void InDet::SiSpacePointsSeedMaker_ITK::erase(EventData& data) const
// 2 space points seeds production
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::production2Sp(EventData& data) const
+void InDet::SiSpacePointsSeedMaker_ITK::production2Sp(EventData &data) const
{
- if (data.nsazv<2) return;
+ if (data.nsazv < 2)
+ return;
- std::list<InDet::SiSpacePointForSeedITK*>::iterator r0,r0e,r,re;
+ std::list<InDet::SiSpacePointForSeedITK *>::iterator r0, r0e, r, re;
int nseed = 0;
// Loop thorugh all azimuthal regions
//
- for (int f=data.fvNmin; f<=m_fvNmax; ++f) {
+ for (int f = data.fvNmin; f <= m_fvNmax; ++f)
+ {
// For each azimuthal region loop through Z regions
//
int z = 0;
- if (!data.endlist) z = data.zMin;
- for (; z<SizeZV; ++z) {
-
- int a = f*SizeZV+z;
- if (!data.rfzv_map[a]) continue;
- r0 = data.rfzv_Sorted_ITK[a].begin();
- r0e = data.rfzv_Sorted_ITK[a].end ();
-
- if (!data.endlist) {
+ if (!data.endlist)
+ z = data.zMin;
+ for (; z < arraySizeZV; ++z)
+ {
+
+ int a = f * arraySizeZV + z;
+ if (!data.rfzv_map[a])
+ continue;
+ r0 = data.rfzv_Sorted_ITK[a].begin();
+ r0e = data.rfzv_Sorted_ITK[a].end();
+
+ if (!data.endlist)
+ {
r0 = data.rMin_ITK;
data.endlist = true;
}
// Loop through trigger space points
//
- for (; r0!=r0e; ++r0) {
- float X = (*r0)->x();
- float Y = (*r0)->y();
- float R = (*r0)->radius();
- if (R<m_r2minv) continue;
- if (R>m_r2maxv) break;
- float Z = (*r0)->z();
- float ax = X/R;
- float ay = Y/R;
-
- // Bottom links production
- //
- int NB = m_rfzv_n[a];
- for (int i=0; i<NB; ++i) {
- int an = m_rfzv_i[a][i];
- if (!data.rfzv_map[an]) continue;
-
- r = data.rfzv_Sorted_ITK[an].begin();
- re = data.rfzv_Sorted_ITK[an].end ();
-
- for (; r!=re; ++r) {
- float Rb =(*r)->radius();
- if (Rb<m_r1minv) continue;
- if (Rb>m_r1maxv) break;
- float dR = R-Rb;
- if (dR<m_drminv) break;
- if (dR>m_drmax) continue;
- float dZ = Z-(*r)->z();
- float Tz = dZ/dR;
- if (Tz<data.dzdrmin || Tz>data.dzdrmax) continue;
- float Zo = Z-R*Tz;
-
- // Comparison with vertices Z coordinates
- //
- if (!isZCompatible(data, Zo, Rb, Tz)) continue;
-
- // Momentum cut
- //
- float dx =(*r)->x()-X;
- float dy =(*r)->y()-Y;
- float x = dx*ax+dy*ay;
- float y =-dx*ay+dy*ax;
- float xy = x*x+y*y; if (xy == 0.) continue;
- float r2 = 1.f/xy;
- float Ut = x*r2;
- float Vt = y*r2;
- float UR = Ut*R+1.f; if (UR == 0.) continue;
- float A = Vt*R/UR;
- float B = Vt-A*Ut;
- if (std::abs(B*data.K) > m_ipt*sqrt(1.f+A*A)) continue;
+ for (; r0 != r0e; ++r0)
+ {
+ float X = (*r0)->x();
+ float Y = (*r0)->y();
+ float R = (*r0)->radius();
+ if (R < m_r2minv)
+ continue;
+ if (R > m_r2maxv)
+ break;
+ float Z = (*r0)->z();
+ float ax = X / R;
+ float ay = Y / R;
+
+ // Bottom links production
+ //
+ int NB = m_rfzv_n[a];
+ for (int i = 0; i < NB; ++i)
+ {
+ int an = m_rfzv_i[a][i];
+ if (!data.rfzv_map[an])
+ continue;
+
+ r = data.rfzv_Sorted_ITK[an].begin();
+ re = data.rfzv_Sorted_ITK[an].end();
+
+ for (; r != re; ++r)
+ {
+ float Rb = (*r)->radius();
+ if (Rb < m_r1minv)
+ continue;
+ if (Rb > m_r1maxv)
+ break;
+ float dR = R - Rb;
+ if (dR < m_drminv)
+ break;
+ if (dR > m_drmax)
+ continue;
+ float dZ = Z - (*r)->z();
+ float Tz = dZ / dR;
+ if (Tz < data.dzdrmin || Tz > data.dzdrmax)
+ continue;
+ float Zo = Z - R * Tz;
+
+ // Comparison with vertices Z coordinates
+ //
+ if (!isZCompatible(data, Zo, Rb, Tz))
+ continue;
+
+ // Momentum cut
+ //
+ float dx = (*r)->x() - X;
+ float dy = (*r)->y() - Y;
+ float x = dx * ax + dy * ay;
+ float y = -dx * ay + dy * ax;
+ float xy = x * x + y * y;
+ if (xy == 0.)
+ continue;
+ float r2 = 1.f / xy;
+ float Ut = x * r2;
+ float Vt = y * r2;
+ float UR = Ut * R + 1.f;
+ if (UR == 0.)
+ continue;
+ float A = Vt * R / UR;
+ float B = Vt - A * Ut;
+ if (std::abs(B * data.K) > m_ipt * sqrt(1.f + A * A))
+ continue;
++nseed;
- newSeed(data, (*r), (*r0), Zo);
- }
- }
- if (nseed < m_maxsize) continue;
- data.endlist=false;
+ newSeed(data, (*r), (*r0), Zo);
+ }
+ }
+ if (nseed < m_maxsize)
+ continue;
+ data.endlist = false;
data.rMin_ITK = (++r0);
- data.fvNmin=f;
- data.zMin=z;
- return;
+ data.fvNmin = f;
+ data.zMin = z;
+ return;
}
}
}
@@ -1189,686 +1868,1321 @@ void InDet::SiSpacePointsSeedMaker_ITK::production2Sp(EventData& data) const
}
///////////////////////////////////////////////////////////////////
-// Production 3 space points seeds
+// Production 3 space points seeds
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::production3Sp(EventData& data) const
-{
- if (data.nsaz<3) return;
- data.seeds_ITK.clear();
+void InDet::SiSpacePointsSeedMaker_ITK::production3Sp(EventData &data) const
+{
+ /// we need at least 3 SP in our phi-z binning, otherwise can't build 3-SP seeds
+ if (data.nsaz < 3)
+ return;
+
+ /**
+ * This method will run a separate seed formation round
+ * for each phi-Z region, taking the central SP from there
+ * and allowing the top/bottom SP to come from either the same
+ * or certain neighbouring bins.
+ *
+ * The search in each region is performed in the overload of this
+ * method with the extended signature below.
+ * Here, we implement the loop over the 2D regions
+ **/
+
+ /**
+ * Order how we walk across z.
+ * 0-4 are negative z, 5 is central z, 6-10 are positive z.
+ * 0 1 2 3 4 5 6 7 8 9 10 z bin index
+ * --------------------------------------> Z[mm]
+ * Z=-2500 IP,Z=0 Z=+2500
+ **/
+ const std::array<int, arraySizeZ> zBinIndex_SSS{5, 6, 4, 7, 3, 8, 2, 9, 1, 10, 0};
+ const std::array<int, arraySizeZ> zBinIndex_PPP_fast{0, 10, 1, 9, 2, 8, 5, 3, 7, 4, 6};
+ const std::array<int, arraySizeZ> zBinIndex_PPP_long{0, 1, 2, 3, 10, 9, 8, 7, 5, 4, 6};
+ const auto zBinIndex_PPP = m_fastTracking ? zBinIndex_PPP_fast : zBinIndex_PPP_long;
+ // Fast tracking runs a single iteration, either pixel or strip
+ // Default tracking runs a 0-th iteration for strip then a 1-st for pixel
+ bool isPixel = (m_fastTracking && m_pixel) || data.iteration == 1;
+ const auto zBinIndex = isPixel ? zBinIndex_PPP : zBinIndex_SSS;
+
+ const float RTmax[11] = {80., 100., 150., 200., 250., 250., 250., 200., 150., 100., 80.};
+
+ /// prepare arrays to store the iterators over the SP containers for all
+ /// neighbouring cells we wish to consider in the seed formation
+ std::array<std::list<InDet::SiSpacePointForSeedITK *>::iterator, arraySizeNeighbourBins> iter_topCands;
+ std::array<std::list<InDet::SiSpacePointForSeedITK *>::iterator, arraySizeNeighbourBins> iter_endTopCands;
+ std::array<std::list<InDet::SiSpacePointForSeedITK *>::iterator, arraySizeNeighbourBins> iter_bottomCands;
+ std::array<std::list<InDet::SiSpacePointForSeedITK *>::iterator, arraySizeNeighbourBins> iter_endBottomCands;
+
+ int nPhiBins;
+ std::array<int, arraySizePhiZ> nNeighbourCellsBottom;
+ std::array<int, arraySizePhiZ> nNeighbourCellsTop;
+ std::array<std::array<int, arraySizeNeighbourBins>, arraySizePhiZ> neighbourCellsBottom;
+ std::array<std::array<int, arraySizeNeighbourBins>, arraySizePhiZ> neighbourCellsTop;
+
+ if (isPixel)
+ {
+ nPhiBins = m_maxPhiBinPPP;
+ nNeighbourCellsBottom = m_nNeighbourCellsBottomPPP;
+ nNeighbourCellsTop = m_nNeighbourCellsTopPPP;
+ neighbourCellsBottom = m_neighbourCellsBottomPPP;
+ neighbourCellsTop = m_neighbourCellsTopPPP;
+ }
+ else
+ {
+ nPhiBins = m_maxPhiBinSSS;
+ nNeighbourCellsBottom = m_nNeighbourCellsBottomSSS;
+ nNeighbourCellsTop = m_nNeighbourCellsTopSSS;
+ neighbourCellsBottom = m_neighbourCellsBottomSSS;
+ neighbourCellsTop = m_neighbourCellsTopSSS;
+ }
- const int ZI[SizeZ]= {5,6,7,8,9,10,4,3,2,1,0};
- std::list<InDet::SiSpacePointForSeedITK*>::iterator rt[9],rte[9],rb[9],rbe[9];
+ /// counter for the found
int nseed = 0;
+ /// prevent another pass from being run when we run out of Seeds
+ data.endlist = true;
- // Loop thorugh all azimuthal regions
- //
- for (int f=data.fNmin; f<=m_fNmax; ++f) {
-
- // For each azimuthal region loop through all Z regions
- //
- int z = 0;
- if (!data.endlist) z = data.zMin;
-
- for (; z<SizeZ; ++z) {
-
- int a = f *SizeZ+ZI[z];
- if (!data.rfz_map[a]) continue;
- int NB = 0, NT = 0;
- for (int i=0; i<m_rfz_b[a]; ++i) {
- int an = m_rfz_ib[a][i];
- if (!data.rfz_map[an]) continue;
- rb [NB] = data.rfz_Sorted_ITK[an].begin();
- rbe[NB++] = data.rfz_Sorted_ITK[an].end();
- }
- for (int i=0; i<m_rfz_t[a]; ++i) {
- int an = m_rfz_it[a][i];
- if (!data.rfz_map[an]) continue;
- rt [NT] = data.rfz_Sorted_ITK[an].begin();
- rte[NT++] = data.rfz_Sorted_ITK[an].end();
- }
-
- if (data.iteration == 0 && data.iteration0 ==0) production3SpSSS(data, rb, rbe, rt, rte, NB, NT, nseed);
- else production3SpPPP(data, rb, rbe, rt, rte, NB, NT, nseed);
-
- if (!data.endlist) {
- data.fNmin = f;
- data.zMin = z;
- return;
+ /// Loop through all azimuthal regions
+ for (int phiBin = data.fNmin; phiBin <= nPhiBins; ++phiBin)
+ {
+
+ /// For each azimuthal region loop through all Z regions
+ int z = (m_fastTracking && m_pixel) ? 2 : 0;
+ /// If we had to abort a previous run, continue where we left off
+ if (!data.endlist)
+ z = data.zMin;
+
+ /// note that this loop follows the order within 'zBinIndex',
+ /// not the ascending order of z regions. We start in the centre,
+ /// not at -2500 mm, and then move outward.
+ for (; z < arraySizeZ; ++z)
+ {
+
+ if (m_fastTracking && m_pixel)
+ {
+ data.RTmax = RTmax[ zBinIndex[z] ];
}
- }
- }
- data.endlist = true;
-}
-///////////////////////////////////////////////////////////////////
-// Production 3 pixel space points seeds for full scan
-///////////////////////////////////////////////////////////////////
+ int phiZbin = phiBin * arraySizeZ + zBinIndex[z];
-void InDet::SiSpacePointsSeedMaker_ITK::production3SpPPP
-(EventData& data,
- std::list<InDet::SiSpacePointForSeedITK*>::iterator* rb ,
- std::list<InDet::SiSpacePointForSeedITK*>::iterator* rbe,
- std::list<InDet::SiSpacePointForSeedITK*>::iterator* rt ,
- std::list<InDet::SiSpacePointForSeedITK*>::iterator* rte,
- int NB, int NT, int& nseed) const
-{
- std::list<InDet::SiSpacePointForSeedITK*>::iterator r0=rb[0], r;
- if (!data.endlist) {
- r0 = data.rMin_ITK;
- data.endlist = true;
+ /// can skip the rest if this particular 2D bin is empty
+ if (!data.rfz_map[phiZbin])
+ continue;
+
+ /// count how many non-emtpy cells should be searched for the
+ /// top and bottom neighbour
+ int numberBottomCells = 0;
+ int numberTopCells = 0;
+
+ /// walk through the cells in phi-z we wish to consider for the bottom SP search.
+ /// Typically, this will be 3 adjacent phi bins (including the one of the central SP)
+ /// and possibly neighbours in z on side towards the IP or on both sides,
+ /// depdending on the z region we are in
+ for (int neighbourCellNumber = 0; neighbourCellNumber < nNeighbourCellsBottom[phiZbin]; ++neighbourCellNumber)
+ {
+
+ int theNeighbourCell = neighbourCellsBottom[phiZbin][neighbourCellNumber];
+ /// only do something if this cell is populated
+ if (!data.rfz_map[theNeighbourCell])
+ continue;
+ /// plug the begin and end iterators to the SP in the cell into our array
+ iter_bottomCands[numberBottomCells] = data.rfz_Sorted_ITK[theNeighbourCell].begin();
+ iter_endBottomCands[numberBottomCells++] = data.rfz_Sorted_ITK[theNeighbourCell].end();
+ }
+
+ /// walk through the cells in phi-z we wish to consider for the top SP search.
+ /// Typically, this will be 3 adjacent phi bins (including the one of the central SP)
+ /// and possibly neighbours in z on the side opposed to the IP or on both sides,
+ /// depdending on the z region we are in
+ for (int neighbourCellNumber = 0; neighbourCellNumber < nNeighbourCellsTop[phiZbin]; ++neighbourCellNumber)
+ {
+
+ int theNeighbourCell = neighbourCellsTop[phiZbin][neighbourCellNumber];
+ /// only do something if this cell is populated
+ if (!data.rfz_map[theNeighbourCell])
+ continue;
+ /// plug the begin and end iterators to the SP in the cell into our array
+ iter_topCands[numberTopCells] = data.rfz_Sorted_ITK[theNeighbourCell].begin();
+ iter_endTopCands[numberTopCells++] = data.rfz_Sorted_ITK[theNeighbourCell].end();
+ }
+
+ /// now run the seed search for the current phi-z bin.
+ if (!data.trigger)
+ {
+ if (isPixel)
+ production3SpPPP(data, iter_bottomCands, iter_endBottomCands, iter_topCands, iter_endTopCands, numberBottomCells, numberTopCells, nseed);
+ else
+ production3SpSSS(data, iter_bottomCands, iter_endBottomCands, iter_topCands, iter_endTopCands, numberBottomCells, numberTopCells, nseed);
+ }
+ else
+ production3SpTrigger(data, iter_bottomCands, iter_endBottomCands, iter_topCands, iter_endTopCands, numberBottomCells, numberTopCells, nseed);
+ }
+
+ /** If we exceed the seed capacity, we stop here.
+ * Save where we were in z and phi, and set endlist to false.
+ * This will trigger another run of production3Sp when
+ * The client calls next() after processing all vertices seen
+ * so far (freeing up capacity).
+ **/
+ if (nseed >= m_maxsize)
+ {
+ data.endlist = false;
+ data.fNmin = phiBin + 1;
+ return;
+ }
}
+ /// Processed all seeds there are without aborting - no re-run needed!
+ data.endlist = true;
+}
- float ipt2K = data.ipt2K;
- float ipt2C = data.ipt2C;
- float COFK = data.COFK;
- float imaxp = m_diver;
- float imaxs = m_divermax;
+///////////////////////////////////////////////////////////////////
+// Production 3 pixel space points seeds for full scan
+///////////////////////////////////////////////////////////////////
+
+void InDet::SiSpacePointsSeedMaker_ITK::production3SpPPP(EventData &data,
+ std::array<std::list<InDet::SiSpacePointForSeedITK *>::iterator, arraySizeNeighbourBins> &iter_bottomCands,
+ std::array<std::list<InDet::SiSpacePointForSeedITK *>::iterator, arraySizeNeighbourBins> &iter_endBottomCands,
+ std::array<std::list<InDet::SiSpacePointForSeedITK *>::iterator, arraySizeNeighbourBins> &iter_topCands,
+ std::array<std::list<InDet::SiSpacePointForSeedITK *>::iterator, arraySizeNeighbourBins> &iter_endTopCands,
+ const int numberBottomCells, const int numberTopCells, int &nseed) const
+{
+ /**
+ * This method implements the seed search for a single phi-Z region of the detector.
+ * The central SP is taken from the region, while the top and bottom SP are allowed
+ * to come from either the same or a range of neighbouring cells.
+ **/
+
+ /// iterator across the candidates for the central space point.
+ std::list<InDet::SiSpacePointForSeedITK *>::iterator iter_centralSP = iter_bottomCands[0];
+ std::list<InDet::SiSpacePointForSeedITK *>::iterator iter_otherSP; ///< will be used for iterating over top/bottom SP
+
+ /**
+ * Next, we work out where we are within the ATLAS geometry.
+ * This will help us identify which space-points we need to
+ * consider as potential central points of a seed.
+ **/
+
+ /// find the first central SP candidate above the minimum radius.
+ for (; iter_centralSP != iter_endBottomCands[0]; ++iter_centralSP)
+ {
+ if((*iter_centralSP)->radius() > data.RTmin) break;
+ }
+ /// for the top candidates in the central phi-Z bin, we do not need to start at a smaller
+ /// radius than the lowest-r valid central SP candidate
+ iter_topCands[0] = iter_centralSP;
+ ++iter_topCands[0];
+
+ /// prepare cut values
+ const float &ipt2K = data.ipt2K;
+ const float &ipt2C = data.ipt2C;
+ const float &COFK = data.COFK;
+ const float &maxd0cut = m_maxdImpact;
+ const float &zmax = data.zmaxU;
+ const float &dzdrmax = data.dzdrmax;
data.CmSp_ITK.clear();
- // Loop through all trigger space points
- //
- for (; r0!=rbe[0]; ++r0) {
+ /// keep track of the SP storace capacity.
+ /// Extend it needed (should rarely be the case)
+ size_t SPcapacity = data.SP_ITK.size();
- data.nOneSeeds = 0;
- data.mapOneSeeds_ITK.clear();
+ /// Loop through all central space point candidates
+ for (; iter_centralSP != iter_endBottomCands[0]; ++iter_centralSP)
+ {
- float R = (*r0)->radius();
+ const float &R = (*iter_centralSP)->radius();
+
+ if(R > data.RTmax) break; ///< stop if we have moved outside our radial region of interest.
+
+ /// global coordinates of the central SP
+ const float &X = (*iter_centralSP)->x();
+ const float &Y = (*iter_centralSP)->y();
+ const float &Z = (*iter_centralSP)->z();
+
+ /// for the central SP, we veto locations on the last disk -
+ /// there would be no "outer" hits to complete a seed.
+ double absZ = std::abs(Z);
+ if (!m_fastTracking && absZ > m_zmaxPPP)
+ continue;
+
+ float covr0 = (*iter_centralSP)->covr();
+ float covz0 = (*iter_centralSP)->covz();
+ float ax = X / R;
+ float ay = Y / R;
+ float VR = maxd0cut / (R * R);
+ size_t Ntm = 2;
+ if (R > m_rmaxPPP)
+ Ntm = 1;
+
+ /// initialise a counter for found bottom links
+ /// This also serves as an index in the data.SP vector
+ size_t Nt = 0;
+
+ /// Top links production
+ /// Loop over all the cells where we expect to find such SP
+ for (int cell = 0; cell < numberTopCells; ++cell)
+ {
+
+ if (iter_otherSP == iter_endTopCands[cell])
+ continue;
+
+ /// loop over each SP in each cell
+ for (iter_otherSP = iter_topCands[cell]; iter_otherSP != iter_endTopCands[cell]; ++iter_otherSP)
+ {
+
+ /// evaluate the radial distance,
+ float Rt = (*iter_otherSP)->radius();
+ float dR = Rt - R;
+ /// and continue if we are too close
+ if (dR < m_drminPPP)
+ {
+ iter_topCands[cell] = iter_otherSP;
+ continue;
+ }
- const Trk::Surface* sur0 = (*r0)->sur();
- const Trk::Surface* surn = (*r0)->sun();
- float X = (*r0)->x();
- float Y = (*r0)->y();
- float Z = (*r0)->z();
- int Nb = 0;
+ /// if we are too far, the next ones will be even farther, so abort
+ if (!m_fastTracking && dR > m_drmaxPPP)
+ break;
- // Bottom links production
- //
- for (int i=0; i<NB; ++i) {
- for (r=rb[i]; r!=rbe[i]; ++r) {
- float Rb =(*r)->radius();
- float dR = R-Rb;
+ const float dz = (*iter_otherSP)->z() - Z;
+ const float dZdR = dz / dR;
+ /// Comparison with vertices Z coordinates
+ /// straight line extrapolation to r=0
+ const float z0 = Z - R * dZdR;
+ if (std::abs(z0) > zmax)
+ continue;
+
+ float dx = (*iter_otherSP)->x() - X;
+ float dy = (*iter_otherSP)->y() - Y;
+ float x = dx * ax + dy * ay;
+ float y = dy * ax - dx * ay;
+ float dxy = x * x + y * y;
+ float r2 = 1. / dxy;
+ float u = x * r2;
+ float v = y * r2;
+
+ if (std::abs(R * y) > maxd0cut * x)
+ {
+ float V0;
+ y < 0. ? V0 = VR : V0 = -VR;
+ float A = (v - V0) / (u + 1. / R);
+ float B = V0 + A / R;
+ if ((B * B) > (ipt2K * (1. + A * A)))
+ continue;
+ }
- if (dR > m_drmax) {
- rb[i]=r;
+ const float dr = std::sqrt(r2);
+ const float tz = dz * dr;
+ /// this is effectively a segment-level eta cut - exclude too shallow seed segments
+ if (std::abs(tz) > dzdrmax)
continue;
+
+ /// add SP to the list
+ data.SP_ITK[Nt] = (*iter_otherSP);
+ data.R[Nt] = dr; ///< inverse distance to central SP
+ data.U[Nt] = u; ///< transformed U coordinate
+ data.V[Nt] = v; ///< transformed V coordinate
+ data.Er[Nt] = ((covz0 + (*iter_otherSP)->covz()) + (tz * tz) * (covr0 + (*iter_otherSP)->covr())) * r2; ///<squared Error on 1/tan theta coming from the space-point position errors
+ data.SP_ITK[Nt]->setDR(std::sqrt(dxy + dz * dz));
+ data.SP_ITK[Nt]->setDZDR(dZdR);
+ data.Tn[Nt].Fl = tz;
+ data.Tn[Nt].In = Nt;
+
+ /// if we are exceeding the SP capacity of our data object,
+ /// make it resize its vectors. Will add 50 slots by default,
+ /// so rarely should happen more than once per event.
+ if (++Nt == SPcapacity)
+ {
+ data.resizeSPCont();
+ SPcapacity = data.SP_ITK.size();
}
- if (dR < m_drmin) break;
- if ((*r)->sur()==sur0 || (surn && surn==(*r)->sun())) continue;
-
- float Tz = (Z-(*r)->z())/dR, aTz =std::abs(Tz);
-
- if (aTz < data.dzdrmin || aTz > data.dzdrmax) continue;
-
- // Comparison with vertices Z coordinates
- //
- float Zo = Z-R*Tz;
- if (!isZCompatible(data, Zo, Rb, Tz)) continue;
- data.SP_ITK[Nb] = (*r);
- if (++Nb==m_maxsizeSP) goto breakb;
- }
- }
- breakb:
- if (!Nb || Nb==m_maxsizeSP) continue;
- int Nt = Nb;
-
- // Top links production
- //
- for (int i=0; i<NT; ++i) {
- for (r=rt[i]; r!=rte[i]; ++r) {
- float Rt =(*r)->radius();
- float dR = Rt-R;
-
- if (dR<m_drmin) {
- rt[i]=r;
+ } ///< end of loop over SP within top candidate cell
+ } ///< end of loop over top candidate cells
+
+ if (Nt < Ntm)
+ continue;
+
+ /// now continue with the bottom SP search.
+ /// Make the counter start at Nt, as this serves as a running
+ /// index in the SP list for this seed.
+ size_t Nb = Nt;
+
+ /// Bottom links production
+ /// Loop over all the cells where we expect to find such SP
+ for (int cell = 0; cell < numberBottomCells; ++cell)
+ {
+ /// in each cell, loop over the space points
+ for (iter_otherSP = iter_bottomCands[cell]; iter_otherSP != iter_endBottomCands[cell]; ++iter_otherSP)
+ {
+
+ /// evaluate the radial distance between the central and bottom SP
+ const float &Rb = (*iter_otherSP)->radius();
+ float dR = R - Rb;
+
+ /// if the bottom SP is too far, remember this for future iterations and
+ /// don't bother starting from the beginning again
+ if (dR > m_drmaxPPP)
+ {
+ iter_bottomCands[cell] = iter_otherSP;
continue;
}
- if (dR>m_drmax) break;
+ /// if the points are too close in r, abort (future ones will be even closer).
+ if (dR < m_drminPPP)
+ break;
- if ( (*r)->sur()==sur0 || (surn && surn==(*r)->sun())) continue;
+ const float dz = Z - (*iter_otherSP)->z();
+ const float dZdR = dz / dR;
+ /// Comparison with vertices Z coordinates
+ /// straight line extrapolation to r=0
+ const float z0 = Z - R * dZdR;
+ if (std::abs(z0) > zmax)
+ continue;
- float Tz = ((*r)->z()-Z)/dR, aTz =std::abs(Tz);
+ float dx = (*iter_otherSP)->x() - X;
+ float dy = (*iter_otherSP)->y() - Y;
+ float x = dx * ax + dy * ay;
+ float y = dy * ax - dx * ay;
+ float dxy = x * x + y * y;
+ float r2 = 1. / dxy;
+ float u = x * r2;
+ float v = y * r2;
+
+ if (std::abs(R * y) > -maxd0cut * x)
+ {
+ float V0;
+ y > 0. ? V0 = VR : V0 = -VR;
+ float A = (v - V0) / (u + 1. / R);
+ float B = V0 + A / R;
+ if ((B * B) > (ipt2K * (1. + A * A)))
+ continue;
+ }
- if (aTz < data.dzdrmin || aTz > data.dzdrmax) continue;
+ const float dr = std::sqrt(r2);
+ const float tz = dz * dr;
+ /// this is effectively a segment-level eta cut - exclude too shallow seed segments
+ if (std::abs(tz) > dzdrmax)
+ continue;
+ if (m_fastTracking && (*iter_otherSP)->radius() < 50. && std::abs(tz) > 1.5)
+ continue;
- // Comparison with vertices Z coordinates
- //
- float Zo = Z-R*Tz;
- if (!isZCompatible(data, Zo, R, Tz)) continue;
- data.SP_ITK[Nt] = (*r);
- if (++Nt==m_maxsizeSP) goto breakt;
- }
- }
-
- breakt:
- if (!(Nt-Nb)) continue;
- float covr0 = (*r0)->covr ();
- float covz0 = (*r0)->covz ();
- float ax = X/R;
- float ay = Y/R;
-
- for (int i=0; i<Nt; ++i) {
- InDet::SiSpacePointForSeedITK* sp = data.SP_ITK[i];
-
- float dx = sp->x()-X;
- float dy = sp->y()-Y;
- float dz = sp->z()-Z;
- float x = dx*ax+dy*ay;
- float y = dy*ax-dx*ay;
- float r2 = 1.f/(x*x+y*y);
- float dr = std::sqrt(r2);
- float tz = dz*dr;
- if (i < Nb) tz = -tz;
-
- data.Tz[i] = tz;
- data.Zo[i] = Z-R*tz;
- data.R [i] = dr;
- data.U [i] = x*r2;
- data.V [i] = y*r2;
- data.Er[i] = ((covz0+sp->covz())+(tz*tz)*(covr0+sp->covr()))*r2;
- }
- covr0 *= .5;
- covz0 *= 2.;
-
- // Three space points comparison
- //
- for (int b=0; b<Nb; ++b) {
- float Zob = data.Zo[b];
- float Tzb = data.Tz[b];
- float Rb2r = data.R [b]*covr0;
- float Rb2z = data.R [b]*covz0;
- float Erb = data.Er[b];
- float Vb = data.V [b];
- float Ub = data.U [b];
- float Tzb2 = (1.f+Tzb*Tzb);
- float sTzb2 = std::sqrt(Tzb2);
- float CSA = Tzb2*COFK;
- float ICSA = Tzb2*ipt2C;
- float imax = imaxp;
- if (data.SP_ITK[b]->spacepoint->clusterList().second) imax = imaxs;
-
- for (int t=Nb; t<Nt; ++t) {
- float dT = ((Tzb-data.Tz[t])*(Tzb-data.Tz[t])-data.R[t]*Rb2z-(Erb+data.Er[t]))-(data.R[t]*Rb2r)*((Tzb+data.Tz[t])*(Tzb+data.Tz[t]));
- if (dT > ICSA) continue;
-
- float dU = data.U[t]-Ub;
- if (dU == 0.) continue;
- float A = (data.V[t]-Vb)/dU;
- float S2 = 1.f+A*A;
- float B = Vb-A*Ub;
- float B2 = B*B;
- if (B2 > ipt2K*S2 || dT*S2 > B2*CSA) continue;
-
- float Im = std::abs((A-B*R)*R);
-
- if (Im <= imax) {
- float dr = data.R[b];
- if (data.R[t] < data.R[b]) dr = data.R[t];
- Im+=std::abs((Tzb-data.Tz[t])/(dr*sTzb2));
- data.CmSp_ITK.emplace_back(std::make_pair(B/std::sqrt(S2), data.SP_ITK[t]));
- data.SP_ITK[t]->setParam(Im);
- }
- }
- if (!data.CmSp_ITK.empty()) {
- newOneSeedWithCurvaturesComparison(data, data.SP_ITK[b], (*r0), Zob);
+ /// add SP to the list
+ data.SP_ITK[Nb] = (*iter_otherSP);
+ data.R[Nb] = dr; ///< inverse distance to central SP
+ data.U[Nb] = u; ///< transformed U coordinate
+ data.V[Nb] = v; ///< transformed V coordinate
+ data.Er[Nb] = ((covz0 + (*iter_otherSP)->covz()) + (tz * tz) * (covr0 + (*iter_otherSP)->covr())) * r2; ///<squared Error on 1/tan theta coming from the space-point position errors
+ data.SP_ITK[Nb]->setDR(std::sqrt(dxy + dz * dz));
+ data.SP_ITK[Nb]->setDZDR(dZdR);
+ data.Tn[Nb].Fl = tz;
+ data.Tn[Nb].In = Nb;
+
+ /// if we are exceeding the SP capacity of our data object,
+ /// make it resize its vectors. Will add 50 slots by default,
+ /// so rarely should happen more than once per event.
+ if (++Nb == SPcapacity)
+ {
+ data.resizeSPCont();
+ SPcapacity = data.SP_ITK.size();
+ }
+
+ } ///< end of loop over SP in bottom candidate cell
+ } ///< end of loop over bottom candidate cells
+
+ /// if we found no bottom candidates (remember, Nb starts counting at Nt), abort
+ if (!(Nb - Nt))
+ continue;
+
+ sort(data.Tn,0,Nt);
+ sort(data.Tn,Nt,Nb-Nt);
+
+ data.nOneSeeds = 0;
+ data.mapOneSeeds_ITK.clear();
+
+ /// Three space points comparison
+ /// first, loop over the bottom point candidates
+ size_t it0 = 0;
+ for (size_t ib = Nt; ib < Nb; ++ib)
+ {
+
+ if (it0 == Nt)
+ break;
+
+ /// retrieve the geometrical paranmeters w.r.t the central SP for this candidate
+ float Tzb = data.Tn[ib].Fl; ///< 1/tanTheta estimate from central+bottom SP
+ int b = data.Tn[ib].In; /// bottom seed index after sorting
+
+ float Rb2r = data.R[b] * covr0;
+ float Rb2z = data.R[b] * covz0;
+ float Erb = data.Er[b]; ///< this is the uncertainty in 1/tanTheta on the bottom segment resulting from the position errors in the 2 SP
+ float Vb = data.V[b]; ///< v-coordinate of bottom SP
+ float Ub = data.U[b]; ///< u-coordinate of bottom SP
+ float Tzb2 = (1. + Tzb * Tzb); ///< 1+1/tan²theta - converts transverse to total squared pt
+ float sTzb2 = std::sqrt(Tzb2); ///< sqrt (1+1/tan²theta) - used to convert pt to |p|
+
+ float sigmaSquaredScatteringPtDependent = Tzb2 * COFK; ///< this, when divided by the 2R², yields an approximated multiple scattering term assuming the measured pt.
+ float sigmaSquaredScatteringMinPt = Tzb2 * ipt2C; ///< this is an approximate worst case multiple scattering term assuming the lowest
+ /// pt we allow and the estimated theta angle
+ /// max IP
+ float d0max = maxd0cut;
+
+ size_t Nc = 1;
+ if (data.SP_ITK[b]->radius() > m_rmaxPPP)
+ Nc = 0;
+ if (data.nOneSeeds)
+ ++Nc;
+
+ /// inner loop over the top point candidates
+ for (size_t it = it0; it < Nt; ++it)
+ {
+
+ int t = data.Tn[it].In; // index of top seed after sorting
+ float Tzt = data.Tn[it].Fl;
+
+ /// Apply a cut on the compatibility between the r-z slope of the two seed segments.
+ /// This is done by comparing the squared difference between slopes, and comparing
+ /// to the squared uncertainty in this difference - we keep a seed if the difference
+ /// is compatible within the assumed uncertainties.
+
+ /// average value of 1/tan(theta), approximate the slope at the location of the central space point
+ float meanOneOverTanThetaSquare = Tzb * Tzt; // SSS uses arithmetic average, PPP geometric average
+
+ /// squared error on the difference in tan(theta) due to space point position errors.
+ float sigmaSquaredSpacePointErrors = Erb + data.Er[t] /// pre-computed individual squared errors on 1/tan(theta) for the two segments
+ + 2 * Rb2z * data.R[t] /// mixed term with z-uncertainty on central SP
+ + 2 * Rb2r * data.R[t] * meanOneOverTanThetaSquare; // mixed term with r-uncertainy on central SP
+
+ /// start out by subtracting from the squared difference in 1/tanTheta the space-point-related squared error
+ float remainingSquaredDelta = (Tzb - Tzt) * (Tzb - Tzt) - sigmaSquaredSpacePointErrors;
+
+ /// First, we test using a generous scattering term calculated assuming the minimum pt we expect
+ /// to reconstruct.
+ if (remainingSquaredDelta - sigmaSquaredScatteringMinPt > 0)
+ {
+ if (Tzb - Tzt < 0.)
+ break;
+ it0 = it + 1;
+ continue;
+ }
+
+ /**
+ * The following exploits the transformation u:=x/(x²+y²); v:=y/(x²+y²);
+ * This is applied on the x,y coordinates in the frame described above, where the
+ * origin is put in the central SP and the x axis defined to point directly away from the IP.
+ *
+ * In this transformed u,v frame, what would be our circle in x-y space takes the form of
+ * a linear function V = (-x0/y0) x U + 1/(2y0) =: A x U + B/2.
+ * Here, x0 and y0 describe the center point of the circle in the x-y frame.
+ * As the origin of the x-y frame (the middle space point of our seed) is on the circle,
+ * we have x0²+y0²=R² with circle radius R.
+ *
+ * For our seed, we can experimentally obtain A as the slope of the linear function,
+ * delta V / delta U,
+ * estimated using the delta U and delta V between the top and bottom space point.
+ *
+ * B is then obtained by inserting the obtained A into the
+ * linear equation for the bottom SP, A x U + B/2 = V --> B = 2(V - A x U0
+ *
+ * With x0²+y0²=R², and x0=-A/B and y0=1/B, the radius of the circle is
+ * then obtained as R²=(1+A²)/B².
+ **/
+
+ float dU = data.U[t] - Ub;
+ if (dU == 0.)
+ continue;
+ float A = (data.V[t] - Vb) / dU;
+ float onePlusAsquare = 1. + A * A;
+ float B = Vb - A * Ub;
+ float BSquare = B * B;
+
+ /** With this radius (and pT) estimate, we can apply our pt cut.
+ * Reminder, ipt2K is 1 / (K x 0.9 x pt-cut)², where K translates pt into 2R.
+ * So here we can apply the pt cut directly on the (2R)² estimate without
+ * the extra overhead of conversion / division.
+ * The second check is a refinement of the above Tz compatibility cut,
+ * replacing the sigmaSquaredScatteringMinPt scattering contribution which assumes the lowest pt
+ * by one based on the actual estimated pt.
+ *
+ * The second term in this if-statement applies a second version of the
+ * 1/tan(theta) compatibility, this time using a scattering term scaled by the actual measured
+ * pt. This refines the cut applied above, following the same logic ("delta² - sigma² ?<=0")
+ **/
+ if (BSquare > ipt2K * onePlusAsquare)
+ continue;
+ if (remainingSquaredDelta * onePlusAsquare > BSquare * sigmaSquaredScatteringPtDependent)
+ {
+ if (Tzb - Tzt < 0.)
+ break;
+ it0 = it + 1;
+ continue;
+ }
+
+ /** This is an estimate of the transverse impact parameter.
+ * The reasoning is that, in the x-y frame with the central SP as origin and
+ * the x axis pointing away from the IP, we have for the distance between
+ * the IP and the middle of the circle:
+ * (x0 - r_central)²+y0² = (R + d0)²,
+ * with R being the circle radius and r_central
+ * the radial location of the central SP, placing the IP at IP at (-r_central, 0).
+ *
+ * First simplify using R² =x0²+y0², then apply the approximation d0²/R² ~ 0.
+ *
+ * Finally, consider that locally close to the central SP, the circle is parallel to the x axis,
+ * so A = 0 --> expand (2R)²=(1+A²)/B² around this point to obtain
+ * d0 = r_central x (r_central x B - A).
+ * Note that below, the variable R is the radial coordinate fo the central SP,
+ * corresponding to r_central in the notation above.
+ **/
+ float d0 = std::abs((A - B * R) * R);
+
+ /// apply d0 cut to seed
+ if (d0 <= d0max)
+ {
+ /// evaluate distance the two closest-by SP in this seed candidate
+ float dr = data.R[b];
+ if (data.R[t] < data.R[b])
+ dr = data.R[t];
+ /// obtain a quality score - start from the d0 estimate, and add
+ /// a penalty term corresponding to how far the seed segments
+ /// deviate from a straight line in r-z
+ data.SP_ITK[t]->setScorePenalty(std::abs((Tzb - Tzt) / (dr * sTzb2)));
+ data.SP_ITK[t]->setParam(d0);
+
+ float meanOneOverTanTheta = std::sqrt(meanOneOverTanThetaSquare);
+ if (meanOneOverTanTheta < 1e-8)
+ meanOneOverTanTheta = 1e-8;
+ if (BSquare < 1e-8)
+ BSquare = 1e-8;
+ float theta = std::atan(1. / std::sqrt(meanOneOverTanThetaSquare));
+ data.SP_ITK[t]->setEta(-std::log(std::tan(0.5 * theta)));
+ data.SP_ITK[t]->setPt(std::sqrt(onePlusAsquare / BSquare) / (1000 * data.K));
+
+ /// record one possible seed candidate, sort by the curvature
+ data.CmSp_ITK.emplace_back(std::make_pair(B / std::sqrt(onePlusAsquare), data.SP_ITK[t]));
+ /// store the transverse IP, will later be used as a quality estimator
+ if (data.CmSp_ITK.size() == 500)
+ break;
+ }
+
+ } ///< end loop over top space point candidates
+ /// now apply further cleaning on the seed candidates for this central+bottom pair.
+ if (data.CmSp_ITK.size() > Nc)
+ {
+ newOneSeedWithCurvaturesComparisonPPP(data, data.SP_ITK[b], (*iter_centralSP), Z - R * Tzb);
}
- }
+ data.CmSp_ITK.clear(); /// cleared in newOneSeedWithCurvaturesComparisonPPP but need to also be cleared in case previous conditional statement isn't fulfilled
+ } ///< end loop over bottom space points
+ ///record seeds found in this run
fillSeeds(data);
nseed += data.fillOneSeeds;
- if (nseed>=m_maxsize) {
- data.endlist=false;
- ++r0;
- data.rMin_ITK = r0;
- return;
- }
- }
+
+ } ///< end loop over central SP
}
///////////////////////////////////////////////////////////////////
-// Production 3 SCT space points seeds for full scan
+/// Production 3 space points seeds for full scan
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::production3SpSSS
-(EventData& data,
- std::list<InDet::SiSpacePointForSeedITK*>::iterator* rb ,
- std::list<InDet::SiSpacePointForSeedITK*>::iterator* rbe,
- std::list<InDet::SiSpacePointForSeedITK*>::iterator* rt ,
- std::list<InDet::SiSpacePointForSeedITK*>::iterator* rte,
- int NB, int NT, int& nseed) const
+void InDet::SiSpacePointsSeedMaker_ITK::production3SpSSS(EventData &data,
+ std::array<std::list<InDet::SiSpacePointForSeedITK *>::iterator, arraySizeNeighbourBins> &iter_bottomCands,
+ std::array<std::list<InDet::SiSpacePointForSeedITK *>::iterator, arraySizeNeighbourBins> &iter_endBottomCands,
+ std::array<std::list<InDet::SiSpacePointForSeedITK *>::iterator, arraySizeNeighbourBins> &iter_topCands,
+ std::array<std::list<InDet::SiSpacePointForSeedITK *>::iterator, arraySizeNeighbourBins> &iter_endTopCands,
+ const int numberBottomCells, const int numberTopCells, int &nseed) const
{
- std::list<InDet::SiSpacePointForSeedITK*>::iterator r0=rb[0], r;
- if (!data.endlist) {
- r0 = data.rMin_ITK;
- data.endlist = true;
- }
- float ipt2K = data.ipt2K;
- float ipt2C = data.ipt2C;
- float COFK = data.COFK;
- float imaxs = m_divermax;
+ /**
+ * This method implements the seed search for a single phi-Z region of the detector.
+ * The central SP is taken from the region, while the top and bottom SP are allowed
+ * to come from either the same or a range of neighbouring cells.
+ **/
+
+ /// iterator across the candidates for the central space point.
+ std::list<InDet::SiSpacePointForSeedITK *>::iterator iter_centralSP = iter_bottomCands[0];
+ std::list<InDet::SiSpacePointForSeedITK *>::iterator iter_otherSP; ///< will be used for iterating over top/bottom SP
+
+ /**
+ * Next, we work out where we are within the ATLAS geometry.
+ * This will help us identify which space-points we need to
+ * consider as potential central points of a seed.
+ **/
+
+ /// find the first central SP candidate above the minimum radius.
+ for (; iter_centralSP != iter_endBottomCands[0]; ++iter_centralSP)
+ {
+ if((*iter_centralSP)->radius() > data.RTmin) break;
+ }
+ /// for the top candidates in the central phi-Z bin, we do not need to start at a smaller
+ /// radius than the lowest-r valid central SP candidate
+ iter_topCands[0] = iter_centralSP;
+ ++iter_topCands[0];
+
+ /// prepare cut values
+ const float &ipt2K = data.ipt2K;
+ const float &ipt2C = data.ipt2C;
+ const float &COFK = data.COFK;
+ const float &maxd0cut = m_maxdImpactSSS;
+ const float &zmax = data.zmaxU;
data.CmSp_ITK.clear();
- // Loop through all trigger space points
- //
- for (; r0!=rbe[0]; ++r0) {
- data.nOneSeeds = 0;
- data.mapOneSeeds_ITK.clear();
+ /// keep track of the SP storace capacity.
+ /// Extend it needed (should rarely be the case)
+ size_t SPcapacity = data.SP_ITK.size();
- float R = (*r0)->radius();
+ /// Loop through all central space point candidates
+ for (; iter_centralSP != iter_endBottomCands[0]; ++iter_centralSP)
+ {
+
+ const float &R = (*iter_centralSP)->radius();
+
+ if(R > data.RTmax) break; ///< stop if we have moved outside our radial region of interest.
+
+ /// global coordinates of the central SP
+ const float &X = (*iter_centralSP)->x();
+ const float &Y = (*iter_centralSP)->y();
+ const float &Z = (*iter_centralSP)->z();
+
+ /// for the central SP, we veto locations on the last disk -
+ /// there would be no "outer" hits to complete a seed.
+ double absZ = std::abs(Z);
+ /// veto the last strip disk
+ if (absZ > m_zmaxSSS)
+ continue;
+
+ /// initialise a counter for found bottom links
+ /// This also serves as an index in the data.SP vector
+ size_t Nt = 0;
+
+ /// Top links production
+ /// Loop over all the cells where we expect to find such SP
+ for (int cell = 0; cell < numberTopCells; ++cell)
+ {
+
+ if (iter_otherSP == iter_endTopCands[cell])
+ continue;
+
+ for (iter_otherSP = iter_topCands[cell]; iter_otherSP != iter_endTopCands[cell]; ++iter_otherSP)
+ {
+ /// evaluate the radial distance,
+ float Rt = (*iter_otherSP)->radius();
+ float dR = Rt - R;
+ if (dR >= m_drminSSS)
+ break;
+ }
+ iter_topCands[cell] = iter_otherSP;
- const Trk::Surface* sur0 = (*r0)->sur();
- const Trk::Surface* surn = (*r0)->sun();
- float X = (*r0)->x();
- float Y = (*r0)->y();
- float Z = (*r0)->z();
- int Nb = 0;
+ /// loop over each SP in each cell
+ for (iter_otherSP = iter_topCands[cell]; iter_otherSP != iter_endTopCands[cell]; ++iter_otherSP)
+ {
- // Bottom links production
- //
- for (int i=0; i<NB; ++i) {
- for (r=rb[i]; r!=rbe[i]; ++r) {
- float Rb =(*r)->radius();
- float dR = R-Rb;
- if (dR > m_drmax) {
- rb[i]=r;
+ /// evaluate the radial distance,
+ float Rt = (*iter_otherSP)->radius();
+ float dR = Rt - R;
+ /// if we are to far, the next ones will be even farther, so abort
+ if (dR > m_drmaxSSS)
+ break;
+
+ const float dz = (*iter_otherSP)->z() - Z;
+ const float dZdR = dz / dR;
+
+ /// Comparison with vertices Z coordinates
+ /// straight line extrapolation to r=0
+ const float z0 = Z - R * dZdR;
+ if (std::abs(dz) > m_dzmaxSSS || std::abs(z0) > zmax)
continue;
+
+ /// add SP to the list
+ data.SP_ITK[Nt] = (*iter_otherSP);
+ data.SP_ITK[Nt]->setDZDR(dZdR);
+ /// if we are exceeding the SP capacity of our data object,
+ /// make it resize its vectors. Will add 50 slots by default,
+ /// so rarely should happen more than once per event.
+ if (++Nt == SPcapacity)
+ {
+ data.resizeSPCont();
+ SPcapacity = data.SP_ITK.size();
}
- if (dR < m_drmin) break;
- if ((*r)->sur()==sur0 || (surn && surn==(*r)->sun())) continue;
- float Tz = (Z-(*r)->z())/dR;
- float aTz =std::abs(Tz);
- if (aTz < data.dzdrmin || aTz > data.dzdrmax) continue;
-
- // Comparison with vertices Z coordinates
- //
- float Zo = Z-R*Tz;
- if (!isZCompatible(data, Zo, Rb, Tz)) continue;
- data.SP_ITK[Nb] = (*r);
- if (++Nb==m_maxsizeSP) goto breakb;
- }
- }
- breakb:
- if (!Nb || Nb==m_maxsizeSP) continue;
- int Nt = Nb;
-
- // Top links production
- //
- for (int i=0; i<NT; ++i) {
- for (r=rt[i]; r!=rte[i]; ++r) {
- float Rt =(*r)->radius();
- float dR = Rt-R;
-
- if (dR<m_drmin) {
- rt[i]=r;
+ } ///< end of loop over SP within top candidate cell
+ } ///< end of loop over top candidate cells
+
+ /// if we did not find ANY top SP, or if we exceed the storage capacity, we abort this seed candidate.
+ if (!Nt)
+ continue;
+
+ /// now continue with the bottom SP search.
+ /// Make the counter start at Nt, as this serves as a running
+ /// index in the SP list for this seed.
+ size_t Nb = Nt;
+
+ /// Bottom links production
+ /// Loop over all the cells where we expect to find such SP
+ for (int cell = 0; cell < numberBottomCells; ++cell)
+ {
+ /// in each cell, loop over the space points
+ for (iter_otherSP = iter_bottomCands[cell]; iter_otherSP != iter_endBottomCands[cell]; ++iter_otherSP)
+ {
+
+ /// evaluate the radial distance between the central and bottom SP
+ const float &Rb = (*iter_otherSP)->radius();
+ float dR = R - Rb;
+
+ /// if the bottom SP is too far, remember this for future iterations and
+ /// don't bother starting from the beginning again
+ if (dR > m_drmaxSSS)
+ {
+ iter_bottomCands[cell] = iter_otherSP;
continue;
}
- if (dR>m_drmax) break;
-
- if ((*r)->sur()==sur0 || (surn && surn==(*r)->sun())) continue;
- float Tz = ((*r)->z()-Z)/dR;
- float aTz = std::abs(Tz);
- if (aTz < data.dzdrmin || aTz > data.dzdrmax) continue;
-
- // Comparison with vertices Z coordinates
- //
- float Zo = Z-R*Tz;
- if (!isZCompatible(data, Zo, R, Tz)) continue;
- data.SP_ITK[Nt] = (*r);
- if (++Nt==m_maxsizeSP) goto breakt;
- }
- }
-
- breakt:
- if (!(Nt-Nb)) continue;
- float covr0 = (*r0)->covr();
- float covz0 = (*r0)->covz();
- float ax = X/R;
- float ay = Y/R;
-
- for (int i=0; i<Nt; ++i) {
- InDet::SiSpacePointForSeedITK* sp = data.SP_ITK[i];
-
- float dx = sp->x()-X;
- float dy = sp->y()-Y;
- float dz = sp->z()-Z;
- float x = dx*ax+dy*ay;
- float y = dy*ax-dx*ay;
- float r2 = 1.f/(x*x+y*y);
- float dr = std::sqrt(r2);
- float tz = dz*dr;
- if (i < Nb) tz = -tz;
-
- data.X [i] = x;
- data.Y [i] = y;
- data.Tz[i] = tz;
- data.Zo[i] = Z-R*tz;
- data.R [i] = dr;
- data.U [i] = x*r2;
- data.V [i] = y*r2;
- data.Er[i] = ((covz0+sp->covz())+(tz*tz)*(covr0+sp->covr()))*r2;
+ /// if the points are too close in r, abort (future ones will be even closer).
+ if (dR < m_drminSSS)
+ break;
+
+ const float dz = Z - (*iter_otherSP)->z();
+ const float dZdR = dz / dR;
+
+ /// Comparison with vertices Z coordinates
+ /// straight line extrapolation to r=0
+ const float z0 = Z - R * dZdR;
+ if (std::abs(dz) > m_dzmaxSSS || std::abs(z0) > zmax)
+ continue;
+ /// found a bottom SP candidate, write it into the data object
+ data.SP_ITK[Nb] = (*iter_otherSP);
+ data.SP_ITK[Nb]->setDZDR(dZdR);
+ /// if we are exceeding the SP capacity of our data object,
+ /// make it resize its vectors. Will add 50 slots by default,
+ /// so rarely should happen more than once per event.
+ if (++Nb == SPcapacity)
+ {
+ data.resizeSPCont();
+ SPcapacity = data.SP_ITK.size();
+ }
+ } ///< end of loop over SP in bottom candidate cell
+ } ///< end of loop over bottom candidate cells
+
+ /// if we found no bottom candidates (remember, Nb starts counting at Nt), abort
+ if (!(Nb - Nt))
+ continue;
+
+ /// get covariance on r and z for the central SP
+ float covr0 = (*iter_centralSP)->covr();
+ float covz0 = (*iter_centralSP)->covz();
+
+ /// build a unit direction vector pointing from the IP to the central SP
+ float ax = X / R;
+ float ay = Y / R;
+
+ /// check all SP candidates we found during our loop and
+ /// compute geometrical variables w.r.t the central point.
+ for (size_t i = 0; i < Nb; ++i)
+ {
+
+ InDet::SiSpacePointForSeedITK *sp = data.SP_ITK[i];
+
+ /// transform the space point coordinates into a frame centered around the middle SP,
+ /// where the x axis points away from the detector frame origin
+ float dx = sp->x() - X;
+ float dy = sp->y() - Y;
+ float dz = sp->z() - Z;
+ float x = dx * ax + dy * ay;
+ float y = dy * ax - dx * ay;
+
+ /// inverse square distance of the candidate space point to the central point
+ float r2 = 1. / (x * x + y * y);
+ /// inverse distance of the candidate space point to the central point
+ float dr = std::sqrt(r2);
+ /// estimate slope in z - distance traveled in transverse plane vs z direction.
+ /// rough estimate of 1/tan theta from 2 points
+ float tz = dz * dr;
+
+ /// if we are looking at a bottom SP candidate, flip the sign to account for
+ /// different direction of flight (from bottom to central)
+ if (i >= Nt)
+ tz = -tz;
+
+ /// save this into our data object
+ data.X[i] = x;
+ data.Y[i] = y;
+ data.Tz[i] = tz; ///< 1/ tan theta
+ data.Zo[i] = Z - R * tz; ///< z0 estimate.
+ data.R[i] = dr; ///< inverse distance to central SP
+ data.U[i] = x * r2; ///< transformed U coordinate
+ data.V[i] = y * r2; ///< transformed V coordinate
+ data.Er[i] = ((covz0 + sp->covz()) + (tz * tz) * (covr0 + sp->covr())) * r2; ///<squared Error on 1/tan theta coming from the space-point position errors
}
- covr0 *= .5;
- covz0 *= 2.;
-
- // Three space points comparison
- //
- for (int b=0; b<Nb; ++b) {
- float Zob = data.Zo[b];
- float Tzb = data.Tz[b];
- float Rb2r = data.R [b]*covr0;
- float Rb2z = data.R [b]*covz0;
- float Erb = data.Er[b];
- float Vb = data.V [b];
- float Ub = data.U [b];
- float Tzb2 = (1.f+Tzb*Tzb);
- float sTzb2 = std::sqrt(Tzb2);
- float CSA = Tzb2*COFK;
- float ICSA = Tzb2*ipt2C;
- float imax = imaxs;
-
- float Se = 1.f/sqrt(1.f+Tzb*Tzb);
- float Ce = Se*Tzb;
- float Sx = Se*ax;
- float Sy = Se*ay;
-
- for (int t=Nb; t<Nt; ++t) {
- // Trigger point
- //
- float dU0 = data.U[t]-Ub;
- if (dU0 == 0.) continue;
- float A0 = (data.V[t]-Vb)/dU0;
- float C0 = 1.f/std::sqrt(1.f+A0*A0);
- float S0 = A0*C0;
- float d0[3] = {Sx*C0-Sy*S0, Sx*S0+Sy*C0, Ce};
- float rn[3];
- if (!(*r0)->coordinates(d0,rn)) continue;
-
- // Bottom point
- //
- float B0 = 2.*(Vb-A0*Ub);
- float Cb = (1.-B0*data.Y[b])*C0;
- float Sb = (A0+B0*data.X[b])*C0;
- float db[3] = {Sx*Cb-Sy*Sb,Sx*Sb+Sy*Cb,Ce};
- float rbDup[3]; //a new and different rb
- if (!data.SP_ITK[b]->coordinates(db,rbDup)) continue;
-
- // Top point
- //
- float Ct = (1.f-B0*data.Y[t])*C0;
- float St = (A0+B0*data.X[t])*C0;
- float dt[3] = {Sx*Ct-Sy*St,Sx*St+Sy*Ct,Ce};
- float rtDup[3]; //doesnt hide previous declaration of rt
- if (!data.SP_ITK[t]->coordinates(dt,rtDup)) continue;
-
- float xb = rbDup[0]-rn[0];
- float yb = rbDup[1]-rn[1];
- float xt = rtDup[0]-rn[0];
- float yt = rtDup[1]-rn[1];
-
- float rb2 = 1.f/(xb*xb+yb*yb);
- float rt2 = 1.f/(xt*xt+yt*yt);
-
- float tb = (rn[2]-rbDup[2])*std::sqrt(rb2);
- float tz = (rtDup[2]-rn[2])*std::sqrt(rt2);
-
- float dT = ((tb-tz)*(tb-tz)-data.R[t]*Rb2z-(Erb+data.Er[t]))-(data.R[t]*Rb2r)*((tb+tz)*(tb+tz));
- if ( dT > ICSA) continue;
-
- float Rn = std::sqrt(rn[0]*rn[0]+rn[1]*rn[1]);
- float Ax = rn[0]/Rn;
- float Ay = rn[1]/Rn;
-
- float ub = (xb*Ax+yb*Ay)*rb2;
- float vb = (yb*Ax-xb*Ay)*rb2;
- float ut = (xt*Ax+yt*Ay)*rt2;
- float vt = (yt*Ax-xt*Ay)*rt2;
-
- float dU = ut-ub;
- if (dU == 0.) continue;
- float A = (vt-vb)/dU;
- float S2 = 1.f+A*A;
- float B = vb-A*ub;
- float B2 = B*B;
- if (B2 > ipt2K*S2 || dT*S2 > B2*CSA) continue;
-
- float Im = std::abs((A-B*Rn)*Rn);
-
- if (Im <= imax) {
- float dr;
- data.R[t] < data.R[b] ? dr = data.R[t] : dr = data.R[b];
- Im+=std::abs((Tzb-data.Tz[t])/(dr*sTzb2));
- data.CmSp_ITK.emplace_back(std::make_pair(B/std::sqrt(S2), data.SP_ITK[t]));
- data.SP_ITK[t]->setParam(Im);
- }
-
- }
- if (!data.CmSp_ITK.empty()) {
- newOneSeedWithCurvaturesComparison(data, data.SP_ITK[b], (*r0), Zob);
+
+ data.nOneSeeds = 0;
+ data.mapOneSeeds_ITK.clear();
+
+ /// Three space points comparison
+ /// first, loop over the bottom point candidates
+ for (size_t b = Nt; b < Nb; ++b)
+ {
+
+ /// retrieve the geometrical paranmeters w.r.t the central SP for this candidate
+ float Zob = data.Zo[b]; ///< z0 estimate from central+bottom SP
+ float Tzb = data.Tz[b]; ///< 1/tanTheta estimate from central+bottom SP
+ float Rb2r = data.R[b] * covr0;
+ float Rb2z = data.R[b] * covz0;
+ float Erb = data.Er[b]; ///< this is the uncertainty in 1/tanTheta on the bottom segment resulting from the position errors in the 2 SP
+ float Vb = data.V[b]; ///< v-coordinate of bottom SP
+ float Ub = data.U[b]; ///< u-coordinate of bottom SP
+ float Tzb2 = (1. + Tzb * Tzb); ///< 1+1/tan²theta - converts transverse to total squared pt
+ float sTzb2 = std::sqrt(Tzb2); ///< sqrt (1+1/tan²theta) - used to convert pt to |p|
+ float Se = 1. / std::sqrt(Tzb2);
+ float Ce = Se * Tzb;
+ float Sx = Se * ax;
+ float Sy = Se * ay;
+
+ float sigmaSquaredScatteringPtDependent = Tzb2 * COFK; ///< this, when divided by the 2R², yields an approximated multiple scattering term assuming the measured pt.
+ float sigmaSquaredScatteringMinPt = Tzb2 * ipt2C; ///< this is an approximate worst case multiple scattering term assuming the lowest
+ /// pt we allow and the estimated theta angle
+ /// max IP
+ float d0max = maxd0cut;
+
+ /// inner loop over the top point candidates
+ for (size_t t = 0; t < Nt; ++t)
+ {
+
+ /**
+ * The following exploits the transformation u:=x/(x²+y²); v:=y/(x²+y²);
+ * This is applied on the x,y coordinates in the frame described above, where the
+ * origin is put in the central SP and the x axis defined to point directly away from the IP.
+ *
+ * In this transformed u,v frame, what would be our circle in x-y space takes the form of
+ * a linear function V = (-x0/y0) x U + 1/(2y0) =: A x U + B/2.
+ * Here, x0 and y0 describe the center point of the circle in the x-y frame.
+ * As the origin of the x-y frame (the middle space point of our seed) is on the circle,
+ * we have x0²+y0²=R² with circle radius R.
+ *
+ * For our seed, we can experimentally obtain A as the slope of the linear function,
+ * delta V / delta U,
+ * estimated using the delta U and delta V between the top and bottom space point.
+ *
+ * B is then obtained by inserting the obtained A into the
+ * linear equation for the bottom SP, A x U + B/2 = V --> B = 2(V - A x U0
+ *
+ * With x0²+y0²=R², and x0=-A/B and y0=1/B, the radius of the circle is
+ * then obtained as R²=(1+A²)/B².
+ **/
+
+ // Trigger point
+ //
+ float dU0 = data.U[t] - Ub;
+ if (dU0 == 0.)
+ continue;
+ float A0 = (data.V[t] - Vb) / dU0;
+
+ float Cn = Ce * std::sqrt(1. + A0 * A0);
+
+ float dn[3] = {Sx - Sy * A0, Sx * A0 + Sy, Cn};
+ float rn[3];
+ if (!(*iter_centralSP)->coordinates(dn, rn))
+ continue;
+
+ // Bottom point
+ //
+ float B0 = 2. * (Vb - A0 * Ub);
+ float Cb = 1. - B0 * data.Y[b];
+ float Sb = A0 + B0 * data.X[b];
+ float db[3] = {Sx * Cb - Sy * Sb, Sx * Sb + Sy * Cb, Cn};
+ float rb[3];
+ if (!data.SP_ITK[b]->coordinates(db, rb))
+ continue;
+
+ // Top point
+ //
+ float Ct = 1. - B0 * data.Y[t];
+ float St = A0 + B0 * data.X[t];
+ float dt[3] = {Sx * Ct - Sy * St, Sx * St + Sy * Ct, Cn};
+ float rt[3];
+ if (!data.SP_ITK[t]->coordinates(dt, rt))
+ continue;
+
+ float xb = rb[0] - rn[0];
+ float yb = rb[1] - rn[1];
+ float zb = rb[2] - rn[2];
+ float xt = rt[0] - rn[0];
+ float yt = rt[1] - rn[1];
+ float zt = rt[2] - rn[2];
+
+ float rb2 = 1. / (xb * xb + yb * yb);
+ float rt2 = 1. / (xt * xt + yt * yt);
+
+ float tb = -zb * std::sqrt(rb2);
+ float tz = zt * std::sqrt(rt2);
+
+ /// Apply a cut on the compatibility between the r-z slope of the two seed segments.
+ /// This is done by comparing the squared difference between slopes, and comparing
+ /// to the squared uncertainty in this difference - we keep a seed if the difference
+ /// is compatible within the assumed uncertainties.
+
+ /// average value of 1/tan(theta), approximate the slope at the location of the central space point
+ float meanOneOverTanTheta = (tb + tz) / 2.;
+
+ /// squared error on the difference in tan(theta) due to space point position errors.
+ float sigmaSquaredSpacePointErrors = Erb + data.Er[t] /// pre-computed individual squared errors on 1/tan(theta) for the two segments
+ + 2 * Rb2z * data.R[t] /// mixed term with z-uncertainty on central SP
+ + 2 * Rb2r * data.R[t] * meanOneOverTanTheta * meanOneOverTanTheta; // mixed term with r-uncertainy on central SP
+
+ /// start out by subtracting from the squared difference in 1/tanTheta the space-point-related squared error
+ float remainingSquaredDelta = (tb - tz) * (tb - tz) - sigmaSquaredSpacePointErrors;
+
+ /// First, we test using a generous scattering term calculated assuming the minimum pt we expect
+ /// to reconstruct.
+ if (remainingSquaredDelta - sigmaSquaredScatteringMinPt > 0)
+ continue;
+
+ float Rn = std::sqrt(rn[0] * rn[0] + rn[1] * rn[1]);
+ float Ax = rn[0] / Rn;
+ float Ay = rn[1] / Rn;
+
+ float ub = (xb * Ax + yb * Ay) * rb2;
+ float vb = (yb * Ax - xb * Ay) * rb2;
+ float ut = (xt * Ax + yt * Ay) * rt2;
+ float vt = (yt * Ax - xt * Ay) * rt2;
+
+ float dU = ut - ub;
+ if (dU == 0.)
+ continue;
+ float A = (vt - vb) / dU;
+ float onePlusAsquare = 1. + A * A;
+ float B = vb - A * ub;
+ float BSquare = B * B;
+
+ /** With this radius (and pT) estimate, we can apply our pt cut.
+ * Reminder, ipt2K is 1 / (K x 0.9 x pt-cut)², where K translates pt into 2R.
+ * So here we can apply the pt cut directly on the (2R)² estimate without
+ * the extra overhead of conversion / division.
+ * The second check is a refinement of the above Tz compatibility cut,
+ * replacing the sigmaSquaredScatteringMinPt scattering contribution which assumes the lowest pt
+ * by one based on the actual estimated pt.
+ *
+ * The second term in this if-statement applies a second version of the
+ * 1/tan(theta) compatibility, this time using a scattering term scaled by the actual measured
+ * pt. This refines the cut applied above, following the same logic ("delta² - sigma² ?<=0")
+ **/
+ if (BSquare > ipt2K * onePlusAsquare || remainingSquaredDelta * onePlusAsquare > BSquare * sigmaSquaredScatteringPtDependent)
+ continue;
+
+ /** This is an estimate of the transverse impact parameter.
+ * The reasoning is that, in the x-y frame with the central SP as origin and
+ * the x axis pointing away from the IP, we have for the distance between
+ * the IP and the middle of the circle:
+ * (x0 - r_central)²+y0² = (R + d0)²,
+ * with R being the circle radius and r_central
+ * the radial location of the central SP, placing the IP at IP at (-r_central, 0).
+ *
+ * First simplify using R² =x0²+y0², then apply the approximation d0²/R² ~ 0.
+ *
+ * Finally, consider that locally close to the central SP, the circle is parallel to the x axis,
+ * so A = 0 --> expand (2R)²=(1+A²)/B² around this point to obtain
+ * d0 = r_central x (r_central x B - A).
+ * Note that below, the variable R is the radial coordinate fo the central SP,
+ * corresponding to r_central in the notation above.
+ **/
+ float d0 = std::abs((A - B * Rn) * Rn);
+
+ /// apply d0 cut to seed
+ if (d0 <= d0max)
+ {
+ /// evaluate distance the two closest-by SP in this seed candidate
+ float dr = std::sqrt(1 / rb2);
+ if (data.R[t] < data.R[b])
+ dr = std::sqrt(1 / rt2);
+ /// obtain a quality score - start from the d0 estimate, and add
+ /// a penalty term corresponding to how far the seed segments
+ /// deviate from a straight line in r-z
+ data.SP_ITK[t]->setScorePenalty(std::abs((tb - tz) / (dr * sTzb2)));
+ data.SP_ITK[t]->setParam(d0);
+ float DR = xt * xt + yt * yt + zt * zt; // distance between top and central SP
+ data.SP_ITK[t]->setDR(DR);
+
+ if (meanOneOverTanTheta < 1e-8)
+ meanOneOverTanTheta = 1e-8;
+ if (BSquare < 1e-8)
+ BSquare = 1e-8;
+ float theta = std::atan(1. / meanOneOverTanTheta);
+ data.SP_ITK[t]->setEta(-std::log(std::tan(0.5 * theta)));
+ data.SP_ITK[t]->setPt(std::sqrt(onePlusAsquare / BSquare) / (1000 * data.K));
+
+ /// record one possible seed candidate, sort by the curvature
+ data.CmSp_ITK.emplace_back(std::make_pair(B / std::sqrt(onePlusAsquare), data.SP_ITK[t]));
+ /// store the transverse IP, will later be used as a quality estimator
+ if (data.CmSp_ITK.size() == 500)
+ break;
+ }
+
+ } ///< end loop over top space point candidates
+ /// now apply further cleaning on the seed candidates for this central+bottom pair.
+ if (!data.CmSp_ITK.empty())
+ {
+ newOneSeedWithCurvaturesComparisonSSS(data, data.SP_ITK[b], (*iter_centralSP), Zob);
}
- }
+ } ///< end loop over bottom space points
+ ///record seeds found in this run
fillSeeds(data);
nseed += data.fillOneSeeds;
- if (nseed>=m_maxsize) {
- data.endlist=false;
- ++r0;
- data.rMin_ITK = r0;
- return;
- }
- }
+
+ } ///< end loop over central SP
}
///////////////////////////////////////////////////////////////////
// Production 3 space points seeds in ROI
///////////////////////////////////////////////////////////////////
-
-void InDet::SiSpacePointsSeedMaker_ITK::production3SpTrigger
-(EventData& data,
- std::list<InDet::SiSpacePointForSeedITK*>::iterator* rb ,
- std::list<InDet::SiSpacePointForSeedITK*>::iterator* rbe,
- std::list<InDet::SiSpacePointForSeedITK*>::iterator* rt ,
- std::list<InDet::SiSpacePointForSeedITK*>::iterator* rte,
- int NB, int NT, int& nseed) const
+void InDet::SiSpacePointsSeedMaker_ITK::production3SpTrigger(EventData &data,
+ std::array<std::list<InDet::SiSpacePointForSeedITK *>::iterator, arraySizeNeighbourBins> &rb,
+ std::array<std::list<InDet::SiSpacePointForSeedITK *>::iterator, arraySizeNeighbourBins> &rbe,
+ std::array<std::list<InDet::SiSpacePointForSeedITK *>::iterator, arraySizeNeighbourBins> &rt,
+ std::array<std::list<InDet::SiSpacePointForSeedITK *>::iterator, arraySizeNeighbourBins> &rte,
+ const int numberBottomCells, const int numberTopCells, int &nseed) const
{
- std::list<InDet::SiSpacePointForSeedITK*>::iterator r0=rb[0], r;
- if (!data.endlist) {
+ std::list<InDet::SiSpacePointForSeedITK *>::iterator r0 = rb[0], r;
+ if (!data.endlist)
+ {
r0 = data.rMin_ITK;
data.endlist = true;
}
- constexpr float pi2 = 2.*M_PI;
+ constexpr float pi2 = 2. * M_PI;
float ipt2K = data.ipt2K;
float ipt2C = data.ipt2C;
- float COFK = data.COFK;
- float imaxp = m_diver;
- float imaxs = m_diversss;
+ float COFK = data.COFK;
+ float imaxp = m_maxdImpact;
+ float imaxs = m_maxdImpactSSS;
data.CmSp_ITK.clear();
// Loop through all trigger space points
//
- for (; r0!=rbe[0]; ++r0) {
+ for (; r0 != rbe[0]; ++r0)
+ {
data.nOneSeeds = 0;
data.mapOneSeeds_ITK.clear();
-
+
float R = (*r0)->radius();
- const Trk::Surface* sur0 = (*r0)->sur();
- float X = (*r0)->x();
- float Y = (*r0)->y();
- float Z = (*r0)->z();
- int Nb = 0;
+ const Trk::Surface *sur0 = (*r0)->sur();
+ float X = (*r0)->x();
+ float Y = (*r0)->y();
+ float Z = (*r0)->z();
+ int Nb = 0;
// Bottom links production
//
- for (int i=0; i<NB; ++i) {
- for (r=rb[i]; r!=rbe[i]; ++r) {
- float Rb =(*r)->radius();
-
- float dR = R-Rb;
- if (dR < m_drmin || (data.iteration && (*r)->spacepoint->clusterList().second)) break;
- if (dR > m_drmax || (*r)->sur()==sur0) continue;
-
- // Comparison with bottom and top Z
- //
- float Tz = (Z-(*r)->z())/dR;
- float Zo = Z-R*Tz;
- if (Zo < data.zminB || Zo > data.zmaxB) continue;
- float Zu = Z+(550.f-R)*Tz;
- if (Zu < data.zminU || Zu > data.zmaxU) continue;
- data.SP_ITK[Nb] = (*r);
- if (++Nb==m_maxsizeSP) goto breakb;
+ for (int i = 0; i < numberBottomCells; ++i)
+ {
+ for (r = rb[i]; r != rbe[i]; ++r)
+ {
+ float Rb = (*r)->radius();
+
+ float dR = R - Rb;
+ if (dR < m_drmin || (data.iteration && (*r)->spacepoint->clusterList().second))
+ break;
+ if (dR > m_drmax || (*r)->sur() == sur0)
+ continue;
+
+ // Comparison with bottom and top Z
+ //
+ float Tz = (Z - (*r)->z()) / dR;
+ float Zo = Z - R * Tz;
+ if (Zo < data.zminB || Zo > data.zmaxB)
+ continue;
+ float Zu = Z + (550.f - R) * Tz;
+ if (Zu < data.zminU || Zu > data.zmaxU)
+ continue;
+ data.SP_ITK[Nb] = (*r);
+ if (++Nb == m_maxsizeSP)
+ goto breakb;
}
}
breakb:
- if (!Nb || Nb==m_maxsizeSP) continue;
+ if (!Nb || Nb == m_maxsizeSP)
+ continue;
int Nt = Nb;
-
+
// Top links production
//
- for (int i=0; i<NT; ++i) {
- for (r=rt[i]; r!=rte[i]; ++r) {
- float Rt =(*r)->radius();
- float dR = Rt-R;
-
- if (dR<m_drmin) {
- rt[i]=r;
+ for (int i = 0; i < numberTopCells; ++i)
+ {
+ for (r = rt[i]; r != rte[i]; ++r)
+ {
+ float Rt = (*r)->radius();
+ float dR = Rt - R;
+
+ if (dR < m_drmin)
+ {
+ rt[i] = r;
continue;
}
- if (dR>m_drmax) break;
-
- if ((*r)->sur()==sur0) continue;
-
- // Comparison with bottom and top Z
- //
- float Tz = ((*r)->z()-Z)/dR;
- float Zo = Z-R*Tz;
- if (Zo < data.zminB || Zo > data.zmaxB) continue;
- float Zu = Z+(550.f-R)*Tz;
- if (Zu < data.zminU || Zu > data.zmaxU) continue;
- data.SP_ITK[Nt] = (*r);
- if (++Nt==m_maxsizeSP) goto breakt;
+ if (dR > m_drmax)
+ break;
+
+ if ((*r)->sur() == sur0)
+ continue;
+
+ // Comparison with bottom and top Z
+ //
+ float Tz = ((*r)->z() - Z) / dR;
+ float Zo = Z - R * Tz;
+ if (Zo < data.zminB || Zo > data.zmaxB)
+ continue;
+ float Zu = Z + (550.f - R) * Tz;
+ if (Zu < data.zminU || Zu > data.zmaxU)
+ continue;
+ data.SP_ITK[Nt] = (*r);
+ if (++Nt == m_maxsizeSP)
+ goto breakt;
}
}
-
+
breakt:
- if (!(Nt-Nb)) continue;
- float covr0 = (*r0)->covr ();
- float covz0 = (*r0)->covz ();
+ if (!(Nt - Nb))
+ continue;
+ float covr0 = (*r0)->covr();
+ float covz0 = (*r0)->covz();
- float ax = X/R;
- float ay = Y/R;
-
- for (int i=0; i<Nt; ++i) {
- InDet::SiSpacePointForSeedITK* sp = data.SP_ITK[i];
-
- float dx = sp->x()-X;
- float dy = sp->y()-Y;
- float dz = sp->z()-Z;
- float x = dx*ax+dy*ay;
- float y = dy*ax-dx*ay;
- float r2 = 1.f/(x*x+y*y);
- float dr = std::sqrt(r2);
- float tz = dz*dr;
- if (i < Nb) tz = -tz;
-
- data.X [i] = x;
- data.Y [i] = y;
- data.Tz[i] = tz;
- data.Zo[i] = Z-R*tz;
- data.R [i] = dr;
- data.U [i] = x*r2;
- data.V [i] = y*r2;
- data.Er[i] = ((covz0+sp->covz())+(tz*tz)*(covr0+sp->covr()))*r2;
+ float ax = X / R;
+ float ay = Y / R;
+
+ for (int i = 0; i < Nt; ++i)
+ {
+ InDet::SiSpacePointForSeedITK *sp = data.SP_ITK[i];
+
+ float dx = sp->x() - X;
+ float dy = sp->y() - Y;
+ float dz = sp->z() - Z;
+ float x = dx * ax + dy * ay;
+ float y = dy * ax - dx * ay;
+ float r2 = 1.f / (x * x + y * y);
+ float dr = std::sqrt(r2);
+ float tz = dz * dr;
+ if (i < Nb)
+ tz = -tz;
+
+ data.X[i] = x;
+ data.Y[i] = y;
+ data.Tz[i] = tz;
+ data.Zo[i] = Z - R * tz;
+ data.R[i] = dr;
+ data.U[i] = x * r2;
+ data.V[i] = y * r2;
+ data.Er[i] = ((covz0 + sp->covz()) + (tz * tz) * (covr0 + sp->covr())) * r2;
}
covr0 *= .5;
covz0 *= 2.;
-
+
// Three space points comparison
//
- for (int b=0; b<Nb; ++b) {
- float Zob = data.Zo[b];
- float Tzb = data.Tz[b];
- float Rb2r = data.R [b]*covr0;
- float Rb2z = data.R [b]*covz0;
- float Erb = data.Er[b];
- float Vb = data.V [b];
- float Ub = data.U [b];
- float Tzb2 = (1.f+Tzb*Tzb);
- float CSA = Tzb2*COFK;
- float ICSA = Tzb2*ipt2C;
- float imax = imaxp;
- if (data.SP_ITK[b]->spacepoint->clusterList().second) imax = imaxs;
-
- for (int t=Nb; t!=Nt; ++t) {
- float dT = ((Tzb-data.Tz[t])*(Tzb-data.Tz[t])-data.R[t]*Rb2z-(Erb+data.Er[t]))-(data.R[t]*Rb2r)*((Tzb+data.Tz[t])*(Tzb+data.Tz[t]));
- if ( dT > ICSA) continue;
- float dU = data.U[t]-Ub;
- if (dU == 0.) continue;
- float A = (data.V[t]-Vb)/dU;
- float S2 = 1.f+A*A;
- float B = Vb-A*Ub;
- float B2 = B*B;
- if (B2 > ipt2K*S2 || dT*S2 > B2*CSA) continue;
-
- float Im = std::abs((A-B*R)*R);
- if (Im > imax) continue;
-
- // Azimuthal angle test
- //
- float y = 1.;
- float x = 2.f*B*R-A;
- float df = std::abs(std::atan2(ay*y-ax*x,ax*y+ay*x)-data.ftrig);
- if (df > M_PI) df=pi2-df;
- if (df > data.ftrigW) continue;
- data.CmSp_ITK.emplace_back(std::make_pair(B/std::sqrt(S2), data.SP_ITK[t]));
+ for (int b = 0; b < Nb; ++b)
+ {
+ float Zob = data.Zo[b];
+ float Tzb = data.Tz[b];
+ float Rb2r = data.R[b] * covr0;
+ float Rb2z = data.R[b] * covz0;
+ float Erb = data.Er[b];
+ float Vb = data.V[b];
+ float Ub = data.U[b];
+ float Tzb2 = (1.f + Tzb * Tzb);
+ float CSA = Tzb2 * COFK;
+ float ICSA = Tzb2 * ipt2C;
+ float imax = imaxp;
+ if (data.SP_ITK[b]->spacepoint->clusterList().second)
+ imax = imaxs;
+
+ for (int t = Nb; t != Nt; ++t)
+ {
+ float dT = ((Tzb - data.Tz[t]) * (Tzb - data.Tz[t]) - data.R[t] * Rb2z - (Erb + data.Er[t])) - (data.R[t] * Rb2r) * ((Tzb + data.Tz[t]) * (Tzb + data.Tz[t]));
+ if (dT > ICSA)
+ continue;
+ float dU = data.U[t] - Ub;
+ if (dU == 0.)
+ continue;
+ float A = (data.V[t] - Vb) / dU;
+ float S2 = 1.f + A * A;
+ float B = Vb - A * Ub;
+ float B2 = B * B;
+ if (B2 > ipt2K * S2 || dT * S2 > B2 * CSA)
+ continue;
+
+ float Im = std::abs((A - B * R) * R);
+ if (Im > imax)
+ continue;
+
+ // Azimuthal angle test
+ //
+ float y = 1.;
+ float x = 2.f * B * R - A;
+ float df = std::abs(std::atan2(ay * y - ax * x, ax * y + ay * x) - data.ftrig);
+ if (df > M_PI)
+ df = pi2 - df;
+ if (df > data.ftrigW)
+ continue;
+ data.CmSp_ITK.emplace_back(std::make_pair(B / std::sqrt(S2), data.SP_ITK[t]));
data.SP_ITK[t]->setParam(Im);
}
- if (!data.CmSp_ITK.empty()) {
+ if (!data.CmSp_ITK.empty())
+ {
newOneSeedWithCurvaturesComparison(data, data.SP_ITK[b], (*r0), Zob);
}
}
fillSeeds(data);
nseed += data.fillOneSeeds;
- if (nseed>=m_maxsize) {
- data.endlist=false;
+ if (nseed >= m_maxsize)
+ {
+ data.endlist = false;
++r0;
data.rMin_ITK = r0;
return;
- }
+ }
}
}
///////////////////////////////////////////////////////////////////
-// New 3 space points pro seeds
+// New 3 space points pro seeds
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::newOneSeed
-(EventData& data,
- InDet::SiSpacePointForSeedITK*& p1, InDet::SiSpacePointForSeedITK*& p2,
- InDet::SiSpacePointForSeedITK*& p3, float z, float q) const
+void InDet::SiSpacePointsSeedMaker_ITK::newOneSeed(EventData &data,
+ InDet::SiSpacePointForSeedITK *&p1, InDet::SiSpacePointForSeedITK *&p2,
+ InDet::SiSpacePointForSeedITK *&p3, float z, float seedCandidateQuality) const
{
- if (data.nOneSeeds < m_maxOneSize) {
- data.OneSeeds_ITK[data.nOneSeeds].set(p1,p2,p3,z);
- data.mapOneSeeds_ITK.insert(std::make_pair(q, &(data.OneSeeds_ITK[data.nOneSeeds])));
+ /// get the worst seed so far
+ float worstQualityInMap = std::numeric_limits<float>::min();
+ InDet::SiSpacePointsProSeedITK *worstSeedSoFar = nullptr;
+ if (!data.mapOneSeeds_ITK.empty())
+ {
+ std::multimap<float, InDet::SiSpacePointsProSeedITK *>::reverse_iterator l = data.mapOneSeeds_ITK.rbegin();
+ worstQualityInMap = (*l).first;
+ worstSeedSoFar = (*l).second;
+ }
+ /// There are three cases where we simply add our new seed to the list and push it into the map:
+ /// a) we have not yet reached our max number of seeds
+ if (data.nOneSeeds < data.maxSeedsPerSP
+ /// b) we have reached the max number but always want to keep confirmed seeds
+ /// and the new seed is a confirmed one, with worse quality than the worst one so far
+ || (m_useSeedConfirmation && data.keepAllConfirmedSeeds && worstQualityInMap <= seedCandidateQuality && isConfirmedSeed(p1, p3, seedCandidateQuality) && data.nOneSeeds < data.seedPerSpCapacity)
+ /// c) we have reached the max number but always want to keep confirmed seeds
+ ///and the new seed of higher quality than the worst one so far, with the latter however being confirmed
+ || (m_useSeedConfirmation && data.keepAllConfirmedSeeds && worstQualityInMap > seedCandidateQuality && isConfirmedSeed(worstSeedSoFar->spacepoint0(), worstSeedSoFar->spacepoint2(), worstQualityInMap) && data.nOneSeeds < data.seedPerSpCapacity))
+ {
+ data.OneSeeds_ITK[data.nOneSeeds].set(p1, p2, p3, z);
+ data.mapOneSeeds_ITK.insert(std::make_pair(seedCandidateQuality, &data.OneSeeds_ITK[data.nOneSeeds]));
++data.nOneSeeds;
- } else {
- std::multimap<float,InDet::SiSpacePointsProSeedITK*>::reverse_iterator
- l = data.mapOneSeeds_ITK.rbegin();
+ }
- if ((*l).first <= q) return;
-
- InDet::SiSpacePointsProSeedITK* s = (*l).second;
- s->set(p1,p2,p3,z);
-
- std::multimap<float,InDet::SiSpacePointsProSeedITK*>::iterator
- i = data.mapOneSeeds_ITK.insert(std::make_pair(q,s));
-
- for (++i; i!=data.mapOneSeeds_ITK.end(); ++i) {
- if ((*i).second==s) {
+ /// otherwise, we check if there is a poorer-quality seed that we can kick out
+ else if (worstQualityInMap > seedCandidateQuality)
+ {
+ /// Overwrite the parameters of the worst seed with the new one
+ worstSeedSoFar->set(p1, p2, p3, z);
+ /// re-insert it with its proper quality to make sure it ends up in the right place
+ std::multimap<float, InDet::SiSpacePointsProSeedITK *>::iterator
+ i = data.mapOneSeeds_ITK.insert(std::make_pair(seedCandidateQuality, worstSeedSoFar));
+ /// and remove the entry with the old quality to avoid duplicates
+ for (++i; i != data.mapOneSeeds_ITK.end(); ++i)
+ {
+ if ((*i).second == worstSeedSoFar)
+ {
data.mapOneSeeds_ITK.erase(i);
return;
}
@@ -1880,57 +3194,78 @@ void InDet::SiSpacePointsSeedMaker_ITK::newOneSeed
// New 3 space points pro seeds production
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::newOneSeedWithCurvaturesComparison
-(EventData& data, SiSpacePointForSeedITK*& SPb, SiSpacePointForSeedITK*& SP0, float Zob) const
+void InDet::SiSpacePointsSeedMaker_ITK::newOneSeedWithCurvaturesComparison(EventData &data, SiSpacePointForSeedITK *&SPb, SiSpacePointForSeedITK *&SP0, float Zob) const
{
const float dC = .00003;
- bool pixb = !SPb->spacepoint->clusterList().second;
+ bool pixb = !SPb->spacepoint->clusterList().second;
std::sort(data.CmSp_ITK.begin(), data.CmSp_ITK.end(), comCurvatureITK());
- std::vector<std::pair<float,InDet::SiSpacePointForSeedITK*>>::iterator j,jn,i = data.CmSp_ITK.begin(),ie = data.CmSp_ITK.end();
- jn=i;
-
- for (; i!=ie; ++i) {
- float u = (*i).second->param();
- bool pixt = !(*i).second->spacepoint->clusterList().second;
- if (pixt && std::abs(SPb->z() -(*i).second->z()) > m_dzmaxPPP) continue;
-
- const Trk::Surface* Sui = (*i).second->sur ();
- float Ri = (*i).second->radius();
- float Ci1 =(*i).first-dC;
- float Ci2 =(*i).first+dC;
- float Rmi = 0.;
- float Rma = 0.;
- bool in = false;
-
- if (!pixb) u-=400.;
- else if ( pixt) u-=200.;
-
- for (j=jn; j!=ie; ++j) {
- if ( j == i ) continue;
- if ( (*j).first < Ci1 ) {jn=j; ++jn; continue;}
- if ( (*j).first > Ci2 ) break;
- if ( (*j).second->sur()==Sui) continue;
-
+ std::vector<std::pair<float, InDet::SiSpacePointForSeedITK *>>::iterator j, jn, i = data.CmSp_ITK.begin(), ie = data.CmSp_ITK.end();
+ jn = i;
+
+ for (; i != ie; ++i)
+ {
+ float u = (*i).second->param();
+ bool pixt = !(*i).second->spacepoint->clusterList().second;
+ if (pixt && std::abs(SPb->z() - (*i).second->z()) > m_dzmaxPPP)
+ continue;
+
+ const Trk::Surface *Sui = (*i).second->sur();
+ float Ri = (*i).second->radius();
+ float Ci1 = (*i).first - dC;
+ float Ci2 = (*i).first + dC;
+ float Rmi = 0.;
+ float Rma = 0.;
+ bool in = false;
+
+ if (!pixb)
+ u -= 400.;
+ else if (pixt)
+ u -= 200.;
+
+ for (j = jn; j != ie; ++j)
+ {
+ if (j == i)
+ continue;
+ if ((*j).first < Ci1)
+ {
+ jn = j;
+ ++jn;
+ continue;
+ }
+ if ((*j).first > Ci2)
+ break;
+ if ((*j).second->sur() == Sui)
+ continue;
+
float Rj = (*j).second->radius();
- if (std::abs(Rj-Ri) < m_drmin) continue;
-
- if (in) {
- if (Rj > Rma) Rma = Rj;
- else if (Rj < Rmi) Rmi = Rj;
- else continue;
- if ( (Rma-Rmi) > 20.) {
- u-=200.;
+ if (std::abs(Rj - Ri) < m_drmin)
+ continue;
+
+ if (in)
+ {
+ if (Rj > Rma)
+ Rma = Rj;
+ else if (Rj < Rmi)
+ Rmi = Rj;
+ else
+ continue;
+ if ((Rma - Rmi) > 20.)
+ {
+ u -= 200.;
break;
}
- } else {
- in=true;
- Rma=Rmi=Rj;
- u-=200.;
+ }
+ else
+ {
+ in = true;
+ Rma = Rmi = Rj;
+ u -= 200.;
}
}
- if (u > m_umax) continue;
+ if (u > m_umax)
+ continue;
newOneSeed(data, SPb, SP0, (*i).second, Zob, u);
}
@@ -1941,148 +3276,615 @@ void InDet::SiSpacePointsSeedMaker_ITK::newOneSeedWithCurvaturesComparison
// Fill seeds
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::fillSeeds(EventData& data) const
+void InDet::SiSpacePointsSeedMaker_ITK::fillSeeds(EventData &data) const
{
data.fillOneSeeds = 0;
- std::multimap<float,InDet::SiSpacePointsProSeedITK*>::iterator
- lf = data.mapOneSeeds_ITK.begin(),
- l = data.mapOneSeeds_ITK.begin(),
- le = data.mapOneSeeds_ITK.end ();
-
- if (l==le) return;
+ std::multimap<float, InDet::SiSpacePointsProSeedITK *>::iterator it_seedCandidate = data.mapOneSeeds_ITK.begin();
+ std::multimap<float, InDet::SiSpacePointsProSeedITK *>::iterator it_endSeedCandidates = data.mapOneSeeds_ITK.end();
- SiSpacePointsProSeedITK* s = nullptr;
+ /// no seeds - nothing to do.
+ if (it_seedCandidate == it_endSeedCandidates)
+ return;
- for (; l!=le; ++l) {
- float w = (*l).first;
- s = (*l).second;
- if (l!=lf && s->spacepoint0()->radius() < 43. && w > -200.) continue;
- if (!s->setQuality(w)) continue;
-
- if (data.i_seede_ITK!=data.l_seeds_ITK.end()) {
- s = &(*data.i_seede_ITK++);
- *s = *(*l).second;
- } else {
- data.l_seeds_ITK.emplace_back(SiSpacePointsProSeedITK(*(*l).second));
- s = &(data.l_seeds_ITK.back());
+ SiSpacePointsProSeedITK *theSeed{nullptr};
+
+ /// loop over the seed candidates we have stored in the event data
+ for (; it_seedCandidate != it_endSeedCandidates; ++it_seedCandidate)
+ {
+
+ /// quality score of the seed, lower = better, list is sorted by quality
+ float quality = (*it_seedCandidate).first;
+ theSeed = (*it_seedCandidate).second;
+
+ /// this will set the quality member of all points on the seed to the quality score of this candidate
+ if (!theSeed->setQuality(quality))
+ continue;
+
+ /// if we have space, write the seed directly into an existing slot
+ if (data.i_seede_ITK != data.l_seeds_ITK.end())
+ {
+ theSeed = &(*data.i_seede_ITK++);
+ *theSeed = *(*it_seedCandidate).second;
+ }
+ else
+ {
+ /// otherwise, extend the seed list and update the iterators
+ data.l_seeds_ITK.emplace_back(SiSpacePointsProSeedITK(*(*it_seedCandidate).second));
+ theSeed = &(data.l_seeds_ITK.back());
data.i_seede_ITK = data.l_seeds_ITK.end();
}
-
- if (s->spacepoint0()->spacepoint->clusterList().second) w-=3000.;
- else if (s->spacepoint1()->spacepoint->clusterList().second) w-=2000.;
- else if (s->spacepoint2()->spacepoint->clusterList().second) w-=1000.;
- data.seeds_ITK.insert(std::make_pair(w,s));
++data.fillOneSeeds;
- }
+ } ///< end loop over seed candidates
}
-const InDet::SiSpacePointsSeed* InDet::SiSpacePointsSeedMaker_ITK::next(const EventContext&, EventData& data) const
+const InDet::SiSpacePointsSeed *InDet::SiSpacePointsSeedMaker_ITK::next(const EventContext &, EventData &data) const
{
- if (not data.initialized) initializeEventData(data);
+ /// This only holds if we call next() without manually calling newEvent/find3Sp
+ if (not data.initialized)
+ initializeEventData(data);
- if (data.nspoint==3) {
- do {
- if (data.i_seed_ITK==data.i_seede_ITK) {
+ if (data.nspoint == 3)
+ {
+ do
+ {
+ /// If we are out of seeds, call findNext to see if we can find more.
+ if (data.i_seed_ITK == data.i_seede_ITK)
+ {
+ /// findNext will call production3Sp again IF data.endlist is false,
+ /// which is only the case if the last run of production3Sp did not run to the end
+ /// or if we did not run seed finding before
+ /// For run-3 offline, this will not do anything.
findNext(data);
- if (data.i_seed_ITK==data.i_seede_ITK) return nullptr;
+ /// if no new seeds were found, exit
+ if (data.i_seed_ITK == data.i_seede_ITK)
+ return nullptr;
}
- ++data.i_seed_ITK;
- } while (!(*data.seed_ITK++).second->set3(data.seedOutput));
+ /// iterate until we find a valid seed satisfying certain quality cuts in set3
+ } while (!(*data.i_seed_ITK++).set3(data.seedOutput));
+ /// then return this next seed candidate
return &data.seedOutput;
- } else {
- if (data.i_seed_ITK==data.i_seede_ITK) {
+ }
+ else
+ {
+ /// same as above for 2SP
+ if (data.i_seed_ITK == data.i_seede_ITK)
+ {
findNext(data);
- if (data.i_seed_ITK==data.i_seede_ITK) return nullptr;
- }
+ if (data.i_seed_ITK == data.i_seede_ITK)
+ return nullptr;
+ }
(*data.i_seed_ITK++).set2(data.seedOutput);
return &data.seedOutput;
}
return nullptr;
}
-
-bool InDet::SiSpacePointsSeedMaker_ITK::isZCompatible
-(EventData& data, float& Zv, float& R, float& T) const
+bool InDet::SiSpacePointsSeedMaker_ITK::isZCompatible(EventData &data, float &Zv, float &R, float &T) const
{
- if (Zv < data.zminU || Zv > data.zmaxU) return false;
- if (!data.isvertex) return true;
+ if (Zv < data.zminU || Zv > data.zmaxU)
+ return false;
+ if (!data.isvertex)
+ return true;
float dZmin = std::numeric_limits<float>::max();
- for (const float& v: data.l_vertex) {
- float dZ = std::abs(v-Zv);
- if (dZ >= dZmin) break;
- dZmin=dZ;
+ for (const float &v : data.l_vertex)
+ {
+ float dZ = std::abs(v - Zv);
+ if (dZ >= dZmin)
+ break;
+ dZmin = dZ;
}
- return dZmin < (m_dzver+m_dzdrver*R)*sqrt(1.+T*T);
+ return dZmin < (m_dzver + m_dzdrver * R) * sqrt(1. + T * T);
}
///////////////////////////////////////////////////////////////////
-// New space point for seeds
+// New space point for seeds
///////////////////////////////////////////////////////////////////
-InDet::SiSpacePointForSeedITK* InDet::SiSpacePointsSeedMaker_ITK::newSpacePoint
-(EventData& data, const Trk::SpacePoint*const& sp) const
+InDet::SiSpacePointForSeedITK *InDet::SiSpacePointsSeedMaker_ITK::newSpacePoint(EventData &data, const Trk::SpacePoint *const &sp) const
{
- InDet::SiSpacePointForSeedITK* sps = nullptr;
-
float r[15];
+ return newSpacePoint(data, sp, r, true);
+}
+
+InDet::SiSpacePointForSeedITK *InDet::SiSpacePointsSeedMaker_ITK::newSpacePoint(EventData &data, const Trk::SpacePoint *const &sp, float *r, bool usePixSctInform) const
+{
+
+ InDet::SiSpacePointForSeedITK *sps = nullptr;
+
+ /// r will store the coordinates of the space point relative
+ /// to the beam spot
convertToBeamFrameWork(data, sp, r);
- if (data.checketa) {
- float z = (std::abs(r[2])+m_zmax);
- float x = r[0]*data.dzdrmin;
- float y = r[1]*data.dzdrmin;
- if ((z*z )<(x*x+y*y)) return sps;
+ /// if needed, apply eta criterion
+ if (data.checketa)
+ {
+ float z = (std::abs(r[2]) + m_zmax);
+ float x = r[0] * data.dzdrmin;
+ float y = r[1] * data.dzdrmin;
+ if ((z * z) < (x * x + y * y))
+ return sps;
}
- if (data.i_spforseed_ITK!=data.l_spforseed_ITK.end()) {
+ if (m_fastTracking)
+ {
+ float R2 = r[0] * r[0] + r[1] * r[1];
+ if (std::abs(r[2]) > m_dzMaxFast && R2 < m_R2MaxFast)
+ return 0;
+ if (std::abs(r[2]) - m_zmax > data.dzdrmax * std::sqrt(R2))
+ return 0;
+ }
+
+ if (usePixSctInform)
+ {
+ if (!sp->clusterList().second)
+ pixInform(sp, r);
+ else
+ sctInform(data, sp, r);
+ }
+
+ /// If we have previously populated the list and just reset
+ /// the iterator when re-initialising the data object,
+ /// then we re-use existing entries
+ if (data.i_spforseed_ITK != data.l_spforseed_ITK.end())
+ {
+ /// re-use existing entry at the current location
sps = &(*data.i_spforseed_ITK++);
+ /// and then update the existing entry with the new SP and location.
+ /// Unfortunately, set still relies on C-arrays...
sps->set(sp, r);
- } else {
- data.l_spforseed_ITK.emplace_back(InDet::SiSpacePointForSeedITK(sp, r));
+ }
+ else
+ {
+ /// otherwise, the list needs to grow
+ data.l_spforseed_ITK.emplace_back(InDet::SiSpacePointForSeedITK(sp, &(r[0])));
+ /// set our return pointer
sps = &(data.l_spforseed_ITK.back());
+ /// and make sure to update the iterator
data.i_spforseed_ITK = data.l_spforseed_ITK.end();
}
-
+
return sps;
}
///////////////////////////////////////////////////////////////////
-// New 2 space points seeds
+// New 2 space points seeds
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::newSeed
-(EventData& data,
- InDet::SiSpacePointForSeedITK*& p1, InDet::SiSpacePointForSeedITK*& p2, float z) const
+void InDet::SiSpacePointsSeedMaker_ITK::newSeed(EventData &data,
+ InDet::SiSpacePointForSeedITK *&p1, InDet::SiSpacePointForSeedITK *&p2, float z) const
{
- InDet::SiSpacePointForSeedITK* p3 = nullptr;
+ InDet::SiSpacePointForSeedITK *p3 = nullptr;
- if (data.i_seede_ITK!=data.l_seeds_ITK.end()) {
- InDet::SiSpacePointsProSeedITK* s = &(*data.i_seede_ITK++);
+ if (data.i_seede_ITK != data.l_seeds_ITK.end())
+ {
+ InDet::SiSpacePointsProSeedITK *s = &(*data.i_seede_ITK++);
s->set(p1, p2, p3, z);
- } else {
+ }
+ else
+ {
data.l_seeds_ITK.emplace_back(InDet::SiSpacePointsProSeedITK(p1, p2, p3, z));
data.i_seede_ITK = data.l_seeds_ITK.end();
}
}
-
-void InDet::SiSpacePointsSeedMaker_ITK::initializeEventData(EventData& data) const {
+
+void InDet::SiSpacePointsSeedMaker_ITK::initializeEventData(EventData &data) const
+{
+ int seedArrayPerSPSize = (m_maxOneSizePPP > m_maxOneSizeSSS ? m_maxOneSizePPP : m_maxOneSizeSSS);
+ if (m_alwaysKeepConfirmedStripSeeds || m_alwaysKeepConfirmedPixelSeeds)
+ seedArrayPerSPSize = 50;
data.initialize(EventData::ITK,
m_maxsizeSP,
- m_maxOneSize,
- 0, // maxsize not used
- m_r_size,
- 0, // sizeRF not used
- SizeRFZ,
- SizeRFZV,
+ seedArrayPerSPSize,
+ 0, /// maxsize not used
+ m_nBinsR,
+ 0, /// sizeRF not used
+ arraySizePhiZ,
+ arraySizePhiZV,
m_checketa);
}
-void InDet::SiSpacePointsSeedMaker_ITK::writeNtuple(const SiSpacePointsSeed*, const Trk::Track*, int, long) const{
+///////////////////////////////////////////////////////////////////
+// New 3 space points pro seeds production
+///////////////////////////////////////////////////////////////////
+
+void InDet::SiSpacePointsSeedMaker_ITK::newOneSeedWithCurvaturesComparisonSSS(EventData &data,
+ SiSpacePointForSeedITK *&SPb, SiSpacePointForSeedITK *&SP0, float Zob) const
+{
+
+ if (m_useSeedConfirmation)
+ {
+ newOneSeedWithCurvaturesComparisonSeedConfirmation(data, SPb, SP0, Zob);
+ }
+
+ else
+ {
+
+ static const float curvatureInterval = .00003;
+
+ /// sort common SP by curvature
+ if (data.CmSp_ITK.size() > 2)
+ std::sort(data.CmSp_ITK.begin(), data.CmSp_ITK.end(), comCurvatureITK());
+
+ std::vector<std::pair<float, InDet::SiSpacePointForSeedITK *>>::iterator it_otherSP;
+ std::vector<std::pair<float, InDet::SiSpacePointForSeedITK *>>::iterator it_commonTopSP = data.CmSp_ITK.begin(), ie = data.CmSp_ITK.end();
+ std::vector<std::pair<float, InDet::SiSpacePointForSeedITK *>>::iterator it_startInnerLoop = it_commonTopSP;
+
+ float Lt[4];
+
+ /// check all possible common top SP
+ for (; it_commonTopSP != ie; ++it_commonTopSP)
+ {
+
+ SiSpacePointForSeedITK *SPt = (*it_commonTopSP).second;
+ int NT = 1;
+ Lt[0] = SPt->dR();
+ float seedIP = SPt->param();
+
+ /// form a curvature interval cut
+ float minCurvature = (*it_commonTopSP).first - curvatureInterval;
+ float maxCurvature = (*it_commonTopSP).first + curvatureInterval;
+
+ /**
+ * Now we look at the other SP candidates and try to find a confirmation seed,
+ * including the same centre/lower SP and giving a compatible curvature,
+ * but with the top SP in a different layer
+ **/
+
+ for (it_otherSP = it_startInnerLoop; it_otherSP != ie; ++it_otherSP)
+ {
+ /// if we are looking at the same SP, skip it
+ if (it_otherSP == it_commonTopSP)
+ continue;
+ /// if we have a lower curvature than the minimum, skip - and remember to
+ /// not bother with this candidate again later, as the vectors are curvature-sorted
+ if ((*it_otherSP).first < minCurvature)
+ {
+ it_startInnerLoop = it_otherSP;
+ ++it_startInnerLoop;
+ continue;
+ }
+ /// abort once the the curvature gets too large
+ if ((*it_otherSP).first > maxCurvature)
+ break;
+
+ float L = (*it_otherSP).second->dR();
+
+ int k = 0;
+ for (; k != NT; ++k)
+ {
+ if (std::abs(L - Lt[k]) < 20.)
+ break;
+ }
+ if (k == NT)
+ {
+ Lt[NT] = L;
+ if (++NT == 4)
+ break;
+ }
+ }
+
+ // ITK seed quality used so far
+ float Q = seedIP - float(NT) * 100.;
+ if (NT > 2)
+ Q -= 100000.;
+ /// this is a good seed, save it (unless we have too many seeds per SP)
+ newOneSeed(data, SPb, SP0, SPt, Zob, Q);
+ } ///< end of loop over top SP candidates
+ data.CmSp_ITK.clear();
+ }
+}
+
+void InDet::SiSpacePointsSeedMaker_ITK::newOneSeedWithCurvaturesComparisonPPP(EventData &data,
+ SiSpacePointForSeedITK *&SPb, SiSpacePointForSeedITK *&SP0, float Zob) const
+{
+
+ if (m_useSeedConfirmation)
+ {
+ newOneSeedWithCurvaturesComparisonSeedConfirmation(data, SPb, SP0, Zob);
+ }
+
+ else
+ {
+
+ static const float curvatureInterval = .00003;
+
+ /// sort common SP by curvature
+ if (data.CmSp_ITK.size() > 2)
+ std::sort(data.CmSp_ITK.begin(), data.CmSp_ITK.end(), comCurvatureITK());
+
+ std::vector<std::pair<float, InDet::SiSpacePointForSeedITK *>>::iterator it_otherSP;
+ std::vector<std::pair<float, InDet::SiSpacePointForSeedITK *>>::iterator it_commonTopSP = data.CmSp_ITK.begin(), ie = data.CmSp_ITK.end();
+ std::vector<std::pair<float, InDet::SiSpacePointForSeedITK *>>::iterator it_startInnerLoop = it_commonTopSP;
+
+ float Lt[4];
+
+ float Qmin = 1.e20;
+ float Rb = 2. * SPb->radius();
+ int NTc(2);
+ if (Rb > 280.)
+ NTc = 1;
+ SiSpacePointForSeedITK *SPmin = nullptr;
+ bool Qm = Rb < 120. || std::abs(Zob) > 150.;
+
+ /// check all possible common top SP
+ for (; it_commonTopSP != ie; ++it_commonTopSP)
+ {
+
+ SiSpacePointForSeedITK *SPt = (*it_commonTopSP).second;
+ int NT = 1;
+ Lt[0] = SPt->dR();
+ float seedIP = SPt->param();
+
+ /// form a curvature interval cut
+ float minCurvature = (*it_commonTopSP).first - curvatureInterval;
+ float maxCurvature = (*it_commonTopSP).first + curvatureInterval;
+
+ /**
+ * Now we look at the other SP candidates and try to find a confirmation seed,
+ * including the same centre/lower SP and giving a compatible curvature,
+ * but with the top SP in a different layer
+ **/
+
+ for (it_otherSP = it_startInnerLoop; it_otherSP != ie; ++it_otherSP)
+ {
+ /// if we are looking at the same SP, skip it
+ if (it_otherSP == it_commonTopSP)
+ continue;
+ /// if we have a lower curvature than the minimum, skip - and remember to
+ /// not bother with this candidate again later, as the vectors are curvature-sorted
+ if ((*it_otherSP).first < minCurvature)
+ {
+ it_startInnerLoop = it_otherSP;
+ ++it_startInnerLoop;
+ continue;
+ }
+ /// abort once the the curvature gets too large
+ if ((*it_otherSP).first > maxCurvature)
+ break;
+
+ float L = (*it_otherSP).second->dR();
+
+ int k = 0;
+ for (; k != NT; ++k)
+ {
+ if (std::abs(L - Lt[k]) < 20.)
+ break;
+ }
+ if (k == NT)
+ {
+ Lt[NT] = L;
+ if (++NT == 4)
+ break;
+ }
+ }
+
+ int dN = NT - NTc;
+ if (dN < 0 || (data.nOneSeeds && !dN))
+ continue;
+ if (Qm && !dN && seedIP > 1.)
+ continue;
+
+ // ITK seed quality used so far
+ float Q = 100. * seedIP + (std::abs(Zob) - float(NT) * 100.);
+ if (Q > SPb->quality() && Q > SP0->quality() && Q > SPt->quality())
+ continue;
+
+ if (dN)
+ newOneSeed(data, SPb, SP0, SPt, Zob, Q);
+ else if (Q < Qmin)
+ {
+ Qmin = Q;
+ SPmin = SPt;
+ }
+ } ///< end of loop over top SP candidates
+ if (SPmin && !data.nOneSeeds)
+ newOneSeed(data, SPb, SP0, SPmin, Zob, Qmin);
+ data.CmSp_ITK.clear();
+ }
}
-bool InDet::SiSpacePointsSeedMaker_ITK::getWriteNtupleBoolProperty() const{
- return false;
+void InDet::SiSpacePointsSeedMaker_ITK::newOneSeedWithCurvaturesComparisonSeedConfirmation(EventData &data,
+ SiSpacePointForSeedITK *&SPb, SiSpacePointForSeedITK *&SP0, float Zob) const
+{
+ static const float curvatureInterval = .00003;
+ bool bottomSPisPixel = !SPb->spacepoint->clusterList().second;
+ float bottomSPQuality = SPb->quality();
+ float centralSPQuality = SP0->quality();
+
+ /// sort common SP by curvature
+ if (data.CmSp_ITK.size() > 2)
+ std::sort(data.CmSp_ITK.begin(), data.CmSp_ITK.end(), comCurvatureITK());
+
+ float bottomR = SPb->radius();
+ float bottomZ = SPb->z();
+
+ std::vector<std::pair<float, InDet::SiSpacePointForSeedITK *>>::iterator it_otherSP;
+ std::vector<std::pair<float, InDet::SiSpacePointForSeedITK *>>::iterator it_commonTopSP = data.CmSp_ITK.begin(), ie = data.CmSp_ITK.end();
+ std::vector<std::pair<float, InDet::SiSpacePointForSeedITK *>>::iterator it_startInnerLoop = it_commonTopSP;
+
+ /// check all possible common top SP
+ for (; it_commonTopSP != ie; ++it_commonTopSP)
+ {
+
+ SiSpacePointForSeedITK *SPt = (*it_commonTopSP).second;
+ /// the seed quality is set to d0 initially
+ float seedIP = SPt->param();
+ float seedQuality = seedIP + SPt->scorePenalty();
+ float originalSeedQuality = seedQuality;
+
+ if (m_maxdImpact > 50)
+ { //This only applies to LRT
+
+ float topR = SPt->radius();
+ float topZ = SPt->z();
+
+ float Zot = std::abs(topR - bottomR) > 10e-9 ? bottomZ - (bottomR - originalSeedQuality) * ((topZ - bottomZ) / (topR - bottomR)) : bottomZ;
+
+ float theta1 = std::abs(topR - bottomR) > 10e-9 ? std::atan2(topR - bottomR, topZ - bottomZ) : 0.;
+ float eta1 = theta1 > 0 ? -std::log(std::tan(.5 * theta1)) : 0.;
+
+ float theta0 = seedIP > 0 ? std::atan2(seedIP, Zot) : 0;
+ float eta0 = theta0 > 0 ? -std::log(std::tan(.5 * theta0)) : 0.;
+
+ float deltaEta = std::abs(eta1 - eta0); //For LLP daughters, the direction of the track is correlated with the direction of the LLP (which is correlated with the direction of the point of closest approach
+ //calculate weighted average of d0 and deltaEta, normalized by their maximum values
+ float f = std::min(0.5, originalSeedQuality / 200.); //0.5 and 200 are parameters chosen from a grid scan to optimize efficiency
+ seedQuality *= (1 - f) / 300.;
+ seedQuality += f * deltaEta / 2.5;
+ }
+
+ bool topSPisPixel = !SPt->spacepoint->clusterList().second;
+
+ /// check the surface the hit is on
+ const Trk::Surface *surfaceTopSP = SPt->sur();
+ float radiusTopSP = SPt->radius();
+ /// form a curvature interval cut
+ float minCurvature = (*it_commonTopSP).first - curvatureInterval;
+ float maxCurvature = (*it_commonTopSP).first + curvatureInterval;
+
+ /** Note: The score modifiers used here have the purpose of separating the candidates into
+ * classes / groups disjoint from each other.
+ * So the score increment (200 by default) should exceed the maximum
+ * |d0| (base score) we expect to encounter to avoid overlap.
+ * For LRT, we may want to tune this!
+ **/
+
+ /// if we have a SSS seed, boost the quality score by 400
+ if (!bottomSPisPixel)
+ seedQuality += m_seedScoreBonusSSS;
+ /// if we have a PPP, boost the quality by 200
+ else if (topSPisPixel)
+ seedQuality += m_seedScoreBonusPPP;
+
+ /**
+ * Now we look at the other SP candidates and try to find a confirmation seed,
+ * including the same centre/lower SP and giving a compatible curvature,
+ * but with the top SP in a different layer
+ **/
+
+ for (it_otherSP = it_startInnerLoop; it_otherSP != ie; ++it_otherSP)
+ {
+ /// if we are looking at the same SP, skip it
+ if (it_otherSP == it_commonTopSP)
+ continue;
+ /// if we have a lower curvature than the minimum, skip - and remember to
+ /// not bother with this candidate again later, as the vectors are curvature-sorted
+ if ((*it_otherSP).first < minCurvature)
+ {
+ it_startInnerLoop = it_otherSP;
+ ++it_startInnerLoop;
+ continue;
+ }
+ /// abort once the the curvature gets too large
+ if ((*it_otherSP).first > maxCurvature)
+ break;
+ /// if both SP are on the surface, skip it
+ if ((*it_otherSP).second->sur() == surfaceTopSP)
+ continue;
+ /// if the other SP is too close to the current top one, skip
+ float radiusOtherSP = (*it_otherSP).second->radius();
+ if (std::abs(radiusOtherSP - radiusTopSP) < m_drminSeedConf)
+ continue;
+ // if we have a confirmation seed, we improve the score of the seed.
+ seedQuality += m_seedScoreBonusConfirmationSeed;
+ // apply confirmation bonus only once
+ break;
+ }
+
+ /// kick this seed candidate if the score is too high (lower values = better)
+ if (seedQuality > data.maxScore)
+ continue;
+
+ /// if we have PPS seeds and no confirmation SP exists (which would give the -200 bonus)
+ /// or the hits on this seed were already used on a higher quality PPP/SSS seed, kick this one
+ if (bottomSPisPixel != topSPisPixel)
+ {
+ if (seedQuality > 0. ||
+ (seedQuality > bottomSPQuality && seedQuality > centralSPQuality && seedQuality > SPt->quality()))
+ continue;
+ }
+ /// If we have a non-confirmed seed, apply a stricter d0 cut.
+ /// This, is determined using the original cut and the score penalty modifier.
+ if (!isConfirmedSeed(SPb, SPt, seedQuality))
+ {
+ /// PPP seeds
+ double maxdImpact = m_maxdImpact - (m_dImpactCutSlopeUnconfirmedPPP * SPt->scorePenalty());
+ /// SSS seeds
+ if (!bottomSPisPixel)
+ maxdImpact = m_maxdImpactSSS - (m_dImpactCutSlopeUnconfirmedSSS * SPt->scorePenalty());
+ if (seedIP > maxdImpact)
+ continue;
+ }
+ /// this is a good seed, save it (unless we have too many seeds per SP)
+ newOneSeed(data, SPb, SP0, SPt, Zob, seedQuality);
+ } ///< end of loop over top SP candidates
+ data.CmSp_ITK.clear();
+}
+
+bool InDet::SiSpacePointsSeedMaker_ITK::isConfirmedSeed(const InDet::SiSpacePointForSeedITK *bottomSP,
+ const InDet::SiSpacePointForSeedITK *topSP, float quality) const
+{
+
+ /// SSS seeds
+ if (bottomSP->spacepoint->clusterList().second)
+ {
+ return (quality < m_seedScoreThresholdSSSConfirmationSeed);
+ }
+ /// PPP seeds
+ else if (!topSP->spacepoint->clusterList().second)
+ {
+ return (quality < m_seedScoreThresholdPPPConfirmationSeed);
+ }
+ /// PPS: the confirmation is the only quality modifier applied
+ else
+ return (quality < 0.);
+}
+
+void InDet::SiSpacePointsSeedMaker_ITK::writeNtuple(const SiSpacePointsSeed* seed, const Trk::Track* track, int seedType, long eventNumber) const
+{
+ if(m_writeNtuple) {
+ std::lock_guard<std::mutex> lock(m_mutex);
+
+ if(track != nullptr) {
+ m_trackPt = (track->trackParameters()->front()->pT())/1000.f;
+ m_trackEta = std::abs(track->trackParameters()->front()->eta());
+ }
+ else {
+ m_trackPt = -1.;
+ m_trackEta = -1.;
+ }
+ m_d0 = seed->d0();
+ m_z0 = seed->zVertex();
+ m_eta = seed->eta();
+ m_x1 = seed->x1();
+ m_x2 = seed->x2();
+ m_x3 = seed->x3();
+ m_y1 = seed->y1();
+ m_y2 = seed->y2();
+ m_y3 = seed->y3();
+ m_z1 = seed->z1();
+ m_z2 = seed->z2();
+ m_z3 = seed->z3();
+ m_r1 = seed->r1();
+ m_r2 = seed->r2();
+ m_r3 = seed->r3();
+ m_type = seedType;
+ m_dzdr_b = seed->dzdr_b();
+ m_dzdr_t = seed->dzdr_t();
+ m_pt = seed->pt();
+ m_givesTrack = !(track == nullptr);
+ m_eventNumber = eventNumber;
+
+ m_outputTree->Fill();
+
+ }
+
+}
+
+bool InDet::SiSpacePointsSeedMaker_ITK::getWriteNtupleBoolProperty() const
+{
+ return m_writeNtuple;
}
--
GitLab
From a25eb891d5aaee2bff293854af0258662233bb72 Mon Sep 17 00:00:00 2001
From: Antonio De Maria <antonio.de.maria@cern.ch>
Date: Wed, 18 Aug 2021 18:57:19 +0000
Subject: [PATCH 146/272] adding Tag and Probe MET+tau triggers to the LS2_v1
menu (ATR-23507)
---
.../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 36 +++++++
.../share/ref_data_v1Dev_build.ref | 36 +++++++
.../python/HLTMenuConfig/Menu/LS2_v1.py | 22 +++++
.../HLTMenuConfig/Menu/MenuAlignmentTools.py | 1 +
.../HLTMenuConfig/Menu/SignatureDicts.py | 2 +-
.../Tau/TauChainConfiguration.py | 96 ++++++++++---------
.../HLTMenuConfig/Tau/TauMenuSequences.py | 55 ++++++-----
7 files changed, 179 insertions(+), 69 deletions(-)
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 3ada39a58ca1..413fc5f58891 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -8377,10 +8377,14 @@ HLT_tau160_mediumRNN_tracktwoMVABDT_L1TAU100:
eventCount: 0
HLT_tau160_mediumRNN_tracktwoMVABDT_L1eTAU100:
eventCount: 0
+HLT_tau160_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau160_mediumRNN_tracktwoMVATest_L1TAU100:
eventCount: 0
HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100:
eventCount: 0
+HLT_tau160_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau160_perf_tracktwoMVABDT_L1TAU100:
eventCount: 0
HLT_tau160_perf_tracktwoMVATest_L1TAU100:
@@ -8393,6 +8397,8 @@ HLT_tau160_ptonly_L1TAU100:
eventCount: 0
HLT_tau180_mediumRNN_tracktwoLLP_L1TAU100:
eventCount: 0
+HLT_tau180_mediumRNN_tracktwoLLP_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau180_tightRNN_tracktwoLLP_L1TAU100:
eventCount: 0
HLT_tau200_medium1_tracktwo_L1TAU100:
@@ -8407,6 +8413,10 @@ HLT_tau200_ptonly_L1TAU100:
eventCount: 0
HLT_tau200_tightRNN_tracktwoLLP_L1TAU100:
eventCount: 0
+HLT_tau20_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
+HLT_tau20_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau25_idperf_tracktwoMVABDT_L1TAU12IM:
eventCount: 13
stepCounts:
@@ -8509,6 +8519,8 @@ HLT_tau25_medium1_tracktwo_L1TAU12IM:
3: 9
4: 9
5: 5
+HLT_tau25_medium1_tracktwo_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau25_mediumRNN_tracktwoLLP_L1TAU12IM:
eventCount: 5
stepCounts:
@@ -8541,6 +8553,8 @@ HLT_tau25_mediumRNN_tracktwoMVABDT_L1eTAU12:
eventCount: 0
HLT_tau25_mediumRNN_tracktwoMVABDT_L1eTAU12M:
eventCount: 0
+HLT_tau25_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
? HLT_tau25_mediumRNN_tracktwoMVABDT_tau20_mediumRNN_tracktwoMVABDT_03dRAB_j70_0eta320_j50_0eta490_j0_DJMASS900j50_L1MJJ-500-NFF
: eventCount: 0
stepCounts:
@@ -8568,6 +8582,8 @@ HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM:
2: 22
3: 22
4: 5
+HLT_tau25_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_j70_0eta320_j50_0eta490_j0_DJMASS900j50_L1MJJ-500-NFF:
eventCount: 0
stepCounts:
@@ -8793,6 +8809,8 @@ HLT_tau35_mediumRNN_tracktwoMVABDT_L1eTAU20:
eventCount: 0
HLT_tau35_mediumRNN_tracktwoMVABDT_L1eTAU20M:
eventCount: 0
+HLT_tau35_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau35_mediumRNN_tracktwoMVABDT_tau25_mediumRNN_tracktwoMVABDT_03dRAB30_L1DR-TAU20ITAU12I-J25:
eventCount: 1
stepCounts:
@@ -8835,6 +8853,8 @@ HLT_tau35_mediumRNN_tracktwoMVA_L1TAU20IM:
2: 17
3: 17
4: 5
+HLT_tau35_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1DR-TAU20ITAU12I-J25:
eventCount: 1
stepCounts:
@@ -8952,6 +8972,8 @@ HLT_tau40_medium1_tracktwo_tau35_medium1_tracktwo_03dRAB_L1TAU25IM_2TAU20IM_2J25
1: 19
2: 19
3: 9
+HLT_tau40_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau40_mediumRNN_tracktwoMVABDT_tau35_mediumRNN_tracktwoMVABDT_03dRAB_L1TAU25IM_2TAU20IM_2J25_3J20:
eventCount: 0
stepCounts:
@@ -8965,6 +8987,8 @@ HLT_tau40_mediumRNN_tracktwoMVABDT_tau35_mediumRNN_tracktwoMVABDT_03dRAB_L1TAU25
2: 19
3: 19
4: 4
+HLT_tau40_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau40_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB_L1TAU25IM_2TAU20IM_2J25_3J20:
eventCount: 0
stepCounts:
@@ -9038,6 +9062,10 @@ HLT_tau50_mediumRNN_tracktwoMVA_xe80_tcpufit_xe50_cell_L1XE50:
3: 7
4: 1
5: 1
+HLT_tau60_mediumRNN_tracktwoLLP_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
+HLT_tau60_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau60_mediumRNN_tracktwoMVABDT_tau25_mediumRNN_tracktwoMVABDT_xe50_cell_03dRAB_L1TAU40_2TAU12IM_XE40:
eventCount: 0
stepCounts:
@@ -9051,6 +9079,8 @@ HLT_tau60_mediumRNN_tracktwoMVABDT_tau25_mediumRNN_tracktwoMVABDT_xe50_cell_03dR
2: 12
3: 12
4: 2
+HLT_tau60_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau60_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1TAU40_2TAU12IM_XE40:
eventCount: 0
stepCounts:
@@ -9086,6 +9116,8 @@ HLT_tau80_medium1_tracktwo_tau60_medium1_tracktwo_03dRAB_L1TAU60_2TAU40:
1: 7
2: 7
3: 1
+HLT_tau80_mediumRNN_tracktwoLLP_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau80_mediumRNN_tracktwoLLP_tau60_mediumRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40:
eventCount: 0
stepCounts:
@@ -9112,6 +9144,8 @@ HLT_tau80_mediumRNN_tracktwoLLP_tau60_tightRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40
2: 8
3: 8
4: 2
+HLT_tau80_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau80_mediumRNN_tracktwoMVABDT_tau35_mediumRNN_tracktwoMVABDT_03dRAB30_L1TAU60_DR-TAU20ITAU12I:
eventCount: 0
stepCounts:
@@ -9138,6 +9172,8 @@ HLT_tau80_mediumRNN_tracktwoMVABDT_tau60_mediumRNN_tracktwoMVABDT_03dRAB_L1TAU60
2: 8
3: 8
4: 2
+HLT_tau80_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau80_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB30_L1TAU60_DR-TAU20ITAU12I:
eventCount: 0
stepCounts:
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index e270fc1fa64a..f7432f4dcb0d 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -3355,10 +3355,14 @@ HLT_tau160_mediumRNN_tracktwoMVABDT_L1TAU100:
eventCount: 0
HLT_tau160_mediumRNN_tracktwoMVABDT_L1eTAU100:
eventCount: 0
+HLT_tau160_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau160_mediumRNN_tracktwoMVATest_L1TAU100:
eventCount: 0
HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100:
eventCount: 0
+HLT_tau160_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau160_perf_tracktwoMVABDT_L1TAU100:
eventCount: 0
HLT_tau160_perf_tracktwoMVATest_L1TAU100:
@@ -3371,6 +3375,8 @@ HLT_tau160_ptonly_L1TAU100:
eventCount: 0
HLT_tau180_mediumRNN_tracktwoLLP_L1TAU100:
eventCount: 0
+HLT_tau180_mediumRNN_tracktwoLLP_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau180_tightRNN_tracktwoLLP_L1TAU100:
eventCount: 0
HLT_tau200_medium1_tracktwo_L1TAU100:
@@ -3385,6 +3391,10 @@ HLT_tau200_ptonly_L1TAU100:
eventCount: 0
HLT_tau200_tightRNN_tracktwoLLP_L1TAU100:
eventCount: 0
+HLT_tau20_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
+HLT_tau20_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau25_idperf_tracktwoMVABDT_L1TAU12IM:
eventCount: 3
stepCounts:
@@ -3487,6 +3497,8 @@ HLT_tau25_medium1_tracktwo_L1TAU12IM:
3: 2
4: 2
5: 1
+HLT_tau25_medium1_tracktwo_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau25_mediumRNN_tracktwoLLP_L1TAU12IM:
eventCount: 2
stepCounts:
@@ -3517,6 +3529,8 @@ HLT_tau25_mediumRNN_tracktwoMVABDT_L1eTAU12:
eventCount: 0
HLT_tau25_mediumRNN_tracktwoMVABDT_L1eTAU12M:
eventCount: 0
+HLT_tau25_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
? HLT_tau25_mediumRNN_tracktwoMVABDT_tau20_mediumRNN_tracktwoMVABDT_03dRAB_j70_0eta320_j50_0eta490_j0_DJMASS900j50_L1MJJ-500-NFF
: eventCount: 0
stepFeatures:
@@ -3533,6 +3547,8 @@ HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM:
1: 3
2: 3
3: 3
+HLT_tau25_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_j70_0eta320_j50_0eta490_j0_DJMASS900j50_L1MJJ-500-NFF:
eventCount: 0
stepFeatures:
@@ -3717,6 +3733,8 @@ HLT_tau35_mediumRNN_tracktwoMVABDT_L1eTAU20:
eventCount: 0
HLT_tau35_mediumRNN_tracktwoMVABDT_L1eTAU20M:
eventCount: 0
+HLT_tau35_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau35_mediumRNN_tracktwoMVABDT_tau25_mediumRNN_tracktwoMVABDT_03dRAB30_L1DR-TAU20ITAU12I-J25:
eventCount: 0
HLT_tau35_mediumRNN_tracktwoMVABDT_tau25_mediumRNN_tracktwoMVABDT_03dRAB_L1TAU20IM_2TAU12IM_4J12p0ETA25:
@@ -3733,6 +3751,8 @@ HLT_tau35_mediumRNN_tracktwoMVA_L1TAU20IM:
1: 3
2: 3
3: 3
+HLT_tau35_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1DR-TAU20ITAU12I-J25:
eventCount: 0
HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1TAU20IM_2TAU12IM_4J12p0ETA25:
@@ -3813,8 +3833,12 @@ HLT_tau35_tightRNN_tracktwoMVA_L1TAU20IM:
3: 3
HLT_tau40_medium1_tracktwo_tau35_medium1_tracktwo_03dRAB_L1TAU25IM_2TAU20IM_2J25_3J20:
eventCount: 0
+HLT_tau40_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau40_mediumRNN_tracktwoMVABDT_tau35_mediumRNN_tracktwoMVABDT_03dRAB_L1TAU25IM_2TAU20IM_2J25_3J20:
eventCount: 0
+HLT_tau40_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau40_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB_L1TAU25IM_2TAU20IM_2J25_3J20:
eventCount: 0
HLT_tau50_mediumRNN_tracktwoMVABDT_xe80_pfopufit_xe50_cell_L1XE50:
@@ -3825,22 +3849,34 @@ HLT_tau50_mediumRNN_tracktwoMVA_xe80_pfopufit_xe50_cell_L1XE50:
eventCount: 0
HLT_tau50_mediumRNN_tracktwoMVA_xe80_tcpufit_xe50_cell_L1XE50:
eventCount: 0
+HLT_tau60_mediumRNN_tracktwoLLP_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
+HLT_tau60_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau60_mediumRNN_tracktwoMVABDT_tau25_mediumRNN_tracktwoMVABDT_xe50_cell_03dRAB_L1TAU40_2TAU12IM_XE40:
eventCount: 0
+HLT_tau60_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau60_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1TAU40_2TAU12IM_XE40:
eventCount: 0
HLT_tau80_medium1_tracktwo_tau35_medium1_tracktwo_03dRAB30_L1TAU60_DR-TAU20ITAU12I:
eventCount: 0
HLT_tau80_medium1_tracktwo_tau60_medium1_tracktwo_03dRAB_L1TAU60_2TAU40:
eventCount: 0
+HLT_tau80_mediumRNN_tracktwoLLP_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau80_mediumRNN_tracktwoLLP_tau60_mediumRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40:
eventCount: 0
HLT_tau80_mediumRNN_tracktwoLLP_tau60_tightRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40:
eventCount: 0
+HLT_tau80_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau80_mediumRNN_tracktwoMVABDT_tau35_mediumRNN_tracktwoMVABDT_03dRAB30_L1TAU60_DR-TAU20ITAU12I:
eventCount: 0
HLT_tau80_mediumRNN_tracktwoMVABDT_tau60_mediumRNN_tracktwoMVABDT_03dRAB_L1TAU60_2TAU40:
eventCount: 0
+HLT_tau80_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
HLT_tau80_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB30_L1TAU60_DR-TAU20ITAU12I:
eventCount: 0
HLT_tau80_mediumRNN_tracktwoMVA_tau60_mediumRNN_tracktwoMVA_03dRAB_L1TAU60_2TAU40:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 2272c8d226ac..fa357cfe5d86 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -890,6 +890,8 @@ def setupMenu():
]
TriggerFlags.CombinedSlice.signatures = TriggerFlags.CombinedSlice.signatures() + [
+
+
# Primary e-mu chains
ChainProp(name='HLT_e17_lhloose_mu14_L1EM15VH_MU10', l1SeedThresholds=['EM15VH','MU10'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup),
ChainProp(name='HLT_e7_lhmedium_mu24_L1MU20',l1SeedThresholds=['EM3','MU20'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup),
@@ -928,6 +930,26 @@ def setupMenu():
ChainProp(name='HLT_mu26_ivarmedium_tau100_mediumRNN_tracktwoLLP_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU60'], stream=[PhysicsStream], groups=TauJetGroup),
ChainProp(name='HLT_e26_lhtight_ivarloose_tau100_mediumRNN_tracktwoLLP_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU60'], stream=[PhysicsStream], groups=TauJetGroup),
+ # MET + tau tag and probe chains (ATR-23507)
+ ChainProp(name='HLT_tau25_medium1_tracktwo_probe_xe110_pfsum_vssk_L1XE50', l1SeedThresholds=['PROBETAU12IM','FSNOSEED'], groups=TagAndProbeLegGroup+TauMETGroup),
+ ChainProp(name='HLT_tau20_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50', l1SeedThresholds=['PROBETAU8','FSNOSEED'], groups=TagAndProbeLegGroup+TauMETGroup),
+ ChainProp(name='HLT_tau20_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50', l1SeedThresholds=['PROBETAU8','FSNOSEED'], groups=TagAndProbeLegGroup+TauMETGroup),
+ ChainProp(name='HLT_tau25_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50', l1SeedThresholds=['PROBETAU12IM','FSNOSEED'], groups=TagAndProbeLegGroup+TauMETGroup),
+ ChainProp(name='HLT_tau25_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50', l1SeedThresholds=['PROBETAU12IM','FSNOSEED'], groups=TagAndProbeLegGroup+TauMETGroup),
+ ChainProp(name='HLT_tau35_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50', l1SeedThresholds=['PROBETAU20IM','FSNOSEED'], groups=TagAndProbeLegGroup+TauMETGroup),
+ ChainProp(name='HLT_tau35_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50', l1SeedThresholds=['PROBETAU20IM','FSNOSEED'], groups=TagAndProbeLegGroup+TauMETGroup),
+ ChainProp(name='HLT_tau40_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50', l1SeedThresholds=['PROBETAU25IM','FSNOSEED'], groups=TagAndProbeLegGroup+TauMETGroup),
+ ChainProp(name='HLT_tau40_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50', l1SeedThresholds=['PROBETAU25IM','FSNOSEED'], groups=TagAndProbeLegGroup+TauMETGroup),
+ ChainProp(name='HLT_tau60_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50', l1SeedThresholds=['PROBETAU40','FSNOSEED'], groups=TagAndProbeLegGroup+TauMETGroup),
+ ChainProp(name='HLT_tau60_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50', l1SeedThresholds=['PROBETAU40','FSNOSEED'], groups=TagAndProbeLegGroup+TauMETGroup),
+ ChainProp(name='HLT_tau80_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50', l1SeedThresholds=['PROBETAU60','FSNOSEED'], groups=TagAndProbeLegGroup+TauMETGroup),
+ ChainProp(name='HLT_tau80_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50', l1SeedThresholds=['PROBETAU60','FSNOSEED'], groups=TagAndProbeLegGroup+TauMETGroup),
+ ChainProp(name='HLT_tau160_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50', l1SeedThresholds=['PROBETAU100','FSNOSEED'], groups=TagAndProbeLegGroup+TauMETGroup),
+ ChainProp(name='HLT_tau160_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50', l1SeedThresholds=['PROBETAU100','FSNOSEED'], groups=TagAndProbeLegGroup+TauMETGroup),
+ ChainProp(name='HLT_tau60_mediumRNN_tracktwoLLP_probe_xe110_pfsum_vssk_L1XE50', l1SeedThresholds=['PROBETAU40','FSNOSEED'], groups=TagAndProbeLegGroup+TauMETGroup),
+ ChainProp(name='HLT_tau80_mediumRNN_tracktwoLLP_probe_xe110_pfsum_vssk_L1XE50', l1SeedThresholds=['PROBETAU60','FSNOSEED'], groups=TagAndProbeLegGroup+TauMETGroup),
+ ChainProp(name='HLT_tau180_mediumRNN_tracktwoLLP_probe_xe110_pfsum_vssk_L1XE50', l1SeedThresholds=['PROBETAU100','FSNOSEED'], groups=TagAndProbeLegGroup+TauMETGroup),
+
# photon + multijets (ATR-22594)
ChainProp(name='HLT_g85_tight_3j50_L1EM22VHI',l1SeedThresholds=['EM22VHI','FSNOSEED'],stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaJetGroup),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuAlignmentTools.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuAlignmentTools.py
index fd107dde764d..515cd4db019d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuAlignmentTools.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuAlignmentTools.py
@@ -27,6 +27,7 @@ the_signature_grouping = OrderedDict([
('MuonnoL1', 'MuonnoL1'),
('Electronprobe', 'EgammaProbe'),
('Photonprobe' , 'EgammaProbe'),
+ ('Tauprobe', 'TauProbe'),
('Muonprobe' , 'MuonProbe'),
])
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
index 6103c8965b4a..5c46c6f3c19d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
@@ -388,7 +388,7 @@ TauChainParts = {
'multiplicity' : '',
'trigType' : ['tau'],
'trkInfo' : '',
- 'extra' : '',
+ 'extra' : ['probe'],
'recoAlg' : '',
'calib' : '',
'addInfo' : ['IdTest'],
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauChainConfiguration.py
index e5da8780b584..c1733989c55e 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauChainConfiguration.py
@@ -16,38 +16,38 @@ from TriggerMenuMT.HLTMenuConfig.Tau.TauMenuSequences import tauCaloMenuSeq, tau
#--------------------------------------------------------
# fragments generating config will be functions in new JO
#--------------------------------------------------------
-def getTauCaloCfg(flags):
- return tauCaloMenuSeq("Tau")
+def getTauCaloCfg(flags, is_probe_leg=False):
+ return tauCaloMenuSeq("Tau", is_probe_leg=is_probe_leg)
-def getTauCaloMVACfg(flags):
- return tauCaloMVAMenuSeq("Tau")
+def getTauCaloMVACfg(flags, is_probe_leg=False):
+ return tauCaloMVAMenuSeq("Tau", is_probe_leg=is_probe_leg)
-def getFTFCoreCfg(flags):
- return tauFTFTauCoreSeq()
+def getFTFCoreCfg(flags, is_probe_leg=False):
+ return tauFTFTauCoreSeq(is_probe_leg=is_probe_leg)
-def getFTFIsoCfg(flags):
- return tauFTFTauIsoSeq()
+def getFTFIsoCfg(flags, is_probe_leg=False):
+ return tauFTFTauIsoSeq(is_probe_leg=is_probe_leg)
-def getFTFIsoBDTCfg(flags):
- return tauFTFTauIsoBDTSeq()
+def getFTFIsoBDTCfg(flags, is_probe_leg=False):
+ return tauFTFTauIsoBDTSeq(is_probe_leg=is_probe_leg)
-def getTrackTwoPrecCfg(flags):
- return tauTrackTwoPrecSeq()
+def getTrackTwoPrecCfg(flags, is_probe_leg=False):
+ return tauTrackTwoPrecSeq(is_probe_leg=is_probe_leg)
-def getTrackTwoMVACfg(flags):
- return tauTrackTwoMVASeq()
+def getTrackTwoMVACfg(flags, is_probe_leg=False):
+ return tauTrackTwoMVASeq(is_probe_leg=is_probe_leg)
-def getTrackTwoMVATestCfg(flags):
- return tauTrackTwoMVATestSeq()
+def getTrackTwoMVATestCfg(flags, is_probe_leg=False):
+ return tauTrackTwoMVATestSeq(is_probe_leg=is_probe_leg)
-def getTrackTwoLLPCfg(flags):
- return tauTrackTwoLLPSeq()
+def getTrackTwoLLPCfg(flags, is_probe_leg=False):
+ return tauTrackTwoLLPSeq(is_probe_leg=is_probe_leg)
-def getPreSelTTCfg(flags):
- return tauPreSelTTSeq()
+def getPreSelTTCfg(flags, is_probe_leg=False):
+ return tauPreSelTTSeq(is_probe_leg=is_probe_leg)
-def getPrecTrackIsoCfg(flags):
- return tauPrecTrackIsoSeq()
+def getPrecTrackIsoCfg(flags, is_probe_leg=False):
+ return tauPrecTrackIsoSeq(is_probe_leg=is_probe_leg)
#############################################
### Class/function to configure muon chains
@@ -81,7 +81,11 @@ class TauChainConfiguration(ChainConfigurationBase):
key = self.chainPart['preselection']
steps=stepDictionary[key]
for step in steps:
- chainstep = getattr(self, step)()
+ is_probe_leg = self.chainPart['extra']=='probe'
+ if 'Empty' in step:
+ chainstep = getattr(self, step)()
+ else:
+ chainstep = getattr(self, step)(is_probe_leg=is_probe_leg)
chainSteps+=[chainstep]
myChain = self.buildChain(chainSteps)
@@ -89,19 +93,19 @@ class TauChainConfiguration(ChainConfigurationBase):
# --------------------
- def getCaloSeq(self):
+ def getCaloSeq(self, is_probe_leg=False):
stepName = 'tau'
- return self.getStep(1,stepName, [getTauCaloCfg])
+ return self.getStep(1,stepName, [getTauCaloCfg], is_probe_leg=is_probe_leg)
# --------------------
- def getCaloMVASeq(self):
+ def getCaloMVASeq(self, is_probe_leg=False):
stepName = 'MVA_tau'
- return self.getStep(1,stepName, [getTauCaloMVACfg])
+ return self.getStep(1,stepName, [getTauCaloMVACfg], is_probe_leg=is_probe_leg)
# --------------------
- def getFTFCore(self):
+ def getFTFCore(self, is_probe_leg=False):
stepName = 'FTFCore_tau'
- return self.getStep(2,stepName, [getFTFCoreCfg])
+ return self.getStep(2,stepName, [getFTFCoreCfg], is_probe_leg=is_probe_leg)
# --------------------
def getFTFEmpty(self):
@@ -109,14 +113,14 @@ class TauChainConfiguration(ChainConfigurationBase):
return self.getEmptyStep(2,stepName)
# --------------------
- def getFTFIso(self):
+ def getFTFIso(self, is_probe_leg=False):
stepName = 'FTFIso_tau'
- return self.getStep(3,stepName, [getFTFIsoCfg])
+ return self.getStep(3,stepName, [getFTFIsoCfg], is_probe_leg=is_probe_leg)
# --------------------
- def getFTFIsoBDT(self):
+ def getFTFIsoBDT(self, is_probe_leg=False):
stepName = 'FTFIsoBDT_tau'
- return self.getStep(3,stepName, [getFTFIsoBDTCfg])
+ return self.getStep(3,stepName, [getFTFIsoBDTCfg], is_probe_leg=is_probe_leg)
# --------------------
def getTrkEmpty(self):
@@ -124,9 +128,9 @@ class TauChainConfiguration(ChainConfigurationBase):
return self.getEmptyStep(3,stepName)
# --------------------
- def getPreSelTT(self):
+ def getPreSelTT(self, is_probe_leg=False):
stepName = 'PreSelTT_tau'
- return self.getStep(4,stepName, [getPreSelTTCfg])
+ return self.getStep(4,stepName, [getPreSelTTCfg], is_probe_leg=is_probe_leg)
# --------------------
def getTauEmpty(self):
@@ -134,9 +138,9 @@ class TauChainConfiguration(ChainConfigurationBase):
return self.getEmptyStep(4,stepName)
# --------------------
- def getPrecTrackIso(self):
+ def getPrecTrackIso(self, is_probe_leg=False):
stepName = 'PrecTrkIso_tau'
- return self.getStep(5,stepName,[getPrecTrackIsoCfg])
+ return self.getStep(5,stepName,[getPrecTrackIsoCfg],is_probe_leg=is_probe_leg)
# --------------------
def getPTEmpty(self):
@@ -144,24 +148,24 @@ class TauChainConfiguration(ChainConfigurationBase):
return self.getEmptyStep(5,stepName)
# --------------------
- def getTrackTwoPrec(self):
+ def getTrackTwoPrec(self, is_probe_leg=False):
stepName = 'TrkTwo_tau'
- return self.getStep(6,stepName, [getTrackTwoPrecCfg])
+ return self.getStep(6,stepName, [getTrackTwoPrecCfg],is_probe_leg=is_probe_leg)
# --------------------
- def getTrackTwoMVA(self):
+ def getTrackTwoMVA(self, is_probe_leg=False):
stepName = "TrkTwoMVA_tau"
- return self.getStep(6,stepName,[getTrackTwoMVACfg])
+ return self.getStep(6,stepName,[getTrackTwoMVACfg],is_probe_leg=is_probe_leg)
- # --------------------
- def getTrackTwoMVATest(self):
+ # --------------------
+ def getTrackTwoMVATest(self, is_probe_leg=False):
stepName = "TrkTwoMVATest_tau"
- return self.getStep(6,stepName,[getTrackTwoMVATestCfg])
+ return self.getStep(6,stepName,[getTrackTwoMVATestCfg],is_probe_leg=is_probe_leg)
# --------------------
- def getTrackTwoLLP(self):
+ def getTrackTwoLLP(self, is_probe_leg=False):
stepName = "TrkTwoLLP_tau"
- return self.getStep(6,stepName,[getTrackTwoLLPCfg])
+ return self.getStep(6,stepName,[getTrackTwoLLPCfg],is_probe_leg=is_probe_leg)
# --------------------
def getIDEmpty(self):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauMenuSequences.py
index 1b3a5ce1073e..8abf81cd9782 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauMenuSequences.py
@@ -13,7 +13,7 @@ from TriggerMenuMT.HLTMenuConfig.Tau.TauRecoSequences import tauCaloSequence, ta
# Calo step
# ===============================================================================================
-def tauCaloMenuSeq(name):
+def tauCaloMenuSeq(name, is_probe_leg=False):
(sequence, tauCaloViewsMaker, sequenceOut) = RecoFragmentsPool.retrieve(tauCaloSequence,ConfigFlags)
# hypo
@@ -26,13 +26,14 @@ def tauCaloMenuSeq(name):
return MenuSequence( Sequence = sequence,
Maker = tauCaloViewsMaker,
Hypo = theTauCaloHypo,
- HypoToolGen = TrigL2TauHypoToolFromDict )
+ HypoToolGen = TrigL2TauHypoToolFromDict,
+ IsProbe = is_probe_leg )
# ===============================================================================================
# Calo MVA step
# ===============================================================================================
-def tauCaloMVAMenuSeq(name):
+def tauCaloMVAMenuSeq(name, is_probe_leg=False):
(sequence, tauCaloMVAViewsMaker, sequenceOut) = RecoFragmentsPool.retrieve(tauCaloMVASequence,ConfigFlags)
# hypo
@@ -45,13 +46,14 @@ def tauCaloMVAMenuSeq(name):
return MenuSequence( Sequence = sequence,
Maker = tauCaloMVAViewsMaker,
Hypo = theTauCaloMVAHypo,
- HypoToolGen = TrigL2TauHypoToolFromDict )
+ HypoToolGen = TrigL2TauHypoToolFromDict,
+ IsProbe = is_probe_leg )
# ===============================================================================================
# Fast track finder (core) + TrackRoI Updater + RejectEmpty Hypo step (tracktwo, tracktwoMVA)
# ===============================================================================================
-def tauFTFTauCoreSeq():
+def tauFTFTauCoreSeq(is_probe_leg=False):
(sequence, ftfCoreViewsMaker, sequenceOut) = RecoFragmentsPool.retrieve(tauFTFCoreSequence,ConfigFlags)
from TrigTauHypo.TrigTauHypoConf import TrigTrackPreSelHypoAlg
@@ -63,13 +65,14 @@ def tauFTFTauCoreSeq():
return MenuSequence( Sequence = sequence,
Maker = ftfCoreViewsMaker,
Hypo = fastTrkHypo,
- HypoToolGen = TrigTauTrackHypoToolFromDict )
+ HypoToolGen = TrigTauTrackHypoToolFromDict,
+ IsProbe = is_probe_leg )
# ===============================================================================================
# Fast track finder (iso) + Dummy Hypo step (tracktwo, tracktwoMVA)
# ===============================================================================================
-def tauFTFTauIsoSeq():
+def tauFTFTauIsoSeq(is_probe_leg=False):
(sequence, ftfIsoViewsMaker, sequenceOut) = RecoFragmentsPool.retrieve(tauFTFIsoSequence,ConfigFlags )
from TrigTauHypo.TrigTauHypoConf import TrigTrackPreSelHypoAlg
@@ -81,13 +84,14 @@ def tauFTFTauIsoSeq():
return MenuSequence( Sequence = sequence,
Maker = ftfIsoViewsMaker,
Hypo = fastTrkHypo,
- HypoToolGen = TrigTauTrackHypoToolFromDict )
+ HypoToolGen = TrigTauTrackHypoToolFromDict,
+ IsProbe = is_probe_leg )
# ===============================================================================================
# Fast track finder (iso bdt) + Dummy Hypo step (tracktwoMVABDT)
# ===============================================================================================
-def tauFTFTauIsoBDTSeq():
+def tauFTFTauIsoBDTSeq(is_probe_leg=False):
(sequence, ftfIsoBDTViewsMaker, sequenceOut) = RecoFragmentsPool.retrieve(tauFTFIsoBDTSequence,ConfigFlags )
from TrigTauHypo.TrigTauHypoConf import TrigTrackPreSelHypoAlg
@@ -100,13 +104,14 @@ def tauFTFTauIsoBDTSeq():
return MenuSequence( Sequence = sequence,
Maker = ftfIsoBDTViewsMaker,
Hypo = fastTrkHypo,
- HypoToolGen = TrigTauTrackHypoToolFromDict )
+ HypoToolGen = TrigTauTrackHypoToolFromDict,
+ IsProbe = is_probe_leg )
# ===============================================================================================
# Tau Precision Alg + EFMVHypo step (tracktwo)
# ===============================================================================================
-def tauTrackTwoPrecSeq():
+def tauTrackTwoPrecSeq(is_probe_leg=False):
(sequence, trackTwoViewsMaker, sequenceOut) = RecoFragmentsPool.retrieve(tauTrackTwoSequence,ConfigFlags )
from TrigTauHypo.TrigTauHypoConf import TrigEFTauMVHypoAlg
@@ -118,13 +123,14 @@ def tauTrackTwoPrecSeq():
return MenuSequence( Sequence = sequence,
Maker = trackTwoViewsMaker,
Hypo = precisionHypo,
- HypoToolGen = TrigEFTauMVHypoToolFromDict )
+ HypoToolGen = TrigEFTauMVHypoToolFromDict,
+ IsProbe = is_probe_leg )
# ===============================================================================================
# Tau Precision MVA Alg + EFMVHypo step (tracktwoMVA)
# ===============================================================================================
-def tauTrackTwoMVASeq():
+def tauTrackTwoMVASeq(is_probe_leg=False):
(sequence, mvaViewsMaker, sequenceOut) = RecoFragmentsPool.retrieve(tauMVASequence,ConfigFlags )
from TrigTauHypo.TrigTauHypoConf import TrigEFTauMVHypoAlg
@@ -136,13 +142,14 @@ def tauTrackTwoMVASeq():
return MenuSequence( Sequence = sequence,
Maker = mvaViewsMaker,
Hypo = precisionHypo,
- HypoToolGen = TrigEFTauMVHypoToolFromDict )
+ HypoToolGen = TrigEFTauMVHypoToolFromDict,
+ IsProbe = is_probe_leg )
# ===============================================================================================
# Tau Precision MVA Alg + EFMVHypo test step (tracktwoMVATest)
# ===============================================================================================
-def tauTrackTwoMVATestSeq():
+def tauTrackTwoMVATestSeq(is_probe_leg=False):
(sequence, mvaViewsMaker, sequenceOut) = RecoFragmentsPool.retrieve(tauMVASequence,ConfigFlags )
from TrigTauHypo.TrigTauHypoConf import TrigEFTauMVHypoAlg
@@ -154,13 +161,14 @@ def tauTrackTwoMVATestSeq():
return MenuSequence( Sequence = sequence,
Maker = mvaViewsMaker,
Hypo = precisionHypo,
- HypoToolGen = TrigEFTauMVHypoToolFromDict )
+ HypoToolGen = TrigEFTauMVHypoToolFromDict,
+ IsProbe = is_probe_leg )
# ===============================================================================================
# Tau Precision LLP Alg + EFMVHypo step (tracktwoLLP)
# ===============================================================================================
-def tauTrackTwoLLPSeq():
+def tauTrackTwoLLPSeq(is_probe_leg=False):
(sequence, mvaViewsMaker, sequenceOut) = RecoFragmentsPool.retrieve(tauLLPSequence,ConfigFlags )
from TrigTauHypo.TrigTauHypoConf import TrigEFTauMVHypoAlg
@@ -172,13 +180,14 @@ def tauTrackTwoLLPSeq():
return MenuSequence( Sequence = sequence,
Maker = mvaViewsMaker,
Hypo = precisionHypo,
- HypoToolGen = TrigEFTauMVHypoToolFromDict )
+ HypoToolGen = TrigEFTauMVHypoToolFromDict,
+ IsProbe = is_probe_leg )
# ===============================================================================================
# Tau Preselection + EFMVHypo step (tracktwo)
# ===============================================================================================
-def tauPreSelTTSeq():
+def tauPreSelTTSeq(is_probe_leg=False):
(sequence, preSelViewsMaker, sequenceOut) = RecoFragmentsPool.retrieve(tauPreSelTTSequence,ConfigFlags )
from TrigTauHypo.TrigTauHypoConf import TrigEFTauMVHypoAlg
@@ -190,13 +199,14 @@ def tauPreSelTTSeq():
return MenuSequence( Sequence = sequence,
Maker = preSelViewsMaker,
Hypo = preSelHypo,
- HypoToolGen = TrigPresTauMVHypoToolFromDict )
+ HypoToolGen = TrigPresTauMVHypoToolFromDict,
+ IsProbe = is_probe_leg)
# ===============================================================================================
# Precision Tracking + TrkPrecHypo step (tracktwo, tracktwoEF, tracktwoMVA, tracktwoMVABDT)
# ===============================================================================================
-def tauPrecTrackIsoSeq():
+def tauPrecTrackIsoSeq(is_probe_leg=False):
(sequence, precTrackViewsMaker, sequenceOut) = RecoFragmentsPool.retrieve(tauPrecIsoTrackSequence,ConfigFlags )
from TrigTauHypo.TrigTauHypoConf import TrigTrkPrecHypoAlg
@@ -209,4 +219,5 @@ def tauPrecTrackIsoSeq():
return MenuSequence( Sequence = sequence,
Maker = precTrackViewsMaker,
Hypo = precTrkHypo,
- HypoToolGen = TrigTrkPrecHypoToolFromDict )
+ HypoToolGen = TrigTrkPrecHypoToolFromDict,
+ IsProbe = is_probe_leg )
--
GitLab
From 65fa66ebac1e9eef8ab5cb194f62fc204c7daa95 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Wed, 18 Aug 2021 21:08:45 +0200
Subject: [PATCH 147/272] TrigDecisionMaker: remove usage of LVL1ConfigSvc
`TrigDecisionMakerMT`: use `ReadHandle` for accessing `L1BunchGroupSet`
and use the new `bgPattern` method for getting the bunchgroup bit mask.
`TrigDecisionMaker`: migrate to Run-3 menu access
Also apply a temporary fix to avoid undefined behavior when storing the
16 possible bunchgroups in a 8 bit `char` (ATR-24030).
---
.../TrigDecisionMaker/CMakeLists.txt | 2 +-
.../src/TrigDecisionMaker.cxx | 49 ++++++-------------
.../TrigDecisionMaker/src/TrigDecisionMaker.h | 13 ++---
.../src/TrigDecisionMakerMT.cxx | 43 +++++-----------
.../src/TrigDecisionMakerMT.h | 6 +--
.../TriggerJobOpts/share/runHLT_standalone.py | 1 +
6 files changed, 36 insertions(+), 78 deletions(-)
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/CMakeLists.txt b/Trigger/TrigAnalysis/TrigDecisionMaker/CMakeLists.txt
index 53f81b265fe2..30f27a7281d2 100644
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/CMakeLists.txt
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/CMakeLists.txt
@@ -18,7 +18,7 @@ atlas_add_component( TrigDecisionMaker
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps EventInfo GaudiKernel TrigConfData TrigConfHLTData TrigConfInterfaces TrigConfL1Data TrigDecisionEvent TrigDecisionMakerLib TrigOutputHandlingLib TrigSteeringEvent TrigT1Interfaces TrigT1Result xAODEventInfo xAODTrigger )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps EventInfo GaudiKernel TrigConfData TrigConfHLTData TrigDecisionEvent TrigDecisionMakerLib TrigOutputHandlingLib TrigSteeringEvent TrigT1Interfaces TrigT1Result xAODEventInfo xAODTrigger )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMaker.cxx b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMaker.cxx
index 177fd190a827..532d2fd32339 100644
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMaker.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMaker.cxx
@@ -28,8 +28,7 @@
#include "TrigSteeringEvent/Lvl1Result.h"
-#include "TrigConfInterfaces/ITrigConfigSvc.h"
-#include "TrigConfL1Data/BunchGroupSet.h"
+#include "TrigConfData/L1BunchGroupSet.h"
// all Trigger EDM ()
@@ -39,7 +38,6 @@ using namespace TrigDec;
TrigDecisionMaker::TrigDecisionMaker(const std::string &name, ISvcLocator *pSvcLocator)
: AthReentrantAlgorithm(name, pSvcLocator),
- m_trigConfigSvc("TrigConf::TrigConfigSvc/TrigConfigSvc", name),
m_nEvents(0),
m_l1_error(0), m_l2_error(0), m_ef_error(0),
m_hlt_error(0),
@@ -51,7 +49,6 @@ TrigDecisionMaker::TrigDecisionMaker(const std::string &name, ISvcLocator *pSvcL
m_l1_passed(0), m_l2_passed(0), m_ef_passed(0),
m_hlt_passed(0)
{
- declareProperty("TrigConfigSvc", m_trigConfigSvc, "Trigger config service");
}
@@ -94,8 +91,9 @@ StatusCode TrigDecisionMaker::initialize()
ATH_MSG_DEBUG ( " TrigHLTResultKey= " << m_hltResultKey ) ;
ATH_CHECK( m_lvl1Tool.retrieve() );
- ATH_CHECK( m_trigConfigSvc.retrieve() );
+ ATH_CHECK( m_bgKey.initialize() );
+ ATH_CHECK( m_HLTMenuKey.initialize() );
ATH_CHECK( m_trigDecisionKey.initialize() );
ATH_CHECK( m_l1ResultKey.initialize(m_doL1) );
ATH_CHECK( m_l1roibResultKey.initialize(m_doL1) );
@@ -196,7 +194,9 @@ StatusCode TrigDecisionMaker::execute(const EventContext& ctx) const
std::unique_ptr<TrigDecision> trigDec = std::make_unique<TrigDecision>();
- trigDec->m_configMasterKey = m_trigConfigSvc->masterKey();
+ SG::ReadHandle<TrigConf::HLTMenu> hltMenu(m_HLTMenuKey, ctx);
+ ATH_CHECK( hltMenu.isValid() );
+ trigDec->m_configMasterKey = hltMenu->smk();
if (l1Result) trigDec->m_l1_result = *l1Result;
if (l2Result) trigDec->m_l2_result = *l2Result;
@@ -204,15 +204,20 @@ StatusCode TrigDecisionMaker::execute(const EventContext& ctx) const
if (hltResult){
trigDec->m_ef_result = *hltResult;//store the merged result into ef_result to propagate with getEFResult
}
- // std::cout << "Acc state: " << l2Result->isAccepted() << " " << trigDec->m_l2_result.isAccepted() << std::endl;
-
// get the bunch crossing id
ATH_MSG_DEBUG ( "Run " << ctx.eventID().run_number()
<< "; Event " << ctx.eventID().event_number()
<< "; BC-ID " << ctx.eventID().bunch_crossing_id() ) ;
- char x = getBGByte(ctx.eventID().bunch_crossing_id());
- trigDec->m_bgCode = x;
+
+ const TrigConf::L1BunchGroupSet* l1bgs = SG::get(m_bgKey, ctx);
+ if (l1bgs) {
+ // We currently only support 8 bits/bunchgroups (ATR-24030)
+ trigDec->m_bgCode = static_cast<char>(l1bgs->bgPattern(ctx.eventID().bunch_crossing_id()));
+ }
+ else {
+ ATH_MSG_WARNING("Could not read " << m_bgKey);
+ }
SG::WriteHandle<TrigDecision> writeHandle{m_trigDecisionKey, ctx};
if (writeHandle.record(std::move(trigDec)).isFailure()) {
@@ -293,27 +298,3 @@ TrigDecisionMaker::ResultStatus TrigDecisionMaker::getHLTResult(const HLT::HLTRe
return OK;
}
-
-
-char TrigDecisionMaker::getBGByte(int BCId) const {
-
- const TrigConf::BunchGroupSet* bgs = m_trigConfigSvc->bunchGroupSet();
- if(!bgs) {
- ATH_MSG_WARNING ( " Could not get BunchGroupSet to calculate BGByte" ) ;
- return 0;
- }
-
- // if(bgs->bunchGroups().size()!=8) {
- // (*m_log) << MSG::WARNING << " Did not find 8 bunchgroups in the set (actual number of BGs is "
- // << bgs->bunchGroups().size()
- // << ")" << endmsg;
- // return 0;
- // }
-
- if((unsigned int)BCId>=bgs->bgPattern().size()) {
- ATH_MSG_WARNING ( " Could not return BGCode for BCid " << BCId << ", since size of BGpattern is " << bgs->bgPattern().size() ) ;
- return 0;
- }
-
- return bgs->bgPattern()[BCId];
-}
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMaker.h b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMaker.h
index 630afb3d4071..01e848626226 100644
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMaker.h
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMaker.h
@@ -34,6 +34,8 @@
#include "TrigDecisionMaker/ILvl1ResultAccessTool.h"
#include "TrigDecisionEvent/TrigDecision.h"
#include "TrigT1Result/RoIBResult.h"
+#include "TrigConfData/L1BunchGroupSet.h"
+#include "TrigConfData/HLTMenu.h"
#include <vector>
#include <string>
@@ -47,10 +49,6 @@ namespace LVL1CTP {
class Lvl1Result;
}
-namespace TrigConf {
- class ITrigConfigSvc;
-}
-
namespace TrigDec {
/**
@@ -88,8 +86,6 @@ namespace TrigDec {
ResultStatus getL1Result (const LVL1CTP::Lvl1Result*& result, const EventContext& ctx) const; //!< retrieve LVL1 result (called in execute)
ResultStatus getHLTResult(const HLT::HLTResult*& result, TrigLevel level, const EventContext& ctx) const; //!< retrieve HLT results (called in execute)
- char getBGByte(int BCId) const; //!< to get the BG byte encoded for a given BC
-
private:
Gaudi::Property<bool> m_doL1{this, "doL1", true, "flag whether or not to consider L1 trigger information"};
@@ -97,8 +93,8 @@ namespace TrigDec {
Gaudi::Property<bool> m_doEF{this, "doEF", true, "flag whether or not to consider L3 (EF) trigger information"};
Gaudi::Property<bool> m_doHLT{this, "doHLT", true, "flag whether or not to consider merged L2EF=HLT trigger information"};
-// bool m_doEvtInfo;
-
+ SG::ReadHandleKey<TrigConf::L1BunchGroupSet> m_bgKey{this, "L1BunchGroup", "DetectorStore+L1BunchGroup", "L1BunchGroupSet key name"};
+ SG::ReadHandleKey<TrigConf::HLTMenu> m_HLTMenuKey{this, "HLTTriggerMenu", "DetectorStore+HLTTriggerMenu", "HLT Menu key"};
SG::WriteHandleKey<TrigDecision> m_trigDecisionKey{this, "TrigDecisionKey", "TrigDecision", "SG key to save the TrigDecision object" };
SG::ReadHandleKey<ROIB::RoIBResult> m_l1roibResultKey{this, "L1ROIBResultKey", "RoIBResult", "SK key to retrieve the L1 ROIB result from SG" };
SG::ReadHandleKey<LVL1CTP::Lvl1Result> m_l1ResultKey{this, "L1ResultKey", "Lvl1Result", "SK key to retrieve the L1 result from SG" };
@@ -106,7 +102,6 @@ namespace TrigDec {
SG::ReadHandleKey<HLT::HLTResult> m_efResultKey{this, "EFResultKey", "HLTResult_EF", "SK key to retrieve the EF result from SG" };
SG::ReadHandleKey<HLT::HLTResult> m_hltResultKey{this, "HLTResultKey", "HLTResult_HLT", " SK key to retrieve the merged HLT result from SG" };
- ServiceHandle<TrigConf::ITrigConfigSvc> m_trigConfigSvc; //!< handle to the full (L1 & HLT) trigger config service
ToolHandle<HLT::ILvl1ResultAccessTool> m_lvl1Tool{this, "Lvl1ResultAccessTool", "HLT::Lvl1ResultAccessTool/Lvl1ResultAccessTool", "L1 tool to fetch"}; //!< tool to ease the access to the L1 results (RoIs, items, etc)
// For statistics
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.cxx b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.cxx
index 3007a5d9d5b1..18d184651f23 100644
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.cxx
@@ -23,8 +23,6 @@
#include "xAODTrigger/TrigDecisionAuxInfo.h"
-#include "TrigConfData/L1BunchGroupSet.h"
-
#include <boost/dynamic_bitset.hpp>
TrigDec::TrigDecisionMakerMT::TrigDecisionMakerMT(const std::string &name, ISvcLocator *pSvcLocator)
@@ -49,7 +47,8 @@ TrigDec::TrigDecisionMakerMT::initialize()
}
ATH_CHECK( m_hltResultKeyIn.initialize(resultObjectIsUsed) ); // If false, this removes the ReadHandle
- ATH_CHECK(m_HLTMenuKey.initialize());
+ ATH_CHECK( m_bgKey.initialize() );
+ ATH_CHECK( m_HLTMenuKey.initialize() );
ATH_CHECK( m_ROIBResultKeyIn.initialize() );
ATH_CHECK( m_EventInfoKeyIn.initialize() );
@@ -164,12 +163,19 @@ TrigDec::TrigDecisionMakerMT::execute(const EventContext &context) const
// get the bunch crossing id
const xAOD::EventInfo* eventInfo = SG::get(m_EventInfoKeyIn, context);
- const char bgByte = getBGByte(eventInfo->bcid());
- trigDec->setBGCode(bgByte);
+ const TrigConf::L1BunchGroupSet* l1bgs = SG::get(m_bgKey, context);
+ if (l1bgs) {
+ // We currently only support 8 bits/bunchgroups (ATR-24030)
+ trigDec->setBGCode( static_cast<char>(l1bgs->bgPattern(eventInfo->bcid())) );
+ }
+ else {
+ ATH_MSG_WARNING("Could not read " << m_bgKey);
+ }
+
ATH_MSG_DEBUG ( "Run '" << eventInfo->runNumber()
<< "'; Event '" << eventInfo->eventNumber()
<< "'; BCID '" << eventInfo->bcid()
- << "'; BG Code '" << (size_t)bgByte << "'" ) ;
+ << "'; BG Code '" << trigDec->bgCode() << "'" ) ;
ATH_MSG_DEBUG ("Decision object dump: " << *(trigDec.get()));
auto trigDecWriteHandle = SG::makeHandle( m_trigDecisionKeyOut, context );
@@ -199,28 +205,3 @@ TrigDec::TrigDecisionMakerMT::getL1Result(const LVL1CTP::Lvl1Result *&result, co
return StatusCode::SUCCESS;
}
-
-char TrigDec::TrigDecisionMakerMT::getBGByte(unsigned int bcId) const
-{
- if (bcId >= 3564) { // LHC has 3564 bunch crossings
- ATH_MSG_WARNING("Could not return BGCode for bunch crossing ID " << bcId << ", which is outside allowed range 0..3563 ");
- return 0;
- }
-
- const TrigConf::L1BunchGroupSet *l1bgs = nullptr;
- detStore()->retrieve(l1bgs).ignore();
- if (l1bgs) {
- char bgword = 0;
- for (size_t i = 0; i < l1bgs->maxNBunchGroups(); ++i) {
- auto bg = l1bgs->getBunchGroup(i);
- if (bg->contains(bcId)) {
- bgword += 1 << i;
- }
- }
- return bgword;
- }
- else {
- ATH_MSG_WARNING("Did not find L1BunchGroupSet in DetectorStore");
- return 0;
- }
-}
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.h b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.h
index 3bc06fe2e5b0..ee76e08e2bf9 100644
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.h
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.h
@@ -34,6 +34,7 @@
#include "TrigT1Result/RoIBResult.h"
#include "TrigSteeringEvent/HLTResultMT.h"
#include "TrigOutputHandling/ITriggerBitsMakerTool.h"
+#include "TrigConfData/L1BunchGroupSet.h"
#include "TrigConfData/HLTMenu.h"
// containers
@@ -75,8 +76,6 @@ namespace TrigDec {
StatusCode getL1Result (const LVL1CTP::Lvl1Result*& result, const EventContext& context) const; //!< retrieve LVL1 result (called in execute)
- char getBGByte(unsigned int BCId) const; //!< to get the BG byte encoded for a given BC
-
Gaudi::Property<bool> m_doL1{this, "doL1", true, "Read L1 trigger information"};
Gaudi::Property<bool> m_doHLT{this, "doHLT", true, "Read HLT trigger information"};
@@ -86,7 +85,8 @@ namespace TrigDec {
ToolHandle<ITriggerBitsMakerTool> m_bitsMakerTool{this, "BitsMakerTool", "", "Tool to create trigger bits for MC"};
// Input keys configuration
- SG::ReadHandleKey<TrigConf::HLTMenu> m_HLTMenuKey{this, "HLTTriggerMenu", "DetectorStore+HLTTriggerMenu", "HLT Menu key, for use if IsJSONConfig=True"};
+ SG::ReadHandleKey<TrigConf::L1BunchGroupSet> m_bgKey{this, "L1BunchGroup", "DetectorStore+L1BunchGroup", "L1BunchGroupSet key name"};
+ SG::ReadHandleKey<TrigConf::HLTMenu> m_HLTMenuKey{this, "HLTTriggerMenu", "DetectorStore+HLTTriggerMenu", "HLT Menu key"};
SG::ReadHandleKey<HLT::HLTResultMT> m_hltResultKeyIn {this, "HLTResultMT", "HLTResultMT", "Key of the HLTResultMT object to get bits from online bytestream" };
SG::ReadHandleKey<ROIB::RoIBResult> m_ROIBResultKeyIn {this, "RoIBResult", "RoIBResult", "RoIB Result Object Key"};
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
index 6e764addafa2..2e34bb76a990 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
@@ -522,6 +522,7 @@ svcMgr += conf2toConfigurable( getHLTConfigSvc(ConfigFlags) )
# ---------------------------------------------------------------
if hasattr(topSequence,"SGInputLoader"):
topSequence.SGInputLoader.Load += [
+ ('TrigConf::L1BunchGroupSet','DetectorStore+L1BunchGroup'),
('TrigConf::L1Menu','DetectorStore+L1TriggerMenu'),
('TrigConf::HLTMenu','DetectorStore+HLTTriggerMenu')]
--
GitLab
From d0350b436638f3844a8665ef77834bd106d899d2 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Tue, 17 Aug 2021 22:46:41 +0200
Subject: [PATCH 148/272] RecExCommon: Fix myTopOptions.
Fix myTopToptions.py example to work in current master.
---
Reconstruction/RecExample/RecExCommon/share/myTopOptions.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Reconstruction/RecExample/RecExCommon/share/myTopOptions.py b/Reconstruction/RecExample/RecExCommon/share/myTopOptions.py
index 6e4b80e98689..037c315da236 100755
--- a/Reconstruction/RecExample/RecExCommon/share/myTopOptions.py
+++ b/Reconstruction/RecExample/RecExCommon/share/myTopOptions.py
@@ -22,6 +22,8 @@ InDetFlags.doSecVertexFinder.set_Value_and_Lock(False)
# athenaCommonFlags.FilesInput=["LFN:top_GEO-02-01-00_RDO_extract.pool"]
athenaCommonFlags.FilesInput=["/afs/cern.ch/atlas/project/rig/referencefiles/RTTinputFiles/MC15_13TeV/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r6699_10evt.pool.root"]
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ConfigFlags.Input.Files = athenaCommonFlags.FilesInput()
#athenaCommonFlags.jp.AthenaCommonFlags.EvtMax=-1 # number of events to process run on all file
--
GitLab
From 641919ff9a61e2b4d08beef9692ea6c14c549161 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Tue, 17 Aug 2021 18:28:46 +0200
Subject: [PATCH 149/272] DQUtils: Fix test failure with py 3.9.
repr() can allocate a list object the first time it's called,
which causes the gc check to fail.
Avoid by making sure that that happens before the gc check.
---
DataQuality/DQUtils/tests/test_coracool.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/DataQuality/DQUtils/tests/test_coracool.py b/DataQuality/DQUtils/tests/test_coracool.py
index 6faa265f4019..33d8e9af5310 100755
--- a/DataQuality/DQUtils/tests/test_coracool.py
+++ b/DataQuality/DQUtils/tests/test_coracool.py
@@ -65,6 +65,10 @@ def test_refcounting():
from time import time
start = time()
+ # repr() can allocate a list object the first time it's called.
+ # (cf. Py_ReprEnter)
+ # Make sure that happens now, before we do the gc check.
+ repr([1])
objects = None
--
GitLab
From 28582968856c4e935684bdcc47748e292d9eccee Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Tue, 17 Aug 2021 15:33:20 +0200
Subject: [PATCH 150/272] D3PDMakerConfig: Fix for recent AODs.
Recent AODs don't contain jets/MET, so we need to rebuild them.
---
.../share/EgammaD3PD_prodJobOFragment.py | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/share/EgammaD3PD_prodJobOFragment.py b/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/share/EgammaD3PD_prodJobOFragment.py
index 2b11e34ce1e6..6e4d8f37db3e 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/share/EgammaD3PD_prodJobOFragment.py
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/share/EgammaD3PD_prodJobOFragment.py
@@ -12,6 +12,18 @@ from AthenaCommon.JobProperties import jobproperties
prodFlags = jobproperties.D3PDProdFlags
from PrimaryDPDMaker.PrimaryDPDHelpers import buildFileName
+# Recent AODs don't contain jets.
+# Need to remake them.
+from D3PDMakerCoreComps.resolveSGKey import testSGKey
+from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
+if not testSGKey ('xAOD::JetContainer', D3PDMakerFlags.JetSGKey()):
+ from DerivationFrameworkJetEtMiss.ExtendedJetCommon import addDAODJets
+ addDAODJets (['AntiKt4EMTopoJets','AntiKt4EMPFlowJets'], topSequence, 'PhysCommon')
+ D3PDMakerFlags.JetSGKey = 'AntiKt4EMTopoJets'
+ from DerivationFrameworkJetEtMiss.METCommon import scheduleStandardMETContent
+ scheduleStandardMETContent (topSequence)
+
+
# Set up a logger:
from AthenaCommon.Logging import logging
EgammaD3PDStream_msg = logging.getLogger( 'EgammaD3PD_prodJobOFragment' )
--
GitLab
From 9ae2d05232cc31fa998ce7761910cf0d87b2cf88 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Thu, 24 Jun 2021 11:51:37 -0400
Subject: [PATCH 151/272] xAODEventInfoAthenaPool: Enable thread-safety
checking.
Enable thread-safety checking.
---
Event/xAOD/xAODEventInfoAthenaPool/ATLAS_CHECK_THREAD_SAFETY | 1 +
1 file changed, 1 insertion(+)
create mode 100644 Event/xAOD/xAODEventInfoAthenaPool/ATLAS_CHECK_THREAD_SAFETY
diff --git a/Event/xAOD/xAODEventInfoAthenaPool/ATLAS_CHECK_THREAD_SAFETY b/Event/xAOD/xAODEventInfoAthenaPool/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 000000000000..342690809fb6
--- /dev/null
+++ b/Event/xAOD/xAODEventInfoAthenaPool/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Event/xAOD/xAODEventInfoAthenaPool
--
GitLab
From 521706ab7ed164ff8ca97a63d24673342f2b27e2 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Thu, 24 Jun 2021 13:12:54 -0400
Subject: [PATCH 152/272] AmdcCore: Enable thread-safety checking.
Enable thread-safety checking.
Replace AmdcsimrecAccess with a dummy --- the singleton is never
actually set anymore.
---
.../AmdcCore/ATLAS_CHECK_THREAD_SAFETY | 1 +
.../AmdcCore/AmdcCore/AmdcsimrecAccess.h | 20 +-------------
.../AmdcCore/src/AmdcsimrecAccess.cxx | 26 ++-----------------
3 files changed, 4 insertions(+), 43 deletions(-)
create mode 100644 MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/ATLAS_CHECK_THREAD_SAFETY
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/ATLAS_CHECK_THREAD_SAFETY b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 000000000000..de3a84a8e504
--- /dev/null
+++ b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+MuonSpectrometer/Amdcsimrec/AmdcCore
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcsimrecAccess.h b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcsimrecAccess.h
index adb743ea9cfc..401f5faea475 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcsimrecAccess.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcsimrecAccess.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef AMDCCORE_AMDCSIMRECACCESS_H
@@ -18,27 +18,9 @@
class AmdcsimrecAccess{
public:
- AmdcsimrecAccess();
- ~AmdcsimrecAccess();
-
-public:
-///////////////////////////////////
/**Get Amdcsimrec interface*/
static Amdcsimrec* GetAmdcsimrec();
-
- /**Set Amdcsimrec interface*/
- static void SetAmdcsimrec(Amdcsimrec* pAmdcsimrec);
-
- /**Reset Amdcsimrec interface*/
- static void ResetAmdcsimrec();
-
-private:
-///////////////////////////////////
-// Data
-
- static Amdcsimrec* s_Amdcsimrec ; //!< Static Pointer on a Amdcsimrec interface
-
};
#endif
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcsimrecAccess.cxx b/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcsimrecAccess.cxx
index a1036dad41cd..72c9d6191303 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcsimrecAccess.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcsimrecAccess.cxx
@@ -1,34 +1,12 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "AmdcCore/AmdcsimrecAccess.h"
-Amdcsimrec* AmdcsimrecAccess::s_Amdcsimrec = 0;
-
-AmdcsimrecAccess::AmdcsimrecAccess(){}
-AmdcsimrecAccess::~AmdcsimrecAccess(){}
-
// Get
Amdcsimrec* AmdcsimrecAccess::GetAmdcsimrec(){
-// if (!s_Amdcsimrec){
-// std::cout << " AmdcsimrecAccess::GetAmdcsimrec "
-// << " can not access Amdcsimrec "
-// << std::endl;
-// }
- return s_Amdcsimrec;
-
-}
-
-// Set
-void AmdcsimrecAccess::SetAmdcsimrec(Amdcsimrec* pAmdcsimrec){
-
-//std::cout << " AmdcsimrecAccess::SetAmdcsimrec " << std::endl;
- s_Amdcsimrec = pAmdcsimrec;
+ return nullptr;
}
-
-// Reset
-void AmdcsimrecAccess::ResetAmdcsimrec(){s_Amdcsimrec = 0;}
-
--
GitLab
From 401a5d7b318394f7c4cd66c4ee46e583e9f51c36 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Thu, 24 Jun 2021 15:52:32 -0400
Subject: [PATCH 153/272] VP1HEPVis: Fix cppcheck warnings.
Fix cppcheck warnings.
---
graphics/VP1/VP1HEPVis/VP1HEPVis/SbPolyhedron.h | 2 +-
graphics/VP1/VP1HEPVis/src/BooleanProcessor.h | 2 +-
graphics/VP1/VP1HEPVis/src/RevolutionSurfaceUtil.h | 5 ++---
graphics/VP1/VP1HEPVis/src/SbPlane.cxx | 14 ++++++++------
graphics/VP1/VP1HEPVis/src/SbPolyhedron.cxx | 6 ++----
graphics/VP1/VP1HEPVis/src/gl2ps.cxx | 6 +++---
6 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/graphics/VP1/VP1HEPVis/VP1HEPVis/SbPolyhedron.h b/graphics/VP1/VP1HEPVis/VP1HEPVis/SbPolyhedron.h
index faf9abf5f00d..4bebb83d5fe5 100644
--- a/graphics/VP1/VP1HEPVis/VP1HEPVis/SbPolyhedron.h
+++ b/graphics/VP1/VP1HEPVis/VP1HEPVis/SbPolyhedron.h
@@ -571,7 +571,7 @@ class SbPolyhedronArbitrary : public SbPolyhedron {
class SbPolyhedronGenericTrap : public SbPolyhedron {
public:
- SbPolyhedronGenericTrap(double Dz, const std::vector<std::pair<double,double> > Vertices);
+ SbPolyhedronGenericTrap(double Dz, const std::vector<std::pair<double,double> >& Vertices);
virtual ~SbPolyhedronGenericTrap();
virtual SbPolyhedron& operator = (const SbPolyhedron& from) {
return SbPolyhedron::operator = (from);
diff --git a/graphics/VP1/VP1HEPVis/src/BooleanProcessor.h b/graphics/VP1/VP1HEPVis/src/BooleanProcessor.h
index 848b66f67bec..ec7e434cd6a5 100644
--- a/graphics/VP1/VP1HEPVis/src/BooleanProcessor.h
+++ b/graphics/VP1/VP1HEPVis/src/BooleanProcessor.h
@@ -1090,7 +1090,7 @@ void BooleanProcessor::assembleFace(int what, int iface)
{
// A S S E M B L E N E W F A C E
- int ihead; // head of the list of edges for new face
+ int ihead = 0; // head of the list of edges for new face
int icur; // current edge in the list - last edge inserted to the list
int *ilink; // pointer to the current link
int ifirst; // first node of a contour
diff --git a/graphics/VP1/VP1HEPVis/src/RevolutionSurfaceUtil.h b/graphics/VP1/VP1HEPVis/src/RevolutionSurfaceUtil.h
index a37dd64023e7..46363e785cb5 100644
--- a/graphics/VP1/VP1HEPVis/src/RevolutionSurfaceUtil.h
+++ b/graphics/VP1/VP1HEPVis/src/RevolutionSurfaceUtil.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef REVOLUTIONSURFACEUTIL_H
@@ -23,8 +23,7 @@ public:
int lim1 = static_cast<int>(dphi*8.0/(2*M_PI)+0.5);
if (NPHI<lim1) {
if (OverrideNPhi<=0) {
- if (NPHI<lim1)
- NPHI = lim1;
+ NPHI = lim1;
} else {
int lim2 = static_cast<int>(dphi*5.0/(2*M_PI)+0.5);
if (NPHI<lim2)
diff --git a/graphics/VP1/VP1HEPVis/src/SbPlane.cxx b/graphics/VP1/VP1HEPVis/src/SbPlane.cxx
index ba6c2b115231..b756ce82a88a 100644
--- a/graphics/VP1/VP1HEPVis/src/SbPlane.cxx
+++ b/graphics/VP1/VP1HEPVis/src/SbPlane.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/*
@@ -44,15 +44,17 @@ HEPVis::SbPlane::SbPlane(void) //private to avoid problems.
:m_normal(0,0,1) //CLHEP initialize with x-y plane (normal to z and distance 0)
,m_distance(0)
{}
-HEPVis::SbPlane::SbPlane(const SbVec3d& a_normal,double a_D) {
- m_normal = a_normal;
+HEPVis::SbPlane::SbPlane(const SbVec3d& a_normal,double a_D)
+ : m_normal (a_normal),
+ m_distance (a_D)
+{
m_normal.normalize();
- m_distance = a_D;
//NOTE : equation of the plan is then : n[0]*x+n[1]*y+n[2]*z-distance = 0
}
-HEPVis::SbPlane::SbPlane(const SbVec3d& a_normal,const SbVec3d& a_point) {
+HEPVis::SbPlane::SbPlane(const SbVec3d& a_normal,const SbVec3d& a_point)
+ : m_normal (a_normal)
+{
//FIXME if(normalref.sqrLength()==0) //throw
- m_normal = a_normal;
m_normal.normalize();
m_distance = m_normal.dot(a_point);
}
diff --git a/graphics/VP1/VP1HEPVis/src/SbPolyhedron.cxx b/graphics/VP1/VP1HEPVis/src/SbPolyhedron.cxx
index 79ee424a691f..9984b01f0d22 100644
--- a/graphics/VP1/VP1HEPVis/src/SbPolyhedron.cxx
+++ b/graphics/VP1/VP1HEPVis/src/SbPolyhedron.cxx
@@ -2009,7 +2009,6 @@ void SbPolyhedronPolygonXSect::Internals::initEdgeClassificationsAndNeighbours()
for (unsigned iedge=0;iedge<3;++iedge) {
Edge eun = GetEdge(&(*itt),iedge,false/*unoriented!*/);
if (edge2triangles_map.find(eun)==edge2triangles_map.end()) {
- edge2triangles_map[eun] = std::vector<Triangles::const_iterator>();
alledges.insert(eun);
}
edge2triangles_map[eun].push_back(itt);
@@ -2081,8 +2080,7 @@ void SbPolyhedronPolygonXSect::Internals::addExtraVertices() {
Edge e = GetEdge(&(*itt),iedge,true/*oriented!*/);
const Triangle* trneighbour = neighbourmap[e];
assert(trneighbour);//fixme
- if (triangles_with_extra_vertex.find(trneighbour)==triangles_with_extra_vertex.end()) {
- triangles_with_extra_vertex.insert(trneighbour);
+ if (triangles_with_extra_vertex.insert(trneighbour).second) {
triangles_with_extra_vertex.insert(&(*itt));
Edge eun = GetEdge(&(*itt),iedge,false/*unoriented*/);
edges_with_extra_vertex.insert(eun);
@@ -2408,7 +2406,7 @@ void SbPolyhedronArbitrary::Finalize()
SetReferences();
}
-SbPolyhedronGenericTrap::SbPolyhedronGenericTrap(double Dz, const std::vector<std::pair<double,double> > Vertices)
+SbPolyhedronGenericTrap::SbPolyhedronGenericTrap(double Dz, const std::vector<std::pair<double,double> >& Vertices)
{
AllocateMemory(8,6);
diff --git a/graphics/VP1/VP1HEPVis/src/gl2ps.cxx b/graphics/VP1/VP1HEPVis/src/gl2ps.cxx
index 796fbd4f6b23..53110c275a22 100644
--- a/graphics/VP1/VP1HEPVis/src/gl2ps.cxx
+++ b/graphics/VP1/VP1HEPVis/src/gl2ps.cxx
@@ -2929,10 +2929,9 @@ static void gl2psParseStipplePattern(GLushort pattern, GLint factor,
couples (our longest possible array is thus [on4 off4 on3 off3
on2 off2 on1 off1 on0 off0]) */
*nb = 0;
- for(n = i - 1; n >= 0; n--){
+ for(n = i - 1; n >= 0 && *nb <= 8; n--){
array[(*nb)++] = factor * on[n];
array[(*nb)++] = factor * off[n];
- if(*nb == 10) break;
}
}
@@ -5913,7 +5912,8 @@ GL2PSDLL_API GLint gl2psDrawImageMap(GLsizei width, GLsizei height,
glPassThrough((GLfloat)width);
glPassThrough((GLfloat)height);
for(i = 0; i < size; i += sizeoffloat){
- float *value = (float*)imagemap;
+ // cppcheck-suppress invalidPointerCast
+ const float *value = reinterpret_cast<const float*>(imagemap);
glPassThrough(*value);
imagemap += sizeoffloat;
}
--
GitLab
From 211874bb252796c646ccdf43a8fb3ecd343e6d6f Mon Sep 17 00:00:00 2001
From: Vakho Tsulaia <vakhtang.tsulaia@cern.ch>
Date: Fri, 13 Aug 2021 02:43:13 +0200
Subject: [PATCH 154/272] First version of the condition algorithm for applying
LAr alignments to GeoModel
Introduced LArAlignCondAlg nad LArAlignHelper. The latter contains the code for
applying alignment corrections to LArGeoModel. It is used by both LArAlignCondAlg
and LArDetectorTool.
Added CONDCONT_DEF for two classes
* DetCondKeyTrans
* CaloCellPositionShift
Fixed LArConditionsCommon/python/LArAlignable.py so that it declares "/LAR/Align" and
"/LAR/LArCellPositionShift" folders to the CondInputLoader, and removed the obsolete
LArConditionsCommon/share/LArAlignable.py
Switched CaloMgrDetDescrCnv from `fabs` to `std::abs`
---
.../src/CaloMgrDetDescrCnv.cxx | 58 +++---
.../CaloConditions/CaloCellPositionShift.h | 4 +-
.../DetDescrConditions/DetCondKeyTrans.h | 27 ++-
.../LArAlignmentAlgs/CMakeLists.txt | 4 +-
.../LArAlignmentAlgs/src/LArAlignCondAlg.cxx | 61 ++++++
.../LArAlignmentAlgs/src/LArAlignCondAlg.h | 52 ++++++
.../components/LArAlignmentAlgs_entries.cxx | 3 +-
.../python/LArAlignable.py | 45 +++--
.../LArConditionsCommon/share/LArAlignable.py | 17 --
.../LArGeoAlgsNV/src/LArDetectorTool.cxx | 176 +-----------------
.../LArGeoAlgsNV/src/LArDetectorToolNV.h | 87 +++++----
.../LArGeoModel/LArGeoCode/CMakeLists.txt | 3 +-
.../LArGeoCode/LArGeoCode/LArAlignHelper.h | 61 ++++++
.../LArGeoCode/src/LArAlignHelper.cxx | 160 ++++++++++++++++
14 files changed, 475 insertions(+), 283 deletions(-)
create mode 100644 LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/LArAlignCondAlg.cxx
create mode 100644 LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/LArAlignCondAlg.h
delete mode 100755 LArCalorimeter/LArExample/LArConditionsCommon/share/LArAlignable.py
create mode 100644 LArCalorimeter/LArGeoModel/LArGeoCode/LArGeoCode/LArAlignHelper.h
create mode 100644 LArCalorimeter/LArGeoModel/LArGeoCode/src/LArAlignHelper.cxx
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx
index e3a4d59ec2a9..086d2761bdda 100755
--- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx
+++ b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx
@@ -234,10 +234,10 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
if(r_max < embElement->r()+0.5*embElement->dr())
r_max = embElement->r()+0.5*embElement->dr();
- if(z_min > fabs(embElement->z_raw())-0.5*embElement->dz())
- z_min = fabs(embElement->z_raw())-0.5*embElement->dz();
- if(z_max < fabs(embElement->z_raw())+0.5*embElement->dz())
- z_max = fabs(embElement->z_raw())+0.5*embElement->dz();
+ if(z_min > std::abs(embElement->z_raw())-0.5*embElement->dz())
+ z_min = std::abs(embElement->z_raw())-0.5*embElement->dz();
+ if(z_max < std::abs(embElement->z_raw())+0.5*embElement->dz())
+ z_max = std::abs(embElement->z_raw())+0.5*embElement->dz();
if(reg_min > embElement->eta()-0.5*embElement->deta())
reg_min = embElement->eta()-0.5*embElement->deta();
@@ -258,7 +258,7 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
: embRegion->getDescriptor()->getEtaBinning().getStart();
double eta_max = (embRegion->getDescriptor()->getEtaBinning()).getEnd();
- double phi_max = phi_min + std::fabs((embRegion->getDescriptor()->getPhiBinning()).getDelta())*embDescr->n_phi();
+ double phi_max = phi_min + std::abs((embRegion->getDescriptor()->getPhiBinning()).getDelta())*embDescr->n_phi();
// 'ideal' values
embDescr->setCaloEtaMin(eta_min);
@@ -391,10 +391,10 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
if(r_max < emecElement->r()+0.5*emecElement->dr())
r_max = emecElement->r()+0.5*emecElement->dr();
- if(z_min > fabs(emecElement->z_raw())-0.5*emecElement->dz())
- z_min = fabs(emecElement->z_raw())-0.5*emecElement->dz();
- if(z_max < fabs(emecElement->z_raw())+0.5*emecElement->dz())
- z_max = fabs(emecElement->z_raw())+0.5*emecElement->dz();
+ if(z_min > std::abs(emecElement->z_raw())-0.5*emecElement->dz())
+ z_min = std::abs(emecElement->z_raw())-0.5*emecElement->dz();
+ if(z_max < std::abs(emecElement->z_raw())+0.5*emecElement->dz())
+ z_max = std::abs(emecElement->z_raw())+0.5*emecElement->dz();
if(reg_min > emecElement->eta()-0.5*emecElement->deta())
reg_min = emecElement->eta()-0.5*emecElement->deta();
@@ -403,8 +403,8 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
// depths
if(iPhi==emecRegion->beginPhiIndex()) {
- depth_in.push_back(fabs(emecElement->z_raw())-emecElement->dz());
- depth_out.push_back(fabs(emecElement->z_raw())+emecElement->dz());
+ depth_in.push_back(std::abs(emecElement->z_raw())-emecElement->dz());
+ depth_out.push_back(std::abs(emecElement->z_raw())+emecElement->dz());
}
} // Eta loop
} // Phi loop
@@ -412,7 +412,7 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
double eta_min = emecRegion->getDescriptor()->getEtaBinning().getStart();
double eta_max = emecRegion->getDescriptor()->getEtaBinning().getEnd();
- double phi_max = phi_min + std::fabs(emecRegion->getDescriptor()->getPhiBinning().getDelta())*emecDescr->n_phi();
+ double phi_max = phi_min + std::abs(emecRegion->getDescriptor()->getPhiBinning().getDelta())*emecDescr->n_phi();
// 'ideal' values
emecDescr->setCaloEtaMin(eta_min);
@@ -522,10 +522,10 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
if(r_max < cellPtr->getRMaxLocalNominal(HECCell::FRONT))
r_max = cellPtr->getRMaxLocalNominal(HECCell::FRONT);
- if(z_min > fabs(hecElement->z_raw())-hecElement->dz())
- z_min = fabs(hecElement->z_raw())-hecElement->dz();
- if(z_max < fabs(hecElement->z_raw())+hecElement->dz())
- z_max = fabs(hecElement->z_raw())+hecElement->dz();
+ if(z_min > std::abs(hecElement->z_raw())-hecElement->dz())
+ z_min = std::abs(hecElement->z_raw())-hecElement->dz();
+ if(z_max < std::abs(hecElement->z_raw())+hecElement->dz())
+ z_max = std::abs(hecElement->z_raw())+hecElement->dz();
if(reg_min > hecElement->eta()-0.5*hecElement->deta())
reg_min = hecElement->eta()-0.5*hecElement->deta();
@@ -533,8 +533,8 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
reg_max = hecElement->eta()+0.5*hecElement->deta();
if(iPhi==hecregion->beginPhiIndex() && iEta==hecregion->beginEtaIndex()) {
- depth_in.push_back(fabs(hecElement->z_raw())-hecElement->dz());
- depth_out.push_back(fabs(hecElement->z_raw())+hecElement->dz());
+ depth_in.push_back(std::abs(hecElement->z_raw())-hecElement->dz());
+ depth_out.push_back(std::abs(hecElement->z_raw())+hecElement->dz());
}
}
@@ -544,7 +544,7 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
double eta_min = hecregion->getDescriptor()->getEtaBinning().getStart();
double eta_max = hecregion->getDescriptor()->getEtaBinning().getEnd();
- double phi_max = phi_min + std::fabs(hecregion->getDescriptor()->getPhiBinning().getDelta())*hecDescr->n_phi();
+ double phi_max = phi_min + std::abs(hecregion->getDescriptor()->getPhiBinning().getDelta())*hecDescr->n_phi();
// 'ideal' values
hecDescr->setCaloEtaMin(eta_min);
@@ -645,26 +645,26 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
caloMgr->add(fcalElement);
- if(eta_min > std::fabs(fcalElement->eta_raw())-0.5*fcalElement->deta())
- eta_min = std::fabs(fcalElement->eta_raw())-0.5*fcalElement->deta();
- if(eta_max < std::fabs(fcalElement->eta_raw())+0.5*fcalElement->deta())
- eta_max = std::fabs(fcalElement->eta_raw())+0.5*fcalElement->deta();
+ if(eta_min > std::abs(fcalElement->eta_raw())-0.5*fcalElement->deta())
+ eta_min = std::abs(fcalElement->eta_raw())-0.5*fcalElement->deta();
+ if(eta_max < std::abs(fcalElement->eta_raw())+0.5*fcalElement->deta())
+ eta_max = std::abs(fcalElement->eta_raw())+0.5*fcalElement->deta();
if(r_min > fcalElement->r() - 0.5*fcalElement->dr())
r_min = fcalElement->r() - 0.5*fcalElement->dr();
if(r_max < fcalElement->r() + 0.5*fcalElement->dr())
r_max = fcalElement->r() + 0.5*fcalElement->dr();
- if(z_min > fabs(fcalElement->z_raw()) - 0.5*fcalElement->dz())
- z_min = fabs(fcalElement->z_raw()) - 0.5*fcalElement->dz();
- if(z_max < fabs(fcalElement->z_raw()) + 0.5*fcalElement->dz())
- z_max = fabs(fcalElement->z_raw()) + 0.5*fcalElement->dz();
+ if(z_min > std::abs(fcalElement->z_raw()) - 0.5*fcalElement->dz())
+ z_min = std::abs(fcalElement->z_raw()) - 0.5*fcalElement->dz();
+ if(z_max < std::abs(fcalElement->z_raw()) + 0.5*fcalElement->dz())
+ z_max = std::abs(fcalElement->z_raw()) + 0.5*fcalElement->dz();
if(reg_min > fcalElement->eta()-0.5*fcalElement->deta())
reg_min = fcalElement->eta()-0.5*fcalElement->deta();
if(reg_max < fcalElement->eta()+0.5*fcalElement->deta())
reg_max = fcalElement->eta()+0.5*fcalElement->deta();
if(fcaltileIt==fcalmodule->beginTiles()) {
- depth_in.push_back(std::fabs(fcalElement->z_raw()) - fcalElement->dz());
- depth_out.push_back(std::fabs(fcalElement->z_raw()) + fcalElement->dz());
+ depth_in.push_back(std::abs(fcalElement->z_raw()) - fcalElement->dz());
+ depth_out.push_back(std::abs(fcalElement->z_raw()) + fcalElement->dz());
}
}
diff --git a/Calorimeter/CaloConditions/CaloConditions/CaloCellPositionShift.h b/Calorimeter/CaloConditions/CaloConditions/CaloCellPositionShift.h
index b5993ec2efa9..2cb85a20a05b 100755
--- a/Calorimeter/CaloConditions/CaloConditions/CaloCellPositionShift.h
+++ b/Calorimeter/CaloConditions/CaloConditions/CaloCellPositionShift.h
@@ -16,7 +16,8 @@
#define CALOREC_CALOCELLPOSITIONSHIFT_H
-#include "AthenaKernel/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthenaKernel/CondCont.h"
#include <vector>
namespace CaloRec {
@@ -75,5 +76,6 @@ class CaloCellPositionShift
}// end namespace
CLASS_DEF(CaloRec::CaloCellPositionShift,96609121,1)
+CONDCONT_DEF(CaloRec::CaloCellPositionShift,219045687);
#endif
diff --git a/DetectorDescription/DetDescrCond/DetDescrConditions/DetDescrConditions/DetCondKeyTrans.h b/DetectorDescription/DetDescrCond/DetDescrConditions/DetDescrConditions/DetCondKeyTrans.h
index 20456fd2f14b..44edf33f77b0 100755
--- a/DetectorDescription/DetDescrCond/DetDescrConditions/DetDescrConditions/DetCondKeyTrans.h
+++ b/DetectorDescription/DetDescrCond/DetDescrConditions/DetDescrConditions/DetCondKeyTrans.h
@@ -1,20 +1,28 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef DETDESCRCOND_KEYTRANS_H
-#define DETDESCRCOND_KEYTRANS_H
-// DetCondKeyTrans.h - class to hold set of HepGeom::Transform3D keyed by string
-// value for storage in the conditions DB
-// typically for holding top-level transforms for GeoModel/G4
-// This class can be persistified (converters in DetDescrCondAthenaPool)
-//
-// Richard Hawkings, started 23/6/05
+#ifndef DETDESCRCONDITIONS_DETCONDKEYTRANS_H
+#define DETDESCRCONDITIONS_DETCONDKEYTRANS_H
+
+/**
+ * @file DetCondKeyTrans.h
+ *
+ * @class DetCondKeyTrans
+ *
+ * @brief Class to hold set of HepGeom::Transform3D keyed by string
+ * value for storage in the conditions DB typically for holding top-level transforms
+ * for GeoModel/G4. This class can be persistified (converters in DetDescrCondAthenaPool)
+ *
+ * @author Richard Hawkings, started 23/6/05
+ *
+ **/
#include <string>
#include <map>
#include "CLHEP/Geometry/Transform3D.h"
#include "AthenaKernel/CLASS_DEF.h"
+#include "AthenaKernel/CondCont.h"
class DetCondKeyTrans {
public:
@@ -44,6 +52,7 @@ private:
};
CLASS_DEF(DetCondKeyTrans,254546453,1)
+CONDCONT_DEF( DetCondKeyTrans , 116888117 );
// iterator declaration for SEAL dictionary
// removed - perhaps will not be needed for reflex, causes problem for gcc344
diff --git a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/CMakeLists.txt b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/CMakeLists.txt
index 56a6ea1e5718..25418812525e 100644
--- a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/CMakeLists.txt
+++ b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LArAlignmentAlgs )
@@ -7,7 +7,7 @@ atlas_subdir( LArAlignmentAlgs )
atlas_add_component( LArAlignmentAlgs
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps AthenaKernel GaudiKernel DetDescrConditions RegistrationServicesLib )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel GaudiKernel DetDescrConditions RegistrationServicesLib GeoModelUtilities LArGeoCode )
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/LArAlignCondAlg.cxx b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/LArAlignCondAlg.cxx
new file mode 100644
index 000000000000..8184136fad6b
--- /dev/null
+++ b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/LArAlignCondAlg.cxx
@@ -0,0 +1,61 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "LArAlignCondAlg.h"
+
+#include "GeoModelKernel/GeoAlignableTransform.h"
+#include "GeoModelUtilities/GeoAlignmentStore.h"
+
+#include <memory>
+
+StatusCode LArAlignCondAlg::initialize()
+{
+ ATH_MSG_DEBUG("initialize " << name());
+
+ ATH_CHECK(m_condSvc.retrieve());
+ ATH_CHECK(m_readKey.initialize());
+ ATH_CHECK(m_writeKey.initialize());
+
+ // Register Write Cond Handle
+ if(m_condSvc->regHandle(this, m_writeKey).isFailure()) {
+ ATH_MSG_ERROR("unable to register WriteCondHandle " << m_writeKey.fullKey() << " with CondSvc");
+ return StatusCode::FAILURE;
+ }
+
+ return StatusCode::SUCCESS;
+}
+
+StatusCode LArAlignCondAlg::execute(const EventContext& ctx) const
+{
+ // ____________ Construct Write Cond Handle and check its validity ____________
+ SG::WriteCondHandle<GeoAlignmentStore> writeHandle{m_writeKey,ctx};
+ if (writeHandle.isValid()) {
+ ATH_MSG_DEBUG("Found valid write handle");
+ return StatusCode::SUCCESS;
+ }
+
+ // ____________ Get Read Cond Object ____________
+ SG::ReadCondHandle<DetCondKeyTrans> readHandle{m_readKey,ctx};
+ const DetCondKeyTrans* readCdo{*readHandle};
+ if(!readCdo) {
+ ATH_MSG_ERROR("Null pointer to the read conditions object");
+ return StatusCode::FAILURE;
+ }
+ ATH_MSG_DEBUG("Retrieved DetCondKeyTrans object form the Condition Store");
+
+ writeHandle.addDependency(readHandle);
+
+ // ____________ Construct new Write Cond Object and apply alignments ____________
+ std::unique_ptr<GeoAlignmentStore> writeCdo = std::make_unique<GeoAlignmentStore>();
+ if(m_alignHelper.applyAlignments(detStore(),readCdo,writeCdo.get()).isFailure()) {
+ ATH_MSG_ERROR("Failed to apply LAr alignments");
+ return StatusCode::FAILURE;
+ }
+
+ ATH_CHECK(writeHandle.record(std::move(writeCdo)));
+ ATH_MSG_INFO("recorded new GeoAlignmentStore object for LAr with key " << writeHandle.key()
+ << " and range " << writeHandle.getRange());
+
+ return StatusCode::SUCCESS;
+}
diff --git a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/LArAlignCondAlg.h b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/LArAlignCondAlg.h
new file mode 100644
index 000000000000..5600a2082e30
--- /dev/null
+++ b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/LArAlignCondAlg.h
@@ -0,0 +1,52 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef LARALIGNMENTALGS_LARALIGNCONDALG_H
+#define LARALIGNMENTALGS_LARALIGNCONDALG_H
+
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
+#include "StoreGate/ReadCondHandleKey.h"
+#include "StoreGate/WriteCondHandleKey.h"
+#include "GaudiKernel/ICondSvc.h"
+
+#include "DetDescrConditions/DetCondKeyTrans.h"
+#include "GeoModelUtilities/GeoAlignmentStore.h"
+#include "GeoModelUtilities/StoredAlignX.h"
+
+#include "LArGeoCode/LArAlignHelper.h"
+
+/**
+ * @class LArAlignCondAlg
+ *
+ * @brief Condition Algorithm for applying LAr Alignments
+ *
+ **/
+
+class LArAlignCondAlg final : public AthReentrantAlgorithm
+{
+ public:
+ using AthReentrantAlgorithm::AthReentrantAlgorithm;
+ virtual ~LArAlignCondAlg() = default;
+
+ virtual StatusCode initialize() override;
+ virtual StatusCode execute(const EventContext& ctx) const override;
+ virtual StatusCode finalize() override {return StatusCode::SUCCESS;};
+
+ private:
+ SG::ReadCondHandleKey<DetCondKeyTrans> m_readKey {this
+ , "LArAlignFolder"
+ , "/LAR/Align"
+ , "SG key of DetCondKeyTrans object with LAr alignments" };
+
+ SG::WriteCondHandleKey<GeoAlignmentStore> m_writeKey {this
+ , "LArAlignmentStore"
+ , "LArAlignmentStore"
+ , "SG key of the resulting GeoAlignmentStore for LAr" };
+
+ ServiceHandle<ICondSvc> m_condSvc{this, "CondSvc", "CondSvc"};
+
+ LArAlignHelper m_alignHelper;
+};
+
+#endif
diff --git a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/components/LArAlignmentAlgs_entries.cxx b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/components/LArAlignmentAlgs_entries.cxx
index 778d3a682510..eac897bbfc73 100644
--- a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/components/LArAlignmentAlgs_entries.cxx
+++ b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/components/LArAlignmentAlgs_entries.cxx
@@ -1,4 +1,5 @@
#include "../LArAlignDbAlg.h"
+#include "../LArAlignCondAlg.h"
DECLARE_COMPONENT( LArAlignDbAlg )
-
+DECLARE_COMPONENT( LArAlignCondAlg )
diff --git a/LArCalorimeter/LArExample/LArConditionsCommon/python/LArAlignable.py b/LArCalorimeter/LArExample/LArConditionsCommon/python/LArAlignable.py
index 44b82e557fe1..5c4d54427146 100755
--- a/LArCalorimeter/LArExample/LArConditionsCommon/python/LArAlignable.py
+++ b/LArCalorimeter/LArExample/LArConditionsCommon/python/LArAlignable.py
@@ -1,18 +1,29 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-
-#Job options needed to enable LAr alignment
-
-from IOVDbSvc.CondDB import conddb
-
-if conddb.isMC:
- #Monte Carlo case:
- conddb.addFolder("LAR_OFL","/LAR/Align")
- conddb.addFolder("LAR_OFL","/LAR/LArCellPositionShift")
-else:
- #Regular offline data processing
- conddb.addFolder("LAR_ONL","/LAR/Align")
- conddb.addFolder("LAR_ONL","/LAR/LArCellPositionShift")
-
-
-
+#Job options needed to enable LAr alignment
+
+from AthenaCommon.DetFlags import DetFlags
+import os
+activateCondAlgs = (not DetFlags.simulate.any_on() or DetFlags.overlay.any_on()) and "AthSimulation_DIR" not in os.environ
+
+from IOVDbSvc.CondDB import conddb
+
+if conddb.isMC:
+ #Monte Carlo case:
+ if activateCondAlgs:
+ conddb.addFolder("LAR_OFL","/LAR/Align",className="DetCondKeyTrans")
+ conddb.addFolder("LAR_OFL","/LAR/LArCellPositionShift",className="CaloRec::CaloCellPositionShift")
+ else:
+ conddb.addFolder("LAR_OFL","/LAR/Align")
+ conddb.addFolder("LAR_OFL","/LAR/LArCellPositionShift")
+else:
+ #Regular offline data processing
+ conddb.addFolder("LAR_ONL","/LAR/Align",className="DetCondKeyTrans")
+ conddb.addFolder("LAR_ONL","/LAR/LArCellPositionShift",className="CaloRec::CaloCellPositionShift")
+
+if activateCondAlgs:
+ from AthenaCommon.AlgSequence import AthSequencer
+ condSeq = AthSequencer("AthCondSeq")
+ if not hasattr(condSeq,"LArAlignCondAlg"):
+ from LArAlignmentAlgs.LArAlignmentAlgsConf import LArAlignCondAlg
+ condSeq += LArAlignCondAlg("LArAlignCondAlg")
diff --git a/LArCalorimeter/LArExample/LArConditionsCommon/share/LArAlignable.py b/LArCalorimeter/LArExample/LArConditionsCommon/share/LArAlignable.py
deleted file mode 100755
index 52e63e4b9e0f..000000000000
--- a/LArCalorimeter/LArExample/LArConditionsCommon/share/LArAlignable.py
+++ /dev/null
@@ -1,17 +0,0 @@
-
-#Job options needed to enable LAr alignment
-
-include("DetDescrCondAthenaPool/DetDescrCondAthenaPool_joboptions.py" )
-
-from IOVDbSvc.CondDB import conddb
-
-if conddb.isMC:
- #Monte Carlo case:
- conddb.addFolder("LAR_OFL","/LAR/Align")
- conddb.addFolder("LAR_OFL","/LAR/LArCellPositionShift")
-else:
- #Regular offline data processing
- conddb.addFolder("LAR_ONL","/LAR/Align")
- conddb.addFolder("LAR_ONL","/LAR/LArCellPositionShift")
-
-print "including share/LArAlignable"
diff --git a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/LArDetectorTool.cxx b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/LArDetectorTool.cxx
index 31063e56aa6f..f5aba80cd67f 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/LArDetectorTool.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/LArDetectorTool.cxx
@@ -248,17 +248,10 @@ StatusCode LArDetectorToolNV::registerCallback()
return StatusCode::FAILURE;
}
- std::string folderName = "/LAR/Align";
-
const DataHandle<DetCondKeyTrans> dckt;
- ATH_MSG_DEBUG("Registering callback on DetCondKeyTrans with folder " << folderName);
- StatusCode sc = detStore()->regFcn(&IGeoModelTool::align, dynamic_cast<IGeoModelTool *>(this), dckt, folderName);
- if(sc.isSuccess()) {
- ATH_MSG_DEBUG(" Successfully registered ");
- }
- else {
- ATH_MSG_DEBUG(" Registration failed ");
- }
+ StatusCode sc = detStore()->regFcn(&IGeoModelTool::align, dynamic_cast<IGeoModelTool *>(this), dckt, LAR_ALIGN);
+ ATH_MSG_DEBUG( (sc.isSuccess() ? "Successfully registered" : "Registration failed for")
+ << " callback on DetCondKeyTrans with folder " << LAR_ALIGN);
return sc;
}
@@ -270,40 +263,13 @@ StatusCode LArDetectorToolNV::align(IOVSVC_CALLBACK_ARGS)
return StatusCode::SUCCESS;
}
- std::vector<std::string> alignNames {
- "LARCRYO_B"
- ,"LARCRYO_EC_POS"
- ,"LARCRYO_EC_NEG"
- ,"PRESAMPLER_B_POS"
- ,"PRESAMPLER_B_NEG"
- ,"EMB_POS"
- ,"EMB_NEG"
- ,"PRESAMPLER_EC_POS"
- ,"PRESAMPLER_EC_NEG"
- ,"EMEC_POS"
- ,"EMEC_NEG"
- ,"HEC_POS" // Policy: either HEC_POS is present or HEC1_POS and HEC2_POS
- ,"HEC_NEG" // Same with HEC_NEG. Now in recent releases if HEC_POS is found
- ,"HEC1_POS" // it will be applied to both HEC1 and HEC2...
- ,"HEC1_NEG"
- ,"HEC2_POS"
- ,"HEC2_NEG"
- ,"FCAL1_POS"
- ,"FCAL1_NEG"
- ,"FCAL2_POS"
- ,"FCAL2_NEG"
- ,"FCAL3_POS"
- ,"FCAL3_NEG"
- ,"SOLENOID"
- };
-
if(m_manager==nullptr) {
ATH_MSG_ERROR(" LArDetDescrManager not created yet, cannot align !");
return StatusCode::FAILURE;
}
- const DetCondKeyTrans* align=0;
if(detStore()->contains<DetCondKeyTrans>(LAR_ALIGN)) {
+ const DetCondKeyTrans* align{nullptr};
StatusCode sc = detStore()->retrieve(align, LAR_ALIGN);
if(sc.isFailure()) {
@@ -311,144 +277,22 @@ StatusCode LArDetectorToolNV::align(IOVSVC_CALLBACK_ARGS)
return sc;
}
- if(0 == align) {
- ATH_MSG_ERROR(" LAr DetCondKeyTrans ptr is 0");
+ if(align==nullptr) {
+ ATH_MSG_ERROR("LAr DetCondKeyTrans ptr is null");
return StatusCode::FAILURE;
}
ATH_MSG_DEBUG(" LAr DetCondKeyTrans retrieved ");
-
- // Special treatment for the HEC:
- StoredAlignX *hec1AlxPos{nullptr};
- StoredAlignX *hec2AlxPos{nullptr};
- StoredAlignX *hec1AlxNeg{nullptr};
- StoredAlignX *hec2AlxNeg{nullptr};
- if (detStore()->contains<StoredAlignX> ("HEC1_POS")) {
- if (detStore()->retrieve(hec1AlxPos,"HEC1_POS")!=StatusCode::SUCCESS) {
- ATH_MSG_WARNING(" Unable to retrieve StoredAlignX for the key HEC1_POS");
- }
- }
- if (detStore()->contains<StoredAlignX> ("HEC1_NEG")) {
- if (detStore()->retrieve(hec1AlxNeg,"HEC1_NEG")!=StatusCode::SUCCESS) {
- ATH_MSG_WARNING(" Unable to retrieve StoredAlignX for the key HEC1_NEG");
- }
- }
- if (detStore()->contains<StoredAlignX> ("HEC2_POS")) {
- if (detStore()->retrieve(hec2AlxPos,"HEC2_POS")!=StatusCode::SUCCESS) {
- ATH_MSG_WARNING(" Unable to retrieve StoredAlignX for the key HEC2_POS");
- }
- }
- if (detStore()->contains<StoredAlignX> ("HEC2_NEG")) {
- if (detStore()->retrieve(hec2AlxNeg,"HEC2_NEG")!=StatusCode::SUCCESS) {
- ATH_MSG_WARNING(" Unable to retrieve StoredAlignX for the key HEC2_NEG");
- }
+ if(m_alignHelper.applyAlignments(detStore(),align,nullptr).isFailure()) {
+ ATH_MSG_ERROR("Failed to apply LAr alignments to GeoModel");
+ return StatusCode::FAILURE;
}
- GeoAlignableTransform *hec1GatPos = hec1AlxPos ? hec1AlxPos->getAlignX(): nullptr;
- GeoAlignableTransform *hec1GatNeg = hec1AlxPos ? hec1AlxNeg->getAlignX(): nullptr;
- GeoAlignableTransform *hec2GatPos = hec2AlxPos ? hec2AlxPos->getAlignX(): nullptr;
- GeoAlignableTransform *hec2GatNeg = hec2AlxPos ? hec2AlxNeg->getAlignX(): nullptr;
-
- // loop over align names
- // if the transform presented alter its delta
- // if the transform is not presented clear its delta
- for(unsigned int i=0; i<alignNames.size(); i++) {
- std::string alignName = alignNames[i];
- HepGeom::Transform3D newDelta;
- // First try to retrieve StoredAlignX
- if(detStore()->contains<StoredAlignX>(alignName)) {
- StoredAlignX* alignX{nullptr};
- sc = detStore()->retrieve(alignX,alignName);
-
- if(sc.isFailure()) {
- ATH_MSG_ERROR(" Unable to retrieve StoredAlignX for the key " << alignName);
- return sc;
- }
-
- if(!alignX) {
- ATH_MSG_ERROR(" 0 pointer to StoredAlignX for the key " << alignName);
- return StatusCode::FAILURE;
- }
-
- GeoAlignableTransform* gat = alignX->getAlignX();
- if(!gat) {
- ATH_MSG_ERROR(" 0 pointer to GeoAlignableTransform for the key " << alignName);
- return StatusCode::FAILURE;
- }
-
- // check existence of new delta in DetCondKeyTrans
- if(align->getTransform(alignName,newDelta)) {
- gat->setDelta(Amg::CLHEPTransformToEigen(newDelta));
- }
- else {
- gat->clearDelta();
- }
- }
- else if (alignName=="HEC_POS") {
- if (hec1GatPos) {
- if(align->getTransform(alignName,newDelta)) {
- hec1GatPos->setDelta(Amg::CLHEPTransformToEigen(newDelta));
- }
- else {
- hec1GatPos->clearDelta();
- }
- }
- if (hec2GatPos) {
- if(align->getTransform(alignName,newDelta)) {
- hec2GatPos->setDelta(Amg::CLHEPTransformToEigen(newDelta));
- }
- else {
- hec2GatPos->clearDelta();
- }
- }
- }
- else if (alignName=="HEC_NEG") {
- if (hec1GatNeg) {
- if(align->getTransform(alignName,newDelta)) {
- hec1GatNeg->setDelta(Amg::CLHEPTransformToEigen(newDelta));
- }
- else {
- hec1GatNeg->clearDelta();
- }
- }
- if (hec2GatNeg) {
- if(align->getTransform(alignName,newDelta)) {
- hec2GatNeg->setDelta(Amg::CLHEPTransformToEigen(newDelta));
- }
- else {
- hec2GatNeg->clearDelta();
- }
- }
- }
- else {
- ATH_MSG_DEBUG(" No StoredAlignX for the key " << alignName);
- }
- } // for
+ ATH_MSG_DEBUG("LAr Alignments applied successfully");
}
else {
ATH_MSG_DEBUG(" No LAr DetCondKeyTrans in SG, skipping align() ");
}
- // debug printout of global positions:
-// for(unsigned int i=0; i<alignNames.size(); i++)
- for(const std::string& alignName : alignNames) {
- if(detStore()->contains<StoredPhysVol>(alignName)) {
- StoredPhysVol* storedPV{nullptr};
- StatusCode sc = detStore()->retrieve(storedPV,alignName);
- if(sc.isSuccess()) {
- const GeoFullPhysVol* fullPV = storedPV->getPhysVol();
- const GeoTrf::Transform3D& xf = fullPV->getAbsoluteTransform();
- GeoTrf::Vector3D trans=xf.translation();
- GeoTrf::RotationMatrix3D rot=xf.rotation();
- ATH_MSG_DEBUG("Dump Absolute Transform:");
- ATH_MSG_DEBUG("Key " << alignName << " transl [" << trans.x()
- << "," << trans.y() << "," << trans.z() << "] rotation \n("
- << rot(0,0) << "," << rot(0,1) << "," << rot(0,2) << "\n"
- << rot(1,0) << "," << rot(1,1) << "," << rot(1,2) << "\n"
- << rot(2,0) << "," << rot(2,1) << "," << rot(2,2) << ")");
- }
- }
- }
-
return StatusCode::SUCCESS;
}
diff --git a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/LArDetectorToolNV.h b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/LArDetectorToolNV.h
index 09970c3b1e84..be71c85d702e 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/LArDetectorToolNV.h
+++ b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/LArDetectorToolNV.h
@@ -15,53 +15,60 @@
#include "GeoModelUtilities/GeoModelTool.h"
#include "AthenaKernel/IOVSvcDefs.h"
+#include "LArGeoCode/LArAlignHelper.h"
+
class LArDetectorManager;
-/** @class LArDetectorToolNV
- @brief LArDetectorToolNV is a standard GeoModel tool, which calls LArDetectorFactory::create(),
- stores LArDetectorManager to the Detector Store and also registers a callback function
- align() which applies misalignments on top of the 'regular' geometry.
-*/
+/**
+ * @class LArDetectorToolNV
+ *
+ * @brief LArDetectorToolNV is a standard GeoModel tool, which calls LArDetectorFactory::create(),
+ * stores LArDetectorManager to the Detector Store and also registers a callback function
+ * align() which applies misalignments on top of the 'regular' geometry.
+ *
+ **/
class LArDetectorToolNV final : public GeoModelTool {
public:
- // Standard Constructor
- LArDetectorToolNV( const std::string& type, const std::string& name, const IInterface* parent );
-
- // Standard Destructor
- virtual ~LArDetectorToolNV() override final;
-
- // Create Method:
- virtual StatusCode create() override final;
-
- // Clear Method
- virtual StatusCode clear() override final;
-
- // Register callback function on ConDB object
- virtual StatusCode registerCallback() override final;
-
- // Callback function itself
- virtual StatusCode align(IOVSVC_CALLBACK_ARGS) override final;
+ // Standard Constructor
+ LArDetectorToolNV( const std::string& type, const std::string& name, const IInterface* parent );
+
+ // Standard Destructor
+ virtual ~LArDetectorToolNV();
+
+ // Create Method:
+ virtual StatusCode create() override;
+
+ // Clear Method
+ virtual StatusCode clear() override;
+
+ // Register callback function on ConDB object
+ virtual StatusCode registerCallback() override;
+
+ // Callback function itself
+ virtual StatusCode align(IOVSVC_CALLBACK_ARGS) override;
private:
- bool m_barrelSaggingOn;
- int m_barrelVisLimit;
- int m_fcalVisLimit;
-
- bool m_buildBarrel;
- bool m_buildEndcap;
-
- bool m_applyAlignments;
-
- const LArDetectorManager *m_manager;
-
- std::string m_geometryConfig; // FULL, SIMU, RECO
-
- std::string m_EMECVariantInner;
- std::string m_EMECVariantOuter;
-
- bool m_activateFT;
- bool m_enableMBTS;
+ bool m_barrelSaggingOn;
+ int m_barrelVisLimit;
+ int m_fcalVisLimit;
+
+ bool m_buildBarrel;
+ bool m_buildEndcap;
+
+ bool m_applyAlignments;
+
+ const LArDetectorManager *m_manager;
+
+ std::string m_geometryConfig; // FULL, SIMU, RECO
+
+ std::string m_EMECVariantInner;
+ std::string m_EMECVariantOuter;
+
+ bool m_activateFT;
+ bool m_enableMBTS;
+
+ LArAlignHelper m_alignHelper;
};
#endif
diff --git a/LArCalorimeter/LArGeoModel/LArGeoCode/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoCode/CMakeLists.txt
index 2e0030a25990..bff329de75a4 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoCode/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoCode/CMakeLists.txt
@@ -12,5 +12,6 @@ atlas_add_library( LArGeoCode
PUBLIC_HEADERS LArGeoCode
PRIVATE_INCLUDE_DIRS ${GEOMODEL_INCLUDE_DIRS}
LINK_LIBRARIES StoreGateLib
- PRIVATE_LINK_LIBRARIES ${GEOMODEL_LIBRARIES} GaudiKernel GeoModelInterfaces RDBAccessSvcLib )
+ PRIVATE_LINK_LIBRARIES ${GEOMODEL_LIBRARIES} GaudiKernel AthenaBaseComps GeoModelInterfaces RDBAccessSvcLib
+ GeoModelUtilities DetDescrConditions GeoPrimitives )
diff --git a/LArCalorimeter/LArGeoModel/LArGeoCode/LArGeoCode/LArAlignHelper.h b/LArCalorimeter/LArGeoModel/LArGeoCode/LArGeoCode/LArAlignHelper.h
new file mode 100644
index 000000000000..558ce5531a19
--- /dev/null
+++ b/LArCalorimeter/LArGeoModel/LArGeoCode/LArGeoCode/LArAlignHelper.h
@@ -0,0 +1,61 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef LARGEOCODE_LARALIGNHELPER_H
+#define LARGEOCODE_LARALIGNHELPER_H
+
+/**
+ * @class LArAlignHelper
+ *
+ * @brief Helper class for applying LAr alignments either from LArDetectorToolNV or from LArAlignCondAlg
+ *
+ **/
+
+#include "GaudiKernel/ServiceHandle.h"
+#include "AthenaBaseComps/AthMessaging.h"
+#include "StoreGate/StoreGateSvc.h"
+#include <vector>
+#include <string>
+
+class DetCondKeyTrans;
+class GeoAlignmentStore;
+
+class LArAlignHelper : public AthMessaging
+{
+ public:
+ LArAlignHelper();
+
+ StatusCode applyAlignments(const ServiceHandle<StoreGateSvc>& detStore
+ , const DetCondKeyTrans* detCondKeyTrans
+ , GeoAlignmentStore* alignmentStore) const;
+
+ private:
+ std::vector<std::string> m_alignNames{ "LARCRYO_B"
+ , "LARCRYO_EC_POS"
+ , "LARCRYO_EC_NEG"
+ , "PRESAMPLER_B_POS"
+ , "PRESAMPLER_B_NEG"
+ , "EMB_POS"
+ , "EMB_NEG"
+ , "PRESAMPLER_EC_POS"
+ , "PRESAMPLER_EC_NEG"
+ , "EMEC_POS"
+ , "EMEC_NEG"
+ , "HEC_POS" // Policy: either HEC_POS is present or HEC1_POS and HEC2_POS. The same applies to HEC_NEG
+ , "HEC_NEG" // Now in recent releases if HEC_POS is found it will be applied to both HEC1 and HEC2...
+ , "HEC1_POS"
+ , "HEC1_NEG"
+ , "HEC2_POS"
+ , "HEC2_NEG"
+ , "FCAL1_POS"
+ , "FCAL1_NEG"
+ , "FCAL2_POS"
+ , "FCAL2_NEG"
+ , "FCAL3_POS"
+ , "FCAL3_NEG"
+ , "SOLENOID"
+ };
+};
+
+#endif
diff --git a/LArCalorimeter/LArGeoModel/LArGeoCode/src/LArAlignHelper.cxx b/LArCalorimeter/LArGeoModel/LArGeoCode/src/LArAlignHelper.cxx
new file mode 100644
index 000000000000..1881de9df73a
--- /dev/null
+++ b/LArCalorimeter/LArGeoModel/LArGeoCode/src/LArAlignHelper.cxx
@@ -0,0 +1,160 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "LArGeoCode/LArAlignHelper.h"
+
+#include "GeoModelKernel/GeoFullPhysVol.h"
+#include "GeoModelKernel/GeoAlignableTransform.h"
+#include "GeoModelUtilities/GeoAlignmentStore.h"
+#include "GeoModelUtilities/StoredAlignX.h"
+#include "GeoModelUtilities/StoredPhysVol.h"
+#include "DetDescrConditions/DetCondKeyTrans.h"
+#include "GeoPrimitives/CLHEPtoEigenConverter.h"
+
+LArAlignHelper::LArAlignHelper()
+ : AthMessaging(Athena::getMessageSvc(), "LArAlignHelper")
+{
+}
+
+StatusCode LArAlignHelper::applyAlignments(const ServiceHandle<StoreGateSvc>& detStore
+ , const DetCondKeyTrans* detCondKeyTrans
+ , GeoAlignmentStore* alignmentStore) const
+{
+ ATH_MSG_DEBUG("Applying LAr Alignments to GeoModel");
+
+ // Special treatment for the HEC:
+ StoredAlignX *hec1AlxPos{nullptr};
+ StoredAlignX *hec2AlxPos{nullptr};
+ StoredAlignX *hec1AlxNeg{nullptr};
+ StoredAlignX *hec2AlxNeg{nullptr};
+ if (detStore->contains<StoredAlignX> ("HEC1_POS")) {
+ if (detStore->retrieve(hec1AlxPos,"HEC1_POS")!=StatusCode::SUCCESS) {
+ ATH_MSG_WARNING(" Unable to retrieve StoredAlignX for the key HEC1_POS");
+ }
+ }
+ if (detStore->contains<StoredAlignX> ("HEC1_NEG")) {
+ if (detStore->retrieve(hec1AlxNeg,"HEC1_NEG")!=StatusCode::SUCCESS) {
+ ATH_MSG_WARNING(" Unable to retrieve StoredAlignX for the key HEC1_NEG");
+ }
+ }
+ if (detStore->contains<StoredAlignX> ("HEC2_POS")) {
+ if (detStore->retrieve(hec2AlxPos,"HEC2_POS")!=StatusCode::SUCCESS) {
+ ATH_MSG_WARNING(" Unable to retrieve StoredAlignX for the key HEC2_POS");
+ }
+ }
+ if (detStore->contains<StoredAlignX> ("HEC2_NEG")) {
+ if (detStore->retrieve(hec2AlxNeg,"HEC2_NEG")!=StatusCode::SUCCESS) {
+ ATH_MSG_WARNING(" Unable to retrieve StoredAlignX for the key HEC2_NEG");
+ }
+ }
+ GeoAlignableTransform *hec1GatPos = hec1AlxPos ? hec1AlxPos->getAlignX(): nullptr;
+ GeoAlignableTransform *hec1GatNeg = hec1AlxPos ? hec1AlxNeg->getAlignX(): nullptr;
+ GeoAlignableTransform *hec2GatPos = hec2AlxPos ? hec2AlxPos->getAlignX(): nullptr;
+ GeoAlignableTransform *hec2GatNeg = hec2AlxPos ? hec2AlxNeg->getAlignX(): nullptr;
+
+ // Loop over align names and if a transform is present, then alter its delta
+ for(const std::string& alignName : m_alignNames) {
+ ATH_MSG_DEBUG("Working on align name " << alignName);
+ HepGeom::Transform3D newDelta;
+ // First try to retrieve StoredAlignX
+ if(detStore->contains<StoredAlignX>(alignName)) {
+ StoredAlignX* alignX{nullptr};
+ if(detStore->retrieve(alignX,alignName).isFailure()) {
+ ATH_MSG_ERROR(" Unable to retrieve StoredAlignX for the key " << alignName);
+ return StatusCode::FAILURE;
+ }
+
+ if(!alignX) {
+ ATH_MSG_ERROR("Null pointer to StoredAlignX for the key " << alignName);
+ return StatusCode::FAILURE;
+ }
+
+ GeoAlignableTransform* gat = alignX->getAlignX();
+ if(!gat) {
+ ATH_MSG_ERROR("Null pointer to GeoAlignableTransform for the key " << alignName);
+ return StatusCode::FAILURE;
+ }
+
+ // Check the existence of new delta in DetCondKeyTrans
+ if(detCondKeyTrans->getTransform(alignName,newDelta)) {
+ gat->setDelta(Amg::CLHEPTransformToEigen(newDelta),alignmentStore);
+ }
+ else {
+ gat->clearDelta();
+ }
+ }
+ else if (alignName=="HEC_POS") {
+ if (hec1GatPos) {
+ if(detCondKeyTrans->getTransform(alignName,newDelta)) {
+ hec1GatPos->setDelta(Amg::CLHEPTransformToEigen(newDelta),alignmentStore);
+ }
+ else {
+ hec1GatPos->clearDelta();
+ }
+ }
+ if (hec2GatPos) {
+ if(detCondKeyTrans->getTransform(alignName,newDelta)) {
+ hec2GatPos->setDelta(Amg::CLHEPTransformToEigen(newDelta),alignmentStore);
+ }
+ else {
+ hec2GatPos->clearDelta();
+ }
+ }
+ }
+ else if (alignName=="HEC_NEG") {
+ if (hec1GatNeg) {
+ if(detCondKeyTrans->getTransform(alignName,newDelta)) {
+ hec1GatNeg->setDelta(Amg::CLHEPTransformToEigen(newDelta),alignmentStore);
+ }
+ else {
+ hec1GatNeg->clearDelta();
+ }
+ }
+ if (hec2GatNeg) {
+ if(detCondKeyTrans->getTransform(alignName,newDelta)) {
+ hec2GatNeg->setDelta(Amg::CLHEPTransformToEigen(newDelta),alignmentStore);
+ }
+ else {
+ hec2GatNeg->clearDelta();
+ }
+ }
+ }
+ else {
+ ATH_MSG_DEBUG(" No StoredAlignX for the key " << alignName);
+ }
+ } // Loop over Align Names
+
+ // Fill the caches of Full Physical Volumes
+ for(const std::string& alignName : m_alignNames) {
+ if(detStore->contains<StoredPhysVol>(alignName)) {
+ StoredPhysVol* storedPV{nullptr};
+ if(detStore->retrieve(storedPV,alignName).isSuccess()) {
+ storedPV->getPhysVol()->getAbsoluteTransform(alignmentStore);
+ storedPV->getPhysVol()->getDefAbsoluteTransform(alignmentStore);
+ }
+ }
+ }
+
+ // Debug printout of global positions
+ if (msgLvl (MSG::DEBUG)) {
+ for(const std::string& alignName : m_alignNames) {
+ if(detStore->contains<StoredPhysVol>(alignName)) {
+ StoredPhysVol* storedPV{nullptr};
+ if(detStore->retrieve(storedPV,alignName).isSuccess()) {
+ const GeoFullPhysVol* fullPV = storedPV->getPhysVol();
+ const GeoTrf::Transform3D& xf = fullPV->getAbsoluteTransform(alignmentStore);
+ GeoTrf::Vector3D trans=xf.translation();
+ GeoTrf::RotationMatrix3D rot=xf.rotation();
+ ATH_MSG_DEBUG("Dump Absolute Transform: Key " << alignName
+ << " translation [" << trans.x() << "," << trans.y() << "," << trans.z()
+ << "] rotation (" << rot(0,0) << "," << rot(0,1) << "," << rot(0,2)
+ << "," << rot(1,0) << "," << rot(1,1) << "," << rot(1,2)
+ << "," << rot(2,0) << "," << rot(2,1) << "," << rot(2,2) << ")");
+ }
+ }
+ }
+ }
+
+ return StatusCode::SUCCESS;
+}
--
GitLab
From 63edb2bd46f683b6ecbbb496608f4b28d761e4ed Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Thu, 19 Aug 2021 00:30:05 +0200
Subject: [PATCH 155/272] CaloUtils clang-tidy related fixes
---
.../CaloUtils/CaloUtils/CaloCellCorrection.h | 8 +++---
.../CaloUtils/CaloUtils/CaloCellDetPos.h | 18 ++++++-------
.../CaloUtils/CaloUtils/CaloLCCoeffHelper.h | 14 +++++-----
.../CaloUtils/CaloUtils/CaloLayerCalculator.h | 26 +++++++++----------
.../CaloUtils/CaloTowerBuilderTool.h | 6 ++---
.../CaloUtils/src/CaloCellCorrection.cxx | 8 +++---
Calorimeter/CaloUtils/src/CaloCellDetPos.cxx | 10 +++----
.../src/CaloLCClassificationTool.cxx | 4 +--
.../CaloUtils/src/CaloLCCoeffHelper.cxx | 4 +--
.../CaloUtils/src/CaloLCDeadMaterialTool.cxx | 6 ++---
.../CaloUtils/src/CaloLCOutOfClusterTool.cxx | 4 +--
.../CaloUtils/src/CaloLCWeightTool.cxx | 4 +--
.../CaloUtils/src/CaloTowerBuilderTool.cxx | 4 +--
.../CaloUtils/src/CaloTowerStoreTestAlg.h | 8 +++---
14 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/Calorimeter/CaloUtils/CaloUtils/CaloCellCorrection.h b/Calorimeter/CaloUtils/CaloUtils/CaloCellCorrection.h
index 179abc8009dc..84168706ba3a 100644
--- a/Calorimeter/CaloUtils/CaloUtils/CaloCellCorrection.h
+++ b/Calorimeter/CaloUtils/CaloUtils/CaloCellCorrection.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef CALOUTILS_CALOCELLCORRECTION_H
@@ -69,11 +69,11 @@ public:
protected:
// All derived classes can call the following to correct CaloCell object:
- void setenergy(CaloCell* lar_cell, float energy) const;
+ static void setenergy(CaloCell* lar_cell, float energy) ;
- void addenergy(CaloCell* lar_cell, float energy) const;
+ static void addenergy(CaloCell* lar_cell, float energy) ;
- void scaleenergy(CaloCell* lar_cell, float scale) const;
+ static void scaleenergy(CaloCell* lar_cell, float scale) ;
};
diff --git a/Calorimeter/CaloUtils/CaloUtils/CaloCellDetPos.h b/Calorimeter/CaloUtils/CaloUtils/CaloCellDetPos.h
index 930dcc595fff..26e4e81d2bb3 100644
--- a/Calorimeter/CaloUtils/CaloUtils/CaloCellDetPos.h
+++ b/Calorimeter/CaloUtils/CaloUtils/CaloCellDetPos.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef CaloCellDetPos_H
@@ -33,9 +33,9 @@ class CaloCellDetPos
* @param double etaDet : estimated eta detector in nominal calo frame
* @param double phiDet : estimated phi detector in nominal calo frame
*/
- bool getDetPosition(const CaloDetDescrManager& mgr,
+ static bool getDetPosition(const CaloDetDescrManager& mgr,
CaloCell_ID::CaloSample sam, double etaAtlas,
- double phiAtlas, double& etaDet, double& phiDet) const;
+ double phiAtlas, double& etaDet, double& phiDet) ;
/**
* @brief get Atlas (aligned) level eta-phi position from detector level eta-phi positions
@@ -47,10 +47,10 @@ class CaloCellDetPos
* @param double phiAtlas : estimated phi detector in aligned Atlas frame
*/
- bool getAtlasPosition(const CaloDetDescrManager& mgr,
+ static bool getAtlasPosition(const CaloDetDescrManager& mgr,
CaloCell_ID::CaloSample sam, double etaDet,
double phiDet, double& etaAtlas,
- double& phiAtlas) const;
+ double& phiAtlas) ;
/**
* @brief get Detector level eta-phi position from Atlas level (aligned) position
@@ -60,8 +60,8 @@ class CaloCellDetPos
* @param double etaDet : estimated eta detector in nominal calo frame
* @param double phiDet : estimated phi detector in nominal calo frame
*/
- bool getDetPosition(CaloCell_ID::CaloSample sam , double etaAtlas, double phiAtlas,
- double & etaDet, double & phiDet) const;
+ static bool getDetPosition(CaloCell_ID::CaloSample sam , double etaAtlas, double phiAtlas,
+ double & etaDet, double & phiDet) ;
/**
@@ -73,8 +73,8 @@ class CaloCellDetPos
* @param double phiAtlas : estimated phi detector in aligned Atlas frame
*/
- bool getAtlasPosition(CaloCell_ID::CaloSample sam , double etaDet, double phiDet,
- double & etaAtlas, double & phiAtlas) const;
+ static bool getAtlasPosition(CaloCell_ID::CaloSample sam , double etaDet, double phiDet,
+ double & etaAtlas, double & phiAtlas) ;
};
diff --git a/Calorimeter/CaloUtils/CaloUtils/CaloLCCoeffHelper.h b/Calorimeter/CaloUtils/CaloUtils/CaloLCCoeffHelper.h
index cb4d011f1ae3..de92942bfd78 100644
--- a/Calorimeter/CaloUtils/CaloUtils/CaloLCCoeffHelper.h
+++ b/Calorimeter/CaloUtils/CaloUtils/CaloLCCoeffHelper.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef CALOUTILS_CALOLCCOEFFHELPER_H
@@ -19,15 +19,15 @@ class CaloLCCoeffHelper {
CaloLCCoeffHelper();
virtual ~CaloLCCoeffHelper();
- CaloLocalHadCoeff *InitDataFromFile(const char *fname);
- void PrintData(CaloLocalHadCoeff *m_data, std::ostream &fout);
- void PrintData(CaloLocalHadCoeff *m_data, const char *fname);
+ static CaloLocalHadCoeff *InitDataFromFile(const char *fname);
+ static void PrintData(CaloLocalHadCoeff *m_data, std::ostream &fout);
+ static void PrintData(CaloLocalHadCoeff *m_data, const char *fname);
- const CaloLocalHadCoeff::LocalHadArea * getAreaFromName(const CaloLocalHadCoeff * m_coeff, const std::string& sname, int &m_indx) const;
+ static const CaloLocalHadCoeff::LocalHadArea * getAreaFromName(const CaloLocalHadCoeff * m_coeff, const std::string& sname, int &m_indx) ;
// Interpolate m_data, n_area in phase space point x, over dimensions dim (all if 0)
// return in pars
- bool Interpolate(const CaloLocalHadCoeff *m_data, const unsigned int n_area, std::vector<float> &x,
+ static bool Interpolate(const CaloLocalHadCoeff *m_data, const unsigned int n_area, std::vector<float> &x,
CaloLocalHadCoeff::LocalHadCoeff &pars, const std::vector<int> &dim, double xfit=0.);
static CaloLocalHadDefs::LocalHadDimensionId getDimensionId(const std::string& dimensionName)
@@ -87,7 +87,7 @@ class CaloLCCoeffHelper {
}
private:
- CaloLocalHadCoeff::LocalHadDimension *parse_dim(std::string &sLine);
+ static CaloLocalHadCoeff::LocalHadDimension *parse_dim(std::string &sLine);
};
diff --git a/Calorimeter/CaloUtils/CaloUtils/CaloLayerCalculator.h b/Calorimeter/CaloUtils/CaloUtils/CaloLayerCalculator.h
index 2b78a1c9bf3e..3f636aa34b60 100644
--- a/Calorimeter/CaloUtils/CaloUtils/CaloLayerCalculator.h
+++ b/Calorimeter/CaloUtils/CaloUtils/CaloLayerCalculator.h
@@ -1,7 +1,7 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// $Id: CaloLayerCalculator.h,v 1.1 2006-03-20 17:42:26 ssnyder Exp $
@@ -280,20 +280,20 @@ private:
/// Layer variables.
- double m_etam; // Mean @f$\eta@f$.
- double m_phim; // Mean @f$\phi@f$.
- double m_etas; // RMS @f$\eta@f$.
- double m_phis; // RMS @f$\phi@f$.
- double m_em; // Total energy.
- double m_etamax; // @f$\eta@f$ center of maximum-energy cell.
- double m_phimax; // @f$\phi@f$ center of maximum-energy cell.
- double m_emax; // Energy of maximum-energy cell.
+ double m_etam = 0.0; // Mean @f$\eta@f$.
+ double m_phim = 0.0; // Mean @f$\phi@f$.
+ double m_etas = 0.0; // RMS @f$\eta@f$.
+ double m_phis = 0.0; // RMS @f$\phi@f$.
+ double m_em = 0.0; // Total energy.
+ double m_etamax = 0.0; // @f$\eta@f$ center of maximum-energy cell.
+ double m_phimax = 0.0; // @f$\phi@f$ center of maximum-energy cell.
+ double m_emax = 0.0; // Energy of maximum-energy cell.
// Added to cluster in the calorimeter frame
- double m_etamr; // Mean @f$\eta@f$ with raw quantity
- double m_phimr; // Mean @f$\phi@f$ with raw quantity
- double m_etarmax; // @f$\eta_raw@f$ center of maximum-energy cell.
- double m_phirmax; // @f$\phi_raw@f$ center of maximum-energy cell.
+ double m_etamr = 0.0; // Mean @f$\eta@f$ with raw quantity
+ double m_phimr = 0.0; // Mean @f$\phi@f$ with raw quantity
+ double m_etarmax = 0.0; // @f$\eta_raw@f$ center of maximum-energy cell.
+ double m_phirmax = 0.0; // @f$\phi_raw@f$ center of maximum-energy cell.
/**
diff --git a/Calorimeter/CaloUtils/CaloUtils/CaloTowerBuilderTool.h b/Calorimeter/CaloUtils/CaloUtils/CaloTowerBuilderTool.h
index 5baef7c97969..8aaf278f777c 100644
--- a/Calorimeter/CaloUtils/CaloUtils/CaloTowerBuilderTool.h
+++ b/Calorimeter/CaloUtils/CaloUtils/CaloTowerBuilderTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef CALOREC_CALOTOWERBUILDERTOOL_H
@@ -110,9 +110,9 @@ private:
CaloTowerStore m_cellStore;
virtual StatusCode checkSetup(MsgStream& log);
- void addTower (const CaloTowerStore::tower_iterator tower_it,
+ static void addTower (const CaloTowerStore::tower_iterator tower_it,
const ElementLink<CaloCellContainer>& cellsEL,
- CaloTower* tower) const;
+ CaloTower* tower) ;
void iterateFull (CaloTowerContainer* towers,
const ElementLink<CaloCellContainer>& cellsEL) const;
void iterateSubSeg (CaloTowerContainer* towers,
diff --git a/Calorimeter/CaloUtils/src/CaloCellCorrection.cxx b/Calorimeter/CaloUtils/src/CaloCellCorrection.cxx
index b78f99e9a20d..89ec45caaebc 100644
--- a/Calorimeter/CaloUtils/src/CaloCellCorrection.cxx
+++ b/Calorimeter/CaloUtils/src/CaloCellCorrection.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/********************************************************************
@@ -86,17 +86,17 @@ StatusCode CaloCellCorrection::execute (CaloCellContainer* cellCollection,
//////////////////////////////////////////////////////////////
-void CaloCellCorrection::setenergy(CaloCell* theCell, float energy) const
+void CaloCellCorrection::setenergy(CaloCell* theCell, float energy)
{
theCell->setEnergy( energy );
}
-void CaloCellCorrection::addenergy(CaloCell* theCell, float energy) const
+void CaloCellCorrection::addenergy(CaloCell* theCell, float energy)
{
theCell->addEnergy( energy );
}
-void CaloCellCorrection::scaleenergy(CaloCell* theCell, float scale) const
+void CaloCellCorrection::scaleenergy(CaloCell* theCell, float scale)
{
theCell->scaleEnergy( scale );
}
diff --git a/Calorimeter/CaloUtils/src/CaloCellDetPos.cxx b/Calorimeter/CaloUtils/src/CaloCellDetPos.cxx
index d13465d55861..f6f5ee8e8c44 100644
--- a/Calorimeter/CaloUtils/src/CaloCellDetPos.cxx
+++ b/Calorimeter/CaloUtils/src/CaloCellDetPos.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// for a given calorimeter layer, this class will convert detector eta,phi to Atlas eta,phi
@@ -14,7 +14,7 @@
bool CaloCellDetPos::getDetPosition(const CaloDetDescrManager& mgr,
CaloCell_ID::CaloSample sam,
double etaAtlas, double phiAtlas,
- double& etaDet, double& phiDet) const {
+ double& etaDet, double& phiDet) {
const CaloDetDescrElement* elt = mgr.get_element(sam,etaAtlas,phiAtlas);
if (!elt) {
@@ -31,7 +31,7 @@ bool CaloCellDetPos::getAtlasPosition(const CaloDetDescrManager& mgr,
CaloCell_ID::CaloSample sam,
double etaDet, double phiDet,
double& etaAtlas,
- double& phiAtlas) const {
+ double& phiAtlas) {
const CaloDetDescrElement* elt = mgr.get_element_raw(sam,etaDet,phiDet);
if (!elt) {
@@ -46,7 +46,7 @@ bool CaloCellDetPos::getAtlasPosition(const CaloDetDescrManager& mgr,
bool CaloCellDetPos::getDetPosition(CaloCell_ID::CaloSample sam,
double etaAtlas, double phiAtlas,
- double& etaDet, double& phiDet) const {
+ double& etaDet, double& phiDet) {
const CaloDetDescrManager* calo_mgr;
calo_mgr = CaloDetDescrManager::instance();
return getDetPosition(*calo_mgr,sam,etaAtlas,phiAtlas,etaDet,phiDet);
@@ -55,7 +55,7 @@ bool CaloCellDetPos::getDetPosition(CaloCell_ID::CaloSample sam,
bool CaloCellDetPos::getAtlasPosition(CaloCell_ID::CaloSample sam,
double etaDet, double phiDet,
double& etaAtlas,
- double& phiAtlas) const {
+ double& phiAtlas) {
const CaloDetDescrManager* calo_mgr;
calo_mgr = CaloDetDescrManager::instance();
diff --git a/Calorimeter/CaloUtils/src/CaloLCClassificationTool.cxx b/Calorimeter/CaloUtils/src/CaloLCClassificationTool.cxx
index 7f608740e347..299e23e76a66 100644
--- a/Calorimeter/CaloUtils/src/CaloLCClassificationTool.cxx
+++ b/Calorimeter/CaloUtils/src/CaloLCClassificationTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
//-----------------------------------------------------------------------
@@ -152,7 +152,7 @@ CaloRecoStatus::StatusIndicator CaloLCClassificationTool::classify(CaloCluster*
if(m_interpolate) {
// accesing interpolated coefficients
- bool isa = hp.Interpolate(condObject, 0,vars,parint, m_interpolateDimensions);
+ bool isa = CaloLCCoeffHelper::Interpolate(condObject, 0,vars,parint, m_interpolateDimensions);
if(isa) {
if ( parint[CaloLocalHadDefs::BIN_ENTRIES] > 0 ) {
isDataOK = true;
diff --git a/Calorimeter/CaloUtils/src/CaloLCCoeffHelper.cxx b/Calorimeter/CaloUtils/src/CaloLCCoeffHelper.cxx
index ad7f8d2cccc3..f663dd88c881 100644
--- a/Calorimeter/CaloUtils/src/CaloLCCoeffHelper.cxx
+++ b/Calorimeter/CaloUtils/src/CaloLCCoeffHelper.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// //-----------------------------------------------------------------------
@@ -40,7 +40,7 @@ CaloLCCoeffHelper::~CaloLCCoeffHelper()
// get HadDMArea from area name
-const CaloLocalHadCoeff::LocalHadArea * CaloLCCoeffHelper::getAreaFromName(const CaloLocalHadCoeff * coeff, const std::string& sname, int &indx) const
+const CaloLocalHadCoeff::LocalHadArea * CaloLCCoeffHelper::getAreaFromName(const CaloLocalHadCoeff * coeff, const std::string& sname, int &indx)
{
for(int i_area=0; i_area<coeff->getSizeAreaSet(); i_area++) {
if(sname == coeff->getArea(i_area)->getTitle()) {
diff --git a/Calorimeter/CaloUtils/src/CaloLCDeadMaterialTool.cxx b/Calorimeter/CaloUtils/src/CaloLCDeadMaterialTool.cxx
index 7d8d83de537d..74040bfe1efd 100644
--- a/Calorimeter/CaloUtils/src/CaloLCDeadMaterialTool.cxx
+++ b/Calorimeter/CaloUtils/src/CaloLCDeadMaterialTool.cxx
@@ -288,7 +288,7 @@ StatusCode CaloLCDeadMaterialTool::weight(CaloCluster* theCluster, const EventC
if(area->getType() == CaloLocalHadDefs::AREA_DMFIT) {
edm = (*pars)[CaloLocalHadDefs::BIN_P0] + (*pars)[CaloLocalHadDefs::BIN_P1]*areas[i_dm].eprep;
if(m_interpolate) {
- bool isa = hp.Interpolate(data, i_dm, vars, parint, m_interpolateDimensionsFit, areas[i_dm].eprep);
+ bool isa = CaloLCCoeffHelper::Interpolate(data, i_dm, vars, parint, m_interpolateDimensionsFit, areas[i_dm].eprep);
// calculation of fitted values is done already in the interpolator
if(isa) edm = parint[CaloLocalHadDefs::BIN_P0];
}
@@ -297,7 +297,7 @@ StatusCode CaloLCDeadMaterialTool::weight(CaloCluster* theCluster, const EventC
}else if(area->getType() == CaloLocalHadDefs::AREA_DMLOOKUP){
if( (*pars)[CaloLocalHadDefs::BIN_ENTRIES] > m_MinLookupBinNentry) edm = cls_unweighted_energy*((*pars)[CaloLocalHadDefs::BIN_WEIGHT] - 1.0 );
if(m_interpolate) {
- bool isa = hp.Interpolate(data, i_dm, vars, parint, m_interpolateDimensionsLookup);
+ bool isa = CaloLCCoeffHelper::Interpolate(data, i_dm, vars, parint, m_interpolateDimensionsLookup);
if(isa && parint[CaloLocalHadDefs::BIN_ENTRIES] > m_MinLookupBinNentry) edm = cls_unweighted_energy*(parint[CaloLocalHadDefs::BIN_WEIGHT] - 1.0 );
}
@@ -560,7 +560,7 @@ CaloLCDeadMaterialTool::prepare_for_cluster
float weight = itrCell.weight();
cls_unweighted_energy += energy;
- Cell cell;
+ Cell cell{};
cell.weight = weight;
cell.energy = energy;
cell.dm = sDM;
diff --git a/Calorimeter/CaloUtils/src/CaloLCOutOfClusterTool.cxx b/Calorimeter/CaloUtils/src/CaloLCOutOfClusterTool.cxx
index db3ed88ce6ce..acc353717ee2 100644
--- a/Calorimeter/CaloUtils/src/CaloLCOutOfClusterTool.cxx
+++ b/Calorimeter/CaloUtils/src/CaloLCOutOfClusterTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
//-----------------------------------------------------------------------
@@ -240,7 +240,7 @@ StatusCode CaloLCOutOfClusterTool::weight(CaloCluster *theCluster, const EventCo
if(m_interpolate) {
// accesing interpolated coefficients
CaloLocalHadCoeff::LocalHadCoeff parint;
- bool isa = hp.Interpolate(data, 0,vars,parint, m_interpolateDimensions);
+ bool isa = CaloLCCoeffHelper::Interpolate(data, 0,vars,parint, m_interpolateDimensions);
if(isa && parint[CaloLocalHadDefs::BIN_ENTRIES] > 0) {
isDataOK = true;
oocData = parint[CaloLocalHadDefs::BIN_WEIGHT];
diff --git a/Calorimeter/CaloUtils/src/CaloLCWeightTool.cxx b/Calorimeter/CaloUtils/src/CaloLCWeightTool.cxx
index b4346ceeff2e..4a08c1729b60 100644
--- a/Calorimeter/CaloUtils/src/CaloLCWeightTool.cxx
+++ b/Calorimeter/CaloUtils/src/CaloLCWeightTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
//-----------------------------------------------------------------------
@@ -188,7 +188,7 @@ StatusCode CaloLCWeightTool::weight(xAOD::CaloCluster *theCluster, const EventCo
}
if(m_interpolate) {
// accesing interpolated coefficients
- bool isa = hp.Interpolate(data, isAmpMap[theSample], vars, parint, m_interpolateDimensions);
+ bool isa = CaloLCCoeffHelper::Interpolate(data, isAmpMap[theSample], vars, parint, m_interpolateDimensions);
if(isa && parint[CaloLocalHadDefs::BIN_ENTRIES] > 10) {
isDataOK = true;
wData = parint[CaloLocalHadDefs::BIN_WEIGHT];
diff --git a/Calorimeter/CaloUtils/src/CaloTowerBuilderTool.cxx b/Calorimeter/CaloUtils/src/CaloTowerBuilderTool.cxx
index 979dfa451fbd..c3039b1ca4ee 100644
--- a/Calorimeter/CaloUtils/src/CaloTowerBuilderTool.cxx
+++ b/Calorimeter/CaloUtils/src/CaloTowerBuilderTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
@@ -64,7 +64,7 @@ inline
void
CaloTowerBuilderTool::addTower (const CaloTowerStore::tower_iterator tower_it,
const ElementLink<CaloCellContainer>& cellsEL,
- CaloTower* tower) const
+ CaloTower* tower)
{
CaloTowerStore::cell_iterator firstC = tower_it.firstCell();
CaloTowerStore::cell_iterator lastC = tower_it.lastCell();
diff --git a/Calorimeter/CaloUtils/src/CaloTowerStoreTestAlg.h b/Calorimeter/CaloUtils/src/CaloTowerStoreTestAlg.h
index b64cdbfe6c92..35e0324451b5 100644
--- a/Calorimeter/CaloUtils/src/CaloTowerStoreTestAlg.h
+++ b/Calorimeter/CaloUtils/src/CaloTowerStoreTestAlg.h
@@ -1,7 +1,7 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// $Id$
@@ -40,12 +40,12 @@ public:
typedef std::vector<std::pair<unsigned, double> > test_tow_t;
typedef std::vector<test_tow_t> test_tows_t;
- void dump_tows (const test_tows_t& t);
+ static void dump_tows (const test_tows_t& t);
private:
- void iterate_full (const CaloTowerStore& store,
+ static void iterate_full (const CaloTowerStore& store,
test_tows_t& tows);
- void iterate_subseg (const CaloTowerStore& store,
+ static void iterate_subseg (const CaloTowerStore& store,
const CaloTowerSeg::SubSeg& subseg,
test_tows_t& tows);
--
GitLab
From 4d605b7140f99ef41b6c577171c3e8bda7b93537 Mon Sep 17 00:00:00 2001
From: Daniele Zanzi <daniele.zanzi@cern.ch>
Date: Thu, 19 Aug 2021 09:56:49 +0200
Subject: [PATCH 156/272] fix ref
---
.../TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref | 4 ----
1 file changed, 4 deletions(-)
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index d035d57c6ac8..2c2f2885d07e 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -788,10 +788,6 @@ HLT_2mu6_bPhi_L1LFV-MU6:
4: 4
HLT_2mu6_bUpsimumu_L1BPH-8M15-0DR22-2MU6:
eventCount: 0
- stepCounts:
- 0: 1
- stepFeatures:
- 0: 2
HLT_2mu6_l2io_L12MU6:
eventCount: 3
stepCounts:
--
GitLab
From 7dc9327edd61be2dcc6ba8f941de6a7cd44c665e Mon Sep 17 00:00:00 2001
From: Tadej Novak <tadej.novak@cern.ch>
Date: Mon, 26 Jul 2021 14:42:31 +0200
Subject: [PATCH 157/272] Define PixelReadoutManager
---
.../GeoModel/GeoAdaptors/CMakeLists.txt | 4 +-
.../InDetAlignGenTools/CMakeLists.txt | 4 +-
.../InDetAlignGeomTools/CMakeLists.txt | 4 +-
.../PixelCalibAlgs/CMakeLists.txt | 2 +-
.../PixelCalibAlgs/PixelChargeToTConversion.h | 8 +-
.../src/PixelChargeToTConversion.cxx | 8 +-
.../PixelConditionsAlgorithms/CMakeLists.txt | 4 +-
.../src/PixelChargeLUTCalibCondAlg.cxx | 6 +-
.../src/PixelSiliconConditionsTestAlg.cxx | 38 +-
.../PixelConditionsData/CMakeLists.txt | 4 +-
.../PixelChargeCalibCondData.h | 37 +-
.../src/PixelChargeCalibCondData.cxx | 76 +--
.../PixelConditionsTools/CMakeLists.txt | 2 +-
.../python/ITkPixelConditionsSummaryConfig.py | 6 +-
.../python/PixelConditionsSummaryConfig.py | 6 +-
.../src/PixelConditionsSummaryTool.cxx | 8 +-
.../src/PixelConditionsSummaryTool.h | 8 +-
.../SiLorentzAngleTool/CMakeLists.txt | 4 +-
.../src/PixelSiLorentzAngleCondAlg.cxx | 2 +-
.../InDetTrackingGeometry/CMakeLists.txt | 2 +-
.../InDetDetDescr/PixelCabling/CMakeLists.txt | 24 -
.../PixelCabling/ATLAS_CHECK_THREAD_SAFETY | 1 -
.../PixelCabling/IPixelCablingSvc.h | 40 --
.../python/PixelCablingConfigNew.py | 21 -
.../run/dumpCabling_jobOptions.py | 103 ----
.../run/readCabling_jobOptions.py | 107 ----
.../PixelCabling/share/SelectPixelMap.py | 42 --
.../postInclude.IBLPixelSvcCablingSetup.py | 9 -
.../postInclude.IBLPixelSvcCablingSetupDBM.py | 13 -
...nclude.IBLPixelSvcCablingSetupHybridDBM.py | 17 -
.../PixelCabling/src/PixelCablingSvc.cxx | 482 ------------------
.../PixelCabling/src/PixelCablingSvc.h | 45 --
.../src/components/PixelCabling_entries.cxx | 4 -
.../test/PixelCablingConfigNew_test.py | 21 -
.../PixelGeoModel/CMakeLists.txt | 2 +-
.../PixelGeoModelXml/CMakeLists.txt | 2 +-
.../PixelReadoutDefinitions/CMakeLists.txt | 10 +
.../PixelReadoutDefinitions.h | 38 ++
.../PixelReadoutGeometry/CMakeLists.txt | 33 +-
.../IPixelReadoutManager.h | 49 ++
.../PixelReadoutGeometry/PixelModuleDesign.h | 16 +-
.../python/PixelReadoutGeometryConfig.py | 17 +
.../python/PixelReadoutGeometryConfigDb.py | 5 +
.../PixelReadoutGeometryConfigLegacy.py | 6 +
.../PixelReadoutGeometry/python/__init__.py | 0
.../src/ITkPixelReadoutManager.cxx | 289 +++++++++++
.../src/ITkPixelReadoutManager.h | 56 ++
.../src/PixelReadoutManager.cxx | 470 +++++++++++++++++
.../src/PixelReadoutManager.h | 53 ++
.../PixelReadoutGeometry_entries.cxx | 5 +
.../test/ITkPixelReadoutManager_test.cxx | 281 ++++++++++
.../test/ITkPixelReadoutManager_test.txt | 12 +
.../test/PixelReadoutGeometryConfig_test.py | 22 +
.../FastSiDigitization/CMakeLists.txt | 2 +-
.../PixelFastDigitizationTool.h | 8 +-
.../src/PixelFastDigitizationTool.cxx | 6 +-
.../PixelDigitization/CMakeLists.txt | 4 +-
.../python/ITkPixelDigitizationConfig.py | 10 +-
.../python/PixelDigitizationConfig.py | 8 +-
.../python/PixelDigitizationConfigNew.py | 18 +-
.../PixelDigitization/src/FEI3SimTool.cxx | 8 +-
.../PixelDigitization/src/FEI4SimTool.cxx | 8 +-
.../PixelDigitization/src/FrontEndSimTool.h | 12 +-
.../PixelDigitization/src/RD53SimTool.cxx | 8 +-
.../PixelDigitization/src/SensorSim3DTool.cxx | 12 +-
.../PixelDigitization/src/SensorSim3DTool.h | 10 +-
.../src/SensorSimPlanarTool.cxx | 6 +-
.../InDetPrepRawDataToxAOD/CMakeLists.txt | 4 +-
.../src/PixelPrepDataToxAOD.cxx | 6 +-
.../src/PixelPrepDataToxAOD.h | 6 +-
.../PixelRawDataByteStreamCnv/CMakeLists.txt | 8 +-
.../src/PixelRawContByteStreamTool.cxx | 77 ++-
.../src/PixelRawContByteStreamTool.h | 24 +-
.../src/PixelRodDecoder.cxx | 31 +-
.../src/PixelRodDecoder.h | 10 +-
.../share/testSCTDecode.py | 2 +-
.../InDetDetDescrExample/CMakeLists.txt | 2 +-
.../InDetRecExample/share/InDetRecCabling.py | 8 +-
.../share/InDetRecPreProcessingSilicon.py | 5 +
.../share/jobOptions_StandaloneDBM_RAW.py | 1 -
.../InDetAlignmentMonitoring/CMakeLists.txt | 2 +-
.../CMakeLists.txt | 2 +-
.../InDetGlobalMonitoring/CMakeLists.txt | 2 +-
.../PixelMonitoring/CMakeLists.txt | 2 +-
.../src/PixelAthClusterMonAlg.cxx | 9 +-
.../src/PixelAthClusterMonAlg.h | 8 +-
.../src/PixelAthErrorMonAlg.cxx | 9 +-
.../PixelMonitoring/src/PixelAthErrorMonAlg.h | 6 +-
.../PixelMonitoring/src/PixelAthHitMonAlg.cxx | 5 +-
.../PixelMonitoring/src/PixelAthHitMonAlg.h | 8 +-
.../share/SiSPSeededTracksStandalone.py | 4 +-
.../SiSPSeededTracksStandaloneFromESD.py | 4 +
.../InDetTestBLayer/CMakeLists.txt | 6 +-
.../InDetTestPixelLayer/CMakeLists.txt | 4 +-
.../SiClusterOnTrackTool/CMakeLists.txt | 4 +-
.../SiClusterizationTool/CMakeLists.txt | 6 +-
.../SiClusterizationTool/ClusterMakerTool.h | 8 +-
.../NnClusterizationFactory.h | 6 +-
.../TotPixelClusterSplitter.h | 8 +-
.../src/ClusterMakerTool.cxx | 14 +-
.../src/NnClusterizationFactory.cxx | 6 +-
.../src/TotPixelClusterSplitter.cxx | 6 +-
.../SiDetElementsRoadTool_xk/CMakeLists.txt | 4 +-
.../MuonCnv/MuonEventTPCnv/CMakeLists.txt | 2 +-
Projects/AthSimulation/package_filters.txt | 1 +
Simulation/Tools/RDOAnalysis/CMakeLists.txt | 2 +-
.../CMakeLists.txt | 4 +-
.../TrigInDetConfig/python/TrigInDetConfig.py | 4 +-
.../TrigOnlineSpacePointTool/CMakeLists.txt | 4 +-
graphics/GeometryJiveXML/CMakeLists.txt | 2 +-
.../VP1RawDataSystems/CMakeLists.txt | 2 +-
.../VP1Systems/VP1TrackSystems/CMakeLists.txt | 2 +-
graphics/VP1/VP1Utils/CMakeLists.txt | 2 +-
113 files changed, 1715 insertions(+), 1275 deletions(-)
delete mode 100644 InnerDetector/InDetDetDescr/PixelCabling/CMakeLists.txt
delete mode 100644 InnerDetector/InDetDetDescr/PixelCabling/PixelCabling/ATLAS_CHECK_THREAD_SAFETY
delete mode 100644 InnerDetector/InDetDetDescr/PixelCabling/PixelCabling/IPixelCablingSvc.h
delete mode 100644 InnerDetector/InDetDetDescr/PixelCabling/python/PixelCablingConfigNew.py
delete mode 100644 InnerDetector/InDetDetDescr/PixelCabling/run/dumpCabling_jobOptions.py
delete mode 100644 InnerDetector/InDetDetDescr/PixelCabling/run/readCabling_jobOptions.py
delete mode 100644 InnerDetector/InDetDetDescr/PixelCabling/share/SelectPixelMap.py
delete mode 100644 InnerDetector/InDetDetDescr/PixelCabling/share/postInclude.IBLPixelSvcCablingSetup.py
delete mode 100644 InnerDetector/InDetDetDescr/PixelCabling/share/postInclude.IBLPixelSvcCablingSetupDBM.py
delete mode 100644 InnerDetector/InDetDetDescr/PixelCabling/share/postInclude.IBLPixelSvcCablingSetupHybridDBM.py
delete mode 100644 InnerDetector/InDetDetDescr/PixelCabling/src/PixelCablingSvc.cxx
delete mode 100644 InnerDetector/InDetDetDescr/PixelCabling/src/PixelCablingSvc.h
delete mode 100644 InnerDetector/InDetDetDescr/PixelCabling/src/components/PixelCabling_entries.cxx
delete mode 100755 InnerDetector/InDetDetDescr/PixelCabling/test/PixelCablingConfigNew_test.py
create mode 100644 InnerDetector/InDetDetDescr/PixelReadoutDefinitions/CMakeLists.txt
create mode 100644 InnerDetector/InDetDetDescr/PixelReadoutDefinitions/PixelReadoutDefinitions/PixelReadoutDefinitions.h
create mode 100644 InnerDetector/InDetDetDescr/PixelReadoutGeometry/PixelReadoutGeometry/IPixelReadoutManager.h
create mode 100644 InnerDetector/InDetDetDescr/PixelReadoutGeometry/python/PixelReadoutGeometryConfig.py
create mode 100644 InnerDetector/InDetDetDescr/PixelReadoutGeometry/python/PixelReadoutGeometryConfigDb.py
create mode 100644 InnerDetector/InDetDetDescr/PixelReadoutGeometry/python/PixelReadoutGeometryConfigLegacy.py
create mode 100644 InnerDetector/InDetDetDescr/PixelReadoutGeometry/python/__init__.py
create mode 100644 InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/ITkPixelReadoutManager.cxx
create mode 100644 InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/ITkPixelReadoutManager.h
create mode 100644 InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/PixelReadoutManager.cxx
create mode 100644 InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/PixelReadoutManager.h
create mode 100644 InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/components/PixelReadoutGeometry_entries.cxx
create mode 100644 InnerDetector/InDetDetDescr/PixelReadoutGeometry/test/ITkPixelReadoutManager_test.cxx
create mode 100644 InnerDetector/InDetDetDescr/PixelReadoutGeometry/test/ITkPixelReadoutManager_test.txt
create mode 100755 InnerDetector/InDetDetDescr/PixelReadoutGeometry/test/PixelReadoutGeometryConfig_test.py
diff --git a/DetectorDescription/GeoModel/GeoAdaptors/CMakeLists.txt b/DetectorDescription/GeoModel/GeoAdaptors/CMakeLists.txt
index 546f29964e10..68dab54bf7f7 100644
--- a/DetectorDescription/GeoModel/GeoAdaptors/CMakeLists.txt
+++ b/DetectorDescription/GeoModel/GeoAdaptors/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( GeoAdaptors )
@@ -12,4 +12,4 @@ atlas_add_library( GeoAdaptors
PUBLIC_HEADERS GeoAdaptors
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloIdentifier CaloSimEvent GeoPrimitives Identifier InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry SCT_ReadoutGeometry TRT_ReadoutGeometry InDetSimEvent LArSimEvent MuonReadoutGeometry MuonPrepRawData MuonSimEvent CaloDetDescrLib StoreGateLib MuonIdHelpersLib )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloIdentifier CaloSimEvent GeoPrimitives Identifier InDetIdentifier InDetReadoutGeometry PixelReadoutGeometryLib SCT_ReadoutGeometry TRT_ReadoutGeometry InDetSimEvent LArSimEvent MuonReadoutGeometry MuonPrepRawData MuonSimEvent CaloDetDescrLib StoreGateLib MuonIdHelpersLib )
diff --git a/InnerDetector/InDetAlignTools/InDetAlignGenTools/CMakeLists.txt b/InnerDetector/InDetAlignTools/InDetAlignGenTools/CMakeLists.txt
index 703d80c37b81..306367a157be 100644
--- a/InnerDetector/InDetAlignTools/InDetAlignGenTools/CMakeLists.txt
+++ b/InnerDetector/InDetAlignTools/InDetAlignGenTools/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetAlignGenTools )
@@ -19,4 +19,4 @@ atlas_add_component( InDetAlignGenTools
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${CORAL_LIBRARIES} ${HEPPDT_LIBRARIES} AthContainers AthenaKernel AthenaPoolUtilities AtlasDetDescr AtlasHepMCLib DetDescrConditions GaudiKernel GeoPrimitives Identifier InDetAlignGenToolsLib InDetAlignTrkInfo InDetIdentifier InDetPrepRawData ReadoutGeometryBase InDetReadoutGeometry PixelReadoutGeometry RegistrationServicesLib SCT_ReadoutGeometry TrackRecordLib TrkEventPrimitives TrkExInterfaces TrkFitterInterfaces TrkMeasurementBase TrkParameters TrkPrepRawData TrkRIO_OnTrack TrkToolInterfaces TrkTrack TrkTrackSummary TrkTruthData )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${CORAL_LIBRARIES} ${HEPPDT_LIBRARIES} AthContainers AthenaKernel AthenaPoolUtilities AtlasDetDescr AtlasHepMCLib DetDescrConditions GaudiKernel GeoPrimitives Identifier InDetAlignGenToolsLib InDetAlignTrkInfo InDetIdentifier InDetPrepRawData ReadoutGeometryBase InDetReadoutGeometry PixelReadoutGeometryLib RegistrationServicesLib SCT_ReadoutGeometry TrackRecordLib TrkEventPrimitives TrkExInterfaces TrkFitterInterfaces TrkMeasurementBase TrkParameters TrkPrepRawData TrkRIO_OnTrack TrkToolInterfaces TrkTrack TrkTrackSummary TrkTruthData )
diff --git a/InnerDetector/InDetAlignment/InDetAlignGeomTools/CMakeLists.txt b/InnerDetector/InDetAlignment/InDetAlignGeomTools/CMakeLists.txt
index 8c89fcb36236..dbf618b23f7e 100644
--- a/InnerDetector/InDetAlignment/InDetAlignGeomTools/CMakeLists.txt
+++ b/InnerDetector/InDetAlignment/InDetAlignGeomTools/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetAlignGeomTools )
@@ -18,5 +18,5 @@ atlas_add_library( InDetAlignGeomToolsLib
atlas_add_component( InDetAlignGeomTools
src/*.cxx src/components/*.cxx
LINK_LIBRARIES AthContainers GeoModelInterfaces GeoModelUtilities InDetAlignGeomToolsLib
- InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry RDBAccessSvcLib SCT_ReadoutGeometry
+ InDetIdentifier InDetReadoutGeometry PixelReadoutGeometryLib RDBAccessSvcLib SCT_ReadoutGeometry
TRT_ReadoutGeometry TrkAlignEvent TrkAlignInterfaces TrkRIO_OnTrack )
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt
index 113713e027b2..c5370f5dfda8 100644
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt
@@ -13,7 +13,7 @@ atlas_add_library( PixelCalibAlgsLib
PUBLIC_HEADERS PixelCalibAlgs
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps CxxUtils GaudiKernel InDetConditionsSummaryService
- InDetPrepRawData InDetReadoutGeometry PixelCablingLib PixelConditionsData StoreGateLib
+ InDetPrepRawData InDetReadoutGeometry PixelReadoutGeometryLib PixelConditionsData StoreGateLib
PRIVATE_LINK_LIBRARIES AthenaPoolUtilities EventInfo InDetIdentifier InDetRawData PixelGeoModelLib )
atlas_add_component( PixelCalibAlgs
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixelChargeToTConversion.h b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixelChargeToTConversion.h
index fb7a9f470131..cd39ac04f26a 100755
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixelChargeToTConversion.h
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixelChargeToTConversion.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef PIXELCALIBALGS_PIXELCHARGETOTCONVERSION_H
@@ -10,9 +10,9 @@
#include "InDetPrepRawData/PixelCluster.h"
#include "InDetPrepRawData/PixelClusterContainer.h"
#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
-#include "PixelCabling/IPixelCablingSvc.h"
#include "PixelConditionsData/PixelModuleData.h"
#include "PixelConditionsData/PixelChargeCalibCondData.h"
+#include "PixelReadoutGeometry/IPixelReadoutManager.h"
#include "StoreGate/ReadCondHandleKey.h"
#include "GaudiKernel/ServiceHandle.h"
@@ -39,8 +39,8 @@ class ATLAS_NOT_THREAD_SAFE PixelChargeToTConversion : public AthAlgorithm{
SG::ReadHandleKey<InDet::PixelClusterContainer> m_pixelsClustersKey
{this, "PixelClusterContainer", "PixelClusters", ""};
- ServiceHandle<IPixelCablingSvc> m_pixelCabling
- {this, "PixelCablingSvc", "PixelCablingSvc", "Pixel cabling service" };
+ ServiceHandle<InDetDD::IPixelReadoutManager> m_pixelReadout
+ {this, "PixelReadoutManager", "PixelReadoutManager", "Pixel readout manager" };
SG::ReadCondHandleKey<PixelModuleData> m_moduleDataKey
{this, "PixelModuleData", "PixelModuleData", "Pixel module data"};
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelChargeToTConversion.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelChargeToTConversion.cxx
index dbbbfb92c55f..748817a18a53 100644
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelChargeToTConversion.cxx
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelChargeToTConversion.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// conditions
@@ -33,7 +33,7 @@ StatusCode PixelChargeToTConversion::initialize(){
} else
ATH_MSG_INFO("Retrieved service " << m_IBLParameterSvc);
- ATH_CHECK(m_pixelCabling.retrieve());
+ ATH_CHECK(m_pixelReadout.retrieve());
ATH_CHECK(m_moduleDataKey.initialize());
ATH_CHECK(m_chargeDataKey.initialize());
ATH_CHECK(m_pixelDetEleCollKey.initialize());
@@ -106,8 +106,8 @@ StatusCode PixelChargeToTConversion::execute(){
Identifier moduleID = pixelID.wafer_id(pixid);
IdentifierHash moduleHash = pixelID.wafer_hash(moduleID);
- int circ = m_pixelCabling->getFE(&pixid,moduleID);
- int type = m_pixelCabling->getPixelType(pixid);
+ int circ = m_pixelReadout->getFE(pixid, moduleID);
+ InDetDD::PixelDiodeType type = m_pixelReadout->getDiodeType(pixid);
int totInt = (int)calibData->getToT((int)moduleHash, circ, type, Charges[i]);
if( m_IBLParameterSvc->containsIBL() && pixelID.barrel_ec(pixid) == 0 && pixelID.layer_disk(pixid) == 0 ) {
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/CMakeLists.txt b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/CMakeLists.txt
index 6e4f967d2775..d17e1679c300 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( PixelConditionsAlgorithms )
@@ -11,7 +11,7 @@ find_package( CORAL COMPONENTS CoralBase )
atlas_add_component( PixelConditionsAlgorithms
src/*.h src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel AthenaPoolUtilities CommissionEvent DetDescrConditions GaudiKernel GeoModelUtilities GeoPrimitives Identifier InDetCondTools InDetIdentifier InDetReadoutGeometry PathResolver PixelConditionsData PixelReadoutGeometry StoreGateLib TrkGeometry TrkSurfaces MuonReadoutGeometry TRT_ReadoutGeometry)
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel AthenaPoolUtilities CommissionEvent DetDescrConditions GaudiKernel GeoModelUtilities GeoPrimitives Identifier InDetCondTools InDetIdentifier InDetReadoutGeometry PathResolver PixelConditionsData PixelReadoutGeometryLib StoreGateLib TrkGeometry TrkSurfaces MuonReadoutGeometry TRT_ReadoutGeometry)
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeLUTCalibCondAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeLUTCalibCondAlg.cxx
index 54aa72aa2b73..461780d7d11b 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeLUTCalibCondAlg.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeLUTCalibCondAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "PixelChargeLUTCalibCondAlg.h"
@@ -105,7 +105,7 @@ StatusCode PixelChargeLUTCalibCondAlg::execute(const EventContext& ctx) const {
while (std::getline(calibFE,buffer,',')) { calibString.push_back(buffer); }
// new charge calibration for RUN-3
- if (p_design->getReadoutTechnology()==InDetDD::PixelModuleDesign::FEI4 && !(element->isDBM())) {
+ if (p_design->getReadoutTechnology()==InDetDD::PixelReadoutTechnology::FEI4 && !(element->isDBM())) {
if (calibString.size()!=20) {
ATH_MSG_FATAL("Parameter size is not consistent(20) " << calibString.size() << " at (i,j)=(" << i-1 << "," << j << ")");
return StatusCode::FAILURE;
@@ -115,7 +115,7 @@ StatusCode PixelChargeLUTCalibCondAlg::execute(const EventContext& ctx) const {
for (int k=0; k<16; k++) {
chrgs[k]=std::atof(calibString[k+4].c_str());
}
- writeCdo -> setCalibrationStrategy(i-1, 1);
+ writeCdo -> setCalibrationStrategy(i-1, PixelChargeCalibCondData::CalibrationStrategy::LUTFEI4);
writeCdo -> setTot2Charges(i-1, chrgs);
// Normal pixel
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelSiliconConditionsTestAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelSiliconConditionsTestAlg.cxx
index df09b4d43ea2..48e8a8ae7adf 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelSiliconConditionsTestAlg.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelSiliconConditionsTestAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "CLHEP/Units/SystemOfUnits.h"
@@ -43,24 +43,24 @@ StatusCode PixelSiliconConditionsTestAlg::execute(){
<< m_lorentzAngleTool->getLorentzShift(IdentifierHash(i)));
for (int j=0; j<16; j++) {
ATH_MSG_DEBUG("FE " << j << " "
- << calib->getAnalogThreshold(i,j,PixelChargeCalibCondData::NORMAL) << " "
- << calib->getAnalogThresholdSigma(i,j,PixelChargeCalibCondData::NORMAL) << " "
- << calib->getAnalogThresholdNoise(i,j,PixelChargeCalibCondData::NORMAL) << " "
- << calib->getInTimeThreshold(i,j,PixelChargeCalibCondData::NORMAL) << " "
- << calib->getAnalogThreshold(i,j,PixelChargeCalibCondData::LONG) << " "
- << calib->getAnalogThresholdSigma(i,j,PixelChargeCalibCondData::LONG) << " "
- << calib->getAnalogThresholdNoise(i,j,PixelChargeCalibCondData::LONG) << " "
- << calib->getInTimeThreshold(i,j,PixelChargeCalibCondData::LONG) << " "
- << calib->getAnalogThreshold(i,j,PixelChargeCalibCondData::GANGED) << " "
- << calib->getAnalogThresholdSigma(i,j,PixelChargeCalibCondData::GANGED) << " "
- << calib->getAnalogThresholdNoise(i,j,PixelChargeCalibCondData::GANGED) << " "
- << calib->getInTimeThreshold(i,j,PixelChargeCalibCondData::GANGED) << " "
- << calib->getQ2TotA(i,j,PixelChargeCalibCondData::NORMAL) << " "
- << calib->getQ2TotE(i,j,PixelChargeCalibCondData::NORMAL) << " "
- << calib->getQ2TotC(i,j,PixelChargeCalibCondData::NORMAL) << " "
- << calib->getQ2TotA(i,j,PixelChargeCalibCondData::GANGED) << " "
- << calib->getQ2TotE(i,j,PixelChargeCalibCondData::GANGED) << " "
- << calib->getQ2TotC(i,j,PixelChargeCalibCondData::GANGED));
+ << calib->getAnalogThreshold(i,j,InDetDD::PixelDiodeType::NORMAL) << " "
+ << calib->getAnalogThresholdSigma(i,j,InDetDD::PixelDiodeType::NORMAL) << " "
+ << calib->getAnalogThresholdNoise(i,j,InDetDD::PixelDiodeType::NORMAL) << " "
+ << calib->getInTimeThreshold(i,j,InDetDD::PixelDiodeType::NORMAL) << " "
+ << calib->getAnalogThreshold(i,j,InDetDD::PixelDiodeType::LONG) << " "
+ << calib->getAnalogThresholdSigma(i,j,InDetDD::PixelDiodeType::LONG) << " "
+ << calib->getAnalogThresholdNoise(i,j,InDetDD::PixelDiodeType::LONG) << " "
+ << calib->getInTimeThreshold(i,j,InDetDD::PixelDiodeType::LONG) << " "
+ << calib->getAnalogThreshold(i,j,InDetDD::PixelDiodeType::GANGED) << " "
+ << calib->getAnalogThresholdSigma(i,j,InDetDD::PixelDiodeType::GANGED) << " "
+ << calib->getAnalogThresholdNoise(i,j,InDetDD::PixelDiodeType::GANGED) << " "
+ << calib->getInTimeThreshold(i,j,InDetDD::PixelDiodeType::GANGED) << " "
+ << calib->getQ2TotA(i,j,InDetDD::PixelDiodeType::NORMAL) << " "
+ << calib->getQ2TotE(i,j,InDetDD::PixelDiodeType::NORMAL) << " "
+ << calib->getQ2TotC(i,j,InDetDD::PixelDiodeType::NORMAL) << " "
+ << calib->getQ2TotA(i,j,InDetDD::PixelDiodeType::GANGED) << " "
+ << calib->getQ2TotE(i,j,InDetDD::PixelDiodeType::GANGED) << " "
+ << calib->getQ2TotC(i,j,InDetDD::PixelDiodeType::GANGED));
}
diff --git a/InnerDetector/InDetConditions/PixelConditionsData/CMakeLists.txt b/InnerDetector/InDetConditions/PixelConditionsData/CMakeLists.txt
index 1181ac47bbfa..5167b9dfe0fb 100644
--- a/InnerDetector/InDetConditions/PixelConditionsData/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/PixelConditionsData/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( PixelConditionsData )
@@ -13,5 +13,5 @@ atlas_add_library( PixelConditionsData
PUBLIC_HEADERS PixelConditionsData
PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES AthenaKernel AthenaPoolUtilities GeoPrimitives Identifier InDetByteStreamErrors InDetIdentifier
+ LINK_LIBRARIES AthenaKernel AthenaPoolUtilities GeoPrimitives Identifier InDetByteStreamErrors InDetIdentifier PixelReadoutDefinitionsLib
PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} )
diff --git a/InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/PixelChargeCalibCondData.h b/InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/PixelChargeCalibCondData.h
index 573433352c13..92730f0806a3 100644
--- a/InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/PixelChargeCalibCondData.h
+++ b/InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/PixelChargeCalibCondData.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef PIXELCHARGECALIBCONDDATA_H
@@ -7,6 +7,7 @@
#include "AthenaKernel/CLASS_DEF.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
+#include "PixelReadoutDefinitions/PixelReadoutDefinitions.h"
#include <map>
class PixelChargeCalibCondData {
@@ -14,8 +15,12 @@ class PixelChargeCalibCondData {
PixelChargeCalibCondData();
virtual ~PixelChargeCalibCondData();
- enum PixelType{NORMAL,LONG,GANGED};
- enum CalibrationStrategy{RUN1PIX,LUTFEI4,RD53};
+ enum class CalibrationStrategy
+ {
+ RUN1PIX,
+ LUTFEI4,
+ RD53
+ };
// Normal pixel
void setAnalogThreshold(const int chanNum, const int value);
@@ -30,14 +35,14 @@ class PixelChargeCalibCondData {
void setTotRes1(const int chanNum, const float value);
void setTotRes2(const int chanNum, const float value);
- int getAnalogThreshold(const int chanNum, const int FE, const int type) const;
- int getAnalogThresholdSigma(const int chanNum, const int FE, const int type) const;
- int getAnalogThresholdNoise(const int chanNum, const int FE, const int type) const;
- int getInTimeThreshold(const int chanNum, const int FE, const int type) const;
+ int getAnalogThreshold(const int chanNum, const int FE, const InDetDD::PixelDiodeType type) const;
+ int getAnalogThresholdSigma(const int chanNum, const int FE, const InDetDD::PixelDiodeType type) const;
+ int getAnalogThresholdNoise(const int chanNum, const int FE, const InDetDD::PixelDiodeType type) const;
+ int getInTimeThreshold(const int chanNum, const int FE, const InDetDD::PixelDiodeType type) const;
- float getQ2TotA(const int chanNum, const int FE, const int type) const;
- float getQ2TotE(const int chanNum, const int FE, const int type) const;
- float getQ2TotC(const int chanNum, const int FE, const int type) const;
+ float getQ2TotA(const int chanNum, const int FE, const InDetDD::PixelDiodeType type) const;
+ float getQ2TotE(const int chanNum, const int FE, const InDetDD::PixelDiodeType type) const;
+ float getQ2TotC(const int chanNum, const int FE, const InDetDD::PixelDiodeType type) const;
float getTotRes(const int chanNum, const int FE, float Q) const;
@@ -57,14 +62,14 @@ class PixelChargeCalibCondData {
void setAnalogThresholdNoiseGanged(const int chanNum, const int value);
void setInTimeThresholdGanged(const int chanNum, const int value);
- float getToT(const int chanNum, const int FE, const int type, float Q) const;
- float getCharge(const int chanNum, const int FE, const int type, float ToT) const;
+ float getToT(const int chanNum, const int FE, const InDetDD::PixelDiodeType type, float Q) const;
+ float getCharge(const int chanNum, const int FE, const InDetDD::PixelDiodeType type, float ToT) const;
// new IBL calibration
- void setCalibrationStrategy(const int chanNum, const int type);
+ void setCalibrationStrategy(const int chanNum, const CalibrationStrategy strategy);
void setTot2Charges(const int chanNum, const std::array<float,16> charges);
const std::array<float,16> getQs(const int chanNum, const int FE) const;
- int getCalibrationStrategy(const int chanNum) const;
+ CalibrationStrategy getCalibrationStrategy(const int chanNum) const;
float getChargeLUTFEI4(const int chanNum, const int FE, float ToT) const;
float getToTLUTFEI4(const int chanNum, const int FE, float Q) const;
@@ -104,9 +109,9 @@ class PixelChargeCalibCondData {
chipThreshold m_intimethresholdGanged;
// new IBL calibration
- std::map<int, int> m_calibrationStrategy;
+ std::map<int, CalibrationStrategy> m_calibrationStrategy;
typedef std::vector<std::array<float,16>> IBLModule;
- std::map<int,IBLModule> m_tot2chrg;
+ std::map<int, IBLModule> m_tot2chrg;
};
diff --git a/InnerDetector/InDetConditions/PixelConditionsData/src/PixelChargeCalibCondData.cxx b/InnerDetector/InDetConditions/PixelConditionsData/src/PixelChargeCalibCondData.cxx
index e24b521922fc..e11264ed1ee8 100644
--- a/InnerDetector/InDetConditions/PixelConditionsData/src/PixelChargeCalibCondData.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsData/src/PixelChargeCalibCondData.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "PixelConditionsData/PixelChargeCalibCondData.h"
@@ -67,8 +67,8 @@ void PixelChargeCalibCondData::setTotRes2(const int chanNum, const float value)
m_totRes2[chanNum].push_back(value);
}
-int PixelChargeCalibCondData::getAnalogThreshold(const int chanNum, const int FE, const int type) const {
- if (type==PixelType::NORMAL) {
+int PixelChargeCalibCondData::getAnalogThreshold(const int chanNum, const int FE, const InDetDD::PixelDiodeType type) const {
+ if (type == InDetDD::PixelDiodeType::NORMAL) {
auto itr = m_analogThreshold.find(chanNum);
if (itr!=m_analogThreshold.end()) {
const std::vector<int>& chip = itr->second;
@@ -77,7 +77,7 @@ int PixelChargeCalibCondData::getAnalogThreshold(const int chanNum, const int FE
}
}
}
- else if (type==PixelType::LONG) {
+ else if (type == InDetDD::PixelDiodeType::LONG) {
auto itr = m_analogThresholdLong.find(chanNum);
if (itr!=m_analogThresholdLong.end()) {
const std::vector<int>& chip = itr->second;
@@ -86,7 +86,7 @@ int PixelChargeCalibCondData::getAnalogThreshold(const int chanNum, const int FE
}
}
}
- else if (type==PixelType::GANGED) {
+ else if (type == InDetDD::PixelDiodeType::GANGED || type == InDetDD::PixelDiodeType::LARGE) { // TODO: separate for LARGE
auto itr = m_analogThresholdGanged.find(chanNum);
if (itr!=m_analogThresholdGanged.end()) {
const std::vector<int>& chip = itr->second;
@@ -98,8 +98,8 @@ int PixelChargeCalibCondData::getAnalogThreshold(const int chanNum, const int FE
return 0;
}
-int PixelChargeCalibCondData::getAnalogThresholdSigma(const int chanNum, const int FE, const int type) const {
- if (type==PixelType::NORMAL) {
+int PixelChargeCalibCondData::getAnalogThresholdSigma(const int chanNum, const int FE, const InDetDD::PixelDiodeType type) const {
+ if (type == InDetDD::PixelDiodeType::NORMAL) {
auto itr = m_analogThresholdSigma.find(chanNum);
if (itr!=m_analogThresholdSigma.end()) {
const std::vector<int>& chip = itr->second;
@@ -108,7 +108,7 @@ int PixelChargeCalibCondData::getAnalogThresholdSigma(const int chanNum, const i
}
}
}
- else if (type==PixelType::LONG) {
+ else if (type == InDetDD::PixelDiodeType::LONG) {
auto itr = m_analogThresholdSigmaLong.find(chanNum);
if (itr!=m_analogThresholdSigmaLong.end()) {
const std::vector<int>& chip = itr->second;
@@ -117,7 +117,7 @@ int PixelChargeCalibCondData::getAnalogThresholdSigma(const int chanNum, const i
}
}
}
- else if (type==PixelType::GANGED) {
+ else if (type == InDetDD::PixelDiodeType::GANGED || type == InDetDD::PixelDiodeType::LARGE) { // TODO: separate for LARGE
auto itr = m_analogThresholdSigmaGanged.find(chanNum);
if (itr!=m_analogThresholdSigmaGanged.end()) {
const std::vector<int>& chip = itr->second;
@@ -129,8 +129,8 @@ int PixelChargeCalibCondData::getAnalogThresholdSigma(const int chanNum, const i
return 0;
}
-int PixelChargeCalibCondData::getAnalogThresholdNoise(const int chanNum, const int FE, const int type) const {
- if (type==PixelType::NORMAL) {
+int PixelChargeCalibCondData::getAnalogThresholdNoise(const int chanNum, const int FE, const InDetDD::PixelDiodeType type) const {
+ if (type == InDetDD::PixelDiodeType::NORMAL) {
auto itr = m_analogThresholdNoise.find(chanNum);
if (itr!=m_analogThresholdNoise.end()) {
const std::vector<int>& chip = itr->second;
@@ -139,7 +139,7 @@ int PixelChargeCalibCondData::getAnalogThresholdNoise(const int chanNum, const i
}
}
}
- else if (type==PixelType::LONG) {
+ else if (type == InDetDD::PixelDiodeType::LONG) {
auto itr = m_analogThresholdNoiseLong.find(chanNum);
if (itr!=m_analogThresholdNoiseLong.end()) {
const std::vector<int>& chip = itr->second;
@@ -148,7 +148,7 @@ int PixelChargeCalibCondData::getAnalogThresholdNoise(const int chanNum, const i
}
}
}
- else if (type==PixelType::GANGED) {
+ else if (type == InDetDD::PixelDiodeType::GANGED || type == InDetDD::PixelDiodeType::LARGE) { // TODO: separate for LARGE
auto itr = m_analogThresholdNoiseGanged.find(chanNum);
if (itr!=m_analogThresholdNoiseGanged.end()) {
const std::vector<int>& chip = itr->second;
@@ -160,8 +160,8 @@ int PixelChargeCalibCondData::getAnalogThresholdNoise(const int chanNum, const i
return 0;
}
-int PixelChargeCalibCondData::getInTimeThreshold(const int chanNum, const int FE, const int type) const {
- if (type==PixelType::NORMAL) {
+int PixelChargeCalibCondData::getInTimeThreshold(const int chanNum, const int FE, const InDetDD::PixelDiodeType type) const {
+ if (type == InDetDD::PixelDiodeType::NORMAL) {
auto itr = m_intimethreshold.find(chanNum);
if (itr!=m_intimethreshold.end()) {
const std::vector<int>& chip = itr->second;
@@ -170,7 +170,7 @@ int PixelChargeCalibCondData::getInTimeThreshold(const int chanNum, const int FE
}
}
}
- else if (type==PixelType::LONG) {
+ else if (type == InDetDD::PixelDiodeType::LONG) {
auto itr = m_intimethresholdLong.find(chanNum);
if (itr!=m_intimethresholdLong.end()) {
const std::vector<int>& chip = itr->second;
@@ -179,7 +179,7 @@ int PixelChargeCalibCondData::getInTimeThreshold(const int chanNum, const int FE
}
}
}
- else if (type==PixelType::GANGED) {
+ else if (type == InDetDD::PixelDiodeType::GANGED || type == InDetDD::PixelDiodeType::LARGE) { // TODO: separate for LARGE
auto itr = m_intimethresholdGanged.find(chanNum);
if (itr!=m_intimethresholdGanged.end()) {
const std::vector<int>& chip = itr->second;
@@ -191,8 +191,8 @@ int PixelChargeCalibCondData::getInTimeThreshold(const int chanNum, const int FE
return 0;
}
-float PixelChargeCalibCondData::getQ2TotA(const int chanNum, const int FE, const int type) const {
- if (type==PixelType::NORMAL || type==PixelType::LONG) {
+float PixelChargeCalibCondData::getQ2TotA(const int chanNum, const int FE, const InDetDD::PixelDiodeType type) const {
+ if (type == InDetDD::PixelDiodeType::NORMAL || type == InDetDD::PixelDiodeType::LONG) {
auto itr = m_totA.find(chanNum);
if (itr!=m_totA.end()) {
const std::vector<float>& chip = itr->second;
@@ -201,7 +201,7 @@ float PixelChargeCalibCondData::getQ2TotA(const int chanNum, const int FE, const
}
}
}
- else if (type==PixelType::GANGED) {
+ else if (type == InDetDD::PixelDiodeType::GANGED || type == InDetDD::PixelDiodeType::LARGE) { // TODO: separate for LARGE
auto itr = m_totALong.find(chanNum);
if (itr!=m_totALong.end()) {
const std::vector<float>& chip = itr->second;
@@ -213,8 +213,8 @@ float PixelChargeCalibCondData::getQ2TotA(const int chanNum, const int FE, const
return 0.0;
}
-float PixelChargeCalibCondData::getQ2TotE(const int chanNum, const int FE, const int type) const {
- if (type==PixelType::NORMAL || type==PixelType::LONG) {
+float PixelChargeCalibCondData::getQ2TotE(const int chanNum, const int FE, const InDetDD::PixelDiodeType type) const {
+ if (type == InDetDD::PixelDiodeType::NORMAL || type == InDetDD::PixelDiodeType::LONG) {
auto itr = m_totE.find(chanNum);
if (itr!=m_totE.end()) {
const std::vector<float>& chip = itr->second;
@@ -223,7 +223,7 @@ float PixelChargeCalibCondData::getQ2TotE(const int chanNum, const int FE, const
}
}
}
- else if (type==PixelType::GANGED) {
+ else if (type == InDetDD::PixelDiodeType::GANGED || type == InDetDD::PixelDiodeType::LARGE) { // TODO: separate for LARGE
auto itr = m_totELong.find(chanNum);
if (itr!=m_totELong.end()) {
const std::vector<float>& chip = itr->second;
@@ -235,8 +235,8 @@ float PixelChargeCalibCondData::getQ2TotE(const int chanNum, const int FE, const
return 0.0;
}
-float PixelChargeCalibCondData::getQ2TotC(const int chanNum, const int FE, const int type) const {
- if (type==PixelType::NORMAL || type==PixelType::LONG) {
+float PixelChargeCalibCondData::getQ2TotC(const int chanNum, const int FE, const InDetDD::PixelDiodeType type) const {
+ if (type == InDetDD::PixelDiodeType::NORMAL || type == InDetDD::PixelDiodeType::LONG) {
auto itr = m_totC.find(chanNum);
if (itr!=m_totC.end()) {
const std::vector<float>& chip = itr->second;
@@ -245,7 +245,7 @@ float PixelChargeCalibCondData::getQ2TotC(const int chanNum, const int FE, const
}
}
}
- else if (type==PixelType::GANGED) {
+ else if (type == InDetDD::PixelDiodeType::GANGED || type == InDetDD::PixelDiodeType::LARGE) { // TODO: separate for LARGE
auto itr = m_totCLong.find(chanNum);
if (itr!=m_totCLong.end()) {
const std::vector<float>& chip = itr->second;
@@ -323,18 +323,18 @@ void PixelChargeCalibCondData::setInTimeThresholdGanged(const int chanNum, const
m_intimethresholdGanged[chanNum].push_back(value);
}
-float PixelChargeCalibCondData::getToT(const int chanNum, const int FE, const int type, float Q) const {
- if (getCalibrationStrategy(chanNum)==CalibrationStrategy::LUTFEI4) {
+float PixelChargeCalibCondData::getToT(const int chanNum, const int FE, const InDetDD::PixelDiodeType type, float Q) const {
+ if (getCalibrationStrategy(chanNum) == CalibrationStrategy::LUTFEI4) {
return getToTLUTFEI4(chanNum,FE,Q);
}
- float paramA = getQ2TotA(chanNum,FE,type);
- float paramE = getQ2TotE(chanNum,FE,type);
- float paramC = getQ2TotC(chanNum,FE,type);
+ float paramA = getQ2TotA(chanNum,FE, type);
+ float paramE = getQ2TotE(chanNum,FE, type);
+ float paramC = getQ2TotC(chanNum,FE, type);
return paramA*(paramE+Q)/(paramC+Q);
}
-float PixelChargeCalibCondData::getCharge(const int chanNum, const int FE, const int type, float ToT) const {
- if (getCalibrationStrategy(chanNum)==CalibrationStrategy::LUTFEI4) {
+float PixelChargeCalibCondData::getCharge(const int chanNum, const int FE, const InDetDD::PixelDiodeType type, float ToT) const {
+ if (getCalibrationStrategy(chanNum) == CalibrationStrategy::LUTFEI4) {
return getChargeLUTFEI4(chanNum,FE,ToT);
}
float paramA = getQ2TotA(chanNum,FE,type);
@@ -347,16 +347,16 @@ float PixelChargeCalibCondData::getCharge(const int chanNum, const int FE, const
return charge;
}
-void PixelChargeCalibCondData::setCalibrationStrategy(const int chanNum, const int type) {
- m_calibrationStrategy[chanNum] = type;
+void PixelChargeCalibCondData::setCalibrationStrategy(const int chanNum, const CalibrationStrategy strategy) {
+ m_calibrationStrategy[chanNum] = strategy;
}
-int PixelChargeCalibCondData::getCalibrationStrategy(const int chanNum) const {
+PixelChargeCalibCondData::CalibrationStrategy PixelChargeCalibCondData::getCalibrationStrategy(const int chanNum) const {
auto itr = m_calibrationStrategy.find(chanNum);
- if (itr!=m_calibrationStrategy.end()) {
+ if (itr != m_calibrationStrategy.end()) {
return itr->second;
}
- return 0;
+ return CalibrationStrategy::RUN1PIX;
}
void PixelChargeCalibCondData::setTot2Charges(const int chanNum, const std::array<float,16> charges) {
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/CMakeLists.txt b/InnerDetector/InDetConditions/PixelConditionsTools/CMakeLists.txt
index ff8a5f0dbca2..f47602e52a63 100644
--- a/InnerDetector/InDetConditions/PixelConditionsTools/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/PixelConditionsTools/CMakeLists.txt
@@ -13,7 +13,7 @@ atlas_add_library( PixelConditionsToolsLib
atlas_add_component( PixelConditionsTools
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps AthenaKernel CxxUtils GaudiKernel Identifier InDetByteStreamErrors InDetConditionsSummaryService InDetIdentifier PixelCablingLib PixelConditionsData InDetReadoutGeometry PixelReadoutGeometry PixelConditionsToolsLib StoreGateLib )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel CxxUtils GaudiKernel Identifier InDetByteStreamErrors InDetConditionsSummaryService InDetIdentifier PixelConditionsData InDetReadoutGeometry PixelReadoutGeometryLib PixelConditionsToolsLib StoreGateLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/python/ITkPixelConditionsSummaryConfig.py b/InnerDetector/InDetConditions/PixelConditionsTools/python/ITkPixelConditionsSummaryConfig.py
index 64ddf68d5033..371781f5f6fe 100644
--- a/InnerDetector/InDetConditions/PixelConditionsTools/python/ITkPixelConditionsSummaryConfig.py
+++ b/InnerDetector/InDetConditions/PixelConditionsTools/python/ITkPixelConditionsSummaryConfig.py
@@ -4,19 +4,19 @@ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
"""
from AthenaConfiguration.ComponentFactory import CompFactory
-from PixelCabling.PixelCablingConfigNew import ITkPixelCablingSvcCfg
from PixelConditionsAlgorithms.ITkPixelConditionsConfig import (
ITkPixelDCSCondStateAlgCfg, ITkPixelDCSCondStatusAlgCfg, ITkPixelDeadMapCondAlgCfg
)
+from PixelReadoutGeometry.PixelReadoutGeometryConfig import ITkPixelReadoutManagerCfg
def ITkPixelConditionsSummaryCfg(flags, name="ITkPixelConditionsSummary", **kwargs):
"""Return configured ComponentAccumulator with tool for ITk Pixel Conditions"""
- acc = ITkPixelCablingSvcCfg(flags)
+ acc = ITkPixelReadoutManagerCfg(flags)
acc.merge(ITkPixelDCSCondStateAlgCfg(flags))
acc.merge(ITkPixelDCSCondStatusAlgCfg(flags))
acc.merge(ITkPixelDeadMapCondAlgCfg(flags))
- kwargs.setdefault("PixelCablingSvc", acc.getPrimary())
+ kwargs.setdefault("PixelReadoutManager", acc.getPrimary())
kwargs.setdefault("PixelDetEleCollKey", "ITkPixelDetectorElementCollection")
kwargs.setdefault("PixelDCSStateCondData", "ITkPixelDCSStateCondData")
kwargs.setdefault("PixelDCSStatusCondData", "ITkPixelDCSStatusCondData")
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/python/PixelConditionsSummaryConfig.py b/InnerDetector/InDetConditions/PixelConditionsTools/python/PixelConditionsSummaryConfig.py
index 32e3ee2c1d35..db1035784c74 100644
--- a/InnerDetector/InDetConditions/PixelConditionsTools/python/PixelConditionsSummaryConfig.py
+++ b/InnerDetector/InDetConditions/PixelConditionsTools/python/PixelConditionsSummaryConfig.py
@@ -4,19 +4,19 @@ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
"""
from AthenaConfiguration.ComponentFactory import CompFactory
-from PixelCabling.PixelCablingConfigNew import PixelCablingSvcCfg
from PixelConditionsAlgorithms.PixelConditionsConfig import (
PixelDCSCondStateAlgCfg, PixelDCSCondStatusAlgCfg, PixelDeadMapCondAlgCfg
)
+from PixelReadoutGeometry.PixelReadoutGeometryConfig import PixelReadoutManagerCfg
def PixelConditionsSummaryCfg(flags, name="PixelConditionsSummary", **kwargs):
"""Return configured ComponentAccumulator with tool for Pixel Conditions"""
- acc = PixelCablingSvcCfg(flags)
+ acc = PixelReadoutManagerCfg(flags)
acc.merge(PixelDCSCondStateAlgCfg(flags))
acc.merge(PixelDCSCondStatusAlgCfg(flags))
acc.merge(PixelDeadMapCondAlgCfg(flags))
- kwargs.setdefault("PixelCablingSvc", acc.getPrimary())
+ kwargs.setdefault("PixelReadoutManager", acc.getPrimary())
kwargs.setdefault("UseByteStreamFEI4", not flags.Input.isMC and not flags.Overlay.DataOverlay)
kwargs.setdefault("UseByteStreamFEI3", not flags.Input.isMC and not flags.Overlay.DataOverlay)
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx
index bde59b6bb0e8..2960453866dd 100644
--- a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx
@@ -33,7 +33,7 @@ StatusCode PixelConditionsSummaryTool::initialize(){
ATH_CHECK(detStore()->retrieve(m_pixelID,"PixelID"));
ATH_CHECK(m_condTDAQKey.initialize( !m_condTDAQKey.empty() ));
ATH_CHECK(m_condDeadMapKey.initialize());
- ATH_CHECK(m_pixelCabling.retrieve());
+ ATH_CHECK(m_pixelReadout.retrieve());
ATH_CHECK(m_pixelDetEleCollKey.initialize());
for (unsigned int istate=0; istate<m_isActiveStates.size(); istate++) {
@@ -106,8 +106,8 @@ uint64_t PixelConditionsSummaryTool::getBSErrorWord(const IdentifierHash& module
const InDetDD::SiDetectorElement *element = elements->getDetectorElement(moduleHash);
const InDetDD::PixelModuleDesign *p_design = static_cast<const InDetDD::PixelModuleDesign*>(&element->design());
- if (!m_useByteStreamFEI4 && p_design->getReadoutTechnology()==InDetDD::PixelModuleDesign::FEI4) { return 0; }
- if (!m_useByteStreamFEI3 && p_design->getReadoutTechnology()==InDetDD::PixelModuleDesign::FEI3) { return 0; }
+ if (!m_useByteStreamFEI4 && p_design->getReadoutTechnology() == InDetDD::PixelReadoutTechnology::FEI4) { return 0; }
+ if (!m_useByteStreamFEI3 && p_design->getReadoutTechnology() == InDetDD::PixelReadoutTechnology::FEI3) { return 0; }
std::scoped_lock<std::mutex> lock{*m_cacheMutex.get(ctx)};
const auto *idcCachePtr = getCacheEntry(ctx)->IDCCache;
@@ -151,7 +151,7 @@ bool PixelConditionsSummaryTool::hasBSError(const IdentifierHash& moduleHash, Id
int maxHash = m_pixelID->wafer_hash_max();
Identifier moduleID = m_pixelID->wafer_id(pixid);
- int chFE = m_pixelCabling->getFE(&pixid,moduleID);
+ int chFE = m_pixelReadout->getFE(pixid, moduleID);
int indexFE = (1+chFE)*maxHash+(int)moduleHash; // (FE_channel+1)*2048 + moduleHash
uint64_t word = getBSErrorWord(moduleHash,indexFE,ctx);
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.h b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.h
index b015d1a0e473..9e9d8b30ea9b 100644
--- a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.h
+++ b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.h
@@ -29,8 +29,8 @@
#include "PixelConditionsData/PixelDCSStatusData.h"
#include "PixelConditionsData/PixelTDAQData.h"
#include "PixelConditionsData/PixelByteStreamErrors.h"
+#include "PixelReadoutGeometry/IPixelReadoutManager.h"
#include "StoreGate/ReadCondHandleKey.h"
-#include "PixelCabling/IPixelCablingSvc.h"
#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
class PixelConditionsSummaryTool: public AthAlgTool, public IInDetConditionsTool{
@@ -97,8 +97,8 @@ class PixelConditionsSummaryTool: public AthAlgTool, public IInDetConditionsTool
SG::ReadCondHandleKey<PixelDeadMapCondData> m_condDeadMapKey
{this, "PixelDeadMapCondData", "PixelDeadMapCondData", "Pixel deadmap conditions key"};
- ServiceHandle<IPixelCablingSvc> m_pixelCabling
- {this, "PixelCablingSvc", "PixelCablingSvc", "Pixel cabling service"};
+ ServiceHandle<InDetDD::IPixelReadoutManager> m_pixelReadout
+ {this, "PixelReadoutManager", "PixelReadoutManager", "Pixel readout manager" };
SG::ReadHandleKey<IDCInDetBSErrContainer> m_BSErrContReadKey
{this, "PixelByteStreamErrs", "PixelByteStreamErrs", "PixelByteStreamErrs container key"};
@@ -149,7 +149,7 @@ inline bool PixelConditionsSummaryTool::checkChipStatus(IdentifierHash moduleHas
std::bitset<16> chipStatus(SG::ReadCondHandle<PixelDeadMapCondData>(m_condDeadMapKey, ctx)->getChipStatus(moduleHash));
if (chipStatus.any()) {
Identifier moduleID = m_pixelID->wafer_id(pixid);
- std::bitset<16> circ; circ.set(m_pixelCabling->getFE(&pixid,moduleID));
+ std::bitset<16> circ; circ.set(m_pixelReadout->getFE(pixid,moduleID));
if ((chipStatus&circ).any()) { return false; }
}
return true;
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleTool/CMakeLists.txt b/InnerDetector/InDetConditions/SiLorentzAngleTool/CMakeLists.txt
index e915d6a1b590..2517d723b501 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleTool/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( SiLorentzAngleTool )
@@ -7,7 +7,7 @@ atlas_subdir( SiLorentzAngleTool )
atlas_add_component( SiLorentzAngleTool
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps AthenaKernel StoreGateLib GeoPrimitives GaudiKernel SiPropertiesToolLib AthenaPoolUtilities Identifier InDetCondTools InDetIdentifier InDetReadoutGeometry PixelConditionsData PixelReadoutGeometry MagFieldElements MagFieldConditions InDetConditionsSummaryService SCT_ConditionsData )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel StoreGateLib GeoPrimitives GaudiKernel SiPropertiesToolLib AthenaPoolUtilities Identifier InDetCondTools InDetIdentifier InDetReadoutGeometry PixelConditionsData PixelReadoutGeometryLib MagFieldElements MagFieldConditions InDetConditionsSummaryService SCT_ConditionsData )
# Run tests:
atlas_add_test( TestSCTLorentzAngle
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.cxx b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.cxx
index 965aef781b7e..23ebb21ee96e 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.cxx
@@ -152,7 +152,7 @@ PixelSiLorentzAngleCondAlg::execute(const EventContext& ctx) const {
return StatusCode::FAILURE;
}
double forceLorentzToZero = 1.0;
- if (p_design->getReadoutTechnology()==InDetDD::PixelModuleDesign::FEI4 && p_design->numberOfCircuits()==1 && p_design->rowsPerCircuit()>100) { // IBL 3D
+ if (p_design->getReadoutTechnology()==InDetDD::PixelReadoutTechnology::FEI4 && p_design->numberOfCircuits()==1 && p_design->rowsPerCircuit()>100) { // IBL 3D
forceLorentzToZero = 0.0;
}
diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/CMakeLists.txt b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/CMakeLists.txt
index 3455fe2ae7d9..4597893742d1 100644
--- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/CMakeLists.txt
@@ -12,7 +12,7 @@ atlas_add_component( InDetTrackingGeometry
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${GEOMODEL_LIBRARIES} AthenaBaseComps CxxUtils GeoPrimitives GaudiKernel InDetIdentifier TrkDetDescrInterfaces TrkDetDescrUtils TrkGeometry BeamPipeGeoModelLib StoreGateLib Identifier InDetReadoutGeometry PixelReadoutGeometry SCT_ReadoutGeometry TRT_ReadoutGeometry TrkDetDescrGeoModelCnv TrkSurfaces TrkVolumes SubDetectorEnvelopesLib )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${GEOMODEL_LIBRARIES} AthenaBaseComps CxxUtils GeoPrimitives GaudiKernel InDetIdentifier TrkDetDescrInterfaces TrkDetDescrUtils TrkGeometry BeamPipeGeoModelLib StoreGateLib Identifier InDetReadoutGeometry PixelReadoutGeometryLib SCT_ReadoutGeometry TRT_ReadoutGeometry TrkDetDescrGeoModelCnv TrkSurfaces TrkVolumes SubDetectorEnvelopesLib )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/InnerDetector/InDetDetDescr/PixelCabling/CMakeLists.txt b/InnerDetector/InDetDetDescr/PixelCabling/CMakeLists.txt
deleted file mode 100644
index bad773367aed..000000000000
--- a/InnerDetector/InDetDetDescr/PixelCabling/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
-# Declare the package name:
-atlas_subdir( PixelCabling )
-
-# Component(s) in the package:
-atlas_add_library( PixelCablingLib
- PixelCabling/*.h
- INTERFACE
- PUBLIC_HEADERS PixelCabling
- LINK_LIBRARIES GaudiKernel Identifier InDetIdentifier )
-
-atlas_add_component( PixelCabling
- src/*.h src/*.cxx src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetReadoutGeometry PixelCablingLib PixelReadoutGeometry StoreGateLib )
-
-# Install files from the package:
-atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/*.py )
-
-# Test(s) in the package:
-atlas_add_test( PixelCablingConfigNew_test
- SCRIPT test/PixelCablingConfigNew_test.py
- PROPERTIES TIMEOUT 300 )
diff --git a/InnerDetector/InDetDetDescr/PixelCabling/PixelCabling/ATLAS_CHECK_THREAD_SAFETY b/InnerDetector/InDetDetDescr/PixelCabling/PixelCabling/ATLAS_CHECK_THREAD_SAFETY
deleted file mode 100644
index c09988c6b0fa..000000000000
--- a/InnerDetector/InDetDetDescr/PixelCabling/PixelCabling/ATLAS_CHECK_THREAD_SAFETY
+++ /dev/null
@@ -1 +0,0 @@
-InnerDetector/InDetDetDescr/PixelCabling
diff --git a/InnerDetector/InDetDetDescr/PixelCabling/PixelCabling/IPixelCablingSvc.h b/InnerDetector/InDetDetDescr/PixelCabling/PixelCabling/IPixelCablingSvc.h
deleted file mode 100644
index 17e5a6f9b554..000000000000
--- a/InnerDetector/InDetDetDescr/PixelCabling/PixelCabling/IPixelCablingSvc.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-#ifndef IPIXELCABLINGSVC_H
-#define IPIXELCABLINGSVC_H
-
-#include "GaudiKernel/IInterface.h"
-
-#include "Identifier/Identifier.h"
-#include "InDetIdentifier/PixelID.h"
-
-class IPixelCablingSvc: virtual public IInterface {
-
- public:
- virtual ~IPixelCablingSvc(){};
- static const InterfaceID& interfaceID( ) ;
-
- virtual Identifier getPixelIdfromHash(IdentifierHash offlineIdHash, uint32_t FE, uint32_t row, uint32_t column) = 0;
- virtual Identifier getPixelId(Identifier offlineId, uint32_t FE, uint32_t row, uint32_t column) = 0;
-
- virtual uint32_t getFE(Identifier * pixelId, Identifier offlineId) = 0;
- virtual uint32_t getColumn(Identifier * pixelId, Identifier offlineId) = 0;
- virtual uint32_t getRow(Identifier * pixelId, Identifier offlineId) = 0;
-
- virtual unsigned int getLocalFEI4(const uint32_t fe, const uint64_t onlineId) = 0;
-
- enum moduletype {DBM, IBL_PLANAR, IBL_3D, PIX_BARREL, PIX_ENDCAP, NONE};
- virtual moduletype getModuleType(const Identifier& id) = 0;
-
- enum pixeltype {NORMAL, LONG, GANGED};
- virtual pixeltype getPixelType(const Identifier& id) = 0;
-
-};
-
-inline const InterfaceID& IPixelCablingSvc::interfaceID(){
- static const InterfaceID IID("IPixelCablingSvc",1,0);
- return IID;
-}
-
-#endif
diff --git a/InnerDetector/InDetDetDescr/PixelCabling/python/PixelCablingConfigNew.py b/InnerDetector/InDetDetDescr/PixelCabling/python/PixelCablingConfigNew.py
deleted file mode 100644
index 24dfb0f76455..000000000000
--- a/InnerDetector/InDetDetDescr/PixelCabling/python/PixelCablingConfigNew.py
+++ /dev/null
@@ -1,21 +0,0 @@
-"""Define a method to construct configured PixelCablingSvc
-
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-"""
-from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-from AthenaConfiguration.ComponentFactory import CompFactory
-
-
-def PixelCablingSvcCfg(flags, name="PixelCablingSvc", **kwargs):
- """Return a ComponentAccumulator with configured PixelCablingSvc"""
- acc = ComponentAccumulator()
- acc.addService(CompFactory.PixelCablingSvc(name, **kwargs), primary=True)
- return acc
-
-
-def ITkPixelCablingSvcCfg(flags, name="ITkPixelCablingSvc", **kwargs):
- """Return a ComponentAccumulator with configured PixelCablingSvc for ITk"""
- acc = ComponentAccumulator()
- kwargs.setdefault("DetManagerName", "ITkPixel")
- acc.addService(CompFactory.PixelCablingSvc(name, **kwargs), primary=True)
- return acc
diff --git a/InnerDetector/InDetDetDescr/PixelCabling/run/dumpCabling_jobOptions.py b/InnerDetector/InDetDetDescr/PixelCabling/run/dumpCabling_jobOptions.py
deleted file mode 100644
index 99a94377c329..000000000000
--- a/InnerDetector/InDetDetDescr/PixelCabling/run/dumpCabling_jobOptions.py
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#use McEventSelector
-## basic job configuration (for generator)
-import AthenaCommon.AtlasUnixGeneratorJob
-
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DataSource = 'data'
-
-## get a handle to the default top-level algorithm sequence
-from AthenaCommon.AlgSequence import AlgSequence
-topjob = AlgSequence()
-
-## get a handle to the ServiceManager
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-
-## get a handle to the ApplicationManager
-from AthenaCommon.AppMgr import theApp
-
-svcMgr.MessageSvc.OutputLevel = INFO
-svcMgr.MessageSvc.debugLimit = 100000
-svcMgr.MessageSvc.infoLimit = 100000
-svcMgr.MessageSvc.Format = "% F%30W%S%7W%R%T %0W%M"
-#--------------------------------------------------------------
-# Access to IOVSvc, IOVDbSvc and CondDBMySQLCnvSvc
-#--------------------------------------------------------------
-
-#--------------------------------------------------------------
-# Options for IOVRegistrationSvc
-import RegistrationServices.IOVRegistrationSvc
-
-# Dont set the tag for ALL folders
-# in COOL folder tags must be globally unique
-regSvc = svcMgr.IOVRegistrationSvc
-# regSvc.IOVDbTag = "DC1"
-regSvc.OutputLevel=2
-
-# Select the following to delete and recreate the folders. Default is
-# NOT to recreate
-regSvc.RecreateFolders = False
-
-#here follow original python
-
-# Add Sequencer to topSequence
-# Sequencer has to be named!
-from AthenaCommon.AlgSequence import AthSequencer
-job = AthSequencer('dumpCabling_sequencer')
-topjob += job
-
-from AthenaCommon.AppMgr import ServiceMgr
-#from AthenaCommon.AppMgr import ToolSvc
-
-# get a handle to the ApplicationManager
-from AthenaCommon.AppMgr import theApp
-
-from AthenaCommon.GlobalFlags import GlobalFlags
-# --- default is atlas geometry
-GlobalFlags.DetGeo.set_atlas()
-
-from IOVDbSvc.CondDB import conddb
-conddb.setGlobalTag('COMCOND-000-00')
-#conddb.addFolder("PIXEL","/PIXEL/PixelCablingData")
-conddb.addFolder("","<dbConnection>oracle://INTR;schema=ATLAS_MLIMPER;dbname=COMP200</dbConnection>/PIXEL/ReadoutSpeed")
-
-
-include( "AthenaCommon/AthenaCommonFlags.py" )
-
-## from AthenaCommon.DetFlags import DetFlags
-## DetFlags.ID_setOn()
-## DetFlags.Calo_setOff()
-## DetFlags.Muon_setOff()
-## DetFlags.Truth_setOff()
-## DetFlags.LVL1_setOff()
-## DetFlags.SCT_setOff()
-## DetFlags.TRT_setOff()
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.all_setOff()
-DetFlags.pixel_setOn()
-
-import AtlasGeoModel.SetGeometryVersion
-import AtlasGeoModel.GeoModelInit
-
-from PixelCabling.PixelCablingConf import PixelCablingSvc
-PixelCablingSvc = PixelCablingSvc()
-svcMgr += PixelCablingSvc
-
-from PixelCabling.PixelCablingConf import DumpCabling
-DumpCabling = DumpCabling()
-
-DumpCabling.Write = True
-
-import IOVDbSvc.IOVDb
-#location of test DB
-svcMgr.IOVDbSvc.dbConnection = "oracle://INTR;schema=ATLAS_MLIMPER;dbname=COMP200"
-#if no explicit dbConnection is given a local sqlite-file "mycool.db" is created in the run-directory
-
-job += DumpCabling
-
-#some reasonable run-number (=good run for 7 TeV minimum bias)
-svcMgr.EventSelector.RunNumber = 158856
-svcMgr.EventSelector.InitialTimeStamp = 1222819200
-theApp.EvtMax = 1
diff --git a/InnerDetector/InDetDetDescr/PixelCabling/run/readCabling_jobOptions.py b/InnerDetector/InDetDetDescr/PixelCabling/run/readCabling_jobOptions.py
deleted file mode 100644
index 51280c9fe8f4..000000000000
--- a/InnerDetector/InDetDetDescr/PixelCabling/run/readCabling_jobOptions.py
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#use McEventSelector
-## basic job configuration (for generator)
-import AthenaCommon.AtlasUnixGeneratorJob
-
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DataSource = 'data'
-
-## get a handle to the default top-level algorithm sequence
-from AthenaCommon.AlgSequence import AlgSequence
-topjob = AlgSequence()
-
-## get a handle to the ServiceManager
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-
-## get a handle to the ApplicationManager
-from AthenaCommon.AppMgr import theApp
-
-svcMgr.MessageSvc.OutputLevel = INFO
-svcMgr.MessageSvc.debugLimit = 100000
-svcMgr.MessageSvc.infoLimit = 100000
-svcMgr.MessageSvc.Format = "% F%30W%S%7W%R%T %0W%M"
-#--------------------------------------------------------------
-# Access to IOVSvc, IOVDbSvc and CondDBMySQLCnvSvc
-#--------------------------------------------------------------
-
-#--------------------------------------------------------------
-# Options for IOVRegistrationSvc
-import RegistrationServices.IOVRegistrationSvc
-
-# Dont set the tag for ALL folders
-# in COOL folder tags must be globally unique
-regSvc = svcMgr.IOVRegistrationSvc
-# regSvc.IOVDbTag = "DC1"
-regSvc.OutputLevel=2
-
-# Select the following to delete and recreate the folders. Default is
-# NOT to recreate
-regSvc.RecreateFolders = False
-
-#here follow original python
-
-# Add Sequencer to topSequence
-# Sequencer has to be named!
-from AthenaCommon.AlgSequence import AthSequencer
-job = AthSequencer('dumpCabling_sequencer')
-topjob += job
-
-from AthenaCommon.AppMgr import ServiceMgr
-#from AthenaCommon.AppMgr import ToolSvc
-
-# get a handle to the ApplicationManager
-from AthenaCommon.AppMgr import theApp
-
-from AthenaCommon.GlobalFlags import GlobalFlags
-# --- default is atlas geometry
-GlobalFlags.DetGeo.set_atlas()
-
-from IOVDbSvc.CondDB import conddb
-conddb.setGlobalTag('COMCOND-000-00')
-#conddb.addFolder("PIXEL","/PIXEL/PixelCablingData")
-
-include( "AthenaCommon/AthenaCommonFlags.py" )
-
-## from AthenaCommon.DetFlags import DetFlags
-## DetFlags.ID_setOn()
-## DetFlags.Calo_setOff()
-## DetFlags.Muon_setOff()
-## DetFlags.Truth_setOff()
-## DetFlags.LVL1_setOff()
-## DetFlags.SCT_setOff()
-## DetFlags.TRT_setOff()
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.all_setOff()
-DetFlags.pixel_setOn()
-
-import AtlasGeoModel.SetGeometryVersion
-import AtlasGeoModel.GeoModelInit
-
-from PixelCabling.PixelCablingConf import PixelCablingSvc
-PixelCablingSvc = PixelCablingSvc()
-
-from PixelCabling.PixelCablingConf import DumpCabling
-DumpCabling = DumpCabling()
-
-#DumpCabling.Coral_Connectionstring = "oracle://ATLAS_COOLPROD/ATLAS_COOLONL_PIXEL"
-#DumpCabling.DictionaryTag = "PIXEL"
-#DumpCabling.ConnectivityTag = "PIT-ALL-V39"
-DumpCabling.Bandwidth = 0
-DumpCabling.Write = False
-
-import IOVDbSvc.IOVDb
-#location of test DB
-#svcMgr.IOVDbSvc.dbConnection = "oracle://INTR;schema=ATLAS_MLIMPER;dbname=NEWDB"
-#if no explicit dbConnection is given a local sqlite-file "mycool.db" is created in the run-directory
-folder = "/PIXEL/PixelCablingData"
-svcMgr.IOVDbSvc.Folders += [ folder + "<tag>BLABLA</tag>" ]
-
-
-job += DumpCabling
-
-#some reasonable run-number (=good run for 7 TeV minimum bias)
-svcMgr.EventSelector.RunNumber = 152409
-svcMgr.EventSelector.InitialTimeStamp = 1222819200
-theApp.EvtMax = 1
diff --git a/InnerDetector/InDetDetDescr/PixelCabling/share/SelectPixelMap.py b/InnerDetector/InDetDetDescr/PixelCabling/share/SelectPixelMap.py
deleted file mode 100644
index 49cc7781ff07..000000000000
--- a/InnerDetector/InDetDetDescr/PixelCabling/share/SelectPixelMap.py
+++ /dev/null
@@ -1,42 +0,0 @@
-
-## --postExec='ServiceMgr.PixelCablingSvc.MappingFile='PixelCabling/Pixels_Atlas_IdMapping_M5.dat''
-## will override the below settings
-## To verify the cabling map contents in COOL, on can do
-## --postExec='ServiceMgr.PixelCablingSvc.DumpMapToFile=True'
-
-
-from RecExConfig.AutoConfiguration import *
-from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags as geoFlags
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-from AthenaCommon.Logging import logging
-
-
-
-logger = logging.getLogger("PixelCablingSvc")
-#logger.setLevel(logging.DEBUG)
-logger.debug("In SelectPixelMap.py")
-#geoFlags.dump()
-
-
-
-if not ('conddb' in dir()):
- IOVDbSvc = Service("IOVDbSvc")
- from IOVDbSvc.CondDB import conddb
-
-from AthenaCommon.CfgGetter import getService
-PixelCablingSvc = getService("PixelCablingSvc")
-ServiceMgr += PixelCablingSvc
-
-#See python/PixelCablingConfing.py for the main configuration.
-
-# Offline mode
-if (athenaCommonFlags.isOnline == False):
- # For debugging, print a summary of the chosen settings
- logger.debug("Summary from SelectPixelMap.py:")
- logger.debug("Mapping type: %s" % ServiceMgr.PixelCablingSvc.MappingType)
- if (ServiceMgr.PixelCablingSvc.MappingType == "Final"):
- logger.debug("Selected mapping file: %s" % ServiceMgr.PixelCablingSvc.MappingFile)
- else:
- logger.debug("Cabling folder: %s" % ServiceMgr.PixelCablingSvc.KeyCabling)
- logger.debug("Fallback mapping file: %s" % ServiceMgr.PixelCablingSvc.MappingFile)
-
diff --git a/InnerDetector/InDetDetDescr/PixelCabling/share/postInclude.IBLPixelSvcCablingSetup.py b/InnerDetector/InDetDetDescr/PixelCabling/share/postInclude.IBLPixelSvcCablingSetup.py
deleted file mode 100644
index 6861ce963713..000000000000
--- a/InnerDetector/InDetDetDescr/PixelCabling/share/postInclude.IBLPixelSvcCablingSetup.py
+++ /dev/null
@@ -1,9 +0,0 @@
-#ServiceMgr.PixelCablingSvc.UseIBLParameterSvc = False
-#ServiceMgr.PixelCablingSvc.MappingFile = "PixelCabling/Pixels_Atlas_IdMapping_inclIBL.dat"
-#ServiceMgr.PixelCablingSvc.LayerColumnsPerFE = [80]
-#ServiceMgr.PixelCablingSvc.LayerRowsPerFE = [336]
-#ServiceMgr.PixelCablingSvc.LayerFEsPerHalfModule = [2]
-
-# Print a warning if this jO is included
-from AthenaCommon.Logging import logging
-logging.getLogger().warning("Use of PixelCabling postIncludes is depreciated - postInclude.IBLPixelSvcCablingSetup.py has no effect")
diff --git a/InnerDetector/InDetDetDescr/PixelCabling/share/postInclude.IBLPixelSvcCablingSetupDBM.py b/InnerDetector/InDetDetDescr/PixelCabling/share/postInclude.IBLPixelSvcCablingSetupDBM.py
deleted file mode 100644
index 212d334267ff..000000000000
--- a/InnerDetector/InDetDetDescr/PixelCabling/share/postInclude.IBLPixelSvcCablingSetupDBM.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#ServiceMgr.PixelCablingSvc.UseIBLParameterSvc = False
-#ServiceMgr.PixelCablingSvc.MappingFile = "PixelCabling/Pixels_Atlas_IdMapping_inclIBL_DBM.dat"
-#ServiceMgr.PixelCablingSvc.LayerColumnsPerFE = [80]
-#ServiceMgr.PixelCablingSvc.LayerRowsPerFE = [336]
-#ServiceMgr.PixelCablingSvc.LayerFEsPerHalfModule = [2]
-#ServiceMgr.PixelCablingSvc.DBMColumnsPerFE = 80
-#ServiceMgr.PixelCablingSvc.DBMRowsPerFE = 336
-#ServiceMgr.PixelCablingSvc.DBMFEsPerHalfModule = 2
-
-
-# Print a warning if this jO is included
-from AthenaCommon.Logging import logging
-logging.getLogger().warning("Use of PixelCabling postIncludes is depreciated - postInclude.IBLPixelSvcCablingSetupDBM.py has no effect")
diff --git a/InnerDetector/InDetDetDescr/PixelCabling/share/postInclude.IBLPixelSvcCablingSetupHybridDBM.py b/InnerDetector/InDetDetDescr/PixelCabling/share/postInclude.IBLPixelSvcCablingSetupHybridDBM.py
deleted file mode 100644
index 7087b8e0c2a5..000000000000
--- a/InnerDetector/InDetDetDescr/PixelCabling/share/postInclude.IBLPixelSvcCablingSetupHybridDBM.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# These parameters are no longer accepted by PixelCabling
-
-#ServiceMgr.PixelCablingSvc.UseIBLParameterSvc = False
-#ServiceMgr.PixelCablingSvc.LayerColumnsPerFE = [80]
-#ServiceMgr.PixelCablingSvc.LayerRowsPerFE = [336]
-#ServiceMgr.PixelCablingSvc.LayerFEsPerHalfModule = [2]
-#ServiceMgr.PixelCablingSvc.DBMColumnsPerFE = 80
-#ServiceMgr.PixelCablingSvc.DBMRowsPerFE = 336
-#ServiceMgr.PixelCablingSvc.DBMFEsPerHalfModule = 1
-#ServiceMgr.PixelCablingSvc.IBLHybridModuleType = [1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1]
-
-# Overriding the mapping file is possible, but not recommended
-#ServiceMgr.PixelCablingSvc.MappingFile = "PixelCabling/Pixels_Atlas_IdMapping_inclIBL3D_DBM.dat"
-
-# Print a warning if this jO is included
-from AthenaCommon.Logging import logging
-logging.getLogger().warning("Use of PixelCabling postIncludes is depreciated - postInclude.IBLPixelSvcCablingSetupHybridDBM.py has no effect")
diff --git a/InnerDetector/InDetDetDescr/PixelCabling/src/PixelCablingSvc.cxx b/InnerDetector/InDetDetDescr/PixelCabling/src/PixelCablingSvc.cxx
deleted file mode 100644
index 89146540778e..000000000000
--- a/InnerDetector/InDetDetDescr/PixelCabling/src/PixelCablingSvc.cxx
+++ /dev/null
@@ -1,482 +0,0 @@
-/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
-
-
-#include "PixelCablingSvc.h"
-
-#include "GaudiKernel/ServiceHandle.h"
-#include "StoreGate/StoreGateSvc.h"
-
-#include "InDetReadoutGeometry/SiDetectorElement.h"
-#include "PixelReadoutGeometry/PixelModuleDesign.h"
-#include "PixelReadoutGeometry/PixelDetectorManager.h"
-
-//#define PIXEL_DEBUG
-
-PixelCablingSvc::PixelCablingSvc(const std::string& name, ISvcLocator*svc):
- AthService(name,svc),
- m_detStore("DetectorStore", name),
- m_detManager(nullptr),
- m_idHelper(nullptr)
-{
-}
-
-PixelCablingSvc::~PixelCablingSvc() { }
-
-StatusCode PixelCablingSvc::initialize() {
- ATH_MSG_INFO("PixelCablingSvc::initialize()");
-
- ATH_CHECK(m_detStore.retrieve());
-
- ATH_CHECK(m_detStore->retrieve(m_detManager,m_detManagerName));
-
- ATH_CHECK(m_detStore->retrieve(m_idHelper,"PixelID"));
-
- return StatusCode::SUCCESS;
-}
-
-StatusCode PixelCablingSvc::finalize() {
- ATH_MSG_INFO("PixelCablingSvc::finalize()");
- return StatusCode::SUCCESS;
-}
-
-StatusCode PixelCablingSvc::queryInterface(const InterfaceID &riid, void** ppvInterface) {
- if (IPixelCablingSvc::interfaceID().versionMatch(riid)) {
- *ppvInterface = dynamic_cast<IPixelCablingSvc*>(this);
- }
- else {
- // Interface is not directly available : try out a base class
- return AthService::queryInterface(riid, ppvInterface);
- }
- addRef();
- return StatusCode::SUCCESS;
-}
-
-Identifier PixelCablingSvc::getPixelIdfromHash(IdentifierHash offlineIdHash, uint32_t FE, uint32_t row, uint32_t column) {
- return getPixelId(m_idHelper->wafer_id(offlineIdHash), FE, row, column);
-}
-
-Identifier PixelCablingSvc::getPixelId(Identifier offlineId, uint32_t FE, uint32_t row, uint32_t column) {
-
- const InDetDD::SiDetectorElement *element = m_detManager->getDetectorElement(offlineId);
- const InDetDD::PixelModuleDesign *p_design = static_cast<const InDetDD::PixelModuleDesign*>(&element->design());
-
- unsigned int columnsPerFE = p_design->columnsPerCircuit();
- unsigned int FEsPerHalfModule = p_design->numberOfCircuits();
- unsigned int rowsPerFE = 0;
- int column_row_offset = 0;
- if (p_design->getReadoutTechnology()==InDetDD::PixelModuleDesign::FEI4) {
- rowsPerFE = p_design->rowsPerCircuit();
- column_row_offset = -1;
- }
- else if (p_design->getReadoutTechnology()==InDetDD::PixelModuleDesign::FEI3) {
- rowsPerFE = p_design->rowsPerCircuit()/2+4; // normal + ganged
- }
- else if (p_design->getReadoutTechnology()==InDetDD::PixelModuleDesign::RD53) {
- rowsPerFE = p_design->rowsPerCircuit();
- }
-
- // ---------------------
- // Check input sanity
- // ---------------------
- // Identify the module type
- moduletype thisModule = getModuleType(offlineId);
-
- // Correct row, column
- row = row + column_row_offset;
- column = column + column_row_offset;
-
- if (row>=rowsPerFE || column>=columnsPerFE || FE>=((thisModule==IBL_PLANAR || thisModule==IBL_3D || thisModule==DBM) ? FEsPerHalfModule:2*FEsPerHalfModule)) {
- ATH_MSG_DEBUG("Illegal pixel requested OfflineID: " << std::hex << offlineId << std::dec << " FE: " << FE << " row: " << row << " column: " << column);
- ATH_MSG_DEBUG("Limits are: FE < " << ((thisModule==IBL_PLANAR || thisModule==IBL_3D || thisModule == DBM) ? FEsPerHalfModule : 2*FEsPerHalfModule) << ", row < " << rowsPerFE << ", column < " << columnsPerFE);
- return Identifier(); // illegal Identifier, standardized for PixelRodDecoder
- }
-
- // ---------------------
- // Convert row/column to eta/phi indices
- // ---------------------
- unsigned int phi_index, eta_index;
- switch (thisModule) {
- case DBM:
- eta_index = rowsPerFE-1-row;
- if (m_idHelper->barrel_ec(offlineId)>0) { // A side (pos. eta)
- phi_index = column;
- }
- else { // C side
- phi_index = columnsPerFE-1-column;
- }
- break;
-
- case IBL_PLANAR:
- phi_index = rowsPerFE-1-row;
- eta_index = FE*columnsPerFE+column;
- break;
-
- case IBL_3D:
- phi_index = rowsPerFE-1-row;
- eta_index = FE*columnsPerFE+column;
- break;
-
- default: // pixels
- if (FE<FEsPerHalfModule) {
- phi_index = ((2*rowsPerFE)-1)-row;
- eta_index = ((columnsPerFE*FEsPerHalfModule)-1)-(column+(FE*columnsPerFE));
- }
- else {
- phi_index = row;
- eta_index = ((FE-FEsPerHalfModule)*columnsPerFE)+column;
- }
- if (thisModule==PIX_ENDCAP) {
- // Swap phi_index for even endcap modules
- if ((m_idHelper->phi_module(offlineId))%2==0) {
- phi_index = 2*rowsPerFE-phi_index-1;
- ATH_MSG_DEBUG("Even disk module found, phi module: " << m_idHelper->phi_module(offlineId) << " swapped phi index to : " << phi_index);
- }
- }
- break;
- }
-
- Identifier pixelId = m_idHelper->pixel_id(offlineId,phi_index,eta_index);
-
-#ifdef PIXEL_DEBUG
- unsigned int eta_index_max = m_idHelper->eta_index_max(offlineId);
- unsigned int phi_index_max = m_idHelper->phi_index_max(offlineId);
- if (eta_index>eta_index_max) {
- ATH_MSG_DEBUG("Error! eta_index: " << eta_index << " > eta_index_max: " << eta_index_max);
- }
- if (phi_index>phi_index_max) {
- ATH_MSG_DEBUG("Error! phi_index: " << phi_index << " > phi_index_max: " << phi_index_max);
- }
- //consistency check - to be removed to speed up
- uint32_t check_FE = getFE(&pixelId,offlineId);
- uint32_t check_row = getRow(&pixelId,offlineId) + column_row_offset;
- uint32_t check_column = getColumn(&pixelId,offlineId) + column_row_offset;
- if (check_FE!=FE || check_row!=row || check_column!=column) {
- ATH_MSG_WARNING("identify OfflineID: 0x" << std::hex << offlineId << std::dec << " FE: " << FE << " row: " << row << " column: " << column << " unequal to:");
- ATH_MSG_WARNING("identify PixelID: 0x" << std::hex << pixelId << std::dec << " FE: " << check_FE << " row: " << check_row << " column: " << check_column);
- }
-#endif
-
- return pixelId;
-}
-
-uint32_t PixelCablingSvc::getFE(Identifier *pixelId, Identifier offlineId) {
-
- const InDetDD::SiDetectorElement *element = m_detManager->getDetectorElement(offlineId);
- const InDetDD::PixelModuleDesign *p_design = static_cast<const InDetDD::PixelModuleDesign*>(&element->design());
-
- unsigned int columnsPerFE = p_design->columnsPerCircuit();
- unsigned int FEsPerHalfModule = p_design->numberOfCircuits();
- unsigned int rowsPerFE = 0;
- if (p_design->getReadoutTechnology()==InDetDD::PixelModuleDesign::FEI4) {
- rowsPerFE = p_design->rowsPerCircuit();
- }
- else if (p_design->getReadoutTechnology()==InDetDD::PixelModuleDesign::FEI3) {
- rowsPerFE = p_design->rowsPerCircuit()/2+4; // normal + ganged
- }
- else if (p_design->getReadoutTechnology()==InDetDD::PixelModuleDesign::RD53) {
- rowsPerFE = p_design->rowsPerCircuit();
- }
-
- // ---------------------
- // Set module properties
- // ---------------------
- moduletype thisModule = getModuleType(offlineId);
- unsigned int FE;
- unsigned int phi_index = m_idHelper->phi_index(*pixelId);
- int eta_index = m_idHelper->eta_index(*pixelId);
-
- switch (thisModule) {
-
- case DBM:
- FE = 0; // simple as that
- return FE;
- break;
-
- case PIX_ENDCAP:
- // Swap phi_index for even endcap modules
- if ((m_idHelper->phi_module(offlineId))%2==0) {
- phi_index = 2*rowsPerFE-phi_index-1;
- }
- break;
-
- default: // PIX_BARREL + IBL
- break;
- }
-
-
- // ---------------------
- // Compute FE number
- // ---------------------
- if (phi_index>=rowsPerFE) {
- FE = (int)((FEsPerHalfModule-1)-(eta_index/columnsPerFE));
- }
- else {
- FE = (int)(eta_index/columnsPerFE)+FEsPerHalfModule;
- }
-
- // For IBL, the above returns FE number in range [2,3] (planar), or [1] (3D sensors).
- // Change that to be [0,1] (planar) and [0] (3D) for consistency
- if (thisModule==IBL_PLANAR || thisModule==IBL_3D) { FE = FE - FEsPerHalfModule; }
-
- return FE;
-}
-
-uint32_t PixelCablingSvc::getColumn(Identifier *pixelId, Identifier offlineId) {
-
- const InDetDD::SiDetectorElement *element = m_detManager->getDetectorElement(offlineId);
- const InDetDD::PixelModuleDesign *p_design = static_cast<const InDetDD::PixelModuleDesign*>(&element->design());
-
- unsigned int columnsPerFE = p_design->columnsPerCircuit();
- unsigned int rowsPerFE = 0;
- int column_offset = 0;
- if (p_design->getReadoutTechnology()==InDetDD::PixelModuleDesign::FEI4) {
- rowsPerFE = p_design->rowsPerCircuit();
- column_offset = 1;
- }
- else if (p_design->getReadoutTechnology()==InDetDD::PixelModuleDesign::FEI3) {
- rowsPerFE = p_design->rowsPerCircuit()/2+4; // normal + ganged
- }
- else if (p_design->getReadoutTechnology()==InDetDD::PixelModuleDesign::RD53) {
- rowsPerFE = p_design->rowsPerCircuit();
- }
-
- moduletype thisModule = getModuleType(offlineId);
-
- unsigned int phi_index = m_idHelper->phi_index(*pixelId);
- int eta_index = m_idHelper->eta_index(*pixelId);
-
- // ---------------------
- // Set module properties
- // ---------------------
- switch (thisModule) {
-
- case DBM:
- break;
-
- case PIX_ENDCAP:
- // Swap phi_index for even endcap modules
- if ((m_idHelper->phi_module(offlineId))%2==0) {
- phi_index = 2*rowsPerFE-phi_index-1;
- }
- break;
-
- default: // PIX_BARREL + IBL
- break;
- }
-
- // ---------------------
- // Convert eta index to column number
- // ---------------------
- int column;
-
- // DBM (column <-> phi_index)
- if (thisModule==DBM) {
- if (m_idHelper->barrel_ec(offlineId)>0) {
- column = m_idHelper->phi_index(*pixelId); // A side
- }
- else {
- column = columnsPerFE-m_idHelper->phi_index(*pixelId)-1; // C side
- }
- }
- // Pixels, IBL
- else {
- if ((phi_index>=rowsPerFE)) {
- column = (columnsPerFE-1)-(eta_index%columnsPerFE);
- }
- else {
- column = eta_index%columnsPerFE;
- }
- }
-
- // ---------------------
- // Check output sanity
- // ---------------------
- if (column>=(int)columnsPerFE) {
- ATH_MSG_ERROR("Computed column number exceeds maximum value: col = " << column + column_offset << " (max = " << columnsPerFE << ")");
- return 0xffffffff;
- }
-
- return column + column_offset;
-}
-
-uint32_t PixelCablingSvc::getRow(Identifier *pixelId, Identifier offlineId) {
-
- const InDetDD::SiDetectorElement *element = m_detManager->getDetectorElement(offlineId);
- const InDetDD::PixelModuleDesign *p_design = static_cast<const InDetDD::PixelModuleDesign*>(&element->design());
-
- unsigned int rowsPerFE = 0;
- int row_offset = 0;
- if (p_design->getReadoutTechnology()==InDetDD::PixelModuleDesign::FEI4) {
- rowsPerFE = p_design->rowsPerCircuit();
- row_offset = 1;
- }
- else if (p_design->getReadoutTechnology()==InDetDD::PixelModuleDesign::FEI3) {
- rowsPerFE = p_design->rowsPerCircuit()/2+4; // normal + ganged
- }
- else if (p_design->getReadoutTechnology()==InDetDD::PixelModuleDesign::RD53) {
- rowsPerFE = p_design->rowsPerCircuit();
- }
-
- moduletype thisModule = getModuleType(offlineId);
-
- unsigned int phi_index = m_idHelper->phi_index(*pixelId);
-
- // ---------------------
- // Set module properties
- // ---------------------
- switch (thisModule) {
-
- case DBM:
- break;
-
- case PIX_ENDCAP:
- // Swap phi_index for even endcap modules
- if ((m_idHelper->phi_module(offlineId))%2==0) {
- phi_index = 2*rowsPerFE-phi_index-1;
- }
- break;
-
- default: // PIX_BARREL + IBL
- break;
- }
-
- // ---------------------
- // Convert phi index to row number
- // ---------------------
- int row;
-
- switch (thisModule) {
-
- case DBM:
- // Row <-> eta_index
- row = rowsPerFE-m_idHelper->eta_index(*pixelId)-1;
- break;
-
- case IBL_PLANAR:
- row = rowsPerFE-1-phi_index;
- break;
-
- case IBL_3D:
- row = rowsPerFE-1-phi_index;
- break;
-
- default: // Pixels
- if (phi_index>=rowsPerFE) {
- row = ((2*rowsPerFE)-1)-phi_index;
- }
- else {
- row = phi_index;
- }
- break;
- }
-
- // ---------------------
- // Check output sanity
- // ---------------------
- if (row >= (int)rowsPerFE) {
- ATH_MSG_ERROR("Computed row number exceeds maximum value: row = " << row + row_offset << "(max = " << rowsPerFE << ")");
- return 0xffffffff;
- }
- return row + row_offset;
-}
-
-unsigned int PixelCablingSvc::getLocalFEI4(const uint32_t fe, const uint64_t onlineId) {
- unsigned int linknum40 = (onlineId>>24) & 0xFF;
- unsigned int linknum80 = (onlineId>>32) & 0xFF;
-
- if (fe==linknum40) {
- return 0;
- }
- else if (fe==linknum80) {
- return 1;
- }
- else {
- ATH_MSG_ERROR("Error in retrieving local FE-I4 number: linknumber " << fe << " not found in onlineID " << std::hex << onlineId);
- }
- return 0xF;
-}
-
-PixelCablingSvc::moduletype PixelCablingSvc::getModuleType(const Identifier& id) {
- moduletype isType = NONE;
-
- const Identifier wafer_id = m_idHelper->wafer_id(id);
- const InDetDD::SiDetectorElement *element = m_detManager->getDetectorElement(wafer_id);
- const InDetDD::PixelModuleDesign *p_design = static_cast<const InDetDD::PixelModuleDesign*>(&element->design());
-
- if (p_design->getReadoutTechnology()==InDetDD::PixelModuleDesign::FEI4) {
- if (p_design->numberOfCircuits()==2) { isType = IBL_PLANAR; }
- else { isType = IBL_3D; }
-
- if (m_idHelper->is_dbm(id)) { isType = DBM; }
- }
- else if (p_design->getReadoutTechnology()==InDetDD::PixelModuleDesign::FEI3 || p_design->getReadoutTechnology()==InDetDD::PixelModuleDesign::RD53) {
- if (abs(m_idHelper->barrel_ec(id))==0) { isType = PIX_BARREL; }
- else if (abs(m_idHelper->barrel_ec(id))==2) { isType = PIX_ENDCAP; }
- else { isType = NONE; }
- }
- else {
- isType = NONE;
- }
- return isType;
-}
-
-PixelCablingSvc::pixeltype PixelCablingSvc::getPixelType(const Identifier& id) {
- pixeltype isType = NORMAL;
-
- const Identifier wafer_id = m_idHelper->wafer_id(id);
- Identifier pixelId = id;
- Identifier offlineId = m_idHelper->wafer_id(pixelId);
- int col = getColumn(&pixelId, offlineId);
- int row = getRow(&pixelId, offlineId);
-
- const InDetDD::SiDetectorElement *element = m_detManager->getDetectorElement(wafer_id);
- const InDetDD::PixelModuleDesign *p_design = static_cast<const InDetDD::PixelModuleDesign*>(&element->design());
-
- if (p_design->getReadoutTechnology()==InDetDD::PixelModuleDesign::FEI4) {
- if (p_design->numberOfCircuits()==2) { // IBL planar
- if (col==0 || col==p_design->columnsPerCircuit()-1) { // column edge =0,79
- isType = LONG;
- }
- else {
- isType = NORMAL;
- }
- }
- else {
- isType = NORMAL;
- }
- }
- else {
- if (col>0 && col<p_design->columnsPerCircuit()-1) {
- if (row>=p_design->rowsPerCircuit()/2-1-6-1 && row<=p_design->rowsPerCircuit()/2-1) {
- if ((row-(p_design->rowsPerCircuit()/2-1-6)+1)%2+1==1) {
- isType = LONG;
- }
- else if ((row-(p_design->rowsPerCircuit()/2-1-6)+1)%2+1==2) {
- isType = GANGED;
- }
- else {
- isType = NORMAL;
- }
- }
- else {
- isType = NORMAL;
- }
- }
- else if (col==0 || col==p_design->columnsPerCircuit()-1) {
- if (row>=p_design->rowsPerCircuit()/2-1-6-1) {
- isType = GANGED;
- }
- else {
- isType = LONG;
- }
- }
- else {
- ATH_MSG_WARNING("Pixel Type : the col number should be 0-" << p_design->columnsPerCircuit() << ", not " <<col);
- isType = NORMAL;
- }
- }
- return isType;
-}
-
diff --git a/InnerDetector/InDetDetDescr/PixelCabling/src/PixelCablingSvc.h b/InnerDetector/InDetDetDescr/PixelCabling/src/PixelCablingSvc.h
deleted file mode 100644
index c7616dc9bb75..000000000000
--- a/InnerDetector/InDetDetDescr/PixelCabling/src/PixelCablingSvc.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef PIXELCABLINGSVC_H
-#define PIXELCABLINGSVC_H
-
-#include "PixelCabling/IPixelCablingSvc.h"
-#include "AthenaBaseComps/AthService.h"
-
-namespace InDetDD {
- class PixelDetectorManager;
-}
-
-class PixelCablingSvc: virtual public IPixelCablingSvc, public AthService {
-
- public:
- PixelCablingSvc(const std::string& name, ISvcLocator* svc ) ;
-
- ~PixelCablingSvc();
- StatusCode initialize();
- StatusCode finalize();
-
- StatusCode queryInterface(const InterfaceID & riid, void** ppvInterface );
-
- Identifier getPixelIdfromHash(IdentifierHash offlineIdHash, uint32_t FE, uint32_t row, uint32_t column);
- Identifier getPixelId(Identifier offlineId, uint32_t FE, uint32_t row, uint32_t column);
-
- uint32_t getFE(Identifier* pixelId, Identifier offlineId);
- uint32_t getColumn(Identifier* pixelId, Identifier offlineId);
- uint32_t getRow(Identifier* pixelId, Identifier offlineId);
- unsigned int getLocalFEI4(const uint32_t fe, const uint64_t onlineId);
-
- moduletype getModuleType(const Identifier& id);
- pixeltype getPixelType(const Identifier& id);
-
- private:
- ServiceHandle< StoreGateSvc > m_detStore;
- StringProperty m_detManagerName{this, "DetManagerName", "Pixel", "Name of the DeterctorManager to retrieve"};
- const InDetDD::PixelDetectorManager *m_detManager;
- const PixelID* m_idHelper;
-
-};
-
-#endif
diff --git a/InnerDetector/InDetDetDescr/PixelCabling/src/components/PixelCabling_entries.cxx b/InnerDetector/InDetDetDescr/PixelCabling/src/components/PixelCabling_entries.cxx
deleted file mode 100644
index 447efb793a95..000000000000
--- a/InnerDetector/InDetDetDescr/PixelCabling/src/components/PixelCabling_entries.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "../PixelCablingSvc.h"
-
-DECLARE_COMPONENT( PixelCablingSvc )
-
diff --git a/InnerDetector/InDetDetDescr/PixelCabling/test/PixelCablingConfigNew_test.py b/InnerDetector/InDetDetDescr/PixelCabling/test/PixelCablingConfigNew_test.py
deleted file mode 100755
index 16ad79046ad9..000000000000
--- a/InnerDetector/InDetDetDescr/PixelCabling/test/PixelCablingConfigNew_test.py
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env python
-"""Run tests on PixelCablingConfigNew.py
-
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-"""
-from AthenaConfiguration.AllConfigFlags import ConfigFlags
-from AthenaConfiguration.TestDefaults import defaultTestFiles
-from AthenaCommon.Logging import log
-from AthenaCommon.Constants import DEBUG
-from AthenaCommon.Configurable import Configurable
-from PixelCabling.PixelCablingConfigNew import PixelCablingSvcCfg
-
-# test setup
-log.setLevel(DEBUG)
-Configurable.configurableRun3Behavior = True
-ConfigFlags.Input.Files = defaultTestFiles.HITS
-# test
-PixelCablingAcc = PixelCablingSvcCfg(ConfigFlags, name="PixelCablingSvcTest")
-# prevent raise on __del__
-PixelCablingAcc.wasMerged()
-
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/CMakeLists.txt b/InnerDetector/InDetDetDescr/PixelGeoModel/CMakeLists.txt
index 73b925d17d14..a05e4bb0712c 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/CMakeLists.txt
@@ -11,7 +11,7 @@ atlas_add_library( PixelGeoModelLib
PixelGeoModel/*.h src/*.cxx
PUBLIC_HEADERS PixelGeoModel
LINK_LIBRARIES AthenaBaseComps GaudiKernel GeoModelUtilities GeometryDBSvcLib InDetGeoModelUtils
- PRIVATE_LINK_LIBRARIES ${GEOMODEL_LIBRARIES} AthenaKernel CxxUtils DetDescrConditions GeoModelInterfaces GeoPrimitives Identifier InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry ReadoutGeometryBase RDBAccessSvcLib SGTools StoreGateLib
+ PRIVATE_LINK_LIBRARIES ${GEOMODEL_LIBRARIES} AthenaKernel CxxUtils DetDescrConditions GeoModelInterfaces GeoPrimitives Identifier InDetIdentifier InDetReadoutGeometry PixelReadoutGeometryLib ReadoutGeometryBase RDBAccessSvcLib SGTools StoreGateLib
PRIVATE_DEFINITIONS "-DGEOTORUS=1" )
atlas_add_component( PixelGeoModel
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModelXml/CMakeLists.txt b/InnerDetector/InDetDetDescr/PixelGeoModelXml/CMakeLists.txt
index 0f0ba14cfd03..9e5d67992c53 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModelXml/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/PixelGeoModelXml/CMakeLists.txt
@@ -11,7 +11,7 @@ atlas_add_library( PixelGeoModelXmlLib
src/*.cxx
PUBLIC_HEADERS PixelGeoModelXml
PRIVATE_INCLUDE_DIRS ${GEOMODEL_INCLUDE_DIRS}
- LINK_LIBRARIES GaudiKernel GeoModelUtilities GeoModelXml InDetGeoModelUtils PixelReadoutGeometry
+ LINK_LIBRARIES GaudiKernel GeoModelUtilities GeoModelXml InDetGeoModelUtils PixelReadoutGeometryLib
PRIVATE_LINK_LIBRARIES ${GEOMODEL_LIBRARIES} AthenaBaseComps AthenaPoolUtilities DetDescrConditions GeoModelInterfaces GeometryDBSvcLib ReadoutGeometryBase InDetReadoutGeometry InDetSimEvent PathResolver RDBAccessSvcLib SGTools StoreGateLib )
atlas_add_component( PixelGeoModelXml
diff --git a/InnerDetector/InDetDetDescr/PixelReadoutDefinitions/CMakeLists.txt b/InnerDetector/InDetDetDescr/PixelReadoutDefinitions/CMakeLists.txt
new file mode 100644
index 000000000000..bed383ff1d79
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/PixelReadoutDefinitions/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+# Declare the package name:
+atlas_subdir( PixelReadoutDefinitions )
+
+# Component(s) in the package:
+atlas_add_library( PixelReadoutDefinitionsLib
+ PixelReadoutDefinitions/*.h
+ INTERFACE
+ PUBLIC_HEADERS PixelReadoutDefinitions )
diff --git a/InnerDetector/InDetDetDescr/PixelReadoutDefinitions/PixelReadoutDefinitions/PixelReadoutDefinitions.h b/InnerDetector/InDetDetDescr/PixelReadoutDefinitions/PixelReadoutDefinitions/PixelReadoutDefinitions.h
new file mode 100644
index 000000000000..ca04b0cedfcd
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/PixelReadoutDefinitions/PixelReadoutDefinitions/PixelReadoutDefinitions.h
@@ -0,0 +1,38 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef PIXELREADOUTDEFINITIONS_H
+#define PIXELREADOUTDEFINITIONS_H
+
+namespace InDetDD
+{
+
+enum class PixelModuleType
+{
+ DBM,
+ IBL_PLANAR,
+ IBL_3D,
+ PIX_BARREL,
+ PIX_ENDCAP,
+ NONE
+};
+
+enum class PixelDiodeType
+{
+ NORMAL,
+ LONG,
+ GANGED,
+ LARGE
+};
+
+enum class PixelReadoutTechnology
+{
+ FEI3,
+ FEI4,
+ RD53
+};
+
+}
+
+#endif
diff --git a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/CMakeLists.txt b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/CMakeLists.txt
index 4490c4f6d8ba..90c8469ebb9c 100644
--- a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/CMakeLists.txt
@@ -3,12 +3,39 @@
# Declare the package name:
atlas_subdir( PixelReadoutGeometry )
+find_package( GTest )
+find_package( GMock )
+
# External dependencies:
find_package( GeoModel COMPONENTS GeoModelKernel )
# Component(s) in the package:
-atlas_add_library( PixelReadoutGeometry
- src/*.cxx
+atlas_add_library( PixelReadoutGeometryLib
+ src/PixelDetectorManager.cxx
+ src/PixelModuleDesign.cxx
PUBLIC_HEADERS PixelReadoutGeometry
- LINK_LIBRARIES ${GEOMODEL_LIBRARIES} AthenaKernel CxxUtils GeoPrimitives InDetIdentifier InDetReadoutGeometry ReadoutGeometryBase TrkDetElementBase TrkSurfaces
+ LINK_LIBRARIES ${GEOMODEL_LIBRARIES} AthenaKernel CxxUtils GaudiKernel GeoPrimitives InDetIdentifier InDetReadoutGeometry PixelReadoutDefinitionsLib ReadoutGeometryBase TrkDetElementBase TrkSurfaces
PRIVATE_LINK_LIBRARIES AthenaBaseComps AthenaPoolUtilities DetDescrConditions Identifier StoreGateLib TrkEventPrimitives InDetGeoModelUtils)
+
+atlas_add_component( PixelReadoutGeometry
+ src/PixelReadoutManager.cxx
+ src/ITkPixelReadoutManager.cxx
+ src/components/*.cxx
+ LINK_LIBRARIES AthenaBaseComps Identifier InDetIdentifier PixelReadoutGeometryLib )
+
+# Install files from the package:
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+
+# Test(s) in the package:
+atlas_add_test( PixelReadoutGeometryConfig_test
+ SCRIPT test/PixelReadoutGeometryConfig_test.py
+ PROPERTIES TIMEOUT 300 )
+
+if( NOT SIMULATIONBASE )
+ # disabled in AthSimulation
+ atlas_add_test( ITkPixelReadoutManager_test
+ SOURCES test/ITkPixelReadoutManager_test.cxx src/ITkPixelReadoutManager.cxx
+ INCLUDE_DIRS ${GTEST_INCLUDE_DIRS} ${GMOCK_INCLUDE_DIRS}
+ LINK_LIBRARIES ${GMOCK_LIBRARIES} ${GTEST_LIBRARIES} AthenaBaseComps AthenaKernel CxxUtils GaudiKernel PixelReadoutGeometryLib
+ ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/test" )
+endif()
diff --git a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/PixelReadoutGeometry/IPixelReadoutManager.h b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/PixelReadoutGeometry/IPixelReadoutManager.h
new file mode 100644
index 000000000000..c8cca15ccf47
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/PixelReadoutGeometry/IPixelReadoutManager.h
@@ -0,0 +1,49 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef IPIXELREADOUTMANAGER_H
+#define IPIXELREADOUTMANAGER_H
+
+#include <cstdint>
+
+#include <GaudiKernel/IInterface.h>
+#include <PixelReadoutDefinitions/PixelReadoutDefinitions.h>
+
+class Identifier;
+class IdentifierHash;
+
+
+namespace InDetDD
+{
+
+class IPixelReadoutManager : virtual public IInterface
+{
+public:
+ /// Creates the InterfaceID and interfaceID() method
+ DeclareInterfaceID(IPixelReadoutManager, 1, 0);
+ virtual ~IPixelReadoutManager() = default;
+
+ virtual PixelModuleType getModuleType(Identifier id) const = 0;
+ virtual PixelDiodeType getDiodeType(Identifier id) const = 0;
+
+ virtual Identifier getPixelIdfromHash(IdentifierHash offlineIdHash,
+ uint32_t FE,
+ uint32_t row,
+ uint32_t column) const = 0;
+ virtual Identifier getPixelId(Identifier offlineId,
+ uint32_t FE,
+ uint32_t row,
+ uint32_t column) const = 0;
+
+ virtual uint32_t getFE(Identifier diodeId,
+ Identifier offlineId) const = 0;
+ virtual uint32_t getColumn(Identifier diodeId,
+ Identifier offlineId) const = 0;
+ virtual uint32_t getRow(Identifier diodeId,
+ Identifier offlineId) const = 0;
+};
+
+}
+
+#endif
diff --git a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/PixelReadoutGeometry/PixelModuleDesign.h b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/PixelReadoutGeometry/PixelModuleDesign.h
index 4da8c5358e09..80b21980e473 100755
--- a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/PixelReadoutGeometry/PixelModuleDesign.h
+++ b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/PixelReadoutGeometry/PixelModuleDesign.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -18,6 +18,7 @@
// Data member classes
#include "ReadoutGeometryBase/PixelDiodeMap.h"
#include "ReadoutGeometryBase/PixelReadoutScheme.h"
+#include "PixelReadoutDefinitions/PixelReadoutDefinitions.h"
// Other includes
#include "CxxUtils/CachedUniquePtr.h"
@@ -207,9 +208,8 @@ namespace InDetDD {
virtual const Trk::SurfaceBounds & bounds() const;
virtual bool is3D() const;
-
- enum ReadoutTechnology{FEI3,FEI4,RD53};
- ReadoutTechnology getReadoutTechnology() const;
+
+ PixelReadoutTechnology getReadoutTechnology() const;
virtual DetectorType type() const final;
@@ -365,18 +365,18 @@ namespace InDetDD {
return m_is3D;
}
- inline PixelModuleDesign::ReadoutTechnology PixelModuleDesign::getReadoutTechnology() const {
+ inline PixelReadoutTechnology PixelModuleDesign::getReadoutTechnology() const {
if (m_detectorType == InDetDD::DetectorType::PixelBarrel
|| m_detectorType == InDetDD::DetectorType::PixelEndcap
|| m_detectorType == InDetDD::DetectorType::PixelInclined)
{
- return RD53;
+ return PixelReadoutTechnology::RD53;
}
const int maxRow = m_readoutScheme.rowsPerCircuit();
const int maxCol = m_readoutScheme.columnsPerCircuit();
- if (maxRow*maxCol>26000) { return FEI4; }
- else { return FEI3; }
+ if (maxRow*maxCol>26000) { return PixelReadoutTechnology::FEI4; }
+ else { return PixelReadoutTechnology::FEI3; }
}
inline std::string PixelModuleDesign::debugStringRepr() const
diff --git a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/python/PixelReadoutGeometryConfig.py b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/python/PixelReadoutGeometryConfig.py
new file mode 100644
index 000000000000..32ff5781bfdf
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/python/PixelReadoutGeometryConfig.py
@@ -0,0 +1,17 @@
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+
+
+def PixelReadoutManagerCfg(flags, name="PixelReadoutManager", **kwargs):
+ """Return a ComponentAccumulator with configured PixelReadoutManager"""
+ acc = ComponentAccumulator()
+ acc.addService(CompFactory.InDetDD.PixelReadoutManager(name, **kwargs), primary=True)
+ return acc
+
+
+def ITkPixelReadoutManagerCfg(flags, name="ITkPixelReadoutManager", **kwargs):
+ """Return a ComponentAccumulator with configured ITkPixelReadoutManager"""
+ acc = ComponentAccumulator()
+ acc.addService(CompFactory.InDetDD.ITkPixelReadoutManager(name, **kwargs), primary=True)
+ return acc
diff --git a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/python/PixelReadoutGeometryConfigDb.py b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/python/PixelReadoutGeometryConfigDb.py
new file mode 100644
index 000000000000..7f8285578553
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/python/PixelReadoutGeometryConfigDb.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.CfgGetter import addService
+
+addService("PixelReadoutGeometry.PixelReadoutGeometryConfigLegacy.PixelReadoutManager", "PixelReadoutManager")
diff --git a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/python/PixelReadoutGeometryConfigLegacy.py b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/python/PixelReadoutGeometryConfigLegacy.py
new file mode 100644
index 000000000000..9d814447bb24
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/python/PixelReadoutGeometryConfigLegacy.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon import CfgMgr
+
+def PixelReadoutManager(name="PixelReadoutManager", **kwargs):
+ return CfgMgr.InDetDD__PixelReadoutManager(name, **kwargs)
diff --git a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/python/__init__.py b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/python/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/ITkPixelReadoutManager.cxx b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/ITkPixelReadoutManager.cxx
new file mode 100644
index 000000000000..0ec7e00543a7
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/ITkPixelReadoutManager.cxx
@@ -0,0 +1,289 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "ITkPixelReadoutManager.h"
+
+#include <InDetIdentifier/PixelID.h>
+#include <InDetReadoutGeometry/SiDetectorElement.h>
+#include <PixelReadoutGeometry/PixelModuleDesign.h>
+#include <PixelReadoutGeometry/PixelDetectorManager.h>
+
+
+namespace InDetDD
+{
+
+ITkPixelReadoutManager::ITkPixelReadoutManager(const std::string &name,
+ ISvcLocator *svc)
+ : base_class(name, svc)
+{
+}
+
+
+StatusCode ITkPixelReadoutManager::initialize()
+{
+ ATH_MSG_DEBUG("ITkPixelReadoutManager::initialize()");
+
+ ATH_CHECK(m_detStore.retrieve());
+ ATH_CHECK(m_detStore->retrieve(m_detManager, "ITkPixel"));
+ ATH_CHECK(m_detStore->retrieve(m_idHelper, "PixelID"));
+
+ return StatusCode::SUCCESS;
+}
+
+
+PixelModuleType ITkPixelReadoutManager::getModuleType(Identifier id) const
+{
+ const Identifier wafer_id = m_idHelper->wafer_id(id);
+ const SiDetectorElement *element = m_detManager->getDetectorElement(wafer_id);
+ const PixelModuleDesign *p_design = static_cast<const PixelModuleDesign *>(&element->design());
+ if (p_design->getReadoutTechnology() != PixelReadoutTechnology::RD53) {
+ ATH_MSG_ERROR("Non-RD53 readout technologies not supported!");
+ return PixelModuleType::NONE;
+ }
+
+ if (m_idHelper->barrel_ec(id) == 0) {
+ return PixelModuleType::PIX_BARREL;
+ }
+
+ if (std::abs(m_idHelper->barrel_ec(id)) == 2) {
+ return PixelModuleType::PIX_ENDCAP;
+ }
+
+ return PixelModuleType::NONE;
+}
+
+
+PixelDiodeType ITkPixelReadoutManager::getDiodeType(Identifier id) const
+{
+ const Identifier wafer_id = m_idHelper->wafer_id(id);
+ const SiDetectorElement *element = m_detManager->getDetectorElement(wafer_id);
+ const PixelModuleDesign *p_design = static_cast<const PixelModuleDesign *>(&element->design());
+ if (p_design->getReadoutTechnology() != PixelReadoutTechnology::RD53) {
+ ATH_MSG_ERROR("Non-RD53 readout technologies not supported!");
+ return PixelDiodeType::NORMAL;
+ }
+
+ Identifier diodeId = id;
+ uint32_t col = getColumn(diodeId, wafer_id);
+ uint32_t row = getRow(diodeId, wafer_id);
+
+ // ---------------------
+ // Get the pixel type
+ // ---------------------
+ unsigned int FEs = p_design->numberOfCircuits();
+ unsigned int rowsPerFE = p_design->rowsPerCircuit();
+ unsigned int columnsPerFE = p_design->columnsPerCircuit();
+
+ if (FEs == 4) {
+ // long pixel row and columns
+ // 2 per row/column side
+ // TODO: avoid hardcoding this
+ if (row > rowsPerFE - 3 && col < columnsPerFE - 2) {
+ return PixelDiodeType::LONG;
+ }
+ if (col > columnsPerFE - 3 && row < rowsPerFE - 2) {
+ return PixelDiodeType::LONG;
+ }
+ // corner big pixels
+ if (row > rowsPerFE - 3 && col > columnsPerFE - 3) {
+ return PixelDiodeType::LARGE;
+ }
+ } else if (FEs != 1) {
+ ATH_MSG_WARNING("Module with a number of circuits which is not 1 or 4.");
+ ATH_MSG_WARNING("Long/pixel identification not implemented");
+ }
+
+ return PixelDiodeType::NORMAL;
+}
+
+
+Identifier ITkPixelReadoutManager::getPixelIdfromHash(IdentifierHash offlineIdHash,
+ uint32_t FE,
+ uint32_t row,
+ uint32_t column) const
+{
+ return getPixelId(m_idHelper->wafer_id(offlineIdHash), FE, row, column);
+}
+
+
+Identifier ITkPixelReadoutManager::getPixelId(Identifier offlineId,
+ uint32_t FE,
+ uint32_t row,
+ uint32_t column) const
+{
+ const SiDetectorElement *element = m_detManager->getDetectorElement(offlineId);
+ const PixelModuleDesign *p_design = static_cast<const PixelModuleDesign *>(&element->design());
+ if (p_design->getReadoutTechnology() != PixelReadoutTechnology::RD53) {
+ ATH_MSG_ERROR("Non-RD53 readout technologies not supported!");
+ return Identifier();
+ }
+
+ unsigned int FEs = p_design->numberOfCircuits();
+ unsigned int FEsPerRow = p_design->numberOfCircuitsPerRow();
+ unsigned int rowsPerFE = p_design->rowsPerCircuit();
+ unsigned int columnsPerFE = p_design->columnsPerCircuit();
+
+ // ---------------------
+ // Check input sanity
+ // ---------------------
+ if (row >= rowsPerFE || column >= columnsPerFE || FE >= FEs) {
+ ATH_MSG_DEBUG("Illegal pixel requested OfflineID: " << std::hex << offlineId << std::dec << " FE: " << FE << " row: " << row << " column: " << column);
+ ATH_MSG_DEBUG("Limits are: FE < " << FEs << ", row < " << rowsPerFE << ", column < " << columnsPerFE);
+ return Identifier(); // illegal Identifier, standardized for PixelRodDecoder
+ }
+
+ // ---------------------
+ // Convert row/column to eta/phi indices
+ // ---------------------
+ unsigned int phi_index{}, eta_index{};
+ if (FE >= 2) {
+ phi_index = 2 * rowsPerFE - 1 - row;
+ } else {
+ phi_index = row;
+ }
+ if (FE % 2 == 1) {
+ eta_index = 2 * columnsPerFE - 1 - column;
+ } else {
+ eta_index = column;
+ }
+
+ // Identify the module type
+ PixelModuleType moduleType = getModuleType(offlineId);
+ if (moduleType == PixelModuleType::PIX_ENDCAP) {
+ // Swap phi_index for even endcap modules
+ int module_phi = m_idHelper->phi_module(offlineId);
+ if (module_phi % 2 == 0) {
+ phi_index = FEsPerRow * rowsPerFE - phi_index - 1;
+ ATH_MSG_DEBUG("Even disk module found, phi module: " << module_phi << " swapped phi index to : " << phi_index);
+ }
+ }
+
+ return m_idHelper->pixel_id(offlineId, phi_index, eta_index);
+}
+
+
+uint32_t ITkPixelReadoutManager::getFE(Identifier diodeId,
+ Identifier offlineId) const
+{
+ const SiDetectorElement *element = m_detManager->getDetectorElement(offlineId);
+ const PixelModuleDesign *p_design = static_cast<const PixelModuleDesign *>(&element->design());
+ if (p_design->getReadoutTechnology() != PixelReadoutTechnology::RD53) {
+ ATH_MSG_ERROR("Non-RD53 readout technologies not supported!");
+ return 0xffffffff;
+ }
+
+ unsigned int FEsPerRow = p_design->numberOfCircuitsPerRow();
+ unsigned int rowsPerFE = p_design->rowsPerCircuit();
+ unsigned int columnsPerFE = p_design->columnsPerCircuit();
+
+ // ---------------------
+ // Set module properties
+ // ---------------------
+ unsigned int phi_index = m_idHelper->phi_index(diodeId);
+ unsigned int eta_index = m_idHelper->eta_index(diodeId);
+
+ PixelModuleType moduleType = getModuleType(offlineId);
+ if (moduleType == PixelModuleType::PIX_ENDCAP) {
+ // Swap phi_index for even endcap modules
+ int module_phi = m_idHelper->phi_module(offlineId);
+ if (module_phi % 2 == 0) {
+ phi_index = FEsPerRow * rowsPerFE - phi_index - 1;
+ }
+ }
+
+ // ---------------------
+ // Compute FE number
+ // ---------------------
+ // ITk has up to 4 FEs
+ unsigned int FErow = static_cast<unsigned int>(std::floor(phi_index / rowsPerFE));
+ unsigned int FEcol = static_cast<unsigned int>(std::floor(eta_index / columnsPerFE));
+ if (FErow > 0) {
+ return 2 + FEcol;
+ } else {
+ return FEcol;
+ }
+}
+
+
+uint32_t ITkPixelReadoutManager::getColumn(Identifier diodeId,
+ Identifier offlineId) const
+{
+ const SiDetectorElement *element = m_detManager->getDetectorElement(offlineId);
+ const PixelModuleDesign *p_design = static_cast<const PixelModuleDesign *>(&element->design());
+ if (p_design->getReadoutTechnology() != PixelReadoutTechnology::RD53) {
+ ATH_MSG_ERROR("Non-RD53 readout technologies not supported!");
+ return 0xffffffff;
+ }
+
+ unsigned int columnsPerFE = p_design->columnsPerCircuit();
+ unsigned int eta_index = m_idHelper->eta_index(diodeId);
+
+ // ---------------------
+ // Convert eta index to column number
+ // ---------------------
+ unsigned int column{};
+ if (eta_index >= columnsPerFE) {
+ column = 2 * columnsPerFE - eta_index - 1;
+ } else {
+ column = eta_index;
+ }
+
+ // ---------------------
+ // Check output sanity
+ // ---------------------
+ if (column >= columnsPerFE) {
+ ATH_MSG_ERROR("Computed column number exceeds maximum value: col = " << column << " (max = " << columnsPerFE << ")");
+ return 0xffffffff;
+ }
+
+ return column;
+}
+
+
+uint32_t ITkPixelReadoutManager::getRow(Identifier diodeId,
+ Identifier offlineId) const
+{
+ const SiDetectorElement *element = m_detManager->getDetectorElement(offlineId);
+ const PixelModuleDesign *p_design = static_cast<const PixelModuleDesign *>(&element->design());
+ if (p_design->getReadoutTechnology() != PixelReadoutTechnology::RD53) {
+ ATH_MSG_ERROR("Non-RD53 readout technologies not supported!");
+ return 0xffffffff;
+ }
+
+ unsigned int FEsPerRow = p_design->numberOfCircuitsPerRow();
+ unsigned int rowsPerFE = p_design->rowsPerCircuit();
+ unsigned int phi_index = m_idHelper->phi_index(diodeId);
+
+ // Identify the module type
+ PixelModuleType moduleType = getModuleType(offlineId);
+ if (moduleType == PixelModuleType::PIX_ENDCAP) {
+ // Swap phi_index for even endcap modules
+ int module_phi = m_idHelper->phi_module(offlineId);
+ if (module_phi % 2 == 0) {
+ phi_index = FEsPerRow * rowsPerFE - phi_index - 1;
+ }
+ }
+
+ // ---------------------
+ // Convert phi index to row number
+ // ---------------------
+ unsigned int row{};
+ if (phi_index >= rowsPerFE) {
+ row = 2 * rowsPerFE - phi_index - 1;
+ } else {
+ row = phi_index;
+ }
+
+ // ---------------------
+ // Check output sanity
+ // ---------------------
+ if (row >= rowsPerFE) {
+ ATH_MSG_ERROR("Computed row number exceeds maximum value: row = " << row << "(max = " << rowsPerFE << ")");
+ return 0xffffffff;
+ }
+
+ return row;
+}
+
+} // namespace InDetDD
diff --git a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/ITkPixelReadoutManager.h b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/ITkPixelReadoutManager.h
new file mode 100644
index 000000000000..c9df008cf39a
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/ITkPixelReadoutManager.h
@@ -0,0 +1,56 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Tadej Novak
+
+
+#ifndef ITKPIXELREADOUTMANAGER_H
+#define ITKPIXELREADOUTMANAGER_H
+
+#include <AthenaBaseComps/AthService.h>
+#include <PixelReadoutGeometry/IPixelReadoutManager.h>
+
+
+class PixelID;
+
+namespace InDetDD
+{
+class PixelDetectorManager;
+
+class ITkPixelReadoutManager final : public extends<AthService, IPixelReadoutManager>
+{
+public:
+ ITkPixelReadoutManager(const std::string &name,
+ ISvcLocator *svc);
+
+ virtual StatusCode initialize() override final;
+
+ virtual PixelModuleType getModuleType(Identifier id) const override final;
+ virtual PixelDiodeType getDiodeType(Identifier id) const override final;
+
+ virtual Identifier getPixelIdfromHash(IdentifierHash offlineIdHash,
+ uint32_t FE,
+ uint32_t row,
+ uint32_t column) const override final;
+ virtual Identifier getPixelId(Identifier offlineId,
+ uint32_t FE,
+ uint32_t row,
+ uint32_t column) const override final;
+
+ virtual uint32_t getFE(Identifier diodeId,
+ Identifier offlineId) const override final;
+ virtual uint32_t getColumn(Identifier diodeId,
+ Identifier offlineId) const override final;
+ virtual uint32_t getRow(Identifier diodeId,
+ Identifier offlineId) const override final;
+
+private:
+ ServiceHandle<StoreGateSvc> m_detStore{this, "DetectorStore", "DetectorStore"};
+ const PixelDetectorManager *m_detManager{};
+ const PixelID *m_idHelper{};
+};
+
+}
+
+#endif
diff --git a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/PixelReadoutManager.cxx b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/PixelReadoutManager.cxx
new file mode 100644
index 000000000000..783a4af37530
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/PixelReadoutManager.cxx
@@ -0,0 +1,470 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "PixelReadoutManager.h"
+
+#include <InDetIdentifier/PixelID.h>
+#include <InDetReadoutGeometry/SiDetectorElement.h>
+#include <PixelReadoutGeometry/PixelModuleDesign.h>
+#include <PixelReadoutGeometry/PixelDetectorManager.h>
+
+// #define PIXEL_DEBUG
+
+namespace InDetDD
+{
+
+PixelReadoutManager::PixelReadoutManager(const std::string &name,
+ ISvcLocator *svc)
+ : base_class(name, svc)
+{
+}
+
+
+StatusCode PixelReadoutManager::initialize()
+{
+ ATH_MSG_DEBUG("PixelReadoutManager::initialize()");
+
+ ATH_CHECK(m_detStore.retrieve());
+ ATH_CHECK(m_detStore->retrieve(m_detManager, "Pixel"));
+ ATH_CHECK(m_detStore->retrieve(m_idHelper, "PixelID"));
+
+ return StatusCode::SUCCESS;
+}
+
+
+PixelModuleType PixelReadoutManager::getModuleType(Identifier id) const
+{
+ const Identifier wafer_id = m_idHelper->wafer_id(id);
+ const SiDetectorElement *element = m_detManager->getDetectorElement(wafer_id);
+ const PixelModuleDesign *p_design = static_cast<const PixelModuleDesign *>(&element->design());
+ if (p_design->getReadoutTechnology() == PixelReadoutTechnology::RD53) {
+ ATH_MSG_ERROR("RD53 readout technologies not supported!");
+ return PixelModuleType::NONE;
+ }
+
+ if (p_design->getReadoutTechnology() == PixelReadoutTechnology::FEI4) {
+ if (m_idHelper->is_dbm(id)) {
+ return PixelModuleType::DBM;
+ }
+
+ if (p_design->numberOfCircuits() == 2) {
+ return PixelModuleType::IBL_PLANAR;
+ }
+
+ return PixelModuleType::IBL_3D;
+ }
+
+ if (p_design->getReadoutTechnology() == PixelReadoutTechnology::FEI3) {
+ if (std::abs(m_idHelper->barrel_ec(id)) == 0) {
+ return PixelModuleType::PIX_BARREL;
+ }
+ if (std::abs(m_idHelper->barrel_ec(id)) == 2) {
+ return PixelModuleType::PIX_ENDCAP;
+ }
+ }
+
+ return PixelModuleType::NONE;
+}
+
+
+PixelDiodeType PixelReadoutManager::getDiodeType(Identifier id) const
+{
+ const Identifier wafer_id = m_idHelper->wafer_id(id);
+ Identifier diodeId = id;
+ Identifier offlineId = m_idHelper->wafer_id(diodeId);
+ int col = getColumn(diodeId, offlineId);
+ int row = getRow(diodeId, offlineId);
+
+ const SiDetectorElement *element = m_detManager->getDetectorElement(wafer_id);
+ const PixelModuleDesign *p_design = static_cast<const PixelModuleDesign *>(&element->design());
+ if (p_design->getReadoutTechnology() == PixelReadoutTechnology::RD53) {
+ ATH_MSG_ERROR("RD53 readout technologies not supported!");
+ return PixelDiodeType::NORMAL;
+ }
+
+ if (p_design->getReadoutTechnology() == PixelReadoutTechnology::FEI4) {
+ if (p_design->numberOfCircuits() == 2) { // IBL planar
+ if (col == 0 || col == p_design->columnsPerCircuit() - 1) { // column edge =0,79
+ return PixelDiodeType::LONG;
+ }
+ return PixelDiodeType::NORMAL;
+ }
+ return PixelDiodeType::NORMAL;
+ }
+
+ if (p_design->getReadoutTechnology() == PixelReadoutTechnology::FEI3) {
+ if (col > 0 && col < p_design->columnsPerCircuit() - 1) {
+ if (row >= p_design->rowsPerCircuit() / 2 - 1 - 6 - 1 && row <= p_design->rowsPerCircuit() / 2 - 1) {
+ if ((row - (p_design->rowsPerCircuit() / 2 - 1 - 6) + 1) % 2 + 1 == 1) {
+ return PixelDiodeType::LONG;
+ }
+ if ((row - (p_design->rowsPerCircuit() / 2 - 1 - 6) + 1) % 2 + 1 == 2) {
+ return PixelDiodeType::GANGED;
+ }
+ }
+ return PixelDiodeType::NORMAL;
+ }
+
+ if (col == 0 || col==p_design->columnsPerCircuit() - 1) {
+ if (row >= p_design->rowsPerCircuit() / 2 - 1 - 6 - 1) {
+ return PixelDiodeType::GANGED;
+ }
+ return PixelDiodeType::LONG;
+ }
+
+ ATH_MSG_WARNING("Pixel Type : the col number should be 0-" << p_design->columnsPerCircuit() << ", not " <<col);
+ return PixelDiodeType::NORMAL;
+ }
+
+ return PixelDiodeType::NORMAL;
+}
+
+
+Identifier PixelReadoutManager::getPixelIdfromHash(IdentifierHash offlineIdHash,
+ uint32_t FE,
+ uint32_t row,
+ uint32_t column) const
+{
+ return getPixelId(m_idHelper->wafer_id(offlineIdHash), FE, row, column);
+}
+
+
+Identifier PixelReadoutManager::getPixelId(Identifier offlineId,
+ uint32_t FE,
+ uint32_t row,
+ uint32_t column) const
+{
+ const SiDetectorElement *element = m_detManager->getDetectorElement(offlineId);
+ const PixelModuleDesign *p_design = static_cast<const PixelModuleDesign *>(&element->design());
+ if (p_design->getReadoutTechnology() == PixelReadoutTechnology::RD53) {
+ ATH_MSG_ERROR("RD53 readout technologies not supported!");
+ return Identifier();
+ }
+
+ unsigned int columnsPerFE = p_design->columnsPerCircuit();
+ unsigned int FEsPerHalfModule = p_design->numberOfCircuits();
+ unsigned int rowsPerFE = 0;
+ int column_row_offset = 0;
+ if (p_design->getReadoutTechnology() == PixelReadoutTechnology::FEI4) {
+ rowsPerFE = p_design->rowsPerCircuit();
+ column_row_offset = -1;
+ }
+ else if (p_design->getReadoutTechnology() == PixelReadoutTechnology::FEI3) {
+ rowsPerFE = p_design->rowsPerCircuit()/2+4; // normal + ganged
+ }
+
+ // ---------------------
+ // Check input sanity
+ // ---------------------
+ // Identify the module type
+ PixelModuleType moduleType = getModuleType(offlineId);
+
+ // Correct row, column
+ row = row + column_row_offset;
+ column = column + column_row_offset;
+
+ if (row>=rowsPerFE || column>=columnsPerFE || FE>=((moduleType == PixelModuleType::IBL_PLANAR || moduleType == PixelModuleType::IBL_3D || moduleType == PixelModuleType::DBM) ? FEsPerHalfModule:2*FEsPerHalfModule)) {
+ ATH_MSG_DEBUG("Illegal pixel requested OfflineID: " << std::hex << offlineId << std::dec << " FE: " << FE << " row: " << row << " column: " << column);
+ ATH_MSG_DEBUG("Limits are: FE < " << ((moduleType == PixelModuleType::IBL_PLANAR || moduleType == PixelModuleType::IBL_3D || moduleType == PixelModuleType::DBM) ? FEsPerHalfModule : 2*FEsPerHalfModule) << ", row < " << rowsPerFE << ", column < " << columnsPerFE);
+ return Identifier(); // illegal Identifier, standardized for PixelRodDecoder
+ }
+
+ // ---------------------
+ // Convert row/column to eta/phi indices
+ // ---------------------
+ unsigned int phi_index, eta_index;
+ switch (moduleType)
+ {
+ case PixelModuleType::DBM:
+ eta_index = rowsPerFE-1-row;
+ if (m_idHelper->barrel_ec(offlineId)>0) { // A side (pos. eta)
+ phi_index = column;
+ }
+ else { // C side
+ phi_index = columnsPerFE-1-column;
+ }
+ break;
+
+ case PixelModuleType::IBL_PLANAR:
+ phi_index = rowsPerFE-1-row;
+ eta_index = FE*columnsPerFE+column;
+ break;
+
+ case PixelModuleType::IBL_3D:
+ phi_index = rowsPerFE-1-row;
+ eta_index = FE*columnsPerFE+column;
+ break;
+
+ default: // pixels
+ if (FE<FEsPerHalfModule) {
+ phi_index = ((2*rowsPerFE)-1)-row;
+ eta_index = ((columnsPerFE*FEsPerHalfModule)-1)-(column+(FE*columnsPerFE));
+ }
+ else {
+ phi_index = row;
+ eta_index = ((FE-FEsPerHalfModule)*columnsPerFE)+column;
+ }
+ if (moduleType == PixelModuleType::PIX_ENDCAP) {
+ // Swap phi_index for even endcap modules
+ if ((m_idHelper->phi_module(offlineId))%2==0) {
+ phi_index = 2*rowsPerFE-phi_index-1;
+ ATH_MSG_DEBUG("Even disk module found, phi module: " << m_idHelper->phi_module(offlineId) << " swapped phi index to : " << phi_index);
+ }
+ }
+ break;
+ }
+
+ Identifier diodeId = m_idHelper->pixel_id(offlineId, phi_index, eta_index);
+
+#ifdef PIXEL_DEBUG
+ unsigned int eta_index_max = m_idHelper->eta_index_max(offlineId);
+ unsigned int phi_index_max = m_idHelper->phi_index_max(offlineId);
+ if (eta_index>eta_index_max) {
+ ATH_MSG_DEBUG("Error! eta_index: " << eta_index << " > eta_index_max: " << eta_index_max);
+ }
+ if (phi_index>phi_index_max) {
+ ATH_MSG_DEBUG("Error! phi_index: " << phi_index << " > phi_index_max: " << phi_index_max);
+ }
+ //consistency check - to be removed to speed up
+ uint32_t check_FE = getFE(diodeId, offlineId);
+ uint32_t check_row = getRow(diodeId, offlineId) + column_row_offset;
+ uint32_t check_column = getColumn(diodeId, offlineId) + column_row_offset;
+ if (check_FE!=FE || check_row!=row || check_column!=column) {
+ ATH_MSG_WARNING("identify OfflineID: 0x" << std::hex << offlineId << std::dec << " FE: " << FE << " row: " << row << " column: " << column << " unequal to:");
+ ATH_MSG_WARNING("identify PixelID: 0x" << std::hex << diodeId << std::dec << " FE: " << check_FE << " row: " << check_row << " column: " << check_column);
+ }
+#endif
+
+ return diodeId;
+}
+
+
+uint32_t PixelReadoutManager::getFE(Identifier diodeId,
+ Identifier offlineId) const
+{
+ const SiDetectorElement *element = m_detManager->getDetectorElement(offlineId);
+ const PixelModuleDesign *p_design = static_cast<const PixelModuleDesign *>(&element->design());
+ if (p_design->getReadoutTechnology() == PixelReadoutTechnology::RD53) {
+ ATH_MSG_ERROR("RD53 readout technologies not supported!");
+ return 0xffffffff;
+ }
+
+ unsigned int columnsPerFE = p_design->columnsPerCircuit();
+ unsigned int FEsPerHalfModule = p_design->numberOfCircuits();
+ unsigned int rowsPerFE = 0;
+ if (p_design->getReadoutTechnology() == PixelReadoutTechnology::FEI4) {
+ rowsPerFE = p_design->rowsPerCircuit();
+ }
+ else if (p_design->getReadoutTechnology() == PixelReadoutTechnology::FEI3) {
+ rowsPerFE = p_design->rowsPerCircuit()/2+4; // normal + ganged
+ }
+
+ // ---------------------
+ // Set module properties
+ // ---------------------
+ PixelModuleType moduleType = getModuleType(offlineId);
+ unsigned int FE;
+ unsigned int phi_index = m_idHelper->phi_index(diodeId);
+ int eta_index = m_idHelper->eta_index(diodeId);
+
+ switch (moduleType)
+ {
+ case PixelModuleType::DBM:
+ FE = 0; // simple as that
+ return FE;
+ break;
+
+ case PixelModuleType::PIX_ENDCAP:
+ // Swap phi_index for even endcap modules
+ if ((m_idHelper->phi_module(offlineId))%2==0) {
+ phi_index = 2*rowsPerFE-phi_index-1;
+ }
+ break;
+
+ default: // PIX_BARREL + IBL
+ break;
+ }
+
+
+ // ---------------------
+ // Compute FE number
+ // ---------------------
+ if (phi_index>=rowsPerFE) {
+ FE = (int)((FEsPerHalfModule-1)-(eta_index/columnsPerFE));
+ }
+ else {
+ FE = (int)(eta_index/columnsPerFE)+FEsPerHalfModule;
+ }
+
+ // For IBL, the above returns FE number in range [2,3] (planar), or [1] (3D sensors).
+ // Change that to be [0,1] (planar) and [0] (3D) for consistency
+ if (moduleType == PixelModuleType::IBL_PLANAR || moduleType == PixelModuleType::IBL_3D) { FE = FE - FEsPerHalfModule; }
+
+ return FE;
+}
+
+
+uint32_t PixelReadoutManager::getColumn(Identifier diodeId,
+ Identifier offlineId) const
+{
+ const SiDetectorElement *element = m_detManager->getDetectorElement(offlineId);
+ const PixelModuleDesign *p_design = static_cast<const PixelModuleDesign *>(&element->design());
+ if (p_design->getReadoutTechnology() == PixelReadoutTechnology::RD53) {
+ ATH_MSG_ERROR("RD53 readout technologies not supported!");
+ return 0xffffffff;
+ }
+
+ unsigned int columnsPerFE = p_design->columnsPerCircuit();
+ unsigned int rowsPerFE = 0;
+ int column_offset = 0;
+ if (p_design->getReadoutTechnology() == PixelReadoutTechnology::FEI4) {
+ rowsPerFE = p_design->rowsPerCircuit();
+ column_offset = 1;
+ }
+ else if (p_design->getReadoutTechnology() == PixelReadoutTechnology::FEI3) {
+ rowsPerFE = p_design->rowsPerCircuit()/2+4; // normal + ganged
+ }
+
+ PixelModuleType moduleType = getModuleType(offlineId);
+
+ unsigned int phi_index = m_idHelper->phi_index(diodeId);
+ int eta_index = m_idHelper->eta_index(diodeId);
+
+ // ---------------------
+ // Set module properties
+ // ---------------------
+ switch (moduleType)
+ {
+ case PixelModuleType::DBM:
+ break;
+
+ case PixelModuleType::PIX_ENDCAP:
+ // Swap phi_index for even endcap modules
+ if ((m_idHelper->phi_module(offlineId))%2==0) {
+ phi_index = 2*rowsPerFE-phi_index-1;
+ }
+ break;
+
+ default: // PIX_BARREL + IBL
+ break;
+ }
+
+ // ---------------------
+ // Convert eta index to column number
+ // ---------------------
+ int column{};
+ // DBM (column <-> phi_index)
+ if (moduleType == PixelModuleType::DBM) {
+ if (m_idHelper->barrel_ec(offlineId)>0) {
+ column = m_idHelper->phi_index(diodeId); // A side
+ }
+ else {
+ column = columnsPerFE-m_idHelper->phi_index(diodeId)-1; // C side
+ }
+ }
+ // Pixels, IBL
+ else {
+ if ((phi_index>=rowsPerFE)) {
+ column = (columnsPerFE-1)-(eta_index%columnsPerFE);
+ }
+ else {
+ column = eta_index%columnsPerFE;
+ }
+ }
+
+ // ---------------------
+ // Check output sanity
+ // ---------------------
+ if (column >= (int)columnsPerFE) {
+ ATH_MSG_ERROR("Computed column number exceeds maximum value: col = " << column + column_offset << " (max = " << columnsPerFE << ")");
+ return 0xffffffff;
+ }
+
+ return column + column_offset;
+}
+
+
+uint32_t PixelReadoutManager::getRow(Identifier diodeId,
+ Identifier offlineId) const
+{
+ const SiDetectorElement *element = m_detManager->getDetectorElement(offlineId);
+ const PixelModuleDesign *p_design = static_cast<const PixelModuleDesign *>(&element->design());
+ if (p_design->getReadoutTechnology() == PixelReadoutTechnology::RD53) {
+ ATH_MSG_ERROR("RD53 readout technologies not supported!");
+ return 0xffffffff;
+ }
+
+ unsigned int rowsPerFE = 0;
+ int row_offset = 0;
+ if (p_design->getReadoutTechnology() == PixelReadoutTechnology::FEI4) {
+ rowsPerFE = p_design->rowsPerCircuit();
+ row_offset = 1;
+ }
+ else if (p_design->getReadoutTechnology() == PixelReadoutTechnology::FEI3) {
+ rowsPerFE = p_design->rowsPerCircuit()/2+4; // normal + ganged
+ }
+
+ PixelModuleType moduleType = getModuleType(offlineId);
+
+ unsigned int phi_index = m_idHelper->phi_index(diodeId);
+
+ // ---------------------
+ // Set module properties
+ // ---------------------
+ switch (moduleType)
+ {
+ case PixelModuleType::DBM:
+ break;
+
+ case PixelModuleType::PIX_ENDCAP:
+ // Swap phi_index for even endcap modules
+ if ((m_idHelper->phi_module(offlineId))%2==0) {
+ phi_index = 2*rowsPerFE-phi_index-1;
+ }
+ break;
+
+ default: // PIX_BARREL + IBL
+ break;
+ }
+
+ // ---------------------
+ // Convert phi index to row number
+ // ---------------------
+ int row{};
+ switch (moduleType)
+ {
+ case PixelModuleType::DBM:
+ // Row <-> eta_index
+ row = rowsPerFE-m_idHelper->eta_index(diodeId)-1;
+ break;
+
+ case PixelModuleType::IBL_PLANAR:
+ row = rowsPerFE-1-phi_index;
+ break;
+
+ case PixelModuleType::IBL_3D:
+ row = rowsPerFE-1-phi_index;
+ break;
+
+ default: // Pixels
+ if (phi_index>=rowsPerFE) {
+ row = ((2*rowsPerFE)-1)-phi_index;
+ }
+ else {
+ row = phi_index;
+ }
+ break;
+ }
+
+ // ---------------------
+ // Check output sanity
+ // ---------------------
+ if (row >= (int)rowsPerFE) {
+ ATH_MSG_ERROR("Computed row number exceeds maximum value: row = " << row + row_offset << "(max = " << rowsPerFE << ")");
+ return 0xffffffff;
+ }
+ return row + row_offset;
+}
+
+} // namespace InDetDD
diff --git a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/PixelReadoutManager.h b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/PixelReadoutManager.h
new file mode 100644
index 000000000000..27aa587f5ec5
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/PixelReadoutManager.h
@@ -0,0 +1,53 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef PIXELREADOUTMANAGER_H
+#define PIXELREADOUTMANAGER_H
+
+#include <AthenaBaseComps/AthService.h>
+#include <PixelReadoutGeometry/IPixelReadoutManager.h>
+
+
+class PixelID;
+
+namespace InDetDD
+{
+class PixelDetectorManager;
+
+class PixelReadoutManager final : public extends<AthService, IPixelReadoutManager>
+{
+public:
+ PixelReadoutManager(const std::string &name,
+ ISvcLocator *svc);
+
+ virtual StatusCode initialize() override final;
+
+ virtual PixelModuleType getModuleType(Identifier id) const override final;
+ virtual PixelDiodeType getDiodeType(Identifier id) const override final;
+
+ virtual Identifier getPixelIdfromHash(IdentifierHash offlineIdHash,
+ uint32_t FE,
+ uint32_t row,
+ uint32_t column) const override final;
+ virtual Identifier getPixelId(Identifier offlineId,
+ uint32_t FE,
+ uint32_t row,
+ uint32_t column) const override final;
+
+ virtual uint32_t getFE(Identifier diodeId,
+ Identifier offlineId) const override final;
+ virtual uint32_t getColumn(Identifier diodeId,
+ Identifier offlineId) const override final;
+ virtual uint32_t getRow(Identifier diodeId,
+ Identifier offlineId) const override final;
+
+private:
+ ServiceHandle<StoreGateSvc> m_detStore{this, "DetectorStore", "DetectorStore"};
+ const PixelDetectorManager *m_detManager{};
+ const PixelID *m_idHelper{};
+};
+
+}
+
+#endif
diff --git a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/components/PixelReadoutGeometry_entries.cxx b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/components/PixelReadoutGeometry_entries.cxx
new file mode 100644
index 000000000000..498152f33798
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/components/PixelReadoutGeometry_entries.cxx
@@ -0,0 +1,5 @@
+#include "../PixelReadoutManager.h"
+#include "../ITkPixelReadoutManager.h"
+
+DECLARE_COMPONENT( InDetDD::PixelReadoutManager )
+DECLARE_COMPONENT( InDetDD::ITkPixelReadoutManager )
diff --git a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/test/ITkPixelReadoutManager_test.cxx b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/test/ITkPixelReadoutManager_test.cxx
new file mode 100644
index 000000000000..0933201803ec
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/test/ITkPixelReadoutManager_test.cxx
@@ -0,0 +1,281 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+ * @author Tadej Novak
+ * @brief Tests for ITkPixelReadoutManager.
+ */
+
+#undef NDEBUG
+
+// Otherwise we get warnings about mutable members in gmock.
+#include "CxxUtils/checker_macros.h"
+ATLAS_NO_CHECK_FILE_THREAD_SAFETY;
+
+// Tested service
+#include "../src/ITkPixelReadoutManager.h"
+
+#include "GaudiKernel/MsgStream.h"
+
+// Framework includes
+#include "AthenaBaseComps/AthService.h"
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "GaudiKernel/IAppMgrUI.h"
+#include "GaudiKernel/SmartIF.h"
+#include "GaudiKernel/SystemOfUnits.h"
+#include "GaudiKernel/PhysicalConstants.h"
+
+// Pixel includes
+#include "InDetReadoutGeometry/SiDetectorElement.h"
+#include "PixelReadoutGeometry/PixelModuleDesign.h"
+#include "PixelReadoutGeometry/PixelDetectorManager.h"
+
+// Google Test
+#include "gtest/gtest.h"
+// Google Mock
+#include "gmock/gmock.h"
+
+
+namespace InDetDD
+{
+namespace PixelTesting
+{
+
+ class ITkPixelReadoutManager_test : public ::testing::Test {
+
+ protected:
+ virtual void SetUp() override {
+ // Gaudi
+ m_appMgr = Gaudi::createApplicationMgr();
+ ASSERT_TRUE( m_appMgr!=nullptr );
+
+ m_svcLoc = m_appMgr;
+ ASSERT_TRUE( m_svcLoc.isValid() );
+
+ m_svcMgr = m_appMgr;
+ ASSERT_TRUE( m_svcMgr.isValid() );
+
+ m_propMgr = m_appMgr;
+ ASSERT_TRUE( m_propMgr.isValid() );
+ ASSERT_TRUE( m_propMgr->setProperty( "EvtSel", "NONE" ).isSuccess() );
+ ASSERT_TRUE( m_propMgr->setProperty( "JobOptionsType", "FILE" ).isSuccess() );
+ ASSERT_TRUE( m_propMgr->setProperty( "JobOptionsPath", "ITkPixelReadoutManager_test.txt" ).isSuccess() );
+
+ m_toolSvc = m_svcLoc->service("ToolSvc");
+ ASSERT_TRUE( m_toolSvc.isValid() );
+
+ ASSERT_TRUE( m_appMgr->configure().isSuccess() );
+ ASSERT_TRUE( m_appMgr->initialize().isSuccess() );
+
+ // the tested AthenaService
+ const auto& svcTypeAndName = "InDetDD::ITkPixelReadoutManager/ITkPixelReadoutManager";
+ SmartIF<IService> svc = m_svcLoc->service(svcTypeAndName);
+ m_svc = dynamic_cast<ITkPixelReadoutManager *>(svc.get());
+ ASSERT_NE(nullptr, m_svc);
+
+ ASSERT_TRUE( m_svc->configure().isSuccess() );
+ }
+
+ virtual void TearDown() override {
+ ASSERT_TRUE( m_svcMgr->removeService(m_svc).isSuccess() );
+ ASSERT_TRUE( m_svc->finalize().isSuccess() );
+ ASSERT_TRUE( m_svc->terminate().isSuccess() );
+ ReleaseSmartIFComponent(m_svc);
+
+ ASSERT_TRUE( m_svcMgr->finalize().isSuccess() );
+ ASSERT_TRUE( m_appMgr->finalize().isSuccess() );
+ ASSERT_TRUE( m_appMgr->terminate().isSuccess() );
+ m_svcLoc->release();
+ m_svcMgr->release();
+ Gaudi::setInstance( static_cast<IAppMgrUI*>(nullptr) );
+ }
+
+ void ReleaseSmartIFComponent(IInterface* comp) {
+ size_t finalRefCount = 1; // keep one reference for the SmartIF destructor
+ for (size_t refCount = comp->refCount(); refCount>finalRefCount; refCount--) {
+ comp->release();
+ }
+ }
+
+ // the tested service
+ ITkPixelReadoutManager* m_svc{};
+
+ // Core Gaudi components
+ IAppMgrUI* m_appMgr{};
+ SmartIF<ISvcLocator> m_svcLoc;
+ SmartIF<ISvcManager> m_svcMgr;
+ SmartIF<IToolSvc> m_toolSvc;
+ SmartIF<IProperty> m_propMgr;
+ }; // ITkPixelReadoutManager_test fixture
+
+
+ // TEST_F(ITkPixelReadoutManager_test, initialize_empty) {
+ // ASSERT_TRUE( m_svc->initialize().isSuccess() );
+ // }
+
+ TEST_F(ITkPixelReadoutManager_test, barrel) {
+ ASSERT_TRUE( m_svc->initialize().isSuccess() );
+
+ ServiceHandle<StoreGateSvc> detectorStore("DetectorStore", "ITkPixelReadoutManager_test");
+
+ const InDetDD::PixelDetectorManager *detManager{};
+ ASSERT_TRUE( detectorStore->retrieve(detManager, "ITkPixel").isSuccess() );
+ const PixelID *pixelID{};
+ ASSERT_TRUE( detectorStore->retrieve(pixelID, "PixelID").isSuccess() );
+
+ // barrel, layer 2
+ Identifier moduleId = pixelID->wafer_id(0, 2, 0, 1);
+
+ const InDetDD::SiDetectorElement *element = detManager->getDetectorElement(moduleId);
+ const InDetDD::PixelModuleDesign *p_design = static_cast<const InDetDD::PixelModuleDesign*>(&element->design());
+ std::cerr << p_design->debugStringRepr() << std::endl;
+
+ ASSERT_EQ( m_svc->getModuleType(moduleId), PixelModuleType::PIX_BARREL );
+
+ std::cerr << p_design->rows() << " " << p_design->columns() << " "
+ << p_design->rowsPerCircuit() << " " << p_design->columnsPerCircuit() << " "
+ << p_design->numberOfCircuits() << std::endl;
+
+ Identifier edge1 = element->identifierFromCellId(InDetDD::SiCellId(0, 0));
+ Identifier edge2 = element->identifierFromCellId(InDetDD::SiCellId(0, p_design->columns() - 1));
+ Identifier edge3 = element->identifierFromCellId(InDetDD::SiCellId(p_design->rows() - 1, 0));
+ Identifier edge4 = element->identifierFromCellId(InDetDD::SiCellId(p_design->rows() - 1, p_design->columns() - 1));
+ Identifier center1 = element->identifierFromCellId(InDetDD::SiCellId(p_design->rowsPerCircuit() - 1, p_design->columnsPerCircuit() - 1));
+ Identifier center2 = element->identifierFromCellId(InDetDD::SiCellId(p_design->rowsPerCircuit(), p_design->columnsPerCircuit() - 1));
+ Identifier center3 = element->identifierFromCellId(InDetDD::SiCellId(p_design->rowsPerCircuit() - 1, p_design->columnsPerCircuit()));
+ Identifier center4 = element->identifierFromCellId(InDetDD::SiCellId(p_design->rowsPerCircuit(), p_design->columnsPerCircuit()));
+ Identifier close1 = element->identifierFromCellId(InDetDD::SiCellId(p_design->rowsPerCircuit() - 3, p_design->columnsPerCircuit() - 1));
+ Identifier close2 = element->identifierFromCellId(InDetDD::SiCellId(p_design->rowsPerCircuit() - 1, p_design->columnsPerCircuit() - 3));
+ Identifier close3 = element->identifierFromCellId(InDetDD::SiCellId(p_design->rowsPerCircuit(), p_design->columnsPerCircuit() + 2));
+ Identifier close4 = element->identifierFromCellId(InDetDD::SiCellId(p_design->rowsPerCircuit() + 2, p_design->columnsPerCircuit()));
+
+ ASSERT_EQ( m_svc->getRow(edge1, moduleId), 0 );
+ ASSERT_EQ( m_svc->getRow(edge2, moduleId), 0 );
+ ASSERT_EQ( m_svc->getRow(edge3, moduleId), 0 );
+ ASSERT_EQ( m_svc->getRow(edge4, moduleId), 0 );
+ ASSERT_EQ( m_svc->getRow(center1, moduleId), p_design->rowsPerCircuit() - 1 );
+ ASSERT_EQ( m_svc->getRow(center2, moduleId), p_design->rowsPerCircuit() - 1 );
+ ASSERT_EQ( m_svc->getRow(center3, moduleId), p_design->rowsPerCircuit() - 1 );
+ ASSERT_EQ( m_svc->getRow(center4, moduleId), p_design->rowsPerCircuit() - 1 );
+ ASSERT_EQ( m_svc->getRow(close1, moduleId), p_design->rowsPerCircuit() - 3 );
+ ASSERT_EQ( m_svc->getRow(close2, moduleId), p_design->rowsPerCircuit() - 1 );
+ ASSERT_EQ( m_svc->getRow(close3, moduleId), p_design->rowsPerCircuit() - 1 );
+ ASSERT_EQ( m_svc->getRow(close4, moduleId), p_design->rowsPerCircuit() - 3 );
+
+ ASSERT_EQ( m_svc->getColumn(edge1, moduleId), 0 );
+ ASSERT_EQ( m_svc->getColumn(edge2, moduleId), 0 );
+ ASSERT_EQ( m_svc->getColumn(edge3, moduleId), 0 );
+ ASSERT_EQ( m_svc->getColumn(edge4, moduleId), 0 );
+ ASSERT_EQ( m_svc->getColumn(center1, moduleId), p_design->columnsPerCircuit() - 1 );
+ ASSERT_EQ( m_svc->getColumn(center2, moduleId), p_design->columnsPerCircuit() - 1 );
+ ASSERT_EQ( m_svc->getColumn(center3, moduleId), p_design->columnsPerCircuit() - 1 );
+ ASSERT_EQ( m_svc->getColumn(center4, moduleId), p_design->columnsPerCircuit() - 1 );
+ ASSERT_EQ( m_svc->getColumn(close1, moduleId), p_design->columnsPerCircuit() - 1 );
+ ASSERT_EQ( m_svc->getColumn(close2, moduleId), p_design->columnsPerCircuit() - 3 );
+ ASSERT_EQ( m_svc->getColumn(close3, moduleId), p_design->columnsPerCircuit() - 3 );
+ ASSERT_EQ( m_svc->getColumn(close4, moduleId), p_design->columnsPerCircuit() - 1 );
+
+ ASSERT_EQ( m_svc->getDiodeType(edge1), PixelDiodeType::NORMAL );
+ ASSERT_EQ( m_svc->getDiodeType(edge2), PixelDiodeType::NORMAL );
+ ASSERT_EQ( m_svc->getDiodeType(edge3), PixelDiodeType::NORMAL );
+ ASSERT_EQ( m_svc->getDiodeType(edge4), PixelDiodeType::NORMAL );
+ ASSERT_EQ( m_svc->getDiodeType(center1), PixelDiodeType::LARGE );
+ ASSERT_EQ( m_svc->getDiodeType(center2), PixelDiodeType::LARGE );
+ ASSERT_EQ( m_svc->getDiodeType(center3), PixelDiodeType::LARGE );
+ ASSERT_EQ( m_svc->getDiodeType(center4), PixelDiodeType::LARGE );
+ ASSERT_EQ( m_svc->getDiodeType(close1), PixelDiodeType::LONG );
+ ASSERT_EQ( m_svc->getDiodeType(close2), PixelDiodeType::LONG );
+ ASSERT_EQ( m_svc->getDiodeType(close3), PixelDiodeType::LONG );
+ ASSERT_EQ( m_svc->getDiodeType(close4), PixelDiodeType::LONG );
+
+ ASSERT_EQ( m_svc->getFE(edge1, moduleId), 0 );
+ ASSERT_EQ( m_svc->getFE(edge2, moduleId), 1 );
+ ASSERT_EQ( m_svc->getFE(edge3, moduleId), 2 );
+ ASSERT_EQ( m_svc->getFE(edge4, moduleId), 3 );
+ ASSERT_EQ( m_svc->getFE(center1, moduleId), 0 );
+ ASSERT_EQ( m_svc->getFE(center2, moduleId), 2 );
+ ASSERT_EQ( m_svc->getFE(center3, moduleId), 1 );
+ ASSERT_EQ( m_svc->getFE(center4, moduleId), 3 );
+ ASSERT_EQ( m_svc->getFE(close1, moduleId), 0 );
+ ASSERT_EQ( m_svc->getFE(close2, moduleId), 0 );
+ ASSERT_EQ( m_svc->getFE(close3, moduleId), 3 );
+ ASSERT_EQ( m_svc->getFE(close4, moduleId), 3 );
+
+ ASSERT_EQ( m_svc->getPixelId(moduleId, 0, 0, 0), edge1 );
+ ASSERT_EQ( m_svc->getPixelId(moduleId, 1, 0, 0), edge2 );
+ ASSERT_EQ( m_svc->getPixelId(moduleId, 2, 0, 0), edge3 );
+ ASSERT_EQ( m_svc->getPixelId(moduleId, 3, 0, 0), edge4 );
+ ASSERT_EQ( m_svc->getPixelId(moduleId, 0, p_design->rowsPerCircuit() - 1, p_design->columnsPerCircuit() - 1), center1 );
+ ASSERT_EQ( m_svc->getPixelId(moduleId, 2, p_design->rowsPerCircuit() - 1, p_design->columnsPerCircuit() - 1), center2 );
+ ASSERT_EQ( m_svc->getPixelId(moduleId, 1, p_design->rowsPerCircuit() - 1, p_design->columnsPerCircuit() - 1), center3 );
+ ASSERT_EQ( m_svc->getPixelId(moduleId, 3, p_design->rowsPerCircuit() - 1, p_design->columnsPerCircuit() - 1), center4 );
+ ASSERT_EQ( m_svc->getPixelId(moduleId, 0, p_design->rowsPerCircuit() - 3, p_design->columnsPerCircuit() - 1), close1 );
+ ASSERT_EQ( m_svc->getPixelId(moduleId, 0, p_design->rowsPerCircuit() - 1, p_design->columnsPerCircuit() - 3), close2 );
+ ASSERT_EQ( m_svc->getPixelId(moduleId, 3, p_design->rowsPerCircuit() - 1, p_design->columnsPerCircuit() - 3), close3 );
+ ASSERT_EQ( m_svc->getPixelId(moduleId, 3, p_design->rowsPerCircuit() - 3, p_design->columnsPerCircuit() - 1), close4 );
+
+ // barrel, layer 0
+ moduleId = pixelID->wafer_id(0, 0, 0, 1);
+
+ const InDetDD::SiDetectorElement *elementS = detManager->getDetectorElement(moduleId);
+ const InDetDD::PixelModuleDesign *p_designS = static_cast<const InDetDD::PixelModuleDesign*>(&elementS->design());
+ std::cerr << p_designS->debugStringRepr() << std::endl;
+
+ ASSERT_EQ( m_svc->getModuleType(moduleId), PixelModuleType::PIX_BARREL );
+
+ std::cerr << p_designS->rows() << " " << p_designS->columns() << " "
+ << p_designS->rowsPerCircuit() << " " << p_designS->columnsPerCircuit() << " "
+ << p_designS->numberOfCircuits() << std::endl;
+
+ Identifier edge1s = elementS->identifierFromCellId(InDetDD::SiCellId(0, 0));
+ Identifier edge2s = elementS->identifierFromCellId(InDetDD::SiCellId(0, p_designS->columns() - 1));
+ Identifier edge3s = elementS->identifierFromCellId(InDetDD::SiCellId(p_designS->rows() - 1, 0));
+ Identifier edge4s = elementS->identifierFromCellId(InDetDD::SiCellId(p_designS->rows() - 1, p_designS->columns() - 1));
+ Identifier centers = elementS->identifierFromCellId(InDetDD::SiCellId(p_designS->rows() / 2, p_designS->columns() / 2));
+
+ ASSERT_EQ( m_svc->getRow(edge1s, moduleId), 0 );
+ ASSERT_EQ( m_svc->getRow(edge2s, moduleId), 0 );
+ ASSERT_EQ( m_svc->getRow(edge3s, moduleId), p_designS->rows() - 1 );
+ ASSERT_EQ( m_svc->getRow(edge4s, moduleId), p_designS->rows() - 1 );
+ ASSERT_EQ( m_svc->getRow(centers, moduleId), p_designS->rows() / 2);
+
+ ASSERT_EQ( m_svc->getColumn(edge1s, moduleId), 0 );
+ ASSERT_EQ( m_svc->getColumn(edge2s, moduleId), p_designS->columns() - 1 );
+ ASSERT_EQ( m_svc->getColumn(edge3s, moduleId), 0 );
+ ASSERT_EQ( m_svc->getColumn(edge4s, moduleId), p_designS->columns() - 1 );
+ ASSERT_EQ( m_svc->getColumn(centers, moduleId), p_designS->columns() / 2 );
+
+ ASSERT_EQ( m_svc->getDiodeType(edge1s), PixelDiodeType::NORMAL );
+ ASSERT_EQ( m_svc->getDiodeType(edge2s), PixelDiodeType::NORMAL );
+ ASSERT_EQ( m_svc->getDiodeType(edge3s), PixelDiodeType::NORMAL );
+ ASSERT_EQ( m_svc->getDiodeType(edge4s), PixelDiodeType::NORMAL );
+ ASSERT_EQ( m_svc->getDiodeType(centers), PixelDiodeType::NORMAL );
+
+ ASSERT_EQ( m_svc->getFE(edge1s, moduleId), 0 );
+ ASSERT_EQ( m_svc->getFE(edge2s, moduleId), 0 );
+ ASSERT_EQ( m_svc->getFE(edge3s, moduleId), 0 );
+ ASSERT_EQ( m_svc->getFE(edge4s, moduleId), 0 );
+ ASSERT_EQ( m_svc->getFE(centers, moduleId), 0 );
+
+ ASSERT_EQ( m_svc->getPixelId(moduleId, 0, 0, 0), edge1s );
+ ASSERT_EQ( m_svc->getPixelId(moduleId, 0, 0, p_designS->columns() - 1), edge2s );
+ ASSERT_EQ( m_svc->getPixelId(moduleId, 0, p_designS->rows() - 1, 0), edge3s );
+ ASSERT_EQ( m_svc->getPixelId(moduleId, 0, p_designS->rows() - 1, p_designS->columns() - 1), edge4s );
+ ASSERT_EQ( m_svc->getPixelId(moduleId, 0, p_designS->rows() / 2, p_designS->columns() / 2), centers );
+ }
+
+} // namespace PixelTesting
+} // namespace InDetDD
+
+
+int main(int argc, char *argv[])
+{
+ ::testing::InitGoogleTest( &argc, argv );
+
+ //return RUN_ALL_TESTS();
+ // if the above gets stuck forever while trying to finalize Boost stuff
+ // inside SGTools, try to use the following:
+ // skips proper finalization:
+ std::quick_exit( RUN_ALL_TESTS() );
+}
diff --git a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/test/ITkPixelReadoutManager_test.txt b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/test/ITkPixelReadoutManager_test.txt
new file mode 100644
index 000000000000..86e95c4e7505
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/test/ITkPixelReadoutManager_test.txt
@@ -0,0 +1,12 @@
+ApplicationMgr.ExtSvc += { "StoreGateSvc/DetectorStore", "DetDescrCnvSvc/DetDescrCnvSvc", "GeoModelSvc/GeoModelSvc" };
+
+DetDescrCnvSvc.IdDictName = "IdDictParser/ATLAS_IDS.xml";
+DetDescrCnvSvc.IdDictFromRDB = True;
+
+EventPersistencySvc.CnvServices += { "DetDescrCnvSvc" };
+
+GeoModelSvc.AtlasVersion = "ATLAS-P2-ITK-24-00-00";
+GeoModelSvc.SupportedGeometry = 22;
+GeoModelSvc.DetectorTools = ["ITkPixelDetectorTool/ITkPixelDetectorTool"];
+GeoModelSvc.ITkPixelDetectorTool.Alignable = False;
+GeoModelSvc.ITkPixelDetectorTool.DetectorName = "ITkPixel";
diff --git a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/test/PixelReadoutGeometryConfig_test.py b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/test/PixelReadoutGeometryConfig_test.py
new file mode 100755
index 000000000000..6eabff9fba6c
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/test/PixelReadoutGeometryConfig_test.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
+from AthenaConfiguration.TestDefaults import defaultTestFiles
+from AthenaCommon.Logging import log
+from AthenaCommon.Constants import DEBUG
+from AthenaCommon.Configurable import Configurable
+from PixelReadoutGeometry.PixelReadoutGeometryConfig import PixelReadoutManagerCfg, ITkPixelReadoutManagerCfg
+
+# test setup
+log.setLevel(DEBUG)
+Configurable.configurableRun3Behavior = True
+ConfigFlags.Input.Files = defaultTestFiles.HITS
+# test
+PixelReadoutManagerAcc = PixelReadoutManagerCfg(ConfigFlags, name="PixelReadoutManagerTest")
+# prevent raise on __del__
+PixelReadoutManagerAcc.wasMerged()
+
+# test ITk
+ITkPixelReadoutManagerAcc = ITkPixelReadoutManagerCfg(ConfigFlags, name="ITkPixelReadoutManagerTest")
+# prevent raise on __del__
+ITkPixelReadoutManagerAcc.wasMerged()
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/CMakeLists.txt b/InnerDetector/InDetDigitization/FastSiDigitization/CMakeLists.txt
index 6f09772626e5..c66985d9d564 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/CMakeLists.txt
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/CMakeLists.txt
@@ -12,7 +12,7 @@ atlas_add_component( FastSiDigitization
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps AthenaKernel PileUpToolsLib EventPrimitives xAODEventInfo GaudiKernel GeoPrimitives InDetReadoutGeometry PixelCablingLib PixelConditionsData ReadoutGeometryBase PixelReadoutGeometry SCT_ReadoutGeometry InDetCondTools InDetSimData InDetPrepRawData SiClusterizationToolLib InDetSimEvent HitManagement TrkTruthData StoreGateLib Identifier GeneratorObjects InDetIdentifier TrkDetDescrInterfaces TrkDigEvent TrkDigInterfaces TrkSurfaces TrkExUtils )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps AthenaKernel PileUpToolsLib EventPrimitives xAODEventInfo GaudiKernel GeoPrimitives InDetReadoutGeometry PixelConditionsData ReadoutGeometryBase PixelReadoutGeometryLib SCT_ReadoutGeometry InDetCondTools InDetSimData InDetPrepRawData SiClusterizationToolLib InDetSimEvent HitManagement TrkTruthData StoreGateLib Identifier GeneratorObjects InDetIdentifier TrkDetDescrInterfaces TrkDigEvent TrkDigInterfaces TrkSurfaces TrkExUtils )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/PixelFastDigitizationTool.h b/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/PixelFastDigitizationTool.h
index 33a31ba5cbf5..6558f077cf51 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/PixelFastDigitizationTool.h
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/PixelFastDigitizationTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -23,9 +23,9 @@
#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
#include "SiClusterizationTool/ClusterMakerTool.h"
#include "PileUpTools/PileUpMergeSvc.h"
-#include "PixelCabling/IPixelCablingSvc.h"
#include "PixelConditionsData/PixelChargeCalibCondData.h"
#include "PixelConditionsData/PixelDistortionData.h"
+#include "PixelReadoutGeometry/IPixelReadoutManager.h"
#include "StoreGate/ReadCondHandleKey.h"
//New digi
@@ -138,8 +138,8 @@ private:
bool m_acceptDiagonalClusters; //!< merging parameter used to define two clusters as neighbour >
std::string m_pixelClusterAmbiguitiesMapName;
InDet::PixelGangedClusterAmbiguities* m_ambiguitiesMap;
- ServiceHandle<IPixelCablingSvc> m_pixelCabling
- {this, "PixelCablingSvc", "PixelCablingSvc", "Pixel cabling service" };
+ ServiceHandle<InDetDD::IPixelReadoutManager> m_pixelReadout
+ {this, "PixelReadoutManager", "PixelReadoutManager", "Pixel readout manager" };
SG::ReadCondHandleKey<PixelChargeCalibCondData> m_chargeDataKey
{this, "PixelChargeCalibCondData", "PixelChargeCalibCondData", "Pixel charge calibration data"};
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/src/PixelFastDigitizationTool.cxx b/InnerDetector/InDetDigitization/FastSiDigitization/src/PixelFastDigitizationTool.cxx
index c295e24a4ed0..c1597d76d8f4 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/src/PixelFastDigitizationTool.cxx
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/src/PixelFastDigitizationTool.cxx
@@ -148,7 +148,7 @@ StatusCode PixelFastDigitizationTool::initialize()
ATH_MSG_DEBUG ( "PixelDigitizationTool::initialize()" );
- ATH_CHECK(m_pixelCabling.retrieve());
+ ATH_CHECK(m_pixelReadout.retrieve());
ATH_CHECK(m_chargeDataKey.initialize());
ATH_CHECK(m_pixelDetEleCollKey.initialize());
@@ -583,8 +583,8 @@ StatusCode PixelFastDigitizationTool::digitize(const EventContext& ctx)
double pixMinimalPathCut= 1. / m_pixPathLengthTotConv;
Identifier diodeID = hitId;
- int circ = m_pixelCabling->getFE(&diodeID,moduleID);
- int type = m_pixelCabling->getPixelType(diodeID);
+ int circ = m_pixelReadout->getFE(diodeID,moduleID);
+ InDetDD::PixelDiodeType type = m_pixelReadout->getDiodeType(diodeID);
double th0 = calibData->getAnalogThreshold((int)waferHash,circ,type)/m_ThrConverted;
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/CMakeLists.txt b/InnerDetector/InDetDigitization/PixelDigitization/CMakeLists.txt
index 6cdb88bc9b6e..e7005f3b0ec2 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/CMakeLists.txt
+++ b/InnerDetector/InDetDigitization/PixelDigitization/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( PixelDigitization )
@@ -12,7 +12,7 @@ atlas_add_component( PixelDigitization
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps GaudiKernel AthenaKernel PileUpToolsLib StoreGateLib GeneratorObjects PixelConditionsData SiPropertiesToolLib InDetIdentifier ReadoutGeometryBase InDetReadoutGeometry PixelReadoutGeometry SiDigitization InDetCondTools InDetRawData InDetSimData InDetSimEvent HitManagement PathResolver PixelCablingLib InDetConditionsSummaryService )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps GaudiKernel AthenaKernel PileUpToolsLib StoreGateLib GeneratorObjects PixelConditionsData SiPropertiesToolLib InDetIdentifier ReadoutGeometryBase InDetReadoutGeometry PixelReadoutGeometryLib SiDigitization InDetCondTools InDetRawData InDetSimData InDetSimEvent HitManagement PathResolver InDetConditionsSummaryService )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/python/ITkPixelDigitizationConfig.py b/InnerDetector/InDetDigitization/PixelDigitization/python/ITkPixelDigitizationConfig.py
index 8735f9c99d4d..cb44c6682f02 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/python/ITkPixelDigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/PixelDigitization/python/ITkPixelDigitizationConfig.py
@@ -9,13 +9,13 @@ from Digitization.PileUpMergeSvcConfigNew import PileUpMergeSvcCfg, PileUpXingFo
from Digitization.PileUpToolsConfig import PileUpToolsCfg
from Digitization.TruthDigitizationOutputConfig import TruthDigitizationOutputCfg
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
-from PixelCabling.PixelCablingConfigNew import ITkPixelCablingSvcCfg
from PixelConditionsAlgorithms.ITkPixelConditionsConfig import (
ITkPixelConfigCondAlgCfg, ITkPixelChargeCalibCondAlgCfg,
ITkPixelDistortionAlgCfg
)
from PixelConditionsTools.ITkPixelConditionsSummaryConfig import ITkPixelConditionsSummaryCfg
from PixelGeoModelXml.ITkPixelGeoModelConfig import ITkPixelGeometryCfg
+from PixelReadoutGeometry.PixelReadoutGeometryConfig import ITkPixelReadoutManagerCfg
from SiLorentzAngleTool.ITkPixelLorentzAngleConfig import ITkPixelLorentzAngleCfg
from SiPropertiesTool.ITkPixelSiPropertiesConfig import ITkPixelSiPropertiesCfg
@@ -51,12 +51,12 @@ def ITkEnergyDepositionToolCfg(flags, name="ITkEnergyDepositionTool", **kwargs):
def BarrelRD53SimToolCfg(flags, name="BarrelRD53SimTool", **kwargs):
"""Return a RD53SimTool configured for Barrel"""
- acc = ITkPixelCablingSvcCfg(flags)
+ acc = ITkPixelReadoutManagerCfg(flags)
acc.merge(ITkPixelConfigCondAlgCfg(flags))
acc.merge(ITkPixelChargeCalibCondAlgCfg(flags))
kwargs.setdefault("BarrelEC", 0)
kwargs.setdefault("DoNoise", flags.Digitization.DoInnerDetectorNoise)
- kwargs.setdefault("PixelCablingSvc", acc.getPrimary())
+ kwargs.setdefault("PixelReadoutManager", acc.getPrimary())
kwargs.setdefault("PixelModuleData", "ITkPixelModuleData")
kwargs.setdefault("PixelChargeCalibCondData", "ITkPixelChargeCalibCondData")
kwargs.setdefault("PixelConditionsSummaryTool", acc.popToolsAndMerge(ITkPixelConditionsSummaryCfg(flags)))
@@ -67,12 +67,12 @@ def BarrelRD53SimToolCfg(flags, name="BarrelRD53SimTool", **kwargs):
def EndcapRD53SimToolCfg(flags, name="EndcapRD53SimTool", **kwargs):
"""Return a RD53SimTool configured for Endcap"""
- acc = ITkPixelCablingSvcCfg(flags)
+ acc = ITkPixelReadoutManagerCfg(flags)
acc.merge(ITkPixelConfigCondAlgCfg(flags))
acc.merge(ITkPixelChargeCalibCondAlgCfg(flags))
kwargs.setdefault("BarrelEC", 2)
kwargs.setdefault("DoNoise", flags.Digitization.DoInnerDetectorNoise)
- kwargs.setdefault("PixelCablingSvc", acc.getPrimary())
+ kwargs.setdefault("PixelReadoutManager", acc.getPrimary())
kwargs.setdefault("PixelModuleData", "ITkPixelModuleData")
kwargs.setdefault("PixelChargeCalibCondData", "ITkPixelChargeCalibCondData")
kwargs.setdefault("PixelConditionsSummaryTool", acc.popToolsAndMerge(ITkPixelConditionsSummaryCfg(flags)))
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
index 5c6d27285db0..eefff474b203 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
@@ -522,10 +522,10 @@ def BasicPixelDigitizationTool(name="PixelDigitizationTool", **kwargs):
#####################
# Setup Cabling Svc #
#####################
- from PixelCabling.PixelCablingConf import PixelCablingSvc
- PixelCablingSvc = PixelCablingSvc()
- ServiceMgr += PixelCablingSvc
- print ( PixelCablingSvc)
+ from PixelReadoutGeometry.PixelReadoutGeometryConf import InDetDD__PixelReadoutManager
+ PixelReadoutManager = InDetDD__PixelReadoutManager()
+ ServiceMgr += PixelReadoutManager
+ print (PixelReadoutManager)
kwargs.setdefault("InputObjectName", "PixelHits")
chargeTools = []
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py
index c435566b790b..7c29770aa80d 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py
+++ b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py
@@ -9,7 +9,6 @@ from Digitization.PileUpMergeSvcConfigNew import PileUpMergeSvcCfg, PileUpXingFo
from Digitization.PileUpToolsConfig import PileUpToolsCfg
from Digitization.TruthDigitizationOutputConfig import TruthDigitizationOutputCfg
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
-from PixelCabling.PixelCablingConfigNew import PixelCablingSvcCfg
from PixelConditionsAlgorithms.PixelConditionsConfig import (
PixelConfigCondAlgCfg, PixelChargeCalibCondAlgCfg,
PixelDistortionAlgCfg, PixelRadSimFluenceMapAlgCfg,
@@ -17,6 +16,7 @@ from PixelConditionsAlgorithms.PixelConditionsConfig import (
)
from PixelConditionsTools.PixelConditionsSummaryConfig import PixelConditionsSummaryCfg
from PixelGeoModel.PixelGeoModelConfig import PixelGeometryCfg
+from PixelReadoutGeometry.PixelReadoutGeometryConfig import PixelReadoutManagerCfg
from SiLorentzAngleTool.PixelLorentzAngleConfig import PixelLorentzAngleCfg
from SiPropertiesTool.PixelSiPropertiesConfig import PixelSiPropertiesCfg
@@ -105,7 +105,7 @@ def SensorSim3DToolCfg(flags, name="SensorSim3DTool", **kwargs):
def BarrelFEI4SimToolCfg(flags, name="BarrelFEI4SimTool", **kwargs):
"""Return a FEI4SimTool configured for Barrel"""
- acc = PixelCablingSvcCfg(flags)
+ acc = PixelReadoutManagerCfg(flags)
acc.merge(PixelConfigCondAlgCfg(flags))
if flags.GeoModel.Run=="RUN3":
acc.merge(PixelChargeLUTCalibCondAlgCfg(flags))
@@ -113,7 +113,7 @@ def BarrelFEI4SimToolCfg(flags, name="BarrelFEI4SimTool", **kwargs):
acc.merge(PixelChargeCalibCondAlgCfg(flags))
kwargs.setdefault("BarrelEC", 0)
kwargs.setdefault("DoNoise", flags.Digitization.DoInnerDetectorNoise)
- kwargs.setdefault("PixelCablingSvc", acc.getPrimary())
+ kwargs.setdefault("PixelReadoutManager", acc.getPrimary())
kwargs.setdefault("PixelConditionsSummaryTool", acc.popToolsAndMerge(PixelConditionsSummaryCfg(flags)))
FEI4SimTool = CompFactory.FEI4SimTool
acc.setPrivateTools(FEI4SimTool(name, **kwargs))
@@ -122,7 +122,7 @@ def BarrelFEI4SimToolCfg(flags, name="BarrelFEI4SimTool", **kwargs):
def DBMFEI4SimToolCfg(flags, name="DBMFEI4SimTool", **kwargs):
"""Return a FEI4SimTool configured for Endcap"""
- acc = PixelCablingSvcCfg(flags)
+ acc = PixelReadoutManagerCfg(flags)
acc.merge(PixelConfigCondAlgCfg(flags))
if flags.GeoModel.Run=="RUN3":
acc.merge(PixelChargeLUTCalibCondAlgCfg(flags))
@@ -130,7 +130,7 @@ def DBMFEI4SimToolCfg(flags, name="DBMFEI4SimTool", **kwargs):
acc.merge(PixelChargeCalibCondAlgCfg(flags))
kwargs.setdefault("BarrelEC", 4)
kwargs.setdefault("DoNoise", flags.Digitization.DoInnerDetectorNoise)
- kwargs.setdefault("PixelCablingSvc", acc.getPrimary())
+ kwargs.setdefault("PixelReadoutManager", acc.getPrimary())
kwargs.setdefault("PixelConditionsSummaryTool", acc.popToolsAndMerge(PixelConditionsSummaryCfg(flags)))
FEI4SimTool = CompFactory.FEI4SimTool
acc.setPrivateTools(FEI4SimTool(name, **kwargs))
@@ -139,14 +139,14 @@ def DBMFEI4SimToolCfg(flags, name="DBMFEI4SimTool", **kwargs):
def BarrelFEI3SimToolCfg(flags, name="BarrelFEI3SimTool", **kwargs):
"""Return a FEI3SimTool configured for Barrel"""
- acc = PixelCablingSvcCfg(flags)
+ acc = PixelReadoutManagerCfg(flags)
acc.merge(PixelConfigCondAlgCfg(flags))
if flags.GeoModel.Run=="RUN3":
acc.merge(PixelChargeLUTCalibCondAlgCfg(flags))
else:
acc.merge(PixelChargeCalibCondAlgCfg(flags))
kwargs.setdefault("BarrelEC", 0)
- kwargs.setdefault("PixelCablingSvc", acc.getPrimary())
+ kwargs.setdefault("PixelReadoutManager", acc.getPrimary())
kwargs.setdefault("PixelConditionsSummaryTool", acc.popToolsAndMerge(PixelConditionsSummaryCfg(flags)))
FEI3SimTool = CompFactory.FEI3SimTool
acc.setPrivateTools(FEI3SimTool(name, **kwargs))
@@ -155,14 +155,14 @@ def BarrelFEI3SimToolCfg(flags, name="BarrelFEI3SimTool", **kwargs):
def EndcapFEI3SimToolCfg(flags, name="EndcapFEI3SimTool", **kwargs):
"""Return a FEI3SimTool configured for Endcap"""
- acc = PixelCablingSvcCfg(flags)
+ acc = PixelReadoutManagerCfg(flags)
acc.merge(PixelConfigCondAlgCfg(flags))
if flags.GeoModel.Run=="RUN3":
acc.merge(PixelChargeLUTCalibCondAlgCfg(flags))
else:
acc.merge(PixelChargeCalibCondAlgCfg(flags))
kwargs.setdefault("BarrelEC", 2)
- kwargs.setdefault("PixelCablingSvc", acc.getPrimary())
+ kwargs.setdefault("PixelReadoutManager", acc.getPrimary())
kwargs.setdefault("PixelConditionsSummaryTool", acc.popToolsAndMerge(PixelConditionsSummaryCfg(flags)))
FEI3SimTool = CompFactory.FEI3SimTool
acc.setPrivateTools(FEI3SimTool(name, **kwargs))
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/FEI3SimTool.cxx b/InnerDetector/InDetDigitization/PixelDigitization/src/FEI3SimTool.cxx
index 1e083cd6c688..6a262f6a4489 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/FEI3SimTool.cxx
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/FEI3SimTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "FEI3SimTool.h"
@@ -27,7 +27,7 @@ void FEI3SimTool::process(SiChargedDiodeCollection& chargedDiodes, PixelRDO_Coll
const InDetDD::PixelModuleDesign* p_design =
static_cast<const InDetDD::PixelModuleDesign*>(&(chargedDiodes.element())->design());
- if (p_design->getReadoutTechnology() != InDetDD::PixelModuleDesign::FEI3) {
+ if (p_design->getReadoutTechnology() != InDetDD::PixelReadoutTechnology::FEI3) {
return;
}
@@ -99,8 +99,8 @@ void FEI3SimTool::process(SiChargedDiodeCollection& chargedDiodes, PixelRDO_Coll
Identifier diodeID = chargedDiodes.getId(diode.diode());
double charge = diode.charge();
- int circ = m_pixelCabling->getFE(&diodeID, moduleID);
- int type = m_pixelCabling->getPixelType(diodeID);
+ int circ = m_pixelReadout->getFE(diodeID, moduleID);
+ InDetDD::PixelDiodeType type = m_pixelReadout->getDiodeType(diodeID);
// Apply analog threshold, timing simulation
double th0 = calibData->getAnalogThreshold((int) moduleHash, circ, type);
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/FEI4SimTool.cxx b/InnerDetector/InDetDigitization/PixelDigitization/src/FEI4SimTool.cxx
index 37234a5c5225..1cc63919f226 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/FEI4SimTool.cxx
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/FEI4SimTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "FEI4SimTool.h"
@@ -27,7 +27,7 @@ void FEI4SimTool::process(SiChargedDiodeCollection& chargedDiodes, PixelRDO_Coll
const InDetDD::PixelModuleDesign* p_design =
static_cast<const InDetDD::PixelModuleDesign*>(&(chargedDiodes.element())->design());
- if (p_design->getReadoutTechnology() != InDetDD::PixelModuleDesign::FEI4) {
+ if (p_design->getReadoutTechnology() != InDetDD::PixelReadoutTechnology::FEI4) {
return;
}
@@ -88,8 +88,8 @@ void FEI4SimTool::process(SiChargedDiodeCollection& chargedDiodes, PixelRDO_Coll
}
charge *= moduleData->getFEI4ChargScaling();
- int circ = m_pixelCabling->getFE(&diodeID, moduleID);
- int type = m_pixelCabling->getPixelType(diodeID);
+ int circ = m_pixelReadout->getFE(diodeID, moduleID);
+ InDetDD::PixelDiodeType type = m_pixelReadout->getDiodeType(diodeID);
// Apply analog threshold, timing simulation
double th0 = calibData->getAnalogThreshold((int) moduleHash, circ, type);
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/FrontEndSimTool.h b/InnerDetector/InDetDigitization/PixelDigitization/src/FrontEndSimTool.h
index f6a0ea67a08c..52826fbe6af0 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/FrontEndSimTool.h
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/FrontEndSimTool.h
@@ -17,11 +17,11 @@
#include "SiDigitization/SiChargedDiodeCollection.h"
#include "InDetRawData/InDetRawDataCLASS_DEF.h"
-#include "PixelCabling/IPixelCablingSvc.h"
#include "InDetConditionsSummaryService/IInDetConditionsTool.h"
#include "InDetSimEvent/SiTotalCharge.h"
#include "SiDigitization/SiHelper.h"
+#include "PixelReadoutGeometry/IPixelReadoutManager.h"
#include "PixelReadoutGeometry/PixelModuleDesign.h"
#include "ReadoutGeometryBase/SiCellId.h"
@@ -44,7 +44,7 @@ public:
virtual StatusCode initialize() {
ATH_CHECK(m_pixelConditionsTool.retrieve());
- ATH_CHECK(m_pixelCabling.retrieve());
+ ATH_CHECK(m_pixelReadout.retrieve());
ATH_CHECK(m_moduleDataKey.initialize());
ATH_CHECK(m_chargeDataKey.initialize());
return StatusCode::SUCCESS;
@@ -120,7 +120,7 @@ public:
int circuit = CLHEP::RandFlat::shootInt(rndmEngine, p_design->numberOfCircuits());
int column = CLHEP::RandFlat::shootInt(rndmEngine, p_design->columnsPerCircuit());
int row = CLHEP::RandFlat::shootInt(rndmEngine, p_design->rowsPerCircuit());
- if (row > 159 && p_design->getReadoutTechnology() == InDetDD::PixelModuleDesign::FEI3) {
+ if (row > 159 && p_design->getReadoutTechnology() == InDetDD::PixelReadoutTechnology::FEI3) {
row += 8;
} // jump over ganged pixels - rowsPerCircuit == 320 above
@@ -142,7 +142,7 @@ public:
double noiseToTm = bin + 1.5;
double noiseToT = CLHEP::RandGaussZiggurat::shoot(rndmEngine, noiseToTm, 1.);
- int type = m_pixelCabling->getPixelType(noisyID);
+ InDetDD::PixelDiodeType type = m_pixelReadout->getDiodeType(noisyID);
double chargeShape = calibData->getCharge((int) moduleHash, circuit, type, noiseToT);
chargedDiodes.add(diodeNoise, SiCharge(chargeShape, 0, SiCharge::noise));
@@ -173,9 +173,9 @@ protected:
this, "PixelConditionsSummaryTool", "PixelConditionsSummaryTool", "Tool to retrieve Pixel Conditions summary"
};
- ServiceHandle<IPixelCablingSvc> m_pixelCabling
+ ServiceHandle<InDetDD::IPixelReadoutManager> m_pixelReadout
{
- this, "PixelCablingSvc", "PixelCablingSvc", "Pixel cabling service"
+ this, "PixelReadoutManager", "PixelReadoutManager", "Pixel readout manager"
};
SG::ReadCondHandleKey<PixelModuleData> m_moduleDataKey
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/RD53SimTool.cxx b/InnerDetector/InDetDigitization/PixelDigitization/src/RD53SimTool.cxx
index 292bd07e590f..a50b3ddca055 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/RD53SimTool.cxx
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/RD53SimTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "RD53SimTool.h"
@@ -34,7 +34,7 @@ void RD53SimTool::process(SiChargedDiodeCollection& chargedDiodes, PixelRDO_Coll
const InDetDD::PixelModuleDesign* p_design =
static_cast<const InDetDD::PixelModuleDesign*>(&(chargedDiodes.element())->design());
- if (p_design->getReadoutTechnology() != InDetDD::PixelModuleDesign::RD53) {
+ if (p_design->getReadoutTechnology() != InDetDD::PixelReadoutTechnology::RD53) {
return;
}
@@ -81,8 +81,8 @@ void RD53SimTool::process(SiChargedDiodeCollection& chargedDiodes, PixelRDO_Coll
Identifier diodeID = chargedDiodes.getId((*i_chargedDiode).first);
double charge = (*i_chargedDiode).second.charge();
- int circ = m_pixelCabling->getFE(&diodeID, moduleID);
- int type = m_pixelCabling->getPixelType(diodeID);
+ int circ = m_pixelReadout->getFE(diodeID, moduleID);
+ InDetDD::PixelDiodeType type = m_pixelReadout->getDiodeType(diodeID);
// Apply analogu threshold, timing simulation
double th0 = calibData->getAnalogThreshold((int) moduleHash, circ, type);
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSim3DTool.cxx b/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSim3DTool.cxx
index f05b3af96706..cb1b540c3b40 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSim3DTool.cxx
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSim3DTool.cxx
@@ -72,14 +72,14 @@ StatusCode SensorSim3DTool::induceCharge(const TimedHitPtr<SiHit>& phit,
CLHEP::HepRandomEngine* rndmEngine,
const EventContext &ctx) {
// TODO: check that detectors other than ITk have this properly set
- if (p_design.getReadoutTechnology() == InDetDD::PixelModuleDesign::RD53) {
+ if (p_design.getReadoutTechnology() == InDetDD::PixelReadoutTechnology::RD53) {
// disable for now!
return StatusCode::SUCCESS;
} else {
if (!Module.isBarrel()) {
return StatusCode::SUCCESS;
}
- if (p_design.getReadoutTechnology() != InDetDD::PixelModuleDesign::FEI4) {
+ if (p_design.getReadoutTechnology() != InDetDD::PixelReadoutTechnology::FEI4) {
return StatusCode::SUCCESS;
}
if (p_design.numberOfCircuits() > 1) {
@@ -573,7 +573,7 @@ StatusCode SensorSim3DTool::induceCharge(const TimedHitPtr<SiHit>& phit,
// -- retrieve the charge collection probability from Svc
// -- swap x and y bins to match Map coord convention
- double ccprob_neighbor = getProbMapEntry(SensorType::FEI4, y_bin_cc_map, x_bin_cc_map);
+ double ccprob_neighbor = getProbMapEntry(InDetDD::PixelReadoutTechnology::FEI4, y_bin_cc_map, x_bin_cc_map);
if (ccprob_neighbor == -1.) return StatusCode::FAILURE;
double ed = es_current * eleholePairEnergy * ccprob_neighbor;
@@ -657,13 +657,13 @@ StatusCode SensorSim3DTool::printProbMap(const std::string& readout) const {
}
// -- Returns the Charge Collection Probability at a given point (bin_x,bin_y)
-double SensorSim3DTool::getProbMapEntry(const SensorType& readout, int binx, int biny) const {
+double SensorSim3DTool::getProbMapEntry(const InDetDD::PixelReadoutTechnology &readout, int binx, int biny) const {
std::pair<int, int> doublekey(binx, biny);
double echarge;
- if (readout == SensorType::FEI4) {
+ if (readout == InDetDD::PixelReadoutTechnology::FEI4) {
std::multimap<std::pair<int, int>, double>::const_iterator iter = m_probMapFEI4.find(doublekey);
echarge = iter->second;
- } else if (readout == SensorType::FEI3) {
+ } else if (readout == InDetDD::PixelReadoutTechnology::FEI3) {
std::multimap<std::pair<int, int>, double>::const_iterator iter = m_probMapFEI3.find(doublekey);
echarge = iter->second;
} else {
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSim3DTool.h b/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSim3DTool.h
index b4d06d18aa5f..acfccaa5c22b 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSim3DTool.h
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSim3DTool.h
@@ -45,15 +45,9 @@ public:
std::vector<double> getDriftTime(bool isHoleBit, size_t number);
private:
-
- enum class SensorType {
- FEI4,
- FEI3
- };
-
SensorSim3DTool();
-
- double getProbMapEntry(const SensorType&, int, int) const;
+
+ double getProbMapEntry(const InDetDD::PixelReadoutTechnology &, int, int) const;
// 3D sensor simulation using probability density map (used in RUN-2 (no radiation damage)
std::multimap<std::pair<int, int>, double> m_probMapFEI4;
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSimPlanarTool.cxx b/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSimPlanarTool.cxx
index 3e44fbafe360..f0b645d6cc1d 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSimPlanarTool.cxx
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/SensorSimPlanarTool.cxx
@@ -197,7 +197,7 @@ StatusCode SensorSimPlanarTool::induceCharge(const TimedHitPtr<SiHit>& phit,
std::vector<double>& initialConditions,
CLHEP::HepRandomEngine* rndmEngine,
const EventContext &ctx) {
- if (p_design.getReadoutTechnology() == InDetDD::PixelModuleDesign::RD53) {
+ if (p_design.getReadoutTechnology() == InDetDD::PixelReadoutTechnology::RD53) {
// TODO: check that detectors other than ITk have this properly set
// if (p_design.is3D()) {
// return StatusCode::SUCCESS;
@@ -393,7 +393,7 @@ StatusCode SensorSimPlanarTool::induceCharge(const TimedHitPtr<SiHit>& phit,
// Slim Edge for IBL planar sensors:
- if (p_design.getReadoutTechnology() == InDetDD::PixelModuleDesign::FEI4) {
+ if (p_design.getReadoutTechnology() == InDetDD::PixelReadoutTechnology::FEI4) {
applyIBLSlimEdges(energy_per_step, eta_f_e);
applyIBLSlimEdges(energy_per_step, eta_f_h);
}
@@ -529,7 +529,7 @@ StatusCode SensorSimPlanarTool::induceCharge(const TimedHitPtr<SiHit>& phit,
double eta_drifted = eta_i + rdif * etaRand;
// Slim Edge for IBL planar sensors:
- if (!(Module.isDBM()) && p_design.getReadoutTechnology() == InDetDD::PixelModuleDesign::FEI4) {
+ if (!(Module.isDBM()) && p_design.getReadoutTechnology() == InDetDD::PixelReadoutTechnology::FEI4) {
applyIBLSlimEdges(energy_per_step, eta_drifted);
}
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/CMakeLists.txt b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/CMakeLists.txt
index 58a058251786..57460194c56a 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/CMakeLists.txt
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetPrepRawDataToxAOD )
@@ -12,7 +12,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 Identifier PixelConditionsData xAODTracking TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry TRT_ReadoutGeometry InDetCondTools InDetConditionsSummaryService InDetRawData InDetSimData InDetPrepRawData InDetSimEvent TrkSurfaces TrkTruthData TrkEventUtils TRT_DriftFunctionToolLib PixelCablingLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib GaudiKernel AthenaBaseComps StoreGateLib Identifier PixelConditionsData xAODTracking TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry PixelReadoutGeometryLib TRT_ReadoutGeometry InDetCondTools InDetConditionsSummaryService InDetRawData InDetSimData InDetPrepRawData InDetSimEvent TrkSurfaces TrkTruthData TrkEventUtils TRT_DriftFunctionToolLib )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/PixelPrepDataToxAOD.cxx b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/PixelPrepDataToxAOD.cxx
index 3165a83ef360..e186b68f22e4 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/PixelPrepDataToxAOD.cxx
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/PixelPrepDataToxAOD.cxx
@@ -90,7 +90,7 @@ StatusCode PixelPrepDataToxAOD::initialize()
m_writeSiHits = false;
}
- ATH_CHECK(m_pixelCabling.retrieve());
+ ATH_CHECK(m_pixelReadout.retrieve());
ATH_CHECK(m_chargeDataKey.initialize( m_writeRDOinformation));
ATH_CHECK(m_condDCSStateKey.initialize());
@@ -713,8 +713,8 @@ void PixelPrepDataToxAOD::addRdoInformation(xAOD::TrackMeasurementValidation* xp
// charge calibration parameters
Identifier moduleID = m_PixelHelper->wafer_id(rId);
IdentifierHash moduleHash = m_PixelHelper->wafer_hash(moduleID); // wafer hash
- int circ = m_pixelCabling->getFE(&rId,moduleID);
- int type = m_pixelCabling->getPixelType(rId);
+ int circ = m_pixelReadout->getFE(rId, moduleID);
+ InDetDD::PixelDiodeType type = m_pixelReadout->getDiodeType(rId);
CTerm.push_back(calibData->getQ2TotC((int)moduleHash, circ, type));
ATerm.push_back(calibData->getQ2TotA((int)moduleHash, circ, type));
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/PixelPrepDataToxAOD.h b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/PixelPrepDataToxAOD.h
index 2b3d2e60a064..d7d4a0bedbd6 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/PixelPrepDataToxAOD.h
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/PixelPrepDataToxAOD.h
@@ -31,10 +31,10 @@
#include "PixelConditionsData/PixelDCSHVData.h"
#include "PixelConditionsData/PixelDCSTempData.h"
#include "PixelConditionsData/PixelChargeCalibCondData.h"
+#include "PixelReadoutGeometry/IPixelReadoutManager.h"
#include "InDetCondTools/ISiLorentzAngleTool.h"
#include "InDetConditionsSummaryService/IInDetConditionsTool.h"
-#include "PixelCabling/IPixelCablingSvc.h"
#include "StoreGate/ReadCondHandleKey.h"
#include "TrkEventUtils/ClusterSplitProbabilityContainer.h"
@@ -116,8 +116,8 @@ private:
bool m_writeRDOinformation;
bool m_useSiHitsGeometryMatching;
- ServiceHandle<IPixelCablingSvc> m_pixelCabling
- {this, "PixelCablingSvc", "PixelCablingSvc", "Pixel cabling service"};
+ ServiceHandle<InDetDD::IPixelReadoutManager> m_pixelReadout
+ {this, "PixelReadoutManager", "PixelReadoutManager", "Pixel readout manager" };
SG::ReadCondHandleKey<PixelChargeCalibCondData> m_chargeDataKey
{this, "PixelChargeCalibCondData", "PixelChargeCalibCondData", "Pixel charge calibration data"};
diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/CMakeLists.txt b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/CMakeLists.txt
index 7a11aa710dab..309171f95625 100644
--- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/CMakeLists.txt
+++ b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( PixelRawDataByteStreamCnv )
@@ -18,7 +18,7 @@ atlas_add_component( PixelRawDataByteStreamCnv
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ByteStreamData AthenaKernel EventContainers
GaudiKernel InDetRawData AthenaBaseComps AthContainers CxxUtils StoreGateLib
- ByteStreamCnvSvcBaseLib InDetIdentifier PixelReadoutGeometry IRegionSelector
- xAODEventInfo TrigSteeringEvent InDetByteStreamErrors PixelConditionsData PixelRawDataByteStreamCnvLib PixelCablingLib ByteStreamCnvSvcLib )
+ ByteStreamCnvSvcBaseLib InDetIdentifier PixelReadoutGeometryLib IRegionSelector
+ xAODEventInfo TrigSteeringEvent InDetByteStreamErrors PixelConditionsData PixelRawDataByteStreamCnvLib ByteStreamCnvSvcLib )
- atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
\ No newline at end of file
+ atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawContByteStreamTool.cxx b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawContByteStreamTool.cxx
index c58301be40cc..5d7d8f95404f 100644
--- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawContByteStreamTool.cxx
+++ b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawContByteStreamTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -21,8 +21,7 @@
// constructor
////////////////////////
PixelRawContByteStreamTool::PixelRawContByteStreamTool(const std::string& type,const std::string& name,const IInterface* parent) :
- AthAlgTool(type,name,parent),
- m_pixelCabling("PixelCablingSvc", name)
+ AthAlgTool(type,name,parent)
{
declareInterface<PixelRawContByteStreamTool>(this);
declareProperty("RodBlockVersion",m_RodBlockVersion=0);
@@ -40,7 +39,7 @@ PixelRawContByteStreamTool::~PixelRawContByteStreamTool() {
////////////////////////
StatusCode PixelRawContByteStreamTool::initialize() {
- ATH_CHECK(m_pixelCabling.retrieve());
+ ATH_CHECK(m_pixelReadout.retrieve());
ATH_CHECK(detStore()->retrieve(m_PixelID, "PixelID"));
@@ -148,7 +147,7 @@ void PixelRawContByteStreamTool::fillROD(std::vector<uint32_t>& v32rod, std::vec
// ordering of the elements of the RDOs vector by offlineId, n5
if (rdo_it != rdo_it_end) {
- OrderInitialRdos orderInitialRdos(m_pixelCabling, m_PixelID, pixCabling);
+ OrderInitialRdos orderInitialRdos(m_pixelReadout, m_PixelID, pixCabling);
std::sort(rdo_it, rdo_it_end, orderInitialRdos);
}
// end of ordering of the elements of the RDOs vector by offlineId, n5
@@ -188,10 +187,10 @@ void PixelRawContByteStreamTool::fillROD(std::vector<uint32_t>& v32rod, std::vec
int LVL1ID = rawdata->getLVL1ID();
int LVL1A = rawdata->getLVL1A();
- if (m_pixelCabling->getModuleType(offlineId)==IPixelCablingSvc::IBL_PLANAR || m_pixelCabling->getModuleType(offlineId)==IPixelCablingSvc::IBL_3D) {
+ if (m_pixelReadout->getModuleType(offlineId) == InDetDD::PixelModuleType::IBL_PLANAR || m_pixelReadout->getModuleType(offlineId) == InDetDD::PixelModuleType::IBL_3D) {
is_ibl_module = true;
}
- if (m_pixelCabling->getModuleType(offlineId)==IPixelCablingSvc::DBM) {
+ if (m_pixelReadout->getModuleType(offlineId) == InDetDD::PixelModuleType::DBM) {
is_dbm_module = true;
}
@@ -254,9 +253,9 @@ void PixelRawContByteStreamTool::fillROD(std::vector<uint32_t>& v32rod, std::vec
//--------------------------------------------------------------------------------------
//- Write RawDataWord
//--------------------------------------------------------------------------------------
- FE = m_pixelCabling->getFE(&pixelId,offlineId);
- uint32_t row = m_pixelCabling->getRow(&pixelId,offlineId);
- uint32_t column = m_pixelCabling->getColumn(&pixelId,offlineId);
+ FE = m_pixelReadout->getFE(pixelId, offlineId);
+ uint32_t row = m_pixelReadout->getRow(pixelId, offlineId);
+ uint32_t column = m_pixelReadout->getColumn(pixelId, offlineId);
v32rod.push_back(packRawDataWord(FE, row, column, TOT));
// The following was used for running a validation scrip and making validation plots
@@ -287,7 +286,7 @@ void PixelRawContByteStreamTool::fillROD(std::vector<uint32_t>& v32rod, std::vec
ATH_MSG_DEBUG("Inside the IBL/DBM case of the PixelRodEncoder");
uint32_t linkNum = (onlineId>>24) & 0xFFFF;
- unsigned int localFE = m_pixelCabling->getFE(&pixelId, m_PixelID->wafer_id(pixelId));
+ unsigned int localFE = m_pixelReadout->getFE(pixelId, m_PixelID->wafer_id(pixelId));
FE = (linkNum>>(localFE*8)) & 0xF;
sLink = onlineId & 0xF; // extract the LSB 4 bits from the onlineId
@@ -301,10 +300,10 @@ void PixelRawContByteStreamTool::fillROD(std::vector<uint32_t>& v32rod, std::vec
if (!pixHitDiscCnfg) {
pixHitDiscCnfg = std::make_unique<SG::ReadCondHandle<PixelHitDiscCnfgData> >(m_condHitDiscCnfgKey);
}
- if (m_pixelCabling->getModuleType(offlineId)==IPixelCablingSvc::IBL_PLANAR || m_pixelCabling->getModuleType(offlineId)==IPixelCablingSvc::DBM) {
+ if (m_pixelReadout->getModuleType(offlineId) == InDetDD::PixelModuleType::IBL_PLANAR || m_pixelReadout->getModuleType(offlineId) == InDetDD::PixelModuleType::DBM) {
hitDiscCnfg = (*pixHitDiscCnfg)->getHitDiscCnfgPL();
}
- else if (m_pixelCabling->getModuleType(offlineId)==IPixelCablingSvc::IBL_3D) {
+ else if (m_pixelReadout->getModuleType(offlineId) == InDetDD::PixelModuleType::IBL_3D) {
hitDiscCnfg = (*pixHitDiscCnfg)->getHitDiscCnfg3D();
}
@@ -364,15 +363,15 @@ void PixelRawContByteStreamTool::fillROD(std::vector<uint32_t>& v32rod, std::vec
std::vector<const PixelRDORawData*> rdos_sameIBL_offlineId; // vector containing all the rdos with the same offlineId => belonging to the same IBL FE-I4 chip
// This loop fills the rdo_sameIBL_offlineId vector with all the RDOs that have the same offlineId and same FEw.r.t.SLink => all RDOs coming from the same FE
- for (; (rdo_it!=rdo_it_end) && ((((m_pixelCabling->getModuleType((*rdo_it)->identify())==IPixelCablingSvc::IBL_PLANAR)
- || (m_pixelCabling->getModuleType((*rdo_it)->identify())==IPixelCablingSvc::IBL_3D)) && is_ibl_module)
- || (m_pixelCabling->getModuleType((*rdo_it)->identify())==IPixelCablingSvc::DBM && is_dbm_module)); ++rdo_it) {
+ for (; (rdo_it!=rdo_it_end) && ((((m_pixelReadout->getModuleType((*rdo_it)->identify())==InDetDD::PixelModuleType::IBL_PLANAR)
+ || (m_pixelReadout->getModuleType((*rdo_it)->identify())==InDetDD::PixelModuleType::IBL_3D)) && is_ibl_module)
+ || (m_pixelReadout->getModuleType((*rdo_it)->identify())==InDetDD::PixelModuleType::DBM && is_dbm_module)); ++rdo_it) {
Identifier pixelId_probe = (*rdo_it)->identify();
Identifier offlineId_probe = m_PixelID->wafer_id(pixelId_probe);
uint32_t linkNum = (onlineId>>24) & 0xFFFF;
- unsigned int localFE = m_pixelCabling->getFE(&pixelId_probe, offlineId_probe);
+ unsigned int localFE = m_pixelReadout->getFE(pixelId_probe, offlineId_probe);
uint32_t fe_probe = (linkNum>>(localFE*8)) & 0xF;
@@ -395,8 +394,8 @@ void PixelRawContByteStreamTool::fillROD(std::vector<uint32_t>& v32rod, std::vec
//check: list of all the rdos with same offlineId, listing also the column, the row and the Tot
for (; rdo_same_it != rdo_same_it_end; ++rdo_same_it) {
Identifier pixelId_probe = (*rdo_same_it)->identify();
- uint32_t col = m_pixelCabling->getColumn(&pixelId_probe, offlineId); // offlineId of rdos in rdos_sameIBL_offlineId vector are, of course, all equal
- uint32_t row = m_pixelCabling->getRow(&pixelId_probe, offlineId);
+ uint32_t col = m_pixelReadout->getColumn(pixelId_probe, offlineId); // offlineId of rdos in rdos_sameIBL_offlineId vector are, of course, all equal
+ uint32_t row = m_pixelReadout->getRow(pixelId_probe, offlineId);
int tot = (*rdo_same_it)->getToT();
ATH_MSG_DEBUG("col: " << col << " (0x" << std::hex << col << std::dec << ")\trow: "<< row << " (0x" << std::hex << row << std::dec << ")\ttot: " << tot << "(0x" <<std::hex << tot << std::dec << ")");
}
@@ -406,7 +405,7 @@ void PixelRawContByteStreamTool::fillROD(std::vector<uint32_t>& v32rod, std::vec
#endif
// Order the RDOs within the vector rdos_sameIBL_offlineId, following the ordering rules of orderRdos
- OrderRdos orderRdos(offlineId,m_pixelCabling);
+ OrderRdos orderRdos(offlineId, m_pixelReadout);
std::sort(rdo_same_it, rdo_same_it_end, orderRdos);
//check:
@@ -417,8 +416,8 @@ void PixelRawContByteStreamTool::fillROD(std::vector<uint32_t>& v32rod, std::vec
ATH_MSG_DEBUG("Re-ordered RDOs with Same offlineId:");
for (; rdo_same_it != rdo_same_it_end; ++rdo_same_it) {
Identifier pixelId_probe = (*rdo_same_it)->identify();
- uint32_t col = m_pixelCabling->getColumn(&pixelId_probe, offlineId);
- uint32_t row = m_pixelCabling->getRow(&pixelId_probe, offlineId);
+ uint32_t col = m_pixelReadout->getColumn(pixelId_probe, offlineId);
+ uint32_t row = m_pixelReadout->getRow(pixelId_probe, offlineId);
int tot = (*rdo_same_it)->getToT();
int eta_i = m_PixelID->eta_index(pixelId_probe);
int phi_i = m_PixelID->phi_index(pixelId_probe);
@@ -434,8 +433,8 @@ void PixelRawContByteStreamTool::fillROD(std::vector<uint32_t>& v32rod, std::vec
rdo_same_it_end = rdos_sameIBL_offlineId.end();
for (; rdo_same_it != rdo_same_it_end; ++rdo_same_it) {
Identifier pixelId_probe = (*rdo_same_it)->identify();
- uint32_t col = m_pixelCabling->getColumn(&pixelId_probe, offlineId);
- uint32_t row = m_pixelCabling->getRow(&pixelId_probe, offlineId);
+ uint32_t col = m_pixelReadout->getColumn(pixelId_probe, offlineId);
+ uint32_t row = m_pixelReadout->getRow(pixelId_probe, offlineId);
int tot = (*rdo_same_it)->getToT();
int eta_i = m_PixelID->eta_index(pixelId_probe);
int phi_i = m_PixelID->phi_index(pixelId_probe);
@@ -468,8 +467,8 @@ void PixelRawContByteStreamTool::fillROD(std::vector<uint32_t>& v32rod, std::vec
for (; rdo_same_it!=rdo_same_it_end; ++rdo_same_it) {
doubleHit = false;
Identifier pixelId_probe = (*rdo_same_it)->identify();
- uint32_t col0 = m_pixelCabling->getColumn(&pixelId_probe, offlineId);
- uint32_t row0 = m_pixelCabling->getRow(&pixelId_probe, offlineId);
+ uint32_t col0 = m_pixelReadout->getColumn(pixelId_probe, offlineId);
+ uint32_t row0 = m_pixelReadout->getRow(pixelId_probe, offlineId);
int totInHitWord (0);
#ifdef PLOTS
std::cout << "[VAL] " << std::hex << pixelId_probe << " 0x" << robId << " 0x" << onlineId // << " " << offlineId
@@ -484,8 +483,8 @@ void PixelRawContByteStreamTool::fillROD(std::vector<uint32_t>& v32rod, std::vec
if ((rdo_same_it+1)!=rdo_same_it_end) {
rdo_test_it = rdo_same_it + 1;
Identifier pixelId_probe = (*rdo_test_it)->identify();
- uint32_t col1 = m_pixelCabling->getColumn(&pixelId_probe, offlineId);
- uint32_t row1 = m_pixelCabling->getRow(&pixelId_probe, offlineId);
+ uint32_t col1 = m_pixelReadout->getColumn(pixelId_probe, offlineId);
+ uint32_t row1 = m_pixelReadout->getRow(pixelId_probe, offlineId);
#ifdef PLOTS
std::cout << "[VAL] " << std::hex << pixelId_probe << " 0x" << robId << " 0x" << onlineId // << " " << offlineId
<< std::dec << " " << m_PixelID->eta_module(pixelId_probe) << " " << m_PixelID->phi_module(pixelId_probe)
@@ -751,11 +750,11 @@ bool OrderRdos::operator () (const PixelRDORawData* rdo0, const PixelRDORawData*
// const uint32_t halfCols = 40; // this is the number of the FE-I4 columns / 2, because the two tokens in the FE-I4 run from the double column 0 to 19, and then from 39 to 20.
// This corresponds to column 1 to 40, and 79-80, 77-78, ... to 41-42.
Identifier pixelId0 = rdo0->identify();
- uint32_t col0 = m_pixelCabling->getColumn(&pixelId0, m_offlineId);
- uint32_t row0 = m_pixelCabling->getRow(&pixelId0, m_offlineId);
+ uint32_t col0 = m_pixelReadout->getColumn(pixelId0, m_offlineId);
+ uint32_t row0 = m_pixelReadout->getRow(pixelId0, m_offlineId);
Identifier pixelId1 = rdo1->identify();
- uint32_t col1 = m_pixelCabling->getColumn(&pixelId1, m_offlineId);
- uint32_t row1 = m_pixelCabling->getRow(&pixelId1, m_offlineId);
+ uint32_t col1 = m_pixelReadout->getColumn(pixelId1, m_offlineId);
+ uint32_t row1 = m_pixelReadout->getRow(pixelId1, m_offlineId);
// Decide if (col0, row0) should be inserted in front of (col1, row1):
@@ -792,25 +791,25 @@ bool OrderInitialRdos::operator() (const PixelRDORawData* rdo0, const PixelRDORa
return true;
}
if (offlineId0 == offlineId1) {
- if ( m_pixelCabling->getModuleType(pixelId0)==IPixelCablingSvc::IBL_PLANAR
- || m_pixelCabling->getModuleType(pixelId0)==IPixelCablingSvc::IBL_3D
- || m_pixelCabling->getModuleType(pixelId0)==IPixelCablingSvc::DBM) { // IBL and DBM
+ if ( m_pixelReadout->getModuleType(pixelId0) == InDetDD::PixelModuleType::IBL_PLANAR
+ || m_pixelReadout->getModuleType(pixelId0) == InDetDD::PixelModuleType::IBL_3D
+ || m_pixelReadout->getModuleType(pixelId0) == InDetDD::PixelModuleType::DBM) { // IBL and DBM
uint64_t onlineId0 = m_pixCabling->find_entry_offon(offlineId0);
uint32_t linkNum0 = (onlineId0>>24) & 0xFFFF;
- unsigned int localFE0 = m_pixelCabling->getFE(&pixelId0, offlineId0);
+ unsigned int localFE0 = m_pixelReadout->getFE(pixelId0, offlineId0);
uint32_t fe0= (linkNum0>>(localFE0*8)) & 0xF;
uint64_t onlineId1 = m_pixCabling->find_entry_offon(offlineId1);
uint32_t linkNum1 = (onlineId1>>24) & 0xFFFF;
- unsigned int localFE1 = m_pixelCabling->getFE(&pixelId1, offlineId1);
+ unsigned int localFE1 = m_pixelReadout->getFE(pixelId1, offlineId1);
uint32_t fe1= (linkNum1>>(localFE1*8)) & 0xF;
return (fe0 < fe1);
}
else { // PixelCase
- uint32_t fe0 = m_pixelCabling->getFE(&pixelId0, offlineId0);
- uint32_t fe1 = m_pixelCabling->getFE(&pixelId1, offlineId1);
+ uint32_t fe0 = m_pixelReadout->getFE(pixelId0, offlineId0);
+ uint32_t fe1 = m_pixelReadout->getFE(pixelId1, offlineId1);
return (fe0 < fe1);
// return false;
diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawContByteStreamTool.h b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawContByteStreamTool.h
index 775a62c725cb..522a0801de53 100644
--- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawContByteStreamTool.h
+++ b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawContByteStreamTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -32,12 +32,12 @@
#include "ByteStreamCnvSvc/ByteStreamCnvSvc.h"
#include "PixelByteStreamModuleMask.h"
-#include "PixelCabling/IPixelCablingSvc.h"
#include "InDetIdentifier/PixelID.h"
#include "ByteStreamCnvSvcBase/SrcIdMap.h"
#include "PixelConditionsData/PixelCablingCondData.h"
#include "PixelConditionsData/PixelHitDiscCnfgData.h"
+#include "PixelReadoutGeometry/IPixelReadoutManager.h"
#include "StoreGate/ReadCondHandleKey.h"
class PixelRawContByteStreamTool: public AthAlgTool {
@@ -71,7 +71,9 @@ class PixelRawContByteStreamTool: public AthAlgTool {
ServiceHandle<ByteStreamCnvSvc> m_byteStreamCnvSvc
{ this, "ByteStreamCnvSvc", "ByteStreamCnvSvc" };
- ServiceHandle<IPixelCablingSvc> m_pixelCabling;
+ ServiceHandle<InDetDD::IPixelReadoutManager> m_pixelReadout
+ { this, "PixelReadoutManager", "PixelReadoutManager", "Pixel readout manager" };
+
const PixelID* m_PixelID;
const InDetDD::PixelDetectorManager* m_pixelManager;
@@ -89,19 +91,19 @@ class PixelRawContByteStreamTool: public AthAlgTool {
class OrderRdos {
private:
- ServiceHandle<IPixelCablingSvc> m_pixelCabling;
+ ServiceHandle<InDetDD::IPixelReadoutManager> m_pixelReadout;
Identifier m_offlineId;
public:
- OrderRdos(Identifier offlineId, const ServiceHandle<IPixelCablingSvc>& pixelCabling):
- m_pixelCabling(pixelCabling),m_offlineId(offlineId) { }
+ OrderRdos(Identifier offlineId, const ServiceHandle<InDetDD::IPixelReadoutManager> &pixelReadout):
+ m_pixelReadout(pixelReadout), m_offlineId(offlineId) { }
// copy constructor
OrderRdos(const OrderRdos & orderFunct) = default;
// assignment operator
OrderRdos& operator= (const OrderRdos &other) {
- m_pixelCabling = other.m_pixelCabling;
+ m_pixelReadout = other.m_pixelReadout;
return *this;
}
@@ -111,13 +113,13 @@ class OrderRdos {
class OrderInitialRdos {
private:
- ServiceHandle<IPixelCablingSvc> m_pixelCabling;
+ ServiceHandle<InDetDD::IPixelReadoutManager> m_pixelReadout;
const PixelID * m_PixelID;
SG::ReadCondHandle<PixelCablingCondData> m_pixCabling;
public:
- OrderInitialRdos(const ServiceHandle<IPixelCablingSvc>& pixelCabling, const PixelID *pixelID, SG::ReadCondHandle<PixelCablingCondData> &pixCabling):
- m_pixelCabling(pixelCabling),m_PixelID(pixelID),m_pixCabling(pixCabling) { }
+ OrderInitialRdos(const ServiceHandle<InDetDD::IPixelReadoutManager> &pixelReadout, const PixelID *pixelID, SG::ReadCondHandle<PixelCablingCondData> &pixCabling):
+ m_pixelReadout(pixelReadout), m_PixelID(pixelID), m_pixCabling(pixCabling) { }
// copy constructor
OrderInitialRdos(const OrderInitialRdos & orderFunct) = default;
@@ -125,7 +127,7 @@ class OrderInitialRdos {
// assignment operator
// cppcheck-suppress operatorEqVarError
OrderInitialRdos& operator= (const OrderInitialRdos &other) {
- m_pixelCabling = other.m_pixelCabling;
+ m_pixelReadout = other.m_pixelReadout;
return *this;
}
diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRodDecoder.cxx b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRodDecoder.cxx
index 8a61ec623dfc..c436ee95d48f 100644
--- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRodDecoder.cxx
+++ b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRodDecoder.cxx
@@ -4,7 +4,6 @@
#include "PixelRodDecoder.h"
#include "CxxUtils/AthUnlikelyMacros.h"
-#include "PixelCabling/IPixelCablingSvc.h"
#include "InDetIdentifier/PixelID.h"
#include "PixelReadoutGeometry/PixelDetectorManager.h"
#include "ExtractCondensedIBLhits.h"
@@ -50,7 +49,6 @@ inline bool isDBM( uint32_t robId ) { return ((robId>>16) & 0xFF)==0x15; }
PixelRodDecoder::PixelRodDecoder
( const std::string& type, const std::string& name,const IInterface* parent )
: AthAlgTool(type,name,parent),
- m_pixelCabling("PixelCablingSvc",name),
m_is_ibl_present(false){
declareInterface< IPixelRodDecoder >( this );
}
@@ -66,7 +64,7 @@ PixelRodDecoder::~PixelRodDecoder() {
StatusCode PixelRodDecoder::initialize() {
ATH_MSG_INFO("PixelRodDecoder::initialize()");
- ATH_CHECK(m_pixelCabling.retrieve());
+ ATH_CHECK(m_pixelReadout.retrieve());
ATH_CHECK(detStore()->retrieve(m_pixel_id, "PixelID"));
const InDetDD::PixelDetectorManager* pixelManager;
ATH_CHECK(detStore()->retrieve(pixelManager, "Pixel"));
@@ -534,7 +532,7 @@ StatusCode PixelRodDecoder::fillCollection( const ROBFragment *robFrag, IPixelRD
}
// computing the FE number on the silicon wafer for IBL ( mFE is = 0 for IBL 3D and the lower-eta FE on the planar sensor,
// while is = 1 for the higher-eta FE on the planar sensor)
- mFE = m_pixelCabling->getLocalFEI4(fe_IBLheader, onlineId);
+ mFE = getLocalFEI4(fe_IBLheader, onlineId);
} // end of the if (isIBLModule || isDBMModule)
else { // Pixel Hit Case
@@ -620,7 +618,7 @@ StatusCode PixelRodDecoder::fillCollection( const ROBFragment *robFrag, IPixelRD
}
else {
if (((row[i] != 0) && (col[i] != 0) && (row[i] <= 336) && (col[i] <= 80)) || isDBMModule) { // FIXME : Hardcoded numbers. Should be ok as they are features of the FE-I4, but worth checking!
- pixelId = m_pixelCabling ->getPixelIdfromHash (offlineIdHash, mFE, row[i], col[i]);
+ pixelId = m_pixelReadout ->getPixelIdfromHash (offlineIdHash, mFE, row[i], col[i]);
#ifdef PIXEL_DEBUG
ATH_MSG_VERBOSE( "PixelId: " << pixelId );
@@ -646,10 +644,10 @@ StatusCode PixelRodDecoder::fillCollection( const ROBFragment *robFrag, IPixelRD
pixHitDiscCnfg = std::make_unique<SG::ReadCondHandle<PixelHitDiscCnfgData> > (m_condHitDiscCnfgKey);
}
// Get the hit discrimination configuration setting for this FE
- if (m_pixelCabling->getModuleType(pixelId)==IPixelCablingSvc::IBL_PLANAR || m_pixelCabling->getModuleType(pixelId)==IPixelCablingSvc::DBM) {
+ if (m_pixelReadout->getModuleType(pixelId) == InDetDD::PixelModuleType::IBL_PLANAR || m_pixelReadout->getModuleType(pixelId) == InDetDD::PixelModuleType::DBM) {
hitDiscCnfg = (*pixHitDiscCnfg)->getHitDiscCnfgPL();
}
- else if (m_pixelCabling->getModuleType(pixelId)==IPixelCablingSvc::IBL_3D) {
+ else if (m_pixelReadout->getModuleType(pixelId) == InDetDD::PixelModuleType::IBL_3D) {
hitDiscCnfg = (*pixHitDiscCnfg)->getHitDiscCnfg3D();
}
// Now do some interpreting of the ToT values
@@ -679,7 +677,7 @@ StatusCode PixelRodDecoder::fillCollection( const ROBFragment *robFrag, IPixelRD
continue;
}
else {
- pixelId = m_pixelCabling ->getPixelIdfromHash (offlineIdHash, mFE, row[i] + 1, col[i]);
+ pixelId = m_pixelReadout->getPixelIdfromHash (offlineIdHash, mFE, row[i] + 1, col[i]);
#ifdef PIXEL_DEBUG
int eta_i = m_pixel_id->eta_index(pixelId);
@@ -723,7 +721,7 @@ StatusCode PixelRodDecoder::fillCollection( const ROBFragment *robFrag, IPixelRD
} // end IBL/DBM words pushed into Collection
else { // it is a Pixel hit word to be saved into the Collection
- pixelId = m_pixelCabling->getPixelIdfromHash(offlineIdHash, mFE, mRow, mColumn);
+ pixelId = m_pixelReadout->getPixelIdfromHash(offlineIdHash, mFE, mRow, mColumn);
if (pixelId == invalidPixelId) {
ATH_MSG_DEBUG("In ROB = 0x" << std::hex << robId << ", link 0x" << mLink << ": Illegal pixelId - row = " << std::dec << mRow << ", col = " << mColumn << ", dataword = 0x" << std::hex << rawDataWord << std::dec);
m_numInvalidIdentifiers++;
@@ -1471,3 +1469,18 @@ void PixelRodDecoder::checkUnequalNumberOfHeaders( const unsigned int nFragments
generalwarning("[FE number] : [# headers] - " << errmsg);
}
+
+unsigned int PixelRodDecoder::getLocalFEI4(const uint32_t fe, const uint64_t onlineId) const
+{
+ unsigned int linknum40 = (onlineId>>24) & 0xFF;
+ unsigned int linknum80 = (onlineId>>32) & 0xFF;
+
+ if (fe == linknum40) {
+ return 0;
+ } else if (fe == linknum80) {
+ return 1;
+ } else {
+ ATH_MSG_ERROR("Error in retrieving local FE-I4 number: linknumber " << fe << " not found in onlineID " << std::hex << onlineId);
+ }
+ return 0xF;
+}
diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRodDecoder.h b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRodDecoder.h
index 944c749bf091..d82f1b810d87 100644
--- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRodDecoder.h
+++ b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRodDecoder.h
@@ -14,9 +14,9 @@
#include "PixelConditionsData/PixelCablingCondData.h"
#include "PixelConditionsData/PixelHitDiscCnfgData.h"
+#include "PixelReadoutGeometry/IPixelReadoutManager.h"
#include "StoreGate/ReadCondHandleKey.h"
-class IPixelCablingSvc;
class PixelID;
class PixelRodDecoder : virtual public IPixelRodDecoder, public AthAlgTool {
@@ -131,10 +131,11 @@ class PixelRodDecoder : virtual public IPixelRodDecoder, public AthAlgTool {
mutable std::atomic_uint m_numLinkMaskedByPPC{0};
mutable std::atomic_uint m_numLimitError{0};
- ServiceHandle<IPixelCablingSvc> m_pixelCabling;
-
const PixelID* m_pixel_id=nullptr;
+ ServiceHandle<InDetDD::IPixelReadoutManager> m_pixelReadout
+ {this, "PixelReadoutManager", "PixelReadoutManager", "Pixel readout manager" };
+
SG::ReadCondHandleKey<PixelCablingCondData> m_condCablingKey
{this, "PixelCablingCondData", "PixelCablingCondData", "Pixel cabling key"};
@@ -157,6 +158,9 @@ class PixelRodDecoder : virtual public IPixelRodDecoder, public AthAlgTool {
//!< if the check duplicated RDO flag is true, check that this RDO is unique (returns true if unique)
inline bool thisRdoIsUnique(const Identifier & pixelRdo, std::unordered_set<Identifier> & pixelRdosSeenSoFar) const;
+
+ //!< get local FEI4
+ unsigned int getLocalFEI4(const uint32_t fe, const uint64_t onlineId) const;
};
bool
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py
index 86f8b9566883..0424f787a133 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py
@@ -121,7 +121,7 @@ from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
from SiClusterizationTool.SiClusterizationToolConf import InDet__ClusterMakerTool
InDetClusterMakerTool = InDet__ClusterMakerTool(name = "InDetClusterMakerTool",
- PixelCablingSvc = None,
+ PixelReadoutManager = None,
PixelChargeCalibCondData = "",
PixelOfflineCalibData = '',
PixelLorentzAngleTool = None,
diff --git a/InnerDetector/InDetExample/InDetDetDescrExample/CMakeLists.txt b/InnerDetector/InDetExample/InDetDetDescrExample/CMakeLists.txt
index 5fd7635bbbec..72382e86e5b4 100644
--- a/InnerDetector/InDetExample/InDetDetDescrExample/CMakeLists.txt
+++ b/InnerDetector/InDetExample/InDetDetDescrExample/CMakeLists.txt
@@ -11,7 +11,7 @@ atlas_add_component( InDetDetDescrExample
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib GeoModelInterfaces GeoPrimitives Identifier GaudiKernel InDetCondTools InDetConditionsSummaryService InDetIdentifier ReadoutGeometryBase InDetReadoutGeometry PixelReadoutGeometry SCT_ReadoutGeometry TRT_ReadoutGeometry)
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib GeoModelInterfaces GeoPrimitives Identifier GaudiKernel InDetCondTools InDetConditionsSummaryService InDetIdentifier ReadoutGeometryBase InDetReadoutGeometry PixelReadoutGeometryLib SCT_ReadoutGeometry TRT_ReadoutGeometry)
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCabling.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCabling.py
index c9935b814c0a..9447d2b708a2 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCabling.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCabling.py
@@ -110,11 +110,11 @@ if DetFlags.detdescr.pixel_on() and not 'PixelCabling' in dir():
condSeq += alg
- from PixelCabling.PixelCablingConf import PixelCablingSvc
- PixelCablingSvc = PixelCablingSvc()
- ServiceMgr += PixelCablingSvc
+ from PixelReadoutGeometry.PixelReadoutGeometryConf import InDetDD__PixelReadoutManager
+ PixelReadoutManager = InDetDD__PixelReadoutManager()
+ ServiceMgr += PixelReadoutManager
if (InDetFlags.doPrintConfigurables()):
- printfunc (PixelCablingSvc)
+ printfunc (PixelReadoutManager)
#
# --- SCT cabling
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecPreProcessingSilicon.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecPreProcessingSilicon.py
index bbe4a79c2593..a7eb63b0b315 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecPreProcessingSilicon.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecPreProcessingSilicon.py
@@ -147,6 +147,11 @@ if InDetFlags.doPRDFormation():
#
# --- PixelClusterization algorithm
#
+ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+ if not hasattr(svcMgr, "PixelReadoutManager"):
+ from PixelReadoutGeometry.PixelReadoutGeometryConf import InDetDD__PixelReadoutManager
+ svcMgr += InDetDD__PixelReadoutManager("PixelReadoutManager")
+
from InDetPrepRawDataFormation.InDetPrepRawDataFormationConf import InDet__PixelClusterization
InDetPixelClusterization = InDet__PixelClusterization(name = "InDetPixelClusterization",
clusteringTool = InDetMergedPixelsTool,
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/jobOptions_StandaloneDBM_RAW.py b/InnerDetector/InDetExample/InDetRecExample/share/jobOptions_StandaloneDBM_RAW.py
index 5bdbf8993e25..715ca4d2e1b3 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/jobOptions_StandaloneDBM_RAW.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/jobOptions_StandaloneDBM_RAW.py
@@ -169,4 +169,3 @@ InDetFlags.doParticleCreation = True
include("InDetRecExample/InDetRec_all.py")
include("RecExCommon/BSRead_config.py")
include("IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py")
-include("PixelCabling/SelectPixelMap.py")
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/CMakeLists.txt b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/CMakeLists.txt
index b469d5252cfb..5705f2f8e9bb 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/CMakeLists.txt
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/CMakeLists.txt
@@ -16,7 +16,7 @@ atlas_add_component( InDetAlignmentMonitoring
LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib
GaudiKernel CommissionEvent AthenaBaseComps AthenaMonitoringLib AthContainers
AtlasDetDescr Identifier EventPrimitives xAODEventInfo xAODTracking
- TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry SCT_ReadoutGeometry
+ TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry PixelReadoutGeometryLib SCT_ReadoutGeometry
InDetPrepRawData InDetRIO_OnTrack Particle LWHists TrkGeometry TrkSurfaces
TrkEventPrimitives TrkParameters TrkParticleBase TrkPseudoMeasurementOnTrack
TrkRIO_OnTrack TrkTrack TrkTrackSummary TrkTruthData VxVertex TrkExInterfaces
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/CMakeLists.txt b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/CMakeLists.txt
index 27886016df6e..6b3b45ead8b2 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/CMakeLists.txt
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/CMakeLists.txt
@@ -9,7 +9,7 @@ atlas_subdir( InDetAlignmentMonitoringRun3 )
atlas_add_component( InDetAlignmentMonitoringRun3
src/*.h src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib GaudiKernel CommissionEvent AthenaBaseComps AthenaMonitoringLib AthContainers AtlasDetDescr Identifier EventPrimitives xAODEventInfo xAODTracking TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry SCT_ReadoutGeometry InDetPrepRawData InDetRIO_OnTrack Particle TrkGeometry TrkSurfaces TrkEventPrimitives TrkParameters TrkParticleBase TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkTrack TrkTrackSummary TrkTruthData VxVertex TrkExInterfaces TrkToolInterfaces TrkVertexFitterInterfaces InDetTrackSelectionToolLib BeamSpotConditionsData InDetAlignGenToolsLib InDetTrackSplitterToolLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib GaudiKernel CommissionEvent AthenaBaseComps AthenaMonitoringLib AthContainers AtlasDetDescr Identifier EventPrimitives xAODEventInfo xAODTracking TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry PixelReadoutGeometryLib SCT_ReadoutGeometry InDetPrepRawData InDetRIO_OnTrack Particle TrkGeometry TrkSurfaces TrkEventPrimitives TrkParameters TrkParticleBase TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkTrack TrkTrackSummary TrkTruthData VxVertex TrkExInterfaces TrkToolInterfaces TrkVertexFitterInterfaces InDetTrackSelectionToolLib BeamSpotConditionsData InDetAlignGenToolsLib InDetTrackSplitterToolLib )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/CMakeLists.txt b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/CMakeLists.txt
index 7608a1dceb7b..231b288101d1 100644
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/CMakeLists.txt
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/CMakeLists.txt
@@ -16,7 +16,7 @@ atlas_add_component( InDetGlobalMonitoring
LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel
CommissionEvent AthenaBaseComps AthenaMonitoringLib AtlasDetDescr
IdDictDetDescr Identifier EventInfo EventPrimitives xAODJet xAODTracking
- GeneratorObjects InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry InDetBCM_RawData
+ GeneratorObjects InDetIdentifier InDetReadoutGeometry PixelReadoutGeometryLib InDetBCM_RawData
InDetRawData InDetPrepRawData InDetRIO_OnTrack InDetByteStreamErrors LWHists TrkSurfaces
TrkEventPrimitives TrkMeasurementBase TrkParameters TrkParticleBase TrkTrack
TrkTrackSummary TrkTruthData VxVertex TrkExInterfaces TrkToolInterfaces
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/CMakeLists.txt b/InnerDetector/InDetMonitoring/PixelMonitoring/CMakeLists.txt
index c52696659bc4..b247c0fcbc6c 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/CMakeLists.txt
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/CMakeLists.txt
@@ -8,7 +8,7 @@ atlas_add_component( PixelMonitoring
src/*.h src/*.cxx src/components/*.cxx
LINK_LIBRARIES AthenaMonitoringKernelLib AthenaMonitoringLib AtlasDetDescr EventPrimitives
InDetConditionsSummaryService InDetIdentifier InDetPrepRawData InDetRIO_OnTrack InDetRawData
- InDetReadoutGeometry InDetTrackSelectionToolLib PixelCablingLib PixelConditionsData
+ InDetReadoutGeometry InDetTrackSelectionToolLib PixelConditionsData PixelReadoutGeometryLib
TrkMeasurementBase TrkRIO_OnTrack TrkToolInterfaces TrkTrack TrkTrackSummary )
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx
index ce35aa868ad1..309437423862 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx
@@ -6,7 +6,6 @@
PixelAthClusterMonAlg::PixelAthClusterMonAlg( const std::string& name, ISvcLocator* pSvcLocator ) :
AthMonitorAlgorithm(name, pSvcLocator),
- m_pixelCablingSvc("PixelCablingSvc", name),
m_holeSearchTool("InDet::InDetTrackHoleSearchTool/InDetHoleSearchTool", this),
m_trackSelTool("InDet::InDetTrackSelectionTool/TrackSelectionTool", this),
m_atlasid(nullptr),
@@ -33,7 +32,7 @@ StatusCode PixelAthClusterMonAlg::initialize() {
ATH_CHECK( detStore()->retrieve(m_atlasid, "AtlasID") );
ATH_CHECK( detStore()->retrieve(m_pixelid, "PixelID") );
ATH_CHECK( m_pixelCondSummaryTool.retrieve() );
- ATH_CHECK( m_pixelCablingSvc.retrieve() );
+ ATH_CHECK( m_pixelReadout.retrieve() );
if ( !m_holeSearchTool.empty() ) ATH_CHECK( m_holeSearchTool.retrieve() );
if ( !m_trackSelTool.empty() ) ATH_CHECK( m_trackSelTool.retrieve() );
@@ -114,7 +113,7 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons
if (m_doFEPlots) {
int nFE = getNumberOfFEs(pixlayer, m_pixelid->eta_module(waferID));
for (int iFE=0; iFE<nFE; iFE++) {
- Identifier pixelID = m_pixelCablingSvc->getPixelIdfromHash(id_hash, iFE, 1, 1);
+ Identifier pixelID = m_pixelReadout->getPixelIdfromHash(id_hash, iFE, 1, 1);
if (pixelID.is_valid()) {
if (m_pixelCondSummaryTool->isActive(id_hash, pixelID) == true && m_pixelCondSummaryTool->isGood(id_hash, pixelID) == true) {
index = 0; // active and good FE
@@ -425,7 +424,7 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons
//
Cluster_Occupancy.add(pixlayer, clusID, m_pixelid);
if (m_doFEPlots) {
- Cluster_FE_Occupancy.add(pixlayer, clusID, m_pixelid, m_pixelCablingSvc->getFE(&clusID, clusID), 1.0);
+ Cluster_FE_Occupancy.add(pixlayer, clusID, m_pixelid, m_pixelReadout->getFE(clusID, clusID), 1.0);
}
if (cluster.rdoList().size() > 1) Clus_Occ_SizeCut.add(pixlayer, clusID, m_pixelid);
// end cluster occupancy
@@ -482,7 +481,7 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons
//
Cluster_Occupancy_OnTrack.add(pixlayer, clusID, m_pixelid);
if (m_doFEPlots) {
- Cluster_FE_Occupancy_OnTrack.add(pixlayer, clusID, m_pixelid, m_pixelCablingSvc->getFE(&clusID, clusID), 1.0);
+ Cluster_FE_Occupancy_OnTrack.add(pixlayer, clusID, m_pixelid, m_pixelReadout->getFE(clusID, clusID), 1.0);
}
if (cluster.rdoList().size() > 1) Clus_Occ_SizeCut_OnTrack.add(pixlayer, clusID, m_pixelid);
//
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.h b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.h
index 9d51e018b101..1009b787b341 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.h
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef PIXELATHCLUSTERMONTOOL_H
@@ -9,7 +9,7 @@
#include "AtlasDetDescr/AtlasDetectorID.h"
#include "InDetConditionsSummaryService/IInDetConditionsTool.h"
-#include "PixelCabling/IPixelCablingSvc.h"
+#include "PixelReadoutGeometry/IPixelReadoutManager.h"
#include "InDetPrepRawData/PixelClusterContainer.h"
@@ -52,7 +52,9 @@ class PixelAthClusterMonAlg : public PixelAthMonitoringBase {
std::string findComponentString(int bec, int ld) const;
private:
- ServiceHandle<IPixelCablingSvc> m_pixelCablingSvc; //FE info
+ ServiceHandle<InDetDD::IPixelReadoutManager> m_pixelReadout
+ {this, "PixelReadoutManager", "PixelReadoutManager", "Pixel readout manager" };
+
ToolHandle<Trk::ITrackHoleSearchTool> m_holeSearchTool;
ToolHandle<InDet::IInDetTrackSelectionTool> m_trackSelTool;
ToolHandle<IInDetConditionsTool> m_pixelCondSummaryTool{this, "PixelConditionsSummaryTool", "PixelConditionsSummaryTool", "Tool to retrieve Pixel Conditions summary"};
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.cxx
index 0687d4e48d39..62c6097c9914 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.cxx
@@ -6,7 +6,6 @@
PixelAthErrorMonAlg::PixelAthErrorMonAlg( const std::string& name, ISvcLocator* pSvcLocator ) :
AthMonitorAlgorithm(name, pSvcLocator),
- m_pixelCablingSvc("PixelCablingSvc", name),
m_pixelid(nullptr)
{
// jo flags
@@ -25,7 +24,7 @@ StatusCode PixelAthErrorMonAlg::initialize() {
ATH_CHECK( detStore()->retrieve(m_pixelid, "PixelID") );
ATH_CHECK( m_pixelCondSummaryTool.retrieve() );
- ATH_CHECK( m_pixelCablingSvc.retrieve() );
+ ATH_CHECK( m_pixelReadout.retrieve() );
return AthMonitorAlgorithm::initialize();
}
@@ -186,7 +185,7 @@ StatusCode PixelAthErrorMonAlg::fillHistograms( const EventContext& ctx ) const
} else {
std::bitset<kNumErrorStatesFEI3> stateFEI4 = getErrorStateFE(fe_errorword, is_fei4);
num_errors[pixlayer]+=stateFEI4.count();
- Identifier pixelIDperFEI4 = m_pixelCablingSvc->getPixelIdfromHash(modHash, iFE, 1, 1);
+ Identifier pixelIDperFEI4 = m_pixelReadout->getPixelIdfromHash(modHash, iFE, 1, 1);
for (unsigned int state = 0; state < stateFEI4.size(); ++state) {
if (stateFEI4[state]) {
num_errors_per_state[state][pixlayer]++;
@@ -212,7 +211,7 @@ StatusCode PixelAthErrorMonAlg::fillHistograms( const EventContext& ctx ) const
}
int serviceCodeOffset = serviceCode*280*nFE;
for (int iFE=0; iFE<nFE; iFE++) {
- Identifier pixelIDperFEI4 = m_pixelCablingSvc->getPixelIdfromHash(modHash, iFE, 1, 1);
+ Identifier pixelIDperFEI4 = m_pixelReadout->getPixelIdfromHash(modHash, iFE, 1, 1);
// index = offset + (serviceCode)*(#IBL*nFE) + (moduleHash-156)*nFE + FE
int serviceCodeCounterIndex = serviceRecordFieldOffset + serviceCodeOffset + moduleOffset + iFE;
uint64_t serviceCodeCounter = m_pixelCondSummaryTool->getBSErrorWord(modHash, serviceCodeCounterIndex, ctx);
@@ -242,7 +241,7 @@ StatusCode PixelAthErrorMonAlg::fillHistograms( const EventContext& ctx ) const
if (pixlayer != PixLayers::kIBL && iFE>0) continue;
Identifier pixID = waferID;
if (pixlayer == PixLayers::kIBL) {
- pixID = m_pixelCablingSvc->getPixelIdfromHash(modHash, iFE, 1, 1);
+ pixID = m_pixelReadout->getPixelIdfromHash(modHash, iFE, 1, 1);
}
if (pixID.is_valid()) {
for (int i = 0; i < ErrorCategoryRODMOD::COUNT; i++) {
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.h b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.h
index d91daa3b8593..67b0c2a257ed 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.h
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.h
@@ -8,7 +8,7 @@
#include "PixelAthMonitoringBase.h"
#include "InDetConditionsSummaryService/IInDetConditionsTool.h"
#include "PixelConditionsData/PixelByteStreamErrors.h"
-#include "PixelCabling/IPixelCablingSvc.h"
+#include "PixelReadoutGeometry/IPixelReadoutManager.h"
class PixelID;
@@ -143,7 +143,9 @@ class PixelAthErrorMonAlg : public PixelAthMonitoringBase {
private:
- ServiceHandle<IPixelCablingSvc> m_pixelCablingSvc; //FE info
+ ServiceHandle<InDetDD::IPixelReadoutManager> m_pixelReadout
+ {this, "PixelReadoutManager", "PixelReadoutManager", "Pixel readout manager" };
+
ToolHandle<IInDetConditionsTool> m_pixelCondSummaryTool{this, "PixelConditionsSummaryTool",
"PixelConditionsSummaryTool", "Tool to retrieve Pixel Conditions summary"};
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx
index c4787b575c83..7ff8efee248d 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx
@@ -6,7 +6,6 @@
PixelAthHitMonAlg::PixelAthHitMonAlg( const std::string& name, ISvcLocator* pSvcLocator ) :
AthMonitorAlgorithm(name, pSvcLocator),
- m_pixelCablingSvc("PixelCablingSvc", name),
m_pixelid(nullptr)
{
//jo flags
@@ -26,7 +25,7 @@ StatusCode PixelAthHitMonAlg::initialize() {
ATH_CHECK( detStore()->retrieve(m_pixelid, "PixelID") );
ATH_CHECK( m_pixelCondSummaryTool.retrieve() );
- ATH_CHECK( m_pixelCablingSvc.retrieve() );
+ ATH_CHECK( m_pixelReadout.retrieve() );
ATH_CHECK( m_pixelRDOName.initialize() );
return AthMonitorAlgorithm::initialize();
@@ -160,7 +159,7 @@ StatusCode PixelAthHitMonAlg::fillHistograms( const EventContext& ctx ) const {
int pixlayer = getPixLayersID(m_pixelid->barrel_ec(rdoID), m_pixelid->layer_disk(rdoID) );
if (pixlayer == 99) continue;
HitMap.add(pixlayer, rdoID, m_pixelid, 1.0);
- if (m_doFEPlots) HitFEMap.add(pixlayer, rdoID, m_pixelid, m_pixelCablingSvc->getFE(&rdoID, rdoID), 1.0);
+ if (m_doFEPlots) HitFEMap.add(pixlayer, rdoID, m_pixelid, m_pixelReadout->getFE(rdoID, rdoID), 1.0);
nhits++;
nhits_layer[pixlayer]++;
hitLvl1a.push_back( (*p_rdo)->getLVL1A() );
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.h b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.h
index 4e6f294fbc3b..8da355e8d99e 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.h
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef PIXELATHHITMONTOOL_H
@@ -8,7 +8,7 @@
#include "PixelAthMonitoringBase.h"
#include "InDetConditionsSummaryService/IInDetConditionsTool.h"
//#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
-#include "PixelCabling/IPixelCablingSvc.h"
+#include "PixelReadoutGeometry/IPixelReadoutManager.h"
#include "InDetRawData/InDetRawDataCLASS_DEF.h"
#include "InDetRawData/InDetRawDataContainer.h"
@@ -29,7 +29,9 @@ class PixelAthHitMonAlg : public PixelAthMonitoringBase {
private:
- ServiceHandle<IPixelCablingSvc> m_pixelCablingSvc; //FE info
+ ServiceHandle<InDetDD::IPixelReadoutManager> m_pixelReadout
+ {this, "PixelReadoutManager", "PixelReadoutManager", "Pixel readout manager" };
+
ToolHandle<IInDetConditionsTool> m_pixelCondSummaryTool{this, "PixelConditionsSummaryTool", "PixelConditionsSummaryTool", "Tool to retrieve Pixel Conditions summary"};
const PixelID* m_pixelid;
diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py
index 7bd6ed2c3330..b2067d50e3c9 100644
--- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py
+++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
###############################################################
#
@@ -432,7 +432,7 @@ InDetClusterMakerTool = InDet__ClusterMakerTool(name = "InDetClusterMakerTool",
if doPixel:
InDetClusterMakerTool.PixelLorentzAngleTool = ToolSvc.PixelLorentzAngleTool
else:
- InDetClusterMakerTool.PixelCablingSvc = None
+ InDetClusterMakerTool.PixelReadoutManager = None
InDetClusterMakerTool.PixelChargeCalibCondData = ""
InDetClusterMakerTool.PixelLorentzAngleTool = None
InDetClusterMakerTool.PixelOfflineCalibData = ""
diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py
index 047fdbc4a5e2..af051fe63300 100644
--- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py
+++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py
@@ -170,6 +170,10 @@ include("InDetRecExample/InDetRecCabling.py")
# Set up Pixel conditions
if doPixel:
+ if not hasattr(svcMgr, "PixelReadoutManager"):
+ from PixelReadoutGeometry.PixelReadoutGeometryConf import InDetDD__PixelReadoutManager
+ svcMgr += InDetDD__PixelReadoutManager("PixelReadoutManager")
+
# Taken from InDetRecExample/share/InDetRecConditionsAccess.py
#################
# Module status #
diff --git a/InnerDetector/InDetRecTools/InDetTestBLayer/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetTestBLayer/CMakeLists.txt
index 87dd02b8da4a..91b83828240d 100644
--- a/InnerDetector/InDetRecTools/InDetTestBLayer/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetTestBLayer/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetTestBLayer )
@@ -8,9 +8,9 @@ atlas_add_library( InDetTestBLayerLib
src/*.cxx
PUBLIC_HEADERS InDetTestBLayer
LINK_LIBRARIES AthenaBaseComps GeoPrimitives Identifier EventPrimitives GaudiKernel InDetRecToolInterfaces
- TrkEventPrimitives TrkParameters TrkToolInterfaces TrkExInterfaces InDetConditionsSummaryService
+ TrkEventPrimitives TrkParameters TrkToolInterfaces TrkExInterfaces InDetConditionsSummaryService
PRIVATE_LINK_LIBRARIES AtlasDetDescr IdDictDetDescr InDetIdentifier InDetReadoutGeometry
- PixelReadoutGeometry Particle TrkGeometry TrkSurfaces TrkMeasurementBase TrkTrack )
+ PixelReadoutGeometryLib Particle TrkGeometry TrkSurfaces TrkMeasurementBase TrkTrack )
atlas_add_component( InDetTestBLayer
src/components/*.cxx
diff --git a/InnerDetector/InDetRecTools/InDetTestPixelLayer/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetTestPixelLayer/CMakeLists.txt
index f64aed1106c8..d4bbcf6fd737 100644
--- a/InnerDetector/InDetRecTools/InDetTestPixelLayer/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetTestPixelLayer/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetTestPixelLayer )
@@ -8,7 +8,7 @@ atlas_add_library( InDetTestPixelLayerLib
src/*.cxx
PUBLIC_HEADERS InDetTestPixelLayer
LINK_LIBRARIES AthenaBaseComps AthenaKernel GeoPrimitives Identifier GaudiKernel InDetIdentifier InDetRecToolInterfaces TrkEventPrimitives TrkParameters TrkToolInterfaces InDetConditionsSummaryService
- PRIVATE_LINK_LIBRARIES AtlasDetDescr IdDictDetDescr InDetReadoutGeometry PixelReadoutGeometry TrkGeometry TrkSurfaces TrkMeasurementBase TrkParticleBase TrkTrack TrkTrackSummary TrkExInterfaces )
+ PRIVATE_LINK_LIBRARIES AtlasDetDescr IdDictDetDescr InDetReadoutGeometry PixelReadoutGeometryLib TrkGeometry TrkSurfaces TrkMeasurementBase TrkParticleBase TrkTrack TrkTrackSummary TrkExInterfaces )
atlas_add_component( InDetTestPixelLayer
src/components/*.cxx
diff --git a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/CMakeLists.txt b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/CMakeLists.txt
index d5d724a7a039..32bfe02b4044 100644
--- a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( SiClusterOnTrackTool )
@@ -7,4 +7,4 @@ atlas_subdir( SiClusterOnTrackTool )
atlas_add_component( SiClusterOnTrackTool
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps AthenaPoolUtilities EventPrimitives GaudiKernel GeoPrimitives Identifier InDetCondTools InDetIdentifier InDetPrepRawData InDetRIO_OnTrack InDetReadoutGeometry PixelConditionsData PixelGeoModelLib PixelReadoutGeometry SCT_ModuleDistortionsLib SiClusterizationToolLib StoreGateLib TrkEventUtils TrkParameters TrkRIO_OnTrack TrkSurfaces TrkToolInterfaces )
+ LINK_LIBRARIES AthenaBaseComps AthenaPoolUtilities EventPrimitives GaudiKernel GeoPrimitives Identifier InDetCondTools InDetIdentifier InDetPrepRawData InDetRIO_OnTrack InDetReadoutGeometry PixelConditionsData PixelGeoModelLib PixelReadoutGeometryLib SCT_ModuleDistortionsLib SiClusterizationToolLib StoreGateLib TrkEventUtils TrkParameters TrkRIO_OnTrack TrkSurfaces TrkToolInterfaces )
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/CMakeLists.txt b/InnerDetector/InDetRecTools/SiClusterizationTool/CMakeLists.txt
index d248f3014f2b..97df26d3b5a4 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( SiClusterizationTool )
@@ -18,8 +18,8 @@ atlas_add_library( SiClusterizationToolLib
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${LWTNN_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${COOL_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${LWTNN_LIBRARIES} ${EIGEN_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel BeamSpotConditionsData EventPrimitives GaudiKernel GeoPrimitives Identifier InDetCondTools InDetConditionsSummaryService InDetIdentifier InDetPrepRawData InDetRawData ReadoutGeometryBase InDetReadoutGeometry InDetRecToolInterfaces InDetSimData PixelCablingLib PixelConditionsData PixelGeoModelLib PoolSvcLib StoreGateLib TrkNeuralNetworkUtilsLib TrkParameters TrkSurfaces LwtnnUtils
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${COOL_LIBRARIES} AthenaPoolUtilities AtlasDetDescr AtlasHepMCLib DetDescrCondToolsLib FileCatalog PixelReadoutGeometry SCT_ReadoutGeometry TrkEventPrimitives VxVertex )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${LWTNN_LIBRARIES} ${EIGEN_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel BeamSpotConditionsData EventPrimitives GaudiKernel GeoPrimitives Identifier InDetCondTools InDetConditionsSummaryService InDetIdentifier InDetPrepRawData InDetRawData ReadoutGeometryBase InDetReadoutGeometry InDetRecToolInterfaces InDetSimData PixelConditionsData PixelGeoModelLib PixelReadoutGeometryLib PoolSvcLib StoreGateLib TrkNeuralNetworkUtilsLib TrkParameters TrkSurfaces LwtnnUtils
+ PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${COOL_LIBRARIES} AthenaPoolUtilities AtlasDetDescr AtlasHepMCLib DetDescrCondToolsLib FileCatalog SCT_ReadoutGeometry TrkEventPrimitives VxVertex )
atlas_add_component( SiClusterizationTool
src/components/*.cxx
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/ClusterMakerTool.h b/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/ClusterMakerTool.h
index 3ab17002adac..70210c455880 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/ClusterMakerTool.h
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/ClusterMakerTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -22,9 +22,9 @@
#include "GeoPrimitives/GeoPrimitives.h"
#include "InDetCondTools/ISiLorentzAngleTool.h"
-#include "PixelCabling/IPixelCablingSvc.h"
#include "PixelConditionsData/PixelChargeCalibCondData.h"
#include "PixelConditionsData/PixelOfflineCalibData.h"
+#include "PixelReadoutGeometry/IPixelReadoutManager.h"
#include "StoreGate/ReadCondHandleKey.h"
#include "GaudiKernel/ToolHandle.h"
@@ -142,8 +142,8 @@ public:
private:
- ServiceHandle<IPixelCablingSvc> m_pixelCabling
- {this, "PixelCablingSvc", "PixelCablingSvc", "Pixel cabling service"};
+ ServiceHandle<InDetDD::IPixelReadoutManager> m_pixelReadout
+ {this, "PixelReadoutManager", "PixelReadoutManager", "Pixel readout manager" };
SG::ReadCondHandleKey<PixelChargeCalibCondData> m_chargeDataKey
{this, "PixelChargeCalibCondData", "PixelChargeCalibCondData", "Pixel charge calibration data"};
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/NnClusterizationFactory.h b/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/NnClusterizationFactory.h
index 08ac0c354d76..231d04a315a3 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/NnClusterizationFactory.h
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/NnClusterizationFactory.h
@@ -32,9 +32,9 @@
#include "InDetCondTools/ISiLorentzAngleTool.h"
#include "SiClusterizationTool/TTrainedNetworkCollection.h"
#include "SiClusterizationTool/LWTNNCollection.h"
-#include "PixelCabling/IPixelCablingSvc.h"
#include "PixelConditionsData/PixelModuleData.h"
#include "PixelConditionsData/PixelChargeCalibCondData.h"
+#include "PixelReadoutGeometry/IPixelReadoutManager.h"
#include "StoreGate/ReadCondHandleKey.h"
#include <RtypesCore.h> //Double_t
@@ -239,8 +239,8 @@ namespace InDet {
ToolHandle<ISiLorentzAngleTool> m_pixelLorentzAngleTool
{this, "PixelLorentzAngleTool", "SiLorentzAngleTool/PixelLorentzAngleTool", "Tool to retreive Lorentz angle of Pixel"};
- ServiceHandle<IPixelCablingSvc> m_pixelCabling
- {this, "PixelCablingSvc", "PixelCablingSvc", "Pixel cabling service" };
+ ServiceHandle<InDetDD::IPixelReadoutManager> m_pixelReadout
+ {this, "PixelReadoutManager", "PixelReadoutManager", "Pixel readout manager" };
SG::ReadCondHandleKey<PixelChargeCalibCondData> m_chargeDataKey
{this, "PixelChargeCalibCondData", "PixelChargeCalibCondData", "Output key"};
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/TotPixelClusterSplitter.h b/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/TotPixelClusterSplitter.h
index 8057b7bedf5f..49a1e0938c8f 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/TotPixelClusterSplitter.h
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/TotPixelClusterSplitter.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -15,8 +15,8 @@
#include "InDetPrepRawData/PixelClusterParts.h"
#include "InDetPrepRawData/PixelClusterSplitProb.h"
#include "InDetIdentifier/PixelID.h"
-#include "PixelCabling/IPixelCablingSvc.h"
#include "PixelConditionsData/PixelChargeCalibCondData.h"
+#include "PixelReadoutGeometry/IPixelReadoutManager.h"
#include "StoreGate/ReadCondHandleKey.h"
template <class T> class ServiceHandle;
@@ -81,8 +81,8 @@ namespace InDet
enum SplitType { PhiSplit = 0, EtaSplit = 1, NoSplit = 2 };
- ServiceHandle<IPixelCablingSvc> m_pixelCabling
- {this, "PixelCablingSvc", "PixelCablingSvc", "Pixel cabling service" };
+ ServiceHandle<InDetDD::IPixelReadoutManager> m_pixelReadout
+ {this, "PixelReadoutManager", "PixelReadoutManager", "Pixel readout manager" };
SG::ReadCondHandleKey<PixelChargeCalibCondData> m_chargeDataKey
{this, "PixelChargeCalibCondData", "PixelChargeCalibCondData", "Pixel charge calibration data"};
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/ClusterMakerTool.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/ClusterMakerTool.cxx
index 726959d4ed59..749fa29c77da 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/ClusterMakerTool.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/src/ClusterMakerTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
//***************************************************************************
@@ -57,8 +57,8 @@ StatusCode ClusterMakerTool::initialize(){
ATH_MSG_DEBUG ( name() << " initialize()" );
- if (not m_pixelCabling.empty()) {
- ATH_CHECK(m_pixelCabling.retrieve());
+ if (not m_pixelReadout.empty()) {
+ ATH_CHECK(m_pixelReadout.retrieve());
}
ATH_CHECK(m_chargeDataKey.initialize(SG::AllowEmpty));
@@ -144,8 +144,8 @@ PixelCluster* ClusterMakerTool::pixelCluster(
Identifier moduleID = pid->wafer_id(pixid);
IdentifierHash moduleHash = pid->wafer_hash(moduleID);
- int circ = m_pixelCabling->getFE(&pixid,moduleID);
- int type = m_pixelCabling->getPixelType(pixid);
+ int circ = m_pixelReadout->getFE(pixid, moduleID);
+ InDetDD::PixelDiodeType type = m_pixelReadout->getDiodeType(pixid);
float charge = calibData->getCharge((int)moduleHash, circ, type, 1.0*ToT);
chargeList.push_back(charge);
@@ -304,8 +304,8 @@ PixelCluster* ClusterMakerTool::pixelCluster(
float charge = ToT;
Identifier moduleID = pixelID.wafer_id(pixid);
IdentifierHash moduleHash = pixelID.wafer_hash(moduleID); // wafer hash
- int circ = m_pixelCabling->getFE(&pixid,moduleID);
- int type = m_pixelCabling->getPixelType(pixid);
+ int circ = m_pixelReadout->getFE(pixid, moduleID);
+ InDetDD::PixelDiodeType type = m_pixelReadout->getDiodeType(pixid);
charge = calibData->getCharge((int)moduleHash, circ, type, 1.0*ToT);
if (moduleHash<12 || moduleHash>2035) {
charge = ToT/8.0*(8000.0-1200.0)+1200.0;
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/NnClusterizationFactory.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/NnClusterizationFactory.cxx
index 28afe16e85ee..adc23a64fb4e 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/NnClusterizationFactory.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/src/NnClusterizationFactory.cxx
@@ -56,7 +56,7 @@ namespace InDet {
}
StatusCode NnClusterizationFactory::initialize() {
- ATH_CHECK(m_pixelCabling.retrieve());
+ ATH_CHECK(m_pixelReadout.retrieve());
ATH_CHECK(m_chargeDataKey.initialize());
ATH_CHECK(m_pixelLorentzAngleTool.retrieve());
m_assembleInput = ( m_doRunI ? &NnClusterizationFactory::assembleInputRunI : &NnClusterizationFactory::assembleInputRunII );
@@ -798,8 +798,8 @@ namespace InDet {
Identifier pixid = *rdosBegin;
Identifier moduleID = pixelID.wafer_id(pixid);
IdentifierHash moduleHash = pixelID.wafer_hash(moduleID); // wafer hash
- int circ = m_pixelCabling->getFE(&pixid,moduleID);
- int type = m_pixelCabling->getPixelType(pixid);
+ int circ = m_pixelReadout->getFE(pixid, moduleID);
+ InDetDD::PixelDiodeType type = m_pixelReadout->getDiodeType(pixid);
float ch = calibData->getCharge((int)moduleHash, circ, type, 1.0*tot0);
chListRecreated.push_back(ch);
totListRecreated.push_back(tot0);
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/TotPixelClusterSplitter.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/TotPixelClusterSplitter.cxx
index 5ef56d682594..245e3f2baaa4 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/TotPixelClusterSplitter.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/src/TotPixelClusterSplitter.cxx
@@ -22,7 +22,7 @@ InDet::TotPixelClusterSplitter::TotPixelClusterSplitter(const std::string & type
StatusCode InDet::TotPixelClusterSplitter::initialize() {
- ATH_CHECK(m_pixelCabling.retrieve());
+ ATH_CHECK(m_pixelReadout.retrieve());
ATH_CHECK(m_chargeDataKey.initialize());
return StatusCode::SUCCESS;
@@ -223,8 +223,8 @@ std::vector<InDet::PixelClusterParts> InDet::TotPixelClusterSplitter::splitClust
Identifier pixid = Rdos[i];
Identifier moduleID = pixelID.wafer_id(pixid);
IdentifierHash moduleHash = pixelID.wafer_hash(moduleID); // wafer hash
- int circ = m_pixelCabling->getFE(&pixid,moduleID);
- int type = m_pixelCabling->getPixelType(pixid);
+ int circ = m_pixelReadout->getFE(pixid, moduleID);
+ InDetDD::PixelDiodeType type = m_pixelReadout->getDiodeType(pixid);
SplitRdos[j].push_back(Rdos[i]);
Totgroups[j].push_back(static_cast<int>(calibData->getToT((int)moduleHash,circ,type,Charges[i]/2.0)));
diff --git a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/CMakeLists.txt b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/CMakeLists.txt
index 46cc9170e677..e7b06a6f26fc 100644
--- a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( SiDetElementsRoadTool_xk )
@@ -7,4 +7,4 @@ atlas_subdir( SiDetElementsRoadTool_xk )
atlas_add_component( SiDetElementsRoadTool_xk
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps AthenaKernel AthenaPoolUtilities GaudiKernel InDetReadoutGeometry InDetRecToolInterfaces MagFieldConditions MagFieldElements PixelReadoutGeometry SCT_ReadoutGeometry SiSPSeededTrackFinderData StoreGateLib TrkExInterfaces TrkGeometry TrkParameters TrkPrepRawData TrkSurfaces )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel AthenaPoolUtilities GaudiKernel InDetReadoutGeometry InDetRecToolInterfaces MagFieldConditions MagFieldElements PixelReadoutGeometryLib SCT_ReadoutGeometry SiSPSeededTrackFinderData StoreGateLib TrkExInterfaces TrkGeometry TrkParameters TrkPrepRawData TrkSurfaces )
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/CMakeLists.txt b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/CMakeLists.txt
index 8b2494004a1a..49930846c178 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/CMakeLists.txt
@@ -80,7 +80,7 @@ foreach( name CscMcDataCnv_p1_test CscSimDataCnv_p1_test
SOURCES test/${name}.cxx
LINK_LIBRARIES ${GEOMODEL_LIBRARIES} GaudiKernel TrkSurfaces TrkEventTPCnv TestTools
StoreGateLib TPTools AGDDKernel AtlasDetDescr
- IdDict IdDictDetDescr IdDictParser InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry SCT_ReadoutGeometry TRT_ReadoutGeometry
+ IdDict IdDictDetDescr IdDictParser InDetIdentifier InDetReadoutGeometry PixelReadoutGeometryLib SCT_ReadoutGeometry TRT_ReadoutGeometry
MuonAGDDDescription MuonReadoutGeometry MuonIdHelpersLib
TrkEventPrimitives TrkPseudoMeasurementOnTrack MuonEventTPCnv AthenaKernel
LOG_IGNORE_PATTERN "MultiRange built successfully|element hash max|DEBUG|Strip range"
diff --git a/Projects/AthSimulation/package_filters.txt b/Projects/AthSimulation/package_filters.txt
index 8ebe8f6eb59f..2c52bcc9cff8 100644
--- a/Projects/AthSimulation/package_filters.txt
+++ b/Projects/AthSimulation/package_filters.txt
@@ -191,6 +191,7 @@
+ InnerDetector/InDetDetDescr/InDetIdDictFiles
+ InnerDetector/InDetDetDescr/InDetIdentifier
+ InnerDetector/InDetDetDescr/InDetReadoutGeometry
++ InnerDetector/InDetDetDescr/PixelReadoutDefinitions
+ InnerDetector/InDetDetDescr/PixelReadoutGeometry
+ InnerDetector/InDetDetDescr/SCT_ReadoutGeometry
+ InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
diff --git a/Simulation/Tools/RDOAnalysis/CMakeLists.txt b/Simulation/Tools/RDOAnalysis/CMakeLists.txt
index 5ccd64443f65..19ca7e382725 100644
--- a/Simulation/Tools/RDOAnalysis/CMakeLists.txt
+++ b/Simulation/Tools/RDOAnalysis/CMakeLists.txt
@@ -17,7 +17,7 @@ atlas_add_component( RDOAnalysis
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel AthenaBaseComps InDetIdentifier InDetRawData InDetSimData InDetBCM_RawData InDetPrepRawData LArRawEvent MuonRDO MuonSimData TileEvent TrkSurfaces TrkTruthData SCT_ReadoutGeometry PixelReadoutGeometry )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel AthenaBaseComps InDetIdentifier InDetRawData InDetSimData InDetBCM_RawData InDetPrepRawData LArRawEvent MuonRDO MuonSimData TileEvent TrkSurfaces TrkTruthData SCT_ReadoutGeometry PixelReadoutGeometryLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/Trigger/TrigAccel/TrigInDetAccel/TrigInDetAccelerationService/CMakeLists.txt b/Trigger/TrigAccel/TrigInDetAccel/TrigInDetAccelerationService/CMakeLists.txt
index 004854e2519c..05770da0a903 100644
--- a/Trigger/TrigAccel/TrigInDetAccel/TrigInDetAccelerationService/CMakeLists.txt
+++ b/Trigger/TrigAccel/TrigInDetAccel/TrigInDetAccelerationService/CMakeLists.txt
@@ -2,7 +2,7 @@
# Package: TrigInDetAccelerationService
################################################################################
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
@@ -17,7 +17,7 @@ atlas_add_library( TrigInDetAccelerationServiceLib
src/*.cxx
PUBLIC_HEADERS TrigInDetAccelerationService
INCLUDE_DIRS ${TBB_INCLUDE_DIRS}
- LINK_LIBRARIES AthenaKernel GaudiKernel AthenaBaseComps StoreGateLib InDetIdentifier PixelReadoutGeometry SCT_ReadoutGeometry TrigAccelEvent ${TBB_LIBRARIES} rt dl)
+ LINK_LIBRARIES AthenaKernel GaudiKernel AthenaBaseComps StoreGateLib InDetIdentifier PixelReadoutGeometryLib SCT_ReadoutGeometry TrigAccelEvent ${TBB_LIBRARIES} rt dl)
atlas_add_component( TrigInDetAccelerationService
src/components/*.cxx
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
index 23741b814368..adb98b08ae93 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
@@ -307,9 +307,9 @@ def pixelCondCfg(flags):
)
from PixelConditionsTools.PixelConditionsSummaryConfig import PixelConditionsSummaryCfg
+ from PixelReadoutGeometry.PixelReadoutGeometryConfig import PixelReadoutManagerCfg
from SiPropertiesTool.PixelSiPropertiesConfig import PixelSiPropertiesCfg
from SiLorentzAngleTool.PixelLorentzAngleConfig import PixelLorentzAngleCfg
- from PixelCabling.PixelCablingConfigNew import PixelCablingSvcCfg
# module parameters
acc.merge(PixelConfigCondAlgCfg(flags))
@@ -338,7 +338,7 @@ def pixelCondCfg(flags):
acc.popToolsAndMerge(PixelConditionsSummaryCfg(flags))
acc.popToolsAndMerge(PixelSiPropertiesCfg(flags))
acc.popToolsAndMerge(PixelLorentzAngleCfg(flags))
- acc.merge(PixelCablingSvcCfg(flags))
+ acc.merge(PixelReadoutManagerCfg(flags))
return acc
diff --git a/Trigger/TrigTools/TrigOnlineSpacePointTool/CMakeLists.txt b/Trigger/TrigTools/TrigOnlineSpacePointTool/CMakeLists.txt
index 2378cc2ae2a9..40bfb0cee577 100644
--- a/Trigger/TrigTools/TrigOnlineSpacePointTool/CMakeLists.txt
+++ b/Trigger/TrigTools/TrigOnlineSpacePointTool/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigOnlineSpacePointTool )
@@ -7,4 +7,4 @@ atlas_subdir( TrigOnlineSpacePointTool )
atlas_add_component( TrigOnlineSpacePointTool
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps AtlasDetDescr BeamSpotConditionsData GaudiKernel IRegionSelector InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry SCT_ReadoutGeometry StoreGateLib TrigInDetEvent TrigInDetToolInterfacesLib TrkSpacePoint )
+ LINK_LIBRARIES AthenaBaseComps AtlasDetDescr BeamSpotConditionsData GaudiKernel IRegionSelector InDetIdentifier InDetReadoutGeometry PixelReadoutGeometryLib SCT_ReadoutGeometry StoreGateLib TrigInDetEvent TrigInDetToolInterfacesLib TrkSpacePoint )
diff --git a/graphics/GeometryJiveXML/CMakeLists.txt b/graphics/GeometryJiveXML/CMakeLists.txt
index 8b0951540585..a803b65e9aec 100644
--- a/graphics/GeometryJiveXML/CMakeLists.txt
+++ b/graphics/GeometryJiveXML/CMakeLists.txt
@@ -12,4 +12,4 @@ atlas_add_component( GeometryJiveXML
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${GEOMODEL_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${GEOMODEL_LIBRARIES} AthenaBaseComps CaloDetDescrLib GaudiKernel InDetIdentifier InDetReadoutGeometry JiveXMLLib LArReadoutGeometry MuonIdHelpersLib MuonReadoutGeometry PixelReadoutGeometry SCT_ReadoutGeometry StoreGateLib TRT_ReadoutGeometry TileDetDescr )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${GEOMODEL_LIBRARIES} AthenaBaseComps CaloDetDescrLib GaudiKernel InDetIdentifier InDetReadoutGeometry JiveXMLLib LArReadoutGeometry MuonIdHelpersLib MuonReadoutGeometry PixelReadoutGeometryLib SCT_ReadoutGeometry StoreGateLib TRT_ReadoutGeometry TileDetDescr )
diff --git a/graphics/VP1/VP1Systems/VP1RawDataSystems/CMakeLists.txt b/graphics/VP1/VP1Systems/VP1RawDataSystems/CMakeLists.txt
index 3f81c0784730..9072566f9470 100644
--- a/graphics/VP1/VP1Systems/VP1RawDataSystems/CMakeLists.txt
+++ b/graphics/VP1/VP1Systems/VP1RawDataSystems/CMakeLists.txt
@@ -25,5 +25,5 @@ atlas_add_library( VP1RawDataSystems VP1RawDataSystems/*.h src/*.h src/*.cxx src
PRIVATE_INCLUDE_DIRS ${COIN3D_INCLUDE_DIRS}
FILES LUCID_RawEvent/LUCID_Digit.h
LINK_LIBRARIES ${EIGEN_LIBRARIES} GeoPrimitives VP1Base GL
- PRIVATE_LINK_LIBRARIES ${COIN3D_LIBRARIES} ${GEOMODEL_LIBRARIES} EventPrimitives LUCID_RawEvent GaudiKernel InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry SCT_ReadoutGeometry TRT_ReadoutGeometry InDetBCM_RawData InDetRawData VP1HEPVis VP1Utils )
+ PRIVATE_LINK_LIBRARIES ${COIN3D_LIBRARIES} ${GEOMODEL_LIBRARIES} EventPrimitives LUCID_RawEvent GaudiKernel InDetIdentifier InDetReadoutGeometry PixelReadoutGeometryLib SCT_ReadoutGeometry TRT_ReadoutGeometry InDetBCM_RawData InDetRawData VP1HEPVis VP1Utils )
diff --git a/graphics/VP1/VP1Systems/VP1TrackSystems/CMakeLists.txt b/graphics/VP1/VP1Systems/VP1TrackSystems/CMakeLists.txt
index a396b6c1b774..ffc704432095 100644
--- a/graphics/VP1/VP1Systems/VP1TrackSystems/CMakeLists.txt
+++ b/graphics/VP1/VP1Systems/VP1TrackSystems/CMakeLists.txt
@@ -20,4 +20,4 @@ atlas_add_library( VP1TrackSystems VP1TrackSystems/*.h src/*.cxx
PUBLIC_HEADERS VP1TrackSystems
PRIVATE_INCLUDE_DIRS ${COIN3D_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}
LINK_LIBRARIES ${GEOMODEL_LIBRARIES} AtlasHepMCLib GaudiKernel GeneratorObjects GeoPrimitives TrackRecordLib TrkDetDescrInterfaces TrkEventPrimitives TrkParameters TrkSurfaces VP1Base VP1Utils xAODTracking Qt5::Core Qt5::Gui
- PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} ${COIN3D_LIBRARIES} AthContainers AtlasDetDescr EventPrimitives ForwardRegion_SimEv InDetIdentifier InDetPrepRawData InDetRIO_OnTrack InDetReadoutGeometry InDetSimEvent MuonChamberT0s MuonIdHelpersLib MuonPrepRawData MuonRIO_OnTrack MuonReadoutGeometry MuonRecHelperToolsLib MuonSegment MuonSimEvent Particle PixelReadoutGeometry SCT_ReadoutGeometry StoreGateLib TRT_ReadoutGeometry TrkCompetingRIOsOnTrack TrkDetElementBase TrkExInterfaces TrkFitterInterfaces TrkMaterialOnTrack TrkMeasurementBase TrkPrepRawData TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkSegment TrkTrack TrkTrackSummary TrkVolumes VP1GuideLineSystems VP1HEPVis VP1PRDSystems )
+ PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} ${COIN3D_LIBRARIES} AthContainers AtlasDetDescr EventPrimitives ForwardRegion_SimEv InDetIdentifier InDetPrepRawData InDetRIO_OnTrack InDetReadoutGeometry InDetSimEvent MuonChamberT0s MuonIdHelpersLib MuonPrepRawData MuonRIO_OnTrack MuonReadoutGeometry MuonRecHelperToolsLib MuonSegment MuonSimEvent Particle PixelReadoutGeometryLib SCT_ReadoutGeometry StoreGateLib TRT_ReadoutGeometry TrkCompetingRIOsOnTrack TrkDetElementBase TrkExInterfaces TrkFitterInterfaces TrkMaterialOnTrack TrkMeasurementBase TrkPrepRawData TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkSegment TrkTrack TrkTrackSummary TrkVolumes VP1GuideLineSystems VP1HEPVis VP1PRDSystems )
diff --git a/graphics/VP1/VP1Utils/CMakeLists.txt b/graphics/VP1/VP1Utils/CMakeLists.txt
index 3945817b27c1..5e0db35be5ef 100644
--- a/graphics/VP1/VP1Utils/CMakeLists.txt
+++ b/graphics/VP1/VP1Utils/CMakeLists.txt
@@ -28,7 +28,7 @@ atlas_add_library( VP1Utils VP1Utils/*.h src/*.cxx src/*.cpp
PRIVATE_LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${COIN3D_LIBRARIES}
${EIGEN_LIBRARIES} CaloIdentifier CaloTTDetDescr CxxUtils AtlasDetDescr
GeoModelUtilities GeoSpecialShapes Identifier InDetIdentifier
- InDetReadoutGeometry PixelReadoutGeometry SCT_ReadoutGeometry TRT_ReadoutGeometry InDetRIO_OnTrack LArReadoutGeometry
+ InDetReadoutGeometry PixelReadoutGeometryLib SCT_ReadoutGeometry TRT_ReadoutGeometry InDetRIO_OnTrack LArReadoutGeometry
MuonReadoutGeometry MuonRIO_OnTrack TileDetDescr TrkSurfaces
TrkRIO_OnTrack VP1HEPVis )
endif()
--
GitLab
From 19b95184f3f1e0e7867f805cb1c15397da567f9a Mon Sep 17 00:00:00 2001
From: Nicholas Styles <nicholas.styles@desy.de>
Date: Thu, 19 Aug 2021 10:59:10 +0200
Subject: [PATCH 158/272] Clean up printouts
---
.../GeoModelXml/src/MulticopyProcessor.cxx | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/DetectorDescription/GeoModelXml/src/MulticopyProcessor.cxx b/DetectorDescription/GeoModelXml/src/MulticopyProcessor.cxx
index abf291e834b3..cbccfe6a23d7 100644
--- a/DetectorDescription/GeoModelXml/src/MulticopyProcessor.cxx
+++ b/DetectorDescription/GeoModelXml/src/MulticopyProcessor.cxx
@@ -236,11 +236,11 @@ DOMDocument *doc = element->getOwnerDocument();
objectProcessor->process(object, gmxUtil, toAdd);
if (alignable) {
- cout << "copy = " << copy << "; level = " << level << endl;
- cout << "\nAdd Alignable named " << endl;
- cout << ((GeoNameTag *) (toAdd[lastTransform + 1]))->getName() << endl;
- cout << " with id " << endl;
- cout << ((GeoIdentifierTag *) (toAdd[lastTransform + 2]))->getIdentifier() << endl;
+ msglog << MSG::DEBUG << "copy = " << copy << "; level = " << level <<"; ";
+ msglog << MSG::DEBUG << "Add Alignable named ";
+ msglog << MSG::DEBUG << ((GeoNameTag *) (toAdd[lastTransform + 1]))->getName();
+ msglog << MSG::DEBUG << " with id ";
+ msglog << MSG::DEBUG << ((GeoIdentifierTag *) (toAdd[lastTransform + 2]))->getIdentifier() << endmsg;
gmxUtil.positionIndex.incrementLevel(); // Logvol has unfortunately already decremented this; temp. restore it
gmxUtil.positionIndex.indices(index, gmxUtil.eval);
--
GitLab
From 7cf4616cffba84f290f033b4b09966182e0fd8be Mon Sep 17 00:00:00 2001
From: Andrew Mehta <andrew.mehta@cern.ch>
Date: Thu, 19 Aug 2021 09:22:11 +0000
Subject: [PATCH 159/272] Update version.txt
---
Projects/AnalysisBase/version.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Projects/AnalysisBase/version.txt b/Projects/AnalysisBase/version.txt
index bba25d9d92e1..35672aec1fc7 100644
--- a/Projects/AnalysisBase/version.txt
+++ b/Projects/AnalysisBase/version.txt
@@ -1 +1 @@
-22.2.38
+22.2.39
--
GitLab
From a9cebe8e0da1109b3c796b8ac7d5529cd22d5ed5 Mon Sep 17 00:00:00 2001
From: Andrew Mehta <andrew.mehta@cern.ch>
Date: Thu, 19 Aug 2021 09:22:22 +0000
Subject: [PATCH 160/272] Update version.txt
---
Projects/AthAnalysis/version.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Projects/AthAnalysis/version.txt b/Projects/AthAnalysis/version.txt
index bba25d9d92e1..35672aec1fc7 100644
--- a/Projects/AthAnalysis/version.txt
+++ b/Projects/AthAnalysis/version.txt
@@ -1 +1 @@
-22.2.38
+22.2.39
--
GitLab
From cd992f22d3ce924777c737d3ed86d1341746e2ac Mon Sep 17 00:00:00 2001
From: "Ewelina.Maria.Lobodzinska" <ewelina.maria.lobodzinska@cern.ch>
Date: Thu, 19 Aug 2021 11:51:19 +0200
Subject: [PATCH 161/272] PowhegControl: fix arguments for re.sub() in utility
function
---
Generators/PowhegControl/python/utility/file_parser.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Generators/PowhegControl/python/utility/file_parser.py b/Generators/PowhegControl/python/utility/file_parser.py
index 72e14a87aa11..0c61e2048175 100644
--- a/Generators/PowhegControl/python/utility/file_parser.py
+++ b/Generators/PowhegControl/python/utility/file_parser.py
@@ -50,7 +50,7 @@ class FileParser(object):
if regex_line_match is not None and not re.search(regex_line_match, line):
f_output.write(line)
continue
- new_line = c_regex_find.sub(regex_find, string_replace, line.rstrip(), count)
+ new_line = c_regex_find.sub(string_replace, line.rstrip(), count)
f_output.write(new_line + "\n")
replaced_lines += 1
os.remove("{}.text_replace_backup".format(input_file_name))
--
GitLab
From 90f878165c7328014192ae3a2c8cd6e38811ea0f Mon Sep 17 00:00:00 2001
From: abarton <Adam.Edward.Barton@cern.ch>
Date: Thu, 19 Aug 2021 10:52:45 +0100
Subject: [PATCH 162/272] Update IOVTime to use latest C++
---
Control/AthenaKernel/AthenaKernel/IOVRange.h | 10 +--
Control/AthenaKernel/AthenaKernel/IOVTime.h | 89 +++++++++++---------
Control/AthenaKernel/src/IOVRange.cxx | 13 ++-
Control/AthenaKernel/src/IOVTime.cxx | 46 ++--------
4 files changed, 66 insertions(+), 92 deletions(-)
diff --git a/Control/AthenaKernel/AthenaKernel/IOVRange.h b/Control/AthenaKernel/AthenaKernel/IOVRange.h
index 1809019abd4d..20189bf3f289 100644
--- a/Control/AthenaKernel/AthenaKernel/IOVRange.h
+++ b/Control/AthenaKernel/AthenaKernel/IOVRange.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ATHENAKERNEL_IOVRANGE_H
@@ -33,11 +33,11 @@ public:
IOVRange(): m_start(0),m_stop(0) {};
IOVRange( const IOVTime& start, const IOVTime& stop );
IOVRange( const EventIDRange& eir);
- IOVRange( const IOVRange& r ):m_start(r.m_start),m_stop(r.m_stop) {};
- IOVRange& operator= (const IOVRange& r);
+ IOVRange( const IOVRange& r ) = default;
+ IOVRange& operator= (const IOVRange& r) = default;
- IOVTime start() const { return m_start; }
- IOVTime stop() const { return m_stop; }
+ const IOVTime& start() const { return m_start; }
+ const IOVTime& stop() const { return m_stop; }
bool isInRange(const IOVTime& t) const {
return ( t>=m_start && t<m_stop );
diff --git a/Control/AthenaKernel/AthenaKernel/IOVTime.h b/Control/AthenaKernel/AthenaKernel/IOVTime.h
index 4550cdcee021..3091bb03393d 100644
--- a/Control/AthenaKernel/AthenaKernel/IOVTime.h
+++ b/Control/AthenaKernel/AthenaKernel/IOVTime.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ATHENAKERNEL_IOVTIME_H
@@ -20,6 +20,7 @@
#include <iosfwd>
#include <string>
#include <stdint.h>
+#include <limits>
class MsgStream;
class EventIDBase;
@@ -40,18 +41,22 @@ private:
};
public:
- static const uint32_t MINRUN;
- static const uint32_t MAXRUN;
+ static constexpr uint32_t MINRUN = std::numeric_limits<uint32_t>::min();
- static const uint32_t MINEVENT;
- static const uint32_t MAXEVENT;
+ // We remove the top bit from MAXRUN to allow use of this to set
+ // CondDBKey which has a sign bit
+ static constexpr uint32_t MAXRUN = (std::numeric_limits<uint32_t>::max() >> 1);
+
+ static constexpr uint32_t MINEVENT = std::numeric_limits<uint32_t>::min();
+ static constexpr uint32_t MAXEVENT = (std::numeric_limits<uint32_t>::max());
- static const uint64_t MAXRETIME;
- static const uint64_t UNDEFRETIME;
+ static constexpr uint64_t MAXRETIME =( ((uint64_t) IOVTime::MAXRUN << 32) + IOVTime::MAXEVENT );
+ static constexpr uint64_t UNDEFRETIME = std::numeric_limits<uint64_t>::max();
- static const uint64_t MINTIMESTAMP;
- static const uint64_t MAXTIMESTAMP;
- static const uint64_t UNDEFTIMESTAMP;
+ static constexpr uint64_t MINTIMESTAMP = std::numeric_limits<uint64_t>::min();
+ // Set MAXTIMESTAMP to 63 bit max
+ static constexpr uint64_t MAXTIMESTAMP = (std::numeric_limits<uint64_t>::max() >> 1);
+ static constexpr uint64_t UNDEFTIMESTAMP = std::numeric_limits<uint64_t>::max();
public:
/**
@@ -60,10 +65,10 @@ public:
*/
class SortByTimeStamp {
public:
- bool operator() ( const IOVTime& t1, const IOVTime& t2 ) const {
+ bool operator() ( const IOVTime& t1, const IOVTime& t2 ) const noexcept {
return t1.timestamp() > t2.timestamp();
}
- bool operator() ( const IOVTime* t1, const IOVTime* t2 ) const {
+ bool operator() ( const IOVTime* t1, const IOVTime* t2 ) const noexcept {
return t1->timestamp() > t2->timestamp();
}
};
@@ -74,10 +79,10 @@ public:
*/
class SortByRunEvent {
public:
- bool operator() ( const IOVTime& t1, const IOVTime& t2 ) const {
+ bool operator() ( const IOVTime& t1, const IOVTime& t2 ) const noexcept {
return t1.re_time() > t2.re_time();
}
- bool operator() ( const IOVTime* t1, const IOVTime* t2 ) const {
+ bool operator() ( const IOVTime* t1, const IOVTime* t2 ) const noexcept {
return t1->re_time() > t2->re_time();
}
};
@@ -85,39 +90,39 @@ public:
public:
IOVTime(): m_status(IOVTime::UNDEF), m_time(UNDEFRETIME),
m_timestamp(UNDEFTIMESTAMP){};
- IOVTime( const uint64_t& timestamp ): m_status(IOVTime::TIMESTAMP),
+ IOVTime( uint64_t timestamp ): m_status(IOVTime::TIMESTAMP),
m_time(IOVTime::UNDEFRETIME), m_timestamp(timestamp){};
- IOVTime( const uint32_t& run, const uint32_t& event );
- IOVTime( const uint32_t& run, const uint32_t& event,
- const uint64_t& timestamp );
+ IOVTime( uint32_t run, uint32_t event );
+ IOVTime( uint32_t run, uint32_t event,
+ uint64_t timestamp );
IOVTime( const EventIDBase& eid);
- void setTimestamp( const uint64_t& timestamp );
- void setRETime( const uint64_t& time );
- void setRunEvent( const uint32_t& run, const uint32_t& event );
- void reset();
+ void setTimestamp( uint64_t timestamp ) noexcept;
+ void setRETime( uint64_t time ) noexcept;
+ void setRunEvent( uint32_t run, uint32_t event ) noexcept;
+ void reset() noexcept;
- inline uint32_t run() const { return static_cast<uint32_t> (m_time>>32); }
- inline uint32_t event() const { return static_cast<uint32_t> (m_time & 0xFFFFFFFF); }
- inline uint64_t re_time() const { return m_time; }
- inline uint64_t timestamp() const { return m_timestamp; }
+ inline uint32_t run() const noexcept { return static_cast<uint32_t> (m_time>>32); }
+ inline uint32_t event() const noexcept { return static_cast<uint32_t> (m_time & 0xFFFFFFFF); }
+ inline uint64_t re_time() const noexcept { return m_time; }
+ inline uint64_t timestamp() const noexcept { return m_timestamp; }
- bool isValid() const;
- inline bool isTimestamp() const { return (m_status == IOVTime::TIMESTAMP ||
+ bool isValid() const noexcept;
+ inline bool isTimestamp() const noexcept { return (m_status == IOVTime::TIMESTAMP ||
m_status== IOVTime::BOTH) ? 1 : 0; }
- inline bool isRunEvent() const { return (m_status == IOVTime::RUN_EVT ||
+ inline bool isRunEvent() const noexcept { return (m_status == IOVTime::RUN_EVT ||
m_status == IOVTime::BOTH) ? 1 : 0; }
- inline bool isBoth() const { return (m_status == IOVTime::BOTH) ? 1 : 0; }
+ inline bool isBoth() const noexcept { return (m_status == IOVTime::BOTH) ? 1 : 0; }
operator std::string() const;
operator EventIDBase() const;
- friend bool operator<(const IOVTime& lhs, const IOVTime& rhs);
- friend bool operator>(const IOVTime& lhs, const IOVTime& rhs);
- friend bool operator==(const IOVTime& lhs, const IOVTime& rhs);
- friend bool operator!=(const IOVTime& lhs, const IOVTime& rhs);
- friend bool operator>=(const IOVTime& lhs, const IOVTime& rhs);
- friend bool operator<=(const IOVTime& lhs, const IOVTime& rhs);
+ friend bool operator<(const IOVTime& lhs, const IOVTime& rhs) noexcept;
+ friend bool operator>(const IOVTime& lhs, const IOVTime& rhs) noexcept;
+ friend bool operator==(const IOVTime& lhs, const IOVTime& rhs) noexcept;
+ friend bool operator!=(const IOVTime& lhs, const IOVTime& rhs) noexcept;
+ friend bool operator>=(const IOVTime& lhs, const IOVTime& rhs) noexcept;
+ friend bool operator<=(const IOVTime& lhs, const IOVTime& rhs) noexcept;
friend std::ostream& operator<<(std::ostream& os, const IOVTime& rhs);
friend MsgStream& operator<<(MsgStream& os, const IOVTime& rhs);
@@ -129,34 +134,34 @@ private:
uint64_t m_timestamp;
};
-inline bool operator<(const IOVTime& lhs, const IOVTime& rhs) {
+inline bool operator<(const IOVTime& lhs, const IOVTime& rhs) noexcept {
if (lhs.isTimestamp() && rhs.isTimestamp()) {
return lhs.m_timestamp < rhs.m_timestamp;
} else {
return lhs.m_time < rhs.m_time;
}
}
-inline bool operator>(const IOVTime& lhs, const IOVTime& rhs) {
+inline bool operator>(const IOVTime& lhs, const IOVTime& rhs) noexcept {
if (lhs.isTimestamp() && rhs.isTimestamp()) {
return lhs.m_timestamp > rhs.m_timestamp;
} else {
return lhs.m_time > rhs.m_time;
}
}
-inline bool operator==(const IOVTime& lhs, const IOVTime& rhs) {
+inline bool operator==(const IOVTime& lhs, const IOVTime& rhs) noexcept {
if (lhs.isTimestamp() && rhs.isTimestamp()) {
return lhs.m_timestamp == rhs.m_timestamp;
} else {
return lhs.m_time == rhs.m_time;
}
}
-inline bool operator!=(const IOVTime& lhs, const IOVTime& rhs) {
+inline bool operator!=(const IOVTime& lhs, const IOVTime& rhs) noexcept {
return !(lhs == rhs) ;
}
-inline bool operator>=(const IOVTime& lhs, const IOVTime& rhs) {
+inline bool operator>=(const IOVTime& lhs, const IOVTime& rhs) noexcept {
return !( lhs < rhs );
}
-inline bool operator<=(const IOVTime& lhs, const IOVTime& rhs) {
+inline bool operator<=(const IOVTime& lhs, const IOVTime& rhs) noexcept {
return !( lhs > rhs );
}
diff --git a/Control/AthenaKernel/src/IOVRange.cxx b/Control/AthenaKernel/src/IOVRange.cxx
index e1378dfffcda..0471bd5bdccb 100644
--- a/Control/AthenaKernel/src/IOVRange.cxx
+++ b/Control/AthenaKernel/src/IOVRange.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ATHENAKERNEL_IOVRANGE_H
@@ -31,15 +31,12 @@ IOVRange::IOVRange( const IOVTime& start, const IOVTime& stop ):
IOVRange::IOVRange( const EventIDRange& eir ):
m_start(eir.start()), m_stop(eir.stop()) {
+ static_assert(std::is_trivially_copyable<IOVRange>::value);
+ static_assert(std::is_trivially_destructible<IOVRange>::value);
+ static_assert(std::is_trivially_copyable<IOVTime>::value);
+ static_assert(std::is_trivially_destructible<IOVTime>::value);
}
-IOVRange& IOVRange::operator= (const IOVRange& r) {
- if (this != &r) {
- m_start = r.m_start;
- m_stop = r.m_stop;
- }
- return *this;
-}
IOVRange::operator EventIDRange() const {
return EventIDRange( EventIDBase(m_start), EventIDBase(m_stop) );
diff --git a/Control/AthenaKernel/src/IOVTime.cxx b/Control/AthenaKernel/src/IOVTime.cxx
index 74fb210aac39..b5adf6dcb823 100644
--- a/Control/AthenaKernel/src/IOVTime.cxx
+++ b/Control/AthenaKernel/src/IOVTime.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/*****************************************************************************
@@ -18,40 +18,12 @@
#include "AthenaKernel/IOVTime.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/EventIDBase.h"
-#include <limits>
-
-const uint32_t IOVTime::MINRUN =
- std::numeric_limits<uint32_t>::min();
-
-// We remove the top bit from MAXRUN to allow use of this to set
-// CondDBKey which has a sign bit
-const uint32_t IOVTime::MAXRUN =
- (std::numeric_limits<uint32_t>::max() >> 1);
-
-const uint32_t IOVTime::MINEVENT =
- std::numeric_limits<uint32_t>::min();
-const uint32_t IOVTime::MAXEVENT =
- (std::numeric_limits<uint32_t>::max());
-
-const uint64_t IOVTime::MAXRETIME =
- ( ((uint64_t) IOVTime::MAXRUN << 32) + IOVTime::MAXEVENT );
-const uint64_t IOVTime::UNDEFRETIME =
- std::numeric_limits<uint64_t>::max();
-
-const uint64_t IOVTime::MINTIMESTAMP =
- std::numeric_limits<uint64_t>::min();
-
-// Set MAXTIMESTAMP to 63 bit max
-const uint64_t IOVTime::MAXTIMESTAMP =
- (std::numeric_limits<uint64_t>::max() >> 1);
-const uint64_t IOVTime::UNDEFTIMESTAMP =
- std::numeric_limits<uint64_t>::max();
//
///////////////////////////////////////////////////////////////////////////
//
-IOVTime::IOVTime(const uint32_t& run, const uint32_t& event):
+IOVTime::IOVTime(uint32_t run, uint32_t event):
m_status(IOVTime::RUN_EVT),
m_timestamp(IOVTime::UNDEFTIMESTAMP)
{
@@ -60,8 +32,8 @@ IOVTime::IOVTime(const uint32_t& run, const uint32_t& event):
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-IOVTime::IOVTime(const uint32_t& run, const uint32_t& event,
- const uint64_t& time):
+IOVTime::IOVTime( uint32_t run, uint32_t event,
+ uint64_t time):
m_status(IOVTime::BOTH), m_timestamp(time)
{
m_time = ( (uint64_t) run << 32) + event;
@@ -97,7 +69,7 @@ IOVTime::IOVTime(const EventIDBase& eid)
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
void
-IOVTime::setTimestamp( const uint64_t& timestamp ) {
+IOVTime::setTimestamp( uint64_t timestamp ) noexcept {
if (isRunEvent()) {
m_status = IOVTime::BOTH;
} else {
@@ -109,7 +81,7 @@ IOVTime::setTimestamp( const uint64_t& timestamp ) {
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
void
-IOVTime::setRETime( const uint64_t& time ) {
+IOVTime::setRETime( uint64_t time ) noexcept {
if (isTimestamp()) {
m_status = IOVTime::BOTH;
} else {
@@ -121,7 +93,7 @@ IOVTime::setRETime( const uint64_t& time ) {
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
void
-IOVTime::setRunEvent( const uint32_t& run, const uint32_t& event ) {
+IOVTime::setRunEvent( uint32_t run, uint32_t event ) noexcept {
if (isTimestamp()) {
m_status = IOVTime::BOTH;
} else {
@@ -133,7 +105,7 @@ IOVTime::setRunEvent( const uint32_t& run, const uint32_t& event ) {
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
void
-IOVTime::reset() {
+IOVTime::reset() noexcept {
m_status = IOVTime::UNDEF;
m_time = IOVTime::UNDEFRETIME;
m_timestamp = IOVTime::UNDEFTIMESTAMP;
@@ -142,7 +114,7 @@ IOVTime::reset() {
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
bool
-IOVTime::isValid() const {
+IOVTime::isValid() const noexcept {
// Cannot have BOTH undefined
if (m_timestamp == IOVTime::UNDEFTIMESTAMP &&
--
GitLab
From 260eb1aa75324a078b435496aa0929eb4ca6621b Mon Sep 17 00:00:00 2001
From: Savanna Marie Shaw <savanna.marie.shaw@cern.ch>
Date: Thu, 19 Aug 2021 12:27:46 +0200
Subject: [PATCH 163/272] Update conditions used in trigger mulrt_staustau test
Switching back to the default conditions for the trigID_mulrt_staustau test, since it is using mc16 files as input so shouldn't be using the 2015 conditions. Fixes ATR-24011.
---
.../TrigInDetValidation/test/test_trigID_mulrt_staustau.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mulrt_staustau.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mulrt_staustau.py
index a31bca9a9a27..3927e6102120 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mulrt_staustau.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mulrt_staustau.py
@@ -37,7 +37,7 @@ Release = "current"
ExtraAna = ' -c LRT="True" '
-preinclude_file = 'all:TrigInDetValidation/TIDV_cond_fix.py,TrigInDetValidation/TIDAlrt_preinclude.py' #conditions fix for ATR-23982. In future find a more recent RDO
+preinclude_file = 'all:TrigInDetValidation/TIDAlrt_preinclude.py'
Jobs = [ ( "Truth", " TIDAdata-run3-lrt.dat -o data-hists.root -p 13", "Test_bin_lrt.dat" ),
--
GitLab
From c09895e800f6a020f68953a925eeb9f1a68979e4 Mon Sep 17 00:00:00 2001
From: Tim Martin <Tim.Martin@cern.ch>
Date: Thu, 19 Aug 2021 13:37:28 +0200
Subject: [PATCH 164/272] Demote not-overwriting message from ERROR to WARNING
---
.../TrigSerializeCnvSvc/TrigSerializeConverter.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Trigger/TrigDataAccess/TrigSerializeCnvSvc/TrigSerializeCnvSvc/TrigSerializeConverter.h b/Trigger/TrigDataAccess/TrigSerializeCnvSvc/TrigSerializeCnvSvc/TrigSerializeConverter.h
index d84d34a05a00..dce0e068fce7 100755
--- a/Trigger/TrigDataAccess/TrigSerializeCnvSvc/TrigSerializeCnvSvc/TrigSerializeConverter.h
+++ b/Trigger/TrigDataAccess/TrigSerializeCnvSvc/TrigSerializeCnvSvc/TrigSerializeConverter.h
@@ -151,7 +151,7 @@ public:
void *ptr( 0 );
if( m_log->level() <= MSG::DEBUG ) {
- *m_log << MSG::DEBUG << "In createObj for : " << clname << " normalized to " << normalized << endmsg;
+ *m_log << MSG::DEBUG << "In createObj for : " << clname << " normalized to " << normalized << endmsg;
}
StatusCode sc = m_convHelper->createObj( normalized, iAddr, ptr, typeIsxAOD);
@@ -176,7 +176,7 @@ public:
TrigStreamAddress *addr = dynamic_cast< TrigStreamAddress* >( iAddr );
if( addr ) {
if( m_sgsvc->contains< DATA >( addr->sgkey() ) ) {
- *m_log << MSG::ERROR << "TrigSerializeConverter::createObj object "
+ *m_log << MSG::WARNING << "TrigSerializeConverter::createObj object "
<< clname << " / " << addr->sgkey()
<< " is already in the store; not overwriting"
<< endmsg;
--
GitLab
From c55e6c49b66676d9b672c22b503cc2aaac690d48 Mon Sep 17 00:00:00 2001
From: tbuanes <trygve@buanes.net>
Date: Thu, 19 Aug 2021 13:59:15 +0200
Subject: [PATCH 165/272] Move CI check of trigger counts on data from
TriggerTest to TrigP1Test
---
.../share/ref_v1Dev_decodeBS_build.ref} | 2221 ++++++++++-------
.../test/test_trigP1_v1Dev_decodeBS_build.py | 13 +-
.../TrigValTools/bin/runTrigART.py | 2 +-
.../TrigValidation/TriggerTest/CMakeLists.txt | 1 -
.../test/test_trig_data_v1Dev_build.py | 11 -
5 files changed, 1290 insertions(+), 958 deletions(-)
rename Trigger/TrigValidation/{TriggerTest/share/ref_data_v1Dev_build.ref => TrigP1Test/share/ref_v1Dev_decodeBS_build.ref} (91%)
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
similarity index 91%
rename from Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
rename to Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
index 8c2809b16d6e..1ca2a74268aa 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
@@ -25,15 +25,15 @@ HLT_2e5_lhmedium_j70_0eta320_j50_0eta490_j0_DJMASS900j50_L1MJJ-500-NFF:
HLT_2e5_lhvloose_bBeeM6000_L12EM3:
eventCount: 0
stepCounts:
- 0: 7
- 1: 1
- 2: 1
- 3: 1
- stepFeatures:
- 0: 20
- 1: 19
+ 0: 14
+ 1: 3
2: 2
3: 2
+ stepFeatures:
+ 0: 47
+ 1: 49
+ 2: 4
+ 3: 4
HLT_2g10_loose_mu20_L1MU20:
eventCount: 0
HLT_2g15_loose_25dphiAA_invmAA80_L1DPHI-M70-2eEM12M:
@@ -79,10 +79,10 @@ HLT_2j135_mb_afprec_afpdijet_L1CEP-CJ60:
HLT_2j20_mb_afprec_afpdijet_L1RD0_FILLED:
eventCount: 0
stepCounts:
- 0: 15
+ 0: 40
stepFeatures:
- 0: 55
- 1: 15
+ 0: 172
+ 1: 40
HLT_2j250_ftf_0eta240_j120_ftf_0eta240_L1J100:
eventCount: 0
HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_L1J100:
@@ -601,15 +601,15 @@ HLT_e10_lhmedium_ivarloose_j70_0eta320_j50_0eta490_j0_DJMASS900j50_L1MJJ-500-NFF
HLT_e10_lhvloose_L1EM7:
eventCount: 0
stepCounts:
- 0: 2
- 1: 2
- 2: 1
- 3: 1
- stepFeatures:
- 0: 2
+ 0: 7
1: 6
- 2: 1
- 3: 1
+ 2: 2
+ 3: 2
+ stepFeatures:
+ 0: 8
+ 1: 17
+ 2: 2
+ 3: 2
HLT_e120_etcut_L1EM22VHI:
eventCount: 0
HLT_e120_lhvloose_L1EM22VHI:
@@ -628,24 +628,32 @@ HLT_e140_lhloose_noringer_L1EM22VHI:
eventCount: 0
HLT_e14_lhtight_e4_etcut_1invmAB3_L1JPSI-1M5-EM12:
eventCount: 0
+ stepFeatures:
+ 0: 6
HLT_e14_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM12:
eventCount: 0
+ stepFeatures:
+ 0: 6
HLT_e14_lhtight_e4_etcut_probe_1invmAB3_L1JPSI-1M5-EM12:
eventCount: 0
HLT_e14_lhtight_noringer_e4_etcut_1invmAB3_L1JPSI-1M5-EM12:
eventCount: 0
+ stepFeatures:
+ 0: 6
HLT_e14_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM12:
eventCount: 0
+ stepFeatures:
+ 0: 6
HLT_e14_lhtight_noringer_e4_etcut_probe_1invmAB3_L1JPSI-1M5-EM12:
eventCount: 0
HLT_e15_lhvloose_L1EM10VH:
eventCount: 0
stepCounts:
- 0: 1
- 1: 1
+ 0: 4
+ 1: 2
stepFeatures:
- 0: 1
- 1: 4
+ 0: 4
+ 1: 5
HLT_e17_lhloose_mu14_L1EM15VH_MU10:
eventCount: 0
HLT_e17_lhmedium_ivarloose_tau25_medium1_tracktwo_03dRAB_L1EM15VHI_2TAU12IM_4J12:
@@ -660,6 +668,10 @@ HLT_e17_lhmedium_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1EM15VHI_2TAU12IM
eventCount: 0
HLT_e20_lhloose_L1EM7:
eventCount: 0
+ stepCounts:
+ 0: 2
+ stepFeatures:
+ 0: 2
HLT_e20_lhloose_L1EM7_AFP_A_AND_C:
eventCount: 0
HLT_e20_lhloose_L1EM7_AFP_A_OR_C:
@@ -668,6 +680,10 @@ HLT_e20_lhtight_ivarloose_L1ZAFB-25DPHI-eEM18M:
eventCount: 0
HLT_e20_lhvloose_L1EM15VH:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 1
HLT_e24_lhmedium_g12_loose_g12_loose_02dRAB_02dRAC_L1EM20VH_3EM10VH:
eventCount: 0
HLT_e24_lhmedium_g25_medium_02dRAB_L12EM20VH:
@@ -719,19 +735,19 @@ HLT_e26_lhtight_L1EM22VHI:
HLT_e26_lhtight_e15_etcut_50invmAB130_L1EM22VHI:
eventCount: 0
stepFeatures:
- 0: 1
+ 0: 5
HLT_e26_lhtight_e15_etcut_L1EM22VHI:
eventCount: 0
stepFeatures:
- 0: 1
+ 0: 5
HLT_e26_lhtight_e15_etcut_Zee_L1EM22VHI:
eventCount: 0
stepFeatures:
- 0: 1
+ 0: 5
HLT_e26_lhtight_e15_etcut_idperf_Zee_L1EM22VHI:
eventCount: 0
stepFeatures:
- 0: 1
+ 0: 5
HLT_e26_lhtight_e15_etcut_probe_50invmAB130_L1EM22VHI:
eventCount: 0
HLT_e26_lhtight_ivarloose_2j20_0eta290_020jvt_pf_ftf_boffperf_L1EM22VHI:
@@ -782,6 +798,12 @@ HLT_e26_lhtight_ivarloose_e9_lhtight_probe_L1EM22VHI:
eventCount: 0
HLT_e26_lhtight_ivarloose_noringer_L1EM22VHI:
eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ stepFeatures:
+ 0: 1
+ 1: 1
HLT_e26_lhtight_ivarloose_tau100_mediumRNN_tracktwoLLP_03dRAB_L1EM22VHI:
eventCount: 0
HLT_e26_lhtight_ivarloose_tau160_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI:
@@ -839,162 +861,216 @@ HLT_e50_etcut_L1EM22VHI:
HLT_e5_dnnloose_L1EM3:
eventCount: 0
stepCounts:
- 0: 10
- 1: 8
- 2: 4
- 3: 4
+ 0: 27
+ 1: 17
+ 2: 10
+ 3: 10
stepFeatures:
- 0: 19
- 1: 22
- 2: 5
- 3: 5
+ 0: 47
+ 1: 62
+ 2: 13
+ 3: 12
HLT_e5_dnnmedium_L1EM3:
eventCount: 0
stepCounts:
- 0: 10
- 1: 9
- 2: 4
- 3: 4
+ 0: 27
+ 1: 18
+ 2: 10
+ 3: 10
stepFeatures:
- 0: 21
- 1: 24
- 2: 5
- 3: 5
+ 0: 48
+ 1: 62
+ 2: 13
+ 3: 12
HLT_e5_dnntight_L1EM3:
eventCount: 0
stepCounts:
- 0: 9
- 1: 7
- 2: 3
- 3: 3
+ 0: 24
+ 1: 15
+ 2: 8
+ 3: 8
stepFeatures:
- 0: 17
- 1: 17
- 2: 3
- 3: 3
+ 0: 41
+ 1: 51
+ 2: 10
+ 3: 9
HLT_e5_etcut_L1eEM3:
- eventCount: 10
+ eventCount: 34
stepCounts:
- 0: 17
- 1: 14
- 2: 10
- 3: 10
+ 0: 46
+ 1: 39
+ 2: 34
+ 3: 34
stepFeatures:
- 0: 112
- 1: 71
- 2: 47
- 3: 41
+ 0: 332
+ 1: 303
+ 2: 177
+ 3: 140
HLT_e5_idperf_gsf_tight_L1EM3:
- eventCount: 4
+ eventCount: 11
stepCounts:
- 0: 9
- 1: 8
- 2: 4
- 3: 4
- 4: 4
- stepFeatures:
- 0: 17
- 1: 13
- 2: 5
- 3: 5
- 4: 5
+ 0: 24
+ 1: 19
+ 2: 11
+ 3: 11
+ 4: 11
+ stepFeatures:
+ 0: 41
+ 1: 30
+ 2: 14
+ 3: 13
+ 4: 13
HLT_e5_idperf_loose_L1EM3:
- eventCount: 5
+ eventCount: 13
stepCounts:
- 0: 10
- 1: 9
- 2: 5
- 3: 5
- 4: 5
- stepFeatures:
- 0: 19
- 1: 15
- 2: 7
- 3: 7
- 4: 7
+ 0: 27
+ 1: 21
+ 2: 13
+ 3: 13
+ 4: 13
+ stepFeatures:
+ 0: 47
+ 1: 35
+ 2: 17
+ 3: 16
+ 4: 16
HLT_e5_idperf_loose_lrtloose_L1EM3:
- eventCount: 6
+ eventCount: 15
stepCounts:
- 0: 10
- 1: 9
- 2: 6
- 3: 6
- 4: 6
- stepFeatures:
- 0: 19
- 1: 18
- 2: 8
- 3: 8
- 4: 8
+ 0: 27
+ 1: 26
+ 2: 15
+ 3: 15
+ 4: 15
+ stepFeatures:
+ 0: 47
+ 1: 46
+ 2: 21
+ 3: 20
+ 4: 20
HLT_e5_idperf_medium_L1EM3:
- eventCount: 5
+ eventCount: 13
stepCounts:
- 0: 10
- 1: 9
- 2: 5
- 3: 5
- 4: 5
- stepFeatures:
- 0: 21
- 1: 17
- 2: 7
- 3: 7
- 4: 7
+ 0: 27
+ 1: 21
+ 2: 13
+ 3: 13
+ 4: 13
+ stepFeatures:
+ 0: 48
+ 1: 36
+ 2: 17
+ 3: 16
+ 4: 16
HLT_e5_idperf_tight_L1EM3:
- eventCount: 4
+ eventCount: 11
stepCounts:
- 0: 9
- 1: 8
- 2: 4
- 3: 4
- 4: 4
- stepFeatures:
- 0: 17
- 1: 13
- 2: 5
- 3: 5
- 4: 5
+ 0: 24
+ 1: 19
+ 2: 11
+ 3: 11
+ 4: 11
+ stepFeatures:
+ 0: 41
+ 1: 30
+ 2: 14
+ 3: 13
+ 4: 13
HLT_e5_lhtight_e14_etcut_1invmAB3_L1JPSI-1M5-EM12:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
+ 1: 7
HLT_e5_lhtight_e14_etcut_Jpsiee_L1JPSI-1M5-EM12:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
+ 1: 7
HLT_e5_lhtight_e14_etcut_probe_1invmAB3_L1JPSI-1M5-EM12:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 1
HLT_e5_lhtight_e9_etcut_1invmAB3_L1JPSI-1M5-EM7:
eventCount: 0
+ stepCounts:
+ 0: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 7
HLT_e5_lhtight_e9_etcut_Jpsiee_L1JPSI-1M5-EM7:
eventCount: 0
+ stepCounts:
+ 0: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 7
HLT_e5_lhtight_e9_etcut_probe_1invmAB3_L1JPSI-1M5-EM7:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 2
1: 1
2: 1
3: 1
stepFeatures:
- 0: 3
+ 0: 4
1: 6
2: 1
3: 1
HLT_e5_lhtight_noringer_e14_etcut_1invmAB3_L1JPSI-1M5-EM12:
eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 4
+ 1: 11
+ 2: 2
+ 3: 2
HLT_e5_lhtight_noringer_e14_etcut_Jpsiee_L1JPSI-1M5-EM12:
eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 4
+ 1: 11
+ 2: 2
+ 3: 2
HLT_e5_lhtight_noringer_e14_etcut_probe_1invmAB3_L1JPSI-1M5-EM12:
eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 3
+ 1: 4
+ 2: 1
+ 3: 1
HLT_e5_lhtight_noringer_e9_etcut_1invmAB3_L1JPSI-1M5-EM7:
eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
stepFeatures:
- 0: 2
+ 0: 6
+ 1: 11
+ 2: 4
+ 3: 2
HLT_e5_lhtight_noringer_e9_etcut_Jpsiee_L1JPSI-1M5-EM7:
- eventCount: 0
- stepFeatures:
- 0: 2
-HLT_e5_lhtight_noringer_e9_etcut_probe_1invmAB3_L1JPSI-1M5-EM7:
eventCount: 0
stepCounts:
0: 1
@@ -1002,10 +1078,22 @@ HLT_e5_lhtight_noringer_e9_etcut_probe_1invmAB3_L1JPSI-1M5-EM7:
2: 1
3: 1
stepFeatures:
+ 0: 6
+ 1: 11
+ 2: 4
+ 3: 2
+HLT_e5_lhtight_noringer_e9_etcut_probe_1invmAB3_L1JPSI-1M5-EM7:
+ eventCount: 0
+ stepCounts:
0: 2
- 1: 4
- 2: 1
- 3: 1
+ 1: 2
+ 2: 2
+ 3: 2
+ stepFeatures:
+ 0: 5
+ 1: 8
+ 2: 2
+ 3: 2
HLT_e5_lhvloose_j70_0eta320_j50_0eta490_j0_DJMASS1000j50_xe50_tcpufit_L1MJJ-500-NFF:
eventCount: 0
HLT_e5_lhvloose_nopix_lrtloose_idperf_probe_g25_medium_L1EM20VH:
@@ -1037,61 +1125,61 @@ HLT_e80_lhvloose_L1EM22VHI:
HLT_e9_lhtight_e4_etcut_1invmAB3_L1JPSI-1M5-EM7:
eventCount: 0
stepFeatures:
- 0: 5
+ 0: 11
HLT_e9_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM7:
eventCount: 0
stepFeatures:
- 0: 5
+ 0: 11
HLT_e9_lhtight_e4_etcut_L1JPSI-1M5-EM7:
eventCount: 0
stepFeatures:
- 0: 5
+ 0: 11
HLT_e9_lhtight_e4_etcut_probe_1invmAB3_L1JPSI-1M5-EM7:
eventCount: 0
HLT_e9_lhtight_noringer_e4_etcut_1invmAB3_L1JPSI-1M5-EM7:
eventCount: 0
stepFeatures:
- 0: 5
+ 0: 11
HLT_e9_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM7:
eventCount: 0
stepFeatures:
- 0: 5
+ 0: 11
HLT_e9_lhtight_noringer_e4_etcut_probe_1invmAB3_L1JPSI-1M5-EM7:
eventCount: 0
HLT_e9_lhvloose_mu20_mu8noL1_L1MU20:
eventCount: 0
HLT_eb_low_L1RD2_FILLED:
- eventCount: 10
+ eventCount: 29
stepCounts:
- 0: 10
+ 0: 29
stepFeatures:
- 0: 10
+ 0: 29
HLT_eb_medium_L1RD2_FILLED:
- eventCount: 6
+ eventCount: 15
stepCounts:
- 0: 6
+ 0: 15
stepFeatures:
- 0: 6
+ 0: 15
HLT_g0_hiptrt_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 5
stepFeatures:
- 0: 1
+ 0: 5
HLT_g100_loose_L1EM22VHI:
eventCount: 0
HLT_g10_loose_L1EM7:
- eventCount: 1
+ eventCount: 5
stepCounts:
- 0: 6
- 1: 5
- 2: 4
- 3: 1
+ 0: 22
+ 1: 15
+ 2: 12
+ 3: 5
stepFeatures:
- 0: 8
- 1: 5
- 2: 5
- 3: 1
+ 0: 27
+ 1: 16
+ 2: 13
+ 3: 5
HLT_g120_loose_L1EM22VHI:
eventCount: 0
HLT_g12_loose_LArPEBHLT_L1EM10VH:
@@ -1107,109 +1195,125 @@ HLT_g15_loose_2mu10_msonly_L1MU4_UNPAIRED_ISO:
HLT_g15_loose_2mu10_msonly_L1MU6_EMPTY:
eventCount: 0
HLT_g15_loose_L1EM10VH:
- eventCount: 1
+ eventCount: 5
stepCounts:
- 0: 4
- 1: 2
- 2: 2
- 3: 1
+ 0: 14
+ 1: 10
+ 2: 8
+ 3: 5
stepFeatures:
- 0: 4
- 1: 2
- 2: 2
- 3: 1
+ 0: 14
+ 1: 10
+ 2: 8
+ 3: 5
HLT_g15_tight_L1EM10VH:
eventCount: 0
stepCounts:
- 0: 4
- 1: 2
- 2: 2
+ 0: 14
+ 1: 10
+ 2: 8
stepFeatures:
- 0: 4
- 1: 2
- 2: 2
+ 0: 14
+ 1: 10
+ 2: 8
HLT_g20_loose_L1EM15VH:
- eventCount: 1
+ eventCount: 3
stepCounts:
- 0: 4
- 1: 2
- 2: 1
- 3: 1
+ 0: 10
+ 1: 7
+ 2: 4
+ 3: 3
stepFeatures:
- 0: 4
- 1: 2
- 2: 1
- 3: 1
+ 0: 10
+ 1: 7
+ 2: 4
+ 3: 3
HLT_g20_loose_LArPEBHLT_L1EM15:
eventCount: 0
HLT_g20_tight_L1EM15VHI:
eventCount: 0
stepCounts:
- 0: 2
- 1: 1
- 2: 1
+ 0: 7
+ 1: 6
+ 2: 4
stepFeatures:
- 0: 2
- 1: 1
- 2: 1
+ 0: 7
+ 1: 6
+ 2: 4
HLT_g20_tight_icaloloose_L1EM15VHI:
eventCount: 0
stepCounts:
- 0: 2
- 1: 1
- 2: 1
+ 0: 7
+ 1: 6
+ 2: 4
stepFeatures:
- 0: 2
- 1: 1
- 2: 1
+ 0: 7
+ 1: 6
+ 2: 4
HLT_g20_tight_icaloloose_j35_pf_ftf_bdl1r77_3j35_pf_ftf_0eta490_j0_pf_ftf_DJMASS500j35_L1EM18VHI_MJJ-300:
eventCount: 0
HLT_g22_tight_L1EM15VHI:
eventCount: 0
stepCounts:
- 0: 2
- 1: 1
- 2: 1
+ 0: 6
+ 1: 5
+ 2: 3
stepFeatures:
- 0: 2
- 1: 1
- 2: 1
+ 0: 6
+ 1: 5
+ 2: 3
HLT_g250_etcut_L1EM22VHI:
eventCount: 0
HLT_g25_loose_L1EM20VH:
eventCount: 0
stepCounts:
- 0: 3
- 1: 1
+ 0: 7
+ 1: 4
+ 2: 1
stepFeatures:
- 0: 3
- 1: 1
+ 0: 7
+ 1: 4
+ 2: 1
HLT_g25_medium_2j35_pf_ftf_0eta490_bdl1r77_2j35_pf_ftf_0eta490_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
stepFeatures:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
HLT_g25_medium_4j35_0eta490_j0_DJMASS1000j35_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
stepFeatures:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
HLT_g25_medium_L1EM20VH:
eventCount: 0
stepCounts:
- 0: 3
- 1: 1
+ 0: 7
+ 1: 4
+ 2: 1
stepFeatures:
- 0: 3
- 1: 1
+ 0: 7
+ 1: 4
+ 2: 1
HLT_g25_medium_j35_pf_ftf_0eta490_bdl1r77_3j35_pf_ftf_0eta490_j0_pf_ftf_DJMASS700j35_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
stepFeatures:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
HLT_g25_medium_mu24_L1MU20:
eventCount: 0
HLT_g25_medium_mu24_ivarmedium_L1MU20:
@@ -1217,107 +1321,175 @@ HLT_g25_medium_mu24_ivarmedium_L1MU20:
HLT_g25_medium_tau25_dikaonmass_tracktwoMVABDT_50invmAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
stepFeatures:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
HLT_g25_medium_tau25_dikaonmass_tracktwoMVA_50invmAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
stepFeatures:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
HLT_g25_medium_tau25_dipion1_tracktwoMVABDT_50invmAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
stepFeatures:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
HLT_g25_medium_tau25_dipion1_tracktwoMVA_50invmAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
stepFeatures:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
HLT_g25_medium_tau25_dipion2_tracktwoMVABDT_50invmAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
stepFeatures:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
HLT_g25_medium_tau25_dipion2_tracktwoMVA_50invmAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
stepFeatures:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
HLT_g25_medium_tau25_dipion4_tracktwoMVABDT_50invmAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
stepFeatures:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
HLT_g25_medium_tau25_dipion4_tracktwoMVA_50invmAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
stepFeatures:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
HLT_g25_medium_tau25_kaonpi1_tracktwoMVABDT_50invmAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
stepFeatures:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
HLT_g25_medium_tau25_kaonpi1_tracktwoMVA_50invmAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
stepFeatures:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
HLT_g25_medium_tau25_kaonpi2_tracktwoMVABDT_50invmAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
stepFeatures:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
HLT_g25_medium_tau25_kaonpi2_tracktwoMVA_50invmAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
stepFeatures:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
HLT_g25_medium_tau25_singlepion_tracktwoMVABDT_50invmAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
stepFeatures:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
HLT_g25_medium_tau25_singlepion_tracktwoMVA_50invmAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
stepFeatures:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
HLT_g25_tight_icalotight_xe40_cell_xe40_tcpufit_xe40_pfopufit_18dphiAB_18dphiAC_80mTAC_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
stepFeatures:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
HLT_g25_tight_icalotight_xe40_cell_xe50_tcpufit_18dphiAB_18dphiAC_80mTAC_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
stepFeatures:
- 0: 1
+ 0: 4
+ 1: 3
+ 2: 1
HLT_g300_etcut_L1EM22VHI:
eventCount: 0
HLT_g30_loose_L1EM20VH:
eventCount: 0
stepCounts:
- 0: 2
+ 0: 4
+ 1: 1
+ 2: 1
stepFeatures:
- 0: 2
+ 0: 4
+ 1: 1
+ 2: 1
HLT_g35_loose_3j25_pf_ftf_L1EM22VHI:
eventCount: 0
HLT_g35_loose_L1EM22VHI:
@@ -1337,9 +1509,9 @@ HLT_g35_medium_3j25_pf_ftf_L1EM22VHI:
HLT_g35_medium_L1EM20VH:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 2
stepFeatures:
- 0: 1
+ 0: 2
HLT_g35_medium_L1EM22VHI:
eventCount: 0
HLT_g35_medium_g25_medium_L12EM20VH:
@@ -1393,29 +1565,29 @@ HLT_g85_tight_3j50_L1EM22VHI:
HLT_g90_loose_xe90_cell_L1EM22VHI:
eventCount: 0
HLT_j0_DIJET20j12etXX110djmass_L1J20:
- eventCount: 5
+ eventCount: 13
stepCounts:
- 0: 5
+ 0: 13
stepFeatures:
- 0: 18
+ 0: 57
HLT_j0_DIJET20j12etXX110djmass_PTRANGE2r3_L1J20:
- eventCount: 1
+ eventCount: 5
stepCounts:
- 0: 1
+ 0: 5
stepFeatures:
- 0: 2
+ 0: 10
HLT_j0_DIJET20j12ptXX110djmass_L1J20:
- eventCount: 5
+ eventCount: 13
stepCounts:
- 0: 5
+ 0: 13
stepFeatures:
- 0: 18
+ 0: 57
HLT_j0_DIJET20j12ptXX110djmass_PTRANGE2r3_L1J20:
- eventCount: 1
+ eventCount: 5
stepCounts:
- 0: 1
+ 0: 5
stepFeatures:
- 0: 2
+ 0: 10
HLT_j0_DIJET70j12etXX1000djmassXXdjdphi200XX400djdeta_L1J20:
eventCount: 0
HLT_j0_DIJET70j12ptXX1000djmassXXdjdphi200XX400djdeta_L1J20:
@@ -1465,47 +1637,47 @@ HLT_j0_perf_L1RD0_FILLED:
HLT_j0_perf_pf_ftf_L1RD0_FILLED:
eventCount: 0
HLT_j0_pf_ftf_HT50XX010jvt_L1J20:
- eventCount: 5
+ eventCount: 14
stepCounts:
- 0: 5
- 1: 5
+ 0: 16
+ 1: 14
stepFeatures:
- 0: 5
- 1: 8
+ 0: 16
+ 1: 32
HLT_j0_pf_ftf_HT50XX30etXX010jvt_L1J20:
- eventCount: 5
+ eventCount: 14
stepCounts:
- 0: 5
- 1: 5
+ 0: 16
+ 1: 14
stepFeatures:
- 0: 5
- 1: 8
+ 0: 16
+ 1: 32
HLT_j0_pf_ftf_HT50XX30et_L1J20:
- eventCount: 5
+ eventCount: 14
stepCounts:
- 0: 5
- 1: 5
+ 0: 16
+ 1: 14
stepFeatures:
- 0: 5
- 1: 8
+ 0: 16
+ 1: 34
HLT_j0_pf_ftf_HT50_L1J20:
- eventCount: 5
+ eventCount: 14
stepCounts:
- 0: 5
- 1: 5
+ 0: 16
+ 1: 14
stepFeatures:
- 0: 5
- 1: 8
+ 0: 16
+ 1: 34
HLT_j100_0eta290_020jvt_pf_ftf_boffperf_L1J50:
- eventCount: 1
+ eventCount: 2
stepCounts:
- 0: 2
- 1: 1
- 2: 1
+ 0: 4
+ 1: 2
+ 2: 2
stepFeatures:
- 0: 2
- 1: 1
- 2: 1
+ 0: 4
+ 1: 3
+ 2: 3
HLT_j100_pf_ftf_0eta320_j20_0eta290_pf_ftf_boffperf_L1HT190-J15s5pETA21:
eventCount: 0
HLT_j100_pf_ftf_bdl1r60_xe50_cell_xe85_pfopufit_L1XE55:
@@ -1539,39 +1711,43 @@ HLT_j110_a10r_subjesIS_ftf_0eta200_TracklessdR1p2_L1J100:
HLT_j110_a10r_subjesIS_ftf_0eta200_TracklessdR1p2_L1SC111-CJ15:
eventCount: 0
HLT_j110_a10sd_cssk_pf_jes_ftf_L1J30:
- eventCount: 3
+ eventCount: 4
stepCounts:
- 0: 4
- 1: 3
+ 0: 7
+ 1: 4
stepFeatures:
- 0: 4
- 1: 3
+ 0: 7
+ 1: 5
HLT_j110_a10t_lcw_jes_L1J30:
- eventCount: 2
+ eventCount: 4
stepCounts:
- 0: 2
+ 0: 4
stepFeatures:
- 0: 2
+ 0: 6
HLT_j110_pf_ftf_preselj20_L1J30:
- eventCount: 1
+ eventCount: 2
stepCounts:
- 0: 4
- 1: 1
+ 0: 7
+ 1: 2
stepFeatures:
- 0: 4
- 1: 1
+ 0: 7
+ 1: 2
HLT_j110_subjesgscIS_ftf_bdl1r60_j45_subjesgscIS_ftf_bdl1r70_L1J50:
eventCount: 0
stepCounts:
- 0: 2
- stepFeatures:
0: 4
+ 1: 1
+ stepFeatures:
+ 0: 8
+ 1: 3
HLT_j110_subjesgscIS_ftf_j45_subjesgscIS_ftf_L1J50:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 2
- stepFeatures:
0: 4
+ 1: 1
+ stepFeatures:
+ 0: 8
+ 1: 3
HLT_j120_mb_afprec_afpdijet_L1AFP_A_AND_C_TOF_J50:
eventCount: 0
HLT_j135_L1J100:
@@ -1585,19 +1761,19 @@ HLT_j150_0eta320_pf_ftf_2j55_0eta290_020jvt_pf_ftf_bdl1r70_L1J85_3J30:
HLT_j150_ftf_2j55_ftf_L1J85_3J30:
eventCount: 0
HLT_j15_320eta490_L1RD0_FILLED:
- eventCount: 2
+ eventCount: 10
stepCounts:
- 0: 2
+ 0: 10
stepFeatures:
- 0: 3
+ 0: 12
HLT_j15_pf_ftf_L1RD0_FILLED:
- eventCount: 18
+ eventCount: 46
stepCounts:
- 0: 20
- 1: 18
+ 0: 50
+ 1: 46
stepFeatures:
- 0: 20
- 1: 77
+ 0: 50
+ 1: 220
HLT_j165_LArPEBHLT_L1J100:
eventCount: 0
HLT_j175_0eta290_020jvt_pf_ftf_bdl1r60_j60_0eta290_020jvt_pf_ftf_bdl1r60_L1J100:
@@ -1627,9 +1803,9 @@ HLT_j175_a10r_subjesIS_ftf_0eta200_TracklessdR1p2_L1SC111-CJ15:
HLT_j175_a10sd_cssk_pf_jes_ftf_L1J50:
eventCount: 0
stepCounts:
- 0: 2
+ 0: 4
stepFeatures:
- 0: 2
+ 0: 4
HLT_j175_a10t_lcw_jes_L1J50:
eventCount: 0
HLT_j175_mb_afprec_afpdijet_L1AFP_A_AND_C_TOF_J75:
@@ -1637,23 +1813,23 @@ HLT_j175_mb_afprec_afpdijet_L1AFP_A_AND_C_TOF_J75:
HLT_j175_pf_ftf_preselj20_L1J50:
eventCount: 0
stepCounts:
- 0: 2
+ 0: 4
stepFeatures:
- 0: 2
+ 0: 4
HLT_j180_L1J100:
eventCount: 0
HLT_j200_0eta290_020jvt_pf_ftf_boffperf_L1J100:
eventCount: 0
HLT_j20_0eta290_020jvt_pf_ftf_boffperf_L1J15:
- eventCount: 7
+ eventCount: 20
stepCounts:
- 0: 7
- 1: 7
- 2: 7
+ 0: 22
+ 1: 20
+ 2: 20
stepFeatures:
- 0: 7
- 1: 22
- 2: 22
+ 0: 22
+ 1: 60
+ 2: 60
HLT_j20_0eta290_pf_ftf_boffperf_L1HT190-J15s5pETA21:
eventCount: 0
HLT_j20_JetDS_L1HT190-J15s5pETA21:
@@ -1661,7 +1837,15 @@ HLT_j20_JetDS_L1HT190-J15s5pETA21:
HLT_j20_JetDS_L1J100:
eventCount: 0
HLT_j20_JetDS_L1J50_DETA20-J50J:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ stepFeatures:
+ 0: 6
+ 1: 6
+ 2: 1
HLT_j225_0eta290_020jvt_pf_ftf_bmv2c1040_L1J100:
eventCount: 0
HLT_j225_0eta290_pf_ftf_bdl1r60_L1J100:
@@ -1675,19 +1859,19 @@ HLT_j225_0eta290_pf_ftf_bdl1r85_L1J100:
HLT_j225_L1J100:
eventCount: 0
HLT_j25_320eta490_L1RD0_FILLED:
- eventCount: 1
+ eventCount: 3
stepCounts:
- 0: 1
+ 0: 3
stepFeatures:
- 0: 1
+ 0: 3
HLT_j25_pf_ftf_L1RD0_FILLED:
- eventCount: 11
+ eventCount: 33
stepCounts:
- 0: 20
- 1: 11
+ 0: 50
+ 1: 33
stepFeatures:
- 0: 20
- 1: 28
+ 0: 50
+ 1: 78
HLT_j260_320eta490_L1J20:
eventCount: 0
HLT_j260_320eta490_L1J75p31ETA49:
@@ -1745,29 +1929,29 @@ HLT_j300_320eta490_L1J75p31ETA49:
HLT_j300_subjesgscIS_ftf_bdl1r70_L1J100:
eventCount: 0
HLT_j30_0eta290_020jvt_pf_ftf_boffperf_L1J20:
- eventCount: 5
+ eventCount: 13
stepCounts:
- 0: 5
- 1: 5
- 2: 5
+ 0: 16
+ 1: 13
+ 2: 13
stepFeatures:
- 0: 5
- 1: 8
- 2: 8
+ 0: 16
+ 1: 28
+ 2: 28
HLT_j35_320eta490_L1RD0_FILLED:
- eventCount: 1
+ eventCount: 2
stepCounts:
- 0: 1
+ 0: 2
stepFeatures:
- 0: 1
+ 0: 2
HLT_j35_pf_ftf_L1RD0_FILLED:
- eventCount: 8
+ eventCount: 21
stepCounts:
- 0: 20
- 1: 8
+ 0: 50
+ 1: 21
stepFeatures:
- 0: 20
- 1: 14
+ 0: 50
+ 1: 42
HLT_j360_0eta290_020jvt_pf_ftf_bdl1r77_L1J100:
eventCount: 0
HLT_j360_0eta290_pf_ftf_bdl1r60_L1J100:
@@ -1811,17 +1995,17 @@ HLT_j400_pf_ftf_preselj20_L1J100:
HLT_j40_LArPEBHLT_L1J20:
eventCount: 0
HLT_j40_j0_HT50XX10etXX0eta320_L1J20:
- eventCount: 5
+ eventCount: 15
stepCounts:
- 0: 5
+ 0: 15
stepFeatures:
- 0: 60
+ 0: 216
HLT_j40_j0_HT50XX10ptXX0eta320_L1J20:
- eventCount: 5
+ eventCount: 15
stepCounts:
- 0: 5
+ 0: 15
stepFeatures:
- 0: 60
+ 0: 216
HLT_j420_L1J100:
eventCount: 0
HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_L1J100:
@@ -1857,33 +2041,33 @@ HLT_j450_pf_ftf_preselj135_L1J100:
HLT_j45_0eta290_020jvt_020jvt_pf_ftf_bdl1r70_L1J20:
eventCount: 2
stepCounts:
- 0: 5
- 1: 5
+ 0: 16
+ 1: 12
2: 2
stepFeatures:
- 0: 5
- 1: 7
+ 0: 16
+ 1: 20
2: 2
HLT_j45_0eta290_020jvt_pf_ftf_boffperf_L1J20:
- eventCount: 5
+ eventCount: 12
stepCounts:
- 0: 5
- 1: 5
- 2: 5
+ 0: 16
+ 1: 12
+ 2: 12
stepFeatures:
- 0: 5
- 1: 7
- 2: 7
+ 0: 16
+ 1: 20
+ 2: 20
HLT_j45_0eta290_020jvt_pf_ftf_boffperf_split_L1J20:
- eventCount: 5
+ eventCount: 12
stepCounts:
- 0: 5
- 1: 5
- 2: 5
+ 0: 16
+ 1: 12
+ 2: 12
stepFeatures:
- 0: 5
- 1: 7
- 2: 7
+ 0: 16
+ 1: 20
+ 2: 20
HLT_j45_320eta490_L1J15p31ETA49:
eventCount: 1
stepCounts:
@@ -1893,191 +2077,191 @@ HLT_j45_320eta490_L1J15p31ETA49:
HLT_j45_L1J15:
eventCount: 0
HLT_j45_cssk_nojcalib_L1J15:
- eventCount: 3
+ eventCount: 5
stepCounts:
- 0: 3
+ 0: 5
stepFeatures:
- 0: 3
+ 0: 7
HLT_j45_cssk_pf_nojcalib_ftf_L1J15:
- eventCount: 4
+ eventCount: 9
stepCounts:
- 0: 7
- 1: 4
+ 0: 22
+ 1: 9
stepFeatures:
- 0: 7
- 1: 4
+ 0: 22
+ 1: 11
HLT_j45_ftf_L1J15:
- eventCount: 7
+ eventCount: 17
stepCounts:
- 0: 7
- 1: 7
+ 0: 22
+ 1: 17
stepFeatures:
- 0: 7
- 1: 8
+ 0: 22
+ 1: 25
HLT_j45_ftf_preselj20_L1J15:
- eventCount: 7
+ eventCount: 17
stepCounts:
- 0: 7
- 1: 7
+ 0: 22
+ 1: 17
stepFeatures:
- 0: 7
- 1: 8
+ 0: 22
+ 1: 25
HLT_j45_nojcalib_L1J15:
- eventCount: 3
- stepCounts:
- 0: 3
- stepFeatures:
- 0: 3
-HLT_j45_pf_ftf_010jvt_L1J15:
eventCount: 7
stepCounts:
0: 7
- 1: 7
stepFeatures:
- 0: 7
- 1: 9
+ 0: 9
+HLT_j45_pf_ftf_010jvt_L1J15:
+ eventCount: 16
+ stepCounts:
+ 0: 22
+ 1: 16
+ stepFeatures:
+ 0: 22
+ 1: 25
HLT_j45_pf_ftf_020jvt_L1J15:
- eventCount: 7
+ eventCount: 15
stepCounts:
- 0: 7
- 1: 7
+ 0: 22
+ 1: 15
stepFeatures:
- 0: 7
- 1: 9
+ 0: 22
+ 1: 24
HLT_j45_pf_ftf_050jvt_L1J15:
- eventCount: 7
+ eventCount: 14
stepCounts:
- 0: 7
- 1: 7
+ 0: 22
+ 1: 14
stepFeatures:
- 0: 7
- 1: 9
+ 0: 22
+ 1: 22
HLT_j45_pf_ftf_L1J15:
- eventCount: 7
+ eventCount: 16
stepCounts:
- 0: 7
- 1: 7
+ 0: 22
+ 1: 16
stepFeatures:
- 0: 7
- 1: 9
+ 0: 22
+ 1: 25
HLT_j45_pf_ftf_preselj20_L1J15:
- eventCount: 7
+ eventCount: 16
stepCounts:
- 0: 7
- 1: 7
+ 0: 22
+ 1: 16
stepFeatures:
- 0: 7
- 1: 9
+ 0: 22
+ 1: 25
HLT_j45_pf_ftf_preselj20_L1RD0_FILLED:
- eventCount: 7
+ eventCount: 16
stepCounts:
- 0: 17
- 1: 7
+ 0: 45
+ 1: 16
stepFeatures:
- 0: 17
- 1: 9
+ 0: 45
+ 1: 25
HLT_j45_pf_nojcalib_ftf_L1J15:
- eventCount: 6
+ eventCount: 12
stepCounts:
- 0: 7
- 1: 6
+ 0: 22
+ 1: 12
stepFeatures:
- 0: 7
- 1: 6
+ 0: 22
+ 1: 14
HLT_j45_pf_subjesgscIS_ftf_L1J15:
- eventCount: 7
+ eventCount: 16
stepCounts:
- 0: 7
- 1: 7
+ 0: 22
+ 1: 16
stepFeatures:
- 0: 7
- 1: 8
+ 0: 22
+ 1: 22
HLT_j45_pf_subjesgsc_ftf_L1J15:
- eventCount: 7
+ eventCount: 16
stepCounts:
- 0: 7
- 1: 7
+ 0: 22
+ 1: 16
stepFeatures:
- 0: 7
- 1: 8
+ 0: 22
+ 1: 21
HLT_j45_pf_subresjesgsc_ftf_L1J15:
- eventCount: 7
+ eventCount: 16
stepCounts:
- 0: 7
- 1: 7
+ 0: 22
+ 1: 16
stepFeatures:
- 0: 7
- 1: 8
+ 0: 22
+ 1: 24
HLT_j45_sk_nojcalib_L1J15:
- eventCount: 3
+ eventCount: 5
stepCounts:
- 0: 3
+ 0: 5
stepFeatures:
- 0: 3
+ 0: 7
HLT_j45_subjesIS_ftf_preselj20_L1J15:
- eventCount: 7
+ eventCount: 17
stepCounts:
- 0: 7
- 1: 7
+ 0: 22
+ 1: 17
stepFeatures:
- 0: 7
- 1: 7
+ 0: 22
+ 1: 26
HLT_j45_subjesgscIS_ftf_011jvt_L1J15:
- eventCount: 6
+ eventCount: 16
stepCounts:
- 0: 7
- 1: 6
+ 0: 22
+ 1: 16
stepFeatures:
- 0: 7
- 1: 6
+ 0: 22
+ 1: 21
HLT_j45_subjesgscIS_ftf_015jvt_L1J15:
- eventCount: 6
+ eventCount: 16
stepCounts:
- 0: 7
- 1: 6
+ 0: 22
+ 1: 16
stepFeatures:
- 0: 7
- 1: 6
+ 0: 22
+ 1: 21
HLT_j45_subjesgscIS_ftf_059jvt_L1J15:
- eventCount: 6
+ eventCount: 14
stepCounts:
- 0: 7
- 1: 6
+ 0: 22
+ 1: 14
stepFeatures:
- 0: 7
- 1: 6
+ 0: 22
+ 1: 18
HLT_j45_subjesgscIS_ftf_L1J15:
- eventCount: 7
+ eventCount: 17
stepCounts:
- 0: 7
- 1: 7
+ 0: 22
+ 1: 17
stepFeatures:
- 0: 7
- 1: 7
+ 0: 22
+ 1: 25
HLT_j45_subjesgscIS_ftf_bdl1r70_L1J20:
eventCount: 0
stepCounts:
- 0: 5
- 1: 5
+ 0: 16
+ 1: 14
stepFeatures:
- 0: 5
- 1: 5
+ 0: 16
+ 1: 19
HLT_j45_subjesgsc_ftf_L1J15:
- eventCount: 7
+ eventCount: 17
stepCounts:
- 0: 7
- 1: 7
+ 0: 22
+ 1: 17
stepFeatures:
- 0: 7
- 1: 7
+ 0: 22
+ 1: 23
HLT_j45_subresjesgsc_ftf_L1J15:
- eventCount: 7
+ eventCount: 17
stepCounts:
- 0: 7
- 1: 7
+ 0: 22
+ 1: 17
stepFeatures:
- 0: 7
- 1: 8
+ 0: 22
+ 1: 25
HLT_j460_a10_lcw_subjes_L1J100:
eventCount: 0
HLT_j460_a10_lcw_subjes_L1J20:
@@ -2133,15 +2317,15 @@ HLT_j55_0eta240_xe50_cell_L1J30_FIRSTEMPTY:
HLT_j55_pf_ftf_0eta320_bdl1r70_2j45_pf_ftf_320eta490_L1J25p0ETA23_2J15p31ETA49:
eventCount: 0
HLT_j60_0eta290_020jvt_pf_ftf_boffperf_L1J50:
- eventCount: 2
+ eventCount: 4
stepCounts:
- 0: 2
- 1: 2
- 2: 2
+ 0: 4
+ 1: 4
+ 2: 4
stepFeatures:
- 0: 2
- 1: 2
- 2: 2
+ 0: 4
+ 1: 5
+ 2: 5
HLT_j60_320eta490_L1J20p31ETA49:
eventCount: 1
stepCounts:
@@ -2157,13 +2341,13 @@ HLT_j60_j0_FBDJSHARED_L1J20:
HLT_j60_j45_2j20_JetDS_L1J45p0ETA21_3J15p0ETA25:
eventCount: 0
HLT_j60_pf_ftf_preselj20_L1J20:
- eventCount: 3
+ eventCount: 8
stepCounts:
- 0: 5
- 1: 3
+ 0: 16
+ 1: 8
stepFeatures:
- 0: 5
- 1: 3
+ 0: 16
+ 1: 10
HLT_j70_0eta320_j50_0eta490_j0_DJMASS1000j50dphi200x400deta_L1MJJ-500-NFF:
eventCount: 0
HLT_j70_0eta320_j50_0eta490_j0_DJMASS1000j50dphi240_xe90_tcpufit_xe50_cell_L1MJJ-500-NFF:
@@ -2211,17 +2395,21 @@ HLT_j75_320eta490_LArPEBHLT_L1J30p31ETA49:
HLT_j80_0eta240_2j60_320eta490_j0_DJMASS700j80x0eta240_L1J20:
eventCount: 0
HLT_j80_0eta290_020jvt_pf_ftf_boffperf_L1J50:
+ eventCount: 4
+ stepCounts:
+ 0: 4
+ 1: 4
+ 2: 4
+ stepFeatures:
+ 0: 4
+ 1: 5
+ 2: 5
+HLT_j80_j60_SHARED_j40__L1J15:
eventCount: 2
stepCounts:
0: 2
- 1: 2
- 2: 2
stepFeatures:
- 0: 2
- 1: 2
- 2: 2
-HLT_j80_j60_SHARED_j40__L1J15:
- eventCount: 0
+ 0: 13
? HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_L1J45p0ETA21_3J15p0ETA25
: eventCount: 0
? HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_L1MU10_2J15_J20
@@ -2289,75 +2477,75 @@ HLT_j85_050momemfrac100XXmomhecfrac010_L1J20:
stepFeatures:
0: 2
HLT_j85_050momemfrac100_L1J20:
- eventCount: 3
+ eventCount: 4
stepCounts:
- 0: 3
+ 0: 4
stepFeatures:
- 0: 3
+ 0: 4
HLT_j85_320eta490_L1J20p31ETA49:
eventCount: 0
HLT_j85_CLEANlb_L1J20:
- eventCount: 3
+ eventCount: 4
stepCounts:
- 0: 3
+ 0: 4
stepFeatures:
- 0: 3
+ 0: 5
HLT_j85_CLEANllp_L1J20:
- eventCount: 3
+ eventCount: 4
stepCounts:
- 0: 3
+ 0: 4
stepFeatures:
- 0: 3
+ 0: 5
HLT_j85_L1J20:
- eventCount: 3
+ eventCount: 4
stepCounts:
- 0: 3
+ 0: 4
stepFeatures:
- 0: 3
+ 0: 5
HLT_j85_a10sd_cssk_pf_jes_ftf_L1J20:
- eventCount: 3
+ eventCount: 9
stepCounts:
- 0: 5
- 1: 3
+ 0: 16
+ 1: 9
stepFeatures:
- 0: 5
- 1: 3
+ 0: 16
+ 1: 12
HLT_j85_a10sd_cssk_pf_nojcalib_ftf_L1J20:
- eventCount: 3
+ eventCount: 6
stepCounts:
- 0: 5
- 1: 3
+ 0: 16
+ 1: 6
stepFeatures:
- 0: 5
- 1: 3
+ 0: 16
+ 1: 7
HLT_j85_a10t_lcw_jes_L1J20:
- eventCount: 4
+ eventCount: 13
stepCounts:
- 0: 4
+ 0: 13
stepFeatures:
- 0: 4
+ 0: 24
HLT_j85_a10t_lcw_nojcalib_L1J20:
- eventCount: 3
+ eventCount: 11
stepCounts:
- 0: 3
+ 0: 11
stepFeatures:
- 0: 3
+ 0: 16
HLT_j85_ftf_L1J20:
- eventCount: 3
+ eventCount: 5
stepCounts:
- 0: 5
- 1: 3
+ 0: 16
+ 1: 5
stepFeatures:
- 0: 5
- 1: 3
+ 0: 16
+ 1: 6
HLT_j85_ftf_MASK300ceta210XX300nphi10_L1J20:
- eventCount: 3
+ eventCount: 5
stepCounts:
- 0: 5
- 1: 3
+ 0: 16
+ 1: 5
stepFeatures:
- 0: 5
- 1: 3
+ 0: 16
+ 1: 6
HLT_j85_momhecfrac010_L1J20:
eventCount: 2
stepCounts:
@@ -2365,37 +2553,37 @@ HLT_j85_momhecfrac010_L1J20:
stepFeatures:
0: 2
HLT_j85_pf_ftf_L1J20:
- eventCount: 3
+ eventCount: 5
stepCounts:
- 0: 5
- 1: 3
+ 0: 16
+ 1: 5
stepFeatures:
- 0: 5
- 1: 3
+ 0: 16
+ 1: 7
HLT_j85_pf_ftf_preselj20_L1J20:
- eventCount: 3
+ eventCount: 5
stepCounts:
- 0: 5
- 1: 3
+ 0: 16
+ 1: 5
stepFeatures:
- 0: 5
- 1: 3
+ 0: 16
+ 1: 7
HLT_l1topodebug_legacy_L1All:
eventCount: 0
HLT_larnoiseburst_L1XE60:
eventCount: 0
HLT_larpsall_L1J15:
- eventCount: 7
+ eventCount: 19
stepCounts:
- 0: 7
+ 0: 19
stepFeatures:
- 0: 7
+ 0: 19
HLT_larpsallem_L1EM3:
- eventCount: 13
+ eventCount: 36
stepCounts:
- 0: 13
+ 0: 36
stepFeatures:
- 0: 42
+ 0: 128
HLT_mb_afprec_L1AFP_A_AND_C_TOF_J20:
eventCount: 0
HLT_mb_afprec_L1AFP_A_AND_C_TOF_J30:
@@ -2527,9 +2715,9 @@ HLT_mu0_muoncalib_L1MU4_EMPTY:
HLT_mu10_L1MU10:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 5
stepFeatures:
- 0: 1
+ 0: 5
HLT_mu10_ivarmedium_j70_0eta320_j50_0eta490_j0_DJMASS900j50_L1MJJ-500-NFF:
eventCount: 0
HLT_mu10_ivarmedium_mu10_10invm70_L12MU10:
@@ -2751,9 +2939,9 @@ HLT_mu11_mu6_bUpsimumu_L1MU8VF_2MU5VF:
HLT_mu14_L1MU10:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 5
stepFeatures:
- 0: 1
+ 0: 5
HLT_mu14_ivarloose_tau25_medium1_tracktwo_03dRAB_L1MU10_TAU12IM_3J12:
eventCount: 0
HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVABDT_03dRAB_L1MU10_TAU12IM_3J12:
@@ -2785,9 +2973,9 @@ HLT_mu20_2mu4noL1_L1MU20:
HLT_mu20_L1MU6:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 5
stepFeatures:
- 0: 2
+ 0: 6
HLT_mu20_L1MU6_AFP_A_AND_C:
eventCount: 0
HLT_mu20_L1MU6_AFP_A_OR_C:
@@ -3127,12 +3315,18 @@ HLT_mu28_ivarmedium_L1MU20:
HLT_mu4_j70_0eta320_j50_0eta490_j0_DJMASS1000j50_xe50_tcpufit_L1MJJ-500-NFF:
eventCount: 0
HLT_mu4_l2io_L1MU4:
- eventCount: 0
+ eventCount: 2
stepCounts:
- 0: 1
- stepFeatures:
- 0: 2
-HLT_mu50_L1MU14FCH:
+ 0: 6
+ 1: 3
+ 2: 2
+ 3: 2
+ stepFeatures:
+ 0: 7
+ 1: 5
+ 2: 2
+ 3: 2
+HLT_mu50_L1MU14FCH:
eventCount: 0
stepCounts:
0: 1
@@ -3175,41 +3369,73 @@ HLT_mu6_2mu4_bTau_L1MU6_3MU4:
HLT_mu6_2mu4_bUpsi_L1MU6_3MU4:
eventCount: 0
HLT_mu6_L1MU6:
- eventCount: 0
+ eventCount: 2
stepCounts:
- 0: 1
+ 0: 5
+ 1: 2
+ 2: 2
+ 3: 2
stepFeatures:
- 0: 2
+ 0: 6
+ 1: 2
+ 2: 2
+ 3: 2
HLT_mu6_LRT_idperf_L1MU6:
- eventCount: 0
+ eventCount: 2
stepCounts:
- 0: 1
- 1: 1
+ 0: 5
+ 1: 5
+ 2: 2
+ 3: 2
stepFeatures:
- 0: 2
- 1: 2
+ 0: 6
+ 1: 6
+ 2: 2
+ 3: 2
HLT_mu6_idperf_L1MU6:
- eventCount: 0
+ eventCount: 2
stepCounts:
- 0: 1
- 1: 1
+ 0: 5
+ 1: 5
+ 2: 2
+ 3: 2
stepFeatures:
- 0: 2
- 1: 2
+ 0: 6
+ 1: 6
+ 2: 2
+ 3: 2
HLT_mu6_ivarmedium_L1MU6:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 5
+ 1: 2
+ 2: 2
+ 3: 2
stepFeatures:
- 0: 2
+ 0: 6
+ 1: 2
+ 2: 2
+ 3: 2
HLT_mu6_j45_nojcalib_L1J20:
eventCount: 0
-HLT_mu6_msonly_L1MU6:
- eventCount: 0
stepCounts:
0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+HLT_mu6_msonly_L1MU6:
+ eventCount: 2
+ stepCounts:
+ 0: 5
+ 1: 2
stepFeatures:
- 0: 2
+ 0: 6
+ 1: 2
HLT_mu6_mu4_L12MU4:
eventCount: 0
stepCounts:
@@ -3241,9 +3467,17 @@ HLT_mu6_mu4_bUpsimumu_L1BPH-8M15-0DR22-MU6MU4-BO:
HLT_mu6_mu6noL1_L1MU6:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 5
+ 1: 2
+ 2: 2
+ 3: 2
+ 4: 1
stepFeatures:
- 0: 2
+ 0: 6
+ 1: 2
+ 2: 2
+ 3: 2
+ 4: 2
HLT_mu6_noL2Comb_mu4_noL2Comb_bJpsimumu_L1MU6_2MU4:
eventCount: 0
stepCounts:
@@ -3272,27 +3506,33 @@ HLT_mu80_msonly_3layersEC_L1MU20:
stepFeatures:
0: 1
HLT_mu8_L1MU6:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 1
+ 0: 5
+ 1: 2
+ 2: 2
+ 3: 1
stepFeatures:
- 0: 2
+ 0: 6
+ 1: 2
+ 2: 2
+ 3: 1
HLT_noalg_AlfaPEB_L1ALFA_ANY:
eventCount: 0
HLT_noalg_CIS_TilePEB_L1CALREQ1:
eventCount: 0
HLT_noalg_CSCPEB_L1All:
- eventCount: 20
+ eventCount: 50
stepCounts:
- 0: 20
+ 0: 50
stepFeatures:
- 0: 20
+ 0: 50
HLT_noalg_CostMonDS_L1All:
- eventCount: 20
+ eventCount: 50
stepCounts:
- 0: 20
+ 0: 50
stepFeatures:
- 0: 20
+ 0: 50
HLT_noalg_L1AFP_A_AND_C_TOF_J50:
eventCount: 0
HLT_noalg_L1AFP_A_AND_C_TOF_J75:
@@ -3302,53 +3542,53 @@ HLT_noalg_L1AFP_A_AND_C_TOF_T0T1_J50:
HLT_noalg_L1AFP_A_AND_C_TOF_T0T1_J75:
eventCount: 0
HLT_noalg_L1All:
- eventCount: 20
+ eventCount: 50
HLT_noalg_L1CEP-CJ50:
eventCount: 0
HLT_noalg_L1CEP-CJ60:
eventCount: 0
HLT_noalg_L1Calo:
- eventCount: 20
+ eventCount: 50
HLT_noalg_L1Calo_EMPTY:
eventCount: 0
HLT_noalg_L1EM10VH:
- eventCount: 6
+ eventCount: 19
HLT_noalg_L1EM12:
- eventCount: 4
+ eventCount: 16
HLT_noalg_L1EM15:
- eventCount: 4
+ eventCount: 13
HLT_noalg_L1EM15VH:
- eventCount: 4
+ eventCount: 10
HLT_noalg_L1EM20VH:
- eventCount: 3
+ eventCount: 8
HLT_noalg_L1EM22VHI:
- eventCount: 1
+ eventCount: 5
HLT_noalg_L1EM3:
- eventCount: 15
+ eventCount: 40
HLT_noalg_L1EM7:
- eventCount: 9
+ eventCount: 25
HLT_noalg_L1EM7_AFP_A_AND_C:
eventCount: 0
HLT_noalg_L1EM7_AFP_A_OR_C:
eventCount: 0
HLT_noalg_L1EM8VH:
- eventCount: 7
+ eventCount: 20
HLT_noalg_L1J100:
eventCount: 0
HLT_noalg_L1J15:
- eventCount: 7
+ eventCount: 22
HLT_noalg_L1J20:
- eventCount: 5
+ eventCount: 16
HLT_noalg_L1J25:
- eventCount: 5
+ eventCount: 12
HLT_noalg_L1J30:
- eventCount: 4
+ eventCount: 7
HLT_noalg_L1J40:
- eventCount: 3
+ eventCount: 5
HLT_noalg_L1J400:
eventCount: 0
HLT_noalg_L1J50:
- eventCount: 2
+ eventCount: 4
HLT_noalg_L1J75:
eventCount: 0
HLT_noalg_L1J85:
@@ -3436,7 +3676,7 @@ HLT_noalg_L1MBTS_2_EMPTY:
HLT_noalg_L1MBTS_2_UNPAIRED_ISO:
eventCount: 0
HLT_noalg_L1MU6:
- eventCount: 1
+ eventCount: 6
HLT_noalg_L1MU6_AFP_A_AND_C:
eventCount: 0
HLT_noalg_L1MU6_AFP_A_OR_C:
@@ -3444,19 +3684,19 @@ HLT_noalg_L1MU6_AFP_A_OR_C:
HLT_noalg_L1RD0_EMPTY:
eventCount: 0
HLT_noalg_L1RD0_FILLED:
- eventCount: 20
+ eventCount: 50
HLT_noalg_L1Standby:
- eventCount: 20
+ eventCount: 50
HLT_noalg_L1TAU12IM:
- eventCount: 3
+ eventCount: 13
HLT_noalg_L1TAU20IM:
- eventCount: 3
+ eventCount: 9
HLT_noalg_L1TAU40:
- eventCount: 0
+ eventCount: 2
HLT_noalg_L1TAU60:
- eventCount: 0
+ eventCount: 1
HLT_noalg_L1TAU8:
- eventCount: 9
+ eventCount: 26
HLT_noalg_L1XE30:
eventCount: 2
HLT_noalg_L1XE300:
@@ -3474,11 +3714,11 @@ HLT_noalg_L1XE55:
HLT_noalg_L1XE60:
eventCount: 1
HLT_noalg_L1eEM10:
- eventCount: 4
+ eventCount: 16
HLT_noalg_L1eEM10L:
eventCount: 0
HLT_noalg_L1eEM15:
- eventCount: 4
+ eventCount: 11
HLT_noalg_L1eEM15L:
eventCount: 0
HLT_noalg_L1eEM15M:
@@ -3486,23 +3726,23 @@ HLT_noalg_L1eEM15M:
HLT_noalg_L1eEM18M:
eventCount: 0
HLT_noalg_L1eEM20:
- eventCount: 2
+ eventCount: 7
HLT_noalg_L1eEM20L:
eventCount: 0
HLT_noalg_L1eEM20M:
eventCount: 0
HLT_noalg_L1eEM22:
- eventCount: 2
+ eventCount: 7
HLT_noalg_L1eEM22M:
eventCount: 0
HLT_noalg_L1eEM22T:
eventCount: 0
HLT_noalg_L1eEM3:
- eventCount: 20
+ eventCount: 50
HLT_noalg_L1eEM7:
- eventCount: 7
+ eventCount: 24
HLT_noalg_L1eEM8:
- eventCount: 6
+ eventCount: 22
HLT_noalg_L1eEM8L:
eventCount: 0
HLT_noalg_L1eTAU100:
@@ -3560,13 +3800,13 @@ HLT_noalg_eb_L1EMPTY_noPS:
HLT_noalg_eb_L1FIRSTEMPTY_noPS:
eventCount: 0
HLT_noalg_eb_L1PhysicsHigh_noPS:
- eventCount: 4
+ eventCount: 10
HLT_noalg_eb_L1PhysicsVeryHigh_noPS:
eventCount: 1
HLT_noalg_eb_L1RD3_EMPTY:
eventCount: 0
HLT_noalg_eb_L1RD3_FILLED:
- eventCount: 20
+ eventCount: 50
HLT_noalg_eb_L1UNPAIRED_ISO_noPS:
eventCount: 0
HLT_noalg_eb_L1UNPAIRED_NONISO_noPS:
@@ -3574,7 +3814,7 @@ HLT_noalg_eb_L1UNPAIRED_NONISO_noPS:
HLT_noalg_idmon_L1RD0_EMPTY:
eventCount: 0
HLT_noalg_idmon_L1RD0_FILLED:
- eventCount: 20
+ eventCount: 50
HLT_noalg_idmon_L1RD0_UNPAIRED_ISO:
eventCount: 0
HLT_noalg_l1calo_L1J400:
@@ -3586,15 +3826,30 @@ HLT_noalg_mb_L1RD2_EMPTY:
HLT_noalg_zb_L1ZB:
eventCount: 0
HLT_tau0_ptonly_L1TAU60:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 1
HLT_tau0_ptonly_L1TAU8:
- eventCount: 8
+ eventCount: 25
stepCounts:
- 0: 8
+ 0: 25
stepFeatures:
- 0: 10
+ 0: 36
HLT_tau100_mediumRNN_tracktwoLLP_tau80_mediumRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40:
eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
+ 4: 2
HLT_tau160_idperf_tracktwoMVABDT_L1TAU100:
eventCount: 0
HLT_tau160_idperf_tracktwoMVA_L1TAU100:
@@ -3648,135 +3903,137 @@ HLT_tau20_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
HLT_tau20_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
eventCount: 0
HLT_tau25_idperf_tracktwoMVABDT_L1TAU12IM:
- eventCount: 3
+ eventCount: 10
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 3
+ 0: 11
+ 1: 10
+ 2: 10
+ 3: 10
+ 4: 10
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
- 4: 3
+ 0: 13
+ 1: 11
+ 2: 11
+ 3: 11
+ 4: 11
HLT_tau25_idperf_tracktwoMVA_L1TAU12IM:
- eventCount: 3
+ eventCount: 10
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 3
+ 0: 11
+ 1: 10
+ 2: 10
+ 3: 10
+ 4: 10
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
- 4: 3
+ 0: 13
+ 1: 11
+ 2: 11
+ 3: 11
+ 4: 11
HLT_tau25_idperf_tracktwo_L1TAU12IM:
- eventCount: 3
+ eventCount: 9
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 3
- 5: 3
+ 0: 10
+ 1: 9
+ 2: 9
+ 3: 9
+ 4: 9
+ 5: 9
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
- 4: 3
- 5: 3
+ 0: 12
+ 1: 10
+ 2: 10
+ 3: 10
+ 4: 10
+ 5: 10
HLT_tau25_looseRNN_tracktwoLLP_L1TAU12IM:
- eventCount: 2
+ eventCount: 7
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 2
+ 0: 11
+ 1: 10
+ 2: 10
+ 3: 10
+ 4: 7
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
- 4: 2
+ 0: 13
+ 1: 11
+ 2: 11
+ 3: 11
+ 4: 7
HLT_tau25_looseRNN_tracktwoMVABDT_L1TAU12IM:
- eventCount: 2
+ eventCount: 6
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 2
+ 0: 11
+ 1: 10
+ 2: 10
+ 3: 10
+ 4: 6
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
- 4: 2
+ 0: 13
+ 1: 11
+ 2: 11
+ 3: 11
+ 4: 6
HLT_tau25_looseRNN_tracktwoMVA_L1TAU12IM:
- eventCount: 2
+ eventCount: 6
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 2
+ 0: 11
+ 1: 10
+ 2: 10
+ 3: 10
+ 4: 6
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
- 4: 2
+ 0: 13
+ 1: 11
+ 2: 11
+ 3: 11
+ 4: 6
HLT_tau25_medium1_tracktwo_L1TAU12IM:
- eventCount: 1
+ eventCount: 4
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 2
- 4: 2
- 5: 1
+ 0: 10
+ 1: 9
+ 2: 9
+ 3: 8
+ 4: 8
+ 5: 4
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 2
- 4: 2
- 5: 1
+ 0: 12
+ 1: 10
+ 2: 10
+ 3: 9
+ 4: 9
+ 5: 4
HLT_tau25_medium1_tracktwo_probe_xe110_pfsum_vssk_L1XE50:
eventCount: 0
HLT_tau25_mediumRNN_tracktwoLLP_L1TAU12IM:
- eventCount: 2
+ eventCount: 6
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 2
+ 0: 11
+ 1: 10
+ 2: 10
+ 3: 10
+ 4: 6
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
- 4: 2
+ 0: 13
+ 1: 11
+ 2: 11
+ 3: 11
+ 4: 6
HLT_tau25_mediumRNN_tracktwoMVABDT_L1TAU12IM:
- eventCount: 0
+ eventCount: 2
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
+ 0: 11
+ 1: 10
+ 2: 10
+ 3: 10
+ 4: 2
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
+ 0: 13
+ 1: 11
+ 2: 11
+ 3: 11
+ 4: 2
HLT_tau25_mediumRNN_tracktwoMVABDT_L1eTAU12:
eventCount: 0
HLT_tau25_mediumRNN_tracktwoMVABDT_L1eTAU12M:
@@ -3788,17 +4045,19 @@ HLT_tau25_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
stepFeatures:
0: 2
HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
+ 0: 11
+ 1: 10
+ 2: 10
+ 3: 10
+ 4: 1
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
+ 0: 13
+ 1: 11
+ 2: 11
+ 3: 11
+ 4: 1
HLT_tau25_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
eventCount: 0
HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_j70_0eta320_j50_0eta490_j0_DJMASS900j50_L1MJJ-500-NFF:
@@ -3806,181 +4065,187 @@ HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_j70_0eta320_j
stepFeatures:
0: 2
HLT_tau25_perf_tracktwoMVABDT_L1TAU12IM:
- eventCount: 2
+ eventCount: 8
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 2
+ 0: 11
+ 1: 10
+ 2: 10
+ 3: 10
+ 4: 8
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
- 4: 2
+ 0: 13
+ 1: 11
+ 2: 11
+ 3: 11
+ 4: 8
HLT_tau25_perf_tracktwoMVA_L1TAU12IM:
- eventCount: 2
+ eventCount: 7
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 2
+ 0: 11
+ 1: 10
+ 2: 10
+ 3: 10
+ 4: 7
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
- 4: 2
+ 0: 13
+ 1: 11
+ 2: 11
+ 3: 11
+ 4: 7
HLT_tau25_perf_tracktwo_L1TAU12IM:
- eventCount: 2
+ eventCount: 6
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 2
- 4: 2
- 5: 2
+ 0: 10
+ 1: 9
+ 2: 9
+ 3: 8
+ 4: 8
+ 5: 6
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 2
- 4: 2
- 5: 2
+ 0: 12
+ 1: 10
+ 2: 10
+ 3: 9
+ 4: 9
+ 5: 6
HLT_tau25_ptonly_L1TAU12IM:
- eventCount: 3
+ eventCount: 10
stepCounts:
- 0: 3
+ 0: 10
stepFeatures:
- 0: 4
+ 0: 12
HLT_tau25_tightRNN_tracktwoLLP_L1TAU12IM:
- eventCount: 2
+ eventCount: 6
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 2
+ 0: 11
+ 1: 10
+ 2: 10
+ 3: 10
+ 4: 6
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
- 4: 2
+ 0: 13
+ 1: 11
+ 2: 11
+ 3: 11
+ 4: 6
HLT_tau25_tightRNN_tracktwoMVABDT_L1TAU12IM:
- eventCount: 0
+ eventCount: 2
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
+ 0: 11
+ 1: 10
+ 2: 10
+ 3: 10
+ 4: 2
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
+ 0: 13
+ 1: 11
+ 2: 11
+ 3: 11
+ 4: 2
HLT_tau25_tightRNN_tracktwoMVA_L1TAU12IM:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
+ 0: 11
+ 1: 10
+ 2: 10
+ 3: 10
+ 4: 1
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
+ 0: 13
+ 1: 11
+ 2: 11
+ 3: 11
+ 4: 1
HLT_tau35_idperf_tracktwoMVABDT_L1TAU20IM:
- eventCount: 3
+ eventCount: 6
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 3
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
+ 4: 6
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
- 4: 3
+ 0: 8
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 7
HLT_tau35_idperf_tracktwoMVA_L1TAU20IM:
- eventCount: 3
+ eventCount: 6
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 3
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
+ 4: 6
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
- 4: 3
+ 0: 8
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 7
HLT_tau35_idperf_tracktwo_L1TAU20IM:
- eventCount: 3
+ eventCount: 6
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 3
- 5: 3
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
+ 4: 6
+ 5: 6
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
- 4: 3
- 5: 3
+ 0: 8
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 7
+ 5: 7
HLT_tau35_looseRNN_tracktwoMVABDT_L1TAU20IM:
- eventCount: 2
+ eventCount: 4
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 2
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
+ 4: 4
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
- 4: 2
+ 0: 8
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 4
HLT_tau35_looseRNN_tracktwoMVA_L1TAU20IM:
- eventCount: 2
+ eventCount: 4
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 2
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
+ 4: 4
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
- 4: 2
+ 0: 8
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 4
HLT_tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dRAB30_L1DR-TAU20ITAU12I-J25:
eventCount: 0
HLT_tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dRAB_L1TAU20IM_2TAU12IM_4J12p0ETA25:
eventCount: 0
HLT_tau35_mediumRNN_tracktwoMVABDT_L1TAU20IM:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
+ 4: 1
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
+ 0: 8
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 1
HLT_tau35_mediumRNN_tracktwoMVABDT_L1eTAU20:
eventCount: 0
HLT_tau35_mediumRNN_tracktwoMVABDT_L1eTAU20M:
@@ -3994,15 +4259,15 @@ HLT_tau35_mediumRNN_tracktwoMVABDT_tau25_mediumRNN_tracktwoMVABDT_03dRAB_L1TAU20
HLT_tau35_mediumRNN_tracktwoMVA_L1TAU20IM:
eventCount: 0
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
+ 0: 8
+ 1: 7
+ 2: 7
+ 3: 7
HLT_tau35_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
eventCount: 0
HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1DR-TAU20ITAU12I-J25:
@@ -4010,79 +4275,81 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1DR-TAU20I
HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1TAU20IM_2TAU12IM_4J12p0ETA25:
eventCount: 0
HLT_tau35_perf_tracktwoMVABDT_L1TAU20IM:
- eventCount: 2
+ eventCount: 5
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 2
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
+ 4: 5
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
- 4: 2
+ 0: 8
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 5
HLT_tau35_perf_tracktwoMVA_L1TAU20IM:
- eventCount: 2
+ eventCount: 4
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 2
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
+ 4: 4
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
- 4: 2
+ 0: 8
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 4
HLT_tau35_perf_tracktwo_L1TAU20IM:
- eventCount: 2
+ eventCount: 4
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 2
- 4: 2
- 5: 2
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 5
+ 4: 5
+ 5: 4
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 2
- 4: 2
- 5: 2
+ 0: 8
+ 1: 7
+ 2: 7
+ 3: 6
+ 4: 6
+ 5: 4
HLT_tau35_ptonly_L1TAU20IM:
- eventCount: 3
+ eventCount: 6
stepCounts:
- 0: 3
+ 0: 6
stepFeatures:
- 0: 4
+ 0: 8
HLT_tau35_tightRNN_tracktwoMVABDT_L1TAU20IM:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
+ 4: 1
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
+ 0: 8
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 1
HLT_tau35_tightRNN_tracktwoMVA_L1TAU20IM:
eventCount: 0
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
stepFeatures:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
+ 0: 8
+ 1: 7
+ 2: 7
+ 3: 7
HLT_tau40_medium1_tracktwo_tau35_medium1_tracktwo_03dRAB_L1TAU25IM_2TAU20IM_2J25_3J20:
eventCount: 0
HLT_tau40_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
@@ -4115,34 +4382,100 @@ HLT_tau80_medium1_tracktwo_tau35_medium1_tracktwo_03dRAB30_L1TAU60_DR-TAU20ITAU1
eventCount: 0
HLT_tau80_medium1_tracktwo_tau60_medium1_tracktwo_03dRAB_L1TAU60_2TAU40:
eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ stepFeatures:
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
+ 4: 3
+ 5: 2
HLT_tau80_mediumRNN_tracktwoLLP_probe_xe110_pfsum_vssk_L1XE50:
eventCount: 0
HLT_tau80_mediumRNN_tracktwoLLP_tau60_mediumRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40:
eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
+ 4: 2
HLT_tau80_mediumRNN_tracktwoLLP_tau60_tightRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40:
eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
+ 4: 2
HLT_tau80_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
eventCount: 0
HLT_tau80_mediumRNN_tracktwoMVABDT_tau35_mediumRNN_tracktwoMVABDT_03dRAB30_L1TAU60_DR-TAU20ITAU12I:
eventCount: 0
HLT_tau80_mediumRNN_tracktwoMVABDT_tau60_mediumRNN_tracktwoMVABDT_03dRAB_L1TAU60_2TAU40:
eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
HLT_tau80_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
eventCount: 0
HLT_tau80_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB30_L1TAU60_DR-TAU20ITAU12I:
eventCount: 0
HLT_tau80_mediumRNN_tracktwoMVA_tau60_mediumRNN_tracktwoMVA_03dRAB_L1TAU60_2TAU40:
eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
HLT_tau80_tightRNN_tracktwoLLP_tau60_tightRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40:
eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
+ 4: 2
HLT_timeburner_L1All:
eventCount: 0
HLT_unconvtrk0_fslrt_L1All:
- eventCount: 19
+ eventCount: 48
stepCounts:
- 0: 19
+ 0: 48
stepFeatures:
- 0: 19
+ 0: 48
HLT_unconvtrk0_fslrt_L1XE50:
eventCount: 1
stepCounts:
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_decodeBS_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_decodeBS_build.py
index ac0892642fe8..a7ee30f2fb94 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_decodeBS_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_decodeBS_build.py
@@ -41,8 +41,9 @@ writeBS = ExecStep.ExecStep("WriteBS")
writeBS.type = 'athenaHLT'
writeBS.job_options = 'TriggerJobOpts/runHLT_standalone.py'
writeBS.input = 'data'
+writeBS.max_events = 50
writeBS.args = '-o output'
-writeBS.args += ' -c "setMenu=\'LS2_v1_TriggerValidation_prescale\';doL1Sim=True;rewriteLVL1=True;"' # LS2_v1 to be renamed to Dev_pp_run3_v1
+writeBS.args += ' -c "setMenu=\'LS2_v1_TriggerValidation_prescale\';doL1Sim=True;rewriteLVL1=True;doRuntimeNaviVal=True;"' # LS2_v1 to be renamed to Dev_pp_run3_v1
writeBS.args += ' --dump-config-reload'
# Extract and decode physics_Main
@@ -72,5 +73,15 @@ msgcount.thresholds = {
}
msgcount.required = True # make the test exit code depend on this step
+# Add a step comparing counts against a reference
+chaindump = test.get_step("ChainDump")
+chaindump.args = '--json --yaml ref_v1Dev_decodeBS_build.new'
+refcomp = CheckSteps.ChainCompStep("CountRefComp")
+refcomp.input_file = 'ref_v1Dev_decodeBS_build.new'
+refcomp.args += ' --patch'
+refcomp.reference_from_release = True # installed from TriggerTest/share
+refcomp.required = True # Final exit code depends on this step
+CheckSteps.add_step_after_type(test.check_steps, CheckSteps.ChainDumpStep, refcomp)
+
import sys
sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigValTools/bin/runTrigART.py b/Trigger/TrigValidation/TrigValTools/bin/runTrigART.py
index fdf516b85958..e9f6c1736139 100755
--- a/Trigger/TrigValidation/TrigValTools/bin/runTrigART.py
+++ b/Trigger/TrigValidation/TrigValTools/bin/runTrigART.py
@@ -15,7 +15,7 @@ from TrigValTools.TrigARTUtils import package_prefix, find_scripts, remember_cwd
def minimal_pattern(package):
dict = {'TriggerTest': '(test_trig_data_v1Dev_build|test_trig_data_newJO_build)',
- 'TrigP1Test': 'test_trigP1_v1Dev_build',
+ 'TrigP1Test': 'test_trigP1_v1Dev_decodeBS_build',
'TrigAnalysisTest': 'test_trigAna_RDOtoRDOTrig_v1Dev_build'}
if package == 'ALL':
return '({})'.format('|'.join([v for v in dict.values() if v]))
diff --git a/Trigger/TrigValidation/TriggerTest/CMakeLists.txt b/Trigger/TrigValidation/TriggerTest/CMakeLists.txt
index d3b5fc3ba377..5bc2bdb5c4a6 100644
--- a/Trigger/TrigValidation/TriggerTest/CMakeLists.txt
+++ b/Trigger/TrigValidation/TriggerTest/CMakeLists.txt
@@ -7,7 +7,6 @@ atlas_subdir( TriggerTest )
atlas_install_scripts( test/test*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
atlas_install_runtime( share/*.conf )
-atlas_install_data( share/*.ref )
# Unit tests:
atlas_add_test( TrigValSteeringUT
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 98806511103a..8fdb8c14d0c4 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_build.py
@@ -19,7 +19,6 @@ precommand = ''.join([
"doL1Sim=True;",
"doWriteBS=False;",
"doWriteRDOTrigger=True;",
- 'doRuntimeNaviVal=True', # Perform runtime graph vaidation in this test
])
ex.args = '-c "{:s}"'.format(precommand)
@@ -39,15 +38,5 @@ msgcount.thresholds = {
}
msgcount.required = True # make the test exit code depend on this step
-# Add a step comparing counts against a reference
-chaindump = test.get_step("ChainDump")
-chaindump.args = '--json --yaml ref_data_v1Dev_build.new'
-refcomp = CheckSteps.ChainCompStep("CountRefComp")
-refcomp.input_file = 'ref_data_v1Dev_build.new'
-refcomp.args += ' --patch'
-refcomp.reference_from_release = True # installed from TriggerTest/share
-refcomp.required = True # Final exit code depends on this step
-CheckSteps.add_step_after_type(test.check_steps, CheckSteps.ChainDumpStep, refcomp)
-
import sys
sys.exit(test.run())
--
GitLab
From c6467ef4f2a7e07bbab8c589ea912ed5ea49017c Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Thu, 19 Aug 2021 15:43:58 +0200
Subject: [PATCH 166/272] AthContainersInterfaces: use explicit type cast
Fix `-Wconversion` warnings by using explicit `static_cast`.
---
.../AthContainersInterfaces/AuxDataOption.icc | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/Control/AthContainersInterfaces/AthContainersInterfaces/AuxDataOption.icc b/Control/AthContainersInterfaces/AthContainersInterfaces/AuxDataOption.icc
index e8f67ead98ef..49aaf5ff81b0 100644
--- a/Control/AthContainersInterfaces/AthContainersInterfaces/AuxDataOption.icc
+++ b/Control/AthContainersInterfaces/AthContainersInterfaces/AuxDataOption.icc
@@ -1,8 +1,7 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-// $Id$
/**
* @file AthContainersInterfaces/AuxDataOption.icc
* @author scott snyder <snyder@bnl.gov>
@@ -51,7 +50,7 @@ AuxDataOption::AuxDataOption (const std::string& name, double val)
: m_name (name),
m_isInt(false)
{
- m_val.f = val;
+ m_val.f = static_cast<float>(val);
}
@@ -71,10 +70,7 @@ std::string AuxDataOption::name() const
inline
int AuxDataOption::intVal() const
{
- if (m_isInt)
- return m_val.i;
- else
- return m_val.f;
+ return m_isInt ? m_val.i : static_cast<int>(m_val.f);
}
@@ -84,10 +80,7 @@ int AuxDataOption::intVal() const
inline
float AuxDataOption::floatVal() const
{
- if (m_isInt)
- return m_val.i;
- else
- return m_val.f;
+ return m_isInt ? static_cast<float>(m_val.i) : m_val.f;
}
--
GitLab
From c27e7524e909b0d718b27e198ac6756a7aa4eb82 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Thu, 19 Aug 2021 15:46:03 +0200
Subject: [PATCH 167/272] AthLinks: be explicit about type conversions
Use an explicit `static_cast` when converting between the index types.
This reduces the "noise" when compiling other code with `-Wconversion`.
---
Control/AthLinks/AthLinks/ElementLinkBase.icc | 24 +++++++++----------
.../AthLinks/GenericElementLinkBase.icc | 22 ++++++++---------
Control/AthLinks/src/DataProxyHolder.cxx | 4 ++--
3 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/Control/AthLinks/AthLinks/ElementLinkBase.icc b/Control/AthLinks/AthLinks/ElementLinkBase.icc
index af2aba73b032..d0943466a255 100644
--- a/Control/AthLinks/AthLinks/ElementLinkBase.icc
+++ b/Control/AthLinks/AthLinks/ElementLinkBase.icc
@@ -1,7 +1,7 @@
// Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/**
* @file AthLinks/ElementLinkBase.icc
@@ -218,7 +218,7 @@ bool ElementLinkBase::thin (const SG::ThinningCache* thinningCache)
size_t index = m_persIndex;
bool ret = m_proxy.thin (m_persKey, index, thinningCache);
if (ret)
- m_persIndex = index;
+ m_persIndex = static_cast<stored_index_type>(index);
return ret1 || ret;
}
@@ -248,7 +248,7 @@ ElementLinkBase::ElementLinkBase (const ID_type& dataID,
CLID link_clid,
index_type elemID,
IProxyDict* sg)
- : m_persIndex (elemID)
+ : m_persIndex (static_cast<stored_index_type>(elemID))
{
m_persKey = m_proxy.toIdentifiedObject (dataID, link_clid, sg);
}
@@ -269,7 +269,7 @@ ElementLinkBase::ElementLinkBase (sgkey_t key,
index_type elemID,
IProxyDict* sg)
: m_persKey (key),
- m_persIndex (elemID)
+ m_persIndex (static_cast<stored_index_type>(elemID))
{
m_proxy.toIdentifiedObject (key, link_clid, sg);
}
@@ -293,7 +293,7 @@ ElementLinkBase::ElementLinkBase (const ID_type& dataID,
index_type elemID,
const void* elt,
IProxyDict* sg)
- : m_persIndex (elemID),
+ : m_persIndex (static_cast<stored_index_type>(elemID)),
m_element (elt)
{
m_persKey = m_proxy.toIdentifiedObject (dataID, link_clid, sg);
@@ -319,7 +319,7 @@ ElementLinkBase::ElementLinkBase (sgkey_t key,
const void* elt,
IProxyDict* sg)
: m_persKey (key),
- m_persIndex (elemID),
+ m_persIndex (static_cast<stored_index_type>(elemID)),
m_element (elt)
{
m_proxy.toIdentifiedObject (key, link_clid, sg);
@@ -340,7 +340,7 @@ ElementLinkBase::ElementLinkBase (const_pointer_t obj,
CLID link_clid,
index_type elemID,
IProxyDict* sg)
- : m_persIndex (elemID)
+ : m_persIndex (static_cast<stored_index_type>(elemID))
{
m_persKey = m_proxy.toStorableObject (obj, link_clid, sg);
}
@@ -358,7 +358,7 @@ inline
ElementLinkBase::ElementLinkBase (const ElementLinkBase& other,
index_type elemID)
: m_persKey (other.m_persKey),
- m_persIndex (elemID),
+ m_persIndex (static_cast<stored_index_type>(elemID)),
m_proxy (other.m_proxy)
{
}
@@ -467,7 +467,7 @@ bool ElementLinkBase::toIndexedElement (const_pointer_t obj,
{
if (m_proxy.isDefault() && isDefaultIndex() && !hasCachedElement()) {
m_persKey = m_proxy.toStorableObject (obj, link_clid, sg);
- m_persIndex = elemID;
+ m_persIndex = static_cast<stored_index_type>(elemID);
//clearCachedElement(); // Redundant --- must be 0 due to above test.
return true;
}
@@ -493,7 +493,7 @@ void ElementLinkBase::resetWithKeyAndIndex (const ID_type& dataID,
IProxyDict* sg)
{
m_persKey = m_proxy.toIdentifiedObject (dataID, link_clid, sg);
- m_persIndex = elemID;
+ m_persIndex = static_cast<stored_index_type>(elemID);
clearCachedElement();
}
@@ -517,7 +517,7 @@ void ElementLinkBase::resetWithKeyAndIndex (sgkey_t key,
{
m_persKey = key;
m_proxy.toIdentifiedObject (key, link_clid, sg);
- m_persIndex = elemID;
+ m_persIndex = static_cast<stored_index_type>(elemID);
clearCachedElement();
}
@@ -529,7 +529,7 @@ void ElementLinkBase::resetWithKeyAndIndex (sgkey_t key,
inline
void ElementLinkBase::setIndex (index_type index)
{
- m_persIndex = index;
+ m_persIndex = static_cast<stored_index_type>(index);
}
diff --git a/Control/AthLinks/AthLinks/GenericElementLinkBase.icc b/Control/AthLinks/AthLinks/GenericElementLinkBase.icc
index 286628d05d0f..6c7403f01144 100644
--- a/Control/AthLinks/AthLinks/GenericElementLinkBase.icc
+++ b/Control/AthLinks/AthLinks/GenericElementLinkBase.icc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// $Id$
@@ -211,7 +211,7 @@ GenericElementLinkBase<INDEXING_POLICY>::GenericElementLinkBase
CLID link_clid,
const index_type& elemID,
IProxyDict* sg)
- : m_index (elemID),
+ : m_index (static_cast<stored_index_type>(elemID)),
m_element()
{
m_key = m_proxy.toIdentifiedObject (dataID, link_clid, sg);
@@ -235,7 +235,7 @@ GenericElementLinkBase<INDEXING_POLICY>::GenericElementLinkBase
const index_type& elemID,
IProxyDict* sg)
: m_key (key),
- m_index (elemID),
+ m_index (static_cast<stored_index_type>(elemID)),
m_element()
{
m_proxy.toIdentifiedObject (key, link_clid, sg);
@@ -262,7 +262,7 @@ GenericElementLinkBase<INDEXING_POLICY>::GenericElementLinkBase
const index_type& elemID,
const ElementType& elt,
IProxyDict* sg)
- : m_index (elemID),
+ : m_index (static_cast<stored_index_type>(elemID)),
m_element (elt)
{
m_key = m_proxy.toIdentifiedObject (dataID, link_clid, sg);
@@ -290,7 +290,7 @@ GenericElementLinkBase<INDEXING_POLICY>::GenericElementLinkBase
const ElementType& elt,
IProxyDict* sg)
: m_key (key),
- m_index (elemID),
+ m_index (static_cast<stored_index_type>(elemID)),
m_element (elt)
{
m_proxy.toIdentifiedObject (key, link_clid, sg);
@@ -313,7 +313,7 @@ GenericElementLinkBase<INDEXING_POLICY>::GenericElementLinkBase
CLID link_clid,
const index_type& elemID,
IProxyDict* sg)
- : m_index (elemID),
+ : m_index (static_cast<stored_index_type>(elemID)),
m_element()
{
m_key = m_proxy.toStorableObject (obj, link_clid, sg);
@@ -334,7 +334,7 @@ GenericElementLinkBase<INDEXING_POLICY>::GenericElementLinkBase
(const GenericElementLinkBase& other,
const index_type& elemID)
: m_key (other.m_key),
- m_index (elemID),
+ m_index (static_cast<stored_index_type>(elemID)),
m_proxy (other.m_proxy),
m_element()
{
@@ -448,7 +448,7 @@ bool GenericElementLinkBase<INDEXING_POLICY>::toIndexedElement
{
if (m_proxy.isDefault() && isDefaultIndex() && !hasCachedElement()) {
m_key = m_proxy.toStorableObject (obj, link_clid, sg);
- m_index = elemID;
+ m_index = static_cast<stored_index_type>(elemID);
m_element.reset();
return true;
}
@@ -476,7 +476,7 @@ void GenericElementLinkBase<INDEXING_POLICY>::resetWithKeyAndIndex
IProxyDict* sg)
{
m_key = m_proxy.toIdentifiedObject (dataID, link_clid, sg);
- m_index = elemID;
+ m_index = static_cast<stored_index_type>(elemID);
m_element.reset();
}
@@ -502,7 +502,7 @@ void GenericElementLinkBase<INDEXING_POLICY>::resetWithKeyAndIndex
{
m_key = key;
m_proxy.toIdentifiedObject (key, link_clid, sg);
- m_index = elemID;
+ m_index = static_cast<stored_index_type>(elemID);
m_element.reset();
}
@@ -516,7 +516,7 @@ inline
void
GenericElementLinkBase<INDEXING_POLICY>::setIndex (const index_type& index)
{
- m_index = index;
+ m_index = static_cast<stored_index_type>(index);
}
diff --git a/Control/AthLinks/src/DataProxyHolder.cxx b/Control/AthLinks/src/DataProxyHolder.cxx
index 55c426c49ad8..9e63ab18050c 100644
--- a/Control/AthLinks/src/DataProxyHolder.cxx
+++ b/Control/AthLinks/src/DataProxyHolder.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -440,7 +440,7 @@ bool DataProxyHolder::toPersistent (sgkey_t& sgkey, uint32_t& index)
size_t index_s = index;
bool ret = tryRemap (sgkey, index_s);
if (ret)
- index = index_s;
+ index = static_cast<uint32_t>(index_s);
return ret;
}
--
GitLab
From ed32546e31979134de405a99c3a610943ccc78a8 Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Thu, 19 Aug 2021 16:48:37 +0200
Subject: [PATCH 168/272] TrkDetDescrTools fix clang warning on missing
override keyword
---
.../TrkDetDescrTools/LayerMaterialProvider.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Tracking/TrkDetDescr/TrkDetDescrTools/TrkDetDescrTools/LayerMaterialProvider.h b/Tracking/TrkDetDescr/TrkDetDescrTools/TrkDetDescrTools/LayerMaterialProvider.h
index f29af5ba0ef4..88a3a742b1cc 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrTools/TrkDetDescrTools/LayerMaterialProvider.h
+++ b/Tracking/TrkDetDescr/TrkDetDescrTools/TrkDetDescrTools/LayerMaterialProvider.h
@@ -49,13 +49,13 @@ namespace Trk {
/** Processor Action to work on TrackingGeometry& tgeo */
virtual StatusCode process
- ATLAS_NOT_THREAD_SAFE(const TrackingGeometry& tgeo) const;
+ ATLAS_NOT_THREAD_SAFE(const TrackingGeometry& tgeo) const override;
/** Processor Action to work on TrackingVolumes - the level is for the
* hierachy tree*/
virtual StatusCode process
ATLAS_NOT_THREAD_SAFE(const TrackingVolume& tvol,
- size_t level = 0) const;
+ size_t level = 0) const override;
StatusCode process
ATLAS_NOT_THREAD_SAFE(const TrackingVolume& lay,
@@ -64,7 +64,7 @@ namespace Trk {
/** Processor Action to work on Layers */
virtual StatusCode process
- ATLAS_NOT_THREAD_SAFE(const Layer& lay, size_t level = 0) const;
+ ATLAS_NOT_THREAD_SAFE(const Layer& lay, size_t level = 0) const override;
StatusCode process
ATLAS_NOT_THREAD_SAFE(const Layer& lay,
--
GitLab
From 9e073cd2adb8e2a064f56785771a21c454388c69 Mon Sep 17 00:00:00 2001
From: Mark Hodgkinson <m.hodgkinson@sheffield.ac.uk>
Date: Thu, 19 Aug 2021 16:57:35 +0200
Subject: [PATCH 169/272] Fix typo in PFlowUtilsDict.h and conditions tag for
heavy ion data15 ART test.
---
Reconstruction/PFlow/PFlowUtils/PFlowUtils/PFlowUtilsDict.h | 2 +-
.../RecJobTransformTests/test/test_data15_heavy_ion.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Reconstruction/PFlow/PFlowUtils/PFlowUtils/PFlowUtilsDict.h b/Reconstruction/PFlow/PFlowUtils/PFlowUtils/PFlowUtilsDict.h
index 35997cf1a0f6..5e4d10746623 100644
--- a/Reconstruction/PFlow/PFlowUtils/PFlowUtils/PFlowUtilsDict.h
+++ b/Reconstruction/PFlow/PFlowUtils/PFlowUtils/PFlowUtilsDict.h
@@ -2,7 +2,7 @@
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef PFLOWUTISLDICT_H
+#ifndef PFLOWUTILSDICT_H
#define PFLOWUTILSDICT_H
#include "PFlowUtils/IWeightPFOTool.h"
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion.sh
index 434683de472b..95374dab4eaa 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion.sh
@@ -10,7 +10,7 @@
# art-include: 21.9/Athena
-export TRF_ECHO=True; Reco_tf.py --athenaopts="--threads=1" --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_hi.00286711.physics_MinBiasOverlay.daq.RAW._lb0217._SFO-2._0001.data --outputESDFile=ESD.root --outputAODFile=AOD.root --maxEvents=25 --conditionsTag 'default:CONDBR2-BLKPA-RUN-06' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --autoConfiguration 'everything' --preExec 'all:rec.doHeavyIon.set_Value_and_Lock(True);rec.doZdc.set_Value_and_Lock(False);rec.doTrigger.set_Value_and_Lock(False);'
+export TRF_ECHO=True; Reco_tf.py --athenaopts="--threads=1" --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_hi.00286711.physics_MinBiasOverlay.daq.RAW._lb0217._SFO-2._0001.data --outputESDFile=ESD.root --outputAODFile=AOD.root --maxEvents=25 --conditionsTag 'default:CONDBR2-BLKPA-RUN2-06' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --autoConfiguration 'everything' --preExec 'all:rec.doHeavyIon.set_Value_and_Lock(True);rec.doZdc.set_Value_and_Lock(False);rec.doTrigger.set_Value_and_Lock(False);'
RES=$?
echo "art-result: $RES Reco"
--
GitLab
From 44b239ae424b7005e57a199346ee80379722b64d Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Thu, 19 Aug 2021 17:22:20 +0200
Subject: [PATCH 170/272] LArCafJobs: remove unused TrigConfigSvc from
LArShapeDumper
---
LArCalorimeter/LArCafJobs/CMakeLists.txt | 2 +-
LArCalorimeter/LArCafJobs/LArCafJobs/LArShapeDumper.h | 3 ---
LArCalorimeter/LArCafJobs/src/LArShapeDumper.cxx | 2 --
3 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/LArCalorimeter/LArCafJobs/CMakeLists.txt b/LArCalorimeter/LArCafJobs/CMakeLists.txt
index aacbe7916248..accbaf45fa52 100644
--- a/LArCalorimeter/LArCafJobs/CMakeLists.txt
+++ b/LArCalorimeter/LArCafJobs/CMakeLists.txt
@@ -34,7 +34,7 @@ atlas_add_library( LArCafJobsLib
PUBLIC_HEADERS LArCafJobs
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} AthAnalysisToolsLib AthenaBaseComps AthenaKernel CaloConditions CaloDetDescrLib CaloIdentifier CaloInterfaceLib CaloUtilsLib GaudiKernel Identifier LArCablingLib LArElecCalib LArIdentifier LArRawConditions LArRawEvent LArRecConditions StoreGateLib TrigAnalysisInterfaces TrigConfInterfaces TrigDecisionToolLib egammaEvent LumiBlockData
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} AthAnalysisToolsLib AthenaBaseComps AthenaKernel CaloConditions CaloDetDescrLib CaloIdentifier CaloUtilsLib GaudiKernel Identifier LArCablingLib LArElecCalib LArIdentifier LArRawConditions LArRawEvent LArRecConditions StoreGateLib TrigDecisionToolLib egammaEvent LumiBlockData
PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} AthenaPoolUtilities CaloEvent CaloGeoHelpers LArRecEvent NavFourMom TrigSteeringEvent TrigT1Result xAODEventInfo )
atlas_add_component( LArCafJobs
diff --git a/LArCalorimeter/LArCafJobs/LArCafJobs/LArShapeDumper.h b/LArCalorimeter/LArCafJobs/LArCafJobs/LArShapeDumper.h
index 4cfbfbfef93e..b629522608f7 100755
--- a/LArCalorimeter/LArCafJobs/LArCafJobs/LArShapeDumper.h
+++ b/LArCalorimeter/LArCafJobs/LArCafJobs/LArShapeDumper.h
@@ -30,7 +30,6 @@
#include "TFile.h"
#include "TTree.h"
#include "TRandom.h"
-#include "TrigConfInterfaces/ITrigConfigSvc.h"
#include "LArCafJobs/ILArShapeDumperTool.h"
#include "StoreGate/ReadCondHandleKey.h"
#include "LArRecConditions/LArBadChannelCont.h"
@@ -113,8 +112,6 @@ class LArShapeDumper : public AthAlgorithm
SG::ReadCondHandleKey<LArBadChannelCont> m_BCKey{this, "BadChanKey", "LArBadChannel", "SG bad channels key"};
SG::ReadCondHandleKey<CaloNoise> m_noiseCDOKey{this,"CaloNoiseKey","totalNoise","SG Key of CaloNoise data object"};
- ServiceHandle<TrigConf::ITrigConfigSvc> m_configSvc; // for tests...
-
SG::ReadCondHandleKey<BunchCrossingCondData> m_bcDataKey {this, "BunchCrossingCondDataKey", "BunchCrossingData" ,"SG Key of BunchCrossing CDO"};
diff --git a/LArCalorimeter/LArCafJobs/src/LArShapeDumper.cxx b/LArCalorimeter/LArCafJobs/src/LArShapeDumper.cxx
index 5a4673d382c4..9b85cf9e1aa8 100755
--- a/LArCalorimeter/LArCafJobs/src/LArShapeDumper.cxx
+++ b/LArCalorimeter/LArCafJobs/src/LArShapeDumper.cxx
@@ -49,7 +49,6 @@ LArShapeDumper::LArShapeDumper(const std::string & name, ISvcLocator * pSvcLocat
m_nLArError(0),
m_nNoDigits(0),
m_trigDec("Trig::TrigDecisionTool/TrigDecisionTool"),
- m_configSvc("TrigConf::TrigConfigSvc/TrigConfigSvc", name),
m_caloDetDescrMgr(nullptr),
m_onlineHelper(nullptr),
m_doEM(false),
@@ -108,7 +107,6 @@ StatusCode LArShapeDumper::initialize()
if (m_doTrigger) {
ATH_CHECK( m_trigDec.retrieve() );
- ATH_CHECK( m_configSvc.retrieve() );
}
ATH_CHECK( m_dumperTool.retrieve() );
--
GitLab
From c6694cb5de56db0df655113a309a2c6a4254b3d6 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Thu, 19 Aug 2021 17:52:01 +0200
Subject: [PATCH 171/272] DumpGeo+VP1Algs: remove unsupported trigger XML menu
reading
---
.../GeoModelStandalone/DumpGeo/share/dump-geo.py | 11 +----------
graphics/VP1/VP1Algs/share/vp1.py | 9 ---------
2 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/DetectorDescription/GeoModel/GeoModelStandalone/DumpGeo/share/dump-geo.py b/DetectorDescription/GeoModel/GeoModelStandalone/DumpGeo/share/dump-geo.py
index 448174309dfb..95ed22734827 100644
--- a/DetectorDescription/GeoModel/GeoModelStandalone/DumpGeo/share/dump-geo.py
+++ b/DetectorDescription/GeoModel/GeoModelStandalone/DumpGeo/share/dump-geo.py
@@ -1,5 +1,5 @@
#/*
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
#*/
if not 'vp1InputFiles' in dir(): vp1InputFiles = []
@@ -23,7 +23,6 @@ if not 'vp1Multinp' in dir(): vp1Multinp=False
if not 'vp1Multinpsrc' in dir(): vp1Multinpsrc=""
if not 'vp1Multinpcpy' in dir(): vp1Multinpcpy=""
if not 'vp1MultiAvailableSrcDirs' in dir(): vp1MultiAvailableSrcDirs = []
-if not 'vp1TrigDecXML' in dir(): vp1TrigDecXML=""
if not 'vp1LarHvData' in dir(): vp1LarHvData=False
# if not 'vp1FullToroids' in dir(): vp1FullToroids=False
if not 'vp1CruiseTime' in dir(): vp1CruiseTime=0
@@ -371,14 +370,6 @@ if ( vp1LarHvData ):
if (vp1Fatras):
include( "FatrasExample/Fatras_jobOptions.py" )
-if (vp1TrigDecXML!=""):
- include( "TrigConfigSvc/jobOptions_commonSetup.py" )
- include( "TrigConfigSvc/jobOptions_setupLVL1Svc.py" )
- include( "TrigConfigSvc/jobOptions_setupHLTSvc.py" )
- HLTConfigSvc.XMLMenuFile = vp1TrigDecXML
- from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
- ToolSvc += Trig__TrigDecisionTool("TrigDecisionTool")
-
if (vp1Calo):
from AthenaCommon.GlobalFlags import globalflags
if globalflags.DataSource() == 'data' :
diff --git a/graphics/VP1/VP1Algs/share/vp1.py b/graphics/VP1/VP1Algs/share/vp1.py
index 977c55d6960d..295c86640797 100644
--- a/graphics/VP1/VP1Algs/share/vp1.py
+++ b/graphics/VP1/VP1Algs/share/vp1.py
@@ -19,7 +19,6 @@ if not 'vp1Multinp' in dir(): vp1Multinp=False
if not 'vp1Multinpsrc' in dir(): vp1Multinpsrc=""
if not 'vp1Multinpcpy' in dir(): vp1Multinpcpy=""
if not 'vp1MultiAvailableSrcDirs' in dir(): vp1MultiAvailableSrcDirs = []
-if not 'vp1TrigDecXML' in dir(): vp1TrigDecXML=""
if not 'vp1Batch' in dir(): vp1Batch=False
if not 'vp1BatchAllEvents' in dir(): vp1BatchAllEvents=False
if not 'vp1BatchNEvents' in dir(): vp1BatchNEvents=0
@@ -381,14 +380,6 @@ if ( vp1LarHvData ):
if (vp1Fatras):
include( "FatrasExample/Fatras_jobOptions.py" )
-if (vp1TrigDecXML!=""):
- include( "TrigConfigSvc/jobOptions_commonSetup.py" )
- include( "TrigConfigSvc/jobOptions_setupLVL1Svc.py" )
- include( "TrigConfigSvc/jobOptions_setupHLTSvc.py" )
- HLTConfigSvc.XMLMenuFile = vp1TrigDecXML
- from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
- ToolSvc += Trig__TrigDecisionTool("TrigDecisionTool")
-
if (vp1Calo):
from AthenaCommon.GlobalFlags import globalflags
if globalflags.DataSource() == 'data' :
--
GitLab
From 3a82269e38bccf3caa95a86a978accd3df1de471 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Thu, 19 Aug 2021 17:53:18 +0200
Subject: [PATCH 172/272] TrigConfigSvc: delete obsolete files
- `TriggerConfigARA.py`: ARA has been gone since a long time
- `checkTrigger.py`/`TriggerSummary.py`: was used for inspecting trigger info in POOL files
- delete unused/broken job options
- delete unused dictionary and C++ source files not even compiled
- delete obsolete HLT XML DTD
---
.../TrigConfigSvc/CMakeLists.txt | 11 +-
.../TrigConfigSvc/data/hlt_menu.dtd | 63 ---
.../TrigConfigSvc/python/TriggerConfigARA.py | 481 ------------------
.../TrigConfigSvc/python/TriggerSummary.py | 470 -----------------
.../TrigConfigSvc/python/__init__.py | 8 +-
.../TrigConfigSvc/share/checkTrigger.py | 104 ----
.../share/jobOptions_commonSetup.py | 2 -
.../share/jobOptions_setupHLTSvc.py | 4 -
.../share/jobOptions_setupLVL1Svc.py | 6 -
.../share/testTriggerFrontierQuery.py | 48 --
.../TrigConfigSvc/src/TrigConfigSvcDict.h | 26 -
.../src/test/TrigConfigARATest.cxx | 38 --
12 files changed, 3 insertions(+), 1258 deletions(-)
delete mode 100755 Trigger/TrigConfiguration/TrigConfigSvc/data/hlt_menu.dtd
delete mode 100644 Trigger/TrigConfiguration/TrigConfigSvc/python/TriggerConfigARA.py
delete mode 100644 Trigger/TrigConfiguration/TrigConfigSvc/python/TriggerSummary.py
delete mode 100755 Trigger/TrigConfiguration/TrigConfigSvc/share/checkTrigger.py
delete mode 100755 Trigger/TrigConfiguration/TrigConfigSvc/share/jobOptions_commonSetup.py
delete mode 100755 Trigger/TrigConfiguration/TrigConfigSvc/share/jobOptions_setupHLTSvc.py
delete mode 100755 Trigger/TrigConfiguration/TrigConfigSvc/share/jobOptions_setupLVL1Svc.py
delete mode 100755 Trigger/TrigConfiguration/TrigConfigSvc/share/testTriggerFrontierQuery.py
delete mode 100644 Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfigSvcDict.h
delete mode 100644 Trigger/TrigConfiguration/TrigConfigSvc/src/test/TrigConfigARATest.cxx
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/CMakeLists.txt b/Trigger/TrigConfiguration/TrigConfigSvc/CMakeLists.txt
index 4e6196e455a7..d10cb0b9cc31 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/CMakeLists.txt
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/CMakeLists.txt
@@ -18,16 +18,9 @@ atlas_add_component( TrigConfigSvc
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/jobOptions_commonSetup.py
- share/jobOptions_setupHLTSvc.py
- share/jobOptions_setupLVL1Svc.py
- share/testTriggerFrontierQuery.py )
-atlas_install_scripts( share/checkTrigger.py share/trigconf_property.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_xmls( data/*.dtd )
-
-# Aliases:
-atlas_add_alias( checkTrigger "checkTrigger.py" )
+atlas_install_scripts( share/trigconf_property.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+# Tests:
atlas_add_test( AccumulatorTest
SCRIPT python -m TrigConfigSvc.TrigConfigSvcConfig
POST_EXEC_SCRIPT nopost.sh )
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/data/hlt_menu.dtd b/Trigger/TrigConfiguration/TrigConfigSvc/data/hlt_menu.dtd
deleted file mode 100755
index fde4afb5cee2..000000000000
--- a/Trigger/TrigConfiguration/TrigConfigSvc/data/hlt_menu.dtd
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!ELEMENT HLT_MENU (CHAIN_LIST, SEQUENCE_LIST)>
-
-<!ELEMENT CHAIN_LIST (CHAIN)*>
-
-<!ELEMENT CHAIN (TRIGGERTYPE_LIST?, STREAMTAG_LIST, GROUP_LIST?, SIGNATURE_LIST)>
-<!ATTLIST CHAIN
- chain_name CDATA #REQUIRED
- chain_counter CDATA #REQUIRED
- lower_chain_name CDATA #REQUIRED
- level CDATA #REQUIRED
- prescale CDATA #REQUIRED
- pass_through CDATA #REQUIRED
->
-
-<!ELEMENT TRIGGERTYPE_LIST (TRIGGERTYPE*)>
-
-<!ELEMENT TRIGGERTYPE EMPTY>
-<!ATTLIST TRIGGERTYPE
- bit CDATA #REQUIRED>
-
-<!ELEMENT STREAMTAG_LIST (STREAMTAG)+>
-
-<!ELEMENT STREAMTAG EMPTY>
-<!ATTLIST STREAMTAG
- stream CDATA #REQUIRED
- type CDATA #REQUIRED
- obeyLB CDATA #REQUIRED
- prescale CDATA #REQUIRED
->
-
-<!ELEMENT GROUP_LIST (GROUP*)>
-<!ELEMENT GROUP EMPTY>
-<!ATTLIST GROUP
- name CDATA #REQUIRED
->
-
-
-
-<!ELEMENT SIGNATURE_LIST (SIGNATURE)*>
-
-<!ELEMENT SIGNATURE (TRIGGERELEMENT)*>
-<!ATTLIST SIGNATURE
- logic CDATA #REQUIRED
- signature_counter CDATA #REQUIRED
->
-
-<!ELEMENT TRIGGERELEMENT EMPTY>
-<!ATTLIST TRIGGERELEMENT
- te_name CDATA #REQUIRED
->
-
-
-
-<!ELEMENT SEQUENCE_LIST (SEQUENCE)*>
-
-<!ELEMENT SEQUENCE EMPTY>
-<!ATTLIST SEQUENCE
- input CDATA #REQUIRED
- topo_start_from CDATA #IMPLIED
- algorithm CDATA #REQUIRED
- output ID #REQUIRED >
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/python/TriggerConfigARA.py b/Trigger/TrigConfiguration/TrigConfigSvc/python/TriggerConfigARA.py
deleted file mode 100644
index 4f406e0867b4..000000000000
--- a/Trigger/TrigConfiguration/TrigConfigSvc/python/TriggerConfigARA.py
+++ /dev/null
@@ -1,481 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-## @file TriggerConfigARA.py
-## @brief Configuration object to be used in python ARA
-## @author Joerg Stelzer <stelzer@cern.ch>
-
-from __future__ import print_function
-
-import sys
-import ROOT
-import cppyy
-import AthenaROOTAccess.transientTree
-
-def _iter(self) :
- sequential = self.begin()
- end = self.end()
- while sequential != end :
- yield sequential.__deref__()
- sequential.__preinc__()
- raise StopIteration
-
-def _chPrint(self):
- s = "%s (%s %i), ps %g [streams: " % (self.chain_name(), self.level(), self.chain_counter(), self.prescale())
- if len(self.streamTagList())>0:
- for stag in self.streamTagList():
- s += stag.stream() + "|"
- s = s.rstrip('|')
- else:
- s += "-"
- s+=']'
- return s
-
-def _elemFilter(elem):
- if elem.key().startswith('/TRIGGER/'):
- return elem
- return None
-
-
-class _TrigConfHolder:
- """helper class to hold all configuration data in one place"""
- def __init__(self):
- self.SMK = -1
- self.HltPSK = -1
- self.L1PSK = -1
- self.L1PS = []
- self.L1Items = {}
- self.HLTChains = {}
- self.ConfigSrc = ""
-
- def __str__(self):
- s = "SMK: %i, HLTpsk: %i, L1psk: %i\n" % (self.SMK, self.HltPSK, self.L1PSK)
- s += "Config source: %s\n" % str(self.ConfigSrc)
- s += "# L1 Items : %i\n" % len(self.L1Items)
- s += "# HLT Chains : %i" % len(self.HLTChains)
- return s
-
-
-class TriggerConfigARA(object):
- """class which the user should instantiate to get access to the trigger configuration in PyROOT"""
-
- __cnv = ROOT.TrigConf.TrigConfigARA()
- __keysInUpdateOrder = ['L1K','HLTK','HLTPSK','L1M','HLTM','L1PS']
- __folderName = {
- "L1M" : "_TRIGGER_LVL1_Menu",
- "HLTM" : "_TRIGGER_HLT_Menu",
- "L1K" : "_TRIGGER_LVL1_Lvl1ConfigKey",
- "HLTK" : "_TRIGGER_HLT_HltConfigKeys",
- "HLTPSK" : "_TRIGGER_HLT_PrescaleKey",
- "L1PS" : "_TRIGGER_LVL1_Prescales"
- }
-
-
- def __init__(self, poolfile, **args):
- """An AOD file pointer (not a string) must be given as argument"""
-
- self.__dict__.__setitem__("_TriggerConfigARA__curConf", _TrigConfHolder())
- self.__currentIOV = {}
- self.verbose = False
- if 'verbose' in args: self.verbose = args['verbose']
-
- plcClass = cppyy.makeClass("IOVPayloadContainer")
- plcClass.iter = _iter
-
- tiClass = cppyy.makeClass("TrigConf::TriggerItem")
- tiClass.__str__ = lambda x: "%s (ctpid %i), ps %g" % (x.name(), x.ctpId(), x.ps)
-
- chClass = cppyy.makeClass("TrigConf::HLTChain")
- chClass.__str__ = _chPrint
-
- ROOT.IOVTime.__str__ = lambda x: "%i/%i" % (x.run(),x.event())
- ROOT.IOVTime.__lt__ = lambda s,o: s.run()<o.run() or s.run()==o.run() and s.event()<o.event()
- ROOT.IOVTime.__eq__ = lambda s,o: s.run()==o.run() and s.event()==o.event()
- ROOT.IOVTime.__le__ = lambda s,o: s<o or s==o
- ROOT.IOVRange.__str__ = lambda x: "%s - %s" % (x.start(),x.stop())
- ROOT.IOVRange.isInRange = lambda x,e: x.start()<=e and e<x.stop()
-
- print("Opening file(s) and creating transient metadata ...")
- if type(poolfile) == list:
- self._collection = ROOT.AthenaROOTAccess.TChainROOTAccess('MetaData')
- for file in poolfile:
- self._collection.Add(file)
- self.mdt = AthenaROOTAccess.transientTree.makeTree(self._collection,
- persTreeName = 'MetaData',
- dhTreeName = 'MetaDataHdr',
- dhfilt = _elemFilter )
- else:
- treeNames = [k.GetName() for k in poolfile.GetListOfKeys()]
- if "MetaDataHdrDataHeader" in treeNames:
- dhTreeName = 'MetaDataHdrDataHeader' # old style
- else:
- dhTreeName = 'MetaDataHdr'
- self.mdt = AthenaROOTAccess.transientTree.makeTree(poolfile,
- persTreeName = 'MetaData',
- dhTreeName = dhTreeName,
- dhfilt = _elemFilter )
-
- for key in self.__class__.__keysInUpdateOrder:
- if not hasattr(self.mdt,self.__class__.__folderName[key]):
- print("No key %s in file %s, use checkFile.py to verify" % (self.__class__.__folderName[key],poolfile))
- sys.exit(0)
-
-
-
-
-
- def printfnc(self,chaindetails=False):
- print(self)
- if not chaindetails: return
- for ef in self.HLTChains.values():
- if ef.level()!='EF': continue
- if ef.prescale()<0: continue
- self.printFullChain(ef.chain_name())
-
- def printFullChain(self, name):
- fc = self.getFullChain(name)
- efstr = "-"
- l2str = "-"
- l1str = "-"
- ststr = ""
- if fc[2]:
- efstr = "%s (%1.2f)" % (fc[2].chain_name(), fc[2].prescale())
- if len(fc[2].streamTagList())>0:
- for stag in fc[2].streamTagList():
- ststr += stag.stream() + "|"
- ststr = ststr.rstrip('|')
- else:
- ststr += "-"
- ststr+=']'
- if fc[1]: l2str = "%s (%1.2f)" % (fc[1].chain_name(), fc[1].prescale())
- if fc[0]:
- l1str = ""
- if isinstance(fc[0], list):
- for i in fc[0]:
- l1str += "%s (%i) " % (i.name(), self.L1PS[i.ctpId()])
- else:
- l1str = "%s (%i)" % (fc[0].name(), self.L1PS[fc[0].ctpId()])
- print("EF: %s, L2: %s, L1: %s [streams: %s" % (efstr, l2str, l1str, ststr ))
-
-
- def __str__(self):
- s = "SMK: %i, HLTpsk: %i, L1psk: %i\n" % (self.SMK, self.HltPSK, self.L1PSK)
- s += "Config source: %s\n" % str(self.ConfigSrc)
- s += "L1 Items : %i\n" % len(self.L1Items)
- s += "HLT Chains : %i" % len(self.HLTChains)
- return s
-
- def __getattr__(self, key):
- """Forwards getting of unknown attributes to the configuration holder"""
- if key in self.__dict__["_TriggerConfigARA__curConf"].__dict__:
- return self.__dict__["_TriggerConfigARA__curConf"].__dict__.__getitem__(key)
- raise AttributeError("No configuration parameter %s" % key)
-
- def __setattr__(self, key, val):
- """Forwards setting of unknown attributes to the configuration holder"""
- if key in self.__dict__["_TriggerConfigARA__curConf"].__dict__:
- self.__dict__["_TriggerConfigARA__curConf"].__dict__.__setitem__(key,val)
- else:
- self.__dict__.__setitem__(key, val)
-
- def printFileSummary(self, chaindetails=False):
- br = self.mdt.GetBranch(self.__class__.__folderName['HLTK'])
- iovs = []
- for i in range(self.mdt.GetEntries()):
- br.GetEntry(i)
- metaData = getattr(self.mdt, br.GetName())
- plc = metaData.payloadContainer()
- for payload in plc.iter():
- for j in range(payload.size()):
- chanNum = int(payload.chanNum(j))
- iovr = payload.iovRange(chanNum)
- iovs += [iovr]
-
- print("-----------------------------------------------------------------------")
- for iov in iovs:
- end = iov.stop().event()-1
- if end==-1: end="MAX"
- else: end="%3i" % end
- print("Run: %6i LBs: %3i - %s" % (iov.start().run(),iov.start().event(),end))
- print("---------------------------")
- currentEvent = ROOT.IOVTime(iov.start().run(), iov.start().event())
- for key in self.__class__.__keysInUpdateOrder:
- self.__loadData(key, currentEvent)
- self.printfnc(chaindetails)
- print("-----------------------------------------------------------------------")
- self.__dict__.__setitem__("_TriggerConfigARA__curConf", _TrigConfHolder())
- self.__currentIOV = {}
-
- def update(self, run, lb):
- """This is the function the user must call to trigger reloading of meta-data from the Tree.
- Data is only reloaded if the IOV goes out of range. The valid IOVs are kept for each folder individually"""
- updated = False
- overallsucc = True
- currentEvent = ROOT.IOVTime(run, lb)
- # check if all the currently loaded folders are still covering the current run/lb
- for key in self.__class__.__keysInUpdateOrder:
- if (key in self.__currentIOV) and self.__currentIOV[key] and self.__currentIOV[key].isInRange(currentEvent):
- continue
- success = self.__loadData(key, currentEvent)
- if not success:
- overallsucc = False
- print("Did not find valid IOV for %s" % self.__class__.__folderName[key])
- updated = True
- if updated:
- if overallsucc:
- print("Loaded new trigger configuration for run/lb = %i/%i" % (run,lb))
- else:
- print("ERROR: Loading of new trigger configuration for run/lb = %i/%i failed" % (run,lb))
- if self.verbose:
- print(self)
- return updated
-
- def isConfigured(self, name):
- if name in self.L1Items: return True
- if name in self.HLTChains: return True
- return False
-
- def getConfiguredChainNames(self):
- nameList = []
- nameList += self.L1Items.keys()
- nameList += self.HLTChains.keys()
- return nameList
-
- def getFullChain(self, name):
- if not self.isConfigured(name): return None
-
- fullchain = [None,None,None] # L1,L2,EF
-
- if name in self.L1Items:
- fullchain[0] = self.L1Items[name]
- return fullchain
-
- hltchain = self.HLTChains[name]
- if hltchain.level()=='EF':
- fullchain[2] = hltchain
- l2name = hltchain.lower_chain_name()
- if l2name!="":
- if not self.isConfigured(l2name):
- raise RuntimeError("Lower chain %s as seed of %s not configured" % (l2name,name))
- fullchain[1] = self.HLTChains[l2name]
- else:
- fullchain[1] = hltchain
-
- if fullchain[1]:
- l2name = fullchain[1].chain_name()
- l1name = fullchain[1].lower_chain_name()
- if l1name=="":
- pass
- elif ',' in l1name: # multiseeded L2 chain
- fullchain[0] = []
- itemlist = l1name.replace(' ','').split(',')
- for item in itemlist:
- if not self.isConfigured(item):
- raise RuntimeError("L1 item %s as seed of %s not configured" % (str(item),l2name))
- fullchain[0].append(self.L1Items[item])
- else:
- if not self.isConfigured(l1name):
- raise RuntimeError("L1 item %s as seed of %s not configured" % (str(l1name),l2name))
- fullchain[0] = self.L1Items[l1name]
-
- return fullchain
-
-
- def getFullChainPrescaleFactor(self, name):
- if not self.isConfigured(name): return 0
- # if name is a L1Item
- if name in self.L1Items:
- return self.L1PS[self.L1Items[name].ctpId()]
-
- hltchain = self.HLTChains[name]
- prescale = hltchain.prescale()
- lowname = hltchain.lower_chain_name()
- if lowname=="": return prescale # unseeded
- if not self.isConfigured(lowname):
- raise RuntimeError("Lower chain %s of %s not configured" % (lowname,name))
-
- if hltchain.level()=='EF':
- hltchain = self.HLTChains[lowname]
- prescale *= hltchain.prescale()
- lowname = hltchain.lower_chain_name()
- if lowname=="": return prescale # unseeded
- if not self.isConfigured(lowname):
- raise RuntimeError("Lower item %s of %s not configured" % (lowname,name))
-
- # hltchain should be of L2
- prescale *= self.L1PS[self.L1Items[lowname].ctpId()]
- return prescale
-
- def getL1Items(self):
- return self.L1Items
-
- def getHLTChains(self):
- return self.HLTChains
-
- def getConfigKeys(self):
- return (self.SMK, self.L1PSK, self.HltPSK)
-
- def __loadData(self, key, currentEvent):
- br = self.mdt.GetBranch(self.__class__.__folderName[key])
- validIOV = getattr(self,"_load%s" % key)(br, currentEvent)
- if self.verbose:
- print("Loaded %s with iov %s" % (key, validIOV))
- self.__currentIOV[key] = validIOV
- return validIOV is not None
-
- def _loadHLTK(self, br, currentEvent):
- validIOV = None
- self.SMK = -1
- self.HltPSK = -1
- self.ConfigSrc = ""
- for i in range(self.mdt.GetEntries()):
- br.GetEntry(i)
- metaData = getattr(self.mdt, br.GetName())
- plc = metaData.payloadContainer()
- for payload in plc.iter():
- #payload.dump()
- for i in range(payload.size()):
- chanNum = int(payload.chanNum(i))
- # first check the iov
- iovr = payload.iovRange(chanNum)
- if not iovr.isInRange(currentEvent): continue
- if not validIOV: validIOV = ROOT.IOVRange(iovr)
- al = payload.attributeList(chanNum)
- smk = ROOT.Long(0)
- hltpsk = ROOT.Long(0)
- configsrc = ROOT.std.string("")
- self.__class__.__cnv.readHltConfigKeysARA(al,smk,hltpsk,configsrc)
- self.SMK = smk
- self.HltPSK = hltpsk
- self.ConfigSrc = configsrc
- return validIOV
-
-
- def _loadHLTPSK(self, br, currentEvent):
- validIOV = None
- self.HltPSK = -1
- for i in range(self.mdt.GetEntries()):
- br.GetEntry(i)
- metaData = getattr(self.mdt, br.GetName())
- plc = metaData.payloadContainer()
- for payload in plc.iter():
- #payload.dump()
- for i in range(payload.size()):
- chanNum = int(payload.chanNum(i))
- # first check the iov
- iovr = payload.iovRange(chanNum)
- if not iovr.isInRange(currentEvent): continue
- if not validIOV: validIOV = ROOT.IOVRange(iovr)
- al = payload.attributeList(chanNum)
- hltpsk = ROOT.Long(0)
- self.HltPSK = self.__class__.__cnv.readHltPrescaleKeyARA(al,hltpsk)
- self.HltPSK = hltpsk
- return validIOV
-
-
-
- def _loadL1K(self, br, currentEvent):
- foundAnyIOV = False
- self.L1PSK = -1
- payloadList = []
- for i in range(self.mdt.GetEntries()):
- br.GetEntry(i)
- metaData = getattr(self.mdt, br.GetName())
- plc = metaData.payloadContainer()
- for payload in plc.iter():
- for i in range(payload.size()):
- chanNum = int(payload.chanNum(i))
- iovr = payload.iovRange(chanNum)
- payloadList += [[iovr,payload.attributeList(chanNum)]]
- foundAnyIOV = True
- if not foundAnyIOV: return None
- # sort the payload by IOV and remove the overlap
- payloadList.sort(key = lambda a: a[0].start())
- for i in range(len(payloadList)-1):
- payloadList[i][0] = ROOT.IOVRange(payloadList[i][0].start(),payloadList[i+1][0].start())
- # get the content
- validIOV = None
- for pl in payloadList:
- if pl[0].isInRange(currentEvent):
- if not validIOV: validIOV = pl[0]
- self.L1PSK = pl[1]['Lvl1PrescaleConfigurationKey']
- return validIOV
-
-
- def _loadL1PS(self, br, currentEvent):
- foundAnyIOV = False
- self.L1PS = 256*[0]
- payloadList = [[] for x in range(256)]
- for i in range(self.mdt.GetEntries()):
- br.GetEntry(i)
- metaData = getattr(self.mdt, br.GetName())
- plc = metaData.payloadContainer()
- for payload in plc.iter():
- for i in range(payload.size()):
- chanNum = int(payload.chanNum(i))
- iovr = payload.iovRange(chanNum)
- payloadList[chanNum] += [[iovr,payload.attributeList(chanNum)]]
- foundAnyIOV = True
- if not foundAnyIOV: return None
- # sort the payload by IOV and remove the overlap
- for ch in range(256):
- x = payloadList[ch]
- x.sort(key = lambda a: a[0].start())
- for i in range(len(x)-1):
- x[i][0] = ROOT.IOVRange(x[i][0].start(),x[i+1][0].start())
- # read the payload
- psset = 256 * [0]
- validIOV = None
- for ch in range(256):
- for pl in payloadList[ch]:
- if pl[0].isInRange(currentEvent):
- if not validIOV: validIOV = pl[0]
- psset[ch] = pl[1]['Lvl1Prescale']
-
- for item in self.L1Items.values():
- item.ps = psset[item.ctpId()]
- self.L1PS = psset
- return validIOV
-
- def _loadL1M(self, br, currentEvent):
- validIOV = None
- items = {}
- for i in range(self.mdt.GetEntries()):
- br.GetEntry(i)
- metaData = getattr(self.mdt, br.GetName())
- plc = metaData.payloadContainer()
- for payload in plc.iter():
- #payload.dump()
- for i in range(payload.size()):
- chanNum = int(payload.chanNum(i))
- # first check the iov
- iovr = payload.iovRange(chanNum)
- if not iovr.isInRange(currentEvent): continue
- if not validIOV: validIOV = ROOT.IOVRange(iovr)
- al = payload.attributeList(chanNum)
- l1item = self.__class__.__cnv.createLvl1TriggerItemARA(al)
- l1item.setCtpId(chanNum)
- items[l1item.name()] = l1item
- self.L1Items = items
- return validIOV
-
-
- def _loadHLTM(self, br, currentEvent):
- validIOV = None
- chains = {}
- for i in range(self.mdt.GetEntries()):
- br.GetEntry(i)
- metaData = getattr(self.mdt, br.GetName())
- plc = metaData.payloadContainer()
- for payload in plc.iter():
- #payload.dump()
- for i in range(payload.size()):
- chanNum = int(payload.chanNum(i))
- # first check the iov
- iovr = payload.iovRange(chanNum)
- if not iovr.isInRange(currentEvent): continue
- if not validIOV: validIOV = ROOT.IOVRange(iovr)
- al = payload.attributeList(chanNum)
- chain = self.__class__.__cnv.createHLTChainARA(al)
- chains[chain.chain_name()] = chain
- self.HLTChains = chains
- return validIOV
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/python/TriggerSummary.py b/Trigger/TrigConfiguration/TrigConfigSvc/python/TriggerSummary.py
deleted file mode 100644
index 5dee068d4e5e..000000000000
--- a/Trigger/TrigConfiguration/TrigConfigSvc/python/TriggerSummary.py
+++ /dev/null
@@ -1,470 +0,0 @@
-from __future__ import print_function
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-# @author: Till Eifert <Till.Eifert@cern.ch>
-# @date: October 2008
-#
-# Note, parts of this file are copied from S. Binet's PoolFile.py
-
-__version__ = "$Revision: 1.2 $"
-__author__ = "Till Eifert <Till.Eifert@cern.ch>"
-
-import sys, os
-import shelve, whichdb
-
-
-class PoolOpts(object):
- FAST_MODE = False
- READ_MODE = "READ"
- POOL_HEADER = "POOLContainer_"
- EVENT_DATA = "CollectionTree"
- META_DATA = "MetaData"
- HDR_FORMAT = "%5s %5s %-15s %s"
- ROW_FORMAT = "%5i %4s %-30s %5i %5i %5i"
- ROW_FORMAT_GLOBAL = " %4s %-30s %5i"
-
- L1_GLOBAL = "Global LVL1"
- L2_GLOBAL = "Global LVL2"
- EF_GLOBAL = "Global EF (LVL3)"
-
- level = ['None', 'LVL1', 'LVL2', 'EF']
-
- @classmethod
- def isData(cls, name):
- return ( len(name) >= len("##") and name[:2] != "##" ) and \
- ( name != PoolOpts.POOL_HEADER )
-
- @classmethod
- def isDataHeader(cls, name):
- return name == PoolOpts.POOL_HEADER+"DataHeader"
-
- @classmethod
- def isEventData(cls, name):
- return len(name) >= len(PoolOpts.EVENT_DATA) and \
- name[:len(PoolOpts.EVENT_DATA)] == PoolOpts.EVENT_DATA
-
- pass # class PoolOpts
-
-
-
-class PoolRecord(object):
- """
- """
- class Sorter:
- name = "name"
- counter = "counter"
- evtsBeforePS = "evtsBeforePS"
- evtsAfterPS = "evtsAfterPS"
- evtsAfterPT = "evtsAfterPT"
-
- @staticmethod
- def allowedValues():
- return [ PoolRecord.Sorter.name,
- PoolRecord.Sorter.counter,
- PoolRecord.Sorter.evtsBeforePS,
- PoolRecord.Sorter.evtsAfterPS,
- PoolRecord.Sorter.evtsAfterPT,]
- pass
- def __init__(self, name, counter, evtsBeforePS, evtsAfterPS, evtsAfterPT, level):
- object.__init__(self)
- self.name = name
- self.counter = counter
- self.evtsBeforePS = evtsBeforePS
- self.evtsAfterPS = evtsAfterPS
- self.evtsAfterPT = evtsAfterPT
- self.level = level
- return
-
-
-class PoolFile(object):
- """
- A simple class to retrieve informations about the content of a POOL file.
- It should be abstracted from the underlying technology used to create this
- POOL file (Db, ROOT,...).
- Right now, we are using the easy and loosy solution: going straight to the
- ROOT 'API'.
- """
-
- def __init__(self, fileName):
- object.__init__(self)
-
- self._fileInfos = None
- self.keys = None
- self.dataHeader = None
- # trigger stuff
- self.trigConf = None
- self.l1_global = None
- self.l1_items = []
- self.l2_global = None
- self.l2_chains = []
- self.ef_global = None
- self.ef_chains = []
-
- self.poolFile = None
- dbFileName = whichdb.whichdb( fileName )
- if dbFileName not in ( None, '' ):
- print("## opening file [%s]..." % str(fileName))
- db = shelve.open( fileName, 'r' )
- print("## opening file [OK]")
- report = db['report']
- self._fileInfos = report['fileInfos']
-
- self.l1_items = report['l1_data']
- self.l2_chains = report['l2_data']
- self.ef_chains = report['ef_data']
- self.l1_global = report['l1_global']
- self.l2_global = report['l2_global']
- self.ef_global = report['ef_global']
- else:
- print("## opening file [%s]..." % str(fileName))
- self.__openPoolFile( fileName )
- print("## opening file [OK]")
- self.__processFile()
-
- return
-
- def __openPoolFile(self, fileName):
- # hack to prevent ROOT from loading graphic libraries and hence bother
- # our fellow Mac users
- oldArgs = sys.argv
- sys.argv = sys.argv[:1] + ['-b'] + sys.argv[1:]
- print("## importing ROOT...")
- import ROOT
- print("## importing ROOT... [DONE]")
- ROOT.gErrorIgnoreLevel = ROOT.kFatal
- sys.argv = oldArgs
-
- poolFile = None
- try:
- #ROOT.TFile.SetReadStreamerInfo(False)
- poolFile = ROOT.TFile.Open( fileName, PoolOpts.READ_MODE )
- except Exception as e:
- print("## Failed to open file [%s] !!" % fileName)
- print("## Reason:")
- print(e)
- print("## Bailing out...")
- raise IOError("Could not open file [%s]" % fileName)
-
- #rootMsg.unMute()
-
- if poolFile is None:
- print("## Failed to open file [%s] !!" % fileName)
- msg = "Could not open file [%s]" % fileName
- raise IOError(msg)
-
- self.poolFile = poolFile
- assert self.poolFile.IsOpen() and not self.poolFile.IsZombie(), "Invalid POOL file or a Zombie one"
- self._fileInfos = {
- 'name' : self.poolFile.GetName(),
- 'size' : self.poolFile.GetSize()
- }
- return
-
- def __setupDataStructure(self):
- self.l1_global = PoolRecord( name=PoolOpts.L1_GLOBAL, counter=-1, evtsBeforePS=0, evtsAfterPS=0,
- evtsAfterPT=0, level=PoolOpts.level[1] )
-
- self.l2_global = PoolRecord( name=PoolOpts.L2_GLOBAL, counter=-1, evtsBeforePS=0, evtsAfterPS=0,
- evtsAfterPT=0, level=PoolOpts.level[2] )
-
- self.ef_global = PoolRecord( name=PoolOpts.EF_GLOBAL, counter=-1, evtsBeforePS=0, evtsAfterPS=0,
- evtsAfterPT=0, level=PoolOpts.level[3] )
-
- # access to L1 TriggerItems through trigConf.L1Items
- for (name,item) in self.trigConf.L1Items.items():
- self.l1_items += [PoolRecord(name=name, counter=item.ctpId(), evtsBeforePS=0, evtsAfterPS=0,
- evtsAfterPT=0, level=PoolOpts.level[1]) ]
-
- # access to HLT chains through trigConf.L1Items
- for (name,chain) in self.trigConf.HLTChains.items():
- if chain.level() == 'L2':
- self.l2_chains += [PoolRecord(name=name, counter=chain.chain_counter(), evtsBeforePS=0, evtsAfterPS=0, \
- evtsAfterPT=0, level=PoolOpts.level[2]) ]
- elif chain.level() == 'EF':
- self.ef_chains += [PoolRecord(name=name, counter=chain.chain_counter(), evtsBeforePS=0, evtsAfterPS=0, \
- evtsAfterPT=0, level=PoolOpts.level[3]) ]
- else:
- print("will ignore chain (%s, %i) because the trigger level (=%s) is not set to either 'L2' or 'EF'" \
- % ( name, chain.chain_counter(), chain.level()))
-
-
- return
-
- def __processFile(self):
-
- ## first we try to fetch the DataHeader
- treeNames = [k.GetName() for k in self.poolFile.GetListOfKeys()]
- if "POOLContainer" in treeNames:
- name = "POOLContainer" # new format
- else:
- name = "POOLContainer_DataHeader" # old format
- dhKey = self.poolFile.FindKey( name )
- nEntries = dhKey.ReadObj().GetEntries()
- self._fileInfos['entries'] = nEntries
-
- ## next, try to get the trigger configuration from the MetaData TTree
- print("## Reading trigger configuration from MetaData ...")
- from TrigConfigSvc.TriggerConfigARA import TriggerConfigARA
- try:
- self.trigConf = TriggerConfigARA(self.poolFile)
- except Exception as e:
- print("## Caught exception [%s] !!" % str(e.__class__))
- print("## What:",e)
- print(sys.exc_info()[0])
- print(sys.exc_info()[1])
- pass
- print("## Reading trigger configuration from MetaData ... [DONE]")
-
- ## get the transient tree
- print("## Creating transient collection tree ...")
- import AthenaROOTAccess.transientTree
- def filter(dhe):
- if 'HLTResult' in dhe.token() or 'TrigDecision' in dhe.token() or 'EventInfo' in dhe.token():
- print('+', dhe.token())
- return dhe
- return False
-
-
-
-
- branchNames = {}
- transientTree = AthenaROOTAccess.transientTree.makeTree(self.poolFile, branchNames = branchNames, dhfilt=filter)
- print("## Creating transient collection tree ... [DONE]")
-
- # figure out the name of the EventInfo branch (this may change from MC to MC and DATA)
- eventInfoBranchName = 'McEventInfo'
- possible = [ (b.GetClassName(), b.GetName()) for b in transientTree.GetListOfBranches() if b.GetClassName() == 'EventInfo']
- if len(possible) == 1:
- eventInfoBranchName = possible[0][1]
- del possible
-
- # from TrigSteering.Chain import Chain #MN
- import ROOT
- Chain = ROOT.HLT.Chain
-
- ## Branches that we're interested in:
- EventInfo_br = transientTree.GetBranch(eventInfoBranchName)
- TrigDecision_br = transientTree.GetBranch("TrigDecision")
-
- print("## Looping over all events now ...")
- isFirstEvent = True
- for i in range(transientTree.GetEntries()):
- if EventInfo_br.GetEntry(i) <= 0 or TrigDecision_br.GetEntry(i) <= 0 :
- print(":: could not get entry #%i" % i)
- break
- # update the trig conf. with these numbers:
-
- #eventID = eval('transientTree.'+eventInfoBranchName+'.event_ID()')
- ei = getattr(transientTree, eventInfoBranchName)
- eventID = ei.event_ID()
- self.trigConf.update(eventID.run_number(), eventID.lumi_block())
-
- ## FIRST EVENT -> setup data structure
- if isFirstEvent:
- isFirstEvent = False
- self.__setupDataStructure()
-
- ## global trigger status
- l1 = transientTree.TrigDecision.getL1Result()
- l2 = transientTree.TrigDecision.getL2Result()
- ef = transientTree.TrigDecision.getEFResult()
-
- self.l1_global.evtsAfterPT += l1.isAccepted()
- self.l2_global.evtsAfterPT += l2.isAccepted()
- self.ef_global.evtsAfterPT += ef.isAccepted()
-
- ## LVL1 items
- for l1_item in self.l1_items:
- l1_item.evtsBeforePS += l1.isPassedBeforePrescale( l1_item.counter )
- l1_item.evtsAfterPS += l1.isPassedAfterPrescale ( l1_item.counter )
- l1_item.evtsAfterPT += l1.isPassedAfterVeto ( l1_item.counter )
-
- ## LVL2 chains
- l2_chains = l2.getChainResult()
- l2Chains = {}
- for i in range(l2_chains.size()):
- aChain = Chain( l2_chains[i] )
- l2Chains[aChain.getChainCounter()] = aChain
-
- for chain in self.l2_chains:
- if chain.counter not in l2Chains:
- continue
- if l2Chains[ chain.counter ].chainPassedRaw():
- chain.evtsBeforePS += 1
- if not l2Chains[ chain.counter ].isPrescaled():
- chain.evtsAfterPS += 1
- if l2Chains[ chain.counter ].chainPassed():
- chain.evtsAfterPT += 1
-
- ## EF chains
- ef_chains = ef.getChainResult()
- efChains = {}
- for i in range(ef_chains.size()):
- aChain = Chain( ef_chains[i] )
- efChains[aChain.getChainCounter()] = aChain
-
- for chain in self.ef_chains:
- if chain.counter not in efChains:
- continue
- if efChains[ chain.counter ].chainPassedRaw():
- chain.evtsBeforePS += 1
- if not efChains[ chain.counter ].isPrescaled():
- chain.evtsAfterPS += 1
- if efChains[ chain.counter ].chainPassed():
- chain.evtsAfterPT += 1
-
-
-
-
- print("## Looping over all events ... [DONE]")
-
- return
-
-
- def fileInfos(self):
- return os.linesep.join( [
- "File:" + self._fileInfos['name'],
- "Size: %12.3f kb" % (self._fileInfos['size'] / 1e3),
- "Nbr Events: %i" % self._fileInfos['entries']
- ] )
-
- def checkFile(self, sorting = PoolRecord.Sorter.name):
- print(self.fileInfos())
- print("")
- print("Trigger configuration summary:")
- print(self.trigConf)
-
- ## sorting data
- if sorting in PoolRecord.Sorter.allowedValues():
- import operator
- data1 = self.l1_items
- data1.sort(key = operator.attrgetter(sorting) )
- data2 = self.l2_chains
- data2.sort(key = operator.attrgetter(sorting) )
- data3 = self.ef_chains
- data3.sort(key = operator.attrgetter(sorting) )
-
- print("")
- print("="*80)
- print(PoolOpts.HDR_FORMAT % ( "ID",
- "level",
- "Trigger name",
- "Passed events: raw, after PS, after PT/Veto"))
- print("="*80)
- for item in [self.l1_global, self.l2_global, self.ef_global]:
- print(PoolOpts.ROW_FORMAT_GLOBAL % (
- item.level,
- item.name,
- item.evtsAfterPT
- ))
-
- print("-"*80)
- for item in self.l1_items:
- print(PoolOpts.ROW_FORMAT % (
- item.counter,
- item.level,
- item.name,
- item.evtsBeforePS, item.evtsAfterPS,
- item.evtsAfterPT
- ))
- print("-"*80)
- for chain in self.l2_chains:
- print(PoolOpts.ROW_FORMAT % (
- chain.counter,
- chain.level,
- chain.name,
- chain.evtsBeforePS, chain.evtsAfterPS,
- chain.evtsAfterPT
- ))
- print("-"*80)
- for chain in self.ef_chains:
- print(PoolOpts.ROW_FORMAT % (
- chain.counter,
- chain.level,
- chain.name,
- chain.evtsBeforePS, chain.evtsAfterPS,
- chain.evtsAfterPT
- ))
- print("="*80)
-
- return
-
- def saveReport (self, fileName):
- """
- Save all the gathered informations into a python shelve or a CSV file
- (depending on the @param `fileName` extension)
- """
- import os
- if os.path.splitext(fileName)[-1] == '.csv':
- return self._save_csv_report (fileName)
- return self._save_shelve_report (fileName)
-
- def _save_shelve_report(self, fileName):
- """
- Save all the gathered informations into a python shelve
- Data can then be read like so:
- >>> import shelve
- >>> db = shelve.open( 'myfile.dat', 'r' )
- >>> report = db['report']
- >>> print 'fileSize:',report['fileSize']
- >>> print 'dataHeader/memSize:',report['dataHeader'].memSize
- >>> for d in report['data']:
- ... print 'data:',d.name,d.nEntries,d.memSize
- """
- import shelve, os
- if os.path.exists (fileName):
- os.unlink (fileName)
- db = shelve.open (fileName)
- db['report'] = {
- 'fileInfos' : self._fileInfos,
- 'l1_global' : self.l1_global,
- 'l2_global' : self.l2_global,
- 'ef_global' : self.ef_global,
- 'l1_data' : self.l1_items,
- 'l2_data' : self.l2_chains,
- 'ef_data' : self.ef_chains
- }
- db.close()
- return
-
- def _save_csv_report(self, fileName):
- """
- Save all the gathered informations into a CSV file
- """
- import csv, os
- if os.path.exists (fileName):
- os.unlink (fileName)
- o = csv.writer (open (fileName, 'w'))
- map (o.writerow,
- [ ['file name', self._fileInfos['name']],
- ['file size', self._fileInfos['size']],
- ['nbr evts', self._fileInfos['entries']],
- ['counter', 'level', 'name', 'evtsBeforePS',
- 'evtsAfterPS', 'evtsAfterPT'],
- ])
- map (o.writerow,
- [ [d.counter, d.level, d.name,
- d.evtsBeforePS, d.evtsAfterPS, d.evtsAfterPT]
- for d in self.l1_items ])
- map (o.writerow,
- [ [d.counter, d.level, d.name,
- d.evtsBeforePS, d.evtsAfterPS, d.evtsAfterPT]
- for d in self.l2_chains ])
- map (o.writerow,
- [ [d.counter, d.level, d.name,
- d.evtsBeforePS, d.evtsAfterPS, d.evtsAfterPT]
- for d in self.ef_chains ])
- return
-
-
-
- def __del__(self):
- if self.poolFile and hasattr(self.poolFile, 'Close'):
- try:
- self.poolFile.Close()
- self.poolFile = None
- except Exception as err:
- print("WARNING:",err)
- pass
-
- pass # class PoolFile
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/python/__init__.py b/Trigger/TrigConfiguration/TrigConfigSvc/python/__init__.py
index 44a8fab62051..d13ae164caa4 100755
--- a/Trigger/TrigConfiguration/TrigConfigSvc/python/__init__.py
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/python/__init__.py
@@ -1,7 +1 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-# File: TrigConfigSvc/__init__.py
-# Author: Tomasz.Bold@cern.ch
-
-__author__ = 'Paul Bell, Tomasz Bold, Joerg Stelzer'
-__all__ = [ 'TrigConfigSvcConfig', 'TriggerConfigARA', 'TrigConfigSvcUtils.py' ]
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/share/checkTrigger.py b/Trigger/TrigConfiguration/TrigConfigSvc/share/checkTrigger.py
deleted file mode 100755
index 744e3eea13ab..000000000000
--- a/Trigger/TrigConfiguration/TrigConfigSvc/share/checkTrigger.py
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-# @file: checkTrigger.py
-# @purpose: read a POOL file and dump a trigger summary.
-# Copied (& modified) from CheckFile.py from Sebastien Binet
-# @author: Till Eifert <Till.Eifert@cern.ch>
-# @date: October 2008
-#
-# @example:
-# @code
-# checkTrigger aod.pool.root
-# checkTrigger /castor/cern.ch/user/j/johndoe/aod.pool.root
-# checkTrigger somedir/*/*.pool
-# @endcode
-#
-
-__author__ = "Till Eifert <Till.Eifert@cern.ch>"
-
-
-import sys
-import os
-
-from optparse import OptionParser
-
-
-if __name__ == "__main__":
-
- parser = OptionParser(usage="usage: %prog [options] [-f] my.file.pool")
-
- p = parser.add_option
- p( "-f",
- "--file",
- dest = "fileName",
- help = "The path to the POOL file to analyze" )
-## p( "-d",
-## "--detailed-dump",
-## action = "store_true",
-## dest = "doDetailedDump",
-## default = False,
-## help = "Switch to activate or not a detailed dump of each ... " )
- p( "--sort-fct",
- dest = "sortFctName",
- default = "name",
- help = "Sorting function used to list triggers (allowed are: name, counter, evtsBeforePS, evtsAfterPS, evtsAfterPT)" )
- p( "-o",
- "--output",
- dest = "outFileName",
- default = None,
- help = "Name of the output file which will contain the informations gathered during checkTrigger processing. These informations will be stored into a python-shelve file. If the given file name extension is '.csv' a comma separated file is written instead. Note that the python-shelve files can be read-in again by this script." )
-
- (options, args) = parser.parse_args()
-
- fileNames = []
-
- if len(args) > 0:
- fileNames = [ arg for arg in args if arg[0] != "-" ]
- pass
-
- if options.fileName is None and len(fileNames) == 0:
- str(parser.print_help() or "")
- sys.exit(1)
-
- if options.fileName is not None:
- fileName = os.path.expandvars(os.path.expanduser(options.fileName))
- fileNames.append(fileName)
-
- fileNames = set( fileNames )
- sc = 0
-
- for fileName in fileNames:
- try:
- import TrigConfigSvc.TriggerSummary as TS
- #TS.PoolOpts.FAST_MODE = options.fastMode
- poolFile = TS.PoolFile( fileName )
- poolFile.checkFile( sorting = options.sortFctName )
-## if options.doDetailedDump:
-## dumpFile = os.path.basename(fileName)+ ".txt"
-## print "## dumping details into [%s]" % dumpFile
-## poolFile.detailedDump( dumpFile )
- if options.outFileName:
- outFileName = options.outFileName
- print("## saving checkFile report into [%s]..." % outFileName)
- poolFile.saveReport( outFileName )
- except Exception as e:
- print("## Caught exception [%s] !!" % str(e.__class__))
- print("## What: %s" % e)
- print(sys.exc_info()[0])
- print(sys.exc_info()[1])
- sc = 1
- pass
-
- except Exception:
- print("## Caught something !! (don't know what)")
- print(sys.exc_info()[0])
- print(sys.exc_info()[1])
- sc = 10
- pass
- if len(fileNames) > 1:
- print("")
- pass # loop over fileNames
-
- print("## Bye.")
- sys.exit(sc)
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/share/jobOptions_commonSetup.py b/Trigger/TrigConfiguration/TrigConfigSvc/share/jobOptions_commonSetup.py
deleted file mode 100755
index 6597b2de292f..000000000000
--- a/Trigger/TrigConfiguration/TrigConfigSvc/share/jobOptions_commonSetup.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-theApp.Dlls += [ "TrigConfigSvc" ]
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/share/jobOptions_setupHLTSvc.py b/Trigger/TrigConfiguration/TrigConfigSvc/share/jobOptions_setupHLTSvc.py
deleted file mode 100755
index 9c39b35899b2..000000000000
--- a/Trigger/TrigConfiguration/TrigConfigSvc/share/jobOptions_setupHLTSvc.py
+++ /dev/null
@@ -1,4 +0,0 @@
-theApp.CreateSvc += [ "TrigConf::HLTConfigSvc/HLTConfigSvc" ]
-
-HLTConfigSvc = Service( "HLTConfigSvc" )
-# HLTConfigSvc.DBServer = "devdb"
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/share/jobOptions_setupLVL1Svc.py b/Trigger/TrigConfiguration/TrigConfigSvc/share/jobOptions_setupLVL1Svc.py
deleted file mode 100755
index 551a61310116..000000000000
--- a/Trigger/TrigConfiguration/TrigConfigSvc/share/jobOptions_setupLVL1Svc.py
+++ /dev/null
@@ -1,6 +0,0 @@
-theApp.CreateSvc += [ "TrigConf::LVL1ConfigSvc/LVL1ConfigSvc" ]
-
-LVL1ConfigSvc = Service( "LVL1ConfigSvc" )
-#LVL1ConfigSvc.DBServer = "devdb"
-LVL1ConfigSvc.CreateLegacyObjects = False
-
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/share/testTriggerFrontierQuery.py b/Trigger/TrigConfiguration/TrigConfigSvc/share/testTriggerFrontierQuery.py
deleted file mode 100755
index 9e318cab3a19..000000000000
--- a/Trigger/TrigConfiguration/TrigConfigSvc/share/testTriggerFrontierQuery.py
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env python
-
-import sys,os
-from re import match
-from PyCool import cool
-import CoolConvUtilities.AtlCoolLib as AtlCoolLib
-
-
-def main():
- connectString = "TRIGGERDBREPR"
- if len(sys.argv)>1:
- connectString = sys.argv[1]
- if connectString == None: return 0
-
- (ALL, VERBOSE, DEBUG, INFO, WARNING, ERROR, FATAL) = range(7)
-
- from AthenaCommon.Logging import logging
- log = logging.getLogger( "TrigConfigSvcUtils.py" )
- log.setLevel(VERBOSE)
- log = logging.getLogger( "TrigConfFrontier.py" )
- log.setLevel(VERBOSE)
-
-
- from TrigConfigSvc.TrigConfigSvcUtils import getTriggerDBCursor, executeQuery
-
- cursor,schemaname = getTriggerDBCursor(connectString)
-
- output = ["SM.SMT_ID", "SM.SMT_NAME", "SM.SMT_VERSION", "SM.SMT_COMMENT", "SM.SMT_ORIGIN", "SM.SMT_USERNAME", "SM.SMT_STATUS"]
- condition = []
- tables = { 'SM' : 'SUPER_MASTER_TABLE' }
-
- result = executeQuery(cursor, output, condition, schemaname, tables)
-
- print "TEST result:\n============"
- for r in sorted(result):
- print r
-
- return 0
-
-if __name__ == '__main__':
- """This test does a simple query using different technologies
-
- if environment TRIGGER_USE_FRONTIER is set then local frontier is used, otherwise oracle
- """
-
- sys.exit(main())
-
-
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfigSvcDict.h b/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfigSvcDict.h
deleted file mode 100644
index 8b1f341f5744..000000000000
--- a/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfigSvcDict.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "TrigConfHLTData/HLTChainList.h"
-#include "TrigConfHLTData/HLTSequenceList.h"
-#include "TrigConfHLTData/HLTChain.h"
-#include "TrigConfHLTData/HLTSequence.h"
-#include "TrigConfHLTData/HLTSignature.h"
-#include "TrigConfHLTData/HLTTriggerElement.h"
-#include "TrigConfHLTData/HLTTriggerType.h"
-#include "TrigConfHLTData/HLTStreamTag.h"
-
-#include "TrigConfL1Data/TriggerItem.h"
-#include "TrigConfL1Data/CTPConfig.h"
-#include "TrigConfL1Data/L1DataBaseclass.h"
-#include "TrigConfL1Data/TrigConfData.h"
-
-#include "TrigConfigSvc/TrigConfigARA.h"
-#include "TrigConfigSvc/TrigConfigSvcARA.h"
-
-#include <vector>
-namespace {
- std::vector<TrigConf::HLTChain*> vc;
- std::vector<TrigConf::HLTSequence*> vs;
-}
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/src/test/TrigConfigARATest.cxx b/Trigger/TrigConfiguration/TrigConfigSvc/src/test/TrigConfigARATest.cxx
deleted file mode 100644
index 8dc2728e8ad6..000000000000
--- a/Trigger/TrigConfiguration/TrigConfigSvc/src/test/TrigConfigARATest.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-
-#include <iostream>
-#include <string>
-#include <sstream>
-#include <stdint.h>
-
-#include "TrigConfigSvc/TrigConfigSvcARA.h"
-
-int main(int argc, char *argv[]) {
-
- std::string inputFile("AOD.pool.root");
-
- if(argc>1) inputFile = std::string(argv[1]);
-
- unsigned int runnumber = 5200; // 106303
- if(argc>2) {
- std::stringstream s(argv[2]);
- s >> runnumber;
- }
-
- std::cout << "Test program to read configuration from " << inputFile << std::endl;
-
- std::vector< std::string > filenames;
- filenames.push_back(inputFile);
-
- TrigConf::TrigConfigSvcARA tcs( filenames );
- tcs.setVerbose();
- std::cout << "update for runnumber " << runnumber << std::endl;
- tcs.update(runnumber,1);
-
- std::cout << tcs << std::endl;
-
- return 1;
-}
--
GitLab
From 0d9159f3cc524599a0234f26073caed647a0a545 Mon Sep 17 00:00:00 2001
From: Frank Berghaus <frank.berghaus@cern.ch>
Date: Thu, 19 Aug 2021 15:59:22 +0000
Subject: [PATCH 173/272] EventBookkeeperTools: Get input stream name from
FileMetaData
---
Event/EventBookkeeperTools/CMakeLists.txt | 6 +--
.../EventBookkeeperTools/Root/CutFlowSvc.cxx | 40 ++++++++++---------
2 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/Event/EventBookkeeperTools/CMakeLists.txt b/Event/EventBookkeeperTools/CMakeLists.txt
index a9a06f141f3f..f60fdf8a1588 100644
--- a/Event/EventBookkeeperTools/CMakeLists.txt
+++ b/Event/EventBookkeeperTools/CMakeLists.txt
@@ -4,16 +4,16 @@
atlas_subdir( EventBookkeeperTools )
if( XAOD_STANDALONE )
- set( extra_libs )
+ set( extra_libs xAODMetaData )
set( xaod_access_lib xAODRootAccess )
# ... for AthAnalysisBase (Athena calls this POOLRootAccess)
else()
- set( extra_libs GaudiKernel AthenaKernel AthenaPoolUtilities EventInfo IOVDbDataModel StoreGateLib )
+ set( extra_libs GaudiKernel AthenaKernel AthenaPoolUtilities EventInfo IOVDbDataModel StoreGateLib xAODMetaData )
set( xaod_access_lib xAODRootAccess POOLRootAccessLib )
endif()
if( NOT GENERATIONBASE )
- set( extra_libs ${extra_libs} AnaAlgorithmLib xAODMetaData xAODTruth )
+ set( extra_libs ${extra_libs} AnaAlgorithmLib xAODTruth )
endif()
# Component(s) in the package:
diff --git a/Event/EventBookkeeperTools/Root/CutFlowSvc.cxx b/Event/EventBookkeeperTools/Root/CutFlowSvc.cxx
index d2dbcb15e497..3db83a755911 100644
--- a/Event/EventBookkeeperTools/Root/CutFlowSvc.cxx
+++ b/Event/EventBookkeeperTools/Root/CutFlowSvc.cxx
@@ -17,7 +17,7 @@
#include <GaudiKernel/IIncidentSvc.h>
// EDM includes
-#include <EventInfo/EventStreamInfo.h>
+#include <xAODMetaData/FileMetaData.h>
CutFlowSvc::CutFlowSvc(const std::string& name,
@@ -234,28 +234,30 @@ void CutFlowSvc::handle( const Incident& inc )
if ( inc.type() == IncidentType::BeginInputFile ) {
// Check the stream name
- const EventStreamInfo* esi;
- if (m_inMetaDataStore->retrieve(esi).isFailure()) {
- ATH_MSG_WARNING("No EventStreamInfo taking stream from property InputStream");
+ const xAOD::FileMetaData* fmd;
+ if (m_inMetaDataStore->retrieve(fmd).isFailure()) {
+ ATH_MSG_WARNING("No FileMetaData taking stream from property InputStream");
}
else {
// ignore event-less files
- if (esi->getProcessingTags().empty()) {
- ATH_MSG_DEBUG("Ignoring input stream name of event-less file");
- return;
- }
- std::string inputstream = *(esi->getProcessingTags().begin());
- ATH_MSG_DEBUG("Input stream name: " << inputstream);
- if (m_inputStream.empty()) {m_inputStream=inputstream;}
- else if (m_inputStream!=inputstream) {
- const FileIncident* finc = dynamic_cast<const FileIncident*>(&inc);
- if (m_inputStream != "N/A" && m_inputStream != "unknownStream") {
- ATH_MSG_FATAL("File " << finc->fileName()
- << " stream " << inputstream
- << " does not match previous file "
- << m_inputStream);
- return;
+ std::string inputstream = m_inputStream;
+ if (fmd->value(xAOD::FileMetaData::dataType, inputstream)) {
+ ATH_MSG_DEBUG("Input stream name: " << inputstream);
+ if (m_inputStream.empty()) {
+ m_inputStream=inputstream;
+ } else if (m_inputStream!=inputstream) {
+ const FileIncident* finc = dynamic_cast<const FileIncident*>(&inc);
+ if (m_inputStream != "N/A" && m_inputStream != "unknownStream") {
+ ATH_MSG_FATAL("File " << finc->fileName()
+ << " stream " << inputstream
+ << " does not match previous file "
+ << m_inputStream);
+ return;
+ }
}
+ } else {
+ ATH_MSG_WARNING("No dataType in FileMetaData taking stream from property InputStream");
+ return;
}
}
}
--
GitLab
From 8ad6a7299313728332e016c7369109d186b489cf Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Thu, 19 Aug 2021 16:07:10 +0000
Subject: [PATCH 174/272] LArCabling+LArHVTool: Clean up LArHVCablingTool.
---
.../LArCabling/LArHVCablingSimTool.h | 55 +
.../LArCabling/LArCabling/LArHVCablingTool.h | 165 --
.../LArCabling/LArHVIdMappingReader.h | 59 +
.../LArCabling/src/LArHVCablingSimTool.cxx | 72 +
.../LArCabling/src/LArHVCablingTool.cxx | 2262 -----------------
.../LArCabling/src/LArHVIdMappingReader.cxx | 205 ++
.../src/components/LArCabling_entries.cxx | 4 +-
.../LArGeoModel/LArHV/LArHV/EMBHVManager.h | 5 +-
.../LArHV/LArHV/EMBPresamplerHVManager.h | 6 +-
.../LArGeoModel/LArHV/LArHV/EMECHVManager.h | 5 +-
.../LArHV/LArHV/EMECPresamplerHVManager.h | 6 +-
.../LArGeoModel/LArHV/LArHV/FCALHVManager.h | 5 +-
.../LArGeoModel/LArHV/LArHV/HECHVManager.h | 5 +-
.../LArGeoModel/LArHV/src/EMBHVManager.cxx | 13 +-
.../LArHV/src/EMBPresamplerHVManager.cxx | 44 -
.../LArGeoModel/LArHV/src/EMECHVManager.cxx | 13 +-
.../LArHV/src/EMECPresamplerHVManager.cxx | 44 -
.../LArGeoModel/LArHV/src/FCALHVManager.cxx | 13 +-
.../LArGeoModel/LArHV/src/HECHVManager.cxx | 13 +-
19 files changed, 431 insertions(+), 2563 deletions(-)
create mode 100644 LArCalorimeter/LArCabling/LArCabling/LArHVCablingSimTool.h
delete mode 100755 LArCalorimeter/LArCabling/LArCabling/LArHVCablingTool.h
create mode 100644 LArCalorimeter/LArCabling/LArCabling/LArHVIdMappingReader.h
create mode 100644 LArCalorimeter/LArCabling/src/LArHVCablingSimTool.cxx
delete mode 100755 LArCalorimeter/LArCabling/src/LArHVCablingTool.cxx
create mode 100644 LArCalorimeter/LArCabling/src/LArHVIdMappingReader.cxx
diff --git a/LArCalorimeter/LArCabling/LArCabling/LArHVCablingSimTool.h b/LArCalorimeter/LArCabling/LArCabling/LArHVCablingSimTool.h
new file mode 100644
index 000000000000..f597a7996fa7
--- /dev/null
+++ b/LArCalorimeter/LArCabling/LArCabling/LArHVCablingSimTool.h
@@ -0,0 +1,55 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef LARCABLING_LARHVCABLINGSIMTOOL_H
+#define LARCABLING_LARHVCABLINGSIMTOOL_H
+
+
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "Identifier/HWIdentifier.h"
+
+#include <vector>
+#include <map>
+
+class LArHVLineID;
+
+
+/**
+ * @brief Mapping from HV lines to electrodes.
+ *
+ * For use only in simulation, where we don't want to use conditions data.
+ * Otherwise, use the LArHVIdMapping conditions object.
+ *
+ * Derived from the original LArHVCablingTool:
+ * date of creation : 07/09/2004
+ * @author : lucotte@in2p3.fr
+ */
+class LArHVCablingSimTool : public AthAlgTool
+{
+public:
+ // constructor
+ LArHVCablingSimTool( const std::string& type,
+ const std::string& name,
+ const IInterface* parent ) ;
+
+ // Destructor
+ virtual ~LArHVCablingSimTool() = default;
+
+ virtual StatusCode initialize( ) override;
+
+
+ /** Return a vector of LArElectrodeID corresponding to a given LArHVLineID
+ */
+ const std::vector<HWIdentifier>& getLArElectrodeIDvec(const HWIdentifier& hvlineId) const;
+
+
+
+private:
+ std::string m_mappingFolder;
+
+ const LArHVLineID * m_hvlineHelper ;
+ std::map<HWIdentifier,std::vector<HWIdentifier> > m_hvline_electrode_map;
+};
+
+#endif // LARCABLING_LARHVCABLINGSIMTOOL_H
diff --git a/LArCalorimeter/LArCabling/LArCabling/LArHVCablingTool.h b/LArCalorimeter/LArCabling/LArCabling/LArHVCablingTool.h
deleted file mode 100755
index b24ef13f9756..000000000000
--- a/LArCalorimeter/LArCabling/LArCabling/LArHVCablingTool.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef LARCABLING_LARHVCABLINGTOOL_H
-#define LARCABLING_LARHVCABLINGTOOL_H
-
-
-#include "AthenaBaseComps/AthAlgTool.h"
-#include "AthenaKernel/IOVSvcDefs.h"
-#include "AthenaPoolUtilities/AthenaAttributeList.h"
-#include "Identifier/HWIdentifier.h"
-#include "CxxUtils/checker_macros.h"
-
-#include <vector>
-#include <map>
-
-//class LArHVCellID;
-//class LArHVDetectorID;
-//class LArHVElectrodeID;
-//class LArHVSpecialElectrodeID;
-class LArElectrodeID;
-class LArHVLineID;
-
-class LArEM_ID;
-class LArHEC_ID;
-class LArFCAL_ID;
-class CaloCell_ID;
-
-//class CondAttrListCollection;
-class AthenaAttributeList;
-static const InterfaceID IID_LArHVCablingTool("LArHVCablingTool", 1 , 0);
-
-/**
- @brief Tool for mapping HV from HVdetectornal electrode
-
- date of creation : 07/09/2004
- @author : lucotte@in2p3.fr
-*/
-
-
-class ATLAS_NOT_THREAD_SAFE LArHVCablingTool : public AthAlgTool {
- public:
-
- // Retrieve interface ID
- static const InterfaceID& interfaceID() { return IID_LArHVCablingTool; }
-
- // constructor
- LArHVCablingTool( const std::string& type, const std::string& name, const IInterface* parent ) ;
-
- // Destructor
- virtual ~LArHVCablingTool(){}
-
- StatusCode initialize( );
-
- StatusCode finalize( );
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-//%%%%%%%%%%%%%%%%%%% NEW INTERFACE FOR HIGH VOLTAGE CODING %%%%%%%%%%%%%%%%%%%%%%%%%%%
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
- /** Return the LArHVLineID corresponding to a given LArElectrodeId
-
- */
- const HWIdentifier getLArHVLineID(HWIdentifier& electrodeId);
-
- // Returns a vector<electrodeID> given an input offlineID
- //-------------------------------------------------------
- void getElectrodeInCell(const Identifier& offId, std::vector<HWIdentifier> &elecId );
-
- /** Returns a vector<HVLineID> given an input offlineID
- */
- void getHVLineInCell( const Identifier& offId, std::vector<HWIdentifier> &hvlineId);
-
-
- /** Return a vector of LArElectrodeID corresponding to a given LArHVLineID
- */
- const std::vector<HWIdentifier>& getLArElectrodeIDvec(HWIdentifier& hvlineId);
-
-
- /** returns the *Module* of a given offId
- */
- int getCellModule(const Identifier& offId );
- int getCellEtaSector(const Identifier& offId );
- int getCellPhiSector(const Identifier& offId );
- std::pair<int,int> getCellElectrodeMinMax(const Identifier& offId);
-
-
- /** initialize HV map
- */
- int fillHVMap();
-
- virtual StatusCode iovCallback(IOVSVC_CALLBACK_ARGS);
-
-
- /*
- // Get Module index as a char
- virtual std::string getModChar( int mod );
- // CheckLArHVCellID values
- virtual std::string checkLArHVCellIDValues(int l_partition, int l_canline,
- int l_cannode, int l_hvline );
-
- // CheckLArHVDetectorID values
- virtual std::string checkLArHVDetectorIDValues(int l_det, int l_mod, int l_hvphi,
- int l_hveta, int l_gaps );
- // CheckLArHVElectrodeID values
- virtual std::string checkLArHVElectrodeIDValues(int l_min, int l_max, int l_nele );
-
- // CheckLArHVElectrodeID values
- virtual std::string checkLArHVSpecialElectrodeIDValues(int l_nspe, int l_elec1, int l_elec2 );
- */
- private:
- /*
- // for LArHVCellID
- static const unsigned int m_partition;
- static const unsigned int m_canline;
- static const unsigned int m_cannode;
- static const unsigned int m_hvline;
-
- // for LArHVDetectorID
- static const unsigned int m_detector;
- static const unsigned int m_module;
- static const unsigned int m_hvphi;
- static const unsigned int m_hveta;
- static const unsigned int m_gaps;
-
- // for LArHVElectrodeID
- static const unsigned int m_elemin;
- static const unsigned int m_elemax;
- static const unsigned int m_nele;
-
- // for LArHVSpecialElectrodeID
- static const unsigned int m_nspecial;
- static const unsigned int m_elec1;
- static const unsigned int m_elec2;
- */
- // =========================
- // Data Members
- // =========================
- const CaloCell_ID* m_caloHelper ;
- const LArEM_ID * m_emHelper ;
- const LArHEC_ID * m_hecHelper ;
- const LArFCAL_ID * m_fcalHelper ;
- // AL--> added for new interface ..
- const LArHVLineID * m_hvlineHelper ;
- const LArElectrodeID* m_electrodeHelper ;
-
- //std::vector<HWIdentifier> m_hvline_electrode_vec;
- //std::vector<HWIdentifier> m_electrodeIDvec;
- std::map<HWIdentifier,HWIdentifier> m_electrode_hvline_map;
- std::map<HWIdentifier,std::vector<HWIdentifier> > m_hvline_electrode_map;
- bool m_initHVMap;
- //<-- AL
-
- private:
- std::string m_mappingFolder;
- const DataHandle<AthenaAttributeList> m_attrList;
-};
-
-#endif // LARCABLING_LARHVCABLINGTOOL_H
diff --git a/LArCalorimeter/LArCabling/LArCabling/LArHVIdMappingReader.h b/LArCalorimeter/LArCabling/LArCabling/LArHVIdMappingReader.h
new file mode 100644
index 000000000000..7505d00af4fc
--- /dev/null
+++ b/LArCalorimeter/LArCabling/LArCabling/LArHVIdMappingReader.h
@@ -0,0 +1,59 @@
+// This file's extension implies that it's C, but it's really -*- C++ -*-.
+/*
+ * Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration.
+ */
+/**
+ * @file LArCabling/LArHVIdMappingReader.h
+ * @author scott snyder <snyder@bnl.gov>, from code originally in LArHVCablingTool.
+ * @date Jun, 2021
+ * @brief Helper to read HV ID mapping data from a file or conditions.
+ */
+
+
+#ifndef LARCABLING_LARHVIDMAPPINGREADER_H
+#define LARCABLING_LARHVIDMAPPINGREADER_H
+
+
+#include "AthenaBaseComps/AthMessaging.h"
+#include "Identifier/HWIdentifier.h"
+#include "GaudiKernel/StatusCode.h"
+#include <map>
+#include <vector>
+#include <string>
+class AthenaAttributeList;
+class LArHVLineID;
+class LArElectrodeID;
+
+
+/**
+ * @brief Helper to read HV ID mapping data from a file or conditions.
+ */
+class LArHVIdMappingReader
+ : public AthMessaging
+{
+public:
+ using hvlineMap_t = std::map<HWIdentifier,HWIdentifier>;
+ using electrodeMap_t = std::map<HWIdentifier,std::vector<HWIdentifier> >;
+
+ LArHVIdMappingReader();
+
+ StatusCode read (const AthenaAttributeList* attrList,
+ const LArHVLineID& hvlineHelper,
+ const LArElectrodeID& electrodeHelper,
+ hvlineMap_t& hvlineMap,
+ electrodeMap_t& electrodeMap) const;
+
+
+private:
+ std::string fromAttrList (const AthenaAttributeList& attrList) const;
+ std::string fromFile() const;
+
+ StatusCode fillHV (const std::string& content,
+ const LArHVLineID& hvlineHelper,
+ const LArElectrodeID& electrodeHelper,
+ hvlineMap_t& hvlineMap,
+ electrodeMap_t& electrodeMap) const;
+};
+
+
+#endif // not LARCABLING_LARHVIDMAPPINGREADER_H
diff --git a/LArCalorimeter/LArCabling/src/LArHVCablingSimTool.cxx b/LArCalorimeter/LArCabling/src/LArHVCablingSimTool.cxx
new file mode 100644
index 000000000000..f22f22c879ff
--- /dev/null
+++ b/LArCalorimeter/LArCabling/src/LArHVCablingSimTool.cxx
@@ -0,0 +1,72 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "LArCabling/LArHVCablingSimTool.h"
+#include "LArCabling/LArHVIdMappingReader.h"
+#include "LArIdentifier/LArElectrodeID.h"
+#include "LArIdentifier/LArHVLineID.h"
+#include "AthenaPoolUtilities/AthenaAttributeList.h"
+
+
+//==================================================================================
+LArHVCablingSimTool::LArHVCablingSimTool( const std::string& type,
+ const std::string& name,
+ const IInterface* parent )
+ : AthAlgTool(type,name,parent),
+ m_hvlineHelper(nullptr)
+{
+ declareProperty("MappingFolder",m_mappingFolder="/LAR/Identifier/HVLineToElectrodeMap");
+}
+
+
+
+//===========================================
+StatusCode LArHVCablingSimTool::initialize ()
+//============================================
+{
+ ATH_MSG_DEBUG(" ====> Initializing LArHVCablingSimTool... ");
+
+ ATH_CHECK( detStore()->retrieve(m_hvlineHelper, "LArHVLineID") );
+
+ const LArElectrodeID* electrodeHelper = nullptr;
+ ATH_CHECK( detStore()->retrieve(electrodeHelper, "LArElectrodeID") );
+
+ const AthenaAttributeList* attrList = nullptr;
+ ATH_CHECK ( detStore()->retrieve(attrList, m_mappingFolder) );
+
+ LArHVIdMappingReader reader;
+ std::map<HWIdentifier,HWIdentifier> electrode_hvline_map;
+ ATH_CHECK( reader.read (attrList,
+ *m_hvlineHelper,
+ *electrodeHelper,
+ electrode_hvline_map,
+ m_hvline_electrode_map) );
+
+ ATH_MSG_DEBUG(" ====> ...initialized LArHVCablingSimTool ");
+ return StatusCode::SUCCESS;
+}
+
+
+//========================================================================================
+const std::vector<HWIdentifier>&
+LArHVCablingSimTool::getLArElectrodeIDvec(const HWIdentifier& hvlineId) const
+//========================================================================================
+{
+ ATH_MSG_VERBOSE("Entering getLArElectrodeIDvec( hvlineId )" );
+
+ std::map<HWIdentifier,std::vector<HWIdentifier> >::const_iterator elecIt=m_hvline_electrode_map.find(hvlineId);
+ if( elecIt != m_hvline_electrode_map.end()){
+ return (elecIt)->second;
+ }
+ else{
+ int part = m_hvlineHelper->partition(hvlineId);
+ int canl = m_hvlineHelper->can_line(hvlineId);
+ int cann = m_hvlineHelper->can_node(hvlineId);
+ int hvli = m_hvlineHelper->hv_line(hvlineId);
+ ATH_MSG_WARNING( "LArHVCablingSimTool: getLArElectrodeIDvec did not find electrode for hvline ["
+ << part << "." << canl << "." << cann << "." << hvli << "]" );
+ static const std::vector<HWIdentifier> invalid;
+ return(invalid);
+ }
+}
diff --git a/LArCalorimeter/LArCabling/src/LArHVCablingTool.cxx b/LArCalorimeter/LArCabling/src/LArHVCablingTool.cxx
deleted file mode 100755
index 34a64f273eb3..000000000000
--- a/LArCalorimeter/LArCabling/src/LArHVCablingTool.cxx
+++ /dev/null
@@ -1,2262 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "LArCabling/LArHVCablingTool.h"
-
-/*
-#include "LArHVCell.icc"
-#include "LArHVDetector.icc"
-#include "LArHVElectrode.icc"
-#include "LArHVSpecialElectrode.icc"
-*/
-
-//#include "CaloIdentifier/CaloIdManager.h"
-//#include "CaloIdentifier/CaloID.h"
-#include "CaloIdentifier/CaloCell_ID.h"
-#include "CaloIdentifier/LArEM_ID.h"
-#include "CaloIdentifier/LArHEC_ID.h"
-#include "CaloIdentifier/LArFCAL_ID.h"
-
-
-#include "LArIdentifier/LArElectrodeID.h"
-
-/* To go away:
-#include "LArIdentifier/LArHVDetectorID.h"
-#include "LArIdentifier/LArHVElectrodeID.h"
-#include "LArIdentifier/LArHVSpecialElectrodeID.h"
-*/
-
-#include "LArIdentifier/LArHVLineID.h"
-//#include "LArTools/LArHVMap.h"
-
-#include <fstream>
-#include <iostream>
-
-#include "PathResolver/PathResolver.h"
-
-//#include "AthenaPoolUtilities/CondAttrListCollection.h"
-#include "AthenaPoolUtilities/AthenaAttributeList.h"
-
-// initialization of static member variables to shift bit fields
-// of HardwareID in proper positions
-/*
-const unsigned int LArHVCablingTool:: m_partition = 1 ; // bits 0-1
-const unsigned int LArHVCablingTool:: m_canline = 4 ; // bit 2-3
-const unsigned int LArHVCablingTool:: m_cannode = 16 ; // bits 3-9
-const unsigned int LArHVCablingTool:: m_hvline = 2048; // bits 10-12
-
-const unsigned int LArHVCablingTool:: m_detector = 1; // bits 0-2
-const unsigned int LArHVCablingTool:: m_module = 8; // bits 3-8
-const unsigned int LArHVCablingTool:: m_hvphi = 512; // bits 9-11
-const unsigned int LArHVCablingTool:: m_hveta = 4096; // bits 12-15
-const unsigned int LArHVCablingTool:: m_gaps = 65536; // bits 16-18
-
-const unsigned int LArHVCablingTool:: m_elemin = 1; // bits 0-7
-const unsigned int LArHVCablingTool:: m_elemax = 256; // bits 8-15
-const unsigned int LArHVCablingTool:: m_nele = 65536; // bits 16-21
-
-const unsigned int LArHVCablingTool:: m_nspecial = 1; // bits 0-1
-const unsigned int LArHVCablingTool:: m_elec1 = 4; // bits 2-8
-const unsigned int LArHVCablingTool:: m_elec2 = 512; // bits 9-15
-*/
-
-//==================================================================================
-LArHVCablingTool::LArHVCablingTool( const std::string& type,
- const std::string& name,
- const IInterface* parent ) : AthAlgTool(type,name,parent),
- m_caloHelper(0),
- m_emHelper(0) ,
- m_hecHelper(0) ,
- m_fcalHelper(0) ,
- m_hvlineHelper(0),
- m_electrodeHelper(0),
- m_initHVMap(false)
-{
- declareProperty("MappingFolder",m_mappingFolder="/LAR/IdentifierOfl/HVLineToElectrodeMap");
- // Declare additional interface
- declareInterface<LArHVCablingTool>(this);
-}
-
-
-
-//===========================================
-StatusCode LArHVCablingTool::finalize ()
-//============================================
-{// finalize()
- ATH_MSG_DEBUG(" ====> Finalizing LArHVCablingTool... ");
- return StatusCode::SUCCESS;
-}
-
-
-//===========================================
-StatusCode LArHVCablingTool::initialize ()
-//============================================
-{// initialize()
- ATH_MSG_DEBUG(" ====> Initializing LArHVCablingTool... ");
-
- // ==========
- // calo_id_ID
- // ==========
- StatusCode status = detStore()->retrieve(m_caloHelper, "CaloCell_ID");
- if (status.isFailure()) {
- msg(MSG::FATAL) << "Could not get Calo_ID helper !" << endmsg;
- return StatusCode::FAILURE;
- }
- else {
- ATH_MSG_DEBUG(" Found the Calo_ID helper. " );
- }
-
- // ==========
- // LArEM_ID
- // ==========
- status = detStore()->retrieve(m_emHelper, "LArEM_ID");
- if (status.isFailure()) {
- msg(MSG::FATAL) << "Could not get LArEM_ID helper !" << endmsg;
- return StatusCode::FAILURE;
- }
- else {
- ATH_MSG_DEBUG(" Found the LArEM_ID helper. ");
- }
- // =========
- // HEC_ID
- // =========
- status = detStore()->retrieve(m_hecHelper, "LArHEC_ID");
- if (status.isFailure()) {
- msg(MSG::FATAL) << "Could not get LArHEC_ID helper !" << endmsg;
- return StatusCode::FAILURE;
- }
- else {
- ATH_MSG_DEBUG(" Found the LArHEC_ID helper. " );
- }
- // =========
- // FCAL_ID
- // =========
- status = detStore()->retrieve(m_fcalHelper, "LArFCAL_ID");
- if (status.isFailure()) {
- msg(MSG::FATAL) << "Could not get LArFCAL_ID helper !" << endmsg;
- return StatusCode::FAILURE;
- }
- else {
- ATH_MSG_DEBUG(" Found the LArFCAL_ID helper. " );
- }
-
- // ===========
- // LArHVLineID
- // ===========
- status = detStore()->retrieve(m_hvlineHelper, "LArHVLineID");
- if (status.isFailure()) {
- msg(MSG::FATAL) << "Could not get LArHVLineID helper !" << endmsg;
- return StatusCode::FAILURE;
- }
- else {
- ATH_MSG_DEBUG(" Found the LArHVLineID helper. " );
- }
-
- // ==============
- // LArElectrodeID
- // ==============
- status = detStore()->retrieve(m_electrodeHelper, "LArElectrodeID");
- if (status.isFailure()) {
- msg(MSG::FATAL) << "Could not get LArElectrodeID helper !" << endmsg;
- return StatusCode::FAILURE;
- }
- else {
- ATH_MSG_DEBUG(" Found the LArElectrodeID helper. " );
- }
-
-
- status = detStore()->regFcn(&LArHVCablingTool::iovCallback,this,m_attrList,m_mappingFolder,true);
- if (status.isFailure()) {
- msg(MSG::ERROR) << "Failed to register callback on folder " << m_mappingFolder << endmsg;
- }
- else
- ATH_MSG_DEBUG("Successfully registered callback on folder " << m_mappingFolder);
-
-
- ATH_MSG_DEBUG(" ====> ...initialized LArHVCablingTool ");
- return StatusCode::SUCCESS;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-//%%%%%%%%%%%%%%%%%%% NEW INTERFACE FOR HIGH VOLTAGE CODING %%%%%%%%%%%%%%%%%%%%%%%%%%%
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-
-//============================================================================
-const HWIdentifier LArHVCablingTool::getLArHVLineID(HWIdentifier& electrodeId)
-//============================================================================
-{
- ATH_MSG_VERBOSE("[getLArHVLineID] entering getLArHVLineID..." );
-
- // Get maping from fillHVMap()
- //-----------------------------
- if(!m_initHVMap)
- {// if no map then fill it first
- msg(MSG::INFO) << "[getLArHVLineID] no mapping defined..--> fillHVMap().." << endmsg;
- fillHVMap();
- m_initHVMap = true;
- }
-
- std::map<HWIdentifier,HWIdentifier>::iterator elecIt = m_electrode_hvline_map.find(electrodeId);
- if(elecIt != m_electrode_hvline_map.end()) {
- HWIdentifier hvlineId = (elecIt)->second;
- if (msgLvl(MSG::DEBUG)) {
- const int dete = m_electrodeHelper->detector(electrodeId);
- const int side = m_electrodeHelper->zside(electrodeId);
- const int modu = m_electrodeHelper->module(electrodeId);
- const int hvph = m_electrodeHelper->hv_phi(electrodeId);
- const int hvet = m_electrodeHelper->hv_eta(electrodeId);
- const int hvga = m_electrodeHelper->gap(electrodeId);
- const int elec = m_electrodeHelper->electrode(electrodeId);
- const int part = m_hvlineHelper->partition(hvlineId);
- const int canl = m_hvlineHelper->can_line(hvlineId);
- const int cann = m_hvlineHelper->can_node(hvlineId);
- const int hvli = m_hvlineHelper->hv_line(hvlineId);
- msg(MSG::DEBUG) << "[getLArHVLineID] input ElectrodeId=["
- << dete << "." << side << "." << modu << "." << hvph
- << "." << hvet << "." << hvga << "." << elec << "]"
- << " corresponding hvlineID=["
- << part << "." << canl << "." << cann << "." << hvli << "]... OK "
- << endmsg;
- }//end if debug
- return hvlineId;
- }
- else {
- int dete = m_electrodeHelper->detector(electrodeId);
- int side = m_electrodeHelper->zside(electrodeId);
- int modu = m_electrodeHelper->module(electrodeId);
- int hvph = m_electrodeHelper->hv_phi(electrodeId);
- int hvet = m_electrodeHelper->hv_eta(electrodeId);
- int hvga = m_electrodeHelper->gap(electrodeId);
- int elec = m_electrodeHelper->electrode(electrodeId);
-
- HWIdentifier invalidId = m_hvlineHelper->HVLineId(0,0,0,0);
- int part = m_hvlineHelper->partition(invalidId);
- int canl = m_hvlineHelper->can_line(invalidId);
- int cann = m_hvlineHelper->can_node(invalidId);
- int hvli = m_hvlineHelper->hv_line(invalidId);
- msg(MSG::WARNING) << "[getLArHVLineID] NO MAP for ElectrodeId=["
- << dete << "." << side << "." << modu << "." << hvph
- << "." << hvet << "." << hvga << "." << elec << "] returning ["
- << part << "." << canl << "." << cann << "." << hvli << "]... OK " << endmsg;
- return (invalidId);
-
- //return m_hvmapHelper->getLArHVLineID( electrodeId ) ;
- }
- // if the map exists, use the mapping object
-}
-
-
-
-
-//=================================================================================
-int LArHVCablingTool::fillHVMap()
-//=================================================================================
-{// Start of fillHVMap()
- ATH_MSG_DEBUG("[fillHVMap] entering fillHVMap()..." );
-
- m_electrode_hvline_map.clear();
- m_hvline_electrode_map.clear();
-
- // Reads in the file
- // -------------------
-
- std::istringstream infile;
-
- if (!detStore()->contains<AthenaAttributeList>(m_mappingFolder)) {
- msg(MSG::ERROR) << " Cannot find /LAR/IdentifierOfl/HVLineToElectrodeMap from database, Use ASCII file indeed !!!" << endmsg;
- std::string tablename=PathResolver::find_file ("HVLineToElectrode.data", "DATAPATH");
- if (tablename == "") {
- msg(MSG::WARNING) << "[fillHVMap] Could not locate HVLineToElectrode.data file" << endmsg;
- return(-1) ;
- }
- else{
- ATH_MSG_DEBUG("[fillHVMap] have located HVLineToElectrode.data OK !");
- }
- const char * tablefile= tablename.c_str() ;
- std::ifstream myfile(tablefile);
- // get pointer to associated buffer object
- std::filebuf *pbuf;
- pbuf=myfile.rdbuf();
- int size=pbuf->pubseekoff (0,std::ios::end,std::ios::in);
- pbuf->pubseekpos (0,std::ios::in);
- // allocate memory to contain file data
- char * buffer;
- buffer=new char[size];
- // get file data
- pbuf->sgetn (buffer,size);
- myfile.close();
- infile.str(buffer);
- delete [] buffer;
- }
- else {
- //const AthenaAttributeList* attrList = 0;
- //StatusCode sc=detStore()->retrieve(attrList,m_mappingFolder);
- //if (sc.isFailure()) {
- if (!m_attrList.isValid()) {
- msg(MSG::ERROR) << "Failed to retrieve AttributeList with key " << m_mappingFolder << " from DetectorStore" << endmsg;
- return -1;
- }
-
- msg(MSG::INFO) << " Found AttrList from " << m_mappingFolder << endmsg;
- std::ostringstream attrStr1;
- coral::AttributeList::const_iterator itr=m_attrList->begin();
- itr->toOutputStream(attrStr1);
- std::string::size_type pos = attrStr1.str().find(":");
- if (pos == std::string::npos)
- pos = 0;
- else
- pos++;
- std::string Line=attrStr1.str().substr(pos);
- ATH_MSG_DEBUG(" Line " << Line );
- infile.str(Line);
- }
-
- if(!infile) {
- msg(MSG::WARNING) << "[fillHVMap] Could not load HVLineToElectrode.data file" << endmsg;
- return(-1) ;
- }
- else{
- ATH_MSG_DEBUG("[fillHVMap] have loaded HVLineToElectrode.data OK !");
- }
- int dummy;
- int hvcannode;
- int hvline;
- int hvpartition;
- int hvcanline;
- int detect;
- int side;
- int mod;
- int hvphi;
- int hveta;
- int hvgap;
- int min;
- int max;
- ATH_MSG_DEBUG("start reading infile " );
- while ( infile
- >> dummy
- >> hvcannode
- >> hvline
- >> hvpartition
- >> hvcanline
- >> detect
- >> side
- >> mod
- >> hvphi
- >> hveta
- >> hvgap
- >> min
- >> max )
- {// Fill Maps
- if (max > 1000)
- std::abort();
- ATH_MSG_DEBUG("[fillHVMap] listing HVLineToElectrode :("
- << dummy << ") hvline=["
- << hvpartition << "."
- << hvcanline << "."
- << hvcannode << "."
- << hvline << "] electrode=["
- << detect << "."
- << side << "."
- << mod << "."
- << hvphi << "."
- << hveta << "."
- << hvgap << " min="
- << min << " max="
- << max << "]"
- );
-
- std::vector<HWIdentifier> electrodeIdvec;
- electrodeIdvec.clear();
- HWIdentifier hvlineId = m_hvlineHelper->HVLineId(hvpartition,hvcanline,hvcannode,hvline);
-
- //std::cout << " module, line " << hvcannode << " " << hvline << " ---- > hvLineId " << hvlineId << std::endl;
-
- if( max > min ){
- if (min < 0) min = 0;
- if (max < 0) max = 0;
- if (min > 1000) min = 1000; // Shouldn't happen.
- for( int ielec=min; ielec<max+1; ielec++){
- ATH_MSG_VERBOSE("[fillHVMap] defining electrodeId: [det="
- << detect << " side="
- << side << " mod="
- << mod << " phi="
- << hvphi << " eta="
- << hveta << " gap="
- << hvgap << " ielec="
- << ielec << "]" );
- HWIdentifier electrodeId =
- m_electrodeHelper->ElectrodeId(detect,side,mod,hvphi,hveta,hvgap,ielec);
- //ATH_MSG_DEBUG("[fillHVMap] have defined electrodeId..." );
- electrodeIdvec.push_back(electrodeId);
- //ATH_MSG_DEBUG("[fillHVMap] push_back in electrodeId vector..." );
-
- // Check if electrode is already in map ?
- // std::map<HWIdentifier,HWIdentifier>::iterator testIt = m_electrode_hvline_map.find(electrodeId);
- // if (testIt != m_electrode_hvline_map.end()) {
- // std::cout << " ----- Electrode Id " << side << " " << mod << " " << hvphi << " " << hveta << " " << hvgap << " " << ielec <<
- // " read for HvLine " << hvcannode << " " << hvline << " " << hvlineId << " already exist for " << (testIt)->second << std::endl;
- // }
-
- m_electrode_hvline_map.insert(std::pair<HWIdentifier,HWIdentifier>(electrodeId,hvlineId));
- }
- }
- else{
- //msg(MSG::INFO) << "[fillHVMap] max < min STOP !!!" << endmsg;
- HWIdentifier electrodeId = m_electrodeHelper->ElectrodeId(detect,side,mod,hvphi,hveta,hvgap,min);
- electrodeIdvec.push_back(electrodeId);
-
- // Check if electrode is already in map ?
- // std::map<HWIdentifier,HWIdentifier>::iterator testIt = m_electrode_hvline_map.find(electrodeId);
- // if (testIt != m_electrode_hvline_map.end()) {
- // std::cout << " ----- Electrode Id " << side << " " << mod << " " << hvphi << " " << hveta << " " << hvgap << " " << min <<
- // " read for HvLine " << hvcannode << " " << hvline << " " << hvlineId << " already exist for " << (testIt)->second << std::endl;
- // }
-
- m_electrode_hvline_map.insert(std::pair<HWIdentifier,HWIdentifier>(electrodeId,hvlineId));
- }
-
- std::map<HWIdentifier,std::vector<HWIdentifier> >::iterator elecIt=m_hvline_electrode_map.find(hvlineId);
- if( elecIt != m_hvline_electrode_map.end()) {
- std::vector<HWIdentifier>* list1 = &((elecIt)->second);
- for (unsigned int ii=0;ii<electrodeIdvec.size();ii++) {
- list1->push_back(electrodeIdvec[ii]);
- }
- }
- else {
- m_hvline_electrode_map.insert(std::pair<HWIdentifier,std::vector<HWIdentifier> >(hvlineId,electrodeIdvec));
- }
- }
- ATH_MSG_DEBUG(" end reading infile " );
- ATH_MSG_DEBUG("[fillHVMap] Mapping electrode-to-hvline : number of Ids= "<<m_electrode_hvline_map.size());
- ATH_MSG_DEBUG("[fillHVMap] Mapping hvline-to-electrode : number of Ids= "<<m_hvline_electrode_map.size());
- //GU infile.close();
- ATH_MSG_DEBUG("[fillHVMap] exiting fillHVMap ... OK" );
- return(0);
-}
-
-
-//========================================================================================
-const std::vector<HWIdentifier>& LArHVCablingTool::getLArElectrodeIDvec(HWIdentifier &hvlineId)
-//========================================================================================
-{// Start of getLArElectrodeIdvec()
- ATH_MSG_VERBOSE("Entering getLArElectrodeIDvec( hvlineId )" );
- // Get maping from fillHVMap()
- //-----------------------------
- if(!m_initHVMap)
- {// if no map then fill it first
- msg(MSG::INFO) << "[getLArHVLineID] no mapping defined..--> fillHVMap().." << endmsg;
- fillHVMap();
- m_initHVMap = true;
- }
- // Use fillHVMap generated-objects
- // if(!m_hvmapHelper){
- // fillHVMap();
- //}
- std::map<HWIdentifier,std::vector<HWIdentifier> >::iterator elecIt=m_hvline_electrode_map.find(hvlineId);
- if( elecIt != m_hvline_electrode_map.end()){
- return (elecIt)->second;
- }
- else{
- int part = m_hvlineHelper->partition(hvlineId);
- int canl = m_hvlineHelper->can_line(hvlineId);
- int cann = m_hvlineHelper->can_node(hvlineId);
- int hvli = m_hvlineHelper->hv_line(hvlineId);
- msg(MSG::WARNING) << "LArHVCablingSvc: getLArElectrodeIDvec didnot find electrode to hvline ["
- << part << "." << canl << "." << cann << "." << hvli << "]" << endmsg;
- static std::vector<HWIdentifier> invalid;
- return(invalid);
- }
- //return m_hvmapHelper->getLArElectrodeIDvec( hvlineId );
-}
-
-
-
-
-
-
-
-//==========================================================================
-void LArHVCablingTool::getElectrodeInCell( const Identifier& offId, std::vector<HWIdentifier> &electrodeIdVec )
-//============================================================================
-{//Start of getCellElectrodeIDvec
- ATH_MSG_VERBOSE("Entering getElectrodeInCell( offlineId ) " );
-
- // Get HV fields from offline fields
- //===================================
- int Detector = -1;
- int Side = -9;
- int iGapMax = -1;
- if( m_caloHelper->is_em( offId ) ){
- const int sampl = m_emHelper->sampling( offId );
- const int bec = m_emHelper->barrel_ec( offId);
- if( bec > 0 ){
- Side = 0;}
- else{Side = 1;}
- if( m_caloHelper->is_em_barrel(offId) && sampl != 0 ){
- // EMB
- Detector = 0;
- iGapMax = 1;
- }
- if( m_caloHelper->is_em_barrel(offId) && sampl == 0 ){
- // EMBPS
- Detector = 1;
- iGapMax = 0;
- }
- if( m_caloHelper->is_em_endcap(offId) && sampl != 0 ){
- // EMEC
- Detector = 2;
- iGapMax = 1;
- }
- if( m_caloHelper->is_em_endcap(offId) && sampl == 0 ){
- // EMECPS
- Detector = 3;
- iGapMax = 0;
- }
- }
- else if( m_caloHelper->is_hec( offId ) ){
- const int bec = m_hecHelper->pos_neg(offId);
- if( bec > 0 ){
- Side = 0;}
- else{Side = 1;}
- Detector = 4;
- iGapMax = 3;
- }
- else if( m_caloHelper->is_fcal( offId ) ){
- const int bec = m_fcalHelper->pos_neg(offId);
- Detector = 5;
- iGapMax = 3;
- if( bec > 0 ){
- Side = 0;}
- else{Side = 1;}
- }
-
- // ------------------------------------------------------------
- // Get cell localisation information in terms of HV description
- // ------------------------------------------------------------
- const int Module = getCellModule( offId );
- const int EtaBin = getCellEtaSector( offId );
- const int PhiBin = getCellPhiSector( offId );
- const int elecmin = getCellElectrodeMinMax(offId).first;
- const int elecmax = getCellElectrodeMinMax(offId).second;
- ATH_MSG_DEBUG("[getArHVLineID] ElectrodeId=["
- << Detector << "."
- << Side << "."
- << Module << "."
- << PhiBin << "."
- << EtaBin << ".gap_max="
- << iGapMax << ".min="
- << elecmin << ".max="
- << elecmax << "]" );
- for( int ielec=elecmin; ielec<elecmax+1; ielec++){
- for( int iGap=0; iGap<iGapMax+1; iGap++){
- const HWIdentifier electrodeId =
- m_electrodeHelper->ElectrodeId(Detector,Side,Module,PhiBin,EtaBin,iGap,ielec);
- electrodeIdVec.push_back(electrodeId);
- }
- }
- ATH_MSG_DEBUG("vector size = " << electrodeIdVec.size() );
-}
-// <<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-// End of getElectrodeInCell()
-// <<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-
-
-
-
-
-
-
-//==========================================================================
-void LArHVCablingTool::getHVLineInCell( const Identifier& offId, std::vector<HWIdentifier> &hvlineIdVec )
-//============================================================================
-{//Start of getHVLineInCell
- ATH_MSG_VERBOSE("Entering getHVLineInCell( offlineId ) " );
-
- hvlineIdVec.clear();
-
- // Get maping from fillHVMap()
- //-----------------------------
- if(!m_initHVMap)
- {// if no map then fill it first
- msg(MSG::INFO) << "[getHVLineInCell] no mapping defined..--> fillHVMap().." << endmsg;
- fillHVMap();
- m_initHVMap = true;
- }
-
- // Get HV fields from offline fields
- //===================================
- int Detector = -1;
- int Side = -9;
- int iGapMax = 0;
- if( m_caloHelper->is_em( offId ) ){
- const int sampl = m_emHelper->sampling( offId );
- const int bec = m_emHelper->barrel_ec( offId);
- if( bec > 0 ){
- Side = 0;}
- else{Side = 1;
- }
- if( m_caloHelper->is_em_barrel(offId) && sampl != 0 ){
- // EMB
- Detector = 0;
- iGapMax = 1;
- }
- if( m_caloHelper->is_em_barrel(offId) && sampl == 0 ){
- // EMBPS
- Detector = 1;
- iGapMax = 0;
- }
- if( m_caloHelper->is_em_endcap(offId) && sampl != 0 ){
- // EMEC
- Detector = 2;
- iGapMax = 1;
- }
- if( m_caloHelper->is_em_endcap(offId) && sampl == 0 ){
- // EMECPS
- Detector = 3;
- iGapMax = 0;
- }
- }
- else if( m_caloHelper->is_hec( offId ) ){
- const int bec = m_hecHelper->pos_neg(offId);
- if( bec > 0 ){
- Side = 0;}
- else{Side = 1;}
- Detector = 4;
- iGapMax = 3;
- }
- else if( m_caloHelper->is_fcal( offId ) ){
- const int bec = m_fcalHelper->pos_neg(offId);
- if( bec > 0 )
- { Side = 0;}
- else{Side = 1;}
- Detector = 5;
- iGapMax = 3;
- }
-
- ATH_MSG_DEBUG("[getHVLineInCell] identified detector det="
- << Detector << " (0=EMB, 1=EMBPS, 2=EMEC, 3=EMECPS, 4=HEC 5=FCAL)"
- );
-
-
- // ------------------------------------------------------------
- // Get cell localisation information in terms of HV description
- // ------------------------------------------------------------
- const int Module = getCellModule( offId );
- const int EtaBin = getCellEtaSector( offId );
- const int PhiBin = getCellPhiSector( offId );
- const int elecmin = getCellElectrodeMinMax(offId).first;
- const int elecmax = getCellElectrodeMinMax(offId).second;
- for( int ielec=elecmin; ielec<elecmax+1; ielec++){
- // Loop over electrodes in cell
- ATH_MSG_VERBOSE("[getHVLineInCell] defining electrodeId: [det="
- << Detector << " sid="
- << Side << " mod="
- << Module << " phi="
- << PhiBin << " eta="
- << EtaBin << " ielec="
- << ielec << "]"
- );
- for( int iGap=0; iGap<iGapMax+1; iGap++){
- // Loop over gaps
- const HWIdentifier electrodeId =
- m_electrodeHelper->ElectrodeId(Detector,Side,Module,PhiBin,EtaBin,iGap,ielec);
- const int dete = m_electrodeHelper->detector(electrodeId);
- const int side = m_electrodeHelper->zside(electrodeId);
- const int modu = m_electrodeHelper->module(electrodeId);
- const int hvph = m_electrodeHelper->hv_phi(electrodeId);
- const int hvet = m_electrodeHelper->hv_eta(electrodeId);
- const int hvga = m_electrodeHelper->gap(electrodeId);
- const int elec = m_electrodeHelper->electrode(electrodeId);
- std::map<HWIdentifier,HWIdentifier>::iterator elecIt =
- m_electrode_hvline_map.find(electrodeId);
- if(elecIt != m_electrode_hvline_map.end()){
- // found corresponding HVline
- HWIdentifier hvlineId = (elecIt)->second;
-
- int part1 = m_hvlineHelper->partition(hvlineId);
- int canl1 = m_hvlineHelper->can_line(hvlineId);
- int cann1 = m_hvlineHelper->can_node(hvlineId);
- int hvli1 = m_hvlineHelper->hv_line(hvlineId);
-
- if (msgLvl(MSG::DEBUG)) {
- msg(MSG::DEBUG) << "[getHVLineInCell] input ElectrodeId=["
- << dete << "." << side << "." << modu << "." << hvph
- << "." << hvet << "." << hvga << "." << elec << "]"
- << " corresponding hvlineID=["
- << part1 << "." << canl1 << "."
- << cann1 << "." << hvli1 << "] "
- << endmsg;
- }
- if( hvlineIdVec.size() == 0 ){
- ATH_MSG_DEBUG("[getHVLineInCell] -> first fill of vector..." );
- hvlineIdVec.push_back(hvlineId);
- }
- else{
- bool foundHvId = false;
- std::vector<HWIdentifier>::const_iterator hv = hvlineIdVec.begin();
- std::vector<HWIdentifier>::const_iterator hvEnd = hvlineIdVec.end();
- for(; hv!=hvEnd;++hv){
- HWIdentifier hvRef = *hv;
- int part = m_hvlineHelper->partition(hvRef);
- int canl = m_hvlineHelper->can_line(hvRef);
- int cann = m_hvlineHelper->can_node(hvRef);
- int hvli = m_hvlineHelper->hv_line(hvRef);
- ATH_MSG_DEBUG("[getHVLineInCell] -> in loop : hvRef=["
- << part << "." << canl << "."
- << cann << "." << hvli << "] "
- );
- if( hvlineId == hvRef ){
- foundHvId = true;
- ATH_MSG_DEBUG("[getHVLineInCell] -> BREAK !" );
- break;
- }
- }
- if( !foundHvId ){
- hvlineIdVec.push_back(hvlineId);
- ATH_MSG_DEBUG("[getHVLineInCell] -> new HV line added"
- << "=["
- << part1 << "." << canl1 << "."
- << cann1 << "." << hvli1 << "] size of vector="
- << hvlineIdVec.size()
- );
- }
- else{
- ATH_MSG_DEBUG("[getHVLineInCell] -> HV line already IN"
- << "=["
- << part1 << "." << canl1 << "."
- << cann1 << "." << hvli1 << "] size of vector="
- << hvlineIdVec.size()
- );
- }
- }
- }
- else{
- msg(MSG::WARNING) << "[getHVLineInCell] couldnot find the electrodeID in map ["
- << Detector << " Sid="
- << Side << " Mod="
- << Module << " phi="
- << PhiBin << " eta="
- << EtaBin << " Gap="
- << iGap << " elec_min="
- << elecmin <<" elec_max="
- << elecmax << "]"
- << endmsg;
- }
- } // Loop over gaps
- }// Loop over electrodes in cell
- ATH_MSG_DEBUG("vector size = " << hvlineIdVec.size() );
-}
-// <<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-// End of getHVLineInCell()
-// <<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-
-
-//=====================================================================
-int LArHVCablingTool::getCellModule( const Identifier &offId )
-//=====================================================================
-// Returns the LArModule index as an integer
-//
-// Last Modified:
-// 05-FEB-2007 AL fixed FCAL info --thanks to Zhaoyu Yang
-// 02-FEB-2007 AL added Module info for FCAL
-// 31-JAN-2007 AL reversed ModuleID returned for EMEC C-side
-//
-// =====================================================================
-{// Start of getCellModule
- //======================================
- ATH_MSG_VERBOSE("Entering getCellModule " );
-
- int bec =-99;
- int sampling =-99;
- int region =-99;
- int phi =-99;
- //int module =-99;
- // Returned Value
- // =====================================
- int ModuleID =-99;
-
- // Identify the Helper to be used
- // =====================================
- if( m_caloHelper->is_em( offId ) ){
- bec = m_emHelper->barrel_ec(offId);
- sampling = m_emHelper->sampling(offId);
- region = m_emHelper->region(offId);
- phi = m_emHelper->phi(offId);
- ATH_MSG_DEBUG("[getCellModule] processing an EM cell.." );
- }
- else if( m_caloHelper->is_hec( offId ) ){
- bec = m_hecHelper->pos_neg(offId)*10;
- sampling = m_hecHelper->sampling(offId);
- region = m_hecHelper->region(offId);
- phi = m_hecHelper->phi(offId);
- ATH_MSG_DEBUG("[getCellModule] processing an HEC cell.." );
- }
- else if( m_caloHelper->is_fcal( offId )){
- bec = m_fcalHelper->pos_neg(offId)*20;
- sampling = m_fcalHelper->module(offId);
- //module = m_fcalHelper->module(offId);
- phi = m_fcalHelper->phi(offId);
- ATH_MSG_DEBUG("[getCellModule] processing an FCAL cell.." );
- }
-
- // Now determine the Module ID
- if( abs(bec) == 1 ){
- // EM BARREL
- // ===========================================================================
- // x being the ATLAS x direction (pointing towards the center of the collider)
- // we have :
- // SIDE - C (z<0) SIDE - A (z>0)
- // ------------- --------------
- // C04 A04
- // C03 C05 A05 A03
- // C02 C06 A06 A02
- // C01 C07 A07 A01
- // C00----------C08-->X A08----------A00---> X
- // C15 C09 A09 A15
- // C14 C10 A10 A14
- // C13 C11 A11 A13
- // C12 A12
- //============================================================================
- if( bec == 1 ){
- // A-WHEEL
- // =======
- if( sampling == 0 ){
- // ------------------------------
- // 32 Modules of two cells in phi
- // ------------------------------
- int phi_module=int(phi/2);
- ModuleID = phi_module;
- }
- else if( sampling == 1 && region == 0 ){
- // -----------------------------
- // 16 Modules of 4 cells in phi
- // -----------------------------
- int phi_module = int((phi+2)/4);
- if( phi_module == 16 ){
- ModuleID = 0;
- }
- else{
- ModuleID = phi_module;
- }
- }
- else if( sampling == 2 || sampling == 3 || (sampling == 1 && region == 1 ) ){
- // -----------------------------
- // 16 Modules of 16 cells in phi
- // -----------------------------
- int phi_module = int((phi+8)/16);
- if( phi_module == 16 ){
- ModuleID=0;
- }
- else{
- ModuleID=phi_module;
- }
- }
- }
-
- else if( bec == -1 ){
- // C-WHEEL
- // =======
- if( sampling == 0 ){
- // ------------------------------
- // 32 Modules of two cells in phi
- // ------------------------------
- int phi_module=int(phi/2);
- if( phi_module <= 15 ){
- phi_module = 15 - phi_module;
- }
- else{
- phi_module = 47 - phi_module;
- }
- ModuleID = phi_module;
- }
- else if( sampling == 1 && region == 0 ){
- // -----------------------------
- // 16 Modules of 4 cells in phi
- // -----------------------------
- int phi_module = int((phi+2)/4);
- if( phi_module <= 8){
- phi_module = 8 - phi_module;
- }
- else{
- phi_module = 24 - phi_module;
- }
- ModuleID = phi_module;
- }
- else if( sampling == 2 || sampling == 3 || (sampling == 1 && region == 1 ) ){
- // -----------------------------
- // 16 Modules of 16 cells in phi
- // -----------------------------
- int phi_module = int((phi+8)/16);
- if( phi_module <= 8){
- phi_module = 8 - phi_module;
- }
- else{
- phi_module = 24 - phi_module;
- }
- ModuleID = phi_module;
- }
- }
- }
-
- else if( abs(bec) == 2 || abs(bec) == 3){
- // EMEC
- // ----
- //
- // x being the ATLAS x direction (pointing towards the center of the collider)
- // we have :
- // SIDE - C SIDE - A
- // -------- -----------
- //
- // ECC1 ECC2 ECA2 ECA1
- //
- // ECC0 ECC3 ECA3 ECA0
- // -------------> X -----------> X
- // ECC7 ECC4 ECA4 ECA7
- //
- // ECC6 ECC5 ECA5 ECA6
- //
- //
- if( bec > 0 ){
- // SIDE - A
- if( sampling == 0 || sampling == 1 ||
- (sampling == 2 && abs(bec) == 3 ) ){
- // -------------------------------
- // 8 Modules of 8 cells in phi
- // -------------------------------
- // Sampling 0, 1 (inner+outer) & 2 region 0 (inner)
- //
- int phi_local = int(phi/8);
- ModuleID = phi_local;
- }
- else if( (sampling == 2 && abs(bec) == 2) || (sampling == 3 && abs(bec) == 2)){
- // ----------------------------------------
- // 8 Modules of 32 cells in phi
- // ----------------------------------------
- // Sampling 2 & 3 ( outer wheel) in [0,255]
- //
- int phi_local = int(phi/32);
- ModuleID = phi_local;
- }
- }
- else{
- // SIDE-C
- if( sampling == 0 || sampling == 1 ||
- (sampling == 2 && abs(bec) == 3 ) ){
- // ------------------------------
- // 8 Modules of 8 cells in phi
- // -------------------------------
- // Sampling 0, 1 & 2( inner wheel) in [0,63]
- //
- int rev_phi=-99;
- int phi_local = int(phi/8);
- if( phi_local == 0 ){rev_phi = 3;}
- if( phi_local == 1 ){rev_phi = 2;}
- if( phi_local == 2 ){rev_phi = 1;}
- if( phi_local == 3 ){rev_phi = 0;}
- if( phi_local == 4 ){rev_phi = 7;}
- if( phi_local == 5 ){rev_phi = 6;}
- if( phi_local == 6 ){rev_phi = 5;}
- if( phi_local == 7 ){rev_phi = 4;}
- ModuleID = rev_phi;
- }
- else if( (sampling == 2 && abs(bec) == 2) || (sampling == 3 && abs(bec) == 2)){
- // ----------------------------------------
- // 8 Modules of 32 cells in phi
- // ----------------------------------------
- // Sampling 2 & 3 ( outer wheel) in [0,255]
- //
- int rev_phi=-99;
- int phi_local = int(phi/32);
- if( phi_local == 0 ){rev_phi = 3;}
- if( phi_local == 1 ){rev_phi = 2;}
- if( phi_local == 2 ){rev_phi = 1;}
- if( phi_local == 3 ){rev_phi = 0;}
- if( phi_local == 4 ){rev_phi = 7;}
- if( phi_local == 5 ){rev_phi = 6;}
- if( phi_local == 6 ){rev_phi = 5;}
- if( phi_local == 7 ){rev_phi = 4;}
- ModuleID = rev_phi;
- }
- }
- }
-
-
- else if( abs(bec) == 20 ){
- // HEC Detector
- // ============
- if( bec > 0){
- // WHEEL A
- if( region == 0 ){
- // OUTER WHEEL
- // ----------------------------
- // 32 Modules of 2 cells in phi
- // ----------------------------
- int phi_module=int(phi/2);
- ModuleID = phi_module;
- }
- else if( region == 1){
- // INNER WHEEL
- // ----------------------------
- // 32 Modules of 1 cells in phi
- // ----------------------------
- int phi_module=int(phi);
- ModuleID = phi_module;
- }
- }
- else if( bec < 0){
- // WHEEL C
- if( region == 0 ){
- // OUTER WHEEL
- // -----------
- int phi_module=int(phi/2);
- if( phi_module <= 15 ){
- phi_module = 15 - phi_module;
- }
- else{
- phi_module = 47 - phi_module;
- }
- ModuleID = phi_module;
- }
- else if( region == 1){
- // INNER WHEEL
- // -----------
- int phi_module=int(phi);
- if( phi_module <= 15 ){
- phi_module = 15 - phi_module;
- }
- else{
- phi_module = 47 - phi_module;
- }
- ModuleID = phi_module;
- }
- }
- }
- // ===========================================================================
- // x being the ATLAS x direction (pointing towards the center of the collider)
- // we have :
- // SIDE - C (z<0) SIDE - A (z>0)
- // ------------- --------------
- // C04 A04
- // C03 C05 A05 A03
- // C02 C06 A06 A02
- // C01 C07 A07 A01
- // C00----------C08-->X A08----------A00---> X
- // C15 C09 A09 A15
- // C14 C10 A10 A14
- // C13 C11 A11 A13
- // C12 A12
- //============================================================================
-
- else if( abs(bec) == 40 ){
- // FCAL Detector
- // ==============
- // FCAL-Module 1 : EM
- // FCAL-Module 2,3 : Hadronic
- // -> 16 cells in phi per Module
- // ==============================
- if( sampling == 1){
- ModuleID = int(phi);
- }
- else if( sampling == 2 ){
- ModuleID = int(phi/2);
- }
- else if( sampling == 3){
- ModuleID = int(phi/4);
- }
- }
- else{
- msg(MSG::WARNING) << " -->> Invalid MODULE returned " << endmsg;
- }
- ATH_MSG_DEBUG("Closing getCellModule " );
- return ModuleID;
-}
-
-
-
-//===================================================================
-int LArHVCablingTool::getCellEtaSector( const Identifier &offId )
-//===================================================================
-// Returns the HV eta sector given an cell ID as an integert
-//
-// 05-FEB-2007 : AL added FCAL info from Zhaoyu
-//
-// 11-FEB-2005: modified getHVEtaSector to return an int.
-// 25-NOV-2004: AL Added EMEC
-// 09-DEC-2004: AL fixed EMBPS : change from 8 to 4 HV-sectors in Eta (08-DEC-2004)
-// & fixed EMEC
-// 15-DEC-2004: AL added HEC wheels
-//===================================================================
-{// Start of getHVEtaSector()
- ATH_MSG_VERBOSE("Entering getCellEtaSector ...." );
-
- std::string l_version = m_emHelper->dictionaryVersion();
-
- // Returned Value
- int l_bec =-99;
- int sampling=-99;
- int region =-99;
- int ieta =-99;
- // Identify the Helper to be used
- // =====================================
- if( m_caloHelper->is_em( offId ) ){
- l_bec = m_emHelper->barrel_ec(offId);
- sampling = m_emHelper->sampling(offId);
- region = m_emHelper->region(offId);
- ieta = m_emHelper->eta(offId);
- }
- else if( m_caloHelper->is_hec( offId ) ){
- l_bec = m_hecHelper->pos_neg(offId)*10;
- sampling = m_hecHelper->sampling(offId);
- region = m_hecHelper->region(offId);
- ieta = m_hecHelper->eta(offId);
- }
- else if( m_caloHelper->is_fcal( offId ) ){
- l_bec = m_fcalHelper->pos_neg(offId)*20;
- sampling = m_fcalHelper->module(offId);
- }
-
- // Output argument
- // =====================================
- int hvEta=-99;
-
- // Construct heEta
- // =====================================
- if( abs(l_bec) == 1 ){
- // BARREL
- if( sampling == 1 )
- {// FRONT sampling
- if( region == 0 ){
- if( ieta >= 0 && ieta < 64 ){
- hvEta=1;
- }
- else if( ieta >=64 && ieta < 128 ){
- hvEta=2;
- }
- else if( ieta >=128 && ieta < 192 ){
- hvEta=3;
- }
- else if( ieta >=192 && ieta < 256 ){
- hvEta=4;
- }
- else if( ieta >=256 && ieta < 320 ){
- hvEta=5;
- }
- else if( ieta >=320 && ieta < 384 ){
- hvEta=6;
- }
- else if( ieta >=384 && ieta < 448 ){
- hvEta=7;
- }
- }
- else if( region == 1){
- hvEta=7;
- }
- else {
- msg(MSG::WARNING) << "==> Invalid HV Eta-Sector for sampling=" << sampling << " Region=" << region << " I(eta)="<< ieta << endmsg;
- }
- }
- else if( sampling == 2 ){
- // MIDDLE Sampling in Barrel
- // ----------------------
- //
- if( region == 0 ){
- if( ieta >= 0 && ieta < 8 ){
- hvEta=1;
- }
- else if( ieta >=8 && ieta < 16 ){
- hvEta=2;
- }
- else if( ieta >=16 && ieta < 24 ){
- hvEta=3;
- }
- else if( ieta >=24 && ieta < 32 ){
- hvEta=4;
- }
- else if( ieta >=32 && ieta < 40 ){
- hvEta=5;
- }
- else if( ieta >=40 && ieta < 48 ){
- hvEta=6;
- }
- else if( ieta >=48 && ieta < 57 ){
- hvEta=7;
- }
- }
- else if( region == 1)
- {
- hvEta=7; // to be checked with Francesco
-
- }
- else{
- msg(MSG::WARNING) << "==> Invalid HV Eta-Sector for sampling=" << sampling << " Region=" << region << " I(eta)="<< ieta << endmsg;
- }
- }
- else if( sampling == 3 ){
- // BACK Sampling in Barrel
- // -----------------------
- //
- if( region == 0 ){
- if( ieta >= 0 && ieta < 4 ){
- hvEta=1;
- }
- else if( ieta >=4 && ieta < 8 ){
- hvEta=2;
- }
- else if( ieta >=8 && ieta < 12 ){
- hvEta=3;
- }
- else if( ieta >=12 && ieta < 16 ){
- hvEta=4;
- }
- else if( ieta >=16 && ieta < 20 ){
- hvEta=5;
- }
- else if( ieta >=20 && ieta < 24 ){
- hvEta=6;
- }
- else if( ieta >=24 && ieta < 28 ){
- hvEta=7;
- }
- }
- else if( region == 1){
- msg(MSG::WARNING) << "==> Invalid HV Eta-Sector for sampling=" << sampling << " Region=" << region << " I(eta)="<< ieta << endmsg;
- }
- else{
- msg(MSG::WARNING) << "==> Invalid HV Eta-Sector for sampling=" << sampling << " Region=" << region << " I(eta)="<< ieta << endmsg;
- }
- }
-
- else if( sampling == 0 ){
- // PreSampler Sampling in Barrel
- // -----------------------------
- if( region == 0 ){
- // OKed by JY Hostachy
- if( ieta <= 60 ){
- if( ieta >= 0 && ieta < 15 ){
- hvEta=1;
- }
- else if( ieta >=15 && ieta <30 ){
- hvEta=2;
- }
- else if( ieta >=30 && ieta < 45 ){
- hvEta=3;
- }
- else if( ieta >=45 && ieta < 61 ){
- hvEta=4;
- }
- }
- else{
- msg(MSG::WARNING) << "Not in EMBPS..i(eta)=" << ieta << endmsg;
- }
- }
- }
- else {
- msg(MSG::WARNING) << "Not in Barrel ..." << endmsg;
- }
- }
- else if( abs(l_bec) == 2 || abs(l_bec) == 3){
- // ENDCAP EMEC
- // -----------
- //
- if( sampling == 3 ){
- // Sampling 3 OUTER Wheel
- // -----------------------
- // Validated on NOV-25-2004 with Djama (CPPM)
- //
- if( ieta >= 0 && ieta <= 1){
- hvEta=1;
- }
- else if(ieta >=2 && ieta <= 5){
- hvEta=2;
- }
- else if(ieta >=6 && ieta <= 9){
- hvEta=3;
- }
- else if(ieta >=10 && ieta <= 11){
- hvEta=4;
- }
- else if(ieta >=12 && ieta <= 15){
- hvEta=5;
- }
- else if(ieta >=16 && ieta <= 19){
- hvEta=6;
- }
- }
- else if( sampling == 2 && abs(l_bec) == 2 ){
- // Sampling 2 OUTER Wheel
- // ----------------------
- //
- // Validated on NOV-25-2004 with Djama (CPPM)
- //
- if(region == 0){
- hvEta =0;
- }
- else if( region == 1 ){
- // region 1 Sampling 2
- if( ieta >=0 && ieta <= 2){
- hvEta=0;
- }
- else if( ieta >=3 && ieta <= 6){
- hvEta=1;
- }
- else if( ieta >=7 && ieta <= 15){
- hvEta=2;
- }
- else if( ieta >=16 && ieta <= 23){
- hvEta=3;
- }
- else if( ieta >=24 && ieta <= 27){
- hvEta=4;
- }
- else if( ieta >=28 && ieta <= 35){
- hvEta=5;
- }
- else if( ieta >=36 && ieta <= 42){
- hvEta=6;
- }
- }
- }
-
- else if( sampling == 2 && abs(l_bec) == 3 ){
- // Sampling 2 INNER Wheel
- // -----------------------
- //
- // Validated on NOV-25-2004 with Djama (CPPM)
- //
- if( ieta >=0 && ieta <= 2){
- hvEta=7;
- }
- else if( ieta >=3 && ieta <= 6){
- hvEta=8;
- }
- }
-
- else if( sampling == 1 && abs(l_bec) == 3 ){
- // Sampling 1 INNER Wheel
- // -----------------------
- //
- // Validated on NOV-25-2004 with Djama (CPPM)
- //
- if( ieta >=0 && ieta <= 2){
- hvEta=7;
- }
- else if( ieta >=3 && ieta <= 6){
- hvEta=8;
- }
- }
-
- else if( sampling == 1 && abs(l_bec) == 2 ){
- // Sampling 1 OUTER Wheel
- // -----------------------
- //
- if( region == 0 || region == 1)
- {// 1.375 < eta < 1.5
- hvEta=0;
- }
- else if( region == 2 ){
- if( ieta >= 0 && ieta <= 31)
- {
- // 1.5 < eta < 1.6
- hvEta = 1;
- }
- else if( ieta <= 95) {
- // 1.6 < eta < 1.8
- hvEta = 2;
- }
- }
- else if(region == 3){
- // 1.8 < eta < 2.0
- hvEta = 3;
- }
- else if(region == 4){
- // 2.0 < eta < 2.4
- if( ieta >=0 && ieta <= 15 ){
- // 2.0 < eta < 2.1
- hvEta = 4;
- }
- else if( ieta >= 16 && ieta <= 47 ){
- // 2.1 < eta < 2.3
- hvEta = 5;
- }
- else if( ieta >= 48 && ieta <= 63 ){
- // 2.3 < eta < 2.4
- hvEta = 6;
- }
- }
- else if( region == 5 ){
- // 2.4 < eta < 2.5
- hvEta = 6;
- }
- }
- }
-
-
- else if( abs(l_bec)== 20 ){
- // HEC Wheels
- //-----------
- if( sampling == 0 ){
- hvEta = 1;
- }
- else if( sampling == 1){
- hvEta = 2;
- }
- else if( sampling == 2){
- hvEta = 3;
- }
- else if( sampling == 3){
- hvEta = 4;
- }
- }
- // ============================
- // FCAL eta bins
- // eta = [0,62] in Module 1
- // eta = [0,31] in Module 2
- // eta = [0,15] in Module 3
- // ============================
- else if( abs(l_bec)== 40 ){
- // FCAL Wheels
- //-----------
- if( sampling == 1 ){
- hvEta = 1;
- }
- else if( sampling == 2 ){
- hvEta = 2;
- }
- else if( sampling == 3 ){
- hvEta = 3;
- }
- else{
- msg(MSG::WARNING)
- << "[getCellEtaSector] invalid FCAL input cell.." << endmsg;
- }
- }
- else{
- msg(MSG::WARNING) << "[getCellModule] Detector unknown ! " << endmsg;
- }
- // Output
- ATH_MSG_DEBUG("Closing getCellEtaSector ...." );
- return hvEta;
-}
-
-
-
-
-//=====================================================================
-int LArHVCablingTool::getCellPhiSector( const Identifier &offId )
-//=====================================================================
-// Returns the phi-sector used number for a given cell
-//
-// 23-JAN-2007 AL change of convention for EMB :
-// now returns hv_phi = 0 for FT=-1 (prev. 1)
-// hv_phi = 1 for FT= 0 (prev. 0)
-//
-// 09-FEB-2005 AL fixed for H8 (module A00 rotated)
-// 09-DEC-2004 AL created from getLArFeefdthrough(int,int,int,int)
-// - Added H8-EMBPS returning FT=0
-// - Corrected for reversed order for C-Wheel
-// 16-DEC-2004 AL added HEC and H6-HEC (which returns 0)
-// 14-JAN-2005 AL added H6-EMEC
-// - Added H6-EMEC returning FT=0
-//=====================================================================
-{// Start of getCellPhiSector()
- ATH_MSG_VERBOSE("Entering getCellPhiSector ...." );
- //
- // Get relevant offline fields
- //
- int bec =99;
- int sampling=-99;
- int region =-99;
- int phi =-99;
-
- if( m_caloHelper->is_em( offId ) ){
- bec = m_emHelper->barrel_ec(offId);
- sampling = m_emHelper->sampling(offId);
- region = m_emHelper->region(offId);
- phi = m_emHelper->phi(offId);
- }
- else if( m_caloHelper->is_hec( offId ) ){
- bec = m_hecHelper->pos_neg(offId)*10;
- }
- else if( m_caloHelper->is_fcal( offId ) ){
- bec = m_fcalHelper->pos_neg(offId)*20; // ie: +/-40
- }
- // Output Argument
- int hvPhi=-2;
- //
- //*** Note*** :
- //
- // For EMB, Feedthrough (FT) takes value -1 and 0
- // Instead, we encode these values as:
- // FT = -1 --> hvPhiSector = 1
- // FT = 0 --> hvPhiSector = 0
- //
- if( abs(bec) == 1){
- // EMBARREL
- //----------
- if( bec == 1){
- // WHEEL-A
- //--------
- if( sampling == 0 ){
- // ------------------------------
- // EMBPS : phiSector not relevant
- // ------------------------------
- hvPhi = 0;
- }
- if( sampling == 1 && region == 0 ){
- // ---------------------------------
- // EM1 Region 0: phi-cells in [0,63]
- // ---------------------------------
- //
- int phi_local = int(phi);
- for(int ift=0; ift<= 15; ift++){
- if( phi_local == ift*4 || phi_local == 1+ift*4 ){
- hvPhi = 0;
- }
- if( phi_local == 2+ift*4 || phi_local == 3+ift*4 ){
- hvPhi = 1;
- }
- }
- }
- else if( sampling == 2 || sampling == 3 || (sampling == 1 && region == 1 ) ){
- // ----------------------------------------------
- // FRONT Region 1 + MIDDLE + BACK Phi in [0,255]
- // ----------------------------------------------
- int phi_local = int(phi);
- for( int ift=0; ift<= 15; ift++){
- for( int i=0; i<=7; i++){
- if( phi_local == i+ift*16 ){
- hvPhi = 0;
- }
- }
- for( int i=8; i<=15; i++){
- if( phi_local == i+ift*16 ){
- hvPhi = 1;
- }
- }
- }
- }
- }
-
- else if( bec == -1){
- // WHEEL-C
- //--------
- if( sampling == 0 ){
- // ------------------------------
- // EMBPS : phiSector not relevant
- // ------------------------------
- hvPhi = 0;
- }
- if( sampling == 1 && region == 0 ){
- // ---------------------------------------
- // FRONT (Region 0): phi-cells in [0,63]
- // ---------------------------------------
- int phi_local = int(phi);
- for(int ift=0; ift<= 15; ift++){
- if( phi_local == ift*4 || phi_local == 1+ift*4 ){
- hvPhi = 1;
- }
- if( phi_local == 2+ift*4 || phi_local == 3+ift*4 ){
- hvPhi = 0;
- }
- }
- }
- else if( sampling == 2 || sampling == 3 || (sampling == 1 && region == 1 ) ){
- // FRONT Region 1 + MIDDLE + BACK Phi in [0,255]
- int phi_local = int(phi);
- for( int ift=0; ift<= 15; ift++){
- for( int i=0; i<=7; i++){
- if( phi_local == i+ift*16 ){
- hvPhi = 1;
- }
- }
- for( int i=8; i<=15; i++){
- if( phi_local == i+ift*16 ){
- hvPhi = 0;
- }
- }
- }
- }
- }
- }
-
- else if( abs(bec) == 2 || abs(bec) == 3 ){
- // EMEC
- if( bec > 0 ){
- // WHEEL-A
- if( sampling == 1 && abs(bec) == 2 ){
- // ====================================
- // Sampling 1 OUTER Wheel
- // =====================================
- // 64 cells per SIDE
- // 8 Modules per side
- // --> 8 cells / module
- // 4 FT per module [1,4]
- // --> 2 cells / FT
- // =====================================
- int imod=int(phi/8);
- int phi_local = phi - imod*8;
- if( phi_local == 0 || phi_local == 1){
- hvPhi = 1;
- }
- else if( phi_local == 2 || phi_local == 3){
- hvPhi = 2;
- }
- else if( phi_local == 4 || phi_local == 5){
- hvPhi = 3;
- }
- else if( phi_local == 6 || phi_local == 7){
- hvPhi = 4;
- }
- }
- if( sampling == 1 && abs(bec) == 3 ){
- // Sampling 1 INNER Wheel (FT in [1,8])
- // ------------------------------------
- //
- int imod=int(phi/8);
- int phi_local = phi-imod*8;
- hvPhi = phi_local+1;
- }
- else if( sampling == 2 && abs(bec) == 3 ){
- //
- // Sampling 2 Inner Wheel (FT in [1,8])
- // ------------------------------------
- //
- int imod=int(phi/8);
- int phi_local = phi - imod*8;
- hvPhi = phi_local+1;
- }
- else if( sampling == 2 && abs(bec) == 2 ){
- //
- // Sampling 2 Outer Wheel (FT in [1,4])
- // ------------------------------------
- //
- int imod = (phi/32);
- int phi_local= phi-imod*32;
- if( phi_local >= 0 && phi_local <= 7 ){
- hvPhi = 1;
- }
- else if( phi_local >= 8 && phi_local <= 15 ){
- hvPhi = 2;
- }
- else if( phi_local >= 16 && phi_local <= 23 ){
- hvPhi = 3;
- }
- else if( phi_local >= 24 && phi_local <= 31 ){
- hvPhi = 4;
- }
- }
- else if( sampling == 3 ){
- //
- // Sampling 3 Outer Wheel (FT in [1,4])
- // ------------------------------------
- //
- int imod = (phi/32);
- int phi_local= phi-imod*32;
- if( phi_local >= 0 && phi_local <= 7 ){
- hvPhi = 1;
- }
- else if( phi_local >= 8 && phi_local <= 15 ){
- hvPhi = 2;
- }
- else if( phi_local >= 16 && phi_local <= 23 ){
- hvPhi = 3;
- }
- else if( phi_local >= 24 && phi_local <= 31 ){
- hvPhi = 4;
- }
- }
- }
- else if( bec < 0 ){
- // WHEEL-C
- if( sampling == 1 && abs(bec) == 2 ){
- // Sampling 1 OUTER Wheel (FT in [1,4])
- // ------------------------------------
- int imod=int(phi/8);
- int phi_local = phi-imod*8;
- if( phi_local == 0 || phi_local == 1){
- hvPhi = 4;
- }
- else if( phi_local == 2 || phi_local == 3){
- hvPhi = 3;
- }
- else if( phi_local == 4 || phi_local == 5){
- hvPhi = 2;
- }
- else if( phi_local == 6 || phi_local == 7){
- hvPhi = 1;
- }
- }
- if( sampling == 1 && abs(bec) == 3 ){
- // Sampling 1 INNER Wheel (FT in [1,8])
- // ------------------------------------
- //
- int imod=int(phi/8);
- int phi_local = phi - imod*8;
- hvPhi = 8-(phi_local);
- }
- else if( sampling == 2 && abs(bec) == 3 ){
- // Sampling 2 Inner Wheel (FT in [1,8])
- // ------------------------------------
- int imod=int(phi/8);
- int phi_local = phi-imod*8;
- hvPhi = 8-(phi_local);
- }
- else if( sampling == 2 && abs(bec) == 2 ){
- // Sampling 2 Outer Wheel (FT in [1,4])
- // ------------------------------------
- int imod = (phi/32);
- int phi_local= phi-imod*32;
- if( phi_local >= 0 && phi_local <= 7 ){
- hvPhi = 4;
- }
- else if( phi_local >= 8 && phi_local <= 15 ){
- hvPhi = 3;
- }
- else if( phi_local >= 16 && phi_local <= 23 ){
- hvPhi = 2;
- }
- else if( phi_local >= 24 && phi_local <= 31 ){
- hvPhi = 1;
- }
- }
- else if( sampling == 3 ){
- // Sampling 3 Outer Wheel (FT in [1,4])
- // ------------------------------------
- int imod = (phi/32);
- int phi_local= phi-imod*32;
- if( phi_local >= 0 && phi_local <= 7 ){
- hvPhi = 4;
- }
- else if( phi_local >= 8 && phi_local <= 15 ){
- hvPhi = 3;
- }
- else if( phi_local >= 16 && phi_local <= 23 ){
- hvPhi = 2;
- }
- else if( phi_local >= 24 && phi_local <= 31 ){
- hvPhi = 1;
- }
- }
- }
- }
-
- else if( abs(bec)==20){
- // HEC detector
- //------------
- // Note: not used because we use the 32 modules instead
- hvPhi = 0;
- }
- else if( abs(bec)==40){
- // FCAL detector
- //------------
- // Note: not used
- hvPhi = 0;
- }
- ATH_MSG_DEBUG("Closing getCellPhiSector ...." );
- return hvPhi;
-}
-
-
-
-
-
-//============================================================================
-std::pair<int,int> LArHVCablingTool::getCellElectrodeMinMax( const Identifier &offId )
-//============================================================================
-// Returns a pair <1st_electrode,last_electrode> of a given calo cell
-//
-// 12-FEB-2007 : AL fixed a bug in HEC
-// 02-FEB-2007 : AL added FCAL info *null* (see Zhaoyu)
-// 01-FEB-2007 : AL modified HEC info according to TDR 96-41
-// *te be checked by an expert*
-// 26-JAN-2007 : AL fixed electrode Min,Max for EMBARREL and EMEC
-//
-// 09-FEB-2005 : AL fixed the H8 inversion problem (rotation of Module 00)
-// 07-DEC-2004 : AL fixed A-Wheel (phi_local vs phi_atlas)
-// fixed for Reversed order for Barrel C-Wheel
-// 15-DEC-2004 : AL added HEC detector
-//
-//============================================================================
-{// get getCell1stElectrode start
- ATH_MSG_VERBOSE("[getCellElectrodeMinMax] Entering..." );
-
- int l_bec=99;
- int l_sampling=-99;
- int l_region=-99;
- //int l_eta=-99;
- int l_phi=-99;
-
- if( m_caloHelper->is_em( offId ) ){
- l_bec = m_emHelper->barrel_ec(offId);
- l_sampling = m_emHelper->sampling(offId);
- l_region = m_emHelper->region(offId);
- //l_eta = m_emHelper->eta(offId);
- l_phi = m_emHelper->phi(offId);
- }
- else if( m_caloHelper->is_hec( offId ) ){
- l_bec = m_hecHelper->pos_neg(offId)*10; // +-20
- l_sampling = m_hecHelper->sampling(offId);
- l_region = m_hecHelper->region(offId);
- //l_eta = m_hecHelper->eta(offId);
- l_phi = m_hecHelper->phi(offId);
- }
- else if( m_caloHelper->is_fcal( offId ) ){
- l_bec = m_fcalHelper->pos_neg(offId)*20; // +-40
- }
- // Output argument
- // ===============
- int ElecMin=-99;
- int ElecMax=-99;
- if( abs(l_bec) == 1 )
- {// if in BARREL
- if( l_bec == 1 ) {
- // EMBARREL SIDE A
- if( l_sampling == 0 || ( l_sampling == 1 && l_region == 0) ){
- // ========================================
- // - 64 cells-in-phi per SIDE
- // - 4 cells-in-phi per MODULE
- // - 64 electrodes-in-phi per MODULE
- // --> 4 cells of 16 electrodes per CELL
- // Examples in *ATLAS* (not H8)
- // --> Cell #0 ==> MOD A01 FT=-1 ELEC 0-15
- // --> Cell #1 ==> MOD A01 FT=-1 ELEC 16-31
- // --> Cell #2 ==> MOD A01 FT=0 ELEC 32-47
- // --> Cell #3 ==> MOD A01 FT=0 ELEC 48-64
- // ========================================
- int phi_module = int((l_phi+2)/4);
- int phi_local = l_phi+2 - 4*phi_module;
- ElecMin = phi_local*16;
- ElecMax = ElecMin + 16-1;
- ATH_MSG_DEBUG("[getCellElectrodeMinMax] EMB"
- << " Side A " << l_bec
- << " Sampling= " << l_sampling
- << " Region= " << l_region
- << " Module= A" << phi_module
- << " Phi/Module= " << phi_local
- << " Electrode=[" << ElecMin << "." << ElecMax << "]"
- );
- if( l_sampling == 0 ){
- ElecMin = 0;
- ElecMax = 0;
- }
-
- }
- else if( (l_sampling == 1 && l_region == 1) || l_sampling == 2 || l_sampling == 3 ){
- // ==========================================
- // - 256 cells-in-phi per SIDE
- // - 16 cells-in-phi per MODULE
- // - 64 electrode's planes per MODULE
- // --> 16 cells of 4 electrodes per CELL
- // ==========================================
- // --> Cell #0 ==> MOD A01 FT=-1 ELEC 00-03
- // --> Cell #1 ==> MOD A01 FT=-1 ELEC 04-07
- // --> Cell #2 ==> MOD A01 FT=-1 ELEC 08-11
- // --> Cell #3 ==> MOD A01 FT=-1 ELEC 12-15
- // --> Cell #4 ==> MOD A01 FT=-1 ELEC 16-19
- // --> Cell #5 ==> MOD A01 FT=-1 ELEC 20-23
- // --> Cell #6 ==> MOD A01 FT=-1 ELEC 24-27
- // --> Cell #7 ==> MOD A01 FT=-1 ELEC 28-31
- // --> Cell #8 ==> MOD A01 FT=0 ELEC 32-35
- // --> Cell #9 ==> MOD A01 FT=0 ELEC 36-39
- // --> Cell#10 ==> MOD A01 FT=0 ELEC 40-43
- // --> Cell#11 ==> MOD A01 FT=0 ELEC 44-47
- // --> Cell#12 ==> MOD A01 FT=0 ELEC 48-51
- // --> Cell#13 ==> MOD A01 FT=0 ELEC 52-55
- // --> Cell#14 ==> MOD A01 FT=0 ELEC 56-59
- // --> Cell#15 ==> MOD A01 FT=0 ELEC 60-63
- // ==========================================
- int phi_module = int((l_phi+8)/16);
- // shift of 8 cells because Module #0 is rotated by half-module
- int phi_local = l_phi+8 - 16*phi_module;
- ElecMin = phi_local * 4;
- ElecMax = ElecMin + 4 - 1;
- ATH_MSG_DEBUG("[getCellElectrodeMinMax] EMB"
- << " Side A " << l_bec
- << " Sampling= " << l_sampling
- << " Region= " << l_region
- << " Phi/Module= " << phi_local
- << " Module= A" << phi_module
- << " Electrode=[" << ElecMin << "." << ElecMax << "]"
- );
- }
- }
-
- else if( l_bec == -1){
- //=====================
- //=====================
- // EMBARREL SIDE C
- //=====================
- //=====================
- // Phi in module is reversed going from left to right
- // in the MODULE frame
- if( l_sampling == 0 || ( l_sampling == 1 && l_region == 0) ){
- // ========================================
- // SAMPLING 0
- // - 64 cells-in-phi per DETECTOR
- // - 4 cells-in-phi per MODULE
- // - 64 electrodes-in-phi per MODULE
- // --> 4 cells of 16 electrodes per CELL
- // ========================================
- // --> Cell #0 ==> MOD C01 FT=-1 ELEC 0-15
- // --> Cell #1 ==> MOD C01 FT=-1 ELEC 16-31
- // --> Cell #2 ==> MOD C01 FT=0 ELEC 32-47
- // --> Cell #3 ==> MOD C01 FT=0 ELEC 48-64
- // ========================================
- int phi_module = int((l_phi+2)/4);
- int phi_local = (l_phi+2 - 4*phi_module) ;
- ElecMin = 48-phi_local*16;
- ElecMax = ElecMin + 16 - 1;
- ATH_MSG_DEBUG("[getCellElectrodeMinMax] EMB"
- << " Side C " << l_bec
- << " Sampling= " << l_sampling
- << " Region= " << l_region
- << " Module= C" << phi_module
- << " Phi/Module= " << phi_local
- << " Electrode=[" << ElecMin << "." << ElecMax << "]"
- );
- if( l_sampling == 0 ){
- ElecMin = 0;
- ElecMax = 0;
- }
- }
- else if( (l_sampling == 1 && l_region == 1) || l_sampling == 2 || l_sampling == 3 ){
- //===========================================
- // - 256 cells-in-phi per SIDE
- // - 16 cells-in-phi per MODULE
- // - 64 electrodes-in-phi per MODULE
- // --> 16 cells of 4 electrodes per CELL
- // Cell[electrodes]: 0[0,3],1[4,7],2[8,11],3[12,15]..etc...
- //===========================================
- // --> Cell #0 ==> MOD C01 FT=-1 ELEC 00-03
- // --> Cell #1 ==> MOD C01 FT=-1 ELEC 04-07
- // --> Cell #2 ==> MOD C01 FT=-1 ELEC 08-11
- // --> Cell #3 ==> MOD C01 FT=-1 ELEC 12-15
- // --> Cell #4 ==> MOD C01 FT=-1 ELEC 16-19
- // --> Cell #5 ==> MOD C01 FT=-1 ELEC 20-23
- // --> Cell #6 ==> MOD C01 FT=-1 ELEC 24-27
- // --> Cell #7 ==> MOD C01 FT=-1 ELEC 28-31
- // --> Cell #8 ==> MOD C01 FT=0 ELEC 32-35
- // --> Cell #9 ==> MOD C01 FT=0 ELEC 36-39
- // --> Cell#10 ==> MOD C01 FT=0 ELEC 40-43
- // --> Cell#11 ==> MOD C01 FT=0 ELEC 44-47
- // --> Cell#12 ==> MOD C01 FT=0 ELEC 48-51
- // --> Cell#13 ==> MOD C01 FT=0 ELEC 52-55
- // --> Cell#14 ==> MOD C01 FT=0 ELEC 56-59
- // --> Cell#15 ==> MOD C01 FT=0 ELEC 60-63
- //===========================================
- int phi_module = int((l_phi+8)/16);
- int phi_local = (l_phi+8 - 16*phi_module);
- // Just to get the right MOD id (electrode plane is idem to A-side)
- // Do not use to compute local Phi
- if( phi_module <= 8){
- phi_module = 8 - phi_module;
- }
- else{
- phi_module = 24 - phi_module;
- }
- ElecMin = 60-phi_local * 4;
- ElecMax = ElecMin + 4 - 1;
- ATH_MSG_DEBUG("[getCellElectrodeMinMax] EMB"
- << " Side C " << l_bec
- << " Sampling= " << l_sampling
- << " Region= " << l_region
- << " Module= C" << phi_module
- << " Phi/Module= " << phi_local
- << " Electrode=[" << ElecMin << "." << ElecMax << "]"
- );
- }
- }
- }
- // ======================================
- // ======================================
- // EM ENDCAP (A+C SIDES)
- // ======================================
- // ======================================
- else if(abs(l_bec) == 2 || abs(l_bec) == 3){
- // EMEC
- if( l_bec == 2 ){// bec==2
- //======================
- // A-SIDE / OUTER WHEEL
- //======================
- if( l_sampling == 0 ||
- (l_sampling == 1 && l_region >= 0 && l_region <= 5) ){
- //=============================
- // 64 cells per SIDE
- // 8 Modules per SIDE
- // -> 8 cells / module
- // 768 electrodes for 64 cells
- // -> 96 electrodes per module
- // -> 12 electrodes per cell
- //=============================
- // --> Cell #0 ==> ELEC 00-11
- // --> Cell #1 ==> ELEC 12-23
- // --> Cell #2 ==> ELEC 24-35
- // --> Cell #3 ==> ELEC 36-47
- // --> Cell #4 ==> ELEC 48-59
- // --> Cell #5 ==> ELEC 60-71
- // --> Cell #6 ==> ELEC 72-83
- // --> Cell #7 ==> ELEC 84-95
- //=============================
- int phi_module = int(l_phi/8);
- int phi_local = l_phi - 8*phi_module;
- ElecMin = phi_local * 12;
- ElecMax = ElecMin + 12 - 1;
- ATH_MSG_DEBUG("[getCellElectrodeMinMax] EMEC"
- << " Side A " << l_bec
- << " Sampling= " << l_sampling
- << " Region= " << l_region
- << " Module= A" << phi_module
- << " FT= " << phi_local
- << " Electrode=[" << ElecMin << "." << ElecMax << "]"
- );
-
- }
- else if( l_sampling == 2 || l_sampling == 3){
- //=============================
- // 256 cells per SIDE
- // 8 Modules per SIDE
- // --> 32 cells per module
- // 768 electrodes for 256 cells
- // --> 96 electrodes per module
- // --> 3 electrodes per cell
- //=============================
- // --> Cell #0 ==> ELEC 00-02
- // --> Cell #1 ==> ELEC 03-05
- // --> Cell #2 ==> ELEC 06-08
- // ...
- // --> Cell #31 => ELEC 92-95
- //=============================
- int phi_module = int(l_phi/32);
- int phi_local = l_phi - 32*phi_module;
- ElecMin = phi_local*3;
- ElecMax = ElecMin+3-1;
- ATH_MSG_DEBUG("[getCellElectrodeMinMax] EMEC"
- << " Side A " << l_bec
- << " Sampling= " << l_sampling
- << " Region= " << l_region
- << " Module= A" << phi_module
- << " Phi/Module= " << phi_local
- << " Electrode=[" << ElecMin << "." << ElecMax << "]"
- );
-
- }
- }
- else if( l_bec == 3 ){
- // =================
- // INNER WHEEL
- // =================
- if( l_sampling == 1 || l_sampling == 2 || l_sampling == 0 ){
- //====================================
- // 64 cells per SIDE
- // 8 module per SIDE
- // -> 8 cells per Module
- // 256 electrodes for 8 modules
- // --> 32 electrodes per module
- // --> 4 electrodes per cell
- //====================================
- // --> Cell #0 ==> ELEC 00-03
- // --> Cell #1 ==> ELEC 04-07
- // --> Cell #2 ==> ELEC 08-11
- // ...
- // --> Cell #7 ==> ELEC 28-31
- //====================================
- int phi_module = int(l_phi/8);
- int phi_local = l_phi - 8*phi_module;
- ElecMin = phi_local *4;
- ElecMax = ElecMin + 4 - 1;
- ATH_MSG_DEBUG("[getCellElectrodeMinMax] EMEC"
- << " Side A " << l_bec
- << " Sampling= " << l_sampling
- << " Region= " << l_region
- << " Module= A" << phi_module
- << " Phi/Module= " << phi_local
- << " Electrode=[" << ElecMin << "." << ElecMax << "]"
- );
-
- }
- }
- else if( l_bec == -2 ){
- //========================
- // C-SIDE OUTER WHEEL
- //========================
- if( l_sampling == 0 || (l_sampling == 1 && l_region >= 0 && l_region <= 5) ){
- //=============================
- // 64 cells per SIDE
- // 8 Modules per SIDE
- // -> 8 cells / module
- // 768 electrodes for 64 cells
- // -> 96 electrodes per module
- // -> 12 electrodes per cell
- //=============================
- // --> Cell #0 ==> ELEC 00-11
- // --> Cell #1 ==> ELEC 12-23
- // --> Cell #2 ==> ELEC 24-35
- // --> Cell #3 ==> ELEC 36-47
- // --> Cell #4 ==> ELEC 48-59
- // --> Cell #5 ==> ELEC 60-71
- // --> Cell #6 ==> ELEC 72-83
- // --> Cell #7 ==> ELEC 84-95
- //=============================
- int phi_module = int(l_phi/8);
- int phi_local = 7 - (l_phi - 8*phi_module);
- ElecMin = phi_local * 12;
- ElecMax = ElecMin + 12 - 1;
- ATH_MSG_DEBUG("[getCellElectrodeMinMax] EMEC"
- << " Side C " << l_bec
- << " Sampling= " << l_sampling
- << " Region= " << l_region
- << " Module= C" << phi_module
- << " Phi/Module= " << phi_local
- << " Electrode=[" << ElecMin << "." << ElecMax << "]"
- );
-
- }
- else if( l_sampling == 2 || l_sampling == 3){
- //=============================
- // 256 cells per SIDE
- // 8 Modules per SIDE
- // --> 32 cells per module
- // 768 electrodes for 256 cells
- // --> 96 electrodes per module
- // --> 3 electrodes per cell
- //=============================
- // --> Cell #0 ==> ELEC 00-02
- // --> Cell #1 ==> ELEC 03-05
- // --> Cell #2 ==> ELEC 06-08
- // ...
- // --> Cell #31 => ELEC 92-95
- //=============================
- int phi_module = int(l_phi/32);
- int phi_local = 31 - (l_phi - 32*phi_module);
- ElecMin = phi_local*3;
- ElecMax = ElecMin + 3 - 1;
- ATH_MSG_DEBUG("[getCellElectrodeMinMax] EMEC"
- << " Side C " << l_bec
- << " Sampling= " << l_sampling
- << " Region= " << l_region
- << " Module= C" << phi_module
- << " Phi/Module= " << phi_local
- << " Electrode=[" << ElecMin << "." << ElecMax << "]"
- );
- }
- }
- else if( l_bec == -3 ){
- // INNER WHEEL C
- if( l_sampling == 1 || l_sampling == 2 || l_sampling == 0 ){
- // 256 electrodes for 64 cells
- // --> 8 cells per module
- // --> 32 electrodes per module
- // --> 4 electrodes per cell
- int phi_module = int(l_phi/8);
- int phi_local = l_phi - 8*phi_module;
- ElecMin = 28 - phi_local *4;
- ElecMax = ElecMin + 4 -1;
- ATH_MSG_DEBUG("[getCellElectrodeMinMax] EMEC"
- << " Side C " << l_bec
- << " Sampling= " << l_sampling
- << " Region= " << l_region
- << " Module= C" << phi_module
- << " Phi/Module= " << phi_local
- << " Electrode=[" << ElecMin << "." << ElecMax << "]"
- );
- }
- }
- }
- else if( abs(l_bec)==20 ){// HEC
- //==========================
- // HEC wheels
- //==========================
- // Sampling 0 & 1 : 1st wheel
- // Sampling 2 & 3 : 2nd wheel
- // l_region 0 : Outer
- // region 1 : Inner
- //==========================
- if( l_sampling == 0){
- // ======================
- // Sampling 0 , region 0
- // * 1st wheel *
- // 64 cells per SIDE
- // 32 module per SIDE
- // -> 2 cells in phi per Module
- // 8 electrode's planes
- // -> 8 electrode's planes per cell !
- // ================================
- // Made using Fig. 8-1 in TDR 96-41
- // ================================
- //ElecMin = l_eta+1;
- //ElecMax = ElecMin + 4;
- ElecMin = 1;
- ElecMax = 8;
- // Note : idem for region 0 and region 1
- }
- else if( l_sampling == 1){
- // ====================
- // sampling 1 l_region 0
- // * 1st wheel *
- // 64 cells in phi per SIDE
- // 10 cells in eta per SIDE
- // 32 modules per SIDE
- // -> 2x10 cells per module
- // 16 electrode's planes per module
- // ================================
- // Made using Fig. 8-1 in TDR 96-41
- // ================================
- ElecMin = 9;
- ElecMax =24;
- // Note : idem for region 0 and region 1
- }
- else if( l_sampling == 2){
- // ====================
- // sampling 2 region 0
- // * 2nd wheel *
- // 64 cells in phi per SIDE
- // 10 cells in eta per SIDE
- // 32 modules in phi per SIDE
- // 16 electrode's plane
- // ================================
- // Made using Fig. 8-1 in TDR 96-41
- // ================================
- // Note : idem for region 0 and region 1
- ElecMin = 25;
- ElecMax = 32;
- }
- else if( l_sampling == 3){
- // ==============================
- // index starting at 2 thus the 32-2=20
- // 2 cells in phi per module
- // 8 electrode per module
- // ie: 4 electrodes per cell
- // ==============================
- // Note : idem for region 0 and region 1
- ElecMin = 33;
- ElecMax = 40;
- }
- } // HEC
- else if( abs(l_bec)==40 ){// FCAL
- ElecMin = 0;
- ElecMax = 0;
- }
- else{
- msg(MSG::WARNING)
- << "[getCellElectrodeMinMax] Detector unknown .."
- << endmsg;
- }
- ATH_MSG_DEBUG("[getCellElectrodeMinMax] Exiting..." );
- std::pair<int, int> electrodeMinMax( ElecMin, ElecMax);
- return electrodeMinMax;
-}
-
-
-
-StatusCode LArHVCablingTool::iovCallback(IOVSVC_CALLBACK_ARGS) {
- m_initHVMap=false;
- return StatusCode::SUCCESS;
-}
diff --git a/LArCalorimeter/LArCabling/src/LArHVIdMappingReader.cxx b/LArCalorimeter/LArCabling/src/LArHVIdMappingReader.cxx
new file mode 100644
index 000000000000..8c5498b31b4b
--- /dev/null
+++ b/LArCalorimeter/LArCabling/src/LArHVIdMappingReader.cxx
@@ -0,0 +1,205 @@
+/*
+ * Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration.
+ */
+/**
+ * @file LArCabling/src/LArHVIdMappingReader.cxx
+ * @author scott snyder <snyder@bnl.gov>, from code originally in LArHVCablingTool.
+ * @date Jun, 2021
+ * @brief Helper to read HV ID mapping data from a file or conditions.
+ */
+
+
+#include "LArCabling/LArHVIdMappingReader.h"
+#include "LArIdentifier/LArElectrodeID.h"
+#include "LArIdentifier/LArHVLineID.h"
+#include "PathResolver/PathResolver.h"
+#include "AthenaPoolUtilities/AthenaAttributeList.h"
+#include "AthenaKernel/getMessageSvc.h"
+#include <sstream>
+#include <fstream>
+
+
+LArHVIdMappingReader::LArHVIdMappingReader()
+ : AthMessaging (Athena::getMessageSvc(), "LArHVIdMappingReader")
+{
+}
+
+
+StatusCode LArHVIdMappingReader::read (const AthenaAttributeList* attrList,
+ const LArHVLineID& hvlineHelper,
+ const LArElectrodeID& electrodeHelper,
+ hvlineMap_t& hvlineMap,
+ electrodeMap_t& electrodeMap) const
+{
+ hvlineMap.clear();
+ electrodeMap.clear();
+
+ std::string content;
+ if (attrList) {
+ content = fromAttrList (*attrList);
+ }
+ else {
+ content = fromFile();
+ }
+
+ if (content.empty()) {
+ return StatusCode::FAILURE;
+ }
+
+ return fillHV (content,
+ hvlineHelper,
+ electrodeHelper,
+ hvlineMap,
+ electrodeMap);
+}
+
+
+std::string
+LArHVIdMappingReader::fromAttrList (const AthenaAttributeList& attrList) const
+{
+ std::ostringstream attrStr1;
+ coral::AttributeList::const_iterator itr = attrList.begin();
+ itr->toOutputStream(attrStr1);
+ std::string::size_type pos = attrStr1.str().find(":");
+ if (pos == std::string::npos)
+ pos = 0;
+ else
+ pos++;
+ std::string Line = attrStr1.str().substr(pos);
+ ATH_MSG_DEBUG(" Line " << Line );
+ return Line;
+}
+
+
+std::string LArHVIdMappingReader::fromFile() const
+{
+ ATH_MSG_WARNING( " Cannot find /LAR/IdentifierOfl/HVLineToElectrodeMap from database, Use ASCII file indeed !!!");
+ std::string tablename = PathResolver::find_file ("HVLineToElectrode.data", "DATAPATH");
+ if (tablename == "") {
+ ATH_MSG_FATAL( "[fillHVMap] Could not locate HVLineToElectrode.data file as well");
+ return "";
+ }
+ else{
+ ATH_MSG_DEBUG("[fillHVMap] have located HVLineToElectrode.data OK !");
+ }
+ const char * tablefile = tablename.c_str() ;
+ std::ifstream myfile(tablefile);
+ // get pointer to associated buffer object
+ std::filebuf* pbuf = myfile.rdbuf();
+ int size = pbuf->pubseekoff (0,std::ios::end,std::ios::in);
+ pbuf->pubseekpos (0,std::ios::in);
+ // allocate memory to contain file data
+ std::string buffer;
+ buffer.resize (size, ' ');
+ // get file data
+ pbuf->sgetn (buffer.data(),size);
+ myfile.close();
+ return buffer;
+}
+
+
+StatusCode
+LArHVIdMappingReader::fillHV (const std::string& content,
+ const LArHVLineID& hvlineHelper,
+ const LArElectrodeID& electrodeHelper,
+ hvlineMap_t& hvlineMap,
+ electrodeMap_t& electrodeMap) const
+{
+ ATH_MSG_DEBUG("[fillHVMap] entering fillHVMap()..." );
+
+ hvlineMap.clear();
+ electrodeMap.clear();
+
+ std::istringstream infile;
+ infile.str (content);
+
+ int dummy;
+ int hvcannode;
+ int hvline;
+ int hvpartition;
+ int hvcanline;
+ int detect;
+ int side;
+ int mod;
+ int hvphi;
+ int hveta;
+ int hvgap;
+ int min;
+ int max;
+ ATH_MSG_DEBUG("start reading infile " );
+ while (infile
+ >> dummy
+ >> hvcannode
+ >> hvline
+ >> hvpartition
+ >> hvcanline
+ >> detect
+ >> side
+ >> mod
+ >> hvphi
+ >> hveta
+ >> hvgap
+ >> min
+ >> max )
+ {// Fill Maps
+ if (max > 1000) // Crude check against reading nonsense.
+ std::abort();
+ ATH_MSG_DEBUG("[fillHVMap] listing HVLineToElectrode :("
+ << dummy << ") hvline=["
+ << hvpartition << "."
+ << hvcanline << "."
+ << hvcannode << "."
+ << hvline << "] electrode=["
+ << detect << "."
+ << side << "."
+ << mod << "."
+ << hvphi << "."
+ << hveta << "."
+ << hvgap << " min="
+ << min << " max="
+ << max << "]"
+ );
+
+ std::vector<HWIdentifier> electrodeIdvec;
+ HWIdentifier hvlineId = hvlineHelper.HVLineId(hvpartition,hvcanline,hvcannode,hvline);
+
+ if( max > min ){
+ if (min < 0) min = 0;
+ if (max < 0) max = 0;
+ if (min > 1000) min = 1000; // Shouldn't happen.
+ for( int ielec=min; ielec<max+1; ielec++){
+ ATH_MSG_VERBOSE("[fillHVMap] defining electrodeId: [det="
+ << detect << " side="
+ << side << " mod="
+ << mod << " phi="
+ << hvphi << " eta="
+ << hveta << " gap="
+ << hvgap << " ielec="
+ << ielec << "]" );
+ HWIdentifier electrodeId =
+ electrodeHelper.ElectrodeId(detect,side,mod,hvphi,hveta,hvgap,ielec);
+ electrodeIdvec.push_back(electrodeId);
+
+ // Check if electrode is already in map ?
+ hvlineMap.emplace (electrodeId, hvlineId);
+ }
+ }
+ else{
+ HWIdentifier electrodeId = electrodeHelper.ElectrodeId(detect,side,mod,hvphi,hveta,hvgap,min);
+ electrodeIdvec.push_back(electrodeId);
+
+ // Check if electrode is already in map ?
+ hvlineMap.emplace (electrodeId, hvlineId);
+ }
+
+ std::vector<HWIdentifier>& l = electrodeMap[hvlineId];
+ l.insert (l.end(), electrodeIdvec.begin(), electrodeIdvec.end());
+ }
+
+ ATH_MSG_DEBUG(" end reading infile " );
+ ATH_MSG_DEBUG("[fillHV] Mapping electrode-to-hvline : number of Ids= "<<hvlineMap.size());
+ ATH_MSG_DEBUG("[fillHV] Mapping hvline-to-electrode : number of Ids= "<<electrodeMap.size());
+ ATH_MSG_DEBUG("[fillHV] exiting fillHVMap ... OK" );
+ return StatusCode::SUCCESS;
+}
+
diff --git a/LArCalorimeter/LArCabling/src/components/LArCabling_entries.cxx b/LArCalorimeter/LArCabling/src/components/LArCabling_entries.cxx
index 8744c031e3ff..76a012467a11 100644
--- a/LArCalorimeter/LArCabling/src/components/LArCabling_entries.cxx
+++ b/LArCalorimeter/LArCabling/src/components/LArCabling_entries.cxx
@@ -1,6 +1,6 @@
#include "LArCabling/LArCablingLegacyService.h"
-#include "LArCabling/LArHVCablingTool.h"
+#include "LArCabling/LArHVCablingSimTool.h"
DECLARE_COMPONENT( LArCablingLegacyService )
-DECLARE_COMPONENT( LArHVCablingTool )
+DECLARE_COMPONENT( LArHVCablingSimTool )
diff --git a/LArCalorimeter/LArGeoModel/LArHV/LArHV/EMBHVManager.h b/LArCalorimeter/LArGeoModel/LArHV/LArHV/EMBHVManager.h
index 29ae93eb5741..f0a3d3935d69 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/LArHV/EMBHVManager.h
+++ b/LArCalorimeter/LArGeoModel/LArHV/LArHV/EMBHVManager.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARHV_EMBHVMANAGER_H
@@ -8,7 +8,6 @@
#include "LArHV/EMBHVModule.h"
#include "LArHV/EMBHVDescriptor.h"
#include "Identifier/HWIdentifier.h"
-#include "CxxUtils/checker_macros.h"
#include <memory>
#include <functional>
@@ -80,7 +79,7 @@ class EMBHVManager
unsigned int endSideIndex() const;
// Get the database payload
- EMBHVData getData ATLAS_NOT_THREAD_SAFE () const;
+ EMBHVData getData() const;
#if !(defined(SIMULATIONBASE) || defined(GENERATIONBASE))
EMBHVData getData (const LArHVIdMapping& hvIdMapping,
diff --git a/LArCalorimeter/LArGeoModel/LArHV/LArHV/EMBPresamplerHVManager.h b/LArCalorimeter/LArGeoModel/LArHV/LArHV/EMBPresamplerHVManager.h
index 607cd64aaffc..23460f152c5a 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/LArHV/EMBPresamplerHVManager.h
+++ b/LArCalorimeter/LArGeoModel/LArHV/LArHV/EMBPresamplerHVManager.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARHV_EMBPRESAMPLERHVMANAGER_H
@@ -7,7 +7,6 @@
#include "LArHV/EMBPresamplerHVModule.h"
#include "Identifier/HWIdentifier.h"
-#include "CxxUtils/checker_macros.h"
#include <memory>
#include <functional>
@@ -75,9 +74,6 @@ class EMBPresamplerHVManager
unsigned int beginSideIndex() const;
unsigned int endSideIndex() const;
- // Get the database payload
- EMBPresamplerHVData getData ATLAS_NOT_THREAD_SAFE () const;
-
#if !(defined(SIMULATIONBASE) || defined(GENERATIONBASE))
EMBPresamplerHVData getData (const LArHVIdMapping& hvIdMapping,
const std::vector<const CondAttrListCollection*>& attrLists) const;
diff --git a/LArCalorimeter/LArGeoModel/LArHV/LArHV/EMECHVManager.h b/LArCalorimeter/LArGeoModel/LArHV/LArHV/EMECHVManager.h
index 3162c653ab97..96c8c1e19473 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/LArHV/EMECHVManager.h
+++ b/LArCalorimeter/LArGeoModel/LArHV/LArHV/EMECHVManager.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARHV_EMECHVMANAGER_H
@@ -8,7 +8,6 @@
#include "LArHV/EMECHVModule.h"
#include "LArHV/EMECHVDescriptor.h"
#include "Identifier/HWIdentifier.h"
-#include "CxxUtils/checker_macros.h"
#include <memory>
#include <functional>
@@ -83,7 +82,7 @@ class EMECHVManager
EMECHVManager::IOType getWheelIndex() const;
// Get the database payload
- EMECHVData getData ATLAS_NOT_THREAD_SAFE () const;
+ EMECHVData getData() const;
#if !(defined(SIMULATIONBASE) || defined(GENERATIONBASE))
EMECHVData getData (const LArHVIdMapping& hvIdMapping,
diff --git a/LArCalorimeter/LArGeoModel/LArHV/LArHV/EMECPresamplerHVManager.h b/LArCalorimeter/LArGeoModel/LArHV/LArHV/EMECPresamplerHVManager.h
index 51e6797f684b..a2361832fe15 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/LArHV/EMECPresamplerHVManager.h
+++ b/LArCalorimeter/LArGeoModel/LArHV/LArHV/EMECPresamplerHVManager.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARHV_EMECPRESAMPLERHVMANAGER_H
@@ -7,7 +7,6 @@
#include "LArHV/EMECPresamplerHVModule.h"
#include "Identifier/HWIdentifier.h"
-#include "CxxUtils/checker_macros.h"
#include <memory>
#include <functional>
@@ -69,9 +68,6 @@ class EMECPresamplerHVManager
// Get a link to the HV module:
const EMECPresamplerHVModule& getHVModule(unsigned int iSide, unsigned int iPhi) const;
- // Get the database payload
- EMECPresamplerHVData getData ATLAS_NOT_THREAD_SAFE () const;
-
#if !(defined(SIMULATIONBASE) || defined(GENERATIONBASE))
EMECPresamplerHVData getData (const LArHVIdMapping& hvIdMapping,
const std::vector<const CondAttrListCollection*>& attrLists) const;
diff --git a/LArCalorimeter/LArGeoModel/LArHV/LArHV/FCALHVManager.h b/LArCalorimeter/LArGeoModel/LArHV/LArHV/FCALHVManager.h
index af8509e693c0..a95b05455e79 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/LArHV/FCALHVManager.h
+++ b/LArCalorimeter/LArGeoModel/LArHV/LArHV/FCALHVManager.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARHV_FCALHVMANAGER_H
@@ -7,7 +7,6 @@
#include "LArHV/FCALHVModule.h"
#include "Identifier/HWIdentifier.h"
-#include "CxxUtils/checker_macros.h"
#include <memory>
#include <functional>
@@ -71,7 +70,7 @@ class FCALHVManager
, unsigned int iSampling) const;
// Get the database payload
- FCALHVData getData ATLAS_NOT_THREAD_SAFE () const;
+ FCALHVData getData() const;
#if !(defined(SIMULATIONBASE) || defined(GENERATIONBASE))
FCALHVData getData (const LArHVIdMapping& hvIdMapping,
diff --git a/LArCalorimeter/LArGeoModel/LArHV/LArHV/HECHVManager.h b/LArCalorimeter/LArGeoModel/LArHV/LArHV/HECHVManager.h
index 4640810f2b68..dc59a0355d13 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/LArHV/HECHVManager.h
+++ b/LArCalorimeter/LArGeoModel/LArHV/LArHV/HECHVManager.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARHV_HECHVMANAGER_H
@@ -8,7 +8,6 @@
#include "LArHV/HECHVDescriptor.h"
#include "LArHV/HECHVModule.h"
#include "Identifier/HWIdentifier.h"
-#include "CxxUtils/checker_macros.h"
#include <memory>
#include <functional>
@@ -74,7 +73,7 @@ class HECHVManager
, unsigned int iSampling) const;
// Get the database payload
- HECHVData getData ATLAS_NOT_THREAD_SAFE () const;
+ HECHVData getData() const;
#if !(defined(SIMULATIONBASE) || defined(GENERATIONBASE))
HECHVData getData (const LArHVIdMapping& hvIdMapping,
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/EMBHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/EMBHVManager.cxx
index fb2ee6ebfbaa..102881727f87 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/EMBHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/EMBHVManager.cxx
@@ -21,7 +21,7 @@
#include "LArIdentifier/LArElectrodeID.h"
#include "LArIdentifier/LArHVLineID.h"
-#include "LArCabling/LArHVCablingTool.h"
+#include "LArCabling/LArHVCablingSimTool.h"
#ifndef SIMULATIONBASE
#ifndef GENERATIONBASE
@@ -37,20 +37,20 @@
namespace {
-struct ATLAS_NOT_THREAD_SAFE LegacyIdFunc
+struct LegacyIdFunc
{
LegacyIdFunc();
std::vector<HWIdentifier> operator()(HWIdentifier id)
{
return m_cablingTool->getLArElectrodeIDvec (id);
}
- LArHVCablingTool* m_cablingTool;
+ LArHVCablingSimTool* m_cablingTool;
};
LegacyIdFunc::LegacyIdFunc()
{
- ToolHandle<LArHVCablingTool> tool ("LArHVCablingTool");
+ ToolHandle<LArHVCablingSimTool> tool ("LArHVCablingSimTool");
if (!tool.retrieve().isSuccess()) {
std::abort();
}
@@ -327,15 +327,16 @@ EMBHVManager::getData (idfunc_t idfunc,
EMBHVManager::EMBHVData
-EMBHVManager::getData ATLAS_NOT_THREAD_SAFE () const
+EMBHVManager::getData() const
{
std::vector<const CondAttrListCollection*> attrLists;
ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "EMBHVManager");
const CondAttrListCollection* atrlistcol = nullptr;
+ // Not a typo --- this folder has a lower-case l in the database...
if (detStore->retrieve(atrlistcol, "/LAR/DCS/HV/BARREl/I16").isSuccess()) {
attrLists.push_back (atrlistcol);
}
- if (detStore->retrieve(atrlistcol, "/LAR/DCS/HV/BARREl/I8").isSuccess()) {
+ if (detStore->retrieve(atrlistcol, "/LAR/DCS/HV/BARREL/I8").isSuccess()) {
attrLists.push_back (atrlistcol);
}
return getData (LegacyIdFunc(), attrLists);
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/EMBPresamplerHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/EMBPresamplerHVManager.cxx
index f5bee934c896..0f5217d80b2c 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/EMBPresamplerHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/EMBPresamplerHVManager.cxx
@@ -22,7 +22,6 @@
#include "LArIdentifier/LArElectrodeID.h"
#include "LArIdentifier/LArHVLineID.h"
-#include "LArCabling/LArHVCablingTool.h"
#ifndef SIMULATIONBASE
#ifndef GENERATIONBASE
@@ -35,33 +34,6 @@
#include <atomic>
-namespace {
-
-
-struct ATLAS_NOT_THREAD_SAFE LegacyIdFunc
-{
- LegacyIdFunc();
- std::vector<HWIdentifier> operator()(HWIdentifier id)
- {
- return m_cablingTool->getLArElectrodeIDvec (id);
- }
- LArHVCablingTool* m_cablingTool;
-};
-
-
-LegacyIdFunc::LegacyIdFunc()
-{
- ToolHandle<LArHVCablingTool> tool ("LArHVCablingTool");
- if (!tool.retrieve().isSuccess()) {
- std::abort();
- }
- m_cablingTool = tool.get();
-}
-
-
-} // Anonymous namespace
-
-
class EMBPresamplerHVManager::Clockwork {
public:
Clockwork(const EMBPresamplerHVManager* manager) {
@@ -304,22 +276,6 @@ EMBPresamplerHVManager::getData (idfunc_t idfunc,
return EMBPresamplerHVManager::EMBPresamplerHVData (std::move (payload));
}
-EMBPresamplerHVManager::EMBPresamplerHVData
-EMBPresamplerHVManager::getData ATLAS_NOT_THREAD_SAFE () const
-{
- std::vector<const CondAttrListCollection*> attrLists;
- ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "EMBHVManager");
- const CondAttrListCollection* atrlistcol = nullptr;
- if (detStore->retrieve(atrlistcol, "/LAR/DCS/HV/BARREl/I16").isSuccess()) {
- attrLists.push_back (atrlistcol);
- }
- if (detStore->retrieve(atrlistcol, "/LAR/DCS/HV/BARREl/I8").isSuccess()) {
- attrLists.push_back (atrlistcol);
- }
- return getData (LegacyIdFunc(), attrLists);
-}
-
-
#ifndef SIMULATIONBASE
#ifndef GENERATIONBASE
EMBPresamplerHVManager::EMBPresamplerHVData
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/EMECHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/EMECHVManager.cxx
index 3c5a922be2d9..ae7b7b1f212b 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/EMECHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/EMECHVManager.cxx
@@ -22,7 +22,7 @@
#include "LArIdentifier/LArElectrodeID.h"
#include "LArIdentifier/LArHVLineID.h"
-#include "LArCabling/LArHVCablingTool.h"
+#include "LArCabling/LArHVCablingSimTool.h"
#ifndef SIMULATIONBASE
#ifndef GENERATIONBASE
@@ -38,20 +38,20 @@
namespace {
-struct ATLAS_NOT_THREAD_SAFE LegacyIdFunc
+struct LegacyIdFunc
{
LegacyIdFunc();
std::vector<HWIdentifier> operator()(HWIdentifier id)
{
return m_cablingTool->getLArElectrodeIDvec (id);
}
- LArHVCablingTool* m_cablingTool;
+ LArHVCablingSimTool* m_cablingTool;
};
LegacyIdFunc::LegacyIdFunc()
{
- ToolHandle<LArHVCablingTool> tool ("LArHVCablingTool");
+ ToolHandle<LArHVCablingSimTool> tool ("LArHVCablingSimTool");
if (!tool.retrieve().isSuccess()) {
std::abort();
}
@@ -371,15 +371,16 @@ EMECHVManager::getData (idfunc_t idfunc,
EMECHVManager::EMECHVData
-EMECHVManager::getData ATLAS_NOT_THREAD_SAFE () const
+EMECHVManager::getData() const
{
std::vector<const CondAttrListCollection*> attrLists;
ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "EMBHVManager");
const CondAttrListCollection* atrlistcol = nullptr;
+ // Not a typo --- this folder has a lower-case l in the database...
if (detStore->retrieve(atrlistcol, "/LAR/DCS/HV/BARREl/I16").isSuccess()) {
attrLists.push_back (atrlistcol);
}
- if (detStore->retrieve(atrlistcol, "/LAR/DCS/HV/BARREl/I8").isSuccess()) {
+ if (detStore->retrieve(atrlistcol, "/LAR/DCS/HV/BARREL/I8").isSuccess()) {
attrLists.push_back (atrlistcol);
}
return getData (LegacyIdFunc(), attrLists);
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/EMECPresamplerHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/EMECPresamplerHVManager.cxx
index 21ef2d0e14f0..471875ca2fb0 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/EMECPresamplerHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/EMECPresamplerHVManager.cxx
@@ -21,7 +21,6 @@
#include "LArIdentifier/LArElectrodeID.h"
#include "LArIdentifier/LArHVLineID.h"
-#include "LArCabling/LArHVCablingTool.h"
#if !(defined(SIMULATIONBASE) || defined(GENERATIONBASE))
#include "LArRecConditions/LArHVIdMapping.h"
@@ -33,33 +32,6 @@
#include <atomic>
-namespace {
-
-
-struct ATLAS_NOT_THREAD_SAFE LegacyIdFunc
-{
- LegacyIdFunc();
- std::vector<HWIdentifier> operator()(HWIdentifier id)
- {
- return m_cablingTool->getLArElectrodeIDvec (id);
- }
- LArHVCablingTool* m_cablingTool;
-};
-
-
-LegacyIdFunc::LegacyIdFunc()
-{
- ToolHandle<LArHVCablingTool> tool ("LArHVCablingTool");
- if (!tool.retrieve().isSuccess()) {
- std::abort();
- }
- m_cablingTool = tool.get();
-}
-
-
-} // Anonymous namespace
-
-
class EMECPresamplerHVManager::Clockwork {
public:
Clockwork(const EMECPresamplerHVManager* manager) {
@@ -269,22 +241,6 @@ EMECPresamplerHVManager::getData (idfunc_t idfunc,
}
-EMECPresamplerHVManager::EMECPresamplerHVData
-EMECPresamplerHVManager::getData ATLAS_NOT_THREAD_SAFE () const
-{
- std::vector<const CondAttrListCollection*> attrLists;
- ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "EMBHVManager");
- const CondAttrListCollection* atrlistcol = nullptr;
- if (detStore->retrieve(atrlistcol, "/LAR/DCS/HV/BARREl/I16").isSuccess()) {
- attrLists.push_back (atrlistcol);
- }
- if (detStore->retrieve(atrlistcol, "/LAR/DCS/HV/BARREl/I8").isSuccess()) {
- attrLists.push_back (atrlistcol);
- }
- return getData (LegacyIdFunc(), attrLists);
-}
-
-
#if !(defined(SIMULATIONBASE) || defined(GENERATIONBASE))
EMECPresamplerHVManager::EMECPresamplerHVData
EMECPresamplerHVManager::getData (const LArHVIdMapping& hvIdMapping,
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/FCALHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/FCALHVManager.cxx
index 7b2808169ac9..cb1365b2717a 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/FCALHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/FCALHVManager.cxx
@@ -17,7 +17,7 @@
#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "LArIdentifier/LArElectrodeID.h"
#include "LArIdentifier/LArHVLineID.h"
-#include "LArCabling/LArHVCablingTool.h"
+#include "LArCabling/LArHVCablingSimTool.h"
#include "Identifier/HWIdentifier.h"
#if !(defined(SIMULATIONBASE) || defined(GENERATIONBASE))
@@ -30,20 +30,20 @@
namespace {
-struct ATLAS_NOT_THREAD_SAFE LegacyIdFunc
+struct LegacyIdFunc
{
LegacyIdFunc();
std::vector<HWIdentifier> operator()(HWIdentifier id)
{
return m_cablingTool->getLArElectrodeIDvec (id);
}
- LArHVCablingTool* m_cablingTool;
+ LArHVCablingSimTool* m_cablingTool;
};
LegacyIdFunc::LegacyIdFunc()
{
- ToolHandle<LArHVCablingTool> tool ("LArHVCablingTool");
+ ToolHandle<LArHVCablingSimTool> tool ("LArHVCablingSimTool");
if (!tool.retrieve().isSuccess()) {
std::abort();
}
@@ -263,15 +263,16 @@ FCALHVManager::getData (idfunc_t idfunc,
}
FCALHVManager::FCALHVData
-FCALHVManager::getData ATLAS_NOT_THREAD_SAFE () const
+FCALHVManager::getData() const
{
std::vector<const CondAttrListCollection*> attrLists;
ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "EMBHVManager");
const CondAttrListCollection* atrlistcol = nullptr;
+ // Not a typo --- this folder has a lower-case l in the database...
if (detStore->retrieve(atrlistcol, "/LAR/DCS/HV/BARREl/I16").isSuccess()) {
attrLists.push_back (atrlistcol);
}
- if (detStore->retrieve(atrlistcol, "/LAR/DCS/HV/BARREl/I8").isSuccess()) {
+ if (detStore->retrieve(atrlistcol, "/LAR/DCS/HV/BARREL/I8").isSuccess()) {
attrLists.push_back (atrlistcol);
}
return getData (LegacyIdFunc(), attrLists);
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/HECHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/HECHVManager.cxx
index d00421102f7f..072908f7dc63 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/HECHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/HECHVManager.cxx
@@ -21,7 +21,7 @@
#include "LArIdentifier/LArElectrodeID.h"
#include "LArIdentifier/LArHVLineID.h"
-#include "LArCabling/LArHVCablingTool.h"
+#include "LArCabling/LArHVCablingSimTool.h"
#if !(defined(SIMULATIONBASE) || defined(GENERATIONBASE))
#include "LArRecConditions/LArHVIdMapping.h"
@@ -33,20 +33,20 @@
namespace {
-struct ATLAS_NOT_THREAD_SAFE LegacyIdFunc
+struct LegacyIdFunc
{
LegacyIdFunc();
std::vector<HWIdentifier> operator()(HWIdentifier id)
{
return m_cablingTool->getLArElectrodeIDvec (id);
}
- LArHVCablingTool* m_cablingTool;
+ LArHVCablingSimTool* m_cablingTool;
};
LegacyIdFunc::LegacyIdFunc()
{
- ToolHandle<LArHVCablingTool> tool ("LArHVCablingTool");
+ ToolHandle<LArHVCablingSimTool> tool ("LArHVCablingSimTool");
if (!tool.retrieve().isSuccess()) {
std::abort();
}
@@ -276,15 +276,16 @@ HECHVManager::getData (idfunc_t idfunc,
HECHVManager::HECHVData
-HECHVManager::getData ATLAS_NOT_THREAD_SAFE () const
+HECHVManager::getData() const
{
std::vector<const CondAttrListCollection*> attrLists;
ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "EMBHVManager");
const CondAttrListCollection* atrlistcol = nullptr;
+ // Not a typo --- this folder has a lower-case l in the database...
if (detStore->retrieve(atrlistcol, "/LAR/DCS/HV/BARREl/I16").isSuccess()) {
attrLists.push_back (atrlistcol);
}
- if (detStore->retrieve(atrlistcol, "/LAR/DCS/HV/BARREl/I8").isSuccess()) {
+ if (detStore->retrieve(atrlistcol, "/LAR/DCS/HV/BARREL/I8").isSuccess()) {
attrLists.push_back (atrlistcol);
}
return getData (LegacyIdFunc(), attrLists);
--
GitLab
From 2da975824150c9bad24e9d832966ac89ced3dcf0 Mon Sep 17 00:00:00 2001
From: abarton <Adam.Edward.Barton@cern.ch>
Date: Thu, 19 Aug 2021 17:07:26 +0100
Subject: [PATCH 175/272] Fix uninitialized warning
---
Trigger/TrigMonitoring/TrigHLTMonitoring/src/HLTMonTool.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Trigger/TrigMonitoring/TrigHLTMonitoring/src/HLTMonTool.cxx b/Trigger/TrigMonitoring/TrigHLTMonitoring/src/HLTMonTool.cxx
index 6347fad79e0f..feb66e95d5a4 100755
--- a/Trigger/TrigMonitoring/TrigHLTMonitoring/src/HLTMonTool.cxx
+++ b/Trigger/TrigMonitoring/TrigHLTMonitoring/src/HLTMonTool.cxx
@@ -204,7 +204,7 @@ StatusCode HLTMonTool::GetL1SummaryAndLBInfo(){
xAOD::LumiBlockRangeContainer::const_iterator lbit = m_lbc->begin();
int nLBs = 0;
- uint32_t start, stop;
+ uint32_t start=0, stop=0;
// uint32_t first = (((IOVRange*)(*lbit))->start()).event();
// for(;lbit!=m_lbc->end();++lbit){
--
GitLab
From 1ebba6d62966d5bc2dffa6e4135a486051918fb6 Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Thu, 19 Aug 2021 19:24:17 +0200
Subject: [PATCH 176/272] SiSpacePointsSeedMaker_ITK fix clang warning. Also do
some clangtidy related fixes in the package
---
.../SiSpacePointsSeedMaker_ATLxk.h | 10 ++---
.../SiSpacePointsSeedMaker_BeamGas.h | 22 +++++-----
.../SiSpacePointsSeedMaker_Cosmic.h | 14 +++---
.../SiSpacePointsSeedMaker_HeavyIon.h | 22 +++++-----
.../SiSpacePointsSeedMaker_ITK.h | 44 ++++++++-----------
.../SiSpacePointsSeedMaker_LowMomentum.h | 24 +++++-----
.../SiSpacePointsSeedMaker_Trigger.h | 18 ++++----
.../src/SiSpacePointsSeedMaker_ATLxk.cxx | 10 ++---
.../src/SiSpacePointsSeedMaker_BeamGas.cxx | 16 +++----
.../src/SiSpacePointsSeedMaker_Cosmic.cxx | 10 ++---
.../src/SiSpacePointsSeedMaker_HeavyIon.cxx | 18 ++++----
.../src/SiSpacePointsSeedMaker_ITK.cxx | 30 ++++++-------
.../SiSpacePointsSeedMaker_LowMomentum.cxx | 18 ++++----
.../src/SiSpacePointsSeedMaker_Trigger.cxx | 14 +++---
14 files changed, 131 insertions(+), 139 deletions(-)
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ATLxk.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ATLxk.h
index 927290395c6f..03d6ccdd0f63 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ATLxk.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ATLxk.h
@@ -317,7 +317,7 @@ namespace InDet {
//@}
MsgStream& dumpConditions(EventData& data, MsgStream& out) const;
- MsgStream& dumpEvent (EventData& data, MsgStream& out) const;
+ static MsgStream& dumpEvent (EventData& data, MsgStream& out) ;
/// prepare several data members with cached cut values,
/// conversion factors, binnings, etc
@@ -341,7 +341,7 @@ namespace InDet {
* @param[in] Rmin: starting radius for trajectory displacement
* @param[in] Rmax: end radius for trajectory displacement
**/
- float azimuthalStep(const float pTmin,const float maxd0,const float Rmin,const float Rmax) const;
+ static float azimuthalStep(const float pTmin,const float maxd0,const float Rmin,const float Rmax) ;
/** Create a SiSpacePointForSeed from the space point.
* This will also add the point to the data object's
@@ -355,7 +355,7 @@ namespace InDet {
**/
SiSpacePointForSeed* newSpacePoint(EventData& data, const Trk::SpacePoint*const& sp) const;
- void newSeed(EventData& data, SiSpacePointForSeed*& p1, SiSpacePointForSeed*& p2, float z) const;
+ static void newSeed(EventData& data, SiSpacePointForSeed*& p1, SiSpacePointForSeed*& p2, float z) ;
/** This inserts a seed into the set of saved seeds.
* It internally respects the user-configured max number of seeds per central
@@ -395,7 +395,7 @@ namespace InDet {
* @param[in,out] data: Event data which will be updated.
**/
void fillLists(EventData& data) const;
- void erase(EventData& data) const;
+ static void erase(EventData& data) ;
void production2Sp(EventData& data) const;
@@ -470,7 +470,7 @@ namespace InDet {
* @param[in] sp: Space point to take the global position from
* @param[out] r: 3-array, will be populated with the relative coordinates
**/
- void convertToBeamFrameWork(EventData& data, const Trk::SpacePoint*const& sp, std::array<float,3> & r) const;
+ static void convertToBeamFrameWork(EventData& data, const Trk::SpacePoint*const& sp, std::array<float,3> & r) ;
bool isUsed(const Trk::SpacePoint* sp, const Trk::PRDtoTrackMap &prd_to_track_map) const;
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_BeamGas.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_BeamGas.h
index 63c5d31e84b1..4c27906bb232 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_BeamGas.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_BeamGas.h
@@ -213,31 +213,31 @@ namespace InDet {
//@}
MsgStream& dumpConditions(EventData& data, MsgStream& out) const;
- MsgStream& dumpEvent(EventData& data, MsgStream& out) const;
+ static MsgStream& dumpEvent(EventData& data, MsgStream& out) ;
void buildFrameWork();
void buildBeamFrameWork(EventData& data) const;
- SiSpacePointForSeed* newSpacePoint
- (EventData& data, const Trk::SpacePoint*const&) const;
- void newSeed
+ static SiSpacePointForSeed* newSpacePoint
+ (EventData& data, const Trk::SpacePoint*const&) ;
+ static void newSeed
(EventData& data,
const Trk::SpacePoint*&,const Trk::SpacePoint*&,
- const float&) const;
- void newSeed
+ const float&) ;
+ static void newSeed
(EventData& data,
const Trk::SpacePoint*&,const Trk::SpacePoint*&,
- const Trk::SpacePoint*&,const float&) const;
+ const Trk::SpacePoint*&,const float&) ;
void newOneSeed
(EventData& data,
const Trk::SpacePoint*&,const Trk::SpacePoint*&,
const Trk::SpacePoint*&,const float&,const float&) const;
- void fillSeeds(EventData& data) const;
+ static void fillSeeds(EventData& data) ;
void fillLists(EventData& data) const;
- void erase(EventData& data) const;
- void production2Sp(EventData& data) const;
+ static void erase(EventData& data) ;
+ static void production2Sp(EventData& data) ;
void production3Sp(EventData& data) const;
void production3Sp
(EventData& data,
@@ -249,7 +249,7 @@ namespace InDet {
void findNext(EventData& data) const;
bool isZCompatible(float&) const;
- void convertToBeamFrameWork(EventData& data, const Trk::SpacePoint*const& sp, float* r) const;
+ static void convertToBeamFrameWork(EventData& data, const Trk::SpacePoint*const& sp, float* r) ;
bool isUsed(const Trk::SpacePoint* sp, const Trk::PRDtoTrackMap &prd_to_track_map) const;
void initializeEventData(EventData& data) const;
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Cosmic.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Cosmic.h
index aa826cb04f3a..a6eca260d86a 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Cosmic.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Cosmic.h
@@ -198,14 +198,14 @@ namespace InDet {
//@}
MsgStream& dumpConditions(MsgStream& out) const;
- MsgStream& dumpEvent(EventData& data, MsgStream& out) const;
+ static MsgStream& dumpEvent(EventData& data, MsgStream& out) ;
void buildFrameWork();
- SiSpacePointForSeed* newSpacePoint
- (EventData& data, const Trk::SpacePoint*const&) const;
- SiSpacePointForSeed* newSpacePoint
- (EventData& data, const Trk::SpacePoint*const&, const float*) const;
+ static SiSpacePointForSeed* newSpacePoint
+ (EventData& data, const Trk::SpacePoint*const&) ;
+ static SiSpacePointForSeed* newSpacePoint
+ (EventData& data, const Trk::SpacePoint*const&, const float*) ;
void newSeed
(EventData& data,
const Trk::SpacePoint*&,const Trk::SpacePoint*&,
@@ -215,8 +215,8 @@ namespace InDet {
const Trk::SpacePoint*&,const Trk::SpacePoint*&,
const Trk::SpacePoint*&,const float&) const;
void fillLists(EventData& data) const;
- void erase(EventData& data) const;
- void production2Sp(EventData& data) const;
+ static void erase(EventData& data) ;
+ static void production2Sp(EventData& data) ;
void production3Sp(const EventContext& ctx, EventData& data) const;
void production3Sp
(EventData& data,
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_HeavyIon.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_HeavyIon.h
index 070580ed6424..d7cff0594bc7 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_HeavyIon.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_HeavyIon.h
@@ -230,30 +230,30 @@ namespace InDet {
//@}
MsgStream& dumpConditions(EventData& data, MsgStream& out) const;
- MsgStream& dumpEvent(EventData& data, MsgStream& out) const;
+ static MsgStream& dumpEvent(EventData& data, MsgStream& out) ;
void buildFrameWork();
void buildBeamFrameWork(const EventContext& ctx, EventData& data) const;
- SiSpacePointForSeed* newSpacePoint
- (EventData& data, const Trk::SpacePoint*const&) const;
- void newSeed
+ static SiSpacePointForSeed* newSpacePoint
+ (EventData& data, const Trk::SpacePoint*const&) ;
+ static void newSeed
(EventData& data,
const Trk::SpacePoint*&,const Trk::SpacePoint*&,
- const float&) const;
- void newSeed
+ const float&) ;
+ static void newSeed
(EventData& data,
const Trk::SpacePoint*&,const Trk::SpacePoint*&,
- const Trk::SpacePoint*&,const float&) const;
+ const Trk::SpacePoint*&,const float&) ;
void newOneSeed
(EventData& data,
const Trk::SpacePoint*&,const Trk::SpacePoint*&,
const Trk::SpacePoint*&,const float&,const float&) const;
- void fillSeeds(EventData& data) const;
+ static void fillSeeds(EventData& data) ;
void fillLists(EventData& data) const;
- void erase(EventData& data) const;
+ static void erase(EventData& data) ;
void production2Sp(EventData& data) const;
void production3Sp(EventData& data) const;
void production3Sp
@@ -281,8 +281,8 @@ namespace InDet {
bool newVertices(EventData& data, const std::list<Trk::Vertex>&) const;
void findNext(EventData& data) const;
bool isZCompatible(EventData& data, float&,float&,float&) const;
- float dZVertexMin(EventData& data, float&) const;
- void convertToBeamFrameWork(EventData& data, const Trk::SpacePoint*const&,float*) const;
+ static float dZVertexMin(EventData& data, float&) ;
+ static void convertToBeamFrameWork(EventData& data, const Trk::SpacePoint*const&,float*) ;
void initializeEventData(EventData& data) const;
};
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ITK.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ITK.h
index ddd97e1ed0bf..75851a2532cb 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ITK.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ITK.h
@@ -255,15 +255,9 @@ namespace InDet {
/// @name Data members, which are updated only in initialize
//@{
- bool m_initialized{false};
int m_outputlevel{0};
- int m_fNmax{0};
int m_fvNmax{0};
- int m_rfz_b[arraySizePhiZ]{};
- int m_rfz_t[arraySizePhiZ]{};
- int m_rfz_ib[arraySizePhiZ][arraySizeNeighbourBins]{};
- int m_rfz_it[arraySizePhiZ][arraySizeNeighbourBins]{};
int m_rfzv_n[arraySizePhiZV]{};
int m_rfzv_i[arraySizePhiZV][arraySizeNeighbourBinsVertex]{};
float m_dzdrmin0{0.};
@@ -271,8 +265,6 @@ namespace InDet {
float m_ipt{0.};
float m_ipt2{0.};
float m_COF{0.};
- float m_sF{0.};
- float m_sFv{0.};
float m_dzMaxFast {200.};
float m_R2MaxFast {2500.};
float m_zmaxPPP {2700.};
@@ -339,15 +331,15 @@ namespace InDet {
/// arrays associating bins to each other for SP formation
- std::array<int,arraySizePhiZ> m_nNeighbourCellsBottomPPP; ///< number of neighbouring phi-z bins to consider when looking for "bottom SP" candidates for each phi-z bin
- std::array<int,arraySizePhiZ> m_nNeighbourCellsTopPPP; ///< number of neighbouring phi-z bins to consider when looking for "top SP" candidates for each phi-z bin
- std::array<std::array<int, arraySizeNeighbourBins>, arraySizePhiZ> m_neighbourCellsBottomPPP; ///< mapping of neighbour cells in the 2D phi-z binning to consider for the "bottom SP" search for central SPs in each phi-z bin. Number of valid entries stored in m_nNeighboursPhiZbottom
- std::array<std::array<int, arraySizeNeighbourBins>, arraySizePhiZ> m_neighbourCellsTopPPP; ///< mapping of neighbour cells in the 2D phi-z binning to consider for the "top SP" search for central SPs in each phi-z bin. Number of valid entries stored in m_nNeighboursPhiZtop
+ std::array<int,arraySizePhiZ> m_nNeighbourCellsBottomPPP{}; ///< number of neighbouring phi-z bins to consider when looking for "bottom SP" candidates for each phi-z bin
+ std::array<int,arraySizePhiZ> m_nNeighbourCellsTopPPP{}; ///< number of neighbouring phi-z bins to consider when looking for "top SP" candidates for each phi-z bin
+ std::array<std::array<int, arraySizeNeighbourBins>, arraySizePhiZ> m_neighbourCellsBottomPPP{}; ///< mapping of neighbour cells in the 2D phi-z binning to consider for the "bottom SP" search for central SPs in each phi-z bin. Number of valid entries stored in m_nNeighboursPhiZbottom
+ std::array<std::array<int, arraySizeNeighbourBins>, arraySizePhiZ> m_neighbourCellsTopPPP{}; ///< mapping of neighbour cells in the 2D phi-z binning to consider for the "top SP" search for central SPs in each phi-z bin. Number of valid entries stored in m_nNeighboursPhiZtop
- std::array<int,arraySizePhiZ> m_nNeighbourCellsBottomSSS;
- std::array<int,arraySizePhiZ> m_nNeighbourCellsTopSSS;
- std::array<std::array<int, arraySizeNeighbourBins>, arraySizePhiZ> m_neighbourCellsBottomSSS;
- std::array<std::array<int, arraySizeNeighbourBins>, arraySizePhiZ> m_neighbourCellsTopSSS;
+ std::array<int,arraySizePhiZ> m_nNeighbourCellsBottomSSS{};
+ std::array<int,arraySizePhiZ> m_nNeighbourCellsTopSSS{};
+ std::array<std::array<int, arraySizeNeighbourBins>, arraySizePhiZ> m_neighbourCellsBottomSSS{};
+ std::array<std::array<int, arraySizeNeighbourBins>, arraySizePhiZ> m_neighbourCellsTopSSS{};
///////////////////////////////////////////////////////////////////
@@ -361,11 +353,11 @@ namespace InDet {
//@}
MsgStream& dumpConditions(EventData& data, MsgStream& out) const;
- MsgStream& dumpEvent(EventData& data, MsgStream& out) const;
+ static MsgStream& dumpEvent(EventData& data, MsgStream& out) ;
void buildFrameWork();
- void buildConnectionMaps(std::array<int, arraySizePhiZ>& nNeighbourCellsBottom,
+ static void buildConnectionMaps(std::array<int, arraySizePhiZ>& nNeighbourCellsBottom,
std::array<int, arraySizePhiZ>& nNeighbourCellsTop,
std::array<std::array<int, arraySizeNeighbourBins>, arraySizePhiZ>& neighbourCellsBottom,
std::array<std::array<int, arraySizeNeighbourBins>, arraySizePhiZ>& neighbourCellsTop,
@@ -386,7 +378,7 @@ namespace InDet {
* @param[in] Rmin: starting radius for trajectory displacement
* @param[in] Rmax: end radius for trajectory displacement
**/
- float azimuthalStep(const float pTmin,const float maxd0,const float Rmin,const float Rmax) const;
+ static float azimuthalStep(const float pTmin,const float maxd0,const float Rmin,const float Rmax) ;
/** Create a SiSpacePointForSeed from the space point.
@@ -402,9 +394,9 @@ namespace InDet {
SiSpacePointForSeedITK* newSpacePoint(EventData& data, const Trk::SpacePoint*const& sp) const;
SiSpacePointForSeedITK* newSpacePoint(EventData& data, const Trk::SpacePoint*const& sp, float* r, bool usePixSctInform=false) const;
- void newSeed
+ static void newSeed
(EventData& data,
- SiSpacePointForSeedITK*&,SiSpacePointForSeedITK*&,float) const;
+ SiSpacePointForSeedITK*&,SiSpacePointForSeedITK*&,float) ;
void newOneSeed
(EventData& data,
@@ -415,12 +407,12 @@ namespace InDet {
(EventData& data,
SiSpacePointForSeedITK*&,SiSpacePointForSeedITK*&,float) const;
- void fillSeeds(EventData& data) const;
+ static void fillSeeds(EventData& data) ;
void fillLists(EventData& data) const;
void fillListsFast(const EventContext& ctx, EventData& data) const;
- void pixInform(const Trk::SpacePoint* sp, float* r) const;
- void sctInform(EventData& data,const Trk::SpacePoint* sp, float* r) const;
- void erase(EventData& data) const;
+ static void pixInform(const Trk::SpacePoint* sp, float* r) ;
+ static void sctInform(EventData& data,const Trk::SpacePoint* sp, float* r) ;
+ static void erase(EventData& data) ;
void production2Sp(EventData& data) const;
void production3Sp(EventData& data) const;
@@ -509,7 +501,7 @@ namespace InDet {
bool newVertices(EventData& data, const std::list<Trk::Vertex>&) const;
void findNext(EventData& data) const;
bool isZCompatible(EventData& data, float&,float&,float&) const;
- void convertToBeamFrameWork(EventData& data, const Trk::SpacePoint*const&,float*) const;
+ static void convertToBeamFrameWork(EventData& data, const Trk::SpacePoint*const&,float*) ;
bool isUsed(const Trk::SpacePoint*, const Trk::PRDtoTrackMap &prd_to_track_map) const;
void initializeEventData(EventData& data) const;
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_LowMomentum.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_LowMomentum.h
index 33872c6eefbe..dbc6ed5f69c6 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_LowMomentum.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_LowMomentum.h
@@ -208,31 +208,31 @@ namespace InDet {
//@}
MsgStream& dumpConditions(EventData& data, MsgStream& out) const;
- MsgStream& dumpEvent(EventData& data, MsgStream& out) const;
+ static MsgStream& dumpEvent(EventData& data, MsgStream& out) ;
void buildFrameWork();
void buildBeamFrameWork(EventData& data) const;
- SiSpacePointForSeed* newSpacePoint
- (EventData& data, const Trk::SpacePoint*const&) const;
- void newSeed
+ static SiSpacePointForSeed* newSpacePoint
+ (EventData& data, const Trk::SpacePoint*const&) ;
+ static void newSeed
(EventData& data,
const Trk::SpacePoint*&,const Trk::SpacePoint*&,
- const float&) const;
- void newSeed
+ const float&) ;
+ static void newSeed
(EventData& data,
const Trk::SpacePoint*&,const Trk::SpacePoint*&,
- const Trk::SpacePoint*&,const float&) const;
+ const Trk::SpacePoint*&,const float&) ;
void newOneSeed
(EventData& data,
const Trk::SpacePoint*&,const Trk::SpacePoint*&,
const Trk::SpacePoint*&,const float&,const float&) const;
- void fillSeeds(EventData& data) const;
+ static void fillSeeds(EventData& data) ;
void fillLists(EventData& data) const;
- void erase(EventData& data) const;
- void production2Sp(EventData& data) const;
+ static void erase(EventData& data) ;
+ static void production2Sp(EventData& data) ;
void production3Sp(const EventContext& ctx, EventData& data) const;
void production3Sp
(EventData& data,
@@ -242,10 +242,10 @@ namespace InDet {
std::vector<InDet::SiSpacePointForSeed*>::iterator*,
int,int,int&,float) const;
- bool newVertices(EventData& data, const std::list<Trk::Vertex>&) const;
+ static bool newVertices(EventData& data, const std::list<Trk::Vertex>&) ;
void findNext(const EventContext& ctx, EventData& data) const;
bool isZCompatible(EventData& data, float&,float&,float&) const;
- void convertToBeamFrameWork(EventData& data, const Trk::SpacePoint*const&,float*) const;
+ static void convertToBeamFrameWork(EventData& data, const Trk::SpacePoint*const&,float*) ;
bool isUsed(const Trk::SpacePoint*, const Trk::PRDtoTrackMap &prd_to_track_map) const;
void initializeEventData(EventData& data) const;
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Trigger.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Trigger.h
index c6d6ee5b6e13..c6c34c0de60d 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Trigger.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Trigger.h
@@ -220,26 +220,26 @@ namespace InDet {
//@}
MsgStream& dumpConditions(EventData& data, MsgStream& out) const;
- MsgStream& dumpEvent(EventData& data, MsgStream& out) const;
+ static MsgStream& dumpEvent(EventData& data, MsgStream& out) ;
void buildFrameWork();
void buildBeamFrameWork(EventData& data) const;
- SiSpacePointForSeed* newSpacePoint
- (EventData& data, const Trk::SpacePoint*const&) const;
- void newSeed
+ static SiSpacePointForSeed* newSpacePoint
+ (EventData& data, const Trk::SpacePoint*const&) ;
+ static void newSeed
(EventData& data,
const Trk::SpacePoint*&,const Trk::SpacePoint*&,
- const float&) const;
+ const float&) ;
void newOneSeed
(EventData& data,
const Trk::SpacePoint*&,const Trk::SpacePoint*&,
const Trk::SpacePoint*&,const float&,const float&) const;
- void fillSeeds(EventData& data) const;
+ static void fillSeeds(EventData& data) ;
void fillLists(EventData& data) const;
- void erase(EventData& data) const;
+ static void erase(EventData& data) ;
void production2Sp(EventData& data) const;
void production3Sp(EventData& data) const;
void production3Sp
@@ -260,8 +260,8 @@ namespace InDet {
bool newVertices(EventData& data, const std::list<Trk::Vertex>&) const;
void findNext(EventData& data) const;
bool isZCompatible(EventData& data, float&, float&, float&) const;
- void convertToBeamFrameWork(EventData& data, const Trk::SpacePoint*const&, float*) const;
- float dZVertexMin(EventData& data, float&) const;
+ static void convertToBeamFrameWork(EventData& data, const Trk::SpacePoint*const&, float*) ;
+ static float dZVertexMin(EventData& data, float&) ;
void initializeEventData(EventData& data) const;
};
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx
index 938bd1d42800..e6e97bc97310 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx
@@ -879,7 +879,7 @@ MsgStream& InDet::SiSpacePointsSeedMaker_ATLxk::dumpConditions(EventData &data,
/// Dumps event information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SiSpacePointsSeedMaker_ATLxk::dumpEvent(EventData& data, MsgStream& out) const
+MsgStream& InDet::SiSpacePointsSeedMaker_ATLxk::dumpEvent(EventData& data, MsgStream& out)
{
out<<"|---------------------------------------------------------------------|"
<<endmsg;
@@ -1269,7 +1269,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::buildBeamFrameWork(EventData& data) co
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_ATLxk::convertToBeamFrameWork
-(EventData& data, const Trk::SpacePoint*const& sp, std::array<float,3> & r) const
+(EventData& data, const Trk::SpacePoint*const& sp, std::array<float,3> & r)
{
r[0] = static_cast<float>(sp->globalPosition().x())-data.xbeam[0];
r[1] = static_cast<float>(sp->globalPosition().y())-data.ybeam[0];
@@ -1402,7 +1402,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::fillLists(EventData& data) const
-float InDet::SiSpacePointsSeedMaker_ATLxk::azimuthalStep(const float pTmin,const float maxd0,const float Rmin,const float Rmax) const
+float InDet::SiSpacePointsSeedMaker_ATLxk::azimuthalStep(const float pTmin,const float maxd0,const float Rmin,const float Rmax)
{
/// here we approximate the largest curvature
/// that can be expected for the seeds we build
@@ -1430,7 +1430,7 @@ float InDet::SiSpacePointsSeedMaker_ATLxk::azimuthalStep(const float pTmin,const
// Erase space point information
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ATLxk::erase(EventData& data) const
+void InDet::SiSpacePointsSeedMaker_ATLxk::erase(EventData& data)
{
for (int i=0; i<data.nrfz; ++i) {
int n = data.rfz_index[i];
@@ -2633,7 +2633,7 @@ InDet::SiSpacePointForSeed* InDet::SiSpacePointsSeedMaker_ATLxk::newSpacePoint
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_ATLxk::newSeed
-(EventData& data, InDet::SiSpacePointForSeed*& p1, InDet::SiSpacePointForSeed*& p2, float z) const
+(EventData& data, InDet::SiSpacePointForSeed*& p1, InDet::SiSpacePointForSeed*& p2, float z)
{
InDet::SiSpacePointForSeed* p3 = nullptr;
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx
index 6496d123044c..485ef3474767 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx
@@ -553,7 +553,7 @@ MsgStream& InDet::SiSpacePointsSeedMaker_BeamGas::dumpConditions(EventData& data
// Dumps event information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SiSpacePointsSeedMaker_BeamGas::dumpEvent(EventData& data, MsgStream& out) const
+MsgStream& InDet::SiSpacePointsSeedMaker_BeamGas::dumpEvent(EventData& data, MsgStream& out)
{
out<<"|---------------------------------------------------------------------|"
<<endmsg;
@@ -720,7 +720,7 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::buildBeamFrameWork(EventData& data)
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_BeamGas::convertToBeamFrameWork
-(EventData& data, const Trk::SpacePoint*const& sp,float* r) const
+(EventData& data, const Trk::SpacePoint*const& sp,float* r)
{
float x = static_cast<float>(sp->globalPosition().x())-data.xbeam[0];
float y = static_cast<float>(sp->globalPosition().y())-data.ybeam[0];
@@ -783,7 +783,7 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::fillLists(EventData& data) const
// Erase space point information
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_BeamGas::erase(EventData& data) const
+void InDet::SiSpacePointsSeedMaker_BeamGas::erase(EventData& data)
{
for (int i=0; i!=data.nr; ++i) {
int n = data.r_index[i];
@@ -815,7 +815,7 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::erase(EventData& data) const
// 2 space points seeds production
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_BeamGas::production2Sp(EventData& data) const
+void InDet::SiSpacePointsSeedMaker_BeamGas::production2Sp(EventData& data)
{
data.endlist = true;
}
@@ -1124,7 +1124,7 @@ bool InDet::SiSpacePointsSeedMaker_BeamGas::isZCompatible(float& Zv) const
///////////////////////////////////////////////////////////////////
InDet::SiSpacePointForSeed* InDet::SiSpacePointsSeedMaker_BeamGas::newSpacePoint
-(EventData& data, const Trk::SpacePoint*const& sp) const
+(EventData& data, const Trk::SpacePoint*const& sp)
{
InDet::SiSpacePointForSeed* sps = nullptr;
@@ -1150,7 +1150,7 @@ InDet::SiSpacePointForSeed* InDet::SiSpacePointsSeedMaker_BeamGas::newSpacePoint
void InDet::SiSpacePointsSeedMaker_BeamGas::newSeed
(EventData& data,
const Trk::SpacePoint*& p1,const Trk::SpacePoint*& p2,
- const float& z) const
+ const float& z)
{
if (data.i_seede!=data.l_seeds.end()) {
InDet::SiSpacePointsSeed* s = &(*data.i_seede++);
@@ -1171,7 +1171,7 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::newSeed
void InDet::SiSpacePointsSeedMaker_BeamGas::newSeed
(EventData& data,
const Trk::SpacePoint*& p1,const Trk::SpacePoint*& p2,
- const Trk::SpacePoint*& p3,const float& z) const
+ const Trk::SpacePoint*& p3,const float& z)
{
if (data.i_seede!=data.l_seeds.end()) {
InDet::SiSpacePointsSeed* s = &(*data.i_seede++);
@@ -1190,7 +1190,7 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::newSeed
// Fill seeds
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_BeamGas::fillSeeds(EventData& data) const
+void InDet::SiSpacePointsSeedMaker_BeamGas::fillSeeds(EventData& data)
{
std::multimap<float,InDet::SiSpacePointsSeed*>::iterator
l = data.mapOneSeeds.begin(),
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx
index 7208d5a6b7ee..7f11db239b25 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx
@@ -464,7 +464,7 @@ MsgStream& InDet::SiSpacePointsSeedMaker_Cosmic::dumpConditions(MsgStream& out)
// Dumps event information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SiSpacePointsSeedMaker_Cosmic::dumpEvent(EventData& data, MsgStream& out) const
+MsgStream& InDet::SiSpacePointsSeedMaker_Cosmic::dumpEvent(EventData& data, MsgStream& out)
{
out<<"|---------------------------------------------------------------------|"
<<endmsg;
@@ -627,7 +627,7 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::fillLists(EventData& data) const
// Erase space point information
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_Cosmic::erase(EventData& data) const
+void InDet::SiSpacePointsSeedMaker_Cosmic::erase(EventData& data)
{
for (int i=0; i<data.nr; ++i) {
int n = data.r_index[i];
@@ -659,7 +659,7 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::erase(EventData& data) const
// 2 space points seeds production
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_Cosmic::production2Sp(EventData& data) const
+void InDet::SiSpacePointsSeedMaker_Cosmic::production2Sp(EventData& data)
{
data.endlist = true;
}
@@ -1043,7 +1043,7 @@ const InDet::SiSpacePointsSeed* InDet::SiSpacePointsSeedMaker_Cosmic::next(const
///////////////////////////////////////////////////////////////////
InDet::SiSpacePointForSeed* InDet::SiSpacePointsSeedMaker_Cosmic::newSpacePoint
-(EventData& data, const Trk::SpacePoint*const& sp) const
+(EventData& data, const Trk::SpacePoint*const& sp)
{
InDet::SiSpacePointForSeed* sps = nullptr;
@@ -1068,7 +1068,7 @@ InDet::SiSpacePointForSeed* InDet::SiSpacePointsSeedMaker_Cosmic::newSpacePoint
///////////////////////////////////////////////////////////////////
InDet::SiSpacePointForSeed* InDet::SiSpacePointsSeedMaker_Cosmic::newSpacePoint
-(EventData& data, const Trk::SpacePoint*const& sp,const float* sc) const
+(EventData& data, const Trk::SpacePoint*const& sp,const float* sc)
{
InDet::SiSpacePointForSeed* sps = nullptr;
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx
index fa3dba320598..adb5c365aa9b 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx
@@ -537,7 +537,7 @@ MsgStream& InDet::SiSpacePointsSeedMaker_HeavyIon::dumpConditions(EventData& dat
// Dumps event information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SiSpacePointsSeedMaker_HeavyIon::dumpEvent(EventData& data, MsgStream& out) const
+MsgStream& InDet::SiSpacePointsSeedMaker_HeavyIon::dumpEvent(EventData& data, MsgStream& out)
{
out<<"|---------------------------------------------------------------------|"
<<endmsg;
@@ -771,7 +771,7 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::buildBeamFrameWork(const EventConte
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_HeavyIon::convertToBeamFrameWork
-(EventData& data, const Trk::SpacePoint*const& sp,float* r) const
+(EventData& data, const Trk::SpacePoint*const& sp,float* r)
{
r[0] = static_cast<float>(sp->globalPosition().x())-data.xbeam[0];
r[1] = static_cast<float>(sp->globalPosition().y())-data.ybeam[0];
@@ -842,7 +842,7 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::fillLists(EventData& data) const
// Erase space point information
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_HeavyIon::erase(EventData& data) const
+void InDet::SiSpacePointsSeedMaker_HeavyIon::erase(EventData& data)
{
for (int i=0; i<data.nr; ++i) {
int n = data.r_index[i];
@@ -951,7 +951,7 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production2Sp(EventData& data) cons
float UR = Ut*R+1. ; if (UR == 0.) continue;
float A = Vt*R/UR ;
float B = Vt-A*Ut ;
- if (std::abs(B*data.K) > m_ipt*sqrt(1.f+A*A)) continue;
+ if (std::abs(B*data.K) > m_ipt*std::sqrt(1.f+A*A)) continue;
++nseed;
newSeed(data, (*r)->spacepoint, (*r0)->spacepoint,Zo);
}
@@ -1637,7 +1637,7 @@ bool InDet::SiSpacePointsSeedMaker_HeavyIon::isZCompatible
return dZmin < (m_dzver+m_dzdrver*R)*sqrt(1.+T*T);
}
-float InDet::SiSpacePointsSeedMaker_HeavyIon::dZVertexMin(EventData& data, float& Z) const
+float InDet::SiSpacePointsSeedMaker_HeavyIon::dZVertexMin(EventData& data, float& Z)
{
float dZm = std::numeric_limits<float>::max();
for (const float& v: data.l_vertex) {
@@ -1652,7 +1652,7 @@ float InDet::SiSpacePointsSeedMaker_HeavyIon::dZVertexMin(EventData& data, float
///////////////////////////////////////////////////////////////////
InDet::SiSpacePointForSeed* InDet::SiSpacePointsSeedMaker_HeavyIon::newSpacePoint
-(EventData& data, const Trk::SpacePoint*const& sp) const
+(EventData& data, const Trk::SpacePoint*const& sp)
{
InDet::SiSpacePointForSeed* sps = nullptr;
@@ -1678,7 +1678,7 @@ InDet::SiSpacePointForSeed* InDet::SiSpacePointsSeedMaker_HeavyIon::newSpacePoin
void InDet::SiSpacePointsSeedMaker_HeavyIon::newSeed
(EventData& data,
const Trk::SpacePoint*& p1, const Trk::SpacePoint*& p2,
- const float& z) const
+ const float& z)
{
if (data.i_seede!=data.l_seeds.end()) {
InDet::SiSpacePointsSeed* s = &(*data.i_seede++);
@@ -1699,7 +1699,7 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newSeed
void InDet::SiSpacePointsSeedMaker_HeavyIon::newSeed
(EventData& data,
const Trk::SpacePoint*& p1, const Trk::SpacePoint*& p2,
- const Trk::SpacePoint*& p3, const float& z) const
+ const Trk::SpacePoint*& p3, const float& z)
{
if (data.i_seede!=data.l_seeds.end()) {
InDet::SiSpacePointsSeed* s = &(*data.i_seede++);
@@ -1718,7 +1718,7 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newSeed
// Fill seeds
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_HeavyIon::fillSeeds(EventData& data) const
+void InDet::SiSpacePointsSeedMaker_HeavyIon::fillSeeds(EventData& data)
{
std::multimap<float, InDet::SiSpacePointsSeed*>::iterator
l = data.mapOneSeeds.begin(),
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx
index 8e4f02d77b81..6395cbe7e98d 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx
@@ -927,7 +927,7 @@ MsgStream &InDet::SiSpacePointsSeedMaker_ITK::dumpConditions(EventData &data, Ms
// Dumps event information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream &InDet::SiSpacePointsSeedMaker_ITK::dumpEvent(EventData &data, MsgStream &out) const
+MsgStream &InDet::SiSpacePointsSeedMaker_ITK::dumpEvent(EventData &data, MsgStream &out)
{
out<<"|---------------------------------------------------------------------|"
<<endmsg;
@@ -1259,7 +1259,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::buildConnectionMaps(std::array<int, arra
}
}
-float InDet::SiSpacePointsSeedMaker_ITK::azimuthalStep(const float pTmin, const float maxd0, const float Rmin, const float Rmax) const
+float InDet::SiSpacePointsSeedMaker_ITK::azimuthalStep(const float pTmin, const float maxd0, const float Rmin, const float Rmax)
{
/// here we approximate the largest curvature
/// that can be expected for the seeds we build
@@ -1320,7 +1320,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::buildBeamFrameWork(EventData &data) cons
///////////////////////////////////////////////////////////////////
// Initiate beam frame work for seed generator
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::convertToBeamFrameWork(EventData &data, const Trk::SpacePoint *const &sp, float *r) const
+void InDet::SiSpacePointsSeedMaker_ITK::convertToBeamFrameWork(EventData &data, const Trk::SpacePoint *const &sp, float *r)
{
r[0] = static_cast<float>(sp->globalPosition().x()) - data.xbeam[0];
r[1] = static_cast<float>(sp->globalPosition().y()) - data.ybeam[0];
@@ -1661,7 +1661,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::fillListsFast(const EventContext &ctx, E
// Pixels information
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::pixInform(const Trk::SpacePoint *sp, float *r) const
+void InDet::SiSpacePointsSeedMaker_ITK::pixInform(const Trk::SpacePoint *sp, float *r)
{
const InDet::SiCluster *cl = static_cast<const InDet::SiCluster *>(sp->clusterList().first);
const InDetDD::SiDetectorElement *de = cl->detectorElement();
@@ -1675,7 +1675,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::pixInform(const Trk::SpacePoint *sp, flo
// SCT information
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::sctInform(EventData &data, const Trk::SpacePoint *sp, float *r) const
+void InDet::SiSpacePointsSeedMaker_ITK::sctInform(EventData &data, const Trk::SpacePoint *sp, float *r)
{
const InDet::SiCluster *c0 = static_cast<const InDet::SiCluster *>(sp->clusterList().first);
const InDet::SiCluster *c1 = static_cast<const InDet::SiCluster *>(sp->clusterList().second);
@@ -1722,7 +1722,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::sctInform(EventData &data, const Trk::Sp
// Erase space point information
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::erase(EventData &data) const
+void InDet::SiSpacePointsSeedMaker_ITK::erase(EventData &data)
{
for (int i = 0; i < data.nrfz; ++i)
{
@@ -1848,7 +1848,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::production2Sp(EventData &data) const
continue;
float A = Vt * R / UR;
float B = Vt - A * Ut;
- if (std::abs(B * data.K) > m_ipt * sqrt(1.f + A * A))
+ if (std::abs(B * data.K) > m_ipt * std::sqrt(1.f + A * A))
continue;
++nseed;
newSeed(data, (*r), (*r0), Zo);
@@ -1914,10 +1914,10 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3Sp(EventData &data) const
std::array<std::list<InDet::SiSpacePointForSeedITK *>::iterator, arraySizeNeighbourBins> iter_endBottomCands;
int nPhiBins;
- std::array<int, arraySizePhiZ> nNeighbourCellsBottom;
- std::array<int, arraySizePhiZ> nNeighbourCellsTop;
- std::array<std::array<int, arraySizeNeighbourBins>, arraySizePhiZ> neighbourCellsBottom;
- std::array<std::array<int, arraySizeNeighbourBins>, arraySizePhiZ> neighbourCellsTop;
+ std::array<int, arraySizePhiZ> nNeighbourCellsBottom{};
+ std::array<int, arraySizePhiZ> nNeighbourCellsTop{};
+ std::array<std::array<int, arraySizeNeighbourBins>, arraySizePhiZ> neighbourCellsBottom{};
+ std::array<std::array<int, arraySizeNeighbourBins>, arraySizePhiZ> neighbourCellsTop{};
if (isPixel)
{
@@ -3276,7 +3276,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::newOneSeedWithCurvaturesComparison(Event
// Fill seeds
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::fillSeeds(EventData &data) const
+void InDet::SiSpacePointsSeedMaker_ITK::fillSeeds(EventData &data)
{
data.fillOneSeeds = 0;
@@ -3412,9 +3412,9 @@ InDet::SiSpacePointForSeedITK *InDet::SiSpacePointsSeedMaker_ITK::newSpacePoint(
{
float R2 = r[0] * r[0] + r[1] * r[1];
if (std::abs(r[2]) > m_dzMaxFast && R2 < m_R2MaxFast)
- return 0;
+ return nullptr;
if (std::abs(r[2]) - m_zmax > data.dzdrmax * std::sqrt(R2))
- return 0;
+ return nullptr;
}
if (usePixSctInform)
@@ -3454,7 +3454,7 @@ InDet::SiSpacePointForSeedITK *InDet::SiSpacePointsSeedMaker_ITK::newSpacePoint(
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_ITK::newSeed(EventData &data,
- InDet::SiSpacePointForSeedITK *&p1, InDet::SiSpacePointForSeedITK *&p2, float z) const
+ InDet::SiSpacePointForSeedITK *&p1, InDet::SiSpacePointForSeedITK *&p2, float z)
{
InDet::SiSpacePointForSeedITK *p3 = nullptr;
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx
index 1725e4a06b08..7b22d5b1782c 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx
@@ -506,7 +506,7 @@ MsgStream& InDet::SiSpacePointsSeedMaker_LowMomentum::dumpConditions(EventData&
// Dumps event information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SiSpacePointsSeedMaker_LowMomentum::dumpEvent(EventData& data, MsgStream& out) const
+MsgStream& InDet::SiSpacePointsSeedMaker_LowMomentum::dumpEvent(EventData& data, MsgStream& out)
{
out<<"|---------------------------------------------------------------------|"
<<endmsg;
@@ -549,7 +549,7 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::findNext(const EventContext& ctx
// New and old list vertices comparison
///////////////////////////////////////////////////////////////////
-bool InDet::SiSpacePointsSeedMaker_LowMomentum::newVertices(EventData& data, const std::list<Trk::Vertex>& lV) const
+bool InDet::SiSpacePointsSeedMaker_LowMomentum::newVertices(EventData& data, const std::list<Trk::Vertex>& lV)
{
unsigned int s1 = data.l_vertex.size();
unsigned int s2 = lV.size();
@@ -697,7 +697,7 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::buildBeamFrameWork(EventData& da
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_LowMomentum::convertToBeamFrameWork
-(EventData& data, const Trk::SpacePoint*const& sp, float* r) const
+(EventData& data, const Trk::SpacePoint*const& sp, float* r)
{
r[0] = static_cast<float>(sp->globalPosition().x())-data.xbeam[0];
r[1] = static_cast<float>(sp->globalPosition().y())-data.ybeam[0];
@@ -753,7 +753,7 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::fillLists(EventData& data) const
// Erase space point information
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_LowMomentum::erase(EventData& data) const
+void InDet::SiSpacePointsSeedMaker_LowMomentum::erase(EventData& data)
{
for (int i=0; i!=data.nr; ++i) {
int n = data.r_index[i];
@@ -778,7 +778,7 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::erase(EventData& data) const
// 2 space points seeds production
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_LowMomentum::production2Sp(EventData& data) const
+void InDet::SiSpacePointsSeedMaker_LowMomentum::production2Sp(EventData& data)
{
data.endlist = true;
}
@@ -1092,7 +1092,7 @@ bool InDet::SiSpacePointsSeedMaker_LowMomentum::isZCompatible
///////////////////////////////////////////////////////////////////
InDet::SiSpacePointForSeed* InDet::SiSpacePointsSeedMaker_LowMomentum::newSpacePoint
-(EventData& data, const Trk::SpacePoint*const& sp) const
+(EventData& data, const Trk::SpacePoint*const& sp)
{
InDet::SiSpacePointForSeed* sps = nullptr;
@@ -1118,7 +1118,7 @@ InDet::SiSpacePointForSeed* InDet::SiSpacePointsSeedMaker_LowMomentum::newSpaceP
void InDet::SiSpacePointsSeedMaker_LowMomentum::newSeed
(EventData& data,
const Trk::SpacePoint*& p1,const Trk::SpacePoint*& p2,
- const float& z) const
+ const float& z)
{
if (data.i_seede!=data.l_seeds.end()) {
InDet::SiSpacePointsSeed* s = &(*data.i_seede++);
@@ -1139,7 +1139,7 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::newSeed
void InDet::SiSpacePointsSeedMaker_LowMomentum::newSeed
(EventData& data,
const Trk::SpacePoint*& p1,const Trk::SpacePoint*& p2,
- const Trk::SpacePoint*& p3,const float& z) const
+ const Trk::SpacePoint*& p3,const float& z)
{
if (data.i_seede!=data.l_seeds.end()) {
InDet::SiSpacePointsSeed* s = &(*data.i_seede++);
@@ -1158,7 +1158,7 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::newSeed
// Fill seeds
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_LowMomentum::fillSeeds(EventData& data) const
+void InDet::SiSpacePointsSeedMaker_LowMomentum::fillSeeds(EventData& data)
{
std::multimap<float,InDet::SiSpacePointsSeed*>::iterator
l = data.mapOneSeeds.begin(),
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx
index 265b0c0cf723..58ad68106c0d 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx
@@ -584,7 +584,7 @@ MsgStream& InDet::SiSpacePointsSeedMaker_Trigger::dumpConditions(EventData& data
// Dumps event information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SiSpacePointsSeedMaker_Trigger::dumpEvent(EventData& data, MsgStream& out) const
+MsgStream& InDet::SiSpacePointsSeedMaker_Trigger::dumpEvent(EventData& data, MsgStream& out)
{
out<<"|---------------------------------------------------------------------|"
<<endmsg;
@@ -833,7 +833,7 @@ void InDet::SiSpacePointsSeedMaker_Trigger::buildBeamFrameWork(EventData& data)
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_Trigger::convertToBeamFrameWork
-(EventData& data, const Trk::SpacePoint*const& sp, float* r) const
+(EventData& data, const Trk::SpacePoint*const& sp, float* r)
{
r[0] = static_cast<float>(sp->globalPosition().x())-data.xbeam[0];
r[1] = static_cast<float>(sp->globalPosition().y())-data.ybeam[0];
@@ -903,7 +903,7 @@ void InDet::SiSpacePointsSeedMaker_Trigger::fillLists(EventData& data) const
// Erase space point information
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_Trigger::erase(EventData& data) const
+void InDet::SiSpacePointsSeedMaker_Trigger::erase(EventData& data)
{
for (int i=0; i!=data.nr; ++i) {
int n = data.r_index[i];
@@ -1567,7 +1567,7 @@ bool InDet::SiSpacePointsSeedMaker_Trigger::isZCompatible
return dZmin < (m_dzver+m_dzdrver*R)*sqrt(1.+T*T);
}
-float InDet::SiSpacePointsSeedMaker_Trigger::dZVertexMin(EventData& data, float& Z) const
+float InDet::SiSpacePointsSeedMaker_Trigger::dZVertexMin(EventData& data, float& Z)
{
if (data.l_vertex.empty()) return 0.;
@@ -1584,7 +1584,7 @@ float InDet::SiSpacePointsSeedMaker_Trigger::dZVertexMin(EventData& data, float&
///////////////////////////////////////////////////////////////////
InDet::SiSpacePointForSeed* InDet::SiSpacePointsSeedMaker_Trigger::newSpacePoint
-(EventData& data, const Trk::SpacePoint*const& sp) const
+(EventData& data, const Trk::SpacePoint*const& sp)
{
InDet::SiSpacePointForSeed* sps = nullptr;
@@ -1610,7 +1610,7 @@ InDet::SiSpacePointForSeed* InDet::SiSpacePointsSeedMaker_Trigger::newSpacePoint
void InDet::SiSpacePointsSeedMaker_Trigger::newSeed
(EventData& data,
const Trk::SpacePoint*& p1,const Trk::SpacePoint*& p2,
- const float& z) const
+ const float& z)
{
if (data.i_seede!=data.l_seeds.end()) {
InDet::SiSpacePointsSeed* s = &(*data.i_seede++);
@@ -1628,7 +1628,7 @@ void InDet::SiSpacePointsSeedMaker_Trigger::newSeed
// Fill seeds
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_Trigger::fillSeeds(EventData& data) const
+void InDet::SiSpacePointsSeedMaker_Trigger::fillSeeds(EventData& data)
{
std::multimap<float, InDet::SiSpacePointsSeed*>::iterator
l = data.mapOneSeeds.begin(),
--
GitLab
From 85c3a6d1162bb2dfa35b343fe47eee97000dc2b2 Mon Sep 17 00:00:00 2001
From: yoyamagu <yohei.yamaguchi@cern.ch>
Date: Fri, 20 Aug 2021 02:40:15 +0900
Subject: [PATCH 177/272] condition to run isolation calculation
---
.../DataQualityTools/share/DataQualityMon_jobOptions.py | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/DataQuality/DataQualityTools/share/DataQualityMon_jobOptions.py b/DataQuality/DataQualityTools/share/DataQualityMon_jobOptions.py
index c89137d261b0..c5c6c5159e35 100644
--- a/DataQuality/DataQualityTools/share/DataQualityMon_jobOptions.py
+++ b/DataQuality/DataQualityTools/share/DataQualityMon_jobOptions.py
@@ -36,14 +36,7 @@ else:
JetCollectionKey='AntiKt4EMTopoJets'
# add isolation variables for IsolationSelection
-isESD=False
-for class_name, name in metadata['metadata_items'].items():
- if name == 'EventStreamInfo':
- if "ESD" in class_name :
- print ("Running on ESD - will add TTVA decorations.")
- isESD=True
-
-if isESD:
+if DQMonFlags.monManEnvironment() == 'tier0ESD' or DQMonFlags.monManEnvironment() == 'tier0':
from IsolationAlgs.IsoUpdatedTrackCones import GetUpdatedIsoTrackCones
if not hasattr(topSequence,"IsolationBuilderNonprompt_All_MaxWeight1000"):
ToolSvc += CfgMgr.InDet__InDetUsedInFitTrackDecoratorTool( name = topSequence.name()+"_InDetUsedInFitDecoratorTool_forIso",
--
GitLab
From 9c80bfcf5bdf99f43e81220f38515581823d7524 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Thu, 19 Aug 2021 16:10:22 +0200
Subject: [PATCH 178/272] CxxUtils: Fix warning.
Leftover debugging pragma.
---
Control/CxxUtils/test/stacktrace_test.cxx | 1 -
1 file changed, 1 deletion(-)
diff --git a/Control/CxxUtils/test/stacktrace_test.cxx b/Control/CxxUtils/test/stacktrace_test.cxx
index 3d58c44f0820..6ffbe05fa353 100644
--- a/Control/CxxUtils/test/stacktrace_test.cxx
+++ b/Control/CxxUtils/test/stacktrace_test.cxx
@@ -10,7 +10,6 @@
*/
-#pragma GCC optimize "-O0"
#undef NDEBUG
#include "CxxUtils/checker_macros.h"
--
GitLab
From 41a2ce0ed55e214bcc092004a5b93dc74ff77fa2 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Thu, 19 Aug 2021 16:13:57 +0200
Subject: [PATCH 179/272] TrkDetDescrTools: Fix clang warnings.
Missing override keywords.
---
.../TrkDetDescrTools/LayerMaterialProvider.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Tracking/TrkDetDescr/TrkDetDescrTools/TrkDetDescrTools/LayerMaterialProvider.h b/Tracking/TrkDetDescr/TrkDetDescrTools/TrkDetDescrTools/LayerMaterialProvider.h
index f29af5ba0ef4..88a3a742b1cc 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrTools/TrkDetDescrTools/LayerMaterialProvider.h
+++ b/Tracking/TrkDetDescr/TrkDetDescrTools/TrkDetDescrTools/LayerMaterialProvider.h
@@ -49,13 +49,13 @@ namespace Trk {
/** Processor Action to work on TrackingGeometry& tgeo */
virtual StatusCode process
- ATLAS_NOT_THREAD_SAFE(const TrackingGeometry& tgeo) const;
+ ATLAS_NOT_THREAD_SAFE(const TrackingGeometry& tgeo) const override;
/** Processor Action to work on TrackingVolumes - the level is for the
* hierachy tree*/
virtual StatusCode process
ATLAS_NOT_THREAD_SAFE(const TrackingVolume& tvol,
- size_t level = 0) const;
+ size_t level = 0) const override;
StatusCode process
ATLAS_NOT_THREAD_SAFE(const TrackingVolume& lay,
@@ -64,7 +64,7 @@ namespace Trk {
/** Processor Action to work on Layers */
virtual StatusCode process
- ATLAS_NOT_THREAD_SAFE(const Layer& lay, size_t level = 0) const;
+ ATLAS_NOT_THREAD_SAFE(const Layer& lay, size_t level = 0) const override;
StatusCode process
ATLAS_NOT_THREAD_SAFE(const Layer& lay,
--
GitLab
From d1cd767438f42f2f41bd51b38d3d99cd57727181 Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Thu, 19 Aug 2021 20:13:15 +0200
Subject: [PATCH 180/272] Trk::Layer . Remove 4 const overloads marked as
ATLAS_NOT_THREAD_SAFE due to const_cast. Do the const_cast in the single
client method that needs them
---
.../TrkGeometry/TrkGeometry/Layer.h | 6 -----
.../TrkGeometry/TrkGeometry/Layer.icc | 19 -------------
.../TrkGeometry/src/TrackingVolume.cxx | 27 ++++++++++++-------
3 files changed, 17 insertions(+), 35 deletions(-)
diff --git a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/Layer.h b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/Layer.h
index 09bc07451623..84ae401b5257 100644
--- a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/Layer.h
+++ b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/Layer.h
@@ -157,8 +157,6 @@ class Layer {
const Layer* previousLayer(bool skipNavLayer = false) const;
/** set the previous Layer*/
void setPreviousLayer(const Layer*);
- /** set the previous Layer const not const thread safe*/
- void setPreviousLayer ATLAS_NOT_THREAD_SAFE(const Layer*) const;
/** getting the next/previous Layer if registered - unit for direction vector
* required */
@@ -169,8 +167,6 @@ class Layer {
const Layer* nextLayer(bool skipNavLayer = false) const;
/** set the next Layer*/
void setNextLayer(const Layer*);
- /** set the next Layer const not const thread safe*/
- void setNextLayer ATLAS_NOT_THREAD_SAFE(const Layer*) const;
/** access the BinUtility*/
const BinUtility* binUtility() const;
@@ -264,8 +260,6 @@ class Layer {
double getRef() const;
void encloseTrackingVolume(const TrackingVolume& tvol);
- void encloseTrackingVolume
- ATLAS_NOT_THREAD_SAFE(const TrackingVolume& tvol) const;
//!< private method to set the enclosed detached TV
void encloseDetachedTrackingVolume(const DetachedTrackingVolume& tvol);
void encloseDetachedTrackingVolume
diff --git a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/Layer.icc b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/Layer.icc
index 0bdf99d7c263..19a145622ffa 100644
--- a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/Layer.icc
+++ b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/Layer.icc
@@ -148,29 +148,14 @@ inline const OverlapDescriptor *Layer::overlapDescriptor() const {
}
/** set the previous Layer*/
inline void Layer::setPreviousLayer(const Layer *in) { m_previousLayer = in; }
-/** set the previous Layer const not const thread safe*/
-inline void Layer::setPreviousLayer
-ATLAS_NOT_THREAD_SAFE(const Layer * in) const {
- const_cast<Layer *>(this)->setPreviousLayer(in);
-}
/** set the next Layer*/
inline void Layer::setNextLayer(const Layer *in) { m_nextLayer = in; }
-/** set the next Layer const not const thread safe*/
-inline void Layer::setNextLayer
-ATLAS_NOT_THREAD_SAFE(const Layer *in) const {
- const_cast<Layer *>(this)->setNextLayer(in);
-}
/** access the BinUtility*/
inline const BinUtility *Layer::binUtility() const { return m_binUtility; }
/** set the BinUtility*/
inline void Layer::setBinUtility(const BinUtility *in) { m_binUtility = in; }
-/** set the BinUtility const not const thread safe*/
-inline void Layer::setBinUtility
-ATLAS_NOT_THREAD_SAFE(const BinUtility *in) const {
- const_cast<Layer *>(this)->setBinUtility(in);
-}
inline const TrackingVolume *Layer::enclosingTrackingVolume() const {
return m_enclosingTrackingVolume;
@@ -178,10 +163,6 @@ inline const TrackingVolume *Layer::enclosingTrackingVolume() const {
inline void Layer::encloseTrackingVolume(const TrackingVolume &tvol) {
m_enclosingTrackingVolume = &(tvol);
}
-inline void Layer::encloseTrackingVolume
-ATLAS_NOT_THREAD_SAFE(const TrackingVolume &tvol) const {
- const_cast<Layer *>(this)->encloseTrackingVolume(tvol);
-}
inline const DetachedTrackingVolume *
Layer::enclosingDetachedTrackingVolume() const {
diff --git a/Tracking/TrkDetDescr/TrkGeometry/src/TrackingVolume.cxx b/Tracking/TrkDetDescr/TrkGeometry/src/TrackingVolume.cxx
index 48bd92c57bc7..713b7d07f935 100755
--- a/Tracking/TrkDetDescr/TrkGeometry/src/TrackingVolume.cxx
+++ b/Tracking/TrkDetDescr/TrkGeometry/src/TrackingVolume.cxx
@@ -1079,23 +1079,25 @@ void Trk::TrackingVolume::createLayerAttemptsCalculator() {
}
}
-void Trk::TrackingVolume::interlinkLayers ATLAS_NOT_THREAD_SAFE() {
+void Trk::TrackingVolume::interlinkLayers
+ATLAS_NOT_THREAD_SAFE()
+{
if (m_confinedLayers) {
const std::vector<const Trk::Layer*>& layers =
- m_confinedLayers->arrayObjects();
+ m_confinedLayers->arrayObjects();
// forward loop
const Trk::Layer* lastLayer = nullptr;
std::vector<const Trk::Layer*>::const_iterator layerIter = layers.begin();
for (; layerIter != layers.end(); ++layerIter) {
if (*layerIter) {
// register the layers
- (**layerIter)
- .setBinUtility(m_confinedLayers->binUtility()
- ? m_confinedLayers->binUtility()
- : nullptr);
- (**layerIter).setPreviousLayer(lastLayer);
+ Trk::Layer& mutableLayer = const_cast<Trk::Layer&>(**layerIter);
+ mutableLayer.setBinUtility(m_confinedLayers->binUtility()
+ ? m_confinedLayers->binUtility()
+ : nullptr);
+ mutableLayer.setPreviousLayer(lastLayer);
// register the volume
- (**layerIter).encloseTrackingVolume(*this);
+ mutableLayer.encloseTrackingVolume(*this);
}
lastLayer = (*layerIter);
}
@@ -1104,9 +1106,14 @@ void Trk::TrackingVolume::interlinkLayers ATLAS_NOT_THREAD_SAFE() {
layerIter = layers.end();
--layerIter;
for (;; --layerIter) {
- if (*layerIter) (**layerIter).setNextLayer(lastLayer);
+ if (*layerIter) {
+ Trk::Layer& mutableLayer = const_cast<Trk::Layer&>(**layerIter);
+ mutableLayer.setNextLayer(lastLayer);
+ }
lastLayer = (*layerIter);
- if (layerIter == layers.begin()) break;
+ if (layerIter == layers.begin()) {
+ break;
+ }
}
}
}
--
GitLab
From 5741134ad8d6e2b99038058e08aa3d8f53f88f36 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Tue, 29 Jun 2021 10:33:02 -0400
Subject: [PATCH 181/272] VP1Base: Fix compilation warnings.
Fix compilation warnings (mostly related to newer qt version).
---
.../VP1/VP1Base/VP1Base/VP12DExaminerViewer.h | 6 ++---
graphics/VP1/VP1Base/VP1Base/VP1TabWidget.h | 2 +-
.../VP1/VP1Base/src/IVP13DChannelWidget.cxx | 2 +-
.../src/IVP13DStandardChannelWidget.cxx | 4 +--
.../VP1/VP1Base/src/IVP1ChannelWidget.cxx | 4 +--
graphics/VP1/VP1Base/src/IVP1System.cxx | 4 +--
graphics/VP1/VP1Base/src/PhiSectionWidget.cxx | 4 +--
.../VP1/VP1Base/src/VP1CollectionWidget.cxx | 13 +++++-----
.../VP1/VP1Base/src/VP1CustomTourEditor.cxx | 15 ++++++++++-
.../VP1Base/src/VP1CustomTourFrameWidget.cxx | 11 +++++++-
.../VP1/VP1Base/src/VP1ExaminerViewer.cxx | 6 +++--
graphics/VP1/VP1Base/src/VP1GraphicsView.cxx | 25 ++++++++++---------
.../VP1/VP1Base/src/VP1QtInventorUtils.cxx | 20 +++++++++++----
graphics/VP1/VP1Base/src/VP1TabBar.cxx | 9 +++----
graphics/VP1/VP1Base/src/VP1TabWidget.cxx | 16 ++++++------
15 files changed, 88 insertions(+), 53 deletions(-)
diff --git a/graphics/VP1/VP1Base/VP1Base/VP12DExaminerViewer.h b/graphics/VP1/VP1Base/VP1Base/VP12DExaminerViewer.h
index 2b93ed308889..bb07a5e71ca6 100644
--- a/graphics/VP1/VP1Base/VP1Base/VP12DExaminerViewer.h
+++ b/graphics/VP1/VP1Base/VP1Base/VP12DExaminerViewer.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////
@@ -32,9 +32,9 @@ public:
//The choice of constructor will determine whether this view is in single or multi view mode:
//An examinerviewer with just one VP1GraphicsView:
- VP12DExaminerViewer(QWidget * parent = 0, Qt::WindowFlags f = 0);
+ VP12DExaminerViewer(QWidget * parent = 0, Qt::WindowFlags f = Qt::WindowFlags());
//An examinerviewer with several VP1GraphicsView's. First argument is a list of view_id's and icon urls for the views:
- VP12DExaminerViewer(const QList<QPair<QString,QString> >& views, QWidget * parent = 0, Qt::WindowFlags f = 0);
+ VP12DExaminerViewer(const QList<QPair<QString,QString> >& views, QWidget * parent = 0, Qt::WindowFlags f = Qt::WindowFlags());
virtual ~VP12DExaminerViewer();
bool isSingleViewMode() const;
diff --git a/graphics/VP1/VP1Base/VP1Base/VP1TabWidget.h b/graphics/VP1/VP1Base/VP1Base/VP1TabWidget.h
index 072f011b9144..dbeb9e6ef542 100644
--- a/graphics/VP1/VP1Base/VP1Base/VP1TabWidget.h
+++ b/graphics/VP1/VP1Base/VP1Base/VP1TabWidget.h
@@ -52,7 +52,7 @@ class VP1TabWidget : public QTabWidget
VP1TabBar* getVP1TabBar();//Added by TK.
- explicit VP1TabWidget( QWidget *parent = 0, Qt::WindowFlags flags = 0 );
+ explicit VP1TabWidget( QWidget *parent = 0, Qt::WindowFlags flags = Qt::WindowFlags() );
virtual ~VP1TabWidget();
diff --git a/graphics/VP1/VP1Base/src/IVP13DChannelWidget.cxx b/graphics/VP1/VP1Base/src/IVP13DChannelWidget.cxx
index ce6342324e3f..edbf7940e321 100644
--- a/graphics/VP1/VP1Base/src/IVP13DChannelWidget.cxx
+++ b/graphics/VP1/VP1Base/src/IVP13DChannelWidget.cxx
@@ -155,7 +155,7 @@ QPixmap IVP13DChannelWidget::getSnapshot(bool transp, int width, bool /*batch*/)
QPainter painter;
painter.begin(&pm);
- painter.drawPixmap(0,0,QPixmap::grabWidget ( this ));
+ painter.drawPixmap(0,0,this->grab ( ));
m_d->it = m_d->renderareas.begin();
for (;m_d->it!=m_d->itE;++(m_d->it)) {
diff --git a/graphics/VP1/VP1Base/src/IVP13DStandardChannelWidget.cxx b/graphics/VP1/VP1Base/src/IVP13DStandardChannelWidget.cxx
index 1314da09f31f..4dc26d22bc1f 100644
--- a/graphics/VP1/VP1Base/src/IVP13DStandardChannelWidget.cxx
+++ b/graphics/VP1/VP1Base/src/IVP13DStandardChannelWidget.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////
@@ -232,7 +232,7 @@ void IVP13DStandardChannelWidget::create() {
} else if (sysname2extradisplay.count()==1) {
m_d->setupSplitter(sysname2extradisplay.front().second);
} else if (sysname2extradisplay.count()>1) {
- VP1TabWidget * tabWidget = new VP1TabWidget(0);
+ VP1TabWidget * tabWidget = new VP1TabWidget();
for (int i = 0; i < sysname2extradisplay.count(); ++i) {
tabWidget->addTab(sysname2extradisplay.at(i).second,sysname2extradisplay.at(i).first);
}
diff --git a/graphics/VP1/VP1Base/src/IVP1ChannelWidget.cxx b/graphics/VP1/VP1Base/src/IVP1ChannelWidget.cxx
index 35639124ceb9..1a7f6230e78e 100644
--- a/graphics/VP1/VP1Base/src/IVP1ChannelWidget.cxx
+++ b/graphics/VP1/VP1Base/src/IVP1ChannelWidget.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////
@@ -308,7 +308,7 @@ QPixmap IVP1ChannelWidget::getSnapshot(bool transp, int width, bool batch)
VP1Msg::messageVerbose("IVP1ChannelWidget::getSnapshot() - using QPixmap::grabWidget()");
VP1Msg::messageVerbose("(and so, not using the values - transp: "+QString::number(transp)+" - width: "+QString::number(width)+" - batch: " + batch +")");
- return QPixmap::grabWidget( this );
+ return this->grab();
}
//_______________________________________________________
diff --git a/graphics/VP1/VP1Base/src/IVP1System.cxx b/graphics/VP1/VP1Base/src/IVP1System.cxx
index ad2b04bb1cca..c1849191ab67 100644
--- a/graphics/VP1/VP1Base/src/IVP1System.cxx
+++ b/graphics/VP1/VP1Base/src/IVP1System.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
@@ -264,7 +264,7 @@ void IVP1System::updateGUI() {
//assert(m_d->allowupdategui);
//assert(m_d->state==ERASED);
- if ( m_d->allowupdategui && qApp->hasPendingEvents() ) {
+ if ( m_d->allowupdategui ) {
qApp->processEvents();
}
diff --git a/graphics/VP1/VP1Base/src/PhiSectionWidget.cxx b/graphics/VP1/VP1Base/src/PhiSectionWidget.cxx
index 7206c6057794..ecc23cc998b7 100644
--- a/graphics/VP1/VP1Base/src/PhiSectionWidget.cxx
+++ b/graphics/VP1/VP1Base/src/PhiSectionWidget.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "VP1Base/PhiSectionWidget.h"
@@ -833,7 +833,7 @@ void PhiSectionWidget::setAllowedNumberOfSectors(QList<int> allowedNSectors, boo
m_d->allowCustomNSectors = allowCustom;
- qSort(allowedNSectors);
+ std::sort(allowedNSectors.begin(), allowedNSectors.end());
if (m_d->allowedNSectors==allowedNSectors) {
return;
}
diff --git a/graphics/VP1/VP1Base/src/VP1CollectionWidget.cxx b/graphics/VP1/VP1Base/src/VP1CollectionWidget.cxx
index 9b322af0f01e..a61b188755b8 100644
--- a/graphics/VP1/VP1Base/src/VP1CollectionWidget.cxx
+++ b/graphics/VP1/VP1Base/src/VP1CollectionWidget.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
@@ -84,9 +84,10 @@ void VP1CollectionWidget::clear(bool deleteCollections,bool deleteGuiElements)
m_d->clearGui(deleteGuiElements);
m_d->widgetsFromCollections.clear();
- if (deleteCollections)
+ if (deleteCollections) {
foreach(VP1Collection*col, m_d->collections)
delete col;
+ }
m_d->collections.clear();
//Fixme: update report-on-width
@@ -119,8 +120,8 @@ void VP1CollectionWidget::Imp::repopulateGUIFromCollections()
QSet<QString> sections;
foreach (VP1Collection* col,collections)
sections.insert(col->section());
- QList<QString> sectionsSorted = sections.toList();
- qSort(sectionsSorted);
+ QList<QString> sectionsSorted = sections.values();
+ std::sort(sectionsSorted.begin(), sectionsSorted.end());
theclass->sortSections(sectionsSorted);
const bool nosectionlabels = sectionsSorted.count() == 1 && sectionsSorted.at(0).isEmpty();
@@ -313,8 +314,8 @@ QList<qint32> VP1CollectionWidget::Imp::visibleStdCollectionTypesFromVisStdCols(
QSet<qint32> vt;
foreach(VP1StdCollection* stdcol,l)
vt.insert(stdcol->collTypeID());
- QList<qint32> vistypes = vt.toList();
- qSort(vistypes);
+ QList<qint32> vistypes = vt.values();
+ std::sort(vistypes.begin(), vistypes.end());
return vistypes;
}
diff --git a/graphics/VP1/VP1Base/src/VP1CustomTourEditor.cxx b/graphics/VP1/VP1Base/src/VP1CustomTourEditor.cxx
index 05c5e264d4ca..63a51b39d210 100644
--- a/graphics/VP1/VP1Base/src/VP1CustomTourEditor.cxx
+++ b/graphics/VP1/VP1Base/src/VP1CustomTourEditor.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
@@ -31,6 +31,7 @@
#include <QShortcut>
#include <QCloseEvent>
#include <QScrollBar>
+#include <QtCoreVersion>
#include <iostream>
@@ -191,7 +192,11 @@ void VP1CustomTourEditor::frameStepToEarlier()
int iframe(m_d->frames.indexOf(dynamic_cast<VP1CustomTourFrameWidget*>(sender())));
if (iframe<=0)
return;//not found or already at start
+#if QTCORE_VERSION >= 0x050D00
+ m_d->frames.swapItemsAt(iframe-1,iframe);
+#else
m_d->frames.swap(iframe-1,iframe);
+#endif
m_d->updateFrameListVisuals();
}
@@ -203,7 +208,11 @@ void VP1CustomTourEditor::frameStepToLater()
return;
if (iframe>=m_d->frames.count()-1)
return;//already at end
+#if QTCORE_VERSION >= 0x050D00
+ m_d->frames.swapItemsAt(iframe,iframe+1);
+#else
m_d->frames.swap(iframe,iframe+1);
+#endif
m_d->updateFrameListVisuals();
}
@@ -278,7 +287,11 @@ void VP1CustomTourEditor::swap( VP1CustomTourFrameWidget * frame1,
||iframe1>=m_d->frames.count()
||iframe2>=m_d->frames.count() )
return;
+#if QTCORE_VERSION >= 0x050D00
+ m_d->frames.swapItemsAt(iframe1,iframe2);
+#else
m_d->frames.swap(iframe1,iframe2);
+#endif
m_d->updateFrameListVisuals();
}
diff --git a/graphics/VP1/VP1Base/src/VP1CustomTourFrameWidget.cxx b/graphics/VP1/VP1Base/src/VP1CustomTourFrameWidget.cxx
index 506f7693f8c6..1790460ff52f 100644
--- a/graphics/VP1/VP1Base/src/VP1CustomTourFrameWidget.cxx
+++ b/graphics/VP1/VP1Base/src/VP1CustomTourFrameWidget.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
@@ -24,6 +24,7 @@
#include <QMimeData>
#include <QBuffer>
#include <QDrag>
+#include <QtWidgetsVersion>
//____________________________________________________________________
class VP1CustomTourFrameWidget::Imp {
@@ -116,7 +117,11 @@ QByteArray VP1CustomTourFrameWidget::serialise() const
s.save(m_d->ui.doubleSpinBox_clipVolumePercentOfATLAS);
s.save(m_d->ui.comboBox_approachMethod);
s.save(m_d->ui.checkBox_frameEnabled);
+#if QTWIDGETS_VERSION >= 0x050F00
+ s.save(m_d->ui.label_snapshot->pixmap(Qt::ReturnByValue));
+#else
s.save(m_d->ui.label_snapshot->pixmap() ? *(m_d->ui.label_snapshot->pixmap()) : QPixmap());
+#endif
s.warnUnsaved(this);
return s.result();
}
@@ -220,7 +225,11 @@ void VP1CustomTourFrameWidget::mouseMoveEvent(QMouseEvent *event)
QMimeData *mimeData = new QMimeData;
mimeData->setData("vp1/customtourframe", QByteArray() );
drag->setMimeData(mimeData);//drag assumes ownership of mimeData
+#if QTWIDGETS_VERSION >= 0x050F00
+ QPixmap pm = m_d->ui.label_snapshot->pixmap(Qt::ReturnByValue);
+#else
QPixmap pm = m_d->ui.label_snapshot->pixmap() ? *(m_d->ui.label_snapshot->pixmap()) : QPixmap();
+#endif
if (!pm.isNull())
drag->setPixmap(pm );
drag->exec(Qt::CopyAction | Qt::MoveAction);
diff --git a/graphics/VP1/VP1Base/src/VP1ExaminerViewer.cxx b/graphics/VP1/VP1Base/src/VP1ExaminerViewer.cxx
index c5cba06d102a..739a910d60d0 100644
--- a/graphics/VP1/VP1Base/src/VP1ExaminerViewer.cxx
+++ b/graphics/VP1/VP1Base/src/VP1ExaminerViewer.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
@@ -29,7 +29,6 @@
#include "VP1Base/VP1CustomStereoEditor.h"
#include "VP1HEPVis/VP1HEPVisUtils.h"
#include "VP1HEPVis/actions/SoGL2PSAction.h"
-#include "VP1HEPVis/gl2ps.h"
#include <Inventor/nodes/SoSphere.h>
#include <Inventor/nodes/SoGroup.h>
@@ -53,6 +52,9 @@
#include <QPushButton>
#include <QGLFormat>
+// Has to be after qt headers because qt uses its own glext.
+#include "VP1HEPVis/gl2ps.h"
+
#include <map>
#include <iostream>
#include <typeinfo>
diff --git a/graphics/VP1/VP1Base/src/VP1GraphicsView.cxx b/graphics/VP1/VP1Base/src/VP1GraphicsView.cxx
index 81f126709211..0c240485f852 100644
--- a/graphics/VP1/VP1Base/src/VP1GraphicsView.cxx
+++ b/graphics/VP1/VP1Base/src/VP1GraphicsView.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////
@@ -211,7 +211,7 @@ VP1GraphicsView::~VP1GraphicsView()
void VP1GraphicsView::scaleView(qreal scaleFactor)
{
abortZoomAnimation();
- qreal factor = matrix().scale(scaleFactor, scaleFactor).mapRect(QRectF(0, 0, 1, 1)).width();
+ qreal factor = transform().scale(scaleFactor, scaleFactor).mapRect(QRectF(0, 0, 1, 1)).width();
if (factor < 1e-5 || factor > 1e5)//Fixme:Set as options!
return;
scale(scaleFactor, scaleFactor);
@@ -238,7 +238,7 @@ void VP1GraphicsView::wheelEvent(QWheelEvent *event)
ratefact = 0.1;
if (event->modifiers() & Qt::ShiftModifier)
ratefact = 0.01;
- scaleView(pow((double)2, -event->delta() / (240.0/ratefact)));
+ scaleView(pow((double)2, -event->angleDelta().y() / (240.0/ratefact)));
}
//____________________________________________________________________
@@ -476,15 +476,15 @@ void VP1GraphicsView::mousePressEvent(QMouseEvent *event)
return;
}
- if (m_d->mode==CHANGEVIEW&&event->buttons()==(Qt::LeftButton|Qt::MidButton)) {
+ if (m_d->mode==CHANGEVIEW&&event->buttons()==(Qt::LeftButton|Qt::MiddleButton)) {
event->accept();
m_d->dragzoom_startpoint=event->pos();
setMode(DRAGZOOM);
return;
}
- if (m_d->mode==DRAGZOOM&&event->buttons()!=(Qt::LeftButton|Qt::MidButton)) {
- if (event->buttons()==(Qt::LeftButton|Qt::MidButton|Qt::RightButton)) {
+ if (m_d->mode==DRAGZOOM&&event->buttons()!=(Qt::LeftButton|Qt::MiddleButton)) {
+ if (event->buttons()==(Qt::LeftButton|Qt::MiddleButton|Qt::RightButton)) {
setMode(DRAGZOOMHOLD);
} else {
setMode(CHANGEVIEW);
@@ -562,14 +562,14 @@ void VP1GraphicsView::mouseReleaseEvent(QMouseEvent *event)
{
//Fixme: transformed pos
- if (m_d->mode==CHANGEVIEW&&event->buttons()==(Qt::LeftButton|Qt::MidButton)) {
+ if (m_d->mode==CHANGEVIEW&&event->buttons()==(Qt::LeftButton|Qt::MiddleButton)) {
event->accept();
m_d->dragzoom_startpoint=event->pos();
setMode(DRAGZOOM);
return;
}
- if (m_d->mode==DRAGZOOM&&event->buttons()!=(Qt::LeftButton|Qt::MidButton)) {
+ if (m_d->mode==DRAGZOOM&&event->buttons()!=(Qt::LeftButton|Qt::MiddleButton)) {
event->accept();
setMode(CHANGEVIEW);
return;
@@ -810,7 +810,7 @@ void VP1GraphicsView::initiateAnimatedZoomTo( QRectF goal )
}
m_d->savedrenderhints=renderHints();
- setRenderHints(0);
+ setRenderHints(QPainter::RenderHints());
m_d->zoomanim_timer->start();
}
@@ -836,7 +836,8 @@ void VP1GraphicsView::abortZoomAnimation()
m_d->zoomanim_queue.clear();
if (m_d->savedrenderhints)
setRenderHints(m_d->savedrenderhints);
- m_d->savedrenderhints=0;//Fixme: renderhints changed during an
+ m_d->savedrenderhints=QPainter::RenderHints();
+ //Fixme: renderhints changed during an
//animation cycle might not be saved... Should
//override the renderhints methods to avoid
//this.
@@ -969,7 +970,7 @@ void VP1GraphicsView::saveImage()
if(filename.isEmpty())
return;
- QPixmap pm = QPixmap::grabWidget ( viewport() );
+ QPixmap pm = viewport()->grab();
if (!(filename.endsWith(".png",Qt::CaseInsensitive)||filename.endsWith(".bmp",Qt::CaseInsensitive)))
filename += ".png";
@@ -1107,7 +1108,7 @@ void VP1GraphicsView::drawItems(QPainter *painter, int numItems,
for (int i = 0; i < numItems; ++i) {
QGraphicsItem *item = items[i];
painter->save();
- painter->setMatrix(item->sceneMatrix(), true);//??
+ painter->setTransform(item->sceneTransform(), true);//??
// std::cout<< item->sceneMatrix().isIdentity()<<std::endl;
// std::cout<< item->sceneMatrix().dx()<<" : "<<item->sceneMatrix().dy()<<std::endl;
m_d->transform->paintItem(painter, item);
diff --git a/graphics/VP1/VP1Base/src/VP1QtInventorUtils.cxx b/graphics/VP1/VP1Base/src/VP1QtInventorUtils.cxx
index 9036eec4b192..5cb5562ae66e 100644
--- a/graphics/VP1/VP1Base/src/VP1QtInventorUtils.cxx
+++ b/graphics/VP1/VP1Base/src/VP1QtInventorUtils.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
@@ -45,6 +45,7 @@
#include <QTextStream>
#include <QSlider>
#include <QGLFormat>
+#include <QtCoreVersion>
#include <iostream>
@@ -519,12 +520,14 @@ QImage VP1QtInventorUtils::renderToImage(VP1ExaminerViewer *ra, int pixels_x, in
SbViewportRegion myViewport;
myViewport.setWindowSize(SbVec2s(pixels_x,pixels_y));
- // init the random number generator a get a random filename for the temp file
- qsrand(QTime::currentTime().msecsTo(QTime(0,0)));
QString tmppath(QDir::tempPath());
if (!tmppath.endsWith(QDir::separator()))
tmppath+=QDir::separator();
- QString tmpfile = tmppath+"vp1tmpfile" +QString::number(qrand())+QString::number(qrand())+".rgb";
+ tmppath += "vp1tmpfileXXXXXX.rgb";
+ std::string stmppath = tmppath.toStdString();
+ int tmpfd = mkstemps (stmppath.data(), 4);
+ FILE* tmpf = fdopen (tmpfd, "w");
+ QString tmpfile (stmppath.c_str());
// declare a new renderer with the viewport created above
SoOffscreenRenderer *myRenderer = new SoOffscreenRenderer(myViewport);
@@ -569,13 +572,16 @@ QImage VP1QtInventorUtils::renderToImage(VP1ExaminerViewer *ra, int pixels_x, in
// write the rendered image to the temp file
// if fails, remove the temp file and return an empty image
- if (!myRenderer->writeToRGB(tmpfile.toStdString().c_str())) {
+ if (!myRenderer->writeToRGB(tmpf)) {
+ fclose (tmpf);
if (QFile::exists(tmpfile))
QFile(tmpfile).remove();
delete myRenderer;
return QImage();
}
+ fclose (tmpf);
+
// delete the renderer
delete myRenderer;
@@ -1432,7 +1438,11 @@ bool VP1QtInventorUtils::writeGraphToFile(SoNode*root, const QString& filename)
QFile data(filename);
if (data.open(QFile::WriteOnly | QFile::Truncate)) {
QTextStream out(&data);
+#if QTCORE_VERSION >= 0x050E00
+ out << s << Qt::endl;
+#else
out << s << endl;
+#endif
return true;
} else {
return false;
diff --git a/graphics/VP1/VP1Base/src/VP1TabBar.cxx b/graphics/VP1/VP1Base/src/VP1TabBar.cxx
index 5b9a63ea6983..b9d3d0517510 100644
--- a/graphics/VP1/VP1Base/src/VP1TabBar.cxx
+++ b/graphics/VP1/VP1Base/src/VP1TabBar.cxx
@@ -133,7 +133,7 @@ void VP1TabBar::mouseMoveEvent( QMouseEvent *event )
return;
}
}
- } else if ( event->buttons() == Qt::MidButton ) {
+ } else if ( event->buttons() == Qt::MiddleButton ) {
if ( m_d->mReorderStartTab == -1 ) {
int delay = 5;//TK fixme KGlobalSettings::dndEventDelay();
QPoint newPos = event->pos();
@@ -178,7 +178,7 @@ void VP1TabBar::activateDragSwitchTab()
void VP1TabBar::mouseReleaseEvent( QMouseEvent *event )
{
- if ( event->button() == Qt::MidButton ) {
+ if ( event->button() == Qt::MiddleButton ) {
if ( m_d->mReorderStartTab == -1 ) {
int tab = selectTab( event->pos() );
if ( tab != -1 ) {
@@ -239,10 +239,7 @@ void VP1TabBar::dropEvent( QDropEvent *event )
#ifndef QT_NO_WHEELEVENT
void VP1TabBar::wheelEvent( QWheelEvent *event )
{
- if ( event->orientation() == Qt::Horizontal )
- return;
-
- emit( wheelDelta( event->delta() ) );
+ emit( wheelDelta( event->angleDelta().y() ) );
}
#endif
diff --git a/graphics/VP1/VP1Base/src/VP1TabWidget.cxx b/graphics/VP1/VP1Base/src/VP1TabWidget.cxx
index b2e2bb470d82..fe9cfdc625f4 100644
--- a/graphics/VP1/VP1Base/src/VP1TabWidget.cxx
+++ b/graphics/VP1/VP1Base/src/VP1TabWidget.cxx
@@ -15,7 +15,7 @@
/* This file is part of the KDE libraries
- Copyright (C) 2003 Stephan Binner <binner@kde.org>
+ Copyright (C) 2003, 2021 Stephan Binner <binner@kde.org>
Copyright (C) 2003 Zack Rusin <zack@kde.org>
This library is free software; you can redistribute it and/or
@@ -41,6 +41,7 @@
#include <QDragMoveEvent>
#include <QStyle>
#include <QTextDocument>
+#include <QtGuiVersion>
@@ -274,7 +275,7 @@ int VP1TabWidget::tabBarWidthForMaxChars( int /*maxLength*/ )
//TK-fixme. Just use elide here?
//TK-fixme newTitle = KStringHandler::rsqueeze( newTitle, maxLength ).leftJustified( m_d->m_minLength, ' ' );
- int lw = fm.width( newTitle );
+ int lw = fm.horizontalAdvance( newTitle );
int iw = 0;
if ( !tabBar()->tabIcon( i ).isNull() ){
iw = tabBar()->tabIcon( i ).pixmap( style()->pixelMetric( QStyle::PM_SmallIconSize ), QIcon::Normal ).width() + 4;
@@ -346,11 +347,12 @@ void VP1TabWidget::dropEvent( QDropEvent *event )
#ifndef QT_NO_WHEELEVENT
void VP1TabWidget::wheelEvent( QWheelEvent *event )
{
- if ( event->orientation() == Qt::Horizontal )
- return;
-
+#if QTGUI_VERSION >= 0x050E00
+ if ( m_d->isEmptyTabbarSpace( event->position().toPoint() ) )
+#else
if ( m_d->isEmptyTabbarSpace( event->pos() ) )
- wheelDelta( event->delta() );
+#endif
+ wheelDelta( event->angleDelta().y() );
else
event->ignore();
}
@@ -392,7 +394,7 @@ void VP1TabWidget::mousePressEvent( QMouseEvent *event )
emit( contextMenu( mapToGlobal( event->pos() ) ) );
return;
}
- } else if ( event->button() == Qt::MidButton ) {
+ } else if ( event->button() == Qt::MiddleButton ) {
if ( m_d->isEmptyTabbarSpace( event->pos() ) ) {
emit( mouseMiddleClick() );
return;
--
GitLab
From a006f8703f10864b8cfc95636ba7f14753cae42b Mon Sep 17 00:00:00 2001
From: Magnar Kopangen Bugge <magnar.kopangen.bugge@cern.ch>
Date: Thu, 19 Aug 2021 18:19:46 +0000
Subject: [PATCH 182/272] Enable MuonSelectorTools unit test in Athena
---
.../MuonID/MuonSelectorTools/CMakeLists.txt | 17 +++--
.../MuonSelectorTools/errorcheck.h | 17 -----
.../util/MuonSelectorToolsTester.cxx | 66 +++++++++++++------
3 files changed, 57 insertions(+), 43 deletions(-)
delete mode 100644 PhysicsAnalysis/MuonID/MuonSelectorTools/MuonSelectorTools/errorcheck.h
diff --git a/PhysicsAnalysis/MuonID/MuonSelectorTools/CMakeLists.txt b/PhysicsAnalysis/MuonID/MuonSelectorTools/CMakeLists.txt
index 36b070bfbd41..edae207fa5f1 100644
--- a/PhysicsAnalysis/MuonID/MuonSelectorTools/CMakeLists.txt
+++ b/PhysicsAnalysis/MuonID/MuonSelectorTools/CMakeLists.txt
@@ -26,6 +26,7 @@ atlas_add_dictionary( MuonSelectorToolsDict
MuonSelectorTools/selection.xml
LINK_LIBRARIES MuonSelectorToolsLib )
+
# Executable(s) in the package:
if( XAOD_STANDALONE )
atlas_add_executable( MuonSelectorToolsTester
@@ -33,16 +34,20 @@ if( XAOD_STANDALONE )
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} xAODRootAccess xAODEventInfo xAODMuon MCTruthClassifierLib
xAODTracking xAODCore MuonSelectorToolsLib PATCoreLib )
+else()
+ atlas_add_executable( MuonSelectorToolsTester
+ util/MuonSelectorToolsTester.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} POOLRootAccessLib xAODRootAccess xAODEventInfo xAODMuon MCTruthClassifierLib
+ xAODTracking xAODCore MuonSelectorToolsLib PATCoreLib )
endif()
# Test(s) in the package:
-if( XAOD_STANDALONE )
- atlas_add_test( ut_MuonSelectorToolsTester_data
- SCRIPT test/ut_MuonSelectorToolsTester_data.sh )
- atlas_add_test( ut_MuonSelectorToolsTester_MC
- SCRIPT test/ut_MuonSelectorToolsTester_MC.sh )
-endif()
+atlas_add_test( ut_MuonSelectorToolsTester_data
+ SCRIPT test/ut_MuonSelectorToolsTester_data.sh )
+atlas_add_test( ut_MuonSelectorToolsTester_MC
+ SCRIPT test/ut_MuonSelectorToolsTester_MC.sh )
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/PhysicsAnalysis/MuonID/MuonSelectorTools/MuonSelectorTools/errorcheck.h b/PhysicsAnalysis/MuonID/MuonSelectorTools/MuonSelectorTools/errorcheck.h
deleted file mode 100644
index 004ce0c2c529..000000000000
--- a/PhysicsAnalysis/MuonID/MuonSelectorTools/MuonSelectorTools/errorcheck.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef CPTOOLTESTS_ERRORCHECK_H
-#define CPTOOLTESTS_ERRORCHECK_H
-
-#define CHECK(ARG) \
- do { \
- const bool result = ARG; \
- if (!result) { \
- ::Error(APP_NAME, "Failed to execute: \"%s\"", #ARG); \
- return 1; \
- } \
- } while (false)
-
-#endif // CPTOOLTESTS_ERRORCHECK_H
diff --git a/PhysicsAnalysis/MuonID/MuonSelectorTools/util/MuonSelectorToolsTester.cxx b/PhysicsAnalysis/MuonID/MuonSelectorTools/util/MuonSelectorToolsTester.cxx
index 0ea43620a55d..acfc7653440d 100644
--- a/PhysicsAnalysis/MuonID/MuonSelectorTools/util/MuonSelectorToolsTester.cxx
+++ b/PhysicsAnalysis/MuonID/MuonSelectorTools/util/MuonSelectorToolsTester.cxx
@@ -19,10 +19,13 @@
#include <TString.h>
// Infrastructure include(s):
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
#include "xAODRootAccess/Init.h"
#include "xAODRootAccess/TEvent.h"
-#endif // ROOTCORE
+#else
+#include "POOLRootAccess/TEvent.h"
+#include "StoreGate/StoreGateSvc.h"
+#endif
// EDM include(s):
#include "xAODEventInfo/EventInfo.h"
@@ -32,7 +35,6 @@
// Local include(s):
#include "MuonSelectorTools/MuonSelectionTool.h"
-#include "MuonSelectorTools/errorcheck.h"
// Needed for Smart Slimming
#include "xAODCore/tools/IOStats.h"
@@ -54,18 +56,31 @@ int main(int argc, char* argv[]) {
return 1;
}
- // Initialise the application:
- CHECK(xAOD::Init(APP_NAME));
+ // Create a TEvent object:
+#ifdef XAOD_STANDALONE
+ if ( xAOD::Init( APP_NAME ).isFailure() ) {
+ Error( APP_NAME, "Failed to do xAOD::Init!" );
+ return 1;
+ }
+ xAOD::TEvent event( xAOD::TEvent::kClassAccess );
+#else
+ POOL::TEvent event( POOL::TEvent::kClassAccess );
+#endif
// 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());
+ if ( !ifile.get() ) {
+ Error( APP_NAME, "Failed to open input file!" );
+ return 1;
+ }
- // Create a TEvent object:
- xAOD::TEvent event;
- CHECK(event.readFrom(ifile.get(), xAOD::TEvent::kClassAccess));
+ //Read from input file with TEvent
+ if ( event.readFrom( ifile.get() ).isFailure() ) {
+ Error( APP_NAME, "Failed to read from input file!" );
+ return 1;
+ }
Info(APP_NAME, "Number of events in the file: %i", static_cast<int>(event.getEntries()));
// Decide how many events to run over:
@@ -75,8 +90,6 @@ int main(int argc, char* argv[]) {
if (e < entries) { entries = e; }
}
- // Create a TStore object
- xAOD::TStore store;
// Create a set of selector tools configured for each of the available working points
@@ -91,19 +104,26 @@ int main(int argc, char* argv[]) {
Info(APP_NAME, "Creating selector tool for working point: %s ...", WPnames[wp].c_str());
CP::MuonSelectionTool* muonSelection = new CP::MuonSelectionTool("MuonSelection_" + WPnames[wp]);
-
muonSelection->msg().setLevel(MSG::INFO);
- CHECK(muonSelection->setProperty("MaxEta", 2.7));
+
+ bool failed = false;
+
+ failed = failed || muonSelection->setProperty("MaxEta", 2.7).isFailure();
if (WPnames[wp] == "LowPtMVA") {
- CHECK (muonSelection->setProperty( "MuQuality", 5));
- CHECK (muonSelection->setProperty( "UseMVALowPt", true));
+ failed = failed || muonSelection->setProperty( "MuQuality", 5).isFailure();
+ failed = failed || muonSelection->setProperty( "UseMVALowPt", true).isFailure();
}
else
- CHECK(muonSelection->setProperty("MuQuality", wp));
+ failed = failed || muonSelection->setProperty("MuQuality", wp).isFailure();
+
+ failed = failed || muonSelection->setProperty("TurnOffMomCorr", true).isFailure();
+ failed = failed || muonSelection->initialize().isFailure();
- CHECK(muonSelection->setProperty("TurnOffMomCorr", true));
- CHECK(muonSelection->initialize());
+ if (failed) {
+ Error( APP_NAME, "Failed to set up MuonSelectorTool for working point: %s !", WPnames[wp].c_str() );
+ return 1;
+ }
selectorTools.emplace_back(muonSelection);
}
@@ -273,7 +293,10 @@ int main(int argc, char* argv[]) {
// Print some event information for fun:
const xAOD::EventInfo* ei = 0;
- CHECK(event.retrieve(ei, "EventInfo"));
+ if ( event.retrieve( ei, "EventInfo" ).isFailure() ) {
+ Error( APP_NAME, "Failed to read EventInfo!" );
+ return 1;
+ }
Info(APP_NAME,
"===>>> start processing event #%i, "
"run #%i %i events processed so far <<<===",
@@ -281,7 +304,10 @@ int main(int argc, char* argv[]) {
// Get the Muons from the event:
const xAOD::MuonContainer* muons = 0;
- CHECK(event.retrieve(muons, "Muons"));
+ if ( event.retrieve( muons, "Muons" ).isFailure() ) {
+ Error( APP_NAME, "Failed to read Muons container!" );
+ return 1;
+ }
Info(APP_NAME, "Number of muons: %i", static_cast<int>(muons->size()));
xAOD::Muon::Quality my_quality;
--
GitLab
From 84921eec000aa557673c1b349f6bb98df92c20c3 Mon Sep 17 00:00:00 2001
From: Rafal Bielski <rafal.bielski@cern.ch>
Date: Thu, 19 Aug 2021 18:23:18 +0000
Subject: [PATCH 183/272] HLTSeeding: spell-check, consistent indentation,
clang-tidy, general cleanup
---
Trigger/TrigSteer/HLTSeeding/CMakeLists.txt | 4 +-
.../HLTSeeding/HLTSeeding/ICTPUnpackingTool.h | 22 ++--
.../HLTSeeding/HLTSeeding/TrigIdentifiers.h | 10 --
.../src/CTPUnpackingEmulationTool.cxx | 42 +++---
.../src/CTPUnpackingEmulationTool.h | 21 ++-
.../HLTSeeding/src/CTPUnpackingTool.cxx | 84 ++++++------
.../HLTSeeding/src/CTPUnpackingTool.h | 27 ++--
.../HLTSeeding/src/CTPUnpackingToolBase.cxx | 30 ++---
.../HLTSeeding/src/CTPUnpackingToolBase.h | 10 +-
.../HLTSeeding/src/EMRoIsUnpackingTool.cxx | 50 +++++---
.../HLTSeeding/src/EMRoIsUnpackingTool.h | 4 +-
.../HLTSeeding/src/FSRoIsUnpackingTool.cxx | 42 +++---
.../HLTSeeding/src/FSRoIsUnpackingTool.h | 8 +-
.../TrigSteer/HLTSeeding/src/HLTSeeding.cxx | 49 ++++---
Trigger/TrigSteer/HLTSeeding/src/HLTSeeding.h | 62 +++++----
.../src/HLTSeedingNoCtpForTesting.cxx | 71 +++++------
.../src/HLTSeedingNoCtpForTesting.h | 35 ++---
.../HLTSeeding/src/IPrescalingTool.h | 17 +--
.../HLTSeeding/src/IRoIsUnpackingTool.h | 10 +-
.../HLTSeeding/src/JRoIsUnpackingTool.cxx | 77 ++++++-----
.../HLTSeeding/src/JRoIsUnpackingTool.h | 10 +-
.../HLTSeeding/src/L1TriggerResultMaker.cxx | 4 +-
.../HLTSeeding/src/METRoIsUnpackingTool.cxx | 36 +++---
.../HLTSeeding/src/METRoIsUnpackingTool.h | 11 +-
.../HLTSeeding/src/MURoIsUnpackingTool.cxx | 58 +++++----
.../HLTSeeding/src/MURoIsUnpackingTool.h | 44 ++++---
.../src/PrescalingEmulationTool.cxx | 45 +++----
.../HLTSeeding/src/PrescalingEmulationTool.h | 44 +++----
.../HLTSeeding/src/PrescalingTool.cxx | 113 +++++++++--------
.../TrigSteer/HLTSeeding/src/PrescalingTool.h | 54 ++++----
.../src/RoIsUnpackingEmulationTool.cxx | 120 ++++++++++--------
.../src/RoIsUnpackingEmulationTool.h | 36 +++---
.../HLTSeeding/src/RoIsUnpackingToolBase.cxx | 30 +++--
.../HLTSeeding/src/RoIsUnpackingToolBase.h | 44 +++----
.../HLTSeeding/src/TAURoIsUnpackingTool.cxx | 64 ++++++----
.../HLTSeeding/src/TAURoIsUnpackingTool.h | 13 +-
.../src/eFexEMRoIThresholdsTool.cxx | 16 +--
.../src/eFexEMRoIsUnpackingTool.cxx | 14 +-
.../HLTSeeding/src/eFexEMRoIsUnpackingTool.h | 2 +-
.../src/eFexTauRoIsUnpackingTool.cxx | 14 +-
.../HLTSeeding/src/eFexTauRoIsUnpackingTool.h | 2 +-
.../src/jFexTauRoIsUnpackingTool.cxx | 14 +-
.../HLTSeeding/src/jFexTauRoIsUnpackingTool.h | 2 +-
43 files changed, 748 insertions(+), 717 deletions(-)
delete mode 100644 Trigger/TrigSteer/HLTSeeding/HLTSeeding/TrigIdentifiers.h
diff --git a/Trigger/TrigSteer/HLTSeeding/CMakeLists.txt b/Trigger/TrigSteer/HLTSeeding/CMakeLists.txt
index 9500d3840cbf..c50dfd15588c 100644
--- a/Trigger/TrigSteer/HLTSeeding/CMakeLists.txt
+++ b/Trigger/TrigSteer/HLTSeeding/CMakeLists.txt
@@ -16,7 +16,9 @@ atlas_add_library( HLTSeedingLib
atlas_add_component( HLTSeeding
src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel AthenaMonitoringKernelLib GaudiKernel HLTSeedingLib StoreGateLib TrigCompositeUtilsLib TrigConfxAODLib TrigCostMonitorLib TrigSteeringEvent TrigT1Interfaces TrigT1Result TrigTimeAlgsLib xAODEventInfo xAODTrigger )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel AthenaMonitoringKernelLib
+ GaudiKernel HLTSeedingLib StoreGateLib TrigCompositeUtilsLib TrigConfxAODLib TrigCostMonitorLib
+ TrigSteeringEvent TrigT1Interfaces TrigT1Result TrigTimeAlgsLib xAODEventInfo xAODTrigger )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Trigger/TrigSteer/HLTSeeding/HLTSeeding/ICTPUnpackingTool.h b/Trigger/TrigSteer/HLTSeeding/HLTSeeding/ICTPUnpackingTool.h
index 83c2f4a0e732..15ce28034c11 100644
--- a/Trigger/TrigSteer/HLTSeeding/HLTSeeding/ICTPUnpackingTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/HLTSeeding/ICTPUnpackingTool.h
@@ -3,38 +3,41 @@
*/
#ifndef HLTSEEDING_ICTPUNPACKINGTOOL_H
-#define HLTSEEDING_ICTPUNPACKINGTOOL_H 1
+#define HLTSEEDING_ICTPUNPACKINGTOOL_H
#include "GaudiKernel/IAlgTool.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
-
namespace ROIB {
class RoIBResult;
}
/**
- * Interface for CTP unpacking tools
+ * @class ICTPUnpackingTool
+ * @brief Interface for CTP unpacking tools
*/
class ICTPUnpackingTool : virtual public IAlgTool {
public:
DeclareInterfaceID(ICTPUnpackingTool, 1, 0);
/**
- * The method decodes CTP bits content of the RoIBResult and fills the list of chains which are activated by those bits
+ * The method decodes CTP bits from the RoIBResult and fills the list of chains which are activated by those bits
*
* The mapping ctpToChain is expected to contain the CTP bit number mapping to the chain identifiers
*
- * @warning if the mapping is empty it means an empty menu. This condition is NOT checked and not reported.
- * @warning if none of CTP bits is set this is also an error condition, this is the event should not have been passed to HLT
+ * @warning If the mapping is empty it means an empty menu. This condition is NOT checked and not reported.
+ * @warning If none of CTP bits is set this is also an error condition, this is an event which should not have been
+ * passed to HLT
*/
virtual StatusCode decode(const ROIB::RoIBResult& roib, HLT::IDVec& enabledChains) const = 0;
/**
- * The method decodes CTP bits content of the RoIBResult and checks if L1 Items
- * from a given list of names passed before prescale
+ * The method decodes CTP bits content of the RoIBResult and checks if L1 Items from a given list of names passed
+ * before prescale
*/
- virtual StatusCode passBeforePrescaleSelection(const ROIB::RoIBResult* roib, const std::vector<std::string>& l1ItemNames, bool& pass) const = 0;
+ virtual StatusCode passBeforePrescaleSelection(const ROIB::RoIBResult* roib,
+ const std::vector<std::string>& l1ItemNames,
+ bool& pass) const = 0;
/**
* Should return true if the implementation of decode() doesn't depend on RoIBResult
@@ -42,5 +45,4 @@ public:
virtual bool isEmulated() const = 0;
};
-
#endif
diff --git a/Trigger/TrigSteer/HLTSeeding/HLTSeeding/TrigIdentifiers.h b/Trigger/TrigSteer/HLTSeeding/HLTSeeding/TrigIdentifiers.h
deleted file mode 100644
index ff3d96bd2a24..000000000000
--- a/Trigger/TrigSteer/HLTSeeding/HLTSeeding/TrigIdentifiers.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
-#ifndef HLTSeeding_TrigIdentifiers_h
-#define HLTSeeding_TrigIdentifiers_h
-
-typedef int TriggerElementID;
-typedef int ChainID;
-
-#endif
diff --git a/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingEmulationTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingEmulationTool.cxx
index 3a013681e5c2..a44be785b1a0 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingEmulationTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingEmulationTool.cxx
@@ -1,23 +1,19 @@
/*
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-#include "TrigCompositeUtils/HLTIdentifier.h"
-#include "TrigT1Result/RoIBResult.h"
#include "CTPUnpackingEmulationTool.h"
-
+#include "TrigCompositeUtils/HLTIdentifier.h"
#include "GaudiKernel/EventContext.h"
#include "GaudiKernel/ThreadLocalContext.h"
+
#include <fstream>
CTPUnpackingEmulationTool::CTPUnpackingEmulationTool( const std::string& type,
- const std::string& name,
- const IInterface* parent )
- : CTPUnpackingToolBase( type, name, parent )
-{
-}
-
+ const std::string& name,
+ const IInterface* parent )
+ : CTPUnpackingToolBase( type, name, parent ) {}
StatusCode CTPUnpackingEmulationTool::parseInputFile() {
@@ -26,24 +22,25 @@ StatusCode CTPUnpackingEmulationTool::parseInputFile() {
ATH_MSG_ERROR( "Input file " << m_inputFileName << " inaccessible" );
return StatusCode::FAILURE;
}
-
+
std::string line;
while ( std::getline( inputFile, line ) ) {
-
- if ( line[0] == '#' ) continue;
+ if ( line[0] == '#' ) {continue;}
std::istringstream allChains( line );
HLT::IDVec ids;
while ( allChains ) {
std::string chainName;
allChains >> chainName;
- if ( not chainName.empty() )
- ids.push_back( HLT::Identifier( chainName ).numeric() );
+ if ( not chainName.empty() ) {
+ ids.push_back( HLT::Identifier( chainName ).numeric() );
+ }
}
-
- if ( not ids.empty() )
+
+ if ( not ids.empty() ) {
m_events.push_back( ids ); // new event
+ }
}
- inputFile.close();
+ inputFile.close();
ATH_MSG_DEBUG( "In input file "<<m_inputFileName.value()<<" found "<<m_events.size()<<" chain sets" );
return StatusCode::SUCCESS;
@@ -51,23 +48,20 @@ StatusCode CTPUnpackingEmulationTool::parseInputFile() {
StatusCode CTPUnpackingEmulationTool::initialize() {
-
- CHECK( CTPUnpackingToolBase::initialize() );
+ ATH_CHECK( CTPUnpackingToolBase::initialize() );
return parseInputFile();
}
+
StatusCode CTPUnpackingEmulationTool::decode( const ROIB::RoIBResult& /*roib*/, HLT::IDVec& enabledChains ) const {
- if ( m_events.size() ==0 ){
+ if ( m_events.empty() ){
ATH_MSG_ERROR( "No chain set found. Cannot decode CTP emulation" );
return StatusCode::FAILURE;
}
const EventContext& context = Gaudi::Hive::currentContext();
- int line = context.evt() % m_events.size();
+ size_t line = context.evt() % m_events.size();
enabledChains = m_events[line];
return StatusCode::SUCCESS;
}
-
-
-
diff --git a/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingEmulationTool.h b/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingEmulationTool.h
index f7c14ffc2e7a..c93b2215c7df 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingEmulationTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingEmulationTool.h
@@ -9,12 +9,12 @@
#include "TrigCompositeUtils/HLTIdentifier.h"
-class CTPUnpackingEmulationTool : public CTPUnpackingToolBase {
+class CTPUnpackingEmulationTool : public CTPUnpackingToolBase {
public:
CTPUnpackingEmulationTool( const std::string& type,
- const std::string& name,
+ const std::string& name,
const IInterface* parent );
virtual StatusCode decode(const ROIB::RoIBResult& roib, HLT::IDVec& enabledChains) const override;
@@ -25,18 +25,15 @@ public:
private:
- ///@{ @name Properties
+ Gaudi::Property<std::string> m_inputFileName{
+ this, "InputFilename", "CTPEmulation.dat", "Fake CTP RoIB input filename"};
- Gaudi::Property<std::string> m_inputFileName{this, "InputFilename", "CTPEmulation.dat", "Fake CTP RoIb input filename"};
+ /// Chain IDs (inner vector) to activate for each event (outer vector)
+ std::vector<HLT::IDVec> m_events;
- ///@}
-
- // @brief returns names oc the chains (iner vector) to activate for each event (outer vector)
- // std::vector < std::set< size_t > > m_events; // list of CTPID enabled, per event
- std::vector < HLT::IDVec > m_events;
- StatusCode parseInputFile() ;
-
-};
+ /// Fill the m_events vector with configuration from an input file
+ StatusCode parseInputFile();
+};
#endif
diff --git a/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingTool.cxx
index ecc21dc116a5..358480e5304d 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingTool.cxx
@@ -1,12 +1,14 @@
/*
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-#include <boost/algorithm/string.hpp>
+#include "CTPUnpackingTool.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigT1Result/CTPResult.h"
#include "TrigT1Result/RoIBResult.h"
+
#include "AthenaMonitoringKernel/Monitored.h"
-#include "CTPUnpackingTool.h"
+
+#include <boost/algorithm/string.hpp>
using namespace HLT;
@@ -14,11 +16,10 @@ using namespace HLT;
CTPUnpackingTool::CTPUnpackingTool( const std::string& type,
const std::string& name,
const IInterface* parent )
- : CTPUnpackingToolBase(type, name, parent) { }
+ : CTPUnpackingToolBase(type, name, parent) {}
-StatusCode CTPUnpackingTool::initialize()
-{
+StatusCode CTPUnpackingTool::initialize() {
ATH_CHECK( m_L1MenuKey.initialize() );
ATH_CHECK( m_HLTMenuKey.initialize() );
@@ -29,10 +30,7 @@ StatusCode CTPUnpackingTool::initialize()
}
-
-
StatusCode CTPUnpackingTool::start() {
- // TODO switch to the L1 menu once available
ATH_MSG_INFO( "Updating CTP bits decoding configuration");
// iterate over all items and obtain the CPT ID for each item. Then, package that in the map: name -> CTP ID
@@ -55,9 +53,8 @@ StatusCode CTPUnpackingTool::start() {
// this code should be removed after the L1 menu is migrated to the new json version
ATH_MSG_WARNING(itemName << " used to seed the chain " << id <<" not in the configuration ");
return StatusCode::SUCCESS;
- } else {
- ATH_MSG_ERROR(itemName << " used to seed the chain " << id <<" not in the configuration ");
}
+ ATH_MSG_ERROR(itemName << " used to seed the chain " << id <<" not in the configuration ");
return StatusCode::FAILURE;
};
@@ -66,7 +63,7 @@ StatusCode CTPUnpackingTool::start() {
for ( const TrigConf::Chain& chain: *hltMenuHandle ) {
HLT::Identifier chainID{ chain.name() };
if ( chain.l1item().empty() ) { // unseeded chain
- m_ctpToChain[ s_CTPIDForUndeededChains ].push_back( chainID );
+ m_ctpToChain[ s_CTPIDForUnseededChains ].push_back( chainID );
} else if ( chain.l1item().find(',') != std::string::npos ) { // OR seeds
std::vector<std::string> items;
@@ -89,67 +86,70 @@ StatusCode CTPUnpackingTool::start() {
}
-
StatusCode CTPUnpackingTool::decode( const ROIB::RoIBResult& roib, HLT::IDVec& enabledChains ) const {
auto nItems = Monitored::Scalar( "Items", 0 );
- auto nChains = Monitored::Scalar( "Chains", 0 );
- auto monitorit = Monitored::Group( m_monTool, nItems, nChains );
+ auto nChains = Monitored::Scalar( "Chains", 0 );
- auto ctpbits = m_useTBPBit ? roib.cTPResult().TBP() : roib.cTPResult().TAV();
- const size_t bitsSize = ctpbits.size();
+ auto ctpBits = m_useTBPBit ? roib.cTPResult().TBP() : roib.cTPResult().TAV();
+ const size_t bitsSize = ctpBits.size();
+ constexpr static size_t wordSize{32};
for ( size_t wordCounter = 0; wordCounter < bitsSize; ++wordCounter ) {
- for ( size_t bitCounter = 0; bitCounter < 32; ++bitCounter ) {
- const size_t ctpIndex = 32*wordCounter + bitCounter;
- const bool decision = ( ctpbits[wordCounter].roIWord() & ((uint32_t)1 << bitCounter) ) > 0;
-
- if ( decision == true or m_forceEnable ) {
- if ( decision ) {
- nItems = nItems + 1;
- ATH_MSG_DEBUG( "L1 item " << ctpIndex << " active, enabling chains "
- << (m_forceEnable ? " due to the forceEnable flag" : " due to the seed"));
- }
-
- auto itr = m_ctpToChain.find( ctpIndex );
- if ( itr != m_ctpToChain.end() ) {
- enabledChains.insert( enabledChains.end(), itr->second.begin(), itr->second.end() );
- }
+ for ( size_t bitCounter = 0; bitCounter < wordSize; ++bitCounter ) {
+ const size_t ctpIndex = wordSize*wordCounter + bitCounter;
+ const bool decision = ( ctpBits[wordCounter].roIWord() & ((uint32_t)1 << bitCounter) ) > 0;
+
+ if ( decision or m_forceEnable ) {
+ if ( decision ) {
+ nItems = nItems + 1;
+ ATH_MSG_DEBUG("L1 item " << ctpIndex << " active, enabling chains "
+ << (m_forceEnable ? " due to the forceEnable flag" : " due to the seed"));
+ }
+
+ auto itr = m_ctpToChain.find( ctpIndex );
+ if ( itr != m_ctpToChain.end() ) {
+ enabledChains.insert( enabledChains.end(), itr->second.begin(), itr->second.end() );
+ }
}
}
}
- // the unseded chains are alwasys enabled at this stage
- auto itr = m_ctpToChain.find( s_CTPIDForUndeededChains );
- if ( itr != m_ctpToChain.end() )
+ // the unseeded chains are always enabled at this stage
+ const auto itr = m_ctpToChain.find( s_CTPIDForUnseededChains );
+ if ( itr != m_ctpToChain.cend() ) {
enabledChains.insert( enabledChains.end(), itr->second.begin(), itr->second.end());
+ }
nChains = enabledChains.size();
for ( auto chain: enabledChains ) {
ATH_MSG_DEBUG( "Enabling chain: " << chain );
}
if ( nItems == 0 ) {
- ATH_MSG_ERROR( "All CTP bits were disabled, this event shoudl not have shown here" );
+ ATH_MSG_ERROR( "All CTP bits were disabled, this event should not have shown here" );
return StatusCode::FAILURE;
}
+ Monitored::Group( m_monTool, nItems, nChains );
return StatusCode::SUCCESS;
}
-StatusCode CTPUnpackingTool::passBeforePrescaleSelection(const ROIB::RoIBResult* roib, const std::vector<std::string>& l1ItemNames, bool& pass) const{
+StatusCode CTPUnpackingTool::passBeforePrescaleSelection(const ROIB::RoIBResult* roib,
+ const std::vector<std::string>& l1ItemNames,
+ bool& pass) const {
pass = false;
- const auto ctpbits = roib->cTPResult().TBP();
+ const auto ctpBits = roib->cTPResult().TBP();
for (const std::string& l1name : l1ItemNames) {
try {
// Retrieve before prescale decision
- const size_t ctpid = m_itemNametoCTPIDMap.at(l1name);
- const size_t bitCounter = ctpid % 32;
- const size_t wordCounter = ctpid / 32;
+ const size_t ctpId = m_itemNametoCTPIDMap.at(l1name);
+ const size_t bitCounter = ctpId % 32;
+ const size_t wordCounter = ctpId / 32;
- const bool decision = (ctpbits[wordCounter].roIWord() & ((uint32_t)1 << bitCounter)) > 0;
+ const bool decision = (ctpBits[wordCounter].roIWord() & ((uint32_t)1 << bitCounter)) > 0;
- pass = pass | decision;
+ pass = (pass || decision);
}
catch (const std::exception& e) {
ATH_MSG_ERROR ( l1name << " is not part of L1Menu!" );
diff --git a/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingTool.h b/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingTool.h
index c6002f84dcd6..1db965494d5e 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingTool.h
@@ -3,7 +3,7 @@
*/
#ifndef HLTSEEDING_CTPUNPACKINGTOOL_H
-#define HLTSEEDING_CTPUNPACKINGTOOL_H 1
+#define HLTSEEDING_CTPUNPACKINGTOOL_H
#include "CTPUnpackingToolBase.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
@@ -20,26 +20,31 @@ public:
const std::string& name,
const IInterface* parent );
- //!< fills the list of chains that should be acvtivated in a given event (note, HLT prescaling happens at a later stage)
+ /// Fills the list of chains that should be activated in a given event (note HLT prescaling happens at a later stage)
virtual StatusCode decode(const ROIB::RoIBResult& roib, HLT::IDVec& enabledChains) const override;
virtual StatusCode initialize() override;
virtual StatusCode start() override;
- virtual StatusCode passBeforePrescaleSelection(const ROIB::RoIBResult* roib, const std::vector<std::string>& l1ItemNames, bool& pass) const override;
+ virtual StatusCode passBeforePrescaleSelection(const ROIB::RoIBResult* roib,
+ const std::vector<std::string>& l1ItemNames,
+ bool& pass) const override;
private:
- // Menu objects (that act here as configuration) need to be available in detector store.
- // They are, at the moment, provided by HLT and LVL1 ConfigSvc during initialize.
- // Threfore these services have to be configured & instantiated in jobs that use this tool (and HLTSeeding itself).
- SG::ReadHandleKey<TrigConf::HLTMenu> m_HLTMenuKey{this, "HLTTriggerMenu", "DetectorStore+HLTTriggerMenu", "HLT Menu"};
- SG::ReadHandleKey<TrigConf::L1Menu> m_L1MenuKey{ this, "L1TriggerMenu", "DetectorStore+L1TriggerMenu", "L1 Menu" };
-
- Gaudi::Property<bool> m_useTBPBit{ this, "UseTBPBits", false, "When true, use Trigger Before Prescale bits instead of Trigger After Veto (for testing only)" };
+ // Menu objects (that act here as configuration) need to be available in the detector store. They are provided by
+ // the HLT and LVL1 ConfigSvc during initialize. Therefore, these services have to be configured & instantiated
+ // in jobs that use this tool (and HLTSeeding itself).
+ SG::ReadHandleKey<TrigConf::HLTMenu> m_HLTMenuKey{
+ this, "HLTTriggerMenu", "DetectorStore+HLTTriggerMenu", "HLT Menu"};
+ SG::ReadHandleKey<TrigConf::L1Menu> m_L1MenuKey{
+ this, "L1TriggerMenu", "DetectorStore+L1TriggerMenu", "L1 Menu"};
+
+ Gaudi::Property<bool> m_useTBPBit{
+ this, "UseTBPBits", false,
+ "When true, use Trigger Before Prescale bits instead of Trigger After Veto (for testing only)"};
std::map<std::string, size_t> m_itemNametoCTPIDMap;
};
-
#endif
diff --git a/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingToolBase.cxx b/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingToolBase.cxx
index ee1636c34004..0736e13f507e 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingToolBase.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingToolBase.cxx
@@ -1,34 +1,34 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-
-#include <iostream>
-
#include "CTPUnpackingToolBase.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
-CTPUnpackingToolBase::CTPUnpackingToolBase(const std::string& type,
- const std::string& name,
- const IInterface* parent)
- : base_class(type, name, parent)
-{
-}
-
+CTPUnpackingToolBase::CTPUnpackingToolBase(const std::string& type,
+ const std::string& name,
+ const IInterface* parent)
+ : base_class(type, name, parent) {}
-StatusCode CTPUnpackingToolBase::initialize()
+StatusCode CTPUnpackingToolBase::initialize()
{
- if ( !m_monTool.empty() ) CHECK( m_monTool.retrieve() );
-
+ if ( !m_monTool.empty() ) {
+ ATH_CHECK( m_monTool.retrieve() );
+ }
+
return StatusCode::SUCCESS;
}
-StatusCode CTPUnpackingToolBase::passBeforePrescaleSelection(const ROIB::RoIBResult* /*roib*/, const std::vector<std::string>& /*l1ItemNames*/, bool& /*pass*/) const {
+
+StatusCode CTPUnpackingToolBase::passBeforePrescaleSelection(const ROIB::RoIBResult* /*roib*/,
+ const std::vector<std::string>& /*l1ItemNames*/,
+ bool& /*pass*/) const {
ATH_MSG_ERROR("Base class should not call this function");
return StatusCode::FAILURE;
}
+
StatusCode CTPUnpackingToolBase::decode(const ROIB::RoIBResult& /*roib*/, HLT::IDVec& /*enabledChains*/) const {
ATH_MSG_ERROR("Base class should not call this function");
return StatusCode::FAILURE;
diff --git a/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingToolBase.h b/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingToolBase.h
index c89258c96e4d..aedbb3ae937a 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingToolBase.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/CTPUnpackingToolBase.h
@@ -3,7 +3,7 @@
*/
#ifndef HLTSEEDING_CTPUNPACKINGTOOLBASE_H
-#define HLTSEEDING_CTPUNPACKINGTOOLBASE_H 1
+#define HLTSEEDING_CTPUNPACKINGTOOLBASE_H
#include "HLTSeeding/ICTPUnpackingTool.h"
@@ -41,17 +41,13 @@ public:
protected:
- static constexpr int s_CTPIDForUndeededChains = -1;
- typedef std::unordered_map<int, HLT::IDVec> IndexToIdentifiers;
- IndexToIdentifiers m_ctpToChain;
-
- ///@{ @name Properties
+ static constexpr int s_CTPIDForUnseededChains = -1;
+ std::unordered_map<int, HLT::IDVec> m_ctpToChain;
Gaudi::Property<bool> m_forceEnable{
this, "ForceEnableAllChains", false, "Enables all chains in each event, testing mode"};
ToolHandle<GenericMonitoringTool> m_monTool{this, "MonTool", "", "Monitoring tool"};
- ///@}
};
#endif
diff --git a/Trigger/TrigSteer/HLTSeeding/src/EMRoIsUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/EMRoIsUnpackingTool.cxx
index eb2ee10ec49c..b5b7217c63f7 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/EMRoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/EMRoIsUnpackingTool.cxx
@@ -7,32 +7,38 @@
#include "TrigT1Interfaces/TrigT1CaloDefs.h"
#include "AthenaMonitoringKernel/Monitored.h"
+
EMRoIsUnpackingTool::EMRoIsUnpackingTool( const std::string& type,
- const std::string& name,
- const IInterface* parent )
+ const std::string& name,
+ const IInterface* parent )
: RoIsUnpackingToolBase(type, name, parent) {}
+
StatusCode EMRoIsUnpackingTool::initialize() {
ATH_CHECK( RoIsUnpackingToolBase::initialize() );
ATH_CHECK( m_recRoIsKey.initialize() );
return StatusCode::SUCCESS;
}
+
StatusCode EMRoIsUnpackingTool::start() {
- ATH_CHECK( decodeMapping( [](const std::string& name ){ return name.find("EM") == 0 or name.find(getProbeThresholdName("EM")) == 0; } ) );
+ ATH_CHECK(decodeMapping([](const std::string& name){
+ return name.find("EM") == 0 or name.find(getProbeThresholdName("EM")) == 0;
+ }));
return StatusCode::SUCCESS;
}
-StatusCode EMRoIsUnpackingTool::unpack( const EventContext& ctx,
- const ROIB::RoIBResult& roib,
- const HLT::IDSet& activeChains ) const {
+
+StatusCode EMRoIsUnpackingTool::unpack(const EventContext& ctx,
+ const ROIB::RoIBResult& roib,
+ const HLT::IDSet& activeChains) const {
using namespace TrigCompositeUtils;
// create and record the collections needed
- SG::WriteHandle<TrigRoiDescriptorCollection> trigRoIs = createAndStoreNoAux(m_trigRoIsKey, ctx );
+ SG::WriteHandle<TrigRoiDescriptorCollection> trigRoIs = createAndStoreNoAux(m_trigRoIsKey, ctx );
SG::WriteHandle<DataVector<LVL1::RecEmTauRoI>> recRoIs = createAndStoreNoAux( m_recRoIsKey, ctx );
- SG::WriteHandle<DecisionContainer> decisionOutput = createAndStore(m_decisionsKey, ctx );
- SG::WriteHandle<DecisionContainer> decisionOutputProbe = createAndStore(m_decisionsKeyProbe, ctx );
+ SG::WriteHandle<DecisionContainer> decisionOutput = createAndStore(m_decisionsKey, ctx );
+ SG::WriteHandle<DecisionContainer> decisionOutputProbe = createAndStore(m_decisionsKeyProbe, ctx );
// Retrieve the L1 menu configuration
SG::ReadHandle<TrigConf::L1Menu> l1Menu = SG::makeHandle(m_l1MenuKey, ctx);
@@ -43,24 +49,24 @@ StatusCode EMRoIsUnpackingTool::unpack( const EventContext& ctx,
// RoIBResult contains vector of EM fragments
for ( const auto & emTauFragment : roib.eMTauResult() ) {
for ( const auto & roi : emTauFragment.roIVec() ) {
- uint32_t roIWord = roi.roIWord();
+ uint32_t roIWord = roi.roIWord();
if ( not ( LVL1::TrigT1CaloDefs::EMRoIWordType == roi.roIType() ) ) {
ATH_MSG_DEBUG( "Skipping RoI as it is not EM threshold " << roIWord );
continue;
}
-
+
recRoIs->push_back( std::make_unique<LVL1::RecEmTauRoI>(roIWord, l1Menu.cptr()) );
const LVL1::RecEmTauRoI* recRoI = recRoIs->back();
-
+
trigRoIs->push_back( std::make_unique<TrigRoiDescriptor>(
roIWord, 0u ,0u,
recRoI->eta(), recRoI->eta()-m_roIWidth, recRoI->eta()+m_roIWidth,
recRoI->phi(), recRoI->phi()-m_roIWidth, recRoI->phi()+m_roIWidth) );
-
- ATH_MSG_DEBUG( "RoI word: 0x" << MSG::hex << std::setw( 8 ) << roIWord << MSG::dec );
+
+ ATH_MSG_DEBUG( "RoI word: 0x" << MSG::hex << std::setw( 8 ) << roIWord << MSG::dec );
// The hltSeedingNodeName denotes an initial node with no parents
- Decision* decisionMain = TrigCompositeUtils::newDecisionIn( decisionOutput.ptr(), hltSeedingNodeName() );
+ Decision* decisionMain = TrigCompositeUtils::newDecisionIn( decisionOutput.ptr(), hltSeedingNodeName() );
Decision* decisionProbe = TrigCompositeUtils::newDecisionIn( decisionOutputProbe.ptr(), hltSeedingNodeName() );
std::vector<unsigned> passedThresholdIDs;
@@ -77,13 +83,17 @@ StatusCode EMRoIsUnpackingTool::unpack( const EventContext& ctx,
}
decisionMain->setDetail( "thresholds", passedThresholdIDs );
- decisionMain->setObjectLink( initialRoIString(), ElementLink<TrigRoiDescriptorCollection>( m_trigRoIsKey.key(), trigRoIs->size()-1 ) );
- decisionMain->setObjectLink( initialRecRoIString(), ElementLink<DataVector<LVL1::RecEmTauRoI>>( m_recRoIsKey.key(), recRoIs->size()-1 ) );
+ decisionMain->setObjectLink( initialRoIString(),
+ ElementLink<TrigRoiDescriptorCollection>(m_trigRoIsKey.key(), trigRoIs->size()-1) );
+ decisionMain->setObjectLink( initialRecRoIString(),
+ ElementLink<DataVector<LVL1::RecEmTauRoI>>(m_recRoIsKey.key(), recRoIs->size()-1) );
decisionProbe->setDetail( "thresholds", passedThresholdIDs );
- decisionProbe->setObjectLink( initialRoIString(), ElementLink<TrigRoiDescriptorCollection>( m_trigRoIsKey.key(), trigRoIs->size()-1 ) );
- decisionProbe->setObjectLink( initialRecRoIString(), ElementLink<DataVector<LVL1::RecEmTauRoI>>( m_recRoIsKey.key(), recRoIs->size()-1 ) );
- }
+ decisionProbe->setObjectLink( initialRoIString(),
+ ElementLink<TrigRoiDescriptorCollection>(m_trigRoIsKey.key(), trigRoIs->size()-1) );
+ decisionProbe->setObjectLink( initialRecRoIString(),
+ ElementLink<DataVector<LVL1::RecEmTauRoI>>(m_recRoIsKey.key(), recRoIs->size()-1) );
+ }
}
for ( auto roi: *trigRoIs ) {
diff --git a/Trigger/TrigSteer/HLTSeeding/src/EMRoIsUnpackingTool.h b/Trigger/TrigSteer/HLTSeeding/src/EMRoIsUnpackingTool.h
index 5b31e31236ff..28a99c3581be 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/EMRoIsUnpackingTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/EMRoIsUnpackingTool.h
@@ -2,7 +2,7 @@
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef HLTSEEDING_EMROISUNPACKINGTOOL_H
-#define HLTSEEDING_EMROISUNPACKINGTOOL_H 1
+#define HLTSEEDING_EMROISUNPACKINGTOOL_H
#include "RoIsUnpackingToolBase.h"
@@ -25,14 +25,12 @@ public:
virtual StatusCode start() override;
private:
- ///@{ @name Properties
SG::WriteHandleKey< DataVector<LVL1::RecEmTauRoI> > m_recRoIsKey{
this, "OutputRecRoIs", "HLT_RecEMRoIs",
"Name of the RoIs object produced by the unpacker"};
Gaudi::Property<float> m_roIWidth{
this, "RoIWidth", 0.1, "Size of RoI in eta/ phi"};
- ///@}
};
#endif //> !HLTSEEDING_EMROISUNPACKINGTOOL_H
diff --git a/Trigger/TrigSteer/HLTSeeding/src/FSRoIsUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/FSRoIsUnpackingTool.cxx
index b7c848b8617a..3aa7ff929c76 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/FSRoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/FSRoIsUnpackingTool.cxx
@@ -6,24 +6,25 @@
#include "xAODTrigger/TrigCompositeContainer.h"
-FSRoIsUnpackingTool::FSRoIsUnpackingTool( const std::string& type,
- const std::string& name,
- const IInterface* parent )
+FSRoIsUnpackingTool::FSRoIsUnpackingTool(const std::string& type,
+ const std::string& name,
+ const IInterface* parent)
: RoIsUnpackingToolBase(type, name, parent) {}
-StatusCode FSRoIsUnpackingTool::initialize()
-{
+
+StatusCode FSRoIsUnpackingTool::initialize() {
ATH_CHECK(RoIsUnpackingToolBase::initialize());
return StatusCode::SUCCESS;
}
+
StatusCode FSRoIsUnpackingTool::start() {
- ATH_CHECK( decodeMapping( [](const std::string& name ){ return
- name.find("FS") == 0 or
- name == ""; } ) );
+ ATH_CHECK(decodeMapping([](const std::string& name){
+ return name.find("FS") == 0 or name.empty();
+ }));
m_allFSChains.clear();
-
+
for ( auto thresholdToChain: m_thresholdToChainMapping ) {
m_allFSChains.insert( thresholdToChain.second.begin(), thresholdToChain.second.end() );
}
@@ -36,25 +37,26 @@ StatusCode FSRoIsUnpackingTool::start() {
}
-StatusCode FSRoIsUnpackingTool::unpack( const EventContext& ctx,
- const ROIB::RoIBResult& /*roib*/,
- const HLT::IDSet& activeChains ) const {
+StatusCode FSRoIsUnpackingTool::unpack(const EventContext& ctx,
+ const ROIB::RoIBResult& /*roib*/,
+ const HLT::IDSet& activeChains) const {
using namespace TrigCompositeUtils;
SG::WriteHandle<DecisionContainer> handle = createAndStore(m_decisionsKey, ctx );
auto *decisionOutput = handle.ptr();
- HLT::IDSet activeFSchains;
+ HLT::IDSet activeFSChains;
// see if any chain we care of is active
std::set_intersection(activeChains.begin(), activeChains.end(),
- m_allFSChains.begin(), m_allFSChains.end(),
- std::inserter(activeFSchains, activeFSchains.end() ) );
+ m_allFSChains.begin(), m_allFSChains.end(),
+ std::inserter(activeFSChains, activeFSChains.end()));
- auto *decision = TrigCompositeUtils::newDecisionIn( decisionOutput, hltSeedingNodeName() ); // This hltSeedingNodeName() denotes an initial node with no parents
+ // This hltSeedingNodeName() denotes an initial node with no parents
+ auto *decision = TrigCompositeUtils::newDecisionIn( decisionOutput, hltSeedingNodeName() );
addChainsToDecision( HLT::Identifier( "FSNOSEED" ), decision, activeChains );
- ATH_MSG_DEBUG("Unpacking FS RoI for " << activeFSchains.size() << " chains: " << [&](){
- TrigCompositeUtils::DecisionIDContainer ids;
- TrigCompositeUtils::decisionIDs( decision, ids );
+ ATH_MSG_DEBUG("Unpacking FS RoI for " << activeFSChains.size() << " chains: " << [&](){
+ TrigCompositeUtils::DecisionIDContainer ids;
+ TrigCompositeUtils::decisionIDs( decision, ids );
return std::vector<TrigCompositeUtils::DecisionID>( ids.begin(), ids.end() ); }() );
auto roiHandle = SG::makeHandle( m_trigRoIsKey, ctx );
@@ -62,7 +64,7 @@ StatusCode FSRoIsUnpackingTool::unpack( const EventContext& ctx,
roiHandle->push_back( std::make_unique<TrigRoiDescriptor>(true) ); // true == FS
ATH_MSG_DEBUG("Linking to FS RoI descriptor");
- decision->setObjectLink( initialRoIString(), ElementLink<TrigRoiDescriptorCollection>( m_trigRoIsKey.key(), 0 ) );
+ decision->setObjectLink( initialRoIString(), ElementLink<TrigRoiDescriptorCollection>( m_trigRoIsKey.key(), 0 ) );
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigSteer/HLTSeeding/src/FSRoIsUnpackingTool.h b/Trigger/TrigSteer/HLTSeeding/src/FSRoIsUnpackingTool.h
index 9642d7b895fb..602c5f277465 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/FSRoIsUnpackingTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/FSRoIsUnpackingTool.h
@@ -2,16 +2,16 @@
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef HLTSEEDING_FSROISUNPACKINGTOOL_H
-#define HLTSEEDING_FSROISUNPACKINGTOOL_H 1
+#define HLTSEEDING_FSROISUNPACKINGTOOL_H
#include "RoIsUnpackingToolBase.h"
class FSRoIsUnpackingTool : public RoIsUnpackingToolBase {
public:
- FSRoIsUnpackingTool( const std::string& type,
- const std::string& name,
- const IInterface* parent );
+ FSRoIsUnpackingTool(const std::string& type,
+ const std::string& name,
+ const IInterface* parent);
virtual StatusCode initialize() override;
virtual StatusCode start() override;
diff --git a/Trigger/TrigSteer/HLTSeeding/src/HLTSeeding.cxx b/Trigger/TrigSteer/HLTSeeding/src/HLTSeeding.cxx
index 954f401c31b7..e03bbd911ea0 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/HLTSeeding.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/HLTSeeding.cxx
@@ -4,21 +4,25 @@
*/
#include "HLTSeeding.h"
-
-#include "StoreGate/WriteHandle.h"
-#include "GaudiKernel/EventContext.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
#include "TrigConfxAOD/IKeyWriterTool.h"
#include "xAODTrigger/TrigCompositeAuxContainer.h"
+#include "StoreGate/WriteHandle.h"
+#include "GaudiKernel/EventContext.h"
+
+
HLTSeeding::HLTSeeding(const std::string& name, ISvcLocator* pSvcLocator)
: AthReentrantAlgorithm(name, pSvcLocator) {}
+
StatusCode HLTSeeding::initialize() {
- ATH_MSG_INFO( "Reading RoIB infromation from: "<< m_RoIBResultKey.objKey() << " : " << m_RoIBResultKey.fullKey() << " : " << m_RoIBResultKey.key() );
+ ATH_MSG_INFO( "Reading RoIB information from: " << m_RoIBResultKey.objKey() << " : "
+ << m_RoIBResultKey.fullKey() << " : " << m_RoIBResultKey.key() );
- if ( m_RoIBResultKey.empty() )
- ATH_MSG_INFO( "RoIBResultKey empty: assume we're running with CTP emulation" );
+ if ( m_RoIBResultKey.empty() && m_l1TriggerResultKey.empty() ) {
+ ATH_MSG_INFO( "RoIBResult and L1TriggerResult keys both empty: assume we're running with CTP emulation" );
+ }
ATH_CHECK( m_RoIBResultKey.initialize(!m_RoIBResultKey.empty()) );
ATH_CHECK( m_l1TriggerResultKey.initialize(!m_l1TriggerResultKey.empty()) );
@@ -56,7 +60,7 @@ StatusCode HLTSeeding::execute (const EventContext& ctx) const {
if (decodeRoIB) {
SG::ReadHandle<ROIB::RoIBResult> roibH( m_RoIBResultKey, ctx );
roib = roibH.cptr();
- ATH_MSG_DEBUG( "Obtained ROIB result" );
+ ATH_MSG_DEBUG( "Obtained RoIBResult" );
}
const xAOD::TrigComposite* l1TriggerResult = nullptr;
@@ -84,15 +88,6 @@ StatusCode HLTSeeding::execute (const EventContext& ctx) const {
SG::WriteHandle<DecisionContainer> handle = TrigCompositeUtils::createAndStore( m_summaryKey, ctx );
auto *chainsInfo = handle.ptr();
- /*
- auto chainsInfo = std::make_unique<DecisionContainer>();
- auto chainsAux = std::make_unique<DecisionAuxContainer>();
- chainsInfo->setStore(chainsAux.get());
- ATH_MSG_DEBUG("Recording chains");
- auto handle = SG::makeHandle( m_chainsKey, ctx );
- ATH_CHECK( handle.record( std::move( chainsInfo ), std::move( chainsAux ) ) );
- */
-
HLT::IDVec l1SeededChains;
if (decodeRoIB) {
ATH_CHECK( m_ctpUnpacker->decode( *roib, l1SeededChains ) );
@@ -104,15 +99,16 @@ StatusCode HLTSeeding::execute (const EventContext& ctx) const {
HLT::IDVec activeChains; // Chains which are activated to run in the first pass (seeded and pass prescale)
HLT::IDVec prescaledChains; // Chains which are activated but do not run in the first pass (seeded but prescaled out)
- std::set_difference( activeChains.begin(), activeChains.end(),
- l1SeededChains.begin(), l1SeededChains.end(),
- std::back_inserter(prescaledChains) );
+ std::set_difference(activeChains.begin(), activeChains.end(),
+ l1SeededChains.begin(), l1SeededChains.end(),
+ std::back_inserter(prescaledChains));
- ATH_CHECK( m_prescaler->prescaleChains( ctx, l1SeededChains, activeChains ) );
+ ATH_CHECK( m_prescaler->prescaleChains( ctx, l1SeededChains, activeChains ) );
ATH_CHECK( saveChainsInfo( l1SeededChains, chainsInfo, "l1seeded" ) );
ATH_CHECK( saveChainsInfo( activeChains, chainsInfo, "unprescaled" ) );
ATH_CHECK( saveChainsInfo( prescaledChains, chainsInfo, "prescaled" ) );
- //Note: 'prescaled' can be deduced from 'l1seeded' and 'unprescaled'. This non-persistent collection is provided for convenience.
+ // Note: 'prescaled' can be deduced from 'l1seeded' and 'unprescaled'.
+ // This non-persistent collection is provided for convenience.
// Do cost monitoring, this utilises the HLT_costmonitor chain
if (m_doCostMonitoring) {
@@ -144,18 +140,17 @@ StatusCode HLTSeeding::execute (const EventContext& ctx) const {
ATH_CHECK( m_keyWriterTool->writeKeys(ctx) );
}
- return StatusCode::SUCCESS;
-}
-
-StatusCode HLTSeeding::finalize() {
return StatusCode::SUCCESS;
}
-StatusCode HLTSeeding::saveChainsInfo(const HLT::IDVec& chains, xAOD::TrigCompositeContainer* storage, const std::string& type) const {
+StatusCode HLTSeeding::saveChainsInfo(const HLT::IDVec& chains,
+ xAOD::TrigCompositeContainer* storage,
+ const std::string& type) {
using namespace TrigCompositeUtils;
Decision* d = newDecisionIn( storage, type );
- for ( auto c: chains)
+ for ( auto c: chains) {
addDecisionID(c.numeric(), d);
+ }
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigSteer/HLTSeeding/src/HLTSeeding.h b/Trigger/TrigSteer/HLTSeeding/src/HLTSeeding.h
index 222bf16780b8..d788a94bda1d 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/HLTSeeding.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/HLTSeeding.h
@@ -20,75 +20,71 @@
#include "TrigTimeAlgs/TrigTimeStamp.h"
#include "xAODTrigger/TrigCompositeContainer.h"
-/*
- @brief an algorithm used to unpack the RoIB result and provide CTP bits, active chains and RoIs
-
- All the unpacking is outsourced to tools. However the menu mapping, this is from CTP items to chains
- and threshods to chains is maintained in this algorithm and provided to unpacking tools.
+/**
+ * @class HLTSeeding
+ * @brief Collects information from CTP bits and LVL1 RoIs, activates HLT chains and creates seeding RoIs
+ *
+ * All the unpacking is outsourced to tools. However the menu mapping, this is from CTP items to chains
+ * and from thresholds to chains, is maintained in this algorithm and provided to unpacking tools.
*/
class HLTSeeding : public AthReentrantAlgorithm {
public:
HLTSeeding(const std::string& name, ISvcLocator* pSvcLocator);
virtual StatusCode initialize() override;
virtual StatusCode execute (const EventContext& ctx) const override;
- virtual StatusCode finalize() override;
private:
- StatusCode saveChainsInfo(const HLT::IDVec& chains,
- xAOD::TrigCompositeContainer* storage,
- const std::string& type) const;
-
- ///@{ @name Properties
+ static StatusCode saveChainsInfo(const HLT::IDVec& chains,
+ xAOD::TrigCompositeContainer* storage,
+ const std::string& type);
+ /// @name Data dependencies
+ /// @{
/// Level-1 result with RoIs from Run-2 hardware systems
SG::ReadHandleKey<ROIB::RoIBResult> m_RoIBResultKey{
this, "RoIBResult", "RoIBResult", "Name of RoIBResult"};
/// Level-1 result with RoIs from Run-3 hardware systems
SG::ReadHandleKey<xAOD::TrigCompositeContainer> m_l1TriggerResultKey{
- this, "L1TriggerResult", "L1TriggerResult",
- "Name of the L1 Trigger Result"};
+ this, "L1TriggerResult", "L1TriggerResult", "Name of the L1 Trigger Result"};
SG::WriteHandleKey<TrigCompositeUtils::DecisionContainer> m_summaryKey{
- this, "HLTSeedingSummaryKey", "HLTSeedingSummary",
- "Chains status after L1 and prescaling"}; // Note: was previously property 'Chains' with default value 'HLTChains'
+ this, "HLTSeedingSummaryKey", "HLTSeedingSummary", "Chains status after L1 and prescaling"};
SG::WriteHandleKey<TrigTimeStamp> m_startStampKey{
- this, "StartStampKey", "HLTSeedingStart",
- "Object with the time stamp when decoding started" };
+ this, "StartStampKey", "HLTSeedingStart", "Object with the time stamp when decoding started" };
+ /// @}
+ /// @name Properties
+ /// @{
Gaudi::Property<bool> m_doCostMonitoring{
- this, "DoCostMonitoring", false,
- "Enables start-of-event cost monitoring behavior."};
+ this, "DoCostMonitoring", false, "Enables start-of-event cost monitoring behavior."};
Gaudi::Property<std::string> m_costMonitoringChain{
this, "CostMonitoringChain", "HLT_noalg_CostMonDS_L1All",
- "Name of the chain which should enable HLT cost montoring."};
+ "Name of the chain which should enable HLT cost monitoring."};
+ /// @}
+ /// @name Tools and Services
+ /// @{
ServiceHandle<ITrigCostSvc> m_trigCostSvcHandle {
- this, "TrigCostSvc", "TrigCostSvc",
- "The trigger cost service" };
+ this, "TrigCostSvc", "TrigCostSvc", "The trigger cost service" };
ToolHandle<ICTPUnpackingTool> m_ctpUnpacker{
- this, "ctpUnpacker", "CTPUnpackingTool/CTPUnpackingTool",
- "Tool used to unpack the CTP info"};
+ this, "ctpUnpacker", "CTPUnpackingTool/CTPUnpackingTool", "Tool used to unpack the CTP info"};
ToolHandleArray<IRoIsUnpackingTool> m_roiUnpackers_roib{
- this, "RoIBRoIUnpackers", {},
- "Tools unpacking Run-2 RoIs from RoIBResult"};
+ this, "RoIBRoIUnpackers", {}, "Tools unpacking Run-2 RoIs from RoIBResult"};
ToolHandleArray<IRoIsUnpackingTool> m_roiUnpackers_xaod{
- this, "xAODRoIUnpackers", {},
- "Tools unpacking xAOD RoIs from L1TriggerResult"};
+ this, "xAODRoIUnpackers", {}, "Tools unpacking xAOD RoIs from L1TriggerResult"};
ToolHandle<IPrescalingTool> m_prescaler{
- this, "prescaler", "PrescalingTool/PrescalingTool",
- "Prescaling tool"};
+ this, "prescaler", "PrescalingTool/PrescalingTool", "Prescaling tool"};
ToolHandle<TrigConf::IKeyWriterTool> m_keyWriterTool{
- this, "KeyWriterTool", "",
- "Writes the keys used when the trigger executes on an event"};
-
+ this, "KeyWriterTool", "", "Writes the keys used when the trigger executes on an event"};
+ /// @}
};
#endif
diff --git a/Trigger/TrigSteer/HLTSeeding/src/HLTSeedingNoCtpForTesting.cxx b/Trigger/TrigSteer/HLTSeeding/src/HLTSeedingNoCtpForTesting.cxx
index faafde2c87e6..4c767fb3f9a8 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/HLTSeedingNoCtpForTesting.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/HLTSeedingNoCtpForTesting.cxx
@@ -2,25 +2,27 @@
/*
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-#include "StoreGate/WriteHandle.h"
-#include "GaudiKernel/EventContext.h"
-#include "TrigT1Interfaces/RecEmTauRoI.h"
+#include "HLTSeedingNoCtpForTesting.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
#include "TrigConfL1Data/ThresholdConfig.h"
#include "TrigConfL1Data/TriggerThreshold.h"
-#include "HLTSeedingNoCtpForTesting.h"
+#include "TrigT1Interfaces/RecEmTauRoI.h"
+
+#include "StoreGate/WriteHandle.h"
+#include "GaudiKernel/EventContext.h"
+
HLTSeedingNoCtpForTesting::HLTSeedingNoCtpForTesting(const std::string& name, ISvcLocator* pSvcLocator)
- : AthReentrantAlgorithm(name, pSvcLocator)
-{}
+ : AthReentrantAlgorithm(name, pSvcLocator) {}
StatusCode HLTSeedingNoCtpForTesting::initialize() {
- ATH_MSG_INFO( "Reading RoIB infromation from: "<< m_RoIBResultKey.objKey() << " : " << m_RoIBResultKey.fullKey() << " : " << m_RoIBResultKey.key() );
+ ATH_MSG_INFO( "Reading RoIB information from: " << m_RoIBResultKey.objKey()
+ << " : " << m_RoIBResultKey.fullKey() << " : " << m_RoIBResultKey.key() );
ATH_CHECK( m_RoIBResultKey.initialize( ) );
ATH_CHECK( m_trigEMRoIsKey.initialize() );
- ATH_CHECK(m_EMDecisionsKey.initialize() );
- ATH_CHECK( m_trigFSRoIKey.initialize() );
+ ATH_CHECK( m_EMDecisionsKey.initialize() );
+ ATH_CHECK( m_trigFSRoIKey.initialize() );
return StatusCode::SUCCESS;
}
@@ -30,43 +32,38 @@ StatusCode HLTSeedingNoCtpForTesting::execute (const EventContext& ctx) const {
SG::ReadHandle<ROIB::RoIBResult> roibH( m_RoIBResultKey, ctx );
ATH_CHECK( roibH.isValid() );
- SG::WriteHandle<TrigRoiDescriptorCollection> handleTrigRoIs = createAndStoreNoAux(m_trigEMRoIsKey, ctx );
- auto *emRoIs = handleTrigRoIs.ptr();
-
- SG::WriteHandle<TrigRoiDescriptorCollection> handleTrigFSRoI = createAndStoreNoAux(m_trigFSRoIKey, ctx );
- auto *fsRoIs = handleTrigFSRoI.ptr();
- fsRoIs->push_back( new TrigRoiDescriptor( true ) );
+ SG::WriteHandle<TrigRoiDescriptorCollection> emRoIs = createAndStoreNoAux(m_trigEMRoIsKey, ctx);
+ SG::WriteHandle<TrigRoiDescriptorCollection> fsRoIs = createAndStoreNoAux(m_trigFSRoIKey, ctx);
+ fsRoIs->push_back( std::make_unique<TrigRoiDescriptor>(true) );
using namespace TrigConf;
TrigConf::TriggerThreshold threshold;
- SG::WriteHandle<DecisionContainer> handleDecisions = createAndStore(m_EMDecisionsKey, ctx );
- auto *decisionOutput = handleDecisions.ptr();
-
+ SG::WriteHandle<DecisionContainer> decisionOutput = createAndStore(m_EMDecisionsKey, ctx );
+
std::vector<TrigConf::TriggerThreshold*> thresholds{ & threshold};
-
+
for ( const auto & emTauFragment : roibH->eMTauResult() ) {
for ( const auto & roi : emTauFragment.roIVec() ) {
- uint32_t roIWord = roi.roIWord();
+ uint32_t roIWord = roi.roIWord();
if ( not ( LVL1::TrigT1CaloDefs::EMRoIWordType == roi.roIType() ) ) {
- ATH_MSG_VERBOSE( "Skipping RoI as it is not EM threshold " << roIWord );
- continue;
+ ATH_MSG_VERBOSE( "Skipping RoI as it is not EM threshold " << roIWord );
+ continue;
}
LVL1::RecEmTauRoI recRoI( roIWord, &thresholds );
- auto *roiDesc = new TrigRoiDescriptor( roIWord, 0u ,0u,
- recRoI.eta(), recRoI.eta()-m_roIWidth, recRoI.eta()+m_roIWidth,
- recRoI.phi(), recRoI.phi()-m_roIWidth, recRoI.phi()+m_roIWidth );
- ATH_MSG_DEBUG("Decoded EM RoI at position " << *roiDesc );
- emRoIs->push_back( roiDesc );
-
- auto *decision = TrigCompositeUtils::newDecisionIn( decisionOutput, hltSeedingNodeName() );
- decision->setObjectLink( initialRoIString(), ElementLink<TrigRoiDescriptorCollection>( m_trigEMRoIsKey.key(), emRoIs->size()-1 ) );
- addDecisionID( HLT::Identifier( "HLT_EMTestChain" ), decision );
+
+ emRoIs->push_back( std::make_unique<TrigRoiDescriptor>(
+ roIWord, 0u ,0u,
+ recRoI.eta(), recRoI.eta()-m_roIWidth, recRoI.eta()+m_roIWidth,
+ recRoI.phi(), recRoI.phi()-m_roIWidth, recRoI.phi()+m_roIWidth) );
+
+ ATH_MSG_DEBUG("Decoded EM RoI at position " << *emRoIs->back() );
+
+ Decision* decision = TrigCompositeUtils::newDecisionIn( decisionOutput.ptr(), hltSeedingNodeName() );
+ decision->setObjectLink( initialRoIString(),
+ ElementLink<TrigRoiDescriptorCollection>(m_trigEMRoIsKey.key(), emRoIs->size()-1) );
+ addDecisionID( HLT::Identifier( "HLT_EMTestChain" ), decision );
}
}
-
- return StatusCode::SUCCESS;
-}
-// StatusCode HLTSeedingNoCtpForTesting::finalize() {
-// return StatusCode::SUCCESS;
-// }
+ return StatusCode::SUCCESS;
+}
diff --git a/Trigger/TrigSteer/HLTSeeding/src/HLTSeedingNoCtpForTesting.h b/Trigger/TrigSteer/HLTSeeding/src/HLTSeedingNoCtpForTesting.h
index fce5e471cf09..0cba083118f0 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/HLTSeedingNoCtpForTesting.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/HLTSeedingNoCtpForTesting.h
@@ -1,51 +1,44 @@
/*
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-
#ifndef HLTSeeding_HLTSeedingNoCtpForTesting_h
#define HLTSeeding_HLTSeedingNoCtpForTesting_h
-
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
-#include "xAODTrigger/TrigCompositeContainer.h"
+#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
#include "TrigT1Result/RoIBResult.h"
+#include "xAODTrigger/TrigCompositeContainer.h"
+
#include "AthenaBaseComps/AthReentrantAlgorithm.h"
-#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
-/*
- @brief an algorithm used to unpack the RoIB result and provide RoIs for test algorithms.
- It is different from the proper @see HLTSeeding algorithm because it has no menu dependencey and realy does not care about the CTP decisions.
- It only provides RoIs so that HLT reconstruction algorithms have seeds to run on.
- For EMTAU RoIs the generated decisions are flagged with a specimen chain (see source).
- @warning - this algorithm is only for testing, never to be used in production.
+/**
+ * @class HLTSeedingNoCtpForTesting
+ * @brief Simplified version of HLTSeeding with minimal dependencies to use in testing
+ *
+ * It is different from the proper HLTSeeding algorithm because it has no menu dependency and really does not care
+ * about the CTP decisions.It only provides RoIs so that HLT reconstruction algorithms have seeds to run on.
+ * For EMTAU RoIs the generated decisions are flagged with a specimen chain (see source).
+ * @warning This algorithm is only for testing, never to be used in production.
*/
-
class HLTSeedingNoCtpForTesting : public AthReentrantAlgorithm {
public:
HLTSeedingNoCtpForTesting(const std::string& name, ISvcLocator* pSvcLocator);
virtual StatusCode initialize() override;
virtual StatusCode execute (const EventContext& ctx) const override;
- // virtual StatusCode finalize() override;
private:
-
- ///@{ @name Properties
SG::ReadHandleKey<ROIB::RoIBResult> m_RoIBResultKey{
- this, "RoIBResult", "RoIBResult",
- "Name of RoIBResult"};
+ this, "RoIBResult", "RoIBResult", "Name of RoIBResult"};
SG::WriteHandleKey<TrigRoiDescriptorCollection> m_trigEMRoIsKey{
- this, "EMRoIs", "HLT_TestEMRoIs",
- "Name of the EM RoIs object produced by the unpacker"};
+ this, "EMRoIs", "HLT_TestEMRoIs", "Name of the EM RoIs object produced by the unpacker"};
SG::WriteHandleKey<TrigCompositeUtils::DecisionContainer> m_EMDecisionsKey{
this, "EMDecisions", "HLTNav_TestL1EM", "Decisions for each EM RoI"};
-
SG::WriteHandleKey<TrigRoiDescriptorCollection> m_trigFSRoIKey{
- this, "OutputTrigFSRoI", "HLT_TestFSRoI",
- "Name of the Full Scan RoIs object produced by the unpacker"};
+ this, "OutputTrigFSRoI", "HLT_TestFSRoI", "Name of the Full Scan RoIs object produced by the unpacker"};
float m_roIWidth = 0.2;
};
diff --git a/Trigger/TrigSteer/HLTSeeding/src/IPrescalingTool.h b/Trigger/TrigSteer/HLTSeeding/src/IPrescalingTool.h
index f3b85e12b47e..1dc366449039 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/IPrescalingTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/IPrescalingTool.h
@@ -9,27 +9,22 @@
class EventContext;
-
/**
- * @class Implementations of this interface are responsible for
+ * @class Implementations of this interface are responsible for
* applying scaler decisions on the set of active chains
**/
-class IPrescalingTool : virtual public IAlgTool {
-public:
+class IPrescalingTool : virtual public IAlgTool {
+public:
DeclareInterfaceID( IPrescalingTool, 1, 0 );
/**
* @brief the interface needed to do the prescaling
- * @arg initialyActive set of chains initiated by the L1 seeds
- * @arg remainActive set of chains that remain active (relevant) after prescaling
+ * @arg initiallyActive set of chains initiated by the L1 seeds
+ * @arg remainActive set of chains that remain active (relevant) after prescaling
**/
virtual StatusCode prescaleChains( const EventContext& ctx,
- const HLT::IDVec& initialyActive,
+ const HLT::IDVec& initiallyActive,
HLT::IDVec& remainActive ) const = 0;
-
-
-
};
-
#endif
diff --git a/Trigger/TrigSteer/HLTSeeding/src/IRoIsUnpackingTool.h b/Trigger/TrigSteer/HLTSeeding/src/IRoIsUnpackingTool.h
index 1f7d9b40861c..03464e399b8c 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/IRoIsUnpackingTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/IRoIsUnpackingTool.h
@@ -4,20 +4,20 @@
#ifndef HLTSEEDING_IROISUNPACKINGTOOL_H
#define HLTSEEDING_IROISUNPACKINGTOOL_H
-#include "GaudiKernel/IAlgTool.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
-
+#include "GaudiKernel/IAlgTool.h"
namespace ROIB {
class RoIBResult;
}
/**
- * Interface for RoI unpacking tools
+ * @class IRoIsUnpackingTool
+ * @brief Interface for RoI unpacking tools
*/
-class IRoIsUnpackingTool : virtual public IAlgTool {
-public:
+class IRoIsUnpackingTool : virtual public IAlgTool {
+public:
DeclareInterfaceID(IRoIsUnpackingTool, 1, 0);
/**
diff --git a/Trigger/TrigSteer/HLTSeeding/src/JRoIsUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/JRoIsUnpackingTool.cxx
index 6c4b9229e175..6c02c104ef21 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/JRoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/JRoIsUnpackingTool.cxx
@@ -7,11 +7,13 @@
#include "TrigT1Interfaces/TrigT1CaloDefs.h"
#include "AthenaMonitoringKernel/Monitored.h"
-JRoIsUnpackingTool::JRoIsUnpackingTool( const std::string& type,
- const std::string& name,
- const IInterface* parent )
+
+JRoIsUnpackingTool::JRoIsUnpackingTool(const std::string& type,
+ const std::string& name,
+ const IInterface* parent)
: RoIsUnpackingToolBase(type, name, parent) {}
+
StatusCode JRoIsUnpackingTool::initialize() {
ATH_CHECK( RoIsUnpackingToolBase::initialize() );
ATH_CHECK( m_recRoIsKey.initialize() );
@@ -19,19 +21,23 @@ StatusCode JRoIsUnpackingTool::initialize() {
return StatusCode::SUCCESS;
}
+
StatusCode JRoIsUnpackingTool::start() {
- ATH_CHECK( decodeMapping( [](const std::string& name ){ return name.find("J") == 0 or name.find("JF") == 0 or name.find("JB") == 0; } ) );
+ ATH_CHECK(decodeMapping([](const std::string& name){
+ return name.find('J') == 0 or name.find("JF") == 0 or name.find("JB") == 0;
+ }));
return StatusCode::SUCCESS;
}
-StatusCode JRoIsUnpackingTool::unpack( const EventContext& ctx,
- const ROIB::RoIBResult& roib,
- const HLT::IDSet& activeChains ) const {
+
+StatusCode JRoIsUnpackingTool::unpack(const EventContext& ctx,
+ const ROIB::RoIBResult& roib,
+ const HLT::IDSet& activeChains) const {
using namespace TrigCompositeUtils;
// create and record the collections needed
- SG::WriteHandle<TrigRoiDescriptorCollection> trigRoIs = createAndStoreNoAux(m_trigRoIsKey, ctx );
+ SG::WriteHandle<TrigRoiDescriptorCollection> trigRoIs = createAndStoreNoAux(m_trigRoIsKey, ctx );
SG::WriteHandle< DataVector<LVL1::RecJetRoI> > recRoIs = createAndStoreNoAux( m_recRoIsKey, ctx );
- SG::WriteHandle<DecisionContainer> decisionOutput = createAndStore(m_decisionsKey, ctx );
+ SG::WriteHandle<DecisionContainer> decisionOutput = createAndStore(m_decisionsKey, ctx );
// Retrieve the L1 menu configuration
SG::ReadHandle<TrigConf::L1Menu> l1Menu = SG::makeHandle(m_l1MenuKey, ctx);
@@ -39,9 +45,10 @@ StatusCode JRoIsUnpackingTool::unpack( const EventContext& ctx,
std::optional<ThrVecRef> jetThresholds;
ATH_CHECK(getL1Thresholds(*l1Menu, "JET", jetThresholds));
- auto *decision = TrigCompositeUtils::newDecisionIn( decisionOutput.ptr(), hltSeedingNodeName() ); // This hltSeedingNodeName() denotes an initial node with no parents
- decision->setObjectLink( "initialRoI", ElementLink<TrigRoiDescriptorCollection>( m_fsRoIKey, 0 ) );
- auto roiEL = decision->objectLink<TrigRoiDescriptorCollection>( "initialRoI" );
+ // This hltSeedingNodeName() denotes an initial node with no parents
+ auto *decision = TrigCompositeUtils::newDecisionIn( decisionOutput.ptr(), hltSeedingNodeName() );
+ decision->setObjectLink( initialRoIString(), ElementLink<TrigRoiDescriptorCollection>( m_fsRoIKey, 0 ) );
+ auto roiEL = decision->objectLink<TrigRoiDescriptorCollection>( initialRoIString() );
CHECK( roiEL.isValid() );
ATH_MSG_DEBUG("Linked new Decision to the FS roI");
ATH_MSG_DEBUG("Now get jet L1 thresholds from RoIB");
@@ -49,42 +56,41 @@ StatusCode JRoIsUnpackingTool::unpack( const EventContext& ctx,
// RoIBResult contains vector of jet fragments
for ( const auto & jetFragment : roib.jetEnergyResult() ) {
for ( const auto & roi : jetFragment.roIVec() ) {
- uint32_t roIWord = roi.roIWord();
+ uint32_t roIWord = roi.roIWord();
if ( not ( LVL1::TrigT1CaloDefs::JetRoIWordType == roi.roIType() ) ) {
- ATH_MSG_DEBUG( "Skipping RoI as it is not JET threshold " << roIWord <<" Type "<< roi.roIType() );
- continue;
+ ATH_MSG_DEBUG( "Skipping RoI as it is not JET threshold " << roIWord <<" Type "<< roi.roIType() );
+ continue;
}
-
- auto *recRoI = new LVL1::RecJetRoI( roIWord, l1Menu.cptr() );
- recRoIs->push_back( recRoI );
-
- /* TDOD, decide if we need this collection at all here, now keep filling of it commented out
- //decision->setObjectLink( "initialRecRoI", ElementLink<DataVector<LVL1::RecJetRoI>>( m_recRoIsKey.key(), recRoIs->size()-1 ) );
- auto trigRoI = new TrigRoiDescriptor( roIWord, 0u ,0u,
- recRoI->eta(), recRoI->eta()-m_roIWidth, recRoI->eta()+m_roIWidth,
- recRoI->phi(), recRoI->phi()-m_roIWidth, recRoI->phi()+m_roIWidth );
- trigRoIs->push_back( trigRoI );
+
+ recRoIs->push_back( std::make_unique<LVL1::RecJetRoI>(roIWord, l1Menu.cptr()) );
+ const LVL1::RecJetRoI* recRoI = recRoIs->back();
+
+ // TODO: decide if we need this collection at all here, now keep filling of it commented out
+ /*
+ decision->setObjectLink( initialRecRoIString(),
+ ElementLink<DataVector<LVL1::RecJetRoI>>(m_recRoIsKey.key(), recRoIs->size()-1) );
+ trigRoIs->push_back( std::make_unique<TrigRoiDescriptor>(
+ roIWord, 0u ,0u,
+ recRoI->eta(), recRoI->eta()-m_roIWidth, recRoI->eta()+m_roIWidth,
+ recRoI->phi(), recRoI->phi()-m_roIWidth, recRoI->phi()+m_roIWidth) );
*/
- ATH_MSG_DEBUG( "RoI word: 0x" << MSG::hex << std::setw( 8 ) << roIWord << MSG::dec );
-
+ ATH_MSG_DEBUG( "RoI word: 0x" << MSG::hex << std::setw( 8 ) << roIWord << MSG::dec );
+
for (const auto& th : jetThresholds.value().get()) {
ATH_MSG_VERBOSE( "Checking if the threshold " << th->name() << " passed" );
if ( recRoI->passedThreshold(th->mapping()) ) {
ATH_MSG_DEBUG( "Passed Threshold name " << th->name() );
addChainsToDecision( HLT::Identifier( th->name() ), decision, activeChains );
- ATH_MSG_DEBUG( "Labeled object with chains: " << [&](){
- TrigCompositeUtils::DecisionIDContainer ids;
- TrigCompositeUtils::decisionIDs( decision, ids );
+ ATH_MSG_DEBUG( "Labeled object with chains: " << [&](){
+ TrigCompositeUtils::DecisionIDContainer ids;
+ TrigCompositeUtils::decisionIDs( decision, ids );
return std::vector<TrigCompositeUtils::DecisionID>( ids.begin(), ids.end() ); }() );
}
}
-
-
- }
+ }
}
TrigCompositeUtils::uniqueDecisionIDs( decision);
-
if ( msgLvl(MSG::DEBUG) ) {
for ( auto roi: *trigRoIs ) {
@@ -100,7 +106,8 @@ StatusCode JRoIsUnpackingTool::unpack( const EventContext& ctx,
Monitored::Group( m_monTool, RoIsCount, RoIsEta, RoIsPhi );
}
- ATH_MSG_DEBUG( "Number of decision IDs associated with FS RoI: " << TrigCompositeUtils::decisionIDs( decision ).size() );
+ ATH_MSG_DEBUG( "Number of decision IDs associated with FS RoI: "
+ << TrigCompositeUtils::decisionIDs( decision ).size() );
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigSteer/HLTSeeding/src/JRoIsUnpackingTool.h b/Trigger/TrigSteer/HLTSeeding/src/JRoIsUnpackingTool.h
index 8645f0cc8d2c..d121341034b4 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/JRoIsUnpackingTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/JRoIsUnpackingTool.h
@@ -2,7 +2,7 @@
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef HLTSEEDING_JROISUNPACKINGTOOL_H
-#define HLTSEEDING_JROISUNPACKINGTOOL_H 1
+#define HLTSEEDING_JROISUNPACKINGTOOL_H
#include "RoIsUnpackingToolBase.h"
#include "TrigT1Interfaces/RecJetRoI.h"
@@ -26,15 +26,13 @@ public:
private:
SG::WriteHandleKey< DataVector<LVL1::RecJetRoI> > m_recRoIsKey{
- this, "OutputRecRoIs", "HLT_RecJETRoIs",
- "Name of the RoIs object produced by the unpacker"};
+ this, "OutputRecRoIs", "HLT_RecJETRoIs", "Name of the RoIs object produced by the unpacker"};
Gaudi::Property<float> m_roIWidth{
- this, "RoIWidth", 0.4, "Size of RoI in eta/ phi"};
+ this, "RoIWidth", 0.4, "Size of RoI in eta/phi"};
Gaudi::Property<std::string> m_fsRoIKey{
- this, "FSRoIKey", "HLT_FSRoI",
- "The key of FS RoI made earlier by the HLTSeeding" };
+ this, "FSRoIKey", "HLT_FSRoI", "The key of FS RoI made earlier by the HLTSeeding" };
};
#endif //> !HLTSEEDING_JROISUNPACKINGTOOL_H
diff --git a/Trigger/TrigSteer/HLTSeeding/src/L1TriggerResultMaker.cxx b/Trigger/TrigSteer/HLTSeeding/src/L1TriggerResultMaker.cxx
index 6603a65e6b7a..5731e2e47a5f 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/L1TriggerResultMaker.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/L1TriggerResultMaker.cxx
@@ -14,7 +14,7 @@ namespace {
target.typelessSetObjectLink(linkName,
link.key(),
ClassID_traits<T>::ID(),
- /*index =*/ 0);
+ /*beginIndex =*/ 0);
}
}
@@ -53,7 +53,7 @@ StatusCode L1TriggerResultMaker::execute(const EventContext& eventContext) const
ATH_MSG_DEBUG("Recorded L1TriggerResult with key " << m_l1TriggerResultWHKey.key());
// Create new L1TriggerResult in the container
- l1trHandle->push_back(new xAOD::TrigComposite);
+ l1trHandle->push_back(std::make_unique<xAOD::TrigComposite>());
auto retrieveAndLink = [this, &eventContext, &l1trHandle](auto key) -> StatusCode {
// Skip disabled inputs
diff --git a/Trigger/TrigSteer/HLTSeeding/src/METRoIsUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/METRoIsUnpackingTool.cxx
index 3d48ab89003d..873ea499d941 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/METRoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/METRoIsUnpackingTool.cxx
@@ -5,23 +5,23 @@
#include "TrigT1Result/JetEnergyResult.h"
#include "TrigT1Result/RoIBResult.h"
-METRoIsUnpackingTool::METRoIsUnpackingTool( const std::string& type,
- const std::string& name,
- const IInterface* parent )
+
+METRoIsUnpackingTool::METRoIsUnpackingTool(const std::string& type,
+ const std::string& name,
+ const IInterface* parent)
: RoIsUnpackingToolBase(type, name, parent) {}
-StatusCode METRoIsUnpackingTool::initialize()
-{
+
+StatusCode METRoIsUnpackingTool::initialize() {
ATH_CHECK(RoIsUnpackingToolBase::initialize());
return StatusCode::SUCCESS;
}
+
StatusCode METRoIsUnpackingTool::start() {
- ATH_CHECK( decodeMapping( [](const std::string& name ){
- return
- name.find("TE") == 0 or
- name.find("XE") == 0 or
- name.find("XS") == 0 ; } ) );
+ ATH_CHECK(decodeMapping([](const std::string& name){
+ return name.find("TE") == 0 or name.find("XE") == 0 or name.find("XS") == 0;
+ }));
for ( auto th2chains: m_thresholdToChainMapping ) {
m_allMETChains.insert( th2chains.second.begin(), th2chains.second.end() );
@@ -30,9 +30,10 @@ StatusCode METRoIsUnpackingTool::start() {
return StatusCode::SUCCESS;
}
-StatusCode METRoIsUnpackingTool::unpack( const EventContext& ctx,
- const ROIB::RoIBResult& roib,
- const HLT::IDSet& activeChains ) const {
+
+StatusCode METRoIsUnpackingTool::unpack(const EventContext& ctx,
+ const ROIB::RoIBResult& roib,
+ const HLT::IDSet& activeChains) const {
using namespace TrigCompositeUtils;
SG::WriteHandle<DecisionContainer> decisionOutput = createAndStore(m_decisionsKey, ctx );
@@ -53,18 +54,19 @@ StatusCode METRoIsUnpackingTool::unpack( const EventContext& ctx,
HLT::IDSet activeMETchains;
// see if any chain we care of is active
std::set_intersection(activeChains.begin(), activeChains.end(),
- m_allMETChains.begin(), m_allMETChains.end(),
- std::inserter(activeMETchains, activeMETchains.end() ) );
+ m_allMETChains.begin(), m_allMETChains.end(),
+ std::inserter(activeMETchains, activeMETchains.end()));
ATH_MSG_DEBUG("Unpacking MET RoI for " << activeMETchains.size() << " chains");
- auto *decision = TrigCompositeUtils::newDecisionIn( decisionOutput.ptr(), hltSeedingNodeName() ); // This hltSeedingNodeName() denotes an initial node with no parents
+ // This hltSeedingNodeName() denotes an initial node with no parents
+ auto *decision = TrigCompositeUtils::newDecisionIn( decisionOutput.ptr(), hltSeedingNodeName() );
for (const auto& th: thresholds) {
addChainsToDecision( HLT::Identifier( th->name() ), decision, activeChains );
}
ATH_MSG_DEBUG("Linking to FS RoI descriptor");
- decision->setObjectLink( "initialRoI", ElementLink<TrigRoiDescriptorCollection>( m_fsRoIKey, 0 ) );
+ decision->setObjectLink( initialRoIString(), ElementLink<TrigRoiDescriptorCollection>( m_fsRoIKey, 0 ) );
// check the MET RoI, TODO unpack and create L1 MET object (only if turns out to be needed)
bool foundMETRoI = false;
diff --git a/Trigger/TrigSteer/HLTSeeding/src/METRoIsUnpackingTool.h b/Trigger/TrigSteer/HLTSeeding/src/METRoIsUnpackingTool.h
index 421910b637c3..9fcdfe903022 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/METRoIsUnpackingTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/METRoIsUnpackingTool.h
@@ -2,7 +2,7 @@
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef HLTSEEDING_METROISUNPACKINGTOOL_H
-#define HLTSEEDING_METROISUNPACKINGTOOL_H 1
+#define HLTSEEDING_METROISUNPACKINGTOOL_H
#include "RoIsUnpackingToolBase.h"
#include "TrigT1Interfaces/JEPRoIDecoder.h"
@@ -12,9 +12,9 @@
class METRoIsUnpackingTool : public RoIsUnpackingToolBase {
public:
- METRoIsUnpackingTool( const std::string& type,
- const std::string& name,
- const IInterface* parent );
+ METRoIsUnpackingTool(const std::string& type,
+ const std::string& name,
+ const IInterface* parent);
virtual StatusCode initialize() override;
virtual StatusCode start() override;
@@ -25,7 +25,8 @@ public:
const HLT::IDSet& activeChains) const override;
private:
- Gaudi::Property<std::string> m_fsRoIKey{ this, "FSRoIKey", "HLT_FSRoI", "The key of FS RoI made earlier by the HLTSeeding" };
+ Gaudi::Property<std::string> m_fsRoIKey{
+ this, "FSRoIKey", "HLT_FSRoI", "The key of FS RoI made earlier by the HLTSeeding"};
LVL1::JEPRoIDecoder m_jepDecoder;
HLT::IDSet m_allMETChains;
diff --git a/Trigger/TrigSteer/HLTSeeding/src/MURoIsUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/MURoIsUnpackingTool.cxx
index 32a0fb6e3b0e..acb5b32045a4 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/MURoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/MURoIsUnpackingTool.cxx
@@ -2,16 +2,19 @@
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "MURoIsUnpackingTool.h"
+#include "TrigCompositeUtils/TrigCompositeUtils.h"
#include "TrigT1Result/RoIBResult.h"
+
#include "AthenaMonitoringKernel/Monitored.h"
-#include "TrigCompositeUtils/TrigCompositeUtils.h"
#include "StoreGate/ReadDecorHandle.h"
-MURoIsUnpackingTool::MURoIsUnpackingTool( const std::string& type,
- const std::string& name,
+
+MURoIsUnpackingTool::MURoIsUnpackingTool( const std::string& type,
+ const std::string& name,
const IInterface* parent )
: RoIsUnpackingToolBase ( type, name, parent ) {}
+
StatusCode MURoIsUnpackingTool::initialize() {
CHECK( RoIsUnpackingToolBase::initialize() );
CHECK( m_recRoIsKey.initialize(SG::AllowEmpty) );
@@ -21,21 +24,25 @@ StatusCode MURoIsUnpackingTool::initialize() {
return StatusCode::SUCCESS;
}
+
StatusCode MURoIsUnpackingTool::start() {
- ATH_CHECK( decodeMapping( [](const std::string& name ){ return name.find("MU") == 0 or name.find(getProbeThresholdName("MU")) == 0; } ) );
+ ATH_CHECK( decodeMapping([](const std::string& name){
+ return name.find("MU") == 0 or name.find(getProbeThresholdName("MU")) == 0;
+ }));
return StatusCode::SUCCESS;
}
-StatusCode MURoIsUnpackingTool::unpack( const EventContext& ctx,
- const ROIB::RoIBResult& roib,
- const HLT::IDSet& activeChains ) const {
+
+StatusCode MURoIsUnpackingTool::unpack(const EventContext& ctx,
+ const ROIB::RoIBResult& roib,
+ const HLT::IDSet& activeChains ) const {
using namespace TrigCompositeUtils;
// create and record the collections needed
- SG::WriteHandle<TrigRoiDescriptorCollection> trigRoIs = createAndStoreNoAux(m_trigRoIsKey, ctx );
+ SG::WriteHandle<TrigRoiDescriptorCollection> trigRoIs = createAndStoreNoAux(m_trigRoIsKey, ctx );
SG::WriteHandle< DataVector<LVL1::RecMuonRoI> > recRoIs = createAndStoreNoAux( m_recRoIsKey, ctx );
- SG::WriteHandle<DecisionContainer> decisionOutput = createAndStore(m_decisionsKey, ctx );
- SG::WriteHandle<DecisionContainer> decisionOutputProbe = createAndStore(m_decisionsKeyProbe, ctx );
+ SG::WriteHandle<DecisionContainer> decisionOutput = createAndStore(m_decisionsKey, ctx );
+ SG::WriteHandle<DecisionContainer> decisionOutputProbe = createAndStore(m_decisionsKeyProbe, ctx );
// Retrieve the L1 menu configuration
SG::ReadHandle<TrigConf::L1Menu> l1Menu = SG::makeHandle(m_l1MenuKey, ctx);
@@ -43,7 +50,7 @@ StatusCode MURoIsUnpackingTool::unpack( const EventContext& ctx,
std::optional<ThrVecRef> muThresholds;
ATH_CHECK(getL1Thresholds(*l1Menu, "MU", muThresholds));
- for ( const auto & roi : roib.muCTPIResult().roIVec() ) {
+ for ( const auto & roi : roib.muCTPIResult().roIVec() ) {
const uint32_t roIWord = roi.roIWord();
unsigned int thresholdNumber = roi.pt();
ATH_MSG_DEBUG( "MUON RoI with the threshold number: " << thresholdNumber );
@@ -53,25 +60,32 @@ StatusCode MURoIsUnpackingTool::unpack( const EventContext& ctx,
thresholdNumber = 1;
}
- recRoIs->push_back( std::make_unique<LVL1::RecMuonRoI>(roIWord, m_recRpcRoITool.get(), m_recTgcRoITool.get(), l1Menu.cptr()) );
+ recRoIs->push_back(std::make_unique<LVL1::RecMuonRoI>(roIWord,
+ m_recRpcRoITool.get(),
+ m_recTgcRoITool.get(),
+ l1Menu.cptr()));
const LVL1::RecMuonRoI* recRoI = recRoIs->back();
-
+
trigRoIs->push_back( std::make_unique<TrigRoiDescriptor>(
roIWord, 0u ,0u,
recRoI->eta(), recRoI->eta()-m_roIWidth, recRoI->eta()+m_roIWidth,
recRoI->phi(), recRoI->phi()-m_roIWidth, recRoI->phi()+m_roIWidth) );
-
+
ATH_MSG_DEBUG( "RoI word: 0x" << MSG::hex << std::setw( 8 ) << roIWord );
-
+
// The hltSeedingNodeName() denotes an initial node with no parents
Decision* decisionMain = TrigCompositeUtils::newDecisionIn( decisionOutput.ptr(), hltSeedingNodeName() );
- decisionMain->setObjectLink( initialRoIString(), ElementLink<TrigRoiDescriptorCollection>( m_trigRoIsKey.key(), trigRoIs->size()-1 ) );
- decisionMain->setObjectLink( initialRecRoIString(), ElementLink<DataVector<LVL1::RecMuonRoI>>( m_recRoIsKey.key(), recRoIs->size()-1 ) );
+ decisionMain->setObjectLink( initialRoIString(),
+ ElementLink<TrigRoiDescriptorCollection>(m_trigRoIsKey.key(), trigRoIs->size()-1) );
+ decisionMain->setObjectLink( initialRecRoIString(),
+ ElementLink<DataVector<LVL1::RecMuonRoI>>(m_recRoIsKey.key(), recRoIs->size()-1) );
Decision* decisionProbe = TrigCompositeUtils::newDecisionIn( decisionOutputProbe.ptr(), hltSeedingNodeName() );
- decisionProbe->setObjectLink( initialRoIString(), ElementLink<TrigRoiDescriptorCollection>( m_trigRoIsKey.key(), trigRoIs->size()-1 ) );
- decisionProbe->setObjectLink( initialRecRoIString(), ElementLink<DataVector<LVL1::RecMuonRoI>>( m_recRoIsKey.key(), recRoIs->size()-1 ) );
-
+ decisionProbe->setObjectLink( initialRoIString(),
+ ElementLink<TrigRoiDescriptorCollection>(m_trigRoIsKey.key(), trigRoIs->size()-1) );
+ decisionProbe->setObjectLink( initialRecRoIString(),
+ ElementLink<DataVector<LVL1::RecMuonRoI>>(m_recRoIsKey.key(), recRoIs->size()-1) );
+
for (const auto& th : muThresholds.value().get()) {
if ( th->mapping() < thresholdNumber ) {
//th->thresholdNumber() is defined to be [0,5] and thresholdNumber [0,6]
@@ -81,7 +95,6 @@ StatusCode MURoIsUnpackingTool::unpack( const EventContext& ctx,
addChainsToDecision( HLT::Identifier(thresholdProbeName ), decisionProbe, activeChains );
}
}
-
}
// monitoring
@@ -94,6 +107,7 @@ StatusCode MURoIsUnpackingTool::unpack( const EventContext& ctx,
return StatusCode::SUCCESS;
}
+
StatusCode MURoIsUnpackingTool::unpack(const EventContext& ctx,
const xAOD::TrigComposite& l1TriggerResult,
const HLT::IDSet& activeChains) const {
@@ -149,7 +163,7 @@ StatusCode MURoIsUnpackingTool::unpack(const EventContext& ctx,
uint64_t thresholdPattern = thrPatternAcc(*roi);
ATH_MSG_DEBUG("RoI #" << linkIndex << " threshold pattern: " << thresholdPattern);
for (const auto& thr : muThresholds.value().get()) {
- if (not (thresholdPattern & (1 << thr->mapping()))) {continue;}
+ if ((thresholdPattern & (1 << thr->mapping())) == 0u) {continue;}
const std::string thresholdProbeName = getProbeThresholdName(thr->name());
ATH_MSG_DEBUG("RoI #" << linkIndex << " passed threshold number " << thr->mapping()
<< " names " << thr->name() << " and " << thresholdProbeName);
diff --git a/Trigger/TrigSteer/HLTSeeding/src/MURoIsUnpackingTool.h b/Trigger/TrigSteer/HLTSeeding/src/MURoIsUnpackingTool.h
index db1ec7054dbc..c830a5c5ddc8 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/MURoIsUnpackingTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/MURoIsUnpackingTool.h
@@ -17,13 +17,12 @@
#include <string>
-class MURoIsUnpackingTool : public RoIsUnpackingToolBase
-{
- public:
- /// Constructor with parameters:
- MURoIsUnpackingTool( const std::string& type,
- const std::string& name,
- const IInterface* parent );
+class MURoIsUnpackingTool : public RoIsUnpackingToolBase {
+ public:
+ /// Constructor with parameters:
+ MURoIsUnpackingTool(const std::string& type,
+ const std::string& name,
+ const IInterface* parent);
virtual StatusCode initialize() override;
virtual StatusCode start() override;
@@ -34,26 +33,33 @@ class MURoIsUnpackingTool : public RoIsUnpackingToolBase
virtual StatusCode unpack(const EventContext& ctx,
const xAOD::TrigComposite& l1TriggerResult,
const HLT::IDSet& activeChains) const override;
-private:
- ///@{ @name Properties
+private:
+ /// @name Data dependencies
+ /// @{
SG::WriteHandleKey< DataVector<LVL1::RecMuonRoI> > m_recRoIsKey{
- this, "OutputRecRoIs", "HLT_RecMURoIs",
- "Name of the RoIs object produced by the unpacker"};
-
- Gaudi::Property<std::string> m_muRoILinkName {
- this, "MuRoILinkName", "LVL1MuonRoIs",
- "Name of the link to read from L1TriggerResult for muon RoI container"};
+ this, "OutputRecRoIs", "HLT_RecMURoIs", "Name of the RoIs object produced by the unpacker"};
SG::ReadDecorHandleKey<xAOD::MuonRoIContainer> m_thresholdPatternsKey {
this, "MuRoIThresholdPatternsKey", "LVL1MuonRoIs.thresholdPatterns",
"Name of the muon RoI container decoration for the threshold patterns"};
+ /// @}
+
+ /// @name Properties
+ /// @{
+ Gaudi::Property<std::string> m_muRoILinkName {
+ this, "MuRoILinkName", "LVL1MuonRoIs", "Name of the link to read from L1TriggerResult for muon RoI container"};
Gaudi::Property<float> m_roIWidth{
this, "RoIWidth", 0.1, "Size of RoI in eta/ phi"};
- ///@}
+ /// @}
- ToolHandle<LVL1::ITrigT1MuonRecRoiTool> m_recRpcRoITool{this, "RecRpcRoiTool", "LVL1::TrigT1RPCRecRoiTool/TrigT1RPCRecRoiTool"};
- ToolHandle<LVL1::ITrigT1MuonRecRoiTool> m_recTgcRoITool{this, "TgcRpcRoiTool", "LVL1::TrigT1TGCRecRoiTool/TrigT1TGCRecRoiTool"};
-};
+ /// @name Tools
+ /// @{
+ ToolHandle<LVL1::ITrigT1MuonRecRoiTool> m_recRpcRoITool{
+ this, "RecRpcRoiTool", "LVL1::TrigT1RPCRecRoiTool/TrigT1RPCRecRoiTool"};
+ ToolHandle<LVL1::ITrigT1MuonRecRoiTool> m_recTgcRoITool{
+ this, "TgcRpcRoiTool", "LVL1::TrigT1TGCRecRoiTool/TrigT1TGCRecRoiTool"};
+ /// @}
+};
#endif //> !HLTSEEDING_MUROISUNPACKINGTOOL_H
diff --git a/Trigger/TrigSteer/HLTSeeding/src/PrescalingEmulationTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/PrescalingEmulationTool.cxx
index c56039ebf8b8..7fab3cb908eb 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/PrescalingEmulationTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/PrescalingEmulationTool.cxx
@@ -1,24 +1,24 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/IToolSvc.h"
-#include "CLHEP/Random/RandomEngine.h"
#include "PrescalingEmulationTool.h"
#include "AthenaKernel/SlotSpecificObj.h"
+#include "GaudiKernel/IToolSvc.h"
+#include "CLHEP/Random/RandomEngine.h"
#include "CLHEP/Random/Ranlux64Engine.h"
-const std::function< CLHEP::HepRandomEngine*(void) > RanluxFactory = [](void)->CLHEP::HepRandomEngine*{
+
+const std::function< CLHEP::HepRandomEngine*(void) > RanluxFactory = []()->CLHEP::HepRandomEngine*{
return new CLHEP::Ranlux64Engine();
};
-PrescalingEmulationTool::PrescalingEmulationTool( const std::string& type,
- const std::string& name,
- const IInterface* parent )
+PrescalingEmulationTool::PrescalingEmulationTool( const std::string& type,
+ const std::string& name,
+ const IInterface* parent )
: base_class(type, name, parent),
m_RNGEngines( RanluxFactory, SG::getNSlots() ) { }
-PrescalingEmulationTool::~PrescalingEmulationTool() { }
StatusCode PrescalingEmulationTool::initialize() {
for ( const std::string& confElement: m_prescalingConfig ) {
@@ -30,33 +30,30 @@ StatusCode PrescalingEmulationTool::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode PrescalingEmulationTool::prescaleChains( const EventContext& ctx,
- const HLT::IDVec& initialyActive,
- HLT::IDVec& remainActive ) const {
- if ( initialyActive.empty() )
+
+StatusCode PrescalingEmulationTool::prescaleChains( const EventContext& ctx,
+ const HLT::IDVec& initiallyActive,
+ HLT::IDVec& remainActive ) const {
+ if ( initiallyActive.empty() ) {
return StatusCode::SUCCESS;
+ }
// obtain CTP time
- remainActive.reserve( initialyActive.size() );
+ remainActive.reserve( initiallyActive.size() );
// create the seed from the event time
size_t seed = ctx.eventID().time_stamp() ^ ctx.eventID().time_stamp_ns_offset();
CLHEP::HepRandomEngine* engine = m_RNGEngines.getEngine( ctx );
engine->setSeed( seed, 0 );
- for ( auto ch: initialyActive ) {
+ for ( auto ch: initiallyActive ) {
PrescalingInfo::const_iterator chainPS = m_prescalingInfo.find( ch );
- const bool decision = ( chainPS != m_prescalingInfo.end() ) ? engine->flat() < chainPS->second : bool(m_keepUnknownChains);
+ const bool decision = (chainPS != m_prescalingInfo.end()) ?
+ engine->flat() < chainPS->second :
+ bool(m_keepUnknownChains);
ATH_MSG_DEBUG("Prescaling decision for chain " << ch << " " << decision );
- if ( decision )
+ if ( decision ) {
remainActive.push_back( ch );
+ }
}
return StatusCode::SUCCESS;
}
-
-
-StatusCode PrescalingEmulationTool::finalize()
-{
- return StatusCode::SUCCESS;
-}
-
-
diff --git a/Trigger/TrigSteer/HLTSeeding/src/PrescalingEmulationTool.h b/Trigger/TrigSteer/HLTSeeding/src/PrescalingEmulationTool.h
index 0bb9c0f680fa..9322072bd182 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/PrescalingEmulationTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/PrescalingEmulationTool.h
@@ -1,13 +1,13 @@
/*
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef HLTSEEDING_PRESCALINGEMULATIONTOOL_H
+#ifndef HLTSEEDING_PRESCALINGEMULATIONTOOL_H
#define HLTSEEDING_PRESCALINGEMULATIONTOOL_H
// HLTSeeding includes
#include "IPrescalingTool.h"
-// FrameWork includes
+// Framework includes
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ServiceHandle.h"
#include "xAODEventInfo/EventInfo.h"
@@ -17,45 +17,41 @@
// STL includes
#include <string>
-
/**
* @class Implementation of prescaling tool for the offline use
* @brief Uses property of this tool to configure the prescaling.
- * The prescaling info is constant over the whole job.
+ *
+ * The prescaling info is constant over the whole job.
* For running online, where prescaling changes according to conditions the @c PrescalingTool shall be used.
- * Prescaling decision is a function of the chain ID only. The seed of the RNG is reset at every event and thus decisions are reproducible.
+ * Prescaling decision is a function of the chain ID only. The seed of the RNG is reset at every event and thus
+ * decisions are reproducible.
**/
-class PrescalingEmulationTool : public extends<AthAlgTool, IPrescalingTool> {
+class PrescalingEmulationTool : public extends<AthAlgTool, IPrescalingTool> {
public:
PrescalingEmulationTool( const std::string& type,
- const std::string& name,
- const IInterface* parent );
+ const std::string& name,
+ const IInterface* parent );
- virtual ~PrescalingEmulationTool();
+ virtual StatusCode initialize() override;
- virtual StatusCode initialize() override;
- virtual StatusCode finalize() override;
+ virtual StatusCode prescaleChains( const EventContext& ctx,
+ const HLT::IDVec& initiallyActive,
+ HLT::IDVec& remainActive ) const override;
- virtual StatusCode prescaleChains( const EventContext& ctx,
- const HLT::IDVec& initialyActive,
- HLT::IDVec& remainActive ) const override;
- private:
+ private:
+ PrescalingEmulationTool();
- PrescalingEmulationTool();
Gaudi::Property<bool> m_keepUnknownChains{
- this, "KeepUnknownChains", true,
- "If True then chains for which prescaling information is not set are kept" };
+ this, "KeepUnknownChains", true, "If True then chains for which prescaling information is not set are kept"};
Gaudi::Property< std::vector<std::string> > m_prescalingConfig{
- this, "Prescales", {},
- "The prescaling info in the form: \"chainName:PSValue\"" };
+ this, "Prescales", {}, "The prescaling info in the form: \"chainName:PSValue\""};
ATHRNG::RNGWrapper m_RNGEngines;
-
+
typedef std::map<HLT::Identifier, float> PrescalingInfo;
PrescalingInfo m_prescalingInfo;
-};
-
+};
-#endif
+#endif
diff --git a/Trigger/TrigSteer/HLTSeeding/src/PrescalingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/PrescalingTool.cxx
index 2726861ff3c6..1f879d3a947a 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/PrescalingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/PrescalingTool.cxx
@@ -1,38 +1,40 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "PrescalingTool.h"
+
#include "AthenaKernel/SlotSpecificObj.h"
+#include "xAODEventInfo/EventInfo.h"
+
#include "GaudiKernel/IToolSvc.h"
#include "CLHEP/Random/RandomEngine.h"
#include "CLHEP/Random/Ranlux64Engine.h"
-#include "xAODEventInfo/EventInfo.h"
-const std::function< CLHEP::HepRandomEngine*(void) > PSTRanluxFactory = [](void)->CLHEP::HepRandomEngine*{
+
+const std::function< CLHEP::HepRandomEngine*(void) > PSTRanluxFactory = []()->CLHEP::HepRandomEngine*{
return new CLHEP::Ranlux64Engine();
};
-PrescalingTool::PrescalingTool( const std::string& type,
- const std::string& name,
+
+PrescalingTool::PrescalingTool( const std::string& type,
+ const std::string& name,
const IInterface* parent ) :
base_class(type, name, parent),
- m_RNGEngines( PSTRanluxFactory, SG::getNSlots() )
-{}
+ m_RNGEngines( PSTRanluxFactory, SG::getNSlots() ) {}
-PrescalingTool::~PrescalingTool()
-{}
-StatusCode
-PrescalingTool::initialize()
-{
+StatusCode PrescalingTool::initialize() {
ATH_CHECK(m_hltPrescaleSetInputKey.initialize( ! m_hltPrescaleSetInputKey.key().empty() ));
ATH_CHECK( m_HLTMenuKey.initialize() );
ATH_CHECK( m_eventInfoKey.initialize() );
- if ( !m_monTool.empty() ) ATH_CHECK(m_monTool.retrieve());
+ if ( !m_monTool.empty() ) {
+ ATH_CHECK(m_monTool.retrieve());
+ }
if (m_keepUnknownChains.value()) {
- ATH_MSG_WARNING(m_keepUnknownChains.name() << " is set to True. This is OK for testing but do not use this in production");
+ ATH_MSG_WARNING(m_keepUnknownChains.name() << " is set to True. "
+ << "This is OK for testing but do not use this in production");
}
m_prescaleForUnknownChain = { m_keepUnknownChains.value(), (m_keepUnknownChains.value() ? 1.0 : -1.0) };
m_costChainID = HLT::Identifier("HLT_noalg_CostMonDS_L1All");
@@ -55,14 +57,15 @@ StatusCode PrescalingTool::start() {
isCPS++;
}
}
- if ( isCPS ==0 )
+ if ( isCPS ==0 ) {
m_nonCPSChains.insert( chainID );
- if ( isCPS > 1 ) {
+ }
+ if ( isCPS > 1 ) {
ATH_MSG_ERROR("Chain " << chainID << " belongs to more than one CPS groups");
return StatusCode::FAILURE;
}
-
}
+
for ( auto [group, chains]: m_CPSGroups ) {
if ( chains.size() == 1 ) {
ATH_MSG_ERROR("Only one chain " << chains.front() << " in CPS group " << group << " that makes no sense");
@@ -72,7 +75,8 @@ StatusCode PrescalingTool::start() {
for ( auto [group, l1SeedsSet]: l1SeedsCheckForCPS) {
if ( l1SeedsSet.size() != 1 ) {
- ATH_MSG_ERROR("Chains in CPS group " << group << " have several different L1 seeds " << std::vector<std::string>(l1SeedsSet.begin(), l1SeedsSet.end()));
+ ATH_MSG_ERROR("Chains in CPS group " << group << " have several different L1 seeds "
+ << std::vector<std::string>(l1SeedsSet.begin(), l1SeedsSet.end()));
return StatusCode::FAILURE;
}
}
@@ -80,18 +84,19 @@ StatusCode PrescalingTool::start() {
return StatusCode::SUCCESS;
}
-StatusCode PrescalingTool::prescaleChains( const EventContext& ctx,
+
+StatusCode PrescalingTool::prescaleChains( const EventContext& ctx,
const HLT::IDVec& initiallyActive,
- HLT::IDVec& remainActive ) const
-{
- if ( initiallyActive.empty() )
+ HLT::IDVec& remainActive ) const {
+ if ( initiallyActive.empty() ) {
return StatusCode::SUCCESS;
+ }
// clear the output just in case
remainActive.clear();
if ( m_hltPrescaleSetInputKey.key().empty() ) {
- // if no prescaling key is configured, treat all prescales according to propery KeepUnknownChains
+ // if no prescaling key is configured, treat all prescales according to the property KeepUnknownChains
if( m_keepUnknownChains ) {
remainActive.reserve( initiallyActive.size() );
for( const auto & ch : initiallyActive ) {
@@ -101,12 +106,8 @@ StatusCode PrescalingTool::prescaleChains( const EventContext& ctx,
return StatusCode::SUCCESS;
}
- SG::ReadCondHandle<TrigConf::HLTPrescalesSet> hltpssRH(m_hltPrescaleSetInputKey, ctx);
- const TrigConf::HLTPrescalesSet* hltPrescaleSet{*hltpssRH};
- if(hltPrescaleSet == nullptr) {
- ATH_MSG_ERROR("Failed to retrieve HLTPrescalesSet " << hltPrescaleSet->name());
- return StatusCode::FAILURE;
- }
+ SG::ReadCondHandle<TrigConf::HLTPrescalesSet> hltPrescaleSet{m_hltPrescaleSetInputKey, ctx};
+ ATH_CHECK(hltPrescaleSet.isValid());
// access to psk
ATH_MSG_DEBUG("Using HLT PSK " << hltPrescaleSet->psk());
@@ -119,16 +120,15 @@ StatusCode PrescalingTool::prescaleChains( const EventContext& ctx,
// create the seed from the event time
/**
- Note: the event time needs to be taken from the EventInfo instead EventContext.eventID, which is commonly done!
- This is due to the special case when the trigger is run in a partition with preloaded data and the parameter @c
- HLTEventLoopMgr.forceStartOfRunTime is set >0. In that case the @c EventContext.EventID is forced to the be the
- SOR time for each event. Using the @c EventContext.eventID would lead to a constant seed and a scewed prescaling.
+ * Note: the event time needs to be taken from the EventInfo instead EventContext.eventID, which is commonly done!
+ * This is due to the special case when the trigger is run in a partition with preloaded data and the parameter
+ * @c HltEventLoopMgr.forceStartOfRunTime is set >0. In that case the @c EventContext.EventID is forced to the be the
+ * SOR time for each event. Using the @c EventContext.eventID would lead to a constant seed and a skewed prescaling.
*/
auto eventInfoHandle = SG::makeHandle( m_eventInfoKey, ctx );
CHECK( eventInfoHandle.isValid() );
size_t seed = eventInfoHandle->timeStamp() ^ eventInfoHandle->timeStampNSOffset();
-
CLHEP::HepRandomEngine* engine = m_RNGEngines.getEngine( ctx );
engine->setSeed( seed, 0 );
@@ -161,37 +161,43 @@ StatusCode PrescalingTool::prescaleChains( const EventContext& ctx,
TrigConf::HLTPrescalesSet::HLTPrescale ps;
double relativePrescale{};
};
-
+
ChainSet activeChainSet{ initiallyActive.begin(), initiallyActive.end() };
for ( auto [groupName, chainIDs]: m_CPSGroups) {
- if ( std::find(initiallyActive.begin(), initiallyActive.end(), chainIDs.front()) != initiallyActive.end() ) { // this group is seeded
+ if ( std::find(initiallyActive.begin(), initiallyActive.end(), chainIDs.front()) != initiallyActive.end() ) {
+ // this group is seeded
std::vector<ChainAndPrescale> psValueSorted;
for ( const HLT::Identifier& ch: chainIDs ) {
psValueSorted.emplace_back( ChainAndPrescale({ch, getPrescale(ch)}) );
}
- std::sort(psValueSorted.begin(), psValueSorted.end(), [](const ChainAndPrescale& a, const ChainAndPrescale& b){
- if ( a.ps.enabled and b.ps.enabled ) return a.ps.prescale < b.ps.prescale;
- else if ( !a.ps.enabled and b.ps.enabled ) return false;
- else if ( a.ps.enabled and !b.ps.enabled ) return true;
- else /*( !a.prescale.enabled and !b.prescale.enabled )*/ return a.ps.prescale < b.ps.prescale; // irrelevant but sorting needs consistent ordering
- }
- );
+ std::sort(psValueSorted.begin(), psValueSorted.end(), [](const ChainAndPrescale& a, const ChainAndPrescale& b){
+ if ( a.ps.enabled and b.ps.enabled ) {return a.ps.prescale < b.ps.prescale;}
+ if ( !a.ps.enabled and b.ps.enabled ) {return false;}
+ if ( a.ps.enabled and !b.ps.enabled ) {return true;}
+ // both not enabled - irrelevant but sorting needs consistent ordering
+ return a.ps.prescale < b.ps.prescale;
+ });
// setup relative prescales
- psValueSorted.front().relativePrescale = psValueSorted.front().ps.prescale; // the first chain (with the lowest PS is relative w.r.t the all events)
+ // the first chain (with the lowest PS is relative w.r.t the all events)
+ psValueSorted.front().relativePrescale = psValueSorted.front().ps.prescale;
for ( auto i = psValueSorted.begin()+1; i < psValueSorted.end(); ++i ) {
i->relativePrescale = i->ps.prescale / (i-1)->ps.prescale ;
-
}
- ATH_MSG_DEBUG("Chains in CPS group '"<< groupName <<"' sorted by PS : ");
- for ( const ChainAndPrescale& ch: psValueSorted )
- ATH_MSG_DEBUG(" "<< ch.id <<" " << (ch.ps.enabled ? " prescale relative to the above " + std::to_string(ch.relativePrescale) : "disabled" ) );
+ if (msgLvl(MSG::DEBUG)) {
+ ATH_MSG_DEBUG("Chains in CPS group '"<< groupName <<"' sorted by PS : ");
+ for ( const ChainAndPrescale& ch: psValueSorted ) {
+ ATH_MSG_DEBUG(" " << ch.id << " " << (ch.ps.enabled ?
+ "prescale relative to the above " + std::to_string(ch.relativePrescale) :
+ "disabled"));
+ }
+ }
// do actual prescaling
for ( const ChainAndPrescale& ch: psValueSorted ) {
- if ( not ch.ps.enabled ) break;
+ if ( not ch.ps.enabled ) {break;}
const bool decision = decisionPerChain(ch.id, ch.relativePrescale);
- if ( not decision ) break;
+ if ( not decision ) {break;}
remainActive.push_back( ch.id );
}
}
@@ -203,16 +209,15 @@ StatusCode PrescalingTool::prescaleChains( const EventContext& ctx,
auto prescale = getPrescale(ch);
if ( prescale.enabled ) {
const bool decision = decisionPerChain(ch, prescale.prescale);
- if ( decision )
+ if ( decision ) {
remainActive.push_back( ch );
+ }
ATH_MSG_DEBUG("Prescaling decision for chain " << ch << " " << decision);
} else {
ATH_MSG_DEBUG("Chain " << ch << " is disabled, won't keep" );
}
- }
+ }
}
return StatusCode::SUCCESS;
}
-
-
diff --git a/Trigger/TrigSteer/HLTSeeding/src/PrescalingTool.h b/Trigger/TrigSteer/HLTSeeding/src/PrescalingTool.h
index 5385fd35281f..02a238f0c8ce 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/PrescalingTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/PrescalingTool.h
@@ -1,7 +1,7 @@
/*
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef HLTSEEDING_PRESCALINGTOOL_H
+#ifndef HLTSEEDING_PRESCALINGTOOL_H
#define HLTSEEDING_PRESCALINGTOOL_H
// HLTSeeding includes
@@ -23,15 +23,13 @@
// STL includes
#include <string>
-
-
/**
- * @class Implementation of prescaling tool for the offline use
- * @brief Uses the HLTPrescaleSet to configure the prescaling.
- * The HLTPrescalingSet can change within the job, therefor the set is accessed from DetectorStore for each event
+ * @class Implementation of prescaling tool for the HLT use
+ * @brief Uses the HLTPrescalesSet to configure the prescaling
+ *
+ * The HLTPrescalesSet can change within the job, therefore the set is accessed from DetectorStore for each event.
* The seed of the RNG is reset at every event and thus decisions are reproducible.
**/
-
class PrescalingTool : public extends<AthAlgTool, IPrescalingTool> {
public:
@@ -41,24 +39,23 @@ class PrescalingTool : public extends<AthAlgTool, IPrescalingTool> {
// constructor
PrescalingTool( const std::string& type, const std::string& name, const IInterface* parent );
- // destructor
- virtual ~PrescalingTool();
-
virtual StatusCode initialize() override;
virtual StatusCode start() override;
- /** @brief method to prescale chains
- * If the prescale set input key is not defined or the chain does not exist in the prescale set, then the chains (or all chains) are
- * kept according to the property KeepUnknownChains
+
+ /** @brief The method to prescale chains
+ *
+ * If the prescale set input key is not defined or the chain does not exist in the prescale set,
+ * then the chains (or all chains) are kept according to the property KeepUnknownChains
*
* @param[in] ctx event context is needed for accessing the random engine
- * @param[in] initialyActive vector of HLTIdentifiers of initially active chains (because they were seeded by L1)
+ * @param[in] initiallyActive vector of HLTIdentifiers of initially active chains (because they were seeded by L1)
* @param[out] remainActive vector that is being filled with HLTIdentifiers of chains surviving the prescaling
*/
- virtual StatusCode prescaleChains( const EventContext& ctx, const HLT::IDVec& initialyActive,
- HLT::IDVec& remainActive ) const override;
- private:
+ virtual StatusCode prescaleChains( const EventContext& ctx, const HLT::IDVec& initiallyActive,
+ HLT::IDVec& remainActive ) const override;
+
+ private:
- // input data
SG::ReadCondHandleKey<TrigConf::HLTPrescalesSet> m_hltPrescaleSetInputKey{
this, "HLTPrescales", "HLTPrescales", "HLT prescales set"};
@@ -68,23 +65,22 @@ class PrescalingTool : public extends<AthAlgTool, IPrescalingTool> {
SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey{
this, "EventInfo", "EventInfo", "Event Info Object Key"};
- // properties
Gaudi::Property<bool> m_keepUnknownChains{
- this, "KeepUnknownChains", false,
- "If True then chains for which prescaling information is not set are kept" };
+ this, "KeepUnknownChains", false, "If True then chains for which prescaling information is not set are kept"};
- ToolHandle<GenericMonitoringTool> m_monTool{this, "MonTool", "", "Monitoring tool"};
+ ToolHandle<GenericMonitoringTool> m_monTool{
+ this, "MonTool", "", "Monitoring tool"};
- // random engine for calculating prescales
+ /// Random engine for calculating prescales
ATHRNG::RNGWrapper m_RNGEngines;
- typedef std::set<HLT::Identifier> ChainSet;
- std::map<std::string, HLT::IDVec> m_CPSGroups;
+ using ChainSet = std::set<HLT::Identifier>;
ChainSet m_nonCPSChains;
+ std::map<std::string, HLT::IDVec> m_CPSGroups;
- TrigConf::HLTPrescalesSet::HLTPrescale m_prescaleForUnknownChain;
- HLT::Identifier m_costChainID{""};
-};
+ TrigConf::HLTPrescalesSet::HLTPrescale m_prescaleForUnknownChain;
+ HLT::Identifier m_costChainID{""};
+};
-#endif
+#endif
diff --git a/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingEmulationTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingEmulationTool.cxx
index e2d6cec3396c..4ab7f8400489 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingEmulationTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingEmulationTool.cxx
@@ -5,12 +5,14 @@
#include "TrigT1Interfaces/TrigT1CaloDefs.h"
#include <fstream>
-RoIsUnpackingEmulationTool::RoIsUnpackingEmulationTool( const std::string& type,
- const std::string& name,
- const IInterface* parent )
+
+RoIsUnpackingEmulationTool::RoIsUnpackingEmulationTool(const std::string& type,
+ const std::string& name,
+ const IInterface* parent)
: RoIsUnpackingToolBase ( type, name, parent ) {}
-StatusCode RoIsUnpackingEmulationTool::initialize() {
+
+StatusCode RoIsUnpackingEmulationTool::initialize() {
ATH_CHECK( RoIsUnpackingToolBase::initialize() );
if (readEmulatedData().isFailure() ) {
@@ -21,11 +23,15 @@ StatusCode RoIsUnpackingEmulationTool::initialize() {
return StatusCode::SUCCESS;
}
+
StatusCode RoIsUnpackingEmulationTool::start() {
- ATH_CHECK( decodeMapping( [&](const std::string& name ){ return name.find(m_thresholdPrefix) == 0; } ) );
+ ATH_CHECK(decodeMapping([&](const std::string& name){
+ return name.find(m_thresholdPrefix) == 0;
+ }));
return StatusCode::SUCCESS;
}
+
StatusCode RoIsUnpackingEmulationTool::readEmulatedData(){
if ( m_inputFilename.empty() ) {
ATH_MSG_WARNING("Provided InputFilename parameter is empty");
@@ -39,23 +45,25 @@ StatusCode RoIsUnpackingEmulationTool::readEmulatedData(){
ATH_MSG_WARNING(ex.what());
return StatusCode::RECOVERABLE;
}
-
+
ATH_MSG_DEBUG("Input file parsed successfully. Data:");
-
+
for (auto& fragment : m_inputData) {
ATH_MSG_DEBUG("Event");
for (auto& fakeRoI : fragment) {
const char* const delim = ", ";
std::ostringstream debugPassedTresholdIDs;
- std::copy(fakeRoI.passedThresholdIDs.begin(), fakeRoI.passedThresholdIDs.end(), std::ostream_iterator<std::string>(debugPassedTresholdIDs, delim));
-
+ std::copy(fakeRoI.passedThresholdIDs.begin(),
+ fakeRoI.passedThresholdIDs.end(),
+ std::ostream_iterator<std::string>(debugPassedTresholdIDs, delim));
+
ATH_MSG_DEBUG("Eta: " + std::to_string(fakeRoI.eta) +
- ", Phi: " + std::to_string(fakeRoI.phi) +
- ", Word: " + std::to_string(fakeRoI.roIWord) +
- ", PassedThresholdIDs: " + debugPassedTresholdIDs.str());
+ ", Phi: " + std::to_string(fakeRoI.phi) +
+ ", Word: " + std::to_string(fakeRoI.roIWord) +
+ ", PassedThresholdIDs: " + debugPassedTresholdIDs.str());
}
}
-
+
return StatusCode::SUCCESS;
}
@@ -65,23 +73,23 @@ std::vector<std::vector<RoIsUnpackingEmulationTool::FakeRoI>> RoIsUnpackingEmula
auto rtrim = [whiteSpaceChars](std::string& s) { s.erase(s.find_last_not_of(whiteSpaceChars) + 1); };
auto ltrim = [whiteSpaceChars](std::string& s) { s.erase(0, s.find_first_not_of(whiteSpaceChars)); };
auto trim = [&rtrim, <rim](std::string& s) { ltrim(s); rtrim(s); };
-
+
std::vector<std::vector<RoIsUnpackingEmulationTool::FakeRoI>> result;
unsigned lineNumber = 0;
std::string line;
-
+
std::ifstream inputFile(m_inputFilename);
if (!inputFile.good()) {
throw std::invalid_argument("File " + m_inputFilename + "does not exists or is corrupted");
}
while (getline(inputFile, line)) {
- trim(line);
- if (line.empty()) continue;
+ trim(line);
+ if (line.empty()) {continue;}
result.push_back(parseInputFileLine(line, ++lineNumber));
}
-
- if (result.size() == 0) {
+
+ if (result.empty()) {
throw std::invalid_argument("File " + m_inputFilename + " does not contain any RoI");
}
ATH_MSG_DEBUG("Read in " << result.size() << " pseudo events from " << m_inputFilename );
@@ -89,16 +97,17 @@ std::vector<std::vector<RoIsUnpackingEmulationTool::FakeRoI>> RoIsUnpackingEmula
}
-std::vector<RoIsUnpackingEmulationTool::FakeRoI> RoIsUnpackingEmulationTool::parseInputFileLine(const std::string& line, unsigned lineNumber) {
+std::vector<RoIsUnpackingEmulationTool::FakeRoI>
+RoIsUnpackingEmulationTool::parseInputFileLine(const std::string& line, unsigned lineNumber) {
std::vector<RoIsUnpackingEmulationTool::FakeRoI> result;
unsigned roiNumber = 0;
std::stringstream inputLine(line);
std::string roi;
-
+
while (getline(inputLine, roi, ';')) {
// FIXME: If there aren't as many input fields in roi as parseInputRoI expects,
// it'll return uninitialized data (which can lead to a practically infinite
- // loop when we try to normalize the phi). Add an elementary check here to
+ // loop when we try to normalize the phi). Add an elementary check here to
// fix such a loop observed from creatingEVTest in ViewAlgsTest.
if (roi.find (',') != std::string::npos) {
result.push_back(parseInputRoI(roi, lineNumber, ++roiNumber));
@@ -107,72 +116,77 @@ std::vector<RoIsUnpackingEmulationTool::FakeRoI> RoIsUnpackingEmulationTool::par
return result;
}
-RoIsUnpackingEmulationTool::FakeRoI RoIsUnpackingEmulationTool::parseInputRoI(const std::string& roi, unsigned lineNumber, unsigned roiNumber) {
+
+RoIsUnpackingEmulationTool::FakeRoI
+RoIsUnpackingEmulationTool::parseInputRoI(const std::string& roi, unsigned lineNumber, unsigned roiNumber) {
RoIsUnpackingEmulationTool::FakeRoI result;
std::stringstream inputRoi(roi);
std::string roiElement;
unsigned roiElementNumber = 0;
-
+
std::vector<std::function<void(const std::string&)>> fillResultFunctors;
- fillResultFunctors.push_back([&](const std::string& eta) { result.eta = stod(eta); });
- fillResultFunctors.push_back([&](const std::string& phi) { result.phi = stod(phi); });
- fillResultFunctors.push_back([&](const std::string& word) { result.roIWord = stoul(word); });
- fillResultFunctors.push_back([&](const std::string& passedThresholdID) { result.passedThresholdIDs.push_back(passedThresholdID); });
-
+ fillResultFunctors.emplace_back([&](const std::string& eta) { result.eta = stod(eta); });
+ fillResultFunctors.emplace_back([&](const std::string& phi) { result.phi = stod(phi); });
+ fillResultFunctors.emplace_back([&](const std::string& word) { result.roIWord = stoul(word); });
+ fillResultFunctors.emplace_back([&](const std::string& passedThresholdID) {
+ result.passedThresholdIDs.push_back(passedThresholdID); });
+
while (getline(inputRoi, roiElement, ',')) {
- if (roiElementNumber > 2) { roiElementNumber = 3; }
+ if (roiElementNumber > 2) { roiElementNumber = 3; }
try{
fillResultFunctors[roiElementNumber++](roiElement);
}
catch (const std::exception& ex) {
- throw std::invalid_argument("Exception encoruated while parsing line " + std::to_string(lineNumber) + ", roi " + std::to_string(roiNumber) + ". Exception: " + ex.what());
+ throw std::invalid_argument("Exception encountered while parsing line " + std::to_string(lineNumber) +
+ ", roi " + std::to_string(roiNumber) + ". Exception: " + ex.what());
}
}
-
+
return result;
}
-StatusCode RoIsUnpackingEmulationTool::unpack( const EventContext& ctx,
- const ROIB::RoIBResult& /*roib*/,
- const HLT::IDSet& activeChains ) const {
+
+StatusCode RoIsUnpackingEmulationTool::unpack(const EventContext& ctx,
+ const ROIB::RoIBResult& /*roib*/,
+ const HLT::IDSet& activeChains ) const {
using namespace TrigCompositeUtils;
// create and record the collections needed
- SG::WriteHandle<TrigRoiDescriptorCollection> trigRoIs = createAndStoreNoAux(m_trigRoIsKey, ctx );
- SG::WriteHandle<DecisionContainer> decisionOutput = createAndStore(m_decisionsKey, ctx );
-
+ SG::WriteHandle<TrigRoiDescriptorCollection> trigRoIs = createAndStoreNoAux(m_trigRoIsKey, ctx );
+ SG::WriteHandle<DecisionContainer> decisionOutput = createAndStore(m_decisionsKey, ctx );
+
// retrieve fake data for this event
- if (m_inputData.size() ==0){
+ if (m_inputData.empty()){
ATH_MSG_ERROR("No input dataset found. Cannot decode RoI emulation");
return StatusCode::FAILURE;
}
- int line = ctx.evt() % m_inputData.size();
+ const size_t line = ctx.evt() % m_inputData.size();
ATH_MSG_DEBUG("Getting RoIs for event "<< line);
auto FakeRoIs = m_inputData[line];
for (auto& roi : FakeRoIs) {
- uint32_t roIWord = roi.roIWord;
+ uint32_t roIWord = roi.roIWord;
trigRoIs->push_back( std::make_unique<TrigRoiDescriptor>(
roIWord, 0u ,0u,
- roi.eta, roi.eta-m_roIWidth, roi.eta+m_roIWidth,
- roi.phi, roi.phi-m_roIWidth, roi.phi+m_roIWidth) );
-
- ATH_MSG_DEBUG( "RoI word: 0x" << MSG::hex << std::setw(8) << roIWord << MSG::dec );
-
- auto *decision = TrigCompositeUtils::newDecisionIn( decisionOutput.ptr(), hltSeedingNodeName() ); // This hltSeedingNodeName() denotes an initial node with no parents
-
+ roi.eta, roi.eta-m_roIWidth, roi.eta+m_roIWidth,
+ roi.phi, roi.phi-m_roIWidth, roi.phi+m_roIWidth) );
+
+ ATH_MSG_DEBUG( "RoI word: 0x" << MSG::hex << std::setw(8) << roIWord << MSG::dec );
+
+ // This hltSeedingNodeName() denotes an initial node with no parents
+ auto *decision = TrigCompositeUtils::newDecisionIn( decisionOutput.ptr(), hltSeedingNodeName() );
+
for ( const auto& th: roi.passedThresholdIDs ) {
ATH_MSG_DEBUG( "Passed Threshold " << th << " enabling respective chains " );
addChainsToDecision( HLT::Identifier( th ), decision, activeChains );
-
- // TODO would be nice to have this. Requires modifying the TC class: decision->setDetail("Thresholds", passedThresholds); // record passing threshold names (for easy debugging)
- decision->setObjectLink( initialRoIString(), ElementLink<TrigRoiDescriptorCollection>(m_trigRoIsKey.key(), trigRoIs->size()-1 ) );
+ decision->setObjectLink( initialRoIString(),
+ ElementLink<TrigRoiDescriptorCollection>(m_trigRoIsKey.key(), trigRoIs->size()-1) );
}
}
-
+
for ( auto roi: *trigRoIs ) {
ATH_MSG_DEBUG("RoI Eta: " << roi->eta() << " Phi: " << roi->phi() << " RoIWord: " << roi->roiWord());
}
-
+
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingEmulationTool.h b/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingEmulationTool.h
index 5c67448323a8..983cf950f9b7 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingEmulationTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingEmulationTool.h
@@ -2,29 +2,31 @@
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef HLTSEEDING_ROISUNPACKINGEMULATIONTOOL_H
-#define HLTSEEDING_ROISUNPACKINGEMULATIONTOOL_H 1
+#define HLTSEEDING_ROISUNPACKINGEMULATIONTOOL_H
#include "RoIsUnpackingToolBase.h"
#include <string>
-class RoIsUnpackingEmulationTool : public RoIsUnpackingToolBase {
- public:
+class RoIsUnpackingEmulationTool : public RoIsUnpackingToolBase {
+ public:
RoIsUnpackingEmulationTool( const std::string& type,
- const std::string& name,
+ const std::string& name,
const IInterface* parent );
using RoIsUnpackingToolBase::unpack;
virtual StatusCode unpack(const EventContext& ctx,
const ROIB::RoIBResult& roib,
const HLT::IDSet& activeChains) const override;
-
+
virtual StatusCode initialize() override;
virtual StatusCode start() override;
-
- private:
- ///@{ @name Properties
- Gaudi::Property<float> m_roIWidth{"RoIWidth", 0.1, "Size of RoI in eta/ phi"};
+
+ private:
+ /// @name Properties
+ /// @{
+ Gaudi::Property<float> m_roIWidth{
+ "RoIWidth", 0.1, "Size of RoI in eta/ phi"};
Gaudi::Property<std::string> m_inputFilename{
this, "InputFilename", "RoIEmulation.dat", "FakeROI input filename"};
@@ -32,9 +34,10 @@ class RoIsUnpackingEmulationTool : public RoIsUnpackingToolBase {
Gaudi::Property<std::string> m_thresholdPrefix{
this, "ThresholdPrefix", "EM",
"Activate chains that are seed from threshold that have this prefix in the name"};
- ///@}
+ /// @}
- // emulation
+ /// @name Emulation
+ /// @{
struct FakeRoI {
double eta;
double phi;
@@ -44,10 +47,11 @@ class RoIsUnpackingEmulationTool : public RoIsUnpackingToolBase {
StatusCode readEmulatedData();
std::vector<std::vector<FakeRoI>> parseInputFile();
- std::vector<FakeRoI> parseInputFileLine(const std::string& line, unsigned lineNumber);
- FakeRoI parseInputRoI(const std::string& roi, unsigned lineNumber, unsigned roiNumber);
+ static std::vector<FakeRoI> parseInputFileLine(const std::string& line, unsigned lineNumber);
+ static FakeRoI parseInputRoI(const std::string& roi, unsigned lineNumber, unsigned roiNumber);
std::vector<std::vector<RoIsUnpackingEmulationTool::FakeRoI>> m_inputData;
- unsigned m_currentRowNumber;
-};
+ unsigned m_currentRowNumber{0};
+ /// @}
+};
-#endif //> !HLTSEEDING_EMROISUNPACKINGTOOL_H
+#endif //> !HLTSEEDING_ROISUNPACKINGEMULATIONTOOL_H
diff --git a/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingToolBase.cxx b/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingToolBase.cxx
index cc38cfb2a699..215570a4a417 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingToolBase.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingToolBase.cxx
@@ -2,17 +2,19 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include <iostream>
#include "RoIsUnpackingToolBase.h"
#include "TrigConfL1Data/TriggerItem.h"
+#include <iostream>
+
RoIsUnpackingToolBase::RoIsUnpackingToolBase(const std::string& type,
const std::string& name,
const IInterface* parent)
: base_class(type, name, parent) {}
+
StatusCode RoIsUnpackingToolBase::initialize() {
- if ( !m_monTool.empty() ) ATH_CHECK( m_monTool.retrieve() );
+ if ( !m_monTool.empty() ) {ATH_CHECK( m_monTool.retrieve() );}
ATH_CHECK( m_decisionsKey.initialize() );
ATH_CHECK( m_decisionsKeyProbe.initialize(SG::AllowEmpty) );
ATH_CHECK( m_trigRoIsKey.initialize(SG::AllowEmpty) );
@@ -22,6 +24,7 @@ StatusCode RoIsUnpackingToolBase::initialize() {
return StatusCode::SUCCESS;
}
+
StatusCode RoIsUnpackingToolBase::getL1Thresholds(const TrigConf::L1Menu& l1Menu,
const std::string& thrType,
std::optional<ThrVecRef>& thrVec) const {
@@ -35,12 +38,13 @@ StatusCode RoIsUnpackingToolBase::getL1Thresholds(const TrigConf::L1Menu& l1Menu
return StatusCode::SUCCESS;
}
+
std::string RoIsUnpackingToolBase::getProbeThresholdName(const std::string& thresholdName) {
return "PROBE" + thresholdName;
}
-StatusCode RoIsUnpackingToolBase::decodeMapping( std::function< bool(const std::string&)> filter ) {
+StatusCode RoIsUnpackingToolBase::decodeMapping( std::function<bool(const std::string&)>&& filter ) {
SG::ReadHandle<TrigConf::HLTMenu> hltMenuHandle = SG::makeHandle( m_HLTMenuKey );
ATH_CHECK( hltMenuHandle.isValid() );
@@ -49,21 +53,22 @@ StatusCode RoIsUnpackingToolBase::decodeMapping( std::function< bool(const std::
const std::vector<std::string> thresholds{ chain.l1thresholds() };
const std::vector<size_t> legMultiplicities{ chain.legMultiplicities() };
if (thresholds.size() != legMultiplicities.size()) {
- ATH_MSG_ERROR("Encountered a chain " << chain.name() << " with " << legMultiplicities.size() << " legs but only " <<
- thresholds.size() << " thresolds. These should be the same.");
+ ATH_MSG_ERROR("Encountered a chain " << chain.name() << " with " << legMultiplicities.size()
+ << " legs but only " << thresholds.size() << " thresholds. These should be the same.");
return StatusCode::FAILURE;
}
size_t counter = 0;
for ( const std::string& th: thresholds ) {
if ( filter(th) ) {
- const HLT::Identifier thresholIdentifier(th);
- m_thresholdToChainMapping[ thresholIdentifier ].push_back( chainIdentifier );
+ const HLT::Identifier thresholdIdentifier(th);
+ m_thresholdToChainMapping[ thresholdIdentifier ].push_back( chainIdentifier );
ATH_MSG_DEBUG( "Associating " << chainIdentifier << " with threshold " << th );
if ( thresholds.size() > 1 ) {
HLT::Identifier legIdentifier = TrigCompositeUtils::createLegName(chainIdentifier, counter);
- m_thresholdToChainMapping[ thresholIdentifier ].push_back( legIdentifier );
+ m_thresholdToChainMapping[ thresholdIdentifier ].push_back( legIdentifier );
m_legToChainMapping.insert( std::make_pair( legIdentifier, chainIdentifier ) );
- ATH_MSG_INFO( "Associating additional chain leg " << legIdentifier << " with threshold " << thresholIdentifier );
+ ATH_MSG_INFO( "Associating additional chain leg " << legIdentifier
+ << " with threshold " << thresholdIdentifier );
}
}
++counter;
@@ -72,6 +77,7 @@ StatusCode RoIsUnpackingToolBase::decodeMapping( std::function< bool(const std::
return StatusCode::SUCCESS;
}
+
void RoIsUnpackingToolBase::addChainsToDecision( HLT::Identifier thresholdId,
TrigCompositeUtils::Decision* d,
const HLT::IDSet& activeChains ) const {
@@ -88,7 +94,8 @@ void RoIsUnpackingToolBase::addChainsToDecision( HLT::Identifier thresholdId,
ATH_MSG_DEBUG( "Added " << chainId << " to the RoI/threshold decision " << thresholdId );
} else { // maybe it is a leg?
auto legIterator = m_legToChainMapping.find( chainId );
- if ( legIterator != m_legToChainMapping.end() ) { // this is a leg we care about, need to check if respective chain was active, and activate
+ if ( legIterator != m_legToChainMapping.end() ) {
+ // this is a leg we care about, need to check if respective chain was active, and activate
if ( activeChains.find( legIterator->second ) != activeChains.end() ) {
ids.insert( chainId.numeric() );
ATH_MSG_DEBUG( "Added " << chainId << " to the RoI/threshold decision " << thresholdId );
@@ -97,5 +104,6 @@ void RoIsUnpackingToolBase::addChainsToDecision( HLT::Identifier thresholdId,
}
}
TrigCompositeUtils::insertDecisionIDs(ids, d);
- ATH_MSG_DEBUG( "Number of decisions in this RoI after adding chains using threshold " << thresholdId << " " << TrigCompositeUtils::decisionIDs( d ).size() );
+ ATH_MSG_DEBUG( "Number of decisions in this RoI after adding chains using threshold " << thresholdId
+ << " " << TrigCompositeUtils::decisionIDs( d ).size() );
}
diff --git a/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingToolBase.h b/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingToolBase.h
index 36b531c5342a..d6550ea948a1 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingToolBase.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/RoIsUnpackingToolBase.h
@@ -6,8 +6,6 @@
#include "IRoIsUnpackingTool.h"
-#include "AthenaBaseComps/AthAlgTool.h"
-#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigConfData/L1Menu.h"
@@ -15,27 +13,27 @@
#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
#include "xAODTrigger/TrigComposite.h"
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
+
namespace ROIB {
class RoIBResult;
}
-
/**
- * Base class for RoI unpackers
+ * @class RoIsUnpackingToolBase
+ * @brief Base class for RoI unpackers
*
- * Provides common features needed by all unpackers. By itself it does not
- * do anything useful.
+ * Provides common features needed by all unpackers. By itself it does not do anything useful.
*/
-class RoIsUnpackingToolBase : public extends<AthAlgTool, IRoIsUnpackingTool> {
-public:
+class RoIsUnpackingToolBase : public extends<AthAlgTool, IRoIsUnpackingTool> {
+public:
RoIsUnpackingToolBase(const std::string& type,
- const std::string& name,
+ const std::string& name,
const IInterface* parent);
- typedef HLT::IDtoIDVecMap ThresholdToIdentifiers;
-
virtual StatusCode initialize() override;
-
+
virtual StatusCode unpack(const EventContext& /*ctx*/,
const ROIB::RoIBResult& /*roib*/,
const HLT::IDSet& /*activeChains*/) const override { return StatusCode::SUCCESS; }
@@ -44,9 +42,9 @@ public:
const xAOD::TrigComposite& /*l1TriggerResult*/,
const HLT::IDSet& /*activeChains*/) const override { return StatusCode::SUCCESS; }
-
protected:
- ///@{ @name Properties
+ /// @name Data dependencies
+ /// @{
SG::WriteHandleKey<TrigCompositeUtils::DecisionContainer> m_decisionsKey{
this, "Decisions", "RoIDecisions", "Decisions for each RoI"};
@@ -61,10 +59,10 @@ protected:
SG::ReadHandleKey<TrigConf::HLTMenu> m_HLTMenuKey{
this, "HLTTriggerMenu", "DetectorStore+HLTTriggerMenu", "Name of the HLTMenu object to read configuration from"};
+ /// @}
ToolHandle<GenericMonitoringTool> m_monTool{
this, "MonTool", "", "Monitoring tool"};
- ///@}
std::map<HLT::Identifier, HLT::IDVec> m_thresholdToChainMapping;
std::map<HLT::Identifier, HLT::Identifier> m_legToChainMapping;
@@ -73,7 +71,7 @@ protected:
using ThrVecRef = std::reference_wrapper<const ThrVec>;
/**
* Retrieve a vector of thresholds with type @c thrType from L1Menu
- *
+ *
* @param[in] l1Menu The L1Menu object
* @param[in] thrType The threshold type, e.g. EM, MU, eTAU
* @param[out] thrVec The output will be passed into this parameter
@@ -82,21 +80,23 @@ protected:
StatusCode getL1Thresholds(const TrigConf::L1Menu& l1Menu, const std::string& thrType, std::optional<ThrVecRef>& thrVec) const;
/**
- * @brief Concatonate the probe identifier string with the threshold name string to create the alternate version,
- * used by lower pT probe legs of tag+probe chains.
+ * Concatenate the probe identifier string with the threshold name string
+ *
+ * Creates an alternate threshold name, used by lower pT probe legs of tag+probe chains.
**/
static std::string getProbeThresholdName(const std::string& thresholdName);
/**
* Fills mapping from L1 threshold -> to HLT chain
- * @arg filter is a function that, using the threshold name defines if this decoder instance should take care of this threshold
+ *
+ * @arg filter Function that, using the threshold name, defines if this decoder instance should take care
+ * of this threshold
**/
- StatusCode decodeMapping( std::function< bool(const std::string&)> filter ) ;
+ StatusCode decodeMapping( std::function< bool(const std::string&)>&& filter );
void addChainsToDecision( HLT::Identifier thresholdId,
TrigCompositeUtils::Decision* d,
const HLT::IDSet& activeChains ) const;
-};
-
+};
#endif
diff --git a/Trigger/TrigSteer/HLTSeeding/src/TAURoIsUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/TAURoIsUnpackingTool.cxx
index e1d514d23b25..7722264cae35 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/TAURoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/TAURoIsUnpackingTool.cxx
@@ -1,15 +1,15 @@
/*
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-// HLTSeeding includes
#include "TAURoIsUnpackingTool.h"
#include "TrigT1Result/RoIBResult.h"
#include "TrigT1Interfaces/TrigT1CaloDefs.h"
#include "AthenaMonitoringKernel/Monitored.h"
-TAURoIsUnpackingTool::TAURoIsUnpackingTool( const std::string& type,
- const std::string& name,
- const IInterface* parent )
+
+TAURoIsUnpackingTool::TAURoIsUnpackingTool(const std::string& type,
+ const std::string& name,
+ const IInterface* parent)
: RoIsUnpackingToolBase(type, name, parent) {}
@@ -19,10 +19,14 @@ StatusCode TAURoIsUnpackingTool::initialize() {
return StatusCode::SUCCESS;
}
+
StatusCode TAURoIsUnpackingTool::start() {
- ATH_CHECK( decodeMapping( [](const std::string& name ){ return name.find("TAU") == 0 or name.find(getProbeThresholdName("TAU")) == 0; } ) );
- // for taus, since there is threshold name change from HA to TAU we need to fill up mapping with same threshold but prefixed by HA
- // TODO remove once L1 configuration switches to TAU
+ ATH_CHECK(decodeMapping([](const std::string& name ){
+ return name.find("TAU") == 0 or name.find(getProbeThresholdName("TAU")) == 0;
+ }));
+ // For Taus, since there is threshold name change from HA to TAU we need to fill the mapping with same threshold
+ // but prefixed by HA
+ // TODO: Remove once L1 configuration switches to TAU
for ( const auto& [threshold, chains] : m_thresholdToChainMapping ) {
if ( threshold.name().find("TAU") != std::string::npos ) {
std::string newThresholdName = threshold.name();
@@ -35,17 +39,18 @@ StatusCode TAURoIsUnpackingTool::start() {
return StatusCode::SUCCESS;
}
-StatusCode TAURoIsUnpackingTool::unpack( const EventContext& ctx,
- const ROIB::RoIBResult& roib,
- const HLT::IDSet& activeChains ) const {
+
+StatusCode TAURoIsUnpackingTool::unpack(const EventContext& ctx,
+ const ROIB::RoIBResult& roib,
+ const HLT::IDSet& activeChains) const {
using namespace TrigCompositeUtils;
// create and record the collections needed
- SG::WriteHandle<TrigRoiDescriptorCollection> trigRoIs = createAndStoreNoAux(m_trigRoIsKey, ctx );
+ SG::WriteHandle<TrigRoiDescriptorCollection> trigRoIs = createAndStoreNoAux(m_trigRoIsKey, ctx );
SG::WriteHandle< DataVector<LVL1::RecEmTauRoI> > recRoIs = createAndStoreNoAux( m_recRoIsKey, ctx );
- SG::WriteHandle<DecisionContainer> decisionOutput = createAndStore(m_decisionsKey, ctx );
- SG::WriteHandle<DecisionContainer> decisionOutputProbe = createAndStore(m_decisionsKeyProbe, ctx );
-
+ SG::WriteHandle<DecisionContainer> decisionOutput = createAndStore(m_decisionsKey, ctx );
+ SG::WriteHandle<DecisionContainer> decisionOutputProbe = createAndStore(m_decisionsKeyProbe, ctx );
+
// Retrieve the L1 menu configuration
SG::ReadHandle<TrigConf::L1Menu> l1Menu = SG::makeHandle(m_l1MenuKey, ctx);
ATH_CHECK(l1Menu.isValid());
@@ -55,12 +60,12 @@ StatusCode TAURoIsUnpackingTool::unpack( const EventContext& ctx,
// RoIBResult contains vector of TAU fragments
for ( const auto & emTauFragment : roib.eMTauResult() ) {
for ( const auto & roi : emTauFragment.roIVec() ) {
- uint32_t roIWord = roi.roIWord();
+ uint32_t roIWord = roi.roIWord();
if ( not ( LVL1::TrigT1CaloDefs::TauRoIWordType == roi.roIType() ) ) {
ATH_MSG_DEBUG( "Skipping RoI as it is not TAU threshold " << roIWord );
continue;
}
-
+
recRoIs->push_back( std::make_unique<LVL1::RecEmTauRoI>(roIWord, l1Menu.cptr()) );
const LVL1::RecEmTauRoI* recRoI = recRoIs->back();
@@ -68,11 +73,11 @@ StatusCode TAURoIsUnpackingTool::unpack( const EventContext& ctx,
roIWord, 0u ,0u,
recRoI->eta(), recRoI->eta()-m_roIWidth, recRoI->eta()+m_roIWidth,
recRoI->phi(), recRoI->phi()-m_roIWidth, recRoI->phi()+m_roIWidth) );
-
- ATH_MSG_DEBUG( "RoI word: 0x" << MSG::hex << std::setw( 8 ) << roIWord << MSG::dec );
-
+
+ ATH_MSG_DEBUG( "RoI word: 0x" << MSG::hex << std::setw( 8 ) << roIWord << MSG::dec );
+
// The hltSeedingNodeName() denotes an initial node with no parents
- Decision* decisionMain = TrigCompositeUtils::newDecisionIn( decisionOutput.ptr(), hltSeedingNodeName() );
+ Decision* decisionMain = TrigCompositeUtils::newDecisionIn( decisionOutput.ptr(), hltSeedingNodeName() );
Decision* decisionProbe = TrigCompositeUtils::newDecisionIn( decisionOutputProbe.ptr(), hltSeedingNodeName() );
for (const auto& th : tauThresholds.value().get()) {
@@ -84,14 +89,17 @@ StatusCode TAURoIsUnpackingTool::unpack( const EventContext& ctx,
addChainsToDecision( HLT::Identifier( thresholdProbeName ), decisionProbe, activeChains );
}
}
-
- // TODO would be nice to have this. Requires modifying the TC class: decision->setDetail( "Thresholds", passedThresholds ); // record passing threshold names ( for easy debugging )
- decisionMain->setObjectLink( initialRoIString(), ElementLink<TrigRoiDescriptorCollection>( m_trigRoIsKey.key(), trigRoIs->size()-1 ) );
- decisionMain->setObjectLink( initialRecRoIString(), ElementLink<DataVector<LVL1::RecEmTauRoI>>( m_recRoIsKey.key(), recRoIs->size()-1 ) );
-
- decisionProbe->setObjectLink( initialRoIString(), ElementLink<TrigRoiDescriptorCollection>( m_trigRoIsKey.key(), trigRoIs->size()-1 ) );
- decisionProbe->setObjectLink( initialRecRoIString(), ElementLink<DataVector<LVL1::RecEmTauRoI>>( m_recRoIsKey.key(), recRoIs->size()-1 ) );
- }
+
+ decisionMain->setObjectLink( initialRoIString(),
+ ElementLink<TrigRoiDescriptorCollection>(m_trigRoIsKey.key(), trigRoIs->size()-1) );
+ decisionMain->setObjectLink( initialRecRoIString(),
+ ElementLink<DataVector<LVL1::RecEmTauRoI>>(m_recRoIsKey.key(), recRoIs->size()-1) );
+
+ decisionProbe->setObjectLink( initialRoIString(),
+ ElementLink<TrigRoiDescriptorCollection>(m_trigRoIsKey.key(), trigRoIs->size()-1) );
+ decisionProbe->setObjectLink( initialRecRoIString(),
+ ElementLink<DataVector<LVL1::RecEmTauRoI>>(m_recRoIsKey.key(), recRoIs->size()-1) );
+ }
}
for ( auto roi: *trigRoIs ) {
diff --git a/Trigger/TrigSteer/HLTSeeding/src/TAURoIsUnpackingTool.h b/Trigger/TrigSteer/HLTSeeding/src/TAURoIsUnpackingTool.h
index b12c2e765a3a..da15478bb5a8 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/TAURoIsUnpackingTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/TAURoIsUnpackingTool.h
@@ -2,7 +2,7 @@
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef HLTSEEDING_TAUROISUNPACKINGTOOL_H
-#define HLTSEEDING_TAUROISUNPACKINGTOOL_H 1
+#define HLTSEEDING_TAUROISUNPACKINGTOOL_H
#include "RoIsUnpackingToolBase.h"
#include "TrigT1Interfaces/RecEmTauRoI.h"
@@ -10,8 +10,8 @@
class TAURoIsUnpackingTool : public RoIsUnpackingToolBase {
public:
TAURoIsUnpackingTool(const std::string& type,
- const std::string& name,
- const IInterface* parent);
+ const std::string& name,
+ const IInterface* parent);
using RoIsUnpackingToolBase::unpack;
StatusCode unpack(const EventContext& ctx,
@@ -22,14 +22,11 @@ public:
virtual StatusCode start() override;
private:
- ///@{ @name Properties
- SG::WriteHandleKey< DataVector<LVL1::RecEmTauRoI> > m_recRoIsKey{
- this, "OutputRecRoIs", "HLT_RecTAURoIs",
- "Name of the RoIs object produced by the unpacker"};
+ SG::WriteHandleKey<DataVector<LVL1::RecEmTauRoI>> m_recRoIsKey{
+ this, "OutputRecRoIs", "HLT_RecTAURoIs", "Name of the RoIs object produced by the unpacker"};
Gaudi::Property<float> m_roIWidth{
this, "RoIWidth", 0.1, "Size of RoI in eta/ phi"};
- ///@}
};
#endif //> !HLTSEEDING_TAUROISUNPACKINGTOOL_H
diff --git a/Trigger/TrigSteer/HLTSeeding/src/eFexEMRoIThresholdsTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/eFexEMRoIThresholdsTool.cxx
index 78b288c3a622..345683366d9d 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/eFexEMRoIThresholdsTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/eFexEMRoIThresholdsTool.cxx
@@ -19,14 +19,14 @@ uint64_t eFexEMRoIThresholdsTool::getPattern(const xAOD::eFexEMRoI& roi,
int ieta = roi.iEta();
uint64_t thresholdMask = 0;
- // iterate through thresholds and see which ones are passed
- RoIThresholdsTool::ThrVec::const_iterator thr_Itr = menuThresholds.begin();
- for (; thr_Itr != menuThresholds.end(); ++thr_Itr) {
- std::shared_ptr<TrigConf::L1Threshold_eEM> thr = std::static_pointer_cast<TrigConf::L1Threshold_eEM>(*thr_Itr);
- // Test ET threshold and jet discriminant codes, set bit in threshold word if conditions met
- if (et > thr->thrValueCounts(ieta) && reta >= (unsigned int)thr->reta() &&
- rhad >= (unsigned int)thr->rhad() && wstot >= (unsigned int)thr->wstot())
- thresholdMask |= (1<<thr->mapping());
+ // Iterate through thresholds and see which ones are passed
+ for (const std::shared_ptr<TrigConf::L1Threshold>& thrBase : menuThresholds) {
+ std::shared_ptr<TrigConf::L1Threshold_eEM> thr = std::static_pointer_cast<TrigConf::L1Threshold_eEM>(thrBase);
+ // Test ET threshold and jet discriminant codes, set bit in threshold word if conditions met
+ if (et > thr->thrValueCounts(ieta) && reta >= (unsigned int)thr->reta() &&
+ rhad >= (unsigned int)thr->rhad() && wstot >= (unsigned int)thr->wstot()) {
+ thresholdMask |= (1<<thr->mapping());
+ }
}
return thresholdMask;
diff --git a/Trigger/TrigSteer/HLTSeeding/src/eFexEMRoIsUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/eFexEMRoIsUnpackingTool.cxx
index 3f64a96883ed..32aa378affb3 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/eFexEMRoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/eFexEMRoIsUnpackingTool.cxx
@@ -21,7 +21,9 @@ StatusCode eFexEMRoIsUnpackingTool::initialize() {
// =============================================================================
StatusCode eFexEMRoIsUnpackingTool::start() {
- ATH_CHECK(decodeMapping([](const std::string& name){return name.find("eEM")==0 or name.find(getProbeThresholdName("eEM"))==0;}));
+ ATH_CHECK(decodeMapping([](const std::string& name){
+ return name.find("eEM")==0 or name.find(getProbeThresholdName("eEM"))==0;
+ }));
return StatusCode::SUCCESS;
}
@@ -66,21 +68,21 @@ StatusCode eFexEMRoIsUnpackingTool::unpack(const EventContext& ctx,
// Create new decision and link the RoI objects
Decision* decisionMain = TrigCompositeUtils::newDecisionIn(decisionsMain.ptr(), hltSeedingNodeName());
decisionMain->setObjectLink(initialRoIString(),
- ElementLink<TrigRoiDescriptorCollection>(m_trigRoIsKey.key(), linkIndex, ctx));
+ ElementLink<TrigRoiDescriptorCollection>(m_trigRoIsKey.key(), linkIndex, ctx));
decisionMain->setObjectLink(initialRecRoIString(),
- ElementLink<xAOD::eFexEMRoIContainer>(m_eFexEMRoILinkName, linkIndex, ctx));
+ ElementLink<xAOD::eFexEMRoIContainer>(m_eFexEMRoILinkName, linkIndex, ctx));
Decision* decisionProbe = TrigCompositeUtils::newDecisionIn(decisionsProbe.ptr(), hltSeedingNodeName());
decisionProbe->setObjectLink(initialRoIString(),
- ElementLink<TrigRoiDescriptorCollection>(m_trigRoIsKey.key(), linkIndex, ctx));
+ ElementLink<TrigRoiDescriptorCollection>(m_trigRoIsKey.key(), linkIndex, ctx));
decisionProbe->setObjectLink(initialRecRoIString(),
- ElementLink<xAOD::eFexEMRoIContainer>(m_eFexEMRoILinkName, linkIndex, ctx));
+ ElementLink<xAOD::eFexEMRoIContainer>(m_eFexEMRoILinkName, linkIndex, ctx));
// Add positive decisions for chains to be activated by this RoI object
uint64_t thresholdPattern = thrPatternAcc(*roi);
ATH_MSG_DEBUG("RoI #" << linkIndex << " threshold pattern: " << thresholdPattern);
for (const std::shared_ptr<TrigConf::L1Threshold>& thr : thresholds.value().get()) {
- if (not (thresholdPattern & (1 << thr->mapping()))) {continue;}
+ if ((thresholdPattern & (1 << thr->mapping())) == 0u) {continue;}
const std::string thresholdProbeName = getProbeThresholdName(thr->name());
ATH_MSG_DEBUG("RoI #" << linkIndex << " passed threshold number " << thr->mapping()
<< " names " << thr->name() << " and " << thresholdProbeName);
diff --git a/Trigger/TrigSteer/HLTSeeding/src/eFexEMRoIsUnpackingTool.h b/Trigger/TrigSteer/HLTSeeding/src/eFexEMRoIsUnpackingTool.h
index f0d7ded16b39..82772abf2a7f 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/eFexEMRoIsUnpackingTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/eFexEMRoIsUnpackingTool.h
@@ -2,7 +2,7 @@
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef HLTSEEDING_EFEXEMROISUNPACKINGTOOL_H
-#define HLTSEEDING_EFEXEMROISUNPACKINGTOOL_H 1
+#define HLTSEEDING_EFEXEMROISUNPACKINGTOOL_H
#include "RoIsUnpackingToolBase.h"
#include "xAODTrigger/eFexEMRoIContainer.h"
diff --git a/Trigger/TrigSteer/HLTSeeding/src/eFexTauRoIsUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/eFexTauRoIsUnpackingTool.cxx
index 38f470d972a9..dea281926d6c 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/eFexTauRoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/eFexTauRoIsUnpackingTool.cxx
@@ -21,7 +21,9 @@ StatusCode eFexTauRoIsUnpackingTool::initialize() {
// =============================================================================
StatusCode eFexTauRoIsUnpackingTool::start() {
- ATH_CHECK(decodeMapping([](const std::string& name){return name.find("eTAU")==0 or name.find(getProbeThresholdName("eTAU"))==0;}));
+ ATH_CHECK(decodeMapping([](const std::string& name){
+ return name.find("eTAU")==0 or name.find(getProbeThresholdName("eTAU"))==0;
+ }));
return StatusCode::SUCCESS;
}
@@ -66,21 +68,21 @@ StatusCode eFexTauRoIsUnpackingTool::unpack(const EventContext& ctx,
// Create new decision and link the RoI objects
Decision* decisionMain = TrigCompositeUtils::newDecisionIn(decisionsMain.ptr(), hltSeedingNodeName());
decisionMain->setObjectLink(initialRoIString(),
- ElementLink<TrigRoiDescriptorCollection>(m_trigRoIsKey.key(), linkIndex, ctx));
+ ElementLink<TrigRoiDescriptorCollection>(m_trigRoIsKey.key(), linkIndex, ctx));
decisionMain->setObjectLink(initialRecRoIString(),
- ElementLink<xAOD::eFexTauRoIContainer>(m_eFexTauRoILinkName, linkIndex, ctx));
+ ElementLink<xAOD::eFexTauRoIContainer>(m_eFexTauRoILinkName, linkIndex, ctx));
Decision* decisionProbe = TrigCompositeUtils::newDecisionIn(decisionsProbe.ptr(), hltSeedingNodeName());
decisionProbe->setObjectLink(initialRoIString(),
- ElementLink<TrigRoiDescriptorCollection>(m_trigRoIsKey.key(), linkIndex, ctx));
+ ElementLink<TrigRoiDescriptorCollection>(m_trigRoIsKey.key(), linkIndex, ctx));
decisionProbe->setObjectLink(initialRecRoIString(),
- ElementLink<xAOD::eFexTauRoIContainer>(m_eFexTauRoILinkName, linkIndex, ctx));
+ ElementLink<xAOD::eFexTauRoIContainer>(m_eFexTauRoILinkName, linkIndex, ctx));
// Add positive decisions for chains to be activated by this RoI object
uint64_t thresholdPattern = thrPatternAcc(*roi);
ATH_MSG_DEBUG("RoI #" << linkIndex << " threshold pattern: " << thresholdPattern);
for (const std::shared_ptr<TrigConf::L1Threshold>& thr : thresholds.value().get()) {
- if (not (thresholdPattern & (1 << thr->mapping()))) {continue;}
+ if ((thresholdPattern & (1 << thr->mapping())) == 0u) {continue;}
const std::string thresholdProbeName = getProbeThresholdName(thr->name());
ATH_MSG_DEBUG("RoI #" << linkIndex << " passed threshold number " << thr->mapping()
<< " names " << thr->name() << " and " << thresholdProbeName);
diff --git a/Trigger/TrigSteer/HLTSeeding/src/eFexTauRoIsUnpackingTool.h b/Trigger/TrigSteer/HLTSeeding/src/eFexTauRoIsUnpackingTool.h
index eaa0479d14e7..ec2e9dcfdb4d 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/eFexTauRoIsUnpackingTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/eFexTauRoIsUnpackingTool.h
@@ -2,7 +2,7 @@
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef HLTSEEDING_EFEXTAUROISUNPACKINGTOOL_H
-#define HLTSEEDING_EFEXTAUROISUNPACKINGTOOL_H 1
+#define HLTSEEDING_EFEXTAUROISUNPACKINGTOOL_H
#include "RoIsUnpackingToolBase.h"
#include "xAODTrigger/eFexTauRoIContainer.h"
diff --git a/Trigger/TrigSteer/HLTSeeding/src/jFexTauRoIsUnpackingTool.cxx b/Trigger/TrigSteer/HLTSeeding/src/jFexTauRoIsUnpackingTool.cxx
index cce2b14c570c..93bdb682a294 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/jFexTauRoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/HLTSeeding/src/jFexTauRoIsUnpackingTool.cxx
@@ -21,7 +21,9 @@ StatusCode jFexTauRoIsUnpackingTool::initialize() {
// =============================================================================
StatusCode jFexTauRoIsUnpackingTool::start() {
- ATH_CHECK(decodeMapping([](const std::string& name){return name.find("jTAU")==0 or name.find(getProbeThresholdName("jTAU"))==0;}));
+ ATH_CHECK(decodeMapping([](const std::string& name){
+ return name.find("jTAU")==0 or name.find(getProbeThresholdName("jTAU"))==0;
+ }));
return StatusCode::SUCCESS;
}
@@ -66,21 +68,21 @@ StatusCode jFexTauRoIsUnpackingTool::unpack(const EventContext& ctx,
// Create new decision and link the RoI objects
Decision* decisionMain = TrigCompositeUtils::newDecisionIn(decisionsMain.ptr(), hltSeedingNodeName());
decisionMain->setObjectLink(initialRoIString(),
- ElementLink<TrigRoiDescriptorCollection>(m_trigRoIsKey.key(), linkIndex, ctx));
+ ElementLink<TrigRoiDescriptorCollection>(m_trigRoIsKey.key(), linkIndex, ctx));
decisionMain->setObjectLink(initialRecRoIString(),
- ElementLink<xAOD::jFexTauRoIContainer>(m_jFexTauRoILinkName, linkIndex, ctx));
+ ElementLink<xAOD::jFexTauRoIContainer>(m_jFexTauRoILinkName, linkIndex, ctx));
Decision* decisionProbe = TrigCompositeUtils::newDecisionIn(decisionsProbe.ptr(), hltSeedingNodeName());
decisionProbe->setObjectLink(initialRoIString(),
- ElementLink<TrigRoiDescriptorCollection>(m_trigRoIsKey.key(), linkIndex, ctx));
+ ElementLink<TrigRoiDescriptorCollection>(m_trigRoIsKey.key(), linkIndex, ctx));
decisionProbe->setObjectLink(initialRecRoIString(),
- ElementLink<xAOD::jFexTauRoIContainer>(m_jFexTauRoILinkName, linkIndex, ctx));
+ ElementLink<xAOD::jFexTauRoIContainer>(m_jFexTauRoILinkName, linkIndex, ctx));
// Add positive decisions for chains to be activated by this RoI object
uint64_t thresholdPattern = thrPatternAcc(*roi);
ATH_MSG_DEBUG("RoI #" << linkIndex << " threshold pattern: " << thresholdPattern);
for (const std::shared_ptr<TrigConf::L1Threshold>& thr : thresholds.value().get()) {
- if (not (thresholdPattern & (1 << thr->mapping()))) {continue;}
+ if ((thresholdPattern & (1 << thr->mapping())) == 0u) {continue;}
const std::string thresholdProbeName = getProbeThresholdName(thr->name());
ATH_MSG_DEBUG("RoI #" << linkIndex << " passed threshold number " << thr->mapping()
<< " names " << thr->name() << " and " << thresholdProbeName);
diff --git a/Trigger/TrigSteer/HLTSeeding/src/jFexTauRoIsUnpackingTool.h b/Trigger/TrigSteer/HLTSeeding/src/jFexTauRoIsUnpackingTool.h
index 9410ef04e5b1..088357a85842 100644
--- a/Trigger/TrigSteer/HLTSeeding/src/jFexTauRoIsUnpackingTool.h
+++ b/Trigger/TrigSteer/HLTSeeding/src/jFexTauRoIsUnpackingTool.h
@@ -2,7 +2,7 @@
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef HLTSEEDING_JFEXTAUROISUNPACKINGTOOL_H
-#define HLTSEEDING_JFEXTAUROISUNPACKINGTOOL_H 1
+#define HLTSEEDING_JFEXTAUROISUNPACKINGTOOL_H
#include "RoIsUnpackingToolBase.h"
#include "xAODTrigger/jFexTauRoIContainer.h"
--
GitLab
From 5cc9df7bbaf8d2feacce45afdfa7a82d4819c615 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Wed, 18 Aug 2021 22:04:03 +0200
Subject: [PATCH 184/272] PixelConditionsAlgorithms: Fix run 1 configuration.
Don't try to configure the PixelModuleFeMask folder for run 1 configurations.
---
.../PixelConditionsAlgorithms/python/PixelConditionsConfig.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
index 49fdbad9e21b..f8e8e3df8dae 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
@@ -424,11 +424,11 @@ def PixelDeadMapCondAlgCfg(flags, name="PixelDeadMapCondAlg", **kwargs):
"""Return a ComponentAccumulator with configured PixelDeadMapCondAlg"""
acc = ComponentAccumulator()
acc.merge(PixelConfigCondAlgCfg(flags))
- acc.merge(addFoldersSplitOnline(flags, "PIXEL", "/PIXEL/Onl/PixelModuleFeMask", "/PIXEL/PixelModuleFeMask", className="CondAttrListCollection"))
if flags.GeoModel.Run == "RUN1":
kwargs.setdefault("ReadKey", "")
else:
kwargs.setdefault("ReadKey", "/PIXEL/PixelModuleFeMask")
+ acc.merge(addFoldersSplitOnline(flags, "PIXEL", "/PIXEL/Onl/PixelModuleFeMask", "/PIXEL/PixelModuleFeMask", className="CondAttrListCollection"))
kwargs.setdefault("WriteKey", "PixelDeadMapCondData")
acc.addCondAlgo(CompFactory.PixelDeadMapCondAlg(name, **kwargs))
return acc
--
GitLab
From e853ac1dd864405ba2f6d62aa48d369e3c6ebb37 Mon Sep 17 00:00:00 2001
From: Ewelina Maria Lobodzinska <ewelina.maria.lobodzinska@cern.ch>
Date: Thu, 19 Aug 2021 18:44:58 +0000
Subject: [PATCH 185/272] GeneratorFilters: add changes to TTbarWToLeptonFilter
as in 21.6
---
.../GeneratorFilters/TTbarWToLeptonFilter.h | 5 +-
.../src/TTbarWToLeptonFilter.cxx | 122 +++++++++++++-----
2 files changed, 94 insertions(+), 33 deletions(-)
diff --git a/Generators/GeneratorFilters/GeneratorFilters/TTbarWToLeptonFilter.h b/Generators/GeneratorFilters/GeneratorFilters/TTbarWToLeptonFilter.h
index e708114f0b4d..59b3a22e5a47 100644
--- a/Generators/GeneratorFilters/GeneratorFilters/TTbarWToLeptonFilter.h
+++ b/Generators/GeneratorFilters/GeneratorFilters/TTbarWToLeptonFilter.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef GENERATORFILTERS_TTBARWTOLEPTONFILTER_H
@@ -23,6 +23,9 @@ private:
double m_Ptmin;
int m_numLeptons;
+ bool m_fourTopsFilter;
+ bool m_SSMLFilter;
+
};
diff --git a/Generators/GeneratorFilters/src/TTbarWToLeptonFilter.cxx b/Generators/GeneratorFilters/src/TTbarWToLeptonFilter.cxx
index 855435211b2e..38091416d3b9 100644
--- a/Generators/GeneratorFilters/src/TTbarWToLeptonFilter.cxx
+++ b/Generators/GeneratorFilters/src/TTbarWToLeptonFilter.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "GeneratorFilters/TTbarWToLeptonFilter.h"
@@ -9,6 +9,9 @@ TTbarWToLeptonFilter::TTbarWToLeptonFilter(const std::string& name, ISvcLocator*
{
declareProperty("Ptcut", m_Ptmin=200000.);
declareProperty("NumLeptons", m_numLeptons=-1); // Negative for >0, positive integers for the specific number
+ declareProperty("fourTopsFilter", m_fourTopsFilter=false);//four top filter or not
+ declareProperty("SSMLFilter", m_SSMLFilter=false);//Same sign multilepton filter or not
+
}
@@ -18,6 +21,12 @@ StatusCode TTbarWToLeptonFilter::filterEvent() {
int N_quark_t_all = 0;
int N_quark_tbar_all = 0;
int N_pt_above_cut = 0;
+ int N_pt_above_cut_plus = 0;
+ int N_pt_above_cut_minus = 0;
+
+ int foundlepton[6] = {0, 0, 0, 0, 0, 0}; // e+, e-, mu+, mu-, tau+, tau-
+ int count_found_leptons = 1; // In ttbar each charged lepton flavour is counted at most once
+ if(m_fourTopsFilter) count_found_leptons = 2; // In four tops, one can have the same charged lepton flavour twice
for (McEventCollection::const_iterator itr = events()->begin(); itr!=events()->end(); ++itr) {
const HepMC::GenEvent* genEvt = (*itr);
@@ -105,33 +114,72 @@ StatusCode TTbarWToLeptonFilter::filterEvent() {
HepMC::GenVertex::particles_out_const_iterator grandchild_mcpartItrE = w_decayVtx->particles_out_const_end();
for (; grandchild_mcpartItr != grandchild_mcpartItrE; ++grandchild_mcpartItr) {
-
- HepMC::GenParticle * grandchild_mcpart = (*grandchild_mcpartItr);
- int grandchild_pid = grandchild_mcpart->pdg_id();
-
- ATH_MSG_DEBUG("W (t/tbar) has " << mcpart_n_particles_out << " children and the pdg_id of the next is " << grandchild_pid);
-
- // Check if the W's child is W again. If yes, then move to its next decay vertex in a decay tree
- if (std::abs(grandchild_pid) == 24) {
- w_decayVtx = grandchild_mcpart->end_vertex();
-
- // If something wrong comes from truth...
- if (!w_decayVtx) {
- ATH_MSG_ERROR("A stable W is found... ");
- break;
- }
-
- useNextVertex = true;
- break;
- }
-
- if (std::abs(grandchild_pid) == 11 || abs(grandchild_pid) == 13 || abs(grandchild_pid) == 15) {
- if (grandchild_mcpart->momentum().perp() >= m_Ptmin) N_pt_above_cut++;
- // W decay lepton is found. Break loop over the decay product particles
- break;
- }
- }
-
+ HepMC::GenParticle * grandchild_mcpart = (*grandchild_mcpartItr);
+ int grandchild_pid = grandchild_mcpart->pdg_id();
+
+ ATH_MSG_DEBUG("W (t/tbar) has " << mcpart_n_particles_out << " children and the pdg_id of the next is " << grandchild_pid);
+
+ // Check if the W's child is W again. If yes, then move to its next decay vertex in a decay tree
+ if (std::abs(grandchild_pid) == 24) {
+ w_decayVtx = grandchild_mcpart->end_vertex();
+
+ // If something wrong comes from truth...
+ if (!w_decayVtx) {
+ ATH_MSG_ERROR("A stable W is found... ");
+ break;
+ }
+
+ useNextVertex = true;
+ break;
+ }
+
+ // use brute force to use only leptons that have not been found already
+ if (grandchild_pid == -11 && foundlepton[0] < count_found_leptons) {
+ if (grandchild_mcpart->momentum().perp() >= m_Ptmin) {
+ foundlepton[0]++;
+ N_pt_above_cut++;
+ N_pt_above_cut_minus++;
+ }
+ }
+ if (grandchild_pid == 11 && foundlepton[1] < count_found_leptons) {
+ if (grandchild_mcpart->momentum().perp() >= m_Ptmin) {
+ foundlepton[1]++;
+ N_pt_above_cut++;
+ N_pt_above_cut_plus++;
+
+ }
+ }
+ if (grandchild_pid == -13 && foundlepton[2] < count_found_leptons) {
+ if (grandchild_mcpart->momentum().perp() >= m_Ptmin) {
+ foundlepton[2]++;
+ N_pt_above_cut++;
+ N_pt_above_cut_minus++;
+ }
+ }
+ if (grandchild_pid == 13 && foundlepton[3] < count_found_leptons) {
+ if (grandchild_mcpart->momentum().perp() >= m_Ptmin) {
+ foundlepton[3]++;
+ N_pt_above_cut++;
+ N_pt_above_cut_plus++;
+ }
+ }
+ if (grandchild_pid == -15 && foundlepton[4] < count_found_leptons) {
+ if (grandchild_mcpart->momentum().perp() >= m_Ptmin) {
+ foundlepton[4]++;
+ N_pt_above_cut++;
+ N_pt_above_cut_minus++;
+ }
+ }
+ if (grandchild_pid == 15 && foundlepton[5] < count_found_leptons) {
+ if (grandchild_mcpart->momentum().perp() >= m_Ptmin) {
+ foundlepton[5]++;
+ N_pt_above_cut++;
+ N_pt_above_cut_plus++;
+ }
+ }
+
+ }
+
// If investigation of W's next decay vertex is not required then finish looking for leptons
if (!useNextVertex) break;
}
@@ -149,13 +197,17 @@ StatusCode TTbarWToLeptonFilter::filterEvent() {
ATH_MSG_INFO("Found " << N_quark_tbar << " tbar -> W X decays");
ATH_MSG_INFO("Num leptons from W decays from tops with lepton pt above " << m_Ptmin/1000.0 << " CLHEP::GeV/c = " << N_pt_above_cut);
- if (N_quark_t_all < 1 || N_quark_tbar_all < 1) {
+ int count_tops = 1;
+ if(m_fourTopsFilter) count_tops = 2;
+ if (N_quark_t_all < count_tops || N_quark_tbar_all < count_tops) {
+
ATH_MSG_ERROR("No t or tbar quarks were found in a (presumably) ttbar event! Event is rejected.");
setFilterPassed(false);
return StatusCode::SUCCESS;
}
- if (N_quark_t < 1 || N_quark_tbar < 1) {
+ if (N_quark_t < count_tops || N_quark_tbar < count_tops) {
+
ATH_MSG_ERROR("No t or tbar quarks were found decaying to W in a (presumably) ttbar event! Event is rejected. Event dump follows.");
int event = 0;
for (McEventCollection::const_iterator itr = events()->begin(); itr!=events()->end(); ++itr) {
@@ -184,12 +236,18 @@ StatusCode TTbarWToLeptonFilter::filterEvent() {
// If NumLeptons is negative (default), accept if Nlep > 0, otherwise only accept an exact match
if (m_numLeptons < 0) {
- if (N_quark_t >= 2 || N_quark_tbar >= 2) {
+ if ( (N_quark_t >= 2 || N_quark_tbar >= 2) && !m_fourTopsFilter) {
+ ATH_MSG_WARNING("More than one t -> W X or tbar -> W X decays found. Event is accepted anyway.");
+ }
+ if ( (N_quark_t > 2 || N_quark_tbar > 2) && m_fourTopsFilter) {
ATH_MSG_WARNING("More than one t -> W X or tbar -> W X decays found. Event is accepted anyway.");
}
setFilterPassed(N_pt_above_cut > 0);
} else {
- setFilterPassed(N_pt_above_cut == m_numLeptons);
+ if(m_fourTopsFilter){
+ if(m_SSMLFilter) setFilterPassed( (N_pt_above_cut >= m_numLeptons) && (N_pt_above_cut_plus >= 2 || N_pt_above_cut_minus >= 2));
+ else setFilterPassed(N_pt_above_cut >= m_numLeptons);}
+ else setFilterPassed(N_pt_above_cut == m_numLeptons);
}
return StatusCode::SUCCESS;
--
GitLab
From 3954c2a809fd462fe858ba0a400a8b9c9c308597 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Tue, 29 Jun 2021 14:40:15 -0400
Subject: [PATCH 186/272] VP1UtilsBase: Fix cppcheck warnings.
Fix cppcheck warnings.
---
.../VP1/VP1UtilsBase/VP1UtilsBase/VP1BatchUtilities.h | 4 ++--
.../VP1/VP1UtilsBase/VP1UtilsBase/VP1FileUtilities.h | 4 ++--
graphics/VP1/VP1UtilsBase/src/VP1BatchUtilities.cxx | 10 ++++++----
graphics/VP1/VP1UtilsBase/src/VP1FileUtilities.cxx | 4 ++--
4 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/graphics/VP1/VP1UtilsBase/VP1UtilsBase/VP1BatchUtilities.h b/graphics/VP1/VP1UtilsBase/VP1UtilsBase/VP1BatchUtilities.h
index 37725e859583..e4d84390dfa9 100644
--- a/graphics/VP1/VP1UtilsBase/VP1UtilsBase/VP1BatchUtilities.h
+++ b/graphics/VP1/VP1UtilsBase/VP1UtilsBase/VP1BatchUtilities.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////
@@ -30,7 +30,7 @@ public:
std::string getRandomConfigFile();
static void overlayATLASlogo();
- static void overlayEventDetails(unsigned long runNumber, unsigned long eventNumber, std::string humanTimestamp);
+ static void overlayEventDetails(unsigned long runNumber, unsigned long eventNumber, const std::string& humanTimestamp);
private:
std::vector<std::string> m_files;
diff --git a/graphics/VP1/VP1UtilsBase/VP1UtilsBase/VP1FileUtilities.h b/graphics/VP1/VP1UtilsBase/VP1UtilsBase/VP1FileUtilities.h
index d13e56046692..f0931493c476 100644
--- a/graphics/VP1/VP1UtilsBase/VP1UtilsBase/VP1FileUtilities.h
+++ b/graphics/VP1/VP1UtilsBase/VP1UtilsBase/VP1FileUtilities.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////
@@ -51,7 +51,7 @@ public:
int runNumber,
int eventNumber,
int timeStamp,
- std::string textLabel = "");
+ const std::string& textLabel = "");
// **** Check if file exists ****
static bool fileExistsAndReadable(const std::string&);
diff --git a/graphics/VP1/VP1UtilsBase/src/VP1BatchUtilities.cxx b/graphics/VP1/VP1UtilsBase/src/VP1BatchUtilities.cxx
index 84fcf8bfec0c..d667b6b91c4f 100644
--- a/graphics/VP1/VP1UtilsBase/src/VP1BatchUtilities.cxx
+++ b/graphics/VP1/VP1UtilsBase/src/VP1BatchUtilities.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////
@@ -24,9 +24,11 @@
-VP1BatchUtilities::VP1BatchUtilities(std::vector<std::string> files) : m_indexFile(0), m_lastIndexFile(0)
+VP1BatchUtilities::VP1BatchUtilities(std::vector<std::string> files) :
+ m_files(files),
+ m_indexFile(0),
+ m_lastIndexFile(0)
{
- m_files = files;
std::cout << "Got vector of " << files.size() << " items" << std::endl;
// Iterate and print values of vector
for(std::string n : m_files) {
@@ -90,7 +92,7 @@ void VP1BatchUtilities::overlayATLASlogo()
// Overlay the event details to the image
// it replaces the original image with a version having event details on it
-void VP1BatchUtilities::overlayEventDetails(unsigned long runNumber, unsigned long eventNumber, std::string humanTimestamp)
+void VP1BatchUtilities::overlayEventDetails(unsigned long runNumber, unsigned long eventNumber, const std::string& humanTimestamp)
{
std::string nRun = std::to_string(runNumber);
diff --git a/graphics/VP1/VP1UtilsBase/src/VP1FileUtilities.cxx b/graphics/VP1/VP1UtilsBase/src/VP1FileUtilities.cxx
index 9c89cd4b61ad..6cb647a50e0d 100644
--- a/graphics/VP1/VP1UtilsBase/src/VP1FileUtilities.cxx
+++ b/graphics/VP1/VP1UtilsBase/src/VP1FileUtilities.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////
@@ -68,7 +68,7 @@ void VP1FileUtilities::produceNewFile(const std::string& sourceFile,
int runNumber,
int eventNumber,
int timeStamp,
- std::string textLabel)
+ const std::string& textLabel)
{
// Check if the sourceFile exists
QString srcName(sourceFile.c_str());
--
GitLab
From f682c972b277ef72e7033f8f7ae78c3026d5b989 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Tue, 29 Jun 2021 23:55:02 -0400
Subject: [PATCH 187/272] VP1Utils: Fix warning.
Fix warning about potential use of uninitialized eigen object.
---
graphics/VP1/VP1Utils/src/HitToSodeNode.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/graphics/VP1/VP1Utils/src/HitToSodeNode.cxx b/graphics/VP1/VP1Utils/src/HitToSodeNode.cxx
index 14b1860a8025..26b2e944febf 100644
--- a/graphics/VP1/VP1Utils/src/HitToSodeNode.cxx
+++ b/graphics/VP1/VP1Utils/src/HitToSodeNode.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
@@ -265,7 +265,8 @@ void HitToSoNode::buildStripShapes(const Trk::RIO_OnTrack& rio, SoSeparator*&sha
if( !localposROT )
{
- localposROT = Amg::Vector2D{};
+ localposROT.emplace();
+ localposROT->setZero();
VP1Msg::message("Warning: Local hit position was NULL");
}
--
GitLab
From 77e8c8372af4c68f2c0f1ee5ce8320b41b860cf3 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Wed, 7 Jul 2021 16:53:17 -0400
Subject: [PATCH 188/272] xAODMetaDataCnv: Fix test.
Need to configure file reading, or we won't write a metadata object.
---
Event/xAOD/xAODMetaDataCnv/python/TestWriteFileMetaData.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Event/xAOD/xAODMetaDataCnv/python/TestWriteFileMetaData.py b/Event/xAOD/xAODMetaDataCnv/python/TestWriteFileMetaData.py
index 5b109da5cd43..71f229e7c3fa 100644
--- a/Event/xAOD/xAODMetaDataCnv/python/TestWriteFileMetaData.py
+++ b/Event/xAOD/xAODMetaDataCnv/python/TestWriteFileMetaData.py
@@ -13,6 +13,7 @@ from AthenaCommon import Configurable, Constants, Logging
from OutputStreamAthenaPool import OutputStreamConfig
from PyUtils import MetaReader
from xAODEventInfoCnv import xAODEventInfoCnvConfig
+from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
def writeFileMetaData(flags):
@@ -55,6 +56,7 @@ def main():
config_flags.lock()
write = MainServicesConfig.MainServicesCfg(config_flags)
+ write.merge(PoolReadCfg(config_flags))
write.merge(writeFileMetaData(config_flags))
write.run(100)
--
GitLab
From 3c7d4cf3f4be648936a4098aca2a447e02aabb0c Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Wed, 7 Jul 2021 10:21:12 -0400
Subject: [PATCH 189/272] AthContainers: Add missing test reference file.
Add missing test reference file.
---
Control/AthContainers/share/DataVector_rule5_test.ref | 1 +
Control/AthContainers/test/DataVector_rule5_test.cxx | 2 ++
2 files changed, 3 insertions(+)
create mode 100644 Control/AthContainers/share/DataVector_rule5_test.ref
diff --git a/Control/AthContainers/share/DataVector_rule5_test.ref b/Control/AthContainers/share/DataVector_rule5_test.ref
new file mode 100644
index 000000000000..f0014f278b3c
--- /dev/null
+++ b/Control/AthContainers/share/DataVector_rule5_test.ref
@@ -0,0 +1 @@
+AthContainers/DataVector_rule5_test
diff --git a/Control/AthContainers/test/DataVector_rule5_test.cxx b/Control/AthContainers/test/DataVector_rule5_test.cxx
index 045104f7b949..0abd0487279c 100644
--- a/Control/AthContainers/test/DataVector_rule5_test.cxx
+++ b/Control/AthContainers/test/DataVector_rule5_test.cxx
@@ -52,6 +52,8 @@ void fillWithApples(apples & appleDataVec){
int
main()
{
+ std::cout << "AthContainers/DataVector_rule5_test\n";
+
[[maybe_unused]] applePie myPie;
{ //straight assignment, both vectors prefilled
--
GitLab
From 71b856ed122e363de052ddc8280193420b9e4b5b Mon Sep 17 00:00:00 2001
From: Vakho Tsulaia <vakhtang.tsulaia@cern.ch>
Date: Fri, 20 Aug 2021 07:16:38 +0200
Subject: [PATCH 190/272] Fixed LAr/Tile/Muon GeoModel code accessing materials
defined either in SCT or in TRT
We have several cases in GeoModel when some subsystem is accessing materials
defined by other subsystem. This can lead to crashes when we build a geometry
layout where the latter subsystem's material definitions are missing (e.g.
InDet materials in SLHC layouts).
This commit fixes some of such cases by copying several SCT and TRT material
definitions over to STD materials, and pointing the client code to the new
location of these materials.
Addresses: ATLASSIM-5306 and ATLASSIM-5307
---
.../LArGeoBarrel/src/BarrelDMConstruction.cxx | 8 +++-
.../LArGeoCode/src/LArMaterialManager.cxx | 37 -------------------
.../MuonGeoModel/src/Micromegas.cxx | 6 +--
.../src/TileGeoSectionBuilder.cxx | 22 ++---------
4 files changed, 12 insertions(+), 61 deletions(-)
diff --git a/LArCalorimeter/LArGeoModel/LArGeoBarrel/src/BarrelDMConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoBarrel/src/BarrelDMConstruction.cxx
index b8acf8c745c6..762bd9a34028 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoBarrel/src/BarrelDMConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoBarrel/src/BarrelDMConstruction.cxx
@@ -957,7 +957,9 @@ void LArGeo::BarrelDMConstruction::create(GeoFullPhysVol* envelope)
//const GeoMaterial *cu = materialManager->getMaterial("std::Copper");
const GeoMaterial *matXeCO2O2 = materialManager->getMaterial("trt::XeCO2O2");
const GeoMaterial *shieldSteel = materialManager->getMaterial("shield::ShieldSteel");
- const GeoMaterial *matRubber = materialManager->getMaterial("sct::Rubber");
+ const GeoMaterial *matRubber = materialManager->getMaterial("std::Rubber")!=nullptr
+ ? materialManager->getMaterial("std::Rubber")
+ : materialManager->getMaterial("sct::Rubber");
// Get required elements
const GeoElement* silicon = materialManager->getElement("Silicon");
@@ -1196,7 +1198,9 @@ void LArGeo::BarrelDMConstruction::create(GeoFullPhysVol* envelope)
const GeoMaterial *air = materialManager->getMaterial("std::Air"); //0.001214 g/cm3
const GeoMaterial *alu = materialManager->getMaterial("std::Aluminium"); //2.7 g/cm3
const GeoMaterial *shieldSteel = materialManager->getMaterial("shield::ShieldSteel"); //8 g/cm3
- const GeoMaterial *matCO2 = materialManager->getMaterial("trt::CO2"); //0.001842 g/cm3
+ const GeoMaterial *matCO2 = materialManager->getMaterial("std::CO2")!=nullptr //0.001842 g/cm3
+ ? materialManager->getMaterial("std::CO2")
+ : materialManager->getMaterial("trt::CO2");
const GeoMaterial *matKapton = materialManager->getMaterial("std::Kapton"); // 1.42*gram/cm3
const GeoMaterial *matC3F8 = materialManager->getMaterial("std::C3F8"); //1.032*gram/cm3
diff --git a/LArCalorimeter/LArGeoModel/LArGeoCode/src/LArMaterialManager.cxx b/LArCalorimeter/LArGeoModel/LArGeoCode/src/LArMaterialManager.cxx
index 1b1e7a93a951..3620f2c70066 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoCode/src/LArMaterialManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoCode/src/LArMaterialManager.cxx
@@ -637,41 +637,4 @@ void LArMaterialManager::buildMaterials()
pigtail_mat->lock();
m_storedManager->addMaterial("LAr", pigtail_mat);
}
-
- // Fallback materials
- {
- // Fallback for sct::Rubber
- const GeoMaterial *matRubber = m_storedManager->getMaterial("sct::Rubber");
- if (matRubber == nullptr) {
- msg << MSG::WARNING << "Creating fallback sct::Rubber material definition" << endmsg;
- const GeoElement* carbon = m_storedManager->getElement("Carbon");
- const GeoElement* hydrogen = m_storedManager->getElement("Hydrogen");
- const int carbonAtoms{5};
- const int hydrogenAtoms{8};
- const double inv_totalFraction = 1. / (carbonAtoms * carbon->getA() + hydrogenAtoms * hydrogen->getA());
-
- auto matRubberFallback = new GeoMaterial("sct::Rubber", 2.982*GeoModelKernelUnits::gram/Gaudi::Units::cm3);
- matRubberFallback->add(carbon, carbonAtoms * carbon->getA() * inv_totalFraction);
- matRubberFallback->add(hydrogen, hydrogenAtoms * hydrogen->getA() * inv_totalFraction);
- matRubberFallback->lock();
- m_storedManager->addMaterial("sct", matRubberFallback);
- }
-
- // Fallback for trt::CO2
- const GeoMaterial *matCO2 = m_storedManager->getMaterial("trt::CO2"); //0.001842 g/cm3
- if (matCO2 == nullptr) {
- msg << MSG::WARNING << "Creating fallback trt::CO2 material definition" << endmsg;
- const GeoElement* carbon = m_storedManager->getElement("Carbon");
- const GeoElement* oxygen = m_storedManager->getElement("Oxygen");
- const int carbonAtoms{1};
- const int oxygenAtoms{2};
- const double inv_totalFraction = 1. / (carbonAtoms * carbon->getA() + oxygenAtoms * oxygen->getA());
-
- auto matCO2Fallback = new GeoMaterial("trt::CO2", 0.001842*GeoModelKernelUnits::gram/Gaudi::Units::cm3);
- matCO2Fallback->add(carbon, carbonAtoms * carbon->getA() * inv_totalFraction);
- matCO2Fallback->add(oxygen, oxygenAtoms * oxygen->getA() * inv_totalFraction);
- matCO2Fallback->lock();
- m_storedManager->addMaterial("trt", matCO2Fallback);
- }
- }
}
diff --git a/MuonSpectrometer/MuonGeoModel/src/Micromegas.cxx b/MuonSpectrometer/MuonGeoModel/src/Micromegas.cxx
index d1978bc5aa2e..d5978953082a 100644
--- a/MuonSpectrometer/MuonGeoModel/src/Micromegas.cxx
+++ b/MuonSpectrometer/MuonGeoModel/src/Micromegas.cxx
@@ -71,9 +71,9 @@ namespace MuonGM {
logVolName = name;
if (!(m_component->subType).empty())
logVolName += ("-" + m_component->subType);
- // sct::PCB is not always available. Fallback to muo::FR4 for now while this is being investigated
- const GeoMaterial *mtrd = getMaterialManager()->getMaterial("sct::PCB") != nullptr ?
- getMaterialManager()->getMaterial("sct::PCB") : getMaterialManager()->getMaterial("muo::FR4");
+ // std::FR4 is not always available. Fallback to sct::PCB
+ const GeoMaterial *mtrd = getMaterialManager()->getMaterial("std::FR4") != nullptr ?
+ getMaterialManager()->getMaterial("std::FR4") : getMaterialManager()->getMaterial("sct::PCB");
GeoLogVol *ltrd = new GeoLogVol(logVolName, strd, mtrd);
GeoFullPhysVol *ptrd = new GeoFullPhysVol(ltrd);
diff --git a/TileCalorimeter/TileGeoModel/src/TileGeoSectionBuilder.cxx b/TileCalorimeter/TileGeoModel/src/TileGeoSectionBuilder.cxx
index 52456725c175..fdd30b649764 100755
--- a/TileCalorimeter/TileGeoModel/src/TileGeoSectionBuilder.cxx
+++ b/TileCalorimeter/TileGeoModel/src/TileGeoSectionBuilder.cxx
@@ -1509,25 +1509,9 @@ void TileGeoSectionBuilder::fillFinger(GeoPhysVol*& mother,
const GeoMaterial *air = m_theMaterialManager->getMaterial("std::Air");
const GeoMaterial *iron = m_theMaterialManager->getMaterial("std::Iron");
const GeoMaterial *shieldSteel = m_theMaterialManager->getMaterial("shield::ShieldSteel");
- const GeoMaterial *matRubber = m_theMaterialManager->getMaterial("sct::Rubber");
-
- // Fallback rubber material definition
- if (matRubber == nullptr) {
- (*m_log) << MSG::WARNING << "Creating fallback sct::Rubber material definition" << endmsg;
- const GeoElement* carbon = m_theMaterialManager->getElement("Carbon");
- const GeoElement* hydrogen = m_theMaterialManager->getElement("Hydrogen");
- const int carbonAtoms{5};
- const int hydrogenAtoms{8};
- const double inv_totalFraction = 1. / (carbonAtoms * carbon->getA() + hydrogenAtoms * hydrogen->getA());
-
- auto matRubberFallback = new GeoMaterial("sct::Rubber", 2.982*GeoModelKernelUnits::gram/Gaudi::Units::cm3);
- matRubberFallback->add(carbon, carbonAtoms * carbon->getA() * inv_totalFraction);
- matRubberFallback->add(hydrogen, hydrogenAtoms * hydrogen->getA() * inv_totalFraction);
- matRubberFallback->lock();
- m_theMaterialManager->addMaterial("sct", matRubberFallback);
-
- matRubber = m_theMaterialManager->getMaterial("sct::Rubber");
- }
+ const GeoMaterial *matRubber = m_theMaterialManager->getMaterial("std::Rubber")!=nullptr
+ ? m_theMaterialManager->getMaterial("std::Rubber")
+ : m_theMaterialManager->getMaterial("sct::Rubber");
// m_matLArServices
if (m_matLArServices == 0)
--
GitLab
From 7b3a8ecaf9d3f952445cd1836deb4871ad469178 Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <smh@cern.ch>
Date: Fri, 20 Aug 2021 10:16:03 +0200
Subject: [PATCH 191/272] Remove MergeSlices and ReprocessTriggerTowers: not
referenced anywhere since 2016
---
.../TrigT1/TrigT1CaloSim/src/MergeSlices.cxx | 456 ---------------
.../TrigT1/TrigT1CaloSim/src/MergeSlices.h | 81 ---
.../src/ReprocessTriggerTowers.cxx | 533 ------------------
.../src/ReprocessTriggerTowers.h | 136 -----
.../src/components/TrigT1CaloSim_entries.cxx | 4 -
5 files changed, 1210 deletions(-)
delete mode 100644 Trigger/TrigT1/TrigT1CaloSim/src/MergeSlices.cxx
delete mode 100644 Trigger/TrigT1/TrigT1CaloSim/src/MergeSlices.h
delete mode 100644 Trigger/TrigT1/TrigT1CaloSim/src/ReprocessTriggerTowers.cxx
delete mode 100644 Trigger/TrigT1/TrigT1CaloSim/src/ReprocessTriggerTowers.h
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/MergeSlices.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/MergeSlices.cxx
deleted file mode 100644
index cfe2b6413022..000000000000
--- a/Trigger/TrigT1/TrigT1CaloSim/src/MergeSlices.cxx
+++ /dev/null
@@ -1,456 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-
-#include <sstream>
-#include <utility>
-#include <vector>
-
-#include "TrigT1CaloEvent/CPMHits.h"
-#include "TrigT1CaloEvent/CPMTower.h"
-#include "TrigT1CaloEvent/JEMEtSums.h"
-#include "TrigT1CaloEvent/JEMHits.h"
-#include "TrigT1CaloEvent/JetElement.h"
-#include "TrigT1CaloUtils/JetElementKey.h"
-#include "MergeSlices.h"
-#include "TrigT1CaloEvent/TriggerTower.h"
-#include "TrigT1CaloUtils/TriggerTowerKey.h"
-#include "TrigT1Interfaces/TrigT1CaloDefs.h"
-
-namespace LVL1 {
-
-
-MergeSlices::MergeSlices(const std::string& name, ISvcLocator* pSvcLocator)
- : AthAlgorithm(name, pSvcLocator)
-{
- declareProperty("TimeslicesLUT", m_slicesLut = 1,
- "The number of timeslices to be merged");
-
- declareProperty("CPMHitsLocation",
- m_cpmHitsLocation = TrigT1CaloDefs::CPMHitsLocation);
- declareProperty("CPMTowerLocation",
- m_cpmTowerLocation = TrigT1CaloDefs::CPMTowerLocation);
- declareProperty("JEMEtSumsLocation",
- m_jemEtSumsLocation = TrigT1CaloDefs::JEMEtSumsLocation);
- declareProperty("JEMHitsLocation",
- m_jemHitsLocation = TrigT1CaloDefs::JEMHitsLocation);
- declareProperty("JetElementLocation",
- m_jetElementLocation = TrigT1CaloDefs::JetElementLocation);
- declareProperty("TriggerTowerLocation",
- m_triggerTowerLocation = TrigT1CaloDefs::TriggerTowerLocation);
- declareProperty("FullADCLocation",
- m_fullAdcLocation = TrigT1CaloDefs::TriggerTowerLocation+"ADC");
-}
-
-MergeSlices::~MergeSlices()
-{
-}
-
-// Initialize
-
-StatusCode MergeSlices::initialize()
-{
- return StatusCode::SUCCESS;
-}
-
-// Execute
-
-StatusCode MergeSlices::execute()
-{
- // PPM
-
- StatusCode sc = mergePpm();
- if (sc.isFailure()) {
- ATH_MSG_ERROR( "PPM merge failed" );
- }
-
- // CPM
-
- sc = mergeCpm();
- if (sc.isFailure()) {
- ATH_MSG_ERROR( "CPM merge failed" );
- }
-
- // JEM
-
- sc = mergeJem();
- if (sc.isFailure()) {
- ATH_MSG_ERROR( "JEM merge failed" );
- }
-
- return StatusCode::SUCCESS;
-}
-
-// Finalize
-
-StatusCode MergeSlices::finalize()
-{
-
- return StatusCode::SUCCESS;
-}
-
-// Merge PPM containers
-
-StatusCode MergeSlices::mergePpm()
-{
- // Create map for output TriggerTowers
-
- TriggerTowerMap ttMap;
-
- // Find full ADC digits
-
- const TriggerTowerCollection* adcCollection = 0;
- ATH_CHECK( evtStore()->retrieve(adcCollection, m_fullAdcLocation) );
-
- // Copy and put in map
-
- TriggerTowerCollection::const_iterator pos = adcCollection->begin();
- TriggerTowerCollection::const_iterator pose = adcCollection->end();
- std::vector<int> dummyLut(m_slicesLut);
- for (; pos != pose; ++pos) {
- // Have to copy these because constructor doesn't take const
- std::vector<int> emADC((*pos)->emADC());
- std::vector<int> hadADC((*pos)->hadADC());
- std::vector<int> emBCIDext((*pos)->emBCIDext());
- std::vector<int> hadBCIDext((*pos)->hadBCIDext());
- TriggerTower* tt = new TriggerTower(
- (*pos)->phi(), (*pos)->eta(), (*pos)->key(),
- emADC, dummyLut, emBCIDext, dummyLut,
- (*pos)->emError(), m_slicesLut/2, (*pos)->emADCPeak(),
- hadADC, dummyLut, hadBCIDext, dummyLut,
- (*pos)->hadError(), m_slicesLut/2, (*pos)->hadADCPeak());
- ttMap.insert(std::make_pair((*pos)->key(), tt));
- }
-
- // Merge in LUT data for each slice
-
- for (int slice = 0; slice < m_slicesLut; ++slice) {
- std::string location = m_triggerTowerLocation + numString(slice);
- const TriggerTowerCollection* ttColl = 0;
- StatusCode sc = evtStore()->retrieve(ttColl, location);
- if (sc.isFailure() || !ttColl) {
- ATH_MSG_ERROR( "No TriggerTower container found for slice "
- << slice << " key " << location );
- continue;
- }
- pos = ttColl->begin();
- pose = ttColl->end();
- for (; pos != pose; ++pos) {
- TriggerTowerMap::iterator adcPos = ttMap.find((*pos)->key());
- if (adcPos == ttMap.end()) {
- ATH_MSG_ERROR( "Missing ADC data for TT key " << (*pos)->key()
- );
- continue;
- }
- TriggerTower* tt = adcPos->second;
- std::vector<int> emADC(tt->emADC());
- std::vector<int> hadADC(tt->hadADC());
- std::vector<int> emLUT(tt->emLUT());
- std::vector<int> hadLUT(tt->hadLUT());
- std::vector<int> emBCIDext(tt->emBCIDext());
- std::vector<int> hadBCIDext(tt->hadBCIDext());
- std::vector<int> emBCIDvec(tt->emBCIDvec());
- std::vector<int> hadBCIDvec(tt->hadBCIDvec());
- emLUT[slice] = (*pos)->emEnergy();
- hadLUT[slice] = (*pos)->hadEnergy();
- emBCIDvec[slice] = (*pos)->emBCID();
- hadBCIDvec[slice] = (*pos)->hadBCID();
- int emADCPeak = tt->emADCPeak();
- int hadADCPeak = tt->hadADCPeak();
- int emLUTPeak = tt->emPeak();
- int hadLUTPeak = tt->hadPeak();
- int emError = tt->emError();
- int hadError = tt->hadError();
- tt->addEM(emADC, emLUT, emBCIDext, emBCIDvec,
- emError, emLUTPeak, emADCPeak);
- tt->addHad(hadADC, hadLUT, hadBCIDext, hadBCIDvec,
- hadError, hadLUTPeak, hadADCPeak);
- }
- }
-
- // Fill container and save
-
- TriggerTowerCollection* ttOut = new TriggerTowerCollection;
- TriggerTowerMap::iterator mapIter;
- TriggerTowerMap::iterator mapIterEnd;
- mapIter = ttMap.begin();
- mapIterEnd = ttMap.end();
- for (; mapIter != mapIterEnd; ++mapIter) ttOut->push_back(mapIter->second);
- StatusCode sc = evtStore()->overwrite(ttOut, m_triggerTowerLocation, true);
- if (sc.isFailure()) {
- ATH_MSG_ERROR( "Error registering trigger tower collection in TDS"
- );
- delete ttOut;
- }
-
- return sc;
-}
-
-// Merge CPM containers
-
-StatusCode MergeSlices::mergeCpm()
-{
- // Create maps and key provider for output CPM Towers and Hits
-
- CPMTowerMap towerMap;
- CPMHitsMap hitsMap;
- TriggerTowerKey towerKey;
-
- // Merge in data for each slice
-
- for (int slice = 0; slice < m_slicesLut; ++slice) {
-
- // Find CPM towers for this slice
-
- const CPMTowerCollection* ttCollection = 0;
- std::string location = m_cpmTowerLocation + numString(slice);
- StatusCode sc = evtStore()->retrieve(ttCollection, location);
- if (sc.isFailure() || !ttCollection || ttCollection->empty()) {
- ATH_MSG_DEBUG( "No CPM Towers found for slice " << slice );
- } else {
- CPMTowerCollection::const_iterator pos = ttCollection->begin();
- CPMTowerCollection::const_iterator pose = ttCollection->end();
- for (; pos != pose; ++pos) {
- const CPMTower* tt = *pos;
- CPMTower* ttOut = 0;
- unsigned int key = towerKey.ttKey(tt->phi(), tt->eta());
- CPMTowerMap::iterator mPos = towerMap.find(key);
- if (mPos == towerMap.end()) {
- std::vector<int> vec(m_slicesLut);
- ttOut = new CPMTower(tt->phi(), tt->eta(),
- vec, vec, vec, vec, m_slicesLut/2);
- towerMap.insert(std::make_pair(key, ttOut));
- } else ttOut = mPos->second;
- std::vector<int> emEnergy(ttOut->emEnergyVec());
- std::vector<int> hadEnergy(ttOut->hadEnergyVec());
- std::vector<int> emError(ttOut->emErrorVec());
- std::vector<int> hadError(ttOut->hadErrorVec());
- emEnergy[slice] = tt->emEnergy();
- hadEnergy[slice] = tt->hadEnergy();
- emError[slice] = tt->emError();
- hadError[slice] = tt->hadError();
- ttOut->fill(emEnergy, emError, hadEnergy, hadError, m_slicesLut/2);
- }
- }
-
- // Find CPM hits for this slice
-
- const CPMHitsCollection* hitCollection = 0;
- location = m_cpmHitsLocation + numString(slice);
- sc = evtStore()->retrieve(hitCollection, location);
- if (sc.isFailure() || !hitCollection || hitCollection->empty()) {
- ATH_MSG_DEBUG( "No CPM Hits found for slice " << slice );
- } else {
- CPMHitsCollection::const_iterator pos = hitCollection->begin();
- CPMHitsCollection::const_iterator pose = hitCollection->end();
- for (; pos != pose; ++pos) {
- const CPMHits* hits = *pos;
- CPMHits* hitsOut = 0;
- int key = hits->crate() * 100 + hits->module();
- CPMHitsMap::iterator mPos = hitsMap.find(key);
- if (mPos == hitsMap.end()) {
- std::vector<unsigned int> vec(m_slicesLut);
- hitsOut = new CPMHits(hits->crate(), hits->module(),
- vec, vec, m_slicesLut/2);
- hitsMap.insert(std::make_pair(key, hitsOut));
- } else hitsOut = mPos->second;
- std::vector<unsigned int> hits0(hitsOut->HitsVec0());
- std::vector<unsigned int> hits1(hitsOut->HitsVec1());
- hits0[slice] = hits->HitWord0();
- hits1[slice] = hits->HitWord1();
- hitsOut->addHits(hits0, hits1);
- }
- }
- }
-
- // Fill containers and save
-
- CPMTowerCollection* cpmtOut = new CPMTowerCollection;
- CPMTowerMap::iterator mapIter;
- CPMTowerMap::iterator mapIterEnd;
- mapIter = towerMap.begin();
- mapIterEnd = towerMap.end();
- for (; mapIter != mapIterEnd; ++mapIter) cpmtOut->push_back(mapIter->second);
- StatusCode sc1 = evtStore()->overwrite(cpmtOut, m_cpmTowerLocation, true);
- if (sc1.isFailure()) {
- ATH_MSG_ERROR( "Error registering CPM Tower collection in TDS"
- );
- delete cpmtOut;
- }
- CPMHitsCollection* cpmhOut = new CPMHitsCollection;
- CPMHitsMap::iterator hitIter;
- CPMHitsMap::iterator hitIterEnd;
- hitIter = hitsMap.begin();
- hitIterEnd = hitsMap.end();
- for (; hitIter != hitIterEnd; ++hitIter) cpmhOut->push_back(hitIter->second);
- StatusCode sc2 = evtStore()->overwrite(cpmhOut, m_cpmHitsLocation, true);
- if (sc2.isFailure()) {
- ATH_MSG_ERROR( "Error registering CPM Hits collection in TDS"
- );
- delete cpmhOut;
- }
-
- if (sc1.isFailure() || sc2.isFailure()) return StatusCode::FAILURE;
- return StatusCode::SUCCESS;
-}
-
-// Merge JEM containers
-
-StatusCode MergeSlices::mergeJem()
-{
- // Create maps and key provider for output JetElements, JEMHits and JEMEtSums
-
- JetElementMap elementMap;
- JEMHitsMap hitsMap;
- JEMEtSumsMap sumsMap;
- JetElementKey elementKey;
-
- // Merge in data for each slice
-
- for (int slice = 0; slice < m_slicesLut; ++slice) {
-
- // Find Jet Elements for this slice
-
- const JetElementCollection* jeCollection = 0;
- std::string location = m_jetElementLocation + numString(slice);
- StatusCode sc = evtStore()->retrieve(jeCollection, location);
- if (sc.isFailure() || !jeCollection || jeCollection->empty()) {
- ATH_MSG_DEBUG( "No Jet Elements found for slice " << slice
- );
- } else {
- JetElementCollection::const_iterator pos = jeCollection->begin();
- JetElementCollection::const_iterator pose = jeCollection->end();
- for (; pos != pose; ++pos) {
- const JetElement* je = *pos;
- JetElement* jeOut = 0;
- unsigned int key = elementKey.jeKey(je->phi(), je->eta());
- JetElementMap::iterator mPos = elementMap.find(key);
- if (mPos == elementMap.end()) {
- std::vector<int> vec(m_slicesLut);
- jeOut = new JetElement(je->phi(), je->eta(),
- vec, vec, key, vec, vec, vec, m_slicesLut/2);
- elementMap.insert(std::make_pair(key, jeOut));
- } else jeOut = mPos->second;
- jeOut->addSlice(slice, je->emEnergy(), je->hadEnergy(),
- je->emError(), je->hadError(), je->linkError());
- }
- }
-
- // Find JEM Hits for this slice
-
- const JEMHitsCollection* jhCollection = 0;
- location = m_jemHitsLocation + numString(slice);
- sc = evtStore()->retrieve(jhCollection, location);
- if (sc.isFailure() || !jhCollection || jhCollection->empty()) {
- ATH_MSG_DEBUG( "No JEM Hits found for slice " << slice
- );
- } else {
- JEMHitsCollection::const_iterator pos = jhCollection->begin();
- JEMHitsCollection::const_iterator pose = jhCollection->end();
- for (; pos != pose; ++pos) {
- const JEMHits* jh = *pos;
- JEMHits* jhOut = 0;
- int key = jh->crate() * 100 + jh->module();
- JEMHitsMap::iterator mPos = hitsMap.find(key);
- if (mPos == hitsMap.end()) {
- std::vector<unsigned int> vec(m_slicesLut);
- jhOut = new JEMHits(jh->crate(), jh->module(), vec, m_slicesLut/2);
- hitsMap.insert(std::make_pair(key, jhOut));
- } else jhOut = mPos->second;
- std::vector<unsigned int> jetHits(jhOut->JetHitsVec());
- jetHits[slice] = jh->JetHits();
- jhOut->addJetHits(jetHits);
- }
- }
-
- // Find JEM EtSums for this slice
-
- const JEMEtSumsCollection* jsCollection = 0;
- location = m_jemEtSumsLocation + numString(slice);
- sc = evtStore()->retrieve(jsCollection, location);
- if (sc.isFailure() || !jsCollection || jsCollection->empty()) {
- ATH_MSG_DEBUG( "No JEM EtSums found for slice " << slice
- );
- } else {
- JEMEtSumsCollection::const_iterator pos = jsCollection->begin();
- JEMEtSumsCollection::const_iterator pose = jsCollection->end();
- for (; pos != pose; ++pos) {
- const JEMEtSums* js = *pos;
- JEMEtSums* jsOut = 0;
- int key = js->crate() * 100 + js->module();
- JEMEtSumsMap::iterator mPos = sumsMap.find(key);
- if (mPos == sumsMap.end()) {
- std::vector<unsigned int> vec(m_slicesLut);
- jsOut = new JEMEtSums(js->crate(), js->module(),
- vec, vec, vec, m_slicesLut/2);
- sumsMap.insert(std::make_pair(key, jsOut));
- } else jsOut = mPos->second;
- std::vector<unsigned int> ex(jsOut->ExVec());
- std::vector<unsigned int> ey(jsOut->EyVec());
- std::vector<unsigned int> et(jsOut->EtVec());
- ex[slice] = js->Ex();
- ey[slice] = js->Ey();
- et[slice] = js->Et();
- jsOut->addEx(ex);
- jsOut->addEy(ey);
- jsOut->addEt(et);
- }
- }
- }
-
- // Fill containers and save
-
- JetElementCollection* jeteOut = new JetElementCollection;
- JetElementMap::iterator mapIter;
- JetElementMap::iterator mapIterEnd;
- mapIter = elementMap.begin();
- mapIterEnd = elementMap.end();
- for (; mapIter != mapIterEnd; ++mapIter) jeteOut->push_back(mapIter->second);
- StatusCode sc1 = evtStore()->overwrite(jeteOut, m_jetElementLocation, true);
- if (sc1.isFailure()) {
- ATH_MSG_ERROR( "Error registering Jet Element collection in TDS"
- );
- delete jeteOut;
- }
- JEMHitsCollection* jemhOut = new JEMHitsCollection;
- JEMHitsMap::iterator hitIter;
- JEMHitsMap::iterator hitIterEnd;
- hitIter = hitsMap.begin();
- hitIterEnd = hitsMap.end();
- for (; hitIter != hitIterEnd; ++hitIter) jemhOut->push_back(hitIter->second);
- StatusCode sc2 = evtStore()->overwrite(jemhOut, m_jemHitsLocation, true);
- if (sc2.isFailure()) {
- ATH_MSG_ERROR( "Error registering JEM Hits collection in TDS"
- );
- delete jemhOut;
- }
- JEMEtSumsCollection* jemeOut = new JEMEtSumsCollection;
- JEMEtSumsMap::iterator sumIter;
- JEMEtSumsMap::iterator sumIterEnd;
- sumIter = sumsMap.begin();
- sumIterEnd = sumsMap.end();
- for (; sumIter != sumIterEnd; ++sumIter) jemeOut->push_back(sumIter->second);
- StatusCode sc3 = evtStore()->overwrite(jemeOut, m_jemEtSumsLocation, true);
- if (sc3.isFailure()) {
- ATH_MSG_ERROR( "Error registering JEM Et Sums collection in TDS"
- );
- delete jemeOut;
- }
-
- if (sc1.isFailure() || sc2.isFailure() || sc3.isFailure()) {
- return StatusCode::FAILURE;
- }
- return StatusCode::SUCCESS;
-}
-
-// Return number as a string
-
-std::string MergeSlices::numString(int num)
-{
- std::ostringstream cnum;
- cnum << num;
- return cnum.str();
-}
-
-} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/MergeSlices.h b/Trigger/TrigT1/TrigT1CaloSim/src/MergeSlices.h
deleted file mode 100644
index 3c2a21f1e87f..000000000000
--- a/Trigger/TrigT1/TrigT1CaloSim/src/MergeSlices.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGT1CALO_MERGESLICES_H
-#define TRIGT1CALO_MERGESLICES_H
-
-#include <string>
-#include <map>
-
-#include "AthContainers/DataVector.h"
-#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/ServiceHandle.h"
-
-namespace LVL1 {
-
-class CPMHits;
-class CPMTower;
-class JEMEtSums;
-class JEMHits;
-class JetElement;
-class TriggerTower;
-
-
-/** Algorithm to merge individually processed slices into multi-slice
- * collections for bytestream.
- *
- * @author Peter Faulkner
- */
-
-class MergeSlices : public AthAlgorithm {
-
- public:
- MergeSlices(const std::string& name, ISvcLocator* pSvcLocator);
- virtual ~MergeSlices();
-
- virtual StatusCode initialize();
- virtual StatusCode execute();
- virtual StatusCode finalize();
-
- private:
-
- typedef DataVector<TriggerTower> TriggerTowerCollection;
- typedef DataVector<CPMTower> CPMTowerCollection;
- typedef DataVector<CPMHits> CPMHitsCollection;
- typedef DataVector<JetElement> JetElementCollection;
- typedef DataVector<JEMHits> JEMHitsCollection;
- typedef DataVector<JEMEtSums> JEMEtSumsCollection;
- typedef std::map<unsigned int, TriggerTower*> TriggerTowerMap;
- typedef std::map<unsigned int, CPMTower*> CPMTowerMap;
- typedef std::map<int, CPMHits*> CPMHitsMap;
- typedef std::map<unsigned int, JetElement*> JetElementMap;
- typedef std::map<int, JEMHits*> JEMHitsMap;
- typedef std::map<int, JEMEtSums*> JEMEtSumsMap;
-
- /// Merge PPM containers
- StatusCode mergePpm();
- /// Merge CPM containers
- StatusCode mergeCpm();
- /// Merge JEM containers
- StatusCode mergeJem();
-
- /// Return number as a string
- std::string numString(int num);
-
- // Container StoreGate keys
- std::string m_cpmHitsLocation;
- std::string m_cpmTowerLocation;
- std::string m_jemEtSumsLocation;
- std::string m_jemHitsLocation;
- std::string m_jetElementLocation;
- std::string m_triggerTowerLocation;
- std::string m_fullAdcLocation;
- /// Number of slices to merge
- int m_slicesLut;
-
-};
-
-} // end namespace
-
-#endif
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/ReprocessTriggerTowers.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/ReprocessTriggerTowers.cxx
deleted file mode 100644
index 62eb357df943..000000000000
--- a/Trigger/TrigT1/TrigT1CaloSim/src/ReprocessTriggerTowers.cxx
+++ /dev/null
@@ -1,533 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-// /***************************************************************************
-// ReprocessTriggerTowers.cxx - description
-// -------------------
-// begin : Tue May 18 2010
-// email : Alan.Watson@CERN.CH
-// ***************************************************************************/
-//
-//================================================
-// ReprocessTriggerTowers class Implementation
-// ================================================
-//
-//
-//
-
-// Services
-
-#include "GaudiKernel/IIncidentSvc.h"
-
-// This algorithm includes
-#include "ReprocessTriggerTowers.h"
-#include "TrigT1Interfaces/TrigT1CaloDefs.h"
-#include "TrigT1CaloUtils/CoordToHardware.h"
-
-#include "TrigT1Interfaces/TrigT1Interfaces_ClassDEF.h"
-//#include "TrigT1CaloEvent/TriggerTowerCollection.h"
-
-
-namespace LVL1{
-
-const int ReprocessTriggerTowers::m_numTowers[m_Regions] = {m_nEMB,m_nEMEC,m_nFCAL1,m_nTile,m_nHEC,m_nFCAL23};
-
-//--------------------------------
-// Constructors and destructors
-//--------------------------------
-
-ReprocessTriggerTowers::ReprocessTriggerTowers
- ( const std::string& name, ISvcLocator* pSvcLocator )
- : AthAlgorithm( name, pSvcLocator ),
- m_TTtool("LVL1::L1TriggerTowerTool/L1TriggerTowerTool"),
- m_mappingTool("LVL1::PpmCoolOrBuiltinMappingTool/PpmCoolOrBuiltinMappingTool"),
- m_inputTowers(0),
- m_outputTowers(0)
-{
- m_InputTriggerTowerLocation = TrigT1CaloDefs::TriggerTowerLocation;
- m_OutputTriggerTowerLocation = "ReprocessedTriggerTowers";
-
- // This is how you declare the paramembers to Gaudi so that
- // they can be over-written via the job options file
-
- declareProperty( "InputTriggerTowerLocation", m_InputTriggerTowerLocation ) ;
- declareProperty( "OutputTriggerTowerLocation", m_OutputTriggerTowerLocation ) ;
-
- m_doBCID = false;
- m_ZeroSuppress = false;
- m_LUTStrategy = 1;
- m_emThresh = 0;
- m_hadThresh = 0;
- declareProperty( "ZeroSuppress", m_ZeroSuppress );
- declareProperty( "doBCID", m_doBCID );
- declareProperty( "LUTStrategy", m_LUTStrategy );
- declareProperty( "emThreshold", m_emThresh );
- declareProperty( "hadThreshold", m_hadThresh );
-
- // Provide option to set custom thresholds by bin in 6 regions
- m_Thresholds.resize(m_Regions);
- for (int i = 0; i < m_Regions; ++i) {
- m_Thresholds[i].resize(m_numTowers[i]);
- for (int j = 0; j < m_numTowers[i]; ++j) m_Thresholds[i][j] = 0;
- }
- declareProperty( "EMBThresh", m_Thresholds[EMB]);
- declareProperty( "EMECThresh", m_Thresholds[EMEC]);
- declareProperty( "FCAL1Thresh", m_Thresholds[FCAL1]);
- declareProperty( "TileThresh", m_Thresholds[Tile]);
- declareProperty( "HECThresh", m_Thresholds[HEC]);
- declareProperty( "FCAL23Thresh", m_Thresholds[FCAL23]);
-
- // Provide custom scaling of LUT slopes in same regions
- m_Rescale.resize(m_Regions);
- for (int i = 0; i < m_Regions; ++i) {
- m_Rescale[i].resize(m_numTowers[i]);
- for (int j = 0; j < m_numTowers[i]; ++j) m_Rescale[i][j] = -1.;
- }
- declareProperty( "EMBScale", m_Rescale[EMB]);
- declareProperty( "EMECScale", m_Rescale[EMEC]);
- declareProperty( "FCAL1Scale", m_Rescale[FCAL1]);
- declareProperty( "TileScale", m_Rescale[Tile]);
- declareProperty( "HECScale", m_Rescale[HEC]);
- declareProperty( "FCAL23Scale", m_Rescale[FCAL23]);
-
-}
-
-
-//---------------------------------
-// initialise()
-//---------------------------------
-
-StatusCode ReprocessTriggerTowers::initialize()
-{
- /// and the L1CaloCondSvc
- /// - note: may use tools without DB, so don't abort if fail here
- // sc = service("L1CaloCondSvc", m_l1CondSvc);
- // if (sc.isFailure()) {
- // ATH_MSG_WARNING( "Could not retrieve L1CaloCondSvc" );
- // }
-
- /// mapping tool
- ATH_CHECK( m_mappingTool.retrieve() );
- ATH_CHECK( m_TTtool.retrieve() );
-
- ServiceHandle<IIncidentSvc> incSvc ("IndicentSvc", name());
- ATH_CHECK( incSvc.retrieve() );
-
- //start listening to "BeginRun"
- incSvc->addListener(this, "BeginRun");
-
- return StatusCode::SUCCESS ;
-}
-
-
-//-------------------------------------------------
-// Update parameters at start of run
-//-------------------------------------------------
-
-void ReprocessTriggerTowers::handle(const Incident& inc)
-{
- if (inc.type()=="BeginRun") {
- ATH_MSG_DEBUG ( "Updating settings at start of run" );
-
- /// Set all thresholds to user-specified values except where "hot channel" settings were in use
- /** Initialise user-specified parameters:
- Fill std::map of parameter values, using channel ID as the key.
- Requires looping over all tower coordinates, filling values for each.
- However, we only fill entries when a user value has been specified - otherwise
- these will be taken from COOL. */
-
- m_channelNoiseCuts.clear();
- m_channelScales.clear();
-
- for (int iregion = 0; iregion < m_Regions; ++iregion) {
- int layer = ( (iregion == EMB || iregion == EMEC || iregion == FCAL1) ? 0 : 1 );
- int defaultThreshold = ( (iregion == EMB || iregion == EMEC || iregion == FCAL1) ? m_emThresh : m_hadThresh );
- for (int itower = 0; itower < m_numTowers[iregion]; ++itower) {
- // Noise cut for this eta bin
- int thresh = ( (m_Thresholds[iregion][itower] > 0) ? m_Thresholds[iregion][itower] : defaultThreshold );
- // Compute ids and store threshold for all towers
- int nPhi = 64;
- float etap = 0.1*(itower+0.5);
- float etam = -etap;
- if (iregion == EMEC || iregion == HEC) { // endcap granularity is not uniform
- if (itower < 10) etap += 1.5;
- else {
- nPhi = 32;
- etap = ( (itower != 13) ? (itower-10)*0.2 + 2.6 : 3.15 );
- }
- etam = -etap;
- }
- else if (iregion == FCAL1 || iregion == FCAL23) { // nominal eta bins, not physical tower sizes
- nPhi = 16;
- etap = 0.425*(itower+0.5) + 3.2;
- if (iregion == FCAL1) etam = -etap;
- else {
- if (itower == 0 || itower == 2) etam = -0.425*(itower+1.5) - 3.2;
- else etam = -0.425*(itower-0.5) - 3.2;
- }
- }
- float dPhi = 2.*M_PI/nPhi;
- for (int iphi = 0; iphi < nPhi; ++iphi) {
- float phi = dPhi*(iphi+0.5);
- int channelp = channelId( etap, phi, layer).id();
- int channelm = channelId( etam, phi, layer).id();
- if (thresh > 0) {
- m_channelNoiseCuts.insert(std::map<unsigned int, int>::value_type(channelp,thresh));
- m_channelNoiseCuts.insert(std::map<unsigned int, int>::value_type(channelm,thresh));
- }
- if ((m_Rescale[iregion][itower])>=0) {
- m_channelScales.insert(std::map<unsigned int, float>::value_type(channelp,m_Rescale[iregion][itower]));
- m_channelScales.insert(std::map<unsigned int, float>::value_type(channelm,m_Rescale[iregion][itower]));
- }
- } // loop over phi
-
- } // loop over towers within region
- } // loop over regions
-
- }
-
- return ;
-}
-
-
-
-//---------------------------------
-// finalise()
-//---------------------------------
-
-StatusCode ReprocessTriggerTowers::finalize()
-{
-
- ATH_MSG_INFO( "Finalizing" );
- return StatusCode::SUCCESS ;
-}
-
-
-//----------------------------------------------
-// execute() method called once per event
-//----------------------------------------------
-//
-
-
-StatusCode ReprocessTriggerTowers::execute( )
-{
-
- //make a message logging stream
-
- ATH_MSG_DEBUG ( "in execute()" );
-
- // Create containers for this event
- m_outputTowers = new DataVector<TriggerTower>; // Output tower container
-
- // Retrieve the TriggerTowerContainer
- if (evtStore()->contains<TriggerTowerCollection>(m_InputTriggerTowerLocation)) {
- StatusCode sc = evtStore()->retrieve( m_inputTowers, m_InputTriggerTowerLocation);
- if ( sc==StatusCode::SUCCESS ) {
- // Check size of TriggerTowerCollection - zero would indicate a problem
- if ( m_inputTowers->size() == 0)
- ATH_MSG_WARNING( "Empty TriggerTowerContainer - looks like a problem" );
-
- // Reprocess the TriggerTowers
- preProcess();
-
- }
- else ATH_MSG_WARNING( "Error retrieving TriggerTowers" );
- }
- else ATH_MSG_WARNING( "No TriggerTowerContainer at " << m_InputTriggerTowerLocation );
-
- // Save reprocessed towers in TES
- store();
-
- // Clean up at end of event
- m_outputTowers=0;
-
- return StatusCode::SUCCESS ;
-}
-
-/** Simulate Pre-Processing of ADC data from input TriggerTowerCollection.
- Put results in a new TriggerTowerCollection */
-void ReprocessTriggerTowers::preProcess() {
-
- //make a message logging stream
- ATH_MSG_DEBUG ( "in preProcess()" );
-
- /** Retrieve conditions for L1TriggerTowerTool */
- StatusCode scCond = m_TTtool->retrieveConditions();
- if (scCond.isFailure()) {
- ATH_MSG_WARNING( "Failed to retrieve conditions" );
- return;
- }
- /** Iterate through input TriggerTowerCollection */
- TriggerTowerCollection::const_iterator it = m_inputTowers->begin();
- for ( ; it != m_inputTowers->end(); ++it) {
-
- /** Find ChannelIDs for this TT */
- double eta = (*it)->eta();
- double phi = (*it)->phi();
- L1CaloCoolChannelId emId = channelId(eta, phi, 0);
- L1CaloCoolChannelId hadId = channelId(eta, phi, 1);
- int emChannel = emId.id();
- int hadChannel = hadId.id();
-
- /// vectors to store intermediate results of preprocessing
- std::vector<int> emFIR;
- std::vector<int> emLUTIn;
- std::vector<int> emLUTOut;
- std::vector<int> emBCIDResult;
- std::vector<int> emRange;
- std::vector<int> emBCIDDecision;
-
- /** Retrieve and process EM ADC data */
- std::vector<int> emDigits = (*it)->emADC();
-
- /// Get original parameter values from DB
- std::vector<int> firCoeffs;
- int energyLow = 0;
- int energyHigh = 0;
- int decisionSource = 0;
- std::vector<unsigned int> decisionConditions;
- unsigned int peakFinderStrategy = 0;
- int satLow = 0;
- int satHigh = 0;
- int satLevel = 0;
- int startBit = 0;
- int slope = 0;
- int offset = 0;
- int cut = 0;
- int pedValue = 0;
- float pedMean = 0.;
- int strategy = 0;
- bool disabled = 0;
- m_TTtool->firParams(emId, firCoeffs);
- m_TTtool->bcidParams(emId, energyLow, energyHigh, decisionSource, decisionConditions, peakFinderStrategy, satLow, satHigh, satLevel);
- m_TTtool->lutParams(emId, startBit, slope, offset, cut, pedValue, pedMean, strategy, disabled);
-
- /// Adjust LUT slope if specified by user
- std::map<unsigned int, float>::iterator itScale=m_channelScales.find( emChannel );
- if (itScale != m_channelScales.end()) slope *= itScale->second;
-
- /// If user wishes to change LUT strategy, or change calibration with strategy 1, need to recalculate the LUT offset for the channel
- if ( (m_LUTStrategy >= 0 && strategy != m_LUTStrategy) || itScale != m_channelScales.end() ) {
- int firCoeffSum = 0;
- for (unsigned int i = 0; i < firCoeffs.size(); ++i) firCoeffSum += firCoeffs[i];
- float firPed = pedMean * firCoeffSum;
- float offsetReal = 0.;
- if ( (m_LUTStrategy == 1 && strategy != m_LUTStrategy) ||
- (m_LUTStrategy == 1 && itScale != m_channelScales.end()) ||
- (m_LUTStrategy < 0 && strategy == 1 && itScale != m_channelScales.end()) ) {
- offsetReal = firPed*slope/pow(2.,startBit) - slope*0.5;
- offset = int(offsetReal + 0.5);
- if (offset < 0) offset = 0;
- strategy = m_LUTStrategy;
- }
- else if (m_LUTStrategy == 0 && strategy != m_LUTStrategy) {
- offsetReal = firPed/pow(2.,startBit);
- offset = int(offsetReal + 0.5);
- if (offset < 0) offset = 0;
- strategy = m_LUTStrategy;
- }
- else if (m_LUTStrategy > 1) ATH_MSG_DEBUG( "Unknown LUT Strategy selected. Ignore");
- }
- /// Simulate filter
- m_TTtool->fir(emDigits, firCoeffs, emFIR);
- m_TTtool->dropBits(emFIR, startBit, emLUTIn);
-
- /// BCID decision range
- std::vector<int> emDecisionRange;
- m_TTtool->bcidDecisionRange(emLUTIn, emDigits, emId, emDecisionRange);
-
- /// BCID simulation, if requested
- if (m_doBCID) {
- m_TTtool->bcid(emFIR, emLUTIn, emDigits, energyLow, energyHigh, decisionSource, decisionConditions, peakFinderStrategy, satLow, satHigh, satLevel, emBCIDResult, emBCIDDecision);
- }
- else {
- /// Copy original BCID output from TT into BCIDResult vector at appropriate location
- int bcid = (*it)->emBCID();
- for (int slice = 0; slice < (int)emDigits.size(); ++slice) {
- if (slice == (*it)->emADCPeak()) emBCIDResult.push_back(bcid);
- else emBCIDResult.push_back(0);
- }
- /// Recalculate whether it would have passed BCID (i.e. whether filter changed decision range)
- m_TTtool->bcidDecision(emBCIDResult, emDecisionRange, emId, emBCIDDecision);
- }
-
- /// Set user-specified value for threshold, if specified, otherwise take from COOL
- int thresh = cut;
- std::map<unsigned int, unsigned int>::iterator itThresh=m_channelNoiseCuts.find( emChannel );
- if (itThresh != m_channelNoiseCuts.end()) thresh = itThresh->second;
- //else ATH_MSG_VERBOSE( "No user-specified threshold for channel " << std::hex << emChannel << std::dec );
-
- /// LUT simulation
- m_TTtool->lut(emLUTIn, slope, offset, thresh, pedValue, strategy, disabled, emLUTOut);
-
- /// Suppress LUT ET where BCID failed. Force full scale if saturated.
- std::vector<int>::iterator itlut = emLUTOut.begin();
- std::vector<int>::const_iterator itbcid = emBCIDDecision.begin();
- while (itlut != emLUTOut.end()) {
- if (itbcid != emBCIDDecision.end()) {
- if ((*itbcid)==0) (*itlut)=0;
- ++itbcid;
- }
- ++itlut;
- }
- // Force full scale for saturated towers
- std::vector<int> emETOut;
- m_TTtool->applyEtRange(emLUTOut, emDecisionRange, emId, emETOut);
-
- /** Repeat for Had ADC data */
- std::vector<int> hadFIR;
- std::vector<int> hadLUTIn;
- std::vector<int> hadLUTOut;
- std::vector<int> hadBCIDResult;
- std::vector<int> hadRange;
- std::vector<int> hadBCIDDecision;
-
- std::vector<int> hadDigits = (*it)->hadADC();
-
- m_TTtool->firParams(hadId, firCoeffs);
- m_TTtool->bcidParams(hadId, energyLow, energyHigh, decisionSource, decisionConditions, peakFinderStrategy, satLow, satHigh, satLevel);
- m_TTtool->lutParams(hadId, startBit, slope, offset, cut, pedValue, pedMean, strategy, disabled);
-
- /// Adjust LUT slope if specified by user
- itScale=m_channelScales.find( hadChannel );
- if (itScale != m_channelScales.end()) slope *= itScale->second;
-
- /// If user wishes to change LUT strategy, or change calibration with strategy 1, need to recalculate the LUT offset for the channel
- if ( (m_LUTStrategy >= 0 && strategy != m_LUTStrategy) || itScale != m_channelScales.end() ) {
- int firCoeffSum = 0;
- for (unsigned int i = 0; i < firCoeffs.size(); ++i) firCoeffSum += firCoeffs[i];
- float firPed = pedMean * firCoeffSum;
- float offsetReal = 0.;
- if ( (m_LUTStrategy == 1 && strategy != m_LUTStrategy) ||
- (m_LUTStrategy == 1 && itScale != m_channelScales.end()) ||
- (m_LUTStrategy < 0 && strategy == 1 && itScale != m_channelScales.end()) ) {
- offsetReal = firPed*slope/pow(2.,startBit) - slope*0.5;
- offset = int(offsetReal + 0.5);
- if (offset < 0) offset = 0;
- strategy = m_LUTStrategy;
- }
- else if (m_LUTStrategy == 0 && strategy != m_LUTStrategy) {
- offsetReal = firPed/pow(2.,startBit);
- offset = int(offsetReal + 0.5);
- if (offset < 0) offset = 0;
- strategy = m_LUTStrategy;
- }
- else if (m_LUTStrategy > 1) ATH_MSG_DEBUG( "Unknown LUT Strategy selected. Ignore");
- }
-
- /// Simulate filter
- m_TTtool->fir(hadDigits, firCoeffs, hadFIR);
- m_TTtool->dropBits(hadFIR, startBit, hadLUTIn);
-
- /// BCID decision range
- std::vector<int> hadDecisionRange;
- m_TTtool->bcidDecisionRange(hadLUTIn, hadDigits, hadId, hadDecisionRange);
-
- /// BCID, if requested
- if (m_doBCID) {
- m_TTtool->bcid(hadFIR, hadLUTIn, hadDigits, energyLow, energyHigh, decisionSource, decisionConditions, peakFinderStrategy, satLow, satHigh, satLevel, hadBCIDResult, hadBCIDDecision);
- }
- else {
- /// Copy original BCID output from TT into BCIDResult vector at appropriate location
- int bcid = (*it)->hadBCID();
- for (int slice = 0; slice < (int)hadDigits.size(); ++slice) {
- if (slice == (*it)->hadADCPeak()) hadBCIDResult.push_back(bcid);
- else hadBCIDResult.push_back(0);
- }
- /// need to recalculate BCID decision though (this is not stored)
- m_TTtool->bcidDecision(hadBCIDResult, hadDecisionRange, hadId, hadBCIDDecision);
- }
- /// Set user-specified value for threshold, if available, otherwise take from COOL
- thresh = cut;
- itThresh=m_channelNoiseCuts.find( hadChannel );
- if (itThresh != m_channelNoiseCuts.end()) thresh = itThresh->second;
- //else ATH_MSG_VERBOSE( "No user-specified threshold for channel " << std::hex << hadChannel << std::dec );
-
- /// LUT simulation
- m_TTtool->lut(hadLUTIn, slope, offset, thresh, pedValue, strategy, disabled, hadLUTOut);
-
- /// Suppress LUT ET where BCID failed
- itlut = hadLUTOut.begin();
- itbcid = hadBCIDDecision.begin();
- while (itlut != hadLUTOut.end()) {
- if (itbcid != hadBCIDDecision.end()) {
- if ((*itbcid)==0) (*itlut)=0;
- ++itbcid;
- }
- ++itlut;
- }
- // Force full scale for saturated towers
- std::vector<int> hadETOut;
- m_TTtool->applyEtRange(hadLUTOut, hadDecisionRange, hadId, hadETOut);
-
-
- /** Create new TriggerTower containing results of reprocessing */
-
- /// Zero suppression, if requested. Triggered sample in ET vectors = ADC peak (the way L1TriggerTowerTool works)
- int emADCpeak = (*it)->emADCPeak();
- int hadADCpeak = (*it)->hadADCPeak();
- bool output = true;
- if (m_ZeroSuppress && emETOut[emADCpeak]==0 && hadETOut[hadADCpeak]==0) output = false;
-
- if (output) {
- /// Output only peak slice for LUT ET and BCID results (simple, robust, and what we normally read out)
- std::vector<int> emET;
- emET.push_back(emETOut[emADCpeak]);
- std::vector<int> emBCID;
- emBCID.push_back(emBCIDResult[emADCpeak]);
-
- std::vector<int> hadET;
- hadET.push_back(hadETOut[hadADCpeak]);
- std::vector<int> hadBCID;
- hadBCID.push_back(hadBCIDResult[hadADCpeak]);
-
- /// Create output TT and add to vector
- std::vector<int> emExt = (*it)->emBCIDext();
- std::vector<int> hadExt = (*it)->hadBCIDext();
- TriggerTower* tower = new TriggerTower(phi, eta, (*it)->key(),
- emDigits, emET, emExt, emBCID, 0, 0, emADCpeak,
- hadDigits, hadET, hadExt, hadBCID, 0, 0, hadADCpeak);
-
- m_outputTowers->push_back(tower);
- } // if (output)
-
- } // Loop over towers
-
-}
-
-/** place final ROI objects in the TES. */
-void LVL1::ReprocessTriggerTowers::store() {
-
- StatusCode sc = evtStore()->overwrite(m_outputTowers, m_OutputTriggerTowerLocation, true);
-
- if (sc.isSuccess()) {
- ATH_MSG_VERBOSE ( "Stored " <<m_outputTowers->size()
- << " TriggerTowers at " << m_OutputTriggerTowerLocation );
- }
- else {
- ATH_MSG_ERROR( "failed to write TriggerTowers to "
- << m_OutputTriggerTowerLocation );
- }
-
- return;
-
-} //end store
-
-/** Function to compute Id from eta/phi/layer.
- Unlike L1TriggerTowerTool::channelID this function can cope with old geometries (hence
- the hard-coded numbers). So don't remove this until all ATLAS-CSC datasets are irrevokably
- deprecated */
-L1CaloCoolChannelId LVL1::ReprocessTriggerTowers::channelId(double eta, double phi, int layer) {
- int crate, module, channel;
- m_mappingTool->mapping(eta, phi, layer, crate, module, channel);
- int slot = module + 5;
- int pin = channel % 16;
- int asic = channel / 16;
- return L1CaloCoolChannelId(crate, L1CaloModuleType::Ppm, slot, pin, asic, false);
-}
-
-
-} // end of LVL1 namespace bracket
-
-
-
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/ReprocessTriggerTowers.h b/Trigger/TrigT1/TrigT1CaloSim/src/ReprocessTriggerTowers.h
deleted file mode 100644
index 5b40ac012fb0..000000000000
--- a/Trigger/TrigT1/TrigT1CaloSim/src/ReprocessTriggerTowers.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
- /***************************************************************************
- ReprocessTriggerTowers.h - description
- -------------------
- begin : Tue May 18 2010
- email : Alan.Watson@CERN.CH
- ***************************************************************************/
-
- /***************************************************************************
- * *
- * *
- ***************************************************************************/
- #ifndef ReprocessTriggerTowers_H
- #define ReprocessTriggerTowers_H
-
- // STL
- #include <string>
- #include <vector>
-
- // Athena/Gaudi
- #include "AthenaBaseComps/AthAlgorithm.h"
- #include "GaudiKernel/ServiceHandle.h"
- #include "GaudiKernel/ToolHandle.h"
-
- #include "AthContainers/DataVector.h"
- #include "GaudiKernel/DataSvc.h"
-
-// LVL1 Calo Trigger includes
-#include "TrigT1CaloEvent/TriggerTowerCollection.h"
-// #include "TrigT1CaloCalibTools/L1CaloTTIdTools.h"
-#include "TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h"
-#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
-#include "TrigT1CaloCalibConditions/L1CaloCoolChannelId.h"
-
- namespace LVL1 {
-
- //Doxygen Class definition below:
- /**
- The algorithm responsible for simulating the Em/tau calo trigger.
- */
- class ReprocessTriggerTowers : public AthAlgorithm, public IIncidentListener
- {
- public:
-
- //-------------------------
- // Constructors/Destructors
- //
- // Athena requires that the constructor takes certain arguments
- // (and passes them directly to the constructor of the base class)
- //-------------------------
-
- ReprocessTriggerTowers( const std::string& name, ISvcLocator* pSvcLocator ) ;
-
-
- //------------------------------------------------------
- // Methods used by Athena to run the algorithm
- //------------------------------------------------------
-
- StatusCode initialize() ;
- StatusCode execute() ;
- StatusCode finalize() ;
-
- virtual void handle(const Incident&);
-
- private: // Private methods
-
- /** Simulate PreProcessor with user-defined settings */
- void preProcess();
-
- /** write output TriggerTowerCollection to TES. */
- void store();
-
- /** Compute L1CaloCoolChannelId (including support for old geometries) */
- L1CaloCoolChannelId channelId(double eta, double phi, int layer);
-
- private: // Private attributes
-
- /** Pointers to tools and services */
- ToolHandle<IL1TriggerTowerTool> m_TTtool;
- ToolHandle<IL1CaloMappingTool> m_mappingTool;
- //L1CaloCondSvc* m_l1CondSvc;
-
- /** Where to find the TriggerTowers */
- std::string m_InputTriggerTowerLocation ;
- /** Locations of outputs in StoreGate */
- std::string m_OutputTriggerTowerLocation ;
-
- /** Maps to hold customized tower parameters */
- std::map<unsigned int, unsigned int> m_channelNoiseCuts;
- std::map<unsigned int, float> m_channelScales;
-
- /** The input and output TriggerTowers */
- const TriggerTowerCollection* m_inputTowers;
- DataVector<TriggerTower>* m_outputTowers;
-
- /** Local control flags */
- bool m_ZeroSuppress;
- bool m_doBCID;
- int m_LUTStrategy;
-
- /** User-adjustable parameters */
- unsigned int m_emThresh;
- unsigned int m_hadThresh;
-
- static const int m_Regions = 6;
- enum Region { EMB=0, EMEC=1, FCAL1=2, Tile=3, HEC=4, FCAL23=5 };
- static const int m_nEMB = 15;
- static const int m_nEMEC = 14;
- static const int m_nFCAL1 = 4;
- static const int m_nTile = 15;
- static const int m_nHEC = 14;
- static const int m_nFCAL23 = 4;
- static const int m_numTowers[m_Regions];
- std::vector< std::vector<int> > m_Thresholds;
- std::vector< std::vector<float> > m_Rescale;
-
-};
-
-} // end of namespace bracket
-
- #endif
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/components/TrigT1CaloSim_entries.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/components/TrigT1CaloSim_entries.cxx
index 921e369500e3..cca1b6469d8e 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/components/TrigT1CaloSim_entries.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/components/TrigT1CaloSim_entries.cxx
@@ -1,9 +1,7 @@
#include "../Run2TriggerTowerMaker.h"
#include "../Run2CPMTowerMaker.h"
#include "../Run2JetElementMaker.h"
-#include "../MergeSlices.h"
#include "../Tester.h"
-#include "../ReprocessTriggerTowers.h"
#include "../CPMSim.h"
#include "../JEMJetSim.h"
#include "../JEMEnergySim.h"
@@ -22,9 +20,7 @@ using namespace LVL1;
DECLARE_COMPONENT( Run2TriggerTowerMaker )
DECLARE_COMPONENT( Run2CPMTowerMaker )
DECLARE_COMPONENT( Run2JetElementMaker )
-DECLARE_COMPONENT( MergeSlices )
DECLARE_COMPONENT( Tester )
-DECLARE_COMPONENT( ReprocessTriggerTowers )
DECLARE_COMPONENT( CPMSim )
DECLARE_COMPONENT( JEMJetSim )
DECLARE_COMPONENT( JEMEnergySim )
--
GitLab
From 9f410a41562f7f2c09c96b0d401780a1f35a231e Mon Sep 17 00:00:00 2001
From: Oleh Kivernyk <oleh.kivernyk@cern.ch>
Date: Fri, 20 Aug 2021 10:46:32 +0200
Subject: [PATCH 192/272] PhotonEfficiencyCorrectionTool fix in master
---
.../Root/AsgPhotonEfficiencyCorrectionTool.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/Root/AsgPhotonEfficiencyCorrectionTool.cxx b/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/Root/AsgPhotonEfficiencyCorrectionTool.cxx
index 6d5ebe9da831..08b4b78f243a 100644
--- a/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/Root/AsgPhotonEfficiencyCorrectionTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/Root/AsgPhotonEfficiencyCorrectionTool.cxx
@@ -137,9 +137,9 @@ StatusCode AsgPhotonEfficiencyCorrectionTool::initialize()
}
// Set prefix for sustematics if this is ISO, Trigger or ID SF
+ if( corrFileNameList[0].find(m_file_prefix_Trig) != std::string::npos) m_sysSubstring="TRIGGER_";
if( corrFileNameList[0].find(m_file_prefix_ID) != std::string::npos) m_sysSubstring="ID_";
if( corrFileNameList[0].find(m_file_prefix_ISO) != std::string::npos) m_sysSubstring="ISO_";
- if( corrFileNameList[0].find(m_file_prefix_Trig) != std::string::npos) m_sysSubstring="TRIGGER_";
if( corrFileNameList[0].find(m_file_prefix_TrigEff) != std::string::npos) m_sysSubstring="TRIGGER_";
if(m_sysSubstring.empty()) {ATH_MSG_ERROR ( "Invalid input file" ); return StatusCode::FAILURE;}
--
GitLab
From 6d5c7905bb59d2a5ecef26e6f07874cc27ef6fe0 Mon Sep 17 00:00:00 2001
From: Rafal Bielski <rafal.bielski@cern.ch>
Date: Fri, 20 Aug 2021 13:34:21 +0200
Subject: [PATCH 193/272] Avoid potential nullptr dereference in messages
---
.../TrigT1/L1Topo/L1TopoCoreSim/Root/CountingConnector.cxx | 2 +-
.../TrigT1/L1Topo/L1TopoCoreSim/Root/DecisionConnector.cxx | 2 +-
Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/SortingConnector.cxx | 2 +-
Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/TopoSteering.cxx | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/CountingConnector.cxx b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/CountingConnector.cxx
index fbf00becbfc7..cf3706d58967 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/CountingConnector.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/CountingConnector.cxx
@@ -65,7 +65,7 @@ void
CountingConnector::setAlgorithm(TCS::ConfigurableAlg* alg) {
Connector::setAlgorithm(alg);
m_countingAlgorithm = dynamic_cast<CountingAlg*>(alg);
- if( ! m_countingAlgorithm ) {
+ if(m_countingAlgorithm == nullptr && alg != nullptr) {
TCS_EXCEPTION("Error: algorithm " << alg->name() << " is not a CountingAlg");
}
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/DecisionConnector.cxx b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/DecisionConnector.cxx
index ee648be0973d..53a391245868 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/DecisionConnector.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/DecisionConnector.cxx
@@ -66,7 +66,7 @@ void
DecisionConnector::setAlgorithm(TCS::ConfigurableAlg* alg) {
Connector::setAlgorithm(alg);
m_decisionAlgorithm = dynamic_cast<DecisionAlg*>(alg);
- if(! m_decisionAlgorithm ) {
+ if(m_decisionAlgorithm == nullptr && alg != nullptr) {
cerr << "Error: algorithm" << alg->name() << " is not a DecisionAlg" << endl;
}
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/SortingConnector.cxx b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/SortingConnector.cxx
index c6b2a6bfc1ed..c97416176535 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/SortingConnector.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/SortingConnector.cxx
@@ -41,7 +41,7 @@ void
SortingConnector::setAlgorithm(TCS::ConfigurableAlg* alg) {
Connector::setAlgorithm(alg);
m_sortingAlgorithm = dynamic_cast<SortingAlg*>(alg); // set a local copy
- if( ! m_sortingAlgorithm ) {
+ if(m_sortingAlgorithm == nullptr && alg != nullptr) {
TCS_EXCEPTION("Error: algorithm" << alg->name() << " is not a sorting alg");
}
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/TopoSteering.cxx b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/TopoSteering.cxx
index 113e58091dac..2e2a58389ef2 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/TopoSteering.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/TopoSteering.cxx
@@ -400,12 +400,12 @@ TopoSteering::executeDecisionAlgorithm(TCS::DecisionAlg *alg,
for(const Connector* inConn: inputConnectors)
{
const SortingConnector * sc = dynamic_cast<const SortingConnector *>(inConn);
- if (sc==NULL) {
+ if (sc==nullptr && inConn!=nullptr) {
TCS_EXCEPTION("L1Topo Steering: Decision algorithm " << alg->name() << " could not cast as SortingConnector* the input connector " << inConn->name());
}
else {
const TOBArray * tobA = dynamic_cast<const TOBArray *>( sc->outputData());
- if(tobA==NULL) {
+ if(tobA==nullptr) {
TCS_EXCEPTION("L1Topo Steering: Decision algorithm " << alg->name() << " expects TOBArray(s) as input, but did not get it from connector " << inConn->name());
}
input.push_back( tobA );
--
GitLab
From 0404f3f6062b4ce93459134aea82677238aef817 Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@CERN.CH>
Date: Fri, 20 Aug 2021 14:59:47 +0200
Subject: [PATCH 194/272] Fix typo in decoration name
---
MuonSpectrometer/MuonTruthAlgs/src/MuonTruthAssociationAlg.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/MuonSpectrometer/MuonTruthAlgs/src/MuonTruthAssociationAlg.cxx b/MuonSpectrometer/MuonTruthAlgs/src/MuonTruthAssociationAlg.cxx
index b74bceae5fe5..d9448f29014b 100644
--- a/MuonSpectrometer/MuonTruthAlgs/src/MuonTruthAssociationAlg.cxx
+++ b/MuonSpectrometer/MuonTruthAlgs/src/MuonTruthAssociationAlg.cxx
@@ -24,7 +24,7 @@ namespace {
static const SG::AuxElement::ConstAccessor<ElementLink<xAOD::TruthParticleContainer> > acc_link("truthParticleLink");
//
static const SG::AuxElement::Decorator<int> dec_origin("truthOrigin");
- static const SG::AuxElement::Decorator<int> dec_type ("truthType=");
+ static const SG::AuxElement::Decorator<int> dec_type ("truthType");
static const SG::AuxElement::Decorator<ElementLink<xAOD::TruthParticleContainer> > dec_link("truthParticleLink");
} // namespace
--
GitLab
From c8ce26f61d4ced3b533e3ec6e9a738016595375d Mon Sep 17 00:00:00 2001
From: Shaun Roe <shaun.roe@cern.ch>
Date: Fri, 20 Aug 2021 15:34:18 +0200
Subject: [PATCH 195/272] solve cppcheck warnings
---
.../TRT_Monitoring/src/TRT_Monitoring_Tool.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/InnerDetector/InDetMonitoring/TRT_Monitoring/src/TRT_Monitoring_Tool.cxx b/InnerDetector/InDetMonitoring/TRT_Monitoring/src/TRT_Monitoring_Tool.cxx
index 0bf6f6312041..c4b2e71bb928 100644
--- a/InnerDetector/InDetMonitoring/TRT_Monitoring/src/TRT_Monitoring_Tool.cxx
+++ b/InnerDetector/InDetMonitoring/TRT_Monitoring/src/TRT_Monitoring_Tool.cxx
@@ -2085,11 +2085,11 @@ StatusCode TRT_Monitoring_Tool::fillTRTRDOs(const TRT_RDO_Container& rdoContaine
if (m_doChips) m_hHitHMapC[ibe][iphi_module]->Fill(chip - 1);
- if (is_middleHTbit_high) {
- if (m_doStraws) m_hHitHWMapS[ibe][iphi_module]->Fill(thisStrawNumber);
+
+ if (m_doStraws) m_hHitHWMapS[ibe][iphi_module]->Fill(thisStrawNumber);
- if (m_doChips) m_hHitHWMapC[ibe][iphi_module]->Fill(chip - 1);
- }
+ if (m_doChips) m_hHitHWMapC[ibe][iphi_module]->Fill(chip - 1);
+
}
if (firstBinHigh || lastBinHigh || driftTimeBin > 0 || trailingEdge < 23) {
--
GitLab
From 2737223537366b3e93c6c33f5a758330c45e0c00 Mon Sep 17 00:00:00 2001
From: Mark Hodgkinson <m.hodgkinson@sheffield.ac.uk>
Date: Fri, 20 Aug 2021 15:47:17 +0200
Subject: [PATCH 196/272] Update ART reco from ESD job options to treat
EventInfo correctly.
---
.../share/RecExRecoTest_ART_egamma_fromESD.py | 14 +++++++++-----
.../share/RecExRecoTest_ART_refit_fromESD.py | 14 +++++++++-----
.../share/RecExRecoTest_EgammaHiveRenames.py | 2 --
3 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_ART_egamma_fromESD.py b/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_ART_egamma_fromESD.py
index d30930fcebf8..bf4157070384 100644
--- a/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_ART_egamma_fromESD.py
+++ b/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_ART_egamma_fromESD.py
@@ -50,10 +50,6 @@ if nThreads >=1 :
theApp.EvtMax = 20
-from xAODEventInfoCnv.xAODEventInfoCreator import xAODMaker__EventInfoCnvAlg
-xAODMaker__EventInfoCnvAlg.AODKey="EventInfo"
-topSequence+=xAODMaker__EventInfoCnvAlg()
-
#---------------------------------------------------------------------------------#
# NEW Conditions access infrastructure
#
@@ -85,6 +81,13 @@ auto.ConfigureFromListOfKeys(rec.AutoConfiguration())
from RecExConfig.ObjKeyStore import objKeyStore, CfgKeyStore
+#If old style ESD with old EventInfo, we will convert it
+if (objKeyStore.isInInput("EventInfo") and not objKeyStore.isInInput( "xAOD::EventInfo")):
+ from xAODEventInfoCnv.xAODEventInfoCreator import xAODMaker__EventInfoCnvAlg
+ topSequence+=xAODMaker__EventInfoCnvAlg()
+
+import EventInfoMgt.EventInfoMgtInit
+
from PyUtils.MetaReaderPeeker import convert_itemList
objKeyStore.addManyTypesInputFile(convert_itemList(layout='#join'))
@@ -169,7 +172,8 @@ import AthenaPoolCnvSvc.WriteAthenaPool
logRecoOutputItemList_jobOptions = logging.getLogger( 'py:RecoOutputItemList_jobOptions' )
from OutputStreamAthenaPool.CreateOutputStreams import createOutputStream
-StreamESD=createOutputStream("StreamESD","myESD.pool.root",True)
+#Second True disables EventInfoTagBuilder
+StreamESD=createOutputStream("StreamESD","myESD.pool.root",True,True)
include ("CaloRecEx/CaloRecOutputItemList_jobOptions.py")
StreamESD.ItemList+=CaloESDList
include ("egammaRec/egammaOutputItemList_jobOptions.py")
diff --git a/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_ART_refit_fromESD.py b/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_ART_refit_fromESD.py
index bd557849818f..101c9d0282af 100644
--- a/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_ART_refit_fromESD.py
+++ b/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_ART_refit_fromESD.py
@@ -50,10 +50,6 @@ if nThreads >=1 :
theApp.EvtMax = 20
-from xAODEventInfoCnv.xAODEventInfoCreator import xAODMaker__EventInfoCnvAlg
-xAODMaker__EventInfoCnvAlg.AODKey="EventInfo"
-topSequence+=xAODMaker__EventInfoCnvAlg()
-
#---------------------------------------------------------------------------------#
# NEW Conditions access infrastructure
#
@@ -85,6 +81,13 @@ auto.ConfigureFromListOfKeys(rec.AutoConfiguration())
from RecExConfig.ObjKeyStore import objKeyStore, CfgKeyStore
+#If old style ESD with old EventInfo, we will convert it
+if (objKeyStore.isInInput("EventInfo") and not objKeyStore.isInInput( "xAOD::EventInfo")):
+ from xAODEventInfoCnv.xAODEventInfoCreator import xAODMaker__EventInfoCnvAlg
+ topSequence+=xAODMaker__EventInfoCnvAlg()
+
+import EventInfoMgt.EventInfoMgtInit
+
from PyUtils.MetaReaderPeeker import convert_itemList
objKeyStore.addManyTypesInputFile(convert_itemList(layout='#join'))
@@ -169,7 +172,8 @@ import AthenaPoolCnvSvc.WriteAthenaPool
logRecoOutputItemList_jobOptions = logging.getLogger( 'py:RecoOutputItemList_jobOptions' )
from OutputStreamAthenaPool.CreateOutputStreams import createOutputStream
-StreamESD=createOutputStream("StreamESD","myESD.pool.root",True)
+#Second True disables EventInfoTagBuilder
+StreamESD=createOutputStream("StreamESD","myESD.pool.root",True,True)
include ("CaloRecEx/CaloRecOutputItemList_jobOptions.py")
StreamESD.ItemList+=CaloESDList
include ("egammaRec/egammaOutputItemList_jobOptions.py")
diff --git a/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_EgammaHiveRenames.py b/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_EgammaHiveRenames.py
index 6539ffcba8c5..0725cfd78a84 100644
--- a/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_EgammaHiveRenames.py
+++ b/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_EgammaHiveRenames.py
@@ -1,6 +1,4 @@
from SGComps.AddressRemappingSvc import addInputRename
-addInputRename ('xAOD::EventAuxInfo','EventInfoAux.', 'old_EventInfoAux.')
-addInputRename ('xAOD::EventInfo','EventInfo', 'old_EventInfo')
addInputRename ('xAOD::CaloClusterContainer','CaloCalTopoClusters', 'old_CaloCalTopoClusters')
addInputRename ('xAOD::CaloClusterAuxContainer','CaloCalTopoClustersAux.', 'old_CaloCalTopoClustersAux.')
--
GitLab
From 178b0bb816b47dfd377b270ecbcc5d9f0ce00f6e Mon Sep 17 00:00:00 2001
From: Walter Lampl <Walter.Lampl@cern.ch>
Date: Fri, 20 Aug 2021 16:14:14 +0200
Subject: [PATCH 197/272] TrackingGeometry depends on both, RunLB- and
timestamp-idexed input condtions. Use CONDCONT_MIXED_DEF
---
Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/TrackingGeometry.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/TrackingGeometry.h b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/TrackingGeometry.h
index 8fc626970d9c..4832a482d02e 100644
--- a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/TrackingGeometry.h
+++ b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/TrackingGeometry.h
@@ -233,7 +233,7 @@ namespace Trk {
CLASS_DEF(Trk::TrackingGeometry, 167645219, 1)
#include "AthenaKernel/CondCont.h"
-CONDCONT_DEF( Trk::TrackingGeometry , 119021535 );
+CONDCONT_MIXED_DEF( Trk::TrackingGeometry , 119021535 );
#endif //TRKGEOMETRY_TRACKINGGEOMETRY_H
--
GitLab
From 919706085866d332e3303b4a552046e63d0e2fc6 Mon Sep 17 00:00:00 2001
From: Rafal Bielski <rafal.bielski@cern.ch>
Date: Fri, 20 Aug 2021 16:30:57 +0200
Subject: [PATCH 198/272] Make slicing and narrowing casts explicit
Make the following implicit slicing and narrowing into explicit:
```
L1TopoEvent/Root/GenericTOB.cxx:30:4: warning: slicing object from type 'JetTOB' to 'BaseTOB' discards 48 bytes of state [cppcoreguidelines-slicing]
BaseTOB(jet)
^
L1TopoEvent/Root/GenericTOB.cxx:30:4: warning: slicing object from type 'JetTOB' to 'BaseTOB' discards override 'print' [cppcoreguidelines-slicing]
L1TopoEvent/Root/GenericTOB.cxx:30:4: warning: slicing object from type 'JetTOB' to 'BaseTOB' discards override 'tobType' [cppcoreguidelines-slicing]
L1TopoEvent/Root/GenericTOB.cxx:44:4: warning: slicing object from type 'jTauTOB' to 'BaseTOB' discards 40 bytes of state [cppcoreguidelines-slicing]
BaseTOB(tau)
^
L1TopoEvent/Root/GenericTOB.cxx:44:4: warning: slicing object from type 'jTauTOB' to 'BaseTOB' discards override 'print' [cppcoreguidelines-slicing]
L1TopoEvent/Root/GenericTOB.cxx:44:4: warning: slicing object from type 'jTauTOB' to 'BaseTOB' discards override 'tobType' [cppcoreguidelines-slicing]
L1TopoEvent/Root/GenericTOB.cxx:47:12: warning: narrowing conversion from 'unsigned int' to signed type 'int' is implementation-defined [bugprone-narrowing-conversions]
, m_phi(tau.phi())
^
L1TopoEvent/Root/GenericTOB.cxx:56:4: warning: slicing object from type 'jLargeRJetTOB' to 'BaseTOB' discards 40 bytes of state [cppcoreguidelines-slicing]
BaseTOB(jet)
^
L1TopoEvent/Root/GenericTOB.cxx:56:4: warning: slicing object from type 'jLargeRJetTOB' to 'BaseTOB' discards override 'print' [cppcoreguidelines-slicing]
L1TopoEvent/Root/GenericTOB.cxx:56:4: warning: slicing object from type 'jLargeRJetTOB' to 'BaseTOB' discards override 'tobType' [cppcoreguidelines-slicing]
L1TopoEvent/Root/GenericTOB.cxx:59:12: warning: narrowing conversion from 'unsigned int' to signed type 'int' is implementation-defined [bugprone-narrowing-conversions]
, m_phi(jet.phi())
^
L1TopoEvent/Root/GenericTOB.cxx:68:4: warning: slicing object from type 'jJetTOB' to 'BaseTOB' discards 40 bytes of state [cppcoreguidelines-slicing]
BaseTOB(jet)
^
L1TopoEvent/Root/GenericTOB.cxx:68:4: warning: slicing object from type 'jJetTOB' to 'BaseTOB' discards override 'print' [cppcoreguidelines-slicing]
L1TopoEvent/Root/GenericTOB.cxx:68:4: warning: slicing object from type 'jJetTOB' to 'BaseTOB' discards override 'tobType' [cppcoreguidelines-slicing]
L1TopoEvent/Root/GenericTOB.cxx:71:12: warning: narrowing conversion from 'unsigned int' to signed type 'int' is implementation-defined [bugprone-narrowing-conversions]
, m_phi(jet.phi())
^
L1TopoEvent/Root/GenericTOB.cxx:80:4: warning: slicing object from type 'ClusterTOB' to 'BaseTOB' discards 44 bytes of state [cppcoreguidelines-slicing]
BaseTOB(cluster)
^
L1TopoEvent/Root/GenericTOB.cxx:80:4: warning: slicing object from type 'ClusterTOB' to 'BaseTOB' discards override 'print' [cppcoreguidelines-slicing]
L1TopoEvent/Root/GenericTOB.cxx:80:4: warning: slicing object from type 'ClusterTOB' to 'BaseTOB' discards override 'tobType' [cppcoreguidelines-slicing]
L1TopoEvent/Root/GenericTOB.cxx:92:4: warning: slicing object from type 'eEmTOB' to 'BaseTOB' discards 56 bytes of state [cppcoreguidelines-slicing]
BaseTOB(eem)
^
L1TopoEvent/Root/GenericTOB.cxx:92:4: warning: slicing object from type 'eEmTOB' to 'BaseTOB' discards override 'print' [cppcoreguidelines-slicing]
L1TopoEvent/Root/GenericTOB.cxx:92:4: warning: slicing object from type 'eEmTOB' to 'BaseTOB' discards override 'tobType' [cppcoreguidelines-slicing]
L1TopoEvent/Root/GenericTOB.cxx:95:12: warning: narrowing conversion from 'unsigned int' to signed type 'int' is implementation-defined [bugprone-narrowing-conversions]
, m_phi(eem.phi())
^
L1TopoEvent/Root/GenericTOB.cxx:107:4: warning: slicing object from type 'eTauTOB' to 'BaseTOB' discards 56 bytes of state [cppcoreguidelines-slicing]
BaseTOB(etau)
^
L1TopoEvent/Root/GenericTOB.cxx:107:4: warning: slicing object from type 'eTauTOB' to 'BaseTOB' discards override 'print' [cppcoreguidelines-slicing]
L1TopoEvent/Root/GenericTOB.cxx:107:4: warning: slicing object from type 'eTauTOB' to 'BaseTOB' discards override 'tobType' [cppcoreguidelines-slicing]
L1TopoEvent/Root/GenericTOB.cxx:110:12: warning: narrowing conversion from 'unsigned int' to signed type 'int' is implementation-defined [bugprone-narrowing-conversions]
, m_phi(etau.phi())
^
L1TopoEvent/Root/GenericTOB.cxx:122:4: warning: slicing object from type 'MuonTOB' to 'BaseTOB' discards 80 bytes of state [cppcoreguidelines-slicing]
BaseTOB(muon)
^
L1TopoEvent/Root/GenericTOB.cxx:122:4: warning: slicing object from type 'MuonTOB' to 'BaseTOB' discards override 'print' [cppcoreguidelines-slicing]
L1TopoEvent/Root/GenericTOB.cxx:122:4: warning: slicing object from type 'MuonTOB' to 'BaseTOB' discards override 'tobType' [cppcoreguidelines-slicing]
L1TopoEvent/Root/GenericTOB.cxx:139:4: warning: slicing object from type 'LateMuonTOB' to 'BaseTOB' discards 40 bytes of state [cppcoreguidelines-slicing]
BaseTOB(lateMuon)
^
L1TopoEvent/Root/GenericTOB.cxx:139:4: warning: slicing object from type 'LateMuonTOB' to 'BaseTOB' discards override 'print' [cppcoreguidelines-slicing]
L1TopoEvent/Root/GenericTOB.cxx:139:4: warning: slicing object from type 'LateMuonTOB' to 'BaseTOB' discards override 'tobType' [cppcoreguidelines-slicing]
L1TopoEvent/Root/GenericTOB.cxx:151:4: warning: slicing object from type 'MuonNextBCTOB' to 'BaseTOB' discards 40 bytes of state [cppcoreguidelines-slicing]
BaseTOB(muonNextBC)
^
L1TopoEvent/Root/GenericTOB.cxx:151:4: warning: slicing object from type 'MuonNextBCTOB' to 'BaseTOB' discards override 'print' [cppcoreguidelines-slicing]
L1TopoEvent/Root/GenericTOB.cxx:151:4: warning: slicing object from type 'MuonNextBCTOB' to 'BaseTOB' discards override 'tobType' [cppcoreguidelines-slicing]
L1TopoEvent/Root/GenericTOB.cxx:165:4: warning: slicing object from type 'MetTOB' to 'BaseTOB' discards 40 bytes of state [cppcoreguidelines-slicing]
BaseTOB(met)
^
L1TopoEvent/Root/GenericTOB.cxx:165:4: warning: slicing object from type 'MetTOB' to 'BaseTOB' discards override 'print' [cppcoreguidelines-slicing]
L1TopoEvent/Root/GenericTOB.cxx:165:4: warning: slicing object from type 'MetTOB' to 'BaseTOB' discards override 'tobType' [cppcoreguidelines-slicing]
L1TopoEvent/Root/MuonTOB.cxx:26:13: warning: narrowing conversion from 'unsigned int' to signed type 'int' is implementation-defined [bugprone-narrowing-conversions]
, m_phi( sizeCheck(phi, nBitsPhi()) )
^
/workspaces/build/../athena/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/JetTOB.h:36:46: warning: narrowing conversion from 'unsigned int' to signed type 'int' is implementation-defined [bugprone-narrowing-conversions]
int energy(JetSize js ) const { return js==JS1?m_Et1:m_Et2; }
^
/workspaces/build/../athena/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/JetTOB.h:37:42: warning: narrowing conversion from 'unsigned int' to signed type 'int' is implementation-defined [bugprone-narrowing-conversions]
int Et(JetSize js ) const { return js==JS1?m_Et1:m_Et2; }
```
---
.../L1Topo/L1TopoEvent/L1TopoEvent/BaseTOB.h | 2 ++
.../L1Topo/L1TopoEvent/L1TopoEvent/JetTOB.h | 4 +--
.../L1Topo/L1TopoEvent/Root/GenericTOB.cxx | 32 +++++++++----------
.../L1Topo/L1TopoEvent/Root/MuonTOB.cxx | 2 +-
4 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/BaseTOB.h b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/BaseTOB.h
index 4e51896cc7e8..43506526155e 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/BaseTOB.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/BaseTOB.h
@@ -19,6 +19,8 @@ namespace TCS {
uint32_t roiWord() const { return m_roiWord; }
+ const std::string& tobName() const { return m_tobName; }
+
static size_t instances() { return 0; }
protected:
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/JetTOB.h b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/JetTOB.h
index 66e4b9467403..f05206d20384 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/JetTOB.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/L1TopoEvent/JetTOB.h
@@ -33,8 +33,8 @@ namespace TCS {
virtual ~JetTOB();
// accessors
- int energy(JetSize js ) const { return js==JS1?m_Et1:m_Et2; }
- int Et(JetSize js ) const { return js==JS1?m_Et1:m_Et2; }
+ int energy(JetSize js ) const { return static_cast<int>(js==JS1?m_Et1:m_Et2); }
+ int Et(JetSize js ) const { return static_cast<int>(js==JS1?m_Et1:m_Et2); }
// accessors
unsigned int Et1() const { return m_Et1; }
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/GenericTOB.cxx b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/GenericTOB.cxx
index bfd62675894a..23757d67ceab 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/GenericTOB.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/GenericTOB.cxx
@@ -27,7 +27,7 @@ TCS::GenericTOB::GenericTOB(const GenericTOB & other) = default;
// constructor from jet
TCS::GenericTOB::GenericTOB(const JetTOB & jet, JetTOB::JetSize jetSize) :
- BaseTOB(jet)
+ BaseTOB(jet.roiWord(), jet.tobName())
, m_Et(jet.Et(jetSize))
, m_EtNarrow(jet.EtNarrow())
, m_EtWide(jet.EtWide())
@@ -41,10 +41,10 @@ TCS::GenericTOB::GenericTOB(const JetTOB & jet, JetTOB::JetSize jetSize) :
// constructor from small R jet
TCS::GenericTOB::GenericTOB(const jTauTOB & tau) :
- BaseTOB(tau)
+ BaseTOB(tau.roiWord(), tau.tobName())
, m_Et(tau.Et())
, m_eta(tau.eta())
- , m_phi(tau.phi())
+ , m_phi(static_cast<int>(tau.phi()))
, m_EtDouble(tau.EtDouble())
, m_etaDouble(tau.etaDouble())
, m_phiDouble(tau.phiDouble())
@@ -53,10 +53,10 @@ TCS::GenericTOB::GenericTOB(const jTauTOB & tau) :
// constructor from large R jet
TCS::GenericTOB::GenericTOB(const jLargeRJetTOB & jet) :
- BaseTOB(jet)
+ BaseTOB(jet.roiWord(), jet.tobName())
, m_Et(jet.Et())
, m_eta(jet.eta())
- , m_phi(jet.phi())
+ , m_phi(static_cast<int>(jet.phi()))
, m_EtDouble(jet.EtDouble())
, m_etaDouble(jet.etaDouble())
, m_phiDouble(jet.phiDouble())
@@ -65,10 +65,10 @@ TCS::GenericTOB::GenericTOB(const jLargeRJetTOB & jet) :
// constructor from small R jet
TCS::GenericTOB::GenericTOB(const jJetTOB & jet) :
- BaseTOB(jet)
+ BaseTOB(jet.roiWord(), jet.tobName())
, m_Et(jet.Et())
, m_eta(jet.eta())
- , m_phi(jet.phi())
+ , m_phi(static_cast<int>(jet.phi()))
, m_EtDouble(jet.EtDouble())
, m_etaDouble(jet.etaDouble())
, m_phiDouble(jet.phiDouble())
@@ -77,7 +77,7 @@ TCS::GenericTOB::GenericTOB(const jJetTOB & jet) :
// constructor from cluster
TCS::GenericTOB::GenericTOB(const ClusterTOB & cluster) :
- BaseTOB(cluster)
+ BaseTOB(cluster.roiWord(), cluster.tobName())
, m_Et(cluster.Et())
, m_eta(cluster.eta())
, m_phi(cluster.phi())
@@ -89,10 +89,10 @@ TCS::GenericTOB::GenericTOB(const ClusterTOB & cluster) :
// constructor from eEm
TCS::GenericTOB::GenericTOB(const eEmTOB & eem) :
- BaseTOB(eem)
+ BaseTOB(eem.roiWord(), eem.tobName())
, m_Et(eem.Et())
, m_eta(eem.eta())
- , m_phi(eem.phi())
+ , m_phi(static_cast<int>(eem.phi()))
, m_EtDouble(eem.EtDouble())
, m_etaDouble(eem.etaDouble())
, m_phiDouble(eem.phiDouble())
@@ -104,10 +104,10 @@ TCS::GenericTOB::GenericTOB(const eEmTOB & eem) :
// constructor from eTau
TCS::GenericTOB::GenericTOB(const eTauTOB & etau) :
- BaseTOB(etau)
+ BaseTOB(etau.roiWord(), etau.tobName())
, m_Et(etau.Et())
, m_eta(etau.eta())
- , m_phi(etau.phi())
+ , m_phi(static_cast<int>(etau.phi()))
, m_EtDouble(etau.EtDouble())
, m_etaDouble(etau.etaDouble())
, m_phiDouble(etau.phiDouble())
@@ -119,7 +119,7 @@ TCS::GenericTOB::GenericTOB(const eTauTOB & etau) :
// constructor from muon
TCS::GenericTOB::GenericTOB(const MuonTOB & muon) :
- BaseTOB(muon)
+ BaseTOB(muon.roiWord(), muon.tobName())
, m_Et(muon.Et())
, m_eta(muon.eta())
, m_phi(muon.phi())
@@ -136,7 +136,7 @@ TCS::GenericTOB::GenericTOB(const MuonTOB & muon) :
// constructor for latemuon
TCS::GenericTOB::GenericTOB(const LateMuonTOB & lateMuon) :
- BaseTOB(lateMuon)
+ BaseTOB(lateMuon.roiWord(), lateMuon.tobName())
, m_Et(lateMuon.Et())
, m_eta(lateMuon.eta())
, m_phi(lateMuon.phi())
@@ -148,7 +148,7 @@ TCS::GenericTOB::GenericTOB(const LateMuonTOB & lateMuon) :
// constructor for muonNextBC
TCS::GenericTOB::GenericTOB(const MuonNextBCTOB & muonNextBC) :
- BaseTOB(muonNextBC)
+ BaseTOB(muonNextBC.roiWord(), muonNextBC.tobName())
, m_Et(muonNextBC.Et())
, m_eta(muonNextBC.eta())
, m_phi(muonNextBC.phi())
@@ -162,7 +162,7 @@ TCS::GenericTOB::GenericTOB(const MuonNextBCTOB & muonNextBC) :
// constr from met
TCS::GenericTOB::GenericTOB(const MetTOB & met) :
- BaseTOB(met)
+ BaseTOB(met.roiWord(), met.tobName())
, m_Et(met.Et())
, m_Ex(met.Ex())
, m_Ey(met.Ey())
diff --git a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MuonTOB.cxx b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MuonTOB.cxx
index 1bf669bf89e4..a3114a25a4dd 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MuonTOB.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoEvent/Root/MuonTOB.cxx
@@ -23,7 +23,7 @@ TCS::MuonTOB::MuonTOB(unsigned int et, unsigned int isolation, int eta, unsigned
, m_Et( sizeCheck(et, nBitsEt()) )
, m_isolation( sizeCheck( isolation, nBitsIsolation()) )
, m_eta( sizeCheck(eta, nBitsEta()) )
- , m_phi( sizeCheck(phi, nBitsPhi()) )
+ , m_phi( static_cast<int>(sizeCheck(phi, nBitsPhi())) )
{}
// copy constructor
--
GitLab
From f7fcbd60a7eb53e81f7f1b74f57849a8ea1f873f Mon Sep 17 00:00:00 2001
From: Rafal Bielski <rafal.bielski@cern.ch>
Date: Fri, 20 Aug 2021 17:48:45 +0200
Subject: [PATCH 199/272] Fix a few cases of nullptr dereference
---
.../src/TrigEgammaTDToolTest.cxx | 1 +
.../TrigSerializeTP/src/TrigSerTPTool.cxx | 1 +
.../TrigBphysMonitoring/src/HLTXAODBphysMonTool.cxx | 1 +
.../TrigT1/TrigT1CTMonitoring/src/BSMonitoring.cxx | 2 +-
Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.cxx | 2 +-
.../TrigT1CaloFexPerf/src/EFexEMClusterTool.cxx | 2 +-
.../TrigT1/TrigT1CaloMonitoring/src/JEPSimMon.cxx | 5 ++++-
.../TrigT1MuonRecRoiTool/src/TrigT1RPCRecRoiTool.cxx | 12 ++++++++++++
8 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/src/TrigEgammaTDToolTest.cxx b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/src/TrigEgammaTDToolTest.cxx
index ee47d297a680..1b528ce06c12 100644
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/src/TrigEgammaTDToolTest.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/src/TrigEgammaTDToolTest.cxx
@@ -71,6 +71,7 @@ StatusCode TrigEgammaTDToolTest::execute() {
const xAOD::ElectronContainer *onlElectrons = 0;
if ( (evtStore()->retrieve(offElectrons,"Electrons")).isFailure() ){
ATH_MSG_ERROR("Failed to retrieve offline Electrons ");
+ return StatusCode::FAILURE;
}
ATH_MSG_INFO("Offline Electron container size " << offElectrons->size());
for(const auto eg : *offElectrons){
diff --git a/Trigger/TrigDataAccess/TrigSerializeTP/src/TrigSerTPTool.cxx b/Trigger/TrigDataAccess/TrigSerializeTP/src/TrigSerTPTool.cxx
index 707e19750e07..fd074da83f5b 100644
--- a/Trigger/TrigDataAccess/TrigSerializeTP/src/TrigSerTPTool.cxx
+++ b/Trigger/TrigDataAccess/TrigSerializeTP/src/TrigSerTPTool.cxx
@@ -108,6 +108,7 @@ void* TrigSerTPTool::convertTP( const std::string &clname, void *ptr,
if( ! cnvtr ) {
ATH_MSG_ERROR( "T/P Converter for transient class " << tpItr->first
<< " persistent class " << persName << " could not be retrieved");
+ return nullptr;
}
// Create a persistent object:
diff --git a/Trigger/TrigMonitoring/TrigBphysMonitoring/src/HLTXAODBphysMonTool.cxx b/Trigger/TrigMonitoring/TrigBphysMonitoring/src/HLTXAODBphysMonTool.cxx
index 316972d80e9e..39334cb49962 100644
--- a/Trigger/TrigMonitoring/TrigBphysMonitoring/src/HLTXAODBphysMonTool.cxx
+++ b/Trigger/TrigMonitoring/TrigBphysMonitoring/src/HLTXAODBphysMonTool.cxx
@@ -1816,6 +1816,7 @@ void HLTXAODBphysMonTool::fillTrigBphysHists(const xAOD::TrigBphys *bphysItem, c
const std::string & prefix,const std::string & path, const std::string & chainName, const bool fullSetOfHists) {
if (!bphysItem) {
ATH_MSG_WARNING("fillTrigBphysHists null pointer provided");
+ return;
}
ATH_MSG_DEBUG("fillTrigBphysHists for: " << bphysItem << " " << groupName << " "
<< prefix << " " <<path << " " <<chainName );
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.cxx b/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.cxx
index 4d1c55728f9f..9fb96a0462e5 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.cxx
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.cxx
@@ -106,7 +106,7 @@ TrigT1CTMonitoring::BSMonitoring::bookHistograms()
m_freqMeasurements.clear();
m_beamMode.clear();
const CTP_RIO* theCTP_RIO = SG::get(m_CTP_RIOKey);
- if (! theCTP_RIO) {
+ if (theCTP_RIO!=nullptr) {
getCoolData(theCTP_RIO->getRunNumber());
ATH_MSG_DEBUG( m_lumiBlocks.size() << " lumi blocks found");
for ( std::vector<uint32_t>::const_iterator lbIt = m_lumiBlocks.begin();
diff --git a/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.cxx b/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.cxx
index 1f5a641f7582..f6356ed67ff0 100644
--- a/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.cxx
+++ b/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.cxx
@@ -745,7 +745,7 @@ LVL1CTP::CTPSimulation::calculateJetMultiplicity( const TrigConf::L1Threshold &
} else {
ATH_MSG_ERROR( "Unexpected threshold name " << confThr.name() << ". Should start with j, jL, g, or J.");
}
- if(!rhk->empty()) {
+ if(rhk!=nullptr && !rhk->empty()) {
auto jets = SG::makeHandle( *rhk, context );
if ( jets.isValid() ) {
auto pt = confThr.getAttribute<unsigned int>("pt");
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/EFexEMClusterTool.cxx b/Trigger/TrigT1/TrigT1CaloFexPerf/src/EFexEMClusterTool.cxx
index 134270a6582f..567fdb751754 100644
--- a/Trigger/TrigT1/TrigT1CaloFexPerf/src/EFexEMClusterTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloFexPerf/src/EFexEMClusterTool.cxx
@@ -339,7 +339,7 @@ LVL1::EFexEMClusterTool::addOnce(const CaloCell* inputCell, std::vector<const Ca
bool alreadyThere = false;
for (auto oCell : outputVector){
if (oCell==nullptr) ATH_MSG_WARNING ( "nullptr cell in vector");
- if (inputCell->ID() == oCell->ID()) alreadyThere=true;
+ else if (inputCell->ID() == oCell->ID()) alreadyThere=true;
}
if (!alreadyThere) outputVector.push_back(inputCell);
}
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEPSimMon.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEPSimMon.cxx
index b5a94290bf69..d47fb4f3a16f 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEPSimMon.cxx
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEPSimMon.cxx
@@ -695,7 +695,10 @@ StatusCode JEPSimMon::fillHistograms()
{
msg(MSG::DEBUG) << "No DAQ CMX RoIs found" << endmsg;
}
- cmxRoiTES = *cmxRoiTEScontainer->begin();
+ else
+ {
+ cmxRoiTES = *cmxRoiTEScontainer->begin();
+ }
// Retrieve JEM Et Sums from SG
const xAOD::JEMEtSumsContainer *jemEtSumsTES = 0;
diff --git a/Trigger/TrigT1/TrigT1MuonRecRoiTool/src/TrigT1RPCRecRoiTool.cxx b/Trigger/TrigT1/TrigT1MuonRecRoiTool/src/TrigT1RPCRecRoiTool.cxx
index 2400ec8e0dda..d5ca20871b30 100644
--- a/Trigger/TrigT1/TrigT1MuonRecRoiTool/src/TrigT1RPCRecRoiTool.cxx
+++ b/Trigger/TrigT1/TrigT1MuonRecRoiTool/src/TrigT1RPCRecRoiTool.cxx
@@ -45,6 +45,10 @@ namespace LVL1 {
SG::ReadCondHandle<RpcCablingCondData> rpcReadHandle{m_rpcKey};
const RpcCablingCondData* rpcCab{*rpcReadHandle};
+ if (rpcCab==nullptr){
+ ATH_MSG_ERROR("Null pointer to the read RpcCablingCondData conditions object.");
+ return data;
+ }
if(rpcCab->give_RoI_borders_id(data.side(), data.sector(), data.roi(),
EtaLowBorder_id, EtaHighBorder_id,
@@ -174,6 +178,10 @@ namespace LVL1 {
SG::ReadCondHandle<RpcCablingCondData> rpcReadHandle{m_rpcKey};
const RpcCablingCondData* rpcCab{*rpcReadHandle};
+ if (rpcCab==nullptr){
+ ATH_MSG_ERROR("Null pointer to the read RpcCablingCondData conditions object.");
+ return false;
+ }
if(!rpcCab->give_LowPt_borders_id(data.side(), data.sector(), data.roi(),
EtaLowBorder_id, EtaHighBorder_id,
@@ -220,6 +228,10 @@ namespace LVL1 {
SG::ReadCondHandle<RpcCablingCondData> rpcReadHandle{m_rpcKey};
const RpcCablingCondData* rpcCab{*rpcReadHandle};
+ if (rpcCab==nullptr){
+ ATH_MSG_ERROR("Null pointer to the read RpcCablingCondData conditions object.");
+ return false;
+ }
if(!rpcCab->give_HighPt_borders_id(data.side(), data.sector(), data.roi(),
EtaLowBorder_id, EtaHighBorder_id,
--
GitLab
From 4cd3c6fc06f140cfeac38f368b26a1f42135bc9d Mon Sep 17 00:00:00 2001
From: Shaun Roe <shaun.roe@cern.ch>
Date: Fri, 20 Aug 2021 17:17:05 +0000
Subject: [PATCH 200/272] 22.0-leak_fix2-InDetTrackingGeometry
---
.../SiLayerBuilderCond.h | 6 +--
.../src/SiLayerBuilderCond.cxx | 53 ++++++++-----------
2 files changed, 24 insertions(+), 35 deletions(-)
diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/InDetTrackingGeometry/SiLayerBuilderCond.h b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/InDetTrackingGeometry/SiLayerBuilderCond.h
index 6feb9da82777..54d0d1e41f6c 100644
--- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/InDetTrackingGeometry/SiLayerBuilderCond.h
+++ b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/InDetTrackingGeometry/SiLayerBuilderCond.h
@@ -41,7 +41,7 @@ namespace Trk {
class CylinderLayer;
class DiscLayer;
class PlaneLayer;
- class LayerMaterialProperties;
+ class BinnedLayerMaterial;
typedef std::pair< SharedObject<const Surface>, Amg::Vector3D > SurfaceOrderPosition;
}
@@ -99,8 +99,8 @@ namespace InDet {
/** create the disc layers, if no vector is given, then it's the first pass, else it's the DBM for the Pixels */
std::pair<EventIDRange, std::vector< const Trk::DiscLayer* >* > createDiscLayers(const EventContext& ctx, std::vector<const Trk::DiscLayer* >* dLayers = nullptr) const;
- const Trk::LayerMaterialProperties* barrelLayerMaterial(double r, double hz) const; //!< helper method to construct barrel material
- const Trk::LayerMaterialProperties* endcapLayerMaterial(double rMin, double rMax) const; //!< helper method to construct endcap material
+ const Trk::BinnedLayerMaterial barrelLayerMaterial(double r, double hz) const; //!< helper method to construct barrel material
+ const Trk::BinnedLayerMaterial endcapLayerMaterial(double rMin, double rMax) const; //!< helper method to construct endcap material
void registerSurfacesToLayer(const std::vector<const Trk::Surface*>& surfaces, const Trk::Layer& layer) const; //!< layer association
diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/SiLayerBuilderCond.cxx b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/SiLayerBuilderCond.cxx
index d3d76fb39d9c..942fcd43f53f 100644
--- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/SiLayerBuilderCond.cxx
+++ b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/SiLayerBuilderCond.cxx
@@ -321,7 +321,7 @@ std::pair<EventIDRange, const std::vector<const Trk::CylinderLayer*>*> InDet::Si
// fill the Surface vector
Amg::Vector3D orderPosition((*sidetIter)->center());
double currentPhi = orderPosition.phi();
- takeSmaller( layerMinPhi[currentlayer], currentPhi);
+ takeSmaller( layerMinPhi[currentlayer], currentPhi);
takeBigger( layerMaxPhi[currentlayer], currentPhi);
// decide which one to register on the Radius: always the one with smaller radius
@@ -461,7 +461,7 @@ std::pair<EventIDRange, const std::vector<const Trk::CylinderLayer*>*> InDet::Si
layerThickness[layerCounter] = layerRmax[layerCounter] - layerRmin[layerCounter];
// create the material
- const Trk::LayerMaterialProperties* layerMaterial = barrelLayerMaterial(layerRadius[layerCounter], currentLayerExtend);
+ const Trk::LayerMaterialProperties& layerMaterial = barrelLayerMaterial(layerRadius[layerCounter], currentLayerExtend);
double currentLayerThickness = layerThickness[layerCounter]+m_barrelEnvelope;
// screen output
@@ -496,11 +496,9 @@ std::pair<EventIDRange, const std::vector<const Trk::CylinderLayer*>*> InDet::Si
// construct the layer (finally)
activeLayer = new Trk::CylinderLayer(new Trk::CylinderBounds(layerRadius[layerCounter],currentLayerExtend),
currentBinnedArray,
- *layerMaterial,
+ layerMaterial,
layerThickness[layerCounter],
olDescriptor);
- // cleanup of the layer material --------------------------------------------------------------
- delete layerMaterial;
// register the layer to the surfaces
const std::vector<const Trk::Surface*>& layerSurfaces = currentBinnedArray->arrayObjects();
registerSurfacesToLayer(layerSurfaces,*activeLayer);
@@ -916,7 +914,7 @@ std::pair<EventIDRange, std::vector< const Trk::DiscLayer* >* > InDet::SiLayerBu
ATH_MSG_DEBUG( " -> With Rmin/Rmax (corr) : " << minRmin << " / " << maxRmax );
// get the layer material from the helper method
- const Trk::LayerMaterialProperties* layerMaterial = endcapLayerMaterial(rMin,rMax);
+ const Trk::LayerMaterialProperties& layerMaterial = endcapLayerMaterial(rMin,rMax);
// position & bounds of the active Layer
Amg::Transform3D activeLayerTransform ;
@@ -946,11 +944,9 @@ std::pair<EventIDRange, std::vector< const Trk::DiscLayer* >* > InDet::SiLayerBu
Trk::DiscLayer* activeLayer = new Trk::DiscLayer(activeLayerTransform,
activeLayerBounds,
currentBinnedArray,
- *layerMaterial,
+ layerMaterial,
thickness,
olDescriptor);
- // cleanup
- delete layerMaterial;
// register the layer to the surfaces --- if necessary to the other sie as well
const std::vector<const Trk::Surface*>& layerSurfaces = currentBinnedArray->arrayObjects();
registerSurfacesToLayer(layerSurfaces,*activeLayer);
@@ -1032,12 +1028,12 @@ std::pair<EventIDRange, std::vector< const Trk::DiscLayer* >* > InDet::SiLayerBu
ATH_MSG_DEBUG(
"Building an additional DiscLayer w/o sensitive modules at");
// create the material and the passive layer
- const Trk::LayerMaterialProperties* passiveLayerMaterial =
+ const Trk::LayerMaterialProperties& passiveLayerMaterial =
endcapLayerMaterial(rMin, rMax);
passiveLayer =
new Trk::DiscLayer(passiveDiscTransf,
new Trk::DiscBounds(rMin, rMax),
- *passiveLayerMaterial,
+ passiveLayerMaterial,
1. * Gaudi::Units::mm);
} else
passiveLayer = new Trk::DiscLayer(
@@ -1092,14 +1088,12 @@ std::vector< const Trk::CylinderLayer* >* InDet::SiLayerBuilderCond::dressCylind
if ( (*addLayerTypeIter) ) {
ATH_MSG_DEBUG("[- M -] Building an additional CylinderLayer w/o sensitive modules");
// the material for the passive layer
- const Trk::LayerMaterialProperties* passiveLayerMaterial = barrelLayerMaterial(*addLayerIter,cylLayerExtend);
+ const Trk::LayerMaterialProperties& passiveLayerMaterial = barrelLayerMaterial(*addLayerIter,cylLayerExtend);
// create the passive layer
cylinderLayers->push_back(new Trk::CylinderLayer(new Trk::CylinderBounds(*addLayerIter,cylLayerExtend),
- *passiveLayerMaterial,
+ passiveLayerMaterial,
1.*Gaudi::Units::mm,
nullptr,0));
- // cleanup of the layer material --------------------------------------------------------------
- delete passiveLayerMaterial;
} else {
ATH_MSG_DEBUG("[- N -] Building an additional NavigationLayer for volume dimension control");
// create the passive layer
@@ -1124,42 +1118,37 @@ std::vector< const Trk::CylinderLayer* >* InDet::SiLayerBuilderCond::dressCylind
return cylinderLayers;
}
-const Trk::LayerMaterialProperties* InDet::SiLayerBuilderCond::barrelLayerMaterial(double r, double hz) const
+const Trk::BinnedLayerMaterial
+InDet::SiLayerBuilderCond::barrelLayerMaterial(double r, double hz) const
{
- Trk::LayerMaterialProperties* layerMaterial = nullptr;
// --------------- material estimation ----------------------------------------------------------------
// -- material with 1D binning
Trk::BinUtility layerBinUtilityZ(m_barrelLayerBinsZ, -hz, hz, Trk::open, Trk::binZ);
- if (m_barrelLayerBinsPhi==1){
- layerMaterial = new Trk::BinnedLayerMaterial(layerBinUtilityZ);
- } else { // -- material with 2D binning
+ auto & layerBinUtility(layerBinUtilityZ);
+ if (m_barrelLayerBinsPhi!=1){ // -- material with 2D binning
Trk::BinUtility layerBinUtilityRPhiZ(m_barrelLayerBinsPhi,
-r*M_PI, r*M_PI,
Trk::closed,
Trk::binRPhi);
- layerBinUtilityRPhiZ += layerBinUtilityZ;
- layerMaterial = new Trk::BinnedLayerMaterial(layerBinUtilityRPhiZ);
+ layerBinUtilityRPhiZ += layerBinUtilityZ;
+ layerBinUtility = layerBinUtilityRPhiZ;
}
// --------------- material estimation ----------------------------------------------------------------
- return layerMaterial;
+ return Trk::BinnedLayerMaterial(layerBinUtility);
}
-const Trk::LayerMaterialProperties* InDet::SiLayerBuilderCond::endcapLayerMaterial(double rMin, double rMax) const
+const Trk::BinnedLayerMaterial
+InDet::SiLayerBuilderCond::endcapLayerMaterial(double rMin, double rMax) const
{
- Trk::LayerMaterialProperties* layerMaterial = nullptr;
// --------------- material estimation ----------------------------------------------------------------
-
Trk::BinUtility layerBinUtilityR(m_endcapLayerBinsR,rMin,rMax,Trk::open, Trk::binR);
- // -- material with 1D binning
- if (m_endcapLayerBinsPhi==1){
- layerMaterial = new Trk::BinnedLayerMaterial(layerBinUtilityR);
- } else { // -- material with 2D binning
+ if (m_endcapLayerBinsPhi!=1){ // -- material with 2D binning
Trk::BinUtility layerBinUtilityPhi(m_endcapLayerBinsPhi,-M_PI,M_PI,Trk::closed,Trk::binPhi);
layerBinUtilityR += layerBinUtilityPhi;
- layerMaterial = new Trk::BinnedLayerMaterial(layerBinUtilityR);
}
+ //const auto layerMaterial = Trk::BinnedLayerMaterial(layerBinUtilityR);
// --------------- material estimation ----------------------------------------------------------------
- return layerMaterial;
+ return Trk::BinnedLayerMaterial(layerBinUtilityR);
}
void InDet::SiLayerBuilderCond::registerSurfacesToLayer(const std::vector<const Trk::Surface*>& layerSurfaces, const Trk::Layer& lay) const
--
GitLab
From 841eb36d1b570d5638f36c09fb979154c82d7663 Mon Sep 17 00:00:00 2001
From: Christos Anastopoulos <christos.anastopoulos@cern.ch>
Date: Fri, 20 Aug 2021 17:18:45 +0000
Subject: [PATCH 201/272] EMClusterTool rm some legacy unused options and
relevant code paths
---
.../egammaAlgs/src/topoEgammaBuilder.cxx | 2 +-
.../egammaInterfaces/IEMClusterTool.h | 3 +-
.../egammaRec/python/LRTEgammaConfig.py | 2 -
.../python/egammaToolsFactories.py | 14 +-
.../egamma/egammaTools/src/EMClusterTool.cxx | 205 +-----------------
.../egamma/egammaTools/src/EMClusterTool.h | 96 +-------
.../Egamma/TrigEgammaFactories.py | 5 +-
.../Electron/generateElectron.py | 4 -
8 files changed, 17 insertions(+), 314 deletions(-)
diff --git a/Reconstruction/egamma/egammaAlgs/src/topoEgammaBuilder.cxx b/Reconstruction/egamma/egammaAlgs/src/topoEgammaBuilder.cxx
index 6906d85f6afc..b00c02ad9158 100644
--- a/Reconstruction/egamma/egammaAlgs/src/topoEgammaBuilder.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/topoEgammaBuilder.cxx
@@ -222,7 +222,7 @@ topoEgammaBuilder::execute(const EventContext& ctx) const
}
// Calibration
- if (m_clusterTool->contExecute(ctx, *calodetdescrmgr, electrons, photons)
+ if (m_clusterTool->contExecute(ctx,electrons, photons)
.isFailure()) {
ATH_MSG_ERROR("Problem executing the " << m_clusterTool << " tool");
return StatusCode::FAILURE;
diff --git a/Reconstruction/egamma/egammaInterfaces/egammaInterfaces/IEMClusterTool.h b/Reconstruction/egamma/egammaInterfaces/egammaInterfaces/IEMClusterTool.h
index 1039574bc4aa..676cb3e7d961 100644
--- a/Reconstruction/egamma/egammaInterfaces/egammaInterfaces/IEMClusterTool.h
+++ b/Reconstruction/egamma/egammaInterfaces/egammaInterfaces/IEMClusterTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef EGAMMAINTERFACES_IEMCLUSTERTOOL_H
@@ -33,7 +33,6 @@ class IEMClusterTool : virtual public IAlgTool {
virtual StatusCode initialize() = 0;
/** @brief execute on containers */
virtual StatusCode contExecute(const EventContext& ctx,
- const CaloDetDescrManager& cmgr,
xAOD::ElectronContainer* electronContainer,
xAOD::PhotonContainer* photonContainer) const = 0;
diff --git a/Reconstruction/egamma/egammaRec/python/LRTEgammaConfig.py b/Reconstruction/egamma/egammaRec/python/LRTEgammaConfig.py
index 1c42694c654c..78c29bb95f5f 100644
--- a/Reconstruction/egamma/egammaRec/python/LRTEgammaConfig.py
+++ b/Reconstruction/egamma/egammaRec/python/LRTEgammaConfig.py
@@ -83,8 +83,6 @@ LRTphotonSuperClusterBuilder = photonSuperClusterBuilder.copy(
LRTEMClusterTool = EMClusterTool.copy(
name='LRTEMClusterTool',
OutputClusterContainerName="LRT"+egammaKeys.outputClusterKey(),
- OutputTopoSeededClusterContainerName='LRT' +
- egammaKeys.outputTopoSeededClusterKey(),
)
LRTtopoEgammaBuilder = topoEgammaBuilder.copy(
diff --git a/Reconstruction/egamma/egammaTools/python/egammaToolsFactories.py b/Reconstruction/egamma/egammaTools/python/egammaToolsFactories.py
index 952bf9b48526..9414f306eb68 100644
--- a/Reconstruction/egamma/egammaTools/python/egammaToolsFactories.py
+++ b/Reconstruction/egamma/egammaTools/python/egammaToolsFactories.py
@@ -69,15 +69,10 @@ def configureSuperClusterCorrections(swTool):
cells_name=egammaKeys.caloCellKey())))
-def configureClusterCorrections(swTool):
- "Add attributes ClusterCorrectionToolsXX to egammaSwTool object"
- configureFixedSizeClusterCorrections(swTool)
- if jobproperties.egammaRecFlags.doSuperclusters():
- configureSuperClusterCorrections(swTool)
-
-
+# At the end we could keep only one version of the tools
+# below
egammaSwTool = ToolFactory(egammaToolsConf.egammaSwTool,
- postInit=[configureClusterCorrections])
+ postInit=[configureSuperClusterCorrections])
egammaSwSuperClusterTool = ToolFactory(
@@ -88,9 +83,6 @@ egammaSwSuperClusterTool = ToolFactory(
EMClusterTool = ToolFactory(
egammaToolsConf.EMClusterTool,
OutputClusterContainerName=egammaKeys.outputClusterKey(),
- OutputTopoSeededClusterContainerName=egammaKeys.outputTopoSeededClusterKey(),
- ClusterCorrectionTool=egammaSwTool,
- doSuperCluster=jobproperties.egammaRecFlags.doSuperclusters(),
MVACalibSvc=egammaMVASvc
)
diff --git a/Reconstruction/egamma/egammaTools/src/EMClusterTool.cxx b/Reconstruction/egamma/egammaTools/src/EMClusterTool.cxx
index 4713a9138640..0421c974f2d2 100644
--- a/Reconstruction/egamma/egammaTools/src/EMClusterTool.cxx
+++ b/Reconstruction/egamma/egammaTools/src/EMClusterTool.cxx
@@ -5,7 +5,6 @@
#include "EMClusterTool.h"
#include "CaloEvent/CaloClusterCellLink.h"
#include "GaudiKernel/EventContext.h"
-#include "StoreGate/StoreGateSvc.h"
#include "xAODCaloEvent/CaloCluster.h"
#include "xAODCaloEvent/CaloClusterAuxContainer.h"
#include "xAODEgamma/EgammaxAODHelpers.h"
@@ -23,8 +22,6 @@ EMClusterTool::EMClusterTool(const std::string& type,
const std::string& name,
const IInterface* parent)
: AthAlgTool(type, name, parent)
- , m_caloCellDetPos{}
- , m_doTopoSeededContainer(false)
{
declareInterface<IEMClusterTool>(this);
}
@@ -41,20 +38,6 @@ EMClusterTool::initialize()
m_outputClusterContainerKey.key() + "_links";
ATH_CHECK(m_outputClusterContainerCellLinkKey.initialize());
- m_doTopoSeededContainer = (m_outputTopoSeededClusterContainerKey.key() !=
- m_outputClusterContainerKey.key() &&
- !m_doSuperClusters);
- ATH_CHECK(
- m_outputTopoSeededClusterContainerKey.initialize(m_doTopoSeededContainer));
- m_outputTopoSeededClusterContainerCellLinkKey =
- m_outputTopoSeededClusterContainerKey.key() + "_links";
-
- ATH_CHECK(m_outputTopoSeededClusterContainerCellLinkKey.initialize(
- m_doTopoSeededContainer));
-
- // Get the cluster correction tool
- ATH_CHECK(m_clusterCorrectionTool.retrieve());
-
// Get the cluster correction tool
ATH_CHECK(m_MVACalibSvc.retrieve());
@@ -65,7 +48,6 @@ EMClusterTool::initialize()
StatusCode
EMClusterTool::contExecute(const EventContext& ctx,
- const CaloDetDescrManager& mgr,
xAOD::ElectronContainer* electronContainer,
xAOD::PhotonContainer* photonContainer) const
{
@@ -84,52 +66,17 @@ EMClusterTool::contExecute(const EventContext& ctx,
ATH_CHECK(outputClusterContainerCellLink.record(
std::make_unique<CaloClusterCellLinkContainer>()));
- // Create output cluster container for topo-seeded clusters and register in
- // StoreGate Only if they differ from the main output cluster container and if
- // we do not do supercluster
- SG::WriteHandle<xAOD::CaloClusterContainer> outputTopoSeededClusterContainer;
- SG::WriteHandle<CaloClusterCellLinkContainer>
- outputTopoSeededClusterContainerCellLink;
-
- if (m_doTopoSeededContainer) {
- outputTopoSeededClusterContainer =
- SG::WriteHandle<xAOD::CaloClusterContainer>(
- m_outputTopoSeededClusterContainerKey, ctx);
-
- ATH_CHECK(outputTopoSeededClusterContainer.record(
- std::make_unique<xAOD::CaloClusterContainer>(),
- std::make_unique<xAOD::CaloClusterAuxContainer>()));
-
- outputTopoSeededClusterContainerCellLink =
- SG::WriteHandle<CaloClusterCellLinkContainer>(
- m_outputTopoSeededClusterContainerCellLinkKey, ctx);
-
- ATH_CHECK(outputTopoSeededClusterContainerCellLink.record(
- std::make_unique<CaloClusterCellLinkContainer>()));
- }
-
// Loop over electrons and create new clusters
- xAOD::EgammaParameters::EgammaType egType = xAOD::EgammaParameters::electron;
if (electronContainer) {
for (auto electron : *electronContainer) {
- setNewCluster(ctx, mgr, electron, outputClusterContainer.ptr(), egType);
+ setNewCluster(ctx, electron, outputClusterContainer.ptr());
}
}
if (photonContainer) {
// Loop over photons and create new clusters
for (auto photon : *photonContainer) {
- egType = (xAOD::EgammaHelpers::isConvertedPhoton(photon)
- ? xAOD::EgammaParameters::convertedPhoton
- : xAOD::EgammaParameters::unconvertedPhoton);
-
- if (!m_doTopoSeededContainer ||
- !photon->author(xAOD::EgammaParameters::AuthorCaloTopo35)) {
- setNewCluster(ctx, mgr, photon, outputClusterContainer.ptr(), egType);
- } else {
- setNewCluster(
- ctx, mgr, photon, outputTopoSeededClusterContainer.ptr(), egType);
- }
+ setNewCluster(ctx, photon, outputClusterContainer.ptr());
}
}
// Now finalize the cluster: based on code in
@@ -138,44 +85,24 @@ EMClusterTool::contExecute(const EventContext& ctx,
cl->setLink(outputClusterContainerCellLink.ptr(), ctx);
}
- if (m_doTopoSeededContainer) {
- for (xAOD::CaloCluster* cl : *outputTopoSeededClusterContainer) {
- cl->setLink(outputTopoSeededClusterContainerCellLink.ptr(), ctx);
- }
- }
-
return StatusCode::SUCCESS;
}
void
-EMClusterTool::setNewCluster(const EventContext& ctx,
- const CaloDetDescrManager& mgr,
- xAOD::Egamma* eg,
- xAOD::CaloClusterContainer* outputClusterContainer,
- xAOD::EgammaParameters::EgammaType egType) const
+EMClusterTool::setNewCluster(
+ const EventContext& ctx,
+ xAOD::Egamma* eg,
+ xAOD::CaloClusterContainer* outputClusterContainer) const
{
if (!eg) {
return;
}
-
if (!eg->caloCluster()) {
ATH_MSG_DEBUG("egamma object does not have a cluster associated");
return;
}
using ClusterLink_t = ElementLink<xAOD::CaloClusterContainer>;
- xAOD::CaloCluster* cluster = nullptr;
-
- // Special Case for topo seeded photons.
- if (eg->author(xAOD::EgammaParameters::AuthorCaloTopo35)) {
- cluster = new xAOD::CaloCluster(*(eg->caloCluster()));
- fillPositionsInCalo(cluster, mgr);
- } // Doing superClusters
- else if (m_doSuperClusters) {
- // copy over for super clusters
- cluster = makeNewSuperCluster(*(eg->caloCluster()), eg);
- } else {
- cluster = makeNewCluster(ctx, *(eg->caloCluster()), mgr, eg, egType);
- }
+ xAOD::CaloCluster* cluster = makeNewSuperCluster(*(eg->caloCluster()), eg);
outputClusterContainer->push_back(cluster);
@@ -185,129 +112,15 @@ EMClusterTool::setNewCluster(const EventContext& ctx,
eg->setCaloClusterLinks(clusterLinks);
}
-xAOD::CaloCluster*
-EMClusterTool::makeNewCluster(const EventContext& ctx,
- const xAOD::CaloCluster& cluster,
- const CaloDetDescrManager& mgr,
- xAOD::Egamma* eg,
- xAOD::EgammaParameters::EgammaType egType) const
-{
- // Create new cluster based on an existing one
- // const CaloCluster* cluster : input cluster
-
- // protection against cluster not in barrel nor endcap
- if (!cluster.inBarrel() && !cluster.inEndcap()) {
- ATH_MSG_ERROR("Cluster neither in barrel nor in endcap, Skipping cluster");
- return nullptr;
- }
-
- if (static_cast<int>(egType) < 0 ||
- egType >= xAOD::EgammaParameters::NumberOfEgammaTypes) {
- ATH_MSG_WARNING("Invalid egamma type");
- return nullptr;
- }
-
- bool isBarrel = xAOD::EgammaHelpers::isBarrel(&cluster);
- xAOD::CaloCluster::ClusterSize cluSize = xAOD::CaloCluster::CSize_Unknown;
- switch (egType) {
- case xAOD::EgammaParameters::electron: {
- cluSize =
- isBarrel ? xAOD::CaloCluster::SW_37ele : xAOD::CaloCluster::SW_55ele;
- break;
- }
- case xAOD::EgammaParameters::convertedPhoton: {
- cluSize = isBarrel ? xAOD::CaloCluster::SW_37Econv
- : xAOD::CaloCluster::SW_55Econv;
- break;
- }
- default: {
- cluSize =
- (isBarrel ? xAOD::CaloCluster::SW_37gam : xAOD::CaloCluster::SW_55gam);
- }
- }
- xAOD::CaloCluster* newCluster = makeNewCluster(ctx, cluster, mgr, cluSize);
-
- if (newCluster && m_MVACalibSvc->execute(*newCluster, *eg).isFailure()) {
- ATH_MSG_ERROR("Problem executing MVA cluster tool");
- }
- return newCluster;
-}
-
-xAOD::CaloCluster*
-EMClusterTool::makeNewCluster(
- const EventContext& ctx,
- const xAOD::CaloCluster& cluster,
- const CaloDetDescrManager& mgr,
- const xAOD::CaloCluster::ClusterSize& cluSize) const
-{
-
- xAOD::CaloCluster* newClus = CaloClusterStoreHelper::makeCluster(
- cluster.getCellLinks()->getCellContainer(),
- cluster.eta0(),
- cluster.phi0(),
- cluSize);
- if (newClus) {
- if (m_clusterCorrectionTool->execute(ctx, newClus).isFailure()) {
- ATH_MSG_ERROR("Problem executing cluster correction tool");
- }
- fillPositionsInCalo(newClus, mgr);
- // Fill the raw state using the cluster with correct size but not MVA
- newClus->setRawE(newClus->calE());
- newClus->setRawEta(newClus->calEta());
- newClus->setRawPhi(newClus->calPhi());
- // Fill the Alt state using the 3x5 cluster
- newClus->setAltE(cluster.calE());
- newClus->setAltEta(cluster.calEta());
- newClus->setAltPhi(cluster.calPhi());
- } else {
- ATH_MSG_ERROR("Null newClus");
- }
-
- return newClus;
-}
-
xAOD::CaloCluster*
EMClusterTool::makeNewSuperCluster(const xAOD::CaloCluster& cluster,
xAOD::Egamma* eg) const
{
//
xAOD::CaloCluster* newClus = new xAOD::CaloCluster(cluster);
- if (m_applySuperClusters) {
- if (newClus && m_MVACalibSvc->execute(*newClus, *eg).isFailure()) {
- ATH_MSG_ERROR("Problem executing MVA cluster tool");
- }
+ if (newClus && m_MVACalibSvc->execute(*newClus, *eg).isFailure()) {
+ ATH_MSG_ERROR("Problem executing MVA cluster tool");
}
return newClus;
}
-void
-EMClusterTool::fillPositionsInCalo(xAOD::CaloCluster* cluster,
- const CaloDetDescrManager& mgr) const
-{
-
- bool isBarrel = xAOD::EgammaHelpers::isBarrel(cluster);
- CaloCell_ID::CaloSample sample =
- isBarrel ? CaloCell_ID::EMB2 : CaloCell_ID::EME2;
-
- // eta and phi of the cluster in the calorimeter frame
- double eta;
- double phi;
- m_caloCellDetPos.getDetPosition(
- mgr, sample, cluster->eta(), cluster->phi(), eta, phi);
-
- cluster->insertMoment(xAOD::CaloCluster::ETACALOFRAME, eta);
- cluster->insertMoment(xAOD::CaloCluster::PHICALOFRAME, phi);
-
- // eta in the second sampling
- m_caloCellDetPos.getDetPosition(
- mgr, sample, cluster->etaBE(2), cluster->phiBE(2), eta, phi);
- cluster->insertMoment(xAOD::CaloCluster::ETA2CALOFRAME, eta);
- cluster->insertMoment(xAOD::CaloCluster::PHI2CALOFRAME, phi);
-
- // eta in the first sampling
- sample = isBarrel ? CaloCell_ID::EMB1 : CaloCell_ID::EME1;
- m_caloCellDetPos.getDetPosition(
- mgr, sample, cluster->etaBE(1), cluster->phiBE(1), eta, phi);
- cluster->insertMoment(xAOD::CaloCluster::ETA1CALOFRAME, eta);
- cluster->insertMoment(xAOD::CaloCluster::PHI1CALOFRAME, phi);
-}
diff --git a/Reconstruction/egamma/egammaTools/src/EMClusterTool.h b/Reconstruction/egamma/egammaTools/src/EMClusterTool.h
index 787aad9030dc..a3b3f21c0d6a 100644
--- a/Reconstruction/egamma/egammaTools/src/EMClusterTool.h
+++ b/Reconstruction/egamma/egammaTools/src/EMClusterTool.h
@@ -8,14 +8,13 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/EventContext.h"
#include "GaudiKernel/ToolHandle.h"
-#include "egammaBaseTool.h"
#include "egammaInterfaces/IEMClusterTool.h"
#include "EgammaAnalysisInterfaces/IegammaMVASvc.h"
#include "egammaInterfaces/IegammaSwTool.h"
#include "StoreGate/WriteHandleKey.h"
-#include "xAODCaloEvent/CaloCluster.h" // cannot use CaloClusterFwd b/c of ClusterSize
+#include "xAODCaloEvent/CaloCluster.h"
#include "xAODCaloEvent/CaloClusterContainer.h"
#include "xAODEgamma/EgammaEnums.h"
#include "xAODEgamma/EgammaFwd.h"
@@ -26,17 +25,6 @@ class CaloClusterCellLink;
/**
@class EMClusterTool
This tool makes the EM CaloCluster used by egamma objects.
- It also defines the cluster size
- - in barrel
- 3*7 for electrons
- 3*7 for converted photons with Rconv<800mm
- 3*5 for converted photons with Rconv>800mm
- 3*5 for unconverted photons
- - in end-caps
- 5*5 for electrons
- 5*5 for converted photons with Rconv<800mm
- 5*5 for converted photons with Rconv>800mm
- 5*5 for unconverted photons
and applies the right cluster corrections depending on classification as
electron, unconverted photon or converted photon
@@ -65,7 +53,6 @@ public:
/** @brief execute on container */
virtual StatusCode contExecute(
const EventContext& ctx,
- const CaloDetDescrManager& mgr,
xAOD::ElectronContainer* electronContainer,
xAOD::PhotonContainer* photonContainer) const override final;
@@ -73,42 +60,12 @@ private:
/** @brief Set new cluster to the egamma object, decorate the new cluster
* with a link to the old one **/
void setNewCluster(const EventContext& ctx,
- const CaloDetDescrManager& mgr,
xAOD::Egamma* eg,
- xAOD::CaloClusterContainer* outputClusterContainer,
- xAOD::EgammaParameters::EgammaType egType) const;
-
- /** @brief creation of new cluster based on existing one
- * Return a new cluster using the seed eta0, phi0 from the existing one,
- * applying cluster corrections and MVA calibration (requires the egamma
- * object). The cluster size depends on the given EgammaType
- */
- xAOD::CaloCluster* makeNewCluster(const EventContext&,
- const xAOD::CaloCluster&,
- const CaloDetDescrManager& mgr,
- xAOD::Egamma* eg,
- xAOD::EgammaParameters::EgammaType) const;
-
- /** @brief creation of new cluster based on existing one
- * Return a new cluster with the given size using the seed eta0, phi0 from the
- * existing cluster and applying cluster corrections.
- * If doDecorate is true, copy the cal to the raw signal state
- * and set the raw one to the cal e,eta,phi from the existing cluster
- */
- xAOD::CaloCluster* makeNewCluster(
- const EventContext& ctx,
- const xAOD::CaloCluster&,
- const CaloDetDescrManager& mgr,
- const xAOD::CaloCluster::ClusterSize&) const;
-
+ xAOD::CaloClusterContainer* outputClusterContainer) const;
/** @brief creation of new super cluster based on existing one */
xAOD::CaloCluster* makeNewSuperCluster(const xAOD::CaloCluster& cluster,
xAOD::Egamma* eg) const;
- /** @brief build extra positions in calo frame*/
- void fillPositionsInCalo(xAOD::CaloCluster* cluster,
- const CaloDetDescrManager& mgr) const;
-
/** @brief Key of the output cluster container **/
SG::WriteHandleKey<xAOD::CaloClusterContainer> m_outputClusterContainerKey{
this,
@@ -128,60 +85,11 @@ private:
"from associated container"
};
- /** @brief Key of the output cluster container for topo-seeded clusters **/
- SG::WriteHandleKey<xAOD::CaloClusterContainer>
- m_outputTopoSeededClusterContainerKey{
- this,
- "OutputTopoSeededClusterContainerName",
- ""
- "Name of the output cluster container for topo-seeded clusters (can be "
- "the same as the other clusters)"
- };
-
- /** @brief Key of the output cluster container cell links for topo-seeded
- * clusters: name taken from containter name; only dummy configurable */
- SG::WriteHandleKey<CaloClusterCellLinkContainer>
- m_outputTopoSeededClusterContainerCellLinkKey{
- this,
- "DoNotSet_OutputTopoSeededClusterContainerLinks",
- "",
- "Key of the output cluster container cell links for topo-seeded "
- "clusters; Do not set! Name taken from associated container"
- };
-
/** Handle to the MVA calibration service **/
ServiceHandle<IegammaMVASvc> m_MVACalibSvc{ this,
"MVACalibSvc",
"egammaMVASvc",
"calibration service" };
-
- /** @brief Tool to handle cluster corrections */
- ToolHandle<IegammaSwTool> m_clusterCorrectionTool{
- this,
- "ClusterCorrectionTool",
- "egammaSwTool/egammaswtool",
- "tool that applies cluster corrections"
- };
-
- /** @brief do super clusters **/
- Gaudi::Property<bool> m_doSuperClusters{ this,
- "doSuperCluster",
- true,
- "Do Super Cluster Reco" };
-
- /** @brief flag to protect against applying the MVA to super Clusters **/
- Gaudi::Property<bool> m_applySuperClusters{
- this,
- "applyMVAToSuperCluster",
- true,
- "Protection to not do anything for superClusters"
- };
-
- /** @brief Position in Calo frame**/
- const CaloCellDetPos m_caloCellDetPos;
-
- // derived variable (not set by JOs)
- bool m_doTopoSeededContainer;
};
#endif // EGAMMATOOLS_EMCLUSTERTOOL_H
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/TrigEgammaFactories.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/TrigEgammaFactories.py
index 18a638a8af60..33376f2adaa1 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/TrigEgammaFactories.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/TrigEgammaFactories.py
@@ -21,7 +21,7 @@ from CaloIdentifier import SUBCALO
# Egamma imports
from egammaRec.Factories import ToolFactory, AlgFactory
-from egammaTools.egammaToolsFactories import egammaToolsConf, egammaSwSuperClusterTool, egammaMVASvc, EMFourMomBuilder, PhotonPIDBuilder, ElectronPIDBuilder
+from egammaTools.egammaToolsFactories import egammaToolsConf, egammaMVASvc, EMFourMomBuilder, PhotonPIDBuilder, ElectronPIDBuilder
from egammaTrackTools.egammaTrackToolsFactories import EMExtrapolationTools
@@ -103,9 +103,6 @@ TrigEgammaOQFlagsBuilder = ToolFactory( egammaToolsConf.egammaOQFlagsBuilder,
TrigEMClusterTool = ToolFactory(egammaToolsConf.EMClusterTool,
name = 'TrigEMClusterTool',
OutputClusterContainerName = TrigEgammaKeys.TrigEMClusterToolOutputContainer,
- OutputTopoSeededClusterContainerName = TrigEgammaKeys.outputTopoSeededClusterKey,
- ClusterCorrectionTool = egammaSwSuperClusterTool,
- doSuperCluster = True,
MVACalibSvc = egammaMVASvc
)
from xAODPrimitives.xAODIso import xAODIso as isoPar
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py
index c372e9da7e4c..81ce36306fea 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py
@@ -203,12 +203,8 @@ def _precisionElectronSeq(flags, doIDperf=False):
def TrigEMClusterToolCfg(flags):
acc = ComponentAccumulator()
from egammaMVACalib.egammaMVACalibConfig import egammaMVASvcCfg
- from egammaTools.egammaSwToolConfig import egammaSwToolCfg
tool = CompFactory.EMClusterTool('TrigEMClusterTool',
OutputClusterContainerName = TrigEgammaKeys.TrigEMClusterToolOutputContainer,
- OutputTopoSeededClusterContainerName = TrigEgammaKeys.outputTopoSeededClusterKey,
- ClusterCorrectionTool = acc.popToolsAndMerge(egammaSwToolCfg(flags)),
- doSuperCluster = True,
MVACalibSvc = acc.getPrimaryAndMerge(egammaMVASvcCfg(flags))
)
acc.setPrivateTools(tool)
--
GitLab
From a57bf860a68b8f6b8564b28b8091dd9b26ecb6dd Mon Sep 17 00:00:00 2001
From: Andrii Verbytskyi <andriish@mppui4.t2.rzg.mpg.de>
Date: Fri, 20 Aug 2021 19:20:51 +0200
Subject: [PATCH 202/272] Syncronize the versions of HepMC3 and HEpMC2 filters
in master
---
.../src/TTbarWToLeptonFilter.cxx | 49 +++++++++++++++++--
1 file changed, 44 insertions(+), 5 deletions(-)
diff --git a/Generators/GeneratorFilters/src/TTbarWToLeptonFilter.cxx b/Generators/GeneratorFilters/src/TTbarWToLeptonFilter.cxx
index 38091416d3b9..f6f239067e27 100644
--- a/Generators/GeneratorFilters/src/TTbarWToLeptonFilter.cxx
+++ b/Generators/GeneratorFilters/src/TTbarWToLeptonFilter.cxx
@@ -65,11 +65,50 @@ StatusCode TTbarWToLeptonFilter::filterEvent() {
break;
}
- if (std::abs(grandchild_pid) == 11 || std::abs(grandchild_pid) == 13 || abs(grandchild_pid) == 15) {
- if (grandchild_mcpart->momentum().perp() >= m_Ptmin) N_pt_above_cut++;
- // W decay lepton is found. Break loop over the decay product particles
- break;
- }
+ // use brute force to use only leptons that have not been found already
+ if (grandchild_pid == -11 && foundlepton[0] < count_found_leptons) {
+ if (grandchild_mcpart->momentum().perp() >= m_Ptmin) {
+ foundlepton[0]++;
+ N_pt_above_cut++;
+ N_pt_above_cut_minus++;
+ }
+ }
+ if (grandchild_pid == 11 && foundlepton[1] < count_found_leptons) {
+ if (grandchild_mcpart->momentum().perp() >= m_Ptmin) {
+ foundlepton[1]++;
+ N_pt_above_cut++;
+ N_pt_above_cut_plus++;
+
+ }
+ }
+ if (grandchild_pid == -13 && foundlepton[2] < count_found_leptons) {
+ if (grandchild_mcpart->momentum().perp() >= m_Ptmin) {
+ foundlepton[2]++;
+ N_pt_above_cut++;
+ N_pt_above_cut_minus++;
+ }
+ }
+ if (grandchild_pid == 13 && foundlepton[3] < count_found_leptons) {
+ if (grandchild_mcpart->momentum().perp() >= m_Ptmin) {
+ foundlepton[3]++;
+ N_pt_above_cut++;
+ N_pt_above_cut_plus++;
+ }
+ }
+ if (grandchild_pid == -15 && foundlepton[4] < count_found_leptons) {
+ if (grandchild_mcpart->momentum().perp() >= m_Ptmin) {
+ foundlepton[4]++;
+ N_pt_above_cut++;
+ N_pt_above_cut_minus++;
+ }
+ }
+ if (grandchild_pid == 15 && foundlepton[5] < count_found_leptons) {
+ if (grandchild_mcpart->momentum().perp() >= m_Ptmin) {
+ foundlepton[5]++;
+ N_pt_above_cut++;
+ N_pt_above_cut_plus++;
+ }
+ }
}
// If investigation of W's next decay vertex is not required then finish looking for leptons
if (!useNextVertex) break;
--
GitLab
From 46dc42fdf05cf5fc7984a0ad190d74d5ba62b884 Mon Sep 17 00:00:00 2001
From: Mark Stockton <mark@cern.ch>
Date: Fri, 20 Aug 2021 19:53:05 +0200
Subject: [PATCH 203/272] Add TriggerDBconnections to be able to read keys from
cool
---
.../TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py
index c4fc78e2516e..b0f67ed51530 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py
@@ -63,7 +63,7 @@ def getTrigConfigFromFlag( flags ):
lbNumber = flags.Input.LumiBlockNumber[0]
if dbconn == "":
dbconn = getTrigConfFromCool(runNumber, lbNumber)["DB"]
- if dbconn in ["TRIGGERDBR3","TRIGGERDBR2", "TRIGGERDBDEV1", "TRIGGERDBDEV2"]:
+ if dbconn in ["TRIGGERDBR3","TRIGGERDBR2", "TRIGGERDB_RUN3", "TRIGGERDBDEV1_I8", "TRIGGERDBDEV1", "TRIGGERDBDEV2"]:
d = getTrigConfFromCool(runNumber, lbNumber)
if smk is None:
smk = d["SMK"]
--
GitLab
From e56159cc08af813b232c62175fd00a70fa902871 Mon Sep 17 00:00:00 2001
From: Adam Edward Barton <adam.edward.barton@cern.ch>
Date: Fri, 20 Aug 2021 18:08:14 +0000
Subject: [PATCH 204/272] Use single char find 3
---
Control/AthViews/src/ViewDataVerifier.cxx | 2 +-
.../src/ManagedMonitorToolBase.cxx | 8 +-
Control/IOVSvc/src/CondInputLoader.cxx | 4 +-
Control/SGComps/src/SGInputLoader.cxx | 2 +-
.../src/CompositeAlgorithm.cxx | 6 +-
.../src/ConditionsSingleton.cxx | 12 +-
.../DataQualityUtils/src/HanOutputFile.cxx | 158 +++++++++---------
.../DataQualityUtils/src/MonitoringFile.cxx | 32 ++--
.../APR/PersistencySvc/src/UserDatabase.cpp | 4 +-
Database/APR/StorageSvc/src/DbDatabaseObj.cpp | 10 +-
Database/CrestApi/src/CrestApi.cxx | 84 +++++-----
.../src/PixelResidualHistograms.cxx | 4 +-
.../TRT_CalibAlgs/share/CalibrateTRT.cpp | 44 ++---
.../InDetGeoModelUtils/ServiceVolumeMaker.h | 38 ++---
.../src/ServiceVolumeMaker.cxx | 1 +
.../LArCabling/src/LArHVIdMappingReader.cxx | 2 +-
LumiBlock/LumiCalc/src/ReplicaSorter.cxx | 10 +-
.../MuonCablingTools/src/dbline.cxx | 2 +-
.../MuonGeoModelTest/src/MuonGMCheck.cxx | 32 ++--
.../test/CheckDifferences.cxx | 10 +-
.../TrigL2MuonSA/src/ClusterPatFinder.cxx | 10 +-
.../TrigL2MuonSA/src/RpcPatFinder.cxx | 10 +-
.../TrigConfL1Data/Root/TriggerItem.cxx | 2 +-
.../TrigBSExtraction/src/TrigBStoxAODTool.cxx | 10 +-
.../TrigNavigation/src/Navigation.cxx | 6 +-
.../TrigHLTMonitoring/src/IHLTMonTool.cxx | 28 ++--
.../TrigTauMonitoring/src/HLTTauMonTool.cxx | 16 +-
.../TrigT1/TrigT1TGC/src/LVL1TGCTrigger.cxx | 2 +-
.../TrigT1/TrigT1TGC/src/TGCSectorLogic.cxx | 4 +-
graphics/JiveXML/src/XMLFormatTool.cxx | 4 +-
30 files changed, 278 insertions(+), 279 deletions(-)
diff --git a/Control/AthViews/src/ViewDataVerifier.cxx b/Control/AthViews/src/ViewDataVerifier.cxx
index fd20f9b30687..c165b98a853d 100644
--- a/Control/AthViews/src/ViewDataVerifier.cxx
+++ b/Control/AthViews/src/ViewDataVerifier.cxx
@@ -37,7 +37,7 @@ StatusCode ViewDataVerifier::initialize()
str << "Will explicitly preload the following DataObjects:";
for ( auto &obj : m_load.value() ) {
str << "\n + " << obj;
- if ( obj.key() == "" ) {
+ if ( obj.key() .empty() ) {
sc = StatusCode::FAILURE;
str << " ERROR: empty key is not allowed!";
}
diff --git a/Control/AthenaMonitoring/src/ManagedMonitorToolBase.cxx b/Control/AthenaMonitoring/src/ManagedMonitorToolBase.cxx
index 62cb63ec295f..ba7021ccad7d 100644
--- a/Control/AthenaMonitoring/src/ManagedMonitorToolBase.cxx
+++ b/Control/AthenaMonitoring/src/ManagedMonitorToolBase.cxx
@@ -1481,7 +1481,7 @@ regHist( TH1* h, const MonGroup& group )
track of "proper" attribute for X_VS_LB
*/
- if (group.histo_mgmt() == ATTRIB_X_VS_LB && group.merge() == "") {
+ if (group.histo_mgmt() == ATTRIB_X_VS_LB && group.merge().empty()) {
ATH_MSG_WARNING("HEY! You're attempting to register " << h->GetName() << " as a per-LB histogram, but you're not setting the merge algorithm! This is a SUPER-BAD idea! Use \"merge\", at least.");
}
@@ -1659,7 +1659,7 @@ StatusCode ManagedMonitorToolBase::regEfficiency( TEfficiency* e, const MonGroup
// MANAGED
if ( group.histo_mgmt() != ATTRIB_UNMANAGED ) {
// warn about not using merge algorithms
- if (group.histo_mgmt() == ATTRIB_X_VS_LB && group.merge() == "") {
+ if (group.histo_mgmt() == ATTRIB_X_VS_LB && group.merge().empty()) {
ATH_MSG_WARNING("HEY! Attempting to register "<<name<<" as a per-LB histogram, but not setting the merge algorithm! Use \"merge\", at least.");
}
// add the efficiency to rebooking vector
@@ -2115,9 +2115,9 @@ fill( const std::string& name,
// this to the ROOT developers yet because I don't have time to develope a simple test case
// for them (independent of Atlas software).
// --M.G.Wilson, 7 July 2008
- if( trigger == "" )
+ if( trigger.empty() )
trigger = "<none>";
- if( merge == "" )
+ if( merge.empty() )
merge = "<default>";
copyString( m_nameData, name );
diff --git a/Control/IOVSvc/src/CondInputLoader.cxx b/Control/IOVSvc/src/CondInputLoader.cxx
index 64aa5bdf575b..a3a8a6ed7d23 100644
--- a/Control/IOVSvc/src/CondInputLoader.cxx
+++ b/Control/IOVSvc/src/CondInputLoader.cxx
@@ -145,7 +145,7 @@ CondInputLoader::initialize()
ost << "Adding base classes:";
for (auto &e : sortedDataObjIDColl (handles_to_load)) {
// ignore empty keys
- if (e->key() == "") continue;
+ if (e->key().empty()) continue;
ost << "\n + " << *e << " ->";
CLID clid = e->clid();
@@ -184,7 +184,7 @@ CondInputLoader::initialize()
str << "Will create WriteCondHandle dependencies for the following DataObjects:";
for (auto &e : sortedDataObjIDColl(m_load)) {
str << "\n + " << *e;
- if (e->key() == "") {
+ if (e->key().empty()) {
sc = StatusCode::FAILURE;
str << " ERROR: empty key is not allowed!";
} else {
diff --git a/Control/SGComps/src/SGInputLoader.cxx b/Control/SGComps/src/SGInputLoader.cxx
index fd70dbf70b2c..0aab959c4740 100644
--- a/Control/SGComps/src/SGInputLoader.cxx
+++ b/Control/SGComps/src/SGInputLoader.cxx
@@ -70,7 +70,7 @@ SGInputLoader::initialize()
str << "Will explicitly preload the following DataObjects:";
for (auto &e : m_load) {
str << "\n + " << e;
- if (e.key() == "") {
+ if (e.key().empty()) {
sc = StatusCode::FAILURE;
str << " ERROR: empty key is not allowed!";
}
diff --git a/DataQuality/DataQualityInterfaces/src/CompositeAlgorithm.cxx b/DataQuality/DataQualityInterfaces/src/CompositeAlgorithm.cxx
index 1a56381dec48..c8b044ce1205 100644
--- a/DataQuality/DataQualityInterfaces/src/CompositeAlgorithm.cxx
+++ b/DataQuality/DataQualityInterfaces/src/CompositeAlgorithm.cxx
@@ -170,7 +170,7 @@ ConfigureSubAlg(const dqm_core::AlgorithmConfig& config, std::string subalg)
for (std::map< std::string, double >::const_iterator parVal = oldpars.begin();
parVal != oldpars.end(); ++parVal) {
std::string parname(parVal->first);
- std::string::size_type pos = parname.find("|");
+ std::string::size_type pos = parname.find('|');
if (pos == std::string::npos) {
pars.insert(*parVal);
} else if (parname.substr(0, pos) == subalg) {
@@ -180,7 +180,7 @@ ConfigureSubAlg(const dqm_core::AlgorithmConfig& config, std::string subalg)
for (std::map< std::string, double >::const_iterator thrVal = oldgrthr.begin();
thrVal != oldgrthr.end(); ++thrVal) {
std::string thrname(thrVal->first);
- std::string::size_type pos = thrname.find("|");
+ std::string::size_type pos = thrname.find('|');
if (pos == std::string::npos) {
grthr.insert(*thrVal);
} else if (thrname.substr(0, pos) == subalg) {
@@ -190,7 +190,7 @@ ConfigureSubAlg(const dqm_core::AlgorithmConfig& config, std::string subalg)
for (std::map< std::string, double >::const_iterator thrVal = oldrdthr.begin();
thrVal != oldrdthr.end(); ++thrVal) {
std::string thrname(thrVal->first);
- std::string::size_type pos = thrname.find("|");
+ std::string::size_type pos = thrname.find('|');
if (pos == std::string::npos) {
rdthr.insert(*thrVal);
} else if (thrname.substr(0, pos) == subalg) {
diff --git a/DataQuality/DataQualityInterfaces/src/ConditionsSingleton.cxx b/DataQuality/DataQualityInterfaces/src/ConditionsSingleton.cxx
index 656e7411cc8b..5d001895b7d4 100644
--- a/DataQuality/DataQualityInterfaces/src/ConditionsSingleton.cxx
+++ b/DataQuality/DataQualityInterfaces/src/ConditionsSingleton.cxx
@@ -99,8 +99,8 @@ namespace dqi{
std::string defaultRef("");
for(tokenizer::iterator tok_iter=referenceConditionPairs.begin();
tok_iter!=referenceConditionPairs.end();++tok_iter){//look at each condition reference pair
- if(std::string((*tok_iter)).find("=")!=std::string::npos){//have conditions defined
- if(std::string(*tok_iter).find(":")!=std::string::npos){//do a reference split
+ if(std::string((*tok_iter)).find('=')!=std::string::npos){//have conditions defined
+ if(std::string(*tok_iter).find(':')!=std::string::npos){//do a reference split
std::vector<std::string> conds;
boost::split(conds,*tok_iter,boost::is_any_of(std::string(":")));
if(conds.size()>2){
@@ -189,8 +189,8 @@ namespace dqi{
std::map<std::string,std::string> conditionalReferences;
for(tokenizer::iterator tok_iter=referenceConditionPairs.begin();
tok_iter!=referenceConditionPairs.end();++tok_iter){//look at each condition reference pair
- if(std::string((*tok_iter)).find("=")!=std::string::npos){//have conditions defined
- if(std::string(*tok_iter).find(":")!=std::string::npos){//do a reference split
+ if(std::string((*tok_iter)).find('=')!=std::string::npos){//have conditions defined
+ if(std::string(*tok_iter).find(':')!=std::string::npos){//do a reference split
std::vector<std::string> conds;
boost::split(conds,*tok_iter,boost::is_any_of(std::string(":")));
if(conds.size()>2){
@@ -249,8 +249,8 @@ namespace dqi{
std::map<std::string,std::string> conditionalReferences;
for(tokenizer::iterator tok_iter=referenceConditionPairs.begin();
tok_iter!=referenceConditionPairs.end();++tok_iter){//look at each condition reference pair
- if(std::string((*tok_iter)).find("=")!=std::string::npos){//have conditions defined
- if(std::string(*tok_iter).find(":")!=std::string::npos){//do a reference split
+ if(std::string((*tok_iter)).find('=')!=std::string::npos){//have conditions defined
+ if(std::string(*tok_iter).find(':')!=std::string::npos){//do a reference split
std::vector<std::string> conds;
boost::split(conds,*tok_iter,boost::is_any_of(std::string(":")));
if(conds.size()>2){
diff --git a/DataQuality/DataQualityUtils/src/HanOutputFile.cxx b/DataQuality/DataQualityUtils/src/HanOutputFile.cxx
index 8ef2fb04bb40..88ac3182a8f8 100644
--- a/DataQuality/DataQualityUtils/src/HanOutputFile.cxx
+++ b/DataQuality/DataQualityUtils/src/HanOutputFile.cxx
@@ -56,7 +56,7 @@ namespace {
Double_t getScaleVal(std::string& display) {
std::size_t found = display.find("ScaleRef");
- std::size_t found2 = display.find_first_of(",",found+1);
+ std::size_t found2 = display.find_first_of(',',found+1);
// has multiple entries? Do this later.
try {
return boost::lexical_cast<Double_t>(display.substr(found+9, found2-found-9));
@@ -879,7 +879,7 @@ bool HanOutputFile::saveHistogramToFile( std::string nameHis, std::string locati
std::string::size_type i = location.find_last_of( '/' );
if( i != (location.size()-1) ) {
- location+="/";
+ location+='/';
}
namePNG = location + namePNG;
nameJSON = location + nameJSON;
@@ -944,7 +944,7 @@ std::pair<std::string,std::string> HanOutputFile:: getHistogram( std::string nam
std::size_t found = display.find("Draw=");
std::string drawopt ="";
while (found!=std::string::npos){
- std::size_t found1 = display.find_first_of(",",found+1);
+ std::size_t found1 = display.find_first_of(',',found+1);
if (found1!=std::string::npos){
drawopt +=boost::algorithm::to_lower_copy(display.substr(found+5,found1-found-5));
}
@@ -957,7 +957,7 @@ std::pair<std::string,std::string> HanOutputFile:: getHistogram( std::string nam
found = display.find("DrawRef=");
std::string drawrefopt ="";
while (found!=std::string::npos){
- std::size_t found1 = display.find_first_of(",",found+1);
+ std::size_t found1 = display.find_first_of(',',found+1);
if (found1!=std::string::npos){
drawrefopt +=boost::algorithm::to_lower_copy(display.substr(found+8,found1-found-8));
}
@@ -972,7 +972,7 @@ std::pair<std::string,std::string> HanOutputFile:: getHistogram( std::string nam
found = display.find("DrawRef2D=");
std::string drawrefopt2D ="";
while (found!=std::string::npos){
- std::size_t found1 = display.find_first_of(",",found+1);
+ std::size_t found1 = display.find_first_of(',',found+1);
if (found1!=std::string::npos){
drawrefopt2D +=boost::algorithm::to_lower_copy(display.substr(found+10,found1-found-10));
}
@@ -989,7 +989,7 @@ std::pair<std::string,std::string> HanOutputFile:: getHistogram( std::string nam
datatitle = "Data";
}
while (found!=std::string::npos){
- std::size_t found1 = display.find_first_of(",",found+1);
+ std::size_t found1 = display.find_first_of(',',found+1);
if (found1!=std::string::npos){
datatitle += display.substr(found+9,found1-found-9);
}
@@ -1031,9 +1031,9 @@ std::pair<std::string,std::string> HanOutputFile:: getHistogram( std::string nam
int wh = 490;
found = display.find("TCanvas",found+1);
if (found!=std::string::npos){
- std::size_t found1 = display.find_first_of(",",found+1);
+ std::size_t found1 = display.find_first_of(',',found+1);
ww = std::atoi((display.substr(found+8,found1-found-8)).c_str() );
- found = display.find_first_of(")",found1+1);
+ found = display.find_first_of(')',found1+1);
wh = std::atoi((display.substr(found1+1,found-found1-1)).c_str() );
}
@@ -1050,7 +1050,7 @@ std::pair<std::string,std::string> HanOutputFile:: getHistogram( std::string nam
gPad->SetGridy(display.find("SetGridy")!=std::string::npos );
std::size_t found = display.find("SetPalette");
if (found!=std::string::npos) {
- std::size_t found1 = display.find_first_of("(",found+1);
+ std::size_t found1 = display.find_first_of('(',found+1);
std::size_t found2 = display.find_first_of(",)",found+1);
std::string cn =display.substr(found1+1,found2-found1-1);
int n1=std::strtol(cn.c_str(),NULL,0);
@@ -1058,7 +1058,7 @@ std::pair<std::string,std::string> HanOutputFile:: getHistogram( std::string nam
}
found = display.find("SetGridStyle");
if (found!=std::string::npos) {
- std::size_t found1 = display.find_first_of("(",found+1);
+ std::size_t found1 = display.find_first_of('(',found+1);
std::size_t found2 = display.find_first_of(",)",found+1);
std::string cn =display.substr(found1+1,found2-found1-1);
int n1=std::strtol(cn.c_str(),NULL,0);
@@ -1072,9 +1072,9 @@ std::pair<std::string,std::string> HanOutputFile:: getHistogram( std::string nam
std::size_t fpos1,fpos2,fpos;
fpos=display.find("MinStat");
if (fpos!= std::string::npos){
- fpos1=display.find("(",fpos+1);
+ fpos1=display.find('(',fpos+1);
if (fpos1!=std::string::npos) {
- fpos2 = display.find(")",fpos1+1);
+ fpos2 = display.find(')',fpos1+1);
if (fpos2!=std::string::npos) {
std::string s_minstat=display.substr(fpos1+1,fpos2-fpos1-1);
minstat=std::strtod(s_minstat.c_str(),NULL);
@@ -1085,9 +1085,9 @@ std::pair<std::string,std::string> HanOutputFile:: getHistogram( std::string nam
std::string fitopt("");
fpos=display.find("FitOption");
if (fpos!= std::string::npos){
- fpos1=display.find("(",fpos+1);
+ fpos1=display.find('(',fpos+1);
if (fpos1!=std::string::npos) {
- fpos2 = display.find(")",fpos1+1);
+ fpos2 = display.find(')',fpos1+1);
if (fpos2!=std::string::npos) {
fitopt=display.substr(fpos1+1,fpos2-fpos1-1);
}
@@ -1096,13 +1096,13 @@ std::pair<std::string,std::string> HanOutputFile:: getHistogram( std::string nam
//plot double gaus
std::size_t found1 = display.find("doublegaus");
if (found1!=std::string::npos) {
- std::size_t found2 = display.find("(",found1+1);
+ std::size_t found2 = display.find('(',found1+1);
if (found2!=std::string::npos) {
- std::size_t found3 = display.find(")",found2+1);
+ std::size_t found3 = display.find(')',found2+1);
if (found3 != std::string::npos){
std::string range = display.substr(found2+1,found3-found2-1);
Double_t xmin = std::strtod(range.c_str(),NULL);
- std::size_t found4 = display.find(",",found2+1);
+ std::size_t found4 = display.find(',',found2+1);
if ( found4 != std::string::npos) {
range = display.substr(found4+1,found3-found4-1);
Double_t xmax = std::strtod(range.c_str(),NULL);
@@ -1129,13 +1129,13 @@ std::pair<std::string,std::string> HanOutputFile:: getHistogram( std::string nam
//draw gaus+pol1
std::size_t found1 = display.find("gauspluspol1");
if (found1!=std::string::npos) {
- std::size_t found2 = display.find("(",found1+1);
+ std::size_t found2 = display.find('(',found1+1);
if (found2!=std::string::npos) {
- std::size_t found3 = display.find(")",found2+1);
+ std::size_t found3 = display.find(')',found2+1);
if (found3 != std::string::npos){
std::string range = display.substr(found2+1,found3-found2-1);
Double_t xmin = std::strtod(range.c_str(),NULL);
- std::size_t found4 = display.find(",",found2+1);
+ std::size_t found4 = display.find(',',found2+1);
if ( found4 != std::string::npos) {
range = display.substr(found4+1,found3-found4-1);
Double_t xmax = std::strtod(range.c_str(),NULL);
@@ -1155,13 +1155,13 @@ std::pair<std::string,std::string> HanOutputFile:: getHistogram( std::string nam
//draw gaus+expo
found1 = display.find("gausplusexpo");
if (found1!=std::string::npos) {
- std::size_t found2 = display.find("(",found1+1);
+ std::size_t found2 = display.find('(',found1+1);
if (found2!=std::string::npos) {
- std::size_t found3 = display.find(")",found2+1);
+ std::size_t found3 = display.find(')',found2+1);
if (found3 != std::string::npos){
std::string range = display.substr(found2+1,found3-found2-1);
Double_t xmin = std::strtod(range.c_str(),NULL);
- std::size_t found4 = display.find(",",found2+1);
+ std::size_t found4 = display.find(',',found2+1);
if ( found4 != std::string::npos) {
range = display.substr(found4+1,found3-found4-1);
Double_t xmax = std::strtod(range.c_str(),NULL);
@@ -1180,13 +1180,13 @@ std::pair<std::string,std::string> HanOutputFile:: getHistogram( std::string nam
}
}else {
// the last case: single gaus
- std::size_t found2 = display.find("(",found+1);
+ std::size_t found2 = display.find('(',found+1);
if (found2!=std::string::npos) {
- std::size_t found3 = display.find(")",found2+1);
+ std::size_t found3 = display.find(')',found2+1);
if (found3 != std::string::npos){
std::string range = display.substr(found2+1,found3-found2-1);
Double_t xmin = std::strtod(range.c_str(),NULL);
- std::size_t found4 = display.find(",",found2+1);
+ std::size_t found4 = display.find(',',found2+1);
if ( found4 != std::string::npos) {
range = display.substr(found4+1,found3-found4-1);
Double_t xmax = std::strtod(range.c_str(),NULL);
@@ -1654,7 +1654,7 @@ bool HanOutputFile::saveHistogramToFileSuperimposed( std::string nameHis, std::s
std::size_t found = display.find("Draw");
std::string drawopt ="";
while (found!=std::string::npos){
- std::size_t found1 = display.find_first_of(",",found+1);
+ std::size_t found1 = display.find_first_of(',',found+1);
if (found1!=std::string::npos){
drawopt +=boost::algorithm::to_lower_copy(display.substr(found+5,found1-found-5));
}
@@ -1698,9 +1698,9 @@ bool HanOutputFile::saveHistogramToFileSuperimposed( std::string nameHis, std::s
int wh = 490;
found = display.find("TCanvas",found+1);
if (found!=std::string::npos){
- std::size_t found1 = display.find_first_of(",",found+1);
+ std::size_t found1 = display.find_first_of(',',found+1);
ww = std::atoi((display.substr(found+8,found1-found-8)).c_str() );
- found = display.find_first_of(")",found1+1);
+ found = display.find_first_of(')',found1+1);
wh = std::atoi((display.substr(found1+1,found-found1-1)).c_str() );
}
@@ -1776,7 +1776,7 @@ bool HanOutputFile::saveHistogramToFileSuperimposed( std::string nameHis, std::s
legend->SetBorderSize(0);
std::size_t foundN1 = run_min_LB.find_first_of("-");
- std::size_t foundN2 = run_min_LB.find_first_of(",");
+ std::size_t foundN2 = run_min_LB.find_first_of(',');
legend->AddEntry(h,("Run "+run_min_LB.substr(5,foundN1-5)).c_str());
legend->AddEntry(hist2,("Run "+run_min_LB.substr(foundN1+1,foundN2-foundN1-1)).c_str());
@@ -1908,7 +1908,7 @@ void HanOutputFile::setupCanvas(std::string &drawopt,std::string &display){
gPad->SetGridy(display.find("SetGridy")!=std::string::npos );
std::size_t found = display.find("SetPalette");
if (found!=std::string::npos) {
- std::size_t found1 = display.find_first_of("(",found+1);
+ std::size_t found1 = display.find_first_of('(',found+1);
std::size_t found2 = display.find_first_of(",)",found+1);
std::string cn =display.substr(found1+1,found2-found1-1);
int n1=std::strtol(cn.c_str(),NULL,0);
@@ -1916,7 +1916,7 @@ void HanOutputFile::setupCanvas(std::string &drawopt,std::string &display){
}
found = display.find("SetGridStyle");
if (found!=std::string::npos) {
- std::size_t found1 = display.find_first_of("(",found+1);
+ std::size_t found1 = display.find_first_of('(',found+1);
std::size_t found2 = display.find_first_of(",)",found+1);
std::string cn =display.substr(found1+1,found2-found1-1);
int n1=std::strtol(cn.c_str(),NULL,0);
@@ -1934,9 +1934,9 @@ void HanOutputFile::attachFits(TH1* h,std::string &drawopt,std::string &display)
std::size_t fpos1,fpos2,fpos;
fpos=display.find("MinStat");
if (fpos!= std::string::npos){
- fpos1=display.find("(",fpos+1);
+ fpos1=display.find('(',fpos+1);
if (fpos1!=std::string::npos) {
- fpos2 = display.find(")",fpos1+1);
+ fpos2 = display.find(')',fpos1+1);
if (fpos2!=std::string::npos) {
std::string s_minstat=display.substr(fpos1+1,fpos2-fpos1-1);
minstat=std::strtod(s_minstat.c_str(),NULL);
@@ -1947,9 +1947,9 @@ void HanOutputFile::attachFits(TH1* h,std::string &drawopt,std::string &display)
std::string fitopt("");
fpos=display.find("FitOption");
if (fpos!= std::string::npos){
- fpos1=display.find("(",fpos+1);
+ fpos1=display.find('(',fpos+1);
if (fpos1!=std::string::npos) {
- fpos2 = display.find(")",fpos1+1);
+ fpos2 = display.find(')',fpos1+1);
if (fpos2!=std::string::npos) {
fitopt=display.substr(fpos1+1,fpos2-fpos1-1);
}
@@ -1958,13 +1958,13 @@ void HanOutputFile::attachFits(TH1* h,std::string &drawopt,std::string &display)
//plot double gaus
std::size_t found1 = display.find("doublegaus");
if (found1!=std::string::npos) {
- std::size_t found2 = display.find("(",found1+1);
+ std::size_t found2 = display.find('(',found1+1);
if (found2!=std::string::npos) {
- std::size_t found3 = display.find(")",found2+1);
+ std::size_t found3 = display.find(')',found2+1);
if (found3 != std::string::npos){
std::string range = display.substr(found2+1,found3-found2-1);
Double_t xmin = std::strtod(range.c_str(),NULL);
- std::size_t found4 = display.find(",",found2+1);
+ std::size_t found4 = display.find(',',found2+1);
if ( found4 != std::string::npos) {
range = display.substr(found4+1,found3-found4-1);
Double_t xmax = std::strtod(range.c_str(),NULL);
@@ -1991,13 +1991,13 @@ void HanOutputFile::attachFits(TH1* h,std::string &drawopt,std::string &display)
//draw gaus+pol1
std::size_t found1 = display.find("gauspluspol1");
if (found1!=std::string::npos) {
- std::size_t found2 = display.find("(",found1+1);
+ std::size_t found2 = display.find('(',found1+1);
if (found2!=std::string::npos) {
- std::size_t found3 = display.find(")",found2+1);
+ std::size_t found3 = display.find(')',found2+1);
if (found3 != std::string::npos){
std::string range = display.substr(found2+1,found3-found2-1);
Double_t xmin = std::strtod(range.c_str(),NULL);
- std::size_t found4 = display.find(",",found2+1);
+ std::size_t found4 = display.find(',',found2+1);
if ( found4 != std::string::npos) {
range = display.substr(found4+1,found3-found4-1);
Double_t xmax = std::strtod(range.c_str(),NULL);
@@ -2017,13 +2017,13 @@ void HanOutputFile::attachFits(TH1* h,std::string &drawopt,std::string &display)
//draw gaus+expo
found1 = display.find("gausplusexpo");
if (found1!=std::string::npos) {
- std::size_t found2 = display.find("(",found1+1);
+ std::size_t found2 = display.find('(',found1+1);
if (found2!=std::string::npos) {
- std::size_t found3 = display.find(")",found2+1);
+ std::size_t found3 = display.find(')',found2+1);
if (found3 != std::string::npos){
std::string range = display.substr(found2+1,found3-found2-1);
Double_t xmin = std::strtod(range.c_str(),NULL);
- std::size_t found4 = display.find(",",found2+1);
+ std::size_t found4 = display.find(',',found2+1);
if ( found4 != std::string::npos) {
range = display.substr(found4+1,found3-found4-1);
Double_t xmax = std::strtod(range.c_str(),NULL);
@@ -2042,13 +2042,13 @@ void HanOutputFile::attachFits(TH1* h,std::string &drawopt,std::string &display)
}
}else {
// the last case: single gaus
- std::size_t found2 = display.find("(",found+1);
+ std::size_t found2 = display.find('(',found+1);
if (found2!=std::string::npos) {
- std::size_t found3 = display.find(")",found2+1);
+ std::size_t found3 = display.find(')',found2+1);
if (found3 != std::string::npos){
std::string range = display.substr(found2+1,found3-found2-1);
Double_t xmin = std::strtod(range.c_str(),NULL);
- std::size_t found4 = display.find(",",found2+1);
+ std::size_t found4 = display.find(',',found2+1);
if ( found4 != std::string::npos) {
range = display.substr(found4+1,found3-found4-1);
Double_t xmax = std::strtod(range.c_str(),NULL);
@@ -2219,25 +2219,25 @@ axisOption( std::string str, TH1* h )
while (found!=std::string::npos)
{
//std::string coordinates, cx1,cy1 ="";
- //std::size_t found1 = str.find_first_of(")",found+1);
+ //std::size_t found1 = str.find_first_of(')',found+1);
//std::size_t found2 = str.find_first_of("\'",found+1);
//if (found2!=std::string::npos){
std::string coordinates, cx1,cy1 ="";
- std::size_t found1 = str.find_first_of(")",found+1);
+ std::size_t found1 = str.find_first_of(')',found+1);
std::size_t found2 = str.find_first_of("\'",found+1);
if (found2!=std::string::npos){
found2 = str.find_first_of("\'",found2+1);
if (found1 < found2) {
- found1 = str.find_first_of(")",found2+1);
+ found1 = str.find_first_of(')',found2+1);
}
/* }
if (found1!=std::string::npos){
coordinates = str.substr(found+10,found1-found-10);
- found1 = coordinates.find_first_of(",");
+ found1 = coordinates.find_first_of(',');
if (found1!=std::string::npos){
cx1 = coordinates.substr(0,found1);
double x1=std::strtod(cx1.c_str(),NULL);
- found2 = coordinates.find_first_of(",",found1+1);
+ found2 = coordinates.find_first_of(',',found1+1);
if (found2!=std::string::npos){
cy1 = coordinates.substr(found1+1,found2-found1-1);
double y1=std::strtod(cy1.c_str(),NULL);
@@ -2265,11 +2265,11 @@ axisOption( std::string str, TH1* h )
}
if (found1!=std::string::npos){
coordinates = str.substr(found+10,found1-found-10);
- found1 = coordinates.find_first_of(",");
+ found1 = coordinates.find_first_of(',');
if (found1!=std::string::npos){
cx1 = coordinates.substr(0,found1);
double x1=std::strtod(cx1.c_str(),NULL);
- found2 = coordinates.find_first_of(",",found1+1);
+ found2 = coordinates.find_first_of(',',found1+1);
if (found2!=std::string::npos){
cy1 = coordinates.substr(found1+1,found2-found1-1);
double y1=std::strtod(cy1.c_str(),NULL);
@@ -2510,11 +2510,11 @@ void HanOutputFile::polynomial( TCanvas* c, std::string str,TH1* h ) {
std::size_t found = str.find("polynomial(");
while (found!=std::string::npos)
{
- std::size_t endpos= str.find_first_of(")",found+1);
+ std::size_t endpos= str.find_first_of(')',found+1);
std::cout<<"found;"<<found<<" endpos;"<<endpos<<"count "<<" \n";
std::string inp_str=str.substr(found+11,endpos-found-11);
std::size_t found1 =0;
- std::size_t found2 =inp_str.find_first_of(",",found1);
+ std::size_t found2 =inp_str.find_first_of(',',found1);
TF1 *func = new TF1("func", "pol9",xmin,xmax);
for(int j=0; j<10; j++) {
std::string value_str=inp_str.substr(found1,found2-found1);
@@ -2524,7 +2524,7 @@ void HanOutputFile::polynomial( TCanvas* c, std::string str,TH1* h ) {
break;
}
found1=found2+1;
- found2=inp_str.find_first_of(",",found1);
+ found2=inp_str.find_first_of(',',found1);
}
func->SetNpx(1000);
c->cd();
@@ -2541,22 +2541,22 @@ displayExtra( TCanvas* c, std::string str )
std::size_t found = str.find("TLine");
while (found!=std::string::npos)
{
- std::size_t found1 = str.find_first_of(")",found+1);
+ std::size_t found1 = str.find_first_of(')',found+1);
if (found1!=std::string::npos){
std::string coordinates = str.substr(found+6,found1-found-6);
bool NDC = false;
if (found1 < str.size()-3 && str.substr(found1+1,3)=="NDC") {
NDC = true;
}
- found1 = coordinates.find_first_of(",");
+ found1 = coordinates.find_first_of(',');
if (found1!=std::string::npos){
std::string cx1 = coordinates.substr(0,found1);
double x1=std::strtod(cx1.c_str(),NULL);
- std::size_t found2 = coordinates.find_first_of(",",found1+1);
+ std::size_t found2 = coordinates.find_first_of(',',found1+1);
if (found2!=std::string::npos){
std::string cy1 = coordinates.substr(found1+1,found2-found1-1);
double y1=std::strtod(cy1.c_str(),NULL);
- found1 = coordinates.find_first_of(",",found2+1);
+ found1 = coordinates.find_first_of(',',found2+1);
if (found1!=std::string::npos){
std::string cx2 = coordinates.substr(found2+1,found1-found2-1);
double x2=std::strtod(cx2.c_str(),NULL);
@@ -2583,12 +2583,12 @@ displayExtra( TCanvas* c, std::string str )
while (found!=std::string::npos)
{
std::string coordinates, cx1,cy1 ="";
- std::size_t found1 = str.find_first_of(")",found+1);
- std::size_t found2 = str.find_first_of("\'",found+1);
+ std::size_t found1 = str.find_first_of(')',found+1);
+ std::size_t found2 = str.find_first_of('\'',found+1);
if (found2!=std::string::npos){
- found2 = str.find_first_of("\"",found2+1);
+ found2 = str.find_first_of('\"',found2+1);
if (found2!=std::string::npos && found1 < found2) {
- found1 = str.find_first_of(")",found2+1);
+ found1 = str.find_first_of(')',found2+1);
}
}
if (found1!=std::string::npos){
@@ -2597,11 +2597,11 @@ displayExtra( TCanvas* c, std::string str )
if (found1 < str.size()-3 && str.substr(found1+1,3)=="NDC") {
NDC = true;
}
- found1 = coordinates.find_first_of(",");
+ found1 = coordinates.find_first_of(',');
if (found1!=std::string::npos){
cx1 = coordinates.substr(0,found1);
double x1=std::strtod(cx1.c_str(),NULL);
- found2 = coordinates.find_first_of(",",found1+1);
+ found2 = coordinates.find_first_of(',',found1+1);
if (found2!=std::string::npos){
cy1 = coordinates.substr(found1+1,found2-found1-1);
double y1=std::strtod(cy1.c_str(),NULL);
@@ -2627,22 +2627,22 @@ displayExtra( TCanvas* c, std::string str )
found = str.find("TDota");
while (found!=std::string::npos)
{
- std::size_t found1 = str.find_first_of(")",found+1);
+ std::size_t found1 = str.find_first_of(')',found+1);
if (found1!=std::string::npos){
std::string coordinates = str.substr(found+6,found1-found-6);
bool NDC = false;
if (found1 < str.size()-3 && str.substr(found1+1,3)=="NDC") {
NDC = true;
}
- found1 = coordinates.find_first_of(",");
+ found1 = coordinates.find_first_of(',');
if (found1!=std::string::npos){
std::string cx1 = coordinates.substr(0,found1);
double x1=std::strtod(cx1.c_str(),NULL);
- std::size_t found2 = coordinates.find_first_of(",",found1+1);
+ std::size_t found2 = coordinates.find_first_of(',',found1+1);
if (found2!=std::string::npos){
std::string cy1 = coordinates.substr(found1+1,found2-found1-1);
double y1=std::strtod(cy1.c_str(),NULL);
- found1 = coordinates.find_first_of(",",found2+1);
+ found1 = coordinates.find_first_of(',',found2+1);
if (found1!=std::string::npos){
std::string cx2 = coordinates.substr(found2+1,found1-found2-1);
double x2=std::strtod(cx2.c_str(),NULL);
@@ -2670,12 +2670,12 @@ displayExtra( TCanvas* c, std::string str )
while (found!=std::string::npos)
{
std::string coordinates, cx1,cy1,txtsize ="";
- std::size_t found1 = str.find_first_of(")",found+1);
- std::size_t found2 = str.find_first_of("\'",found+1);
+ std::size_t found1 = str.find_first_of(')',found+1);
+ std::size_t found2 = str.find_first_of('\'',found+1);
if (found2!=std::string::npos){
- found2 = str.find_first_of("\"",found2+1);
+ found2 = str.find_first_of('\"',found2+1);
if (found2!=std::string::npos && found1 < found2) {
- found1 = str.find_first_of(")",found2+1);
+ found1 = str.find_first_of(')',found2+1);
}
}
if (found1!=std::string::npos){
@@ -2684,15 +2684,15 @@ displayExtra( TCanvas* c, std::string str )
if (found1 < str.size()-3 && str.substr(found1+1,3)=="NDC") {
NDC = true;
}
- found1 = coordinates.find_first_of(",");
+ found1 = coordinates.find_first_of(',');
if (found1!=std::string::npos){
cx1 = coordinates.substr(0,found1);
double x1=std::strtod(cx1.c_str(),NULL);
- found2 = coordinates.find_first_of(",",found1+1);
+ found2 = coordinates.find_first_of(',',found1+1);
if (found2!=std::string::npos){
cy1 = coordinates.substr(found1+1,found2-found1-1);
double y1=std::strtod(cy1.c_str(),NULL);
- std::size_t found3 = coordinates.find_first_of(",",found2+1);
+ std::size_t found3 = coordinates.find_first_of(',',found2+1);
if (found3!=std::string::npos){
txtsize = coordinates.substr(found2+1,found3-found2-1);
double size=std::strtod(txtsize.c_str(),NULL);
diff --git a/DataQuality/DataQualityUtils/src/MonitoringFile.cxx b/DataQuality/DataQualityUtils/src/MonitoringFile.cxx
index 9c15c247ab44..c9d9adb168be 100644
--- a/DataQuality/DataQualityUtils/src/MonitoringFile.cxx
+++ b/DataQuality/DataQualityUtils/src/MonitoringFile.cxx
@@ -218,7 +218,7 @@ getAllDirs( DirMap_t& dirmap, TDirectory* dir, std::string dirName )
std::string fName("");
if( dirName != "" ) {
fName += dirName;
- fName += "/";
+ fName += '/';
}
fName += subdirName;
getAllDirs( dirmap, subdir, fName );
@@ -243,7 +243,7 @@ createDir( DirMap_t& dirmap, TDirectory* dir, std::string parent, std::string pa
std::string fName("");
if( parent != "" ) {
fName += parent;
- fName += "/";
+ fName += '/';
}
if( i != std::string::npos ) {
@@ -554,7 +554,7 @@ mergeDirectory( TDirectory* outputDir, const std::vector<TFile*>& inputFiles, bo
//skip cases where regexp doesn't match object name, all directories are processed by default
if(m_useRE){
if(!boost::regex_search(keyName,*m_mergeMatchHistoRE)){
- //std::cerr<<" skipping keyName=\""<<outputDirName+"/"+keyName<<"\""<<std::endl;
+ //std::cerr<<" skipping keyName=\""<<outputDirName+'/'+keyName<<"\""<<std::endl;
continue; // not the histogram we want
}
}
@@ -1115,10 +1115,10 @@ getHanResults( std::string hanResultsDir, std::string input,
if( tdir_minutes != 0 ) {
std::string tdir_minutes_name( tdir_minutes->GetName() );
if( tdir_minutes_name.find("lowStat") != std::string::npos ) {
- lowStat_dirs.push_back( tdir_run_name + "/" + tdir_minutes_name );
+ lowStat_dirs.push_back( tdir_run_name + '/' + tdir_minutes_name );
}
else if( tdir_minutes_name.find("medStat") != std::string::npos ) {
- medStat_dirs.push_back( tdir_run_name + "/" + tdir_minutes_name );
+ medStat_dirs.push_back( tdir_run_name + '/' + tdir_minutes_name );
}
}
delete obj_minutes;
@@ -1139,7 +1139,7 @@ getHanResults( std::string hanResultsDir, std::string input,
dirs_end = run_dirs.end();
for( dir = run_dirs.begin(); dir != dirs_end; ++dir ) {
const std::string& tdir_run_name = *dir;
- std::string han_output_run = hanResultsDir+"/"+tdir_run_name+"_han.root";
+ std::string han_output_run = hanResultsDir+'/'+tdir_run_name+"_han.root";
std::cout << "Calling han( " << hcfg << ", " << input << ", " << tdir_run_name
<< ", " << han_output_run << " ):\n" << std::flush;
han.Analyze( hcfg, input, han_output_run, tdir_run_name );
@@ -1152,10 +1152,10 @@ getHanResults( std::string hanResultsDir, std::string input,
const std::string& tdir_minutes_path = *dir;
std::string tdir_minutes_underscore = tdir_minutes_path;
- std::string::size_type tdir_minutes_i = tdir_minutes_underscore.find("/");
+ std::string::size_type tdir_minutes_i = tdir_minutes_underscore.find('/');
tdir_minutes_underscore.replace( tdir_minutes_i, 1, "_" );
- std::string han_output_lowStat = hanResultsDir+"/"+tdir_minutes_underscore+"_han.root";
+ std::string han_output_lowStat = hanResultsDir+'/'+tdir_minutes_underscore+"_han.root";
std::cout << "Running han, writing to " << han_output_lowStat << ":\n" << std::flush;
han.Analyze( hcfg_lowStat, input, han_output_lowStat, tdir_minutes_path );
std::cout << "\n";
@@ -1169,10 +1169,10 @@ getHanResults( std::string hanResultsDir, std::string input,
const std::string& tdir_minutes_path = *dir;
std::string tdir_minutes_underscore = tdir_minutes_path;
- std::string::size_type tdir_minutes_i = tdir_minutes_underscore.find("/");
+ std::string::size_type tdir_minutes_i = tdir_minutes_underscore.find('/');
tdir_minutes_underscore.replace( tdir_minutes_i, 1, "_" );
- std::string han_output_medStat = hanResultsDir+"/"+tdir_minutes_underscore+"_han.root";
+ std::string han_output_medStat = hanResultsDir+'/'+tdir_minutes_underscore+"_han.root";
std::cout << "Running han, writing to " << han_output_medStat << ":\n" << std::flush;
han.Analyze( hcfg_medStat, input, han_output_medStat, tdir_minutes_path );
std::cout << "\n";
@@ -1230,7 +1230,7 @@ printHanConfig() const
std::cout << indent << " hist all_in_dir { \n " << indent << " } \n";
}
else{
- //find common part + number of common "/"
+ //find common part + number of common '/'
std::string common = FindCommon(idirName,idirName_p);
indent_c = getIndentation(common,"");
int counter = (indent_p.size() - indent_c.size())/2;
@@ -1802,7 +1802,7 @@ int MonitoringFile::mergeLB_recursiveDirCopy(TDirectory *dir_top_out, TDirectory
std::string p(gDirectory->GetPath());
if( p_top.size() < p.size() ) {
p = p.substr(p_top.size()+1, p.size()-p_top.size()-1); // strip off the top directory part
- p = p + "/";
+ p = p + '/';
}
else p = "";
@@ -1832,7 +1832,7 @@ int MonitoringFile::mergeLB_recursiveDirCopy(TDirectory *dir_top_out, TDirectory
}
else {
if( debugLevel >= DEBUG )
- std::cout << name << ": " << dir_out->GetPath() << "/" << dir->GetName() << " exists already" << std::endl;
+ std::cout << name << ": " << dir_out->GetPath() << '/' << dir->GetName() << " exists already" << std::endl;
dir_out_new = (TDirectory*) dir_out->Get(test_key->GetName());
if( ! dir_out_new ) {
@@ -1873,7 +1873,7 @@ int MonitoringFile::mergeLB_createListOfHistos(TDirectory *dir_top, TDirectory *
std::string p(cwd->GetPath());
if( p_top.size() < p.size() ) {
p = p.substr(p_top.size()+1, p.size()-p_top.size()-1); // strip off the top directory part
- p = p + "/";
+ p = p + '/';
}
else p = "";
@@ -2050,7 +2050,7 @@ int MonitoringFile::mergeLB_processLBinterval(std::vector<TDirectory*>& v_dirsSt
TKey *test_key = dir_out->FindKey(objThis->GetName());
if( test_key ) {
if( debugLevel >= DEBUG )
- std::cout << name << ": " << dir_out->GetPath() << "/" << objThis->GetName()
+ std::cout << name << ": " << dir_out->GetPath() << '/' << objThis->GetName()
<< " exists already, not written" << std::endl;
break;
}
@@ -2100,7 +2100,7 @@ int MonitoringFile::mergeLB_processLBinterval(std::vector<TDirectory*>& v_dirsSt
if( objMerged ) {
objMerged->Write();
if( debugLevel >= DEBUG )
- std::cout << name << ": wrote " << dir_out->GetPath() << "/" << objMerged->GetName() << std::endl;
+ std::cout << name << ": wrote " << dir_out->GetPath() << '/' << objMerged->GetName() << std::endl;
delete objMerged;
}
}
diff --git a/Database/APR/PersistencySvc/src/UserDatabase.cpp b/Database/APR/PersistencySvc/src/UserDatabase.cpp
index 195194519d8f..2b8ae7cc4def 100644
--- a/Database/APR/PersistencySvc/src/UserDatabase.cpp
+++ b/Database/APR/PersistencySvc/src/UserDatabase.cpp
@@ -168,7 +168,7 @@ pool::PersistencySvc::UserDatabase::connectForWrite( const pool::DatabaseConnect
// register in the catalog
pool::DbType dbType( m_technology );
pool::DbType dbTypeMajor( dbType.majorType() );
- m_catalog.registerPFN( m_the_pfn.substr(0, m_the_pfn.find("?")), dbTypeMajor.storageName(), m_the_fid );
+ m_catalog.registerPFN( m_the_pfn.substr(0, m_the_pfn.find('?')), dbTypeMajor.storageName(), m_the_fid );
DbPrint log("PersistencySvc::UserDB::connectForWrite()" );
log << DbPrintLvl::Debug << "registered PFN: " << m_the_pfn << " with FID:" << m_the_fid << endmsg;
dbRegistered = true;
@@ -266,7 +266,7 @@ pool::PersistencySvc::UserDatabase::fid()
else {
if ( m_nameType == pool::DatabaseSpecification::PFN ) {
std::string technology;
- m_catalog.lookupFileByPFN( m_name.substr(0, m_name.find("?")), m_the_fid, technology );
+ m_catalog.lookupFileByPFN( m_name.substr(0, m_name.find('?')), m_the_fid, technology );
DbPrint log("PersistencySvc::UserDB::fid()" );
log << DbPrintLvl::Debug << "lookupPFN: " << m_name << " returned FID: '" << m_the_fid << "'"
<< " tech=" << technology << endmsg;
diff --git a/Database/APR/StorageSvc/src/DbDatabaseObj.cpp b/Database/APR/StorageSvc/src/DbDatabaseObj.cpp
index 31d1b969c982..ebdc72e9112f 100644
--- a/Database/APR/StorageSvc/src/DbDatabaseObj.cpp
+++ b/Database/APR/StorageSvc/src/DbDatabaseObj.cpp
@@ -279,7 +279,7 @@ DbStatus DbDatabaseObj::addShape (const DbTypeInfo* pShape) {
for (size_t ic=0; ic < cols.size();++ic) {
const DbColumn* c = cols[ic];
log << "---->[" << ic << "]:" << c->name()
- << " Typ:" << c->typeName() << " ["<< c->typeID() << "]"
+ << " Typ:" << c->typeName() << " ["<< c->typeID() << ']'
<< " Size:" << c->size()
<< " Offset:" << c->offset()
<< " #Elements:" << c->nElement()
@@ -370,7 +370,7 @@ DbStatus DbDatabaseObj::open() {
for (size_t ic=0; ic < cols.size();++ic) {
const DbColumn* c = cols[ic];
log << "---->[" << ic << "]:" << c->name()
- << " Typ:" << c->typeName() << " ["<< c->typeID() << "]"
+ << " Typ:" << c->typeName() << " ["<< c->typeID() << ']'
<< " Size:" << c->size()
<< " Offset:" << c->offset()
<< " #Elements:" << c->nElement()
@@ -430,7 +430,7 @@ DbStatus DbDatabaseObj::open() {
string n = dsc.substr(id1+6, id11-id1-6);
string v = dsc.substr(id2+7, id22-id2-7);
// ParamMap::value_type val(n, v);
- log << "--->Reading Param:" << n << "=[" << v << "]"
+ log << "--->Reading Param:" << n << "=[" << v << ']'
<< DbPrint::endmsg;
m_paramMap[n] = v;
if (n == "FID") fids.push_back(v);
@@ -488,7 +488,7 @@ DbStatus DbDatabaseObj::open() {
string cnt = dsc.substr(id1+5, id2-1-5);
int section_offset = ::atoi((tmp=dsc.substr(id2+5,id3-id2-6)).c_str());
int section_start = ::atoi((tmp=dsc.substr(id3+7,id4-id3-8)).c_str());
- int section_length = ::atoi((tmp=dsc.substr(id4+5,dsc.find("]",id4+5)-id4-5)).c_str());
+ int section_length = ::atoi((tmp=dsc.substr(id4+5,dsc.find(']',id4+5)-id4-5)).c_str());
m_sections[cnt].push_back(DbSection(section_offset,section_start,section_length));
//m_redirects[db].push_back(Redirection(DbSection(section_offset,section_start,section_length));
log << "--->Internal section:" << dsc << " offset:" << section_offset
@@ -633,7 +633,7 @@ DbStatus DbDatabaseObj::addParam(const string& nam, const string& val) {
if ( m_info ) {
ParamMap::const_iterator i = m_paramMap.find(nam);
if ( i == m_paramMap.end() ) {
- string dsc = "[NAME=" + nam + "][VALUE=" + val + "]";
+ string dsc = "[NAME=" + nam + "][VALUE=" + val + ']';
DbHandle<DbString> persH = new(m_params, m_string_t) DbString(dsc);
if ( !m_params.save(persH, m_string_t).isSuccess() ) {
return Error;
diff --git a/Database/CrestApi/src/CrestApi.cxx b/Database/CrestApi/src/CrestApi.cxx
index cf06cee84b91..b1e665cc25ab 100644
--- a/Database/CrestApi/src/CrestApi.cxx
+++ b/Database/CrestApi/src/CrestApi.cxx
@@ -41,12 +41,12 @@ namespace Crest {
}
CrestClient::CrestClient(const std::string& url) : m_mode(SERVER_MODE) {
- size_t found = url.find_first_of(":");
+ size_t found = url.find_first_of(':');
std::string protocol = url.substr(0, found);
std::string url_new = url.substr(found + 3); //url_new is the url excluding the http part
- size_t found1 = url_new.find_first_of(":");
- size_t found2 = url_new.find_first_of("/");
+ size_t found1 = url_new.find_first_of(':');
+ size_t found2 = url_new.find_first_of('/');
if (found1 != std::string::npos && found2 != std::string::npos) {
m_host = url_new.substr(0, found1);
m_port = url_new.substr(found1 + 1, found2 - found1 - 1);
@@ -160,7 +160,7 @@ namespace Crest {
checkFsException(method_name);
- std::string current_path = s_PATH + s_ADMIN_PATH + s_TAG_PATH + "/" + tagName;
+ std::string current_path = s_PATH + s_ADMIN_PATH + s_TAG_PATH + '/' + tagName;
std::string getTxt = "DELETE";
std::string retv;
@@ -176,7 +176,7 @@ namespace Crest {
return findTagFs(tagName);
}
- std::string current_path = s_PATH + s_TAG_PATH + "/" + tagName;
+ std::string current_path = s_PATH + s_TAG_PATH + '/' + tagName;
std::string getTxt = "GET";
std::string retv;
@@ -229,7 +229,7 @@ namespace Crest {
checkFsException(method_name);
- std::string current_path = s_PATH + s_TAG_PATH + "/" + tagname;
+ std::string current_path = s_PATH + s_TAG_PATH + '/' + tagname;
std::string retv;
@@ -241,7 +241,7 @@ namespace Crest {
checkFsException(method_name);
- std::string current_path = s_PATH + s_TAG_PATH + "/" + tagname;
+ std::string current_path = s_PATH + s_TAG_PATH + '/' + tagname;
nlohmann::json body;
body["objectType"] = objectType;
@@ -259,7 +259,7 @@ namespace Crest {
std::filesystem::create_directory(std::filesystem::path(rootDir));
}
- std::string workDir = m_root_folder + s_FS_TAG_PATH + "/" + name;
+ std::string workDir = m_root_folder + s_FS_TAG_PATH + '/' + name;
if (!std::filesystem::exists(std::filesystem::path(workDir))) {
std::filesystem::create_directory(std::filesystem::path(workDir));
}
@@ -296,7 +296,7 @@ namespace Crest {
nlohmann::json iov = item.second;
std::string name = item.first;
std::cerr << "Flush tag=" << name << std::endl;
- std::string workDir = m_root_folder + s_FS_TAG_PATH + "/" + name;
+ std::string workDir = m_root_folder + s_FS_TAG_PATH + '/' + name;
std::ofstream myfile;
std::string tagFile = workDir + s_FS_IOV_FILE;
myfile.open(tagFile.c_str());
@@ -517,7 +517,7 @@ namespace Crest {
checkFsException(method_name);
- std::string current_path = s_PATH + s_ADMIN_PATH + s_GLOBALTAG_PATH + "/" + name;
+ std::string current_path = s_PATH + s_ADMIN_PATH + s_GLOBALTAG_PATH + '/' + name;
std::string retv;
@@ -570,7 +570,7 @@ namespace Crest {
return s;
}
- std::string current_path = s_PATH + s_GLOBALTAG_PATH + "/" + name;
+ std::string current_path = s_PATH + s_GLOBALTAG_PATH + '/' + name;
std::string retv;
nlohmann::json js = nullptr;
@@ -597,7 +597,7 @@ namespace Crest {
checkFsException(method_name);
- std::string current_path = s_PATH + s_ADMIN_PATH + s_GLOBALTAG_PATH + "/" + name;
+ std::string current_path = s_PATH + s_ADMIN_PATH + s_GLOBALTAG_PATH + '/' + name;
std::string retv;
nlohmann::json js = nullptr;
retv = performRequest(current_path, DELETE, js, method_name);
@@ -665,7 +665,7 @@ namespace Crest {
return findGlobalTagMapFs(name);
}
- std::string current_path = s_PATH + s_GLOBALTAG_MAP_PATH + "/" + name;
+ std::string current_path = s_PATH + s_GLOBALTAG_MAP_PATH + '/' + name;
std::string retv;
@@ -726,7 +726,7 @@ namespace Crest {
return getBlobFs(hash);
}
- std::string current_path = s_PATH + s_PAYLOAD_PATH + "/" + hash;
+ std::string current_path = s_PATH + s_PAYLOAD_PATH + '/' + hash;
std::string retv;
@@ -743,7 +743,7 @@ namespace Crest {
return getBlobInStreamFs(hash, out);
}
- std::string current_path = s_PATH + s_PAYLOAD_PATH + "/" + hash;
+ std::string current_path = s_PATH + s_PAYLOAD_PATH + '/' + hash;
std::string retv;
@@ -762,7 +762,7 @@ namespace Crest {
return getPayloadMetaInfoAsJsonFS(hash);
}
- std::string current_path = s_PATH + s_PAYLOAD_PATH + "/" + hash + s_META_PATH;
+ std::string current_path = s_PATH + s_PAYLOAD_PATH + '/' + hash + s_META_PATH;
std::string retv;
@@ -782,7 +782,7 @@ namespace Crest {
return getPayloadMetaInfoAsStringFS(hash);
}
- std::string current_path = s_PATH + s_PAYLOAD_PATH + "/" + hash + s_META_PATH;
+ std::string current_path = s_PATH + s_PAYLOAD_PATH + '/' + hash + s_META_PATH;
std::string retv;
@@ -836,7 +836,7 @@ namespace Crest {
return getPayloadAsJsonFS(hash);
}
- std::string current_path = s_PATH + s_PAYLOAD_PATH + "/" + hash + "?format=DTO";
+ std::string current_path = s_PATH + s_PAYLOAD_PATH + '/' + hash + "?format=DTO";
std::string retv;
@@ -856,7 +856,7 @@ namespace Crest {
return getPayloadAsStringFS(hash);
}
- std::string current_path = s_PATH + s_PAYLOAD_PATH + "/" + hash + "?format=BLOB";
+ std::string current_path = s_PATH + s_PAYLOAD_PATH + '/' + hash + "?format=BLOB";
std::string retv;
@@ -1038,7 +1038,7 @@ namespace Crest {
if (curl) {
std::ostringstream url;
std::string s;
- url << "http://" << m_host << ":" << m_port << current_path;
+ url << "http://" << m_host << ':' << m_port << current_path;
curl_easy_setopt(curl, CURLOPT_URL, url.str().c_str());
headers = curl_slist_append(headers, "Accept: */*");
@@ -1105,7 +1105,7 @@ namespace Crest {
if (curl) {
std::ostringstream url;
std::string s;
- url << "http://" << m_host << ":" << m_port << current_path;
+ url << "http://" << m_host << ':' << m_port << current_path;
curl_easy_setopt(curl, CURLOPT_URL, url.str().c_str());
if (js.is_null()) {
@@ -1187,13 +1187,13 @@ namespace Crest {
if (js.is_null()) {
request_stream << action << " " << current_path << " HTTP/1.0\r\n";
- request_stream << "Host: " << m_host << ":" << m_port << " \r\n";
+ request_stream << "Host: " << m_host << ':' << m_port << " \r\n";
request_stream << "Accept: */*\r\n";
request_stream << "Connection: close\r\n\r\n";
} else {
std::string s = js.dump();
request_stream << action << " " << current_path << " HTTP/1.0\r\n";
- request_stream << "Host: " << m_host << ":" << m_port << " \r\n";
+ request_stream << "Host: " << m_host << ':' << m_port << " \r\n";
request_stream << "Content-Type: application/json; \r\n";
request_stream << "Accept: */*\r\n";
request_stream << "Content-Length: " << s.length() << "\r\n";
@@ -1305,7 +1305,7 @@ namespace Crest {
if (curl) {
std::ostringstream url;
std::string s;
- url << "http://" << m_host << ":" << m_port << current_path;
+ url << "http://" << m_host << ':' << m_port << current_path;
// First set the URL that is about to receive our POST. This URL can
// just as well be a https:
@@ -1509,7 +1509,7 @@ namespace Crest {
nlohmann::json CrestClient::findTagFs(const std::string& name) {
nlohmann::json js = nullptr;
- std::string file_path = m_root_folder + "/" + s_FS_TAG_PATH + "/" + name + s_FS_TAG_FILE;
+ std::string file_path = m_root_folder + '/' + s_FS_TAG_PATH + '/' + name + s_FS_TAG_FILE;
try{
std::string tag = getFileString(file_path);
js = nlohmann::json::parse(tag);
@@ -1523,7 +1523,7 @@ namespace Crest {
nlohmann::json CrestClient::findAllIovsFs(const std::string& tagname) {
nlohmann::json js = nullptr;
- std::string file_path = m_root_folder + "/" + s_FS_TAG_PATH + "/" + tagname + s_FS_IOV_FILE;
+ std::string file_path = m_root_folder + '/' + s_FS_TAG_PATH + '/' + tagname + s_FS_IOV_FILE;
try{
std::string tag = getFileString(file_path);
@@ -1540,7 +1540,7 @@ namespace Crest {
std::string CrestClient::getFileName(const std::string& path) {
std::string filename = "";
int size = path.size();
- int pos = path.find(":");
+ int pos = path.find(':');
filename = path.substr(pos + 3, size);
return filename;
}
@@ -1729,7 +1729,7 @@ namespace Crest {
"ERROR in CrestClient::createTagMetaInfo cannot get the tag name from tag meta info JSON.");
}
- std::string current_path = s_PATH + s_TAG_PATH + "/" + tagname + s_META_PATH;
+ std::string current_path = s_PATH + s_TAG_PATH + '/' + tagname + s_META_PATH;
std::string retv;
@@ -1755,7 +1755,7 @@ namespace Crest {
return getTagMetaInfoFs(tagname);
}
- std::string current_path = s_PATH + s_TAG_PATH + "/" + tagname + s_META_PATH;
+ std::string current_path = s_PATH + s_TAG_PATH + '/' + tagname + s_META_PATH;
std::string getTxt = "GET";
std::string retv;
@@ -1788,7 +1788,7 @@ namespace Crest {
return;
}
- std::string current_path = s_PATH + s_TAG_PATH + "/" + tagname + s_META_PATH;
+ std::string current_path = s_PATH + s_TAG_PATH + '/' + tagname + s_META_PATH;
std::string retv;
@@ -1816,7 +1816,7 @@ namespace Crest {
return;
}
- std::string current_path = s_PATH + s_TAG_PATH + "/" + tagname + s_META_PATH;
+ std::string current_path = s_PATH + s_TAG_PATH + '/' + tagname + s_META_PATH;
std::string retv;
@@ -1878,7 +1878,7 @@ namespace Crest {
throw std::runtime_error(
"ERROR in CrestClient::createTagMetaInfoFs cannot get the tag name from tag meta info JSON.");
}
- std::string workDir = m_root_folder + s_FS_TAG_PATH + "/" + name;
+ std::string workDir = m_root_folder + s_FS_TAG_PATH + '/' + name;
std::string tagMetaFile = workDir + s_FS_TAGMETAINFO_FILE;
if (!std::filesystem::exists(std::filesystem::path(workDir))) {
@@ -1902,7 +1902,7 @@ namespace Crest {
nlohmann::json CrestClient::getTagMetaInfoFs(const std::string& name) {
nlohmann::json js = nullptr;
- std::string file_path = m_root_folder + s_FS_TAG_PATH + "/" + name + s_FS_TAGMETAINFO_FILE;
+ std::string file_path = m_root_folder + s_FS_TAG_PATH + '/' + name + s_FS_TAGMETAINFO_FILE;
try{
std::string tag = getFileString(file_path);
js = nlohmann::json::parse(tag);
@@ -1966,7 +1966,7 @@ namespace Crest {
}
std::string gTagDir = m_root_folder + s_FS_GLOBALTAG_PATH;
- std::string workDir = gTagDir + "/" + name;
+ std::string workDir = gTagDir + '/' + name;
std::string globalTagFile = workDir + s_FS_GLOBALTAG_FILE;
@@ -1997,7 +1997,7 @@ namespace Crest {
nlohmann::json js = nullptr;
- std::string workDir = m_root_folder + s_FS_GLOBALTAG_PATH + "/" + name;
+ std::string workDir = m_root_folder + s_FS_GLOBALTAG_PATH + '/' + name;
std::string file_path = workDir + s_FS_GLOBALTAG_FILE;
try{
@@ -2031,11 +2031,11 @@ namespace Crest {
throw std::runtime_error("ERROR in CrestClient::createGlobalTagMapFs: cannot get the tag name from JSON.");
}
- std::string fname = "/" + tagname + ".json";
+ std::string fname = '/' + tagname + ".json";
std::string gTagDir = m_root_folder + s_FS_GLOBALTAG_PATH;
- std::string workDir = gTagDir + "/" + name;
+ std::string workDir = gTagDir + '/' + name;
if (!std::filesystem::exists(std::filesystem::path(workDir))) {
@@ -2095,7 +2095,7 @@ namespace Crest {
nlohmann::json js = nullptr;
std::string workDir = m_root_folder + s_FS_GLOBALTAG_PATH;
- std::string file_path = workDir + "/" + name + s_FS_MAP_FILE;
+ std::string file_path = workDir + '/' + name + s_FS_MAP_FILE;
try{
std::string tag = getFileString(file_path);
@@ -2129,7 +2129,7 @@ namespace Crest {
// payload file:
std::string hashCode = getHash(js);
- std::string workDir = m_data_folder + "/" + hashCode;
+ std::string workDir = m_data_folder + '/' + hashCode;
if (!std::filesystem::exists(std::filesystem::path(workDir))) {
std::filesystem::create_directory(std::filesystem::path(workDir));
}
@@ -2196,7 +2196,7 @@ namespace Crest {
}
std::string CrestClient::getPayloadAsStringFS(const std::string& hash) {
- std::string workDir = m_data_folder + "/" + hash;
+ std::string workDir = m_data_folder + '/' + hash;
std::string filePath = workDir + "/payload.json";
std::string res = "";
@@ -2217,7 +2217,7 @@ namespace Crest {
}
std::string CrestClient::getPayloadMetaInfoAsStringFS(const std::string& hash) {
- std::string workDir = m_data_folder + "/" + hash;
+ std::string workDir = m_data_folder + '/' + hash;
std::string filePath = workDir + "/meta.json";
std::string res = "";
@@ -2251,7 +2251,7 @@ namespace Crest {
std::string line;
std::string str = "";
- std::string workDir = m_data_folder + "/" + hash;
+ std::string workDir = m_data_folder + '/' + hash;
std::string file_path = workDir + "/payload.json";
std::cout << "blob file = " << file_path << std::endl;
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelResidualHistograms.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelResidualHistograms.cxx
index c6acce9b1af0..0cf23c6681e9 100644
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelResidualHistograms.cxx
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelResidualHistograms.cxx
@@ -193,9 +193,9 @@ TProfile* PixelResidualHistograms::GetProfile(const int binnumber, bool RMS, boo
float* xbins = new float[nProfileBins+1];
std::string Xvar_name = m_binnames[binnumber];
std::string Xvar_name_s = Xvar_name;
- size_t found0 = Xvar_name_s.find("#");
+ size_t found0 = Xvar_name_s.find('#');
if(found0 != std::string::npos) Xvar_name_s = Xvar_name_s.substr(found0+1);
- size_t found1 = Xvar_name_s.find("_");
+ size_t found1 = Xvar_name_s.find('_');
if(found1 != std::string::npos) Xvar_name_s = Xvar_name_s.substr(0,found1);
for(int i = 0 ; i < nProfileBins+1 ; i++)
xbins[i] = (m_binnage[binnumber])[i];
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CalibrateTRT.cpp b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CalibrateTRT.cpp
index 68a4161bd374..1b330facb382 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CalibrateTRT.cpp
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CalibrateTRT.cpp
@@ -186,7 +186,7 @@ float Calibrator::FitRt(const string & key, const string & opt, TH2F* rtHist){
rtpars[3] = rtfunc2.GetParameter(3);
}
- if (opt.find("0")==string::npos) {
+ if (opt.find('0')==string::npos) {
if (isdines) rtpars[1]=0;
else rtpars[0]=0;
}
@@ -266,13 +266,13 @@ float Calibrator::FitResidual(string key, TH1F* resHist){
TDirectory* Calibrator::Calibrate(TDirectory* dir, string key, string opt, caldata caldata_above){
//set some bool flags
- bool calrt=opt.find("R")!=string::npos;
- bool calt0=opt.find("T")!=string::npos;
- bool donothing=opt.find("N")!=string::npos;
- bool godeeper=opt.find("D")!=string::npos;
- bool isquiet=opt.find("Q")!=string::npos;
- bool prnt=opt.find("P")!=string::npos;
- bool useref=opt.find("B")!=string::npos;
+ bool calrt=opt.find('R')!=string::npos;
+ bool calt0=opt.find('T')!=string::npos;
+ bool donothing=opt.find('N')!=string::npos;
+ bool godeeper=opt.find('D')!=string::npos;
+ bool isquiet=opt.find('Q')!=string::npos;
+ bool prnt=opt.find('P')!=string::npos;
+ bool useref=opt.find('B')!=string::npos;
if (donothing) return dir;
@@ -527,12 +527,12 @@ bool IncludedLevels(string opt0, int* levinc){
string popts[7]{};
- string opt1=opt0.substr(0,opt0.rfind("_"));
- string opt2=opt1.substr(0,opt1.rfind("_"));
- string opt3=opt2.substr(0,opt2.rfind("_"));
- string opt4=opt3.substr(0,opt3.rfind("_"));
- string opt5=opt4.substr(0,opt4.rfind("_"));
- string opt6=opt5.substr(0,opt5.rfind("_"));
+ string opt1=opt0.substr(0,opt0.rfind('_'));
+ string opt2=opt1.substr(0,opt1.rfind('_'));
+ string opt3=opt2.substr(0,opt2.rfind('_'));
+ string opt4=opt3.substr(0,opt3.rfind('_'));
+ string opt5=opt4.substr(0,opt4.rfind('_'));
+ string opt6=opt5.substr(0,opt5.rfind('_'));
popts[6]=opt0.replace(0,opt1.size(),"");
popts[5]=opt1.replace(0,opt2.size(),"");
@@ -546,7 +546,7 @@ bool IncludedLevels(string opt0, int* levinc){
int var;
for (int i=0;i<7;i++){
string slevinc = popts[i].substr(1,popts[i].size());
- if (slevinc.find("*")!=string::npos || slevinc.find(",")!=string::npos || slevinc.find("-")!=string::npos) levinc[i]=-3;
+ if (slevinc.find('*')!=string::npos || slevinc.find(',')!=string::npos || slevinc.find('-')!=string::npos) levinc[i]=-3;
else {
if(EOF == sscanf( (popts[i].substr(1,popts[i].size())).data() , "%d", &var));
levinc[i]=var;
@@ -562,9 +562,9 @@ string SubLev(string pat, int lev){
string sublev;
for (int i=0;i<lev;i++){
- pat.replace(pat.find("_"),1,"");
- sublev = pat.substr(0,pat.find("_"));
- pat.replace(0,pat.find("_"),"");
+ pat.replace(pat.find('_'),1,"");
+ sublev = pat.substr(0,pat.find('_'));
+ pat.replace(0,pat.find('_'),"");
}
return sublev;
}
@@ -576,10 +576,10 @@ bool IsSubLev(const string &key, int lev, const string &sublev){
if (sl.compare(SubLev(key,lev))==0) return true;
- while(sl.compare(sl.substr(sl.find(",")+1))!=0){
- if (SubLev(key,lev).compare(sl.substr(0,sl.find(",")))==0) return true;
- sl=sl.substr(sl.find(",")+1);
- if (SubLev(key,lev).compare(sl.substr(0,sl.find(",")))==0) return true;
+ while(sl.compare(sl.substr(sl.find(',')+1))!=0){
+ if (SubLev(key,lev).compare(sl.substr(0,sl.find(',')))==0) return true;
+ sl=sl.substr(sl.find(',')+1);
+ if (SubLev(key,lev).compare(sl.substr(0,sl.find(',')))==0) return true;
}
return false;
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/ServiceVolumeMaker.h b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/ServiceVolumeMaker.h
index 44c095c5e0cd..8c8fde64a430 100644
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/ServiceVolumeMaker.h
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/ServiceVolumeMaker.h
@@ -25,25 +25,25 @@ namespace InDetDD {
void setDefaultSchema();
void setSimpleSchema();
- std::string rmin() const {return m_rmin;}
- std::string rmax() const {return m_rmax;}
- std::string rmin2() const {return m_rmin2;}
- std::string rmax2() const {return m_rmax2;}
- std::string zmin() const {return m_zmin;}
- std::string zmax() const {return m_zmax;}
- std::string zsymm() const {return m_zsymm;}
- std::string shapeType() const {return m_shapeType;}
- std::string materialName() const {return m_materialName;}
- std::string volName() const {return m_volName;}
- std::string phiWidth() const {return m_phiWidth;}
- std::string width() const {return m_width;}
- std::string repeat() const {return m_repeat;}
- std::string phiStart() const {return m_phiStart;}
- std::string phiDelta() const {return m_phiDelta;}
- std::string phiStep() const {return m_phiStep;}
- std::string radialDiv() const {return m_radialDiv;}
- std::string volId() const {return m_volId;}
- std::string shiftFlag() const {return m_shiftFlag;}
+ const std::string& rmin() const {return m_rmin;}
+ const std::string& rmax() const {return m_rmax;}
+ const std::string& rmin2() const {return m_rmin2;}
+ const std::string& rmax2() const {return m_rmax2;}
+ const std::string& zmin() const {return m_zmin;}
+ const std::string& zmax() const {return m_zmax;}
+ const std::string& zsymm() const {return m_zsymm;}
+ const std::string& shapeType() const {return m_shapeType;}
+ const std::string& materialName() const {return m_materialName;}
+ const std::string& volName() const {return m_volName;}
+ const std::string& phiWidth() const {return m_phiWidth;}
+ const std::string& width() const {return m_width;}
+ const std::string& repeat() const {return m_repeat;}
+ const std::string& phiStart() const {return m_phiStart;}
+ const std::string& phiDelta() const {return m_phiDelta;}
+ const std::string& phiStep() const {return m_phiStep;}
+ const std::string& radialDiv() const {return m_radialDiv;}
+ const std::string& volId() const {return m_volId;}
+ const std::string& shiftFlag() const {return m_shiftFlag;}
void set_rmin (const std::string & s) {m_rmin = s;}
void set_rmax (const std::string & s) {m_rmax = s;}
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/ServiceVolumeMaker.cxx b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/ServiceVolumeMaker.cxx
index b9e6d835c9d2..5e88bd8d6f77 100755
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/ServiceVolumeMaker.cxx
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/ServiceVolumeMaker.cxx
@@ -236,6 +236,7 @@ namespace InDetDD {
IRDBRecordset_ptr PixelLayer = rdbSvc->getRecordsetPtr("PixelLayer", detectorKey, detectorNode);
int numLayers = db()->getInt(PixelBarrelGeneral, "NLAYER");
+ layerShift.reserve(numLayers);
for (int iLayer = 0; iLayer < numLayers; iLayer++) {
double shift = 0;
if (db()->testField(PixelLayer, "GBLSHIFT", iLayer)) shift = db()->getDouble(PixelLayer, "GBLSHIFT", iLayer);
diff --git a/LArCalorimeter/LArCabling/src/LArHVIdMappingReader.cxx b/LArCalorimeter/LArCabling/src/LArHVIdMappingReader.cxx
index 8c5498b31b4b..e177849d577d 100644
--- a/LArCalorimeter/LArCabling/src/LArHVIdMappingReader.cxx
+++ b/LArCalorimeter/LArCabling/src/LArHVIdMappingReader.cxx
@@ -60,7 +60,7 @@ LArHVIdMappingReader::fromAttrList (const AthenaAttributeList& attrList) const
std::ostringstream attrStr1;
coral::AttributeList::const_iterator itr = attrList.begin();
itr->toOutputStream(attrStr1);
- std::string::size_type pos = attrStr1.str().find(":");
+ std::string::size_type pos = attrStr1.str().find(':');
if (pos == std::string::npos)
pos = 0;
else
diff --git a/LumiBlock/LumiCalc/src/ReplicaSorter.cxx b/LumiBlock/LumiCalc/src/ReplicaSorter.cxx
index a64f3cb83bee..9754159f06e4 100644
--- a/LumiBlock/LumiCalc/src/ReplicaSorter.cxx
+++ b/LumiBlock/LumiCalc/src/ReplicaSorter.cxx
@@ -29,7 +29,7 @@ void ReplicaSorter::sort(std::vector<
if (conn.find("sqlite_file")==std::string::npos) {
// extract the server name (assuming URLs "techno://server/schema")
std::string::size_type ipos1=conn.find("://");
- std::string::size_type ipos2=conn.find("/",ipos1+3);
+ std::string::size_type ipos2=conn.find('/',ipos1+3);
if (ipos1!=std::string::npos && ipos2!=std::string::npos) {
const std::string server=conn.substr(ipos1+3,ipos2-ipos1-3);
// check if this server is on list of replicas to use for domain
@@ -63,7 +63,7 @@ bool ReplicaSorter::readConfig() {
const char* chost=getenv("HOSTNAME");
if (chost) m_hostname=chost;
// check if the returned host has a .
- if (m_hostname.find(".")==std::string::npos) {
+ if (m_hostname.find('.')==std::string::npos) {
m_hostname="unknown";
system("hostname --fqdn > hostnamelookup.tmp");
std::ifstream infile;
@@ -107,7 +107,7 @@ bool ReplicaSorter::readConfig() {
std::vector<std::string> domains;
std::vector<std::string> servers;
while (iofs1<buf.size()) {
- std::string::size_type iofs2=buf.find(" ",iofs1);
+ std::string::size_type iofs2=buf.find(' ',iofs1);
// allow for trailing linefeed
if (iofs2==std::string::npos) iofs2=buf.size()-1;
std::string token=buf.substr(iofs1,iofs2-iofs1);
@@ -176,9 +176,9 @@ FILE* ReplicaSorter::findFile(const std::string& filename,
len=pathvar.size();
std::string name;
while (!fptr && iofs1<len) {
- iofs2=pathvar.find(":",iofs1);
+ iofs2=pathvar.find(':',iofs1);
if (iofs2==std::string::npos) iofs2=len;
- name=pathvar.substr(iofs1,iofs2-iofs1)+"/"+filename;
+ name=pathvar.substr(iofs1,iofs2-iofs1)+'/'+filename;
fptr=fopen(name.c_str(),"r");
iofs1=iofs2+1;
}
diff --git a/MuonSpectrometer/MuonCablings/MuonCablingTools/src/dbline.cxx b/MuonSpectrometer/MuonCablings/MuonCablingTools/src/dbline.cxx
index 8fda7f180925..fc4e0cf2c493 100755
--- a/MuonSpectrometer/MuonCablings/MuonCablingTools/src/dbline.cxx
+++ b/MuonSpectrometer/MuonCablings/MuonCablingTools/src/dbline.cxx
@@ -49,7 +49,7 @@ void DBline::BadExtraction(void) {
///////////////////////////////////////////////////////////////////////////////
void DBline::erase_comment() {
- const size_t pos = m_data.find("#");
+ const size_t pos = m_data.find('#');
if (pos != std::string::npos) m_data.erase(pos);
}
diff --git a/MuonSpectrometer/MuonGeoModelTest/src/MuonGMCheck.cxx b/MuonSpectrometer/MuonGeoModelTest/src/MuonGMCheck.cxx
index e93e55d59885..92acbfc1b782 100644
--- a/MuonSpectrometer/MuonGeoModelTest/src/MuonGMCheck.cxx
+++ b/MuonSpectrometer/MuonGeoModelTest/src/MuonGMCheck.cxx
@@ -2227,9 +2227,9 @@ void MuonGMCheck::buildRpcRegionSelectorMap()
std::string::size_type loc_o;
std::string::size_type loc_c;
std::string leftover="";
- if ((loc_o = extid.find("[")) != std::string::npos)
+ if ((loc_o = extid.find('[')) != std::string::npos)
{
- if ((loc_c = extid.find("]", loc_o+1)) != std::string::npos)
+ if ((loc_c = extid.find(']', loc_o+1)) != std::string::npos)
{
mystream rpcid_stream(extid.substr(loc_o+1, loc_c-loc_o-1));
rpcid_stream >>aux0>>dot[0]>>aux1>>dot[1]>>aux2>>dot[2]>>aux3>>dot[3]>>aux4>>dot[4]>>aux5>>leftover;
@@ -2347,9 +2347,9 @@ void MuonGMCheck::buildMdtRegionSelectorMap()
std::string::size_type loc_o;
std::string::size_type loc_c;
std::string leftover="";
- if ((loc_o = extid.find("[")) != std::string::npos)
+ if ((loc_o = extid.find('[')) != std::string::npos)
{
- if ((loc_c = extid.find("]", loc_o+1)) != std::string::npos)
+ if ((loc_c = extid.find(']', loc_o+1)) != std::string::npos)
{
mystream mdtid_stream(extid.substr(loc_o+1, loc_c-loc_o-1));
mdtid_stream >>aux0>>dot[0]>>aux1>>dot[1]>>aux2>>dot[2]>>aux3>>dot[3]>>aux4>>dot[4]>>aux5>>leftover;
@@ -2644,9 +2644,9 @@ void MuonGMCheck::buildTgcRegionSelectorMap()
std::string::size_type loc_o;
std::string::size_type loc_c;
std::string leftover="";
- if ((loc_o = extid.find("[")) != std::string::npos)
+ if ((loc_o = extid.find('[')) != std::string::npos)
{
- if ((loc_c = extid.find("]", loc_o+1)) != std::string::npos)
+ if ((loc_c = extid.find(']', loc_o+1)) != std::string::npos)
{
std::istringstream tgcid_stream(extid.substr(loc_o+1, loc_c-loc_o-1));
tgcid_stream >>aux0>>dot[0]>>aux1>>dot[1]>>aux2>>dot[2]>>aux3>>dot[3]>>aux4>>dot[4]>>aux5>>leftover;
@@ -2741,9 +2741,9 @@ void MuonGMCheck::buildCscRegionSelectorMap()
std::string::size_type loc_o;
std::string::size_type loc_c;
std::string leftover="";
- if ((loc_o = extid.find("[")) != std::string::npos)
+ if ((loc_o = extid.find('[')) != std::string::npos)
{
- if ((loc_c = extid.find("]", loc_o+1)) != std::string::npos)
+ if ((loc_c = extid.find(']', loc_o+1)) != std::string::npos)
{
mystream cscid_stream(extid.substr(loc_o+1, loc_c-loc_o-1));
cscid_stream >>aux0>>dot[0]>>aux1>>dot[1]>>aux2>>dot[2]>>aux3>>dot[3]>>aux4>>dot[4]>>aux5>>leftover;
@@ -3189,9 +3189,9 @@ void MuonGMCheck::testMdtDetectorElementHash()
std::string::size_type loc_o;
std::string::size_type loc_c;
std::string leftover="";
- if ((loc_o = extid.find("[")) != std::string::npos)
+ if ((loc_o = extid.find('[')) != std::string::npos)
{
- if ((loc_c = extid.find("]", loc_o+1)) != std::string::npos)
+ if ((loc_c = extid.find(']', loc_o+1)) != std::string::npos)
{
mystream mdtid_stream(extid.substr(loc_o+1, loc_c-loc_o-1));
mdtid_stream >>aux0>>dot[0]>>aux1>>dot[1]>>aux2>>dot[2]>>aux3>>dot[3]>>aux4>>dot[4]
@@ -3281,9 +3281,9 @@ void MuonGMCheck::testRpcDetectorElementHash()
std::string::size_type loc_o;
std::string::size_type loc_c;
std::string leftover="";
- if ((loc_o = extid.find("[")) != std::string::npos)
+ if ((loc_o = extid.find('[')) != std::string::npos)
{
- if ((loc_c = extid.find("]", loc_o+1)) != std::string::npos)
+ if ((loc_c = extid.find(']', loc_o+1)) != std::string::npos)
{
mystream rpcid_stream(extid.substr(loc_o+1, loc_c-loc_o-1));
rpcid_stream >>aux0>>dot[0]>>aux1>>dot[1]>>aux2>>dot[2]>>aux3>>dot[3]>>aux4>>dot[4]
@@ -3370,9 +3370,9 @@ void MuonGMCheck::testTgcDetectorElementHash()
std::string::size_type loc_o;
std::string::size_type loc_c;
std::string leftover="";
- if ((loc_o = extid.find("[")) != std::string::npos)
+ if ((loc_o = extid.find('[')) != std::string::npos)
{
- if ((loc_c = extid.find("]", loc_o+1)) != std::string::npos)
+ if ((loc_c = extid.find(']', loc_o+1)) != std::string::npos)
{
mystream tgcid_stream(extid.substr(loc_o+1, loc_c-loc_o-1));
tgcid_stream >>aux0>>dot[0]>>aux1>>dot[1]>>aux2>>dot[2]>>aux3>>dot[3]>>aux4>>dot[4]
@@ -3456,9 +3456,9 @@ void MuonGMCheck::testCscDetectorElementHash()
std::string::size_type loc_o;
std::string::size_type loc_c;
std::string leftover="";
- if ((loc_o = extid.find("[")) != std::string::npos)
+ if ((loc_o = extid.find('[')) != std::string::npos)
{
- if ((loc_c = extid.find("]", loc_o+1)) != std::string::npos)
+ if ((loc_c = extid.find(']', loc_o+1)) != std::string::npos)
{
mystream cscid_stream(extid.substr(loc_o+1, loc_c-loc_o-1));
cscid_stream >>aux0>>dot[0]>>aux1>>dot[1]>>aux2>>dot[2]>>aux3>>dot[3]>>aux4>>dot[4]
diff --git a/MuonSpectrometer/MuonGeoModelTest/test/CheckDifferences.cxx b/MuonSpectrometer/MuonGeoModelTest/test/CheckDifferences.cxx
index 5d867fd77717..0b9a9c32b3c0 100644
--- a/MuonSpectrometer/MuonGeoModelTest/test/CheckDifferences.cxx
+++ b/MuonSpectrometer/MuonGeoModelTest/test/CheckDifferences.cxx
@@ -278,7 +278,7 @@ int MaterialMap::readMapRecord() {
std::string::size_type locapri;
std::string::size_type locchiudi;
- if ((locapri = s.find("(")) != std::string::npos)
+ if ((locapri = s.find('(')) != std::string::npos)
{
if ((locchiudi = s.find(")", locapri+1)) != std::string::npos)
{
@@ -290,7 +290,7 @@ int MaterialMap::readMapRecord() {
}
}
- if ((locapri = s.find("(",locchiudi)) != std::string::npos)
+ if ((locapri = s.find('(',locchiudi)) != std::string::npos)
{
if ((locchiudi = s.find(")", locapri+1)) != std::string::npos)
{
@@ -322,7 +322,7 @@ int MaterialMap::readMapRecord() {
std::string::size_type locapri;
std::string::size_type locchiudi;
- if ((locapri = s.find("(")) != std::string::npos)
+ if ((locapri = s.find('(')) != std::string::npos)
{
if ((locchiudi = s.find(")", locapri+1)) != std::string::npos)
{
@@ -353,7 +353,7 @@ int MaterialMap::readMapRecord() {
std::string::size_type locapri;
std::string::size_type locchiudi;
- if ((locapri = s.find("(")) != std::string::npos)
+ if ((locapri = s.find('(')) != std::string::npos)
{
if ((locchiudi = s.find(")", locapri+1)) != std::string::npos)
{
@@ -408,7 +408,7 @@ int MaterialMap::readMapRecord() {
{
std::string::size_type locapri;
std::string::size_type locchiudi;
- if ((locapri = s.find("(")) != std::string::npos)
+ if ((locapri = s.find('(')) != std::string::npos)
{
if ((locchiudi = s.find(")", locapri+1)) != std::string::npos)
{
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/ClusterPatFinder.cxx b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/ClusterPatFinder.cxx
index a8a83948b290..a8393cf1a7e9 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/ClusterPatFinder.cxx
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/ClusterPatFinder.cxx
@@ -480,21 +480,21 @@ double TrigL2MuonSA::ClusterPatFinder::calibR(std::string stationName, double R,
double DeltaPhi, temp_phi;
double calibPhi = std::acos(std::cos(Phi)); // 0 < Phi < 2PI
- if(std::string::npos != stationName.rfind("L")){//For Large , SP
+ if(std::string::npos != stationName.rfind('L')){//For Large , SP
DeltaPhi= 999; temp_phi=9999;
for(int inum=0;inum < 8;inum++){
temp_phi = std::abs((inum * M_PI/4.0 )- calibPhi);
DeltaPhi = std::min(temp_phi, DeltaPhi);
}
- }else if(std::string::npos != stationName.rfind("S") ||
- std::string::npos != stationName.rfind("F") ||
- std::string::npos != stationName.rfind("G") ){
+ }else if(std::string::npos != stationName.rfind('S') ||
+ std::string::npos != stationName.rfind('F') ||
+ std::string::npos != stationName.rfind('G') ){
DeltaPhi= 999; temp_phi=9999;
for(int inum=0;inum < 8;inum++){
temp_phi = std::abs(inum *(M_PI/4.0 )+(M_PI/8.0) - calibPhi);
DeltaPhi = std::min(temp_phi, DeltaPhi);
- }//for end
+ }//for end
}else return R;
return R *std::cos(DeltaPhi);
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/RpcPatFinder.cxx b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/RpcPatFinder.cxx
index ea329bc92828..3cd74b696bb9 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/RpcPatFinder.cxx
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/RpcPatFinder.cxx
@@ -383,21 +383,21 @@ double TrigL2MuonSA::RpcPatFinder::calibR(std::string stationName, double R, dou
double DeltaPhi, temp_phi;
double calibPhi = std::acos(std::cos(Phi)); // 0 < Phi < 2PI
- if(std::string::npos != stationName.rfind("L")){//For Large , SP
+ if(std::string::npos != stationName.rfind('L')){//For Large , SP
DeltaPhi= 999; temp_phi=9999;
for(int inum=0;inum < 8;inum++){
temp_phi = std::abs((inum * M_PI/4.0 )- calibPhi);
if(temp_phi < DeltaPhi) DeltaPhi = temp_phi;
}
- }else if(std::string::npos != stationName.rfind("S") ||
- std::string::npos != stationName.rfind("F") ||
- std::string::npos != stationName.rfind("G") ){
+ }else if(std::string::npos != stationName.rfind('S') ||
+ std::string::npos != stationName.rfind('F') ||
+ std::string::npos != stationName.rfind('G') ){
DeltaPhi= 999; temp_phi=9999;
for(int inum=0;inum < 8;inum++){
temp_phi = std::abs(inum *(M_PI/4.0 )+(M_PI/8.0) - calibPhi);
if(temp_phi < DeltaPhi) DeltaPhi = temp_phi;
- }//for end
+ }//for end
}else return R;
double calibR = R *std::cos(DeltaPhi);
diff --git a/Trigger/TrigConfiguration/TrigConfL1Data/Root/TriggerItem.cxx b/Trigger/TrigConfiguration/TrigConfL1Data/Root/TriggerItem.cxx
index 9c65e4651436..ed7c3db096fa 100644
--- a/Trigger/TrigConfiguration/TrigConfL1Data/Root/TriggerItem.cxx
+++ b/Trigger/TrigConfiguration/TrigConfL1Data/Root/TriggerItem.cxx
@@ -105,7 +105,7 @@ TriggerItem::writeXML(std::ostream & xmlfile, int indentLevel, int indentWidth)
bool end=false;
string::size_type index=0;
while(!end){
- std::string::size_type pos=final_def.find("&",index);
+ std::string::size_type pos=final_def.find('&',index);
if(pos!= std::string::npos){
end=false;
index = pos+1;
diff --git a/Trigger/TrigEvent/TrigBSExtraction/src/TrigBStoxAODTool.cxx b/Trigger/TrigEvent/TrigBSExtraction/src/TrigBStoxAODTool.cxx
index 25374af76dfd..03491b763b6e 100755
--- a/Trigger/TrigEvent/TrigBSExtraction/src/TrigBStoxAODTool.cxx
+++ b/Trigger/TrigEvent/TrigBSExtraction/src/TrigBStoxAODTool.cxx
@@ -715,16 +715,16 @@ StatusCode TrigBStoxAODTool::classLabel2CLIDLabel(const std::vector<std::string>
std::string label_new;
std::string type;
- if ( it->find("#") != std::string::npos ) {
- type = it->substr(0, it->find("#") );
- label = it->substr(it->find("#")+1 );
+ if ( it->find('#') != std::string::npos ) {
+ type = it->substr(0, it->find('#') );
+ label = it->substr(it->find('#')+1 );
} else {
type = *it;
label = "";
}
- if ( itNew->find("#") != std::string::npos ) {
- label_new = itNew->substr(itNew->find("#")+1 );
+ if ( itNew->find('#') != std::string::npos ) {
+ label_new = itNew->substr(itNew->find('#')+1 );
} else {
label_new = "";
}
diff --git a/Trigger/TrigEvent/TrigNavigation/src/Navigation.cxx b/Trigger/TrigEvent/TrigNavigation/src/Navigation.cxx
index a55a610d1284..dbae154ca18b 100644
--- a/Trigger/TrigEvent/TrigNavigation/src/Navigation.cxx
+++ b/Trigger/TrigEvent/TrigNavigation/src/Navigation.cxx
@@ -120,9 +120,9 @@ Navigation::classKey2CLIDKey(const std::vector<std::string>& property,
std::string key;
std::string type;
- if ( cname.find("#") != std::string::npos ) {
- type = cname.substr(0, cname.find("#") );
- key = cname.substr(cname.find("#")+1 );
+ if ( cname.find('#') != std::string::npos ) {
+ type = cname.substr(0, cname.find('#') );
+ key = cname.substr(cname.find('#')+1 );
} else {
type = cname;
key = "";
diff --git a/Trigger/TrigMonitoring/TrigHLTMonitoring/src/IHLTMonTool.cxx b/Trigger/TrigMonitoring/TrigHLTMonitoring/src/IHLTMonTool.cxx
index be6ee59e0e2e..ebb6f0553d77 100755
--- a/Trigger/TrigMonitoring/TrigHLTMonitoring/src/IHLTMonTool.cxx
+++ b/Trigger/TrigMonitoring/TrigHLTMonitoring/src/IHLTMonTool.cxx
@@ -198,7 +198,7 @@ void IHLTMonTool::addHistogram(TH1 *h, const std::string &monGroup) {
std::string theMonGroup;
std::map<std::string, MonGroup *>::iterator groupItr;
- if (monGroup == "") {
+ if (monGroup .empty()) {
theMonGroup = m_currentMonGroup;
} else {
theMonGroup = monGroup;
@@ -234,7 +234,7 @@ void IHLTMonTool::addHistogram(TH2 *h, const std::string &monGroup) {
std::string theMonGroup;
std::map<std::string, MonGroup *>::iterator groupItr;
- if (monGroup == "") {
+ if (monGroup .empty()) {
theMonGroup = m_currentMonGroup;
} else {
theMonGroup = monGroup;
@@ -270,7 +270,7 @@ void IHLTMonTool::addTree(TTree *t, const std::string &monGroup) {
std::string theMonGroup;
std::map<std::string, MonGroup *>::iterator groupItr;
- if (monGroup == "") {
+ if (monGroup .empty()) {
theMonGroup = m_currentMonGroup;
} else {
theMonGroup = monGroup;
@@ -307,7 +307,7 @@ void IHLTMonTool::addGraph(TGraph *g, const std::string &monGroup) {
std::string theMonGroup;
std::map<std::string, MonGroup *>::iterator groupItr;
- if (monGroup == "") {
+ if (monGroup .empty()) {
theMonGroup = m_currentMonGroup;
} else {
theMonGroup = monGroup;
@@ -345,7 +345,7 @@ void IHLTMonTool::addProfile(TProfile *h, const std::string &monGroup) {
std::string theMonGroup;
std::map<std::string, MonGroup *>::iterator groupItr;
- if (monGroup == "") {
+ if (monGroup .empty()) {
theMonGroup = m_currentMonGroup;
} else {
theMonGroup = monGroup;
@@ -382,7 +382,7 @@ void IHLTMonTool::removeHistogram(const std::string &histName, const std::string
std::string theMonGroup;
std::map<std::string, MonGroup *>::iterator groupItr;
- if (monGroup == "") {
+ if (monGroup .empty()) {
theMonGroup = m_currentMonGroup;
} else {
theMonGroup = monGroup;
@@ -413,7 +413,7 @@ void IHLTMonTool::removeHistogram2(const std::string &histName, const std::strin
std::string theMonGroup;
std::map<std::string, MonGroup *>::iterator groupItr;
- if (monGroup == "") {
+ if (monGroup .empty()) {
theMonGroup = m_currentMonGroup;
} else {
theMonGroup = monGroup;
@@ -444,7 +444,7 @@ void IHLTMonTool::removeProfile(const std::string &histName, const std::string &
std::string theMonGroup;
std::map<std::string, MonGroup *>::iterator groupItr;
- if (monGroup == "") {
+ if (monGroup .empty()) {
theMonGroup = m_currentMonGroup;
} else {
theMonGroup = monGroup;
@@ -477,7 +477,7 @@ TH1 *IHLTMonTool::hist(const std::string &histName, const std::string &monGroup)
std::string theMonGroup;
std::map<std::string, MonGroup *>::iterator groupItr;
- if (monGroup == "") {
+ if (monGroup .empty()) {
theMonGroup = m_currentMonGroup;
} else {
theMonGroup = monGroup;
@@ -503,7 +503,7 @@ TH2 *IHLTMonTool::hist2(const std::string &histName, const std::string &monGroup
std::string theMonGroup;
std::map<std::string, MonGroup *>::iterator groupItr;
- if (monGroup == "") {
+ if (monGroup .empty()) {
theMonGroup = m_currentMonGroup;
} else {
theMonGroup = monGroup;
@@ -528,7 +528,7 @@ TH2 *IHLTMonTool::hist2(const std::string &histName, const std::string &monGroup
TTree *IHLTMonTool::tree(const std::string &treeName, const std::string &monGroup) {
std::string theMonGroup;
std::map<std::string, MonGroup *>::iterator groupItr;
- if (monGroup == "") {
+ if (monGroup .empty()) {
theMonGroup = m_currentMonGroup;
} else {
theMonGroup = monGroup;
@@ -552,7 +552,7 @@ TTree *IHLTMonTool::tree(const std::string &treeName, const std::string &monGrou
TGraph *IHLTMonTool::graph(const std::string &graphName, const std::string &monGroup) {
std::string theMonGroup;
std::map<std::string, MonGroup *>::iterator groupItr;
- if (monGroup == "") {
+ if (monGroup .empty()) {
theMonGroup = m_currentMonGroup;
} else {
theMonGroup = monGroup;
@@ -577,7 +577,7 @@ TProfile *IHLTMonTool::profile(const std::string &histName, const std::string &m
std::string theMonGroup;
std::map<std::string, MonGroup *>::iterator groupItr;
- if (monGroup == "") {
+ if (monGroup .empty()) {
theMonGroup = m_currentMonGroup;
} else {
theMonGroup = monGroup;
@@ -608,7 +608,7 @@ TNtuple *IHLTMonTool::ntuple(const std::string &treeName, const std::string &mon
if (!mntuple) {
std::string theMonGroup;
std::map<std::string, MonGroup *>::iterator groupItr;
- if (monGroup == "") {
+ if (monGroup .empty()) {
theMonGroup = m_currentMonGroup;
} else {
theMonGroup = monGroup;
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx
index 27cae1886bf5..d79692d27d26 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx
@@ -666,7 +666,7 @@ StatusCode HLTTauMonTool::fillHistogramsForItem(const std::string & trigItem, co
std::string trigItemShort=trigItem;
if(trigItem.find("tau25")!=string::npos && trigItem.find("L1TAU")!=string::npos){
- size_t posit=trigItem.rfind("_");
+ size_t posit=trigItem.rfind('_');
ATH_MSG_DEBUG("Size is: "<< posit);
if(posit<31)trigItemShort=trigItem.substr(0,posit);
}
@@ -802,7 +802,7 @@ StatusCode HLTTauMonTool::fillHistogramsForItem(const std::string & trigItem, co
std::string trigItemShort=trigItem;
if(trigItem.find("tau25")!=string::npos && trigItem.find("L1TAU")!=string::npos){
- size_t posit=trigItem.rfind("_");
+ size_t posit=trigItem.rfind('_');
if(posit<31)trigItemShort=trigItem.substr(0,posit);
}
@@ -979,7 +979,7 @@ StatusCode HLTTauMonTool::fillHistogramsForItem(const std::string & trigItem, co
std::string trigItemShort=trigItem;
if(trigItem.find("tau25")!=string::npos && trigItem.find("L1TAU")!=string::npos){
- size_t posit=trigItem.rfind("_");
+ size_t posit=trigItem.rfind('_');
if(posit<31)trigItemShort=trigItem.substr(0,posit);
}
@@ -1335,7 +1335,7 @@ StatusCode HLTTauMonTool::fillEFTau(const xAOD::TauJet *aEFTau, const std::strin
std::string trigItemShort=trigItem;
if(trigItem.find("tau25")!=string::npos && trigItem.find("L1TAU")!=string::npos){
- size_t posit=trigItem.rfind("_");
+ size_t posit=trigItem.rfind('_');
if(posit<31)trigItemShort=trigItem.substr(0,posit);
}
@@ -1983,7 +1983,7 @@ StatusCode HLTTauMonTool::fillEFTauVsTruth(const xAOD::TauJet *aEFTau, const std
std::string trigItemShort=trigItem;
if(trigItem.find("tau25")!=string::npos && trigItem.find("L1TAU")!=string::npos){
- size_t posit=trigItem.rfind("_");
+ size_t posit=trigItem.rfind('_');
if(posit<31)trigItemShort=trigItem.substr(0,posit);
}
@@ -2099,7 +2099,7 @@ StatusCode HLTTauMonTool::fillEFTauVsOffline(const xAOD::TauJet *aEFTau, const s
std::string trigItemShort=trigItem;
if(trigItem.find("tau25")!=string::npos && trigItem.find("L1TAU")!=string::npos){
- size_t posit=trigItem.rfind("_");
+ size_t posit=trigItem.rfind('_');
if(posit<31)trigItemShort=trigItem.substr(0,posit);
}
@@ -2926,7 +2926,7 @@ StatusCode HLTTauMonTool::TauEfficiency(const std::string & trigItem, const std:
std::string trigItemShort=trigItem;
if(trigItem.find("tau25")!=string::npos && trigItem.find("L1TAU")!=string::npos){
- size_t posit=trigItem.rfind("_");
+ size_t posit=trigItem.rfind('_');
if(posit<31)trigItemShort=trigItem.substr(0,posit);
}
@@ -3539,7 +3539,7 @@ StatusCode HLTTauMonTool::TruthTauEfficiency(const std::string & trigItem, const
std::string trigItemShort=trigItem;
if(trigItem.find("tau25")!=string::npos && trigItem.find("L1TAU")!=string::npos){
- size_t posit=trigItem.rfind("_");
+ size_t posit=trigItem.rfind('_');
if(posit<31)trigItemShort=trigItem.substr(0,posit);
}
diff --git a/Trigger/TrigT1/TrigT1TGC/src/LVL1TGCTrigger.cxx b/Trigger/TrigT1/TrigT1TGC/src/LVL1TGCTrigger.cxx
index f600e824aa54..47573a8639d2 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/LVL1TGCTrigger.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/LVL1TGCTrigger.cxx
@@ -1126,7 +1126,7 @@ void LVL1TGCTrigger::recordRdoSL(TGCSector* sector)
std::string line=str;
while(1) {
if (line.empty()) break;
- int i = line.find(" ");
+ int i = line.find(' ');
if (i==(int)std::string::npos && !line.empty()) {
v.push_back(atoi(line.c_str()));
break;
diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCSectorLogic.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCSectorLogic.cxx
index 13cf02ae2755..1e59c66d6aa4 100644
--- a/Trigger/TrigT1/TrigT1TGC/src/TGCSectorLogic.cxx
+++ b/Trigger/TrigT1/TrigT1TGC/src/TGCSectorLogic.cxx
@@ -57,8 +57,8 @@ TGCSectorLogic::TGCSectorLogic(TGCArguments* tgcargs, const TGCDatabaseManager*
m_sectorId += 3*m_octantId;
}
- m_nswSide = (tgcArgs()->NSWSideInfo().find("A")!=std::string::npos && m_sideId==0)
- || (tgcArgs()->NSWSideInfo().find("C")!=std::string::npos && m_sideId==1);
+ m_nswSide = (tgcArgs()->NSWSideInfo().find('A')!=std::string::npos && m_sideId==0)
+ || (tgcArgs()->NSWSideInfo().find('C')!=std::string::npos && m_sideId==1);
m_SSCController.setRegion(regionIn);
diff --git a/graphics/JiveXML/src/XMLFormatTool.cxx b/graphics/JiveXML/src/XMLFormatTool.cxx
index a874b3b3a7bb..5d283f95643b 100755
--- a/graphics/JiveXML/src/XMLFormatTool.cxx
+++ b/graphics/JiveXML/src/XMLFormatTool.cxx
@@ -47,9 +47,7 @@ namespace JiveXML {
//Store this as release string
m_release = tag.second;
//Format properly
- while(m_release.find("/") != std::string::npos)
- m_release.replace(m_release.find("/"),1,"_");
-
+ std::replace(m_release.begin(), m_release.end(), '/', '_');
return StatusCode::SUCCESS;
}
--
GitLab
From b1863e30c5dece756a4734a6ad814faa81b7bded Mon Sep 17 00:00:00 2001
From: Matthew Thomas Anthony <matthew.thomas.anthony@cern.ch>
Date: Fri, 20 Aug 2021 18:18:54 +0000
Subject: [PATCH 205/272] Fix ctest in ATLASRECTS-6554
---
.../test/test_new_jo_raw_reco.sh | 2 +-
Reconstruction/eflowRec/python/PFConfigFlags.py | 2 ++
Reconstruction/eflowRec/python/PFRun3Config.py | 17 +++++++++++------
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/Reconstruction/RecJobTransforms/test/test_new_jo_raw_reco.sh b/Reconstruction/RecJobTransforms/test/test_new_jo_raw_reco.sh
index d90e9b79e220..7abe19f09363 100755
--- a/Reconstruction/RecJobTransforms/test/test_new_jo_raw_reco.sh
+++ b/Reconstruction/RecJobTransforms/test/test_new_jo_raw_reco.sh
@@ -2,7 +2,7 @@
# run the test
-python -m RecJobTransforms.RecoSteering --RAW 2>&1 > reco.log
+python -m RecJobTransforms.RecoSteering "PF.useElPhotMuLinks=False" --RAW 2>&1 > reco.log
export testStatus=$?
if [[ $testStatus -ne 0 ]]
then
diff --git a/Reconstruction/eflowRec/python/PFConfigFlags.py b/Reconstruction/eflowRec/python/PFConfigFlags.py
index ecb2bcea1ab3..c5cfda288513 100644
--- a/Reconstruction/eflowRec/python/PFConfigFlags.py
+++ b/Reconstruction/eflowRec/python/PFConfigFlags.py
@@ -11,5 +11,7 @@ def createPFConfigFlags():
pfConfigFlags.addFlag("PF.useCalibHitTruthClusterMoments",False) #This defines whether we calculate the calibration hit moments - only possible on if running from special calibraiton hit ESD samples.
pfConfigFlags.addFlag("PF.recoverIsolatedTracks",False) #Defines whether we should apply the split shower recovery algorithm on isolated tracks
pfConfigFlags.addFlag("PF.useUpdated2015ChargedShowerSubtraction",True) #Toggle whether to use updated 2015 charged shower subtraction, which disables the shower subtraction in high calorimeter energy density regions
+ pfConfigFlags.addFlag("PF.useElPhotMuLinks",True)
+ pfConfigFlags.addFlag("PF.useOldPFO",False)
return pfConfigFlags
diff --git a/Reconstruction/eflowRec/python/PFRun3Config.py b/Reconstruction/eflowRec/python/PFRun3Config.py
index 5eb1cae42143..978300133987 100644
--- a/Reconstruction/eflowRec/python/PFRun3Config.py
+++ b/Reconstruction/eflowRec/python/PFRun3Config.py
@@ -132,17 +132,20 @@ def PFCfg(inputFlags,**kwargs):
result.merge(getOfflinePFAlgorithm(inputFlags))
- from eflowRec.PFCfg import getChargedPFOCreatorAlgorithm,getNeutralPFOCreatorAlgorithm
- result.addEventAlgo(getChargedPFOCreatorAlgorithm(inputFlags,""))
- result.addEventAlgo(getNeutralPFOCreatorAlgorithm(inputFlags,""))
+ # old PFO algorithm, keep gated behind a joboption but expect this is deprecated.
+ if(inputFlags.PF.useOldPFO):
+ from eflowRec.PFCfg import getChargedPFOCreatorAlgorithm,getNeutralPFOCreatorAlgorithm
+ result.addEventAlgo(getChargedPFOCreatorAlgorithm(inputFlags,""))
+ result.addEventAlgo(getNeutralPFOCreatorAlgorithm(inputFlags,""))
from eflowRec.PFCfg import getChargedFlowElementCreatorAlgorithm,getNeutralFlowElementCreatorAlgorithm
result.addEventAlgo(getChargedFlowElementCreatorAlgorithm(inputFlags,""))
result.addEventAlgo(getNeutralFlowElementCreatorAlgorithm(inputFlags,""))
- from eflowRec.PFCfg import getMuonFlowElementAssocAlgorithm,getEGamFlowElementAssocAlgorithm
- result.addEventAlgo(getMuonFlowElementAssocAlgorithm(inputFlags))
- result.addEventAlgo(getEGamFlowElementAssocAlgorithm(inputFlags))
+ if(inputFlags.PF.useElPhotMuLinks):
+ from eflowRec.PFCfg import getMuonFlowElementAssocAlgorithm,getEGamFlowElementAssocAlgorithm
+ result.addEventAlgo(getMuonFlowElementAssocAlgorithm(inputFlags))
+ result.addEventAlgo(getEGamFlowElementAssocAlgorithm(inputFlags))
return result
@@ -155,6 +158,8 @@ if __name__=="__main__":
cfgFlags.Input.isMC=True
cfgFlags.Input.Files= ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecExRecoTest/mc20e_13TeV/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.ESD.e4993_s3227_r12689/myESD.pool.root"]
+ cfgFlags.Output.AODFileName="output_AOD.root"
+ cfgFlags.Output.doWriteAOD=True
cfgFlags.lock()
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
--
GitLab
From 0542139a52ffa858eb51c5871172e03f2bcf3937 Mon Sep 17 00:00:00 2001
From: Christos Anastopoulos <christos.anastopoulos@cern.ch>
Date: Fri, 20 Aug 2021 18:29:10 +0000
Subject: [PATCH 206/272] ATLASRECTS-6562. Remove the setLayerType , not thread
safe const overload that was hiding a const_cast.
---
.../MuonInertMaterialBuilder.h | 6 +-
.../MuonInertMaterialBuilderCond.h | 4 +-
.../MuonTrackingGeometry/MuonStationBuilder.h | 6 +-
.../MuonStationBuilderCond.h | 4 +-
.../MuonStationTypeBuilder.h | 8 +-
.../MuonTrackingGeometryBuilder.h | 10 +-
.../MuonTrackingGeometryBuilderCond.h | 10 +-
.../src/MuonInertMaterialBuilder.cxx | 89 ++--
.../src/MuonInertMaterialBuilderCond.cxx | 89 ++--
.../src/MuonStationBuilder.cxx | 92 ++--
.../src/MuonStationBuilderCond.cxx | 97 ++--
.../src/MuonStationTypeBuilder.cxx | 199 ++++---
.../src/MuonTrackingGeometryBuilder.cxx | 497 +++++++++---------
.../src/MuonTrackingGeometryBuilderCond.cxx | 487 ++++++++---------
.../TrkGeometry/TrkGeometry/Layer.h | 3 -
.../TrkGeometry/TrkGeometry/Layer.icc | 3 -
16 files changed, 797 insertions(+), 807 deletions(-)
diff --git a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonInertMaterialBuilder.h b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonInertMaterialBuilder.h
index 9ca7803c099c..7a2bcb8d56a5 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonInertMaterialBuilder.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonInertMaterialBuilder.h
@@ -79,7 +79,7 @@ namespace Muon {
const std::vector<std::pair<const Trk::DetachedTrackingVolume*, std::vector<Amg::Transform3D> > >* buildDetachedTrackingVolumeTypes(
bool blend);
/** Method extracting material objects from GeoModel tree */
- void getObjsForTranslation(const GeoVPhysVol* pv, Amg::Transform3D,
+ void getObjsForTranslation(const GeoVPhysVol* pv, const Amg::Transform3D&,
std::vector<std::pair<const GeoLogVol*, std::vector<Amg::Transform3D> > >& vols) const;
/** Dump from GeoModel tree */
void printInfo(const GeoVPhysVol* pv) const;
@@ -87,7 +87,7 @@ namespace Muon {
/** Simplification of GeoModel object + envelope */
const Trk::TrackingVolume* simplifyShape(const Trk::TrackingVolume* tr, bool blend);
/** Envelope creation & material fraction calculation */
- const Trk::Volume* createEnvelope(const Amg::Transform3D transf,
+ const Trk::Volume* createEnvelope(const Amg::Transform3D& transf,
std::vector<std::pair<const Trk::Volume*, std::pair<float, float> > >) const;
/** Simplification of objects, material fraction calculation */
std::vector<std::pair<const Trk::Volume*, std::pair<float, float> > > splitComposedVolume(const Trk::Volume*, bool) const;
@@ -96,7 +96,7 @@ namespace Muon {
/** Volume calculation */
double calculateVolume(const Trk::Volume* envelope) const;
- const MuonGM::MuonDetectorManager* m_muonMgr; //!< the MuonDetectorManager
+ const MuonGM::MuonDetectorManager* m_muonMgr = nullptr; //!< the MuonDetectorManager
Gaudi::Property<std::string> m_muonMgrLocation{this, "MuonDetManagerLocation", "MuonMgr"}; //!< the location of the Muon Manager
Gaudi::Property<bool> m_simplify{this, "SimplifyGeometry", false}; // switch geometry simplification on/off
Gaudi::Property<bool> m_simplifyToLayers{this, "SimplifyGeometryToLayers",
diff --git a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonInertMaterialBuilderCond.h b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonInertMaterialBuilderCond.h
index 056409919b60..8f816abe0e38 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonInertMaterialBuilderCond.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonInertMaterialBuilderCond.h
@@ -84,7 +84,7 @@ namespace Muon {
std::unique_ptr<std::vector<std::vector<std::pair<std::unique_ptr<const Trk::Volume>, float> > > > >
buildDetachedTrackingVolumeTypes(const EventContext& ctx, bool blend) const;
/** Method extracting material objects from GeoModel tree */
- void getObjsForTranslation(const GeoVPhysVol* pv, Amg::Transform3D,
+ void getObjsForTranslation(const GeoVPhysVol* pv, const Amg::Transform3D&,
std::vector<std::pair<const GeoLogVol*, std::vector<Amg::Transform3D> > >& vols) const;
/** Dump from GeoModel tree */
void printInfo(const GeoVPhysVol* pv) const;
@@ -94,7 +94,7 @@ namespace Muon {
const Trk::TrackingVolume* tr, bool blend,
std::vector<std::vector<std::pair<std::unique_ptr<const Trk::Volume>, float> > >* constituentsVector) const;
/** Envelope creation & material fraction calculation */
- const Trk::Volume* createEnvelope(const Amg::Transform3D transf,
+ const Trk::Volume* createEnvelope(const Amg::Transform3D& transf,
std::vector<std::pair<const Trk::Volume*, std::pair<float, float> > >) const;
/** Simplification of objects, material fraction calculation */
std::vector<std::pair<const Trk::Volume*, std::pair<float, float> > > splitComposedVolume(const Trk::Volume*, bool) const;
diff --git a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonStationBuilder.h b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonStationBuilder.h
index 7ef75635198f..404c4af11e86 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonStationBuilder.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonStationBuilder.h
@@ -56,13 +56,13 @@ namespace Muon {
void glueComponents(const Trk::DetachedTrackingVolume*) const;
void encloseLayers(const Trk::DetachedTrackingVolume*) const;
void identifyLayers(const Trk::DetachedTrackingVolume*, int, int) const;
- void identifyPrototype(const Trk::TrackingVolume*, int, int, Amg::Transform3D) const;
+ void identifyPrototype(const Trk::TrackingVolume*, int, int, const Amg::Transform3D&) const;
void getNSWStationsForTranslation(
- const GeoVPhysVol* pv, std::string name, Amg::Transform3D,
+ const GeoVPhysVol* pv, const std::string& name, const Amg::Transform3D&,
std::vector<std::pair<std::pair<const GeoLogVol*, Trk::MaterialProperties*>, std::vector<Amg::Transform3D> > >& vols,
std::vector<std::string>& volNames) const;
- const MuonGM::MuonDetectorManager* m_muonMgr;
+ const MuonGM::MuonDetectorManager* m_muonMgr = nullptr;
Gaudi::Property<std::string> m_muonMgrLocation{this, "MuonDetManagerLocation", "MuonMgr"}; //!< the location of the Muon Manager
ToolHandle<Muon::MuonStationTypeBuilder> m_muonStationTypeBuilder{
diff --git a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonStationBuilderCond.h b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonStationBuilderCond.h
index f936d334c299..3a6ab88231b7 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonStationBuilderCond.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonStationBuilderCond.h
@@ -58,9 +58,9 @@ namespace Muon {
void glueComponents(const Trk::DetachedTrackingVolume*) const;
void encloseLayers(const Trk::DetachedTrackingVolume*) const;
void identifyLayers(const Trk::DetachedTrackingVolume*, int, int, const MuonGM::MuonDetectorManager*) const;
- void identifyPrototype(const Trk::TrackingVolume*, int, int, Amg::Transform3D, const MuonGM::MuonDetectorManager*) const;
+ void identifyPrototype(const Trk::TrackingVolume*, int, int, const Amg::Transform3D&, const MuonGM::MuonDetectorManager*) const;
void getNSWStationsForTranslation(
- const GeoVPhysVol* pv, std::string name, Amg::Transform3D,
+ const GeoVPhysVol* pv, const std::string& name, const Amg::Transform3D&,
std::vector<std::pair<std::pair<const GeoLogVol*, Trk::MaterialProperties*>, std::vector<Amg::Transform3D>>>& vols,
std::vector<std::string>& volNames) const;
diff --git a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonStationTypeBuilder.h b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonStationTypeBuilder.h
index 922839646b5f..a8ff326bae07 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonStationTypeBuilder.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonStationTypeBuilder.h
@@ -84,7 +84,7 @@ namespace Muon {
const Trk::TrackingVolumeArray* processTrdStationComponents(const GeoVPhysVol* cv, Trk::TrapezoidVolumeBounds* envBounds,
Cache&) const;
- Trk::TrackingVolume* processCscStation(const GeoVPhysVol* cv, std::string name, Cache&) const;
+ Trk::TrackingVolume* processCscStation(const GeoVPhysVol* cv, const std::string& name, Cache&) const;
std::vector<const Trk::TrackingVolume*> processTgcStation(const GeoVPhysVol* cv, Cache&) const;
@@ -109,10 +109,10 @@ namespace Muon {
std::pair<const Trk::Layer*, const std::vector<const Trk::Layer*>*> createLayerRepresentation(
const Trk::TrackingVolume* trVol) const;
- const Trk::Layer* createLayer(const MuonGM::MuonDetectorManager* detMgr, const Trk::TrackingVolume* trVol, Trk::MaterialProperties*,
- Amg::Transform3D&) const;
+ Trk::Layer* createLayer(const MuonGM::MuonDetectorManager* detMgr, const Trk::TrackingVolume* trVol, Trk::MaterialProperties*,
+ Amg::Transform3D&) const;
- Identifier identifyNSW(const MuonGM::MuonDetectorManager* muonDetMgr, const std::string&, const Amg::Transform3D&) const;
+ static Identifier identifyNSW(const MuonGM::MuonDetectorManager* muonDetMgr, const std::string&, const Amg::Transform3D&) ;
void printChildren(const GeoVPhysVol*) const;
// used to be private ..
diff --git a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonTrackingGeometryBuilder.h b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonTrackingGeometryBuilder.h
index d3eef5620a4d..256fe5049464 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonTrackingGeometryBuilder.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonTrackingGeometryBuilder.h
@@ -97,16 +97,16 @@ namespace Muon {
};
/** Private method to find z/phi span of detached volumes */
- const Span* findVolumeSpan(const Trk::VolumeBounds* volBounds, Amg::Transform3D transf, double zTol, double phiTol,
+ const Span* findVolumeSpan(const Trk::VolumeBounds* volBounds, const Amg::Transform3D& transf, double zTol, double phiTol,
LocalVariablesContainer& aLVC) const;
const std::vector<std::vector<std::pair<const Trk::DetachedTrackingVolume*, const Span*> >*>* findVolumesSpan(
const std::vector<const Trk::DetachedTrackingVolume*>* objs, double zTol, double phiTol, LocalVariablesContainer& aLVC) const;
/** Private methods to define subvolumes and fill them with detached volumes */
- const Trk::TrackingVolume* processVolume(const Trk::Volume*, int, int, std::string, LocalVariablesContainer& aLVC) const;
- const Trk::TrackingVolume* processVolume(const Trk::Volume*, int, std::string, LocalVariablesContainer& aLVC) const;
- const Trk::TrackingVolume* processShield(const Trk::Volume*, int, std::string, LocalVariablesContainer& aLVC) const;
+ const Trk::TrackingVolume* processVolume(const Trk::Volume*, int, int, const std::string&, LocalVariablesContainer& aLVC) const;
+ const Trk::TrackingVolume* processVolume(const Trk::Volume*, int, const std::string&, LocalVariablesContainer& aLVC) const;
+ const Trk::TrackingVolume* processShield(const Trk::Volume*, int, const std::string&, LocalVariablesContainer& aLVC) const;
/** Private method to check volume properties */
- void checkVolume(const Trk::TrackingVolume*) const;
+ static void checkVolume(const Trk::TrackingVolume*) ;
/** Private method to find detached volumes */
std::vector<const Trk::DetachedTrackingVolume*>* getDetachedObjects(const Trk::Volume*,
std::vector<const Trk::DetachedTrackingVolume*>&,
diff --git a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonTrackingGeometryBuilderCond.h b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonTrackingGeometryBuilderCond.h
index ddfa193deb70..45d1fad05282 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonTrackingGeometryBuilderCond.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/MuonTrackingGeometry/MuonTrackingGeometryBuilderCond.h
@@ -102,20 +102,20 @@ namespace Muon {
};
/** Private method to find z/phi span of detached volumes */
- const Span* findVolumeSpan(const Trk::VolumeBounds* volBounds, Amg::Transform3D transf, double zTol, double phiTol,
+ const Span* findVolumeSpan(const Trk::VolumeBounds* volBounds, const Amg::Transform3D& transf, double zTol, double phiTol,
LocalVariablesContainer& aLVC) const;
const std::vector<std::vector<std::pair<const Trk::DetachedTrackingVolume*, const Span*> >*>* findVolumesSpan(
const std::vector<std::unique_ptr<const Trk::DetachedTrackingVolume> >* objs, double zTol, double phiTol,
LocalVariablesContainer& aLVC) const;
/** Private methods to define subvolumes and fill them with detached volumes */
- const Trk::TrackingVolume* processVolume(const Trk::Volume*, int, int, std::string, LocalVariablesContainer& aLVC,
+ const Trk::TrackingVolume* processVolume(const Trk::Volume*, int, int, const std::string&, LocalVariablesContainer& aLVC,
bool hasStations) const;
- const Trk::TrackingVolume* processVolume(const Trk::Volume*, int, std::string, LocalVariablesContainer& aLVC,
+ const Trk::TrackingVolume* processVolume(const Trk::Volume*, int, const std::string&, LocalVariablesContainer& aLVC,
bool hasStations) const;
- const Trk::TrackingVolume* processShield(const Trk::Volume*, int, std::string, LocalVariablesContainer& aLVC,
+ const Trk::TrackingVolume* processShield(const Trk::Volume*, int, const std::string&, LocalVariablesContainer& aLVC,
bool hasStations) const;
/** Private method to check volume properties */
- void checkVolume(const Trk::TrackingVolume*) const;
+ static void checkVolume(const Trk::TrackingVolume*) ;
/** Private method to find detached volumes */
std::vector<const Trk::DetachedTrackingVolume*>* getDetachedObjects(const Trk::Volume*,
std::vector<const Trk::DetachedTrackingVolume*>&,
diff --git a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonInertMaterialBuilder.cxx b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonInertMaterialBuilder.cxx
index bf03d5010a08..bb4ce9c84c0e 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonInertMaterialBuilder.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonInertMaterialBuilder.cxx
@@ -153,8 +153,8 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonInertMaterialBu
delete msTypes;
// merge
- const std::vector<const Trk::DetachedTrackingVolume*>* muonObjects = 0;
- if (!mInert.first.size())
+ const std::vector<const Trk::DetachedTrackingVolume*>* muonObjects = nullptr;
+ if (mInert.first.empty())
muonObjects = new std::vector<const Trk::DetachedTrackingVolume*>(mInert.second);
else {
for (unsigned int i = 0; i < mInert.second.size(); i++) mInert.first.push_back(mInert.second[i]);
@@ -196,27 +196,27 @@ Muon::MuonInertMaterialBuilder::buildDetachedTrackingVolumeTypes(bool blend) {
bool accepted = true;
if (vname.substr(0, 3) == "BAR" || vname.substr(0, 2) == "BT" || vname.substr(0, 6) == "EdgeBT" ||
vname.substr(0, 6) == "HeadBT")
- accepted = m_buildBT ? true : false;
+ accepted = m_buildBT;
else if (vname.substr(0, 3) == "ECT")
- accepted = m_buildECT ? true : false;
+ accepted = m_buildECT;
else if (vname.substr(0, 4) == "Feet" || (vname.size() > 7 && (vname.substr(3, 4) == "Feet" || vname.substr(4, 4) == "Feet")))
- accepted = m_buildFeets ? true : false;
+ accepted = m_buildFeets;
else if (vname.substr(0, 4) == "Rail")
- accepted = m_buildRails > 0 ? true : false;
+ accepted = m_buildRails > 0;
else if (vname.substr(0, 1) == "J")
- accepted = m_buildShields > 0 ? true : false;
+ accepted = m_buildShields > 0;
// NSW build inertmaterial for spacer frame, aluminium HUB, NJD disk and A plate
else if (vname.substr(0, 3) == "NSW" && vname.substr(1, 6) == "Spacer")
- accepted = m_buildNSWInert ? true : false;
+ accepted = m_buildNSWInert;
else if (vname.substr(0, 3) == "NSW" && vname.substr(1, 2) == "Al")
- accepted = m_buildNSWInert ? true : false;
+ accepted = m_buildNSWInert;
else if (vname.substr(0, 3) == "NJD")
- accepted = m_buildNSWInert ? true : false;
+ accepted = m_buildNSWInert;
else if (vname.substr(0, 1) == "A" && vname.substr(1, 5) == "Plate")
- accepted = m_buildNSWInert ? true : false;
+ accepted = m_buildNSWInert;
// strange NSW will be anyway build
else if (vname.substr(0, 1) != "J")
- accepted = m_buildSupports > 0 ? true : false;
+ accepted = m_buildSupports > 0;
// if ( vname=="EdgeBTVoussoir" && accepted && m_simplify ) accepted = false;
@@ -240,7 +240,7 @@ Muon::MuonInertMaterialBuilder::buildDetachedTrackingVolumeTypes(bool blend) {
if (!cv->getNChildVols()) {
std::vector<Amg::Transform3D> volTr;
volTr.push_back(vol.getTransform());
- vols.push_back(std::pair<const GeoLogVol*, std::vector<Amg::Transform3D> >(clv, volTr));
+ vols.emplace_back(clv, volTr);
simpleTree = true;
} else {
getObjsForTranslation(cv, Trk::s_idTransform, vols);
@@ -282,12 +282,11 @@ Muon::MuonInertMaterialBuilder::buildDetachedTrackingVolumeTypes(bool blend) {
if (trObject) {
Trk::Material mat = m_materialConverter->convert(vols[ish].first->getMaterial());
- const Trk::TrackingVolume* newType = new Trk::TrackingVolume(*trObject, mat, 0, 0, protoName);
+ const Trk::TrackingVolume* newType = new Trk::TrackingVolume(*trObject, mat, nullptr, nullptr, protoName);
const Trk::TrackingVolume* simType = simplifyShape(newType, blend);
const Trk::DetachedTrackingVolume* typeStat = new Trk::DetachedTrackingVolume(protoName, simType);
if (blend) typeStat->saveConstituents(&(m_constituents.back()));
- objs.push_back(
- std::pair<const Trk::DetachedTrackingVolume*, std::vector<Amg::Transform3D> >(typeStat, vols[ish].second));
+ objs.emplace_back(typeStat, vols[ish].second);
delete trObject;
} else {
@@ -306,26 +305,26 @@ Muon::MuonInertMaterialBuilder::buildDetachedTrackingVolumeTypes(bool blend) {
// used : z = 14; A=28 ; rho = 2.33 g/cm^3, X0 = 93.7 mmm, l0 = 465.2 mm (Silicium)
Trk::Material mat1(93.7 / scmat1, 465.2 / scmat1, scmat1 * 14, scmat1 * 28, 0.0023, 0.);
Trk::Material mat2(93.7 / scmat2, 465.2 / scmat2, scmat2 * 14, scmat2 * 28, 0.0023, 0.);
- const Trk::LayerArray* dummyLayers = 0;
- const Trk::TrackingVolumeArray* dummyVolumes = 0;
+ const Trk::LayerArray* dummyLayers = nullptr;
+ const Trk::TrackingVolumeArray* dummyVolumes = nullptr;
Trk::VolumeBounds* extraBounds1 = new Trk::CylinderVolumeBounds(850., 13000., 5.);
- const Trk::TrackingVolume* mextra1 = new Trk::TrackingVolume(0, extraBounds1, mat1, dummyLayers, dummyVolumes, "extraMat1");
+ const Trk::TrackingVolume* mextra1 = new Trk::TrackingVolume(nullptr, extraBounds1, mat1, dummyLayers, dummyVolumes, "extraMat1");
const Trk::TrackingVolume* simType1 = simplifyShape(mextra1, blend);
const Trk::DetachedTrackingVolume* eVol1 = new Trk::DetachedTrackingVolume("extraTGCmat1", simType1);
if (blend) eVol1->saveConstituents(&(m_constituents.back()));
Trk::VolumeBounds* extraBounds2 = new Trk::CylinderVolumeBounds(850., 13000., 5.);
- const Trk::TrackingVolume* mextra2 = new Trk::TrackingVolume(0, extraBounds2, mat2, dummyLayers, dummyVolumes, "extraMat2");
+ const Trk::TrackingVolume* mextra2 = new Trk::TrackingVolume(nullptr, extraBounds2, mat2, dummyLayers, dummyVolumes, "extraMat2");
const Trk::TrackingVolume* simType2 = simplifyShape(mextra2, blend);
const Trk::DetachedTrackingVolume* eVol2 = new Trk::DetachedTrackingVolume("extraTGCmat2", simType2);
if (blend) eVol2->saveConstituents(&(m_constituents.back()));
std::vector<Amg::Transform3D> pos1;
- pos1.push_back(Amg::Transform3D(Amg::Translation3D(0., 0., m_extraPos1)));
- pos1.push_back(Amg::Transform3D(Amg::Translation3D(0., 0., -m_extraPos1)));
+ pos1.emplace_back(Amg::Translation3D(0., 0., m_extraPos1));
+ pos1.emplace_back(Amg::Translation3D(0., 0., -m_extraPos1));
std::vector<Amg::Transform3D> pos2;
- pos2.push_back(Amg::Transform3D(Amg::Translation3D(0., 0., m_extraPos2)));
- pos2.push_back(Amg::Transform3D(Amg::Translation3D(0., 0., -m_extraPos2)));
- objs.push_back(std::pair<const Trk::DetachedTrackingVolume*, std::vector<Amg::Transform3D> >(eVol1, pos1));
- objs.push_back(std::pair<const Trk::DetachedTrackingVolume*, std::vector<Amg::Transform3D> >(eVol2, pos2));
+ pos2.emplace_back(Amg::Translation3D(0., 0., m_extraPos2));
+ pos2.emplace_back(Amg::Translation3D(0., 0., -m_extraPos2));
+ objs.emplace_back(eVol1, pos1);
+ objs.emplace_back(eVol2, pos2);
}
//
@@ -382,7 +381,7 @@ void Muon::MuonInertMaterialBuilder::printChildren(const GeoVPhysVol* pv) const
const Trk::TrackingVolume* Muon::MuonInertMaterialBuilder::simplifyShape(const Trk::TrackingVolume* trVol, bool blend) {
// envelope
- const Trk::Volume* envelope = 0;
+ const Trk::Volume* envelope = nullptr;
// resolve composed volumes (returns constituents with material fraction accounting for subtractions & overlaps)
std::vector<std::pair<const Trk::Volume*, std::pair<float, float> > > constituents = splitComposedVolume(trVol, m_simplify || blend);
@@ -405,7 +404,7 @@ const Trk::TrackingVolume* Muon::MuonInertMaterialBuilder::simplifyShape(const T
// simplification
- const Trk::TrackingVolume* newVol = 0;
+ const Trk::TrackingVolume* newVol = nullptr;
std::vector<const Trk::TrackingVolume*>* confinedVols = new std::vector<const Trk::TrackingVolume*>;
std::string envName = trVol->volumeName();
@@ -421,7 +420,7 @@ const Trk::TrackingVolume* Muon::MuonInertMaterialBuilder::simplifyShape(const T
ATH_MSG_VERBOSE(" Applying scaling for " << trVol->volumeName() << " fraction " << fraction);
Trk::Material mat(trVol->X0 / fraction, trVol->L0 / fraction, trVol->A, trVol->Z, fraction * trVol->rho);
- newVol = new Trk::TrackingVolume(*envelope, mat, 0, 0, envName);
+ newVol = new Trk::TrackingVolume(*envelope, mat, nullptr, nullptr, envName);
delete trVol;
delete confinedVols;
} else { // enclose simplified constituents
@@ -430,7 +429,7 @@ const Trk::TrackingVolume* Muon::MuonInertMaterialBuilder::simplifyShape(const T
ATH_MSG_VERBOSE(" Applying scaling for " << trVol->volumeName() << " fraction " << fraction);
// simplified material rescales X0, l0 and density
Trk::Material mat(trVol->X0 / fraction, trVol->L0 / fraction, trVol->A, trVol->Z, fraction * trVol->rho);
- Trk::TrackingVolume* trc = new Trk::TrackingVolume(*(constituents[ic].first), mat, 0, 0, trVol->volumeName());
+ Trk::TrackingVolume* trc = new Trk::TrackingVolume(*(constituents[ic].first), mat, nullptr, nullptr, trVol->volumeName());
confinedVols->push_back(trc);
}
envName = trVol->volumeName() + "_envelope";
@@ -454,8 +453,8 @@ const Trk::TrackingVolume* Muon::MuonInertMaterialBuilder::simplifyShape(const T
std::vector<std::pair<std::unique_ptr<const Trk::Volume>, float> > confinedConst;
for (unsigned int ic = 0; ic < constituents.size(); ic++) {
float scale = simpleMode == 2 ? 1 : constituents[ic].second.first;
- confinedConst.push_back(std::pair<std::unique_ptr<const Trk::Volume>, float>(
- std::make_unique<Trk::Volume>(*(constituents[ic].first), newVol->transform().inverse()), scale));
+ confinedConst.emplace_back(
+ std::make_unique<Trk::Volume>(*(constituents[ic].first), newVol->transform().inverse()), scale);
}
m_constituents.push_back(std::move(confinedConst));
}
@@ -536,7 +535,7 @@ double Muon::MuonInertMaterialBuilder::calculateVolume(const Trk::Volume* envelo
}
void Muon::MuonInertMaterialBuilder::getObjsForTranslation(
- const GeoVPhysVol* pv, Amg::Transform3D transform,
+ const GeoVPhysVol* pv, const Amg::Transform3D& transform,
std::vector<std::pair<const GeoLogVol*, std::vector<Amg::Transform3D> > >& vols) const {
// subcomponents
unsigned int nc = pv->getNChildVols();
@@ -558,7 +557,7 @@ void Muon::MuonInertMaterialBuilder::getObjsForTranslation(
if (!found) {
std::vector<Amg::Transform3D> volTr;
volTr.push_back(transform * transf);
- vols.push_back(std::pair<const GeoLogVol*, std::vector<Amg::Transform3D> >(clv, volTr));
+ vols.emplace_back(clv, volTr);
ATH_MSG_VERBOSE("INERT new volume added:" << clv->getName() << "," << clv->getMaterial()->getName());
if (msg().level() <= MSG::VERBOSE) printInfo(cv);
}
@@ -569,8 +568,8 @@ void Muon::MuonInertMaterialBuilder::getObjsForTranslation(
}
const Trk::Volume* Muon::MuonInertMaterialBuilder::createEnvelope(
- const Amg::Transform3D transf, std::vector<std::pair<const Trk::Volume*, std::pair<float, float> > > constituents) const {
- Trk::Volume* envelope = 0;
+ const Amg::Transform3D& transf, std::vector<std::pair<const Trk::Volume*, std::pair<float, float> > > constituents) const {
+ Trk::Volume* envelope = nullptr;
std::vector<std::pair<const Trk::Volume*, std::pair<float, float> > >::iterator sIter = constituents.begin();
std::vector<Amg::Vector3D> edges;
@@ -641,7 +640,7 @@ const Trk::Volume* Muon::MuonInertMaterialBuilder::createEnvelope(
ATH_MSG_VERBOSE(" createEnvelope psbBounds ");
} else {
ATH_MSG_VERBOSE(" bounds not recognized ");
- return 0;
+ return nullptr;
}
sIter++;
}
@@ -759,7 +758,7 @@ Amg::Vector3D Muon::MuonInertMaterialBuilder::getScanPoint(const Trk::Volume* vo
if (!comb1 && !comb2) {
subVols.push_back(comb->second());
comVol = comb->first();
- comb = 0;
+ comb = nullptr;
} else if (comb1) {
comb = comb1;
subVols.push_back(comb->second());
@@ -811,9 +810,9 @@ std::vector<std::pair<const Trk::Volume*, std::pair<float, float> > > Muon::Muon
const Trk::Volume* trVol, bool estimateVol) const {
std::vector<const Trk::Volume*> garbage;
std::vector<std::pair<const Trk::Volume*, const Trk::Volume*> > constituents;
- constituents.push_back(std::pair<const Trk::Volume*, const Trk::Volume*>(trVol, 0));
+ constituents.emplace_back(trVol, nullptr);
std::vector<std::pair<const Trk::Volume*, const Trk::Volume*> >::iterator sIter = constituents.begin();
- const Trk::Volume* subVol = 0;
+ const Trk::Volume* subVol = nullptr;
while (sIter != constituents.end()) {
const Trk::CombinedVolumeBounds* comb = dynamic_cast<const Trk::CombinedVolumeBounds*>(&((*sIter).first->volumeBounds()));
const Trk::SubtractedVolumeBounds* sub = dynamic_cast<const Trk::SubtractedVolumeBounds*>(&((*sIter).first->volumeBounds()));
@@ -822,9 +821,9 @@ std::vector<std::pair<const Trk::Volume*, std::pair<float, float> > > Muon::Muon
sIter = constituents.erase(sIter);
if (comb->intersection()) {
Trk::Volume* newSubVol =
- new Trk::Volume(0, new Trk::SubtractedVolumeBounds(comb->first()->clone(), comb->second()->clone()));
+ new Trk::Volume(nullptr, new Trk::SubtractedVolumeBounds(comb->first()->clone(), comb->second()->clone()));
if (subVol) {
- Trk::Volume* newCSubVol = new Trk::Volume(0, new Trk::CombinedVolumeBounds(subVol->clone(), newSubVol, false));
+ Trk::Volume* newCSubVol = new Trk::Volume(nullptr, new Trk::CombinedVolumeBounds(subVol->clone(), newSubVol, false));
constituents.insert(sIter, std::pair<const Trk::Volume*, const Trk::Volume*>(comb->first(), newCSubVol));
garbage.push_back(newCSubVol);
} else {
@@ -840,7 +839,7 @@ std::vector<std::pair<const Trk::Volume*, std::pair<float, float> > > Muon::Muon
subVol = (*sIter).second;
sIter = constituents.erase(sIter);
if (subVol) {
- Trk::Volume* newSubVol = new Trk::Volume(0, new Trk::CombinedVolumeBounds(subVol->clone(), sub->inner()->clone(), false));
+ Trk::Volume* newSubVol = new Trk::Volume(nullptr, new Trk::CombinedVolumeBounds(subVol->clone(), sub->inner()->clone(), false));
constituents.insert(sIter, std::pair<const Trk::Volume*, const Trk::Volume*>(sub->outer(), newSubVol));
garbage.push_back(newSubVol);
} else {
@@ -855,11 +854,11 @@ std::vector<std::pair<const Trk::Volume*, std::pair<float, float> > > Muon::Muon
// estimate fraction of cutouts & overlaps
std::vector<std::pair<const Trk::Volume*, std::pair<float, float> > > wConst;
for (unsigned int i = 0; i < constituents.size(); i++)
- wConst.push_back(std::pair<const Trk::Volume*, std::pair<float, float> >(constituents[i].first, std::pair<float, float>(1., 0.)));
+ wConst.emplace_back(constituents[i].first, std::pair<float, float>(1., 0.));
if (estimateVol && (constituents.size() > 1 || constituents[0].second)) {
for (unsigned int iv = 0; iv < constituents.size(); iv++) {
- const Trk::Volume* replaceVol = 0;
+ const Trk::Volume* replaceVol = nullptr;
// check if volume can be optimized (replace cylinder by tube)
if (constituents[iv].second) {
const Trk::CylinderVolumeBounds* cyl =
diff --git a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonInertMaterialBuilderCond.cxx b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonInertMaterialBuilderCond.cxx
index 53e68cba3215..997c8fdf5dfe 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonInertMaterialBuilderCond.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonInertMaterialBuilderCond.cxx
@@ -144,8 +144,8 @@ Muon::MuonInertMaterialBuilderCond::buildDetachedTrackingVolumes(const EventCont
delete msTypes;
// merge
- std::unique_ptr<const std::vector<std::unique_ptr<const Trk::DetachedTrackingVolume>>> muonObjects = 0;
- if (!mInert.first.size())
+ std::unique_ptr<const std::vector<std::unique_ptr<const Trk::DetachedTrackingVolume>>> muonObjects = nullptr;
+ if (mInert.first.empty())
muonObjects = std::make_unique<std::vector<std::unique_ptr<const Trk::DetachedTrackingVolume>>>(std::move(mInert.second));
else {
for (unsigned int i = 0; i < mInert.second.size(); i++) mInert.first.push_back(std::move(mInert.second[i]));
@@ -203,27 +203,27 @@ Muon::MuonInertMaterialBuilderCond::buildDetachedTrackingVolumeTypes(const Event
bool accepted = true;
if (vname.substr(0, 3) == "BAR" || vname.substr(0, 2) == "BT" || vname.substr(0, 6) == "EdgeBT" ||
vname.substr(0, 6) == "HeadBT")
- accepted = m_buildBT ? true : false;
+ accepted = m_buildBT;
else if (vname.substr(0, 3) == "ECT")
- accepted = m_buildECT ? true : false;
+ accepted = m_buildECT;
else if (vname.substr(0, 4) == "Feet" || (vname.size() > 7 && (vname.substr(3, 4) == "Feet" || vname.substr(4, 4) == "Feet")))
- accepted = m_buildFeets ? true : false;
+ accepted = m_buildFeets;
else if (vname.substr(0, 4) == "Rail")
- accepted = m_buildRails > 0 ? true : false;
+ accepted = m_buildRails > 0;
else if (vname.substr(0, 1) == "J")
- accepted = m_buildShields > 0 ? true : false;
+ accepted = m_buildShields > 0;
// NSW build inertmaterial for spacer frame, aluminium HUB, NJD disk and A plate
else if (vname.substr(0, 3) == "NSW" && vname.substr(1, 6) == "Spacer")
- accepted = m_buildNSWInert ? true : false;
+ accepted = m_buildNSWInert;
else if (vname.substr(0, 3) == "NSW" && vname.substr(1, 2) == "Al")
- accepted = m_buildNSWInert ? true : false;
+ accepted = m_buildNSWInert;
else if (vname.substr(0, 3) == "NJD")
- accepted = m_buildNSWInert ? true : false;
+ accepted = m_buildNSWInert;
else if (vname.substr(0, 1) == "A" && vname.substr(1, 5) == "Plate")
- accepted = m_buildNSWInert ? true : false;
+ accepted = m_buildNSWInert;
// strange NSW will be anyway build
else if (vname.substr(0, 1) != "J")
- accepted = m_buildSupports > 0 ? true : false;
+ accepted = m_buildSupports > 0;
// if ( vname=="EdgeBTVoussoir" && accepted && m_simplify ) accepted = false;
@@ -247,7 +247,7 @@ Muon::MuonInertMaterialBuilderCond::buildDetachedTrackingVolumeTypes(const Event
if (!cv->getNChildVols()) {
std::vector<Amg::Transform3D> volTr;
volTr.push_back(vol.getTransform());
- vols.push_back(std::pair<const GeoLogVol*, std::vector<Amg::Transform3D>>(clv, volTr));
+ vols.emplace_back(clv, volTr);
simpleTree = true;
} else {
getObjsForTranslation(cv, Trk::s_idTransform, vols);
@@ -289,12 +289,11 @@ Muon::MuonInertMaterialBuilderCond::buildDetachedTrackingVolumeTypes(const Event
if (trObject) {
Trk::Material mat = m_materialConverter->convert(vols[ish].first->getMaterial());
- const Trk::TrackingVolume* newType = new Trk::TrackingVolume(*trObject, mat, 0, 0, protoName);
+ const Trk::TrackingVolume* newType = new Trk::TrackingVolume(*trObject, mat, nullptr, nullptr, protoName);
const Trk::TrackingVolume* simType = simplifyShape(newType, blend, constituentsVector.get());
const Trk::DetachedTrackingVolume* typeStat = new Trk::DetachedTrackingVolume(protoName, simType);
if (blend) typeStat->saveConstituents(&(constituentsVector->back()));
- objs.push_back(
- std::pair<const Trk::DetachedTrackingVolume*, std::vector<Amg::Transform3D>>(typeStat, vols[ish].second));
+ objs.emplace_back(typeStat, vols[ish].second);
} else {
ATH_MSG_WARNING(name() << " volume not translated: " << vname);
}
@@ -311,26 +310,26 @@ Muon::MuonInertMaterialBuilderCond::buildDetachedTrackingVolumeTypes(const Event
// used : z = 14; A=28 ; rho = 2.33 g/cm^3, X0 = 93.7 mmm, l0 = 465.2 mm (Silicium)
Trk::Material mat1(93.7 / scmat1, 465.2 / scmat1, scmat1 * 14, scmat1 * 28, 0.0023, 0.);
Trk::Material mat2(93.7 / scmat2, 465.2 / scmat2, scmat2 * 14, scmat2 * 28, 0.0023, 0.);
- const Trk::LayerArray* dummyLayers = 0;
- const Trk::TrackingVolumeArray* dummyVolumes = 0;
+ const Trk::LayerArray* dummyLayers = nullptr;
+ const Trk::TrackingVolumeArray* dummyVolumes = nullptr;
Trk::VolumeBounds* extraBounds1 = new Trk::CylinderVolumeBounds(850., 13000., 5.);
- const Trk::TrackingVolume* mextra1 = new Trk::TrackingVolume(0, extraBounds1, mat1, dummyLayers, dummyVolumes, "extraMat1");
+ const Trk::TrackingVolume* mextra1 = new Trk::TrackingVolume(nullptr, extraBounds1, mat1, dummyLayers, dummyVolumes, "extraMat1");
const Trk::TrackingVolume* simType1 = simplifyShape(mextra1, blend, constituentsVector.get());
const Trk::DetachedTrackingVolume* eVol1 = new Trk::DetachedTrackingVolume("extraTGCmat1", simType1);
if (blend) eVol1->saveConstituents(&(constituentsVector->back()));
Trk::VolumeBounds* extraBounds2 = new Trk::CylinderVolumeBounds(850., 13000., 5.);
- const Trk::TrackingVolume* mextra2 = new Trk::TrackingVolume(0, extraBounds2, mat2, dummyLayers, dummyVolumes, "extraMat2");
+ const Trk::TrackingVolume* mextra2 = new Trk::TrackingVolume(nullptr, extraBounds2, mat2, dummyLayers, dummyVolumes, "extraMat2");
const Trk::TrackingVolume* simType2 = simplifyShape(mextra2, blend, constituentsVector.get());
const Trk::DetachedTrackingVolume* eVol2 = new Trk::DetachedTrackingVolume("extraTGCmat2", simType2);
if (blend) eVol2->saveConstituents(&(constituentsVector->back()));
std::vector<Amg::Transform3D> pos1;
- pos1.push_back(Amg::Transform3D(Amg::Translation3D(0., 0., m_extraPos1)));
- pos1.push_back(Amg::Transform3D(Amg::Translation3D(0., 0., -m_extraPos1)));
+ pos1.emplace_back(Amg::Translation3D(0., 0., m_extraPos1));
+ pos1.emplace_back(Amg::Translation3D(0., 0., -m_extraPos1));
std::vector<Amg::Transform3D> pos2;
- pos2.push_back(Amg::Transform3D(Amg::Translation3D(0., 0., m_extraPos2)));
- pos2.push_back(Amg::Transform3D(Amg::Translation3D(0., 0., -m_extraPos2)));
- objs.push_back(std::pair<const Trk::DetachedTrackingVolume*, std::vector<Amg::Transform3D>>(eVol1, pos1));
- objs.push_back(std::pair<const Trk::DetachedTrackingVolume*, std::vector<Amg::Transform3D>>(eVol2, pos2));
+ pos2.emplace_back(Amg::Translation3D(0., 0., m_extraPos2));
+ pos2.emplace_back(Amg::Translation3D(0., 0., -m_extraPos2));
+ objs.emplace_back(eVol1, pos1);
+ objs.emplace_back(eVol2, pos2);
}
//
@@ -391,7 +390,7 @@ const Trk::TrackingVolume* Muon::MuonInertMaterialBuilderCond::simplifyShape(
const Trk::TrackingVolume* trVol, bool blend,
std::vector<std::vector<std::pair<std::unique_ptr<const Trk::Volume>, float>>>* constituentsVector) const {
// envelope
- const Trk::Volume* envelope = 0;
+ const Trk::Volume* envelope = nullptr;
// resolve composed volumes (returns constituents with material fraction accounting for subtractions & overlaps)
std::vector<std::pair<const Trk::Volume*, std::pair<float, float>>> constituents = splitComposedVolume(trVol, m_simplify || blend);
@@ -414,7 +413,7 @@ const Trk::TrackingVolume* Muon::MuonInertMaterialBuilderCond::simplifyShape(
// simplification
- const Trk::TrackingVolume* newVol = 0;
+ const Trk::TrackingVolume* newVol = nullptr;
std::vector<const Trk::TrackingVolume*>* confinedVols = new std::vector<const Trk::TrackingVolume*>;
std::string envName = trVol->volumeName();
@@ -430,7 +429,7 @@ const Trk::TrackingVolume* Muon::MuonInertMaterialBuilderCond::simplifyShape(
ATH_MSG_VERBOSE(" Applying scaling for " << trVol->volumeName() << " fraction " << fraction);
Trk::Material mat(trVol->X0 / fraction, trVol->L0 / fraction, trVol->A, trVol->Z, fraction * trVol->rho);
- newVol = new Trk::TrackingVolume(*envelope, mat, 0, 0, envName);
+ newVol = new Trk::TrackingVolume(*envelope, mat, nullptr, nullptr, envName);
delete trVol;
delete confinedVols;
} else { // enclose simplified constituents
@@ -439,7 +438,7 @@ const Trk::TrackingVolume* Muon::MuonInertMaterialBuilderCond::simplifyShape(
ATH_MSG_VERBOSE(" Applying scaling for " << trVol->volumeName() << " fraction " << fraction);
// simplified material rescales X0, l0 and density
Trk::Material mat(trVol->X0 / fraction, trVol->L0 / fraction, trVol->A, trVol->Z, fraction * trVol->rho);
- Trk::TrackingVolume* trc = new Trk::TrackingVolume(*(constituents[ic].first), mat, 0, 0, trVol->volumeName());
+ Trk::TrackingVolume* trc = new Trk::TrackingVolume(*(constituents[ic].first), mat, nullptr, nullptr, trVol->volumeName());
confinedVols->push_back(trc);
}
envName = trVol->volumeName() + "_envelope";
@@ -463,8 +462,8 @@ const Trk::TrackingVolume* Muon::MuonInertMaterialBuilderCond::simplifyShape(
std::vector<std::pair<std::unique_ptr<const Trk::Volume>, float>> confinedConst;
for (unsigned int ic = 0; ic < constituents.size(); ic++) {
float scale = simpleMode == 2 ? 1 : constituents[ic].second.first;
- confinedConst.push_back(std::pair<std::unique_ptr<const Trk::Volume>, float>(
- std::make_unique<Trk::Volume>(*(constituents[ic].first), newVol->transform().inverse()), scale));
+ confinedConst.emplace_back(
+ std::make_unique<Trk::Volume>(*(constituents[ic].first), newVol->transform().inverse()), scale);
}
constituentsVector->push_back(std::move(confinedConst));
}
@@ -545,7 +544,7 @@ double Muon::MuonInertMaterialBuilderCond::calculateVolume(const Trk::Volume* en
}
void Muon::MuonInertMaterialBuilderCond::getObjsForTranslation(
- const GeoVPhysVol* pv, Amg::Transform3D transform,
+ const GeoVPhysVol* pv, const Amg::Transform3D& transform,
std::vector<std::pair<const GeoLogVol*, std::vector<Amg::Transform3D>>>& vols) const {
// subcomponents
unsigned int nc = pv->getNChildVols();
@@ -567,7 +566,7 @@ void Muon::MuonInertMaterialBuilderCond::getObjsForTranslation(
if (!found) {
std::vector<Amg::Transform3D> volTr;
volTr.push_back(transform * transf);
- vols.push_back(std::pair<const GeoLogVol*, std::vector<Amg::Transform3D>>(clv, volTr));
+ vols.emplace_back(clv, volTr);
ATH_MSG_VERBOSE("INERT new volume added:" << clv->getName() << "," << clv->getMaterial()->getName());
if (msg().level() <= MSG::VERBOSE) printInfo(cv);
}
@@ -578,8 +577,8 @@ void Muon::MuonInertMaterialBuilderCond::getObjsForTranslation(
}
const Trk::Volume* Muon::MuonInertMaterialBuilderCond::createEnvelope(
- const Amg::Transform3D transf, std::vector<std::pair<const Trk::Volume*, std::pair<float, float>>> constituents) const {
- Trk::Volume* envelope = 0;
+ const Amg::Transform3D& transf, std::vector<std::pair<const Trk::Volume*, std::pair<float, float>>> constituents) const {
+ Trk::Volume* envelope = nullptr;
std::vector<std::pair<const Trk::Volume*, std::pair<float, float>>>::iterator sIter = constituents.begin();
std::vector<Amg::Vector3D> edges;
@@ -650,7 +649,7 @@ const Trk::Volume* Muon::MuonInertMaterialBuilderCond::createEnvelope(
ATH_MSG_VERBOSE(" createEnvelope psbBounds ");
} else {
ATH_MSG_VERBOSE(" bounds not recognized ");
- return 0;
+ return nullptr;
}
sIter++;
}
@@ -768,7 +767,7 @@ Amg::Vector3D Muon::MuonInertMaterialBuilderCond::getScanPoint(const Trk::Volume
if (!comb1 && !comb2) {
subVols.push_back(comb->second());
comVol = comb->first();
- comb = 0;
+ comb = nullptr;
} else if (comb1) {
comb = comb1;
subVols.push_back(comb->second());
@@ -820,9 +819,9 @@ std::vector<std::pair<const Trk::Volume*, std::pair<float, float>>> Muon::MuonIn
const Trk::Volume* trVol, bool estimateVol) const {
std::vector<const Trk::Volume*> garbage;
std::vector<std::pair<const Trk::Volume*, const Trk::Volume*>> constituents;
- constituents.push_back(std::pair<const Trk::Volume*, const Trk::Volume*>(trVol, 0));
+ constituents.emplace_back(trVol, nullptr);
std::vector<std::pair<const Trk::Volume*, const Trk::Volume*>>::iterator sIter = constituents.begin();
- const Trk::Volume* subVol = 0;
+ const Trk::Volume* subVol = nullptr;
while (sIter != constituents.end()) {
const Trk::CombinedVolumeBounds* comb = dynamic_cast<const Trk::CombinedVolumeBounds*>(&((*sIter).first->volumeBounds()));
const Trk::SubtractedVolumeBounds* sub = dynamic_cast<const Trk::SubtractedVolumeBounds*>(&((*sIter).first->volumeBounds()));
@@ -831,9 +830,9 @@ std::vector<std::pair<const Trk::Volume*, std::pair<float, float>>> Muon::MuonIn
sIter = constituents.erase(sIter);
if (comb->intersection()) {
Trk::Volume* newSubVol =
- new Trk::Volume(0, new Trk::SubtractedVolumeBounds(comb->first()->clone(), comb->second()->clone()));
+ new Trk::Volume(nullptr, new Trk::SubtractedVolumeBounds(comb->first()->clone(), comb->second()->clone()));
if (subVol) {
- Trk::Volume* newCSubVol = new Trk::Volume(0, new Trk::CombinedVolumeBounds(subVol->clone(), newSubVol, false));
+ Trk::Volume* newCSubVol = new Trk::Volume(nullptr, new Trk::CombinedVolumeBounds(subVol->clone(), newSubVol, false));
constituents.insert(sIter, std::pair<const Trk::Volume*, const Trk::Volume*>(comb->first(), newCSubVol));
garbage.push_back(newCSubVol);
} else {
@@ -849,7 +848,7 @@ std::vector<std::pair<const Trk::Volume*, std::pair<float, float>>> Muon::MuonIn
subVol = (*sIter).second;
sIter = constituents.erase(sIter);
if (subVol) {
- Trk::Volume* newSubVol = new Trk::Volume(0, new Trk::CombinedVolumeBounds(subVol->clone(), sub->inner()->clone(), false));
+ Trk::Volume* newSubVol = new Trk::Volume(nullptr, new Trk::CombinedVolumeBounds(subVol->clone(), sub->inner()->clone(), false));
constituents.insert(sIter, std::pair<const Trk::Volume*, const Trk::Volume*>(sub->outer(), newSubVol));
garbage.push_back(newSubVol);
} else {
@@ -864,11 +863,11 @@ std::vector<std::pair<const Trk::Volume*, std::pair<float, float>>> Muon::MuonIn
// estimate fraction of cutouts & overlaps
std::vector<std::pair<const Trk::Volume*, std::pair<float, float>>> wConst;
for (unsigned int i = 0; i < constituents.size(); i++)
- wConst.push_back(std::pair<const Trk::Volume*, std::pair<float, float>>(constituents[i].first, std::pair<float, float>(1., 0.)));
+ wConst.emplace_back(constituents[i].first, std::pair<float, float>(1., 0.));
if (estimateVol && (constituents.size() > 1 || constituents[0].second)) {
for (unsigned int iv = 0; iv < constituents.size(); iv++) {
- const Trk::Volume* replaceVol = 0;
+ const Trk::Volume* replaceVol = nullptr;
// check if volume can be optimized (replace cylinder by tube)
if (constituents[iv].second) {
const Trk::CylinderVolumeBounds* cyl =
diff --git a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationBuilder.cxx b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationBuilder.cxx
index 080a3b4f526f..0edcf4c261b0 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationBuilder.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationBuilder.cxx
@@ -131,8 +131,7 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilder:
std::vector<Amg::Transform3D> volTr;
volTr.push_back(vol.getTransform());
std::pair<const GeoLogVol*, Trk::MaterialProperties*> cpair(clv, 0);
- vols.push_back(
- std::pair<std::pair<const GeoLogVol*, Trk::MaterialProperties*>, std::vector<Amg::Transform3D> >(cpair, volTr));
+ vols.emplace_back(cpair, volTr);
volNames.push_back(vname);
simpleTree = true;
} else {
@@ -156,10 +155,10 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilder:
std::vector<const Trk::Layer*> sectorL;
std::vector<const Trk::Layer*> sectorS;
- int nClones = vols.size() ? vols[0].second.size() : 0;
+ int nClones = !vols.empty() ? vols[0].second.size() : 0;
for (unsigned int ish = 0; ish < vols.size(); ish++) {
- bool isLargeSector = fabs(((vols[ish]).second)[0].translation().phi()) < 0.01 ? true : false;
+ bool isLargeSector = fabs(((vols[ish]).second)[0].translation().phi()) < 0.01;
std::string protoName = vname;
if (!simpleTree) protoName = vname + "_" + volNames[ish];
@@ -167,7 +166,7 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilder:
ATH_MSG_DEBUG(" ish " << ish << " protoName14 " << protoName.substr(1, 4) << " volName04 " << volNames[ish].substr(0, 4));
if (volNames[ish].substr(0, 4) != "sTGC" && volNames[ish].substr(0, 2) != "MM") continue;
- std::string oName = protoName.substr(protoName.find("-") + 1);
+ std::string oName = protoName.substr(protoName.find('-') + 1);
Identifier nswId = m_muonStationTypeBuilder->identifyNSW(m_muonMgr, oName, vols[ish].second[0]);
// get bounds and transform from readout geometry
@@ -199,7 +198,7 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilder:
const Trk::HomogeneousLayerMaterial mat(*(vols[ish].first.second), 0.);
- const Trk::Layer* layer = 0;
+ Trk::Layer* layer = nullptr;
if (!rtrd && !dia && !trd && !rdia) { // translate from GeoModel ( spacer & non-identified stuff )
// This used to be a !rtrd check as we either had a rotatedTrap or nothing
@@ -211,7 +210,7 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilder:
const Trk::Volume* trObject = m_geoShapeConverter->translateGeoShape(input_shapes[ish], &ident);
if (trObject) {
std::unique_ptr<const Trk::TrackingVolume> newType = std::unique_ptr<const Trk::TrackingVolume>(
- new Trk::TrackingVolume(*trObject, vols[ish].first.second->material(), 0, 0, protoName));
+ new Trk::TrackingVolume(*trObject, vols[ish].first.second->material(), nullptr, nullptr, protoName));
layer =
m_muonStationTypeBuilder->createLayer(m_muonMgr, newType.get(), vols[ish].first.second, vols[ish].second[0]);
if (layer) layer->moveLayer(vols[ish].second[0]);
@@ -222,7 +221,7 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilder:
std::shared_ptr<Trk::DiamondBounds> tbounds = std::make_shared<Trk::DiamondBounds>(
dia->minHalflengthX(), dia->medHalflengthX(), dia->maxHalflengthX(), dia->halflengthY1(), dia->halflengthY2());
Trk::SharedObject<const Trk::SurfaceBounds> bounds(tbounds);
- Trk::OverlapDescriptor* od = 0;
+ Trk::OverlapDescriptor* od = nullptr;
double thickness = (mat.fullMaterial(layTransf.translation()))->thickness();
layer = new Trk::PlaneLayer(Amg::Transform3D(layTransf * Amg::AngleAxis3D(-0.5 * M_PI, Amg::Vector3D(0., 0., 1.))),
bounds, mat, thickness, od, 1);
@@ -231,7 +230,7 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilder:
std::shared_ptr<Trk::DiamondBounds> tbounds = std::make_shared<Trk::DiamondBounds>(
rdia->minHalflengthX(), rdia->medHalflengthX(), rdia->maxHalflengthX(), rdia->halflengthY1(), rdia->halflengthY2());
Trk::SharedObject<const Trk::SurfaceBounds> bounds(tbounds);
- Trk::OverlapDescriptor* od = 0;
+ Trk::OverlapDescriptor* od = nullptr;
double thickness = (mat.fullMaterial(layTransf.translation()))->thickness();
layer = new Trk::PlaneLayer(Amg::Transform3D(layTransf * Amg::AngleAxis3D(-0.5 * M_PI, Amg::Vector3D(0., 0., 1.))),
bounds, mat, thickness, od, 1);
@@ -240,7 +239,7 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilder:
std::shared_ptr<Trk::TrapezoidBounds> tbounds =
std::make_shared<Trk::TrapezoidBounds>(trd->minHalflengthX(), trd->maxHalflengthX(), trd->halflengthY());
Trk::SharedObject<const Trk::SurfaceBounds> bounds(tbounds);
- Trk::OverlapDescriptor* od = 0;
+ Trk::OverlapDescriptor* od = nullptr;
double thickness = (mat.fullMaterial(layTransf.translation()))->thickness();
layer = new Trk::PlaneLayer(Amg::Transform3D(layTransf * Amg::AngleAxis3D(-0.5 * M_PI, Amg::Vector3D(0., 0., 1.))),
bounds, mat, thickness, od, 1);
@@ -250,7 +249,7 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilder:
std::shared_ptr<Trk::RotatedTrapezoidBounds> tbounds =
std::make_shared<Trk::RotatedTrapezoidBounds>(rtrd->halflengthX(), rtrd->minHalflengthY(), rtrd->maxHalflengthY());
Trk::SharedObject<const Trk::SurfaceBounds> bounds(tbounds);
- Trk::OverlapDescriptor* od = 0;
+ Trk::OverlapDescriptor* od = nullptr;
double thickness = (mat.fullMaterial(layTransf.translation()))->thickness();
layer = new Trk::PlaneLayer(Amg::Transform3D(layTransf * Amg::AngleAxis3D(-0.5 * M_PI, Amg::Vector3D(0., 0., 1.))),
bounds, mat, thickness, od, 1);
@@ -286,14 +285,14 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilder:
m_muonStationTypeBuilder->createLayerRepresentation(newTypeL);
// create prototype as detached tracking volume
const Trk::DetachedTrackingVolume* typeL =
- newTypeL ? new Trk::DetachedTrackingVolume("NSWL", newTypeL, layerReprL.first, layerReprL.second) : 0;
+ newTypeL ? new Trk::DetachedTrackingVolume("NSWL", newTypeL, layerReprL.first, layerReprL.second) : nullptr;
// objs.push_back(std::pair<const Trk::DetachedTrackingVolume*,std::vector<Amg::Transform3D> >(typeStat,vols[ish].second));
const Trk::TrackingVolume* newTypeS = m_muonStationTypeBuilder->processNSW(m_muonMgr, sectorS);
// create layer representation
std::pair<const Trk::Layer*, const std::vector<const Trk::Layer*>*> layerReprS =
m_muonStationTypeBuilder->createLayerRepresentation(newTypeS);
const Trk::DetachedTrackingVolume* typeS =
- newTypeS ? new Trk::DetachedTrackingVolume("NSWS", newTypeS, layerReprS.first, layerReprS.second) : 0;
+ newTypeS ? new Trk::DetachedTrackingVolume("NSWS", newTypeS, layerReprS.first, layerReprS.second) : nullptr;
if (typeL) {
mStations.push_back(typeL);
@@ -323,7 +322,7 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilder:
}
unsigned int nType = nid.get_identifier32().get_compact();
- (*lays)[il]->setLayerType(nType);
+ const_cast<Trk::Layer*>((*lays)[il])->setLayerType(nType);
}
}
mStations.push_back(newStat);
@@ -353,7 +352,7 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilder:
}
unsigned int nType = nid.get_identifier32().get_compact();
- (*lays)[il]->setLayerType(nType);
+ const_cast<Trk::Layer*>((*lays)[il])->setLayerType(nType);
}
}
mStations.push_back(mtypeL);
@@ -382,7 +381,7 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilder:
}
unsigned int nType = nid.get_identifier32().get_compact();
- (*lays)[il]->setLayerType(nType);
+ const_cast<Trk::Layer*>((*lays)[il])->setLayerType(nType);
}
}
mStations.push_back(newStat);
@@ -418,7 +417,7 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilder:
}
unsigned int nType = nid.get_identifier32().get_compact();
- (*lays)[il]->setLayerType(nType);
+ const_cast<Trk::Layer*>((*lays)[il])->setLayerType(nType);
}
}
mStations.push_back(newStat);
@@ -451,7 +450,7 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilder:
}
unsigned int nType = nid.get_identifier32().get_compact();
- (*lays)[il]->setLayerType(nType);
+ const_cast<Trk::Layer*>((*lays)[il])->setLayerType(nType);
}
}
mStations.push_back(mtypeS);
@@ -480,7 +479,7 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilder:
}
unsigned int nType = nid.get_identifier32().get_compact();
- (*lays)[il]->setLayerType(nType);
+ const_cast<Trk::Layer*>((*lays)[il])->setLayerType(nType);
}
}
mStations.push_back(newStat);
@@ -523,7 +522,7 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilder:
if (stName.substr(0, 1) == "B" && eta < 0) { stName = (clv->getName()).substr(0, vname.size() - 8) + "-"; }
if (stName.substr(0, 1) == "T" || stName.substr(0, 1) == "C") { stName = vname.substr(0, 4); }
// loop over prototypes
- const Trk::DetachedTrackingVolume* msTV = 0;
+ const Trk::DetachedTrackingVolume* msTV = nullptr;
for (msTypeIter = msTypes->begin(); msTypeIter != msTypes->end(); ++msTypeIter) {
std::string msTypeName = (*msTypeIter)->name();
if ((stName.substr(0, 1) == "T" && stName == msTypeName.substr(0, stName.size())) ||
@@ -590,7 +589,7 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilder:
// clone station from prototype
const Trk::DetachedTrackingVolume* newStat = msTV->clone(vname, transf);
// identify layer representation
- newStat->layerRepresentation()->setLayerType(iD);
+ const_cast<Trk::Layer*>(newStat->layerRepresentation())->setLayerType(iD);
// resolved stations only:
// glue components
glueComponents(newStat);
@@ -629,7 +628,7 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilder:
while (!vol.atEnd()) {
const GeoVPhysVol* cv = &(*(vol.getVolume()));
const GeoLogVol* clv = cv->getLogVol();
- std::string vname = clv->getName();
+ const std::string& vname = clv->getName();
if (vname.size() > 7 && vname.substr(vname.size() - 7, 7) == "Station" &&
((m_buildBarrel && vname.substr(0, 1) == "B") || (m_buildEndcap && vname.substr(0, 1) == "E") ||
(m_buildCsc && vname.substr(0, 1) == "C") || (m_buildTgc && vname.substr(0, 1) == "T"))) {
@@ -669,7 +668,7 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilder:
if (name.substr(0, 1) == "B" && eta < 0) { name = (clv->getName()).substr(0, vname.size() - 8) + "-"; }
unsigned is = 0;
for (unsigned in = 0; in < stations.size(); in++) {
- if (stations[in] != 0 && name == stations[in]->name()) is++;
+ if (stations[in] != nullptr && name == stations[in]->name()) is++;
}
if (is == 0) {
ATH_MSG_VERBOSE(" new station type " << name << "," << clv->getShape()->type());
@@ -733,8 +732,8 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilder:
halfZ = trd->getZHalfLength();
// define enveloping volume
- const Trk::TrackingVolumeArray* confinedVolumes = 0;
- Trk::Volume* envelope = 0;
+ const Trk::TrackingVolumeArray* confinedVolumes = nullptr;
+ Trk::Volume* envelope = nullptr;
std::string shape = "Trd";
if (halfX1 == halfX2 && halfY1 == halfY2) shape = "Box";
if (shape == "Box") {
@@ -743,9 +742,9 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilder:
if (m_muonStationTypeBuilder)
confinedVolumes = m_muonStationTypeBuilder->processBoxStationComponents(cv, envBounds, cache);
// enveloping volume
- envelope = new Trk::Volume(0, envBounds);
+ envelope = new Trk::Volume(nullptr, envBounds);
} else if (shape == "Trd") {
- Trk::TrapezoidVolumeBounds* envBounds = 0;
+ Trk::TrapezoidVolumeBounds* envBounds = nullptr;
Amg::Transform3D* transf; // this pointer is passed to envelope below, and is valid only if envBounds is
// valid. Making it a unique_ptr results in core dump
if (halfY1 == halfY2) {
@@ -773,7 +772,7 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilder:
if (envelope) {
// ready to build the station prototype
const Trk::TrackingVolume* newType = new Trk::TrackingVolume(
- *envelope, m_muonMaterial, 0, confinedVolumes,
+ *envelope, m_muonMaterial, nullptr, confinedVolumes,
name); // this pointer is passed to typeStat below, which in turn is kept in vector stations.
delete envelope;
@@ -809,7 +808,7 @@ void Muon::MuonStationBuilder::glueComponents(const Trk::DetachedTrackingVolume*
const Trk::TrackingVolumeArray* volArray = stat->trackingVolume()->confinedVolumes();
if (volArray) {
if (volArray->arrayObjectsNumber() > 1) {
- const std::vector<const Trk::TrackingVolume*> components = volArray->arrayObjects();
+ const std::vector<const Trk::TrackingVolume*>& components = volArray->arrayObjects();
const Trk::BinUtility* binUtilityX = volArray->binUtility();
const Trk::CuboidVolumeBounds* cubVolBounds = dynamic_cast<const Trk::CuboidVolumeBounds*>(&(components[0]->volumeBounds()));
@@ -848,12 +847,12 @@ void Muon::MuonStationBuilder::identifyLayers(const Trk::DetachedTrackingVolume*
for (int gasgap = 0; gasgap < cscRE->Ngasgaps(); gasgap++) {
Identifier idi = m_idHelperSvc->cscIdHelper().channelID(cscRE->identify(), cscRE->ChamberLayer(), gasgap + 1, 0, 1);
const Trk::PlaneSurface* stripSurf = dynamic_cast<const Trk::PlaneSurface*>(&(cscRE->surface(idi)));
- const Amg::Vector3D gpi = stripSurf->center();
+ const Amg::Vector3D& gpi = stripSurf->center();
const Trk::TrackingVolume* assocVol = station->trackingVolume()->associatedSubVolume(gpi);
- const Trk::Layer* assocLay = 0;
+ const Trk::Layer* assocLay = nullptr;
if (assocVol) assocLay = assocVol->associatedLayer(gpi);
unsigned int iD = idi.get_identifier32().get_compact();
- if (assocVol && assocLay) assocLay->setLayerType(iD);
+ if (assocVol && assocLay) const_cast<Trk::Layer*>(assocLay)->setLayerType(iD);
if (assocLay) assocLay->setRef((assocLay->surfaceRepresentation().transform().inverse() * gpi)[1]);
}
} else {
@@ -893,7 +892,7 @@ void Muon::MuonStationBuilder::identifyLayers(const Trk::DetachedTrackingVolume*
int stationName = m_idHelperSvc->tgcIdHelper().stationName(oldId);
int stationEta = m_idHelperSvc->tgcIdHelper().stationEta(oldId);
Identifier stId = m_idHelperSvc->tgcIdHelper().elementID(stationName, stationEta, phi);
- station->layerRepresentation()->setLayerType(stId.get_identifier32().get_compact());
+ const_cast<Trk::Layer*>(station->layerRepresentation())->setLayerType(stId.get_identifier32().get_compact());
break;
}
phit++;
@@ -915,11 +914,11 @@ void Muon::MuonStationBuilder::identifyLayers(const Trk::DetachedTrackingVolume*
for (unsigned int il = 0; il < layers.size(); il++) {
wireId = m_idHelperSvc->tgcIdHelper().channelID(stationName.substr(0, 3), etaSt, phiSt, il + 1, 0, 1, true, validId);
if (!(*validId))
- layers[il]->setLayerType(1);
+ const_cast<Trk::Layer*>(layers[il])->setLayerType(1);
else {
if (!(*validId)) ATH_MSG_ERROR("invalid TGC channel:" << wireId);
unsigned int id = wireId.get_identifier32().get_compact();
- layers[il]->setLayerType(id);
+ const_cast<Trk::Layer*>(layers[il])->setLayerType(id);
// validation
Identifier checkId(layers[il]->layerType());
const Trk::PlaneSurface* stripSurf = dynamic_cast<const Trk::PlaneSurface*>(&(tgc->surface(checkId)));
@@ -931,7 +930,7 @@ void Muon::MuonStationBuilder::identifyLayers(const Trk::DetachedTrackingVolume*
}
}
delete validId;
- validId = 0;
+ validId = nullptr;
} else {
ATH_MSG_WARNING(name() << "tgcROE not found for :" << stationName << "," << eta << "," << phi);
}
@@ -947,7 +946,7 @@ void Muon::MuonStationBuilder::identifyLayers(const Trk::DetachedTrackingVolume*
for (unsigned int i = 0; i < cVols.size(); i++) {
if (cVols[i]->confinedLayers()) {
const std::vector<const Trk::Layer*> cLays = cVols[i]->confinedLayers()->arrayObjects();
- const MuonGM::MdtReadoutElement* mdtROE = 0;
+ const MuonGM::MdtReadoutElement* mdtROE = nullptr;
for (unsigned int il = 0; il < cLays.size(); il++) {
Identifier id(cLays[il]->layerType());
if (id.get_compact() > 0 && m_idHelperSvc->isMdt(id)) {
@@ -956,7 +955,7 @@ void Muon::MuonStationBuilder::identifyLayers(const Trk::DetachedTrackingVolume*
m_idHelperSvc->mdtIdHelper().tubeLayer(id), m_idHelperSvc->mdtIdHelper().tube(id));
if (!mdtROE) mdtROE = m_muonMgr->getMdtReadoutElement(newId);
unsigned int newid = newId.get_identifier32().get_compact();
- cLays[il]->setLayerType(newid);
+ const_cast<Trk::Layer*>(cLays[il])->setLayerType(newid);
// check reference position
if (mdtROE) {
double ref = cLays[il]->getRef();
@@ -986,7 +985,7 @@ void Muon::MuonStationBuilder::identifyLayers(const Trk::DetachedTrackingVolume*
m_idHelperSvc->rpcIdHelper().doubletPhi(id), m_idHelperSvc->rpcIdHelper().gasGap(id),
m_idHelperSvc->rpcIdHelper().measuresPhi(id), m_idHelperSvc->rpcIdHelper().strip(id));
int newid = newId.get_identifier32().get_compact();
- (*cLays)[il]->setLayerType(newid);
+ const_cast<Trk::Layer*>((*cLays)[il])->setLayerType(newid);
}
}
}
@@ -1024,10 +1023,10 @@ void Muon::MuonStationBuilder::identifyLayers(const Trk::DetachedTrackingVolume*
// end identification check
}
-void Muon::MuonStationBuilder::identifyPrototype(const Trk::TrackingVolume* station, int eta, int phi, Amg::Transform3D transf) const {
+void Muon::MuonStationBuilder::identifyPrototype(const Trk::TrackingVolume* station, int eta, int phi, const Amg::Transform3D& transf) const {
ATH_MSG_VERBOSE(name() << " identifying prototype ");
- const std::string stationName = station->volumeName();
+ const std::string& stationName = station->volumeName();
ATH_MSG_VERBOSE(" for station " << stationName);
const std::string stationNameShort = stationName.substr(0, 3);
const std::string stationFirstChar = stationName.substr(0, 1);
@@ -1055,7 +1054,7 @@ void Muon::MuonStationBuilder::identifyPrototype(const Trk::TrackingVolume* stat
Amg::Vector3D gp = multilayer->tubePos(id);
const Trk::Layer* assocLay = assocVol->associatedLayer(transf.inverse() * gp);
unsigned int iD = id.get_identifier32().get_compact();
- if (assocLay) assocLay->setLayerType(iD);
+ if (assocLay) const_cast<Trk::Layer*>(assocLay)->setLayerType(iD);
}
}
}
@@ -1128,7 +1127,7 @@ void Muon::MuonStationBuilder::identifyPrototype(const Trk::TrackingVolume* stat
rpc->surface(etaId).transform().inverse() * rpc->stripPos(etaId);
double swap = (fabs(locPos1[1] - locPos2[0]) > 0.001) ? 20000. : 0.;
unsigned int id = etaId.get_identifier32().get_compact();
- (*layers)[il]->setLayerType(id);
+ const_cast<Trk::Layer*>((*layers)[il])->setLayerType(id);
const Amg::Vector3D locPos =
(*layers)[il]->surfaceRepresentation().transform().inverse() * transf.inverse() *
rpc->surface(etaId).center();
@@ -1178,7 +1177,7 @@ void Muon::MuonStationBuilder::identifyPrototype(const Trk::TrackingVolume* stat
}
void Muon::MuonStationBuilder::getNSWStationsForTranslation(
- const GeoVPhysVol* pv, std::string name, Amg::Transform3D transform,
+ const GeoVPhysVol* pv, const std::string& name, const Amg::Transform3D& transform,
std::vector<std::pair<std::pair<const GeoLogVol*, Trk::MaterialProperties*>, std::vector<Amg::Transform3D> > >& vols,
std::vector<std::string>& volNames) const {
// special code to get the Sensitive volume of the sTGC and MM (so the gas volume) throught the Frame
@@ -1195,7 +1194,7 @@ void Muon::MuonStationBuilder::getNSWStationsForTranslation(
std::string childName = clv->getName();
ATH_MSG_DEBUG("getNSWStationsForTranslation child " << childName);
- if (childName == "") childName = "Spacer";
+ if (childName.empty()) childName = "Spacer";
if (childName.size() > 9 && childName.substr(childName.size() - 9, 9) == "Sensitive") {
std::stringstream st;
st << ic;
@@ -1241,8 +1240,7 @@ void Muon::MuonStationBuilder::getNSWStationsForTranslation(
Trk::MaterialProperties* nMat = new Trk::MaterialProperties(matComb);
// store mother volume (and not child = Frame)
std::pair<const GeoLogVol*, Trk::MaterialProperties*> cpair(pv->getLogVol(), nMat);
- vols.push_back(
- std::pair<std::pair<const GeoLogVol*, Trk::MaterialProperties*>, std::vector<Amg::Transform3D> >(cpair, volTr));
+ vols.emplace_back(cpair, volTr);
// store extensive name
volNames.push_back(cName);
ATH_MSG_VERBOSE("new NSW station volume added:"
diff --git a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationBuilderCond.cxx b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationBuilderCond.cxx
index 0e094603e73c..fe47a382d7f2 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationBuilderCond.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationBuilderCond.cxx
@@ -138,8 +138,7 @@ Muon::MuonStationBuilderCond::buildDetachedTrackingVolumes(const EventContext& c
std::vector<Amg::Transform3D> volTr;
volTr.push_back(vol.getTransform());
std::pair<const GeoLogVol*, Trk::MaterialProperties*> cpair(clv, 0);
- vols.push_back(
- std::pair<std::pair<const GeoLogVol*, Trk::MaterialProperties*>, std::vector<Amg::Transform3D> >(cpair, volTr));
+ vols.emplace_back(cpair, volTr);
volNames.push_back(vname);
simpleTree = true;
} else {
@@ -163,10 +162,10 @@ Muon::MuonStationBuilderCond::buildDetachedTrackingVolumes(const EventContext& c
std::vector<const Trk::Layer*> sectorL;
std::vector<const Trk::Layer*> sectorS;
- int nClones = vols.size() ? vols[0].second.size() : 0;
+ int nClones = !vols.empty() ? vols[0].second.size() : 0;
for (unsigned int ish = 0; ish < vols.size(); ish++) {
- bool isLargeSector = fabs(((vols[ish]).second)[0].translation().phi()) < 0.01 ? true : false;
+ bool isLargeSector = fabs(((vols[ish]).second)[0].translation().phi()) < 0.01;
std::string protoName = vname;
if (!simpleTree) protoName = vname + "_" + volNames[ish];
@@ -174,7 +173,7 @@ Muon::MuonStationBuilderCond::buildDetachedTrackingVolumes(const EventContext& c
ATH_MSG_DEBUG(" ish " << ish << " protoName14 " << protoName.substr(1, 4) << " volName04 " << volNames[ish].substr(0, 4));
if (volNames[ish].substr(0, 4) != "sTGC" && volNames[ish].substr(0, 2) != "MM") continue;
- std::string oName = protoName.substr(protoName.find("-") + 1);
+ std::string oName = protoName.substr(protoName.find('-') + 1);
Identifier nswId = m_muonStationTypeBuilder->identifyNSW(muonMgr, oName, vols[ish].second[0]);
// get bounds and transform from readout geometry
@@ -206,7 +205,7 @@ Muon::MuonStationBuilderCond::buildDetachedTrackingVolumes(const EventContext& c
const Trk::HomogeneousLayerMaterial mat(*(vols[ish].first.second), 0.);
- const Trk::Layer* layer = nullptr;
+ Trk::Layer* layer = nullptr;
if (!rtrd && !dia && !trd && !rdia) { // translate from GeoModel ( spacer & non-identified stuff )
// This used to be a !rtrd check as we either had a rotatedTrap or nothing
@@ -218,7 +217,7 @@ Muon::MuonStationBuilderCond::buildDetachedTrackingVolumes(const EventContext& c
const Trk::Volume* trObject = m_geoShapeConverter->translateGeoShape(input_shapes[ish], &ident);
if (trObject) {
std::unique_ptr<const Trk::TrackingVolume> newType = std::unique_ptr<const Trk::TrackingVolume>(
- new Trk::TrackingVolume(*trObject, vols[ish].first.second->material(), 0, 0, protoName));
+ new Trk::TrackingVolume(*trObject, vols[ish].first.second->material(), nullptr, nullptr, protoName));
layer = m_muonStationTypeBuilder->createLayer(muonMgr, newType.get(), vols[ish].first.second, vols[ish].second[0]);
if (layer) layer->moveLayer(vols[ish].second[0]);
delete trObject;
@@ -228,7 +227,7 @@ Muon::MuonStationBuilderCond::buildDetachedTrackingVolumes(const EventContext& c
std::shared_ptr<Trk::DiamondBounds> tbounds = std::make_shared<Trk::DiamondBounds>(
dia->minHalflengthX(), dia->medHalflengthX(), dia->maxHalflengthX(), dia->halflengthY1(), dia->halflengthY2());
Trk::SharedObject<const Trk::SurfaceBounds> bounds(tbounds);
- Trk::OverlapDescriptor* od = 0;
+ Trk::OverlapDescriptor* od = nullptr;
double thickness = (mat.fullMaterial(layTransf.translation()))->thickness();
layer = new Trk::PlaneLayer(Amg::Transform3D(layTransf * Amg::AngleAxis3D(-0.5 * M_PI, Amg::Vector3D(0., 0., 1.))),
bounds, mat, thickness, od, 1);
@@ -237,7 +236,7 @@ Muon::MuonStationBuilderCond::buildDetachedTrackingVolumes(const EventContext& c
std::shared_ptr<Trk::DiamondBounds> tbounds = std::make_shared<Trk::DiamondBounds>(
rdia->minHalflengthX(), rdia->medHalflengthX(), rdia->maxHalflengthX(), rdia->halflengthY1(), rdia->halflengthY2());
Trk::SharedObject<const Trk::SurfaceBounds> bounds(tbounds);
- Trk::OverlapDescriptor* od = 0;
+ Trk::OverlapDescriptor* od = nullptr;
double thickness = (mat.fullMaterial(layTransf.translation()))->thickness();
layer = new Trk::PlaneLayer(Amg::Transform3D(layTransf * Amg::AngleAxis3D(-0.5 * M_PI, Amg::Vector3D(0., 0., 1.))),
bounds, mat, thickness, od, 1);
@@ -246,7 +245,7 @@ Muon::MuonStationBuilderCond::buildDetachedTrackingVolumes(const EventContext& c
std::shared_ptr<Trk::TrapezoidBounds> tbounds =
std::make_shared<Trk::TrapezoidBounds>(trd->minHalflengthX(), trd->maxHalflengthX(), trd->halflengthY());
Trk::SharedObject<const Trk::SurfaceBounds> bounds(tbounds);
- Trk::OverlapDescriptor* od = 0;
+ Trk::OverlapDescriptor* od = nullptr;
double thickness = (mat.fullMaterial(layTransf.translation()))->thickness();
layer = new Trk::PlaneLayer(Amg::Transform3D(layTransf * Amg::AngleAxis3D(-0.5 * M_PI, Amg::Vector3D(0., 0., 1.))),
bounds, mat, thickness, od, 1);
@@ -256,7 +255,7 @@ Muon::MuonStationBuilderCond::buildDetachedTrackingVolumes(const EventContext& c
std::shared_ptr<Trk::RotatedTrapezoidBounds> tbounds =
std::make_shared<Trk::RotatedTrapezoidBounds>(rtrd->halflengthX(), rtrd->minHalflengthY(), rtrd->maxHalflengthY());
Trk::SharedObject<const Trk::SurfaceBounds> bounds(tbounds);
- Trk::OverlapDescriptor* od = 0;
+ Trk::OverlapDescriptor* od = nullptr;
double thickness = (mat.fullMaterial(layTransf.translation()))->thickness();
layer = new Trk::PlaneLayer(Amg::Transform3D(layTransf * Amg::AngleAxis3D(-0.5 * M_PI, Amg::Vector3D(0., 0., 1.))),
bounds, mat, thickness, od, 1);
@@ -303,7 +302,7 @@ Muon::MuonStationBuilderCond::buildDetachedTrackingVolumes(const EventContext& c
newTypeS ? new Trk::DetachedTrackingVolume("NSWS", newTypeS, layerReprS.first, layerReprS.second) : nullptr};
if (typeL) {
- auto typeLptr = typeL.get();
+ const auto *typeLptr = typeL.get();
mStations->push_back(std::move(typeL));
for (int it = 1; it < 8; it++) {
@@ -331,7 +330,7 @@ Muon::MuonStationBuilderCond::buildDetachedTrackingVolumes(const EventContext& c
}
unsigned int nType = nid.get_identifier32().get_compact();
- (*lays)[il]->setLayerType(nType);
+ const_cast< Trk::Layer*>((*lays)[il])->setLayerType(nType);
}
}
mStations->push_back(std::move(newStat));
@@ -361,10 +360,10 @@ Muon::MuonStationBuilderCond::buildDetachedTrackingVolumes(const EventContext& c
}
unsigned int nType = nid.get_identifier32().get_compact();
- (*lays)[il]->setLayerType(nType);
+ const_cast< Trk::Layer*>((*lays)[il])->setLayerType(nType);
}
}
- auto mtypeLptr = mtypeL.get();
+ const auto *mtypeLptr = mtypeL.get();
mStations->push_back(std::move(mtypeL));
for (unsigned int it = 1; it < 8; it++) {
// clone station from prototype :: CHECK z<0 side, probably turns in wrong direction
@@ -391,7 +390,7 @@ Muon::MuonStationBuilderCond::buildDetachedTrackingVolumes(const EventContext& c
}
unsigned int nType = nid.get_identifier32().get_compact();
- (*lays)[il]->setLayerType(nType);
+ const_cast< Trk::Layer*>((*lays)[il])->setLayerType(nType);
}
}
mStations->push_back(std::move(newStat));
@@ -400,7 +399,7 @@ Muon::MuonStationBuilderCond::buildDetachedTrackingVolumes(const EventContext& c
}
if (typeS) {
- auto typeSptr = typeS.get();
+ const auto *typeSptr = typeS.get();
mStations->push_back(std::move(typeS));
for (unsigned int it = 1; it < 8; it++) {
@@ -428,7 +427,7 @@ Muon::MuonStationBuilderCond::buildDetachedTrackingVolumes(const EventContext& c
}
unsigned int nType = nid.get_identifier32().get_compact();
- (*lays)[il]->setLayerType(nType);
+ const_cast<Trk::Layer*>((*lays)[il])->setLayerType(nType);
}
}
mStations->push_back(std::move(newStat));
@@ -461,10 +460,10 @@ Muon::MuonStationBuilderCond::buildDetachedTrackingVolumes(const EventContext& c
}
unsigned int nType = nid.get_identifier32().get_compact();
- (*lays)[il]->setLayerType(nType);
+ const_cast< Trk::Layer*>((*lays)[il])->setLayerType(nType);
}
}
- auto mtypeSptr = mtypeS.get();
+ const auto *mtypeSptr = mtypeS.get();
mStations->push_back(std::move(mtypeS));
for (unsigned int it = 1; it < 8; it++) {
// clone station from prototype :: CHECK z<0 side, probably turns in wrong direction
@@ -491,7 +490,7 @@ Muon::MuonStationBuilderCond::buildDetachedTrackingVolumes(const EventContext& c
}
unsigned int nType = nid.get_identifier32().get_compact();
- (*lays)[il]->setLayerType(nType);
+ const_cast<Trk::Layer*>((*lays)[il])->setLayerType(nType);
}
}
mStations->push_back(std::move(newStat));
@@ -534,7 +533,7 @@ Muon::MuonStationBuilderCond::buildDetachedTrackingVolumes(const EventContext& c
if (stName.substr(0, 1) == "B" && eta < 0) { stName = (clv->getName()).substr(0, vname.size() - 8) + "-"; }
if (stName.substr(0, 1) == "T" || stName.substr(0, 1) == "C") { stName = vname.substr(0, 4); }
// loop over prototypes
- const Trk::DetachedTrackingVolume* msTV = 0;
+ const Trk::DetachedTrackingVolume* msTV = nullptr;
for (msTypeIter = msTypes->begin(); msTypeIter != msTypes->end(); ++msTypeIter) {
std::string msTypeName = (*msTypeIter)->name();
if ((stName.substr(0, 1) == "T" && stName == msTypeName.substr(0, stName.size())) ||
@@ -601,7 +600,8 @@ Muon::MuonStationBuilderCond::buildDetachedTrackingVolumes(const EventContext& c
// clone station from prototype
std::unique_ptr<const Trk::DetachedTrackingVolume> newStat{msTV->clone(vname, transf)};
// identify layer representation
- newStat->layerRepresentation()->setLayerType(iD);
+ Trk::Layer* mutableLayer = const_cast< Trk::Layer*>(newStat->layerRepresentation());
+ mutableLayer->setLayerType(iD);
// resolved stations only:
// glue components
glueComponents(newStat.get());
@@ -637,7 +637,7 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilderC
while (!vol.atEnd()) {
const GeoVPhysVol* cv = &(*(vol.getVolume()));
const GeoLogVol* clv = cv->getLogVol();
- std::string vname = clv->getName();
+ const std::string& vname = clv->getName();
if (vname.size() > 7 && vname.substr(vname.size() - 7, 7) == "Station" &&
((m_buildBarrel && vname.substr(0, 1) == "B") || (m_buildEndcap && vname.substr(0, 1) == "E") ||
(m_buildCsc && vname.substr(0, 1) == "C") || (m_buildTgc && vname.substr(0, 1) == "T"))) {
@@ -677,7 +677,7 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilderC
if (name.substr(0, 1) == "B" && eta < 0) { name = (clv->getName()).substr(0, vname.size() - 8) + "-"; }
unsigned is = 0;
for (unsigned in = 0; in < stations.size(); in++) {
- if (stations[in] != 0 && name == stations[in]->name()) is++;
+ if (stations[in] != nullptr && name == stations[in]->name()) is++;
}
if (is == 0) {
ATH_MSG_VERBOSE(" new station type " << name << "," << clv->getShape()->type());
@@ -737,8 +737,8 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilderC
halfZ = trd->getZHalfLength();
// define enveloping volume
- const Trk::TrackingVolumeArray* confinedVolumes = 0;
- Trk::Volume* envelope = 0;
+ const Trk::TrackingVolumeArray* confinedVolumes = nullptr;
+ Trk::Volume* envelope = nullptr;
std::string shape = "Trd";
if (halfX1 == halfX2 && halfY1 == halfY2) shape = "Box";
if (shape == "Box") {
@@ -747,9 +747,9 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilderC
if (m_muonStationTypeBuilder)
confinedVolumes = m_muonStationTypeBuilder->processBoxStationComponents(cv, envBounds, cache);
// enveloping volume
- envelope = new Trk::Volume(0, envBounds);
+ envelope = new Trk::Volume(nullptr, envBounds);
} else if (shape == "Trd") {
- Trk::TrapezoidVolumeBounds* envBounds = 0;
+ Trk::TrapezoidVolumeBounds* envBounds = nullptr;
Amg::Transform3D* transf; // this pointer is passed to envelope below, and is valid only if envBounds is
// valid. Making it a unique_ptr results in core dump
if (halfY1 == halfY2) {
@@ -777,7 +777,7 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilderC
if (envelope) {
// ready to build the station prototype
const Trk::TrackingVolume* newType = new Trk::TrackingVolume(
- *envelope, m_muonMaterial, 0, confinedVolumes,
+ *envelope, m_muonMaterial, nullptr, confinedVolumes,
name); // this pointer is passed to typeStat below, which in turn is kept in vector stations.
delete envelope;
@@ -813,7 +813,7 @@ void Muon::MuonStationBuilderCond::glueComponents(const Trk::DetachedTrackingVol
const Trk::TrackingVolumeArray* volArray = stat->trackingVolume()->confinedVolumes();
if (volArray) {
if (volArray->arrayObjectsNumber() > 1) {
- const std::vector<const Trk::TrackingVolume*> components = volArray->arrayObjects();
+ const std::vector<const Trk::TrackingVolume*>& components = volArray->arrayObjects();
const Trk::BinUtility* binUtilityX = volArray->binUtility();
const Trk::CuboidVolumeBounds* cubVolBounds = dynamic_cast<const Trk::CuboidVolumeBounds*>(&(components[0]->volumeBounds()));
@@ -853,12 +853,12 @@ void Muon::MuonStationBuilderCond::identifyLayers(const Trk::DetachedTrackingVol
for (int gasgap = 0; gasgap < cscRE->Ngasgaps(); gasgap++) {
Identifier idi = m_idHelperSvc->cscIdHelper().channelID(cscRE->identify(), cscRE->ChamberLayer(), gasgap + 1, 0, 1);
const Trk::PlaneSurface* stripSurf = dynamic_cast<const Trk::PlaneSurface*>(&(cscRE->surface(idi)));
- const Amg::Vector3D gpi = stripSurf->center();
+ const Amg::Vector3D& gpi = stripSurf->center();
const Trk::TrackingVolume* assocVol = station->trackingVolume()->associatedSubVolume(gpi);
- const Trk::Layer* assocLay = 0;
+ const Trk::Layer* assocLay = nullptr;
if (assocVol) assocLay = assocVol->associatedLayer(gpi);
unsigned int iD = idi.get_identifier32().get_compact();
- if (assocVol && assocLay) assocLay->setLayerType(iD);
+ if (assocVol && assocLay) const_cast< Trk::Layer*>(assocLay)->setLayerType(iD);
if (assocLay) assocLay->setRef((assocLay->surfaceRepresentation().transform().inverse() * gpi)[1]);
}
} else {
@@ -898,7 +898,7 @@ void Muon::MuonStationBuilderCond::identifyLayers(const Trk::DetachedTrackingVol
int stationName = m_idHelperSvc->tgcIdHelper().stationName(oldId);
int stationEta = m_idHelperSvc->tgcIdHelper().stationEta(oldId);
Identifier stId = m_idHelperSvc->tgcIdHelper().elementID(stationName, stationEta, phi);
- station->layerRepresentation()->setLayerType(stId.get_identifier32().get_compact());
+ const_cast<Trk::Layer*>(station->layerRepresentation())->setLayerType(stId.get_identifier32().get_compact());
break;
}
phit++;
@@ -920,11 +920,11 @@ void Muon::MuonStationBuilderCond::identifyLayers(const Trk::DetachedTrackingVol
for (unsigned int il = 0; il < layers.size(); il++) {
wireId = m_idHelperSvc->tgcIdHelper().channelID(stationName.substr(0, 3), etaSt, phiSt, il + 1, 0, 1, true, validId);
if (!(*validId))
- layers[il]->setLayerType(1);
+ const_cast< Trk::Layer*>(layers[il])->setLayerType(1);
else {
if (!(*validId)) ATH_MSG_ERROR("invalid TGC channel:" << wireId);
unsigned int id = wireId.get_identifier32().get_compact();
- layers[il]->setLayerType(id);
+ const_cast< Trk::Layer*>(layers[il])->setLayerType(id);
// validation
Identifier checkId(layers[il]->layerType());
const Trk::PlaneSurface* stripSurf = dynamic_cast<const Trk::PlaneSurface*>(&(tgc->surface(checkId)));
@@ -936,7 +936,7 @@ void Muon::MuonStationBuilderCond::identifyLayers(const Trk::DetachedTrackingVol
}
}
delete validId;
- validId = 0;
+ validId = nullptr;
} else {
ATH_MSG_WARNING(name() << "tgcROE not found for :" << stationName << "," << eta << "," << phi);
}
@@ -952,7 +952,7 @@ void Muon::MuonStationBuilderCond::identifyLayers(const Trk::DetachedTrackingVol
for (unsigned int i = 0; i < cVols.size(); i++) {
if (cVols[i]->confinedLayers()) {
const std::vector<const Trk::Layer*> cLays = cVols[i]->confinedLayers()->arrayObjects();
- const MuonGM::MdtReadoutElement* mdtROE = 0;
+ const MuonGM::MdtReadoutElement* mdtROE = nullptr;
for (unsigned int il = 0; il < cLays.size(); il++) {
Identifier id(cLays[il]->layerType());
if (id.get_compact() > 0 && m_idHelperSvc->isMdt(id)) {
@@ -961,7 +961,7 @@ void Muon::MuonStationBuilderCond::identifyLayers(const Trk::DetachedTrackingVol
m_idHelperSvc->mdtIdHelper().tubeLayer(id), m_idHelperSvc->mdtIdHelper().tube(id));
if (!mdtROE) mdtROE = muonMgr->getMdtReadoutElement(newId);
unsigned int newid = newId.get_identifier32().get_compact();
- cLays[il]->setLayerType(newid);
+ const_cast< Trk::Layer*>(cLays[il])->setLayerType(newid);
// check reference position
if (mdtROE) {
double ref = cLays[il]->getRef();
@@ -991,7 +991,7 @@ void Muon::MuonStationBuilderCond::identifyLayers(const Trk::DetachedTrackingVol
m_idHelperSvc->rpcIdHelper().doubletPhi(id), m_idHelperSvc->rpcIdHelper().gasGap(id),
m_idHelperSvc->rpcIdHelper().measuresPhi(id), m_idHelperSvc->rpcIdHelper().strip(id));
int newid = newId.get_identifier32().get_compact();
- (*cLays)[il]->setLayerType(newid);
+ const_cast<Trk::Layer*>((*cLays)[il])->setLayerType(newid);
}
}
}
@@ -1029,11 +1029,11 @@ void Muon::MuonStationBuilderCond::identifyLayers(const Trk::DetachedTrackingVol
// end identification check
}
-void Muon::MuonStationBuilderCond::identifyPrototype(const Trk::TrackingVolume* station, int eta, int phi, Amg::Transform3D transf,
+void Muon::MuonStationBuilderCond::identifyPrototype(const Trk::TrackingVolume* station, int eta, int phi, const Amg::Transform3D& transf,
const MuonGM::MuonDetectorManager* muonMgr) const {
ATH_MSG_VERBOSE(name() << " identifying prototype ");
- const std::string stationName = station->volumeName();
+ const std::string& stationName = station->volumeName();
ATH_MSG_VERBOSE(" for station " << stationName);
const std::string stationNameShort = stationName.substr(0, 3);
const std::string stationFirstChar = stationName.substr(0, 1);
@@ -1061,7 +1061,7 @@ void Muon::MuonStationBuilderCond::identifyPrototype(const Trk::TrackingVolume*
Amg::Vector3D gp = multilayer->tubePos(id);
const Trk::Layer* assocLay = assocVol->associatedLayer(transf.inverse() * gp);
unsigned int iD = id.get_identifier32().get_compact();
- if (assocLay) assocLay->setLayerType(iD);
+ if (assocLay) const_cast<Trk::Layer*> (assocLay)->setLayerType(iD);
}
}
}
@@ -1134,7 +1134,7 @@ void Muon::MuonStationBuilderCond::identifyPrototype(const Trk::TrackingVolume*
rpc->surface(etaId).transform().inverse() * rpc->stripPos(etaId);
double swap = (fabs(locPos1[1] - locPos2[0]) > 0.001) ? 20000. : 0.;
unsigned int id = etaId.get_identifier32().get_compact();
- (*layers)[il]->setLayerType(id);
+ const_cast<Trk::Layer*>((*layers)[il])->setLayerType(id);
const Amg::Vector3D locPos =
(*layers)[il]->surfaceRepresentation().transform().inverse() * transf.inverse() *
rpc->surface(etaId).center();
@@ -1184,7 +1184,7 @@ void Muon::MuonStationBuilderCond::identifyPrototype(const Trk::TrackingVolume*
}
void Muon::MuonStationBuilderCond::getNSWStationsForTranslation(
- const GeoVPhysVol* pv, std::string name, Amg::Transform3D transform,
+ const GeoVPhysVol* pv, const std::string& name, const Amg::Transform3D& transform,
std::vector<std::pair<std::pair<const GeoLogVol*, Trk::MaterialProperties*>, std::vector<Amg::Transform3D> > >& vols,
std::vector<std::string>& volNames) const {
// special code to get the Sensitive volume of the sTGC and MM (so the gas volume) throught the Frame
@@ -1201,7 +1201,7 @@ void Muon::MuonStationBuilderCond::getNSWStationsForTranslation(
std::string childName = clv->getName();
ATH_MSG_DEBUG("getNSWStationsForTranslation child " << childName);
- if (childName == "") childName = "Spacer";
+ if (childName.empty()) childName = "Spacer";
if (childName.size() > 9 && childName.substr(childName.size() - 9, 9) == "Sensitive") {
std::stringstream st;
st << ic;
@@ -1247,8 +1247,7 @@ void Muon::MuonStationBuilderCond::getNSWStationsForTranslation(
Trk::MaterialProperties* nMat = new Trk::MaterialProperties(matComb);
// store mother volume (and not child = Frame)
std::pair<const GeoLogVol*, Trk::MaterialProperties*> cpair(pv->getLogVol(), nMat);
- vols.push_back(
- std::pair<std::pair<const GeoLogVol*, Trk::MaterialProperties*>, std::vector<Amg::Transform3D> >(cpair, volTr));
+ vols.emplace_back(cpair, volTr);
// store extensive name
volNames.push_back(cName);
ATH_MSG_VERBOSE("new NSW station volume added:"
diff --git a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationTypeBuilder.cxx b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationTypeBuilder.cxx
index dbc7737083f3..c21aacec4afa 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationTypeBuilder.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationTypeBuilder.cxx
@@ -121,7 +121,7 @@ const Trk::TrackingVolumeArray* Muon::MuonStationTypeBuilder::processBoxStationC
const GeoVPhysVol* cv = p.first;
const GeoLogVol* clv = cv->getLogVol();
const Amg::Transform3D& transf = p.second;
- Trk::VolumeBounds* volBounds = 0;
+ Trk::VolumeBounds* volBounds = nullptr;
Trk::Volume* vol;
if (clv->getShape()->type() == "Trd") {
const GeoTrd* trd = dynamic_cast<const GeoTrd*>(clv->getShape());
@@ -152,7 +152,7 @@ const Trk::TrackingVolumeArray* Muon::MuonStationTypeBuilder::processBoxStationC
int nameSize = vname.size() - 8;
if (cname.substr(0, nameSize) == vname.substr(0, nameSize)) cname = cname.substr(nameSize, cname.size() - nameSize);
// order in X
- if (compVol.size() == 0 || vol->center()[0] >= compVol.back()->center()[0]) {
+ if (compVol.empty() || vol->center()[0] >= compVol.back()->center()[0]) {
compVol.push_back(vol);
compName.push_back(cname);
compGeo.push_back(cv);
@@ -306,7 +306,7 @@ const Trk::TrackingVolumeArray* Muon::MuonStationTypeBuilder::processBoxStationC
}
if (compName[i].substr(0, 3) == "MDT") {
Trk::Volume* mdtVol;
- Trk::CuboidVolumeBounds* mdtBounds = 0;
+ Trk::CuboidVolumeBounds* mdtBounds = nullptr;
// remove z shift in transform !! bugfix !!
double zShift = compVol[i]->transform().translation()[2];
if (std::abs(zShift) > 0) { ATH_MSG_DEBUG("unusual z shift for subvolume:" << zShift); }
@@ -375,7 +375,7 @@ const Trk::TrackingVolumeArray* Muon::MuonStationTypeBuilder::processBoxStationC
}
}
// create VolumeArray (1DX)
- const Trk::TrackingVolumeArray* components = 0;
+ const Trk::TrackingVolumeArray* components = nullptr;
if (m_trackingVolumeArrayCreator) {
Trk::BinUtility* binUtility = new Trk::BinUtility(volSteps, Trk::BinningOption::open, Trk::BinningValue::binX);
components = m_trackingVolumeArrayCreator->cuboidVolumesArrayNav(trkVols, binUtility, false);
@@ -411,7 +411,7 @@ const Trk::TrackingVolumeArray* Muon::MuonStationTypeBuilder::processTrdStationC
const GeoLogVol* clv = cv->getLogVol();
Amg::Transform3D transf = p.second;
// retrieve volumes for components
- Trk::VolumeBounds* volBounds = 0;
+ Trk::VolumeBounds* volBounds = nullptr;
Trk::Volume* vol;
if (clv->getShape()->type() == "Trd") {
const GeoTrd* trd = dynamic_cast<const GeoTrd*>(clv->getShape());
@@ -451,7 +451,7 @@ const Trk::TrackingVolumeArray* Muon::MuonStationTypeBuilder::processTrdStationC
int nameSize = vname.size() - 8;
if (cname.substr(0, nameSize) == vname.substr(0, nameSize)) cname = cname.substr(nameSize, cname.size() - nameSize);
// order in X
- if (compVol.size() == 0 || vol->center()[0] >= compVol.back()->center()[0]) {
+ if (compVol.empty() || vol->center()[0] >= compVol.back()->center()[0]) {
compVol.push_back(vol);
compName.push_back(cname);
compGeo.push_back(cv);
@@ -517,7 +517,7 @@ const Trk::TrackingVolumeArray* Muon::MuonStationTypeBuilder::processTrdStationC
}
if (!compCubBounds && !compTrdBounds) {
std::cout << "unknown volume shape" << std::endl;
- return 0;
+ return nullptr;
}
// close spacer if no further components
if (openSpacer && compName[i].substr(0, 1) != "C" && compName[i].substr(0, 2) != "LB") {
@@ -586,8 +586,8 @@ const Trk::TrackingVolumeArray* Muon::MuonStationTypeBuilder::processTrdStationC
comp_processed = true;
}
if (compName[i].substr(0, 3) == "MDT") {
- Trk::Volume* mdtVol = 0;
- Trk::TrapezoidVolumeBounds* mdtBounds = 0;
+ Trk::Volume* mdtVol = nullptr;
+ Trk::TrapezoidVolumeBounds* mdtBounds = nullptr;
if (lowX == currX) {
mdtBounds = compTrdBounds ? new Trk::TrapezoidVolumeBounds(envX1, envX2, envY, compTrdBounds->halflengthZ())
: new Trk::TrapezoidVolumeBounds(envX1, envX2, envY, compCubBounds->halflengthX());
@@ -633,7 +633,7 @@ const Trk::TrackingVolumeArray* Muon::MuonStationTypeBuilder::processTrdStationC
}
}
// create VolumeArray (1DX)
- const Trk::TrackingVolumeArray* components = 0;
+ const Trk::TrackingVolumeArray* components = nullptr;
// Trk::BinUtility* binUtility = new Trk::BinUtility1DX( -(
// envelope->halflengthZ() ), volSteps);
if (m_trackingVolumeArrayCreator) {
@@ -667,7 +667,7 @@ const Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processMdtBox(Trk::Volu
const GeoLogVol* clv = cv->getLogVol();
const Amg::Transform3D& transfc = p.second;
// printChildren(cv);
- Trk::MaterialProperties* mdtMat = 0;
+ Trk::MaterialProperties* mdtMat = nullptr;
double xv = 0.;
int active = 0;
if ((clv->getName()).substr(0, 3) == "MDT") {
@@ -700,11 +700,11 @@ const Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processMdtBox(Trk::Volu
double volume = 8 * (cub->halflengthY()) * (cub->halflengthZ()) * xv;
cache.m_mdtFoamMat.push_back(std::make_unique<Trk::MaterialProperties>(getAveragedLayerMaterial(cv, volume, 2 * xv)));
}
- if (cache.m_mdtFoamMat.size()) mdtMat = cache.m_mdtFoamMat.back().get();
+ if (!cache.m_mdtFoamMat.empty()) mdtMat = cache.m_mdtFoamMat.back().get();
}
}
if (transfc.translation()[0] != currX) {
- if (x_array.size() == 0 || transfc.translation()[0] > x_array.back()) {
+ if (x_array.empty() || transfc.translation()[0] > x_array.back()) {
x_array.push_back(transfc.translation()[0]);
x_mat.push_back(mdtMat);
x_thickness.push_back(2 * xv);
@@ -747,9 +747,9 @@ const Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processMdtBox(Trk::Volu
}
}
// create layers //
- const Trk::PlaneLayer* layer;
+ Trk::PlaneLayer* layer;
double thickness = 0.;
- Trk::OverlapDescriptor* od = 0;
+ Trk::OverlapDescriptor* od = nullptr;
const Trk::CuboidVolumeBounds* volBounds = dynamic_cast<const Trk::CuboidVolumeBounds*>(&(vol->volumeBounds()));
if (volBounds) {
double yv = volBounds->halflengthY();
@@ -767,11 +767,10 @@ const Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processMdtBox(Trk::Volu
Trk::HomogeneousLayerMaterial mdtMaterial(matLay, 0.);
layer = new Trk::PlaneLayer(cTr, bounds, mdtMaterial, thickness, od);
layer->setRef(x_ref[iloop] - zShift);
- layers.push_back(layer);
-
// make preliminary identification of active layers
layer->setLayerType(x_active[iloop]);
- }
+ layers.push_back(layer);
+ }
}
// create the BinnedArray
std::vector<Trk::SharedObject<const Trk::Layer>> layerOrder;
@@ -780,7 +779,7 @@ const Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processMdtBox(Trk::Volu
// fix lower and upper bound of step vector to volume boundary
float minX = transf->translation()[0] - volBounds->halflengthX();
binSteps.push_back(minX);
- if (layers.size()) {
+ if (!layers.empty()) {
currX = minX;
for (unsigned int i = 0; i < layers.size(); i++) {
const Amg::Transform3D ltransf = layers[i]->transform();
@@ -796,10 +795,10 @@ const Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processMdtBox(Trk::Volu
// std::vector<double>(binSteps));
Trk::BinUtility* binUtility = new Trk::BinUtility(binSteps, Trk::BinningOption::open, Trk::BinningValue::binX);
- Trk::LayerArray* mdtLayerArray = 0;
+ Trk::LayerArray* mdtLayerArray = nullptr;
mdtLayerArray = new Trk::NavBinnedArray1D<Trk::Layer>(layerOrder, binUtility, new Amg::Transform3D(Trk::s_idTransform));
std::string name = "MDT";
- const Trk::TrackingVolume* mdt = new Trk::TrackingVolume(*vol, *m_muonMaterial, mdtLayerArray, 0, name);
+ const Trk::TrackingVolume* mdt = new Trk::TrackingVolume(*vol, *m_muonMaterial, mdtLayerArray, nullptr, name);
delete transf;
return mdt;
}
@@ -825,7 +824,7 @@ const Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processMdtTrd(Trk::Volu
double x2v = trd->getXHalfLength2();
if (x1v == x2v) xv = x1v;
}
- Trk::MaterialProperties* mdtMat = 0;
+ Trk::MaterialProperties* mdtMat = nullptr;
if ((clv->getName()).substr(0, 3) == "MDT") {
xv = 13.0055; // the half-thickness
if (!cache.m_mdtTubeMat) {
@@ -853,12 +852,12 @@ const Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processMdtTrd(Trk::Volu
double volume = 4 * (trd->minHalflengthX() + trd->maxHalflengthX()) * (trd->halflengthY()) * xv;
cache.m_mdtFoamMat.push_back(std::make_unique<Trk::MaterialProperties>(getAveragedLayerMaterial(cv, volume, 2 * xv)));
}
- if (cache.m_mdtFoamMat.size()) mdtMat = cache.m_mdtFoamMat.back().get();
+ if (!cache.m_mdtFoamMat.empty()) mdtMat = cache.m_mdtFoamMat.back().get();
}
}
if (transfc.translation()[0] != currX) {
- if (x_array.size() == 0 || transfc.translation()[0] > x_array.back()) {
+ if (x_array.empty() || transfc.translation()[0] > x_array.back()) {
x_array.push_back(transfc.translation()[0]);
x_mat.push_back(mdtMat);
x_thickness.push_back(2 * xv);
@@ -886,9 +885,9 @@ const Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processMdtTrd(Trk::Volu
}
}
// create layers //
- const Trk::PlaneLayer* layer;
+ Trk::PlaneLayer* layer;
double thickness = 0.;
- Trk::OverlapDescriptor* od = 0;
+ Trk::OverlapDescriptor* od = nullptr;
const Trk::TrapezoidVolumeBounds* volBounds = dynamic_cast<const Trk::TrapezoidVolumeBounds*>(&(vol->volumeBounds()));
if (volBounds) {
double x1v = volBounds->minHalflengthX();
@@ -904,11 +903,11 @@ const Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processMdtTrd(Trk::Volu
Trk::HomogeneousLayerMaterial mdtMaterial(matLay, 0.);
Amg::Transform3D cTr((*transf) * Amg::Translation3D(0., 0., x_array[iloop]));
layer = new Trk::PlaneLayer(cTr, bounds, mdtMaterial, thickness, od);
- layer->setRef(x_ref[iloop]);
- layers.push_back(layer);
// make preliminary identification of active layers
layer->setLayerType(x_active[iloop]);
- }
+ layer->setRef(x_ref[iloop]);
+ layers.push_back(layer);
+ }
// create the BinnedArray
std::vector<Trk::SharedObject<const Trk::Layer>> layerOrder;
@@ -916,7 +915,7 @@ const Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processMdtTrd(Trk::Volu
//
double minX = transf->translation()[0] - volBounds->halflengthZ();
binSteps.push_back(minX);
- if (layers.size()) {
+ if (!layers.empty()) {
currX = minX;
for (unsigned int i = 0; i < layers.size(); i++) {
const Amg::Transform3D ltransf = layers[i]->transform();
@@ -929,13 +928,13 @@ const Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processMdtTrd(Trk::Volu
binSteps.push_back(transf->translation()[0] + volBounds->halflengthZ());
}
Trk::BinUtility* binUtility = new Trk::BinUtility(binSteps, Trk::BinningOption::open, Trk::BinningValue::binX);
- Trk::LayerArray* mdtLayerArray = 0;
+ Trk::LayerArray* mdtLayerArray = nullptr;
mdtLayerArray = new Trk::NavBinnedArray1D<Trk::Layer>(layerOrder, binUtility, new Amg::Transform3D(Trk::s_idTransform));
std::string name = "MDT";
- const Trk::TrackingVolume* mdt = new Trk::TrackingVolume(*vol, *m_muonMaterial, mdtLayerArray, 0, name);
+ const Trk::TrackingVolume* mdt = new Trk::TrackingVolume(*vol, *m_muonMaterial, mdtLayerArray, nullptr, name);
return mdt;
}
- return 0;
+ return nullptr;
}
//
const Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processRpc(Trk::Volume*& vol, std::vector<const GeoVPhysVol*> gv,
@@ -948,7 +947,7 @@ const Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processRpc(Trk::Volume*
const GeoShape* shape = glv->getShape();
if (shape->type() != "Box" && shape->type() != "Trd") {
const GeoShapeSubtraction* sub = dynamic_cast<const GeoShapeSubtraction*>(shape);
- const GeoShape* subt = 0;
+ const GeoShape* subt = nullptr;
while (sub) {
subt = sub->getOpA();
sub = dynamic_cast<const GeoShapeSubtraction*>(subt);
@@ -961,9 +960,9 @@ const Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processRpc(Trk::Volume*
double ys = box->getYHalfLength();
double zs = box->getZHalfLength();
// translating into layer; x dimension defines thickness
- const Trk::PlaneLayer* layer;
+ Trk::PlaneLayer* layer;
double thickness = 2 * xs;
- Trk::OverlapDescriptor* od = 0;
+ Trk::OverlapDescriptor* od = nullptr;
Trk::RectangleBounds* rbounds = new Trk::RectangleBounds(ys, zs);
Trk::SharedObject<const Trk::SurfaceBounds> bounds(rbounds);
Amg::Transform3D cTr(transfc[ic] * Amg::AngleAxis3D(0.5 * M_PI, Amg::Vector3D(0., 1., 0.)) *
@@ -1014,9 +1013,9 @@ const Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processRpc(Trk::Volume*
double zs = trd->getZHalfLength();
// translating into layer; x dimension defines thickness
if (xs1 == xs2 && ys1 == ys2) {
- const Trk::PlaneLayer* layer;
+ Trk::PlaneLayer* layer;
double thickness = 2 * xs1;
- Trk::OverlapDescriptor* od = 0;
+ Trk::OverlapDescriptor* od = nullptr;
Trk::RectangleBounds* rbounds = new Trk::RectangleBounds(ys1, zs);
Trk::SharedObject<const Trk::SurfaceBounds> bounds(rbounds);
Amg::Transform3D cTr(transfc[ic] * Amg::AngleAxis3D(0.5 * M_PI, Amg::Vector3D(0., 1., 0.)) *
@@ -1041,8 +1040,8 @@ const Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processRpc(Trk::Volume*
// create Ded layer
Trk::HomogeneousLayerMaterial rpcMaterial(rpcMat, 0.);
layer = new Trk::PlaneLayer(cTr, bounds, rpcMaterial, thickness, od);
- layers.push_back(layer);
layer->setLayerType(0);
+ layers.push_back(layer);
} else {
// RPC layer; step one level below to resolve strip planes
// printChildren(gv[ic]);
@@ -1089,8 +1088,8 @@ const Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processRpc(Trk::Volume*
Trk::HomogeneousLayerMaterial rpcMaterial(rpcMat, 0.);
layer = new Trk::PlaneLayer(Amg::Transform3D(Amg::Translation3D(trgc.translation()) * (cTr)), bounds,
rpcMaterial, thickness, od);
- layers.push_back(layer);
layer->setLayerType(0);
+ layers.push_back(layer);
} else if ((gclv->getName()) == "Rpclayer") {
if (std::abs(gx - 6.85) > 0.001)
ATH_MSG_WARNING("processRpc() - unusual thickness of RPC (" << glv->getName() << ") layer :" << 2 * gx);
@@ -1106,8 +1105,8 @@ const Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processRpc(Trk::Volume*
Trk::HomogeneousLayerMaterial rpcMaterial(rpcMat, 0.);
layer = new Trk::PlaneLayer(Amg::Transform3D(Amg::Translation3D(trgc.translation()) * (cTr)), bounds,
rpcMaterial, thickness, od);
- layers.push_back(layer);
layer->setLayerType(1);
+ layers.push_back(layer);
} else {
ATH_MSG_WARNING(name() << "unknown RPC component? " << gclv->getName());
}
@@ -1155,7 +1154,7 @@ const Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processSpacer(Trk::Volu
Trk::Material cmat = m_materialConverter->convert(clv->getMaterial());
ATH_MSG_VERBOSE(" spacer material all X0 " << cmat.X0 << " L0 " << cmat.L0 << " A " << cmat.A << " Z " << cmat.Z << " rho "
<< cmat.rho);
- Trk::OverlapDescriptor* od = 0;
+ Trk::OverlapDescriptor* od = nullptr;
if (clv->getShape()->type() == "Box") {
const GeoBox* box = dynamic_cast<const GeoBox*>(clv->getShape());
double xs = box->getXHalfLength();
@@ -1163,7 +1162,7 @@ const Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processSpacer(Trk::Volu
double zs = box->getZHalfLength();
// translating into layer; find minimal size
const Trk::PlaneLayer* layer;
- Trk::RectangleBounds* rbounds = 0;
+ Trk::RectangleBounds* rbounds = nullptr;
double thickness = 0.;
Amg::Transform3D cTr;
if (zs <= xs && zs <= ys) { // x-y plane
@@ -1261,19 +1260,19 @@ const Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processSpacer(Trk::Volu
} else if (sub) {
std::vector<std::pair<const GeoShape*, Amg::Transform3D>> subVs;
const GeoShapeShift* shift = dynamic_cast<const GeoShapeShift*>(sub->getOpB());
- if (shift) subVs.push_back(std::pair<const GeoShape*, Amg::Transform3D>(shift->getOp(), shift->getX()));
+ if (shift) subVs.emplace_back(shift->getOp(), shift->getX());
const GeoShape* shape = sub->getOpA();
while (shape->type() == "Subtraction") {
const GeoShapeSubtraction* subtr = dynamic_cast<const GeoShapeSubtraction*>(shape);
const GeoShapeShift* shift = dynamic_cast<const GeoShapeShift*>(subtr->getOpB());
- if (shift) subVs.push_back(std::pair<const GeoShape*, Amg::Transform3D>(shift->getOp(), shift->getX()));
+ if (shift) subVs.emplace_back(shift->getOp(), shift->getX());
shape = subtr->getOpA();
}
const GeoBox* box = dynamic_cast<const GeoBox*>(shape);
if (box && subVs.size() == 4) {
- Trk::Volume* v1 = 0;
- Trk::Volume* v2 = 0;
- Trk::VolumeExcluder* volExcl = 0;
+ Trk::Volume* v1 = nullptr;
+ Trk::Volume* v2 = nullptr;
+ Trk::VolumeExcluder* volExcl = nullptr;
const GeoBox* sb1 = dynamic_cast<const GeoBox*>(subVs[0].first);
if (sb1)
v1 = new Trk::Volume(
@@ -1352,7 +1351,7 @@ const Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processSpacer(Trk::Volu
ATH_MSG_VERBOSE(" !m_resolveSpacer createLayerRepresentation ");
std::pair<const Trk::Layer*, const std::vector<const Trk::Layer*>*> laySpacer = createLayerRepresentation(spacer);
delete spacer;
- laySpacer.first->setLayerType(0);
+ const_cast<Trk::Layer*>(laySpacer.first)->setLayerType(0);
layers.clear();
layers.push_back(laySpacer.first);
std::vector<const Trk::Layer*>* spacerLays = new std::vector<const Trk::Layer*>(layers);
@@ -1434,7 +1433,7 @@ const Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processNSW(const MuonGM
return trVol;
}
-Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processCscStation(const GeoVPhysVol* mv, std::string name, Cache& cache) const {
+Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processCscStation(const GeoVPhysVol* mv, const std::string& name, Cache& cache) const {
// CSC stations have the particularity of displacement in Z between multilayer
// and the spacer - the envelope
// has to be derived from the component volume shape and component
@@ -1512,7 +1511,7 @@ Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processCscStation(const GeoVP
if (uni->getOpA()->type() == "Trd") {
const GeoTrd* trdA = dynamic_cast<const GeoTrd*>(uni->getOpA());
double xSize = trdA->getXHalfLength1();
- if (xSizes.size() > 0)
+ if (!xSizes.empty())
xSizes.push_back((std::abs(transform.translation()[0] - compTransf[ich - 1].translation()[0]) - xSizes.back()));
else
xSizes.push_back(xSize);
@@ -1525,7 +1524,7 @@ Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processCscStation(const GeoVP
if (clv->getShape()->type() == "Trd") {
const GeoTrd* trd = dynamic_cast<const GeoTrd*>(clv->getShape());
double xSize = trd->getXHalfLength1();
- if (xSizes.size() > 0)
+ if (!xSizes.empty())
xSizes.push_back(std::abs(transform.translation()[0] - compTransf[ich - 1].translation()[0]) - xSizes.back());
else
xSizes.push_back(xSize);
@@ -1573,15 +1572,15 @@ Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processCscStation(const GeoVP
compBounds = new Trk::TrapezoidVolumeBounds(xMin, xMax, y1, xSizes[ic]);
const Trk::LayerArray* cscLayerArray = processCSCTrdComponent(compGeoVol[ic], compBounds, compTr, cache);
Trk::Volume* compVol = new Trk::Volume(compTr, compBounds);
- const Trk::TrackingVolume* compTV = new Trk::TrackingVolume(*compVol, *m_muonMaterial, cscLayerArray, 0, compName[ic]);
+ const Trk::TrackingVolume* compTV = new Trk::TrackingVolume(*compVol, *m_muonMaterial, cscLayerArray, nullptr, compName[ic]);
delete compVol;
components.push_back(compTV);
xCurr += xSizes[ic];
volSteps.push_back(xCurr + xShift);
} // end components
} else {
- Trk::DoubleTrapezoidVolumeBounds* cscBounds = 0;
- Trk::DoubleTrapezoidVolumeBounds* compBounds = 0;
+ Trk::DoubleTrapezoidVolumeBounds* cscBounds = nullptr;
+ Trk::DoubleTrapezoidVolumeBounds* compBounds = nullptr;
if (xMed != xMin && xMed != xMax) {
envXMed += zShift / (y1 / (xMed - xMin) + y2 / (xMed - xMax));
envY1 = y1 * (envXMed - xMin) / (xMed - xMin);
@@ -1605,7 +1604,7 @@ Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processCscStation(const GeoVP
compBounds = new Trk::DoubleTrapezoidVolumeBounds(xMin, envXMed, xMax, envY1, envY2, xSizes[ic]);
const Trk::LayerArray* cscLayerArray = processCSCDiamondComponent(compGeoVol[ic], compBounds, compTr, cache);
Trk::Volume* compVol = new Trk::Volume(compTr, compBounds);
- const Trk::TrackingVolume* compTV = new Trk::TrackingVolume(*compVol, *m_muonMaterial, cscLayerArray, 0, compName[ic]);
+ const Trk::TrackingVolume* compTV = new Trk::TrackingVolume(*compVol, *m_muonMaterial, cscLayerArray, nullptr, compName[ic]);
delete compVol;
components.push_back(compTV);
xCurr += xSizes[ic];
@@ -1614,21 +1613,21 @@ Trk::TrackingVolume* Muon::MuonStationTypeBuilder::processCscStation(const GeoVP
}
// convert component volumes into array
- const Trk::BinnedArray<Trk::TrackingVolume>* compArray = 0;
- if (components.size() && isDiamond) {
+ const Trk::BinnedArray<Trk::TrackingVolume>* compArray = nullptr;
+ if (!components.empty() && isDiamond) {
if (m_trackingVolumeArrayCreator) {
Trk::BinUtility* binUtil = new Trk::BinUtility(volSteps, Trk::BinningOption::open, Trk::BinningValue::binX);
compArray = m_trackingVolumeArrayCreator->doubleTrapezoidVolumesArrayNav(components, binUtil, false);
}
}
- if (components.size() && !isDiamond) {
+ if (!components.empty() && !isDiamond) {
if (m_trackingVolumeArrayCreator) {
Trk::BinUtility* binUtil = new Trk::BinUtility(volSteps, Trk::BinningOption::open, Trk::BinningValue::binX);
compArray = m_trackingVolumeArrayCreator->trapezoidVolumesArrayNav(components, binUtil, false);
}
}
// ready to build the station prototype
- Trk::TrackingVolume* csc_station = new Trk::TrackingVolume(*envelope, *m_muonMaterial, 0, compArray, name);
+ Trk::TrackingVolume* csc_station = new Trk::TrackingVolume(*envelope, *m_muonMaterial, nullptr, compArray, name);
delete envelope;
return csc_station;
}
@@ -1643,7 +1642,7 @@ std::vector<const Trk::TrackingVolume*> Muon::MuonStationTypeBuilder::processTgc
const GeoVPhysVol* cv = p.first;
const GeoLogVol* clv = cv->getLogVol();
const Amg::Transform3D& transform = p.second;
- std::string tgc_name = clv->getName();
+ const std::string& tgc_name = clv->getName();
const GeoShape* baseShape = clv->getShape();
if (baseShape->type() == "Subtraction") {
const GeoShapeSubtraction* sub = dynamic_cast<const GeoShapeSubtraction*>(baseShape);
@@ -1664,7 +1663,7 @@ std::vector<const Trk::TrackingVolume*> Muon::MuonStationTypeBuilder::processTgc
envelope = new Trk::Volume(tTr, tgcBounds);
const Trk::LayerArray* tgcLayerArray = processTGCComponent(cv, tgcBounds, tTr, cache);
// ready to build the station prototype
- const Trk::TrackingVolume* tgc_station = new Trk::TrackingVolume(*envelope, *m_muonMaterial, tgcLayerArray, 0, tgc_name);
+ const Trk::TrackingVolume* tgc_station = new Trk::TrackingVolume(*envelope, *m_muonMaterial, tgcLayerArray, nullptr, tgc_name);
delete envelope;
if (tgc_station) tgc_stations.push_back(tgc_station);
@@ -1791,7 +1790,7 @@ void Muon::MuonStationTypeBuilder::collectMaterial(const GeoVPhysVol* pv, Trk::M
const GeoLogVol* lv = pv->getLogVol();
std::string nm = lv->getName();
- if (nm == "") nm = "Spacer";
+ if (nm.empty()) nm = "Spacer";
if (lv->getMaterial()->getName() != "Air" && nm.substr(0, 1) != "T") {
// get material properties from GeoModel
@@ -1888,7 +1887,7 @@ const Trk::LayerArray* Muon::MuonStationTypeBuilder::processCSCTrdComponent(cons
const GeoLogVol* clv = cv->getLogVol();
if (clv->getName() == "CscArCO2") {
double xl = transfc.translation()[0];
- if (x_array.size() == 0 || xl >= x_array.back()) {
+ if (x_array.empty() || xl >= x_array.back()) {
x_array.push_back(xl);
} else {
unsigned int ix = 0;
@@ -1897,7 +1896,7 @@ const Trk::LayerArray* Muon::MuonStationTypeBuilder::processCSCTrdComponent(cons
}
}
}
- if (x_array.size() == 0) {
+ if (x_array.empty()) {
x_array.push_back(0.);
x_mat.push_back(matCSC);
x_thickness.push_back(thickness);
@@ -1920,7 +1919,7 @@ const Trk::LayerArray* Muon::MuonStationTypeBuilder::processCSCTrdComponent(cons
xthick = 2 * fmin(x_array[il] - currX, halfZ - x_array[il]);
}
x_thickness.push_back(xthick);
- Trk::MaterialProperties xmatCSC(matCSC);
+ const Trk::MaterialProperties& xmatCSC(matCSC);
x_mat.push_back(xmatCSC);
currX = x_array[il] + 0.5 * x_thickness.back();
x_active.push_back(1);
@@ -1938,17 +1937,17 @@ const Trk::LayerArray* Muon::MuonStationTypeBuilder::processCSCTrdComponent(cons
x_active.push_back(0);
}
// create layers
- const Trk::PlaneLayer* layer;
- Trk::OverlapDescriptor* od = 0;
+ Trk::PlaneLayer* layer = nullptr;
+ Trk::OverlapDescriptor* od = nullptr;
Trk::TrapezoidBounds* tbounds = new Trk::TrapezoidBounds(minX, maxX, halfY);
Trk::SharedObject<const Trk::SurfaceBounds> bounds(tbounds);
for (unsigned int iloop = 0; iloop < x_array.size(); iloop++) {
Amg::Transform3D cTr((*transf) * Amg::Translation3D(0., 0., x_array[iloop])); // this won't work for multiple layers !!! //
Trk::HomogeneousLayerMaterial cscMaterial(x_mat[iloop], 0.);
layer = new Trk::PlaneLayer(cTr, bounds, cscMaterial, x_thickness[iloop], od);
- layers.push_back(layer);
// make preliminary identification of active layers
layer->setLayerType(x_active[iloop]);
+ layers.push_back(layer);
}
// create the BinnedArray
@@ -1958,7 +1957,7 @@ const Trk::LayerArray* Muon::MuonStationTypeBuilder::processCSCTrdComponent(cons
float lowX = -compBounds->halflengthZ() + xShift;
binSteps.push_back(lowX);
- if (layers.size()) {
+ if (!layers.empty()) {
currX = lowX - xShift;
for (unsigned int i = 0; i < layers.size() - 1; i++) {
const Amg::Transform3D ltransf(Amg::Translation3D(x_array[i], 0., 0.));
@@ -1973,7 +1972,7 @@ const Trk::LayerArray* Muon::MuonStationTypeBuilder::processCSCTrdComponent(cons
// Trk::BinUtility* binUtility = new Trk::BinUtility1DX( lowX, new
// std::vector<double>(binSteps));
Trk::BinUtility* binUtility = new Trk::BinUtility(binSteps, Trk::BinningOption::open, Trk::BinningValue::binX);
- Trk::LayerArray* cscLayerArray = 0;
+ Trk::LayerArray* cscLayerArray = nullptr;
cscLayerArray = new Trk::NavBinnedArray1D<Trk::Layer>(layerOrder, binUtility, new Amg::Transform3D(Trk::s_idTransform));
return cscLayerArray;
@@ -2014,7 +2013,7 @@ const Trk::LayerArray* Muon::MuonStationTypeBuilder::processCSCDiamondComponent(
const GeoLogVol* clv = cv->getLogVol();
if (clv->getName() == "CscArCO2") {
double xl = transfc.translation()[0];
- if (x_array.size() == 0 || xl >= x_array.back()) {
+ if (x_array.empty() || xl >= x_array.back()) {
x_array.push_back(xl);
} else {
unsigned int ix = 0;
@@ -2024,7 +2023,7 @@ const Trk::LayerArray* Muon::MuonStationTypeBuilder::processCSCDiamondComponent(
}
}
//
- if (x_array.size() == 0) {
+ if (x_array.empty()) {
x_array.push_back(0.);
x_mat.push_back(matCSC);
x_thickness.push_back(thickness);
@@ -2062,8 +2061,8 @@ const Trk::LayerArray* Muon::MuonStationTypeBuilder::processCSCDiamondComponent(
x_active.push_back(0);
}
// create layers
- const Trk::PlaneLayer* layer;
- Trk::OverlapDescriptor* od = 0;
+ Trk::PlaneLayer* layer = nullptr;
+ Trk::OverlapDescriptor* od = nullptr;
Trk::DiamondBounds* dbounds = new Trk::DiamondBounds(minX, medX, maxX, halfY1, halfY2);
;
Trk::SharedObject<const Trk::SurfaceBounds> bounds(dbounds);
@@ -2083,7 +2082,7 @@ const Trk::LayerArray* Muon::MuonStationTypeBuilder::processCSCDiamondComponent(
double lowX = -compBounds->halflengthZ() + xShift;
binSteps.push_back(lowX);
- if (layers.size()) {
+ if (!layers.empty()) {
currX = lowX;
for (unsigned int i = 0; i < layers.size() - 1; i++) {
const Amg::Transform3D ltransf(Amg::Translation3D(x_array[i], 0., 0.));
@@ -2098,7 +2097,7 @@ const Trk::LayerArray* Muon::MuonStationTypeBuilder::processCSCDiamondComponent(
// Trk::BinUtility* binUtility = new Trk::BinUtility1DX( lowX, new
// std::vector<double>(binSteps));
Trk::BinUtility* binUtility = new Trk::BinUtility(binSteps, Trk::BinningOption::open, Trk::BinningValue::binX);
- Trk::LayerArray* cscLayerArray = 0;
+ Trk::LayerArray* cscLayerArray = nullptr;
cscLayerArray = new Trk::NavBinnedArray1D<Trk::Layer>(layerOrder, binUtility, new Amg::Transform3D(Trk::s_idTransform));
return cscLayerArray;
@@ -2143,7 +2142,7 @@ const Trk::LayerArray* Muon::MuonStationTypeBuilder::processTGCComponent(const G
const GeoLogVol* clv = cv->getLogVol();
if (clv->getName() == "muo::TGCGas") {
double xl = transfc.translation()[0];
- if (x_array.size() == 0 || xl >= x_array.back()) {
+ if (x_array.empty() || xl >= x_array.back()) {
x_array.push_back(xl);
} else {
unsigned int ix = 0;
@@ -2153,7 +2152,7 @@ const Trk::LayerArray* Muon::MuonStationTypeBuilder::processTGCComponent(const G
}
}
double activeThick = 0.;
- if (x_array.size() == 0) {
+ if (x_array.empty()) {
x_array.push_back(0.);
x_thickness.push_back(thickness);
activeThick = thickness;
@@ -2177,8 +2176,8 @@ const Trk::LayerArray* Muon::MuonStationTypeBuilder::processTGCComponent(const G
matTGC = Trk::MaterialProperties(activeThick, scale * matTGC.x0(), scale * matTGC.l0(), matTGC.averageA(), matTGC.averageZ(),
matTGC.averageRho() / scale);
// create layers
- const Trk::PlaneLayer* layer;
- Trk::OverlapDescriptor* od = 0;
+ Trk::PlaneLayer* layer = nullptr;
+ Trk::OverlapDescriptor* od = nullptr;
Trk::TrapezoidBounds* tbounds = new Trk::TrapezoidBounds(minX, maxX, halfY);
;
Trk::SharedObject<const Trk::SurfaceBounds> bounds(tbounds);
@@ -2186,9 +2185,9 @@ const Trk::LayerArray* Muon::MuonStationTypeBuilder::processTGCComponent(const G
Amg::Transform3D cTr(Amg::Translation3D(x_array[iloop], 0., 0.) * (*transf)); // this won't work for multiple layers !!! //
Trk::HomogeneousLayerMaterial tgcMaterial(matTGC, 0.);
layer = new Trk::PlaneLayer(cTr, bounds, tgcMaterial, x_thickness[iloop], od);
- layers.push_back(layer);
// make preliminary identification of active layers
layer->setLayerType(1);
+ layers.push_back(layer);
}
// create the BinnedArray
std::vector<Trk::SharedObject<const Trk::Layer>> layerOrder;
@@ -2197,7 +2196,7 @@ const Trk::LayerArray* Muon::MuonStationTypeBuilder::processTGCComponent(const G
float xShift = transf->translation()[0];
float lowX = -halfZ + xShift;
binSteps.push_back(lowX);
- if (layers.size()) {
+ if (!layers.empty()) {
currX = lowX;
for (unsigned int i = 0; i < layers.size() - 1; i++) {
const Amg::Transform3D ltransf(Amg::Translation3D(x_array[i], 0., 0.));
@@ -2210,7 +2209,7 @@ const Trk::LayerArray* Muon::MuonStationTypeBuilder::processTGCComponent(const G
binSteps.push_back(halfZ + xShift);
}
Trk::BinUtility* binUtility = new Trk::BinUtility(binSteps, Trk::BinningOption::open, Trk::BinningValue::binX);
- Trk::LayerArray* tgcLayerArray = 0;
+ Trk::LayerArray* tgcLayerArray = nullptr;
tgcLayerArray = new Trk::NavBinnedArray1D<Trk::Layer>(layerOrder, binUtility, new Amg::Transform3D(Trk::s_idTransform));
return tgcLayerArray;
@@ -2267,7 +2266,7 @@ double Muon::MuonStationTypeBuilder::decodeX(const GeoShape* sh) const {
std::pair<const Trk::Layer*, const std::vector<const Trk::Layer*>*> Muon::MuonStationTypeBuilder::createLayerRepresentation(
const Trk::TrackingVolume* trVol) const {
- const Trk::Layer* layRepr = 0;
+ const Trk::Layer* layRepr = nullptr;
if (!trVol) return std::pair<const Trk::Layer*, const std::vector<const Trk::Layer*>*>(layRepr, 0);
std::vector<const Trk::Layer*>* multi = new std::vector<const Trk::Layer*>;
@@ -2291,7 +2290,7 @@ std::pair<const Trk::Layer*, const std::vector<const Trk::Layer*>*> Muon::MuonSt
}
}
- const Trk::PlaneLayer* layer = nullptr;
+ Trk::PlaneLayer* layer = nullptr;
if (cubBounds) {
double thickness = 2 * cubBounds->halflengthX();
@@ -2302,7 +2301,7 @@ std::pair<const Trk::Layer*, const std::vector<const Trk::Layer*>*> Muon::MuonSt
// (&(*(surfs))[0]->bounds());
Trk::RectangleBounds* rbounds = new Trk::RectangleBounds(cubBounds->halflengthY(), cubBounds->halflengthZ());
Trk::SharedObject<const Trk::SurfaceBounds> bounds(rbounds);
- Trk::OverlapDescriptor* od = 0;
+ Trk::OverlapDescriptor* od = nullptr;
Trk::MaterialProperties matProp = collectStationMaterial(trVol, sf);
ATH_MSG_VERBOSE(" collectStationMaterial cub " << matProp);
if (matProp.thickness() > thickness) {
@@ -2340,7 +2339,7 @@ std::pair<const Trk::Layer*, const std::vector<const Trk::Layer*>*> Muon::MuonSt
const std::vector<const Trk::Surface*>* surfs = trdBounds->decomposeToSurfaces(Trk::s_idTransform);
const Trk::TrapezoidBounds* tbounds = dynamic_cast<const Trk::TrapezoidBounds*>(&(*(surfs))[0]->bounds());
Trk::SharedObject<const Trk::SurfaceBounds> bounds(new Trk::TrapezoidBounds(*tbounds));
- Trk::OverlapDescriptor* od = 0;
+ Trk::OverlapDescriptor* od = nullptr;
Trk::MaterialProperties matProp = collectStationMaterial(trVol, sf);
ATH_MSG_VERBOSE(" collectStationMaterial trd " << matProp << trVol->volumeName());
if (matProp.thickness() > thickness) {
@@ -2373,7 +2372,7 @@ std::pair<const Trk::Layer*, const std::vector<const Trk::Layer*>*> Muon::MuonSt
const std::vector<const Trk::Surface*>* surfs = dtrdBounds->decomposeToSurfaces(Trk::s_idTransform);
const Trk::DiamondBounds* dbounds = dynamic_cast<const Trk::DiamondBounds*>(&(*(surfs))[0]->bounds());
Trk::SharedObject<const Trk::SurfaceBounds> bounds(new Trk::DiamondBounds(*dbounds));
- Trk::OverlapDescriptor* od = 0;
+ Trk::OverlapDescriptor* od = nullptr;
Trk::MaterialProperties matProp = collectStationMaterial(trVol, sf);
ATH_MSG_VERBOSE(" collectStationMaterial dtrd " << matProp);
if (matProp.thickness() > thickness) {
@@ -2403,15 +2402,15 @@ std::pair<const Trk::Layer*, const std::vector<const Trk::Layer*>*> Muon::MuonSt
layRepr = layer;
- if (!multi->size()) {
+ if (multi->empty()) {
delete multi;
- multi = 0;
+ multi = nullptr;
}
return std::pair<const Trk::Layer*, const std::vector<const Trk::Layer*>*>(layRepr, multi);
}
Identifier Muon::MuonStationTypeBuilder::identifyNSW(const MuonGM::MuonDetectorManager* muonDetMgr, const std::string& vName,
- const Amg::Transform3D& transf) const {
+ const Amg::Transform3D& transf) {
Identifier id(0);
if ((vName[0] == 'Q') || (vName[0] == 'M')) { // NSW stations
@@ -2453,11 +2452,11 @@ Identifier Muon::MuonStationTypeBuilder::identifyNSW(const MuonGM::MuonDetectorM
return id;
}
-const Trk::Layer* Muon::MuonStationTypeBuilder::createLayer(const MuonGM::MuonDetectorManager* muonDetMgr, const Trk::TrackingVolume* trVol,
- Trk::MaterialProperties* matEx, Amg::Transform3D& transf) const {
+Trk::Layer* Muon::MuonStationTypeBuilder::createLayer(const MuonGM::MuonDetectorManager* muonDetMgr, const Trk::TrackingVolume* trVol,
+ Trk::MaterialProperties* matEx, Amg::Transform3D& transf) const {
// identification first
- std::string vName = trVol->volumeName().substr(trVol->volumeName().find("-") + 1);
+ std::string vName = trVol->volumeName().substr(trVol->volumeName().find('-') + 1);
const Trk::RotatedTrapezoidBounds* rtrd = nullptr;
const Trk::TrapezoidBounds* trd = nullptr;
@@ -2516,7 +2515,7 @@ const Trk::Layer* Muon::MuonStationTypeBuilder::createLayer(const MuonGM::MuonDe
}
}
- const Trk::Layer* layRepr = nullptr;
+ Trk::Layer* layRepr = nullptr;
if (!trVol) return layRepr;
// retrieve volume envelope
@@ -2575,11 +2574,11 @@ const Trk::Layer* Muon::MuonStationTypeBuilder::createLayer(const MuonGM::MuonDe
return layRepr;
}
- const Trk::PlaneLayer* layer = 0;
+ Trk::PlaneLayer* layer = nullptr;
if (cubBounds) {
double thickness = 2 * cubBounds->halflengthX();
- Trk::OverlapDescriptor* od = 0;
+ Trk::OverlapDescriptor* od = nullptr;
double scale = matEx->thickness() / thickness;
Trk::MaterialProperties matProp(thickness, matEx->x0() / scale, matEx->l0() / scale, matEx->averageA(), matEx->averageZ(),
scale * matEx->averageRho());
@@ -2592,7 +2591,7 @@ const Trk::Layer* Muon::MuonStationTypeBuilder::createLayer(const MuonGM::MuonDe
bounds, mat, thickness, od, 1);
} else if (trdBounds) {
double thickness = 2 * trdBounds->halflengthZ();
- Trk::OverlapDescriptor* od = 0;
+ Trk::OverlapDescriptor* od = nullptr;
double scale = matEx->thickness() / thickness;
Trk::MaterialProperties matProp(thickness, matEx->x0() / scale, matEx->l0() / scale, matEx->averageA(), matEx->averageZ(),
scale * matEx->averageRho());
@@ -2622,7 +2621,7 @@ const Trk::Layer* Muon::MuonStationTypeBuilder::createLayer(const MuonGM::MuonDe
const std::vector<const Trk::Surface*>* surfs = dtrdBounds->decomposeToSurfaces(Amg::Transform3D(Trk::s_idTransform));
const Trk::DiamondBounds* dbounds = dynamic_cast<const Trk::DiamondBounds*>(&(*(surfs))[0]->bounds());
Trk::SharedObject<const Trk::SurfaceBounds> bounds(new Trk::DiamondBounds(*dbounds));
- Trk::OverlapDescriptor* od = 0;
+ Trk::OverlapDescriptor* od = nullptr;
double scale = matEx->thickness() / thickness;
Trk::MaterialProperties matProp(thickness, matEx->x0() / scale, matEx->l0() / scale, matEx->averageA(), matEx->averageZ(),
scale * matEx->averageRho());
diff --git a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonTrackingGeometryBuilder.cxx b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonTrackingGeometryBuilder.cxx
index 815d00677ba5..28442d38e9a5 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonTrackingGeometryBuilder.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonTrackingGeometryBuilder.cxx
@@ -15,6 +15,8 @@
// Units
#include "GaudiKernel/SystemOfUnits.h"
// Trk
+#include <cmath>
+
#include <fstream>
#include "TrkDetDescrUtils/BinUtility.h"
@@ -52,8 +54,8 @@ Muon::MuonTrackingGeometryBuilder::MuonTrackingGeometryBuilder(const std::string
m_innerShieldRadius(850.),
m_outerShieldRadius(1500.),
m_diskShieldZ(6915.),
- m_stations(0),
- m_inertObjs(0) {
+ m_stations(nullptr),
+ m_inertObjs(nullptr) {
declareInterface<Trk::IGeometryBuilder>(this);
}
@@ -152,8 +154,8 @@ const Trk::TrackingGeometry* Muon::MuonTrackingGeometryBuilder::trackingGeometry
aLVC.m_muonMaterial = Trk::Material(10e10, 10e10, 0., 0., 0.); // default material properties
// dummy substructures
- const Trk::LayerArray* dummyLayers = 0;
- const Trk::TrackingVolumeArray* dummyVolumes = 0;
+ const Trk::LayerArray* dummyLayers = nullptr;
+ const Trk::TrackingVolumeArray* dummyVolumes = nullptr;
////////////////////////////////////////////////////////////////////////////////////////////////////////
// Envelope definition (cutouts)
@@ -222,7 +224,7 @@ const Trk::TrackingGeometry* Muon::MuonTrackingGeometryBuilder::trackingGeometry
if (m_muonSimple) {
Trk::VolumeBounds* globalBounds = new Trk::CylinderVolumeBounds(aLVC.m_outerBarrelRadius, aLVC.m_outerEndcapZ);
Trk::TrackingVolume* topVolume =
- new Trk::TrackingVolume(0, globalBounds, aLVC.m_muonMaterial, dummyLayers, dummyVolumes, "GlobalVolume");
+ new Trk::TrackingVolume(nullptr, globalBounds, aLVC.m_muonMaterial, dummyLayers, dummyVolumes, "GlobalVolume");
aLVC.m_standaloneTrackingVolume = topVolume;
return new Trk::TrackingGeometry(topVolume);
}
@@ -287,7 +289,7 @@ const Trk::TrackingGeometry* Muon::MuonTrackingGeometryBuilder::trackingGeometry
std::vector<const Trk::TrackingVolume*> enclosedCentralFaceVolumes = enclosedDetGlueVolumes.glueVolumes(Trk::cylinderCover);
std::vector<const Trk::TrackingVolume*> enclosedNegativeFaceVolumes = enclosedDetGlueVolumes.glueVolumes(Trk::negativeFaceXY);
std::vector<const Trk::TrackingVolume*> enclosedPositiveFaceVolumes = enclosedDetGlueVolumes.glueVolumes(Trk::positiveFaceXY);
- if (enclosedCentralFaceVolumes.size()) {
+ if (!enclosedCentralFaceVolumes.empty()) {
const Trk::CylinderVolumeBounds* cylR =
dynamic_cast<const Trk::CylinderVolumeBounds*>(&(enclosedCentralFaceVolumes[0]->volumeBounds()));
if (cylR && cylR->outerRadius() != enclosedDetectorOuterRadius) {
@@ -296,7 +298,7 @@ const Trk::TrackingGeometry* Muon::MuonTrackingGeometryBuilder::trackingGeometry
name() << " enclosed volume envelope outer radius does not correspond to radius of glue volumes : adjusted ");
}
}
- if (enclosedNegativeFaceVolumes.size() && enclosedPositiveFaceVolumes.size()) {
+ if (!enclosedNegativeFaceVolumes.empty() && !enclosedPositiveFaceVolumes.empty()) {
double negZ = -enclosedDetectorHalfZ;
double posZ = enclosedDetectorHalfZ;
const Trk::CylinderVolumeBounds* cylN =
@@ -376,7 +378,7 @@ const Trk::TrackingGeometry* Muon::MuonTrackingGeometryBuilder::trackingGeometry
if (envelopeDefs[i].first > rmax) rmax = envelopeDefs[i].first;
if (fabs(envelopeDefs[i].second) > zmax) zmax = fabs(envelopeDefs[i].second);
}
- if (envelopeDefs.size()) {
+ if (!envelopeDefs.empty()) {
if (rmax > 0. && rmax <= aLVC.m_innerBarrelRadius && zmax > 0. && zmax <= m_barrelZ) {
enclosedBounds = new Trk::CylinderVolumeBounds(rmax, zmax);
} else {
@@ -388,7 +390,7 @@ const Trk::TrackingGeometry* Muon::MuonTrackingGeometryBuilder::trackingGeometry
}
if (!enclosedBounds) enclosedBounds = new Trk::CylinderVolumeBounds(aLVC.m_innerBarrelRadius, m_barrelZ);
- enclosed = new Trk::TrackingVolume(0, enclosedBounds, aLVC.m_muonMaterial, dummyLayers, dummyVolumes, m_entryVolume);
+ enclosed = new Trk::TrackingVolume(nullptr, enclosedBounds, aLVC.m_muonMaterial, dummyLayers, dummyVolumes, m_entryVolume);
enclosed->registerColorCode(0);
ATH_MSG_DEBUG(" register Barrel m_entryVolume " << m_entryVolume);
}
@@ -397,10 +399,10 @@ const Trk::TrackingGeometry* Muon::MuonTrackingGeometryBuilder::trackingGeometry
for (unsigned int i = 0; i < envelopeDefs.size(); i++) {
// ATH_MSG_VERBOSE( "Rz pair:"<< i<<":"<< envelopeDefs[i].first<<","<<envelopeDefs[i].second );
- if (aLVC.m_msCutoutsIn.size() && aLVC.m_msCutoutsIn.back().second == -aLVC.m_outerEndcapZ) break;
- if (!aLVC.m_msCutoutsIn.size() || fabs(aLVC.m_msCutoutsIn.back().second) > m_barrelZ || fabs(envelopeDefs[i].second) > m_barrelZ)
+ if (!aLVC.m_msCutoutsIn.empty() && aLVC.m_msCutoutsIn.back().second == -aLVC.m_outerEndcapZ) break;
+ if (aLVC.m_msCutoutsIn.empty() || fabs(aLVC.m_msCutoutsIn.back().second) > m_barrelZ || fabs(envelopeDefs[i].second) > m_barrelZ)
aLVC.m_msCutoutsIn.push_back(envelopeDefs[i]);
- else if (aLVC.m_msCutoutsIn.size() && aLVC.m_msCutoutsIn.back().second == m_barrelZ &&
+ else if (!aLVC.m_msCutoutsIn.empty() && aLVC.m_msCutoutsIn.back().second == m_barrelZ &&
aLVC.m_msCutoutsIn.back().first != aLVC.m_innerBarrelRadius) {
aLVC.m_msCutoutsIn.push_back(RZPair(aLVC.m_innerBarrelRadius, m_barrelZ));
aLVC.m_msCutoutsIn.push_back(RZPair(aLVC.m_innerBarrelRadius, -m_barrelZ));
@@ -450,7 +452,7 @@ const Trk::TrackingGeometry* Muon::MuonTrackingGeometryBuilder::trackingGeometry
// muon barrel
barrelBounds = new Trk::CylinderVolumeBounds(aLVC.m_innerBarrelRadius, aLVC.m_outerBarrelRadius, m_diskShieldZ);
- Trk::Volume barrelVol(0, barrelBounds);
+ Trk::Volume barrelVol(nullptr, barrelBounds);
// process volume
// barrel
if (aLVC.m_adjustStatic && aLVC.m_static3d)
@@ -742,7 +744,7 @@ StatusCode Muon::MuonTrackingGeometryBuilder::finalize() {
ATH_MSG_INFO(name() << " finalize() successful");
return StatusCode::SUCCESS;
}
-const Muon::Span* Muon::MuonTrackingGeometryBuilder::findVolumeSpan(const Trk::VolumeBounds* volBounds, Amg::Transform3D transform,
+const Muon::Span* Muon::MuonTrackingGeometryBuilder::findVolumeSpan(const Trk::VolumeBounds* volBounds, const Amg::Transform3D& transform,
double zTol, double phiTol, LocalVariablesContainer& aLVC) const {
if (!volBounds) return nullptr;
// volume shape
@@ -803,65 +805,65 @@ const Muon::Span* Muon::MuonTrackingGeometryBuilder::findVolumeSpan(const Trk::V
double cylZcorr = 0.;
if (box) {
- edges.push_back(Amg::Vector3D(box->halflengthX(), box->halflengthY(), box->halflengthZ()));
- edges.push_back(Amg::Vector3D(-box->halflengthX(), box->halflengthY(), box->halflengthZ()));
- edges.push_back(Amg::Vector3D(box->halflengthX(), -box->halflengthY(), box->halflengthZ()));
- edges.push_back(Amg::Vector3D(-box->halflengthX(), -box->halflengthY(), box->halflengthZ()));
- edges.push_back(Amg::Vector3D(box->halflengthX(), box->halflengthY(), -box->halflengthZ()));
- edges.push_back(Amg::Vector3D(-box->halflengthX(), box->halflengthY(), -box->halflengthZ()));
- edges.push_back(Amg::Vector3D(box->halflengthX(), -box->halflengthY(), -box->halflengthZ()));
- edges.push_back(Amg::Vector3D(-box->halflengthX(), -box->halflengthY(), -box->halflengthZ()));
- edges.push_back(Amg::Vector3D(0., 0., -box->halflengthZ()));
- edges.push_back(Amg::Vector3D(0., 0., box->halflengthZ()));
- edges.push_back(Amg::Vector3D(-box->halflengthX(), 0., 0.));
- edges.push_back(Amg::Vector3D(box->halflengthX(), 0., 0.));
- edges.push_back(Amg::Vector3D(0., -box->halflengthY(), 0.));
- edges.push_back(Amg::Vector3D(0., box->halflengthY(), 0.));
+ edges.emplace_back(box->halflengthX(), box->halflengthY(), box->halflengthZ());
+ edges.emplace_back(-box->halflengthX(), box->halflengthY(), box->halflengthZ());
+ edges.emplace_back(box->halflengthX(), -box->halflengthY(), box->halflengthZ());
+ edges.emplace_back(-box->halflengthX(), -box->halflengthY(), box->halflengthZ());
+ edges.emplace_back(box->halflengthX(), box->halflengthY(), -box->halflengthZ());
+ edges.emplace_back(-box->halflengthX(), box->halflengthY(), -box->halflengthZ());
+ edges.emplace_back(box->halflengthX(), -box->halflengthY(), -box->halflengthZ());
+ edges.emplace_back(-box->halflengthX(), -box->halflengthY(), -box->halflengthZ());
+ edges.emplace_back(0., 0., -box->halflengthZ());
+ edges.emplace_back(0., 0., box->halflengthZ());
+ edges.emplace_back(-box->halflengthX(), 0., 0.);
+ edges.emplace_back(box->halflengthX(), 0., 0.);
+ edges.emplace_back(0., -box->halflengthY(), 0.);
+ edges.emplace_back(0., box->halflengthY(), 0.);
}
if (trd) {
// std::cout << " Trapezoid minHalflengthX " << trd->minHalflengthX() << " maxHalflengthX() " << trd->maxHalflengthX() << "
// halflengthY() " << trd->halflengthY() << " halflengthZ " << trd->halflengthZ() << std::endl;
- edges.push_back(Amg::Vector3D(trd->maxHalflengthX(), trd->halflengthY(), trd->halflengthZ()));
- edges.push_back(Amg::Vector3D(-trd->maxHalflengthX(), trd->halflengthY(), trd->halflengthZ()));
- edges.push_back(Amg::Vector3D(trd->minHalflengthX(), -trd->halflengthY(), trd->halflengthZ()));
- edges.push_back(Amg::Vector3D(-trd->minHalflengthX(), -trd->halflengthY(), trd->halflengthZ()));
- edges.push_back(Amg::Vector3D(trd->maxHalflengthX(), trd->halflengthY(), -trd->halflengthZ()));
- edges.push_back(Amg::Vector3D(-trd->maxHalflengthX(), trd->halflengthY(), -trd->halflengthZ()));
- edges.push_back(Amg::Vector3D(trd->minHalflengthX(), -trd->halflengthY(), -trd->halflengthZ()));
- edges.push_back(Amg::Vector3D(-trd->minHalflengthX(), -trd->halflengthY(), -trd->halflengthZ()));
- edges.push_back(Amg::Vector3D(0., 0., -trd->halflengthZ()));
- edges.push_back(Amg::Vector3D(0., 0., trd->halflengthZ()));
- edges.push_back(Amg::Vector3D(-0.5 * (trd->minHalflengthX() - trd->maxHalflengthX()), 0., 0.));
- edges.push_back(Amg::Vector3D(0.5 * (trd->minHalflengthX() - trd->maxHalflengthX()), 0., 0.));
- edges.push_back(Amg::Vector3D(0., -trd->halflengthY(), 0.));
- edges.push_back(Amg::Vector3D(0., trd->halflengthY(), 0.));
+ edges.emplace_back(trd->maxHalflengthX(), trd->halflengthY(), trd->halflengthZ());
+ edges.emplace_back(-trd->maxHalflengthX(), trd->halflengthY(), trd->halflengthZ());
+ edges.emplace_back(trd->minHalflengthX(), -trd->halflengthY(), trd->halflengthZ());
+ edges.emplace_back(-trd->minHalflengthX(), -trd->halflengthY(), trd->halflengthZ());
+ edges.emplace_back(trd->maxHalflengthX(), trd->halflengthY(), -trd->halflengthZ());
+ edges.emplace_back(-trd->maxHalflengthX(), trd->halflengthY(), -trd->halflengthZ());
+ edges.emplace_back(trd->minHalflengthX(), -trd->halflengthY(), -trd->halflengthZ());
+ edges.emplace_back(-trd->minHalflengthX(), -trd->halflengthY(), -trd->halflengthZ());
+ edges.emplace_back(0., 0., -trd->halflengthZ());
+ edges.emplace_back(0., 0., trd->halflengthZ());
+ edges.emplace_back(-0.5 * (trd->minHalflengthX() - trd->maxHalflengthX()), 0., 0.);
+ edges.emplace_back(0.5 * (trd->minHalflengthX() - trd->maxHalflengthX()), 0., 0.);
+ edges.emplace_back(0., -trd->halflengthY(), 0.);
+ edges.emplace_back(0., trd->halflengthY(), 0.);
}
if (dtrd) {
- edges.push_back(Amg::Vector3D(dtrd->maxHalflengthX(), 2 * dtrd->halflengthY2(), dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(-dtrd->maxHalflengthX(), 2 * dtrd->halflengthY2(), dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(dtrd->medHalflengthX(), 0., dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(-dtrd->medHalflengthX(), 0., dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(dtrd->minHalflengthX(), -2 * dtrd->halflengthY1(), dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(-dtrd->minHalflengthX(), -2 * dtrd->halflengthY1(), dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(dtrd->maxHalflengthX(), 2 * dtrd->halflengthY2(), -dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(-dtrd->maxHalflengthX(), 2 * dtrd->halflengthY2(), -dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(dtrd->medHalflengthX(), 0., -dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(-dtrd->medHalflengthX(), 0., -dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(dtrd->minHalflengthX(), -2 * dtrd->halflengthY1(), -dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(-dtrd->minHalflengthX(), -2 * dtrd->halflengthY1(), -dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(0., 0., -dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(0., 0., dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(0., -2 * dtrd->halflengthY1(), 0.));
- edges.push_back(Amg::Vector3D(0., 2 * dtrd->halflengthY2(), 0.));
+ edges.emplace_back(dtrd->maxHalflengthX(), 2 * dtrd->halflengthY2(), dtrd->halflengthZ());
+ edges.emplace_back(-dtrd->maxHalflengthX(), 2 * dtrd->halflengthY2(), dtrd->halflengthZ());
+ edges.emplace_back(dtrd->medHalflengthX(), 0., dtrd->halflengthZ());
+ edges.emplace_back(-dtrd->medHalflengthX(), 0., dtrd->halflengthZ());
+ edges.emplace_back(dtrd->minHalflengthX(), -2 * dtrd->halflengthY1(), dtrd->halflengthZ());
+ edges.emplace_back(-dtrd->minHalflengthX(), -2 * dtrd->halflengthY1(), dtrd->halflengthZ());
+ edges.emplace_back(dtrd->maxHalflengthX(), 2 * dtrd->halflengthY2(), -dtrd->halflengthZ());
+ edges.emplace_back(-dtrd->maxHalflengthX(), 2 * dtrd->halflengthY2(), -dtrd->halflengthZ());
+ edges.emplace_back(dtrd->medHalflengthX(), 0., -dtrd->halflengthZ());
+ edges.emplace_back(-dtrd->medHalflengthX(), 0., -dtrd->halflengthZ());
+ edges.emplace_back(dtrd->minHalflengthX(), -2 * dtrd->halflengthY1(), -dtrd->halflengthZ());
+ edges.emplace_back(-dtrd->minHalflengthX(), -2 * dtrd->halflengthY1(), -dtrd->halflengthZ());
+ edges.emplace_back(0., 0., -dtrd->halflengthZ());
+ edges.emplace_back(0., 0., dtrd->halflengthZ());
+ edges.emplace_back(0., -2 * dtrd->halflengthY1(), 0.);
+ edges.emplace_back(0., 2 * dtrd->halflengthY2(), 0.);
}
if (bcyl) {
- edges.push_back(Amg::Vector3D(0., 0., bcyl->halflengthZ()));
- edges.push_back(Amg::Vector3D(0., 0., -bcyl->halflengthZ()));
+ edges.emplace_back(0., 0., bcyl->halflengthZ());
+ edges.emplace_back(0., 0., -bcyl->halflengthZ());
}
if (cyl) {
- edges.push_back(Amg::Vector3D(0., 0., cyl->halflengthZ()));
- edges.push_back(Amg::Vector3D(0., 0., -cyl->halflengthZ()));
+ edges.emplace_back(0., 0., cyl->halflengthZ());
+ edges.emplace_back(0., 0., -cyl->halflengthZ());
}
if (spb) {
#ifdef TRKDETDESCR_USEFLOATPRECISON
@@ -872,12 +874,12 @@ const Muon::Span* Muon::MuonTrackingGeometryBuilder::findVolumeSpan(const Trk::V
#undef double
#endif
for (unsigned int i = 0; i < vtcs.size(); i++) {
- edges.push_back(Amg::Vector3D(vtcs[i].first, vtcs[i].second, spb->halflengthZ()));
- edges.push_back(Amg::Vector3D(vtcs[i].first, vtcs[i].second, -spb->halflengthZ()));
+ edges.emplace_back(vtcs[i].first, vtcs[i].second, spb->halflengthZ());
+ edges.emplace_back(vtcs[i].first, vtcs[i].second, -spb->halflengthZ());
}
// center
- edges.push_back(Amg::Vector3D(0., 0., spb->halflengthZ()));
- edges.push_back(Amg::Vector3D(0., 0., -spb->halflengthZ()));
+ edges.emplace_back(0., 0., spb->halflengthZ());
+ edges.emplace_back(0., 0., -spb->halflengthZ());
}
if (prism) {
#ifdef TRKDETDESCR_USEFLOATPRECISON
@@ -888,11 +890,11 @@ const Muon::Span* Muon::MuonTrackingGeometryBuilder::findVolumeSpan(const Trk::V
#undef double
#endif
for (unsigned int i = 0; i < vtcs.size(); i++) {
- edges.push_back(Amg::Vector3D(vtcs[i].first, vtcs[i].second, prism->halflengthZ()));
- edges.push_back(Amg::Vector3D(vtcs[i].first, vtcs[i].second, -prism->halflengthZ()));
+ edges.emplace_back(vtcs[i].first, vtcs[i].second, prism->halflengthZ());
+ edges.emplace_back(vtcs[i].first, vtcs[i].second, -prism->halflengthZ());
}
- edges.push_back(Amg::Vector3D(0., 0., prism->halflengthZ()));
- edges.push_back(Amg::Vector3D(0., 0., -prism->halflengthZ()));
+ edges.emplace_back(0., 0., prism->halflengthZ());
+ edges.emplace_back(0., 0., -prism->halflengthZ());
}
// apply transform and get span
double minP0 = M_PI;
@@ -1012,7 +1014,7 @@ const Muon::Span* Muon::MuonTrackingGeometryBuilder::findVolumeSpan(const Trk::V
const std::vector<std::vector<std::pair<const Trk::DetachedTrackingVolume*, const Muon::Span*> >*>*
Muon::MuonTrackingGeometryBuilder::findVolumesSpan(const std::vector<const Trk::DetachedTrackingVolume*>* objs, double zTol, double phiTol,
LocalVariablesContainer& aLVC) const {
- if (!objs || !objs->size()) return nullptr;
+ if (!objs || objs->empty()) return nullptr;
std::vector<std::vector<std::pair<const Trk::DetachedTrackingVolume*, const Span*> >*>* spans =
new std::vector<std::vector<std::pair<const Trk::DetachedTrackingVolume*, const Span*> >*>(9);
// split MS into 9 blocks to speed up the build-up of geometry
@@ -1085,7 +1087,7 @@ Muon::MuonTrackingGeometryBuilder::findVolumesSpan(const std::vector<const Trk::
}
const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processVolume(const Trk::Volume* vol, int etaN, int phiN,
- std::string volumeName, LocalVariablesContainer& aLVC) const {
+ const std::string& volumeName, LocalVariablesContainer& aLVC) const {
const Trk::TrackingVolume* tVol = nullptr;
unsigned int colorCode = m_colorCode;
@@ -1105,13 +1107,13 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processVolume(cons
return nullptr;
}
// subvolume boundaries
- Trk::CylinderVolumeBounds* subBds = 0;
+ Trk::CylinderVolumeBounds* subBds = nullptr;
double phiSect = M_PI / phiN;
double etaSect = (cyl->halflengthZ()) / etaN;
subBds = new Trk::CylinderVolumeBounds(cyl->innerRadius(), cyl->outerRadius(), phiSect, etaSect);
- const Trk::Volume* protVol = new Trk::Volume(0, subBds);
+ const Trk::Volume* protVol = new Trk::Volume(nullptr, subBds);
// create subvolumes & BinnedArray
std::vector<Trk::TrackingVolumeOrderPosition> subVolumes;
@@ -1155,7 +1157,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processVolume(cons
++m_frameNum;
if (detVols) m_frameStat += detVols->size();
// prepare blending
- if (m_blendInertMaterial && blendVols.size()) {
+ if (m_blendInertMaterial && !blendVols.empty()) {
for (unsigned int id = 0; id < blendVols.size(); id++) {
if (!aLVC.m_blendMap[blendVols[id]]) {
aLVC.m_blendMap[blendVols[id]] = new std::vector<const Trk::TrackingVolume*>;
@@ -1175,9 +1177,9 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processVolume(cons
/* The above was passing a SharedObject with the ndel == True
* now that SharedObject is a typeded to std::shared_ptr , pass a no-op deleter
*/
- subVolumes.push_back(Trk::TrackingVolumeOrderPosition(
+ subVolumes.emplace_back(
Trk::SharedObject<const Trk::TrackingVolume>(sVol, Trk::do_not_delete<const Trk::TrackingVolume>),
- Amg::Vector3D(transf * gp)));
+ Amg::Vector3D(transf * gp));
// glue subVolumes
sVols.push_back(sVol);
if (eta == 0) sVolsNeg.push_back(sVol);
@@ -1211,7 +1213,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processVolume(cons
delete protVol;
Trk::BinnedArray2D<Trk::TrackingVolume>* subVols = new Trk::BinnedArray2D<Trk::TrackingVolume>(subVolumes, volBinUtil);
- tVol = new Trk::TrackingVolume(*vol, aLVC.m_muonMaterial, 0, subVols, volumeName);
+ tVol = new Trk::TrackingVolume(*vol, aLVC.m_muonMaterial, nullptr, subVols, volumeName);
// register glue volumes
const Trk::GlueVolumesDescriptor& volGlueVolumes = tVol->glueVolumesDescriptor();
volGlueVolumes.registerGlueVolumes(Trk::tubeInnerCover, sVols);
@@ -1230,7 +1232,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processVolume(cons
if (muonObjs) m_frameStat += muonObjs->size();
// prepare blending
- if (m_blendInertMaterial && blendVols.size()) {
+ if (m_blendInertMaterial && !blendVols.empty()) {
for (unsigned int id = 0; id < blendVols.size(); id++) {
if (!aLVC.m_blendMap[blendVols[id]]) {
aLVC.m_blendMap[blendVols[id]] = new std::vector<const Trk::TrackingVolume*>;
@@ -1244,7 +1246,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processVolume(cons
return tVol;
}
-const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processVolume(const Trk::Volume* vol, int mode, std::string volumeName,
+const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processVolume(const Trk::Volume* vol, int mode, const std::string& volumeName,
LocalVariablesContainer& aLVC) const {
ATH_MSG_VERBOSE(name() << "processing volume in mode:" << mode);
@@ -1281,7 +1283,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processVolume(cons
if (aLVC.m_zPartitions[iz] == zSteps.front()) zTypes.push_back(aLVC.m_zPartitionsType[iz]);
if (aLVC.m_zPartitions[iz] > z1 && aLVC.m_zPartitions[iz] < z2) {
zSteps.push_back(aLVC.m_zPartitions[iz]);
- if (!zTypes.size()) {
+ if (zTypes.empty()) {
if (iz == 0)
zTypes.push_back(0);
else
@@ -1354,7 +1356,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processVolume(cons
for (unsigned int eta = 0; eta < zSteps.size() - 1; eta++) {
if (colorCode > 0) colorCode = 6 - colorCode;
double posZ = 0.5 * (zSteps[eta] + zSteps[eta + 1]);
- double hZ = 0.5 * fabs(zSteps[eta + 1] - zSteps[eta]);
+ double hZ = 0.5 * std::fabs(zSteps[eta + 1] - zSteps[eta]);
std::vector<std::vector<const Trk::TrackingVolume*> > phiSubs;
std::vector<Trk::SharedObject<Trk::BinnedArray<Trk::TrackingVolume> > > phBins;
std::vector<int> phiType(phiTypeMax + 1, -1); // indication of first phi/R partition built for a given type (for cloning)
@@ -1366,7 +1368,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processVolume(cons
double phiSect = 0.;
if (phi < phiN - 1) {
posPhi += 0.5 * aLVC.m_adjustedPhi[phi + 1];
- phiSect = 0.5 * fabs(aLVC.m_adjustedPhi[phi + 1] - aLVC.m_adjustedPhi[phi]);
+ phiSect = 0.5 * std::fabs(aLVC.m_adjustedPhi[phi + 1] - aLVC.m_adjustedPhi[phi]);
} else {
posPhi += 0.5 * aLVC.m_adjustedPhi[0] + M_PI;
phiSect = 0.5 * fabs(aLVC.m_adjustedPhi[0] + 2 * M_PI - aLVC.m_adjustedPhi[phi]);
@@ -1414,7 +1416,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processVolume(cons
if (detVols) m_frameStat += detVols->size();
// prepare blending
- if (m_blendInertMaterial && blendVols.size()) {
+ if (m_blendInertMaterial && !blendVols.empty()) {
for (unsigned int id = 0; id < blendVols.size(); id++) {
if (!aLVC.m_blendMap[blendVols[id]]) {
aLVC.m_blendMap[blendVols[id]] = new std::vector<const Trk::TrackingVolume*>;
@@ -1443,11 +1445,11 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processVolume(cons
sVol->registerColorCode(colorCode + pCode + hCode);
// reference position
Amg::Vector3D gp(0.5 * (hSteps[h].second + hSteps[h + 1].second), 0., 0.);
- subVolumesVect.push_back(Trk::TrackingVolumeOrderPosition(Trk::SharedObject<const Trk::TrackingVolume>(sVol),
- Amg::Vector3D((*transf) * gp)));
- hSubsTr.push_back(Trk::TrackingVolumeOrderPosition(
+ subVolumesVect.emplace_back(Trk::SharedObject<const Trk::TrackingVolume>(sVol),
+ Amg::Vector3D((*transf) * gp));
+ hSubsTr.emplace_back(
Trk::SharedObject<const Trk::TrackingVolume>(sVol, Trk::do_not_delete<const Trk::TrackingVolume>),
- Amg::Vector3D((*transf) * gp)));
+ Amg::Vector3D((*transf) * gp));
hSubs.push_back(sVol);
// cleanup
@@ -1522,7 +1524,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processVolume(cons
Trk::BinnedArray1D1D1D<Trk::TrackingVolume>* subVols =
new Trk::BinnedArray1D1D1D<Trk::TrackingVolume>(subVolumesVect, zBinUtil, pBinUtil, hBinUtil);
- tVol = new Trk::TrackingVolume(*vol, aLVC.m_muonMaterial, 0, subVols, volumeName);
+ tVol = new Trk::TrackingVolume(*vol, aLVC.m_muonMaterial, nullptr, subVols, volumeName);
// register glue volumes
const Trk::GlueVolumesDescriptor& volGlueVolumes = tVol->glueVolumesDescriptor();
volGlueVolumes.registerGlueVolumes(Trk::tubeInnerCover, sVolsInn);
@@ -1553,7 +1555,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processVolume(cons
std::vector<const Trk::TrackingVolume*> sVolsPos(phiN); // for gluing
for (unsigned int eta = 0; eta < zSteps.size() - 1; eta++) {
double posZ = 0.5 * (zSteps[eta] + zSteps[eta + 1]);
- double hZ = 0.5 * fabs(zSteps[eta + 1] - zSteps[eta]);
+ double hZ = 0.5 * std::fabs(zSteps[eta + 1] - zSteps[eta]);
colorCode = 26 - colorCode;
for (unsigned int phi = 0; phi < phiN; phi++) {
colorCode = 26 - colorCode;
@@ -1561,7 +1563,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processVolume(cons
double phiSect = 0.;
if (phi < phiN - 1) {
posPhi += 0.5 * aLVC.m_adjustedPhi[phi + 1];
- phiSect = 0.5 * fabs(aLVC.m_adjustedPhi[phi + 1] - aLVC.m_adjustedPhi[phi]);
+ phiSect = 0.5 * std::fabs(aLVC.m_adjustedPhi[phi + 1] - aLVC.m_adjustedPhi[phi]);
} else {
posPhi += 0.5 * aLVC.m_adjustedPhi[0] + M_PI;
phiSect = 0.5 * fabs(aLVC.m_adjustedPhi[0] + 2 * M_PI - aLVC.m_adjustedPhi[phi]);
@@ -1583,7 +1585,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processVolume(cons
if (detVols) m_frameStat += detVols->size();
// prepare blending
- if (m_blendInertMaterial && blendVols.size()) {
+ if (m_blendInertMaterial && !blendVols.empty()) {
for (unsigned int id = 0; id < blendVols.size(); id++) {
if (!aLVC.m_blendMap[blendVols[id]]) {
aLVC.m_blendMap[blendVols[id]] = new std::vector<const Trk::TrackingVolume*>;
@@ -1647,7 +1649,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processVolume(cons
Trk::BinnedArray2D<Trk::TrackingVolume>* subVols = new Trk::BinnedArray2D<Trk::TrackingVolume>(subVolumes, volBinUtil);
- tVol = new Trk::TrackingVolume(*vol, aLVC.m_muonMaterial, 0, subVols, volumeName);
+ tVol = new Trk::TrackingVolume(*vol, aLVC.m_muonMaterial, nullptr, subVols, volumeName);
// register glue volumes
const Trk::GlueVolumesDescriptor& volGlueVolumes = tVol->glueVolumesDescriptor();
volGlueVolumes.registerGlueVolumes(Trk::tubeInnerCover, sVols);
@@ -1666,7 +1668,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processVolume(cons
if (muonObjs) m_frameStat += muonObjs->size();
// prepare blending
- if (m_blendInertMaterial && blendVols.size()) {
+ if (m_blendInertMaterial && !blendVols.empty()) {
for (unsigned int id = 0; id < blendVols.size(); id++) {
if (!aLVC.m_blendMap[blendVols[id]]) {
aLVC.m_blendMap[blendVols[id]] = new std::vector<const Trk::TrackingVolume*>;
@@ -1680,7 +1682,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processVolume(cons
return tVol;
}
-const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processShield(const Trk::Volume* vol, int type, std::string volumeName,
+const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processShield(const Trk::Volume* vol, int type, const std::string& volumeName,
LocalVariablesContainer& aLVC) const {
ATH_MSG_VERBOSE(name() << "processing shield volume " << volumeName << " in mode:" << type);
@@ -1748,7 +1750,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processShield(cons
for (unsigned int eta = 0; eta < zSteps.size() - 1; eta++) {
if (colorCode > 0) colorCode = 26 - colorCode;
double posZ = 0.5 * (zSteps[eta] + zSteps[eta + 1]);
- double hZ = 0.5 * fabs(zSteps[eta + 1] - zSteps[eta]);
+ double hZ = 0.5 * std::fabs(zSteps[eta + 1] - zSteps[eta]);
std::vector<std::vector<const Trk::TrackingVolume*> > phiSubs;
std::vector<Trk::SharedObject<Trk::BinnedArray<Trk::TrackingVolume> > > phBins;
int phi = 0;
@@ -1778,7 +1780,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processShield(cons
if (detVols) m_frameStat += detVols->size();
// prepare blending
- if (m_blendInertMaterial && blendVols.size()) {
+ if (m_blendInertMaterial && !blendVols.empty()) {
for (unsigned int id = 0; id < blendVols.size(); id++) {
if (!aLVC.m_blendMap[blendVols[id]]) {
aLVC.m_blendMap[blendVols[id]] = new std::vector<const Trk::TrackingVolume*>;
@@ -1800,11 +1802,10 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processShield(cons
sVol->registerColorCode(colorCode + hCode);
// reference position
Amg::Vector3D gp(subBds->mediumRadius(), 0., 0.);
- subVolumesVect.push_back(
- Trk::TrackingVolumeOrderPosition(Trk::SharedObject<const Trk::TrackingVolume>(sVol), Amg::Vector3D((*transf) * gp)));
- hSubsTr.push_back(Trk::TrackingVolumeOrderPosition(
+ subVolumesVect.emplace_back(Trk::SharedObject<const Trk::TrackingVolume>(sVol), Amg::Vector3D((*transf) * gp));
+ hSubsTr.emplace_back(
Trk::SharedObject<const Trk::TrackingVolume>(sVol, Trk::do_not_delete<const Trk::TrackingVolume>),
- Amg::Vector3D((*transf) * gp)));
+ Amg::Vector3D((*transf) * gp));
hSubs.push_back(sVol);
// glue subVolume
@@ -1840,7 +1841,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilder::processShield(cons
Trk::BinnedArray1D1D1D<Trk::TrackingVolume>* subVols =
new Trk::BinnedArray1D1D1D<Trk::TrackingVolume>(subVolumesVect, zBinUtil, pBinUtil, hBinUtil);
- tVol = new Trk::TrackingVolume(*vol, aLVC.m_muonMaterial, 0, subVols, volumeName);
+ tVol = new Trk::TrackingVolume(*vol, aLVC.m_muonMaterial, nullptr, subVols, volumeName);
// register glue volumes
const Trk::GlueVolumesDescriptor& volGlueVolumes = tVol->glueVolumesDescriptor();
volGlueVolumes.registerGlueVolumes(Trk::tubeInnerCover, sVolsInn);
@@ -2093,7 +2094,7 @@ bool Muon::MuonTrackingGeometryBuilder::enclosed(const Trk::Volume* vol, const M
return encl;
}
-void Muon::MuonTrackingGeometryBuilder::checkVolume(const Trk::TrackingVolume* vol) const {
+void Muon::MuonTrackingGeometryBuilder::checkVolume(const Trk::TrackingVolume* vol) {
std::cout << "MuonTrackingGeometryBuilder::checkVolume: " << vol->volumeName() << std::endl;
const Trk::CylinderVolumeBounds* cyl = dynamic_cast<const Trk::CylinderVolumeBounds*>(&(vol->volumeBounds()));
@@ -2422,66 +2423,66 @@ void Muon::MuonTrackingGeometryBuilder::getHParts(LocalVariablesContainer& aLVC)
// 0: barrel 2x2
// non BT sector
std::vector<std::pair<int, float> > barrelZ0F0;
- barrelZ0F0.push_back(std::pair<int, float>(0, aLVC.m_innerBarrelRadius));
+ barrelZ0F0.emplace_back(0, aLVC.m_innerBarrelRadius);
if (m_activeAdjustLevel > 0) {
- barrelZ0F0.push_back(std::pair<int, float>(0, 4450.)); // for DiskShieldingBackDisk
- barrelZ0F0.push_back(std::pair<int, float>(0, 6500.)); // BI/BM
- barrelZ0F0.push_back(std::pair<int, float>(0, 8900.)); // BM/BO
- barrelZ0F0.push_back(std::pair<int, float>(0, 13000.)); // outer envelope
+ barrelZ0F0.emplace_back(0, 4450.); // for DiskShieldingBackDisk
+ barrelZ0F0.emplace_back(0, 6500.); // BI/BM
+ barrelZ0F0.emplace_back(0, 8900.); // BM/BO
+ barrelZ0F0.emplace_back(0, 13000.); // outer envelope
}
- barrelZ0F0.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ barrelZ0F0.emplace_back(0, aLVC.m_outerBarrelRadius);
std::vector<std::pair<int, float> > barrelZ0F1;
- barrelZ0F1.push_back(std::pair<int, float>(0, aLVC.m_innerBarrelRadius));
+ barrelZ0F1.emplace_back(0, aLVC.m_innerBarrelRadius);
if (m_inertAdjustLevel > 0) {
- barrelZ0F1.push_back(std::pair<int, float>(1, 4500.));
- barrelZ0F1.push_back(std::pair<int, float>(1, 5900.));
+ barrelZ0F1.emplace_back(1, 4500.);
+ barrelZ0F1.emplace_back(1, 5900.);
} else if (m_activeAdjustLevel > 0)
- barrelZ0F1.push_back(std::pair<int, float>(0, 4450.));
- if (m_activeAdjustLevel > 0) barrelZ0F1.push_back(std::pair<int, float>(0, 6500.));
+ barrelZ0F1.emplace_back(0, 4450.);
+ if (m_activeAdjustLevel > 0) barrelZ0F1.emplace_back(0, 6500.);
if (m_inertAdjustLevel > 0)
- barrelZ0F1.push_back(std::pair<int, float>(1, 8900.));
+ barrelZ0F1.emplace_back(1, 8900.);
else if (m_activeAdjustLevel > 0)
- barrelZ0F1.push_back(std::pair<int, float>(0, 8900.));
- if (m_inertAdjustLevel > 0) barrelZ0F1.push_back(std::pair<int, float>(1, 10100.));
- barrelZ0F1.push_back(std::pair<int, float>(0, 13000.)); // outer envelope
- barrelZ0F1.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ barrelZ0F1.emplace_back(0, 8900.);
+ if (m_inertAdjustLevel > 0) barrelZ0F1.emplace_back(1, 10100.);
+ barrelZ0F1.emplace_back(0, 13000.); // outer envelope
+ barrelZ0F1.emplace_back(0, aLVC.m_outerBarrelRadius);
// BT sector
std::vector<std::pair<int, float> > barrelZ1F0;
- barrelZ1F0.push_back(std::pair<int, float>(0, aLVC.m_innerBarrelRadius));
+ barrelZ1F0.emplace_back(0, aLVC.m_innerBarrelRadius);
if (static_cast<int>(m_activeAdjustLevel) + static_cast<int>(m_inertAdjustLevel) > 0)
- barrelZ1F0.push_back(std::pair<int, float>(0, 4450.));
+ barrelZ1F0.emplace_back(0, 4450.);
if (m_inertAdjustLevel > 0) {
- barrelZ1F0.push_back(std::pair<int, float>(1, 5800.));
- barrelZ1F0.push_back(std::pair<int, float>(1, 6500.));
+ barrelZ1F0.emplace_back(1, 5800.);
+ barrelZ1F0.emplace_back(1, 6500.);
} else if (m_activeAdjustLevel > 0)
- barrelZ1F0.push_back(std::pair<int, float>(0, 6500.));
+ barrelZ1F0.emplace_back(0, 6500.);
if (m_inertAdjustLevel > 0) {
- barrelZ1F0.push_back(std::pair<int, float>(1, 6750.));
- barrelZ1F0.push_back(std::pair<int, float>(1, 8400.));
+ barrelZ1F0.emplace_back(1, 6750.);
+ barrelZ1F0.emplace_back(1, 8400.);
}
- if (m_activeAdjustLevel > 0) barrelZ1F0.push_back(std::pair<int, float>(0, 8770.)); // adapted for cryoring (from 8900)
- if (m_inertAdjustLevel > 0) barrelZ1F0.push_back(std::pair<int, float>(1, 9850.)); // adapted for cryoring (from 9600)
- barrelZ1F0.push_back(std::pair<int, float>(0, 13000.)); // outer envelope
- barrelZ1F0.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ if (m_activeAdjustLevel > 0) barrelZ1F0.emplace_back(0, 8770.); // adapted for cryoring (from 8900)
+ if (m_inertAdjustLevel > 0) barrelZ1F0.emplace_back(1, 9850.); // adapted for cryoring (from 9600)
+ barrelZ1F0.emplace_back(0, 13000.); // outer envelope
+ barrelZ1F0.emplace_back(0, aLVC.m_outerBarrelRadius);
std::vector<std::pair<int, float> > barrelZ1F1;
- barrelZ1F1.push_back(std::pair<int, float>(0, aLVC.m_innerBarrelRadius));
+ barrelZ1F1.emplace_back(0, aLVC.m_innerBarrelRadius);
if (m_inertAdjustLevel > 0) {
- barrelZ1F1.push_back(std::pair<int, float>(1, 4500.));
- barrelZ1F1.push_back(std::pair<int, float>(1, 6000.));
+ barrelZ1F1.emplace_back(1, 4500.);
+ barrelZ1F1.emplace_back(1, 6000.);
} else if (m_activeAdjustLevel > 0)
- barrelZ1F1.push_back(std::pair<int, float>(0, 4450.));
- if (m_activeAdjustLevel > 0) barrelZ1F1.push_back(std::pair<int, float>(0, 6500.));
- if (m_inertAdjustLevel > 0) barrelZ1F1.push_back(std::pair<int, float>(1, 6800.));
+ barrelZ1F1.emplace_back(0, 4450.);
+ if (m_activeAdjustLevel > 0) barrelZ1F1.emplace_back(0, 6500.);
+ if (m_inertAdjustLevel > 0) barrelZ1F1.emplace_back(1, 6800.);
if (m_inertAdjustLevel > 0) {
- barrelZ1F1.push_back(std::pair<int, float>(1, 8900.));
- barrelZ1F1.push_back(std::pair<int, float>(1, 10100.));
+ barrelZ1F1.emplace_back(1, 8900.);
+ barrelZ1F1.emplace_back(1, 10100.);
} else if (m_activeAdjustLevel > 0)
- barrelZ1F1.push_back(std::pair<int, float>(0, 8900.));
- barrelZ1F1.push_back(std::pair<int, float>(0, 13000.)); // outer envelope
- barrelZ1F1.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ barrelZ1F1.emplace_back(0, 8900.);
+ barrelZ1F1.emplace_back(0, 13000.); // outer envelope
+ barrelZ1F1.emplace_back(0, aLVC.m_outerBarrelRadius);
std::vector<std::vector<std::vector<std::pair<int, float> > > > barrelZF(2);
barrelZF[0].push_back(barrelZ0F0);
@@ -2492,28 +2493,28 @@ void Muon::MuonTrackingGeometryBuilder::getHParts(LocalVariablesContainer& aLVC)
// small wheel 1x2 ( no z BT sector)
// non BT sector
std::vector<std::pair<int, float> > swZ0F0;
- swZ0F0.push_back(std::pair<int, float>(0, m_innerShieldRadius));
- if (m_activeAdjustLevel > 1) { swZ0F0.push_back(std::pair<int, float>(0, 2700.)); }
- if (static_cast<int>(m_activeAdjustLevel) + static_cast<int>(m_inertAdjustLevel) > 0) swZ0F0.push_back(std::pair<int, float>(0, 4450.));
+ swZ0F0.emplace_back(0, m_innerShieldRadius);
+ if (m_activeAdjustLevel > 1) { swZ0F0.emplace_back(0, 2700.); }
+ if (static_cast<int>(m_activeAdjustLevel) + static_cast<int>(m_inertAdjustLevel) > 0) swZ0F0.emplace_back(0, 4450.);
if (m_activeAdjustLevel > 0) {
- swZ0F0.push_back(std::pair<int, float>(0, 6560.)); // BI/BM
- swZ0F0.push_back(std::pair<int, float>(0, 8900.)); // BM/BO
+ swZ0F0.emplace_back(0, 6560.); // BI/BM
+ swZ0F0.emplace_back(0, 8900.); // BM/BO
}
- swZ0F0.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ swZ0F0.emplace_back(0, aLVC.m_outerBarrelRadius);
// phi BT sector
std::vector<std::pair<int, float> > swZ0F1;
- swZ0F1.push_back(std::pair<int, float>(0, m_innerShieldRadius));
- if (m_activeAdjustLevel > 1) swZ0F1.push_back(std::pair<int, float>(0, 2700.));
- if (static_cast<int>(m_inertAdjustLevel) + static_cast<int>(m_activeAdjustLevel) > 0) swZ0F1.push_back(std::pair<int, float>(0, 4450.));
- if (m_inertAdjustLevel > 0) swZ0F1.push_back(std::pair<int, float>(1, 5900.));
- if (m_activeAdjustLevel > 0) swZ0F1.push_back(std::pair<int, float>(0, 6560.));
+ swZ0F1.emplace_back(0, m_innerShieldRadius);
+ if (m_activeAdjustLevel > 1) swZ0F1.emplace_back(0, 2700.);
+ if (static_cast<int>(m_inertAdjustLevel) + static_cast<int>(m_activeAdjustLevel) > 0) swZ0F1.emplace_back(0, 4450.);
+ if (m_inertAdjustLevel > 0) swZ0F1.emplace_back(1, 5900.);
+ if (m_activeAdjustLevel > 0) swZ0F1.emplace_back(0, 6560.);
if (m_inertAdjustLevel > 0) {
- swZ0F1.push_back(std::pair<int, float>(1, 8900.));
- swZ0F1.push_back(std::pair<int, float>(1, 10100.));
+ swZ0F1.emplace_back(1, 8900.);
+ swZ0F1.emplace_back(1, 10100.);
} else if (m_activeAdjustLevel > 0)
- swZ0F1.push_back(std::pair<int, float>(0, 8900.));
- swZ0F1.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ swZ0F1.emplace_back(0, 8900.);
+ swZ0F1.emplace_back(0, aLVC.m_outerBarrelRadius);
std::vector<std::vector<std::vector<std::pair<int, float> > > > swZF(1);
swZF[0].push_back(swZ0F0);
@@ -2522,114 +2523,114 @@ void Muon::MuonTrackingGeometryBuilder::getHParts(LocalVariablesContainer& aLVC)
// inner endcap/ECT 2x3
// ect coil, non-BT z
std::vector<std::pair<int, float> > innerZ0F0;
- innerZ0F0.push_back(std::pair<int, float>(0, m_innerShieldRadius));
- if (m_inertAdjustLevel > 0) innerZ0F0.push_back(std::pair<int, float>(0, 1100.));
- if (m_inertAdjustLevel > 1) innerZ0F0.push_back(std::pair<int, float>(1, 5150.));
- if (m_inertAdjustLevel > 0) innerZ0F0.push_back(std::pair<int, float>(1, 5300.));
+ innerZ0F0.emplace_back(0, m_innerShieldRadius);
+ if (m_inertAdjustLevel > 0) innerZ0F0.emplace_back(0, 1100.);
+ if (m_inertAdjustLevel > 1) innerZ0F0.emplace_back(1, 5150.);
+ if (m_inertAdjustLevel > 0) innerZ0F0.emplace_back(1, 5300.);
if (m_activeAdjustLevel > 0) {
- innerZ0F0.push_back(std::pair<int, float>(0, 6500.));
- innerZ0F0.push_back(std::pair<int, float>(0, 8900.));
+ innerZ0F0.emplace_back(0, 6500.);
+ innerZ0F0.emplace_back(0, 8900.);
}
- innerZ0F0.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ innerZ0F0.emplace_back(0, aLVC.m_outerBarrelRadius);
// coil gap, non-BT z
std::vector<std::pair<int, float> > innerZ0F1;
- innerZ0F1.push_back(std::pair<int, float>(0, m_innerShieldRadius));
- if (m_inertAdjustLevel > 0) innerZ0F1.push_back(std::pair<int, float>(0, 1100.));
+ innerZ0F1.emplace_back(0, m_innerShieldRadius);
+ if (m_inertAdjustLevel > 0) innerZ0F1.emplace_back(0, 1100.);
if (m_inertAdjustLevel > 1) {
- innerZ0F1.push_back(std::pair<int, float>(1, 1400.));
- innerZ0F1.push_back(std::pair<int, float>(1, 1685.));
+ innerZ0F1.emplace_back(1, 1400.);
+ innerZ0F1.emplace_back(1, 1685.);
}
if (m_inertAdjustLevel > 0) {
- innerZ0F1.push_back(std::pair<int, float>(1, 4700.));
- innerZ0F1.push_back(std::pair<int, float>(1, 5900.));
+ innerZ0F1.emplace_back(1, 4700.);
+ innerZ0F1.emplace_back(1, 5900.);
}
if (m_activeAdjustLevel > 0) {
- innerZ0F1.push_back(std::pair<int, float>(0, 6500.));
- innerZ0F1.push_back(std::pair<int, float>(0, 8900.));
+ innerZ0F1.emplace_back(0, 6500.);
+ innerZ0F1.emplace_back(0, 8900.);
}
- innerZ0F1.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ innerZ0F1.emplace_back(0, aLVC.m_outerBarrelRadius);
// BT coil, no-BT z
std::vector<std::pair<int, float> > innerZ0F2;
- innerZ0F2.push_back(std::pair<int, float>(0, m_innerShieldRadius));
- if (m_inertAdjustLevel > 0) innerZ0F2.push_back(std::pair<int, float>(0, 1100.));
+ innerZ0F2.emplace_back(0, m_innerShieldRadius);
+ if (m_inertAdjustLevel > 0) innerZ0F2.emplace_back(0, 1100.);
if (m_inertAdjustLevel > 1) {
- innerZ0F2.push_back(std::pair<int, float>(1, 1400.));
- innerZ0F2.push_back(std::pair<int, float>(1, 1685.));
+ innerZ0F2.emplace_back(1, 1400.);
+ innerZ0F2.emplace_back(1, 1685.);
}
if (m_inertAdjustLevel > 0) {
- innerZ0F2.push_back(std::pair<int, float>(1, 4450.));
- innerZ0F2.push_back(std::pair<int, float>(1, 5900.));
+ innerZ0F2.emplace_back(1, 4450.);
+ innerZ0F2.emplace_back(1, 5900.);
}
- if (m_activeAdjustLevel > 0) innerZ0F2.push_back(std::pair<int, float>(0, 6500.));
+ if (m_activeAdjustLevel > 0) innerZ0F2.emplace_back(0, 6500.);
if (m_inertAdjustLevel > 0) {
- innerZ0F2.push_back(std::pair<int, float>(1, 8900.));
- innerZ0F2.push_back(std::pair<int, float>(1, 10100.));
+ innerZ0F2.emplace_back(1, 8900.);
+ innerZ0F2.emplace_back(1, 10100.);
} else if (m_activeAdjustLevel > 0)
- innerZ0F2.push_back(std::pair<int, float>(0, 8900.));
- innerZ0F2.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ innerZ0F2.emplace_back(0, 8900.);
+ innerZ0F2.emplace_back(0, aLVC.m_outerBarrelRadius);
// ect coil, z BT sector
std::vector<std::pair<int, float> > innerZ1F0;
- innerZ1F0.push_back(std::pair<int, float>(0, m_innerShieldRadius));
- if (m_inertAdjustLevel > 0) innerZ1F0.push_back(std::pair<int, float>(0, 1100.));
- if (m_inertAdjustLevel > 1) innerZ1F0.push_back(std::pair<int, float>(1, 5150.));
- if (m_inertAdjustLevel > 0) innerZ1F0.push_back(std::pair<int, float>(1, 5300.));
- if (m_inertAdjustLevel > 0) innerZ1F0.push_back(std::pair<int, float>(1, 5800.));
+ innerZ1F0.emplace_back(0, m_innerShieldRadius);
+ if (m_inertAdjustLevel > 0) innerZ1F0.emplace_back(0, 1100.);
+ if (m_inertAdjustLevel > 1) innerZ1F0.emplace_back(1, 5150.);
+ if (m_inertAdjustLevel > 0) innerZ1F0.emplace_back(1, 5300.);
+ if (m_inertAdjustLevel > 0) innerZ1F0.emplace_back(1, 5800.);
if (m_inertAdjustLevel > 0)
- innerZ1F0.push_back(std::pair<int, float>(1, 6750.));
+ innerZ1F0.emplace_back(1, 6750.);
else if (m_activeAdjustLevel > 0)
- innerZ1F0.push_back(std::pair<int, float>(0, 6500.));
+ innerZ1F0.emplace_back(0, 6500.);
if (m_inertAdjustLevel > 0) {
- innerZ1F0.push_back(std::pair<int, float>(1, 8400.));
- innerZ1F0.push_back(std::pair<int, float>(1, 9600.));
+ innerZ1F0.emplace_back(1, 8400.);
+ innerZ1F0.emplace_back(1, 9600.);
} else if (m_activeAdjustLevel > 0)
- innerZ1F0.push_back(std::pair<int, float>(0, 8900.));
- innerZ1F0.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ innerZ1F0.emplace_back(0, 8900.);
+ innerZ1F0.emplace_back(0, aLVC.m_outerBarrelRadius);
// coil gap, BT z sector
std::vector<std::pair<int, float> > innerZ1F1;
- innerZ1F1.push_back(std::pair<int, float>(0, m_innerShieldRadius));
- if (m_inertAdjustLevel > 0) innerZ1F1.push_back(std::pair<int, float>(0, 1100.));
+ innerZ1F1.emplace_back(0, m_innerShieldRadius);
+ if (m_inertAdjustLevel > 0) innerZ1F1.emplace_back(0, 1100.);
if (m_inertAdjustLevel > 1) {
- innerZ1F1.push_back(std::pair<int, float>(1, 1400.));
- innerZ1F1.push_back(std::pair<int, float>(1, 1685.));
+ innerZ1F1.emplace_back(1, 1400.);
+ innerZ1F1.emplace_back(1, 1685.);
}
if (m_inertAdjustLevel > 0) {
- innerZ1F1.push_back(std::pair<int, float>(1, 4700.));
- innerZ1F1.push_back(std::pair<int, float>(1, 5800.));
- innerZ1F1.push_back(std::pair<int, float>(1, 6750.));
+ innerZ1F1.emplace_back(1, 4700.);
+ innerZ1F1.emplace_back(1, 5800.);
+ innerZ1F1.emplace_back(1, 6750.);
} else if (m_activeAdjustLevel > 0)
- innerZ1F1.push_back(std::pair<int, float>(0, 6500.));
+ innerZ1F1.emplace_back(0, 6500.);
if (m_inertAdjustLevel > 0) {
- innerZ1F1.push_back(std::pair<int, float>(1, 8400.));
- innerZ1F1.push_back(std::pair<int, float>(1, 9600.));
+ innerZ1F1.emplace_back(1, 8400.);
+ innerZ1F1.emplace_back(1, 9600.);
} else if (m_activeAdjustLevel > 0)
- innerZ1F1.push_back(std::pair<int, float>(0, 8900.));
- innerZ1F1.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ innerZ1F1.emplace_back(0, 8900.);
+ innerZ1F1.emplace_back(0, aLVC.m_outerBarrelRadius);
// BT coil, BT z sector
std::vector<std::pair<int, float> > innerZ1F2;
- innerZ1F2.push_back(std::pair<int, float>(0, m_innerShieldRadius));
- if (m_inertAdjustLevel > 0) innerZ1F2.push_back(std::pair<int, float>(0, 1100.));
+ innerZ1F2.emplace_back(0, m_innerShieldRadius);
+ if (m_inertAdjustLevel > 0) innerZ1F2.emplace_back(0, 1100.);
if (m_inertAdjustLevel > 1) {
- innerZ1F2.push_back(std::pair<int, float>(1, 1400.));
- innerZ1F2.push_back(std::pair<int, float>(1, 1685.));
+ innerZ1F2.emplace_back(1, 1400.);
+ innerZ1F2.emplace_back(1, 1685.);
}
- innerZ1F2.push_back(std::pair<int, float>(0, 4150.));
+ innerZ1F2.emplace_back(0, 4150.);
if (m_inertAdjustLevel > 0) {
- innerZ1F2.push_back(std::pair<int, float>(1, 4700.));
- innerZ1F2.push_back(std::pair<int, float>(1, 5900.));
- innerZ1F2.push_back(std::pair<int, float>(1, 6800.));
+ innerZ1F2.emplace_back(1, 4700.);
+ innerZ1F2.emplace_back(1, 5900.);
+ innerZ1F2.emplace_back(1, 6800.);
} else if (m_activeAdjustLevel > 0)
- innerZ1F2.push_back(std::pair<int, float>(0, 6500.));
+ innerZ1F2.emplace_back(0, 6500.);
if (m_inertAdjustLevel > 0) {
- innerZ1F2.push_back(std::pair<int, float>(1, 8900.));
- innerZ1F2.push_back(std::pair<int, float>(1, 10100.));
+ innerZ1F2.emplace_back(1, 8900.);
+ innerZ1F2.emplace_back(1, 10100.);
} else if (m_activeAdjustLevel > 0)
- innerZ1F2.push_back(std::pair<int, float>(0, 8900.));
- innerZ1F2.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ innerZ1F2.emplace_back(0, 8900.);
+ innerZ1F2.emplace_back(0, aLVC.m_outerBarrelRadius);
std::vector<std::vector<std::vector<std::pair<int, float> > > > innerZF(2);
innerZF[0].push_back(innerZ0F0);
@@ -2641,26 +2642,26 @@ void Muon::MuonTrackingGeometryBuilder::getHParts(LocalVariablesContainer& aLVC)
// outer 1x1
std::vector<std::pair<int, float> > outerZ0F0;
- outerZ0F0.push_back(std::pair<int, float>(0, m_outerShieldRadius));
- outerZ0F0.push_back(std::pair<int, float>(0, 2750.)); // outer envelope
- outerZ0F0.push_back(std::pair<int, float>(0, 12650.)); // outer envelope
- outerZ0F0.push_back(std::pair<int, float>(0, 13400.)); // outer envelope
- outerZ0F0.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ outerZ0F0.emplace_back(0, m_outerShieldRadius);
+ outerZ0F0.emplace_back(0, 2750.); // outer envelope
+ outerZ0F0.emplace_back(0, 12650.); // outer envelope
+ outerZ0F0.emplace_back(0, 13400.); // outer envelope
+ outerZ0F0.emplace_back(0, aLVC.m_outerBarrelRadius);
std::vector<std::pair<int, float> > outerZ0F1;
- outerZ0F1.push_back(std::pair<int, float>(0, m_outerShieldRadius));
- outerZ0F1.push_back(std::pair<int, float>(0, 2750.)); // outer envelope
+ outerZ0F1.emplace_back(0, m_outerShieldRadius);
+ outerZ0F1.emplace_back(0, 2750.); // outer envelope
if (m_activeAdjustLevel > 0) {
- outerZ0F1.push_back(std::pair<int, float>(0, 3600.));
- outerZ0F1.push_back(std::pair<int, float>(0, 5300.));
- outerZ0F1.push_back(std::pair<int, float>(0, 7000.));
- outerZ0F1.push_back(std::pair<int, float>(0, 8500.));
- outerZ0F1.push_back(std::pair<int, float>(0, 10000.));
- outerZ0F1.push_back(std::pair<int, float>(0, 12000.));
+ outerZ0F1.emplace_back(0, 3600.);
+ outerZ0F1.emplace_back(0, 5300.);
+ outerZ0F1.emplace_back(0, 7000.);
+ outerZ0F1.emplace_back(0, 8500.);
+ outerZ0F1.emplace_back(0, 10000.);
+ outerZ0F1.emplace_back(0, 12000.);
}
- outerZ0F1.push_back(std::pair<int, float>(0, 12650.)); // outer envelope
- outerZ0F1.push_back(std::pair<int, float>(0, 13400.)); // outer envelope
- outerZ0F1.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ outerZ0F1.emplace_back(0, 12650.); // outer envelope
+ outerZ0F1.emplace_back(0, 13400.); // outer envelope
+ outerZ0F1.emplace_back(0, aLVC.m_outerBarrelRadius);
std::vector<std::vector<std::vector<std::pair<int, float> > > > outerZF(2);
outerZF[0].push_back(outerZ0F0);
@@ -2696,25 +2697,25 @@ void Muon::MuonTrackingGeometryBuilder::getShieldParts(LocalVariablesContainer&
aLVC.m_shieldHPart.clear();
std::vector<std::pair<int, float> > outerShield;
- outerShield.push_back(std::pair<int, float>(0, m_beamPipeRadius));
- outerShield.push_back(std::pair<int, float>(0, 279.)); // outer envelope
- outerShield.push_back(std::pair<int, float>(0, 436.7)); // outer envelope
- outerShield.push_back(std::pair<int, float>(0, 1050.)); // outer envelope
- outerShield.push_back(std::pair<int, float>(0, m_outerShieldRadius));
+ outerShield.emplace_back(0, m_beamPipeRadius);
+ outerShield.emplace_back(0, 279.); // outer envelope
+ outerShield.emplace_back(0, 436.7); // outer envelope
+ outerShield.emplace_back(0, 1050.); // outer envelope
+ outerShield.emplace_back(0, m_outerShieldRadius);
aLVC.m_shieldHPart.push_back(outerShield);
std::vector<std::pair<int, float> > innerShield;
- innerShield.push_back(std::pair<int, float>(0, m_beamPipeRadius));
- innerShield.push_back(std::pair<int, float>(0, 530.));
- innerShield.push_back(std::pair<int, float>(0, m_innerShieldRadius));
+ innerShield.emplace_back(0, m_beamPipeRadius);
+ innerShield.emplace_back(0, 530.);
+ innerShield.emplace_back(0, m_innerShieldRadius);
aLVC.m_shieldHPart.push_back(innerShield);
std::vector<std::pair<int, float> > diskShield;
- diskShield.push_back(std::pair<int, float>(0, 0.));
- diskShield.push_back(std::pair<int, float>(0, 540.));
- diskShield.push_back(std::pair<int, float>(0, 750.));
- diskShield.push_back(std::pair<int, float>(0, 2700.));
- diskShield.push_back(std::pair<int, float>(0, 4255.));
+ diskShield.emplace_back(0, 0.);
+ diskShield.emplace_back(0, 540.);
+ diskShield.emplace_back(0, 750.);
+ diskShield.emplace_back(0, 2700.);
+ diskShield.emplace_back(0, 4255.);
aLVC.m_shieldHPart.push_back(diskShield);
return;
diff --git a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonTrackingGeometryBuilderCond.cxx b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonTrackingGeometryBuilderCond.cxx
index a92d0c5d27c4..be7060dbdddd 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonTrackingGeometryBuilderCond.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonTrackingGeometryBuilderCond.cxx
@@ -15,6 +15,8 @@
// Units
#include "GaudiKernel/SystemOfUnits.h"
// Trk
+#include <cmath>
+
#include <fstream>
#include "TrkDetDescrUtils/BinUtility.h"
@@ -247,7 +249,7 @@ std::pair<EventIDRange, const Trk::TrackingGeometry*> Muon::MuonTrackingGeometry
if (m_muonSimple) {
Trk::VolumeBounds* globalBounds = new Trk::CylinderVolumeBounds(aLVC.m_outerBarrelRadius, aLVC.m_outerEndcapZ);
Trk::TrackingVolume* topVolume =
- new Trk::TrackingVolume(0, globalBounds, aLVC.m_muonMaterial, dummyLayers, dummyVolumes, "GlobalVolume");
+ new Trk::TrackingVolume(nullptr, globalBounds, aLVC.m_muonMaterial, dummyLayers, dummyVolumes, "GlobalVolume");
aLVC.m_standaloneTrackingVolume = topVolume;
return std::make_pair(range, new Trk::TrackingGeometry(topVolume));
}
@@ -312,7 +314,7 @@ std::pair<EventIDRange, const Trk::TrackingGeometry*> Muon::MuonTrackingGeometry
std::vector<const Trk::TrackingVolume*> enclosedCentralFaceVolumes = enclosedDetGlueVolumes.glueVolumes(Trk::cylinderCover);
std::vector<const Trk::TrackingVolume*> enclosedNegativeFaceVolumes = enclosedDetGlueVolumes.glueVolumes(Trk::negativeFaceXY);
std::vector<const Trk::TrackingVolume*> enclosedPositiveFaceVolumes = enclosedDetGlueVolumes.glueVolumes(Trk::positiveFaceXY);
- if (enclosedCentralFaceVolumes.size()) {
+ if (!enclosedCentralFaceVolumes.empty()) {
const Trk::CylinderVolumeBounds* cylR =
dynamic_cast<const Trk::CylinderVolumeBounds*>(&(enclosedCentralFaceVolumes[0]->volumeBounds()));
if (cylR && cylR->outerRadius() != enclosedDetectorOuterRadius) {
@@ -321,7 +323,7 @@ std::pair<EventIDRange, const Trk::TrackingGeometry*> Muon::MuonTrackingGeometry
name() << " enclosed volume envelope outer radius does not correspond to radius of glue volumes : adjusted ");
}
}
- if (enclosedNegativeFaceVolumes.size() && enclosedPositiveFaceVolumes.size()) {
+ if (!enclosedNegativeFaceVolumes.empty() && !enclosedPositiveFaceVolumes.empty()) {
double negZ = -enclosedDetectorHalfZ;
double posZ = enclosedDetectorHalfZ;
const Trk::CylinderVolumeBounds* cylN =
@@ -401,7 +403,7 @@ std::pair<EventIDRange, const Trk::TrackingGeometry*> Muon::MuonTrackingGeometry
if (envelopeDefs[i].first > rmax) rmax = envelopeDefs[i].first;
if (fabs(envelopeDefs[i].second) > zmax) zmax = fabs(envelopeDefs[i].second);
}
- if (envelopeDefs.size()) {
+ if (!envelopeDefs.empty()) {
if (rmax > 0. && rmax <= aLVC.m_innerBarrelRadius && zmax > 0. && zmax <= m_barrelZ) {
enclosedBounds = new Trk::CylinderVolumeBounds(rmax, zmax);
} else {
@@ -413,7 +415,7 @@ std::pair<EventIDRange, const Trk::TrackingGeometry*> Muon::MuonTrackingGeometry
}
if (!enclosedBounds) enclosedBounds = new Trk::CylinderVolumeBounds(aLVC.m_innerBarrelRadius, m_barrelZ);
- enclosed = new Trk::TrackingVolume(0, enclosedBounds, aLVC.m_muonMaterial, dummyLayers, dummyVolumes, m_entryVolume);
+ enclosed = new Trk::TrackingVolume(nullptr, enclosedBounds, aLVC.m_muonMaterial, dummyLayers, dummyVolumes, m_entryVolume);
enclosed->registerColorCode(0);
ATH_MSG_DEBUG(" register Barrel m_entryVolume " << m_entryVolume);
}
@@ -422,10 +424,10 @@ std::pair<EventIDRange, const Trk::TrackingGeometry*> Muon::MuonTrackingGeometry
for (unsigned int i = 0; i < envelopeDefs.size(); i++) {
// ATH_MSG_VERBOSE( "Rz pair:"<< i<<":"<< envelopeDefs[i].first<<","<<envelopeDefs[i].second );
- if (aLVC.m_msCutoutsIn.size() && aLVC.m_msCutoutsIn.back().second == -aLVC.m_outerEndcapZ) break;
- if (!aLVC.m_msCutoutsIn.size() || fabs(aLVC.m_msCutoutsIn.back().second) > m_barrelZ || fabs(envelopeDefs[i].second) > m_barrelZ)
+ if (!aLVC.m_msCutoutsIn.empty() && aLVC.m_msCutoutsIn.back().second == -aLVC.m_outerEndcapZ) break;
+ if (aLVC.m_msCutoutsIn.empty() || fabs(aLVC.m_msCutoutsIn.back().second) > m_barrelZ || fabs(envelopeDefs[i].second) > m_barrelZ)
aLVC.m_msCutoutsIn.push_back(envelopeDefs[i]);
- else if (aLVC.m_msCutoutsIn.size() && aLVC.m_msCutoutsIn.back().second == m_barrelZ &&
+ else if (!aLVC.m_msCutoutsIn.empty() && aLVC.m_msCutoutsIn.back().second == m_barrelZ &&
aLVC.m_msCutoutsIn.back().first != aLVC.m_innerBarrelRadius) {
aLVC.m_msCutoutsIn.push_back(RZPair(aLVC.m_innerBarrelRadius, m_barrelZ));
aLVC.m_msCutoutsIn.push_back(RZPair(aLVC.m_innerBarrelRadius, -m_barrelZ));
@@ -475,7 +477,7 @@ std::pair<EventIDRange, const Trk::TrackingGeometry*> Muon::MuonTrackingGeometry
// muon barrel
barrelBounds = new Trk::CylinderVolumeBounds(aLVC.m_innerBarrelRadius, aLVC.m_outerBarrelRadius, m_diskShieldZ);
- Trk::Volume barrelVol(0, barrelBounds);
+ Trk::Volume barrelVol(nullptr, barrelBounds);
// process volume
// barrel
if (aLVC.m_adjustStatic && aLVC.m_static3d)
@@ -751,7 +753,7 @@ StatusCode Muon::MuonTrackingGeometryBuilderCond::finalize() {
ATH_MSG_INFO(name() << " finalize() successful");
return StatusCode::SUCCESS;
}
-const Muon::Span* Muon::MuonTrackingGeometryBuilderCond::findVolumeSpan(const Trk::VolumeBounds* volBounds, Amg::Transform3D transform,
+const Muon::Span* Muon::MuonTrackingGeometryBuilderCond::findVolumeSpan(const Trk::VolumeBounds* volBounds, const Amg::Transform3D& transform,
double zTol, double phiTol, LocalVariablesContainer& aLVC) const {
if (!volBounds) return nullptr;
// volume shape
@@ -812,65 +814,65 @@ const Muon::Span* Muon::MuonTrackingGeometryBuilderCond::findVolumeSpan(const Tr
double cylZcorr = 0.;
if (box) {
- edges.push_back(Amg::Vector3D(box->halflengthX(), box->halflengthY(), box->halflengthZ()));
- edges.push_back(Amg::Vector3D(-box->halflengthX(), box->halflengthY(), box->halflengthZ()));
- edges.push_back(Amg::Vector3D(box->halflengthX(), -box->halflengthY(), box->halflengthZ()));
- edges.push_back(Amg::Vector3D(-box->halflengthX(), -box->halflengthY(), box->halflengthZ()));
- edges.push_back(Amg::Vector3D(box->halflengthX(), box->halflengthY(), -box->halflengthZ()));
- edges.push_back(Amg::Vector3D(-box->halflengthX(), box->halflengthY(), -box->halflengthZ()));
- edges.push_back(Amg::Vector3D(box->halflengthX(), -box->halflengthY(), -box->halflengthZ()));
- edges.push_back(Amg::Vector3D(-box->halflengthX(), -box->halflengthY(), -box->halflengthZ()));
- edges.push_back(Amg::Vector3D(0., 0., -box->halflengthZ()));
- edges.push_back(Amg::Vector3D(0., 0., box->halflengthZ()));
- edges.push_back(Amg::Vector3D(-box->halflengthX(), 0., 0.));
- edges.push_back(Amg::Vector3D(box->halflengthX(), 0., 0.));
- edges.push_back(Amg::Vector3D(0., -box->halflengthY(), 0.));
- edges.push_back(Amg::Vector3D(0., box->halflengthY(), 0.));
+ edges.emplace_back(box->halflengthX(), box->halflengthY(), box->halflengthZ());
+ edges.emplace_back(-box->halflengthX(), box->halflengthY(), box->halflengthZ());
+ edges.emplace_back(box->halflengthX(), -box->halflengthY(), box->halflengthZ());
+ edges.emplace_back(-box->halflengthX(), -box->halflengthY(), box->halflengthZ());
+ edges.emplace_back(box->halflengthX(), box->halflengthY(), -box->halflengthZ());
+ edges.emplace_back(-box->halflengthX(), box->halflengthY(), -box->halflengthZ());
+ edges.emplace_back(box->halflengthX(), -box->halflengthY(), -box->halflengthZ());
+ edges.emplace_back(-box->halflengthX(), -box->halflengthY(), -box->halflengthZ());
+ edges.emplace_back(0., 0., -box->halflengthZ());
+ edges.emplace_back(0., 0., box->halflengthZ());
+ edges.emplace_back(-box->halflengthX(), 0., 0.);
+ edges.emplace_back(box->halflengthX(), 0., 0.);
+ edges.emplace_back(0., -box->halflengthY(), 0.);
+ edges.emplace_back(0., box->halflengthY(), 0.);
}
if (trd) {
// std::cout << " Trapezoid minHalflengthX " << trd->minHalflengthX() << " maxHalflengthX() " << trd->maxHalflengthX() << "
// halflengthY() " << trd->halflengthY() << " halflengthZ " << trd->halflengthZ() << std::endl;
- edges.push_back(Amg::Vector3D(trd->maxHalflengthX(), trd->halflengthY(), trd->halflengthZ()));
- edges.push_back(Amg::Vector3D(-trd->maxHalflengthX(), trd->halflengthY(), trd->halflengthZ()));
- edges.push_back(Amg::Vector3D(trd->minHalflengthX(), -trd->halflengthY(), trd->halflengthZ()));
- edges.push_back(Amg::Vector3D(-trd->minHalflengthX(), -trd->halflengthY(), trd->halflengthZ()));
- edges.push_back(Amg::Vector3D(trd->maxHalflengthX(), trd->halflengthY(), -trd->halflengthZ()));
- edges.push_back(Amg::Vector3D(-trd->maxHalflengthX(), trd->halflengthY(), -trd->halflengthZ()));
- edges.push_back(Amg::Vector3D(trd->minHalflengthX(), -trd->halflengthY(), -trd->halflengthZ()));
- edges.push_back(Amg::Vector3D(-trd->minHalflengthX(), -trd->halflengthY(), -trd->halflengthZ()));
- edges.push_back(Amg::Vector3D(0., 0., -trd->halflengthZ()));
- edges.push_back(Amg::Vector3D(0., 0., trd->halflengthZ()));
- edges.push_back(Amg::Vector3D(-0.5 * (trd->minHalflengthX() - trd->maxHalflengthX()), 0., 0.));
- edges.push_back(Amg::Vector3D(0.5 * (trd->minHalflengthX() - trd->maxHalflengthX()), 0., 0.));
- edges.push_back(Amg::Vector3D(0., -trd->halflengthY(), 0.));
- edges.push_back(Amg::Vector3D(0., trd->halflengthY(), 0.));
+ edges.emplace_back(trd->maxHalflengthX(), trd->halflengthY(), trd->halflengthZ());
+ edges.emplace_back(-trd->maxHalflengthX(), trd->halflengthY(), trd->halflengthZ());
+ edges.emplace_back(trd->minHalflengthX(), -trd->halflengthY(), trd->halflengthZ());
+ edges.emplace_back(-trd->minHalflengthX(), -trd->halflengthY(), trd->halflengthZ());
+ edges.emplace_back(trd->maxHalflengthX(), trd->halflengthY(), -trd->halflengthZ());
+ edges.emplace_back(-trd->maxHalflengthX(), trd->halflengthY(), -trd->halflengthZ());
+ edges.emplace_back(trd->minHalflengthX(), -trd->halflengthY(), -trd->halflengthZ());
+ edges.emplace_back(-trd->minHalflengthX(), -trd->halflengthY(), -trd->halflengthZ());
+ edges.emplace_back(0., 0., -trd->halflengthZ());
+ edges.emplace_back(0., 0., trd->halflengthZ());
+ edges.emplace_back(-0.5 * (trd->minHalflengthX() - trd->maxHalflengthX()), 0., 0.);
+ edges.emplace_back(0.5 * (trd->minHalflengthX() - trd->maxHalflengthX()), 0., 0.);
+ edges.emplace_back(0., -trd->halflengthY(), 0.);
+ edges.emplace_back(0., trd->halflengthY(), 0.);
}
if (dtrd) {
- edges.push_back(Amg::Vector3D(dtrd->maxHalflengthX(), 2 * dtrd->halflengthY2(), dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(-dtrd->maxHalflengthX(), 2 * dtrd->halflengthY2(), dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(dtrd->medHalflengthX(), 0., dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(-dtrd->medHalflengthX(), 0., dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(dtrd->minHalflengthX(), -2 * dtrd->halflengthY1(), dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(-dtrd->minHalflengthX(), -2 * dtrd->halflengthY1(), dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(dtrd->maxHalflengthX(), 2 * dtrd->halflengthY2(), -dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(-dtrd->maxHalflengthX(), 2 * dtrd->halflengthY2(), -dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(dtrd->medHalflengthX(), 0., -dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(-dtrd->medHalflengthX(), 0., -dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(dtrd->minHalflengthX(), -2 * dtrd->halflengthY1(), -dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(-dtrd->minHalflengthX(), -2 * dtrd->halflengthY1(), -dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(0., 0., -dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(0., 0., dtrd->halflengthZ()));
- edges.push_back(Amg::Vector3D(0., -2 * dtrd->halflengthY1(), 0.));
- edges.push_back(Amg::Vector3D(0., 2 * dtrd->halflengthY2(), 0.));
+ edges.emplace_back(dtrd->maxHalflengthX(), 2 * dtrd->halflengthY2(), dtrd->halflengthZ());
+ edges.emplace_back(-dtrd->maxHalflengthX(), 2 * dtrd->halflengthY2(), dtrd->halflengthZ());
+ edges.emplace_back(dtrd->medHalflengthX(), 0., dtrd->halflengthZ());
+ edges.emplace_back(-dtrd->medHalflengthX(), 0., dtrd->halflengthZ());
+ edges.emplace_back(dtrd->minHalflengthX(), -2 * dtrd->halflengthY1(), dtrd->halflengthZ());
+ edges.emplace_back(-dtrd->minHalflengthX(), -2 * dtrd->halflengthY1(), dtrd->halflengthZ());
+ edges.emplace_back(dtrd->maxHalflengthX(), 2 * dtrd->halflengthY2(), -dtrd->halflengthZ());
+ edges.emplace_back(-dtrd->maxHalflengthX(), 2 * dtrd->halflengthY2(), -dtrd->halflengthZ());
+ edges.emplace_back(dtrd->medHalflengthX(), 0., -dtrd->halflengthZ());
+ edges.emplace_back(-dtrd->medHalflengthX(), 0., -dtrd->halflengthZ());
+ edges.emplace_back(dtrd->minHalflengthX(), -2 * dtrd->halflengthY1(), -dtrd->halflengthZ());
+ edges.emplace_back(-dtrd->minHalflengthX(), -2 * dtrd->halflengthY1(), -dtrd->halflengthZ());
+ edges.emplace_back(0., 0., -dtrd->halflengthZ());
+ edges.emplace_back(0., 0., dtrd->halflengthZ());
+ edges.emplace_back(0., -2 * dtrd->halflengthY1(), 0.);
+ edges.emplace_back(0., 2 * dtrd->halflengthY2(), 0.);
}
if (bcyl) {
- edges.push_back(Amg::Vector3D(0., 0., bcyl->halflengthZ()));
- edges.push_back(Amg::Vector3D(0., 0., -bcyl->halflengthZ()));
+ edges.emplace_back(0., 0., bcyl->halflengthZ());
+ edges.emplace_back(0., 0., -bcyl->halflengthZ());
}
if (cyl) {
- edges.push_back(Amg::Vector3D(0., 0., cyl->halflengthZ()));
- edges.push_back(Amg::Vector3D(0., 0., -cyl->halflengthZ()));
+ edges.emplace_back(0., 0., cyl->halflengthZ());
+ edges.emplace_back(0., 0., -cyl->halflengthZ());
}
if (spb) {
#ifdef TRKDETDESCR_USEFLOATPRECISON
@@ -881,12 +883,12 @@ const Muon::Span* Muon::MuonTrackingGeometryBuilderCond::findVolumeSpan(const Tr
#undef double
#endif
for (unsigned int i = 0; i < vtcs.size(); i++) {
- edges.push_back(Amg::Vector3D(vtcs[i].first, vtcs[i].second, spb->halflengthZ()));
- edges.push_back(Amg::Vector3D(vtcs[i].first, vtcs[i].second, -spb->halflengthZ()));
+ edges.emplace_back(vtcs[i].first, vtcs[i].second, spb->halflengthZ());
+ edges.emplace_back(vtcs[i].first, vtcs[i].second, -spb->halflengthZ());
}
// center
- edges.push_back(Amg::Vector3D(0., 0., spb->halflengthZ()));
- edges.push_back(Amg::Vector3D(0., 0., -spb->halflengthZ()));
+ edges.emplace_back(0., 0., spb->halflengthZ());
+ edges.emplace_back(0., 0., -spb->halflengthZ());
}
if (prism) {
#ifdef TRKDETDESCR_USEFLOATPRECISON
@@ -897,11 +899,11 @@ const Muon::Span* Muon::MuonTrackingGeometryBuilderCond::findVolumeSpan(const Tr
#undef double
#endif
for (unsigned int i = 0; i < vtcs.size(); i++) {
- edges.push_back(Amg::Vector3D(vtcs[i].first, vtcs[i].second, prism->halflengthZ()));
- edges.push_back(Amg::Vector3D(vtcs[i].first, vtcs[i].second, -prism->halflengthZ()));
+ edges.emplace_back(vtcs[i].first, vtcs[i].second, prism->halflengthZ());
+ edges.emplace_back(vtcs[i].first, vtcs[i].second, -prism->halflengthZ());
}
- edges.push_back(Amg::Vector3D(0., 0., prism->halflengthZ()));
- edges.push_back(Amg::Vector3D(0., 0., -prism->halflengthZ()));
+ edges.emplace_back(0., 0., prism->halflengthZ());
+ edges.emplace_back(0., 0., -prism->halflengthZ());
}
// apply transform and get span
double minP0 = M_PI;
@@ -1021,7 +1023,7 @@ const Muon::Span* Muon::MuonTrackingGeometryBuilderCond::findVolumeSpan(const Tr
const std::vector<std::vector<std::pair<const Trk::DetachedTrackingVolume*, const Muon::Span*> >*>*
Muon::MuonTrackingGeometryBuilderCond::findVolumesSpan(const std::vector<std::unique_ptr<const Trk::DetachedTrackingVolume> >* objs,
double zTol, double phiTol, LocalVariablesContainer& aLVC) const {
- if (!objs || !objs->size()) return nullptr;
+ if (!objs || objs->empty()) return nullptr;
std::vector<std::vector<std::pair<const Trk::DetachedTrackingVolume*, const Span*> >*>* spans =
new std::vector<std::vector<std::pair<const Trk::DetachedTrackingVolume*, const Span*> >*>(9);
// split MS into 9 blocks to speed up the build-up of geometry
@@ -1094,7 +1096,7 @@ Muon::MuonTrackingGeometryBuilderCond::findVolumesSpan(const std::vector<std::un
}
const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processVolume(const Trk::Volume* vol, int etaN, int phiN,
- std::string volumeName, LocalVariablesContainer& aLVC,
+ const std::string& volumeName, LocalVariablesContainer& aLVC,
bool hasStations) const {
const Trk::TrackingVolume* tVol = nullptr;
@@ -1121,7 +1123,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processVolume(
double etaSect = (cyl->halflengthZ()) / etaN;
subBds = new Trk::CylinderVolumeBounds(cyl->innerRadius(), cyl->outerRadius(), phiSect, etaSect);
- const Trk::Volume* protVol = new Trk::Volume(0, subBds);
+ const Trk::Volume* protVol = new Trk::Volume(nullptr, subBds);
// create subvolumes & BinnedArray
std::vector<Trk::TrackingVolumeOrderPosition> subVolumes;
@@ -1166,7 +1168,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processVolume(
++aLVC.m_frameNum;
if (detVols) aLVC.m_frameStat += detVols->size();
// prepare blending
- if (m_blendInertMaterial && blendVols.size()) {
+ if (m_blendInertMaterial && !blendVols.empty()) {
for (unsigned int id = 0; id < blendVols.size(); id++) {
if (!aLVC.m_blendMap[blendVols[id]]) {
aLVC.m_blendMap[blendVols[id]] = new std::vector<const Trk::TrackingVolume*>;
@@ -1186,9 +1188,9 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processVolume(
/* The above was passing a SharedObject with the ndel == True
* now that SharedObject is a typeded to std::shared_ptr , pass a no-op deleter
*/
- subVolumes.push_back(Trk::TrackingVolumeOrderPosition(
+ subVolumes.emplace_back(
Trk::SharedObject<const Trk::TrackingVolume>(sVol, Trk::do_not_delete<const Trk::TrackingVolume>),
- Amg::Vector3D(transf * gp)));
+ Amg::Vector3D(transf * gp));
// glue subVolumes
sVols.push_back(sVol);
if (eta == 0) sVolsNeg.push_back(sVol);
@@ -1222,7 +1224,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processVolume(
delete protVol;
Trk::BinnedArray2D<Trk::TrackingVolume>* subVols = new Trk::BinnedArray2D<Trk::TrackingVolume>(subVolumes, volBinUtil);
- tVol = new Trk::TrackingVolume(*vol, aLVC.m_muonMaterial, 0, subVols, volumeName);
+ tVol = new Trk::TrackingVolume(*vol, aLVC.m_muonMaterial, nullptr, subVols, volumeName);
// register glue volumes
const Trk::GlueVolumesDescriptor& volGlueVolumes = tVol->glueVolumesDescriptor();
volGlueVolumes.registerGlueVolumes(Trk::tubeInnerCover, sVols);
@@ -1241,7 +1243,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processVolume(
++aLVC.m_frameNum;
if (muonObjs) aLVC.m_frameStat += muonObjs->size();
// prepare blending
- if (m_blendInertMaterial && blendVols.size()) {
+ if (m_blendInertMaterial && !blendVols.empty()) {
for (unsigned int id = 0; id < blendVols.size(); id++) {
if (!aLVC.m_blendMap[blendVols[id]]) {
aLVC.m_blendMap[blendVols[id]] = new std::vector<const Trk::TrackingVolume*>;
@@ -1255,7 +1257,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processVolume(
return tVol;
}
-const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processVolume(const Trk::Volume* vol, int mode, std::string volumeName,
+const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processVolume(const Trk::Volume* vol, int mode, const std::string& volumeName,
LocalVariablesContainer& aLVC, bool hasStations) const {
ATH_MSG_VERBOSE(name() << "processing volume in mode:" << mode);
@@ -1292,7 +1294,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processVolume(
if (aLVC.m_zPartitions[iz] == zSteps.front()) zTypes.push_back(aLVC.m_zPartitionsType[iz]);
if (aLVC.m_zPartitions[iz] > z1 && aLVC.m_zPartitions[iz] < z2) {
zSteps.push_back(aLVC.m_zPartitions[iz]);
- if (!zTypes.size()) {
+ if (zTypes.empty()) {
if (iz == 0)
zTypes.push_back(0);
else
@@ -1365,7 +1367,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processVolume(
for (unsigned int eta = 0; eta < zSteps.size() - 1; eta++) {
if (colorCode > 0) colorCode = 6 - colorCode;
double posZ = 0.5 * (zSteps[eta] + zSteps[eta + 1]);
- double hZ = 0.5 * fabs(zSteps[eta + 1] - zSteps[eta]);
+ double hZ = 0.5 * std::fabs(zSteps[eta + 1] - zSteps[eta]);
std::vector<std::vector<const Trk::TrackingVolume*> > phiSubs;
std::vector<Trk::SharedObject<Trk::BinnedArray<Trk::TrackingVolume> > > phBins;
std::vector<int> phiType(phiTypeMax + 1, -1); // indication of first phi/R partition built for a given type (for cloning)
@@ -1377,7 +1379,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processVolume(
double phiSect = 0.;
if (phi < phiN - 1) {
posPhi += 0.5 * aLVC.m_adjustedPhi[phi + 1];
- phiSect = 0.5 * fabs(aLVC.m_adjustedPhi[phi + 1] - aLVC.m_adjustedPhi[phi]);
+ phiSect = 0.5 * std::fabs(aLVC.m_adjustedPhi[phi + 1] - aLVC.m_adjustedPhi[phi]);
} else {
posPhi += 0.5 * aLVC.m_adjustedPhi[0] + M_PI;
phiSect = 0.5 * fabs(aLVC.m_adjustedPhi[0] + 2 * M_PI - aLVC.m_adjustedPhi[phi]);
@@ -1425,7 +1427,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processVolume(
++aLVC.m_frameNum;
if (detVols) aLVC.m_frameStat += detVols->size();
// prepare blending
- if (m_blendInertMaterial && blendVols.size()) {
+ if (m_blendInertMaterial && !blendVols.empty()) {
for (unsigned int id = 0; id < blendVols.size(); id++) {
if (!aLVC.m_blendMap[blendVols[id]]) {
aLVC.m_blendMap[blendVols[id]] = new std::vector<const Trk::TrackingVolume*>;
@@ -1454,11 +1456,11 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processVolume(
sVol->registerColorCode(colorCode + pCode + hCode);
// reference position
Amg::Vector3D gp(0.5 * (hSteps[h].second + hSteps[h + 1].second), 0., 0.);
- subVolumesVect.push_back(Trk::TrackingVolumeOrderPosition(Trk::SharedObject<const Trk::TrackingVolume>(sVol),
- Amg::Vector3D((*transf) * gp)));
- hSubsTr.push_back(Trk::TrackingVolumeOrderPosition(
+ subVolumesVect.emplace_back(Trk::SharedObject<const Trk::TrackingVolume>(sVol),
+ Amg::Vector3D((*transf) * gp));
+ hSubsTr.emplace_back(
Trk::SharedObject<const Trk::TrackingVolume>(sVol, Trk::do_not_delete<const Trk::TrackingVolume>),
- Amg::Vector3D((*transf) * gp)));
+ Amg::Vector3D((*transf) * gp));
hSubs.push_back(sVol);
// cleanup
@@ -1533,7 +1535,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processVolume(
Trk::BinnedArray1D1D1D<Trk::TrackingVolume>* subVols =
new Trk::BinnedArray1D1D1D<Trk::TrackingVolume>(subVolumesVect, zBinUtil, pBinUtil, hBinUtil);
- tVol = new Trk::TrackingVolume(*vol, aLVC.m_muonMaterial, 0, subVols, volumeName);
+ tVol = new Trk::TrackingVolume(*vol, aLVC.m_muonMaterial, nullptr, subVols, volumeName);
// register glue volumes
const Trk::GlueVolumesDescriptor& volGlueVolumes = tVol->glueVolumesDescriptor();
volGlueVolumes.registerGlueVolumes(Trk::tubeInnerCover, sVolsInn);
@@ -1564,7 +1566,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processVolume(
std::vector<const Trk::TrackingVolume*> sVolsPos(phiN); // for gluing
for (unsigned int eta = 0; eta < zSteps.size() - 1; eta++) {
double posZ = 0.5 * (zSteps[eta] + zSteps[eta + 1]);
- double hZ = 0.5 * fabs(zSteps[eta + 1] - zSteps[eta]);
+ double hZ = 0.5 * std::fabs(zSteps[eta + 1] - zSteps[eta]);
colorCode = 26 - colorCode;
for (unsigned int phi = 0; phi < phiN; phi++) {
colorCode = 26 - colorCode;
@@ -1572,7 +1574,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processVolume(
double phiSect = 0.;
if (phi < phiN - 1) {
posPhi += 0.5 * aLVC.m_adjustedPhi[phi + 1];
- phiSect = 0.5 * fabs(aLVC.m_adjustedPhi[phi + 1] - aLVC.m_adjustedPhi[phi]);
+ phiSect = 0.5 * std::fabs(aLVC.m_adjustedPhi[phi + 1] - aLVC.m_adjustedPhi[phi]);
} else {
posPhi += 0.5 * aLVC.m_adjustedPhi[0] + M_PI;
phiSect = 0.5 * fabs(aLVC.m_adjustedPhi[0] + 2 * M_PI - aLVC.m_adjustedPhi[phi]);
@@ -1594,7 +1596,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processVolume(
++aLVC.m_frameNum;
if (detVols) aLVC.m_frameStat += detVols->size();
// prepare blending
- if (m_blendInertMaterial && blendVols.size()) {
+ if (m_blendInertMaterial && !blendVols.empty()) {
for (unsigned int id = 0; id < blendVols.size(); id++) {
if (!aLVC.m_blendMap[blendVols[id]]) {
aLVC.m_blendMap[blendVols[id]] = new std::vector<const Trk::TrackingVolume*>;
@@ -1658,7 +1660,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processVolume(
Trk::BinnedArray2D<Trk::TrackingVolume>* subVols = new Trk::BinnedArray2D<Trk::TrackingVolume>(subVolumes, volBinUtil);
- tVol = new Trk::TrackingVolume(*vol, aLVC.m_muonMaterial, 0, subVols, volumeName);
+ tVol = new Trk::TrackingVolume(*vol, aLVC.m_muonMaterial, nullptr, subVols, volumeName);
// register glue volumes
const Trk::GlueVolumesDescriptor& volGlueVolumes = tVol->glueVolumesDescriptor();
volGlueVolumes.registerGlueVolumes(Trk::tubeInnerCover, sVols);
@@ -1677,7 +1679,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processVolume(
++aLVC.m_frameNum;
if (muonObjs) aLVC.m_frameStat += muonObjs->size();
// prepare blending
- if (m_blendInertMaterial && blendVols.size()) {
+ if (m_blendInertMaterial && !blendVols.empty()) {
for (unsigned int id = 0; id < blendVols.size(); id++) {
if (!aLVC.m_blendMap[blendVols[id]]) {
aLVC.m_blendMap[blendVols[id]] = new std::vector<const Trk::TrackingVolume*>;
@@ -1691,7 +1693,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processVolume(
return tVol;
}
-const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processShield(const Trk::Volume* vol, int type, std::string volumeName,
+const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processShield(const Trk::Volume* vol, int type, const std::string& volumeName,
LocalVariablesContainer& aLVC, bool hasStations) const {
ATH_MSG_VERBOSE(name() << "processing shield volume " << volumeName << " in mode:" << type);
@@ -1759,7 +1761,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processShield(
for (unsigned int eta = 0; eta < zSteps.size() - 1; eta++) {
if (colorCode > 0) colorCode = 26 - colorCode;
double posZ = 0.5 * (zSteps[eta] + zSteps[eta + 1]);
- double hZ = 0.5 * fabs(zSteps[eta + 1] - zSteps[eta]);
+ double hZ = 0.5 * std::fabs(zSteps[eta + 1] - zSteps[eta]);
std::vector<std::vector<const Trk::TrackingVolume*> > phiSubs;
std::vector<Trk::SharedObject<Trk::BinnedArray<Trk::TrackingVolume> > > phBins;
int phi = 0;
@@ -1789,7 +1791,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processShield(
++aLVC.m_frameNum;
if (detVols) aLVC.m_frameStat += detVols->size();
// prepare blending
- if (m_blendInertMaterial && blendVols.size()) {
+ if (m_blendInertMaterial && !blendVols.empty()) {
for (unsigned int id = 0; id < blendVols.size(); id++) {
if (!aLVC.m_blendMap[blendVols[id]]) {
aLVC.m_blendMap[blendVols[id]] = new std::vector<const Trk::TrackingVolume*>;
@@ -1811,11 +1813,10 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processShield(
sVol->registerColorCode(colorCode + hCode);
// reference position
Amg::Vector3D gp(subBds->mediumRadius(), 0., 0.);
- subVolumesVect.push_back(
- Trk::TrackingVolumeOrderPosition(Trk::SharedObject<const Trk::TrackingVolume>(sVol), Amg::Vector3D((*transf) * gp)));
- hSubsTr.push_back(Trk::TrackingVolumeOrderPosition(
+ subVolumesVect.emplace_back(Trk::SharedObject<const Trk::TrackingVolume>(sVol), Amg::Vector3D((*transf) * gp));
+ hSubsTr.emplace_back(
Trk::SharedObject<const Trk::TrackingVolume>(sVol, Trk::do_not_delete<const Trk::TrackingVolume>),
- Amg::Vector3D((*transf) * gp)));
+ Amg::Vector3D((*transf) * gp));
hSubs.push_back(sVol);
// glue subVolume
@@ -1851,7 +1852,7 @@ const Trk::TrackingVolume* Muon::MuonTrackingGeometryBuilderCond::processShield(
Trk::BinnedArray1D1D1D<Trk::TrackingVolume>* subVols =
new Trk::BinnedArray1D1D1D<Trk::TrackingVolume>(subVolumesVect, zBinUtil, pBinUtil, hBinUtil);
- tVol = new Trk::TrackingVolume(*vol, aLVC.m_muonMaterial, 0, subVols, volumeName);
+ tVol = new Trk::TrackingVolume(*vol, aLVC.m_muonMaterial, nullptr, subVols, volumeName);
// register glue volumes
const Trk::GlueVolumesDescriptor& volGlueVolumes = tVol->glueVolumesDescriptor();
volGlueVolumes.registerGlueVolumes(Trk::tubeInnerCover, sVolsInn);
@@ -2102,7 +2103,7 @@ bool Muon::MuonTrackingGeometryBuilderCond::enclosed(const Trk::Volume* vol, con
return encl;
}
-void Muon::MuonTrackingGeometryBuilderCond::checkVolume(const Trk::TrackingVolume* vol) const {
+void Muon::MuonTrackingGeometryBuilderCond::checkVolume(const Trk::TrackingVolume* vol) {
std::cout << "MuonTrackingGeometryBuilderCond::checkVolume: " << vol->volumeName() << std::endl;
const Trk::CylinderVolumeBounds* cyl = dynamic_cast<const Trk::CylinderVolumeBounds*>(&(vol->volumeBounds()));
@@ -2431,66 +2432,66 @@ void Muon::MuonTrackingGeometryBuilderCond::getHParts(LocalVariablesContainer& a
// 0: barrel 2x2
// non BT sector
std::vector<std::pair<int, float> > barrelZ0F0;
- barrelZ0F0.push_back(std::pair<int, float>(0, aLVC.m_innerBarrelRadius));
+ barrelZ0F0.emplace_back(0, aLVC.m_innerBarrelRadius);
if (m_activeAdjustLevel > 0) {
- barrelZ0F0.push_back(std::pair<int, float>(0, 4450.)); // for DiskShieldingBackDisk
- barrelZ0F0.push_back(std::pair<int, float>(0, 6500.)); // BI/BM
- barrelZ0F0.push_back(std::pair<int, float>(0, 8900.)); // BM/BO
- barrelZ0F0.push_back(std::pair<int, float>(0, 13000.)); // outer envelope
+ barrelZ0F0.emplace_back(0, 4450.); // for DiskShieldingBackDisk
+ barrelZ0F0.emplace_back(0, 6500.); // BI/BM
+ barrelZ0F0.emplace_back(0, 8900.); // BM/BO
+ barrelZ0F0.emplace_back(0, 13000.); // outer envelope
}
- barrelZ0F0.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ barrelZ0F0.emplace_back(0, aLVC.m_outerBarrelRadius);
std::vector<std::pair<int, float> > barrelZ0F1;
- barrelZ0F1.push_back(std::pair<int, float>(0, aLVC.m_innerBarrelRadius));
+ barrelZ0F1.emplace_back(0, aLVC.m_innerBarrelRadius);
if (m_inertAdjustLevel > 0) {
- barrelZ0F1.push_back(std::pair<int, float>(1, 4500.));
- barrelZ0F1.push_back(std::pair<int, float>(1, 5900.));
+ barrelZ0F1.emplace_back(1, 4500.);
+ barrelZ0F1.emplace_back(1, 5900.);
} else if (m_activeAdjustLevel > 0)
- barrelZ0F1.push_back(std::pair<int, float>(0, 4450.));
- if (m_activeAdjustLevel > 0) barrelZ0F1.push_back(std::pair<int, float>(0, 6500.));
+ barrelZ0F1.emplace_back(0, 4450.);
+ if (m_activeAdjustLevel > 0) barrelZ0F1.emplace_back(0, 6500.);
if (m_inertAdjustLevel > 0)
- barrelZ0F1.push_back(std::pair<int, float>(1, 8900.));
+ barrelZ0F1.emplace_back(1, 8900.);
else if (m_activeAdjustLevel > 0)
- barrelZ0F1.push_back(std::pair<int, float>(0, 8900.));
- if (m_inertAdjustLevel > 0) barrelZ0F1.push_back(std::pair<int, float>(1, 10100.));
- barrelZ0F1.push_back(std::pair<int, float>(0, 13000.)); // outer envelope
- barrelZ0F1.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ barrelZ0F1.emplace_back(0, 8900.);
+ if (m_inertAdjustLevel > 0) barrelZ0F1.emplace_back(1, 10100.);
+ barrelZ0F1.emplace_back(0, 13000.); // outer envelope
+ barrelZ0F1.emplace_back(0, aLVC.m_outerBarrelRadius);
// BT sector
std::vector<std::pair<int, float> > barrelZ1F0;
- barrelZ1F0.push_back(std::pair<int, float>(0, aLVC.m_innerBarrelRadius));
+ barrelZ1F0.emplace_back(0, aLVC.m_innerBarrelRadius);
if (static_cast<int>(m_activeAdjustLevel) + static_cast<int>(m_inertAdjustLevel) > 0)
- barrelZ1F0.push_back(std::pair<int, float>(0, 4450.));
+ barrelZ1F0.emplace_back(0, 4450.);
if (m_inertAdjustLevel > 0) {
- barrelZ1F0.push_back(std::pair<int, float>(1, 5800.));
- barrelZ1F0.push_back(std::pair<int, float>(1, 6500.));
+ barrelZ1F0.emplace_back(1, 5800.);
+ barrelZ1F0.emplace_back(1, 6500.);
} else if (m_activeAdjustLevel > 0)
- barrelZ1F0.push_back(std::pair<int, float>(0, 6500.));
+ barrelZ1F0.emplace_back(0, 6500.);
if (m_inertAdjustLevel > 0) {
- barrelZ1F0.push_back(std::pair<int, float>(1, 6750.));
- barrelZ1F0.push_back(std::pair<int, float>(1, 8400.));
+ barrelZ1F0.emplace_back(1, 6750.);
+ barrelZ1F0.emplace_back(1, 8400.);
}
- if (m_activeAdjustLevel > 0) barrelZ1F0.push_back(std::pair<int, float>(0, 8770.)); // adapted for cryoring (from 8900)
- if (m_inertAdjustLevel > 0) barrelZ1F0.push_back(std::pair<int, float>(1, 9850.)); // adapted for cryoring (from 9600)
- barrelZ1F0.push_back(std::pair<int, float>(0, 13000.)); // outer envelope
- barrelZ1F0.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ if (m_activeAdjustLevel > 0) barrelZ1F0.emplace_back(0, 8770.); // adapted for cryoring (from 8900)
+ if (m_inertAdjustLevel > 0) barrelZ1F0.emplace_back(1, 9850.); // adapted for cryoring (from 9600)
+ barrelZ1F0.emplace_back(0, 13000.); // outer envelope
+ barrelZ1F0.emplace_back(0, aLVC.m_outerBarrelRadius);
std::vector<std::pair<int, float> > barrelZ1F1;
- barrelZ1F1.push_back(std::pair<int, float>(0, aLVC.m_innerBarrelRadius));
+ barrelZ1F1.emplace_back(0, aLVC.m_innerBarrelRadius);
if (m_inertAdjustLevel > 0) {
- barrelZ1F1.push_back(std::pair<int, float>(1, 4500.));
- barrelZ1F1.push_back(std::pair<int, float>(1, 6000.));
+ barrelZ1F1.emplace_back(1, 4500.);
+ barrelZ1F1.emplace_back(1, 6000.);
} else if (m_activeAdjustLevel > 0)
- barrelZ1F1.push_back(std::pair<int, float>(0, 4450.));
- if (m_activeAdjustLevel > 0) barrelZ1F1.push_back(std::pair<int, float>(0, 6500.));
- if (m_inertAdjustLevel > 0) barrelZ1F1.push_back(std::pair<int, float>(1, 6800.));
+ barrelZ1F1.emplace_back(0, 4450.);
+ if (m_activeAdjustLevel > 0) barrelZ1F1.emplace_back(0, 6500.);
+ if (m_inertAdjustLevel > 0) barrelZ1F1.emplace_back(1, 6800.);
if (m_inertAdjustLevel > 0) {
- barrelZ1F1.push_back(std::pair<int, float>(1, 8900.));
- barrelZ1F1.push_back(std::pair<int, float>(1, 10100.));
+ barrelZ1F1.emplace_back(1, 8900.);
+ barrelZ1F1.emplace_back(1, 10100.);
} else if (m_activeAdjustLevel > 0)
- barrelZ1F1.push_back(std::pair<int, float>(0, 8900.));
- barrelZ1F1.push_back(std::pair<int, float>(0, 13000.)); // outer envelope
- barrelZ1F1.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ barrelZ1F1.emplace_back(0, 8900.);
+ barrelZ1F1.emplace_back(0, 13000.); // outer envelope
+ barrelZ1F1.emplace_back(0, aLVC.m_outerBarrelRadius);
std::vector<std::vector<std::vector<std::pair<int, float> > > > barrelZF(2);
barrelZF[0].push_back(barrelZ0F0);
@@ -2501,28 +2502,28 @@ void Muon::MuonTrackingGeometryBuilderCond::getHParts(LocalVariablesContainer& a
// small wheel 1x2 ( no z BT sector)
// non BT sector
std::vector<std::pair<int, float> > swZ0F0;
- swZ0F0.push_back(std::pair<int, float>(0, m_innerShieldRadius));
- if (m_activeAdjustLevel > 1) { swZ0F0.push_back(std::pair<int, float>(0, 2700.)); }
- if (static_cast<int>(m_activeAdjustLevel) + static_cast<int>(m_inertAdjustLevel) > 0) swZ0F0.push_back(std::pair<int, float>(0, 4450.));
+ swZ0F0.emplace_back(0, m_innerShieldRadius);
+ if (m_activeAdjustLevel > 1) { swZ0F0.emplace_back(0, 2700.); }
+ if (static_cast<int>(m_activeAdjustLevel) + static_cast<int>(m_inertAdjustLevel) > 0) swZ0F0.emplace_back(0, 4450.);
if (m_activeAdjustLevel > 0) {
- swZ0F0.push_back(std::pair<int, float>(0, 6560.)); // BI/BM
- swZ0F0.push_back(std::pair<int, float>(0, 8900.)); // BM/BO
+ swZ0F0.emplace_back(0, 6560.); // BI/BM
+ swZ0F0.emplace_back(0, 8900.); // BM/BO
}
- swZ0F0.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ swZ0F0.emplace_back(0, aLVC.m_outerBarrelRadius);
// phi BT sector
std::vector<std::pair<int, float> > swZ0F1;
- swZ0F1.push_back(std::pair<int, float>(0, m_innerShieldRadius));
- if (m_activeAdjustLevel > 1) swZ0F1.push_back(std::pair<int, float>(0, 2700.));
- if (static_cast<int>(m_inertAdjustLevel) + static_cast<int>(m_activeAdjustLevel) > 0) swZ0F1.push_back(std::pair<int, float>(0, 4450.));
- if (m_inertAdjustLevel > 0) swZ0F1.push_back(std::pair<int, float>(1, 5900.));
- if (m_activeAdjustLevel > 0) swZ0F1.push_back(std::pair<int, float>(0, 6560.));
+ swZ0F1.emplace_back(0, m_innerShieldRadius);
+ if (m_activeAdjustLevel > 1) swZ0F1.emplace_back(0, 2700.);
+ if (static_cast<int>(m_inertAdjustLevel) + static_cast<int>(m_activeAdjustLevel) > 0) swZ0F1.emplace_back(0, 4450.);
+ if (m_inertAdjustLevel > 0) swZ0F1.emplace_back(1, 5900.);
+ if (m_activeAdjustLevel > 0) swZ0F1.emplace_back(0, 6560.);
if (m_inertAdjustLevel > 0) {
- swZ0F1.push_back(std::pair<int, float>(1, 8900.));
- swZ0F1.push_back(std::pair<int, float>(1, 10100.));
+ swZ0F1.emplace_back(1, 8900.);
+ swZ0F1.emplace_back(1, 10100.);
} else if (m_activeAdjustLevel > 0)
- swZ0F1.push_back(std::pair<int, float>(0, 8900.));
- swZ0F1.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ swZ0F1.emplace_back(0, 8900.);
+ swZ0F1.emplace_back(0, aLVC.m_outerBarrelRadius);
std::vector<std::vector<std::vector<std::pair<int, float> > > > swZF(1);
swZF[0].push_back(swZ0F0);
@@ -2531,114 +2532,114 @@ void Muon::MuonTrackingGeometryBuilderCond::getHParts(LocalVariablesContainer& a
// inner endcap/ECT 2x3
// ect coil, non-BT z
std::vector<std::pair<int, float> > innerZ0F0;
- innerZ0F0.push_back(std::pair<int, float>(0, m_innerShieldRadius));
- if (m_inertAdjustLevel > 0) innerZ0F0.push_back(std::pair<int, float>(0, 1100.));
- if (m_inertAdjustLevel > 1) innerZ0F0.push_back(std::pair<int, float>(1, 5150.));
- if (m_inertAdjustLevel > 0) innerZ0F0.push_back(std::pair<int, float>(1, 5300.));
+ innerZ0F0.emplace_back(0, m_innerShieldRadius);
+ if (m_inertAdjustLevel > 0) innerZ0F0.emplace_back(0, 1100.);
+ if (m_inertAdjustLevel > 1) innerZ0F0.emplace_back(1, 5150.);
+ if (m_inertAdjustLevel > 0) innerZ0F0.emplace_back(1, 5300.);
if (m_activeAdjustLevel > 0) {
- innerZ0F0.push_back(std::pair<int, float>(0, 6500.));
- innerZ0F0.push_back(std::pair<int, float>(0, 8900.));
+ innerZ0F0.emplace_back(0, 6500.);
+ innerZ0F0.emplace_back(0, 8900.);
}
- innerZ0F0.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ innerZ0F0.emplace_back(0, aLVC.m_outerBarrelRadius);
// coil gap, non-BT z
std::vector<std::pair<int, float> > innerZ0F1;
- innerZ0F1.push_back(std::pair<int, float>(0, m_innerShieldRadius));
- if (m_inertAdjustLevel > 0) innerZ0F1.push_back(std::pair<int, float>(0, 1100.));
+ innerZ0F1.emplace_back(0, m_innerShieldRadius);
+ if (m_inertAdjustLevel > 0) innerZ0F1.emplace_back(0, 1100.);
if (m_inertAdjustLevel > 1) {
- innerZ0F1.push_back(std::pair<int, float>(1, 1400.));
- innerZ0F1.push_back(std::pair<int, float>(1, 1685.));
+ innerZ0F1.emplace_back(1, 1400.);
+ innerZ0F1.emplace_back(1, 1685.);
}
if (m_inertAdjustLevel > 0) {
- innerZ0F1.push_back(std::pair<int, float>(1, 4700.));
- innerZ0F1.push_back(std::pair<int, float>(1, 5900.));
+ innerZ0F1.emplace_back(1, 4700.);
+ innerZ0F1.emplace_back(1, 5900.);
}
if (m_activeAdjustLevel > 0) {
- innerZ0F1.push_back(std::pair<int, float>(0, 6500.));
- innerZ0F1.push_back(std::pair<int, float>(0, 8900.));
+ innerZ0F1.emplace_back(0, 6500.);
+ innerZ0F1.emplace_back(0, 8900.);
}
- innerZ0F1.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ innerZ0F1.emplace_back(0, aLVC.m_outerBarrelRadius);
// BT coil, no-BT z
std::vector<std::pair<int, float> > innerZ0F2;
- innerZ0F2.push_back(std::pair<int, float>(0, m_innerShieldRadius));
- if (m_inertAdjustLevel > 0) innerZ0F2.push_back(std::pair<int, float>(0, 1100.));
+ innerZ0F2.emplace_back(0, m_innerShieldRadius);
+ if (m_inertAdjustLevel > 0) innerZ0F2.emplace_back(0, 1100.);
if (m_inertAdjustLevel > 1) {
- innerZ0F2.push_back(std::pair<int, float>(1, 1400.));
- innerZ0F2.push_back(std::pair<int, float>(1, 1685.));
+ innerZ0F2.emplace_back(1, 1400.);
+ innerZ0F2.emplace_back(1, 1685.);
}
if (m_inertAdjustLevel > 0) {
- innerZ0F2.push_back(std::pair<int, float>(1, 4450.));
- innerZ0F2.push_back(std::pair<int, float>(1, 5900.));
+ innerZ0F2.emplace_back(1, 4450.);
+ innerZ0F2.emplace_back(1, 5900.);
}
- if (m_activeAdjustLevel > 0) innerZ0F2.push_back(std::pair<int, float>(0, 6500.));
+ if (m_activeAdjustLevel > 0) innerZ0F2.emplace_back(0, 6500.);
if (m_inertAdjustLevel > 0) {
- innerZ0F2.push_back(std::pair<int, float>(1, 8900.));
- innerZ0F2.push_back(std::pair<int, float>(1, 10100.));
+ innerZ0F2.emplace_back(1, 8900.);
+ innerZ0F2.emplace_back(1, 10100.);
} else if (m_activeAdjustLevel > 0)
- innerZ0F2.push_back(std::pair<int, float>(0, 8900.));
- innerZ0F2.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ innerZ0F2.emplace_back(0, 8900.);
+ innerZ0F2.emplace_back(0, aLVC.m_outerBarrelRadius);
// ect coil, z BT sector
std::vector<std::pair<int, float> > innerZ1F0;
- innerZ1F0.push_back(std::pair<int, float>(0, m_innerShieldRadius));
- if (m_inertAdjustLevel > 0) innerZ1F0.push_back(std::pair<int, float>(0, 1100.));
- if (m_inertAdjustLevel > 1) innerZ1F0.push_back(std::pair<int, float>(1, 5150.));
- if (m_inertAdjustLevel > 0) innerZ1F0.push_back(std::pair<int, float>(1, 5300.));
- if (m_inertAdjustLevel > 0) innerZ1F0.push_back(std::pair<int, float>(1, 5800.));
+ innerZ1F0.emplace_back(0, m_innerShieldRadius);
+ if (m_inertAdjustLevel > 0) innerZ1F0.emplace_back(0, 1100.);
+ if (m_inertAdjustLevel > 1) innerZ1F0.emplace_back(1, 5150.);
+ if (m_inertAdjustLevel > 0) innerZ1F0.emplace_back(1, 5300.);
+ if (m_inertAdjustLevel > 0) innerZ1F0.emplace_back(1, 5800.);
if (m_inertAdjustLevel > 0)
- innerZ1F0.push_back(std::pair<int, float>(1, 6750.));
+ innerZ1F0.emplace_back(1, 6750.);
else if (m_activeAdjustLevel > 0)
- innerZ1F0.push_back(std::pair<int, float>(0, 6500.));
+ innerZ1F0.emplace_back(0, 6500.);
if (m_inertAdjustLevel > 0) {
- innerZ1F0.push_back(std::pair<int, float>(1, 8400.));
- innerZ1F0.push_back(std::pair<int, float>(1, 9600.));
+ innerZ1F0.emplace_back(1, 8400.);
+ innerZ1F0.emplace_back(1, 9600.);
} else if (m_activeAdjustLevel > 0)
- innerZ1F0.push_back(std::pair<int, float>(0, 8900.));
- innerZ1F0.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ innerZ1F0.emplace_back(0, 8900.);
+ innerZ1F0.emplace_back(0, aLVC.m_outerBarrelRadius);
// coil gap, BT z sector
std::vector<std::pair<int, float> > innerZ1F1;
- innerZ1F1.push_back(std::pair<int, float>(0, m_innerShieldRadius));
- if (m_inertAdjustLevel > 0) innerZ1F1.push_back(std::pair<int, float>(0, 1100.));
+ innerZ1F1.emplace_back(0, m_innerShieldRadius);
+ if (m_inertAdjustLevel > 0) innerZ1F1.emplace_back(0, 1100.);
if (m_inertAdjustLevel > 1) {
- innerZ1F1.push_back(std::pair<int, float>(1, 1400.));
- innerZ1F1.push_back(std::pair<int, float>(1, 1685.));
+ innerZ1F1.emplace_back(1, 1400.);
+ innerZ1F1.emplace_back(1, 1685.);
}
if (m_inertAdjustLevel > 0) {
- innerZ1F1.push_back(std::pair<int, float>(1, 4700.));
- innerZ1F1.push_back(std::pair<int, float>(1, 5800.));
- innerZ1F1.push_back(std::pair<int, float>(1, 6750.));
+ innerZ1F1.emplace_back(1, 4700.);
+ innerZ1F1.emplace_back(1, 5800.);
+ innerZ1F1.emplace_back(1, 6750.);
} else if (m_activeAdjustLevel > 0)
- innerZ1F1.push_back(std::pair<int, float>(0, 6500.));
+ innerZ1F1.emplace_back(0, 6500.);
if (m_inertAdjustLevel > 0) {
- innerZ1F1.push_back(std::pair<int, float>(1, 8400.));
- innerZ1F1.push_back(std::pair<int, float>(1, 9600.));
+ innerZ1F1.emplace_back(1, 8400.);
+ innerZ1F1.emplace_back(1, 9600.);
} else if (m_activeAdjustLevel > 0)
- innerZ1F1.push_back(std::pair<int, float>(0, 8900.));
- innerZ1F1.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ innerZ1F1.emplace_back(0, 8900.);
+ innerZ1F1.emplace_back(0, aLVC.m_outerBarrelRadius);
// BT coil, BT z sector
std::vector<std::pair<int, float> > innerZ1F2;
- innerZ1F2.push_back(std::pair<int, float>(0, m_innerShieldRadius));
- if (m_inertAdjustLevel > 0) innerZ1F2.push_back(std::pair<int, float>(0, 1100.));
+ innerZ1F2.emplace_back(0, m_innerShieldRadius);
+ if (m_inertAdjustLevel > 0) innerZ1F2.emplace_back(0, 1100.);
if (m_inertAdjustLevel > 1) {
- innerZ1F2.push_back(std::pair<int, float>(1, 1400.));
- innerZ1F2.push_back(std::pair<int, float>(1, 1685.));
+ innerZ1F2.emplace_back(1, 1400.);
+ innerZ1F2.emplace_back(1, 1685.);
}
- innerZ1F2.push_back(std::pair<int, float>(0, 4150.));
+ innerZ1F2.emplace_back(0, 4150.);
if (m_inertAdjustLevel > 0) {
- innerZ1F2.push_back(std::pair<int, float>(1, 4700.));
- innerZ1F2.push_back(std::pair<int, float>(1, 5900.));
- innerZ1F2.push_back(std::pair<int, float>(1, 6800.));
+ innerZ1F2.emplace_back(1, 4700.);
+ innerZ1F2.emplace_back(1, 5900.);
+ innerZ1F2.emplace_back(1, 6800.);
} else if (m_activeAdjustLevel > 0)
- innerZ1F2.push_back(std::pair<int, float>(0, 6500.));
+ innerZ1F2.emplace_back(0, 6500.);
if (m_inertAdjustLevel > 0) {
- innerZ1F2.push_back(std::pair<int, float>(1, 8900.));
- innerZ1F2.push_back(std::pair<int, float>(1, 10100.));
+ innerZ1F2.emplace_back(1, 8900.);
+ innerZ1F2.emplace_back(1, 10100.);
} else if (m_activeAdjustLevel > 0)
- innerZ1F2.push_back(std::pair<int, float>(0, 8900.));
- innerZ1F2.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ innerZ1F2.emplace_back(0, 8900.);
+ innerZ1F2.emplace_back(0, aLVC.m_outerBarrelRadius);
std::vector<std::vector<std::vector<std::pair<int, float> > > > innerZF(2);
innerZF[0].push_back(innerZ0F0);
@@ -2650,26 +2651,26 @@ void Muon::MuonTrackingGeometryBuilderCond::getHParts(LocalVariablesContainer& a
// outer 1x1
std::vector<std::pair<int, float> > outerZ0F0;
- outerZ0F0.push_back(std::pair<int, float>(0, m_outerShieldRadius));
- outerZ0F0.push_back(std::pair<int, float>(0, 2750.)); // outer envelope
- outerZ0F0.push_back(std::pair<int, float>(0, 12650.)); // outer envelope
- outerZ0F0.push_back(std::pair<int, float>(0, 13400.)); // outer envelope
- outerZ0F0.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ outerZ0F0.emplace_back(0, m_outerShieldRadius);
+ outerZ0F0.emplace_back(0, 2750.); // outer envelope
+ outerZ0F0.emplace_back(0, 12650.); // outer envelope
+ outerZ0F0.emplace_back(0, 13400.); // outer envelope
+ outerZ0F0.emplace_back(0, aLVC.m_outerBarrelRadius);
std::vector<std::pair<int, float> > outerZ0F1;
- outerZ0F1.push_back(std::pair<int, float>(0, m_outerShieldRadius));
- outerZ0F1.push_back(std::pair<int, float>(0, 2750.)); // outer envelope
+ outerZ0F1.emplace_back(0, m_outerShieldRadius);
+ outerZ0F1.emplace_back(0, 2750.); // outer envelope
if (m_activeAdjustLevel > 0) {
- outerZ0F1.push_back(std::pair<int, float>(0, 3600.));
- outerZ0F1.push_back(std::pair<int, float>(0, 5300.));
- outerZ0F1.push_back(std::pair<int, float>(0, 7000.));
- outerZ0F1.push_back(std::pair<int, float>(0, 8500.));
- outerZ0F1.push_back(std::pair<int, float>(0, 10000.));
- outerZ0F1.push_back(std::pair<int, float>(0, 12000.));
+ outerZ0F1.emplace_back(0, 3600.);
+ outerZ0F1.emplace_back(0, 5300.);
+ outerZ0F1.emplace_back(0, 7000.);
+ outerZ0F1.emplace_back(0, 8500.);
+ outerZ0F1.emplace_back(0, 10000.);
+ outerZ0F1.emplace_back(0, 12000.);
}
- outerZ0F1.push_back(std::pair<int, float>(0, 12650.)); // outer envelope
- outerZ0F1.push_back(std::pair<int, float>(0, 13400.)); // outer envelope
- outerZ0F1.push_back(std::pair<int, float>(0, aLVC.m_outerBarrelRadius));
+ outerZ0F1.emplace_back(0, 12650.); // outer envelope
+ outerZ0F1.emplace_back(0, 13400.); // outer envelope
+ outerZ0F1.emplace_back(0, aLVC.m_outerBarrelRadius);
std::vector<std::vector<std::vector<std::pair<int, float> > > > outerZF(2);
outerZF[0].push_back(outerZ0F0);
@@ -2705,25 +2706,25 @@ void Muon::MuonTrackingGeometryBuilderCond::getShieldParts(LocalVariablesContain
aLVC.m_shieldHPart.clear();
std::vector<std::pair<int, float> > outerShield;
- outerShield.push_back(std::pair<int, float>(0, m_beamPipeRadius));
- outerShield.push_back(std::pair<int, float>(0, 279.)); // outer envelope
- outerShield.push_back(std::pair<int, float>(0, 436.7)); // outer envelope
- outerShield.push_back(std::pair<int, float>(0, 1050.)); // outer envelope
- outerShield.push_back(std::pair<int, float>(0, m_outerShieldRadius));
+ outerShield.emplace_back(0, m_beamPipeRadius);
+ outerShield.emplace_back(0, 279.); // outer envelope
+ outerShield.emplace_back(0, 436.7); // outer envelope
+ outerShield.emplace_back(0, 1050.); // outer envelope
+ outerShield.emplace_back(0, m_outerShieldRadius);
aLVC.m_shieldHPart.push_back(outerShield);
std::vector<std::pair<int, float> > innerShield;
- innerShield.push_back(std::pair<int, float>(0, m_beamPipeRadius));
- innerShield.push_back(std::pair<int, float>(0, 530.));
- innerShield.push_back(std::pair<int, float>(0, m_innerShieldRadius));
+ innerShield.emplace_back(0, m_beamPipeRadius);
+ innerShield.emplace_back(0, 530.);
+ innerShield.emplace_back(0, m_innerShieldRadius);
aLVC.m_shieldHPart.push_back(innerShield);
std::vector<std::pair<int, float> > diskShield;
- diskShield.push_back(std::pair<int, float>(0, 0.));
- diskShield.push_back(std::pair<int, float>(0, 540.));
- diskShield.push_back(std::pair<int, float>(0, 750.));
- diskShield.push_back(std::pair<int, float>(0, 2700.));
- diskShield.push_back(std::pair<int, float>(0, 4255.));
+ diskShield.emplace_back(0, 0.);
+ diskShield.emplace_back(0, 540.);
+ diskShield.emplace_back(0, 750.);
+ diskShield.emplace_back(0, 2700.);
+ diskShield.emplace_back(0, 4255.);
aLVC.m_shieldHPart.push_back(diskShield);
return;
diff --git a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/Layer.h b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/Layer.h
index 09bc07451623..641326fa9c21 100644
--- a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/Layer.h
+++ b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/Layer.h
@@ -225,9 +225,6 @@ class Layer {
/** set the Layer coding */
void setLayerType(int identifier);
- /** set the Layer coding */
- void setLayerType ATLAS_NOT_THREAD_SAFE(int identifier) const;
-
/** boolean method to check if the layer needs a LayerMaterialProperties */
bool needsMaterialProperties() const;
diff --git a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/Layer.icc b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/Layer.icc
index 0bdf99d7c263..c3a3d74d9dc7 100644
--- a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/Layer.icc
+++ b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/Layer.icc
@@ -200,9 +200,6 @@ inline const LayerIndex &Layer::layerIndex() const { return m_index; }
inline int Layer::layerType() const { return m_layerType; }
inline void Layer::setLayerType(int id) { m_layerType = id; }
-inline void Layer::setLayerType ATLAS_NOT_THREAD_SAFE(int id) const {
- const_cast<Layer *>(this)->setLayerType(id);
-}
inline void Layer::assignMaterialProperties
ATLAS_NOT_THREAD_SAFE(const LayerMaterialProperties &layerMaterialProp,
--
GitLab
From f75810d8267087266b1772e4968f7777daf8e093 Mon Sep 17 00:00:00 2001
From: Christos Anastopoulos <christos.anastopoulos@cern.ch>
Date: Fri, 20 Aug 2021 18:32:37 +0000
Subject: [PATCH 207/272] DQ loads the TrackingGeometrySvc via a default
TrackToVertexIPEstimator ATLASRECTS-6530. Removing this led to the issues in
ATLASRECTS-6559. After the fixes from @ssnyder for 6559 try to put back in
and see
---
.../src/IDAlignMonGenericTracksAlg.cxx | 2 +
.../src/IDAlignMonGenericTracksAlg.h | 2 +-
.../data/master_q431_AOD_digest_500events.ref | 44 +++++++++----------
3 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.cxx b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.cxx
index 0230dc4d97d9..632409538115 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.cxx
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.cxx
@@ -104,6 +104,8 @@ StatusCode IDAlignMonGenericTracksAlg::initialize()
if (m_doIP) {
ATH_CHECK (m_trackToVertexIPEstimator.retrieve());
+ }else {
+ m_trackToVertexIPEstimator.disable();
}
if ( m_beamSpotKey.initialize().isFailure() ) {
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.h b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.h
index 3aa15c7378a3..7e828bcaf5fa 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.h
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.h
@@ -93,7 +93,7 @@ private:
ToolHandle<InDet::IInDetTrackSelectionTool> m_trackSelection; // baseline
ToolHandle<IInDetAlignHitQualSelTool> m_hitQualityTool;
- PublicToolHandle< Trk::ITrackToVertexIPEstimator > m_trackToVertexIPEstimator
+ ToolHandle< Trk::ITrackToVertexIPEstimator > m_trackToVertexIPEstimator
{this,"TrackToVertexIPEstimator","Trk::TrackToVertexIPEstimator",""};
std::string m_Pixel_Manager;
diff --git a/Tools/PROCTools/data/master_q431_AOD_digest_500events.ref b/Tools/PROCTools/data/master_q431_AOD_digest_500events.ref
index 851baef8f070..4f6bb1c57f28 100644
--- a/Tools/PROCTools/data/master_q431_AOD_digest_500events.ref
+++ b/Tools/PROCTools/data/master_q431_AOD_digest_500events.ref
@@ -3,7 +3,7 @@
330470 1183722156 360 388 1 3 0 3 12 0 12
330470 1183722158 1 0 0 0 0 0 0 0 0
330470 1183722342 394 429 0 2 0 2 15 0 15
- 330470 1183723134 463 502 5 3 0 3 16 0 16
+ 330470 1183723134 463 502 4 3 0 3 16 0 16
330470 1183723677 583 584 3 13 0 13 33 0 33
330470 1183724572 518 627 4 7 0 7 15 0 15
330470 1183725127 367 460 2 9 0 9 16 0 16
@@ -55,15 +55,15 @@
330470 1183745001 320 380 0 10 0 10 12 0 12
330470 1183745791 361 401 0 19 0 19 20 0 20
330470 1183745889 371 380 1 5 0 5 10 0 10
- 330470 1183746019 446 489 1 7 0 7 24 0 24
- 330470 1183746343 492 495 1 3 0 3 16 0 16
+ 330470 1183746019 446 489 0 7 0 7 24 0 24
+ 330470 1183746343 492 495 0 3 0 3 16 0 16
330470 1183746391 364 441 2 15 0 15 20 0 20
330470 1183746668 459 380 0 7 0 7 20 0 20
330470 1183746710 6 0 0 0 0 0 0 0 0
330470 1183746776 348 356 1 9 0 9 27 0 27
330470 1183747953 302 377 2 4 0 4 10 0 10
330470 1183748096 455 491 0 5 0 5 17 0 17
- 330470 1183748136 663 654 2 12 0 12 26 0 26
+ 330470 1183748136 663 654 1 12 0 12 26 0 26
330470 1183748263 396 410 3 8 0 8 16 0 16
330470 1183748421 460 422 1 8 0 8 15 0 15
330470 1183748705 490 523 2 9 0 9 20 0 20
@@ -71,8 +71,8 @@
330470 1183750781 377 365 1 5 0 5 16 0 16
330470 1183750906 702 757 3 10 0 10 29 0 29
330470 1183751782 239 246 0 0 0 0 6 0 6
- 330470 1183752624 347 366 2 5 0 5 15 0 15
- 330470 1183753006 357 398 3 4 0 4 14 0 14
+ 330470 1183752624 347 366 3 5 0 5 15 0 15
+ 330470 1183753006 357 398 2 4 0 4 14 0 14
330470 1183753030 398 352 2 23 0 23 20 0 20
330470 1183753541 400 453 2 8 0 8 11 0 11
330470 1183754806 470 424 0 2 0 2 17 0 17
@@ -142,7 +142,7 @@
330470 1183783921 518 489 1 22 0 22 32 0 32
330470 1183784212 561 538 0 36 0 36 28 0 28
330470 1183784686 458 490 7 5 0 5 23 0 23
- 330470 1183784788 350 327 2 18 0 18 16 0 16
+ 330470 1183784788 350 327 3 18 0 18 16 0 16
330470 1183785404 682 719 4 11 0 11 32 0 32
330470 1183786663 355 436 2 2 0 2 6 0 6
330470 1183787021 684 606 2 9 0 9 33 0 33
@@ -160,7 +160,7 @@
330470 1183792990 468 509 4 24 0 24 28 0 28
330470 1183793190 396 527 1 10 0 10 14 0 14
330470 1183793693 492 620 2 16 0 16 29 0 29
- 330470 1183793783 562 522 6 20 0 20 27 0 27
+ 330470 1183793783 562 522 5 20 0 20 27 0 27
330470 1183794278 454 558 0 7 0 7 9 0 9
330470 1183794508 448 473 2 17 0 17 19 0 19
330470 1183794655 393 364 1 3 0 3 5 0 5
@@ -235,7 +235,7 @@
330470 1183827424 359 352 1 22 0 22 16 0 16
330470 1183828215 521 413 2 12 0 12 30 0 30
330470 1183828765 562 596 4 4 0 4 25 0 25
- 330470 1183828961 522 572 2 4 0 4 19 0 19
+ 330470 1183828961 522 572 3 4 0 4 19 0 19
330470 1183829595 473 418 0 5 0 5 17 0 17
330470 1183829748 592 613 0 10 0 10 23 0 23
330470 1183830135 428 476 1 14 0 14 22 0 22
@@ -285,11 +285,11 @@
330470 1183852355 410 415 0 3 0 3 14 0 14
330470 1183852362 567 668 1 16 0 16 29 0 29
330470 1183852486 387 405 2 4 0 4 15 0 15
- 330470 1183852552 509 470 4 18 0 18 20 0 20
+ 330470 1183852552 509 470 3 18 0 18 20 0 20
330470 1183853281 404 390 2 5 0 5 14 0 14
330470 1183853303 555 525 5 6 0 6 25 0 25
- 330470 1183853317 313 327 4 4 0 4 15 0 15
- 330470 1183853842 629 584 2 10 0 10 28 0 28
+ 330470 1183853317 313 327 5 4 0 4 15 0 15
+ 330470 1183853842 629 584 1 10 0 10 28 0 28
330470 1183854086 313 362 1 6 0 6 11 0 11
330470 1183854099 444 521 0 2 0 2 13 0 13
330470 1183854665 506 450 0 6 0 6 14 0 14
@@ -333,7 +333,7 @@
330470 1183878363 529 583 5 15 0 15 26 0 26
330470 1183879080 615 646 3 9 0 9 30 0 30
330470 1183879154 597 628 4 8 0 8 28 0 28
- 330470 1183879547 423 439 2 0 0 0 13 0 13
+ 330470 1183879547 423 439 3 0 0 0 13 0 13
330470 1183879670 489 525 2 13 0 13 21 0 21
330470 1183879957 494 578 0 12 0 12 26 0 26
330470 1183880152 349 453 3 1 0 1 16 0 16
@@ -350,8 +350,8 @@
330470 1183884717 238 261 2 2 0 2 6 0 6
330470 1183885069 292 240 3 12 0 12 13 0 13
330470 1183885910 310 358 1 11 0 11 16 0 16
- 330470 1183889121 367 381 3 11 0 11 20 0 20
- 330470 1183889788 361 471 3 13 0 13 20 0 20
+ 330470 1183889121 367 381 1 11 0 11 20 0 20
+ 330470 1183889788 361 471 2 13 0 13 20 0 20
330470 1183890058 429 392 1 6 0 6 21 0 21
330470 1183890245 558 582 1 5 0 5 23 0 23
330470 1183891126 511 511 4 10 0 10 18 0 18
@@ -419,7 +419,7 @@
330470 1183931811 465 375 0 8 0 8 18 0 18
330470 1183932465 456 541 3 11 0 11 17 0 17
330470 1183933264 514 450 2 4 0 4 10 0 10
- 330470 1183934061 556 608 1 15 0 15 31 0 31
+ 330470 1183934061 556 608 2 15 0 15 31 0 31
330470 1183934188 559 640 0 11 0 11 28 0 28
330470 1183935176 505 635 1 7 0 7 21 0 21
330470 1183935243 406 422 3 15 0 15 26 0 26
@@ -431,12 +431,12 @@
330470 1183939219 533 500 2 9 0 9 16 0 16
330470 1183939285 273 161 0 5 0 5 8 0 8
330470 1183939881 561 508 3 6 0 6 22 0 22
- 330470 1183941479 270 333 0 2 0 2 6 0 6
+ 330470 1183941479 270 333 1 2 0 2 6 0 6
330470 1183943435 21 0 0 0 0 0 0 0 0
330470 1183944121 428 399 2 5 0 5 25 0 25
330470 1183944525 423 496 1 6 0 6 13 0 13
330470 1183946835 778 886 4 24 0 24 38 0 38
- 330470 1183949177 403 463 0 7 0 7 17 0 17
+ 330470 1183949177 403 463 1 7 0 7 17 0 17
330470 1183949782 548 522 2 12 0 12 20 0 20
330470 1183952907 561 642 4 9 0 9 16 0 16
330470 1183953399 578 478 0 13 0 13 31 0 31
@@ -455,14 +455,14 @@
330470 1183969905 585 593 1 14 0 14 23 0 23
330470 1183970393 350 359 0 8 0 8 14 0 14
330470 1183970582 174 223 1 2 0 2 5 0 5
- 330470 1183973235 544 533 3 5 0 5 17 0 17
+ 330470 1183973235 544 533 1 5 0 5 17 0 17
330470 1183974800 386 404 1 4 0 4 15 0 15
330470 1183975144 422 516 0 8 0 8 28 0 28
330470 1183977930 266 296 0 6 0 6 8 0 8
330470 1183979636 434 503 1 4 0 4 10 0 10
330470 1183982156 373 450 1 2 0 2 10 0 10
330470 1183982855 448 401 2 2 0 2 14 0 14
- 330470 1183983079 512 545 1 7 0 7 29 0 29
+ 330470 1183983079 512 545 2 7 0 7 29 0 29
330470 1183983113 387 382 1 3 0 3 17 0 17
330470 1183984897 342 293 0 14 0 14 15 0 15
330470 1183985311 421 572 1 12 0 12 12 0 12
@@ -477,7 +477,7 @@
330470 1183997552 522 536 0 4 0 4 23 0 23
330470 1183997623 408 325 2 6 0 6 14 0 14
330470 1183997905 350 317 0 1 0 1 6 0 6
- 330470 1184001332 450 406 5 11 0 11 26 0 26
+ 330470 1184001332 450 406 6 11 0 11 26 0 26
330470 1184003671 421 386 1 6 0 6 16 0 16
330470 1184007839 421 441 3 9 0 9 15 0 15
330470 1184010792 477 468 0 5 0 5 15 0 15
@@ -487,7 +487,7 @@
330470 1184014074 358 359 0 3 0 3 12 0 12
330470 1184016450 487 503 1 13 0 13 29 0 29
330470 1184019719 414 367 1 3 0 3 20 0 20
- 330470 1184020401 563 454 3 7 0 7 28 0 28
+ 330470 1184020401 563 454 4 7 0 7 28 0 28
330470 1184026109 415 333 0 11 0 11 20 0 20
330470 1184026603 601 609 2 6 0 6 26 0 26
330470 1184027737 477 484 0 0 0 0 16 0 16
--
GitLab
From 7e2eb381256956d5c410605871c82ef0db67a3bf Mon Sep 17 00:00:00 2001
From: Ewelina Maria Lobodzinska <ewelina.maria.lobodzinska@cern.ch>
Date: Fri, 20 Aug 2021 18:49:51 +0000
Subject: [PATCH 208/272] Superchic_i update to recent changes from 21.6
---
Generators/Superchic_i/CMakeLists.txt | 8 +-
Generators/Superchic_i/README.md | 53 ++
Generators/Superchic_i/python/EventFiller.py | 61 +-
.../Superchic_i/python/SuperChicUtils.py | 642 +++++++++---------
.../share/common/Pythia8_Base_Common.py | 19 +
.../share/common/Pythia8_DD_Common.py | 15 +
.../share/common/Pythia8_EL_Common.py | 15 +
.../share/common/Pythia8_SD_Common.py | 21 +
.../jobOptions.SuperChicPy8_yyMuMu_DD.py | 34 +
.../jobOptions.SuperChicPy8_yyMuMu_El.py | 34 +
.../jobOptions.SuperChicPy8_yyMuMu_SDA.py | 34 +
.../jobOptions.SuperChicPy8_yyMuMu_SDB.py | 34 +
.../share/jobOptions.SuperChic_ALP2.py | 43 ++
.../Superchic_i/share/jobOptions.Superchic.py | 42 --
.../jobOptions.SuperchicPy8EG_yyMuMu_DD.py | 88 ---
.../share/jobOptions.Superchic_ALP2.py | 63 --
.../src/components/Superchic_i_entries.cxx | 1 +
17 files changed, 691 insertions(+), 516 deletions(-)
create mode 100644 Generators/Superchic_i/README.md
create mode 100644 Generators/Superchic_i/share/common/Pythia8_Base_Common.py
create mode 100644 Generators/Superchic_i/share/common/Pythia8_DD_Common.py
create mode 100644 Generators/Superchic_i/share/common/Pythia8_EL_Common.py
create mode 100644 Generators/Superchic_i/share/common/Pythia8_SD_Common.py
create mode 100644 Generators/Superchic_i/share/jobOptions.SuperChicPy8_yyMuMu_DD.py
create mode 100644 Generators/Superchic_i/share/jobOptions.SuperChicPy8_yyMuMu_El.py
create mode 100644 Generators/Superchic_i/share/jobOptions.SuperChicPy8_yyMuMu_SDA.py
create mode 100644 Generators/Superchic_i/share/jobOptions.SuperChicPy8_yyMuMu_SDB.py
create mode 100644 Generators/Superchic_i/share/jobOptions.SuperChic_ALP2.py
delete mode 100644 Generators/Superchic_i/share/jobOptions.Superchic.py
delete mode 100644 Generators/Superchic_i/share/jobOptions.SuperchicPy8EG_yyMuMu_DD.py
delete mode 100644 Generators/Superchic_i/share/jobOptions.Superchic_ALP2.py
create mode 100644 Generators/Superchic_i/src/components/Superchic_i_entries.cxx
diff --git a/Generators/Superchic_i/CMakeLists.txt b/Generators/Superchic_i/CMakeLists.txt
index 2cd8359474db..8544e4d832fd 100644
--- a/Generators/Superchic_i/CMakeLists.txt
+++ b/Generators/Superchic_i/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# $Id: CMakeLists.txt 762209 2016-07-15 14:15:34Z krasznaa $
################################################################################
# Package: Superchic_i
################################################################################
@@ -15,7 +15,11 @@ find_package( Superchic )
# Install files from the package:
atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/*.py )
+atlas_install_joboptions( share/*.py share/common/*.py )
+
+atlas_add_component( Superchic_i
+ src/components/*.cxx
+)
# Set Superchic specific environment variable(s).
set( SuperchicEnvironment_DIR ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/Generators/Superchic_i/README.md b/Generators/Superchic_i/README.md
new file mode 100644
index 000000000000..ad04c1d5a996
--- /dev/null
+++ b/Generators/Superchic_i/README.md
@@ -0,0 +1,53 @@
+[[_TOC_]]
+
+The athena SuperChic interface described here was developed by Patrick McCormack (william.patrick.mc.cormack.iii@cern.ch), who now works for CMS. For interface questions please contact Aleksandra Dimitrievska (aleksandra.dimitrievska@cern.ch) or Simone Pagan Griso (simone.pagan.griso@cern.ch). For generator-specific questions, you might want to contact the SuperChic authors ([Lucian Harland-Lang](lucian.harland-lang@physics.ox.ac.uk)) or [Marek Tasevsky](tasevsky@mail.cern.ch).
+
+# Introduction
+
+SuperChic 4 ([ref](https://superchic.hepforge.org/) and [manual](https://superchic.hepforge.org/superchic4.pdf)) is a generator for exclusive and photon-induced physics. The current (As of May 2021) version of the athena interface of SuperChic has been strongly reworked from prior releases (those preceeding April 2021), now relying primarily on the standalone executables from LCG, rather than the Fortran code that works behind the scenes for SuperChic. The standalone executables can be found at e.g. /cvmfs/sft.cern.ch/lcg/releases/LCG_88b/MCGenerators/superchic/4.02p2/x86_64-centos7-gcc62-opt/bin/, /cvmfs/atlas.cern.ch/repo/sw/software/21.6/sw/lcg/releases/LCG_88b/MCGenerators/superchic/4.02p2/x86_64-centos7-gcc62-opt/bin/, or /cvmfs/atlas-nightlies.cern.ch/repo/sw/21.6_AthGeneration_x86_64-centos7-gcc62-opt/sw/lcg/releases/LCG_88b/MCGenerators/superchic/4.02p2/x86_64-centos7-gcc62-opt/bin/.
+
+
+## Intro to standalone SuperChic
+
+When running independently, SuperChic requires:
+1) Folders named outputs/, inputs/, and evrecs/ in the directory that you want to run from
+2) An input configuration file, probably named input.DAT. The format must follow that found in the directories with the standalone executables referenced above
+3) The packages apfel and lhapdf must also be in the ROOT_INCLUDE_PATH and LD_LIBRARY_PATH of your environment. This is taken care of if you source a recent 21.6,AthGeneration release (21.6.70 or later)
+
+Standalone SuperChic is run in two steps:
+1) First, you would run "init < input.DAT", which generates files in the inputs/ directory. This step performs some initial integrations that get referenced in the next step.
+2) Next, you would run "superchic < input.DAT", using the same input.DAT file. This step generates an LHE/HepMC/HEP-EVT in the evrecs/ folder that contains all of the generated events' information. This LHE file can then be fed into pythia for showering
+
+# SuperChic Interface
+
+The new athena SuperChic interface proceeds primarily as standalone SuperChic would. An example of SuperChic without showering can be found at /athena/Generators/Superchic_i/share/jobOptions.SuperChic_ALP2.py. It proceeds fairly linearly:
+1) The necessary inputs/, outputs/, and evrecs/ folders are created if they don't already exist
+2) An input.DAT file is generated using arguments that are given to "Init". The class type for Init is defined here: /athena/Generators/Superchic_i/python/SuperChicUtils.py. You can see all of the various input variables that can be given. The file is written with the writeInputDAT function in that python macro.
+3) SuperChicRun also runs the init and superchic executables, creating an LHE file. It is important that the output format be LHE, because the next step, which creates an EVNT file is only compatible with the LHE format.
+4) The EVNT file is filled using the /athena/Generators/Superchic_i/python/EventFiller.py macro. To use a format other than LHE, a different version of this macro would have to be written.
+
+An example jobOptions file with pythia showering can be found at /athena/Generators/Superchic_i/share/jobOptions.SuperChicPy8_yyMuMu_SDA.py. The key difference here is of course that Pythia8 is added to the genSeq, and that we have to be careful about what pythia command options are included. The /athena/Generators/Superchic_i/share/jobOptions.SuperChicPy8_yyMuMu_DD.py, /athena/Generators/Superchic_i/share/jobOptions.SuperChicPy8_yyMuMu_SDA.py, /athena/Generators/Superchic_i/share/jobOptions.SuperChicPy8_yyMuMu_SDB.py, and /athena/Generators/Superchic_i/share/jobOptions.SuperChicPy8_yyMuMu_El.py contain the latest recommended options for the case of photon-induced di-lepton for the cases of double-dissociated production, single dissociative production on one side and the other, and elasic production, respectively.
+
+## Some Notes
+* The S^2 model can be changed by adjusting the Init.isurv value
+* The Init.diff should be either 'el', 'sda', 'sdb', or 'dd'. Be careful to make sure that the "BeamRemnants:unresolvedHadron = 0" component of the pythia commands is adjusted accordingly below (el -> 3, sda -> 2, sdb ->1, and dd -> 0)
+* The list of processes for Init.proc can be found in section 7 of the [manual](https://superchic.hepforge.org/superchic4.pdf)
+* Output kinematics can of course be changed from what is in the samples. Two body decays use "a" and "b" particles (as in pta and ptb). Four body decays use "a", "b", "c", "d", and so forth.
+ * Cuts that have "x" in them refer to the hard process as a whole, so e.g. the di-lepton system in a di-lepton event
+* When running without showering with pythia, an important drawback of using LHE files should be noted: they do not use high enough precision. What I mean is the following. In EventFiller.py, you can see that you enter in a four vector that contains every particle's px, py, pz, and E. The mass of the particles is then computed based on those values. Unfortunately, for highly boosted objects (i.e. those where E >> m), such as the final state protons, the calculation of four-vector mass with the precision given in the LHE files is slightly off. So in the output EVNT files, you'll see protons with masses in the range of 900 - 1000 MeV. I have set the "generated_mass" of each particle to the right mass, but if you retrieve "m_m" for a truth-level particle, it will be slightly incorrect.
+
+# Running locally
+
+To run locally:
+1) Make a folder to hold the athena release, go inside it, and run: asetup 21.6,latest,AthGeneration (21.6.70 or any later release should do)
+2) (optional) make a run folder and go inside it
+3) mkdir 999999
+4) put a joboptions file in 999999/. You may need to change the prefix from "jobOptions." to "mc.".
+5) Run with e.g.:
+ ```
+ Gen_tf.py --ecmEnergy=13000.0 --maxEvents=1000 --firstEvent=1 --randomSeed=14 --outputEVNTFile=test.pool.root --jobConfig 999999
+ ```
+
+# Releases
+
+A functional version of the SuperChic interface was first incorporated into the nightly release 21.6,AthGeneration,r2021-04-30T0933. Any full release more recent than 21.6.70 should contain a functional interface. However, a slightly tweak was implemented in EventFiller.py to put the initial state protons into the EVNT files in the unshowered case. This will likely be in release 21.6.72 and onward.
diff --git a/Generators/Superchic_i/python/EventFiller.py b/Generators/Superchic_i/python/EventFiller.py
index 620a93c4d306..940af58b8df2 100644
--- a/Generators/Superchic_i/python/EventFiller.py
+++ b/Generators/Superchic_i/python/EventFiller.py
@@ -1,12 +1,12 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
-# from AthenaCommon.AppMgr import ServiceMgr as svcMgr
from GeneratorModules.EvgenAlg import EvgenAlg
-from AthenaPython.PyAthena import HepMC, StatusCode
-#import McParticleEvent.Pythonizations
+from AthenaPython.PyAthena import StatusCode
+from AthenaPython.PyAthena import HepMC
+
import os
import ROOT
-#import random
class LheEVNTFiller(EvgenAlg):
@@ -15,11 +15,12 @@ class LheEVNTFiller(EvgenAlg):
super(LheEVNTFiller, self).__init__(name=name)
fileName = "evrecs/evrecout.dat"
+ outputFileName = "outputs/outputout.dat"
eventsProcessed = 0
def initialize(self):
-# seed = None
- if(os.path.isfile(self.fileName)):
+
+ if(os.path.isfile(self.fileName) and os.path.isfile(self.outputFileName)):
print(self.fileName)
return StatusCode.Success
else:
@@ -30,8 +31,23 @@ class LheEVNTFiller(EvgenAlg):
eventsSeen = 0
firstLine = True
-# particlesSeen = 0
+ with open(self.outputFileName,'r') as inputOutputFile:
+ for line in inputOutputFile:
+ if 'Cross section =' in line:
+ print(line)
+ splitLine = line.split()
+ factor = 1.
+ if(splitLine[-1] == "pb"):
+ factor = 0.001
+ if(splitLine[-1] == "fb"):
+ factor = 0.000001
+ if(splitLine[-1] == "ub"):
+ factor = 1000.
+ if(splitLine[-1] == "mb"):
+ factor = 1000000.
+ print("MetaData: cross-section (nb)= "+str(float(splitLine[3])*factor))
+
with open(self.fileName,'r') as inputfile:
event = False
for line in inputfile:
@@ -50,6 +66,34 @@ class LheEVNTFiller(EvgenAlg):
if event and firstLine:
firstLine = False
evt.weights().push_back(float(line.split()[2]))
+
+ #Add the initial state protons
+ pos = HepMC.FourVector(0.0, 0.0, 0.0, 0.0)
+ gv = HepMC.GenVertex(pos)
+ ROOT.SetOwnership(gv, False)
+ evt.add_vertex(gv)
+ mom = HepMC.FourVector( 0. , 0. , 6499999.9323 , 6500000.00 )
+ gp = HepMC.GenParticle()
+ gp.set_status( 2 )
+ gp.set_pdg_id( 2212 )
+ gp.set_momentum(mom)
+ gp.set_generated_mass(938.272046)
+ ROOT.SetOwnership(gp, False)
+ gv.add_particle_out(gp)
+
+ pos = HepMC.FourVector(0.0, 0.0, 0.0, 0.0)
+ gv = HepMC.GenVertex(pos)
+ ROOT.SetOwnership(gv, False)
+ evt.add_vertex(gv)
+ mom = HepMC.FourVector( 0. , 0. , -6499999.9323 , 6500000.00 )
+ gp = HepMC.GenParticle()
+ gp.set_status( 2 )
+ gp.set_pdg_id( 2212 )
+ gp.set_momentum(mom)
+ gp.set_generated_mass(938.272046)
+ ROOT.SetOwnership(gp, False)
+ gv.add_particle_out(gp)
+
continue
if event:
pos = HepMC.FourVector(0.0, 0.0, 0.0, 0.0)
@@ -61,7 +105,6 @@ class LheEVNTFiller(EvgenAlg):
gp.set_status(int(line.split()[1]) )
gp.set_pdg_id(int(line.split()[0]) )
gp.set_momentum(mom)
- print(float(line.split()[10]) * 1000.)
gp.set_generated_mass(float(line.split()[10]) * 1000.)
ROOT.SetOwnership(gp, False)
gv.add_particle_out(gp)
diff --git a/Generators/Superchic_i/python/SuperChicUtils.py b/Generators/Superchic_i/python/SuperChicUtils.py
index 2ff729384799..ae70227490ba 100644
--- a/Generators/Superchic_i/python/SuperChicUtils.py
+++ b/Generators/Superchic_i/python/SuperChicUtils.py
@@ -1,353 +1,371 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-import subprocess, os
+
+import subprocess, os, shlex, re
+
+from AthenaCommon import Logging
+
+## Get handle to Athena logging
+logger = Logging.logging.getLogger("Superchic_i")
class SuperChicConfig:
- superchicpath = os.environ['SUPERCHICPATH']
-
- #SuperChic specific variables for input.DAT, see writeInputDAT function for more elaboration
- rts = "13d3" #collision energy (GeV)
- isurv = "4" #Model of soft survival (from 1 -> 4, corresponding to arXiv:1306.2149)
- intag = "'in13'" #tag for input files
- PDFname = "'MMHT2014lo68cl'"
- PDFmember = "0"
- proc = "57" #Please consult Superchic Manual https://superchic.hepforge.org/
- beam = "'prot'"
- outtg = "'out'"
- sfaci = ".true."
- diff = "'el'" #interaction: elastic ('el'), single ('sd','sda','sdb') and double ('dd') dissociation.
- an = "208d0"
- az = "82d0"
- rz = "6.68d0"
- dz = "0.447d0"
- rn = "6.7d0"
- dn = "0.55d0"
- ionqcd = "'coh'"
- ncall = "10000"
- itmx = "10"
- prec = "0.5d0"
- ncall1 = "10000"
- inccall = "10000"
- itend = "1000"
- iseed = "34"
- genunw = ".true"
- nev = "500"
- erec = "'lhe'" #output file type
- readwt = ".false."
- wtmax = "0d0"
- ymin = "-2.4d0" # Minimum object rapidity Y_X
- ymax = "2.4d0" # Maximum object rapidity Y_X
- mmin = "6d0" # Minimum object mass M_X
- mmax = "500d0" # Maximum object mass M_X
- gencuts = ".true." # Generate cuts below
- scorr = ".true."
- fwidth = ".true."
- ptxmax = "100d0"
- ptamin = "3.0d0" # Minimum pT of outgoing object a (gamma)
- ptbmin = "3.0d0" # Minimum pT of outgoing object b (gamma)
- etaamin = "-2.4d0" # Minimum eta of outgoing object a
- etaamax = "2.4d0" # Maximum eta of outgoing object a
- etabmin = "-2.4d0" # Minimum eta of outgoing object b
- etabmax = "2.4d0" # Maximum eta of outgoing object b
- acoabmax = "100d0"
- ptcmin = "0d0"
- etacmin = "-2.5d0"
- etacmax = "2.5d0"
- ptdmin = "0d0"
- etadmin = "-2.5d0"
- etadmax = "2.5d0"
- ptemin = "0d0"
- etaemin = "-2.5d0"
- etaemax = "2.5d0"
- ptfmin = "0d0"
- etafmin = "-2.5d0"
- etafmax = "2.5d0"
- rjet = "0.6d0"
- jalg = "'antikt'"
- m2b = "0.133d0"
- pdgid1 = "211"
- pdgid2 = "-211"
- malp = "1000d0"
- gax = "0.001d0"
- alpt = "'ps'"
- mpol = "500d0"
- mmon = "933d0"
- gamm = "10d0"
- mcharg = "100d0"
- mneut = "80d0"
-
+
+ def __init__(self, runArgs):
+ self.superchicpath = os.environ['SUPERCHICPATH']
+
+ #SuperChic specific variables for input.DAT, see writeInputDAT function for more elaboration
+ self.rts = 13000. #collision energy (GeV)
+ if hasattr(runArgs,"ecmEnergy"):
+ self.rts = runArgs.ecmEnergy
+
+ self.isurv = 4 #Model of soft survival (from 1 -> 4, corresponding to arXiv:1306.2149)
+ self.intag = 'in' #tag for input files
+ self.PDFname = 'MMHT2014lo68cl'
+ self.PDFmember = 0
+ self.proc = 5 #Please consult Superchic Manual https://superchic.hepforge.org/
+ self.beam = 'prot'
+ self.outtg = 'out'
+ self.sfaci = True
+ self.diff = 'el' #interaction: elastic ('el'), single ('sd','sda','sdb') and double ('dd') dissociation.
+ self.an = 208
+ self.az = 82
+ self.rz = 6.68
+ self.dz = 0.447
+ self.rn = 6.7
+ self.dn = 0.55
+ self.ionqcd = 'coh'
+ self.ncall = 10000
+ self.itmx = 10
+ self.prec = 0.5
+ self.ncall1 = 10000
+ self.inccall = 10000
+ self.itend = 1000
+
+ self.iseed = 34
+ if hasattr(runArgs,"randomSeed"):
+ self.iseed = runArgs.randomSeed
+
+ self.genunw = True
+
+ self.nev = "500"
+ if hasattr(runArgs,"maxEvents"):
+ self.nev = runArgs.maxEvents
+
+ self.erec = 'lhe' #output file type
+ self.readwt = False
+ self.wtmax = 0
+ self.ymin = -2.4 # Minimum object rapidity Y_X
+ self.ymax = 2.4 # Maximum object rapidity Y_X
+ self.mmin = 6. # Minimum object mass M_X
+ self.mmax = 500. # Maximum object mass M_X
+ self.gencuts = True # Generate cuts below
+ self.scorr = True
+ self.fwidth = True
+ self.ptxmax = 100.
+ self.ptamin = 3.0 # Minimum pT of outgoing object a (gamma)
+ self.ptbmin = 3.0 # Minimum pT of outgoing object b (gamma)
+ self.etaamin = -2.4 # Minimum eta of outgoing object a
+ self.etaamax = 2.4 # Maximum eta of outgoing object a
+ self.etabmin = -2.4 # Minimum eta of outgoing object b
+ self.etabmax = 2.4 # Maximum eta of outgoing object b
+ self.acoabmax = 100.
+ self.ptcmin = 0
+ self.etacmin = -2.5
+ self.etacmax = 2.5
+ self.ptdmin = 0
+ self.etadmin = -2.5
+ self.etadmax = 2.5
+ self.ptemin = 0
+ self.etaemin = -2.5
+ self.etaemax = 2.5
+ self.ptfmin = 0
+ self.etafmin = -2.5
+ self.etafmax = 2.5
+ self.rjet = 0.6
+ self.jalg = 'antikt'
+ self.m2b = 0.133
+ self.pdgid1 = 211
+ self.pdgid2 = -211
+ self.malp = 1000
+ self.gax = 0.001
+ self.alpt = 'ps'
+ self.mpol = 500
+ self.mmon = 933
+ self.gamm = 10
+ self.mcharg = 100
+ self.mneut = 80
+
+ def toFortran(self):
+
+ def fortDouble(x):
+ return str(x)+"d0"
+ def fortInt(x):
+ return str(x)
+ def fortBool(x):
+ return '.true.' if x else '.false.'
+ def fortStr(x):
+ return "'{}'".format(x)
+
+ conf = ""
+ conf+="***********************************************************************************\n"
+ conf+="****** Initialize afain if FIRST FIVE PARAMETERS ARE CHANGED (and beam = 'prot'):******\n"
+ conf+="***********************************************************************************\n"
+ conf+=fortDouble(self.rts) + " ! [rts] : CMS collision energy (GeV) \n"
+ conf+=fortInt(self.isurv) + " ! [isurv] : Model of soft survival (from 1 -> 4)\n"
+ conf+=fortStr(self.intag) + " ! [intag] for input files \n"
+ conf+="***********************************************************************************\n"
+ conf+="***********************************************************************************\n"
+ conf+=fortStr(self.PDFname) + " ! [PDFname] : PDF set \n"
+ conf+=fortInt(self.PDFmember) + " ! [PDFmember] : PDF member \n"
+ conf+="***********************************************************************************\n"
+ conf+=fortInt(self.proc) + " ! [proc] : Process number \n"
+ conf+=fortStr(self.beam) + " ! [beam] : Beam type ('prot', 'ion', 'ionp' or 'el') \n"
+ conf+=fortStr(self.outtg) + " ! [outtg] : for output file \n"
+ conf+=fortBool(self.sfaci) + " ! [sfaci] : Include soft survival effects \n"
+ conf+="***********************************************************************************\n"
+ conf+="***********************************************************************************\n"
+ conf+="***********************************************************************************\n"
+ conf+=fortStr(self.diff) + " ! [diff] : dissociation flag \n"
+ conf+="***********************************************************************************\n"
+ conf+=fortDouble(self.an) + " ! [an] : Ion mass number \n"
+ conf+=fortDouble(self.az) + " ! [az] : Ion atomic number \n"
+ conf+=fortDouble(self.rz) + " ! [rz] : Ion proton density - radius \n"
+ conf+=fortDouble(self.dz) + " ! [dz] : Ion proton density - skin thickness \n"
+ conf+=fortDouble(self.rn) + " ! [rn] : Ion neutron density - radius \n"
+ conf+=fortDouble(self.dn) + " ! [dn] : Ion neutron density - skin thickness \n"
+ conf+=fortStr(self.ionqcd) + " ! [ionqcd] : Coherent ('coh') or incoherent ('incoh') for QCD-induced processes \n"
+ conf+="***********************************************************************************\n"
+ conf+="*************Integration parameters************************************************\n"
+ conf+="***********************************************************************************\n"
+ conf+=fortInt(self.ncall) + " ! [ncall] : Number of calls for preconditioning \n"
+ conf+=fortInt(self.itmx) + " ! [itmx] : Number of iterations for preconditioning \n"
+ conf+=fortDouble(self.prec) + " ! [prec] : Relative accuracy (in %) in main run \n"
+ conf+=fortInt(self.ncall1) + " ! [ncall1] : Number of calls in first iteration \n"
+ conf+=fortInt(self.inccall) + " ! [inccall] : Number of increase calls per iteration \n"
+ conf+=fortInt(self.itend) + " ! [itend] : Maximum number of iterations \n"
+ conf+=fortInt(self.iseed) + " ! [iseed] : Random number seed (integer > 0) \n"
+ conf+="***********************************************************************************\n"
+ conf+="********************Unweighted events**********************************************\n"
+ conf+="***********************************************************************************\n"
+ conf+=fortBool(self.genunw) + " ! [genunw] : Generate unweighted events \n"
+ conf+=fortInt(int(self.nev*1.01)) + " ! [nev] : Number of events (preferably controlled by maxEvents option in Gen_tf command) \n"
+ conf+=fortStr(self.erec) + " ! [erec] : Event record format ('hepmc','lhe','hepevt') \n"
+ conf+=fortBool(self.readwt) + " ! [readwt] : Set to true to read in pre-calculated maxium weight below \n"
+ conf+=fortDouble(self.wtmax) + " ! [wtmax] : Maximum weight \n"
+ conf+="***********************************************************************************\n"
+ conf+="***********************************************************************************\n"
+ conf+="******************* general cuts ************************************************\n"
+ conf+=fortDouble(self.ymin) + " ! [ymin] : Minimum object rapidity Y_X \n"
+ conf+=fortDouble(self.ymax) + " ! [ymax] : Maximum object rapidity Y_X \n"
+ conf+=fortDouble(self.mmin) + " ! [mmin] : Minimum object mass M_X (redundant for resonance production) \n"
+ conf+=fortDouble(self.mmax) + " ! [mmax] : Maximum object mass M_X (redundant for resonance production) \n"
+ conf+=fortBool(self.gencuts) + " ! [gencuts] : Generate cuts below \n"
+ conf+=fortBool(self.scorr) + " ! [scorr] : Include spin correlations (for chi_c/b decays) \n"
+ conf+=fortBool(self.fwidth) + " ! [fwidth] : Include finite width (for chi_c decays) \n"
+ conf+="***********************************************************************************\n"
+ conf+="************ See manual for momentum assignments***********************************\n"
+ conf+="***********************************************************************************\n"
+ conf+="******************* Proton Cuts ***************************************************\n"
+ conf+="***********************************************************************************\n"
+ conf+=fortDouble(self.ptxmax) + " ! [ptxmax] : max pT of the system \n"
+ conf+="***********************************************************************************\n"
+ conf+="**********2 body final states : p(a) + p(b) ***************************************\n"
+ conf+="***********************************************************************************\n"
+ conf+=fortDouble(self.ptamin) + " ! [ptamin] \n"
+ conf+=fortDouble(self.ptbmin) + " ! [ptbmin] \n"
+ conf+=fortDouble(self.etaamin) + " ! [etaamin] \n"
+ conf+=fortDouble(self.etaamax) + " ! [etaamax] \n"
+ conf+=fortDouble(self.etabmin) + " ! [etabmin] \n"
+ conf+=fortDouble(self.etabmax) + " ! [etabmax] \n"
+ conf+=fortDouble(self.acoabmax) + " ! [acoabmax] \n"
+ conf+="***********************************************************************************\n"
+ conf+="****** 3 body final states : p(a) + p(b) + p(c) ***********************************\n"
+ conf+="***********************************************************************************\n"
+ conf+=fortDouble(self.ptamin) + " ! [ptamin] \n"
+ conf+=fortDouble(self.ptbmin) + " ! [ptbmin] \n"
+ conf+=fortDouble(self.ptcmin) + " ! [ptcmin] \n"
+ conf+=fortDouble(self.etaamin) + " ! [etaamin] \n"
+ conf+=fortDouble(self.etaamax) + " ! [etaamax] \n"
+ conf+=fortDouble(self.etabmin) + " ! [etabmin] \n"
+ conf+=fortDouble(self.etabmax) + " ! [etabmax] \n"
+ conf+=fortDouble(self.etacmin) + " ! [etacmin] \n"
+ conf+=fortDouble(self.etacmax) + " ! [etacmax] \n"
+ conf+="***********************************************************************************\n"
+ conf+="****** 4 body final states : p(a) + p(b) + p(c) + p(d) ****************************\n"
+ conf+="***********************************************************************************\n"
+ conf+=fortDouble(self.ptamin) + " ! [ptamin] \n"
+ conf+=fortDouble(self.ptbmin) + " ! [ptbmin] \n"
+ conf+=fortDouble(self.ptcmin) + " ! [ptcmin] \n"
+ conf+=fortDouble(self.ptdmin) + " ! [ptdmin] \n"
+ conf+=fortDouble(self.etaamin) + " ! [etaamin] \n"
+ conf+=fortDouble(self.etaamax) + " ! [etaamax] \n"
+ conf+=fortDouble(self.etabmin) + " ! [etabmin] \n"
+ conf+=fortDouble(self.etabmax) + " ! [etabmax] \n"
+ conf+=fortDouble(self.etacmin) + " ! [etacmin] \n"
+ conf+=fortDouble(self.etacmax) + " ! [etacmax] \n"
+ conf+=fortDouble(self.etadmin) + " ! [etacmin] \n"
+ conf+=fortDouble(self.etadmax) + " ! [etadmax] \n"
+ conf+="***********************************************************************************\n"
+ conf+="****** 6 body final states : p(a) + p(b) + p(c) + p(d) + p(e) + p(f) **************\n"
+ conf+="***********************************************************************************\n"
+ conf+=fortDouble(self.ptamin) + " ! [ptamin] \n"
+ conf+=fortDouble(self.ptbmin) + " ! [ptbmin] \n"
+ conf+=fortDouble(self.ptcmin) + " ! [ptcmin] \n"
+ conf+=fortDouble(self.ptdmin) + " ! [ptdmin] \n"
+ conf+=fortDouble(self.ptemin) + " ! [ptemin] \n"
+ conf+=fortDouble(self.ptfmin) + " ! [ptfmin] \n"
+ conf+=fortDouble(self.etaamin) + " ! [etaamin] \n"
+ conf+=fortDouble(self.etaamax) + " ! [etaamax] \n"
+ conf+=fortDouble(self.etabmin) + " ! [etabmin] \n"
+ conf+=fortDouble(self.etabmax) + " ! [etabmax] \n"
+ conf+=fortDouble(self.etacmin) + " ! [etacmin] \n"
+ conf+=fortDouble(self.etacmax) + " ! [etacmax] \n"
+ conf+=fortDouble(self.etadmin) + " ! [etadmin] \n"
+ conf+=fortDouble(self.etadmax) + " ! [etadmax] \n"
+ conf+=fortDouble(self.etaemin) + " ! [etaemin] \n"
+ conf+=fortDouble(self.etaemax) + " ! [etaemax] \n"
+ conf+=fortDouble(self.etaemin) + " ! [etafmin] \n"
+ conf+=fortDouble(self.etafmax) + " ! [etafmax] \n"
+ conf+="***********************************************************************************\n"
+ conf+="******************* jet algorithm parameters **************************************\n"
+ conf+="***********************************************************************************\n"
+ conf+=fortDouble(self.rjet) + " ! [rjet] : Jet Radius \n"
+ conf+=fortStr(self.jalg) + " ! [jalg] : Jet algorithm ('antikt','kt') \n"
+ conf+="***********************************************************************************\n"
+ conf+="***** chi_c/b two-body decays *****************************************************\n"
+ conf+="***********************************************************************************\n"
+ conf+=fortDouble(self.m2b) + " ! [m2b] : mass of decay particles \n"
+ conf+=fortInt(self.pdgid1) + " ! [pdgid1] : PDG number particle 1 \n"
+ conf+=fortInt(self.pdgid2) + " ! [pdgid2] : PDG number particle 2 \n"
+ conf+="***********************************************************************************\n"
+ conf+="******* ALP Parameters ***********************************************************\n"
+ conf+="***********************************************************************************\n"
+ conf+=fortDouble(self.malp) + " ! [malp] : ALP mass (GeV) \n"
+ conf+=fortDouble(self.gax) + " ! [gax] : ALP coupling (GeV^-1) \n"
+ conf+=fortStr(self.alpt) + " ! [alpt] : AlP type (scalar - 'sc', pseudoscalar - 'ps') \n"
+ conf+="***********************************************************************************\n"
+ conf+="**** Monopole Parameters **********************************************************\n"
+ conf+="***********************************************************************************\n"
+ conf+=fortDouble(self.mpol) + " ! [mpol] : Monopole mass \n"
+ conf+=fortDouble(self.mmon) + " ! [mmon] : Monopolium mass \n"
+ conf+=fortDouble(self.gamm) + " ! [gamm] : Monopolium width \n"
+ conf+="***********************************************************************************\n"
+ conf+="**** SUSY Parameters ************************************************************\n"
+ conf+="***********************************************************************************\n"
+ conf+=fortDouble(self.mcharg) + " ! [mcharg] : Chargino/Slepton mass \n"
+ conf+=fortDouble(self.mneut) + " ! [mneut] : Neutralino mass \n"
+ conf+="***********************************************************************************\n"
+ conf+="***********************************************************************************\n"
+
+ return conf
+
+ def outputLHEFile(self):
+ return "evrecs/evrec"+self.outtg+".dat"
+
def writeInputDAT(Init):
- outF = open("input.DAT", "w")
- outF.write("***********************************************************************************\n")
- outF.write("****** Initialize again if FIRST FIVE PARAMETERS ARE CHANGED (and beam = 'prot'):******\n")
- outF.write("***********************************************************************************\n")
- outF.write(Init.rts + " ! [rts] : CMS collision energy (GeV) \n")
- outF.write(Init.isurv + " ! [isurv] : Model of soft survival (from 1 -> 4)\n")
- outF.write(Init.intag + " ! [intag] for input files \n")
- outF.write("***********************************************************************************\n")
- outF.write("***********************************************************************************\n")
- outF.write(Init.PDFname + " ! [PDFname] : PDF set \n")
- outF.write(Init.PDFmember + " ! [PDFmember] : PDF member \n")
- outF.write("***********************************************************************************\n")
- outF.write(Init.proc + " ! [proc] : Process number \n")
- outF.write(Init.beam + " ! [beam] : Beam type ('prot', 'ion', 'ionp' or 'el') \n")
- outF.write(Init.outtg + " ! [outtg] : for output file \n")
- outF.write(Init.sfaci + " ! [sfaci] : Include soft survival effects \n")
- outF.write("***********************************************************************************\n")
- outF.write("***********************************************************************************\n")
- outF.write("***********************************************************************************\n")
- outF.write(Init.diff + " ! [diff] : dissociation flag \n")
- outF.write("***********************************************************************************\n")
- outF.write(Init.an + " ! [an] : Ion mass number \n")
- outF.write(Init.az + " ! [az] : Ion atomic number \n")
- outF.write(Init.rz + " ! [rz] : Ion proton density - radius \n")
- outF.write(Init.dz + " ! [dz] : Ion proton density - skin thickness \n")
- outF.write(Init.rn + " ! [rn] : Ion neutron density - radius \n")
- outF.write(Init.dn + " ! [dn] : Ion neutron density - skin thickness \n")
- outF.write(Init.ionqcd + " ! [ionqcd] : Coherent ('coh') or incoherent ('incoh') for QCD-induced processes \n")
- outF.write("***********************************************************************************\n")
- outF.write("*************Integration parameters************************************************\n")
- outF.write("***********************************************************************************\n")
- outF.write(Init.ncall + " ! [ncall] : Number of calls for preconditioning \n")
- outF.write(Init.itmx + " ! [itmx] : Number of iterations for preconditioning \n")
- outF.write(Init.prec + " ! [prec] : Relative accuracy (in %) in main run \n")
- outF.write(Init.ncall1 + " ! [ncall1] : Number of calls in first iteration \n")
- outF.write(Init.inccall + " ! [inccall] : Number of increase calls per iteration \n")
- outF.write(Init.itend + " ! [itend] : Maximum number of iterations \n")
- outF.write(Init.iseed + " ! [iseed] : Random number seed (integer > 0) \n")
- outF.write("***********************************************************************************\n")
- outF.write("********************Unweighted events**********************************************\n")
- outF.write("***********************************************************************************\n")
- outF.write(Init.genunw + " ! [genunw] : Generate unweighted events \n")
- outF.write(Init.nev + " ! [nev] : Number of events (1 or a small value is recommended) ( the number of produced total events are controlled by athena ) \n")
- outF.write(Init.erec + " ! [erec] : Event record format ('hepmc','lhe','hepevt') \n")
- outF.write(Init.readwt + " ! [readwt] : Set to true to read in pre-calculated maxium weight below \n")
- outF.write(Init.wtmax + " ! [wtmax] : Maximum weight \n")
- outF.write("***********************************************************************************\n")
- outF.write("***********************************************************************************\n")
- outF.write("******************* general cuts ************************************************\n")
- outF.write(Init.ymin + " ! [ymin] : Minimum object rapidity Y_X \n")
- outF.write(Init.ymax + " ! [ymax] : Maximum object rapidity Y_X \n")
- outF.write(Init.mmin + " ! [mmin] : Minimum object mass M_X (redundant for resonance production) \n")
- outF.write(Init.mmax + " ! [mmax] : Maximum object mass M_X (redundant for resonance production) \n")
- outF.write(Init.gencuts + " ! [gencuts] : Generate cuts below \n")
- outF.write(Init.scorr + " ! [scorr] : Include spin correlations (for chi_c/b decays) \n")
- outF.write(Init.fwidth + " ! [fwidth] : Include finite width (for chi_c decays) \n")
- outF.write("***********************************************************************************\n")
- outF.write("************ See manual for momentum assignments***********************************\n")
- outF.write("***********************************************************************************\n")
- outF.write("******************* Proton Cuts ***************************************************\n")
- outF.write("***********************************************************************************\n")
- outF.write(Init.ptxmax + " ! [ptxmax] : max pT of the system \n")
- outF.write("***********************************************************************************\n")
- outF.write("**********2 body final states : p(a) + p(b) ***************************************\n")
- outF.write("***********************************************************************************\n")
- outF.write(Init. ptamin + " ! [ptamin] \n")
- outF.write(Init. ptbmin + " ! [ptbmin] \n")
- outF.write(Init. etaamin + " ! [etaamin] \n")
- outF.write(Init. etaamax + " ! [etaamax] \n")
- outF.write(Init. etabmin + " ! [etabmin] \n")
- outF.write(Init. etabmax + " ! [etabmax] \n")
- outF.write(Init. acoabmax + " ! [acoabmax] \n")
- outF.write("***********************************************************************************\n")
- outF.write("****** 3 body final states : p(a) + p(b) + p(c) ***********************************\n")
- outF.write("***********************************************************************************\n")
- outF.write(Init.ptamin + " ! [ptamin] \n")
- outF.write(Init.ptbmin + " ! [ptbmin] \n")
- outF.write(Init.ptcmin + " ! [ptcmin] \n")
- outF.write(Init.etaamin + " ! [etaamin] \n")
- outF.write(Init.etaamax + " ! [etaamax] \n")
- outF.write(Init.etabmin + " ! [etabmin] \n")
- outF.write(Init.etabmax + " ! [etabmax] \n")
- outF.write(Init.etacmin + " ! [etacmin] \n")
- outF.write(Init.etacmax + " ! [etacmax] \n")
- outF.write("***********************************************************************************\n")
- outF.write("****** 4 body final states : p(a) + p(b) + p(c) + p(d) ****************************\n")
- outF.write("***********************************************************************************\n")
- outF.write(Init.ptamin + " ! [ptamin] \n")
- outF.write(Init.ptbmin + " ! [ptbmin] \n")
- outF.write(Init.ptcmin + " ! [ptcmin] \n")
- outF.write(Init.ptdmin + " ! [ptdmin] \n")
- outF.write(Init.etaamin + " ! [etaamin] \n")
- outF.write(Init.etaamax + " ! [etaamax] \n")
- outF.write(Init.etabmin + " ! [etabmin] \n")
- outF.write(Init.etabmax + " ! [etabmax] \n")
- outF.write(Init.etacmin + " ! [etacmin] \n")
- outF.write(Init.etacmax + " ! [etacmax] \n")
- outF.write(Init.etadmin + " ! [etacmin] \n")
- outF.write(Init.etadmax + " ! [etadmax] \n")
- outF.write("***********************************************************************************\n")
- outF.write("****** 6 body final states : p(a) + p(b) + p(c) + p(d) + p(e) + p(f) **************\n")
- outF.write("***********************************************************************************\n")
- outF.write(Init.ptamin + " ! [ptamin] \n")
- outF.write(Init.ptbmin + " ! [ptbmin] \n")
- outF.write(Init.ptcmin + " ! [ptcmin] \n")
- outF.write(Init.ptdmin + " ! [ptdmin] \n")
- outF.write(Init.ptemin + " ! [ptemin] \n")
- outF.write(Init.ptfmin + " ! [ptfmin] \n")
- outF.write(Init.etaamin + " ! [etaamin] \n")
- outF.write(Init.etaamax + " ! [etaamax] \n")
- outF.write(Init.etabmin + " ! [etabmin] \n")
- outF.write(Init.etabmax + " ! [etabmax] \n")
- outF.write(Init.etacmin + " ! [etacmin] \n")
- outF.write(Init.etacmax + " ! [etacmax] \n")
- outF.write(Init.etadmin + " ! [etadmin] \n")
- outF.write(Init.etadmax + " ! [etadmax] \n")
- outF.write(Init.etaemin + " ! [etaemin] \n")
- outF.write(Init.etaemax + " ! [etaemax] \n")
- outF.write(Init.etaemin + " ! [etafmin] \n")
- outF.write(Init.etafmax + " ! [etafmax] \n")
- outF.write("***********************************************************************************\n")
- outF.write("******************* jet algorithm parameters **************************************\n")
- outF.write("***********************************************************************************\n")
- outF.write(Init.rjet + " ! [rjet] : Jet Radius \n")
- outF.write(Init.jalg + " ! [jalg] : Jet algorithm ('antikt','kt') \n")
- outF.write("***********************************************************************************\n")
- outF.write("***** chi_c/b two-body decays *****************************************************\n")
- outF.write("***********************************************************************************\n")
- outF.write(Init.m2b + " ! [m2b] : mass of decay particles \n")
- outF.write(Init.pdgid1 + " ! [pdgid1] : PDG number particle 1 \n")
- outF.write(Init.pdgid2 + " ! [pdgid2] : PDG number particle 2 \n")
- outF.write("***********************************************************************************\n")
- outF.write("******* ALP Parameters ***********************************************************\n")
- outF.write("***********************************************************************************\n")
- outF.write(Init.malp + " ! [malp] : ALP mass (GeV) \n")
- outF.write(Init.gax + " ! [gax] : ALP coupling (GeV^-1) \n")
- outF.write(Init.alpt + " ! [alpt] : AlP type (scalar - 'sc', pseudoscalar - 'ps') \n")
- outF.write("***********************************************************************************\n")
- outF.write("**** Monopole Parameters **********************************************************\n")
- outF.write("***********************************************************************************\n")
- outF.write(Init.mpol + " ! [mpol] : Monopole mass \n")
- outF.write(Init.mmon + " ! [mmon] : Monopolium mass \n")
- outF.write(Init.gamm + " ! [gamm] : Monopolium width \n")
- outF.write("***********************************************************************************\n")
- outF.write("**** SUSY Parameters ************************************************************\n")
- outF.write("***********************************************************************************\n")
- outF.write(Init.mcharg + " ! [mcharg] : Chargino/Slepton mass \n")
- outF.write(Init.mneut + " ! [mneut] : Neutralino mass \n")
- outF.write("***********************************************************************************\n")
- outF.write("***********************************************************************************\n")
-
- outF.close()
+ with open("input.DAT", "w") as outF:
+ outF.write(Init.toFortran())
return
-def SuperChicInitialize(Init):
+def run_command(command, stdin = None):
+ """
+ Run a command and print output continuously
+ """
+ process = subprocess.Popen(shlex.split(command), stdout=subprocess.PIPE, stdin=stdin)
+ while True:
+ output = process.stdout.readline()
+ if output == '' and process.poll() is not None:
+ break
+ if output:
+ # remove ANSI escape formatting characters
+ reaesc = re.compile(r'(\x9B|\x1B\[)[0-?]*[ -\/]*[@-~]')
+ text = reaesc.sub('', output.strip())
+ logger.info(text)
+
+ rc = process.poll()
+ return rc
+
+
+def SuperChicInitialize(Init, stdin=None):
+
+ logger.info("Starting SuperChic Initialization")
+
+ if not os.path.exists('inputs'):
+ os.makedirs('inputs')
+ if not os.path.exists('evrecs'):
+ os.makedirs('evrecs')
+ if not os.path.exists('outputs'):
+ os.makedirs('outputs')
+
- print("Starting SuperChic Initialization")
-
try:
- outputLog = open("init.log", 'w')
inputDAT = open('input.DAT')
-
- init = subprocess.Popen([Init.superchicpath+"/bin/init"], stdin=inputDAT, stdout=outputLog, stderr=outputLog)
- (output, err) = init.communicate()
- init.wait()
+ except IOError:
+ raise Exception("problem with file IO; potentially input.DAT not created correctly")
+ else:
- print(output)
- print(err)
+ try:
+ rc = run_command(Init.superchicpath+"/bin/init", inputDAT)
- except OSError:
- print("init executable or file not found")
- raise
+ except OSError:
+ raise Exception("init executable or file not found")
- except IOError:
- print("problem with file IO; potentially input.DAT not created correctly")
- raise
+ except Exception:
+ raise Exception("Non-OSError or IOError in init execution block")
-# except:
-# print("Non-OSError or IOError in init execution block")
-# raise
+ if rc:
+ raise Exception('Unexpected error in superchic init execution')
- #try... except does not catch fortran errors, instead check that the files made by init are filled
- try:
- fileName = "inputs/sdcoh"+Init.intag[1:-1]+".dat"
- print(fileName)
- if( os.path.isfile(fileName) ):
- print("input file made by init")
- InFile = open(fileName, "r")
- line_count = 0
- for line in InFile:
- if line != "\n":
- line_count += 1
- InFile.close()
- if(line_count < 10):
- raise Exception('Input not filled properly')
- else:
- raise Exception('no Input file produced')
-
- except Exception as inst:
- print(inst.args)
- raise
-
- outputLog.close()
- inputDAT.close()
-
return
def SuperChicExecute(Init):
- print("Starting SuperChic Itself")
+ logger.info("Starting SuperChic Itself")
+
+ if not os.path.exists('inputs'):
+ os.makedirs('inputs')
+ if not os.path.exists('evrecs'):
+ os.makedirs('evrecs')
+ if not os.path.exists('outputs'):
+ os.makedirs('outputs')
+
try:
- outputLog = open("superchic.log", 'w')
inputDAT = open('input.DAT')
-
- superchic = subprocess.Popen([Init.superchicpath+"/bin/superchic"], stdin=inputDAT, stdout=outputLog, stderr=outputLog)
+ except IOError:
+ raise Exception ("problem with IO; potentially input.DAT not created correctly")
+ else:
- (output, err) = superchic.communicate()
- superchic.wait()
+ try:
+ rc = run_command(Init.superchicpath+'/bin/superchic', stdin=inputDAT)
- print(output)
- print(err)
+ except OSError:
+ raise Exception("Superchic executable or file not found")
- except OSError:
- print("Superchic executable or file not found")
- raise
+ except Exception:
+ raise Exception("Non-OSError or IOError in Superchic execution block")
- except IOError:
- print("problem with IO; potentially input.DAT not created correctly")
- raise
+ if rc:
+ raise Exception('Unexpected error in superchic execution')
-# except:
-# print("Non-OSError or IOError in Superchic execution block")
-# raise
+ return
- #try... except does not catch fortran errors, instead check if the LHE file is filled
- try:
- fileName = "evrecs/evrec"+Init.outtg[1:-1]+".dat"
- print(fileName)
- if( os.path.isfile(fileName) ):
- print("LHE file made by Superchic")
- LHEFile = open(fileName, "r")
- line_count = 0
- for line in LHEFile:
- if line != "\n":
- line_count += 1
- LHEFile.close()
- if(line_count < 10):
- raise Exception('LHE not filled properly')
- else:
- raise Exception('no LHE file produced')
-
- except Exception as inst:
- print(inst.args)
- raise
-
- outputLog.close()
- inputDAT.close()
- return
+def SuperChicRun(Init, genSeq):
+ # dump the job configuration for fortran code
+ print(Init.toFortran())
-def SuperChicRun(Init):
+ # attach config to genSequence for later usin in showering
+ genSeq.SuperChicConfig = Init
writeInputDAT(Init)
SuperChicInitialize(Init)
diff --git a/Generators/Superchic_i/share/common/Pythia8_Base_Common.py b/Generators/Superchic_i/share/common/Pythia8_Base_Common.py
new file mode 100644
index 000000000000..415fa7696303
--- /dev/null
+++ b/Generators/Superchic_i/share/common/Pythia8_Base_Common.py
@@ -0,0 +1,19 @@
+from AthenaCommon import Logging
+logger = Logging.logging.getLogger("Superchic_i")
+
+## Shower config for Pythia8 with Superchic for elastic production
+
+from Pythia8_i.Pythia8_iConf import Pythia8_i
+genSeq += Pythia8_i("Pythia8")
+evgenConfig.generators += ["Pythia8"]
+
+## Control storing LHE in the HepMC record
+if "StoreLHE" in genSeq.Pythia8.__slots__.keys():
+ print "Pythia8_Base_Fragment.py: DISABLING storage of LHE record in HepMC by default. Please re-enable storage if desired"
+ genSeq.Pythia8.StoreLHE = False
+
+genSeq.Pythia8.LHEFile = genSeq.SuperChicConfig.outputLHEFile()
+genSeq.Pythia8.CollisionEnergy = int(runArgs.ecmEnergy)
+
+testSeq.TestHepMC.MaxTransVtxDisp = 1000000
+testSeq.TestHepMC.MaxVtxDisp = 1000000000
diff --git a/Generators/Superchic_i/share/common/Pythia8_DD_Common.py b/Generators/Superchic_i/share/common/Pythia8_DD_Common.py
new file mode 100644
index 000000000000..d581e1bad6c6
--- /dev/null
+++ b/Generators/Superchic_i/share/common/Pythia8_DD_Common.py
@@ -0,0 +1,15 @@
+include('Superchic_i/Pythia8_Base_Common.py')
+
+
+if genSeq.SuperChicConfig.diff != 'dd':
+ raise Exception("DD Pythia8 shower configuration can only be used with diff='dd'")
+
+genSeq.Pythia8.Commands += [
+ "PartonLevel:MPI = off",
+ "SpaceShower:dipoleRecoil = on",
+ "SpaceShower:pTmaxMatch = 2",
+ "SpaceShower:QEDshowerByQ = on",
+ "BeamRemnants:primordialKT = off",
+ "BeamRemnants:unresolvedHadron = 0",
+ "SpaceShower:pTdampMatch=1"
+]
diff --git a/Generators/Superchic_i/share/common/Pythia8_EL_Common.py b/Generators/Superchic_i/share/common/Pythia8_EL_Common.py
new file mode 100644
index 000000000000..ecfad21f83ef
--- /dev/null
+++ b/Generators/Superchic_i/share/common/Pythia8_EL_Common.py
@@ -0,0 +1,15 @@
+include('Superchic_i/Pythia8_Base_Common.py')
+
+
+if genSeq.SuperChicConfig.diff != 'el':
+ raise Exception("EL Pythia8 showr configuration can only be used with diff='el'")
+
+genSeq.Pythia8.Commands += [
+ "PartonLevel:MPI = off",
+ "SpaceShower:pTmaxMatch = 2",
+ "BeamRemnants:primordialKT = off",
+ "BeamRemnants:unresolvedHadron = 3",
+ "SpaceShower:pTdampMatch=1",
+ "PartonLevel:ISR = off",
+ "LesHouches:matchInOut = off"
+]
diff --git a/Generators/Superchic_i/share/common/Pythia8_SD_Common.py b/Generators/Superchic_i/share/common/Pythia8_SD_Common.py
new file mode 100644
index 000000000000..894f88bed118
--- /dev/null
+++ b/Generators/Superchic_i/share/common/Pythia8_SD_Common.py
@@ -0,0 +1,21 @@
+include('Superchic_i/Pythia8_Base_Common.py')
+
+
+if not (genSeq.SuperChicConfig.diff == 'sda' or genSeq.SuperChicConfig.diff == 'sdb'):
+ raise Exception("SD Pythia8 shower configuration can only be used with diff='sda' or 'sdb'")
+
+unresolvedHadron = -1
+if genSeq.SuperChicConfig.diff=='sda':
+ unresolvedHadron = 2
+elif genSeq.SuperChicConfig.diff=='sdb':
+ unresolvedHadron = 1
+
+genSeq.Pythia8.Commands += [
+ "PartonLevel:MPI = off",
+ "SpaceShower:dipoleRecoil = on",
+ "SpaceShower:pTmaxMatch = 2",
+ "BeamRemnants:primordialKT = off",
+ "SpaceShower:QEDshowerByQ = off",
+ "BeamRemnants:unresolvedHadron = {}".format(unresolvedHadron),
+ "SpaceShower:pTdampMatch=1"
+]
diff --git a/Generators/Superchic_i/share/jobOptions.SuperChicPy8_yyMuMu_DD.py b/Generators/Superchic_i/share/jobOptions.SuperChicPy8_yyMuMu_DD.py
new file mode 100644
index 000000000000..375f4dcb05ca
--- /dev/null
+++ b/Generators/Superchic_i/share/jobOptions.SuperChicPy8_yyMuMu_DD.py
@@ -0,0 +1,34 @@
+evgenConfig.description = "SuperChic4 MC gamma + gamma pp collisions at 13000 GeV to 2 muons with dissociation on single side"
+evgenConfig.keywords = ["2photon","2muon","dissociation"]
+evgenConfig.contact = ["william.patrick.mccormack.iii@cern.ch", "oldrich.kepka@cern.ch"]
+
+from Superchic_i.SuperChicUtils import SuperChicConfig, SuperChicRun
+
+#class with the superchic initialization parameters. Please see SuperChicUtils for a complete list of tunable parameters.
+scConfig = SuperChicConfig(runArgs)
+
+scConfig.isurv = 4 # Model of soft survival (from 1 -> 4, corresponding to arXiv:1306.2149)
+scConfig.PDFname = 'MMHT2014lo68cl' # PDF set name
+scConfig.PDFmember = 0 # PDF member
+scConfig.proc = 57 # Process number (59 = gg->gg, 56 = gg->ee, 68 = gg->a->gg ); Please consult Superchic Manual https://superchic.hepforge.org/
+scConfig.beam = 'prot' # Beam type ('prot', 'ion')
+scConfig.sfaci = True # Include soft survival effects
+scConfig.diff = 'dd' # interaction: elastic ('el'), single ('sd','sda','sdb') and double ('dd') dissociation.
+scConfig.genunw = True
+scConfig.ymin = -5.0 # Minimum object rapidity Y_X
+scConfig.ymax = 5.0 # Maximum object rapidity Y_X
+scConfig.mmin = 20 # Minimum object mass M_X
+scConfig.mmax = 2000 # Maximum object mass M_X
+scConfig.gencuts = True # Generate cuts below
+scConfig.ptxmax = 100 #cut on proton pt
+scConfig.ptamin = 10.0 # Minimum pT of outgoing object a
+scConfig.ptbmin = 10. # Minimum pT of outgoing object b
+scConfig.etaamin = -2.5 # Minimum eta of outgoing object a
+scConfig.etaamax = 2.5 # Maximum eta of outgoing object a
+scConfig.etabmin = -2.5 # Minimum eta of outgoing object b
+scConfig.etabmax = 2.5 # Maximum eta of outgoing object b
+scConfig.acoabmax = 100
+
+
+SuperChicRun(scConfig, genSeq)
+include('Superchic_i/Pythia8_DD_Common.py')
diff --git a/Generators/Superchic_i/share/jobOptions.SuperChicPy8_yyMuMu_El.py b/Generators/Superchic_i/share/jobOptions.SuperChicPy8_yyMuMu_El.py
new file mode 100644
index 000000000000..2ab604aeb892
--- /dev/null
+++ b/Generators/Superchic_i/share/jobOptions.SuperChicPy8_yyMuMu_El.py
@@ -0,0 +1,34 @@
+evgenConfig.description = "SuperChic4 MC gamma + gamma pp collisions at 13000 GeV to 2 muons with dissociation on both side"
+evgenConfig.keywords = ["2photon","2muon","dissociation"]
+evgenConfig.contact = ["william.patrick.mccormack.iii@cern.ch", "oldrich.kepka@cern.ch"]
+
+from Superchic_i.SuperChicUtils import SuperChicConfig, SuperChicRun
+
+#class with the superchic initialization parameters. Please see SuperChicUtils for a complete list of tunable parameters.
+scConfig = SuperChicConfig(runArgs)
+
+scConfig.isurv = 4 # Model of soft survival (from 1 -> 4, corresponding to arXiv:1306.2149)
+scConfig.PDFname = 'MMHT2014lo68cl' # PDF set name
+scConfig.PDFmember = 0 # PDF member
+scConfig.proc = 57 # Process number (59 = gg->gg, 56 = gg->ee, 68 = gg->a->gg ); Please consult Superchic Manual https://superchic.hepforge.org/
+scConfig.beam = 'prot' # Beam type ('prot', 'ion')
+scConfig.sfaci = True # Include soft survival effects
+scConfig.diff = 'el' # interaction: elastic ('el'), single ('sd','sda','sdb') and double ('dd') dissociation.
+scConfig.genunw = True
+scConfig.ymin = -5.0 # Minimum object rapidity Y_X
+scConfig.ymax = 5.0 # Maximum object rapidity Y_X
+scConfig.mmin = 20 # Minimum object mass M_X
+scConfig.mmax = 2000 # Maximum object mass M_X
+scConfig.gencuts = True # Generate cuts below
+scConfig.ptxmax = 100 #cut on proton pt
+scConfig.ptamin = 10.0 # Minimum pT of outgoing object a
+scConfig.ptbmin = 10. # Minimum pT of outgoing object b
+scConfig.etaamin = -2.5 # Minimum eta of outgoing object a
+scConfig.etaamax = 2.5 # Maximum eta of outgoing object a
+scConfig.etabmin = -2.5 # Minimum eta of outgoing object b
+scConfig.etabmax = 2.5 # Maximum eta of outgoing object b
+scConfig.acoabmax = 100
+
+
+SuperChicRun(scConfig, genSeq)
+include('Superchic_i/Pythia8_EL_Common.py')
diff --git a/Generators/Superchic_i/share/jobOptions.SuperChicPy8_yyMuMu_SDA.py b/Generators/Superchic_i/share/jobOptions.SuperChicPy8_yyMuMu_SDA.py
new file mode 100644
index 000000000000..132e8c82c5ad
--- /dev/null
+++ b/Generators/Superchic_i/share/jobOptions.SuperChicPy8_yyMuMu_SDA.py
@@ -0,0 +1,34 @@
+evgenConfig.description = "SuperChic4 MC gamma + gamma pp collisions at 13000 GeV to 2 muons with dissociation on single side"
+evgenConfig.keywords = ["2photon","2muon","dissociation"]
+evgenConfig.contact = ["william.patrick.mccormack.iii@cern.ch", "oldrich.kepka@cern.ch"]
+
+from Superchic_i.SuperChicUtils import SuperChicConfig, SuperChicRun
+
+#class with the superchic initialization parameters. Please see SuperChicUtils for a complete list of tunable parameters.
+scConfig = SuperChicConfig(runArgs)
+
+scConfig.isurv = 4 # Model of soft survival (from 1 -> 4, corresponding to arXiv:1306.2149)
+scConfig.PDFname = 'MMHT2014lo68cl' # PDF set name
+scConfig.PDFmember = 0 # PDF member
+scConfig.proc = 57 # Process number (59 = gg->gg, 56 = gg->ee, 68 = gg->a->gg ); Please consult Superchic Manual https://superchic.hepforge.org/
+scConfig.beam = 'prot' # Beam type ('prot', 'ion')
+scConfig.sfaci = True # Include soft survival effects
+scConfig.diff = 'sda' # interaction: elastic ('el'), single ('sd','sda','sdb') and double ('dd') dissociation.
+scConfig.genunw = True
+scConfig.ymin = -5.0 # Minimum object rapidity Y_X
+scConfig.ymax = 5.0 # Maximum object rapidity Y_X
+scConfig.mmin = 20 # Minimum object mass M_X
+scConfig.mmax = 2000 # Maximum object mass M_X
+scConfig.gencuts = True # Generate cuts below
+scConfig.ptxmax = 100 #cut on proton pt
+scConfig.ptamin = 10.0 # Minimum pT of outgoing object a
+scConfig.ptbmin = 10. # Minimum pT of outgoing object b
+scConfig.etaamin = -2.5 # Minimum eta of outgoing object a
+scConfig.etaamax = 2.5 # Maximum eta of outgoing object a
+scConfig.etabmin = -2.5 # Minimum eta of outgoing object b
+scConfig.etabmax = 2.5 # Maximum eta of outgoing object b
+scConfig.acoabmax = 100
+
+
+SuperChicRun(scConfig, genSeq)
+include('Superchic_i/Pythia8_SD_Common.py')
diff --git a/Generators/Superchic_i/share/jobOptions.SuperChicPy8_yyMuMu_SDB.py b/Generators/Superchic_i/share/jobOptions.SuperChicPy8_yyMuMu_SDB.py
new file mode 100644
index 000000000000..3b412b945d28
--- /dev/null
+++ b/Generators/Superchic_i/share/jobOptions.SuperChicPy8_yyMuMu_SDB.py
@@ -0,0 +1,34 @@
+evgenConfig.description = "SuperChic4 MC gamma + gamma pp collisions at 13000 GeV to 2 muons with dissociation on single side"
+evgenConfig.keywords = ["2photon","2muon","dissociation"]
+evgenConfig.contact = ["william.patrick.mccormack.iii@cern.ch", "oldrich.kepka@cern.ch"]
+
+from Superchic_i.SuperChicUtils import SuperChicConfig, SuperChicRun
+
+#class with the superchic initialization parameters. Please see SuperChicUtils for a complete list of tunable parameters.
+scConfig = SuperChicConfig(runArgs)
+
+scConfig.isurv = 4 # Model of soft survival (from 1 -> 4, corresponding to arXiv:1306.2149)
+scConfig.PDFname = 'MMHT2014lo68cl' # PDF set name
+scConfig.PDFmember = 0 # PDF member
+scConfig.proc = 57 # Process number (59 = gg->gg, 56 = gg->ee, 68 = gg->a->gg ); Please consult Superchic Manual https://superchic.hepforge.org/
+scConfig.beam = 'prot' # Beam type ('prot', 'ion')
+scConfig.sfaci = True # Include soft survival effects
+scConfig.diff = 'sdb' # interaction: elastic ('el'), single ('sd','sda','sdb') and double ('dd') dissociation.
+scConfig.genunw = True
+scConfig.ymin = -5.0 # Minimum object rapidity Y_X
+scConfig.ymax = 5.0 # Maximum object rapidity Y_X
+scConfig.mmin = 20 # Minimum object mass M_X
+scConfig.mmax = 2000 # Maximum object mass M_X
+scConfig.gencuts = True # Generate cuts below
+scConfig.ptxmax = 100 #cut on proton pt
+scConfig.ptamin = 10.0 # Minimum pT of outgoing object a
+scConfig.ptbmin = 10. # Minimum pT of outgoing object b
+scConfig.etaamin = -2.5 # Minimum eta of outgoing object a
+scConfig.etaamax = 2.5 # Maximum eta of outgoing object a
+scConfig.etabmin = -2.5 # Minimum eta of outgoing object b
+scConfig.etabmax = 2.5 # Maximum eta of outgoing object b
+scConfig.acoabmax = 100
+
+
+SuperChicRun(scConfig, genSeq)
+include('Superchic_i/Pythia8_SD_Common.py')
diff --git a/Generators/Superchic_i/share/jobOptions.SuperChic_ALP2.py b/Generators/Superchic_i/share/jobOptions.SuperChic_ALP2.py
new file mode 100644
index 000000000000..9291a6054cdc
--- /dev/null
+++ b/Generators/Superchic_i/share/jobOptions.SuperChic_ALP2.py
@@ -0,0 +1,43 @@
+evgenConfig.description = "SuperChic4 MC gamma + gamma pp collisions to gamma + gamma mediated by ALP no pythia shower"
+evgenConfig.keywords = ["2photon","2photon"]
+#evgenConfig.weighting = 0
+evgenConfig.contact = ["william.patrick.mccormack.iii@cern.ch"]
+evgenConfig.generators += ["Superchic"]
+
+from Superchic_i.SuperChicUtils import SuperChicConfig, SuperChicRun
+
+#class with the superchic initialization parameters. Please see SuperChicUtils for a complete list of tunable parameters.
+scConfig = SuperChicConfig(runArgs)
+
+scConfig.isurv = 4 # Model of soft survival (from 1 -> 4, corresponding to arXiv:1306.2149)
+scConfig.PDFname = 'MMHT2014lo68cl' # PDF set name
+scConfig.PDFmember = 0 # PDF member
+scConfig.proc = 68 # Process number (59 = gg->gg, 56 = gg->ee, 68 = gg->a->gg ); Please consult Superchic Manual https://superchic.hepforge.org/
+scConfig.beam = 'prot' # Beam type ('prot', 'ion')
+scConfig.sfaci = True # Include soft survival effects
+scConfig.diff = 'el' # interaction: elastic ('el'), single ('sd','sda','sdb') and double ('dd') dissociation.
+scConfig.genunw = True
+scConfig.ymin = -2.4 # Minimum object rapidity Y_X
+scConfig.ymax = 2.4 # Maximum object rapidity Y_X
+scConfig.mmin = 6 # Minimum object mass M_X
+scConfig.mmax = 500 # Maximum object mass M_X
+scConfig.gencuts = True # Generate cuts below
+scConfig.ptxmax = 100 #cut on proton pt
+scConfig.ptamin = 3.0 # Minimum pT of outgoing object a
+scConfig.ptbmin = 3.0 # Minimum pT of outgoing object b
+scConfig.etaamin = -2.4 # Minimum eta of outgoing object a
+scConfig.etaamax = 2.4 # Maximum eta of outgoing object a
+scConfig.etabmin = -2.4 # Minimum eta of outgoing object b
+scConfig.etabmax = 2.4 # Maximum eta of outgoing object b
+scConfig.acoabmax = 100
+
+
+#SuperChicRun(scConfig, genSeq)
+
+import Superchic_i.EventFiller as EF
+ef = EF.LheEVNTFiller()
+ef.fileName = scConfig.outputLHEFile()
+outputFileName = "outputs/output"+scConfig.outtg+".dat"
+ef.outputFileName = outputFileName
+genSeq += ef
+
diff --git a/Generators/Superchic_i/share/jobOptions.Superchic.py b/Generators/Superchic_i/share/jobOptions.Superchic.py
deleted file mode 100644
index 9487b19a258c..000000000000
--- a/Generators/Superchic_i/share/jobOptions.Superchic.py
+++ /dev/null
@@ -1,42 +0,0 @@
-evgenConfig.description = "Superchic gamma + gamma UPC collisions at 5020 GeV"
-evgenConfig.keywords = ["2photon","2lepton"]
-#evgenConfig.weighting = 0
-evgenConfig.contact = ["prabhakar.palni@cern.ch"]
-
-if not os.path.exists('inputs'):
- os.makedirs('inputs')
-if not os.path.exists('evrecs'):
- os.makedirs('evrecs')
-
-from Superchic_i.Superchic_iConf import Superchic_i
-genSeq += Superchic_i("Superchic")
-genSeq.Superchic.McEventKey = "GEN_EVENT"
-evgenConfig.generators += ["Superchic"]
-
-from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
-_evgenstream = AthenaPoolOutputStream("StreamEVGEN")
-_evgenstream.ItemList = ["2101#*","133273#GEN_EVENT"]
-
-del _evgenstream
-
-
-# TODO: Sort out proper param setting based on runArgs.ecmEnergy
-if int(runArgs.ecmEnergy) != 5020:
- evgenLog.error(" Set beam energy in JO initialization with parameter rts ")
- sys.exit(1)
-
-
-genSeq.Superchic.Initialize = \
- ["rts 5.02d3", # set the COM collision energy (in fortran syntax)
- "isurv 4", # Model of soft survival
- "intag 'in5'", # for input files
- "PDFname 'MMHT2014lo68cl'", # PDF set name
- "PDFmember 0", # PDF member
- "proc 59", # Process number (59 = gg->gg, 56 =gg->ee )
- "beam 'ion'", # Beam type ('prot', 'ion')
- "outtg 'out'", # for output file name
- "sfaci .false.", # Include soft survival effects
- "ncall 100000", # Number of calls for preconditioning
- "itmx 1", # Number of iterations for preconditioning
- "prec 1.0d0" # precision
- ]
diff --git a/Generators/Superchic_i/share/jobOptions.SuperchicPy8EG_yyMuMu_DD.py b/Generators/Superchic_i/share/jobOptions.SuperchicPy8EG_yyMuMu_DD.py
deleted file mode 100644
index d076d8c6eade..000000000000
--- a/Generators/Superchic_i/share/jobOptions.SuperchicPy8EG_yyMuMu_DD.py
+++ /dev/null
@@ -1,88 +0,0 @@
-evgenConfig.description = "SuperChic4 MC gamma + gamma pp collisions at 13000 GeV to 2 muons with dissociation on both side"
-evgenConfig.keywords = ["2photon","2muon","dissociation"]
-#evgenConfig.weighting = 0
-evgenConfig.contact = ["william.patrick.mccormack.iii@cern.ch"]
-
-if not os.path.exists('inputs'):
- os.makedirs('inputs')
-if not os.path.exists('evrecs'):
- os.makedirs('evrecs')
-if not os.path.exists('outputs'):
- os.makedirs('outputs')
-
-from Superchic_i.SuperChicUtils import *
-
-#class with the superchic initialization parameters. Please see SuperChicUtils for a complete list of tunable parameters.
-Init = SuperChicConfig()
-
-hasECM = hasattr(runArgs,"ecmEnergy")
-if hasECM:
- ecm = int(runArgs.ecmEnergy)
- Init.rts = str(ecm)+"d0" # set the COM collision energy (in fortran syntax)
-Init.isurv = "4" # Model of soft survival (from 1 -> 4, corresponding to arXiv:1306.2149)
-Init.intag = "'in5'" # for input files
-Init.PDFname = "'MMHT2014lo68cl'" # PDF set name
-Init.PDFmember = "0" # PDF member
-Init.proc = "57" # Process number (59 = gg->gg, 56 = gg->ee, 68 = gg->a->gg ); Please consult Superchic Manual https://superchic.hepforge.org/
-Init.beam = "'prot'" # Beam type ('prot', 'ion')
-Init.outtg = "'out'" # for output file name
-Init.sfaci = ".true." # Include soft survival effects
-Init.diff = "'dd'" # interaction: elastic ('el'), single ('sd','sda','sdb') and double ('dd') dissociation.
-hasSeed = hasattr(runArgs,"randomSeed")
-if hasSeed:
- Init.iseed = str(int(runArgs.randomSeed))
-Init.genunw = ".true."
-hasNev = hasattr(runArgs,"maxEvents")
-if hasNev:
- Init.nev = str(runArgs.maxEvents)
-Init.ymin = "-2.4d0" # Minimum object rapidity Y_X
-Init.ymax = "2.4d0" # Maximum object rapidity Y_X
-Init.mmin = "6d0" # Minimum object mass M_X
-Init.mmax = "500d0" # Maximum object mass M_X
-Init.gencuts = ".true." # Generate cuts below
-Init.ptxmax = "100d0" #cut on proton pt
-Init.ptamin = "3.0d0" # Minimum pT of outgoing object a
-Init.ptbmin = "3.0d0" # Minimum pT of outgoing object b
-Init.etaamin = "-2.4d0" # Minimum eta of outgoing object a
-Init.etaamax = "2.4d0" # Maximum eta of outgoing object a
-Init.etabmin = "-2.4d0" # Minimum eta of outgoing object b
-Init.etabmax = "2.4d0" # Maximum eta of outgoing object b
-Init.acoabmax = "100d0"
-
-
-SuperChicRun(Init)
-
-
-evgenConfig.generators += ["Pythia8"]
-
-include("Pythia8_i/Pythia8_Base_Fragment.py")
-
-genSeq.Pythia8.Commands += [
- "PDF:pSet= LHAPDF6:NNPDF23_nnlo_as_0118_qed",
- "SpaceShower:rapidityOrder = on",
- "SigmaProcess:alphaSvalue = 0.140",
- "SpaceShower:pT0Ref = 1.56",
- "SpaceShower:pTmaxFudge = 0.91",
- "SpaceShower:pTdampFudge = 1.05",
- "SpaceShower:alphaSvalue = 0.127",
- "TimeShower:alphaSvalue = 0.127",
- "SpaceShower:pTdampMatch = 1",
- "BeamRemnants:primordialKThard = 1.88",
- "PartonLevel:MPI = off",
- "PartonLevel:FSR = on",
- "SpaceShower:dipoleRecoil = on",
- "SpaceShower:pTmaxMatch = 2",
- "SpaceShower:QEDshowerByQ = off"
-]
-
-evgenConfig.tune = "NNPDF23_QED"
-
-#EvtGen for b fragmentation as default. No EvtGen is available in "nonStandard"
-include("Pythia8_i/Pythia8_EvtGen.py")
-
-include("Pythia8_i/Pythia8_ShowerWeights.py")
-
-assert hasattr(genSeq, "Pythia8")
-fileName = "evrecs/evrec"+Init.outtg[1:-1]+".dat"
-genSeq.Pythia8.LHEFile = fileName
-genSeq.Pythia8.CollisionEnergy = int(runArgs.ecmEnergy)
diff --git a/Generators/Superchic_i/share/jobOptions.Superchic_ALP2.py b/Generators/Superchic_i/share/jobOptions.Superchic_ALP2.py
deleted file mode 100644
index f44832fea28f..000000000000
--- a/Generators/Superchic_i/share/jobOptions.Superchic_ALP2.py
+++ /dev/null
@@ -1,63 +0,0 @@
-evgenConfig.description = "SuperChic4 MC gamma + gamma pp collisions to gamma + gamma mediated by ALP no pythia shower"
-evgenConfig.keywords = ["2photon","2photon"]
-#evgenConfig.weighting = 0
-evgenConfig.contact = ["william.patrick.mccormack.iii@cern.ch"]
-
-if not os.path.exists('inputs'):
- os.makedirs('inputs')
-if not os.path.exists('evrecs'):
- os.makedirs('evrecs')
-if not os.path.exists('outputs'):
- os.makedirs('outputs')
-
-evgenConfig.generators += ["Superchic"]
-
-from Superchic_i.SuperChicUtils import *
-
-#class with the superchic initialization parameters. Please see SuperChicUtils for a complete list of tunable parameters.
-Init = SuperChicConfig()
-
-hasECM = hasattr(runArgs,"ecmEnergy")
-if hasECM:
- ecm = int(runArgs.ecmEnergy)
- Init.rts = str(ecm)+"d0" # set the COM collision energy (in fortran syntax)
-Init.isurv = "4" # Model of soft survival (from 1 -> 4, corresponding to arXiv:1306.2149)
-Init.intag = "'in5'" # for input files
-Init.PDFname = "'MMHT2014lo68cl'" # PDF set name
-Init.PDFmember = "0" # PDF member
-Init.proc = "68" # Process number (59 = gg->gg, 56 = gg->ee, 68 = gg->a->gg ); Please consult Superchic Manual https://superchic.hepforge.org/
-Init.beam = "'prot'" # Beam type ('prot', 'ion')
-Init.outtg = "'out'" # for output file name
-Init.sfaci = ".true." # Include soft survival effects
-Init.diff = "'el'" # interaction: elastic ('el'), single ('sd','sda','sdb') and double ('dd') dissociation.
-hasSeed = hasattr(runArgs,"randomSeed")
-if hasSeed:
- Init.iseed = str(int(runArgs.randomSeed))
-Init.genunw = ".true."
-hasNev = hasattr(runArgs,"maxEvents")
-if hasNev:
- Init.nev = str(runArgs.maxEvents)
-Init.erec = "'lhe'"
-Init.ymin = "-2.4d0" # Minimum object rapidity Y_X
-Init.ymax = "2.4d0" # Maximum object rapidity Y_X
-Init.mmin = "6d0" # Minimum object mass M_X
-Init.mmax = "500d0" # Maximum object mass M_X
-Init.gencuts = ".true." # Generate cuts below
-Init.ptxmax = "100d0" #cut on proton pt
-Init.ptamin = "3.0d0" # Minimum pT of outgoing object a
-Init.ptbmin = "3.0d0" # Minimum pT of outgoing object b
-Init.etaamin = "-2.4d0" # Minimum eta of outgoing object a
-Init.etaamax = "2.4d0" # Maximum eta of outgoing object a
-Init.etabmin = "-2.4d0" # Minimum eta of outgoing object b
-Init.etabmax = "2.4d0" # Maximum eta of outgoing object b
-Init.acoabmax = "100d0"
-
-SuperChicRun(Init)
-
-
-import Superchic_i.EventFiller as EF
-ef = EF.LheEVNTFiller()
-fileName = "evrecs/evrec"+Init.outtg[1:-1]+".dat"
-ef.fileName = fileName
-genSeq += ef
-
diff --git a/Generators/Superchic_i/src/components/Superchic_i_entries.cxx b/Generators/Superchic_i/src/components/Superchic_i_entries.cxx
new file mode 100644
index 000000000000..ede39d877db1
--- /dev/null
+++ b/Generators/Superchic_i/src/components/Superchic_i_entries.cxx
@@ -0,0 +1 @@
+//This file seems to be needed to make atlas_add_component work
--
GitLab
From 0d8d2610debb6a335b7e5c1c565e2242354ca2b0 Mon Sep 17 00:00:00 2001
From: Gianantonio Pezzullo <g.pezzullo@yale.edu>
Date: Fri, 20 Aug 2021 18:52:29 +0000
Subject: [PATCH 209/272] fixing the group labels in some T&P chains ATR-23974
---
.../python/HLTMenuConfig/Menu/LS2_v1.py | 53 +++++------
.../HLTMenuConfig/Menu/Physics_pp_run3_v1.py | 87 ++++++++++---------
2 files changed, 71 insertions(+), 69 deletions(-)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 69a46c10ac2e..14a215ffd977 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -45,6 +45,7 @@ from TriggerMenuMT.HLTMenuConfig.Menu.Physics_pp_run3_v1 import (PhysicsStream,
PrimaryPhIGroup,
SupportLegGroup,
SupportPhIGroup,
+ TagAndProbeGroup,
TagAndProbeLegGroup,
LowMuGroup,
EOFBPhysL1MuGroup,
@@ -281,32 +282,32 @@ def setupMenu():
# Generic test T&P chain
- ChainProp(name='HLT_e26_lhtight_ivarloose_e5_lhvloose_idperf_probe_L1EM22VHI',l1SeedThresholds=['EM22VHI','PROBEEM3'],groups=TagAndProbeLegGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e5_lhvloose_idperf_probe_L1EM22VHI',l1SeedThresholds=['EM22VHI','PROBEEM3'],groups=SingleElectronGroup),
# T&P chains for displaced electrons
- ChainProp(name='HLT_e26_lhtight_ivarloose_e5_lhvloose_nopix_lrtloose_idperf_probe_L1EM22VHI',l1SeedThresholds=['EM22VHI','PROBEEM3'],groups=TagAndProbeLegGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_e26_lhloose_nopix_lrttight_probe_L1EM22VHI',l1SeedThresholds=['EM22VHI','PROBEEM22VHI'],groups=TagAndProbeLegGroup),
- ChainProp(name='HLT_e5_lhvloose_nopix_lrtloose_idperf_probe_g25_medium_L1EM20VH',l1SeedThresholds=['PROBEEM3','EM20VH'],groups=TagAndProbeLegGroup),
- ChainProp(name='HLT_e26_lhloose_nopix_lrttight_probe_g25_medium_L1EM20VH',l1SeedThresholds=['PROBEEM22VHI','EM20VH'],groups=TagAndProbeLegGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e5_lhvloose_nopix_lrtloose_idperf_probe_L1EM22VHI',l1SeedThresholds=['EM22VHI','PROBEEM3'],groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e26_lhloose_nopix_lrttight_probe_L1EM22VHI',l1SeedThresholds=['EM22VHI','PROBEEM22VHI'],groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e5_lhvloose_nopix_lrtloose_idperf_probe_g25_medium_L1EM20VH',l1SeedThresholds=['PROBEEM3','EM20VH'],groups=TagAndProbeLegGroup+SinglePhotonGroup),
+ ChainProp(name='HLT_e26_lhloose_nopix_lrttight_probe_g25_medium_L1EM20VH',l1SeedThresholds=['PROBEEM22VHI','EM20VH'],groups=TagAndProbeLegGroup+SinglePhotonGroup),
#----------- egamma Tag&Probe
- ChainProp(name='HLT_e26_lhtight_ivarloose_e12_lhvloose_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM10VH'], groups=TagAndProbeLegGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_e17_lhvloose_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM15VHI'], groups=TagAndProbeLegGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_e24_lhvloose_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM20VHI'], groups=TagAndProbeLegGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_e26_lhtight_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM22VHI'], groups=TagAndProbeLegGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_e20_lhtight_ivarloose_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM15VHI'], groups=TagAndProbeLegGroup),
-
- ChainProp(name='HLT_e26_lhtight_ivarloose_e15_etcut_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM7'], groups=TagAndProbeLegGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_e15_etcut_idperf_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM7'], groups=TagAndProbeLegGroup),
-
- ChainProp(name='HLT_e26_lhtight_ivarloose_e14_lhtight_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM7'], groups=TagAndProbeLegGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_e14_lhtight_noringer_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM7'], groups=TagAndProbeLegGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_e14_etcut_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM7'], groups=TagAndProbeLegGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_e9_lhtight_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM3'], groups=TagAndProbeLegGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_e9_lhtight_noringer_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM3'], groups=TagAndProbeLegGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_e9_etcut_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM3'], groups=TagAndProbeLegGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_e5_lhtight_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM3'], groups=TagAndProbeLegGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_e5_lhtight_noringer_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM3'], groups=TagAndProbeLegGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_e4_etcut_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM3'], groups=TagAndProbeLegGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e12_lhvloose_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM10VH'], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e17_lhvloose_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM15VHI'], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e24_lhvloose_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM20VHI'], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e26_lhtight_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM22VHI'], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e20_lhtight_ivarloose_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM15VHI'], groups=TagAndProbeLegGroup+SingleElectronGroup),
+
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e15_etcut_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM7'], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e15_etcut_idperf_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM7'], groups=TagAndProbeLegGroup+SingleElectronGroup),
+
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e14_lhtight_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM7'], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e14_lhtight_noringer_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM7'], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e14_etcut_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM7'], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e9_lhtight_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM3'], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e9_lhtight_noringer_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM3'], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e9_etcut_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM3'], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e5_lhtight_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM3'], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e5_lhtight_noringer_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM3'], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_e4_etcut_probe_L1EM22VHI', l1SeedThresholds=['EM22VHI','PROBEEM3'], groups=TagAndProbeLegGroup+SingleElectronGroup),
# Late stream for LLP
ChainProp(name='HLT_g35_medium_g25_medium_L1EM7_EMPTY', l1SeedThresholds=['EM7']*2, stream=['Late'], groups=PrimaryLegGroup+MultiPhotonGroup),
@@ -319,7 +320,7 @@ def setupMenu():
# Alternative formulation of T&P chains with generic mass cut combohypotool
# With & without 'probe' expression to check count consistency
# Zee
- ChainProp(name='HLT_e26_lhtight_e15_etcut_probe_50invmAB130_L1EM22VHI', l1SeedThresholds=['EM22VHI','EM7'], groups=TagAndProbeLegGroup+MultiElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_e15_etcut_probe_50invmAB130_L1EM22VHI', l1SeedThresholds=['EM22VHI','EM7'], groups=TagAndProbeLegGroup+SingleElectronGroup),
ChainProp(name='HLT_e26_lhtight_e15_etcut_50invmAB130_L1EM22VHI', l1SeedThresholds=['EM22VHI','EM7'], groups=MultiElectronGroup),
# Jpsiee
ChainProp(name='HLT_e9_lhtight_e4_etcut_probe_1invmAB3_L1JPSI-1M5-EM7', l1SeedThresholds=['EM7','EM3'], groups=SupportLegGroup+MultiElectronGroup),
@@ -1004,8 +1005,8 @@ def setupMenu():
ChainProp(name='HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_j70_0eta320_j50_0eta490_j0_DJMASS900j50_L1MJJ-500-NFF',l1SeedThresholds=['TAU8','TAU8','FSNOSEED','FSNOSEED','FSNOSEED'],stream=['VBFDelayed'], groups=SupportLegGroup+TauJetGroup),
ChainProp(name='HLT_tau25_mediumRNN_tracktwoMVABDT_tau20_mediumRNN_tracktwoMVABDT_03dRAB_j70_0eta320_j50_0eta490_j0_DJMASS900j50_L1MJJ-500-NFF',l1SeedThresholds=['TAU8','TAU8','FSNOSEED','FSNOSEED','FSNOSEED'],stream=['VBFDelayed'], groups=PrimaryLegGroup+TauJetGroup),
# mu-tag & tau-probe triggers for LLP (ATR-23150)
- ChainProp(name='HLT_mu26_ivarmedium_tau100_mediumRNN_tracktwoLLP_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU60'], stream=[PhysicsStream], groups=TauJetGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_tau100_mediumRNN_tracktwoLLP_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU60'], stream=[PhysicsStream], groups=TauJetGroup),
+ ChainProp(name='HLT_mu26_ivarmedium_tau100_mediumRNN_tracktwoLLP_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU60'], stream=[PhysicsStream], groups=TagAndProbeGroup+SingleMuonGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_tau100_mediumRNN_tracktwoLLP_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU60'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+SingleElectronGroup),
# MET + tau tag and probe chains (ATR-23507)
ChainProp(name='HLT_tau25_medium1_tracktwo_probe_xe110_pfsum_vssk_L1XE50', l1SeedThresholds=['PROBETAU12IM','FSNOSEED'], groups=TagAndProbeLegGroup+TauMETGroup),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
index 3151e490f701..6f8751c2dbf1 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
@@ -57,6 +57,7 @@ PrimaryPhIGroup = ['Primary:PhaseI']
SupportGroup = ['Support']
SupportLegGroup = ['Support:Legacy']
SupportPhIGroup = ['Support:PhaseI']
+# For the chains with the TAgAndProbe labels, wewe flag the rate group as being that of the tag leg and NOT the full chain selection
TagAndProbeGroup = ['Support:TagAndProbe']
TagAndProbeLegGroup = ['Support:LegacyTagAndProbe']
TagAndProbePhIGroup = ['Support:PhaseITagAndProbe']
@@ -141,13 +142,13 @@ def setupMenu():
ChainProp(name='HLT_e24_lhvloose_2e12_lhvloose_L1EM20VH_3EM10VH',l1SeedThresholds=['EM20VH','EM10VH'], groups=PrimaryLegGroup+MultiElectronGroup),
#--------- primary Zee TnP
- ChainProp(name='HLT_e26_lhtight_e15_etcut_Zee_L1EM22VHI', l1SeedThresholds=['EM22VHI','EM7'], groups=TagAndProbeLegGroup+MultiElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_e15_etcut_Zee_L1EM22VHI', l1SeedThresholds=['EM22VHI','EM7'], groups=PrimaryLegGroup+MultiElectronGroup),
#--------- primary special
ChainProp(name='HLT_e20_lhtight_ivarloose_L1ZAFB-25DPHI-eEM18M', l1SeedThresholds=['eEM18M'], groups=PrimaryPhIGroup+SingleElectronGroup),
#--------- support Zee and J/psi TnP
- ChainProp(name='HLT_e26_lhtight_e15_etcut_idperf_Zee_L1EM22VHI', l1SeedThresholds=['EM22VHI','EM7'], groups=TagAndProbeLegGroup+MultiElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_e15_etcut_idperf_Zee_L1EM22VHI', l1SeedThresholds=['EM22VHI','EM7'], groups=PrimaryLegGroup+MultiElectronGroup),
ChainProp(name='HLT_e9_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM7', l1SeedThresholds=['EM7','EM3'], groups=SupportLegGroup+MultiElectronGroup),
ChainProp(name='HLT_e5_lhtight_e9_etcut_Jpsiee_L1JPSI-1M5-EM7', l1SeedThresholds=['EM3','EM7'], groups=SupportLegGroup+MultiElectronGroup),
@@ -503,52 +504,52 @@ def setupMenu():
ChainProp(name='HLT_mu14_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1MU10_TAU12IM_XE35', l1SeedThresholds=['MU10','TAU12IM','FSNOSEED'], stream=[PhysicsStream], groups=SupportLegGroup+TauMETGroup),
# T&P alignement-based tau chains
- ChainProp(name='HLT_mu26_ivarmedium_tau20_mediumRNN_tracktwoMVA_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU8'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+MuonTauGroup),
- ChainProp(name='HLT_mu26_ivarmedium_tau20_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU8'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+MuonTauGroup),
- ChainProp(name='HLT_mu26_ivarmedium_tau25_idperf_tracktwoMVA_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU12IM'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+MuonTauGroup),
- ChainProp(name='HLT_mu26_ivarmedium_tau25_idperf_tracktwoMVABDT_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU12IM'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+MuonTauGroup),
- ChainProp(name='HLT_mu26_ivarmedium_tau25_perf_tracktwoMVA_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU12IM'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+MuonTauGroup),
- ChainProp(name='HLT_mu26_ivarmedium_tau25_perf_tracktwoMVABDT_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU12IM'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+MuonTauGroup),
- ChainProp(name='HLT_mu26_ivarmedium_tau25_mediumRNN_tracktwoMVA_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU12IM'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+MuonTauGroup),
- ChainProp(name='HLT_mu26_ivarmedium_tau25_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU12IM'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+MuonTauGroup),
- ChainProp(name='HLT_mu26_ivarmedium_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU20IM'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+MuonTauGroup),
- ChainProp(name='HLT_mu26_ivarmedium_tau35_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU20IM'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+MuonTauGroup),
- ChainProp(name='HLT_mu26_ivarmedium_tau40_mediumRNN_tracktwoMVA_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU25IM'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+MuonTauGroup),
- ChainProp(name='HLT_mu26_ivarmedium_tau40_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU25IM'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+MuonTauGroup),
- ChainProp(name='HLT_mu26_ivarmedium_tau60_mediumRNN_tracktwoMVA_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU40'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+MuonTauGroup),
- ChainProp(name='HLT_mu26_ivarmedium_tau60_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU40'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+MuonTauGroup),
- ChainProp(name='HLT_mu26_ivarmedium_tau80_mediumRNN_tracktwoMVA_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU60'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+MuonTauGroup),
- ChainProp(name='HLT_mu26_ivarmedium_tau80_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU60'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+MuonTauGroup),
- ChainProp(name='HLT_mu26_ivarmedium_tau160_mediumRNN_tracktwoMVA_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU100'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+MuonTauGroup),
- ChainProp(name='HLT_mu26_ivarmedium_tau160_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU100'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+MuonTauGroup),
+ ChainProp(name='HLT_mu26_ivarmedium_tau20_mediumRNN_tracktwoMVA_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU8'], stream=[PhysicsStream], groups=TagAndProbeGroup+SingleMuonGroup),
+ ChainProp(name='HLT_mu26_ivarmedium_tau20_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU8'], stream=[PhysicsStream], groups=TagAndProbeGroup+SingleMuonGroup),
+ ChainProp(name='HLT_mu26_ivarmedium_tau25_idperf_tracktwoMVA_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU12IM'], stream=[PhysicsStream], groups=TagAndProbeGroup+SingleMuonGroup),
+ ChainProp(name='HLT_mu26_ivarmedium_tau25_idperf_tracktwoMVABDT_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU12IM'], stream=[PhysicsStream], groups=TagAndProbeGroup+SingleMuonGroup),
+ ChainProp(name='HLT_mu26_ivarmedium_tau25_perf_tracktwoMVA_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU12IM'], stream=[PhysicsStream], groups=TagAndProbeGroup+SingleMuonGroup),
+ ChainProp(name='HLT_mu26_ivarmedium_tau25_perf_tracktwoMVABDT_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU12IM'], stream=[PhysicsStream], groups=TagAndProbeGroup+SingleMuonGroup),
+ ChainProp(name='HLT_mu26_ivarmedium_tau25_mediumRNN_tracktwoMVA_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU12IM'], stream=[PhysicsStream], groups=TagAndProbeGroup+SingleMuonGroup),
+ ChainProp(name='HLT_mu26_ivarmedium_tau25_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU12IM'], stream=[PhysicsStream], groups=TagAndProbeGroup+SingleMuonGroup),
+ ChainProp(name='HLT_mu26_ivarmedium_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU20IM'], stream=[PhysicsStream], groups=TagAndProbeGroup+SingleMuonGroup),
+ ChainProp(name='HLT_mu26_ivarmedium_tau35_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU20IM'], stream=[PhysicsStream], groups=TagAndProbeGroup+SingleMuonGroup),
+ ChainProp(name='HLT_mu26_ivarmedium_tau40_mediumRNN_tracktwoMVA_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU25IM'], stream=[PhysicsStream], groups=TagAndProbeGroup+SingleMuonGroup),
+ ChainProp(name='HLT_mu26_ivarmedium_tau40_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU25IM'], stream=[PhysicsStream], groups=TagAndProbeGroup+SingleMuonGroup),
+ ChainProp(name='HLT_mu26_ivarmedium_tau60_mediumRNN_tracktwoMVA_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU40'], stream=[PhysicsStream], groups=TagAndProbeGroup+SingleMuonGroup),
+ ChainProp(name='HLT_mu26_ivarmedium_tau60_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU40'], stream=[PhysicsStream], groups=TagAndProbeGroup+SingleMuonGroup),
+ ChainProp(name='HLT_mu26_ivarmedium_tau80_mediumRNN_tracktwoMVA_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU60'], stream=[PhysicsStream], groups=TagAndProbeGroup+SingleMuonGroup),
+ ChainProp(name='HLT_mu26_ivarmedium_tau80_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU60'], stream=[PhysicsStream], groups=TagAndProbeGroup+SingleMuonGroup),
+ ChainProp(name='HLT_mu26_ivarmedium_tau160_mediumRNN_tracktwoMVA_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU100'], stream=[PhysicsStream], groups=TagAndProbeGroup+SingleMuonGroup),
+ ChainProp(name='HLT_mu26_ivarmedium_tau160_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU100'], stream=[PhysicsStream], groups=TagAndProbeGroup+SingleMuonGroup),
# mu-tag & tau-probe triggers for LLP tau (ATR-23150)
- ChainProp(name='HLT_mu26_ivarmedium_tau60_mediumRNN_tracktwoLLP_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU40'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+MuonTauGroup),
- ChainProp(name='HLT_mu26_ivarmedium_tau80_mediumRNN_tracktwoLLP_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU60'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+MuonTauGroup),
- ChainProp(name='HLT_mu26_ivarmedium_tau180_mediumRNN_tracktwoLLP_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU100'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+MuonTauGroup),
-
- ChainProp(name='HLT_e26_lhtight_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU8'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+EgammaTauGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_tau20_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU8'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+EgammaTauGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU12IM'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+EgammaTauGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU12IM'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+EgammaTauGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU20IM'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+EgammaTauGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_tau35_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU20IM'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+EgammaTauGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_tau40_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU25IM'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+EgammaTauGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_tau40_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU25IM'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+EgammaTauGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_tau60_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU40'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+EgammaTauGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_tau60_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU40'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+EgammaTauGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_tau80_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU60'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+EgammaTauGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_tau80_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU60'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+EgammaTauGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_tau160_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU100'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+EgammaTauGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_tau160_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU100'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+EgammaTauGroup),
+ ChainProp(name='HLT_mu26_ivarmedium_tau60_mediumRNN_tracktwoLLP_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU40'], stream=[PhysicsStream], groups=TagAndProbeGroup+SingleMuonGroup),
+ ChainProp(name='HLT_mu26_ivarmedium_tau80_mediumRNN_tracktwoLLP_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU60'], stream=[PhysicsStream], groups=TagAndProbeGroup+SingleMuonGroup),
+ ChainProp(name='HLT_mu26_ivarmedium_tau180_mediumRNN_tracktwoLLP_03dRAB_L1MU20', l1SeedThresholds=['MU20','TAU100'], stream=[PhysicsStream], groups=TagAndProbeGroup+SingleMuonGroup),
+
+ ChainProp(name='HLT_e26_lhtight_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU8'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_tau20_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU8'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU12IM'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU12IM'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU20IM'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_tau35_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU20IM'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_tau40_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU25IM'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_tau40_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU25IM'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_tau60_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU40'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_tau60_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU40'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_tau80_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU60'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_tau80_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU60'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_tau160_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU100'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_tau160_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU100'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+SingleElectronGroup),
# el-tag & tau-probe triggers for LLP tau (ATR-23150)
- ChainProp(name='HLT_e26_lhtight_ivarloose_tau60_mediumRNN_tracktwoLLP_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU40'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+EgammaTauGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_tau80_mediumRNN_tracktwoLLP_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU60'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+EgammaTauGroup),
- ChainProp(name='HLT_e26_lhtight_ivarloose_tau180_mediumRNN_tracktwoLLP_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU100'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+EgammaTauGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_tau60_mediumRNN_tracktwoLLP_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU40'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_tau80_mediumRNN_tracktwoLLP_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU60'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_tau180_mediumRNN_tracktwoLLP_03dRAB_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU100'], stream=[PhysicsStream], groups=TagAndProbeLegGroup+SingleElectronGroup),
# b-jet trigger calibration chains
- ChainProp(name='HLT_e26_lhtight_ivarloose_2j20_0eta290_020jvt_pf_ftf_boffperf_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], groups=TagAndProbeLegGroup+EgammaBjetGroup),
- ChainProp(name='HLT_mu26_ivarmedium_2j20_0eta290_020jvt_pf_ftf_boffperf_L1MU20', l1SeedThresholds=['MU20','FSNOSEED'], groups=TagAndProbeLegGroup+MuonBjetGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_2j20_0eta290_020jvt_pf_ftf_boffperf_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], groups=TagAndProbeLegGroup+SingleElectronGroup),
+ ChainProp(name='HLT_mu26_ivarmedium_2j20_0eta290_020jvt_pf_ftf_boffperf_L1MU20', l1SeedThresholds=['MU20','FSNOSEED'], groups=TagAndProbeGroup+SingleMuonGroup),
### Affected by ATR-23722
#ChainProp(name='HLT_e26_lhtight_ivarloose_mu22noL1_j20_0eta290_020jvt_pf_ftf_boffperf_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED','FSNOSEED'], groups=TagAndProbeLegGroup+EgammaBjetGroup),
--
GitLab
From b6bb3528e444e4b98f61f05c4b00531460acd0f5 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Thu, 24 Jun 2021 13:15:40 -0400
Subject: [PATCH 210/272] AmdcCore: Fix cppcheck warnings.
Pass strings by const reference, not by value.
---
MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcAline.h | 4 ++--
MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcBline.h | 4 ++--
MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcIline.h | 4 ++--
MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcAline.cxx | 4 ++--
MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcBline.cxx | 4 ++--
MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcIline.cxx | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcAline.h b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcAline.h
index 385968379307..7361ac32ec46 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcAline.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcAline.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef AMDCCORE_AMDCALINE_H
@@ -32,7 +32,7 @@ public:
void SuperPrint() const;
/**Set station name */
- void SetStationType(std::string StationType );
+ void SetStationType(const std::string& StationType );
/**Set jff index */
void Setjff (int jff );
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcBline.h b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcBline.h
index 6df438a603a6..8cfe165d9c12 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcBline.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcBline.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef AMDCCORE_AMDCBLINE_H
@@ -32,7 +32,7 @@ public:
void SuperPrint() const;
/**Set station name */
- void SetStationType(std::string StationType );
+ void SetStationType(const std::string& StationType );
/**Get station name Nber*/
int Getjtyp () const ;
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcIline.h b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcIline.h
index 7f0047d94183..6a6d74dd457a 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcIline.h
+++ b/MuonSpectrometer/Amdcsimrec/AmdcCore/AmdcCore/AmdcIline.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef AMDCCORE_AMDCILINE_H
@@ -32,7 +32,7 @@ public:
void SuperPrint() const;
/**Set station name */
- void SetStationType(std::string StationType );
+ void SetStationType(const std::string& StationType );
/**Set jff index */
void Setjff(int jff );
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcAline.cxx b/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcAline.cxx
index 45ec2a2e4fec..872197be510a 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcAline.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcAline.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "AmdcCore/AmdcAline.h"
@@ -97,7 +97,7 @@ void AmdcAline::SuperPrint() const
<< std::endl;
}
-void AmdcAline::SetStationType(std::string StationType){
+void AmdcAline::SetStationType(const std::string& StationType){
m_StationType = StationType;
m_StationNameChar[0]= m_StationType[0];
m_StationNameChar[1]= m_StationType[1];
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcBline.cxx b/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcBline.cxx
index 856419392e46..05c33db11e07 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcBline.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcBline.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "AmdcCore/AmdcBline.h"
@@ -120,7 +120,7 @@ void AmdcBline::SuperPrint() const
<< std::endl;
}
-void AmdcBline::SetStationType(std::string StationType){
+void AmdcBline::SetStationType(const std::string& StationType){
m_StationType = StationType;
m_StationNameChar[0]= m_StationType[0];
m_StationNameChar[1]= m_StationType[1];
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcIline.cxx b/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcIline.cxx
index 4718e1ac280a..ffb1d5acdbf3 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcIline.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcCore/src/AmdcIline.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "AmdcCore/AmdcIline.h"
@@ -102,7 +102,7 @@ void AmdcIline::SuperPrint() const
<< std::endl;
}
-void AmdcIline::SetStationType(std::string StationType){
+void AmdcIline::SetStationType(const std::string& StationType){
m_StationType = StationType;
m_StationNameChar[0]= m_StationType[0];
m_StationNameChar[1]= m_StationType[1];
--
GitLab
From efacb05c0d09e54ae074f1ebca3653df097359a7 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Fri, 18 Jun 2021 11:18:46 -0400
Subject: [PATCH 211/272] LArMonTools: Migrate from LArCablingLegacyService to
conditions data.
Use conditions data rather than the obsolete LArCablingLegacyService.
---
.../share/LArCosmicsMonTool_jobOptions.py | 3 +
.../share/LArCoverage_jobOptions.py | 4 +-
.../LArHVCorrectionMonTool_jobOptions.py | 3 +
.../share/LArRawChannelMonTool_jobOptions.py | 3 +
.../LArMonTools/src/LArCosmicsMonTool.cxx | 9 +--
.../LArMonTools/src/LArCosmicsMonTool.h | 6 +-
.../LArMonTools/src/LArCoverage.cxx | 70 ++++++++++---------
LArCalorimeter/LArMonTools/src/LArCoverage.h | 11 +--
.../src/LArHVCorrectionMonTool.cxx | 9 ++-
.../LArMonTools/src/LArHVCorrectionMonTool.h | 6 +-
.../LArMonTools/src/LArRawChannelMonTool.cxx | 9 +--
.../LArMonTools/src/LArRawChannelMonTool.h | 5 +-
12 files changed, 77 insertions(+), 61 deletions(-)
diff --git a/LArCalorimeter/LArMonTools/share/LArCosmicsMonTool_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArCosmicsMonTool_jobOptions.py
index 74ec45ca124b..30358bd4a0b6 100755
--- a/LArCalorimeter/LArMonTools/share/LArCosmicsMonTool_jobOptions.py
+++ b/LArCalorimeter/LArMonTools/share/LArCosmicsMonTool_jobOptions.py
@@ -2,6 +2,9 @@
if 'EventBlockSize' not in dir():
EventBlockSize=0
+from LArCabling.LArCablingAccess import LArOnOffIdMapping
+LArOnOffIdMapping()
+
###### Cosmic Tool Configuration ###############
from LArMonTools.LArMonToolsConf import LArCosmicsMonTool
theLArCosmicsMonTool = LArCosmicsMonTool(name="LArCosmicsMonTool",
diff --git a/LArCalorimeter/LArMonTools/share/LArCoverage_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArCoverage_jobOptions.py
index 93008b54f661..3fe48c409979 100755
--- a/LArCalorimeter/LArMonTools/share/LArCoverage_jobOptions.py
+++ b/LArCalorimeter/LArMonTools/share/LArCoverage_jobOptions.py
@@ -2,10 +2,12 @@
if 'EventBlockSize' not in dir():
EventBlockSize=0
-
from CaloTools.CaloNoiseCondAlg import CaloNoiseCondAlg
CaloNoiseCondAlg(noisetype="electronicNoise")
+from LArCabling.LArCablingAccess import LArOnOffIdMapping
+LArOnOffIdMapping()
+
###### LAr Coverage Tool Configuration ###############
from LArMonTools.LArMonToolsConf import LArCoverage
theLArCoverage = LArCoverage(name="LArCoverage",
diff --git a/LArCalorimeter/LArMonTools/share/LArHVCorrectionMonTool_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArHVCorrectionMonTool_jobOptions.py
index 1091d35d2cdc..a83529d70267 100644
--- a/LArCalorimeter/LArMonTools/share/LArHVCorrectionMonTool_jobOptions.py
+++ b/LArCalorimeter/LArMonTools/share/LArHVCorrectionMonTool_jobOptions.py
@@ -2,6 +2,9 @@
if 'EventBlockSize' not in dir():
EventBlockSize=0
+from LArCabling.LArCablingAccess import LArOnOffIdMapping
+LArOnOffIdMapping()
+
###### LAr HV Correction Tool Configuration ###############
from LArMonTools.LArMonToolsConf import LArHVCorrectionMonTool
theLArHVCorrectionMonTool = LArHVCorrectionMonTool(name="LArHVCorrectionMonTool",
diff --git a/LArCalorimeter/LArMonTools/share/LArRawChannelMonTool_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArRawChannelMonTool_jobOptions.py
index bd95a9e3780a..316f5c09f865 100755
--- a/LArCalorimeter/LArMonTools/share/LArRawChannelMonTool_jobOptions.py
+++ b/LArCalorimeter/LArMonTools/share/LArRawChannelMonTool_jobOptions.py
@@ -5,6 +5,9 @@ from AthenaMonitoring.AtlasReadyFilterTool import GetAtlasReadyFilterTool
from CaloTools.CaloNoiseCondAlg import CaloNoiseCondAlg
CaloNoiseCondAlg ('totalNoise')
+from LArCabling.LArCablingAccess import LArOnOffIdMapping
+LArOnOffIdMapping()
+
# ---- Local Variables ----
# ---specify trigger tool and trigger chain here
diff --git a/LArCalorimeter/LArMonTools/src/LArCosmicsMonTool.cxx b/LArCalorimeter/LArMonTools/src/LArCosmicsMonTool.cxx
index 457d2987339d..f5e8ca1314ee 100644
--- a/LArCalorimeter/LArMonTools/src/LArCosmicsMonTool.cxx
+++ b/LArCalorimeter/LArMonTools/src/LArCosmicsMonTool.cxx
@@ -46,7 +46,6 @@ LArCosmicsMonTool::LArCosmicsMonTool(const std::string& type,
const IInterface* parent)
: ManagedMonitorToolBase(type, name, parent),
m_rootStore(nullptr),
- m_larCablingService("LArCablingLegacyService"),
m_newrun(true)
{
declareProperty("LArDigitContainerKey", m_LArDigitContainerKey = "FREE");
@@ -109,9 +108,9 @@ LArCosmicsMonTool::initialize()
ATH_CHECK(m_bcContKey.initialize());
ATH_CHECK(m_bcMask.buildBitMask(m_problemsToMask,msg()));
- ATH_CHECK( m_larCablingService.retrieve() );
ATH_CHECK( this->initMonInfo() );
ATH_CHECK( m_larPedestalKey.initialize() );
+ ATH_CHECK( m_cablingKey.initialize() );
// End Initialize
ManagedMonitorToolBase::initialize().ignore();
@@ -246,6 +245,8 @@ LArCosmicsMonTool::fillHistograms() {
SG::ReadCondHandle<LArBadChannelCont> bcContHdl{m_bcContKey,ctx};
const LArBadChannelCont* bcCont{*bcContHdl};
+ SG::ReadCondHandle<LArOnOffIdMapping> cabling (m_cablingKey, ctx);
+
// loop over LArDigits
LArDigitContainer::const_iterator itDig = pLArDigitContainer->begin();
LArDigitContainer::const_iterator itDig_e= pLArDigitContainer->end();
@@ -253,10 +254,10 @@ LArCosmicsMonTool::fillHistograms() {
for ( ; itDig!=itDig_e;++itDig) {
pLArDigit = *itDig;
HWIdentifier id = pLArDigit->hardwareID();
- Identifier offlineID = m_larCablingService->cnvToIdentifier(id);
+ Identifier offlineID = cabling->cnvToIdentifier(id);
// Skip disconnected channels
- if(!m_larCablingService->isOnlineConnected(id)) continue;
+ if(!cabling->isOnlineConnected(id)) continue;
// Get Physical Coordinates
float eta = 0; float phi = 0;
diff --git a/LArCalorimeter/LArMonTools/src/LArCosmicsMonTool.h b/LArCalorimeter/LArMonTools/src/LArCosmicsMonTool.h
index a12e5123b150..86919959e581 100644
--- a/LArCalorimeter/LArMonTools/src/LArCosmicsMonTool.h
+++ b/LArCalorimeter/LArMonTools/src/LArCosmicsMonTool.h
@@ -25,7 +25,7 @@
#include "LArRawEvent/LArDigitContainer.h"
#include "LArRawEvent/LArRawChannel.h"
#include "LArRawEvent/LArRawChannelContainer.h"
-#include "LArCabling/LArCablingLegacyService.h"
+#include "LArCabling/LArOnOffIdMapping.h"
#include "LArIdentifier/LArOnlineID.h"
#include "LArRecConditions/LArBadChannelMask.h"
#include "LArRecConditions/LArBadChannelCont.h"
@@ -92,8 +92,6 @@ class LArCosmicsMonTool: public ManagedMonitorToolBase
//LArOnlineIDStrHelper* m_strHelper;
ITHistSvc* m_rootStore;
- /** Handle to LArCablingService */
- ToolHandle<LArCablingLegacyService> m_larCablingService;
/** Handle to bad-channel mask */
LArBadChannelMask m_bcMask;
SG::ReadCondHandleKey<LArBadChannelCont> m_bcContKey {this, "BadChanKey", "LArBadChannel", "SG key for LArBadChan object"};
@@ -108,6 +106,8 @@ class LArCosmicsMonTool: public ManagedMonitorToolBase
std::string m_LArDigitContainerKey;
SG::ReadCondHandleKey<ILArPedestal> m_larPedestalKey
{ this, "LArPedestalKey", "Pedestal", "" };
+ SG::ReadCondHandleKey<LArOnOffIdMapping> m_cablingKey
+ {this,"CablingKey","LArOnOffIdMap","SG Key of LArOnOffIdMapping object"};
std::string m_channelKey;
float m_muonADCthreshold_EM_barrel;
float m_muonADCthreshold_EM_endcap;
diff --git a/LArCalorimeter/LArMonTools/src/LArCoverage.cxx b/LArCalorimeter/LArMonTools/src/LArCoverage.cxx
index bb920032ad20..4322079398cb 100644
--- a/LArCalorimeter/LArMonTools/src/LArCoverage.cxx
+++ b/LArCalorimeter/LArMonTools/src/LArCoverage.cxx
@@ -44,7 +44,6 @@ LArCoverage::LArCoverage(const std::string& type,
const std::string& name,
const IInterface* parent)
: ManagedMonitorToolBase(type, name, parent),
- m_larCablingService("LArCablingLegacyService"),
m_hCoverageEMBA(),
m_hCoverageEMBC(),
m_hCoverageEMECA(),
@@ -101,7 +100,6 @@ LArCoverage::initialize()
ATH_CHECK( m_BCKey.initialize() );
ATH_CHECK( m_BFKey.initialize() );
ATH_CHECK( m_bcMask.buildBitMask(m_problemsToMask,msg()));
- ATH_CHECK( m_larCablingService.retrieve() );
// LArOnlineIDStrHelper
m_strHelper = std::make_unique<LArOnlineIDStrHelper>(m_LArOnlineIDHelper);
@@ -109,6 +107,7 @@ LArCoverage::initialize()
ATH_CHECK( m_EventInfoKey.initialize() );
ATH_CHECK( m_noiseCDOKey.initialize() );
+ ATH_CHECK( m_cablingKey.initialize() );
ATH_CHECK( m_rawChannelsKey.initialize() );
// End Initialize
ManagedMonitorToolBase::initialize().ignore();
@@ -543,6 +542,8 @@ LArCoverage::fillHistograms()
{
ATH_MSG_DEBUG( "in fillHists()" );
+ const EventContext& ctx = Gaudi::Hive::currentContext();
+
m_eventsCounter++;
if(m_eventsCounter > m_nevents ) return StatusCode::SUCCESS;
@@ -552,7 +553,7 @@ LArCoverage::fillHistograms()
// Retrieve Raw Channels Container
- SG::ReadHandle<LArRawChannelContainer> pRawChannelsContainer(m_rawChannelsKey);
+ SG::ReadHandle<LArRawChannelContainer> pRawChannelsContainer(m_rawChannelsKey, ctx);
if(!pRawChannelsContainer.isValid()) {
ATH_MSG_ERROR( " Can not retrieve LArRawChannelContainer: "
<< m_rawChannelsKey.key() );
@@ -560,21 +561,23 @@ LArCoverage::fillHistograms()
}
- SG::ReadCondHandle<LArBadChannelCont> bch{m_BCKey};
+ SG::ReadCondHandle<LArBadChannelCont> bch{m_BCKey, ctx};
const LArBadChannelCont* bcCont{*bch};
- SG::ReadCondHandle<CaloNoise> noiseHdl{m_noiseCDOKey};
+ SG::ReadCondHandle<CaloNoise> noiseHdl{m_noiseCDOKey, ctx};
const CaloNoise* noiseCDO=*noiseHdl;
+ SG::ReadCondHandle<LArOnOffIdMapping> cabling (m_cablingKey, ctx);
+
for (const LArRawChannel& pRawChannel : *pRawChannelsContainer) {
int provenanceChan = pRawChannel.provenance();
float energyChan = pRawChannel.energy();
HWIdentifier id = pRawChannel.hardwareID();
//CaloGain::CaloGain gain = pRawChannel->gain();
- Identifier offlineID = m_larCablingService->cnvToIdentifier(id);
+ Identifier offlineID = cabling->cnvToIdentifier(id);
// Skip disconnected channels
- if(!m_larCablingService->isOnlineConnected(id)) continue;
+ if(!cabling->isOnlineConnected(id)) continue;
// Get ft/slot info
HWIdentifier febID = m_LArOnlineIDHelper->feb_Id(id);
@@ -617,7 +620,7 @@ LArCoverage::fillHistograms()
}
// Fill Bad Channels histograms
- int flag = DBflag(id);
+ int flag = DBflag(ctx, id);
if (flag==0) continue;
// A-Side
@@ -760,7 +763,7 @@ LArCoverage::fillHistograms()
// Fill known missing FEBs with -1
//
- FillKnownMissingFEBs(ddman);
+ FillKnownMissingFEBs(ctx, ddman);
//
// Fix for Cosmetic : Fill "empty bins" in plots
@@ -783,9 +786,9 @@ StatusCode LArCoverage::procHistograms()
}
/*---------------------------------------------------------*/
-int LArCoverage::DBflag(HWIdentifier onID){
+int LArCoverage::DBflag(const EventContext& ctx, HWIdentifier onID){
- SG::ReadCondHandle<LArBadChannelCont> bch{m_BCKey};
+ SG::ReadCondHandle<LArBadChannelCont> bch{m_BCKey, ctx};
const LArBadChannelCont* bcCont{*bch};
if(!bcCont) {
ATH_MSG_WARNING( "Do not have Bad chan container " << m_BCKey.key() );
@@ -826,14 +829,13 @@ void LArCoverage::SetBadChannelZaxisLabels(TH2I_LW* h){
h->SetMaximum(10.);
}
/*---------------------------------------------------------*/
-void LArCoverage::FillKnownMissingFEBs(const CaloDetDescrManager* caloDetDescrMgr){
+void LArCoverage::FillKnownMissingFEBs(const EventContext& ctx,
+ const CaloDetDescrManager* caloDetDescrMgr){
+
+ SG::ReadCondHandle<LArBadFebCont> mfCont{m_BFKey, ctx};
+
+ SG::ReadCondHandle<LArOnOffIdMapping> cabling (m_cablingKey, ctx);
- SG::ReadCondHandle<LArBadFebCont> bf{m_BFKey};
- const LArBadFebCont* mfCont{*bf};
- if(!mfCont) {
- ATH_MSG_WARNING( "Do not have Missing FEBs container !!" );
- return ;
- }
// Loop over all FEBs
for (std::vector<HWIdentifier>::const_iterator allFeb = m_LArOnlineIDHelper->feb_begin();
allFeb != m_LArOnlineIDHelper->feb_end(); ++allFeb) {
@@ -864,10 +866,10 @@ void LArCoverage::FillKnownMissingFEBs(const CaloDetDescrManager* caloDetDescrMg
for (int ichan=0;ichan<128;ichan++){
HWIdentifier chid = m_LArOnlineIDHelper->channel_Id(febid,ichan);
// Skip disconnected channels
- if(!m_larCablingService->isOnlineConnected(chid)) continue;
+ if(!cabling->isOnlineConnected(chid)) continue;
m_hCoverageHWEMBA->SetBinContent(ft*14+slot,ichan+1,replace);
- Identifier offid = m_larCablingService->cnvToIdentifier(chid);
+ Identifier offid = cabling->cnvToIdentifier(chid);
int sampling = m_LArEM_IDHelper->sampling(offid);
float eta, phi;
const CaloDetDescrElement* caloDetElement = caloDetDescrMgr->get_element(offid);
@@ -896,10 +898,10 @@ void LArCoverage::FillKnownMissingFEBs(const CaloDetDescrManager* caloDetDescrMg
for (int ichan=0;ichan<128;ichan++){
HWIdentifier chid = m_LArOnlineIDHelper->channel_Id(febid,ichan);
// Skip disconnected channels
- if(!m_larCablingService->isOnlineConnected(chid)) continue;
+ if(!cabling->isOnlineConnected(chid)) continue;
m_hCoverageHWEMBC->SetBinContent(ft*14+slot,ichan+1,replace);
- Identifier offid = m_larCablingService->cnvToIdentifier(chid);
+ Identifier offid = cabling->cnvToIdentifier(chid);
int sampling = m_LArEM_IDHelper->sampling(offid);
float eta, phi;
const CaloDetDescrElement* caloDetElement = caloDetDescrMgr->get_element(offid);
@@ -933,10 +935,10 @@ void LArCoverage::FillKnownMissingFEBs(const CaloDetDescrManager* caloDetDescrMg
for (int ichan=0;ichan<128;ichan++){
HWIdentifier chid = m_LArOnlineIDHelper->channel_Id(febid,ichan);
// Skip disconnected channels
- if(!m_larCablingService->isOnlineConnected(chid)) continue;
+ if(!cabling->isOnlineConnected(chid)) continue;
m_hCoverageHWEMECA->SetBinContent(ft*15+slot,ichan+1,replace);
- Identifier offid = m_larCablingService->cnvToIdentifier(chid);
+ Identifier offid = cabling->cnvToIdentifier(chid);
int sampling = m_LArEM_IDHelper->sampling(offid);
float eta, phi;
const CaloDetDescrElement* caloDetElement = caloDetDescrMgr->get_element(offid);
@@ -965,10 +967,10 @@ void LArCoverage::FillKnownMissingFEBs(const CaloDetDescrManager* caloDetDescrMg
for (int ichan=0;ichan<128;ichan++){
HWIdentifier chid = m_LArOnlineIDHelper->channel_Id(febid,ichan);
// Skip disconnected channels
- if(!m_larCablingService->isOnlineConnected(chid)) continue;
+ if(!cabling->isOnlineConnected(chid)) continue;
m_hCoverageHWHECA->SetBinContent(ft*15+slot,ichan+1,replace);
- Identifier offid = m_larCablingService->cnvToIdentifier(chid);
+ Identifier offid = cabling->cnvToIdentifier(chid);
int sampling = m_LArHEC_IDHelper->sampling(offid);
float eta, phi;
const CaloDetDescrElement* caloDetElement = caloDetDescrMgr->get_element(offid);
@@ -997,10 +999,10 @@ void LArCoverage::FillKnownMissingFEBs(const CaloDetDescrManager* caloDetDescrMg
for (int ichan=0;ichan<128;ichan++){
HWIdentifier chid = m_LArOnlineIDHelper->channel_Id(febid,ichan);
// Skip disconnected channels
- if(!m_larCablingService->isOnlineConnected(chid)) continue;
+ if(!cabling->isOnlineConnected(chid)) continue;
m_hCoverageHWFCALA->SetBinContent(ft*15+slot,ichan+1,replace);
- Identifier offid = m_larCablingService->cnvToIdentifier(chid);
+ Identifier offid = cabling->cnvToIdentifier(chid);
int sampling = m_LArFCAL_IDHelper->module(offid);
int ieta = m_LArFCAL_IDHelper->eta(offid);
int iphi = m_LArFCAL_IDHelper->phi(offid);
@@ -1031,10 +1033,10 @@ void LArCoverage::FillKnownMissingFEBs(const CaloDetDescrManager* caloDetDescrMg
for (int ichan=0;ichan<128;ichan++){
HWIdentifier chid = m_LArOnlineIDHelper->channel_Id(febid,ichan);
// Skip disconnected channels
- if(!m_larCablingService->isOnlineConnected(chid)) continue;
+ if(!cabling->isOnlineConnected(chid)) continue;
m_hCoverageHWEMECC->SetBinContent(ft*15+slot,ichan+1,replace);
- Identifier offid = m_larCablingService->cnvToIdentifier(chid);
+ Identifier offid = cabling->cnvToIdentifier(chid);
int sampling = m_LArEM_IDHelper->sampling(offid);
float eta, phi;
const CaloDetDescrElement* caloDetElement = caloDetDescrMgr->get_element(offid);
@@ -1063,10 +1065,10 @@ void LArCoverage::FillKnownMissingFEBs(const CaloDetDescrManager* caloDetDescrMg
for (int ichan=0;ichan<128;ichan++){
HWIdentifier chid = m_LArOnlineIDHelper->channel_Id(febid,ichan);
// Skip disconnected channels
- if(!m_larCablingService->isOnlineConnected(chid)) continue;
+ if(!cabling->isOnlineConnected(chid)) continue;
m_hCoverageHWHECC->SetBinContent(ft*15+slot,ichan+1,replace);
- Identifier offid = m_larCablingService->cnvToIdentifier(chid);
+ Identifier offid = cabling->cnvToIdentifier(chid);
int sampling = m_LArHEC_IDHelper->sampling(offid);
float eta, phi;
const CaloDetDescrElement* caloDetElement = caloDetDescrMgr->get_element(offid);
@@ -1095,10 +1097,10 @@ void LArCoverage::FillKnownMissingFEBs(const CaloDetDescrManager* caloDetDescrMg
for (int ichan=0;ichan<128;ichan++){
HWIdentifier chid = m_LArOnlineIDHelper->channel_Id(febid,ichan);
// Skip disconnected channels
- if(!m_larCablingService->isOnlineConnected(chid)) continue;
+ if(!cabling->isOnlineConnected(chid)) continue;
m_hCoverageHWFCALC->SetBinContent(ft*15+slot,ichan+1,replace);
- Identifier offid = m_larCablingService->cnvToIdentifier(chid);
+ Identifier offid = cabling->cnvToIdentifier(chid);
int sampling = m_LArFCAL_IDHelper->module(offid);
int ieta = m_LArFCAL_IDHelper->eta(offid);
int iphi = m_LArFCAL_IDHelper->phi(offid);
diff --git a/LArCalorimeter/LArMonTools/src/LArCoverage.h b/LArCalorimeter/LArMonTools/src/LArCoverage.h
index e379c29d3c14..802b39da0077 100644
--- a/LArCalorimeter/LArMonTools/src/LArCoverage.h
+++ b/LArCalorimeter/LArMonTools/src/LArCoverage.h
@@ -26,7 +26,7 @@
#include "Identifier/HWIdentifier.h"
#include "LArIdentifier/LArOnlineID.h"
#include "LArRawEvent/LArRawChannelContainer.h"
-#include "LArCabling/LArCablingLegacyService.h"
+#include "LArCabling/LArOnOffIdMapping.h"
#include "LArRecConditions/LArBadChannelMask.h"
#include "LArRecConditions/LArBadChannelCont.h"
#include "StoreGate/ReadCondHandleKey.h"
@@ -83,8 +83,6 @@ private:
std::unique_ptr<LArOnlineIDStrHelper> m_strHelper;
ITHistSvc* m_rootStore;
- /** Handle to LArCablingService */
- ToolHandle<LArCablingLegacyService> m_larCablingService;
/** Handle to bad-channel tools */
LArBadChannelMask m_bcMask;
Gaudi::Property<std::vector<std::string> > m_problemsToMask{this,"ProblemsToMask",{}, "Bad-Channel categories to mask"};
@@ -94,9 +92,11 @@ private:
SG::ReadCondHandleKey<LArBadChannelCont> m_BCKey{this, "BadChanKey", "LArBadChannel", "SG bad channels key"};
SG::ReadCondHandleKey<LArBadFebCont> m_BFKey{this, "MFKey", "LArBadFeb", "SG missing FEBs key"};
SG::ReadCondHandleKey<CaloNoise> m_noiseCDOKey{this,"CaloNoiseKey","electronicNoise","SG Key of CaloNoise data object"};
+ SG::ReadCondHandleKey<LArOnOffIdMapping> m_cablingKey
+ {this,"CablingKey","LArOnOffIdMap","SG Key of LArOnOffIdMapping object"};
// To retrieve bad channel DB keywords
- int DBflag(HWIdentifier onID);
+ int DBflag(const EventContext& ctx, HWIdentifier onID);
// To set histos Style
static void SetHWCoverageStyle(TH2I_LW* h);
@@ -104,7 +104,8 @@ private:
static void SetBadChannelZaxisLabels(TH2I_LW* h);
// To keep track of known disabled FEBs
- void FillKnownMissingFEBs(const CaloDetDescrManager* caloDetDescrMgr);
+ void FillKnownMissingFEBs(const EventContext& ctx,
+ const CaloDetDescrManager* caloDetDescrMgr);
// To fix empty bins in histos with variable bin size
void FixEmptyBins();
diff --git a/LArCalorimeter/LArMonTools/src/LArHVCorrectionMonTool.cxx b/LArCalorimeter/LArMonTools/src/LArHVCorrectionMonTool.cxx
index a0677329a523..5bdf6105221b 100644
--- a/LArCalorimeter/LArMonTools/src/LArHVCorrectionMonTool.cxx
+++ b/LArCalorimeter/LArMonTools/src/LArHVCorrectionMonTool.cxx
@@ -44,7 +44,6 @@ LArHVCorrectionMonTool::LArHVCorrectionMonTool(const std::string& type,
m_LArHEC_IDHelper(nullptr),
m_caloIdMgr(nullptr),
m_rootStore(nullptr),
- m_larCablingService("LArCablingLegacyService"),
m_eventsCounter(0)
{
declareProperty("ErrorThreshold",m_threshold=0.02);
@@ -86,10 +85,9 @@ StatusCode LArHVCorrectionMonTool::initialize()
m_LArHEC_IDHelper = idHelper->hec_idHelper();
m_LArFCAL_IDHelper = idHelper->fcal_idHelper();
- ATH_CHECK( m_larCablingService.retrieve() );
-
ATH_CHECK( m_scaleCorrKey.initialize() );
ATH_CHECK( m_onlineScaleCorrKey.initialize() );
+ ATH_CHECK( m_cablingKey.initialize() );
ATH_CHECK( m_channelKey.initialize() );
@@ -260,6 +258,7 @@ LArHVCorrectionMonTool::fillHistograms()
SG::ReadCondHandle<ILArHVScaleCorr> scaleCorr (m_scaleCorrKey, ctx);
SG::ReadCondHandle<ILArHVScaleCorr> onlineScaleCorr (m_onlineScaleCorrKey, ctx);
+ SG::ReadCondHandle<LArOnOffIdMapping> cabling (m_cablingKey, ctx);
// Loop over LArRawChannels
//SelectAllLArRawChannels AllRaw(pRawChannelsContainer);
@@ -270,10 +269,10 @@ LArHVCorrectionMonTool::fillHistograms()
for (const LArRawChannel& rawChannel : *pRawChannelsContainer) {
HWIdentifier id = rawChannel.hardwareID();
//CaloGain::CaloGain gain = pRawChannel->gain();
- Identifier offlineID = m_larCablingService->cnvToIdentifier(id);
+ Identifier offlineID = cabling->cnvToIdentifier(id);
// Skip disconnected channels
- if(!m_larCablingService->isOnlineConnected(id)) continue;
+ if(!cabling->isOnlineConnected(id)) continue;
// Get Physical Coordinates
float etaChan = 0; float phiChan = 0.;
diff --git a/LArCalorimeter/LArMonTools/src/LArHVCorrectionMonTool.h b/LArCalorimeter/LArMonTools/src/LArHVCorrectionMonTool.h
index 7e3e8376f686..bd62b835ab6d 100644
--- a/LArCalorimeter/LArMonTools/src/LArHVCorrectionMonTool.h
+++ b/LArCalorimeter/LArMonTools/src/LArHVCorrectionMonTool.h
@@ -28,7 +28,7 @@
#include "LArRawEvent/LArRawChannel.h"
#include "LArRawEvent/LArRawChannelContainer.h"
#include "EventContainers/SelectAllObject.h"
-#include "LArCabling/LArCablingLegacyService.h"
+#include "LArCabling/LArOnOffIdMapping.h"
#include "LArElecCalib/ILArHVScaleCorr.h"
#include <string>
@@ -82,13 +82,13 @@ class LArHVCorrectionMonTool: public ManagedMonitorToolBase
std::unique_ptr<LArOnlineIDStrHelper> m_strHelper;
ITHistSvc* m_rootStore;
- /** Handle to LArCablingService */
- ToolHandle<LArCablingLegacyService> m_larCablingService;
SG::ReadCondHandleKey<ILArHVScaleCorr> m_scaleCorrKey
{ this, "LArHVScaleCorr", "LArHVScaleCorrRecomputed", "" };
SG::ReadCondHandleKey<ILArHVScaleCorr> m_onlineScaleCorrKey
{ this, "OnlineLArHVScaleCorr", "LArHVScaleCorr", "" };
+ SG::ReadCondHandleKey<LArOnOffIdMapping> m_cablingKey
+ {this,"CablingKey","LArOnOffIdMap","SG Key of LArOnOffIdMapping object"};
private:
diff --git a/LArCalorimeter/LArMonTools/src/LArRawChannelMonTool.cxx b/LArCalorimeter/LArMonTools/src/LArRawChannelMonTool.cxx
index 3951ea7ecf3c..0302f53365b9 100644
--- a/LArCalorimeter/LArMonTools/src/LArRawChannelMonTool.cxx
+++ b/LArCalorimeter/LArMonTools/src/LArRawChannelMonTool.cxx
@@ -99,7 +99,6 @@ LArRawChannelMonTool::LArRawChannelMonTool( const std::string & type,
, m_n_lumi_blocks( 1500 )
, m_lar_online_id_ptr ( nullptr )
, m_calo_id_mgr_ptr( nullptr )
- , m_cable_service_tool ( "LArCablingLegacyService" )
, m_filterAtlasReady_tools (this)
, m_atlas_ready( false )
, m_lar_online_id_str_helper_ptr ( nullptr )
@@ -174,7 +173,6 @@ StatusCode LArRawChannelMonTool::initialize()
ATH_CHECK( detStore()->retrieve( m_lar_online_id_ptr, "LArOnlineID" ) );
ATH_CHECK( detStore()->retrieve( m_calo_id_mgr_ptr ) );
- ATH_CHECK( m_cable_service_tool.retrieve() );
ATH_CHECK( m_bcContKey.initialize());
ATH_CHECK( m_bcMask.buildBitMask(m_problemsToMask,msg()));
@@ -182,6 +180,7 @@ StatusCode LArRawChannelMonTool::initialize()
ATH_CHECK( m_filterAtlasReady_tools.retrieve() );
ATH_CHECK( m_noiseKey.initialize() );
+ ATH_CHECK( m_cablingKey.initialize() );
// ---
// Get Michel's LArOnlineIDStrHelper: All names are Expert view
@@ -1366,9 +1365,11 @@ StatusCode LArRawChannelMonTool::fillHistograms()
SG::ReadCondHandle<CaloNoise> noiseH (m_noiseKey, ctx);
- SG::ReadCondHandle<LArBadChannelCont> bcContHdl{m_bcContKey};
+ SG::ReadCondHandle<LArBadChannelCont> bcContHdl (m_bcContKey, ctx);
const LArBadChannelCont* bcCont={*bcContHdl};
+ SG::ReadCondHandle<LArOnOffIdMapping> cabling (m_cablingKey, ctx);
+
// --- Loop over RawChannels ---
for( const LArRawChannel &chan : *raw_channels ){
@@ -1393,7 +1394,7 @@ StatusCode LArRawChannelMonTool::fillHistograms()
try {
- offline_id = m_cable_service_tool->cnvToIdentifier( hardware_id );
+ offline_id = cabling->cnvToIdentifier( hardware_id );
calo_element_ptr = ddman->get_element( offline_id );
// --- skip unconnected channels ---
diff --git a/LArCalorimeter/LArMonTools/src/LArRawChannelMonTool.h b/LArCalorimeter/LArMonTools/src/LArRawChannelMonTool.h
index a972a801c6f8..017e8747a858 100644
--- a/LArCalorimeter/LArMonTools/src/LArRawChannelMonTool.h
+++ b/LArCalorimeter/LArMonTools/src/LArRawChannelMonTool.h
@@ -17,7 +17,7 @@
#include "AthenaMonitoring/DQAtlasReadyFilterTool.h"
//#include "AthenaMonitoring/IDQFilterTool.h"
#include "CaloIdentifier/CaloIdManager.h"
-#include "LArCabling/LArCablingLegacyService.h"
+#include "LArCabling/LArOnOffIdMapping.h"
#include "LArRecConditions/LArBadChannelMask.h"
#include "LArRecConditions/LArBadChannelCont.h"
#include "LArRawEvent/LArRawChannelContainer.h"
@@ -148,7 +148,6 @@ class LArRawChannelMonTool: public ManagedMonitorToolBase
const LArOnlineID *m_lar_online_id_ptr; //!< LAr online structure
const CaloIdManager *m_calo_id_mgr_ptr; //!< offline calo structure
- ToolHandle<LArCablingLegacyService> m_cable_service_tool;//!< LAr connections
/** Handle to bad-channel mask */
LArBadChannelMask m_bcMask;
@@ -157,6 +156,8 @@ class LArRawChannelMonTool: public ManagedMonitorToolBase
SG::ReadCondHandleKey<CaloNoise> m_noiseKey
{ this, "NoiseKey", "totalNoise", "SG key for noise" };
+ SG::ReadCondHandleKey<LArOnOffIdMapping> m_cablingKey
+ {this,"CablingKey","LArOnOffIdMap","SG Key of LArOnOffIdMapping object"};
// -- for ATLAS Ready Filter
bool isATLASReady() { return m_atlas_ready; }
--
GitLab
From 5192b4eadd5cc7141262aae1fe31436c95847d33 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Mon, 21 Jun 2021 10:28:33 -0400
Subject: [PATCH 212/272] TBCnv: Remove references to LArCablingLegacyService.
Migrate from using the obsolete LArCablingLegacyService to conditions data.
---
TestBeam/TBCnv/CMakeLists.txt | 4 ++--
TestBeam/TBCnv/TBCnv/ReadTBLArDigits.h | 14 ++++++++------
TestBeam/TBCnv/TBCnv/TBByteStreamCnvTool.h | 7 ++++---
.../share/TBH6ByteStream-Monitor-EventStorage.py | 3 +++
.../TBCnv/share/TBReadH6BS_Calib_jobOptions.py | 3 +++
.../share/TBReadH6BS_EventStorage_jobOptions.py | 2 ++
.../share/TBReadH8BS_EventStorage_jobOptions.py | 2 ++
TestBeam/TBCnv/src/ReadTBLArDigits.cxx | 16 +++++++++++-----
TestBeam/TBCnv/src/TBByteStreamCnvTool.cxx | 16 +++++++++-------
9 files changed, 44 insertions(+), 23 deletions(-)
diff --git a/TestBeam/TBCnv/CMakeLists.txt b/TestBeam/TBCnv/CMakeLists.txt
index c6303a417849..fcb239975a98 100644
--- a/TestBeam/TBCnv/CMakeLists.txt
+++ b/TestBeam/TBCnv/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TBCnv )
@@ -13,7 +13,7 @@ atlas_add_library( TBCnvLib
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} CaloIdentifier AthenaBaseComps
ByteStreamData EventInfo GaudiKernel LArIdentifier TBEvent
- ByteStreamCnvSvcLib ByteStreamCnvSvcBaseLib LArCablingLib
+ ByteStreamCnvSvcLib ByteStreamCnvSvcBaseLib LArCablingLib LArRecConditions
PRIVATE_LINK_LIBRARIES Identifier LArRawEvent StoreGateLib )
atlas_add_component( TBCnv
diff --git a/TestBeam/TBCnv/TBCnv/ReadTBLArDigits.h b/TestBeam/TBCnv/TBCnv/ReadTBLArDigits.h
index bedbaef0fb5e..5af73b878e9f 100644
--- a/TestBeam/TBCnv/TBCnv/ReadTBLArDigits.h
+++ b/TestBeam/TBCnv/TBCnv/ReadTBLArDigits.h
@@ -1,7 +1,7 @@
//Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
@@ -10,7 +10,7 @@
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/MsgStream.h"
#include "TBEvent/TBLArDigitContainer.h"
-#include "LArCabling/LArCablingLegacyService.h"
+#include "LArCabling/LArOnOffIdMapping.h"
#include "CaloIdentifier/LArEM_ID.h"
#include "CaloIdentifier/LArFCAL_ID.h"
#include "CaloIdentifier/LArHEC_ID.h"
@@ -20,6 +20,7 @@
//#include "LArDetDescr/LArDetDescrManager.h"
#include <fstream>
#include "LArIdentifier/LArOnlineID.h"
+#include "StoreGate/ReadCondHandleKey.h"
class ReadTBLArDigits : public AthAlgorithm
{
@@ -29,13 +30,14 @@ class ReadTBLArDigits : public AthAlgorithm
~ReadTBLArDigits();
//standart algorithm methods
- StatusCode initialize();
- StatusCode execute();
- StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode execute() override;
+ virtual StatusCode finalize() override;
private:
int m_count;
- LArCablingLegacyService *m_larCablingSvc;
+ SG::ReadCondHandleKey<LArOnOffIdMapping> m_cablingKey
+ {this,"CablingKey","LArOnOffIdMap","SG Key of LArOnOffIdMapping object"};
const LArEM_ID* m_emId;
const LArFCAL_ID* m_fcalId;
const LArHEC_ID* m_hecId;
diff --git a/TestBeam/TBCnv/TBCnv/TBByteStreamCnvTool.h b/TestBeam/TBCnv/TBCnv/TBByteStreamCnvTool.h
index 4ce1056c61a0..630a3228d46d 100644
--- a/TestBeam/TBCnv/TBCnv/TBByteStreamCnvTool.h
+++ b/TestBeam/TBCnv/TBCnv/TBByteStreamCnvTool.h
@@ -27,7 +27,7 @@
#include "TBEvent/TBEventInfo.h"
#include "TBEvent/TBLArDigitContainer.h"
#include "TBEvent/TBLArCalibDigitContainer.h"
-#include "LArCabling/LArCablingLegacyService.h"
+#include "LArRecConditions/LArCalibLineMapping.h"
#include "CaloIdentifier/CaloGain.h"
@@ -120,8 +120,9 @@ private:
}else return false;
}
- LArCablingLegacyService *m_larCablingSvc;
-
+ SG::ReadCondHandleKey<LArCalibLineMapping> m_CLKey
+ {this, "CalibLineKey", "LArCalibLineMap", "SG calib line key"};
+
// pointers to raw objects :
TBTDC * m_tbtdc;
TBTDCRawCont* m_tdcrawCont;
diff --git a/TestBeam/TBCnv/share/TBH6ByteStream-Monitor-EventStorage.py b/TestBeam/TBCnv/share/TBH6ByteStream-Monitor-EventStorage.py
index 6e4ba3766d98..8ecdbc932ec0 100644
--- a/TestBeam/TBCnv/share/TBH6ByteStream-Monitor-EventStorage.py
+++ b/TestBeam/TBCnv/share/TBH6ByteStream-Monitor-EventStorage.py
@@ -220,6 +220,9 @@ ToolSvc.pedmon0.adcCut = 50
ToolSvc.pedmon0.OutputLevel = INFO
#------------- LArDigitTBPhaseMonitoring -------------
+from LArCabling.LArCablingAccess import LArOnOffIdMapping
+LArOnOffIdMapping()
+
LArMon1.AthenaMonTools += ["LArDigTBPhaseMonTool<LArDigitContainer>/LArDigitTBTDC0"]
ToolSvc.LArDigitTBTDC0.histoPathBase = "/stat/LArDigitTBTDC0"
ToolSvc.LArDigitTBTDC0.digitKey = "FREE"
diff --git a/TestBeam/TBCnv/share/TBReadH6BS_Calib_jobOptions.py b/TestBeam/TBCnv/share/TBReadH6BS_Calib_jobOptions.py
index 3e1d27af2e70..32cbf8ed632f 100644
--- a/TestBeam/TBCnv/share/TBReadH6BS_Calib_jobOptions.py
+++ b/TestBeam/TBCnv/share/TBReadH6BS_Calib_jobOptions.py
@@ -18,6 +18,9 @@ theApp.Dlls +=["TBCnv", "DBDataModelAthenaPoolPoolCnv"]
#StreamBS.ItemList += ["TBLArDigitContainer#*"]
#StreamBS.ItemList += ["TBLArCalibDigitContainer#*"]
+from LArCabling.LArCablingAccess import LArCalibIdMapping
+LArCablibIdMapping()
+
from TBCnv.TBCnvConf import TBByteStreamCnvTool
ToolSvc += TBByteStreamCnvTool()
ToolSvc.TBByteStreamCnvTool.ForceHchoice = TRUE
diff --git a/TestBeam/TBCnv/share/TBReadH6BS_EventStorage_jobOptions.py b/TestBeam/TBCnv/share/TBReadH6BS_EventStorage_jobOptions.py
index 8b4d14b46b47..46970397cf23 100644
--- a/TestBeam/TBCnv/share/TBReadH6BS_EventStorage_jobOptions.py
+++ b/TestBeam/TBCnv/share/TBReadH6BS_EventStorage_jobOptions.py
@@ -14,6 +14,8 @@ include( "ByteStreamCnvSvc/TBEventSelector_jobOptions.py" )
include( "ByteStreamCnvSvcBase/BSAddProvSvc_RDO_jobOptions.py" )
+from LArCabling.LArCablingAccess import LArCalibIdMapping
+LArCablibIdMapping()
theApp.Dlls +=["TBCnv", "DBDataModelAthenaPoolPoolCnv" ]
#StreamBS.ItemList +=["TBTDC#*"];
diff --git a/TestBeam/TBCnv/share/TBReadH8BS_EventStorage_jobOptions.py b/TestBeam/TBCnv/share/TBReadH8BS_EventStorage_jobOptions.py
index 1d0a746b17ab..3245e8004106 100644
--- a/TestBeam/TBCnv/share/TBReadH8BS_EventStorage_jobOptions.py
+++ b/TestBeam/TBCnv/share/TBReadH8BS_EventStorage_jobOptions.py
@@ -12,6 +12,8 @@ include( "ByteStreamCnvSvc/TBEventSelector_jobOptions.py" )
include( "ByteStreamCnvSvcBase/BSAddProvSvc_RDO_jobOptions.py" )
+from LArCabling.LArCablingAccess import LArCalibIdMapping
+LArCablibIdMapping()
theApp.Dlls +=["TBCnv", "DBDataModelAthenaPoolPoolCnv"]
#StreamBS = Algorithm( "StreamBS" )
diff --git a/TestBeam/TBCnv/src/ReadTBLArDigits.cxx b/TestBeam/TBCnv/src/ReadTBLArDigits.cxx
index f595e2e4b9d1..9ba1f970af13 100644
--- a/TestBeam/TBCnv/src/ReadTBLArDigits.cxx
+++ b/TestBeam/TBCnv/src/ReadTBLArDigits.cxx
@@ -7,6 +7,8 @@
#include <vector>
#include "GaudiKernel/IToolSvc.h"
#include "CaloIdentifier/CaloCell_ID.h"
+#include "StoreGate/ReadCondHandleKey.h"
+#include "GaudiKernel/ThreadLocalContext.h"
ReadTBLArDigits::SortDigits::SortDigits(const LArOnlineID* onlineHelper)
{
@@ -16,7 +18,6 @@ ReadTBLArDigits::SortDigits::SortDigits(const LArOnlineID* onlineHelper)
ReadTBLArDigits::ReadTBLArDigits(const std::string& name, ISvcLocator* pSvcLocator)
: AthAlgorithm(name, pSvcLocator),
m_count(0),
- m_larCablingSvc(nullptr),
m_emId(0),
m_fcalId(0),
m_hecId(0),
@@ -46,8 +47,6 @@ StatusCode ReadTBLArDigits::initialize()
ATH_CHECK( detStore()->retrieve(m_onlineHelper, "LArOnlineID") );
- ATH_CHECK( toolSvc()->retrieveTool("LArCablingLegacyService",m_larCablingSvc) );
-
if (m_dumpFile.size()>0)
m_outfile.open(m_dumpFile.c_str(),std::ios::out);
//Ntuple booking
@@ -79,6 +78,8 @@ StatusCode ReadTBLArDigits::initialize()
ATH_CHECK( nt->addItem("gain",m_cellIndex,m_gain) );
ATH_CHECK( nt->addItem("NSamples",m_Nsamples,0,32) );
ATH_CHECK( nt->addItem("Samples",m_cellIndex,m_samples,32) );
+
+ ATH_CHECK( m_cablingKey.initialize() );
m_ntuplePtr=nt;
m_count=0;
@@ -88,7 +89,10 @@ StatusCode ReadTBLArDigits::initialize()
StatusCode ReadTBLArDigits::execute()
-{MsgStream log(msgSvc(), name());
+{
+ const EventContext& ctx = Gaudi::Hive::currentContext();
+
+ MsgStream log(msgSvc(), name());
m_count++;
StatusCode sc;
log << MSG::DEBUG << "======== executing event "<< m_count << " ========" << endmsg;
@@ -109,6 +113,8 @@ StatusCode ReadTBLArDigits::execute()
SortDigits sortDigits(m_onlineHelper);
std::sort(larDigitCont->begin(),larDigitCont->end(),sortDigits);
}
+
+ SG::ReadCondHandle<LArOnOffIdMapping> cabling (m_cablingKey, ctx);
log << MSG::DEBUG << "Finished sorting" << endmsg;
unsigned cellCounter=0;
@@ -120,7 +126,7 @@ StatusCode ReadTBLArDigits::execute()
for (const LArDigit* digit : *larDigitCont) {
HWIdentifier chid=digit->hardwareID();
log << MSG::DEBUG << "Get offline ID" << endmsg;
- const Identifier id=m_larCablingSvc->cnvToIdentifier(chid);
+ const Identifier id=cabling->cnvToIdentifier(chid);
const std::vector<short>& vSamples=digit->samples();
m_cellIndex=cellCounter;
log << MSG::DEBUG << "Now find eta/phi (EM only right now)" << endmsg;
diff --git a/TestBeam/TBCnv/src/TBByteStreamCnvTool.cxx b/TestBeam/TBCnv/src/TBByteStreamCnvTool.cxx
index 7c6a8d7965ce..a6bcb69b5a2f 100644
--- a/TestBeam/TBCnv/src/TBByteStreamCnvTool.cxx
+++ b/TestBeam/TBCnv/src/TBByteStreamCnvTool.cxx
@@ -15,6 +15,8 @@
#include "LArIdentifier/LArOnlineID.h"
#include "CaloIdentifier/CaloGain.h"
#include "Identifier/HWIdentifier.h"
+#include "StoreGate/ReadCondHandle.h"
+#include "GaudiKernel/ThreadLocalContext.h"
#include <list>
@@ -77,12 +79,6 @@ StatusCode TBByteStreamCnvTool::initialize()
return StatusCode::FAILURE;
}
- sc=toolSvc->retrieveTool("LArCablingLegacyService",m_larCablingSvc);
- if (sc.isFailure()) {
- logstr << MSG::ERROR << "Unable to retrieve LArCablingService" << endmsg;
- return StatusCode::FAILURE;
- }
-
IService* svc;
sc= service("ByteStreamCnvSvc",svc);
if (sc!=StatusCode::SUCCESS)
@@ -148,6 +144,8 @@ StatusCode TBByteStreamCnvTool::initialize()
m_febgain.clear();
+ ATH_CHECK( m_CLKey.initialize() );
+
return StatusCode::SUCCESS;
}
@@ -545,6 +543,8 @@ StatusCode TBByteStreamCnvTool::H6BuildObjects(int unrec_code)
MsgStream logstr(msgSvc(), name());
logstr << MSG::DEBUG << "H6BuildObject called for " << unrec_code<< endmsg;
+ const EventContext& ctx = Gaudi::Hive::currentContext();
+
StatusCode sc=StatusCode::FAILURE;
//bool gotobject=false;
//bool recordfailure=false;
@@ -583,6 +583,8 @@ StatusCode TBByteStreamCnvTool::H6BuildObjects(int unrec_code)
TBADCRaw* dummyadc = new TBADCRaw("dummy",true,0);
m_adcrawCont->push_back(dummyadc);
+ SG::ReadCondHandle<LArCalibLineMapping> calibLine (m_CLKey, ctx);
+
// with this initialisation, first call of NextSubFrag will initialise correctly the index :
m_subfrag_id=0;
@@ -713,7 +715,7 @@ StatusCode TBByteStreamCnvTool::H6BuildObjects(int unrec_code)
m_tblardigitcont[gainmode]->push_back(lardig);
if(m_isCalib) {
bool isPulsed=false;
- const std::vector<HWIdentifier>& calibChannelIDs=m_larCablingSvc->calibSlotLine(hwid);
+ const std::vector<HWIdentifier>& calibChannelIDs=calibLine->calibSlotLine(hwid);
if (calibChannelIDs.size() != 0) {
// Now figure out if any calibration line connected to this channel is pulsed.
// I'm going to cheat and use the fact that we only pulsed one board at a time
--
GitLab
From c317b796818163d993fa836119af204acee2ba48 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Mon, 21 Jun 2021 16:11:50 -0400
Subject: [PATCH 213/272] CaloSysD3PDMaker: Remove use of
LArCablingLegacyService.
Migrate use of LArCablingLegacyService to conditions data.
---
.../D3PDMaker/CaloSysD3PDMaker/python/SCD3PDObject.py | 6 +++++-
.../D3PDMaker/CaloSysD3PDMaker/src/SCFillerTool.cxx | 8 ++++++--
.../D3PDMaker/CaloSysD3PDMaker/src/SCFillerTool.h | 6 ++++--
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/SCD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/SCD3PDObject.py
index b519d95f1703..923722b8eb45 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/SCD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/python/SCD3PDObject.py
@@ -1,10 +1,14 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
import D3PDMakerCoreComps
from D3PDMakerCoreComps.D3PDObject import D3PDObject, make_SG_D3PDObject
import CaloSysD3PDMaker
+from LArCabling.LArCablingAccess import LArOnOffIdMapping
+LArOnOffIdMapping()
+
+
AllSCD3PDObject = make_SG_D3PDObject( "CaloCellContainer",
"AllCalo",
"sc_",
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/src/SCFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/src/SCFillerTool.cxx
index 8364ec0495f6..7ded731c8ece 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/src/SCFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/src/SCFillerTool.cxx
@@ -9,6 +9,7 @@
#include "LArIdentifier/LArOnlineID.h"
#include "CaloEvent/CaloCell.h"
#include "CaloEvent/CaloCellContainer.h"
+#include "StoreGate/ReadCondHandle.h"
#include <vector>
#include <list>
@@ -32,7 +33,6 @@ SCFillerTool::SCFillerTool
const std::string& name,
const IInterface* parent)
: BlockFillerTool<CaloCellContainer> (type, name, parent),
- m_larCablingSvc("LArCablingLegacyService"),
m_tableFilled(false),
m_caloEtaSelection( false ),
m_caloPhiSelection( false ),
@@ -125,6 +125,8 @@ StatusCode SCFillerTool::initialize() {
m_caloLayerSelection = true;
}
+ ATH_CHECK( m_cablingKey.initialize() );
+
ATH_MSG_INFO( " *** SCFillerTool: completed" );
return StatusCode::SUCCESS;
}
@@ -302,6 +304,8 @@ void SCFillerTool::fillHashTables( const CaloCellContainer& p ) {
int sc_side, sc_calo, sc_region, sc_layer, sc_ieta, sc_jphi;
//float sc_feta, sc_fphi;
+ SG::ReadCondHandle<LArOnOffIdMapping> cabling (m_cablingKey);
+
for( ; f_cell != l_cell; ++f_cell ) {
const CaloCell* cell = ( *f_cell );
Identifier id = cell->ID();
@@ -380,7 +384,7 @@ void SCFillerTool::fillHashTables( const CaloCellContainer& p ) {
sc_jphi = jphi;
sc_region = 0;
} else if (m_fcalid->is_lar_fcal(id)) {
- HWIdentifier hwid = m_larCablingSvc->createSignalChannelID( id );
+ HWIdentifier hwid = cabling->createSignalChannelID( id );
sc_calo = 5;
const int lay = m_fcalid->module(id);
const int s = m_onlineHelper->slot(hwid);
diff --git a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/src/SCFillerTool.h b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/src/SCFillerTool.h
index 9c68d89dd74f..e7a48593e97d 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/src/SCFillerTool.h
+++ b/PhysicsAnalysis/D3PDMaker/CaloSysD3PDMaker/src/SCFillerTool.h
@@ -17,7 +17,8 @@
// Gaudi/Athena include(s):
#include "GaudiKernel/ToolHandle.h"
#include "D3PDMakerUtils/BlockFillerTool.h"
-#include "LArCabling/LArCablingLegacyService.h"
+#include "LArCabling/LArOnOffIdMapping.h"
+#include "StoreGate/ReadCondHandleKey.h"
#include <vector>
#include <list>
@@ -70,7 +71,8 @@ private:
const LArHEC_ID *m_hecid;
const TileID *m_tileid;
const LArOnlineID* m_onlineHelper;
- ToolHandle<LArCablingLegacyService> m_larCablingSvc;
+ SG::ReadCondHandleKey<LArOnOffIdMapping> m_cablingKey
+ {this,"CablingKey","LArOnOffIdMap","SG Key of LArOnOffIdMapping object"};
// const CaloDetDescrManager* m_dd_man;
--
GitLab
From ad6a6821dd796929318bd229b182c89547c2ac17 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Fri, 20 Aug 2021 05:50:48 +0200
Subject: [PATCH 214/272] AthenaMonitoring: Don't try to use TrigDecisionTOol
if trigger is disabled.
Needed to fix crash with q222.
---
Control/AthenaMonitoring/python/AthMonitorCfgHelper.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Control/AthenaMonitoring/python/AthMonitorCfgHelper.py b/Control/AthenaMonitoring/python/AthMonitorCfgHelper.py
index c8c756e1f766..f96062c94635 100644
--- a/Control/AthenaMonitoring/python/AthMonitorCfgHelper.py
+++ b/Control/AthenaMonitoring/python/AthMonitorCfgHelper.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
#
'''@file AthMonitorCfgHelper.py
@@ -64,7 +64,8 @@ class AthMonitorCfgHelper(object):
# configure these properties; users really should have no reason to override them
algObj.Environment = self.inputFlags.DQ.Environment
algObj.DataType = self.inputFlags.DQ.DataType
- algObj.TrigDecisionTool = self.resobj.getPublicTool("TrigDecisionTool")
+ if self.inputFlags.DQ.useTrigger:
+ algObj.TrigDecisionTool = self.resobj.getPublicTool("TrigDecisionTool")
algObj.TriggerTranslatorTool = self.resobj.popToolsAndMerge(getTriggerTranslatorToolSimple(self.inputFlags))
if not self.inputFlags.Input.isMC and self.inputFlags.DQ.enableLumiAccess:
--
GitLab
From eb0b9054a5686defcf658c61da33b302b5fe8ece Mon Sep 17 00:00:00 2001
From: Peter Onyisi <ponyisi@utexas.edu>
Date: Sat, 21 Aug 2021 05:38:03 +0200
Subject: [PATCH 215/272] Prevent rerunning btag output block and so keep btag
out of AOD
---
.../share/BTaggingReconstructionOutputAODList_jobOptions.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/share/BTaggingReconstructionOutputAODList_jobOptions.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/share/BTaggingReconstructionOutputAODList_jobOptions.py
index 5bad5737826f..bb19e3ef01cf 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/share/BTaggingReconstructionOutputAODList_jobOptions.py
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/share/BTaggingReconstructionOutputAODList_jobOptions.py
@@ -1,3 +1,4 @@
+include.block('BTagging/BTaggingReconstructionOutputAODList_jobOptions.py')
#************** AOD list ************************************************
from BTagging.BTaggingFlags import BTaggingFlags
BTaggingAODList = BTaggingFlags.btaggingAODList
--
GitLab
From a4ad99cb5372805367c3be4a78469d11d11af988 Mon Sep 17 00:00:00 2001
From: James Catmore <james.catmore@cern.ch>
Date: Sat, 21 Aug 2021 18:34:20 +0000
Subject: [PATCH 216/272] Adding PRWConfig_tf.py transform to release 22
---
.../share/generatePRW_jobOptions.py | 15 +++--
.../PATJobTransforms/scripts/PRWConfig_tf.py | 57 +++++++++++++++++++
.../share/skeleton.AODtoNTUP_PILEUP.py | 32 +++++++++++
3 files changed, 96 insertions(+), 8 deletions(-)
create mode 100755 PhysicsAnalysis/PATJobTransforms/scripts/PRWConfig_tf.py
create mode 100644 PhysicsAnalysis/PATJobTransforms/share/skeleton.AODtoNTUP_PILEUP.py
diff --git a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/share/generatePRW_jobOptions.py b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/share/generatePRW_jobOptions.py
index 522b5a4389bb..7eed7017cccf 100644
--- a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/share/generatePRW_jobOptions.py
+++ b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/share/generatePRW_jobOptions.py
@@ -1,16 +1,13 @@
-
theApp.EvtMax=-1 #says how many events to run over. Set to -1 for all events
#Include error handler for safety purposes
theApp.CreateSvc += ["AthROOTErrorHandlerSvc"]
-#import AthenaPoolCnvSvc.ReadAthenaPool #sets up reading of POOL files (e.g. xAODs)
-import AthenaRootComps.ReadAthenaxAODHybrid
-svcMgr.EventSelector.AccessMode=1 #use class access mode ... I know it's wrong, but it should be ok just for the EventInfo information
-from glob import glob
-defFile = os.environ.get ('ASG_TEST_FILE_MC',
- '/afs/cern.ch/user/a/asgbase/patspace/xAODs/r7725/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.AOD.e3698_s2608_s2183_r7725_r7676/AOD.07915862._000100.pool.root.1')
-svcMgr.EventSelector.InputCollections=glob( vars().get("FILES",defFile).strip() )
+import AthenaPoolCnvSvc.ReadAthenaPool #sets up reading of POOL files (e.g. xAODs)
+#import AthenaRootComps.ReadAthenaxAODHybrid
+#svcMgr.EventSelector.AccessMode=1 #use class access mode ... I know it's wrong, but it should be ok just for the EventInfo information
+
+print(jps.AthenaCommonFlags.FilesInput())
if len(svcMgr.EventSelector.InputCollections)==0:
print("WARNING >>>>>>>>>> generatePRW_jobOptions.py: NO INPUT FILES PROVIDED/FOUND FROM: %s ... this will produce a failure unless you are sending this job to the grid <<<<<<<<<<<<" % vars().get("FILES","/afs/cern.ch/atlas/project/PAT/xAODs/r5591/mc14_8TeV.117050.PowhegPythia_P2011C_ttbar.recon.AOD.e1727_s1933_s1911_r5591/AOD.01494882._111853.pool.root.1").strip())
@@ -29,6 +26,8 @@ algseq += CfgMgr.CP__PileupReweightingProvider(ConfigOutputStream="NTUP_PILEUP",
include("AthAnalysisBaseComps/SuppressLogging.py") #Optional include to suppress as much athena output as possible
+outputFile = vars().get("outputPRWFile","my.prw.root")
+
svcMgr += CfgMgr.THistSvc()
svcMgr.THistSvc.Output += ["NTUP_PILEUP DATAFILE='" + outputFile + "' OPT='RECREATE'"]
diff --git a/PhysicsAnalysis/PATJobTransforms/scripts/PRWConfig_tf.py b/PhysicsAnalysis/PATJobTransforms/scripts/PRWConfig_tf.py
new file mode 100755
index 000000000000..9954d2b6c896
--- /dev/null
+++ b/PhysicsAnalysis/PATJobTransforms/scripts/PRWConfig_tf.py
@@ -0,0 +1,57 @@
+#! /usr/bin/env python
+
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+## Transform for making PRW Config files
+# @version $Id: PRWConfig_tf.py ... author: will $
+
+import argparse
+import os.path
+import sys
+import time
+import traceback
+
+import logging
+
+# Setup core logging here
+from PyJobTransforms.trfLogger import msg
+msg.info('logging set in %s' % sys.argv[0])
+
+from PyJobTransforms.trfExitCodes import trfExit
+from PyJobTransforms.transform import transform
+from PyJobTransforms.trfExe import athenaExecutor
+from PyJobTransforms.trfDecorators import stdTrfExceptionHandler, sigUsrStackTrace
+import PyJobTransforms.trfExceptions as trfExceptions
+import PyJobTransforms.trfArgClasses as trfArgClasses
+
+@stdTrfExceptionHandler
+@sigUsrStackTrace
+def main():
+
+ msg.info('This is %s' % sys.argv[0])
+
+ trf = getTransform()
+ trf.parseCmdLineArgs(sys.argv[1:])
+ trf.execute()
+ trf.generateReport()
+
+ msg.info("%s stopped at %s, trf exit code %d" % (sys.argv[0], time.asctime(), trf.exitCode))
+ sys.exit(trf.exitCode)
+
+## Get the base transform with all arguments added
+def getTransform():
+ trf = transform(executor = athenaExecutor(name = 'athena',
+ skeletonFile='PATJobTransforms/skeleton.AODtoNTUP_PILEUP.py'))
+
+ trf.parser.defineArgGroup("PRWConfig_tf","PRWConfig_tf options")
+
+ #for input and output file lists to be put correctly into the runArgs and tested in the pre and post corruption
+ #tests, the format of option must be inputXXXXFile and outputYYYYFile
+ trf.parser.add_argument("--inputAODFile",type=trfArgClasses.argFactory(trfArgClasses.argPOOLFile,io='input',type='aod',multipleOK=True),nargs='+',help="The input files",group="PRWConfig_tf")
+ trf.parser.add_argument("--outputNTUP_PILEUPFile",type=trfArgClasses.argFactory(trfArgClasses.argNTUPFile,io='output',type='hist',multipleOK=False),help="The output filename",group="PRWConfig_tf")
+
+ return trf
+
+
+if __name__ == '__main__':
+ main()
diff --git a/PhysicsAnalysis/PATJobTransforms/share/skeleton.AODtoNTUP_PILEUP.py b/PhysicsAnalysis/PATJobTransforms/share/skeleton.AODtoNTUP_PILEUP.py
new file mode 100644
index 000000000000..edcacf37c38e
--- /dev/null
+++ b/PhysicsAnalysis/PATJobTransforms/share/skeleton.AODtoNTUP_PILEUP.py
@@ -0,0 +1,32 @@
+#this is just a simple wrapper for the joboptions
+#to connect up the runArgs input and outputs
+
+jps.AthenaCommonFlags.FilesInput = runArgs.inputAODFile
+outputPRWFile = runArgs.outputNTUP_PILEUPFile
+
+## Pre-exec
+if hasattr(runArgs,"preExec"):
+ recoLog.info("transform pre-exec")
+ for cmd in runArgs.preExec:
+ recoLog.info(cmd)
+ exec(cmd)
+
+#preInclude
+if hasattr(runArgs,"preInclude"):
+ recoLog.info("transform pre-include")
+ include(runArgs.preInclude)
+
+include("PileupReweighting/generatePRW_jobOptions.py")
+
+#postInclude
+if hasattr(runArgs,"postInclude"):
+ recoLog.info("transform pre-include")
+ include(runArgs.postInclude)
+
+
+## Post-exec
+if hasattr(runArgs,"postExec"):
+ recoLog.info("transform post-exec")
+ for cmd in runArgs.postExec:
+ recoLog.info(cmd)
+ exec(cmd)
--
GitLab
From 59ff9dd46d717f310878c6a7fc0da5df671c72dc Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Sat, 21 Aug 2021 19:58:20 +0000
Subject: [PATCH 217/272] LArHV: Rename getData() -> getDataSim().
---
.../LArG4/LArG4Barrel/src/LArBarrelCalculator.cxx | 4 ++--
LArCalorimeter/LArG4/LArG4EC/src/HVHelper.cc | 4 ++--
.../LArG4/LArG4FCAL/src/LArFCALCalculatorBase.cc | 7 +++----
.../LArG4/LArG4FCAL/src/LArFCALCalculatorBase.h | 5 ++---
.../LArG4/LArG4HEC/src/LArHECWheelCalculator.cc | 7 +++----
.../LArG4/LArG4HEC/src/LArHECWheelCalculator.h | 5 ++---
LArCalorimeter/LArGeoModel/LArHV/LArHV/EMBHVManager.h | 5 +++--
LArCalorimeter/LArGeoModel/LArHV/LArHV/EMECHVManager.h | 5 +++--
LArCalorimeter/LArGeoModel/LArHV/LArHV/FCALHVManager.h | 5 +++--
LArCalorimeter/LArGeoModel/LArHV/LArHV/HECHVManager.h | 5 +++--
LArCalorimeter/LArGeoModel/LArHV/src/EMBHVManager.cxx | 10 +++++-----
LArCalorimeter/LArGeoModel/LArHV/src/EMECHVManager.cxx | 10 +++++-----
LArCalorimeter/LArGeoModel/LArHV/src/FCALHVManager.cxx | 10 +++++-----
LArCalorimeter/LArGeoModel/LArHV/src/HECHVManager.cxx | 10 +++++-----
14 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelCalculator.cxx b/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelCalculator.cxx
index e693994b06ca..8d94e24403cf 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelCalculator.cxx
+++ b/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelCalculator.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// The Cell Identifier for the EM Barrel readout cells
@@ -692,7 +692,7 @@ void LArBarrelCalculator::InitHV()
const LArHVManager *manager = nullptr;
if (pDetStore->retrieve(manager)==StatusCode::SUCCESS) {
const EMBHVManager& hvManager=manager->getEMBHVManager();
- const EMBHVManager::EMBHVData hvdata = hvManager.getData();
+ const EMBHVManager::EMBHVData hvdata = hvManager.getDataSim();
ATH_MSG_INFO(" got HV Manager ");
// loop over HV modules
for (unsigned int iSide=0;iSide<2;iSide++) {
diff --git a/LArCalorimeter/LArG4/LArG4EC/src/HVHelper.cc b/LArCalorimeter/LArG4/LArG4EC/src/HVHelper.cc
index 854fd9ff2bf1..b804c41f8231 100644
--- a/LArCalorimeter/LArG4/LArG4EC/src/HVHelper.cc
+++ b/LArCalorimeter/LArG4/LArG4EC/src/HVHelper.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "LArHV/LArHVManager.h"
@@ -211,7 +211,7 @@ void HVHelper::GetMapFromDB(void)
const EMECHVManager& hvManager = manager->getEMECHVManager(
isInner? EMECHVModule::INNER: EMECHVModule::OUTER
);
- const EMECHVManager::EMECHVData hvdata = hvManager.getData();
+ const EMECHVManager::EMECHVData hvdata = hvManager.getDataSim();
ATH_MSG_INFO("got LAr HV Manager for "
<< (isInner? "inner": "outer") << " wheel");
const EMECHVDescriptor& dsc = hvManager.getDescriptor();
diff --git a/LArCalorimeter/LArG4/LArG4FCAL/src/LArFCALCalculatorBase.cc b/LArCalorimeter/LArG4/LArG4FCAL/src/LArFCALCalculatorBase.cc
index 7d250e4dad4e..413faef0f7dd 100644
--- a/LArCalorimeter/LArG4/LArG4FCAL/src/LArFCALCalculatorBase.cc
+++ b/LArCalorimeter/LArG4/LArG4FCAL/src/LArFCALCalculatorBase.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
//-----------------------------------------------------------------------------
@@ -48,8 +48,7 @@ LArFCALCalculatorBase::LArFCALCalculatorBase(const std::string& name, ISvcLocato
//m_FCalSampling.verifier().setUpper(3); //Would need to make m_FCalSampling an IntegerProperty for this to work. Overkill?
}
-// Uses not-thread-safe FCALHVManager::getData()
-StatusCode LArFCALCalculatorBase::initialize ATLAS_NOT_THREAD_SAFE ()
+StatusCode LArFCALCalculatorBase::initialize()
{
ServiceHandle<StoreGateSvc> detStore ("DetectorStore" ,"LArFCALCalculatorBase");
ATH_CHECK(detStore->retrieve(m_ChannelMap));
@@ -69,7 +68,7 @@ StatusCode LArFCALCalculatorBase::initialize ATLAS_NOT_THREAD_SAFE ()
m_posModule = fcalManager->getFCAL(FCALModule::Module(m_FCalSampling),FCALModule::POS);
m_negModule = fcalManager->getFCAL(FCALModule::Module(m_FCalSampling),FCALModule::NEG);
- m_hvdata = fcalManager->getHVManager().getData();
+ m_hvdata = fcalManager->getHVManager().getDataSim();
}
}
return StatusCode::SUCCESS;
diff --git a/LArCalorimeter/LArG4/LArG4FCAL/src/LArFCALCalculatorBase.h b/LArCalorimeter/LArG4/LArG4FCAL/src/LArFCALCalculatorBase.h
index 2a9a987fad0b..a4609e8c0edd 100644
--- a/LArCalorimeter/LArG4/LArG4FCAL/src/LArFCALCalculatorBase.h
+++ b/LArCalorimeter/LArG4/LArG4FCAL/src/LArFCALCalculatorBase.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// LArFCALCalculator
@@ -20,7 +20,6 @@
#include "LArG4Code/LArCalculatorSvcImp.h"
#include "LArReadoutGeometry/FCAL_ChannelMap.h"
#include "LArHV/FCALHVManager.h"
-#include "CxxUtils/checker_macros.h"
#include "globals.hh"
#include <stdexcept>
class LArG4BirksLaw;
@@ -31,7 +30,7 @@ class LArFCALCalculatorBase : public LArCalculatorSvcImp
public:
// constructor
LArFCALCalculatorBase(const std::string& name, ISvcLocator *pSvcLocator);
- virtual StatusCode initialize ATLAS_NOT_THREAD_SAFE () override;
+ virtual StatusCode initialize() override;
virtual StatusCode finalize() override;
/////////////////////////////////////////////
diff --git a/LArCalorimeter/LArG4/LArG4HEC/src/LArHECWheelCalculator.cc b/LArCalorimeter/LArG4/LArG4HEC/src/LArHECWheelCalculator.cc
index 6c4489e52354..9174a0195457 100644
--- a/LArCalorimeter/LArG4/LArG4HEC/src/LArHECWheelCalculator.cc
+++ b/LArCalorimeter/LArG4/LArG4HEC/src/LArHECWheelCalculator.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "LArHECWheelCalculator.h"
@@ -49,8 +49,7 @@ LArHECWheelCalculator::~LArHECWheelCalculator()
if(m_birksLaw) delete m_birksLaw;
}
-// not thread safe due to HECHVManager::getData()
-StatusCode LArHECWheelCalculator::initialize ATLAS_NOT_THREAD_SAFE ()
+StatusCode LArHECWheelCalculator::initialize()
{
ATH_MSG_DEBUG("Use the LArHECWheelCalculator for the HEC");
@@ -69,7 +68,7 @@ StatusCode LArHECWheelCalculator::initialize ATLAS_NOT_THREAD_SAFE ()
ATH_CHECK(detStore.retrieve() );
ATH_CHECK(detStore->retrieve(manager));
m_DetectorManager=manager->getHecManager();
- m_hvdata = m_DetectorManager->getHVManager().getData();
+ m_hvdata = m_DetectorManager->getHVManager().getDataSim();
}
return StatusCode::SUCCESS;
diff --git a/LArCalorimeter/LArG4/LArG4HEC/src/LArHECWheelCalculator.h b/LArCalorimeter/LArG4/LArG4HEC/src/LArHECWheelCalculator.h
index 3a71fd76a40d..18dd8ce8b06e 100644
--- a/LArCalorimeter/LArG4/LArG4HEC/src/LArHECWheelCalculator.h
+++ b/LArCalorimeter/LArG4/LArG4HEC/src/LArHECWheelCalculator.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// LArHECWheelCalculator.hh
@@ -14,7 +14,6 @@
#include "LArG4Code/LArG4Identifier.h"
#include "LArG4Code/LArCalculatorSvcImp.h"
#include "LArHV/HECHVManager.h"
-#include "CxxUtils/checker_macros.h"
#include <stdexcept>
// Forward declarations.
@@ -35,7 +34,7 @@ class LArHECWheelCalculator : virtual public LArCalculatorSvcImp {
public:
LArHECWheelCalculator(const std::string& name, ISvcLocator * pSvcLocator);
- virtual StatusCode initialize ATLAS_NOT_THREAD_SAFE () override final;
+ virtual StatusCode initialize() override final;
virtual StatusCode finalize() override final;
~LArHECWheelCalculator();
/////////////////////////////////////////////
diff --git a/LArCalorimeter/LArGeoModel/LArHV/LArHV/EMBHVManager.h b/LArCalorimeter/LArGeoModel/LArHV/LArHV/EMBHVManager.h
index f0a3d3935d69..7399a2928818 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/LArHV/EMBHVManager.h
+++ b/LArCalorimeter/LArGeoModel/LArHV/LArHV/EMBHVManager.h
@@ -78,8 +78,9 @@ class EMBHVManager
unsigned int beginSideIndex() const;
unsigned int endSideIndex() const;
- // Get the database payload
- EMBHVData getData() const;
+ // Get the database payload --- for use by simulation only
+ // (doesn't account for conditions changes)
+ EMBHVData getDataSim() const;
#if !(defined(SIMULATIONBASE) || defined(GENERATIONBASE))
EMBHVData getData (const LArHVIdMapping& hvIdMapping,
diff --git a/LArCalorimeter/LArGeoModel/LArHV/LArHV/EMECHVManager.h b/LArCalorimeter/LArGeoModel/LArHV/LArHV/EMECHVManager.h
index 96c8c1e19473..0e5eb529a1af 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/LArHV/EMECHVManager.h
+++ b/LArCalorimeter/LArGeoModel/LArHV/LArHV/EMECHVManager.h
@@ -81,8 +81,9 @@ class EMECHVManager
// Gets the Wheel, 0 for the Outer Wheel HV Manager and 1 for the inner Wheel HV Manager
EMECHVManager::IOType getWheelIndex() const;
- // Get the database payload
- EMECHVData getData() const;
+ // Get the database payload --- for use by simulation only
+ // (doesn't account for conditions changes)
+ EMECHVData getDataSim() const;
#if !(defined(SIMULATIONBASE) || defined(GENERATIONBASE))
EMECHVData getData (const LArHVIdMapping& hvIdMapping,
diff --git a/LArCalorimeter/LArGeoModel/LArHV/LArHV/FCALHVManager.h b/LArCalorimeter/LArGeoModel/LArHV/LArHV/FCALHVManager.h
index a95b05455e79..ebc127f3feb2 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/LArHV/FCALHVManager.h
+++ b/LArCalorimeter/LArGeoModel/LArHV/LArHV/FCALHVManager.h
@@ -69,8 +69,9 @@ class FCALHVManager
, unsigned int iSector
, unsigned int iSampling) const;
- // Get the database payload
- FCALHVData getData() const;
+ // Get the database payload --- for use by simulation only
+ // (doesn't account for conditions changes)
+ FCALHVData getDataSim() const;
#if !(defined(SIMULATIONBASE) || defined(GENERATIONBASE))
FCALHVData getData (const LArHVIdMapping& hvIdMapping,
diff --git a/LArCalorimeter/LArGeoModel/LArHV/LArHV/HECHVManager.h b/LArCalorimeter/LArGeoModel/LArHV/LArHV/HECHVManager.h
index dc59a0355d13..5d8caee839e2 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/LArHV/HECHVManager.h
+++ b/LArCalorimeter/LArGeoModel/LArHV/LArHV/HECHVManager.h
@@ -72,8 +72,9 @@ class HECHVManager
, unsigned int iPhi
, unsigned int iSampling) const;
- // Get the database payload
- HECHVData getData() const;
+ // Get the database payload --- for use by simulation only
+ // (doesn't account for conditions changes)
+ HECHVData getDataSim() const;
#if !(defined(SIMULATIONBASE) || defined(GENERATIONBASE))
HECHVData getData (const LArHVIdMapping& hvIdMapping,
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/EMBHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/EMBHVManager.cxx
index 102881727f87..fdbc087ad137 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/EMBHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/EMBHVManager.cxx
@@ -37,9 +37,9 @@
namespace {
-struct LegacyIdFunc
+struct SimIdFunc
{
- LegacyIdFunc();
+ SimIdFunc();
std::vector<HWIdentifier> operator()(HWIdentifier id)
{
return m_cablingTool->getLArElectrodeIDvec (id);
@@ -48,7 +48,7 @@ struct LegacyIdFunc
};
-LegacyIdFunc::LegacyIdFunc()
+SimIdFunc::SimIdFunc()
{
ToolHandle<LArHVCablingSimTool> tool ("LArHVCablingSimTool");
if (!tool.retrieve().isSuccess()) {
@@ -327,7 +327,7 @@ EMBHVManager::getData (idfunc_t idfunc,
EMBHVManager::EMBHVData
-EMBHVManager::getData() const
+EMBHVManager::getDataSim() const
{
std::vector<const CondAttrListCollection*> attrLists;
ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "EMBHVManager");
@@ -339,7 +339,7 @@ EMBHVManager::getData() const
if (detStore->retrieve(atrlistcol, "/LAR/DCS/HV/BARREL/I8").isSuccess()) {
attrLists.push_back (atrlistcol);
}
- return getData (LegacyIdFunc(), attrLists);
+ return getData (SimIdFunc(), attrLists);
}
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/EMECHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/EMECHVManager.cxx
index ae7b7b1f212b..9093909ca00b 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/EMECHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/EMECHVManager.cxx
@@ -38,9 +38,9 @@
namespace {
-struct LegacyIdFunc
+struct SimIdFunc
{
- LegacyIdFunc();
+ SimIdFunc();
std::vector<HWIdentifier> operator()(HWIdentifier id)
{
return m_cablingTool->getLArElectrodeIDvec (id);
@@ -49,7 +49,7 @@ struct LegacyIdFunc
};
-LegacyIdFunc::LegacyIdFunc()
+SimIdFunc::SimIdFunc()
{
ToolHandle<LArHVCablingSimTool> tool ("LArHVCablingSimTool");
if (!tool.retrieve().isSuccess()) {
@@ -371,7 +371,7 @@ EMECHVManager::getData (idfunc_t idfunc,
EMECHVManager::EMECHVData
-EMECHVManager::getData() const
+EMECHVManager::getDataSim() const
{
std::vector<const CondAttrListCollection*> attrLists;
ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "EMBHVManager");
@@ -383,7 +383,7 @@ EMECHVManager::getData() const
if (detStore->retrieve(atrlistcol, "/LAR/DCS/HV/BARREL/I8").isSuccess()) {
attrLists.push_back (atrlistcol);
}
- return getData (LegacyIdFunc(), attrLists);
+ return getData (SimIdFunc(), attrLists);
}
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/FCALHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/FCALHVManager.cxx
index cb1365b2717a..c7baa6f6e335 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/FCALHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/FCALHVManager.cxx
@@ -30,9 +30,9 @@
namespace {
-struct LegacyIdFunc
+struct SimIdFunc
{
- LegacyIdFunc();
+ SimIdFunc();
std::vector<HWIdentifier> operator()(HWIdentifier id)
{
return m_cablingTool->getLArElectrodeIDvec (id);
@@ -41,7 +41,7 @@ struct LegacyIdFunc
};
-LegacyIdFunc::LegacyIdFunc()
+SimIdFunc::SimIdFunc()
{
ToolHandle<LArHVCablingSimTool> tool ("LArHVCablingSimTool");
if (!tool.retrieve().isSuccess()) {
@@ -263,7 +263,7 @@ FCALHVManager::getData (idfunc_t idfunc,
}
FCALHVManager::FCALHVData
-FCALHVManager::getData() const
+FCALHVManager::getDataSim() const
{
std::vector<const CondAttrListCollection*> attrLists;
ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "EMBHVManager");
@@ -275,7 +275,7 @@ FCALHVManager::getData() const
if (detStore->retrieve(atrlistcol, "/LAR/DCS/HV/BARREL/I8").isSuccess()) {
attrLists.push_back (atrlistcol);
}
- return getData (LegacyIdFunc(), attrLists);
+ return getData (SimIdFunc(), attrLists);
}
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/HECHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/HECHVManager.cxx
index 072908f7dc63..eda895e5d4d1 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/HECHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/HECHVManager.cxx
@@ -33,9 +33,9 @@
namespace {
-struct LegacyIdFunc
+struct SimIdFunc
{
- LegacyIdFunc();
+ SimIdFunc();
std::vector<HWIdentifier> operator()(HWIdentifier id)
{
return m_cablingTool->getLArElectrodeIDvec (id);
@@ -44,7 +44,7 @@ struct LegacyIdFunc
};
-LegacyIdFunc::LegacyIdFunc()
+SimIdFunc::SimIdFunc()
{
ToolHandle<LArHVCablingSimTool> tool ("LArHVCablingSimTool");
if (!tool.retrieve().isSuccess()) {
@@ -276,7 +276,7 @@ HECHVManager::getData (idfunc_t idfunc,
HECHVManager::HECHVData
-HECHVManager::getData() const
+HECHVManager::getDataSim() const
{
std::vector<const CondAttrListCollection*> attrLists;
ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "EMBHVManager");
@@ -288,7 +288,7 @@ HECHVManager::getData() const
if (detStore->retrieve(atrlistcol, "/LAR/DCS/HV/BARREL/I8").isSuccess()) {
attrLists.push_back (atrlistcol);
}
- return getData (LegacyIdFunc(), attrLists);
+ return getData (SimIdFunc(), attrLists);
}
--
GitLab
From 1bcc68860e156f47c898157f064fd9bd045331ed Mon Sep 17 00:00:00 2001
From: Peter Onyisi <ponyisi@utexas.edu>
Date: Sun, 22 Aug 2021 02:31:47 +0200
Subject: [PATCH 218/272] Reference files with xAOD classes generated by
q-tests
---
.../data/master_q221_AOD_content.ref | 2244 +++++++++++++++++
.../master_q431_AOD_content_500events.ref | 1339 ++++++++++
2 files changed, 3583 insertions(+)
create mode 100644 Tools/PROCTools/data/master_q221_AOD_content.ref
create mode 100644 Tools/PROCTools/data/master_q431_AOD_content_500events.ref
diff --git a/Tools/PROCTools/data/master_q221_AOD_content.ref b/Tools/PROCTools/data/master_q221_AOD_content.ref
new file mode 100644
index 000000000000..fb3c7cf5acb2
--- /dev/null
+++ b/Tools/PROCTools/data/master_q221_AOD_content.ref
@@ -0,0 +1,2244 @@
+AllCalo
+BunchId
+CaloCalFwdTopoTowers
+CaloCalFwdTopoTowersAux.
+CaloCalFwdTopoTowersAuxDyn.ENG_FRAC_EM
+CaloCalFwdTopoTowersAuxDyn.LONGITUDINAL
+CaloCalFwdTopoTowersAuxDyn.SIGNIFICANCE
+CaloCalTopoClusters
+CaloCalTopoClustersAux.
+CaloCalTopoClustersAuxDyn.AVG_LAR_Q
+CaloCalTopoClustersAuxDyn.AVG_TILE_Q
+CaloCalTopoClustersAuxDyn.BADLARQ_FRAC
+CaloCalTopoClustersAuxDyn.BadChannelList
+CaloCalTopoClustersAuxDyn.CENTER_LAMBDA
+CaloCalTopoClustersAuxDyn.CENTER_MAG
+CaloCalTopoClustersAuxDyn.CellLink
+CaloCalTopoClustersAuxDyn.EM_PROBABILITY
+CaloCalTopoClustersAuxDyn.ENG_BAD_CELLS
+CaloCalTopoClustersAuxDyn.ENG_FRAC_MAX
+CaloCalTopoClustersAuxDyn.ENG_POS
+CaloCalTopoClustersAuxDyn.FIRST_ENG_DENS
+CaloCalTopoClustersAuxDyn.ISOLATION
+CaloCalTopoClustersAuxDyn.NCELL_SAMPLING
+CaloCalTopoClustersAuxDyn.N_BAD_CELLS
+CaloCalTopoClustersAuxDyn.SECOND_LAMBDA
+CaloCalTopoClustersAuxDyn.SECOND_R
+CaloCalTopoClustersAuxDyn.SECOND_TIME
+CaloCalTopoClustersAuxDyn.SIGNIFICANCE
+CaloCalTopoClusters_links
+CombinedMuonTrackParticles
+CombinedMuonTrackParticlesAux.
+CombinedMuonTrackParticlesAuxDyn.TRTdEdx
+CombinedMuonTrackParticlesAuxDyn.TRTdEdxUsedHits
+CombinedMuonTrackParticlesAuxDyn.alignEffectChId
+CombinedMuonTrackParticlesAuxDyn.alignEffectDeltaAngle
+CombinedMuonTrackParticlesAuxDyn.alignEffectDeltaTrans
+CombinedMuonTrackParticlesAuxDyn.alignEffectSigmaDeltaAngle
+CombinedMuonTrackParticlesAuxDyn.alignEffectSigmaDeltaTrans
+CombinedMuonTrackParticlesAuxDyn.deltaphi_0
+CombinedMuonTrackParticlesAuxDyn.deltaphi_1
+CombinedMuonTrackParticlesAuxDyn.deltatheta_0
+CombinedMuonTrackParticlesAuxDyn.deltatheta_1
+CombinedMuonTrackParticlesAuxDyn.eProbabilityNN
+CombinedMuonTrackParticlesAuxDyn.parameterPX
+CombinedMuonTrackParticlesAuxDyn.parameterPY
+CombinedMuonTrackParticlesAuxDyn.parameterPZ
+CombinedMuonTrackParticlesAuxDyn.parameterPosition
+CombinedMuonTrackParticlesAuxDyn.parameterX
+CombinedMuonTrackParticlesAuxDyn.parameterY
+CombinedMuonTrackParticlesAuxDyn.parameterZ
+CombinedMuonTrackParticlesAuxDyn.sigmadeltaphi_0
+CombinedMuonTrackParticlesAuxDyn.sigmadeltaphi_1
+CombinedMuonTrackParticlesAuxDyn.sigmadeltatheta_0
+CombinedMuonTrackParticlesAuxDyn.sigmadeltatheta_1
+CombinedMuonTrackParticlesAuxDyn.trackLink
+CombinedMuonTrackParticlesAuxDyn.trackParameterCovarianceMatrices
+CombinedMuonTrackParticlesAuxDyn.truthOrigin
+CombinedMuonTrackParticlesAuxDyn.truthParticleLink
+CombinedMuonTrackParticlesAuxDyn.truthType
+CombinedMuonsLRTTrackParticles
+CombinedMuonsLRTTrackParticlesAux.
+CombinedMuonsLRTTrackParticlesAuxDyn.TRTdEdx
+CombinedMuonsLRTTrackParticlesAuxDyn.TRTdEdxUsedHits
+CombinedMuonsLRTTrackParticlesAuxDyn.alignEffectChId
+CombinedMuonsLRTTrackParticlesAuxDyn.alignEffectDeltaAngle
+CombinedMuonsLRTTrackParticlesAuxDyn.alignEffectDeltaTrans
+CombinedMuonsLRTTrackParticlesAuxDyn.alignEffectSigmaDeltaAngle
+CombinedMuonsLRTTrackParticlesAuxDyn.alignEffectSigmaDeltaTrans
+CombinedMuonsLRTTrackParticlesAuxDyn.deltaphi_0
+CombinedMuonsLRTTrackParticlesAuxDyn.deltaphi_1
+CombinedMuonsLRTTrackParticlesAuxDyn.deltatheta_0
+CombinedMuonsLRTTrackParticlesAuxDyn.deltatheta_1
+CombinedMuonsLRTTrackParticlesAuxDyn.eProbabilityNN
+CombinedMuonsLRTTrackParticlesAuxDyn.parameterPX
+CombinedMuonsLRTTrackParticlesAuxDyn.parameterPY
+CombinedMuonsLRTTrackParticlesAuxDyn.parameterPZ
+CombinedMuonsLRTTrackParticlesAuxDyn.parameterPosition
+CombinedMuonsLRTTrackParticlesAuxDyn.parameterX
+CombinedMuonsLRTTrackParticlesAuxDyn.parameterY
+CombinedMuonsLRTTrackParticlesAuxDyn.parameterZ
+CombinedMuonsLRTTrackParticlesAuxDyn.sigmadeltaphi_0
+CombinedMuonsLRTTrackParticlesAuxDyn.sigmadeltaphi_1
+CombinedMuonsLRTTrackParticlesAuxDyn.sigmadeltatheta_0
+CombinedMuonsLRTTrackParticlesAuxDyn.sigmadeltatheta_1
+CombinedMuonsLRTTrackParticlesAuxDyn.trackLink
+CombinedMuonsLRTTrackParticlesAuxDyn.trackParameterCovarianceMatrices
+CombinedStauTrackParticles
+CombinedStauTrackParticlesAux.
+CombinedStauTrackParticlesAuxDyn.TRTdEdx
+CombinedStauTrackParticlesAuxDyn.TRTdEdxUsedHits
+CombinedStauTrackParticlesAuxDyn.alignEffectChId
+CombinedStauTrackParticlesAuxDyn.alignEffectDeltaAngle
+CombinedStauTrackParticlesAuxDyn.alignEffectDeltaTrans
+CombinedStauTrackParticlesAuxDyn.alignEffectSigmaDeltaAngle
+CombinedStauTrackParticlesAuxDyn.alignEffectSigmaDeltaTrans
+CombinedStauTrackParticlesAuxDyn.deltaphi_0
+CombinedStauTrackParticlesAuxDyn.deltaphi_1
+CombinedStauTrackParticlesAuxDyn.deltatheta_0
+CombinedStauTrackParticlesAuxDyn.deltatheta_1
+CombinedStauTrackParticlesAuxDyn.eProbabilityNN
+CombinedStauTrackParticlesAuxDyn.parameterPX
+CombinedStauTrackParticlesAuxDyn.parameterPY
+CombinedStauTrackParticlesAuxDyn.parameterPZ
+CombinedStauTrackParticlesAuxDyn.parameterPosition
+CombinedStauTrackParticlesAuxDyn.parameterX
+CombinedStauTrackParticlesAuxDyn.parameterY
+CombinedStauTrackParticlesAuxDyn.parameterZ
+CombinedStauTrackParticlesAuxDyn.sigmadeltaphi_0
+CombinedStauTrackParticlesAuxDyn.sigmadeltaphi_1
+CombinedStauTrackParticlesAuxDyn.sigmadeltatheta_0
+CombinedStauTrackParticlesAuxDyn.sigmadeltatheta_1
+CombinedStauTrackParticlesAuxDyn.trackLink
+CombinedStauTrackParticlesAuxDyn.trackParameterCovarianceMatrices
+ConditionsRun
+DataHeader
+DataHeaderForm
+DataHeaderForm
+DiTauJets
+DiTauJetsAux.
+E4prContainer
+ESDtoAOD_mems
+ESDtoAOD_timings
+EVNTtoHITS_timings
+ElectronCaloRings
+ElectronCaloRingsAux.
+ElectronRingSets
+ElectronRingSetsAux.
+Electrons
+ElectronsAux.
+ElectronsAuxDyn.LHLoose
+ElectronsAuxDyn.LHMedium
+ElectronsAuxDyn.LHTight
+ElectronsAuxDyn.LHValue
+ElectronsAuxDyn.Loose
+ElectronsAuxDyn.Medium
+ElectronsAuxDyn.Tight
+ElectronsAuxDyn.ambiguityLink
+ElectronsAuxDyn.ambiguityType
+ElectronsAuxDyn.asy1
+ElectronsAuxDyn.barys1
+ElectronsAuxDyn.caloRingsLinks
+ElectronsAuxDyn.chargedFELinks
+ElectronsAuxDyn.core57cellsEnergyCorrection
+ElectronsAuxDyn.deltaEta1PearDistortion
+ElectronsAuxDyn.e1152
+ElectronsAuxDyn.e132
+ElectronsAuxDyn.e233
+ElectronsAuxDyn.e235
+ElectronsAuxDyn.e237
+ElectronsAuxDyn.e255
+ElectronsAuxDyn.e2ts1
+ElectronsAuxDyn.e2tsts1
+ElectronsAuxDyn.ecore
+ElectronsAuxDyn.ehad1
+ElectronsAuxDyn.emaxs1
+ElectronsAuxDyn.emins1
+ElectronsAuxDyn.ethad
+ElectronsAuxDyn.ethad1
+ElectronsAuxDyn.neutralFELinks
+ElectronsAuxDyn.pos
+ElectronsAuxDyn.pos7
+ElectronsAuxDyn.poscs1
+ElectronsAuxDyn.poscs2
+ElectronsAuxDyn.ptcone20
+ElectronsAuxDyn.ptcone30
+ElectronsAuxDyn.ptvarcone20
+ElectronsAuxDyn.ptvarcone30
+ElectronsAuxDyn.r33over37allcalo
+ElectronsAuxDyn.topoetcone20
+ElectronsAuxDyn.topoetcone20ptCorrection
+ElectronsAuxDyn.topoetcone30
+ElectronsAuxDyn.topoetcone30ptCorrection
+ElectronsAuxDyn.topoetcone40
+ElectronsAuxDyn.topoetcone40ptCorrection
+ElectronsAuxDyn.truthOrigin
+ElectronsAuxDyn.truthParticleLink
+ElectronsAuxDyn.truthType
+ElectronsAuxDyn.widths1
+ElectronsAuxDyn.widths2
+EventFormatStreamAOD
+EventInfo
+EventInfoAux.
+EventInfoAuxDyn.actualInteractionsPerCrossing
+EventInfoAuxDyn.averageInteractionsPerCrossing
+EventInfoAuxDyn.mcChannelNumber
+EventInfoAuxDyn.mcEventNumber
+EventInfoAuxDyn.mcEventWeights
+EventInfoAuxDyn.streamTagDets
+EventInfoAuxDyn.streamTagRobs
+EventInfo_p4
+EventNumber
+EventTime
+EventTimeNanoSec
+EventWeight
+ExtraPolatedMuonsLRTTrackParticles
+ExtraPolatedMuonsLRTTrackParticlesAux.
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.TRTdEdx
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.TRTdEdxUsedHits
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.alignEffectChId
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.alignEffectDeltaAngle
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.alignEffectDeltaTrans
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.alignEffectSigmaDeltaAngle
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.alignEffectSigmaDeltaTrans
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.deltaphi_0
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.deltaphi_1
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.deltatheta_0
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.deltatheta_1
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.eProbabilityNN
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterPX
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterPY
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterPZ
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterPosition
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterX
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterY
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterZ
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.sigmadeltaphi_0
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.sigmadeltaphi_1
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.sigmadeltatheta_0
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.sigmadeltatheta_1
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.trackLink
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.trackParameterCovarianceMatrices
+ExtrapolatedMuonTrackParticles
+ExtrapolatedMuonTrackParticlesAux.
+ExtrapolatedMuonTrackParticlesAuxDyn.TRTdEdx
+ExtrapolatedMuonTrackParticlesAuxDyn.TRTdEdxUsedHits
+ExtrapolatedMuonTrackParticlesAuxDyn.alignEffectChId
+ExtrapolatedMuonTrackParticlesAuxDyn.alignEffectDeltaAngle
+ExtrapolatedMuonTrackParticlesAuxDyn.alignEffectDeltaTrans
+ExtrapolatedMuonTrackParticlesAuxDyn.alignEffectSigmaDeltaAngle
+ExtrapolatedMuonTrackParticlesAuxDyn.alignEffectSigmaDeltaTrans
+ExtrapolatedMuonTrackParticlesAuxDyn.deltaphi_0
+ExtrapolatedMuonTrackParticlesAuxDyn.deltaphi_1
+ExtrapolatedMuonTrackParticlesAuxDyn.deltatheta_0
+ExtrapolatedMuonTrackParticlesAuxDyn.deltatheta_1
+ExtrapolatedMuonTrackParticlesAuxDyn.eProbabilityNN
+ExtrapolatedMuonTrackParticlesAuxDyn.parameterPX
+ExtrapolatedMuonTrackParticlesAuxDyn.parameterPY
+ExtrapolatedMuonTrackParticlesAuxDyn.parameterPZ
+ExtrapolatedMuonTrackParticlesAuxDyn.parameterPosition
+ExtrapolatedMuonTrackParticlesAuxDyn.parameterX
+ExtrapolatedMuonTrackParticlesAuxDyn.parameterY
+ExtrapolatedMuonTrackParticlesAuxDyn.parameterZ
+ExtrapolatedMuonTrackParticlesAuxDyn.sigmadeltaphi_0
+ExtrapolatedMuonTrackParticlesAuxDyn.sigmadeltaphi_1
+ExtrapolatedMuonTrackParticlesAuxDyn.sigmadeltatheta_0
+ExtrapolatedMuonTrackParticlesAuxDyn.sigmadeltatheta_1
+ExtrapolatedMuonTrackParticlesAuxDyn.trackLink
+ExtrapolatedMuonTrackParticlesAuxDyn.trackParameterCovarianceMatrices
+ExtrapolatedMuonTrackParticlesAuxDyn.truthOrigin
+ExtrapolatedMuonTrackParticlesAuxDyn.truthParticleLink
+ExtrapolatedMuonTrackParticlesAuxDyn.truthType
+ExtrapolatedStauTrackParticles
+ExtrapolatedStauTrackParticlesAux.
+FileMetaData
+FileMetaDataAux.
+FileMetaDataAuxDyn.amiTag
+FileMetaDataAuxDyn.beamEnergy
+FileMetaDataAuxDyn.beamType
+FileMetaDataAuxDyn.conditionsTag
+FileMetaDataAuxDyn.geometryVersion
+FileMetaDataAuxDyn.isDataOverlay
+FileMetaDataAuxDyn.mcProcID
+FileMetaDataAuxDyn.simFlavour
+ForwardElectronClusters
+ForwardElectronClustersAux.
+ForwardElectronClustersAuxDyn.AVG_LAR_Q
+ForwardElectronClustersAuxDyn.AVG_TILE_Q
+ForwardElectronClustersAuxDyn.BADLARQ_FRAC
+ForwardElectronClustersAuxDyn.BAD_CELLS_CORR_E
+ForwardElectronClustersAuxDyn.BadChannelList
+ForwardElectronClustersAuxDyn.CELL_SIGNIFICANCE
+ForwardElectronClustersAuxDyn.CELL_SIG_SAMPLING
+ForwardElectronClustersAuxDyn.CENTER_LAMBDA
+ForwardElectronClustersAuxDyn.CENTER_MAG
+ForwardElectronClustersAuxDyn.CENTER_X
+ForwardElectronClustersAuxDyn.CENTER_Y
+ForwardElectronClustersAuxDyn.CENTER_Z
+ForwardElectronClustersAuxDyn.CellLink
+ForwardElectronClustersAuxDyn.DELTA_ALPHA
+ForwardElectronClustersAuxDyn.DELTA_PHI
+ForwardElectronClustersAuxDyn.DELTA_THETA
+ForwardElectronClustersAuxDyn.DM_WEIGHT
+ForwardElectronClustersAuxDyn.EM_PROBABILITY
+ForwardElectronClustersAuxDyn.ENG_BAD_CELLS
+ForwardElectronClustersAuxDyn.ENG_BAD_HV_CELLS
+ForwardElectronClustersAuxDyn.ENG_FRAC_CORE
+ForwardElectronClustersAuxDyn.ENG_FRAC_EM
+ForwardElectronClustersAuxDyn.ENG_FRAC_MAX
+ForwardElectronClustersAuxDyn.ENG_POS
+ForwardElectronClustersAuxDyn.FIRST_ENG_DENS
+ForwardElectronClustersAuxDyn.FIRST_ETA
+ForwardElectronClustersAuxDyn.FIRST_PHI
+ForwardElectronClustersAuxDyn.HAD_WEIGHT
+ForwardElectronClustersAuxDyn.ISOLATION
+ForwardElectronClustersAuxDyn.LATERAL
+ForwardElectronClustersAuxDyn.LONGITUDINAL
+ForwardElectronClustersAuxDyn.MASS
+ForwardElectronClustersAuxDyn.NCELL_SAMPLING
+ForwardElectronClustersAuxDyn.N_BAD_CELLS
+ForwardElectronClustersAuxDyn.N_BAD_CELLS_CORR
+ForwardElectronClustersAuxDyn.N_BAD_HV_CELLS
+ForwardElectronClustersAuxDyn.OOC_WEIGHT
+ForwardElectronClustersAuxDyn.PTD
+ForwardElectronClustersAuxDyn.SECOND_ENG_DENS
+ForwardElectronClustersAuxDyn.SECOND_LAMBDA
+ForwardElectronClustersAuxDyn.SECOND_R
+ForwardElectronClustersAuxDyn.SECOND_TIME
+ForwardElectronClustersAuxDyn.SIGNIFICANCE
+ForwardElectronClustersAuxDyn.constituentClusterLinks
+ForwardElectronClustersAuxDyn.emax_sampl
+ForwardElectronClustersAuxDyn.eta_sampl
+ForwardElectronClustersAuxDyn.etamax_sampl
+ForwardElectronClustersAuxDyn.phi_sampl
+ForwardElectronClustersAuxDyn.phimax_sampl
+ForwardElectronClusters_links
+ForwardElectrons
+ForwardElectronsAux.
+ForwardElectronsAuxDyn.Loose
+ForwardElectronsAuxDyn.Medium
+ForwardElectronsAuxDyn.Tight
+ForwardElectronsAuxDyn.truthOrigin
+ForwardElectronsAuxDyn.truthParticleLink
+ForwardElectronsAuxDyn.truthType
+GSFConversionVertices
+GSFConversionVerticesAux.
+GSFConversionVerticesAuxDyn.DR1R2
+GSFConversionVerticesAuxDyn.deltaCotThetaTrk
+GSFConversionVerticesAuxDyn.deltaInitRadius
+GSFConversionVerticesAuxDyn.deltaPhiTracks
+GSFConversionVerticesAuxDyn.deltaPhiVtxTrk
+GSFConversionVerticesAuxDyn.etaAtCalo
+GSFConversionVerticesAuxDyn.mass
+GSFConversionVerticesAuxDyn.minRfirstHit
+GSFConversionVerticesAuxDyn.minimumDistanceTrk
+GSFConversionVerticesAuxDyn.phiAtCalo
+GSFConversionVerticesAuxDyn.pt1
+GSFConversionVerticesAuxDyn.pt2
+GSFConversionVerticesAuxDyn.px
+GSFConversionVerticesAuxDyn.py
+GSFConversionVerticesAuxDyn.pz
+GSFTrackParticles
+GSFTrackParticlesAux.
+GSFTrackParticlesAuxDyn.QoverPLM
+GSFTrackParticlesAuxDyn.TRTdEdx
+GSFTrackParticlesAuxDyn.TRTdEdxUsedHits
+GSFTrackParticlesAuxDyn.eProbabilityNN
+GSFTrackParticlesAuxDyn.originalTrackParticle
+GSFTrackParticlesAuxDyn.parameterPX
+GSFTrackParticlesAuxDyn.parameterPY
+GSFTrackParticlesAuxDyn.parameterPZ
+GSFTrackParticlesAuxDyn.parameterPosition
+GSFTrackParticlesAuxDyn.parameterX
+GSFTrackParticlesAuxDyn.parameterY
+GSFTrackParticlesAuxDyn.parameterZ
+GSFTrackParticlesAuxDyn.trackLink
+GSFTrackParticlesAuxDyn.trackParameterCovarianceMatrices
+GSFTrackParticlesAuxDyn.truthMatchProbability
+GSFTrackParticlesAuxDyn.truthOrigin
+GSFTrackParticlesAuxDyn.truthParticleLink
+GSFTrackParticlesAuxDyn.truthType
+HITStoRDO_timings
+HLTNav_R2ToR3Summary
+HLTNav_R2ToR3SummaryAux.
+HLTNav_Summary_ESDSlimmed
+HLTNav_Summary_ESDSlimmedAux.
+HLTNav_Summary_OnlineSlimmed
+HLTNav_Summary_OnlineSlimmedAux.
+HLT_AFPTrackContainer
+HLT_AFPTrackContainerAux.
+HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftf
+HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAux.
+HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAuxDyn.ActiveArea
+HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAuxDyn.ActiveArea4vec_eta
+HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAuxDyn.ActiveArea4vec_m
+HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAuxDyn.ActiveArea4vec_phi
+HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAuxDyn.ActiveArea4vec_pt
+HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAuxDyn.AlgorithmType
+HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAuxDyn.DetectorEta
+HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAuxDyn.DetectorPhi
+HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAuxDyn.InputType
+HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAuxDyn.JVFCorr
+HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_eta
+HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_m
+HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_phi
+HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_pt
+HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAuxDyn.Jvt
+HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAuxDyn.JvtRpt
+HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAuxDyn.NumTrkPt1000
+HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAuxDyn.NumTrkPt500
+HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAuxDyn.SizeParameter
+HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAuxDyn.SumPtChargedPFOPt500
+HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAuxDyn.SumPtTrkPt1000
+HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAuxDyn.SumPtTrkPt500
+HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAuxDyn.TrackWidthPt1000
+HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_jes_ftf
+HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_jes_ftfAux.
+HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_jes_ftfAuxDyn.AlgorithmType
+HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_jes_ftfAuxDyn.DetectorEta
+HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_jes_ftfAuxDyn.DetectorPhi
+HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_jes_ftfAuxDyn.InputType
+HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_jes_ftfAuxDyn.JetConstitScaleMomentum_eta
+HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_jes_ftfAuxDyn.JetConstitScaleMomentum_m
+HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_jes_ftfAuxDyn.JetConstitScaleMomentum_phi
+HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_jes_ftfAuxDyn.JetConstitScaleMomentum_pt
+HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_jes_ftfAuxDyn.JetEtaJESScaleMomentum_eta
+HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_jes_ftfAuxDyn.JetEtaJESScaleMomentum_m
+HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_jes_ftfAuxDyn.JetEtaJESScaleMomentum_phi
+HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_jes_ftfAuxDyn.JetEtaJESScaleMomentum_pt
+HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_jes_ftfAuxDyn.SizeParameter
+HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_nojcalib_ftf
+HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_nojcalib_ftfAux.
+HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_nojcalib_ftfAuxDyn.AlgorithmType
+HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_nojcalib_ftfAuxDyn.InputType
+HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_eta
+HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_m
+HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_phi
+HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_pt
+HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_nojcalib_ftfAuxDyn.SizeParameter
+HLT_AntiKt10EMPFlowJets_nojcalib_ftf
+HLT_AntiKt10EMPFlowJets_nojcalib_ftfAux.
+HLT_AntiKt10EMPFlowJets_nojcalib_ftfAuxDyn.ActiveArea
+HLT_AntiKt10EMPFlowJets_nojcalib_ftfAuxDyn.ActiveArea4vec_eta
+HLT_AntiKt10EMPFlowJets_nojcalib_ftfAuxDyn.ActiveArea4vec_m
+HLT_AntiKt10EMPFlowJets_nojcalib_ftfAuxDyn.ActiveArea4vec_phi
+HLT_AntiKt10EMPFlowJets_nojcalib_ftfAuxDyn.ActiveArea4vec_pt
+HLT_AntiKt10EMPFlowJets_nojcalib_ftfAuxDyn.AlgorithmType
+HLT_AntiKt10EMPFlowJets_nojcalib_ftfAuxDyn.DetectorEta
+HLT_AntiKt10EMPFlowJets_nojcalib_ftfAuxDyn.DetectorPhi
+HLT_AntiKt10EMPFlowJets_nojcalib_ftfAuxDyn.InputType
+HLT_AntiKt10EMPFlowJets_nojcalib_ftfAuxDyn.JVFCorr
+HLT_AntiKt10EMPFlowJets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_eta
+HLT_AntiKt10EMPFlowJets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_m
+HLT_AntiKt10EMPFlowJets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_phi
+HLT_AntiKt10EMPFlowJets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_pt
+HLT_AntiKt10EMPFlowJets_nojcalib_ftfAuxDyn.Jvt
+HLT_AntiKt10EMPFlowJets_nojcalib_ftfAuxDyn.JvtRpt
+HLT_AntiKt10EMPFlowJets_nojcalib_ftfAuxDyn.NumTrkPt1000
+HLT_AntiKt10EMPFlowJets_nojcalib_ftfAuxDyn.NumTrkPt500
+HLT_AntiKt10EMPFlowJets_nojcalib_ftfAuxDyn.SizeParameter
+HLT_AntiKt10EMPFlowJets_nojcalib_ftfAuxDyn.SumPtChargedPFOPt500
+HLT_AntiKt10EMPFlowJets_nojcalib_ftfAuxDyn.SumPtTrkPt1000
+HLT_AntiKt10EMPFlowJets_nojcalib_ftfAuxDyn.SumPtTrkPt500
+HLT_AntiKt10EMPFlowJets_nojcalib_ftfAuxDyn.TrackWidthPt1000
+HLT_AntiKt10EMPFlowSoftDropBeta100Zcut10Jets_nojcalib_ftf
+HLT_AntiKt10EMPFlowSoftDropBeta100Zcut10Jets_nojcalib_ftfAux.
+HLT_AntiKt10EMPFlowSoftDropBeta100Zcut10Jets_nojcalib_ftfAuxDyn.AlgorithmType
+HLT_AntiKt10EMPFlowSoftDropBeta100Zcut10Jets_nojcalib_ftfAuxDyn.InputType
+HLT_AntiKt10EMPFlowSoftDropBeta100Zcut10Jets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_eta
+HLT_AntiKt10EMPFlowSoftDropBeta100Zcut10Jets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_m
+HLT_AntiKt10EMPFlowSoftDropBeta100Zcut10Jets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_phi
+HLT_AntiKt10EMPFlowSoftDropBeta100Zcut10Jets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_pt
+HLT_AntiKt10EMPFlowSoftDropBeta100Zcut10Jets_nojcalib_ftfAuxDyn.SizeParameter
+HLT_AntiKt10EMTopoRCJets_subjesIS
+HLT_AntiKt10EMTopoRCJets_subjesISAux.
+HLT_AntiKt10EMTopoRCJets_subjesISAuxDyn.ActiveArea
+HLT_AntiKt10EMTopoRCJets_subjesISAuxDyn.ActiveArea4vec_eta
+HLT_AntiKt10EMTopoRCJets_subjesISAuxDyn.ActiveArea4vec_m
+HLT_AntiKt10EMTopoRCJets_subjesISAuxDyn.ActiveArea4vec_phi
+HLT_AntiKt10EMTopoRCJets_subjesISAuxDyn.ActiveArea4vec_pt
+HLT_AntiKt10EMTopoRCJets_subjesISAuxDyn.AlgorithmType
+HLT_AntiKt10EMTopoRCJets_subjesISAuxDyn.InputType
+HLT_AntiKt10EMTopoRCJets_subjesISAuxDyn.JetConstitScaleMomentum_eta
+HLT_AntiKt10EMTopoRCJets_subjesISAuxDyn.JetConstitScaleMomentum_m
+HLT_AntiKt10EMTopoRCJets_subjesISAuxDyn.JetConstitScaleMomentum_phi
+HLT_AntiKt10EMTopoRCJets_subjesISAuxDyn.JetConstitScaleMomentum_pt
+HLT_AntiKt10EMTopoRCJets_subjesISAuxDyn.SizeParameter
+HLT_AntiKt10LCTopoJets_nojcalib
+HLT_AntiKt10LCTopoJets_nojcalibAux.
+HLT_AntiKt10LCTopoJets_nojcalibAuxDyn.ActiveArea
+HLT_AntiKt10LCTopoJets_nojcalibAuxDyn.ActiveArea4vec_eta
+HLT_AntiKt10LCTopoJets_nojcalibAuxDyn.ActiveArea4vec_m
+HLT_AntiKt10LCTopoJets_nojcalibAuxDyn.ActiveArea4vec_phi
+HLT_AntiKt10LCTopoJets_nojcalibAuxDyn.ActiveArea4vec_pt
+HLT_AntiKt10LCTopoJets_nojcalibAuxDyn.AlgorithmType
+HLT_AntiKt10LCTopoJets_nojcalibAuxDyn.DetectorEta
+HLT_AntiKt10LCTopoJets_nojcalibAuxDyn.DetectorPhi
+HLT_AntiKt10LCTopoJets_nojcalibAuxDyn.InputType
+HLT_AntiKt10LCTopoJets_nojcalibAuxDyn.JetConstitScaleMomentum_eta
+HLT_AntiKt10LCTopoJets_nojcalibAuxDyn.JetConstitScaleMomentum_m
+HLT_AntiKt10LCTopoJets_nojcalibAuxDyn.JetConstitScaleMomentum_phi
+HLT_AntiKt10LCTopoJets_nojcalibAuxDyn.JetConstitScaleMomentum_pt
+HLT_AntiKt10LCTopoJets_nojcalibAuxDyn.SizeParameter
+HLT_AntiKt10LCTopoJets_subjes
+HLT_AntiKt10LCTopoJets_subjesAux.
+HLT_AntiKt10LCTopoJets_subjesAuxDyn.JetEtaJESScaleMomentum_eta
+HLT_AntiKt10LCTopoJets_subjesAuxDyn.JetEtaJESScaleMomentum_m
+HLT_AntiKt10LCTopoJets_subjesAuxDyn.JetEtaJESScaleMomentum_phi
+HLT_AntiKt10LCTopoJets_subjesAuxDyn.JetEtaJESScaleMomentum_pt
+HLT_AntiKt10LCTopoJets_subjesAuxDyn.JetPileupScaleMomentum_eta
+HLT_AntiKt10LCTopoJets_subjesAuxDyn.JetPileupScaleMomentum_m
+HLT_AntiKt10LCTopoJets_subjesAuxDyn.JetPileupScaleMomentum_phi
+HLT_AntiKt10LCTopoJets_subjesAuxDyn.JetPileupScaleMomentum_pt
+HLT_AntiKt10LCTopoJets_subjesAuxDyn.eta
+HLT_AntiKt10LCTopoJets_subjesAuxDyn.m
+HLT_AntiKt10LCTopoJets_subjesAuxDyn.phi
+HLT_AntiKt10LCTopoJets_subjesAuxDyn.pt
+HLT_AntiKt10LCTopoSoftDropBeta100Zcut10Jets_nojcalib
+HLT_AntiKt10LCTopoSoftDropBeta100Zcut10Jets_nojcalibAux.
+HLT_AntiKt10LCTopoSoftDropBeta100Zcut10Jets_nojcalibAuxDyn.AlgorithmType
+HLT_AntiKt10LCTopoSoftDropBeta100Zcut10Jets_nojcalibAuxDyn.InputType
+HLT_AntiKt10LCTopoSoftDropBeta100Zcut10Jets_nojcalibAuxDyn.JetConstitScaleMomentum_eta
+HLT_AntiKt10LCTopoSoftDropBeta100Zcut10Jets_nojcalibAuxDyn.JetConstitScaleMomentum_m
+HLT_AntiKt10LCTopoSoftDropBeta100Zcut10Jets_nojcalibAuxDyn.JetConstitScaleMomentum_phi
+HLT_AntiKt10LCTopoSoftDropBeta100Zcut10Jets_nojcalibAuxDyn.JetConstitScaleMomentum_pt
+HLT_AntiKt10LCTopoSoftDropBeta100Zcut10Jets_nojcalibAuxDyn.SizeParameter
+HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jes
+HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jesAux.
+HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jesAuxDyn.AlgorithmType
+HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jesAuxDyn.DetectorEta
+HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jesAuxDyn.DetectorPhi
+HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jesAuxDyn.InputType
+HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jesAuxDyn.JetConstitScaleMomentum_eta
+HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jesAuxDyn.JetConstitScaleMomentum_m
+HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jesAuxDyn.JetConstitScaleMomentum_phi
+HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jesAuxDyn.JetConstitScaleMomentum_pt
+HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jesAuxDyn.JetEtaJESScaleMomentum_eta
+HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jesAuxDyn.JetEtaJESScaleMomentum_m
+HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jesAuxDyn.JetEtaJESScaleMomentum_phi
+HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jesAuxDyn.JetEtaJESScaleMomentum_pt
+HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jesAuxDyn.SizeParameter
+HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_nojcalib
+HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_nojcalibAux.
+HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_nojcalibAuxDyn.AlgorithmType
+HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_nojcalibAuxDyn.InputType
+HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_nojcalibAuxDyn.JetConstitScaleMomentum_eta
+HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_nojcalibAuxDyn.JetConstitScaleMomentum_m
+HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_nojcalibAuxDyn.JetConstitScaleMomentum_phi
+HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_nojcalibAuxDyn.JetConstitScaleMomentum_pt
+HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_nojcalibAuxDyn.SizeParameter
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftf
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAux.
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.ActiveArea
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.ActiveArea4vec_eta
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.ActiveArea4vec_m
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.ActiveArea4vec_phi
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.ActiveArea4vec_pt
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.AlgorithmType
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.DetectorEta
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.DetectorPhi
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.EMFrac
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.EnergyPerSampling
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.HECFrac
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.InputType
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.JVFCorr
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_eta
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_m
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_phi
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_pt
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.Jvt
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.JvtRpt
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.NumTrkPt1000
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.NumTrkPt500
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.SizeParameter
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.SumPtChargedPFOPt500
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.SumPtTrkPt1000
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.SumPtTrkPt500
+HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAuxDyn.TrackWidthPt1000
+HLT_AntiKt4EMPFlowJets_nojcalib_ftf
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAux.
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.ActiveArea
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.ActiveArea4vec_eta
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.ActiveArea4vec_m
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.ActiveArea4vec_phi
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.ActiveArea4vec_pt
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.AlgorithmType
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.DetectorEta
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.DetectorPhi
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.EMFrac
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.EnergyPerSampling
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.HECFrac
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.InputType
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.JVFCorr
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_eta
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_m
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_phi
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_pt
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.Jvt
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.JvtRpt
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.NumTrkPt1000
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.NumTrkPt500
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.SizeParameter
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.SumPtChargedPFOPt500
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.SumPtTrkPt1000
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.SumPtTrkPt500
+HLT_AntiKt4EMPFlowJets_nojcalib_ftfAuxDyn.TrackWidthPt1000
+HLT_AntiKt4EMPFlowJets_subjesIS_ftf
+HLT_AntiKt4EMPFlowJets_subjesIS_ftfAux.
+HLT_AntiKt4EMPFlowJets_subjesgscIS_ftf
+HLT_AntiKt4EMPFlowJets_subjesgscIS_ftfAux.
+HLT_AntiKt4EMPFlowJets_subjesgscIS_ftfAuxDyn.JetEtaJESScaleMomentum_eta
+HLT_AntiKt4EMPFlowJets_subjesgscIS_ftfAuxDyn.JetEtaJESScaleMomentum_m
+HLT_AntiKt4EMPFlowJets_subjesgscIS_ftfAuxDyn.JetEtaJESScaleMomentum_phi
+HLT_AntiKt4EMPFlowJets_subjesgscIS_ftfAuxDyn.JetEtaJESScaleMomentum_pt
+HLT_AntiKt4EMPFlowJets_subjesgscIS_ftfAuxDyn.JetGSCScaleMomentum_eta
+HLT_AntiKt4EMPFlowJets_subjesgscIS_ftfAuxDyn.JetGSCScaleMomentum_m
+HLT_AntiKt4EMPFlowJets_subjesgscIS_ftfAuxDyn.JetGSCScaleMomentum_phi
+HLT_AntiKt4EMPFlowJets_subjesgscIS_ftfAuxDyn.JetGSCScaleMomentum_pt
+HLT_AntiKt4EMPFlowJets_subjesgscIS_ftfAuxDyn.JetPileupScaleMomentum_eta
+HLT_AntiKt4EMPFlowJets_subjesgscIS_ftfAuxDyn.JetPileupScaleMomentum_m
+HLT_AntiKt4EMPFlowJets_subjesgscIS_ftfAuxDyn.JetPileupScaleMomentum_phi
+HLT_AntiKt4EMPFlowJets_subjesgscIS_ftfAuxDyn.JetPileupScaleMomentum_pt
+HLT_AntiKt4EMPFlowJets_subjesgscIS_ftfAuxDyn.Jvt
+HLT_AntiKt4EMPFlowJets_subjesgscIS_ftfAuxDyn.JvtRpt
+HLT_AntiKt4EMPFlowJets_subjesgscIS_ftfAuxDyn.eta
+HLT_AntiKt4EMPFlowJets_subjesgscIS_ftfAuxDyn.m
+HLT_AntiKt4EMPFlowJets_subjesgscIS_ftfAuxDyn.phi
+HLT_AntiKt4EMPFlowJets_subjesgscIS_ftfAuxDyn.pt
+HLT_AntiKt4EMPFlowJets_subjesgsc_ftf
+HLT_AntiKt4EMPFlowJets_subjesgsc_ftfAux.
+HLT_AntiKt4EMPFlowJets_subjesgsc_ftfAuxDyn.JetEtaJESScaleMomentum_eta
+HLT_AntiKt4EMPFlowJets_subjesgsc_ftfAuxDyn.JetEtaJESScaleMomentum_m
+HLT_AntiKt4EMPFlowJets_subjesgsc_ftfAuxDyn.JetEtaJESScaleMomentum_phi
+HLT_AntiKt4EMPFlowJets_subjesgsc_ftfAuxDyn.JetEtaJESScaleMomentum_pt
+HLT_AntiKt4EMPFlowJets_subjesgsc_ftfAuxDyn.JetGSCScaleMomentum_eta
+HLT_AntiKt4EMPFlowJets_subjesgsc_ftfAuxDyn.JetGSCScaleMomentum_m
+HLT_AntiKt4EMPFlowJets_subjesgsc_ftfAuxDyn.JetGSCScaleMomentum_phi
+HLT_AntiKt4EMPFlowJets_subjesgsc_ftfAuxDyn.JetGSCScaleMomentum_pt
+HLT_AntiKt4EMPFlowJets_subjesgsc_ftfAuxDyn.JetPileupScaleMomentum_eta
+HLT_AntiKt4EMPFlowJets_subjesgsc_ftfAuxDyn.JetPileupScaleMomentum_m
+HLT_AntiKt4EMPFlowJets_subjesgsc_ftfAuxDyn.JetPileupScaleMomentum_phi
+HLT_AntiKt4EMPFlowJets_subjesgsc_ftfAuxDyn.JetPileupScaleMomentum_pt
+HLT_AntiKt4EMPFlowJets_subjesgsc_ftfAuxDyn.Jvt
+HLT_AntiKt4EMPFlowJets_subjesgsc_ftfAuxDyn.JvtRpt
+HLT_AntiKt4EMPFlowJets_subjesgsc_ftfAuxDyn.eta
+HLT_AntiKt4EMPFlowJets_subjesgsc_ftfAuxDyn.m
+HLT_AntiKt4EMPFlowJets_subjesgsc_ftfAuxDyn.phi
+HLT_AntiKt4EMPFlowJets_subjesgsc_ftfAuxDyn.pt
+HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftf
+HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftfAux.
+HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftfAuxDyn.JetEtaJESScaleMomentum_eta
+HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftfAuxDyn.JetEtaJESScaleMomentum_m
+HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftfAuxDyn.JetEtaJESScaleMomentum_phi
+HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftfAuxDyn.JetEtaJESScaleMomentum_pt
+HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftfAuxDyn.JetGSCScaleMomentum_eta
+HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftfAuxDyn.JetGSCScaleMomentum_m
+HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftfAuxDyn.JetGSCScaleMomentum_phi
+HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftfAuxDyn.JetGSCScaleMomentum_pt
+HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftfAuxDyn.JetPileupScaleMomentum_eta
+HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftfAuxDyn.JetPileupScaleMomentum_m
+HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftfAuxDyn.JetPileupScaleMomentum_phi
+HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftfAuxDyn.JetPileupScaleMomentum_pt
+HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftfAuxDyn.Jvt
+HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftfAuxDyn.JvtRpt
+HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftfAuxDyn.eta
+HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftfAuxDyn.m
+HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftfAuxDyn.phi
+HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftfAuxDyn.pt
+HLT_AntiKt4EMPFlowJets_subresjesgsc_ftf
+HLT_AntiKt4EMPFlowJets_subresjesgsc_ftfAux.
+HLT_AntiKt4EMPFlowJets_subresjesgsc_ftfAuxDyn.JetEtaJESScaleMomentum_eta
+HLT_AntiKt4EMPFlowJets_subresjesgsc_ftfAuxDyn.JetEtaJESScaleMomentum_m
+HLT_AntiKt4EMPFlowJets_subresjesgsc_ftfAuxDyn.JetEtaJESScaleMomentum_phi
+HLT_AntiKt4EMPFlowJets_subresjesgsc_ftfAuxDyn.JetEtaJESScaleMomentum_pt
+HLT_AntiKt4EMPFlowJets_subresjesgsc_ftfAuxDyn.JetGSCScaleMomentum_eta
+HLT_AntiKt4EMPFlowJets_subresjesgsc_ftfAuxDyn.JetGSCScaleMomentum_m
+HLT_AntiKt4EMPFlowJets_subresjesgsc_ftfAuxDyn.JetGSCScaleMomentum_phi
+HLT_AntiKt4EMPFlowJets_subresjesgsc_ftfAuxDyn.JetGSCScaleMomentum_pt
+HLT_AntiKt4EMPFlowJets_subresjesgsc_ftfAuxDyn.JetPileupScaleMomentum_eta
+HLT_AntiKt4EMPFlowJets_subresjesgsc_ftfAuxDyn.JetPileupScaleMomentum_m
+HLT_AntiKt4EMPFlowJets_subresjesgsc_ftfAuxDyn.JetPileupScaleMomentum_phi
+HLT_AntiKt4EMPFlowJets_subresjesgsc_ftfAuxDyn.JetPileupScaleMomentum_pt
+HLT_AntiKt4EMPFlowJets_subresjesgsc_ftfAuxDyn.Jvt
+HLT_AntiKt4EMPFlowJets_subresjesgsc_ftfAuxDyn.JvtRpt
+HLT_AntiKt4EMPFlowJets_subresjesgsc_ftfAuxDyn.eta
+HLT_AntiKt4EMPFlowJets_subresjesgsc_ftfAuxDyn.m
+HLT_AntiKt4EMPFlowJets_subresjesgsc_ftfAuxDyn.phi
+HLT_AntiKt4EMPFlowJets_subresjesgsc_ftfAuxDyn.pt
+HLT_AntiKt4EMTopoCSSKJets_nojcalib
+HLT_AntiKt4EMTopoCSSKJets_nojcalibAux.
+HLT_AntiKt4EMTopoCSSKJets_nojcalibAuxDyn.ActiveArea
+HLT_AntiKt4EMTopoCSSKJets_nojcalibAuxDyn.ActiveArea4vec_eta
+HLT_AntiKt4EMTopoCSSKJets_nojcalibAuxDyn.ActiveArea4vec_m
+HLT_AntiKt4EMTopoCSSKJets_nojcalibAuxDyn.ActiveArea4vec_phi
+HLT_AntiKt4EMTopoCSSKJets_nojcalibAuxDyn.ActiveArea4vec_pt
+HLT_AntiKt4EMTopoCSSKJets_nojcalibAuxDyn.AlgorithmType
+HLT_AntiKt4EMTopoCSSKJets_nojcalibAuxDyn.DetectorEta
+HLT_AntiKt4EMTopoCSSKJets_nojcalibAuxDyn.DetectorPhi
+HLT_AntiKt4EMTopoCSSKJets_nojcalibAuxDyn.EMFrac
+HLT_AntiKt4EMTopoCSSKJets_nojcalibAuxDyn.EnergyPerSampling
+HLT_AntiKt4EMTopoCSSKJets_nojcalibAuxDyn.HECFrac
+HLT_AntiKt4EMTopoCSSKJets_nojcalibAuxDyn.InputType
+HLT_AntiKt4EMTopoCSSKJets_nojcalibAuxDyn.JetConstitScaleMomentum_eta
+HLT_AntiKt4EMTopoCSSKJets_nojcalibAuxDyn.JetConstitScaleMomentum_m
+HLT_AntiKt4EMTopoCSSKJets_nojcalibAuxDyn.JetConstitScaleMomentum_phi
+HLT_AntiKt4EMTopoCSSKJets_nojcalibAuxDyn.JetConstitScaleMomentum_pt
+HLT_AntiKt4EMTopoCSSKJets_nojcalibAuxDyn.SizeParameter
+HLT_AntiKt4EMTopoJets_nojcalib
+HLT_AntiKt4EMTopoJets_nojcalibAux.
+HLT_AntiKt4EMTopoJets_nojcalibAuxDyn.ActiveArea
+HLT_AntiKt4EMTopoJets_nojcalibAuxDyn.ActiveArea4vec_eta
+HLT_AntiKt4EMTopoJets_nojcalibAuxDyn.ActiveArea4vec_m
+HLT_AntiKt4EMTopoJets_nojcalibAuxDyn.ActiveArea4vec_phi
+HLT_AntiKt4EMTopoJets_nojcalibAuxDyn.ActiveArea4vec_pt
+HLT_AntiKt4EMTopoJets_nojcalibAuxDyn.AlgorithmType
+HLT_AntiKt4EMTopoJets_nojcalibAuxDyn.DetectorEta
+HLT_AntiKt4EMTopoJets_nojcalibAuxDyn.DetectorPhi
+HLT_AntiKt4EMTopoJets_nojcalibAuxDyn.EMFrac
+HLT_AntiKt4EMTopoJets_nojcalibAuxDyn.EnergyPerSampling
+HLT_AntiKt4EMTopoJets_nojcalibAuxDyn.HECFrac
+HLT_AntiKt4EMTopoJets_nojcalibAuxDyn.InputType
+HLT_AntiKt4EMTopoJets_nojcalibAuxDyn.JetConstitScaleMomentum_eta
+HLT_AntiKt4EMTopoJets_nojcalibAuxDyn.JetConstitScaleMomentum_m
+HLT_AntiKt4EMTopoJets_nojcalibAuxDyn.JetConstitScaleMomentum_phi
+HLT_AntiKt4EMTopoJets_nojcalibAuxDyn.JetConstitScaleMomentum_pt
+HLT_AntiKt4EMTopoJets_nojcalibAuxDyn.SizeParameter
+HLT_AntiKt4EMTopoJets_nojcalib_ftf
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAux.
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAuxDyn.ActiveArea
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAuxDyn.ActiveArea4vec_eta
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAuxDyn.ActiveArea4vec_m
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAuxDyn.ActiveArea4vec_phi
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAuxDyn.ActiveArea4vec_pt
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAuxDyn.AlgorithmType
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAuxDyn.DetectorEta
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAuxDyn.DetectorPhi
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAuxDyn.EMFrac
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAuxDyn.EnergyPerSampling
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAuxDyn.HECFrac
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAuxDyn.InputType
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAuxDyn.JVFCorr
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_eta
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_m
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_phi
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAuxDyn.JetConstitScaleMomentum_pt
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAuxDyn.Jvt
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAuxDyn.JvtRpt
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAuxDyn.NumTrkPt1000
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAuxDyn.NumTrkPt500
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAuxDyn.SizeParameter
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAuxDyn.SumPtTrkPt1000
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAuxDyn.SumPtTrkPt500
+HLT_AntiKt4EMTopoJets_nojcalib_ftfAuxDyn.TrackWidthPt1000
+HLT_AntiKt4EMTopoJets_subjes
+HLT_AntiKt4EMTopoJets_subjesAux.
+HLT_AntiKt4EMTopoJets_subjesIS
+HLT_AntiKt4EMTopoJets_subjesISAux.
+HLT_AntiKt4EMTopoJets_subjesISAuxDyn.JetEtaJESScaleMomentum_eta
+HLT_AntiKt4EMTopoJets_subjesISAuxDyn.JetEtaJESScaleMomentum_m
+HLT_AntiKt4EMTopoJets_subjesISAuxDyn.JetEtaJESScaleMomentum_phi
+HLT_AntiKt4EMTopoJets_subjesISAuxDyn.JetEtaJESScaleMomentum_pt
+HLT_AntiKt4EMTopoJets_subjesISAuxDyn.JetGSCScaleMomentum_eta
+HLT_AntiKt4EMTopoJets_subjesISAuxDyn.JetGSCScaleMomentum_m
+HLT_AntiKt4EMTopoJets_subjesISAuxDyn.JetGSCScaleMomentum_phi
+HLT_AntiKt4EMTopoJets_subjesISAuxDyn.JetGSCScaleMomentum_pt
+HLT_AntiKt4EMTopoJets_subjesISAuxDyn.JetPileupScaleMomentum_eta
+HLT_AntiKt4EMTopoJets_subjesISAuxDyn.JetPileupScaleMomentum_m
+HLT_AntiKt4EMTopoJets_subjesISAuxDyn.JetPileupScaleMomentum_phi
+HLT_AntiKt4EMTopoJets_subjesISAuxDyn.JetPileupScaleMomentum_pt
+HLT_AntiKt4EMTopoJets_subjesISAuxDyn.eta
+HLT_AntiKt4EMTopoJets_subjesISAuxDyn.m
+HLT_AntiKt4EMTopoJets_subjesISAuxDyn.phi
+HLT_AntiKt4EMTopoJets_subjesISAuxDyn.pt
+HLT_AntiKt4EMTopoJets_subjesIS_ftf
+HLT_AntiKt4EMTopoJets_subjesIS_ftfAux.
+HLT_AntiKt4EMTopoJets_subjesIS_ftfAuxDyn.JetEtaJESScaleMomentum_eta
+HLT_AntiKt4EMTopoJets_subjesIS_ftfAuxDyn.JetEtaJESScaleMomentum_m
+HLT_AntiKt4EMTopoJets_subjesIS_ftfAuxDyn.JetEtaJESScaleMomentum_phi
+HLT_AntiKt4EMTopoJets_subjesIS_ftfAuxDyn.JetEtaJESScaleMomentum_pt
+HLT_AntiKt4EMTopoJets_subjesIS_ftfAuxDyn.JetGSCScaleMomentum_eta
+HLT_AntiKt4EMTopoJets_subjesIS_ftfAuxDyn.JetGSCScaleMomentum_m
+HLT_AntiKt4EMTopoJets_subjesIS_ftfAuxDyn.JetGSCScaleMomentum_phi
+HLT_AntiKt4EMTopoJets_subjesIS_ftfAuxDyn.JetGSCScaleMomentum_pt
+HLT_AntiKt4EMTopoJets_subjesIS_ftfAuxDyn.JetPileupScaleMomentum_eta
+HLT_AntiKt4EMTopoJets_subjesIS_ftfAuxDyn.JetPileupScaleMomentum_m
+HLT_AntiKt4EMTopoJets_subjesIS_ftfAuxDyn.JetPileupScaleMomentum_phi
+HLT_AntiKt4EMTopoJets_subjesIS_ftfAuxDyn.JetPileupScaleMomentum_pt
+HLT_AntiKt4EMTopoJets_subjesIS_ftfAuxDyn.Jvt
+HLT_AntiKt4EMTopoJets_subjesIS_ftfAuxDyn.JvtRpt
+HLT_AntiKt4EMTopoJets_subjesIS_ftfAuxDyn.eta
+HLT_AntiKt4EMTopoJets_subjesIS_ftfAuxDyn.m
+HLT_AntiKt4EMTopoJets_subjesIS_ftfAuxDyn.phi
+HLT_AntiKt4EMTopoJets_subjesIS_ftfAuxDyn.pt
+HLT_AntiKt4EMTopoJets_subjesgscIS_ftf
+HLT_AntiKt4EMTopoJets_subjesgscIS_ftfAux.
+HLT_AntiKt4EMTopoJets_subjesgscIS_ftfAuxDyn.JetEtaJESScaleMomentum_eta
+HLT_AntiKt4EMTopoJets_subjesgscIS_ftfAuxDyn.JetEtaJESScaleMomentum_m
+HLT_AntiKt4EMTopoJets_subjesgscIS_ftfAuxDyn.JetEtaJESScaleMomentum_phi
+HLT_AntiKt4EMTopoJets_subjesgscIS_ftfAuxDyn.JetEtaJESScaleMomentum_pt
+HLT_AntiKt4EMTopoJets_subjesgscIS_ftfAuxDyn.JetGSCScaleMomentum_eta
+HLT_AntiKt4EMTopoJets_subjesgscIS_ftfAuxDyn.JetGSCScaleMomentum_m
+HLT_AntiKt4EMTopoJets_subjesgscIS_ftfAuxDyn.JetGSCScaleMomentum_phi
+HLT_AntiKt4EMTopoJets_subjesgscIS_ftfAuxDyn.JetGSCScaleMomentum_pt
+HLT_AntiKt4EMTopoJets_subjesgscIS_ftfAuxDyn.JetPileupScaleMomentum_eta
+HLT_AntiKt4EMTopoJets_subjesgscIS_ftfAuxDyn.JetPileupScaleMomentum_m
+HLT_AntiKt4EMTopoJets_subjesgscIS_ftfAuxDyn.JetPileupScaleMomentum_phi
+HLT_AntiKt4EMTopoJets_subjesgscIS_ftfAuxDyn.JetPileupScaleMomentum_pt
+HLT_AntiKt4EMTopoJets_subjesgscIS_ftfAuxDyn.Jvt
+HLT_AntiKt4EMTopoJets_subjesgscIS_ftfAuxDyn.JvtRpt
+HLT_AntiKt4EMTopoJets_subjesgscIS_ftfAuxDyn.eta
+HLT_AntiKt4EMTopoJets_subjesgscIS_ftfAuxDyn.m
+HLT_AntiKt4EMTopoJets_subjesgscIS_ftfAuxDyn.phi
+HLT_AntiKt4EMTopoJets_subjesgscIS_ftfAuxDyn.pt
+HLT_AntiKt4EMTopoJets_subjesgsc_ftf
+HLT_AntiKt4EMTopoJets_subjesgsc_ftfAux.
+HLT_AntiKt4EMTopoJets_subjesgsc_ftfAuxDyn.JetEtaJESScaleMomentum_eta
+HLT_AntiKt4EMTopoJets_subjesgsc_ftfAuxDyn.JetEtaJESScaleMomentum_m
+HLT_AntiKt4EMTopoJets_subjesgsc_ftfAuxDyn.JetEtaJESScaleMomentum_phi
+HLT_AntiKt4EMTopoJets_subjesgsc_ftfAuxDyn.JetEtaJESScaleMomentum_pt
+HLT_AntiKt4EMTopoJets_subjesgsc_ftfAuxDyn.JetGSCScaleMomentum_eta
+HLT_AntiKt4EMTopoJets_subjesgsc_ftfAuxDyn.JetGSCScaleMomentum_m
+HLT_AntiKt4EMTopoJets_subjesgsc_ftfAuxDyn.JetGSCScaleMomentum_phi
+HLT_AntiKt4EMTopoJets_subjesgsc_ftfAuxDyn.JetGSCScaleMomentum_pt
+HLT_AntiKt4EMTopoJets_subjesgsc_ftfAuxDyn.JetPileupScaleMomentum_eta
+HLT_AntiKt4EMTopoJets_subjesgsc_ftfAuxDyn.JetPileupScaleMomentum_m
+HLT_AntiKt4EMTopoJets_subjesgsc_ftfAuxDyn.JetPileupScaleMomentum_phi
+HLT_AntiKt4EMTopoJets_subjesgsc_ftfAuxDyn.JetPileupScaleMomentum_pt
+HLT_AntiKt4EMTopoJets_subjesgsc_ftfAuxDyn.Jvt
+HLT_AntiKt4EMTopoJets_subjesgsc_ftfAuxDyn.JvtRpt
+HLT_AntiKt4EMTopoJets_subjesgsc_ftfAuxDyn.eta
+HLT_AntiKt4EMTopoJets_subjesgsc_ftfAuxDyn.m
+HLT_AntiKt4EMTopoJets_subjesgsc_ftfAuxDyn.phi
+HLT_AntiKt4EMTopoJets_subjesgsc_ftfAuxDyn.pt
+HLT_AntiKt4EMTopoJets_subresjesgscIS_ftf
+HLT_AntiKt4EMTopoJets_subresjesgscIS_ftfAux.
+HLT_AntiKt4EMTopoJets_subresjesgscIS_ftfAuxDyn.JetEtaJESScaleMomentum_eta
+HLT_AntiKt4EMTopoJets_subresjesgscIS_ftfAuxDyn.JetEtaJESScaleMomentum_m
+HLT_AntiKt4EMTopoJets_subresjesgscIS_ftfAuxDyn.JetEtaJESScaleMomentum_phi
+HLT_AntiKt4EMTopoJets_subresjesgscIS_ftfAuxDyn.JetEtaJESScaleMomentum_pt
+HLT_AntiKt4EMTopoJets_subresjesgscIS_ftfAuxDyn.JetGSCScaleMomentum_eta
+HLT_AntiKt4EMTopoJets_subresjesgscIS_ftfAuxDyn.JetGSCScaleMomentum_m
+HLT_AntiKt4EMTopoJets_subresjesgscIS_ftfAuxDyn.JetGSCScaleMomentum_phi
+HLT_AntiKt4EMTopoJets_subresjesgscIS_ftfAuxDyn.JetGSCScaleMomentum_pt
+HLT_AntiKt4EMTopoJets_subresjesgscIS_ftfAuxDyn.JetPileupScaleMomentum_eta
+HLT_AntiKt4EMTopoJets_subresjesgscIS_ftfAuxDyn.JetPileupScaleMomentum_m
+HLT_AntiKt4EMTopoJets_subresjesgscIS_ftfAuxDyn.JetPileupScaleMomentum_phi
+HLT_AntiKt4EMTopoJets_subresjesgscIS_ftfAuxDyn.JetPileupScaleMomentum_pt
+HLT_AntiKt4EMTopoJets_subresjesgscIS_ftfAuxDyn.Jvt
+HLT_AntiKt4EMTopoJets_subresjesgscIS_ftfAuxDyn.JvtRpt
+HLT_AntiKt4EMTopoJets_subresjesgscIS_ftfAuxDyn.eta
+HLT_AntiKt4EMTopoJets_subresjesgscIS_ftfAuxDyn.m
+HLT_AntiKt4EMTopoJets_subresjesgscIS_ftfAuxDyn.phi
+HLT_AntiKt4EMTopoJets_subresjesgscIS_ftfAuxDyn.pt
+HLT_AntiKt4EMTopoJets_subresjesgsc_ftf
+HLT_AntiKt4EMTopoJets_subresjesgsc_ftfAux.
+HLT_AntiKt4EMTopoJets_subresjesgsc_ftfAuxDyn.JetEtaJESScaleMomentum_eta
+HLT_AntiKt4EMTopoJets_subresjesgsc_ftfAuxDyn.JetEtaJESScaleMomentum_m
+HLT_AntiKt4EMTopoJets_subresjesgsc_ftfAuxDyn.JetEtaJESScaleMomentum_phi
+HLT_AntiKt4EMTopoJets_subresjesgsc_ftfAuxDyn.JetEtaJESScaleMomentum_pt
+HLT_AntiKt4EMTopoJets_subresjesgsc_ftfAuxDyn.JetGSCScaleMomentum_eta
+HLT_AntiKt4EMTopoJets_subresjesgsc_ftfAuxDyn.JetGSCScaleMomentum_m
+HLT_AntiKt4EMTopoJets_subresjesgsc_ftfAuxDyn.JetGSCScaleMomentum_phi
+HLT_AntiKt4EMTopoJets_subresjesgsc_ftfAuxDyn.JetGSCScaleMomentum_pt
+HLT_AntiKt4EMTopoJets_subresjesgsc_ftfAuxDyn.JetPileupScaleMomentum_eta
+HLT_AntiKt4EMTopoJets_subresjesgsc_ftfAuxDyn.JetPileupScaleMomentum_m
+HLT_AntiKt4EMTopoJets_subresjesgsc_ftfAuxDyn.JetPileupScaleMomentum_phi
+HLT_AntiKt4EMTopoJets_subresjesgsc_ftfAuxDyn.JetPileupScaleMomentum_pt
+HLT_AntiKt4EMTopoJets_subresjesgsc_ftfAuxDyn.Jvt
+HLT_AntiKt4EMTopoJets_subresjesgsc_ftfAuxDyn.JvtRpt
+HLT_AntiKt4EMTopoJets_subresjesgsc_ftfAuxDyn.eta
+HLT_AntiKt4EMTopoJets_subresjesgsc_ftfAuxDyn.m
+HLT_AntiKt4EMTopoJets_subresjesgsc_ftfAuxDyn.phi
+HLT_AntiKt4EMTopoJets_subresjesgsc_ftfAuxDyn.pt
+HLT_AntiKt4EMTopoSKJets_nojcalib
+HLT_AntiKt4EMTopoSKJets_nojcalibAux.
+HLT_AntiKt4EMTopoSKJets_nojcalibAuxDyn.ActiveArea
+HLT_AntiKt4EMTopoSKJets_nojcalibAuxDyn.ActiveArea4vec_eta
+HLT_AntiKt4EMTopoSKJets_nojcalibAuxDyn.ActiveArea4vec_m
+HLT_AntiKt4EMTopoSKJets_nojcalibAuxDyn.ActiveArea4vec_phi
+HLT_AntiKt4EMTopoSKJets_nojcalibAuxDyn.ActiveArea4vec_pt
+HLT_AntiKt4EMTopoSKJets_nojcalibAuxDyn.AlgorithmType
+HLT_AntiKt4EMTopoSKJets_nojcalibAuxDyn.DetectorEta
+HLT_AntiKt4EMTopoSKJets_nojcalibAuxDyn.DetectorPhi
+HLT_AntiKt4EMTopoSKJets_nojcalibAuxDyn.EMFrac
+HLT_AntiKt4EMTopoSKJets_nojcalibAuxDyn.EnergyPerSampling
+HLT_AntiKt4EMTopoSKJets_nojcalibAuxDyn.HECFrac
+HLT_AntiKt4EMTopoSKJets_nojcalibAuxDyn.InputType
+HLT_AntiKt4EMTopoSKJets_nojcalibAuxDyn.JetConstitScaleMomentum_eta
+HLT_AntiKt4EMTopoSKJets_nojcalibAuxDyn.JetConstitScaleMomentum_m
+HLT_AntiKt4EMTopoSKJets_nojcalibAuxDyn.JetConstitScaleMomentum_phi
+HLT_AntiKt4EMTopoSKJets_nojcalibAuxDyn.JetConstitScaleMomentum_pt
+HLT_AntiKt4EMTopoSKJets_nojcalibAuxDyn.SizeParameter
+HLT_BTagging
+HLT_BTaggingAux.
+HLT_BTaggingAuxDyn.BTagTrackToJetAssociator
+HLT_BTaggingAuxDyn.DL1_pb
+HLT_BTaggingAuxDyn.DL1_pc
+HLT_BTaggingAuxDyn.DL1_pu
+HLT_BTaggingAuxDyn.DL1d20210519r22_pb
+HLT_BTaggingAuxDyn.DL1d20210519r22_pc
+HLT_BTaggingAuxDyn.DL1d20210519r22_pu
+HLT_BTaggingAuxDyn.DL1d20210528r22_pb
+HLT_BTaggingAuxDyn.DL1d20210528r22_pc
+HLT_BTaggingAuxDyn.DL1d20210528r22_pu
+HLT_BTaggingAuxDyn.DL1r_pb
+HLT_BTaggingAuxDyn.DL1r_pc
+HLT_BTaggingAuxDyn.DL1r_pu
+HLT_BTaggingAuxDyn.IP2D_TrackParticleLinks
+HLT_BTaggingAuxDyn.IP2D_bc
+HLT_BTaggingAuxDyn.IP2D_bu
+HLT_BTaggingAuxDyn.IP2D_cu
+HLT_BTaggingAuxDyn.IP2D_isDefaults
+HLT_BTaggingAuxDyn.IP2D_nTrks
+HLT_BTaggingAuxDyn.IP3D_TrackParticleLinks
+HLT_BTaggingAuxDyn.IP3D_bc
+HLT_BTaggingAuxDyn.IP3D_bu
+HLT_BTaggingAuxDyn.IP3D_cu
+HLT_BTaggingAuxDyn.IP3D_isDefaults
+HLT_BTaggingAuxDyn.IP3D_nTrks
+HLT_BTaggingAuxDyn.JetFitterSecondaryVertex_averageAllJetTrackRelativeEta
+HLT_BTaggingAuxDyn.JetFitterSecondaryVertex_averageTrackRelativeEta
+HLT_BTaggingAuxDyn.JetFitterSecondaryVertex_displacement2d
+HLT_BTaggingAuxDyn.JetFitterSecondaryVertex_displacement3d
+HLT_BTaggingAuxDyn.JetFitterSecondaryVertex_energy
+HLT_BTaggingAuxDyn.JetFitterSecondaryVertex_energyFraction
+HLT_BTaggingAuxDyn.JetFitterSecondaryVertex_isDefaults
+HLT_BTaggingAuxDyn.JetFitterSecondaryVertex_mass
+HLT_BTaggingAuxDyn.JetFitterSecondaryVertex_maximumAllJetTrackRelativeEta
+HLT_BTaggingAuxDyn.JetFitterSecondaryVertex_maximumTrackRelativeEta
+HLT_BTaggingAuxDyn.JetFitterSecondaryVertex_minimumAllJetTrackRelativeEta
+HLT_BTaggingAuxDyn.JetFitterSecondaryVertex_minimumTrackRelativeEta
+HLT_BTaggingAuxDyn.JetFitterSecondaryVertex_nTracks
+HLT_BTaggingAuxDyn.JetFitter_JFvertices
+HLT_BTaggingAuxDyn.JetFitter_N2Tpair
+HLT_BTaggingAuxDyn.JetFitter_chi2
+HLT_BTaggingAuxDyn.JetFitter_dRFlightDir
+HLT_BTaggingAuxDyn.JetFitter_deltaR
+HLT_BTaggingAuxDyn.JetFitter_deltaeta
+HLT_BTaggingAuxDyn.JetFitter_deltaphi
+HLT_BTaggingAuxDyn.JetFitter_energyFraction
+HLT_BTaggingAuxDyn.JetFitter_fittedCov
+HLT_BTaggingAuxDyn.JetFitter_fittedPosition
+HLT_BTaggingAuxDyn.JetFitter_isDefaults
+HLT_BTaggingAuxDyn.JetFitter_mass
+HLT_BTaggingAuxDyn.JetFitter_massUncorr
+HLT_BTaggingAuxDyn.JetFitter_nSingleTracks
+HLT_BTaggingAuxDyn.JetFitter_nTracksAtVtx
+HLT_BTaggingAuxDyn.JetFitter_nVTX
+HLT_BTaggingAuxDyn.JetFitter_ndof
+HLT_BTaggingAuxDyn.JetFitter_significance3d
+HLT_BTaggingAuxDyn.JetFitter_tracksAtPVchi2
+HLT_BTaggingAuxDyn.JetFitter_tracksAtPVlinks
+HLT_BTaggingAuxDyn.JetFitter_tracksAtPVndf
+HLT_BTaggingAuxDyn.MV2c10_discriminant
+HLT_BTaggingAuxDyn.Muons
+HLT_BTaggingAuxDyn.SV1_L3d
+HLT_BTaggingAuxDyn.SV1_Lxy
+HLT_BTaggingAuxDyn.SV1_N2Tpair
+HLT_BTaggingAuxDyn.SV1_NGTinSvx
+HLT_BTaggingAuxDyn.SV1_TrackParticleLinks
+HLT_BTaggingAuxDyn.SV1_badTracksIP
+HLT_BTaggingAuxDyn.SV1_deltaR
+HLT_BTaggingAuxDyn.SV1_dstToMatLay
+HLT_BTaggingAuxDyn.SV1_efracsvx
+HLT_BTaggingAuxDyn.SV1_energyTrkInJet
+HLT_BTaggingAuxDyn.SV1_isDefaults
+HLT_BTaggingAuxDyn.SV1_masssvx
+HLT_BTaggingAuxDyn.SV1_normdist
+HLT_BTaggingAuxDyn.SV1_significance3d
+HLT_BTaggingAuxDyn.SV1_vertices
+HLT_BTaggingAuxDyn.dips20210517_pb
+HLT_BTaggingAuxDyn.dips20210517_pc
+HLT_BTaggingAuxDyn.dips20210517_pu
+HLT_BTaggingAuxDyn.dipsLoose20210517_pb
+HLT_BTaggingAuxDyn.dipsLoose20210517_pc
+HLT_BTaggingAuxDyn.dipsLoose20210517_pu
+HLT_BTaggingAuxDyn.jetLink
+HLT_BTaggingAuxDyn.rnnip_isDefaults
+HLT_BTaggingAuxDyn.rnnip_pb
+HLT_BTaggingAuxDyn.rnnip_pc
+HLT_BTaggingAuxDyn.rnnip_ptau
+HLT_BTaggingAuxDyn.rnnip_pu
+HLT_BTaggingAuxDyn.viewIndex
+HLT_BTaggingJFVtx
+HLT_BTaggingJFVtxAux.
+HLT_BTaggingJFVtxAuxDyn.viewIndex
+HLT_BTaggingSecVtx
+HLT_BTaggingSecVtxAux.
+HLT_BTaggingSecVtxAuxDyn.viewIndex
+HLT_Bmumux
+HLT_BmumuxAux.
+HLT_CBCombinedMuon_FSTrackParticles
+HLT_CBCombinedMuon_FSTrackParticlesAux.
+HLT_CBCombinedMuon_FSTrackParticlesAuxDyn.viewIndex
+HLT_CBCombinedMuon_RoITrackParticles
+HLT_CBCombinedMuon_RoITrackParticlesAux.
+HLT_CBCombinedMuon_RoITrackParticlesAuxDyn.viewIndex
+HLT_CaloEMClusters
+HLT_CaloEMClustersAux.
+HLT_CaloEMClustersAuxDyn.viewIndex
+HLT_CaloEMClusters_FWD
+HLT_CaloEMClusters_FWDAux.
+HLT_CaloEMClusters_LRT
+HLT_CaloEMClusters_LRTAux.
+HLT_CaloEMClusters_LRTAuxDyn.viewIndex
+HLT_DimuEF
+HLT_DimuEFAux.
+HLT_DisTrkBDTSel
+HLT_DisTrkBDTSelAux.
+HLT_DisTrkCand
+HLT_DisTrkCandAux.
+HLT_DisTrkCandAuxDyn.disTrkCand_chi2
+HLT_DisTrkCandAuxDyn.disTrkCand_chi2sum_br_ibl
+HLT_DisTrkCandAuxDyn.disTrkCand_chi2sum_br_pix1
+HLT_DisTrkCandAuxDyn.disTrkCand_chi2sum_br_pix2
+HLT_DisTrkCandAuxDyn.disTrkCand_chi2sum_br_pix3
+HLT_DisTrkCandAuxDyn.disTrkCand_chi2sum_br_sct1
+HLT_DisTrkCandAuxDyn.disTrkCand_chi2sum_br_sct2
+HLT_DisTrkCandAuxDyn.disTrkCand_chi2sum_br_sct3
+HLT_DisTrkCandAuxDyn.disTrkCand_chi2sum_br_sct4
+HLT_DisTrkCandAuxDyn.disTrkCand_d0
+HLT_DisTrkCandAuxDyn.disTrkCand_d0_wrtVtx
+HLT_DisTrkCandAuxDyn.disTrkCand_eta
+HLT_DisTrkCandAuxDyn.disTrkCand_eta_wrtVtx
+HLT_DisTrkCandAuxDyn.disTrkCand_iso1_dr01
+HLT_DisTrkCandAuxDyn.disTrkCand_iso1_dr02
+HLT_DisTrkCandAuxDyn.disTrkCand_iso1_dr04
+HLT_DisTrkCandAuxDyn.disTrkCand_iso2_dr01
+HLT_DisTrkCandAuxDyn.disTrkCand_iso2_dr02
+HLT_DisTrkCandAuxDyn.disTrkCand_iso2_dr04
+HLT_DisTrkCandAuxDyn.disTrkCand_iso3_dr01
+HLT_DisTrkCandAuxDyn.disTrkCand_iso3_dr02
+HLT_DisTrkCandAuxDyn.disTrkCand_iso3_dr04
+HLT_DisTrkCandAuxDyn.disTrkCand_n_brhits_good_ibl
+HLT_DisTrkCandAuxDyn.disTrkCand_n_brhits_good_pix1
+HLT_DisTrkCandAuxDyn.disTrkCand_n_brhits_good_pix2
+HLT_DisTrkCandAuxDyn.disTrkCand_n_brhits_good_pix3
+HLT_DisTrkCandAuxDyn.disTrkCand_n_brhits_good_sct1
+HLT_DisTrkCandAuxDyn.disTrkCand_n_brhits_good_sct2
+HLT_DisTrkCandAuxDyn.disTrkCand_n_brhits_good_sct3
+HLT_DisTrkCandAuxDyn.disTrkCand_n_brhits_good_sct4
+HLT_DisTrkCandAuxDyn.disTrkCand_n_brhits_ibl
+HLT_DisTrkCandAuxDyn.disTrkCand_n_brhits_pix1
+HLT_DisTrkCandAuxDyn.disTrkCand_n_brhits_pix2
+HLT_DisTrkCandAuxDyn.disTrkCand_n_brhits_pix3
+HLT_DisTrkCandAuxDyn.disTrkCand_n_brhits_sct1
+HLT_DisTrkCandAuxDyn.disTrkCand_n_brhits_sct2
+HLT_DisTrkCandAuxDyn.disTrkCand_n_brhits_sct3
+HLT_DisTrkCandAuxDyn.disTrkCand_n_brhits_sct4
+HLT_DisTrkCandAuxDyn.disTrkCand_n_hits_inner
+HLT_DisTrkCandAuxDyn.disTrkCand_n_hits_innermost
+HLT_DisTrkCandAuxDyn.disTrkCand_n_hits_pix
+HLT_DisTrkCandAuxDyn.disTrkCand_n_hits_sct
+HLT_DisTrkCandAuxDyn.disTrkCand_ndof
+HLT_DisTrkCandAuxDyn.disTrkCand_ndofsum_br_ibl
+HLT_DisTrkCandAuxDyn.disTrkCand_ndofsum_br_pix1
+HLT_DisTrkCandAuxDyn.disTrkCand_ndofsum_br_pix2
+HLT_DisTrkCandAuxDyn.disTrkCand_ndofsum_br_pix3
+HLT_DisTrkCandAuxDyn.disTrkCand_ndofsum_br_sct1
+HLT_DisTrkCandAuxDyn.disTrkCand_ndofsum_br_sct2
+HLT_DisTrkCandAuxDyn.disTrkCand_ndofsum_br_sct3
+HLT_DisTrkCandAuxDyn.disTrkCand_ndofsum_br_sct4
+HLT_DisTrkCandAuxDyn.disTrkCand_phi
+HLT_DisTrkCandAuxDyn.disTrkCand_phi_wrtVtx
+HLT_DisTrkCandAuxDyn.disTrkCand_pt
+HLT_DisTrkCandAuxDyn.disTrkCand_pt_wrtVtx
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_chi2
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_chi2sum_br_ibl
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_chi2sum_br_pix1
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_chi2sum_br_pix2
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_chi2sum_br_pix3
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_chi2sum_br_sct1
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_chi2sum_br_sct2
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_chi2sum_br_sct3
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_chi2sum_br_sct4
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_d0
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_d0_wrtVtx
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_eta
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_eta_wrtVtx
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_n_brhits_good_ibl
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_n_brhits_good_pix1
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_n_brhits_good_pix2
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_n_brhits_good_pix3
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_n_brhits_good_sct1
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_n_brhits_good_sct2
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_n_brhits_good_sct3
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_n_brhits_good_sct4
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_n_brhits_ibl
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_n_brhits_pix1
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_n_brhits_pix2
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_n_brhits_pix3
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_n_brhits_sct1
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_n_brhits_sct2
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_n_brhits_sct3
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_n_brhits_sct4
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_n_hits_inner
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_n_hits_innermost
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_n_hits_pix
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_n_hits_sct
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_ndof
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_ndofsum_br_ibl
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_ndofsum_br_pix1
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_ndofsum_br_pix2
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_ndofsum_br_pix3
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_ndofsum_br_sct1
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_ndofsum_br_sct2
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_ndofsum_br_sct3
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_ndofsum_br_sct4
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_phi
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_phi_wrtVtx
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_pt
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_pt_wrtVtx
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_z0
+HLT_DisTrkCandAuxDyn.disTrkCand_refit_z0_wrtVtx
+HLT_DisTrkCandAuxDyn.disTrkCand_z0
+HLT_DisTrkCandAuxDyn.disTrkCand_z0_wrtVtx
+HLT_EBWeight
+HLT_EBWeightAux.
+HLT_EMRoIs
+HLT_FSLRT_TrackCount
+HLT_FSLRT_TrackCountAux.
+HLT_FSLRT_TrackCountAuxDyn.counts
+HLT_FSLRT_TrackCountAuxDyn.ntrks
+HLT_FSLRT_TrackCountAuxDyn.pTcuts
+HLT_FSRoI
+HLT_FastCaloAsymRinger
+HLT_FastCaloAsymRingerAux.
+HLT_FastCaloAsymRingerAuxDyn.viewIndex
+HLT_FastCaloEMClusters
+HLT_FastCaloEMClustersAux.
+HLT_FastCaloEMClustersAuxDyn.viewIndex
+HLT_FastCaloEMClusters_FWD
+HLT_FastCaloEMClusters_FWDAux.
+HLT_FastCaloRinger
+HLT_FastCaloRingerAux.
+HLT_FastCaloRingerAuxDyn.viewIndex
+HLT_FastElectrons
+HLT_FastElectronsAux.
+HLT_FastElectronsAuxDyn.viewIndex
+HLT_FastElectrons_LRT
+HLT_FastElectrons_LRTAux.
+HLT_FastElectrons_LRTAuxDyn.viewIndex
+HLT_FastPhotons
+HLT_FastPhotonsAux.
+HLT_FastPhotonsAuxDyn.viewIndex
+HLT_HICaloEMClusters
+HLT_HICaloEMClustersAux.
+HLT_HIEventShapeEG
+HLT_HIEventShapeEGAux.
+HLT_HPtdEdxTrk
+HLT_HPtdEdxTrkAux.
+HLT_HitDV
+HLT_HitDVAux.
+HLT_HitDVAuxDyn.hitDV_bdt_score
+HLT_HitDVAuxDyn.hitDV_ly0_sp_frac
+HLT_HitDVAuxDyn.hitDV_ly1_sp_frac
+HLT_HitDVAuxDyn.hitDV_ly2_sp_frac
+HLT_HitDVAuxDyn.hitDV_ly3_sp_frac
+HLT_HitDVAuxDyn.hitDV_ly4_sp_frac
+HLT_HitDVAuxDyn.hitDV_ly5_sp_frac
+HLT_HitDVAuxDyn.hitDV_ly6_sp_frac
+HLT_HitDVAuxDyn.hitDV_ly7_sp_frac
+HLT_HitDVAuxDyn.hitDV_n_track_qual
+HLT_HitDVAuxDyn.hitDV_seed_eta
+HLT_HitDVAuxDyn.hitDV_seed_phi
+HLT_HitDVAuxDyn.hitDV_seed_type
+HLT_IDTrack_Bjet_FTF
+HLT_IDTrack_Bjet_FTFAux.
+HLT_IDTrack_Bjet_FTFAuxDyn.viewIndex
+HLT_IDTrack_Bjet_IDTrig
+HLT_IDTrack_Bjet_IDTrigAux.
+HLT_IDTrack_Bjet_IDTrigAuxDyn.btagIp_d0
+HLT_IDTrack_Bjet_IDTrigAuxDyn.btagIp_d0Uncertainty
+HLT_IDTrack_Bjet_IDTrigAuxDyn.btagIp_trackDisplacement
+HLT_IDTrack_Bjet_IDTrigAuxDyn.btagIp_trackMomentum
+HLT_IDTrack_Bjet_IDTrigAuxDyn.btagIp_z0SinTheta
+HLT_IDTrack_Bjet_IDTrigAuxDyn.btagIp_z0SinThetaUncertainty
+HLT_IDTrack_Bjet_IDTrigAuxDyn.viewIndex
+HLT_IDTrack_Bmumux_FTF
+HLT_IDTrack_Bmumux_FTFAux.
+HLT_IDTrack_Bmumux_FTFAuxDyn.viewIndex
+HLT_IDTrack_Bmumux_IDTrig
+HLT_IDTrack_Bmumux_IDTrigAux.
+HLT_IDTrack_Bmumux_IDTrigAuxDyn.viewIndex
+HLT_IDTrack_Cosmic_EFID
+HLT_IDTrack_Cosmic_EFIDAux.
+HLT_IDTrack_Cosmic_FTF
+HLT_IDTrack_Cosmic_FTFAux.
+HLT_IDTrack_Cosmic_IDTrig
+HLT_IDTrack_Cosmic_IDTrigAux.
+HLT_IDTrack_ElecLRT_FTF
+HLT_IDTrack_ElecLRT_FTFAux.
+HLT_IDTrack_ElecLRT_FTFAuxDyn.viewIndex
+HLT_IDTrack_ElecLRT_IDTrig
+HLT_IDTrack_ElecLRT_IDTrigAux.
+HLT_IDTrack_ElecLRT_IDTrigAuxDyn.viewIndex
+HLT_IDTrack_Electron_FTF
+HLT_IDTrack_Electron_FTFAux.
+HLT_IDTrack_Electron_FTFAuxDyn.viewIndex
+HLT_IDTrack_Electron_GSF
+HLT_IDTrack_Electron_GSFAux.
+HLT_IDTrack_Electron_GSFAuxDyn.viewIndex
+HLT_IDTrack_Electron_IDTrig
+HLT_IDTrack_Electron_IDTrigAux.
+HLT_IDTrack_Electron_IDTrigAuxDyn.viewIndex
+HLT_IDTrack_FSLRT_FTF
+HLT_IDTrack_FSLRT_FTFAux.
+HLT_IDTrack_FSLRT_IDTrig
+HLT_IDTrack_FSLRT_IDTrigAux.
+HLT_IDTrack_FS_FTF
+HLT_IDTrack_FS_FTFAux.
+HLT_IDTrack_FS_FTFAuxDyn.passPFTrackPresel
+HLT_IDTrack_MinBias_IDTrig
+HLT_IDTrack_MinBias_IDTrigAux.
+HLT_IDTrack_MuonIso_FTF
+HLT_IDTrack_MuonIso_FTFAux.
+HLT_IDTrack_MuonIso_FTFAuxDyn.viewIndex
+HLT_IDTrack_MuonIso_IDTrig
+HLT_IDTrack_MuonIso_IDTrigAux.
+HLT_IDTrack_MuonIso_IDTrigAuxDyn.viewIndex
+HLT_IDTrack_MuonLRT_FTF
+HLT_IDTrack_MuonLRT_FTFAux.
+HLT_IDTrack_MuonLRT_FTFAuxDyn.viewIndex
+HLT_IDTrack_MuonLRT_IDTrig
+HLT_IDTrack_MuonLRT_IDTrigAux.
+HLT_IDTrack_MuonLRT_IDTrigAuxDyn.viewIndex
+HLT_IDTrack_Muon_FTF
+HLT_IDTrack_Muon_FTFAux.
+HLT_IDTrack_Muon_FTFAuxDyn.viewIndex
+HLT_IDTrack_Muon_IDTrig
+HLT_IDTrack_Muon_IDTrigAux.
+HLT_IDTrack_Muon_IDTrigAuxDyn.viewIndex
+HLT_IDTrack_TauCore_FTF
+HLT_IDTrack_TauCore_FTFAux.
+HLT_IDTrack_TauCore_FTFAuxDyn.viewIndex
+HLT_IDTrack_TauIso_FTF
+HLT_IDTrack_TauIso_FTFAux.
+HLT_IDTrack_TauIso_FTFAuxDyn.viewIndex
+HLT_IDTrack_Tau_FTF
+HLT_IDTrack_Tau_FTFAux.
+HLT_IDTrack_Tau_IDTrig
+HLT_IDTrack_Tau_IDTrigAux.
+HLT_IDTrack_Tau_IDTrigAuxDyn.viewIndex
+HLT_IDVertex_FS
+HLT_IDVertex_FSAux.
+HLT_IDVertex_FSJet
+HLT_IDVertex_FSJetAux.
+HLT_IDVertex_FSLRT
+HLT_IDVertex_FSLRTAux.
+HLT_IDVertex_Tau
+HLT_IDVertex_TauAux.
+HLT_IDVertex_TauAuxDyn.viewIndex
+HLT_JETRoI
+HLT_LArPS_AllCaloClusters
+HLT_LArPS_AllCaloClustersAux.
+HLT_LArPS_AllCaloClustersAuxDyn.viewIndex
+HLT_LArPS_AllCaloEMClusters
+HLT_LArPS_AllCaloEMClustersAux.
+HLT_LArPS_AllCaloEMClustersAuxDyn.viewIndex
+HLT_METRoI
+HLT_MET_cell
+HLT_MET_cellAux.
+HLT_MET_cvfpufit
+HLT_MET_cvfpufitAux.
+HLT_MET_mht
+HLT_MET_mhtAux.
+HLT_MET_mhtpufit_em_subjesgscIS
+HLT_MET_mhtpufit_em_subjesgscISAux.
+HLT_MET_mhtpufit_pf_subjesgscIS
+HLT_MET_mhtpufit_pf_subjesgscISAux.
+HLT_MET_pfopufit
+HLT_MET_pfopufitAux.
+HLT_MET_pfsum
+HLT_MET_pfsumAux.
+HLT_MET_pfsum_cssk
+HLT_MET_pfsum_csskAux.
+HLT_MET_pfsum_vssk
+HLT_MET_pfsum_vsskAux.
+HLT_MET_tc
+HLT_MET_tcAux.
+HLT_MET_tc_em
+HLT_MET_tc_emAux.
+HLT_MET_tcpufit
+HLT_MET_tcpufitAux.
+HLT_MET_trkmht
+HLT_MET_trkmhtAux.
+HLT_MSExtrapolatedMuons_FSTrackParticles
+HLT_MSExtrapolatedMuons_FSTrackParticlesAux.
+HLT_MSExtrapolatedMuons_FSTrackParticlesAuxDyn.viewIndex
+HLT_MSExtrapolatedMuons_RoITrackParticles
+HLT_MSExtrapolatedMuons_RoITrackParticlesAux.
+HLT_MSExtrapolatedMuons_RoITrackParticlesAuxDyn.viewIndex
+HLT_MSOnlyExtrapolatedMuons_FSTrackParticles
+HLT_MSOnlyExtrapolatedMuons_FSTrackParticlesAux.
+HLT_MURoIs
+HLT_MbtsBitsContainer
+HLT_MbtsBitsContainerAux.
+HLT_MuonL2CBInfo
+HLT_MuonL2CBInfoAux.
+HLT_MuonL2CBInfoAuxDyn.viewIndex
+HLT_MuonL2CBInfoIOmode
+HLT_MuonL2CBInfoIOmodeAux.
+HLT_MuonL2CBInfoIOmodeAuxDyn.viewIndex
+HLT_MuonL2CBInfoLRT
+HLT_MuonL2CBInfoLRTAux.
+HLT_MuonL2CBInfoLRTAuxDyn.viewIndex
+HLT_MuonL2CBInfol2mtmode
+HLT_MuonL2CBInfol2mtmodeAux.
+HLT_MuonL2CBInfol2mtmodeAuxDyn.viewIndex
+HLT_MuonL2ISInfo
+HLT_MuonL2ISInfoAux.
+HLT_MuonL2SAInfo
+HLT_MuonL2SAInfoAux.
+HLT_MuonL2SAInfoAuxDyn.viewIndex
+HLT_MuonL2SAInfoIOmode
+HLT_MuonL2SAInfoIOmodeAux.
+HLT_MuonL2SAInfoIOmodeAuxDyn.viewIndex
+HLT_MuonL2SAInfol2mtmode
+HLT_MuonL2SAInfol2mtmodeAux.
+HLT_MuonL2SAInfol2mtmodeAuxDyn.viewIndex
+HLT_MuonsCB_FS
+HLT_MuonsCB_FSAux.
+HLT_MuonsCB_FSAuxDyn.viewIndex
+HLT_MuonsCB_LRT
+HLT_MuonsCB_LRTAux.
+HLT_MuonsCB_LRTAuxDyn.viewIndex
+HLT_MuonsCB_RoI
+HLT_MuonsCB_RoIAux.
+HLT_MuonsCB_RoIAuxDyn.viewIndex
+HLT_MuonsIso
+HLT_MuonsIsoAux.
+HLT_MuonsIsoAuxDyn.ptcone02
+HLT_MuonsIsoAuxDyn.ptcone03
+HLT_MuonsIsoAuxDyn.viewIndex
+HLT_Muons_FS
+HLT_Muons_FSAux.
+HLT_Muons_FSAuxDyn.viewIndex
+HLT_Muons_RoI
+HLT_Muons_RoIAux.
+HLT_Muons_RoIAuxDyn.viewIndex
+HLT_Roi_Bjet
+HLT_Roi_Bmumux
+HLT_Roi_FastElectron
+HLT_Roi_FastElectron_LRT
+HLT_Roi_FastPhoton
+HLT_Roi_L2SAMuon
+HLT_Roi_L2SAMuonForEF
+HLT_Roi_L2SAMuon_LRT
+HLT_Roi_LArPEBHLT
+HLT_Roi_MuonIso
+HLT_Roi_Tau
+HLT_Roi_TauCore
+HLT_Roi_TauIso
+HLT_Roi_TauIsoBDT
+HLT_SpacePointCounts
+HLT_SpacePointCountsAux.
+HLT_TAURoI
+HLT_TopoCaloClusters
+HLT_TopoCaloClustersAux.
+HLT_TopoCaloClustersFS
+HLT_TopoCaloClustersFSAux.
+HLT_TopoCaloClustersFSAuxDyn.nCells
+HLT_TopoCaloClustersHIRoI
+HLT_TopoCaloClustersHIRoIAux.
+HLT_TopoCaloClustersLC
+HLT_TopoCaloClustersLCAux.
+HLT_TopoCaloClustersLCAuxDyn.nCells
+HLT_TopoCaloClustersLCFS
+HLT_TopoCaloClustersLCFSAux.
+HLT_TopoCaloClustersLCFSAuxDyn.calE
+HLT_TopoCaloClustersLCFSAuxDyn.calEta
+HLT_TopoCaloClustersLCFSAuxDyn.calPhi
+HLT_TopoCaloClustersRoI
+HLT_TopoCaloClustersRoIAux.
+HLT_TopoCaloClustersRoIAuxDyn.nCells
+HLT_TopoCaloClustersRoIAuxDyn.viewIndex
+HLT_TopoCaloClustersRoI_LRT
+HLT_TopoCaloClustersRoI_LRTAux.
+HLT_TopoCaloClustersRoI_LRTAuxDyn.nCells
+HLT_TopoCaloClustersRoI_LRTAuxDyn.viewIndex
+HLT_TrackCount
+HLT_TrackCountAux.
+HLT_TrigEMClusters
+HLT_TrigEMClustersAux.
+HLT_TrigEMClustersAuxDyn.viewIndex
+HLT_TrigTRTHTCounts
+HLT_TrigTRTHTCountsAux.
+HLT_TrigTRTHTCountsAuxDyn.viewIndex
+HLT_TrigTauRecMerged_CaloOnly
+HLT_TrigTauRecMerged_CaloOnlyAux.
+HLT_TrigTauRecMerged_CaloOnlyAuxDyn.viewIndex
+HLT_TrigTauRecMerged_LLP
+HLT_TrigTauRecMerged_LLPAux.
+HLT_TrigTauRecMerged_LLPAuxDyn.viewIndex
+HLT_TrigTauRecMerged_MVA
+HLT_TrigTauRecMerged_MVAAux.
+HLT_TrigTauRecMerged_MVAAuxDyn.viewIndex
+HLT_TrigTauRecMerged_Precision
+HLT_TrigTauRecMerged_PrecisionAux.
+HLT_TrigTauRecMerged_PrecisionAuxDyn.viewIndex
+HLT_TrigTauRecMerged_Presel
+HLT_TrigTauRecMerged_PreselAux.
+HLT_bJets
+HLT_bJetsAux.
+HLT_bJetsAuxDyn.JVFCorr
+HLT_bJetsAuxDyn.Jvt
+HLT_bJetsAuxDyn.SumPtTrkPt500
+HLT_bJetsAuxDyn.btaggingLink
+HLT_bJetsAuxDyn.viewIndex
+HLT_dEdxTrk
+HLT_dEdxTrkAux.
+HLT_dEdxTrkAuxDyn.dEdxTrk_a0beam
+HLT_dEdxTrkAuxDyn.dEdxTrk_dedx
+HLT_dEdxTrkAuxDyn.dEdxTrk_dedx_n_usedhits
+HLT_dEdxTrkAuxDyn.dEdxTrk_eta
+HLT_dEdxTrkAuxDyn.dEdxTrk_id
+HLT_dEdxTrkAuxDyn.dEdxTrk_n_hits_inner
+HLT_dEdxTrkAuxDyn.dEdxTrk_n_hits_innermost
+HLT_dEdxTrkAuxDyn.dEdxTrk_n_hits_pix
+HLT_dEdxTrkAuxDyn.dEdxTrk_n_hits_sct
+HLT_dEdxTrkAuxDyn.dEdxTrk_phi
+HLT_dEdxTrkAuxDyn.dEdxTrk_pt
+HLT_eEMRoIs
+HLT_eTAURoIs
+HLT_egamma_Electrons
+HLT_egamma_ElectronsAux.
+HLT_egamma_ElectronsAuxDyn.viewIndex
+HLT_egamma_Electrons_GSF
+HLT_egamma_Electrons_GSFAux.
+HLT_egamma_Electrons_GSFAuxDyn.viewIndex
+HLT_egamma_Electrons_LRT
+HLT_egamma_Electrons_LRTAux.
+HLT_egamma_Electrons_LRTAuxDyn.viewIndex
+HLT_egamma_Photons
+HLT_egamma_PhotonsAux.
+HLT_egamma_PhotonsAuxDyn.viewIndex
+HLT_jTAURoIs
+HLT_jet_seed
+HLT_jet_seedAux.
+HLT_jet_seedAuxDyn.viewIndex
+HLT_tautrack_LLP
+HLT_tautrack_LLPAux.
+HLT_tautrack_LLPAuxDyn.viewIndex
+HLT_tautrack_MVA
+HLT_tautrack_MVAAux.
+HLT_tautrack_MVAAuxDyn.viewIndex
+HLT_tautrack_Precision
+HLT_tautrack_PrecisionAux.
+HLT_tautrack_Presel
+HLT_tautrack_PreselAux.
+HLT_vtx_z
+HLT_vtx_zAux.
+InDetDisappearingTrackParticles
+InDetDisappearingTrackParticlesAux.
+InDetDisappearingTrackParticlesAuxDyn.TRTdEdx
+InDetDisappearingTrackParticlesAuxDyn.TRTdEdxUsedHits
+InDetDisappearingTrackParticlesAuxDyn.eProbabilityNN
+InDetDisappearingTrackParticlesAuxDyn.nBC_meas
+InDetDisappearingTrackParticlesAuxDyn.trackLink
+InDetDisappearingTrackParticlesAuxDyn.truthMatchProbability
+InDetDisappearingTrackParticlesAuxDyn.truthOrigin
+InDetDisappearingTrackParticlesAuxDyn.truthParticleLink
+InDetDisappearingTrackParticlesAuxDyn.truthType
+InDetForwardTrackParticles
+InDetForwardTrackParticlesAux.
+InDetForwardTrackParticlesAuxDyn.TRTdEdx
+InDetForwardTrackParticlesAuxDyn.TRTdEdxUsedHits
+InDetForwardTrackParticlesAuxDyn.eProbabilityNN
+InDetForwardTrackParticlesAuxDyn.nBC_meas
+InDetForwardTrackParticlesAuxDyn.trackLink
+InDetForwardTrackParticlesAuxDyn.truthMatchProbability
+InDetForwardTrackParticlesAuxDyn.truthOrigin
+InDetForwardTrackParticlesAuxDyn.truthParticleLink
+InDetForwardTrackParticlesAuxDyn.truthType
+InDetLargeD0TrackParticles
+InDetLargeD0TrackParticlesAux.
+InDetLargeD0TrackParticlesAuxDyn.TRTdEdx
+InDetLargeD0TrackParticlesAuxDyn.TRTdEdxUsedHits
+InDetLargeD0TrackParticlesAuxDyn.eProbabilityNN
+InDetLargeD0TrackParticlesAuxDyn.nBC_meas
+InDetLargeD0TrackParticlesAuxDyn.trackLink
+InDetLargeD0TrackParticlesAuxDyn.truthMatchProbability
+InDetLargeD0TrackParticlesAuxDyn.truthOrigin
+InDetLargeD0TrackParticlesAuxDyn.truthParticleLink
+InDetLargeD0TrackParticlesAuxDyn.truthType
+InDetTrackParticles
+InDetTrackParticlesAssociatedClusters
+InDetTrackParticlesAssociatedClustersAux.
+InDetTrackParticlesAssociatedClustersAuxDyn.CellLink
+InDetTrackParticlesAssociatedClusters_links
+InDetTrackParticlesAux.
+InDetTrackParticlesAuxDyn.TRTdEdx
+InDetTrackParticlesAuxDyn.TRTdEdxUsedHits
+InDetTrackParticlesAuxDyn.TTVA_AMVFVertices
+InDetTrackParticlesAuxDyn.TTVA_AMVFWeights
+InDetTrackParticlesAuxDyn.eProbabilityNN
+InDetTrackParticlesAuxDyn.nBC_meas
+InDetTrackParticlesAuxDyn.trackLink
+InDetTrackParticlesAuxDyn.truthMatchProbability
+InDetTrackParticlesAuxDyn.truthOrigin
+InDetTrackParticlesAuxDyn.truthParticleLink
+InDetTrackParticlesAuxDyn.truthType
+InDetTrackParticlesClusterAssociations
+InDetTrackParticlesClusterAssociationsAux.
+IsCalibration
+IsSimulation
+IsTestBeam
+JetETMissChargedParticleFlowObjects
+JetETMissChargedParticleFlowObjectsAux.
+JetETMissChargedParticleFlowObjectsAuxDyn.FE_ElectronLinks
+JetETMissChargedParticleFlowObjectsAuxDyn.FE_MuonLinks
+JetETMissChargedParticleFlowObjectsAuxDyn.FE_PhotonLinks
+JetETMissChargedParticleFlowObjectsAuxDyn.FE_TauLinks
+JetETMissChargedParticleFlowObjectsAuxDyn.IsInDenseEnvironment
+JetETMissChargedParticleFlowObjectsAuxDyn.TracksExpectedEnergyDeposit
+JetETMissLCNeutralParticleFlowObjects
+JetETMissLCNeutralParticleFlowObjectsAux.
+JetETMissLCNeutralParticleFlowObjectsAuxDyn.eta
+JetETMissLCNeutralParticleFlowObjectsAuxDyn.m
+JetETMissLCNeutralParticleFlowObjectsAuxDyn.phi
+JetETMissLCNeutralParticleFlowObjectsAuxDyn.pt
+JetETMissNeutralParticleFlowObjects
+JetETMissNeutralParticleFlowObjectsAux.
+JetETMissNeutralParticleFlowObjectsAuxDyn.AVG_LAR_Q
+JetETMissNeutralParticleFlowObjectsAuxDyn.AVG_TILE_Q
+JetETMissNeutralParticleFlowObjectsAuxDyn.BADLARQ_FRAC
+JetETMissNeutralParticleFlowObjectsAuxDyn.CENTER_LAMBDA
+JetETMissNeutralParticleFlowObjectsAuxDyn.CENTER_MAG
+JetETMissNeutralParticleFlowObjectsAuxDyn.EM_PROBABILITY
+JetETMissNeutralParticleFlowObjectsAuxDyn.ENG_BAD_CELLS
+JetETMissNeutralParticleFlowObjectsAuxDyn.ENG_POS
+JetETMissNeutralParticleFlowObjectsAuxDyn.FE_ElectronLinks
+JetETMissNeutralParticleFlowObjectsAuxDyn.FE_MuonLinks
+JetETMissNeutralParticleFlowObjectsAuxDyn.FE_PhotonLinks
+JetETMissNeutralParticleFlowObjectsAuxDyn.FE_TauLinks
+JetETMissNeutralParticleFlowObjectsAuxDyn.FE_efrac_matched_muon
+JetETMissNeutralParticleFlowObjectsAuxDyn.FE_nMatchedMuons
+JetETMissNeutralParticleFlowObjectsAuxDyn.ISOLATION
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_EMB1
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_EMB2
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_EMB3
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_EME1
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_EME2
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_EME3
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_FCAL0
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_FCAL1
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_FCAL2
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_HEC0
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_HEC1
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_HEC2
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_HEC3
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_MINIFCAL0
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_MINIFCAL1
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_MINIFCAL2
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_MINIFCAL3
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_PreSamplerB
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_PreSamplerE
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_TILE0
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_TileBar0
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_TileBar1
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_TileBar2
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_TileExt0
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_TileExt1
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_TileExt2
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_TileGap1
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_TileGap2
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_TileGap3
+JetETMissNeutralParticleFlowObjectsAuxDyn.SECOND_LAMBDA
+JetETMissNeutralParticleFlowObjectsAuxDyn.SECOND_R
+JetETMissNeutralParticleFlowObjectsAuxDyn.TIMING
+L1TopoErrorFlags_Legacy
+L1TopoErrorFlags_LegacyAux.
+LArNoisyROSummary
+LRTElectrons
+LRTElectronsAux.
+LRTElectronsAuxDyn.LHLoose
+LRTElectronsAuxDyn.LHMedium
+LRTElectronsAuxDyn.LHTight
+LRTElectronsAuxDyn.LHValue
+LRTElectronsAuxDyn.Loose
+LRTElectronsAuxDyn.Medium
+LRTElectronsAuxDyn.Tight
+LRTElectronsAuxDyn.ambiguityType
+LRTElectronsAuxDyn.asy1
+LRTElectronsAuxDyn.barys1
+LRTElectronsAuxDyn.deltaEta1PearDistortion
+LRTElectronsAuxDyn.e1152
+LRTElectronsAuxDyn.e132
+LRTElectronsAuxDyn.e233
+LRTElectronsAuxDyn.e235
+LRTElectronsAuxDyn.e237
+LRTElectronsAuxDyn.e255
+LRTElectronsAuxDyn.e2ts1
+LRTElectronsAuxDyn.e2tsts1
+LRTElectronsAuxDyn.ecore
+LRTElectronsAuxDyn.ehad1
+LRTElectronsAuxDyn.emaxs1
+LRTElectronsAuxDyn.emins1
+LRTElectronsAuxDyn.ethad
+LRTElectronsAuxDyn.ethad1
+LRTElectronsAuxDyn.pos
+LRTElectronsAuxDyn.pos7
+LRTElectronsAuxDyn.poscs1
+LRTElectronsAuxDyn.poscs2
+LRTElectronsAuxDyn.r33over37allcalo
+LRTElectronsAuxDyn.truthOrigin
+LRTElectronsAuxDyn.truthParticleLink
+LRTElectronsAuxDyn.truthType
+LRTElectronsAuxDyn.widths1
+LRTElectronsAuxDyn.widths2
+LRTGSFTrackParticles
+LRTGSFTrackParticlesAux.
+LRTGSFTrackParticlesAuxDyn.QoverPLM
+LRTGSFTrackParticlesAuxDyn.TRTdEdx
+LRTGSFTrackParticlesAuxDyn.TRTdEdxUsedHits
+LRTGSFTrackParticlesAuxDyn.eProbabilityNN
+LRTGSFTrackParticlesAuxDyn.originalTrackParticle
+LRTGSFTrackParticlesAuxDyn.parameterPX
+LRTGSFTrackParticlesAuxDyn.parameterPY
+LRTGSFTrackParticlesAuxDyn.parameterPZ
+LRTGSFTrackParticlesAuxDyn.parameterPosition
+LRTGSFTrackParticlesAuxDyn.parameterX
+LRTGSFTrackParticlesAuxDyn.parameterY
+LRTGSFTrackParticlesAuxDyn.parameterZ
+LRTGSFTrackParticlesAuxDyn.trackLink
+LRTGSFTrackParticlesAuxDyn.trackParameterCovarianceMatrices
+LRTGSFTrackParticlesAuxDyn.truthMatchProbability
+LRTGSFTrackParticlesAuxDyn.truthOrigin
+LRTGSFTrackParticlesAuxDyn.truthParticleLink
+LRTGSFTrackParticlesAuxDyn.truthType
+LRTegammaClusters
+LRTegammaClustersAux.
+LRTegammaClustersAuxDyn.BadChannelList
+LRTegammaClustersAuxDyn.CellLink
+LRTegammaClustersAuxDyn.ETA1CALOFRAME
+LRTegammaClustersAuxDyn.ETA2CALOFRAME
+LRTegammaClustersAuxDyn.ETACALOFRAME
+LRTegammaClustersAuxDyn.PHI1CALOFRAME
+LRTegammaClustersAuxDyn.PHI2CALOFRAME
+LRTegammaClustersAuxDyn.PHICALOFRAME
+LRTegammaClustersAuxDyn.constituentClusterLinks
+LRTegammaClustersAuxDyn.emax_sampl
+LRTegammaClustersAuxDyn.eta_sampl
+LRTegammaClustersAuxDyn.etamax_sampl
+LRTegammaClustersAuxDyn.phi_sampl
+LRTegammaClustersAuxDyn.phimax_sampl
+LRTegammaTruthParticles
+LRTegammaTruthParticlesAux.
+LRTegammaTruthParticlesAuxDyn.recoElectronLink
+LRTegammaTruthParticlesAuxDyn.recoPhotonLink
+LRTegammaTruthParticlesAuxDyn.truthOrigin
+LRTegammaTruthParticlesAuxDyn.truthParticleLink
+LRTegammaTruthParticlesAuxDyn.truthType
+LVL1EmTauRoIs
+LVL1EmTauRoIsAux.
+LVL1EnergySumRoI
+LVL1EnergySumRoIAux.
+LVL1JetEtRoI
+LVL1JetEtRoIAux.
+LVL1JetRoIs
+LVL1JetRoIsAux.
+LVL1MuonRoIs
+LVL1MuonRoIsAux.
+LVL1MuonRoIsAuxDyn.thresholdPatterns
+LumiBlockN
+MBTSContainer
+MSDisplacedVertex
+MSDisplacedVertexAux.
+MSOnlyExtraPolatedMuonsLRTTrackParticles
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAux.
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.TRTdEdx
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.TRTdEdxUsedHits
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.alignEffectChId
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.alignEffectDeltaAngle
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.alignEffectDeltaTrans
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.alignEffectSigmaDeltaAngle
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.alignEffectSigmaDeltaTrans
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.deltaphi_0
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.deltaphi_1
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.deltatheta_0
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.deltatheta_1
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.eProbabilityNN
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterPX
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterPY
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterPZ
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterPosition
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterX
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterY
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterZ
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.sigmadeltaphi_0
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.sigmadeltaphi_1
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.sigmadeltatheta_0
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.sigmadeltatheta_1
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.trackLink
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.trackParameterCovarianceMatrices
+MSOnlyExtrapolatedMuonTrackParticles
+MSOnlyExtrapolatedMuonTrackParticlesAux.
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.TRTdEdx
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.TRTdEdxUsedHits
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.alignEffectChId
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.alignEffectDeltaAngle
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.alignEffectDeltaTrans
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.alignEffectSigmaDeltaAngle
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.alignEffectSigmaDeltaTrans
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.deltaphi_0
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.deltaphi_1
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.deltatheta_0
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.deltatheta_1
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.eProbabilityNN
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.parameterPX
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.parameterPY
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.parameterPZ
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.parameterPosition
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.parameterX
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.parameterY
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.parameterZ
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.sigmadeltaphi_0
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.sigmadeltaphi_1
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.sigmadeltatheta_0
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.sigmadeltatheta_1
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.trackLink
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.trackParameterCovarianceMatrices
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.truthOrigin
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.truthParticleLink
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.truthType
+MSonlyTracklets
+MSonlyTrackletsAux.
+McChannel
+MuonCandidates_FS_ROIs
+MuonClusterCollection
+MuonClusterCollectionAux.
+MuonClusterCollectionAuxDyn.CellLink
+MuonClusterCollectionAuxDyn.constituentClusterLinks
+MuonClusterCollectionAuxDyn.eta_sampl
+MuonClusterCollectionAuxDyn.phi_sampl
+MuonClusterCollection_links
+MuonSegments
+MuonSegmentsAux.
+MuonSegmentsAuxDyn.clusterTime
+MuonSegmentsAuxDyn.clusterTimeError
+MuonSegmentsAuxDyn.clusterTimeValid
+MuonSegmentsAuxDyn.muonSegment
+MuonSegmentsAuxDyn.truthSegmentLink
+MuonSpectrometerTrackParticles
+MuonSpectrometerTrackParticlesAux.
+MuonSpectrometerTrackParticlesAuxDyn.TRTdEdx
+MuonSpectrometerTrackParticlesAuxDyn.TRTdEdxUsedHits
+MuonSpectrometerTrackParticlesAuxDyn.eProbabilityNN
+MuonSpectrometerTrackParticlesAuxDyn.parameterPX
+MuonSpectrometerTrackParticlesAuxDyn.parameterPY
+MuonSpectrometerTrackParticlesAuxDyn.parameterPZ
+MuonSpectrometerTrackParticlesAuxDyn.parameterPosition
+MuonSpectrometerTrackParticlesAuxDyn.parameterX
+MuonSpectrometerTrackParticlesAuxDyn.parameterY
+MuonSpectrometerTrackParticlesAuxDyn.parameterZ
+MuonSpectrometerTrackParticlesAuxDyn.trackLink
+MuonSpectrometerTrackParticlesAuxDyn.trackParameterCovarianceMatrices
+MuonSpectrometerTrackParticlesAuxDyn.truthOrigin
+MuonSpectrometerTrackParticlesAuxDyn.truthParticleLink
+MuonSpectrometerTrackParticlesAuxDyn.truthType
+MuonTruthParticles
+MuonTruthParticlesAux.
+MuonTruthParticlesAuxDyn.CaloEntryLayer_cov_extr
+MuonTruthParticlesAuxDyn.CaloEntryLayer_px
+MuonTruthParticlesAuxDyn.CaloEntryLayer_px_extr
+MuonTruthParticlesAuxDyn.CaloEntryLayer_py
+MuonTruthParticlesAuxDyn.CaloEntryLayer_py_extr
+MuonTruthParticlesAuxDyn.CaloEntryLayer_pz
+MuonTruthParticlesAuxDyn.CaloEntryLayer_pz_extr
+MuonTruthParticlesAuxDyn.CaloEntryLayer_x
+MuonTruthParticlesAuxDyn.CaloEntryLayer_x_extr
+MuonTruthParticlesAuxDyn.CaloEntryLayer_y
+MuonTruthParticlesAuxDyn.CaloEntryLayer_y_extr
+MuonTruthParticlesAuxDyn.CaloEntryLayer_z
+MuonTruthParticlesAuxDyn.CaloEntryLayer_z_extr
+MuonTruthParticlesAuxDyn.MuonEntryLayer_cov_extr
+MuonTruthParticlesAuxDyn.MuonEntryLayer_px
+MuonTruthParticlesAuxDyn.MuonEntryLayer_px_extr
+MuonTruthParticlesAuxDyn.MuonEntryLayer_py
+MuonTruthParticlesAuxDyn.MuonEntryLayer_py_extr
+MuonTruthParticlesAuxDyn.MuonEntryLayer_pz
+MuonTruthParticlesAuxDyn.MuonEntryLayer_pz_extr
+MuonTruthParticlesAuxDyn.MuonEntryLayer_x
+MuonTruthParticlesAuxDyn.MuonEntryLayer_x_extr
+MuonTruthParticlesAuxDyn.MuonEntryLayer_y
+MuonTruthParticlesAuxDyn.MuonEntryLayer_y_extr
+MuonTruthParticlesAuxDyn.MuonEntryLayer_z
+MuonTruthParticlesAuxDyn.MuonEntryLayer_z_extr
+MuonTruthParticlesAuxDyn.MuonExitLayer_cov_extr
+MuonTruthParticlesAuxDyn.MuonExitLayer_px
+MuonTruthParticlesAuxDyn.MuonExitLayer_px_extr
+MuonTruthParticlesAuxDyn.MuonExitLayer_py
+MuonTruthParticlesAuxDyn.MuonExitLayer_py_extr
+MuonTruthParticlesAuxDyn.MuonExitLayer_pz
+MuonTruthParticlesAuxDyn.MuonExitLayer_pz_extr
+MuonTruthParticlesAuxDyn.MuonExitLayer_x
+MuonTruthParticlesAuxDyn.MuonExitLayer_x_extr
+MuonTruthParticlesAuxDyn.MuonExitLayer_y
+MuonTruthParticlesAuxDyn.MuonExitLayer_y_extr
+MuonTruthParticlesAuxDyn.MuonExitLayer_z
+MuonTruthParticlesAuxDyn.MuonExitLayer_z_extr
+MuonTruthParticlesAuxDyn.etaLayer1Hits
+MuonTruthParticlesAuxDyn.etaLayer2Hits
+MuonTruthParticlesAuxDyn.etaLayer3Hits
+MuonTruthParticlesAuxDyn.etaLayer4Hits
+MuonTruthParticlesAuxDyn.extendedLargeHits
+MuonTruthParticlesAuxDyn.extendedSmallHits
+MuonTruthParticlesAuxDyn.innerLargeHits
+MuonTruthParticlesAuxDyn.innerSmallHits
+MuonTruthParticlesAuxDyn.middleLargeHits
+MuonTruthParticlesAuxDyn.middleSmallHits
+MuonTruthParticlesAuxDyn.nphiLayers
+MuonTruthParticlesAuxDyn.nprecLayers
+MuonTruthParticlesAuxDyn.ntrigEtaLayers
+MuonTruthParticlesAuxDyn.outerLargeHits
+MuonTruthParticlesAuxDyn.outerSmallHits
+MuonTruthParticlesAuxDyn.phiLayer1Hits
+MuonTruthParticlesAuxDyn.phiLayer2Hits
+MuonTruthParticlesAuxDyn.phiLayer3Hits
+MuonTruthParticlesAuxDyn.phiLayer4Hits
+MuonTruthParticlesAuxDyn.recoMuonLink
+MuonTruthParticlesAuxDyn.truthCscHits
+MuonTruthParticlesAuxDyn.truthMdtHits
+MuonTruthParticlesAuxDyn.truthOrigin
+MuonTruthParticlesAuxDyn.truthRpcHits
+MuonTruthParticlesAuxDyn.truthTgcHits
+MuonTruthParticlesAuxDyn.truthType
+MuonTruthSegments
+MuonTruthSegmentsAux.
+MuonTruthSegmentsAuxDyn.recoSegmentLink
+MuonTruthSegmentsAuxDyn.truthParticleLink
+Muons
+MuonsAux.
+MuonsAuxDyn.CT_EL_Type
+MuonsAuxDyn.CT_ET_FSRCandidateEnergy
+MuonsAuxDyn.CT_ET_LRLikelihood
+MuonsAuxDyn.ClusterInfo_deltaR
+MuonsAuxDyn.ET_Core
+MuonsAuxDyn.ET_EMCore
+MuonsAuxDyn.ET_HECCore
+MuonsAuxDyn.ET_TileCore
+MuonsAuxDyn.FSR_CandidateEnergy
+MuonsAuxDyn.InnerDetectorPt
+MuonsAuxDyn.MuonSpectrometerPt
+MuonsAuxDyn.chargedFELinks
+MuonsAuxDyn.combinedTrackOutBoundsPrecisionHits
+MuonsAuxDyn.d0_staco
+MuonsAuxDyn.deltaphi_0
+MuonsAuxDyn.deltaphi_1
+MuonsAuxDyn.deltatheta_0
+MuonsAuxDyn.deltatheta_1
+MuonsAuxDyn.extendedClosePrecisionHits
+MuonsAuxDyn.extendedOutBoundsPrecisionHits
+MuonsAuxDyn.innerClosePrecisionHits
+MuonsAuxDyn.innerOutBoundsPrecisionHits
+MuonsAuxDyn.isEndcapGoodLayers
+MuonsAuxDyn.isSmallGoodSectors
+MuonsAuxDyn.middleClosePrecisionHits
+MuonsAuxDyn.middleOutBoundsPrecisionHits
+MuonsAuxDyn.muon_efrac_matched_FE
+MuonsAuxDyn.nUnspoiledCscHits
+MuonsAuxDyn.neflowisol20
+MuonsAuxDyn.neflowisol30
+MuonsAuxDyn.neflowisol40
+MuonsAuxDyn.neflowisolCorrBitset
+MuonsAuxDyn.neflowisolcoreConeEnergyCorrection
+MuonsAuxDyn.neutralFELinks
+MuonsAuxDyn.nphiMatchedHitsPerChamberLayer
+MuonsAuxDyn.nprecMatchedHitsPerChamberLayer
+MuonsAuxDyn.ntrigEtaMatchedHitsPerChamberLayer
+MuonsAuxDyn.numEnergyLossPerTrack
+MuonsAuxDyn.numberOfGoodPrecisionLayers
+MuonsAuxDyn.outerClosePrecisionHits
+MuonsAuxDyn.outerOutBoundsPrecisionHits
+MuonsAuxDyn.phi0_staco
+MuonsAuxDyn.ptcone20
+MuonsAuxDyn.ptcone30
+MuonsAuxDyn.ptcone40
+MuonsAuxDyn.ptconeCorrBitset
+MuonsAuxDyn.ptconecoreTrackPtrCorrection
+MuonsAuxDyn.ptvarcone20
+MuonsAuxDyn.ptvarcone30
+MuonsAuxDyn.ptvarcone40
+MuonsAuxDyn.qOverPErr_staco
+MuonsAuxDyn.qOverP_staco
+MuonsAuxDyn.sigmadeltaphi_0
+MuonsAuxDyn.sigmadeltaphi_1
+MuonsAuxDyn.sigmadeltatheta_0
+MuonsAuxDyn.sigmadeltatheta_1
+MuonsAuxDyn.theta_staco
+MuonsAuxDyn.topoetcone20
+MuonsAuxDyn.topoetcone30
+MuonsAuxDyn.topoetcone40
+MuonsAuxDyn.topoetconeCorrBitset
+MuonsAuxDyn.topoetconecoreConeEnergyCorrection
+MuonsAuxDyn.truthOrigin
+MuonsAuxDyn.truthParticleLink
+MuonsAuxDyn.truthType
+MuonsAuxDyn.z0_staco
+MuonsLRT
+MuonsLRTAux.
+MuonsLRTAuxDyn.CT_EL_Type
+MuonsLRTAuxDyn.CT_ET_FSRCandidateEnergy
+MuonsLRTAuxDyn.CT_ET_LRLikelihood
+MuonsLRTAuxDyn.ET_Core
+MuonsLRTAuxDyn.ET_EMCore
+MuonsLRTAuxDyn.ET_HECCore
+MuonsLRTAuxDyn.ET_TileCore
+MuonsLRTAuxDyn.FSR_CandidateEnergy
+MuonsLRTAuxDyn.InnerDetectorPt
+MuonsLRTAuxDyn.MuonSpectrometerPt
+MuonsLRTAuxDyn.combinedTrackOutBoundsPrecisionHits
+MuonsLRTAuxDyn.d0_staco
+MuonsLRTAuxDyn.deltaphi_0
+MuonsLRTAuxDyn.deltaphi_1
+MuonsLRTAuxDyn.deltatheta_0
+MuonsLRTAuxDyn.deltatheta_1
+MuonsLRTAuxDyn.extendedClosePrecisionHits
+MuonsLRTAuxDyn.extendedOutBoundsPrecisionHits
+MuonsLRTAuxDyn.innerClosePrecisionHits
+MuonsLRTAuxDyn.innerOutBoundsPrecisionHits
+MuonsLRTAuxDyn.isEndcapGoodLayers
+MuonsLRTAuxDyn.isSmallGoodSectors
+MuonsLRTAuxDyn.middleClosePrecisionHits
+MuonsLRTAuxDyn.middleOutBoundsPrecisionHits
+MuonsLRTAuxDyn.nUnspoiledCscHits
+MuonsLRTAuxDyn.numEnergyLossPerTrack
+MuonsLRTAuxDyn.numberOfGoodPrecisionLayers
+MuonsLRTAuxDyn.outerClosePrecisionHits
+MuonsLRTAuxDyn.outerOutBoundsPrecisionHits
+MuonsLRTAuxDyn.phi0_staco
+MuonsLRTAuxDyn.qOverPErr_staco
+MuonsLRTAuxDyn.qOverP_staco
+MuonsLRTAuxDyn.sigmadeltaphi_0
+MuonsLRTAuxDyn.sigmadeltaphi_1
+MuonsLRTAuxDyn.sigmadeltatheta_0
+MuonsLRTAuxDyn.sigmadeltatheta_1
+MuonsLRTAuxDyn.theta_staco
+MuonsLRTAuxDyn.z0_staco
+NCB_MuonSegments
+NCB_MuonSegmentsAux.
+NCB_MuonSegmentsAuxDyn.clusterTime
+NCB_MuonSegmentsAuxDyn.clusterTimeError
+NCB_MuonSegmentsAuxDyn.clusterTimeValid
+NCB_MuonSegmentsAuxDyn.muonSegment
+Photons
+PhotonsAux.
+PhotonsAuxDyn.Loose
+PhotonsAuxDyn.Tight
+PhotonsAuxDyn.ambiguityLink
+PhotonsAuxDyn.ambiguityType
+PhotonsAuxDyn.asy1
+PhotonsAuxDyn.barys1
+PhotonsAuxDyn.chargedFELinks
+PhotonsAuxDyn.core57cellsEnergyCorrection
+PhotonsAuxDyn.e1152
+PhotonsAuxDyn.e132
+PhotonsAuxDyn.e233
+PhotonsAuxDyn.e235
+PhotonsAuxDyn.e237
+PhotonsAuxDyn.e255
+PhotonsAuxDyn.e2ts1
+PhotonsAuxDyn.e2tsts1
+PhotonsAuxDyn.ecore
+PhotonsAuxDyn.ehad1
+PhotonsAuxDyn.emaxs1
+PhotonsAuxDyn.emins1
+PhotonsAuxDyn.ethad
+PhotonsAuxDyn.ethad1
+PhotonsAuxDyn.neutralFELinks
+PhotonsAuxDyn.pos
+PhotonsAuxDyn.pos7
+PhotonsAuxDyn.poscs1
+PhotonsAuxDyn.poscs2
+PhotonsAuxDyn.ptcone20
+PhotonsAuxDyn.ptcone30
+PhotonsAuxDyn.r33over37allcalo
+PhotonsAuxDyn.topoetcone20
+PhotonsAuxDyn.topoetcone20ptCorrection
+PhotonsAuxDyn.topoetcone30
+PhotonsAuxDyn.topoetcone30ptCorrection
+PhotonsAuxDyn.topoetcone40
+PhotonsAuxDyn.topoetcone40ptCorrection
+PhotonsAuxDyn.truthOrigin
+PhotonsAuxDyn.truthParticleLink
+PhotonsAuxDyn.truthType
+PhotonsAuxDyn.widths1
+PhotonsAuxDyn.widths2
+PrimaryVertices
+PrimaryVerticesAux.
+PrimaryVerticesAuxDyn.sumPt2
+RAWtoESD_mems
+RAWtoESD_timings
+RunNumber
+SlowMuons
+SlowMuonsAux.
+SlowMuonsAuxDyn.hitEnergy
+SlowMuonsAuxDyn.hitError
+SlowMuonsAuxDyn.hitIdentifier
+SlowMuonsAuxDyn.hitPositionX
+SlowMuonsAuxDyn.hitPositionY
+SlowMuonsAuxDyn.hitPositionZ
+SlowMuonsAuxDyn.hitPropagationTime
+SlowMuonsAuxDyn.hitShift
+SlowMuonsAuxDyn.hitTOF
+SlowMuonsAuxDyn.hitTechnology
+Staus
+StausAux.
+StausAuxDyn.CT_EL_Type
+StausAuxDyn.CT_ET_FSRCandidateEnergy
+StausAuxDyn.CT_ET_LRLikelihood
+StausAuxDyn.ET_Core
+StausAuxDyn.ET_EMCore
+StausAuxDyn.ET_HECCore
+StausAuxDyn.ET_TileCore
+StausAuxDyn.FSR_CandidateEnergy
+StausAuxDyn.InnerDetectorPt
+StausAuxDyn.MuonSpectrometerPt
+StausAuxDyn.combinedTrackOutBoundsPrecisionHits
+StausAuxDyn.d0_staco
+StausAuxDyn.deltaphi_0
+StausAuxDyn.deltaphi_1
+StausAuxDyn.deltatheta_0
+StausAuxDyn.deltatheta_1
+StausAuxDyn.extendedClosePrecisionHits
+StausAuxDyn.extendedOutBoundsPrecisionHits
+StausAuxDyn.innerClosePrecisionHits
+StausAuxDyn.innerOutBoundsPrecisionHits
+StausAuxDyn.isEndcapGoodLayers
+StausAuxDyn.isSmallGoodSectors
+StausAuxDyn.middleClosePrecisionHits
+StausAuxDyn.middleOutBoundsPrecisionHits
+StausAuxDyn.nUnspoiledCscHits
+StausAuxDyn.numEnergyLossPerTrack
+StausAuxDyn.numberOfGoodPrecisionLayers
+StausAuxDyn.outerClosePrecisionHits
+StausAuxDyn.outerOutBoundsPrecisionHits
+StausAuxDyn.phi0_staco
+StausAuxDyn.qOverPErr_staco
+StausAuxDyn.qOverP_staco
+StausAuxDyn.sigmadeltaphi_0
+StausAuxDyn.sigmadeltaphi_1
+StausAuxDyn.sigmadeltatheta_0
+StausAuxDyn.sigmadeltatheta_1
+StausAuxDyn.theta_staco
+StausAuxDyn.z0_staco
+StreamAOD
+SuspectLumiBlocks
+SuspectLumiBlocksAux.
+TauFinalPi0s
+TauFinalPi0sAux.
+TauFinalPi0sAuxDyn.pi0PFOLinks
+TauHadronicParticleFlowObjects
+TauHadronicParticleFlowObjectsAux.
+TauJets
+TauJetsAux.
+TauJetsAuxDyn.ClusterTotalEnergy
+TauJetsAuxDyn.ClustersMeanCenterLambda
+TauJetsAuxDyn.ClustersMeanEMProbability
+TauJetsAuxDyn.ClustersMeanFirstEngDens
+TauJetsAuxDyn.ClustersMeanPresamplerFrac
+TauJetsAuxDyn.ClustersMeanSecondLambda
+TauJetsAuxDyn.EMFRACTIONATEMSCALE_MOVEE3
+TauJetsAuxDyn.EMFracFixed
+TauJetsAuxDyn.GhostMuonSegmentCount
+TauJetsAuxDyn.LeadClusterFrac
+TauJetsAuxDyn.NNDecayMode
+TauJetsAuxDyn.NNDecayModeProb_1p0n
+TauJetsAuxDyn.NNDecayModeProb_1p1n
+TauJetsAuxDyn.NNDecayModeProb_1pXn
+TauJetsAuxDyn.NNDecayModeProb_3p0n
+TauJetsAuxDyn.NNDecayModeProb_3pXn
+TauJetsAuxDyn.PFOEngRelDiff
+TauJetsAuxDyn.PanTau_DecayModeExtended
+TauJetsAuxDyn.TAU_SEEDTRK_SECMAXSTRIPETOVERPT
+TauJetsAuxDyn.UpsilonCluster
+TauJetsAuxDyn.chargedFELinks
+TauJetsAuxDyn.etHotShotDR1
+TauJetsAuxDyn.etHotShotDR1OverPtLeadTrk
+TauJetsAuxDyn.etHotShotWin
+TauJetsAuxDyn.etHotShotWinOverPtLeadTrk
+TauJetsAuxDyn.etaCombined
+TauJetsAuxDyn.hadLeakFracFixed
+TauJetsAuxDyn.leadTrackProbHT
+TauJetsAuxDyn.mCombined
+TauJetsAuxDyn.nConversionTracks
+TauJetsAuxDyn.nFakeTracks
+TauJetsAuxDyn.nModifiedIsolationTracks
+TauJetsAuxDyn.neutralFELinks
+TauJetsAuxDyn.phiCombined
+TauJetsAuxDyn.ptCombined
+TauJetsAuxDyn.ptIntermediateAxisEM
+TauJetsAuxDyn.rho
+TauNeutralParticleFlowObjects
+TauNeutralParticleFlowObjectsAux.
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_CENTER_LAMBDA
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_DELTA_PHI
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_DELTA_THETA
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_EM1CoreFrac
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_ENG_FRAC_CORE
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_ENG_FRAC_EM
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_ENG_FRAC_MAX
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_FIRST_ETA
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_LATERAL
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_LONGITUDINAL
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_NHitsInEM1
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_NPosECells_EM1
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_NPosECells_EM2
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_NPosECells_PS
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_SECOND_ENG_DENS
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_SECOND_LAMBDA
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_SECOND_R
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_energy_EM1
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_energy_EM2
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_firstEtaWRTClusterPosition_EM1
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_firstEtaWRTClusterPosition_EM2
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_secondEtaWRTClusterPosition_EM1
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_secondEtaWRTClusterPosition_EM2
+TauNeutralParticleFlowObjectsAuxDyn.nPi0Proto
+TauPi0Clusters
+TauPi0ClustersAux.
+TauPi0ClustersAuxDyn.BadChannelList
+TauPi0ClustersAuxDyn.CENTER_LAMBDA
+TauPi0ClustersAuxDyn.CENTER_MAG
+TauPi0ClustersAuxDyn.CENTER_X
+TauPi0ClustersAuxDyn.CENTER_Y
+TauPi0ClustersAuxDyn.CENTER_Z
+TauPi0ClustersAuxDyn.CellLink
+TauPi0ClustersAuxDyn.DELTA_ALPHA
+TauPi0ClustersAuxDyn.DELTA_PHI
+TauPi0ClustersAuxDyn.DELTA_THETA
+TauPi0ClustersAuxDyn.DM_WEIGHT
+TauPi0ClustersAuxDyn.EM_PROBABILITY
+TauPi0ClustersAuxDyn.ENG_FRAC_CORE
+TauPi0ClustersAuxDyn.ENG_FRAC_EM
+TauPi0ClustersAuxDyn.ENG_FRAC_MAX
+TauPi0ClustersAuxDyn.FIRST_ENG_DENS
+TauPi0ClustersAuxDyn.FIRST_ETA
+TauPi0ClustersAuxDyn.FIRST_PHI
+TauPi0ClustersAuxDyn.HAD_WEIGHT
+TauPi0ClustersAuxDyn.ISOLATION
+TauPi0ClustersAuxDyn.LATERAL
+TauPi0ClustersAuxDyn.LONGITUDINAL
+TauPi0ClustersAuxDyn.OOC_WEIGHT
+TauPi0ClustersAuxDyn.SECOND_ENG_DENS
+TauPi0ClustersAuxDyn.SECOND_LAMBDA
+TauPi0ClustersAuxDyn.SECOND_R
+TauPi0ClustersAuxDyn.emax_sampl
+TauPi0ClustersAuxDyn.eta_sampl
+TauPi0ClustersAuxDyn.etamax_sampl
+TauPi0ClustersAuxDyn.phi_sampl
+TauPi0ClustersAuxDyn.phimax_sampl
+TauPi0Clusters_links
+TauSecondaryVertices
+TauSecondaryVerticesAux.
+TauShotClusters
+TauShotClustersAux.
+TauShotClustersAuxDyn.CellLink
+TauShotClustersAuxDyn.emax_sampl
+TauShotClustersAuxDyn.eta_sampl
+TauShotClustersAuxDyn.etamax_sampl
+TauShotClustersAuxDyn.phi_sampl
+TauShotClustersAuxDyn.phimax_sampl
+TauShotClusters_links
+TauShotParticleFlowObjects
+TauShotParticleFlowObjectsAux.
+TauShotParticleFlowObjectsAuxDyn.tauShots_nCellsInEta
+TauShotParticleFlowObjectsAuxDyn.tauShots_nPhotons
+TauShotParticleFlowObjectsAuxDyn.tauShots_pt1
+TauShotParticleFlowObjectsAuxDyn.tauShots_pt3
+TauShotParticleFlowObjectsAuxDyn.tauShots_pt5
+TauShotParticleFlowObjectsAuxDyn.tauShots_seedHash
+TauTracks
+TauTracksAux.
+TauTracksAuxDyn.CaloSamplingEtaEM
+TauTracksAuxDyn.CaloSamplingEtaHad
+TauTracksAuxDyn.CaloSamplingPhiEM
+TauTracksAuxDyn.CaloSamplingPhiHad
+TauTracksAuxDyn.d0SigTJVA
+TauTracksAuxDyn.d0TJVA
+TauTracksAuxDyn.rnn_chargedScore
+TauTracksAuxDyn.rnn_conversionScore
+TauTracksAuxDyn.rnn_fakeScore
+TauTracksAuxDyn.rnn_isolationScore
+TauTracksAuxDyn.z0sinthetaSigTJVA
+TauTracksAuxDyn.z0sinthetaTJVA
+TileMuObj
+Token
+TopoClusterIsoCentralEventShape
+TopoClusterIsoCentralEventShapeAux.
+TopoClusterIsoCentralEventShapeAuxDyn.Density
+TopoClusterIsoCentralEventShapeAuxDyn.DensityArea
+TopoClusterIsoCentralEventShapeAuxDyn.DensitySigma
+TopoClusterIsoForwardEventShape
+TopoClusterIsoForwardEventShapeAux.
+TopoClusterIsoForwardEventShapeAuxDyn.Density
+TopoClusterIsoForwardEventShapeAuxDyn.DensityArea
+TopoClusterIsoForwardEventShapeAuxDyn.DensitySigma
+TrigConfKeys
+TrigConfKeysOnline
+TriggerMenuJson_HLT
+TriggerMenuJson_HLTAux.
+TriggerMenuJson_HLTPS
+TriggerMenuJson_HLTPSAux.
+TriggerMenuJson_L1
+TriggerMenuJson_L1Aux.
+TriggerMenuJson_L1PS
+TriggerMenuJson_L1PSAux.
+TruthEvents
+TruthEventsAux.
+TruthEventsAuxDyn.PDFID1
+TruthEventsAuxDyn.PDFID2
+TruthEventsAuxDyn.PDGID1
+TruthEventsAuxDyn.PDGID2
+TruthEventsAuxDyn.Q
+TruthEventsAuxDyn.X1
+TruthEventsAuxDyn.X2
+TruthEventsAuxDyn.XF1
+TruthEventsAuxDyn.XF2
+TruthMetaData
+TruthMetaDataAux.
+TruthParticles
+TruthParticlesAux.
+TruthParticlesAuxDyn.polarizationPhi
+TruthParticlesAuxDyn.polarizationTheta
+TruthVertices
+TruthVerticesAux.
+_Digitization_Parameters
+_GLOBAL_BField_Maps
+_Generation_Parameters
+_Simulation_Parameters
+_TagInfo
+eElesPerf
+eElesPerfAux.
+egammaClusters
+egammaClustersAux.
+egammaClustersAuxDyn.BadChannelList
+egammaClustersAuxDyn.CellLink
+egammaClustersAuxDyn.ETA1CALOFRAME
+egammaClustersAuxDyn.ETA2CALOFRAME
+egammaClustersAuxDyn.ETACALOFRAME
+egammaClustersAuxDyn.PHI1CALOFRAME
+egammaClustersAuxDyn.PHI2CALOFRAME
+egammaClustersAuxDyn.PHICALOFRAME
+egammaClustersAuxDyn.constituentClusterLinks
+egammaClustersAuxDyn.emax_sampl
+egammaClustersAuxDyn.eta_sampl
+egammaClustersAuxDyn.etamax_sampl
+egammaClustersAuxDyn.phi_sampl
+egammaClustersAuxDyn.phimax_sampl
+egammaClusters_links
+egammaTruthParticles
+egammaTruthParticlesAux.
+egammaTruthParticlesAuxDyn.recoElectronLink
+egammaTruthParticlesAuxDyn.recoPhotonLink
+egammaTruthParticlesAuxDyn.truthOrigin
+egammaTruthParticlesAuxDyn.truthParticleLink
+egammaTruthParticlesAuxDyn.truthType
+index_ref
+index_ref
+index_ref
+index_ref
+index_ref
+xTrigDecision
+xTrigDecisionAux.
diff --git a/Tools/PROCTools/data/master_q431_AOD_content_500events.ref b/Tools/PROCTools/data/master_q431_AOD_content_500events.ref
new file mode 100644
index 000000000000..5464c7f06dd3
--- /dev/null
+++ b/Tools/PROCTools/data/master_q431_AOD_content_500events.ref
@@ -0,0 +1,1339 @@
+AllCalo
+BunchId
+ByteStreamMetadata
+CaloCalFwdTopoTowers
+CaloCalFwdTopoTowersAux.
+CaloCalFwdTopoTowersAuxDyn.ENG_FRAC_EM
+CaloCalFwdTopoTowersAuxDyn.LONGITUDINAL
+CaloCalFwdTopoTowersAuxDyn.SIGNIFICANCE
+CaloCalTopoClusters
+CaloCalTopoClustersAux.
+CaloCalTopoClustersAuxDyn.AVG_LAR_Q
+CaloCalTopoClustersAuxDyn.AVG_TILE_Q
+CaloCalTopoClustersAuxDyn.BADLARQ_FRAC
+CaloCalTopoClustersAuxDyn.BadChannelList
+CaloCalTopoClustersAuxDyn.CELL_SIGNIFICANCE
+CaloCalTopoClustersAuxDyn.CENTER_LAMBDA
+CaloCalTopoClustersAuxDyn.CENTER_MAG
+CaloCalTopoClustersAuxDyn.CellLink
+CaloCalTopoClustersAuxDyn.EM_PROBABILITY
+CaloCalTopoClustersAuxDyn.ENG_BAD_CELLS
+CaloCalTopoClustersAuxDyn.ENG_FRAC_MAX
+CaloCalTopoClustersAuxDyn.ENG_POS
+CaloCalTopoClustersAuxDyn.FIRST_ENG_DENS
+CaloCalTopoClustersAuxDyn.ISOLATION
+CaloCalTopoClustersAuxDyn.LATERAL
+CaloCalTopoClustersAuxDyn.LONGITUDINAL
+CaloCalTopoClustersAuxDyn.MASS
+CaloCalTopoClustersAuxDyn.NCELL_SAMPLING
+CaloCalTopoClustersAuxDyn.N_BAD_CELLS
+CaloCalTopoClustersAuxDyn.PTD
+CaloCalTopoClustersAuxDyn.SECOND_LAMBDA
+CaloCalTopoClustersAuxDyn.SECOND_R
+CaloCalTopoClustersAuxDyn.SECOND_TIME
+CaloCalTopoClustersAuxDyn.SIGNIFICANCE
+CaloCalTopoClusters_links
+CombinedMuonTrackParticles
+CombinedMuonTrackParticlesAux.
+CombinedMuonTrackParticlesAuxDyn.TRTdEdx
+CombinedMuonTrackParticlesAuxDyn.TRTdEdxUsedHits
+CombinedMuonTrackParticlesAuxDyn.alignEffectChId
+CombinedMuonTrackParticlesAuxDyn.alignEffectDeltaAngle
+CombinedMuonTrackParticlesAuxDyn.alignEffectDeltaTrans
+CombinedMuonTrackParticlesAuxDyn.alignEffectSigmaDeltaAngle
+CombinedMuonTrackParticlesAuxDyn.alignEffectSigmaDeltaTrans
+CombinedMuonTrackParticlesAuxDyn.deltaphi_0
+CombinedMuonTrackParticlesAuxDyn.deltaphi_1
+CombinedMuonTrackParticlesAuxDyn.deltatheta_0
+CombinedMuonTrackParticlesAuxDyn.deltatheta_1
+CombinedMuonTrackParticlesAuxDyn.eProbabilityNN
+CombinedMuonTrackParticlesAuxDyn.parameterPX
+CombinedMuonTrackParticlesAuxDyn.parameterPY
+CombinedMuonTrackParticlesAuxDyn.parameterPZ
+CombinedMuonTrackParticlesAuxDyn.parameterPosition
+CombinedMuonTrackParticlesAuxDyn.parameterX
+CombinedMuonTrackParticlesAuxDyn.parameterY
+CombinedMuonTrackParticlesAuxDyn.parameterZ
+CombinedMuonTrackParticlesAuxDyn.sigmadeltaphi_0
+CombinedMuonTrackParticlesAuxDyn.sigmadeltaphi_1
+CombinedMuonTrackParticlesAuxDyn.sigmadeltatheta_0
+CombinedMuonTrackParticlesAuxDyn.sigmadeltatheta_1
+CombinedMuonTrackParticlesAuxDyn.trackLink
+CombinedMuonTrackParticlesAuxDyn.trackParameterCovarianceMatrices
+CombinedMuonsLRTTrackParticles
+CombinedMuonsLRTTrackParticlesAux.
+CombinedMuonsLRTTrackParticlesAuxDyn.TRTdEdx
+CombinedMuonsLRTTrackParticlesAuxDyn.TRTdEdxUsedHits
+CombinedMuonsLRTTrackParticlesAuxDyn.alignEffectChId
+CombinedMuonsLRTTrackParticlesAuxDyn.alignEffectDeltaAngle
+CombinedMuonsLRTTrackParticlesAuxDyn.alignEffectDeltaTrans
+CombinedMuonsLRTTrackParticlesAuxDyn.alignEffectSigmaDeltaAngle
+CombinedMuonsLRTTrackParticlesAuxDyn.alignEffectSigmaDeltaTrans
+CombinedMuonsLRTTrackParticlesAuxDyn.deltaphi_0
+CombinedMuonsLRTTrackParticlesAuxDyn.deltaphi_1
+CombinedMuonsLRTTrackParticlesAuxDyn.deltatheta_0
+CombinedMuonsLRTTrackParticlesAuxDyn.deltatheta_1
+CombinedMuonsLRTTrackParticlesAuxDyn.eProbabilityNN
+CombinedMuonsLRTTrackParticlesAuxDyn.parameterPX
+CombinedMuonsLRTTrackParticlesAuxDyn.parameterPY
+CombinedMuonsLRTTrackParticlesAuxDyn.parameterPZ
+CombinedMuonsLRTTrackParticlesAuxDyn.parameterPosition
+CombinedMuonsLRTTrackParticlesAuxDyn.parameterX
+CombinedMuonsLRTTrackParticlesAuxDyn.parameterY
+CombinedMuonsLRTTrackParticlesAuxDyn.parameterZ
+CombinedMuonsLRTTrackParticlesAuxDyn.sigmadeltaphi_0
+CombinedMuonsLRTTrackParticlesAuxDyn.sigmadeltaphi_1
+CombinedMuonsLRTTrackParticlesAuxDyn.sigmadeltatheta_0
+CombinedMuonsLRTTrackParticlesAuxDyn.sigmadeltatheta_1
+CombinedMuonsLRTTrackParticlesAuxDyn.trackLink
+CombinedMuonsLRTTrackParticlesAuxDyn.trackParameterCovarianceMatrices
+CombinedStauTrackParticles
+CombinedStauTrackParticlesAux.
+CombinedStauTrackParticlesAuxDyn.TRTdEdx
+CombinedStauTrackParticlesAuxDyn.TRTdEdxUsedHits
+CombinedStauTrackParticlesAuxDyn.alignEffectChId
+CombinedStauTrackParticlesAuxDyn.alignEffectDeltaAngle
+CombinedStauTrackParticlesAuxDyn.alignEffectDeltaTrans
+CombinedStauTrackParticlesAuxDyn.alignEffectSigmaDeltaAngle
+CombinedStauTrackParticlesAuxDyn.alignEffectSigmaDeltaTrans
+CombinedStauTrackParticlesAuxDyn.deltaphi_0
+CombinedStauTrackParticlesAuxDyn.deltaphi_1
+CombinedStauTrackParticlesAuxDyn.deltatheta_0
+CombinedStauTrackParticlesAuxDyn.deltatheta_1
+CombinedStauTrackParticlesAuxDyn.eProbabilityNN
+CombinedStauTrackParticlesAuxDyn.parameterPX
+CombinedStauTrackParticlesAuxDyn.parameterPY
+CombinedStauTrackParticlesAuxDyn.parameterPZ
+CombinedStauTrackParticlesAuxDyn.parameterPosition
+CombinedStauTrackParticlesAuxDyn.parameterX
+CombinedStauTrackParticlesAuxDyn.parameterY
+CombinedStauTrackParticlesAuxDyn.parameterZ
+CombinedStauTrackParticlesAuxDyn.sigmadeltaphi_0
+CombinedStauTrackParticlesAuxDyn.sigmadeltaphi_1
+CombinedStauTrackParticlesAuxDyn.sigmadeltatheta_0
+CombinedStauTrackParticlesAuxDyn.sigmadeltatheta_1
+CombinedStauTrackParticlesAuxDyn.trackLink
+CombinedStauTrackParticlesAuxDyn.trackParameterCovarianceMatrices
+ConditionsRun
+DataHeader
+DataHeaderForm
+DataHeaderForm
+DiTauJets
+DiTauJetsAux.
+E4prContainer
+ElectronCaloRings
+ElectronCaloRingsAux.
+ElectronRingSets
+ElectronRingSetsAux.
+Electrons
+ElectronsAux.
+ElectronsAuxDyn.LHLoose
+ElectronsAuxDyn.LHMedium
+ElectronsAuxDyn.LHTight
+ElectronsAuxDyn.LHValue
+ElectronsAuxDyn.Loose
+ElectronsAuxDyn.Medium
+ElectronsAuxDyn.Tight
+ElectronsAuxDyn.ambiguityLink
+ElectronsAuxDyn.ambiguityType
+ElectronsAuxDyn.asy1
+ElectronsAuxDyn.barys1
+ElectronsAuxDyn.caloRingsLinks
+ElectronsAuxDyn.chargedFELinks
+ElectronsAuxDyn.core57cellsEnergyCorrection
+ElectronsAuxDyn.deltaEta1PearDistortion
+ElectronsAuxDyn.e1152
+ElectronsAuxDyn.e132
+ElectronsAuxDyn.e233
+ElectronsAuxDyn.e235
+ElectronsAuxDyn.e237
+ElectronsAuxDyn.e255
+ElectronsAuxDyn.e2ts1
+ElectronsAuxDyn.e2tsts1
+ElectronsAuxDyn.ecore
+ElectronsAuxDyn.ehad1
+ElectronsAuxDyn.emaxs1
+ElectronsAuxDyn.emins1
+ElectronsAuxDyn.ethad
+ElectronsAuxDyn.ethad1
+ElectronsAuxDyn.neutralFELinks
+ElectronsAuxDyn.pos
+ElectronsAuxDyn.pos7
+ElectronsAuxDyn.poscs1
+ElectronsAuxDyn.poscs2
+ElectronsAuxDyn.ptcone20
+ElectronsAuxDyn.ptcone30
+ElectronsAuxDyn.ptvarcone20
+ElectronsAuxDyn.ptvarcone30
+ElectronsAuxDyn.r33over37allcalo
+ElectronsAuxDyn.topoetcone20
+ElectronsAuxDyn.topoetcone20ptCorrection
+ElectronsAuxDyn.topoetcone30
+ElectronsAuxDyn.topoetcone30ptCorrection
+ElectronsAuxDyn.topoetcone40
+ElectronsAuxDyn.topoetcone40ptCorrection
+ElectronsAuxDyn.widths1
+ElectronsAuxDyn.widths2
+EventFormatStreamAOD
+EventInfo
+EventInfoAux.
+EventInfoAuxDyn.actualInteractionsPerCrossing
+EventInfoAuxDyn.averageInteractionsPerCrossing
+EventInfoAuxDyn.mcChannelNumber
+EventInfoAuxDyn.mcEventNumber
+EventInfoAuxDyn.mcEventWeights
+EventInfoAuxDyn.streamTagDets
+EventInfoAuxDyn.streamTagRobs
+EventInfo_p4
+EventNumber
+EventTime
+EventTimeNanoSec
+EventWeight
+ExtraPolatedMuonsLRTTrackParticles
+ExtraPolatedMuonsLRTTrackParticlesAux.
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.TRTdEdx
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.TRTdEdxUsedHits
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.alignEffectChId
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.alignEffectDeltaAngle
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.alignEffectDeltaTrans
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.alignEffectSigmaDeltaAngle
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.alignEffectSigmaDeltaTrans
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.deltaphi_0
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.deltaphi_1
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.deltatheta_0
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.deltatheta_1
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.eProbabilityNN
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterPX
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterPY
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterPZ
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterPosition
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterX
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterY
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterZ
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.sigmadeltaphi_0
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.sigmadeltaphi_1
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.sigmadeltatheta_0
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.sigmadeltatheta_1
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.trackLink
+ExtraPolatedMuonsLRTTrackParticlesAuxDyn.trackParameterCovarianceMatrices
+ExtrapolatedMuonTrackParticles
+ExtrapolatedMuonTrackParticlesAux.
+ExtrapolatedMuonTrackParticlesAuxDyn.TRTdEdx
+ExtrapolatedMuonTrackParticlesAuxDyn.TRTdEdxUsedHits
+ExtrapolatedMuonTrackParticlesAuxDyn.alignEffectChId
+ExtrapolatedMuonTrackParticlesAuxDyn.alignEffectDeltaAngle
+ExtrapolatedMuonTrackParticlesAuxDyn.alignEffectDeltaTrans
+ExtrapolatedMuonTrackParticlesAuxDyn.alignEffectSigmaDeltaAngle
+ExtrapolatedMuonTrackParticlesAuxDyn.alignEffectSigmaDeltaTrans
+ExtrapolatedMuonTrackParticlesAuxDyn.deltaphi_0
+ExtrapolatedMuonTrackParticlesAuxDyn.deltaphi_1
+ExtrapolatedMuonTrackParticlesAuxDyn.deltatheta_0
+ExtrapolatedMuonTrackParticlesAuxDyn.deltatheta_1
+ExtrapolatedMuonTrackParticlesAuxDyn.eProbabilityNN
+ExtrapolatedMuonTrackParticlesAuxDyn.parameterPX
+ExtrapolatedMuonTrackParticlesAuxDyn.parameterPY
+ExtrapolatedMuonTrackParticlesAuxDyn.parameterPZ
+ExtrapolatedMuonTrackParticlesAuxDyn.parameterPosition
+ExtrapolatedMuonTrackParticlesAuxDyn.parameterX
+ExtrapolatedMuonTrackParticlesAuxDyn.parameterY
+ExtrapolatedMuonTrackParticlesAuxDyn.parameterZ
+ExtrapolatedMuonTrackParticlesAuxDyn.sigmadeltaphi_0
+ExtrapolatedMuonTrackParticlesAuxDyn.sigmadeltaphi_1
+ExtrapolatedMuonTrackParticlesAuxDyn.sigmadeltatheta_0
+ExtrapolatedMuonTrackParticlesAuxDyn.sigmadeltatheta_1
+ExtrapolatedMuonTrackParticlesAuxDyn.trackLink
+ExtrapolatedMuonTrackParticlesAuxDyn.trackParameterCovarianceMatrices
+ExtrapolatedStauTrackParticles
+ExtrapolatedStauTrackParticlesAux.
+FileMetaData
+FileMetaDataAux.
+FileMetaDataAuxDyn.amiTag
+FileMetaDataAuxDyn.beamEnergy
+FileMetaDataAuxDyn.beamType
+FileMetaDataAuxDyn.conditionsTag
+FileMetaDataAuxDyn.geometryVersion
+FileMetaDataAuxDyn.mcProcID
+ForwardElectronClusters
+ForwardElectronClustersAux.
+ForwardElectronClustersAuxDyn.AVG_LAR_Q
+ForwardElectronClustersAuxDyn.AVG_TILE_Q
+ForwardElectronClustersAuxDyn.BADLARQ_FRAC
+ForwardElectronClustersAuxDyn.BAD_CELLS_CORR_E
+ForwardElectronClustersAuxDyn.BadChannelList
+ForwardElectronClustersAuxDyn.CELL_SIGNIFICANCE
+ForwardElectronClustersAuxDyn.CELL_SIG_SAMPLING
+ForwardElectronClustersAuxDyn.CENTER_LAMBDA
+ForwardElectronClustersAuxDyn.CENTER_MAG
+ForwardElectronClustersAuxDyn.CENTER_X
+ForwardElectronClustersAuxDyn.CENTER_Y
+ForwardElectronClustersAuxDyn.CENTER_Z
+ForwardElectronClustersAuxDyn.CellLink
+ForwardElectronClustersAuxDyn.DELTA_ALPHA
+ForwardElectronClustersAuxDyn.DELTA_PHI
+ForwardElectronClustersAuxDyn.DELTA_THETA
+ForwardElectronClustersAuxDyn.DM_WEIGHT
+ForwardElectronClustersAuxDyn.EM_PROBABILITY
+ForwardElectronClustersAuxDyn.ENG_BAD_CELLS
+ForwardElectronClustersAuxDyn.ENG_BAD_HV_CELLS
+ForwardElectronClustersAuxDyn.ENG_FRAC_CORE
+ForwardElectronClustersAuxDyn.ENG_FRAC_EM
+ForwardElectronClustersAuxDyn.ENG_FRAC_MAX
+ForwardElectronClustersAuxDyn.ENG_POS
+ForwardElectronClustersAuxDyn.FIRST_ENG_DENS
+ForwardElectronClustersAuxDyn.FIRST_ETA
+ForwardElectronClustersAuxDyn.FIRST_PHI
+ForwardElectronClustersAuxDyn.HAD_WEIGHT
+ForwardElectronClustersAuxDyn.ISOLATION
+ForwardElectronClustersAuxDyn.LATERAL
+ForwardElectronClustersAuxDyn.LONGITUDINAL
+ForwardElectronClustersAuxDyn.MASS
+ForwardElectronClustersAuxDyn.NCELL_SAMPLING
+ForwardElectronClustersAuxDyn.N_BAD_CELLS
+ForwardElectronClustersAuxDyn.N_BAD_CELLS_CORR
+ForwardElectronClustersAuxDyn.N_BAD_HV_CELLS
+ForwardElectronClustersAuxDyn.OOC_WEIGHT
+ForwardElectronClustersAuxDyn.PTD
+ForwardElectronClustersAuxDyn.SECOND_ENG_DENS
+ForwardElectronClustersAuxDyn.SECOND_LAMBDA
+ForwardElectronClustersAuxDyn.SECOND_R
+ForwardElectronClustersAuxDyn.SECOND_TIME
+ForwardElectronClustersAuxDyn.SIGNIFICANCE
+ForwardElectronClustersAuxDyn.constituentClusterLinks
+ForwardElectronClustersAuxDyn.emax_sampl
+ForwardElectronClustersAuxDyn.eta_sampl
+ForwardElectronClustersAuxDyn.etamax_sampl
+ForwardElectronClustersAuxDyn.phi_sampl
+ForwardElectronClustersAuxDyn.phimax_sampl
+ForwardElectronClusters_links
+ForwardElectrons
+ForwardElectronsAux.
+ForwardElectronsAuxDyn.Loose
+ForwardElectronsAuxDyn.Medium
+ForwardElectronsAuxDyn.Tight
+GSFConversionVertices
+GSFConversionVerticesAux.
+GSFConversionVerticesAuxDyn.DR1R2
+GSFConversionVerticesAuxDyn.deltaCotThetaTrk
+GSFConversionVerticesAuxDyn.deltaInitRadius
+GSFConversionVerticesAuxDyn.deltaPhiTracks
+GSFConversionVerticesAuxDyn.deltaPhiVtxTrk
+GSFConversionVerticesAuxDyn.etaAtCalo
+GSFConversionVerticesAuxDyn.mass
+GSFConversionVerticesAuxDyn.minRfirstHit
+GSFConversionVerticesAuxDyn.minimumDistanceTrk
+GSFConversionVerticesAuxDyn.phiAtCalo
+GSFConversionVerticesAuxDyn.pt1
+GSFConversionVerticesAuxDyn.pt2
+GSFConversionVerticesAuxDyn.px
+GSFConversionVerticesAuxDyn.py
+GSFConversionVerticesAuxDyn.pz
+GSFTrackParticles
+GSFTrackParticlesAux.
+GSFTrackParticlesAuxDyn.QoverPLM
+GSFTrackParticlesAuxDyn.TRTdEdx
+GSFTrackParticlesAuxDyn.TRTdEdxUsedHits
+GSFTrackParticlesAuxDyn.eProbabilityNN
+GSFTrackParticlesAuxDyn.originalTrackParticle
+GSFTrackParticlesAuxDyn.parameterPX
+GSFTrackParticlesAuxDyn.parameterPY
+GSFTrackParticlesAuxDyn.parameterPZ
+GSFTrackParticlesAuxDyn.parameterPosition
+GSFTrackParticlesAuxDyn.parameterX
+GSFTrackParticlesAuxDyn.parameterY
+GSFTrackParticlesAuxDyn.parameterZ
+GSFTrackParticlesAuxDyn.trackLink
+GSFTrackParticlesAuxDyn.trackParameterCovarianceMatrices
+HLT_CombinedMuonFeatureContainer
+HLT_MuonFeatureContainer
+HLT_MuonFeatureDetailsContainer
+HLT_TrigEFBjetContainer_EFBjetFex
+HLT_TrigEMClusterContainer_TrigT2CaloCosmic
+HLT_TrigMissingETContainer_TrigEFMissingET
+HLT_TrigMuonEFInfoContainer_MuonEFInfo
+HLT_TrigPassBitsCollection_passbits
+HLT_TrigPassFlagsCollection_isEM
+HLT_TrigPassFlagsCollection_passflags
+HLT_TrigRoiDescriptorCollection_SplitJet
+HLT_TrigRoiDescriptorCollection_SuperRoi
+HLT_TrigRoiDescriptorCollection_forID
+HLT_TrigRoiDescriptorCollection_forID1
+HLT_TrigRoiDescriptorCollection_forID2
+HLT_TrigRoiDescriptorCollection_forID3
+HLT_TrigRoiDescriptorCollection_forMS
+HLT_TrigRoiDescriptorCollection_initialRoI
+HLT_TrigRoiDescriptorCollection_secondaryRoI_EF
+HLT_TrigRoiDescriptorCollection_secondaryRoI_HLT
+HLT_TrigRoiDescriptorCollection_secondaryRoI_L2
+HLT_TrigSpacePointCountsCollection_spacepoints
+HLT_TrigT2MbtsBitsContainer_T2Mbts
+HLT_TrigTrackCountsCollection_trackcounts
+HLT_TrigVertexCollection_TrigBeamSpotVertex
+HLT_TrigVertexCollection_TrigL2SiTrackFinder_FullScan_ZF_Only
+HLT_TrigVertexCountsCollection_vertexcounts
+HLT_xAOD__BTagVertexContainer_BjetVertexFex
+HLT_xAOD__BTagVertexContainer_BjetVertexFexAux.
+HLT_xAOD__BTaggingContainer_HLTBjetFex
+HLT_xAOD__BTaggingContainer_HLTBjetFexAux.
+HLT_xAOD__CaloClusterContainer_CaloCalTopoCluster
+HLT_xAOD__CaloClusterContainer_TrigCaloClusterMaker
+HLT_xAOD__CaloClusterContainer_TrigCaloClusterMakerAux.
+HLT_xAOD__CaloClusterContainer_TrigCaloClusterMaker_slw
+HLT_xAOD__CaloClusterContainer_TrigCaloClusterMaker_slwAux.
+HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFex
+HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFexAux.
+HLT_xAOD__ElectronContainer_egamma_Electrons
+HLT_xAOD__ElectronContainer_egamma_ElectronsAux.
+HLT_xAOD__ElectronContainer_egamma_Iso_Electrons
+HLT_xAOD__ElectronContainer_egamma_Iso_ElectronsAux.
+HLT_xAOD__EmTauRoIContainer_L1TopoEM
+HLT_xAOD__EmTauRoIContainer_L1TopoEMAux.
+HLT_xAOD__EmTauRoIContainer_L1TopoTau
+HLT_xAOD__EmTauRoIContainer_L1TopoTauAux.
+HLT_xAOD__HIEventShapeContainer_HIUE
+HLT_xAOD__HIEventShapeContainer_HIUEAux.
+HLT_xAOD__JetContainer_EFJet
+HLT_xAOD__JetContainer_EFJetAux.
+HLT_xAOD__JetContainer_FarawayJet
+HLT_xAOD__JetContainer_FarawayJetAux.
+HLT_xAOD__JetContainer_GSCJet
+HLT_xAOD__JetContainer_GSCJetAux.
+HLT_xAOD__JetContainer_SplitJet
+HLT_xAOD__JetContainer_SplitJetAux.
+HLT_xAOD__JetContainer_SuperRoi
+HLT_xAOD__JetContainer_SuperRoiAux.
+HLT_xAOD__JetContainer_TrigHLTJetDSSelectorCollection
+HLT_xAOD__JetContainer_TrigHLTJetDSSelectorCollectionAux.
+HLT_xAOD__JetContainer_TrigTauJet
+HLT_xAOD__JetContainer_TrigTauJetAux.
+HLT_xAOD__JetContainer_a10r_tcemsubjesFS
+HLT_xAOD__JetContainer_a10r_tcemsubjesFSAux.
+HLT_xAOD__JetContainer_a10r_tcemsubjesISFS
+HLT_xAOD__JetContainer_a10r_tcemsubjesISFSAux.
+HLT_xAOD__JetContainer_a10tcemjesFS
+HLT_xAOD__JetContainer_a10tcemjesFSAux.
+HLT_xAOD__JetContainer_a10tcemnojcalibFS
+HLT_xAOD__JetContainer_a10tcemnojcalibFSAux.
+HLT_xAOD__JetContainer_a10tcemsubFS
+HLT_xAOD__JetContainer_a10tcemsubFSAux.
+HLT_xAOD__JetContainer_a10tcemsubjesFS
+HLT_xAOD__JetContainer_a10tcemsubjesFSAux.
+HLT_xAOD__JetContainer_a10tclcwjesFS
+HLT_xAOD__JetContainer_a10tclcwjesFSAux.
+HLT_xAOD__JetContainer_a10tclcwnojcalibFS
+HLT_xAOD__JetContainer_a10tclcwnojcalibFSAux.
+HLT_xAOD__JetContainer_a10tclcwsubFS
+HLT_xAOD__JetContainer_a10tclcwsubFSAux.
+HLT_xAOD__JetContainer_a10tclcwsubjesFS
+HLT_xAOD__JetContainer_a10tclcwsubjesFSAux.
+HLT_xAOD__JetContainer_a10ttclcwjesFS
+HLT_xAOD__JetContainer_a10ttclcwjesFSAux.
+HLT_xAOD__JetContainer_a10ttclcwnojcalibFS
+HLT_xAOD__JetContainer_a10ttclcwnojcalibFSAux.
+HLT_xAOD__JetContainer_a3ionemsubjesFS
+HLT_xAOD__JetContainer_a3ionemsubjesFSAux.
+HLT_xAOD__JetContainer_a3ionemsubjesISFS
+HLT_xAOD__JetContainer_a3ionemsubjesISFSAux.
+HLT_xAOD__JetContainer_a4ionemsubjesFS
+HLT_xAOD__JetContainer_a4ionemsubjesFSAux.
+HLT_xAOD__JetContainer_a4ionemsubjesISFS
+HLT_xAOD__JetContainer_a4ionemsubjesISFSAux.
+HLT_xAOD__JetContainer_a4tcemjesFS
+HLT_xAOD__JetContainer_a4tcemjesFSAux.
+HLT_xAOD__JetContainer_a4tcemnojcalibFS
+HLT_xAOD__JetContainer_a4tcemnojcalibFSAux.
+HLT_xAOD__JetContainer_a4tcemsubFS
+HLT_xAOD__JetContainer_a4tcemsubFSAux.
+HLT_xAOD__JetContainer_a4tcemsubjesFS
+HLT_xAOD__JetContainer_a4tcemsubjesFSAux.
+HLT_xAOD__JetContainer_a4tcemsubjesISFS
+HLT_xAOD__JetContainer_a4tcemsubjesISFSAux.
+HLT_xAOD__JetRoIContainer_L1TopoJet
+HLT_xAOD__JetRoIContainer_L1TopoJetAux.
+HLT_xAOD__L2CombinedMuonContainer_MuonL2CBInfo
+HLT_xAOD__L2CombinedMuonContainer_MuonL2CBInfoAux.
+HLT_xAOD__L2StandAloneMuonContainer_MuonL2SAInfo
+HLT_xAOD__L2StandAloneMuonContainer_MuonL2SAInfoAux.
+HLT_xAOD__MuonContainer_MuonEFInfo
+HLT_xAOD__MuonContainer_MuonEFInfoAux.
+HLT_xAOD__MuonContainer_MuonEFInfoAuxDyn.etcone20
+HLT_xAOD__MuonContainer_MuonEFInfoAuxDyn.etcone30
+HLT_xAOD__MuonContainer_MuonEFInfoAuxDyn.etcone40
+HLT_xAOD__MuonContainer_MuonEFInfoAuxDyn.ptcone20
+HLT_xAOD__MuonContainer_MuonEFInfoAuxDyn.ptcone30
+HLT_xAOD__MuonContainer_MuonEFInfoAuxDyn.ptcone40
+HLT_xAOD__MuonContainer_MuonEFInfoAuxDyn.ptvarcone20
+HLT_xAOD__MuonContainer_MuonEFInfoAuxDyn.ptvarcone30
+HLT_xAOD__MuonContainer_MuonEFInfoAuxDyn.ptvarcone40
+HLT_xAOD__MuonContainer_MuonEFInfo_FullScan
+HLT_xAOD__MuonContainer_MuonEFInfo_FullScanAux.
+HLT_xAOD__MuonContainer_MuonEFInfo_FullScanAuxDyn.etcone20
+HLT_xAOD__MuonContainer_MuonEFInfo_FullScanAuxDyn.etcone30
+HLT_xAOD__MuonContainer_MuonEFInfo_FullScanAuxDyn.etcone40
+HLT_xAOD__MuonContainer_MuonEFInfo_FullScanAuxDyn.ptcone20
+HLT_xAOD__MuonContainer_MuonEFInfo_FullScanAuxDyn.ptcone30
+HLT_xAOD__MuonContainer_MuonEFInfo_FullScanAuxDyn.ptcone40
+HLT_xAOD__MuonContainer_MuonEFInfo_FullScanAuxDyn.ptvarcone20
+HLT_xAOD__MuonContainer_MuonEFInfo_FullScanAuxDyn.ptvarcone30
+HLT_xAOD__MuonContainer_MuonEFInfo_FullScanAuxDyn.ptvarcone40
+HLT_xAOD__MuonContainer_MuonEFInfo_MSonlyTrackParticles_FullScan
+HLT_xAOD__MuonContainer_MuonEFInfo_MSonlyTrackParticles_FullScanAux.
+HLT_xAOD__MuonRoIContainer_L1TopoMuon
+HLT_xAOD__MuonRoIContainer_L1TopoMuonAux.
+HLT_xAOD__PhotonContainer_egamma_Iso_Photons
+HLT_xAOD__PhotonContainer_egamma_Iso_PhotonsAux.
+HLT_xAOD__PhotonContainer_egamma_Photons
+HLT_xAOD__PhotonContainer_egamma_PhotonsAux.
+HLT_xAOD__RoiDescriptorStore_SplitJet
+HLT_xAOD__RoiDescriptorStore_SplitJetAux.
+HLT_xAOD__RoiDescriptorStore_SuperRoi
+HLT_xAOD__RoiDescriptorStore_SuperRoiAux.
+HLT_xAOD__RoiDescriptorStore_forID
+HLT_xAOD__RoiDescriptorStore_forID1
+HLT_xAOD__RoiDescriptorStore_forID1Aux.
+HLT_xAOD__RoiDescriptorStore_forID2
+HLT_xAOD__RoiDescriptorStore_forID2Aux.
+HLT_xAOD__RoiDescriptorStore_forID3
+HLT_xAOD__RoiDescriptorStore_forID3Aux.
+HLT_xAOD__RoiDescriptorStore_forIDAux.
+HLT_xAOD__RoiDescriptorStore_forMS
+HLT_xAOD__RoiDescriptorStore_forMSAux.
+HLT_xAOD__RoiDescriptorStore_initialRoI
+HLT_xAOD__RoiDescriptorStore_initialRoIAux.
+HLT_xAOD__RoiDescriptorStore_secondaryRoI_EF
+HLT_xAOD__RoiDescriptorStore_secondaryRoI_EFAux.
+HLT_xAOD__RoiDescriptorStore_secondaryRoI_HLT
+HLT_xAOD__RoiDescriptorStore_secondaryRoI_HLTAux.
+HLT_xAOD__RoiDescriptorStore_secondaryRoI_L2
+HLT_xAOD__RoiDescriptorStore_secondaryRoI_L2Aux.
+HLT_xAOD__TauJetContainer_TrigTauRecMerged
+HLT_xAOD__TauJetContainer_TrigTauRecMergedAux.
+HLT_xAOD__TauJetContainer_TrigTauRecPreselection
+HLT_xAOD__TauJetContainer_TrigTauRecPreselectionAux.
+HLT_xAOD__TauTrackContainer_TrigTauRecMergedTracks
+HLT_xAOD__TauTrackContainer_TrigTauRecMergedTracksAux.
+HLT_xAOD__TauTrackContainer_TrigTauRecPreselectionTracks
+HLT_xAOD__TauTrackContainer_TrigTauRecPreselectionTracksAux.
+HLT_xAOD__TrackParticleContainer_GSFTrigTrackParticles
+HLT_xAOD__TrackParticleContainer_GSFTrigTrackParticlesAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnvIOTRT_CosmicsN_EFID
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnvIOTRT_CosmicsN_EFIDAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTFAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTFAuxDyn.vertexLink
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_EFID
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_EFIDAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTF
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTFAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTFAuxDyn.vertexLink
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_IDTrig
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_IDTrigAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_IDTrigAuxDyn.vertexLink
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_BphysHighPt_IDTrig
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_BphysHighPt_IDTrigAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_EFID
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_EFIDAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_FTF
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_FTFAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_FTFAuxDyn.vertexLink
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_IDTrig
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_IDTrigAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_IDTrigAuxDyn.vertexLink
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_CosmicsN_EFID
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_CosmicsN_EFIDAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_EFID
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_EFIDAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_FTF
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_FTFAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_FTFAuxDyn.vertexLink
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_IDTrig
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_IDTrigAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_IDTrigAuxDyn.vertexLink
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_L2ID
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_L2IDAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_FullScan_EFID
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_FullScan_EFIDAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_FullScan_FTF
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_FullScan_FTFAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_MuonIso_EFID
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_MuonIso_EFIDAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_EFID
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_EFIDAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTF
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTFAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTFAuxDyn.vertexLink
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_IDTrig
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_IDTrigAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_IDTrigAuxDyn.vertexLink
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Photon_EFID
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Photon_EFIDAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_TauCore_FTF
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_TauCore_FTFAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_TauCore_FTFAuxDyn.vertexLink
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_TauIso_FTF
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_TauIso_FTFAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_TauIso_FTFAuxDyn.vertexLink
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_EFID
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_EFIDAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_IDTrig
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_IDTrigAux.
+HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_IDTrigAuxDyn.vertexLink
+HLT_xAOD__TrackParticleContainer_MuonEFInfo_CombTrackParticles
+HLT_xAOD__TrackParticleContainer_MuonEFInfo_CombTrackParticlesAux.
+HLT_xAOD__TrackParticleContainer_MuonEFInfo_CombTrackParticlesAuxDyn.vertexLink
+HLT_xAOD__TrackParticleContainer_MuonEFInfo_CombTrackParticles_FullScan
+HLT_xAOD__TrackParticleContainer_MuonEFInfo_CombTrackParticles_FullScanAux.
+HLT_xAOD__TrackParticleContainer_MuonEFInfo_CombTrackParticles_FullScanAuxDyn.vertexLink
+HLT_xAOD__TrackParticleContainer_MuonEFInfo_ExtrapTrackParticles
+HLT_xAOD__TrackParticleContainer_MuonEFInfo_ExtrapTrackParticlesAux.
+HLT_xAOD__TrackParticleContainer_MuonEFInfo_ExtrapTrackParticlesAuxDyn.vertexLink
+HLT_xAOD__TrackParticleContainer_MuonEFInfo_ExtrapTrackParticles_FullScan
+HLT_xAOD__TrackParticleContainer_MuonEFInfo_ExtrapTrackParticles_FullScanAux.
+HLT_xAOD__TrackParticleContainer_MuonEFInfo_ExtrapTrackParticles_FullScanAuxDyn.vertexLink
+HLT_xAOD__TrigBphysContainer_EFBMuMuFex
+HLT_xAOD__TrigBphysContainer_EFBMuMuFexAux.
+HLT_xAOD__TrigBphysContainer_EFBMuMuXFex
+HLT_xAOD__TrigBphysContainer_EFBMuMuXFexAux.
+HLT_xAOD__TrigBphysContainer_EFBMuMuXFex_X
+HLT_xAOD__TrigBphysContainer_EFBMuMuXFex_XAux.
+HLT_xAOD__TrigBphysContainer_EFDsPhiPiFex
+HLT_xAOD__TrigBphysContainer_EFDsPhiPiFexAux.
+HLT_xAOD__TrigBphysContainer_EFMuPairs
+HLT_xAOD__TrigBphysContainer_EFMuPairsAux.
+HLT_xAOD__TrigBphysContainer_EFMultiMuFex
+HLT_xAOD__TrigBphysContainer_EFMultiMuFexAux.
+HLT_xAOD__TrigBphysContainer_EFTrackMass
+HLT_xAOD__TrigBphysContainer_EFTrackMassAux.
+HLT_xAOD__TrigBphysContainer_L2BMuMuFex
+HLT_xAOD__TrigBphysContainer_L2BMuMuFexAux.
+HLT_xAOD__TrigBphysContainer_L2BMuMuXFex
+HLT_xAOD__TrigBphysContainer_L2BMuMuXFexAux.
+HLT_xAOD__TrigBphysContainer_L2DiMuXFex
+HLT_xAOD__TrigBphysContainer_L2DiMuXFexAux.
+HLT_xAOD__TrigBphysContainer_L2DsPhiPiFexDs
+HLT_xAOD__TrigBphysContainer_L2DsPhiPiFexDsAux.
+HLT_xAOD__TrigBphysContainer_L2DsPhiPiFexPhi
+HLT_xAOD__TrigBphysContainer_L2DsPhiPiFexPhiAux.
+HLT_xAOD__TrigBphysContainer_L2JpsieeFex
+HLT_xAOD__TrigBphysContainer_L2JpsieeFexAux.
+HLT_xAOD__TrigBphysContainer_L2MultiMuFex
+HLT_xAOD__TrigBphysContainer_L2MultiMuFexAux.
+HLT_xAOD__TrigBphysContainer_L2TrackMass
+HLT_xAOD__TrigBphysContainer_L2TrackMassAux.
+HLT_xAOD__TrigCompositeContainer_ExpressInfo_HLT
+HLT_xAOD__TrigCompositeContainer_ExpressInfo_HLTAux.
+HLT_xAOD__TrigCompositeContainer_L1TopoComposite
+HLT_xAOD__TrigCompositeContainer_L1TopoCompositeAux.
+HLT_xAOD__TrigCompositeContainer_L1TopoMET
+HLT_xAOD__TrigCompositeContainer_L1TopoMETAux.
+HLT_xAOD__TrigCompositeContainer_MuonRoICluster
+HLT_xAOD__TrigCompositeContainer_MuonRoIClusterAux.
+HLT_xAOD__TrigCompositeContainer_MuonRoIClusterAuxDyn.ClusterEta
+HLT_xAOD__TrigCompositeContainer_MuonRoIClusterAuxDyn.ClusterPhi
+HLT_xAOD__TrigCompositeContainer_MuonRoIClusterAuxDyn.nJets
+HLT_xAOD__TrigCompositeContainer_MuonRoIClusterAuxDyn.nRoIs
+HLT_xAOD__TrigCompositeContainer_MuonRoIClusterAuxDyn.nTrks
+HLT_xAOD__TrigCompositeContainer_TrigEFDielectronMassFex
+HLT_xAOD__TrigCompositeContainer_TrigEFDielectronMassFexAux.
+HLT_xAOD__TrigCompositeContainer_TrigEFDielectronMassFexAuxDyn.mass
+HLT_xAOD__TrigElectronContainer_L2ElectronFex
+HLT_xAOD__TrigElectronContainer_L2ElectronFexAux.
+HLT_xAOD__TrigMissingETContainer_TrigEFMissingET
+HLT_xAOD__TrigMissingETContainer_TrigEFMissingETAux.
+HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_mht
+HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_mhtAux.
+HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_topocl_PUC
+HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_topocl_PUCAux.
+HLT_xAOD__TrigPassBitsContainer_passbits
+HLT_xAOD__TrigPassBitsContainer_passbitsAux.
+HLT_xAOD__TrigPhotonContainer_L2PhotonFex
+HLT_xAOD__TrigPhotonContainer_L2PhotonFexAux.
+HLT_xAOD__TrigRNNOutputContainer_TrigRingerNeuralFex
+HLT_xAOD__TrigRNNOutputContainer_TrigRingerNeuralFexAux.
+HLT_xAOD__TrigSpacePointCountsContainer_spacepoints
+HLT_xAOD__TrigSpacePointCountsContainer_spacepointsAux.
+HLT_xAOD__TrigT2MbtsBitsContainer_T2Mbts
+HLT_xAOD__TrigT2MbtsBitsContainer_T2MbtsAux.
+HLT_xAOD__TrigT2ZdcSignalsContainer_zdcsignals
+HLT_xAOD__TrigT2ZdcSignalsContainer_zdcsignalsAux.
+HLT_xAOD__TrigTrackCountsContainer_trackcounts
+HLT_xAOD__TrigTrackCountsContainer_trackcountsAux.
+HLT_xAOD__TrigVertexCountsContainer_vertexcounts
+HLT_xAOD__TrigVertexCountsContainer_vertexcountsAux.
+HLT_xAOD__VertexContainer_BjetSecondaryVertexFex
+HLT_xAOD__VertexContainer_BjetSecondaryVertexFexAux.
+HLT_xAOD__VertexContainer_EFHistoPrmVtx
+HLT_xAOD__VertexContainer_EFHistoPrmVtxAux.
+HLT_xAOD__VertexContainer_SecondaryVertex
+HLT_xAOD__VertexContainer_SecondaryVertexAux.
+HLT_xAOD__VertexContainer_xPrimVx
+HLT_xAOD__VertexContainer_xPrimVxAux.
+InDetDisappearingTrackParticles
+InDetDisappearingTrackParticlesAux.
+InDetDisappearingTrackParticlesAuxDyn.TRTdEdx
+InDetDisappearingTrackParticlesAuxDyn.TRTdEdxUsedHits
+InDetDisappearingTrackParticlesAuxDyn.eProbabilityNN
+InDetDisappearingTrackParticlesAuxDyn.nBC_meas
+InDetDisappearingTrackParticlesAuxDyn.trackLink
+InDetForwardTrackParticles
+InDetForwardTrackParticlesAux.
+InDetForwardTrackParticlesAuxDyn.TRTdEdx
+InDetForwardTrackParticlesAuxDyn.TRTdEdxUsedHits
+InDetForwardTrackParticlesAuxDyn.eProbabilityNN
+InDetForwardTrackParticlesAuxDyn.nBC_meas
+InDetForwardTrackParticlesAuxDyn.trackLink
+InDetLargeD0TrackParticles
+InDetLargeD0TrackParticlesAux.
+InDetLargeD0TrackParticlesAuxDyn.TRTdEdx
+InDetLargeD0TrackParticlesAuxDyn.TRTdEdxUsedHits
+InDetLargeD0TrackParticlesAuxDyn.eProbabilityNN
+InDetLargeD0TrackParticlesAuxDyn.nBC_meas
+InDetLargeD0TrackParticlesAuxDyn.trackLink
+InDetTrackParticles
+InDetTrackParticlesAssociatedClusters
+InDetTrackParticlesAssociatedClustersAux.
+InDetTrackParticlesAssociatedClustersAuxDyn.CellLink
+InDetTrackParticlesAssociatedClusters_links
+InDetTrackParticlesAux.
+InDetTrackParticlesAuxDyn.TRTdEdx
+InDetTrackParticlesAuxDyn.TRTdEdxUsedHits
+InDetTrackParticlesAuxDyn.eProbabilityNN
+InDetTrackParticlesAuxDyn.nBC_meas
+InDetTrackParticlesAuxDyn.trackLink
+InDetTrackParticlesClusterAssociations
+InDetTrackParticlesClusterAssociationsAux.
+IncompleteLumiBlocks
+IncompleteLumiBlocksAux.
+IsCalibration
+IsSimulation
+IsTestBeam
+JetETMissChargedParticleFlowObjects
+JetETMissChargedParticleFlowObjectsAux.
+JetETMissChargedParticleFlowObjectsAuxDyn.FE_ElectronLinks
+JetETMissChargedParticleFlowObjectsAuxDyn.FE_MuonLinks
+JetETMissChargedParticleFlowObjectsAuxDyn.FE_PhotonLinks
+JetETMissChargedParticleFlowObjectsAuxDyn.FE_TauLinks
+JetETMissChargedParticleFlowObjectsAuxDyn.IsInDenseEnvironment
+JetETMissChargedParticleFlowObjectsAuxDyn.TracksExpectedEnergyDeposit
+JetETMissLCNeutralParticleFlowObjects
+JetETMissLCNeutralParticleFlowObjectsAux.
+JetETMissLCNeutralParticleFlowObjectsAuxDyn.eta
+JetETMissLCNeutralParticleFlowObjectsAuxDyn.m
+JetETMissLCNeutralParticleFlowObjectsAuxDyn.phi
+JetETMissLCNeutralParticleFlowObjectsAuxDyn.pt
+JetETMissNeutralParticleFlowObjects
+JetETMissNeutralParticleFlowObjectsAux.
+JetETMissNeutralParticleFlowObjectsAuxDyn.AVG_LAR_Q
+JetETMissNeutralParticleFlowObjectsAuxDyn.AVG_TILE_Q
+JetETMissNeutralParticleFlowObjectsAuxDyn.BADLARQ_FRAC
+JetETMissNeutralParticleFlowObjectsAuxDyn.CENTER_LAMBDA
+JetETMissNeutralParticleFlowObjectsAuxDyn.CENTER_MAG
+JetETMissNeutralParticleFlowObjectsAuxDyn.EM_PROBABILITY
+JetETMissNeutralParticleFlowObjectsAuxDyn.ENG_BAD_CELLS
+JetETMissNeutralParticleFlowObjectsAuxDyn.ENG_POS
+JetETMissNeutralParticleFlowObjectsAuxDyn.FE_ElectronLinks
+JetETMissNeutralParticleFlowObjectsAuxDyn.FE_MuonLinks
+JetETMissNeutralParticleFlowObjectsAuxDyn.FE_PhotonLinks
+JetETMissNeutralParticleFlowObjectsAuxDyn.FE_TauLinks
+JetETMissNeutralParticleFlowObjectsAuxDyn.FE_efrac_matched_muon
+JetETMissNeutralParticleFlowObjectsAuxDyn.FE_nMatchedMuons
+JetETMissNeutralParticleFlowObjectsAuxDyn.ISOLATION
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_EMB1
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_EMB2
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_EMB3
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_EME1
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_EME2
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_EME3
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_FCAL0
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_FCAL1
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_FCAL2
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_HEC0
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_HEC1
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_HEC2
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_HEC3
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_MINIFCAL0
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_MINIFCAL1
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_MINIFCAL2
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_MINIFCAL3
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_PreSamplerB
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_PreSamplerE
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_TILE0
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_TileBar0
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_TileBar1
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_TileBar2
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_TileExt0
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_TileExt1
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_TileExt2
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_TileGap1
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_TileGap2
+JetETMissNeutralParticleFlowObjectsAuxDyn.LAYERENERGY_TileGap3
+JetETMissNeutralParticleFlowObjectsAuxDyn.SECOND_LAMBDA
+JetETMissNeutralParticleFlowObjectsAuxDyn.SECOND_R
+JetETMissNeutralParticleFlowObjectsAuxDyn.TIMING
+L1TopoRawData
+L1TopoRawDataAux.
+LArNoisyROSummary
+LRTElectrons
+LRTElectronsAux.
+LRTElectronsAuxDyn.LHLoose
+LRTElectronsAuxDyn.LHMedium
+LRTElectronsAuxDyn.LHTight
+LRTElectronsAuxDyn.LHValue
+LRTElectronsAuxDyn.Loose
+LRTElectronsAuxDyn.Medium
+LRTElectronsAuxDyn.Tight
+LRTElectronsAuxDyn.ambiguityType
+LRTElectronsAuxDyn.asy1
+LRTElectronsAuxDyn.barys1
+LRTElectronsAuxDyn.deltaEta1PearDistortion
+LRTElectronsAuxDyn.e1152
+LRTElectronsAuxDyn.e132
+LRTElectronsAuxDyn.e233
+LRTElectronsAuxDyn.e235
+LRTElectronsAuxDyn.e237
+LRTElectronsAuxDyn.e255
+LRTElectronsAuxDyn.e2ts1
+LRTElectronsAuxDyn.e2tsts1
+LRTElectronsAuxDyn.ecore
+LRTElectronsAuxDyn.ehad1
+LRTElectronsAuxDyn.emaxs1
+LRTElectronsAuxDyn.emins1
+LRTElectronsAuxDyn.ethad
+LRTElectronsAuxDyn.ethad1
+LRTElectronsAuxDyn.pos
+LRTElectronsAuxDyn.pos7
+LRTElectronsAuxDyn.poscs1
+LRTElectronsAuxDyn.poscs2
+LRTElectronsAuxDyn.r33over37allcalo
+LRTElectronsAuxDyn.widths1
+LRTElectronsAuxDyn.widths2
+LRTGSFTrackParticles
+LRTGSFTrackParticlesAux.
+LRTGSFTrackParticlesAuxDyn.QoverPLM
+LRTGSFTrackParticlesAuxDyn.TRTdEdx
+LRTGSFTrackParticlesAuxDyn.TRTdEdxUsedHits
+LRTGSFTrackParticlesAuxDyn.eProbabilityNN
+LRTGSFTrackParticlesAuxDyn.originalTrackParticle
+LRTGSFTrackParticlesAuxDyn.parameterPX
+LRTGSFTrackParticlesAuxDyn.parameterPY
+LRTGSFTrackParticlesAuxDyn.parameterPZ
+LRTGSFTrackParticlesAuxDyn.parameterPosition
+LRTGSFTrackParticlesAuxDyn.parameterX
+LRTGSFTrackParticlesAuxDyn.parameterY
+LRTGSFTrackParticlesAuxDyn.parameterZ
+LRTGSFTrackParticlesAuxDyn.trackLink
+LRTGSFTrackParticlesAuxDyn.trackParameterCovarianceMatrices
+LRTegammaClusters
+LRTegammaClustersAux.
+LRTegammaClustersAuxDyn.BadChannelList
+LRTegammaClustersAuxDyn.CellLink
+LRTegammaClustersAuxDyn.ETA1CALOFRAME
+LRTegammaClustersAuxDyn.ETA2CALOFRAME
+LRTegammaClustersAuxDyn.ETACALOFRAME
+LRTegammaClustersAuxDyn.PHI1CALOFRAME
+LRTegammaClustersAuxDyn.PHI2CALOFRAME
+LRTegammaClustersAuxDyn.PHICALOFRAME
+LRTegammaClustersAuxDyn.constituentClusterLinks
+LRTegammaClustersAuxDyn.emax_sampl
+LRTegammaClustersAuxDyn.eta_sampl
+LRTegammaClustersAuxDyn.etamax_sampl
+LRTegammaClustersAuxDyn.phi_sampl
+LRTegammaClustersAuxDyn.phimax_sampl
+LVL1EmTauRoIs
+LVL1EmTauRoIsAux.
+LVL1EnergySumRoI
+LVL1EnergySumRoIAux.
+LVL1JetEtRoI
+LVL1JetEtRoIAux.
+LVL1JetRoIs
+LVL1JetRoIsAux.
+LVL1MuonRoIs
+LVL1MuonRoIsAux.
+LumiBlockN
+MBTSContainer
+MSDisplacedVertex
+MSDisplacedVertexAux.
+MSOnlyExtraPolatedMuonsLRTTrackParticles
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAux.
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.TRTdEdx
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.TRTdEdxUsedHits
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.alignEffectChId
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.alignEffectDeltaAngle
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.alignEffectDeltaTrans
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.alignEffectSigmaDeltaAngle
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.alignEffectSigmaDeltaTrans
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.deltaphi_0
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.deltaphi_1
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.deltatheta_0
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.deltatheta_1
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.eProbabilityNN
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterPX
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterPY
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterPZ
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterPosition
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterX
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterY
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.parameterZ
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.sigmadeltaphi_0
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.sigmadeltaphi_1
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.sigmadeltatheta_0
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.sigmadeltatheta_1
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.trackLink
+MSOnlyExtraPolatedMuonsLRTTrackParticlesAuxDyn.trackParameterCovarianceMatrices
+MSOnlyExtrapolatedMuonTrackParticles
+MSOnlyExtrapolatedMuonTrackParticlesAux.
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.TRTdEdx
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.TRTdEdxUsedHits
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.alignEffectChId
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.alignEffectDeltaAngle
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.alignEffectDeltaTrans
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.alignEffectSigmaDeltaAngle
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.alignEffectSigmaDeltaTrans
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.deltaphi_0
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.deltaphi_1
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.deltatheta_0
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.deltatheta_1
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.eProbabilityNN
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.parameterPX
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.parameterPY
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.parameterPZ
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.parameterPosition
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.parameterX
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.parameterY
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.parameterZ
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.sigmadeltaphi_0
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.sigmadeltaphi_1
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.sigmadeltatheta_0
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.sigmadeltatheta_1
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.trackLink
+MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.trackParameterCovarianceMatrices
+MSonlyTracklets
+MSonlyTrackletsAux.
+McChannel
+MuonClusterCollection
+MuonClusterCollectionAux.
+MuonClusterCollectionAuxDyn.CellLink
+MuonClusterCollectionAuxDyn.constituentClusterLinks
+MuonClusterCollectionAuxDyn.eta_sampl
+MuonClusterCollectionAuxDyn.phi_sampl
+MuonClusterCollection_links
+MuonSegments
+MuonSegmentsAux.
+MuonSegmentsAuxDyn.clusterTime
+MuonSegmentsAuxDyn.clusterTimeError
+MuonSegmentsAuxDyn.clusterTimeValid
+MuonSegmentsAuxDyn.muonSegment
+MuonSpectrometerTrackParticles
+MuonSpectrometerTrackParticlesAux.
+MuonSpectrometerTrackParticlesAuxDyn.TRTdEdx
+MuonSpectrometerTrackParticlesAuxDyn.TRTdEdxUsedHits
+MuonSpectrometerTrackParticlesAuxDyn.eProbabilityNN
+MuonSpectrometerTrackParticlesAuxDyn.parameterPX
+MuonSpectrometerTrackParticlesAuxDyn.parameterPY
+MuonSpectrometerTrackParticlesAuxDyn.parameterPZ
+MuonSpectrometerTrackParticlesAuxDyn.parameterPosition
+MuonSpectrometerTrackParticlesAuxDyn.parameterX
+MuonSpectrometerTrackParticlesAuxDyn.parameterY
+MuonSpectrometerTrackParticlesAuxDyn.parameterZ
+MuonSpectrometerTrackParticlesAuxDyn.trackLink
+MuonSpectrometerTrackParticlesAuxDyn.trackParameterCovarianceMatrices
+Muons
+MuonsAux.
+MuonsAuxDyn.CT_EL_Type
+MuonsAuxDyn.CT_ET_FSRCandidateEnergy
+MuonsAuxDyn.CT_ET_LRLikelihood
+MuonsAuxDyn.ClusterInfo_deltaR
+MuonsAuxDyn.ET_Core
+MuonsAuxDyn.ET_EMCore
+MuonsAuxDyn.ET_HECCore
+MuonsAuxDyn.ET_TileCore
+MuonsAuxDyn.FSR_CandidateEnergy
+MuonsAuxDyn.InnerDetectorPt
+MuonsAuxDyn.MuonSpectrometerPt
+MuonsAuxDyn.chargedFELinks
+MuonsAuxDyn.combinedTrackOutBoundsPrecisionHits
+MuonsAuxDyn.d0_staco
+MuonsAuxDyn.deltaphi_0
+MuonsAuxDyn.deltaphi_1
+MuonsAuxDyn.deltatheta_0
+MuonsAuxDyn.deltatheta_1
+MuonsAuxDyn.extendedClosePrecisionHits
+MuonsAuxDyn.extendedOutBoundsPrecisionHits
+MuonsAuxDyn.innerClosePrecisionHits
+MuonsAuxDyn.innerOutBoundsPrecisionHits
+MuonsAuxDyn.isEndcapGoodLayers
+MuonsAuxDyn.isSmallGoodSectors
+MuonsAuxDyn.middleClosePrecisionHits
+MuonsAuxDyn.middleOutBoundsPrecisionHits
+MuonsAuxDyn.muon_efrac_matched_FE
+MuonsAuxDyn.nUnspoiledCscHits
+MuonsAuxDyn.neflowisol20
+MuonsAuxDyn.neflowisol30
+MuonsAuxDyn.neflowisol40
+MuonsAuxDyn.neflowisolCorrBitset
+MuonsAuxDyn.neflowisolcoreConeEnergyCorrection
+MuonsAuxDyn.neutralFELinks
+MuonsAuxDyn.numEnergyLossPerTrack
+MuonsAuxDyn.numberOfGoodPrecisionLayers
+MuonsAuxDyn.outerClosePrecisionHits
+MuonsAuxDyn.outerOutBoundsPrecisionHits
+MuonsAuxDyn.phi0_staco
+MuonsAuxDyn.ptcone20
+MuonsAuxDyn.ptcone30
+MuonsAuxDyn.ptcone40
+MuonsAuxDyn.ptconeCorrBitset
+MuonsAuxDyn.ptconecoreTrackPtrCorrection
+MuonsAuxDyn.ptvarcone20
+MuonsAuxDyn.ptvarcone30
+MuonsAuxDyn.ptvarcone40
+MuonsAuxDyn.qOverPErr_staco
+MuonsAuxDyn.qOverP_staco
+MuonsAuxDyn.sigmadeltaphi_0
+MuonsAuxDyn.sigmadeltaphi_1
+MuonsAuxDyn.sigmadeltatheta_0
+MuonsAuxDyn.sigmadeltatheta_1
+MuonsAuxDyn.theta_staco
+MuonsAuxDyn.topoetcone20
+MuonsAuxDyn.topoetcone30
+MuonsAuxDyn.topoetcone40
+MuonsAuxDyn.topoetconeCorrBitset
+MuonsAuxDyn.topoetconecoreConeEnergyCorrection
+MuonsAuxDyn.z0_staco
+MuonsLRT
+MuonsLRTAux.
+MuonsLRTAuxDyn.CT_EL_Type
+MuonsLRTAuxDyn.CT_ET_FSRCandidateEnergy
+MuonsLRTAuxDyn.CT_ET_LRLikelihood
+MuonsLRTAuxDyn.ET_Core
+MuonsLRTAuxDyn.ET_EMCore
+MuonsLRTAuxDyn.ET_HECCore
+MuonsLRTAuxDyn.ET_TileCore
+MuonsLRTAuxDyn.FSR_CandidateEnergy
+MuonsLRTAuxDyn.InnerDetectorPt
+MuonsLRTAuxDyn.MuonSpectrometerPt
+MuonsLRTAuxDyn.combinedTrackOutBoundsPrecisionHits
+MuonsLRTAuxDyn.d0_staco
+MuonsLRTAuxDyn.deltaphi_0
+MuonsLRTAuxDyn.deltaphi_1
+MuonsLRTAuxDyn.deltatheta_0
+MuonsLRTAuxDyn.deltatheta_1
+MuonsLRTAuxDyn.extendedClosePrecisionHits
+MuonsLRTAuxDyn.extendedOutBoundsPrecisionHits
+MuonsLRTAuxDyn.innerClosePrecisionHits
+MuonsLRTAuxDyn.innerOutBoundsPrecisionHits
+MuonsLRTAuxDyn.isEndcapGoodLayers
+MuonsLRTAuxDyn.isSmallGoodSectors
+MuonsLRTAuxDyn.middleClosePrecisionHits
+MuonsLRTAuxDyn.middleOutBoundsPrecisionHits
+MuonsLRTAuxDyn.nUnspoiledCscHits
+MuonsLRTAuxDyn.numEnergyLossPerTrack
+MuonsLRTAuxDyn.numberOfGoodPrecisionLayers
+MuonsLRTAuxDyn.outerClosePrecisionHits
+MuonsLRTAuxDyn.outerOutBoundsPrecisionHits
+MuonsLRTAuxDyn.phi0_staco
+MuonsLRTAuxDyn.qOverPErr_staco
+MuonsLRTAuxDyn.qOverP_staco
+MuonsLRTAuxDyn.sigmadeltaphi_0
+MuonsLRTAuxDyn.sigmadeltaphi_1
+MuonsLRTAuxDyn.sigmadeltatheta_0
+MuonsLRTAuxDyn.sigmadeltatheta_1
+MuonsLRTAuxDyn.theta_staco
+MuonsLRTAuxDyn.z0_staco
+NCB_MuonSegments
+NCB_MuonSegmentsAux.
+NCB_MuonSegmentsAuxDyn.clusterTime
+NCB_MuonSegmentsAuxDyn.clusterTimeError
+NCB_MuonSegmentsAuxDyn.clusterTimeValid
+NCB_MuonSegmentsAuxDyn.muonSegment
+NeutralParticleFlowIsoCentralEventShape
+NeutralParticleFlowIsoCentralEventShapeAux.
+NeutralParticleFlowIsoCentralEventShapeAuxDyn.Density
+NeutralParticleFlowIsoCentralEventShapeAuxDyn.DensityArea
+NeutralParticleFlowIsoCentralEventShapeAuxDyn.DensitySigma
+NeutralParticleFlowIsoForwardEventShape
+NeutralParticleFlowIsoForwardEventShapeAux.
+NeutralParticleFlowIsoForwardEventShapeAuxDyn.Density
+NeutralParticleFlowIsoForwardEventShapeAuxDyn.DensityArea
+NeutralParticleFlowIsoForwardEventShapeAuxDyn.DensitySigma
+Photons
+PhotonsAux.
+PhotonsAuxDyn.Loose
+PhotonsAuxDyn.Tight
+PhotonsAuxDyn.ambiguityLink
+PhotonsAuxDyn.ambiguityType
+PhotonsAuxDyn.asy1
+PhotonsAuxDyn.barys1
+PhotonsAuxDyn.chargedFELinks
+PhotonsAuxDyn.core57cellsEnergyCorrection
+PhotonsAuxDyn.e1152
+PhotonsAuxDyn.e132
+PhotonsAuxDyn.e233
+PhotonsAuxDyn.e235
+PhotonsAuxDyn.e237
+PhotonsAuxDyn.e255
+PhotonsAuxDyn.e2ts1
+PhotonsAuxDyn.e2tsts1
+PhotonsAuxDyn.ecore
+PhotonsAuxDyn.ehad1
+PhotonsAuxDyn.emaxs1
+PhotonsAuxDyn.emins1
+PhotonsAuxDyn.ethad
+PhotonsAuxDyn.ethad1
+PhotonsAuxDyn.neutralFELinks
+PhotonsAuxDyn.pos
+PhotonsAuxDyn.pos7
+PhotonsAuxDyn.poscs1
+PhotonsAuxDyn.poscs2
+PhotonsAuxDyn.ptcone20
+PhotonsAuxDyn.ptcone30
+PhotonsAuxDyn.r33over37allcalo
+PhotonsAuxDyn.topoetcone20
+PhotonsAuxDyn.topoetcone20ptCorrection
+PhotonsAuxDyn.topoetcone30
+PhotonsAuxDyn.topoetcone30ptCorrection
+PhotonsAuxDyn.topoetcone40
+PhotonsAuxDyn.topoetcone40ptCorrection
+PhotonsAuxDyn.widths1
+PhotonsAuxDyn.widths2
+PrimaryVertices
+PrimaryVerticesAux.
+PrimaryVerticesAuxDyn.sumPt2
+RawInfoSummaryForTag
+RunNumber
+SlowMuons
+SlowMuonsAux.
+SlowMuonsAuxDyn.hitEnergy
+SlowMuonsAuxDyn.hitError
+SlowMuonsAuxDyn.hitIdentifier
+SlowMuonsAuxDyn.hitPositionX
+SlowMuonsAuxDyn.hitPositionY
+SlowMuonsAuxDyn.hitPositionZ
+SlowMuonsAuxDyn.hitPropagationTime
+SlowMuonsAuxDyn.hitShift
+SlowMuonsAuxDyn.hitTOF
+SlowMuonsAuxDyn.hitTechnology
+Staus
+StausAux.
+StausAuxDyn.CT_EL_Type
+StausAuxDyn.CT_ET_FSRCandidateEnergy
+StausAuxDyn.CT_ET_LRLikelihood
+StausAuxDyn.ET_Core
+StausAuxDyn.ET_EMCore
+StausAuxDyn.ET_HECCore
+StausAuxDyn.ET_TileCore
+StausAuxDyn.FSR_CandidateEnergy
+StausAuxDyn.InnerDetectorPt
+StausAuxDyn.MuonSpectrometerPt
+StausAuxDyn.combinedTrackOutBoundsPrecisionHits
+StausAuxDyn.d0_staco
+StausAuxDyn.deltaphi_0
+StausAuxDyn.deltaphi_1
+StausAuxDyn.deltatheta_0
+StausAuxDyn.deltatheta_1
+StausAuxDyn.extendedClosePrecisionHits
+StausAuxDyn.extendedOutBoundsPrecisionHits
+StausAuxDyn.innerClosePrecisionHits
+StausAuxDyn.innerOutBoundsPrecisionHits
+StausAuxDyn.isEndcapGoodLayers
+StausAuxDyn.isSmallGoodSectors
+StausAuxDyn.middleClosePrecisionHits
+StausAuxDyn.middleOutBoundsPrecisionHits
+StausAuxDyn.nUnspoiledCscHits
+StausAuxDyn.numEnergyLossPerTrack
+StausAuxDyn.numberOfGoodPrecisionLayers
+StausAuxDyn.outerClosePrecisionHits
+StausAuxDyn.outerOutBoundsPrecisionHits
+StausAuxDyn.phi0_staco
+StausAuxDyn.qOverPErr_staco
+StausAuxDyn.qOverP_staco
+StausAuxDyn.sigmadeltaphi_0
+StausAuxDyn.sigmadeltaphi_1
+StausAuxDyn.sigmadeltatheta_0
+StausAuxDyn.sigmadeltatheta_1
+StausAuxDyn.theta_staco
+StausAuxDyn.z0_staco
+StreamAOD
+TauFinalPi0s
+TauFinalPi0sAux.
+TauFinalPi0sAuxDyn.pi0PFOLinks
+TauHadronicParticleFlowObjects
+TauHadronicParticleFlowObjectsAux.
+TauJets
+TauJetsAux.
+TauJetsAuxDyn.ClusterTotalEnergy
+TauJetsAuxDyn.ClustersMeanCenterLambda
+TauJetsAuxDyn.ClustersMeanEMProbability
+TauJetsAuxDyn.ClustersMeanFirstEngDens
+TauJetsAuxDyn.ClustersMeanPresamplerFrac
+TauJetsAuxDyn.ClustersMeanSecondLambda
+TauJetsAuxDyn.EMFRACTIONATEMSCALE_MOVEE3
+TauJetsAuxDyn.EMFracFixed
+TauJetsAuxDyn.GhostMuonSegmentCount
+TauJetsAuxDyn.LeadClusterFrac
+TauJetsAuxDyn.NNDecayMode
+TauJetsAuxDyn.NNDecayModeProb_1p0n
+TauJetsAuxDyn.NNDecayModeProb_1p1n
+TauJetsAuxDyn.NNDecayModeProb_1pXn
+TauJetsAuxDyn.NNDecayModeProb_3p0n
+TauJetsAuxDyn.NNDecayModeProb_3pXn
+TauJetsAuxDyn.PFOEngRelDiff
+TauJetsAuxDyn.PanTau_DecayModeExtended
+TauJetsAuxDyn.TAU_SEEDTRK_SECMAXSTRIPETOVERPT
+TauJetsAuxDyn.UpsilonCluster
+TauJetsAuxDyn.chargedFELinks
+TauJetsAuxDyn.etHotShotDR1
+TauJetsAuxDyn.etHotShotDR1OverPtLeadTrk
+TauJetsAuxDyn.etHotShotWin
+TauJetsAuxDyn.etHotShotWinOverPtLeadTrk
+TauJetsAuxDyn.etaCombined
+TauJetsAuxDyn.hadLeakFracFixed
+TauJetsAuxDyn.leadTrackProbHT
+TauJetsAuxDyn.mCombined
+TauJetsAuxDyn.nConversionTracks
+TauJetsAuxDyn.nFakeTracks
+TauJetsAuxDyn.nModifiedIsolationTracks
+TauJetsAuxDyn.neutralFELinks
+TauJetsAuxDyn.phiCombined
+TauJetsAuxDyn.ptCombined
+TauJetsAuxDyn.ptIntermediateAxisEM
+TauJetsAuxDyn.rho
+TauNeutralParticleFlowObjects
+TauNeutralParticleFlowObjectsAux.
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_CENTER_LAMBDA
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_DELTA_PHI
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_DELTA_THETA
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_EM1CoreFrac
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_ENG_FRAC_CORE
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_ENG_FRAC_EM
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_ENG_FRAC_MAX
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_FIRST_ETA
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_LATERAL
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_LONGITUDINAL
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_NHitsInEM1
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_NPosECells_EM1
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_NPosECells_EM2
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_NPosECells_PS
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_SECOND_ENG_DENS
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_SECOND_LAMBDA
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_SECOND_R
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_energy_EM1
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_energy_EM2
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_firstEtaWRTClusterPosition_EM1
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_firstEtaWRTClusterPosition_EM2
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_secondEtaWRTClusterPosition_EM1
+TauNeutralParticleFlowObjectsAuxDyn.cellBased_secondEtaWRTClusterPosition_EM2
+TauNeutralParticleFlowObjectsAuxDyn.nPi0Proto
+TauPi0Clusters
+TauPi0ClustersAux.
+TauPi0ClustersAuxDyn.BadChannelList
+TauPi0ClustersAuxDyn.CENTER_LAMBDA
+TauPi0ClustersAuxDyn.CENTER_MAG
+TauPi0ClustersAuxDyn.CENTER_X
+TauPi0ClustersAuxDyn.CENTER_Y
+TauPi0ClustersAuxDyn.CENTER_Z
+TauPi0ClustersAuxDyn.CellLink
+TauPi0ClustersAuxDyn.DELTA_ALPHA
+TauPi0ClustersAuxDyn.DELTA_PHI
+TauPi0ClustersAuxDyn.DELTA_THETA
+TauPi0ClustersAuxDyn.DM_WEIGHT
+TauPi0ClustersAuxDyn.EM_PROBABILITY
+TauPi0ClustersAuxDyn.ENG_FRAC_CORE
+TauPi0ClustersAuxDyn.ENG_FRAC_EM
+TauPi0ClustersAuxDyn.ENG_FRAC_MAX
+TauPi0ClustersAuxDyn.FIRST_ENG_DENS
+TauPi0ClustersAuxDyn.FIRST_ETA
+TauPi0ClustersAuxDyn.FIRST_PHI
+TauPi0ClustersAuxDyn.HAD_WEIGHT
+TauPi0ClustersAuxDyn.ISOLATION
+TauPi0ClustersAuxDyn.LATERAL
+TauPi0ClustersAuxDyn.LONGITUDINAL
+TauPi0ClustersAuxDyn.OOC_WEIGHT
+TauPi0ClustersAuxDyn.SECOND_ENG_DENS
+TauPi0ClustersAuxDyn.SECOND_LAMBDA
+TauPi0ClustersAuxDyn.SECOND_R
+TauPi0ClustersAuxDyn.emax_sampl
+TauPi0ClustersAuxDyn.eta_sampl
+TauPi0ClustersAuxDyn.etamax_sampl
+TauPi0ClustersAuxDyn.phi_sampl
+TauPi0ClustersAuxDyn.phimax_sampl
+TauPi0Clusters_links
+TauSecondaryVertices
+TauSecondaryVerticesAux.
+TauShotClusters
+TauShotClustersAux.
+TauShotClustersAuxDyn.CellLink
+TauShotClustersAuxDyn.emax_sampl
+TauShotClustersAuxDyn.eta_sampl
+TauShotClustersAuxDyn.etamax_sampl
+TauShotClustersAuxDyn.phi_sampl
+TauShotClustersAuxDyn.phimax_sampl
+TauShotClusters_links
+TauShotParticleFlowObjects
+TauShotParticleFlowObjectsAux.
+TauShotParticleFlowObjectsAuxDyn.tauShots_nCellsInEta
+TauShotParticleFlowObjectsAuxDyn.tauShots_nPhotons
+TauShotParticleFlowObjectsAuxDyn.tauShots_pt1
+TauShotParticleFlowObjectsAuxDyn.tauShots_pt3
+TauShotParticleFlowObjectsAuxDyn.tauShots_pt5
+TauShotParticleFlowObjectsAuxDyn.tauShots_seedHash
+TauTracks
+TauTracksAux.
+TauTracksAuxDyn.CaloSamplingEtaEM
+TauTracksAuxDyn.CaloSamplingEtaHad
+TauTracksAuxDyn.CaloSamplingPhiEM
+TauTracksAuxDyn.CaloSamplingPhiHad
+TauTracksAuxDyn.d0SigTJVA
+TauTracksAuxDyn.d0TJVA
+TauTracksAuxDyn.rnn_chargedScore
+TauTracksAuxDyn.rnn_conversionScore
+TauTracksAuxDyn.rnn_fakeScore
+TauTracksAuxDyn.rnn_isolationScore
+TauTracksAuxDyn.z0sinthetaSigTJVA
+TauTracksAuxDyn.z0sinthetaTJVA
+TileMuObj
+Token
+TopoClusterIsoCentralEventShape
+TopoClusterIsoCentralEventShapeAux.
+TopoClusterIsoCentralEventShapeAuxDyn.Density
+TopoClusterIsoCentralEventShapeAuxDyn.DensityArea
+TopoClusterIsoCentralEventShapeAuxDyn.DensitySigma
+TopoClusterIsoForwardEventShape
+TopoClusterIsoForwardEventShapeAux.
+TopoClusterIsoForwardEventShapeAuxDyn.Density
+TopoClusterIsoForwardEventShapeAuxDyn.DensityArea
+TopoClusterIsoForwardEventShapeAuxDyn.DensitySigma
+TrigConfKeys
+TrigNavigation
+TrigNavigationAux.
+TriggerMenuJson_HLT
+TriggerMenuJson_HLTAux.
+TriggerMenuJson_HLTPS
+TriggerMenuJson_HLTPSAux.
+TriggerMenuJson_L1
+TriggerMenuJson_L1Aux.
+TriggerMenuJson_L1PS
+TriggerMenuJson_L1PSAux.
+_TagInfo
+egammaClusters
+egammaClustersAux.
+egammaClustersAuxDyn.BadChannelList
+egammaClustersAuxDyn.CellLink
+egammaClustersAuxDyn.ETA1CALOFRAME
+egammaClustersAuxDyn.ETA2CALOFRAME
+egammaClustersAuxDyn.ETACALOFRAME
+egammaClustersAuxDyn.PHI1CALOFRAME
+egammaClustersAuxDyn.PHI2CALOFRAME
+egammaClustersAuxDyn.PHICALOFRAME
+egammaClustersAuxDyn.constituentClusterLinks
+egammaClustersAuxDyn.emax_sampl
+egammaClustersAuxDyn.eta_sampl
+egammaClustersAuxDyn.etamax_sampl
+egammaClustersAuxDyn.phi_sampl
+egammaClustersAuxDyn.phimax_sampl
+egammaClusters_links
+index_ref
+index_ref
+index_ref
+index_ref
+index_ref
+xTrigDecision
+xTrigDecisionAux.
--
GitLab
From 5965a230f16921bd29c986aaab7c67e496b18963 Mon Sep 17 00:00:00 2001
From: Vakho Tsulaia <vakhtang.tsulaia@cern.ch>
Date: Sat, 21 Aug 2021 22:37:30 +0200
Subject: [PATCH 219/272] Fixed refs for failing unit tests
The failure is caused by introduction of the new LArAlignCondAlg
---
.../CaloUtils/share/CaloTowerStore_test.ref | 90 +-
.../share/LArFCalTowerBuilderTool.ref | 97 +-
.../share/LArConditionsTest.ref | 197 ++++
.../share/LArConditionsTestReadNoReg.ref | 229 +++++
.../share/LArConditionsTestWriteNoReg.ref | 217 +++++
.../share/TileCellBuilderFromHit_test.ref | 127 +--
.../share/TileCellBuilder_test.ref | 145 +--
.../share/TileDQstatusAlg_test.ref | 118 ++-
.../share/TileDQstatusTool_test.ref | 122 ++-
.../share/TileRawChannelBuilder_test.ref | 141 +--
.../TileBeamElemContByteStreamCnv_test.ref | 904 ++++++++++++++++-
.../TileDigitsContByteStreamCnv_test.ref | 908 +++++++++++++++++-
.../share/TileL2ContByteStreamCnv_test.ref | 906 ++++++++++++++++-
.../share/TileLaserObjByteStreamCnv_test.ref | 902 ++++++++++++++++-
.../share/TileMuRcvContByteStreamCnv_test.ref | 908 +++++++++++++++++-
.../TileRawChannelContByteStreamCnv_test.ref | 908 +++++++++++++++++-
16 files changed, 6543 insertions(+), 376 deletions(-)
diff --git a/Calorimeter/CaloUtils/share/CaloTowerStore_test.ref b/Calorimeter/CaloUtils/share/CaloTowerStore_test.ref
index 3f468662321e..c5739e45e074 100644
--- a/Calorimeter/CaloUtils/share/CaloTowerStore_test.ref
+++ b/Calorimeter/CaloUtils/share/CaloTowerStore_test.ref
@@ -1,16 +1,16 @@
-Tue Oct 6 18:57:36 CEST 2020
+Sat Aug 21 21:42:33 CEST 2021
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1855]
+Py:Athena INFO using release [WorkDir-22.0.42] [x86_64-centos7-gcc8-opt] [master-calo-ctests/ec2fa09c9e3] -- built on [2021-08-21T2138]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "CaloUtils/CaloTowerStore_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5569 configurables from 4 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5069 configurables from 8 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.19
+EventInfoMgtInit: Got release version Athena-22.0.42
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "CaloIdCnv/CaloIdCnv_joboptions.py"
Py:Athena INFO including file "CaloConditions/CaloConditions_jobOptions.py"
@@ -20,25 +20,24 @@ Py:Athena INFO including file "TileIdCnv/TileIdCnv_jobOptions.py"
Py:Athena INFO including file "AthenaCommon/runbatch.py"
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
- running on aibuild028.cern.ch on Tue Oct 6 18:57:48 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v36r0)
+ running on aibuild028.cern.ch on Sat Aug 21 21:42:47 2021
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3586 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3377 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc
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-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
-PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
+PoolSvc INFO Unable find catalog apcfile:poolcond/PoolCat_oflcond.xml in $ATLAS_POOLCOND_PATH and $DATAPATH
PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
DbSession INFO Open DbSession
@@ -50,7 +49,9 @@ IOVDbSvc INFO Global tag: OFLCOND-SDR-BS14T-IBL-06 set from joboptio
IOVDbFolder INFO Read from meta data only for folder /TagInfo
IOVDbSvc INFO Initialised with 3 connections and 7 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
-ClassIDSvc INFO getRegistryEntries: read 1629 CLIDRegistry entries for module ALL
+IOVDbSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+TagInfoMgr INFO AlgTool: TagInfoMgr.IOVDbMetaDataTool
+ClassIDSvc INFO getRegistryEntries: read 1513 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
@@ -64,9 +65,9 @@ IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTOn
IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
IOVDbSvc INFO Added taginfo remove for /LAR/Identifier/LArTTCellMapAtlas
-ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 26 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 243 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 23 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 212 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -80,6 +81,7 @@ DetDescrCnvSvc INFO filling address for AtlasID with CLID 164875623 and s
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 HGTD_ID with CLID 79264207 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
@@ -106,6 +108,8 @@ DetDescrCnvSvc INFO filling address for CaloCell_ID with CLID 123500438 a
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
+DetDescrCnvSvc INFO filling address for JTower_ID with CLID 218674799 and storage type 68 to detector store
+DetDescrCnvSvc INFO filling address for GTower_ID with CLID 49678914 and storage type 68 to detector store
GeoModelSvc::RD...WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RD...WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RD...WARNING Getting InDetMatComponents with default tag
@@ -151,7 +155,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 6007 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6320 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -169,11 +173,11 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
-ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloCell_ID helper object in the detector store
CaloIDHelper_ID... INFO in createObj: creating a LArEM_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -181,37 +185,45 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
AtlasDetectorID INFO initialize_from_dictionary - OK
TileDetDescrMan... INFO Entering create_elements()
-ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 71 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr
+ClassIDSvc INFO getRegistryEntries: read 444 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
CondInputLoader INFO Adding base classes:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' ) -> no bases
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' ) ->
CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' )
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' )
ApplicationMgr INFO Application Manager Initialized successfully
+ClassIDSvc INFO getRegistryEntries: read 2125 CLIDRegistry entries for module ALL
+CondInputLoader INFO created CondCont<CaloRec::CaloCellPositionShift> with key 'ConditionStore+LArCellPositionShift'
+CondInputLoader INFO created CondCont<DetCondKeyTrans> with key 'ConditionStore+/LAR/Align'
ApplicationMgr INFO Application Manager Started successfully
AthenaEventLoopMgr INFO ===>>> start of run 1 <<<===
-EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
-EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
-ClassIDSvc INFO getRegistryEntries: read 2430 CLIDRegistry entries for module ALL
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-SDR-BS14T-IBL-06 resolved to LARAlign-mc11-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-SDR-BS14T-IBL-06 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbFolder INFO HVS tag OFLCOND-SDR-BS14T-IBL-06 resolved to LARIdentifierLArTTCellMapAtlas-HadFcalFix2 for folder /LAR/Identifier/LArTTCellMapAtlas
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc INFO getRegistryEntries: read 201 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 207 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -228,12 +240,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -241,6 +253,9 @@ Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8667C6F
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
AthenaEventLoopMgr INFO ===>>> start processing event #1, run #1 0 events processed so far <<<===
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+LArAlignCondAlg INFO recorded new GeoAlignmentStore object for LAr with key LArAlignmentStore and range {[0,l:0] - [INVALID]}
test1
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 1 events processed so far <<<===
/cvmfs/atlas-co... INFO Database being retired...
@@ -248,30 +263,29 @@ Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 06C9EAE
/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
-IncidentProcAlg1 INFO Finalize
CondInputLoader INFO Finalizing CondInputLoader...
-IncidentProcAlg2 INFO Finalize
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.05 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/2 objs/chan/bytes 1/1/170 (( 0.07 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.22 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/2 objs/chan/bytes 2/1/390 (( 0.07 ))s
IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 1/0 objs/chan/bytes 1/1/173 (( 0.02 ))s
IOVDbFolder WARNING Folder /LAR/Identifier/LArTTCellMapAtlas is requested but no data retrieved
-IOVDbSvc INFO bytes in (( 0.28 ))s
+IOVDbSvc INFO bytes in (( 0.16 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 3 ReadTime: (( 0.28 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 3 nFolders: 3 ReadTime: (( 0.16 ))s
IOVDbSvc INFO Connection COOLOFL_CALO/OFLP200 : nConnect: 1 nFolders: 3 ReadTime: (( 0.00 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 490 [ms] Ave/Min/Max= 245(+- 235)/ 10/ 480 [ms] #= 2
-cObj_ALL INFO Time User : Tot= 0.55 [s] Ave/Min/Max= 0.275(+- 0.245)/ 0.03/ 0.52 [s] #= 2
-ChronoStatSvc INFO Time User : Tot= 2.21 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 150 [ms] Ave/Min/Max= 37.5(+- 59.3)/ 0/ 140 [ms] #= 4
+cObj_ALL INFO Time User : Tot= 200 [ms] Ave/Min/Max= 50(+- 70.4)/ 0/ 170 [ms] #= 4
+ChronoStatSvc INFO Time User : Tot= 2.04 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/LArCalorimeter/LArRecUtils/share/LArFCalTowerBuilderTool.ref b/LArCalorimeter/LArRecUtils/share/LArFCalTowerBuilderTool.ref
index 213c690d8a87..495395ac081e 100644
--- a/LArCalorimeter/LArRecUtils/share/LArFCalTowerBuilderTool.ref
+++ b/LArCalorimeter/LArRecUtils/share/LArFCalTowerBuilderTool.ref
@@ -1,16 +1,16 @@
-Thu Oct 22 13:07:27 EDT 2020
+Sat Aug 21 21:43:39 CEST 2021
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-mt/9d6e7edd41b] -- built on [2020-10-22T1119]
+Py:Athena INFO using release [WorkDir-22.0.42] [x86_64-centos7-gcc8-opt] [master-calo-ctests/ec2fa09c9e3] -- built on [2021-08-21T2138]
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 "LArRecUtils/LArFCalTowerBuilderTool_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5616 configurables from 48 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5069 configurables from 8 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.19
+EventInfoMgtInit: Got release version Athena-22.0.42
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "CaloIdCnv/CaloIdCnv_joboptions.py"
Py:Athena INFO including file "CaloConditions/CaloConditions_jobOptions.py"
@@ -20,38 +20,38 @@ Py:Athena INFO including file "TileIdCnv/TileIdCnv_jobOptions.py"
Py:Athena INFO including file "AthenaCommon/runbatch.py"
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
- running on spar0103.usatlas.bnl.gov on Thu Oct 22 13:07:43 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v36r0)
+ running on aibuild028.cern.ch on Sat Aug 21 21:43:53 2021
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3535 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3377 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc
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://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas1.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas2.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier01.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier02.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier03.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier05.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://frontier-cache.sdcc.bnl.gov:3128)(proxyurl=http://frontier-cache1.sdcc.bnl.gov:3128)(proxyurl=http://frontier-cache2.sdcc.bnl.gov:3128)(proxyurl=http://atlasbpfrontier.fnal.gov:3127)(proxyurl=http://atlasbpfrontier.cern.ch: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-10-20T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 1 servers found for host spar0103.usatlas.bnl.gov [ATLF ]
+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/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
-PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
+PoolSvc INFO Unable find catalog apcfile:poolcond/PoolCat_oflcond.xml in $ATLAS_POOLCOND_PATH and $DATAPATH
PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
-OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
IOVDbSvc INFO Global tag: OFLCOND-SDR-BS14T-IBL-06 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
IOVDbSvc INFO Initialised with 3 connections and 7 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
-ClassIDSvc INFO getRegistryEntries: read 1629 CLIDRegistry entries for module ALL
+IOVDbSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+TagInfoMgr INFO AlgTool: TagInfoMgr.IOVDbMetaDataTool
+ClassIDSvc INFO getRegistryEntries: read 1513 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
@@ -65,9 +65,9 @@ IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTOn
IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
IOVDbSvc INFO Added taginfo remove for /LAR/Identifier/LArTTCellMapAtlas
-ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 26 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 180 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 23 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 212 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -81,6 +81,7 @@ DetDescrCnvSvc INFO filling address for AtlasID with CLID 164875623 and s
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 HGTD_ID with CLID 79264207 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
@@ -107,6 +108,8 @@ DetDescrCnvSvc INFO filling address for CaloCell_ID with CLID 123500438 a
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
+DetDescrCnvSvc INFO filling address for JTower_ID with CLID 218674799 and storage type 68 to detector store
+DetDescrCnvSvc INFO filling address for GTower_ID with CLID 49678914 and storage type 68 to detector store
GeoModelSvc::RD...WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RD...WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RD...WARNING Getting InDetMatComponents with default tag
@@ -152,7 +155,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 5905 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6320 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -170,11 +173,11 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-20T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
-ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloCell_ID helper object in the detector store
CaloIDHelper_ID... INFO in createObj: creating a LArEM_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -182,38 +185,46 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-20T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-20T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-20T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
AtlasDetectorID INFO initialize_from_dictionary - OK
TileDetDescrMan... INFO Entering create_elements()
-ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 71 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr
+ClassIDSvc INFO getRegistryEntries: read 444 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
CondInputLoader INFO Adding base classes:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' ) -> no bases
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' ) ->
CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
-ClassIDSvc INFO getRegistryEntries: read 7186 CLIDRegistry entries for module ALL
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' )
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' )
+ClassIDSvc INFO getRegistryEntries: read 6040 CLIDRegistry entries for module ALL
ToolSvc.LArFCal... INFO CaloTowerBuilder for the FCal initiated
ApplicationMgr INFO Application Manager Initialized successfully
+CondInputLoader INFO created CondCont<CaloRec::CaloCellPositionShift> with key 'ConditionStore+LArCellPositionShift'
+CondInputLoader INFO created CondCont<DetCondKeyTrans> with key 'ConditionStore+/LAR/Align'
ApplicationMgr INFO Application Manager Started successfully
AthenaEventLoopMgr INFO ===>>> start of run 1 <<<===
-EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
-EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-SDR-BS14T-IBL-06 resolved to LARAlign-mc11-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-SDR-BS14T-IBL-06 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbFolder INFO HVS tag OFLCOND-SDR-BS14T-IBL-06 resolved to LARIdentifierLArTTCellMapAtlas-HadFcalFix2 for folder /LAR/Identifier/LArTTCellMapAtlas
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc INFO getRegistryEntries: read 201 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 207 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -230,12 +241,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-20T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-20T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-20T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-20T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -243,6 +254,9 @@ Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8667C6F
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
AthenaEventLoopMgr INFO ===>>> start processing event #1, run #1 0 events processed so far <<<===
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+LArAlignCondAlg INFO recorded new GeoAlignmentStore object for LAr with key LArAlignmentStore and range {[0,l:0] - [INVALID]}
test1
towers
0 1 1 0
@@ -6651,30 +6665,29 @@ Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 06C9EAE
/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
-IncidentProcAlg1 INFO Finalize
CondInputLoader INFO Finalizing CondInputLoader...
-IncidentProcAlg2 INFO Finalize
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.74 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/2 objs/chan/bytes 1/1/170 (( 0.07 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.10 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 1/0 objs/chan/bytes 1/1/173 (( 0.10 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/2 objs/chan/bytes 2/1/390 (( 0.05 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 1/0 objs/chan/bytes 1/1/173 (( 0.04 ))s
IOVDbFolder WARNING Folder /LAR/Identifier/LArTTCellMapAtlas is requested but no data retrieved
-IOVDbSvc INFO bytes in (( 0.94 ))s
+IOVDbSvc INFO bytes in (( 0.16 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 3 ReadTime: (( 0.94 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 3 nFolders: 3 ReadTime: (( 0.16 ))s
IOVDbSvc INFO Connection COOLOFL_CALO/OFLP200 : nConnect: 1 nFolders: 3 ReadTime: (( 0.00 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 420 [ms] Ave/Min/Max= 210(+- 200)/ 10/ 410 [ms] #= 2
-cObj_ALL INFO Time User : Tot= 490 [ms] Ave/Min/Max= 245(+- 225)/ 20/ 470 [ms] #= 2
-ChronoStatSvc INFO Time User : Tot= 2.13 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 170 [ms] Ave/Min/Max= 42.5(+- 68)/ 0/ 160 [ms] #= 4
+cObj_ALL INFO Time User : Tot= 210 [ms] Ave/Min/Max= 52.5(+- 79.8)/ 0/ 190 [ms] #= 4
+ChronoStatSvc INFO Time User : Tot= 2.26 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest.ref b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest.ref
index 34e8f1dc8b6a..bc104728d3de 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest.ref
+++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest.ref
@@ -1,17 +1,130 @@
+Sun Aug 22 06:42:48 CEST 2021
+Preloading tcmalloc_minimal.so
+Py:Athena INFO including file "AthenaCommon/Preparation.py"
+Py:Athena INFO using release [WorkDir-22.0.42] [x86_64-centos7-gcc8-opt] [master-calo-ctests/b78ddd66878] -- built on [2021-08-22T0641]
+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 "LArConditionsTest/LArConditionsTest_jobOptions.py"
+Py:Athena INFO including file "AthenaCommon/Atlas_Gen.UnixStandardJob.py"
+Py:Athena INFO SetGeometryVersion.py obtained major release version 22
+Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
+Py:ConfigurableDb INFO Read module info for 5069 configurables from 4 genConfDb files
+Py:ConfigurableDb INFO No duplicates have been found: that's good !
+EventInfoMgtInit: Got release version Athena-22.0.42
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
+Py:Athena INFO including file "LArRawConditions/LArIdMap_ATLAS_jobOptions.py"
+Py:Athena INFO including file "LArConditionsCommon/LArIdMap_MC_jobOptions.py"
Py:JobPropertyContainer:: INFO setting folder /LAR/Identifier/OnOffIdMap with tag LARIdentifierOnOffIdMap-012
Py:JobPropertyContainer:: INFO setting folder /LAR/Identifier/CalibIdMap with tag LARIdentifierCalibIdMap-012
Py:JobPropertyContainer:: INFO setting folder /LAR/Identifier/FebRodMap with tag LARIdentifierFebRodMap-005
+Py:Athena INFO including file "LArIdCnv/LArIdCnv_joboptions.py"
+Py:Athena INFO including file "LArTools/LArTools_jobOptions.py"
+Py:Athena INFO including file "CaloIdCnv/CaloIdCnv_joboptions.py"
+Py:Athena INFO including file "CaloConditions/CaloConditions_jobOptions.py"
+Py:Athena INFO including file "CaloConditions/LArTTCellMap_ATLAS_jobOptions.py"
+Py:Athena INFO including file "CaloConditions/CaloTTIdMap_ATLAS_jobOptions.py"
+Py:Athena INFO including file "CaloDetMgrDetDescrCnv/CaloDetMgrDetDescrCnv_joboptions.py"
+Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
+Py:Athena INFO including file "LArCondAthenaPool/LArCondAthenaPool_joboptions.py"
+Py:Athena INFO including file "AthenaCommon/runbatch.py"
+ApplicationMgr SUCCESS
+====================================================================================================================================
+ Welcome to ApplicationMgr (GaudiCoreSvc v36r0)
+ running on aibuild028.cern.ch on Sun Aug 22 06:43:04 2021
+====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
+ClassIDSvc INFO getRegistryEntries: read 3377 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
+MetaDataSvc INFO Initializing MetaDataSvc
+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/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+PoolSvc INFO Successfully setup replica sorting algorithm
+PoolSvc INFO Setting up APR FileCatalog and Streams
+PoolSvc INFO Unable find catalog apcfile:poolcond/PoolCat_oflcond.xml in $ATLAS_POOLCOND_PATH and $DATAPATH
+PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
+PoolSvc INFO POOL WriteCatalog is file:Catalog1.xml
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
+IOVDbSvc INFO Only 5 POOL conditions files will be open at once
+IOVDbSvc INFO Cache alignment will be done in 3 slices
+IOVDbSvc INFO Global tag: OFLCOND-CSC-00-01-00 set from joboptions
+IOVDbSvc INFO Folder /LAR/Identifier/OnOffIdMap, adding new key tag with value LARIdentifierOnOffIdMap-012
+IOVDbSvc INFO Folder /LAR/Identifier/CalibIdMap, adding new key tag with value LARIdentifierCalibIdMap-012
+IOVDbSvc INFO Folder /LAR/Identifier/FebRodMap, adding new key tag with value LARIdentifierFebRodMap-005
IOVDbFolder INFO Read from meta data only for folder /TagInfo
+IOVDbSvc INFO Initialised with 3 connections and 10 folders
+IOVDbSvc INFO Service IOVDbSvc initialised successfully
+IOVDbSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+TagInfoMgr INFO AlgTool: TagInfoMgr.IOVDbMetaDataTool
+ClassIDSvc INFO getRegistryEntries: read 1513 CLIDRegistry entries for module ALL
+IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
+IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event
+IOVDbSvc INFO Opening COOL connection for COOLOFL_CALO/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_CALO/OFLP200
+IOVDbSvc INFO Added taginfo remove for /LAR/Align
+IOVDbSvc INFO Added taginfo remove for /LAR/Identifier/CalibIdMap
+IOVDbSvc INFO Added taginfo remove for /LAR/Identifier/FebRodMap
+IOVDbSvc INFO Added taginfo remove for /LAR/Identifier/OnOffIdMap
+IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas
+IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas
+IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas
+IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
+IOVDbSvc INFO Added taginfo remove for /LAR/Identifier/LArTTCellMapAtlas
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 23 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 212 CLIDRegistry entries for module ALL
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 HGTD_ID with CLID 79264207 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
+DetDescrCnvSvc INFO filling address for JTower_ID with CLID 218674799 and storage type 68 to detector store
+DetDescrCnvSvc INFO filling address for GTower_ID with CLID 49678914 and storage type 68 to detector store
GeoModelSvc::RD...WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RD...WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RD...WARNING Getting InDetMatComponents with default tag
@@ -54,11 +167,13 @@ LArHVLineID INFO [initialize_from_dictionary] > HV line range -> 11/1/
LArHVLineID INFO [init_hashes()] > Hvline_size= 5008
LAr::BarrelCryo... INFO new description with barrel croystat bolts
LAr::BarrelCryo... INFO new coil bumper description
+BarrelConstruction INFO Getting primary numbers for ATLAS, ATLAS-R2-2016-01-00-01
BarrelConstruction INFO Makes detailed absorber sandwich ? 1 1
BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
+ClassIDSvc INFO getRegistryEntries: read 6430 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -67,6 +182,7 @@ EMECConstruction INFO multi-layered version of absorbers activated, paramete
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstru... INFO Start building EC electronics geometry
+TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
TileDddbManager INFO n_timod = 320
TileDddbManager INFO n_cuts = 9
@@ -75,9 +191,11 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloCell_ID helper object in the detector store
CaloIDHelper_ID... INFO in createObj: creating a LArEM_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -85,20 +203,38 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
AtlasDetectorID INFO initialize_from_dictionary - OK
TileDetDescrMan... INFO Entering create_elements()
+ClassIDSvc INFO getRegistryEntries: read 71 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr
+ClassIDSvc INFO getRegistryEntries: read 444 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6040 CLIDRegistry entries for module ALL
+CondInputLoader INFO Initializing CondInputLoader...
+ClassIDSvc INFO getRegistryEntries: read 12 CLIDRegistry entries for module ALL
CondInputLoader INFO Adding base classes:
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/CalibIdMap' ) ->
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/FebRodMap' ) ->
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/OnOffIdMap' ) ->
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' ) -> no bases
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' ) ->
CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/CalibIdMap' )
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/FebRodMap' )
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/OnOffIdMap' )
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' )
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' )
+ClassIDSvc INFO getRegistryEntries: read 452 CLIDRegistry entries for module ALL
+xAODMaker::Even... INFO Initializing xAODMaker::EventInfoCnvAlg
+ClassIDSvc INFO getRegistryEntries: read 348 CLIDRegistry entries for module ALL
+xAODMaker::Even... INFO Beam conditions service not available
+xAODMaker::Even... INFO Will not fill beam spot information into xAOD::EventInfo
+LArConditionsTe... DEBUG Property update for OutputLevel : new value = 2
LArConditionsTe... DEBUG TestCondObjs flag = 'TestCondObjs':True
LArConditionsTe... DEBUG ReadCondObjs flag = 'ReadCondObjs':False
LArConditionsTe... DEBUG WriteCondObjs flag = 'WriteCondObjs':True
@@ -111,16 +247,36 @@ LArOnlineIDDetD... INFO in createObj: creating a LArOnlineID helper object in
LArOnlineID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
LArConditionsTe... DEBUG initialize done
+LArConditionsTe... DEBUG input handles: 0
+LArConditionsTe... DEBUG output handles: 0
+LArConditionsTe... DEBUG Data Deps for LArConditionsTestAlg
EventSelector INFO Enter McEventSelector Initialization
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/LAR/Identifier/CalibIdMap'
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/LAR/Identifier/FebRodMap'
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/LAR/Identifier/OnOffIdMap'
+CondInputLoader INFO created CondCont<CaloRec::CaloCellPositionShift> with key 'ConditionStore+LArCellPositionShift'
+CondInputLoader INFO created CondCont<DetCondKeyTrans> with key 'ConditionStore+/LAR/Align'
ApplicationMgr INFO Application Manager Started successfully
AthenaEventLoopMgr INFO ===>>> start of run 0 <<<===
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbFolder INFO HVS tag OFLCOND-CSC-00-01-00 resolved to LARAlign_CSC_01 for folder /LAR/Align
+IOVDbFolder INFO HVS tag OFLCOND-CSC-00-01-00 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
+IOVDbFolder INFO HVS tag OFLCOND-CSC-00-01-00 resolved to LARIdentifierLArTTCellMapAtlas-HadFcalFix for folder /LAR/Identifier/LArTTCellMapAtlas
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] E01BD448-BF95-DB11-983E-0015C5098AA3
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/oflcond/oflcond.000002.conditions.simul.pool.v0000/oflcond.000002.conditions.simul.pool.v0000._0058.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/oflcond/oflcond.000002.conditions.simul.pool.v0000/oflcond.000002.conditions.simul.pool.v0000._0058.pool.root File version:51304
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
+ClassIDSvc INFO getRegistryEntries: read 206 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -137,12 +293,30 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
AthenaEventLoopMgr INFO ===>>> start processing event #0, run #0 0 events processed so far <<<===
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+LArAlignCondAlg INFO recorded new GeoAlignmentStore object for LAr with key LArAlignmentStore and range {[0,l:0] - [INVALID]}
LArOnOffMappingAlg INFO Done reading online/offline identifier mapping
LArOnOffMappingAlg INFO Found 195072 online identifier and 182468 offline identifier. 12604 disconnected channels.
LArOnOffMappingAlg INFO recorded new LArOnOffIdMap with range {[0,l:0] - [INVALID]} into Conditions Store
@@ -6728,14 +6902,37 @@ LArConditionsTe... DEBUG Total number of conditions objects 25088
LArConditionsTe... DEBUG Total number of correction objects 20
LArConditionsTe... DEBUG End of testCondObjects
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #0 1 events processed so far <<<===
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] E01BD448-BF95-DB11-983E-0015C5098AA3
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
+CondInputLoader INFO Finalizing CondInputLoader...
IdDictDetDescrCnv INFO in finalize
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 7/2 objs/chan/bytes 7/1/1176 (( 0.40 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/CalibIdMap (AttrList) db-read 7/1 objs/chan/bytes 7/1/10641036 (( 0.11 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/FebRodMap (AttrList) db-read 7/1 objs/chan/bytes 7/1/42700 (( 0.06 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/OnOffIdMap (AttrList) db-read 7/1 objs/chan/bytes 7/1/5462044 (( 0.35 ))s
+IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 4/2 objs/chan/bytes 4/1/780 (( 0.06 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 7/0 objs/chan/bytes 7/1/1211 (( 0.08 ))s
IOVDbFolder WARNING Folder /LAR/Identifier/LArTTCellMapAtlas is requested but no data retrieved
+IOVDbSvc INFO bytes in (( 1.05 ))s
+IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 8 nFolders: 6 ReadTime: (( 1.05 ))s
+IOVDbSvc INFO Connection COOLOFL_CALO/OFLP200 : nConnect: 1 nFolders: 3 ReadTime: (( 0.00 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
+cObjR_ALL INFO Time User : Tot= 150 [ms] Ave/Min/Max= 37.5(+- 59.3)/ 0/ 140 [ms] #= 4
+cObj_ALL INFO Time User : Tot= 180 [ms] Ave/Min/Max= 25.7(+- 55.3)/ 0/ 160 [ms] #= 7
+ChronoStatSvc INFO Time User : Tot= 3.26 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg.ref b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg.ref
index ebe05549e2f7..b1069cdf35e0 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg.ref
+++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg.ref
@@ -1,19 +1,161 @@
+Sat Aug 21 21:45:33 CEST 2021
+Preloading tcmalloc_minimal.so
+Py:Athena INFO including file "AthenaCommon/Preparation.py"
+Py:Athena INFO using release [WorkDir-22.0.42] [x86_64-centos7-gcc8-opt] [master-calo-ctests/ec2fa09c9e3] -- built on [2021-08-21T2138]
+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 "LArConditionsTest/LArConditionsTestReadNoReg_jobOptions.py"
+Py:Athena INFO including file "AthenaCommon/Atlas_Gen.UnixStandardJob.py"
+Py:Athena INFO SetGeometryVersion.py obtained major release version 22
+Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
+Py:ConfigurableDb INFO Read module info for 5069 configurables from 8 genConfDb files
+Py:ConfigurableDb INFO No duplicates have been found: that's good !
+EventInfoMgtInit: Got release version Athena-22.0.42
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
+Py:Athena INFO including file "LArRawConditions/LArIdMap_ATLAS_jobOptions.py"
+Py:Athena INFO including file "LArConditionsCommon/LArIdMap_MC_jobOptions.py"
Py:JobPropertyContainer:: INFO setting folder /LAR/Identifier/OnOffIdMap with tag LARIdentifierOnOffIdMap-012
Py:JobPropertyContainer:: INFO setting folder /LAR/Identifier/CalibIdMap with tag LARIdentifierCalibIdMap-012
Py:JobPropertyContainer:: INFO setting folder /LAR/Identifier/FebRodMap with tag LARIdentifierFebRodMap-005
+Py:Athena INFO including file "LArIdCnv/LArIdCnv_joboptions.py"
+Py:Athena INFO including file "LArTools/LArTools_jobOptions.py"
+Py:Athena INFO including file "CaloIdCnv/CaloIdCnv_joboptions.py"
+Py:Athena INFO including file "CaloConditions/CaloConditions_jobOptions.py"
+Py:Athena INFO including file "CaloConditions/LArTTCellMap_ATLAS_jobOptions.py"
+Py:Athena INFO including file "CaloConditions/CaloTTIdMap_ATLAS_jobOptions.py"
+Py:Athena INFO including file "CaloDetMgrDetDescrCnv/CaloDetMgrDetDescrCnv_joboptions.py"
+Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
+Py:Athena INFO including file "LArCondAthenaPool/LArCondAthenaPool_joboptions.py"
+Py:Athena INFO including file "AthenaPoolServices/AthenaRootStreamerSvc_jobOptions.py"
+Py:Athena INFO including file "AthenaPoolCnvSvc/AthenaPool_jobOptions.py"
+Py:Athena INFO including file "AthenaCommon/runbatch.py"
+ApplicationMgr SUCCESS
+====================================================================================================================================
+ Welcome to ApplicationMgr (GaudiCoreSvc v36r0)
+ running on aibuild028.cern.ch on Sat Aug 21 21:45:46 2021
+====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
+ClassIDSvc INFO getRegistryEntries: read 3377 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
+MetaDataSvc INFO Initializing MetaDataSvc
+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/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+PoolSvc INFO Successfully setup replica sorting algorithm
+PoolSvc INFO Setting up APR FileCatalog and Streams
+PoolSvc INFO Unable find catalog apcfile:poolcond/PoolCat_oflcond.xml in $ATLAS_POOLCOND_PATH and $DATAPATH
+PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
+PoolSvc INFO POOL WriteCatalog is file:Catalog2.xml
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
+IOVDbSvc INFO Only 5 POOL conditions files will be open at once
+IOVDbSvc INFO Cache alignment will be done in 3 slices
+IOVDbSvc INFO Global tag: OFLCOND-CSC-00-01-00 set from joboptions
+IOVDbSvc INFO Folder /LAR/Identifier/OnOffIdMap, adding new key tag with value LARIdentifierOnOffIdMap-012
+IOVDbSvc INFO Folder /LAR/Identifier/CalibIdMap, adding new key tag with value LARIdentifierCalibIdMap-012
+IOVDbSvc INFO Folder /LAR/Identifier/FebRodMap, adding new key tag with value LARIdentifierFebRodMap-005
IOVDbFolder INFO Read from meta data only for folder /TagInfo
+IOVDbSvc INFO Initialised with 3 connections and 10 folders
+IOVDbSvc INFO Service IOVDbSvc initialised successfully
+IOVDbSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+CondProxyProvider INFO Initializing CondProxyProvider
+CondProxyProvider INFO Inputs: LarCondTestNoReg.root
+PoolSvc INFO File is not in Catalog! Attempt to open it anyway.
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 99993A5D-2110-B45C-8015-27A23799B9A5
+Domain[ROOT_All] INFO LarCondTestNoReg.root
+RootDatabase.open INFO LarCondTestNoReg.root File version:62400
+LarCondTestNoRe... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 99993A5D-2110-B45C-8015-27A23799B9A5
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
+PoolSvc INFO File is not in Catalog! Attempt to open it anyway.
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 99993A5D-2110-B45C-8015-27A23799B9A5
+Domain[ROOT_All] INFO LarCondTestNoReg.root
+RootDatabase.open INFO LarCondTestNoReg.root File version:62400
+LarCondTestNoRe... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 99993A5D-2110-B45C-8015-27A23799B9A5
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] B909DF67-135F-B04D-9381-0447646F97EF
+Domain[ROOT_All] INFO LarCondTestNoReg.root
+RootDatabase.open INFO LarCondTestNoReg.root File version:62400
+TagInfoMgr INFO AlgTool: TagInfoMgr.IOVDbMetaDataTool
+ClassIDSvc INFO getRegistryEntries: read 3552 CLIDRegistry entries for module ALL
+IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
+IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event
+IOVDbSvc INFO Opening COOL connection for COOLOFL_CALO/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_CALO/OFLP200
+IOVDbSvc INFO Added taginfo remove for /LAR/Align
+IOVDbSvc INFO Added taginfo remove for /LAR/Identifier/CalibIdMap
+IOVDbSvc INFO Added taginfo remove for /LAR/Identifier/FebRodMap
+IOVDbSvc INFO Added taginfo remove for /LAR/Identifier/OnOffIdMap
+IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas
+IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas
+IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas
+IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
+IOVDbSvc INFO Added taginfo remove for /LAR/Identifier/LArTTCellMapAtlas
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
EventPersistenc... INFO Added successfully Conversion service:McCnvSvc
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 HGTD_ID with CLID 79264207 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
+DetDescrCnvSvc INFO filling address for JTower_ID with CLID 218674799 and storage type 68 to detector store
+DetDescrCnvSvc INFO filling address for GTower_ID with CLID 49678914 and storage type 68 to detector store
EventPersistenc... INFO Added successfully Conversion service:DetDescrCnvSvc
+EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
+ClassIDSvc INFO getRegistryEntries: read 163 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 23 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 58 CLIDRegistry entries for module ALL
GeoModelSvc::RD...WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RD...WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RD...WARNING Getting InDetMatComponents with default tag
@@ -54,11 +196,13 @@ LArHVLineID INFO [initialize_from_dictionary] > HV line range -> 11/1/
LArHVLineID INFO [init_hashes()] > Hvline_size= 5008
LAr::BarrelCryo... INFO new description with barrel croystat bolts
LAr::BarrelCryo... INFO new coil bumper description
+BarrelConstruction INFO Getting primary numbers for ATLAS, ATLAS-R2-2016-01-00-01
BarrelConstruction INFO Makes detailed absorber sandwich ? 1 1
BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
+ClassIDSvc INFO getRegistryEntries: read 5973 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -67,6 +211,7 @@ EMECConstruction INFO multi-layered version of absorbers activated, paramete
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstru... INFO Start building EC electronics geometry
+TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
TileDddbManager INFO n_timod = 320
TileDddbManager INFO n_cuts = 9
@@ -75,9 +220,11 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloCell_ID helper object in the detector store
CaloIDHelper_ID... INFO in createObj: creating a LArEM_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -85,20 +232,37 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
AtlasDetectorID INFO initialize_from_dictionary - OK
TileDetDescrMan... INFO Entering create_elements()
+ClassIDSvc INFO getRegistryEntries: read 71 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr
+ClassIDSvc INFO getRegistryEntries: read 444 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 4880 CLIDRegistry entries for module ALL
+CondInputLoader INFO Initializing CondInputLoader...
CondInputLoader INFO Adding base classes:
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/CalibIdMap' ) ->
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/FebRodMap' ) ->
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/OnOffIdMap' ) ->
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' ) -> no bases
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' ) ->
CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/CalibIdMap' )
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/FebRodMap' )
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/OnOffIdMap' )
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' )
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' )
+ClassIDSvc INFO getRegistryEntries: read 452 CLIDRegistry entries for module ALL
+xAODMaker::Even... INFO Initializing xAODMaker::EventInfoCnvAlg
+ClassIDSvc INFO getRegistryEntries: read 348 CLIDRegistry entries for module ALL
+xAODMaker::Even... INFO Beam conditions service not available
+xAODMaker::Even... INFO Will not fill beam spot information into xAOD::EventInfo
+LArConditionsTe... DEBUG Property update for OutputLevel : new value = 2
LArConditionsTe... DEBUG TestCondObjs flag = 'TestCondObjs':True
LArConditionsTe... DEBUG ReadCondObjs flag = 'ReadCondObjs':True
LArConditionsTe... DEBUG WriteCondObjs flag = 'WriteCondObjs':False
@@ -111,16 +275,33 @@ LArOnlineIDDetD... INFO in createObj: creating a LArOnlineID helper object in
LArOnlineID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
LArConditionsTe... DEBUG initialize done
+LArConditionsTe... DEBUG input handles: 0
+LArConditionsTe... DEBUG output handles: 0
+LArConditionsTe... DEBUG Data Deps for LArConditionsTestAlg
EventSelector INFO Enter McEventSelector Initialization
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/LAR/Identifier/CalibIdMap'
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/LAR/Identifier/FebRodMap'
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/LAR/Identifier/OnOffIdMap'
+CondInputLoader INFO created CondCont<CaloRec::CaloCellPositionShift> with key 'ConditionStore+LArCellPositionShift'
+CondInputLoader INFO created CondCont<DetCondKeyTrans> with key 'ConditionStore+/LAR/Align'
ApplicationMgr INFO Application Manager Started successfully
AthenaEventLoopMgr INFO ===>>> start of run 0 <<<===
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbFolder INFO HVS tag OFLCOND-CSC-00-01-00 resolved to LARAlign_CSC_01 for folder /LAR/Align
+IOVDbFolder INFO HVS tag OFLCOND-CSC-00-01-00 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
+IOVDbFolder INFO HVS tag OFLCOND-CSC-00-01-00 resolved to LARIdentifierLArTTCellMapAtlas-HadFcalFix for folder /LAR/Identifier/LArTTCellMapAtlas
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] E01BD448-BF95-DB11-983E-0015C5098AA3
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/oflcond/oflcond.000002.conditions.simul.pool.v0000/oflcond.000002.conditions.simul.pool.v0000._0058.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/oflcond/oflcond.000002.conditions.simul.pool.v0000/oflcond.000002.conditions.simul.pool.v0000._0058.pool.root File version:51304
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
+ClassIDSvc INFO getRegistryEntries: read 206 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -137,12 +318,30 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
AthenaEventLoopMgr INFO ===>>> start processing event #0, run #0 0 events processed so far <<<===
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+LArAlignCondAlg INFO recorded new GeoAlignmentStore object for LAr with key LArAlignmentStore and range {[0,l:0] - [INVALID]}
LArOnOffMappingAlg INFO Done reading online/offline identifier mapping
LArOnOffMappingAlg INFO Found 195072 online identifier and 182468 offline identifier. 12604 disconnected channels.
LArOnOffMappingAlg INFO recorded new LArOnOffIdMap with range {[0,l:0] - [INVALID]} into Conditions Store
@@ -414,6 +613,9 @@ LArConditionsTe... DEBUG New : chan id, gain, ramps [4.4.1.1.24.5.86.0]
LArConditionsTe... DEBUG Corrections: chan id, gain, ramps [4.4.1.1.24.5.86.0] 2 -582 -583 -584 Compare = 1
LArConditionsTe... DEBUG Iteration check OK
LArConditionsTe... DEBUG Find check OK
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] B909DF67-135F-B04D-9381-0447646F97EF
+Domain[ROOT_All] INFO LarCondTestNoReg.root
+RootDatabase.open INFO LarCondTestNoReg.root File version:62400
LArConditionsTe... INFO Retrieved ramps for LArRampsSingleGroup
LArConditionsTe... INFO in testEachCondObject()
LArConditionsTe... DEBUG Number of channels, iovs 16 0
@@ -6070,14 +6272,41 @@ LArConditionsTe... DEBUG Total number of conditions objects 25088
LArConditionsTe... DEBUG Total number of correction objects 20
LArConditionsTe... DEBUG End of testCondObjects
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #0 1 events processed so far <<<===
+LarCondTestNoRe... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] B909DF67-135F-B04D-9381-0447646F97EF
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] E01BD448-BF95-DB11-983E-0015C5098AA3
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
+LarCondTestNoRe... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] B909DF67-135F-B04D-9381-0447646F97EF
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
+CondInputLoader INFO Finalizing CondInputLoader...
IdDictDetDescrCnv INFO in finalize
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 7/2 objs/chan/bytes 7/1/1176 (( 0.36 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/CalibIdMap (AttrList) db-read 7/1 objs/chan/bytes 7/1/10641036 (( 0.29 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/FebRodMap (AttrList) db-read 7/1 objs/chan/bytes 7/1/42700 (( 0.04 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/OnOffIdMap (AttrList) db-read 7/1 objs/chan/bytes 7/1/5462044 (( 0.13 ))s
+IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 4/2 objs/chan/bytes 4/1/780 (( 0.04 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 7/0 objs/chan/bytes 7/1/1211 (( 0.25 ))s
IOVDbFolder WARNING Folder /LAR/Identifier/LArTTCellMapAtlas is requested but no data retrieved
+IOVDbSvc INFO bytes in (( 1.12 ))s
+IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 8 nFolders: 6 ReadTime: (( 1.12 ))s
+IOVDbSvc INFO Connection COOLOFL_CALO/OFLP200 : nConnect: 1 nFolders: 3 ReadTime: (( 0.00 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
+cObjR_ALL INFO Time User : Tot= 50 [ms] Ave/Min/Max= 0.193(+- 1.63)/ 0/ 20 [ms] #=259
+cObj_ALL INFO Time User : Tot= 160 [ms] Ave/Min/Max= 14.5(+- 22.7)/ 0/ 70 [ms] #= 11
+ChronoStatSvc INFO Time User : Tot= 3.47 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg.ref b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg.ref
index c8cf68fb16db..3e078fa3aa91 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg.ref
+++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg.ref
@@ -1,17 +1,131 @@
+Sat Aug 21 21:44:57 CEST 2021
+Preloading tcmalloc_minimal.so
+Py:Athena INFO including file "AthenaCommon/Preparation.py"
+Py:Athena INFO using release [WorkDir-22.0.42] [x86_64-centos7-gcc8-opt] [master-calo-ctests/ec2fa09c9e3] -- built on [2021-08-21T2138]
+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 "LArConditionsTest/LArConditionsTestWriteNoReg_jobOptions.py"
+Py:Athena INFO including file "AthenaCommon/Atlas_Gen.UnixStandardJob.py"
+Py:Athena INFO SetGeometryVersion.py obtained major release version 22
+Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
+Py:ConfigurableDb INFO Read module info for 5069 configurables from 8 genConfDb files
+Py:ConfigurableDb INFO No duplicates have been found: that's good !
+EventInfoMgtInit: Got release version Athena-22.0.42
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
+Py:Athena INFO including file "LArRawConditions/LArIdMap_ATLAS_jobOptions.py"
+Py:Athena INFO including file "LArConditionsCommon/LArIdMap_MC_jobOptions.py"
Py:JobPropertyContainer:: INFO setting folder /LAR/Identifier/OnOffIdMap with tag LARIdentifierOnOffIdMap-012
Py:JobPropertyContainer:: INFO setting folder /LAR/Identifier/CalibIdMap with tag LARIdentifierCalibIdMap-012
Py:JobPropertyContainer:: INFO setting folder /LAR/Identifier/FebRodMap with tag LARIdentifierFebRodMap-005
+Py:Athena INFO including file "LArIdCnv/LArIdCnv_joboptions.py"
+Py:Athena INFO including file "LArTools/LArTools_jobOptions.py"
+Py:Athena INFO including file "CaloIdCnv/CaloIdCnv_joboptions.py"
+Py:Athena INFO including file "CaloConditions/CaloConditions_jobOptions.py"
+Py:Athena INFO including file "CaloConditions/LArTTCellMap_ATLAS_jobOptions.py"
+Py:Athena INFO including file "CaloConditions/CaloTTIdMap_ATLAS_jobOptions.py"
+Py:Athena INFO including file "CaloDetMgrDetDescrCnv/CaloDetMgrDetDescrCnv_joboptions.py"
+Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
+Py:Athena INFO including file "LArCondAthenaPool/LArCondAthenaPool_joboptions.py"
+Py:Athena INFO including file "LArCondAthenaPool/LArCondAthenaPool_joboptions.py"
+Py:Athena INFO including file "AthenaCommon/runbatch.py"
+ApplicationMgr SUCCESS
+====================================================================================================================================
+ Welcome to ApplicationMgr (GaudiCoreSvc v36r0)
+ running on aibuild028.cern.ch on Sat Aug 21 21:45:10 2021
+====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
+ClassIDSvc INFO getRegistryEntries: read 3377 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
+MetaDataSvc INFO Initializing MetaDataSvc
+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/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+PoolSvc INFO Successfully setup replica sorting algorithm
+PoolSvc INFO Setting up APR FileCatalog and Streams
+PoolSvc INFO Unable find catalog apcfile:poolcond/PoolCat_oflcond.xml in $ATLAS_POOLCOND_PATH and $DATAPATH
+PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
+PoolSvc INFO POOL WriteCatalog is file:Catalog3.xml
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
+IOVDbSvc INFO Only 5 POOL conditions files will be open at once
+IOVDbSvc INFO Cache alignment will be done in 3 slices
+IOVDbSvc INFO Global tag: OFLCOND-CSC-00-01-00 set from joboptions
+IOVDbSvc INFO Folder /LAR/Identifier/OnOffIdMap, adding new key tag with value LARIdentifierOnOffIdMap-012
+IOVDbSvc INFO Folder /LAR/Identifier/CalibIdMap, adding new key tag with value LARIdentifierCalibIdMap-012
+IOVDbSvc INFO Folder /LAR/Identifier/FebRodMap, adding new key tag with value LARIdentifierFebRodMap-005
IOVDbFolder INFO Read from meta data only for folder /TagInfo
+IOVDbSvc INFO Initialised with 3 connections and 10 folders
+IOVDbSvc INFO Service IOVDbSvc initialised successfully
+IOVDbSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+TagInfoMgr INFO AlgTool: TagInfoMgr.IOVDbMetaDataTool
+ClassIDSvc INFO getRegistryEntries: read 1513 CLIDRegistry entries for module ALL
+IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
+IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event
+IOVDbSvc INFO Opening COOL connection for COOLOFL_CALO/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_CALO/OFLP200
+IOVDbSvc INFO Added taginfo remove for /LAR/Align
+IOVDbSvc INFO Added taginfo remove for /LAR/Identifier/CalibIdMap
+IOVDbSvc INFO Added taginfo remove for /LAR/Identifier/FebRodMap
+IOVDbSvc INFO Added taginfo remove for /LAR/Identifier/OnOffIdMap
+IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas
+IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas
+IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas
+IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
+IOVDbSvc INFO Added taginfo remove for /LAR/Identifier/LArTTCellMapAtlas
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 23 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 212 CLIDRegistry entries for module ALL
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 HGTD_ID with CLID 79264207 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
+DetDescrCnvSvc INFO filling address for JTower_ID with CLID 218674799 and storage type 68 to detector store
+DetDescrCnvSvc INFO filling address for GTower_ID with CLID 49678914 and storage type 68 to detector store
GeoModelSvc::RD...WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RD...WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RD...WARNING Getting InDetMatComponents with default tag
@@ -54,11 +168,13 @@ LArHVLineID INFO [initialize_from_dictionary] > HV line range -> 11/1/
LArHVLineID INFO [init_hashes()] > Hvline_size= 5008
LAr::BarrelCryo... INFO new description with barrel croystat bolts
LAr::BarrelCryo... INFO new coil bumper description
+BarrelConstruction INFO Getting primary numbers for ATLAS, ATLAS-R2-2016-01-00-01
BarrelConstruction INFO Makes detailed absorber sandwich ? 1 1
BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
+ClassIDSvc INFO getRegistryEntries: read 6430 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -67,6 +183,7 @@ EMECConstruction INFO multi-layered version of absorbers activated, paramete
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstru... INFO Start building EC electronics geometry
+TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
TileDddbManager INFO n_timod = 320
TileDddbManager INFO n_cuts = 9
@@ -75,9 +192,11 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloCell_ID helper object in the detector store
CaloIDHelper_ID... INFO in createObj: creating a LArEM_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -85,20 +204,38 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
AtlasDetectorID INFO initialize_from_dictionary - OK
TileDetDescrMan... INFO Entering create_elements()
+ClassIDSvc INFO getRegistryEntries: read 71 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr
+ClassIDSvc INFO getRegistryEntries: read 444 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6040 CLIDRegistry entries for module ALL
+CondInputLoader INFO Initializing CondInputLoader...
+ClassIDSvc INFO getRegistryEntries: read 12 CLIDRegistry entries for module ALL
CondInputLoader INFO Adding base classes:
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/CalibIdMap' ) ->
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/FebRodMap' ) ->
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/OnOffIdMap' ) ->
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' ) -> no bases
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' ) ->
CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/CalibIdMap' )
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/FebRodMap' )
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/OnOffIdMap' )
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' )
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' )
+ClassIDSvc INFO getRegistryEntries: read 452 CLIDRegistry entries for module ALL
+xAODMaker::Even... INFO Initializing xAODMaker::EventInfoCnvAlg
+ClassIDSvc INFO getRegistryEntries: read 512 CLIDRegistry entries for module ALL
+xAODMaker::Even... INFO Beam conditions service not available
+xAODMaker::Even... INFO Will not fill beam spot information into xAOD::EventInfo
+LArConditionsTe... DEBUG Property update for OutputLevel : new value = 2
LArConditionsTe... DEBUG TestCondObjs flag = 'TestCondObjs':True
LArConditionsTe... DEBUG ReadCondObjs flag = 'ReadCondObjs':False
LArConditionsTe... DEBUG WriteCondObjs flag = 'WriteCondObjs':True
@@ -111,6 +248,9 @@ LArOnlineIDDetD... INFO in createObj: creating a LArOnlineID helper object in
LArOnlineID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
LArConditionsTe... DEBUG initialize done
+LArConditionsTe... DEBUG input handles: 0
+LArConditionsTe... DEBUG output handles: 0
+LArConditionsTe... DEBUG Data Deps for LArConditionsTestAlg
ToolSvc.OutputC... INFO Initializing ToolSvc.OutputConditionsAlgTool
EventSelector INFO Enter McEventSelector Initialization
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
@@ -118,10 +258,27 @@ ApplicationMgr INFO Application Manager Initialized successfully
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/LAR/Identifier/CalibIdMap'
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/LAR/Identifier/FebRodMap'
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/LAR/Identifier/OnOffIdMap'
+CondInputLoader INFO created CondCont<CaloRec::CaloCellPositionShift> with key 'ConditionStore+LArCellPositionShift'
+CondInputLoader INFO created CondCont<DetCondKeyTrans> with key 'ConditionStore+/LAR/Align'
ApplicationMgr INFO Application Manager Started successfully
AthenaEventLoopMgr INFO ===>>> start of run 0 <<<===
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbFolder INFO HVS tag OFLCOND-CSC-00-01-00 resolved to LARAlign_CSC_01 for folder /LAR/Align
+IOVDbFolder INFO HVS tag OFLCOND-CSC-00-01-00 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
+IOVDbFolder INFO HVS tag OFLCOND-CSC-00-01-00 resolved to LARIdentifierLArTTCellMapAtlas-HadFcalFix for folder /LAR/Identifier/LArTTCellMapAtlas
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] E01BD448-BF95-DB11-983E-0015C5098AA3
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/oflcond/oflcond.000002.conditions.simul.pool.v0000/oflcond.000002.conditions.simul.pool.v0000._0058.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/oflcond/oflcond.000002.conditions.simul.pool.v0000/oflcond.000002.conditions.simul.pool.v0000._0058.pool.root File version:51304
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
+ClassIDSvc INFO getRegistryEntries: read 206 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -138,12 +295,30 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
AthenaEventLoopMgr INFO ===>>> start processing event #0, run #0 0 events processed so far <<<===
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+LArAlignCondAlg INFO recorded new GeoAlignmentStore object for LAr with key LArAlignmentStore and range {[0,l:0] - [INVALID]}
LArOnOffMappingAlg INFO Done reading online/offline identifier mapping
LArOnOffMappingAlg INFO Found 195072 online identifier and 182468 offline identifier. 12604 disconnected channels.
LArOnOffMappingAlg INFO recorded new LArOnOffIdMap with range {[0,l:0] - [INVALID]} into Conditions Store
@@ -6729,7 +6904,21 @@ LArConditionsTe... DEBUG Total number of conditions objects 25088
LArConditionsTe... DEBUG Total number of correction objects 20
LArConditionsTe... DEBUG End of testCondObjects
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #0 1 events processed so far <<<===
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] E01BD448-BF95-DB11-983E-0015C5098AA3
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
+CondInputLoader INFO Finalizing CondInputLoader...
+OutputCondition... INFO Finalize: preparing to write conditions objects
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain UPDATE [ROOT_All]
+Domain[ROOT_All] INFO -> Access DbDatabase CREATE [ROOT_All] B909DF67-135F-B04D-9381-0447646F97EF
+Domain[ROOT_All] INFO LarCondTestNoReg.root
+RootDatabase.open INFO LarCondTestNoReg.root File version:62400
+ClassIDSvc INFO getRegistryEntries: read 35 CLIDRegistry entries for module ALL
OutputCondition... INFO Identified a total of 3 objects to write out:
OutputCondition... INFO 0: LArRampMC#/LArCalorimeter/LArTests/LArRampsSingleGroup#/LArCalorimeter/LArTests/LArRampsSingleGroup
OutputCondition... INFO 1: LArRampMC#/LArCalorimeter/LArTests/LArRampsSubDetectorGrouping#/LArCalorimeter/LArTests/LArRampsSubDetectorGrouping
@@ -6745,16 +6934,44 @@ StorageSvc INFO DataHeaderForm_p6 [7BE56CEF-C866-4BEE-9348-A5F34B5F1DA
OutputCondition... INFO Written 3 objects to output stream
OutputCondition... INFO Register objects in IOV database, interval of validity [run,LB] from [0,0] to [2147483647,4294967295]
OutputCondition... INFO Register object LArRampMC#/LArCalorimeter/LArTests/LArRampsSingleGroup in IOV database folder /LArCalorimeter/LArTests/LArRampsSingleGroup without tagging
+ClassIDSvc INFO getRegistryEntries: read 560 CLIDRegistry entries for module ALL
+IOVDbSvc INFO Opening COOL connection for sqlite://;schema=mycool.db;dbname=OFLP200
+IOVDbSvc INFO *** COOL exception caught: The database does not exist
+IOVDbSvc INFO Create a new conditions database: sqlite://;schema=mycool.db;dbname=OFLP200
OutputCondition... INFO Register object LArRampMC#/LArCalorimeter/LArTests/LArRampsSubDetectorGrouping in IOV database folder /LArCalorimeter/LArTests/LArRampsSubDetectorGrouping without tagging
OutputCondition... INFO Register object LArRampMC#/LArCalorimeter/LArTests/LArRampsFeedThroughGrouping in IOV database folder /LArCalorimeter/LArTests/LArRampsFeedThroughGrouping without tagging
OutputCondition... INFO Registered 3 objects in IOV database
IdDictDetDescrCnv INFO in finalize
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 7/2 objs/chan/bytes 7/1/1176 (( 0.15 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/CalibIdMap (AttrList) db-read 7/1 objs/chan/bytes 7/1/10641036 (( 0.07 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/FebRodMap (AttrList) db-read 7/1 objs/chan/bytes 7/1/42700 (( 0.24 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/OnOffIdMap (AttrList) db-read 7/1 objs/chan/bytes 7/1/5462044 (( 0.12 ))s
+IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 4/2 objs/chan/bytes 4/1/780 (( 0.03 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 7/0 objs/chan/bytes 7/1/1211 (( 0.04 ))s
IOVDbFolder WARNING Folder /LAR/Identifier/LArTTCellMapAtlas is requested but no data retrieved
+IOVDbSvc INFO bytes in (( 0.64 ))s
+IOVDbSvc INFO Disconnecting from sqlite://;schema=mycool.db;dbname=OFLP200
+IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 1 nFolders: 0 ReadTime: (( 0.00 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 8 nFolders: 6 ReadTime: (( 0.64 ))s
+IOVDbSvc INFO Connection COOLOFL_CALO/OFLP200 : nConnect: 1 nFolders: 3 ReadTime: (( 0.00 ))s
+LarCondTestNoRe... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase CREATE [ROOT_All] B909DF67-135F-B04D-9381-0447646F97EF
+Domain[ROOT_All] INFO > Deaccess DbDomain UPDATE [ROOT_All]
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
+commitOutput INFO Time User : Tot= 0 [us] #= 1
+fRep_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 4
+cRepR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.0392(+- 0.625)/ 0/ 10 [ms] #=255
+cRep_ALL INFO Time User : Tot= 130 [ms] Ave/Min/Max= 32.5(+- 44.9)/ 0/ 110 [ms] #= 4
+cObjR_ALL INFO Time User : Tot= 170 [ms] Ave/Min/Max= 42.5(+- 62.6)/ 0/ 150 [ms] #= 4
+cObj_ALL INFO Time User : Tot= 200 [ms] Ave/Min/Max= 28.6(+- 58.7)/ 0/ 170 [ms] #= 7
+ChronoStatSvc INFO Time User : Tot= 4.36 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.ref b/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.ref
index 1683e4919d6b..3db7669248fb 100644
--- a/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.ref
+++ b/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.ref
@@ -1,16 +1,16 @@
-Tue Oct 6 19:52:23 CEST 2020
+Sat Aug 21 21:47:00 CEST 2021
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
+Py:Athena INFO using release [WorkDir-22.0.42] [x86_64-centos7-gcc8-opt] [master-calo-ctests/ec2fa09c9e3] -- built on [2021-08-21T2138]
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 "TileRecUtils/TileCellBuilderFromHit_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5069 configurables from 8 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.19
+EventInfoMgtInit: Got release version Athena-22.0.42
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
@@ -27,25 +27,24 @@ Py:TileInfoConf. INFO Setting 10-bit Tile ADC
Py:Athena INFO including file "AthenaCommon/runbatch.py"
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
- running on aibuild028.cern.ch on Tue Oct 6 19:52:34 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v36r0)
+ running on aibuild028.cern.ch on Sat Aug 21 21:47:13 2021
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 6906 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6689 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc
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-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
-PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
+PoolSvc INFO Unable find catalog apcfile:poolcond/PoolCat_oflcond.xml in $ATLAS_POOLCOND_PATH and $DATAPATH
PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
DbSession INFO Open DbSession
@@ -57,7 +56,9 @@ IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
IOVDbSvc INFO Initialised with 3 connections and 14 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
-ClassIDSvc INFO getRegistryEntries: read 1629 CLIDRegistry entries for module ALL
+IOVDbSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+TagInfoMgr INFO AlgTool: TagInfoMgr.IOVDbMetaDataTool
+ClassIDSvc INFO getRegistryEntries: read 1513 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
@@ -78,8 +79,8 @@ IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 26 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 23 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -93,6 +94,7 @@ DetDescrCnvSvc INFO filling address for AtlasID with CLID 164875623 and s
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 HGTD_ID with CLID 79264207 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
@@ -119,6 +121,8 @@ DetDescrCnvSvc INFO filling address for CaloCell_ID with CLID 123500438 a
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
+DetDescrCnvSvc INFO filling address for JTower_ID with CLID 218674799 and storage type 68 to detector store
+DetDescrCnvSvc INFO filling address for GTower_ID with CLID 49678914 and storage type 68 to detector store
GeoModelSvc::RD...WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RD...WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RD...WARNING Getting InDetMatComponents with default tag
@@ -164,7 +168,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 3005 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3295 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -182,11 +186,11 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
-ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloCell_ID helper object in the detector store
CaloIDHelper_ID... INFO in createObj: creating a LArEM_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -194,15 +198,15 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
AtlasDetectorID INFO initialize_from_dictionary - OK
TileDetDescrMan... INFO Entering create_elements()
-ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 71 CLIDRegistry entries for module ALL
TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_ID... INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
@@ -212,9 +216,11 @@ TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr
-ClassIDSvc INFO getRegistryEntries: read 270 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 444 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
+ClassIDSvc INFO getRegistryEntries: read 12 CLIDRegistry entries for module ALL
CondInputLoader INFO Adding base classes:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' ) -> no bases
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' ) ->
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' ) ->
@@ -226,7 +232,9 @@ CondInputLoader INFO Adding base classes:
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' ) ->
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' ) ->
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' ) ->
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' ) ->
CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' )
@@ -238,6 +246,7 @@ CondInputLoader INFO Will create WriteCondHandle dependencies for the follo
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' )
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' )
TileBadChannels... INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OnlBch) for folder: "/TILE/ONL01/STATUS/ADC"
TileBadChannels... INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OflBch) for folder: "/TILE/OFL02/STATUS/ADC"
TileBadChannels... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
@@ -258,18 +267,17 @@ TileSampleNoise... INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.Tile
TileTimingCondA... INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
tilecellbuilder... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
tilecellbuilder... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
-ClassIDSvc INFO getRegistryEntries: read 452 CLIDRegistry entries for module ALL
-xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 271 CLIDRegistry entries for module ALL
-xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
-xAODMaker::Even...WARNING Beam conditions service not available
-xAODMaker::Even...WARNING Will not fill beam spot information into xAOD::EventInfo
+ClassIDSvc INFO getRegistryEntries: read 452 CLIDRegistry entries for module ALL
+xAODMaker::Even... INFO Initializing xAODMaker::EventInfoCnvAlg
+ClassIDSvc INFO getRegistryEntries: read 271 CLIDRegistry entries for module ALL
+xAODMaker::Even... INFO Beam conditions service not available
+xAODMaker::Even... INFO Will not fill beam spot information into xAOD::EventInfo
PyComponentMgr INFO Initializing PyComponentMgr...
testalg1 INFO Initializing testalg1...
-ClassIDSvc INFO getRegistryEntries: read 6722 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 5980 CLIDRegistry entries for module ALL
ToolSvc.tool1 INFO Storing MBTS cells in MBTSContainer
ToolSvc.tool1 INFO Noise Sigma 0 MeV is selected!
-AtRndmGenSvc INFO Initializing AtRndmGenSvc - package version RngComps-00-00-00
+AtRndmGenSvc INFO Initializing AtRndmGenSvc
INITIALISING RANDOM NUMBER STREAMS.
AtRndmGenSvc INFO will be reseeded for every event
AtRndmGenSvc WARNING INITIALISING Tile_DigitsMaker stream with DEFAULT seeds 3591 2309736
@@ -278,7 +286,7 @@ ToolSvc.tool1 INFO min time thr -25 ns
ToolSvc.tool1 INFO taking hits from 'TileHitCnt'
ToolSvc.tool1 INFO Storing E4' cells in E4prContainer
ToolSvc.tool1 INFO TileCellBuilderFromHit initialization completed
-ClassIDSvc INFO getRegistryEntries: read 270 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 270 CLIDRegistry entries for module ALL
ToolSvc.tool2 INFO Storing MBTS cells in MBTSContainer
ToolSvc.tool2 INFO Noise Sigma 0 MeV is selected!
ToolSvc.tool2 INFO max time thr 25 ns
@@ -294,6 +302,7 @@ ToolSvc.tool3 INFO taking hits from 'TileHitCnt'
ToolSvc.tool3 INFO Storing E4' cells in E4prContainer
ToolSvc.tool3 INFO TileCellBuilderFromHit initialization completed
ApplicationMgr INFO Application Manager Initialized successfully
+CondInputLoader INFO created CondCont<CaloRec::CaloCellPositionShift> with key 'ConditionStore+LArCellPositionShift'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN'
@@ -305,21 +314,23 @@ CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'Con
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/STATUS/ADC'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/ONL01/STATUS/ADC'
+CondInputLoader INFO created CondCont<DetCondKeyTrans> with key 'ConditionStore+/LAR/Align'
ApplicationMgr INFO Application Manager Started successfully
AthenaEventLoopMgr INFO ===>>> start of run 1 <<<===
-EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
-EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc INFO getRegistryEntries: read 201 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 207 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -333,12 +344,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -346,6 +357,8 @@ Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8667C6F
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
AthenaEventLoopMgr INFO ===>>> start processing event #1, run #1 0 events processed so far <<<===
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCes-SIM-06 for folder /TILE/OFL02/CALIB/CES
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCisFitLin-COM-00 for folder /TILE/OFL02/CALIB/CIS/FIT/LIN
@@ -358,6 +371,7 @@ IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02Nois
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02StatusAdc-IOVDEP-03 for folder /TILE/OFL02/STATUS/ADC
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02TimeChanneloffsetPhy-000-00 for folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY
IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200
+LArAlignCondAlg INFO recorded new GeoAlignmentStore object for LAr with key LArAlignmentStore and range {[0,l:0] - [177530,l:0]}
TileBadChannels... INFO Updating TileBchStatus::isBad() definition from DB
TileBadChannels... INFO Updating TileBchStatus::isNoisy() definition from DB
TileBadChannels... INFO No TileBchStatus::isNoGainL1() definition found in DB, using defaults
@@ -369,8 +383,8 @@ TileBadChannels... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
TileBadChannels... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
TileBadChannels... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
TileBadChannels... INFO No drawer trips probabilities found in DB
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_ofl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
+tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
+tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_ofl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
tilecellbuilder... INFO No TileBchStatus::isBad() definition found in DB, using defaults
tilecellbuilder... INFO No TileBchStatus::isNoisy() definition found in DB, using defaults
tilecellbuilder... INFO No TileBchStatus::isNoGainL1() definition found in DB, using defaults
@@ -382,7 +396,7 @@ tilecellbuilder... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
tilecellbuilder... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
tilecellbuilder... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
tilecellbuilder... INFO No drawer trips probabilities found in DB
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
+tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_ofl) for ASCII file name: "/build1/tsulaia/athena-devel/build/TileCalorimeter/TileRecUtils/CMakeFiles/unitTestRun/tilecellbuilder_bct2.bch"
tilecellbuilder... INFO No TileBchStatus::isBad() definition found in DB, using defaults
tilecellbuilder... INFO No TileBchStatus::isNoisy() definition found in DB, using defaults
@@ -395,31 +409,30 @@ tilecellbuilder... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
tilecellbuilder... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
tilecellbuilder... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
tilecellbuilder... INFO No drawer trips probabilities found in DB
-ClassIDSvc INFO getRegistryEntries: read 657 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 444 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 49 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 649 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 125 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 49 CLIDRegistry entries for module ALL
AtRndmGenSvc INFO Stream = Tile_DigitsMaker, Seed1 = 288581169, Seed2 = 758068585
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 1 events processed so far <<<===
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
AthenaEventLoopMgr INFO ===>>> start processing event #2, run #1 1 events processed so far <<<===
AtRndmGenSvc INFO Stream = Tile_DigitsMaker, Seed1 = 1959006884, Seed2 = 1693617434
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 2 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #3, run #1 2 events processed so far <<<===
AtRndmGenSvc INFO Stream = Tile_DigitsMaker, Seed1 = 2049887984, Seed2 = 1923128072
AthenaEventLoopMgr INFO ===>>> done processing event #3, run #1 3 events processed so far <<<===
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
-IncidentProcAlg1 INFO Finalize
CondInputLoader INFO Finalizing CondInputLoader...
testalg1 INFO Finalizing testalg1...
-IncidentProcAlg2 INFO Finalize
AtRndmGenSvc INFO FINALISING
PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.04 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/2 objs/chan/bytes 1/1/170 (( 0.03 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.03 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.02 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.02 ))s
@@ -431,11 +444,11 @@ IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read
IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 (( 0.04 ))s
IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.03 ))s
IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.01 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.01 ))s
-IOVDbSvc INFO bytes in (( 0.31 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/2 objs/chan/bytes 2/1/390 (( 0.04 ))s
+IOVDbSvc INFO bytes in (( 0.35 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.05 ))s
-IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.26 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 3 nFolders: 2 ReadTime: (( 0.07 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.28 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
ToolSvc.tool3 INFO Finalizing
@@ -444,9 +457,9 @@ ToolSvc.tool1 INFO Finalizing
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 0.5 [s] Ave/Min/Max= 0.25(+- 0.25)/ 0/ 0.5 [s] #= 2
-cObj_ALL INFO Time User : Tot= 0.56 [s] Ave/Min/Max= 0.0431(+- 0.141)/ 0/ 0.53 [s] #= 13
-ChronoStatSvc INFO Time User : Tot= 38.1 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 130 [ms] Ave/Min/Max= 32.5(+- 56.3)/ 0/ 130 [ms] #= 4
+cObj_ALL INFO Time User : Tot= 180 [ms] Ave/Min/Max= 12(+- 37.6)/ 0/ 150 [ms] #= 15
+ChronoStatSvc INFO Time User : Tot= 45.1 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.ref b/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.ref
index 292cc4559cee..54d6e3def42f 100644
--- a/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.ref
+++ b/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.ref
@@ -1,16 +1,16 @@
-Tue Oct 6 19:51:26 CEST 2020
+Sat Aug 21 21:45:54 CEST 2021
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
+Py:Athena INFO using release [WorkDir-22.0.42] [x86_64-centos7-gcc8-opt] [master-calo-ctests/ec2fa09c9e3] -- built on [2021-08-21T2138]
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 "TileRecUtils/TileCellBuilder_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5069 configurables from 8 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.19
+EventInfoMgtInit: Got release version Athena-22.0.42
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
@@ -27,25 +27,24 @@ Py:TileInfoConf. INFO Setting 10-bit Tile ADC
Py:Athena INFO including file "AthenaCommon/runbatch.py"
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
- running on aibuild028.cern.ch on Tue Oct 6 19:51:38 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v36r0)
+ running on aibuild028.cern.ch on Sat Aug 21 21:46:07 2021
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 6906 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6689 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc
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-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
-PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
+PoolSvc INFO Unable find catalog apcfile:poolcond/PoolCat_oflcond.xml in $ATLAS_POOLCOND_PATH and $DATAPATH
PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
DbSession INFO Open DbSession
@@ -57,7 +56,9 @@ IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
IOVDbSvc INFO Initialised with 3 connections and 14 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
-ClassIDSvc INFO getRegistryEntries: read 1629 CLIDRegistry entries for module ALL
+IOVDbSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+TagInfoMgr INFO AlgTool: TagInfoMgr.IOVDbMetaDataTool
+ClassIDSvc INFO getRegistryEntries: read 1513 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
@@ -78,8 +79,8 @@ IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 26 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 23 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -93,6 +94,7 @@ DetDescrCnvSvc INFO filling address for AtlasID with CLID 164875623 and s
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 HGTD_ID with CLID 79264207 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
@@ -119,6 +121,8 @@ DetDescrCnvSvc INFO filling address for CaloCell_ID with CLID 123500438 a
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
+DetDescrCnvSvc INFO filling address for JTower_ID with CLID 218674799 and storage type 68 to detector store
+DetDescrCnvSvc INFO filling address for GTower_ID with CLID 49678914 and storage type 68 to detector store
GeoModelSvc::RD...WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RD...WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RD...WARNING Getting InDetMatComponents with default tag
@@ -164,7 +168,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 3005 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3295 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -182,11 +186,11 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
-ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloCell_ID helper object in the detector store
CaloIDHelper_ID... INFO in createObj: creating a LArEM_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -194,15 +198,15 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
AtlasDetectorID INFO initialize_from_dictionary - OK
TileDetDescrMan... INFO Entering create_elements()
-ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 71 CLIDRegistry entries for module ALL
TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_ID... INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
@@ -212,9 +216,11 @@ TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr
-ClassIDSvc INFO getRegistryEntries: read 270 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 444 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
+ClassIDSvc INFO getRegistryEntries: read 12 CLIDRegistry entries for module ALL
CondInputLoader INFO Adding base classes:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' ) -> no bases
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' ) ->
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' ) ->
@@ -226,7 +232,9 @@ CondInputLoader INFO Adding base classes:
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' ) ->
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' ) ->
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' ) ->
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' ) ->
CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' )
@@ -238,6 +246,7 @@ CondInputLoader INFO Will create WriteCondHandle dependencies for the follo
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' )
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' )
TileBadChannels... INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OnlBch) for folder: "/TILE/ONL01/STATUS/ADC"
TileBadChannels... INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OflBch) for folder: "/TILE/OFL02/STATUS/ADC"
TileBadChannels... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
@@ -258,17 +267,16 @@ TileSampleNoise... INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.Tile
TileTimingCondA... INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
tilecellbuilder... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
tilecellbuilder... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
-ClassIDSvc INFO getRegistryEntries: read 452 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 5090 CLIDRegistry entries for module ALL
-xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
-xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
-xAODMaker::Even...WARNING Beam conditions service not available
-xAODMaker::Even...WARNING Will not fill beam spot information into xAOD::EventInfo
+ClassIDSvc INFO getRegistryEntries: read 452 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 4963 CLIDRegistry entries for module ALL
+xAODMaker::Even... INFO Initializing xAODMaker::EventInfoCnvAlg
+xAODMaker::Even... INFO Beam conditions service not available
+xAODMaker::Even... INFO Will not fill beam spot information into xAOD::EventInfo
PyComponentMgr INFO Initializing PyComponentMgr...
prepalg1 INFO Initializing prepalg1...
-ClassIDSvc INFO getRegistryEntries: read 108 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 108 CLIDRegistry entries for module ALL
testalg1 INFO Initializing testalg1...
-ClassIDSvc INFO getRegistryEntries: read 1795 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1180 CLIDRegistry entries for module ALL
ToolSvc.tool1 INFO Storing MBTS cells in MBTSContainer
ToolSvc.tool1 INFO none of thresholds set, all RawChannels will be converted to Cells
ToolSvc.tool1 INFO taking RawChannels from 'TileRawChannelCnt'
@@ -322,6 +330,7 @@ ToolSvc.tool11 INFO taking RawChannels from 'TileRawChannelCnt'
ToolSvc.tool11 INFO Storing E4' cells in E4prContainer
ToolSvc.tool11 INFO TileCellBuilder initialization completed
ApplicationMgr INFO Application Manager Initialized successfully
+CondInputLoader INFO created CondCont<CaloRec::CaloCellPositionShift> with key 'ConditionStore+LArCellPositionShift'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN'
@@ -333,21 +342,23 @@ CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'Con
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/STATUS/ADC'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/ONL01/STATUS/ADC'
+CondInputLoader INFO created CondCont<DetCondKeyTrans> with key 'ConditionStore+/LAR/Align'
ApplicationMgr INFO Application Manager Started successfully
AthenaEventLoopMgr INFO ===>>> start of run 1 <<<===
-EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
-EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc INFO getRegistryEntries: read 201 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 207 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -361,12 +372,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -374,6 +385,8 @@ Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8667C6F
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
AthenaEventLoopMgr INFO ===>>> start processing event #1, run #1 0 events processed so far <<<===
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCes-SIM-06 for folder /TILE/OFL02/CALIB/CES
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCisFitLin-COM-00 for folder /TILE/OFL02/CALIB/CIS/FIT/LIN
@@ -386,6 +399,7 @@ IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02Nois
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02StatusAdc-IOVDEP-03 for folder /TILE/OFL02/STATUS/ADC
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02TimeChanneloffsetPhy-000-00 for folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY
IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200
+LArAlignCondAlg INFO recorded new GeoAlignmentStore object for LAr with key LArAlignmentStore and range {[0,l:0] - [177530,l:0]}
TileBadChannels... INFO Updating TileBchStatus::isBad() definition from DB
TileBadChannels... INFO Updating TileBchStatus::isNoisy() definition from DB
TileBadChannels... INFO No TileBchStatus::isNoGainL1() definition found in DB, using defaults
@@ -397,8 +411,8 @@ TileBadChannels... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
TileBadChannels... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
TileBadChannels... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
TileBadChannels... INFO No drawer trips probabilities found in DB
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_ofl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
+tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
+tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_ofl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
tilecellbuilder... INFO No TileBchStatus::isBad() definition found in DB, using defaults
tilecellbuilder... INFO No TileBchStatus::isNoisy() definition found in DB, using defaults
tilecellbuilder... INFO No TileBchStatus::isNoGainL1() definition found in DB, using defaults
@@ -410,7 +424,7 @@ tilecellbuilder... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
tilecellbuilder... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
tilecellbuilder... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
tilecellbuilder... INFO No drawer trips probabilities found in DB
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
+tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_ofl) for ASCII file name: "/build1/tsulaia/athena-devel/build/TileCalorimeter/TileRecUtils/CMakeFiles/unitTestRun/tilecellbuilder_bct2.bch"
tilecellbuilder... INFO No TileBchStatus::isBad() definition found in DB, using defaults
tilecellbuilder... INFO No TileBchStatus::isNoisy() definition found in DB, using defaults
@@ -423,12 +437,17 @@ tilecellbuilder... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
tilecellbuilder... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
tilecellbuilder... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
tilecellbuilder... INFO No drawer trips probabilities found in DB
-ClassIDSvc INFO getRegistryEntries: read 657 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 436 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 49 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 649 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 117 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 49 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 1 events processed so far <<<===
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
AthenaEventLoopMgr INFO ===>>> start processing event #2, run #1 1 events processed so far <<<===
-ClassIDSvc INFO getRegistryEntries: read 96 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 96 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 2 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #3, run #1 2 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> done processing event #3, run #1 3 events processed so far <<<===
@@ -450,36 +469,30 @@ AthenaEventLoopMgr INFO ===>>> start processing event #11, run #1 10 events
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #1 11 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #12, run #1 11 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #1 12 events processed so far <<<===
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
-IncidentProcAlg1 INFO Finalize
CondInputLoader INFO Finalizing CondInputLoader...
prepalg1 INFO Finalizing prepalg1...
testalg1 INFO Finalizing testalg1...
-IncidentProcAlg2 INFO Finalize
PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.04 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.04 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/2 objs/chan/bytes 1/1/170 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.05 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.04 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.04 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.04 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.04 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 (( 0.05 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 (( 0.30 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 (( 0.06 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.05 ))s
IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.01 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.01 ))s
-IOVDbSvc INFO bytes in (( 0.44 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/2 objs/chan/bytes 2/1/390 (( 0.03 ))s
+IOVDbSvc INFO bytes in (( 0.71 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.04 ))s
-IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.39 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 3 nFolders: 2 ReadTime: (( 0.07 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.63 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
ToolSvc.tool11 INFO Finalizing
@@ -494,9 +507,9 @@ ToolSvc.tool1 INFO Finalizing
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 0.51 [s] Ave/Min/Max= 0.255(+- 0.245)/ 0.01/ 0.5 [s] #= 2
-cObj_ALL INFO Time User : Tot= 0.55 [s] Ave/Min/Max= 0.0423(+- 0.138)/ 0/ 0.52 [s] #= 13
-ChronoStatSvc INFO Time User : Tot= 38.9 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 140 [ms] Ave/Min/Max= 35(+- 60.6)/ 0/ 140 [ms] #= 4
+cObj_ALL INFO Time User : Tot= 190 [ms] Ave/Min/Max= 12.7(+- 40.1)/ 0/ 160 [ms] #= 15
+ChronoStatSvc INFO Time User : Tot= 45.3 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileRecUtils/share/TileDQstatusAlg_test.ref b/TileCalorimeter/TileRecUtils/share/TileDQstatusAlg_test.ref
index e2fc277745d2..11e6e99193ad 100644
--- a/TileCalorimeter/TileRecUtils/share/TileDQstatusAlg_test.ref
+++ b/TileCalorimeter/TileRecUtils/share/TileDQstatusAlg_test.ref
@@ -1,16 +1,16 @@
-Tue Oct 6 19:54:13 CEST 2020
+Sat Aug 21 21:49:10 CEST 2021
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
+Py:Athena INFO using release [WorkDir-22.0.42] [x86_64-centos7-gcc8-opt] [master-calo-ctests/ec2fa09c9e3] -- built on [2021-08-21T2138]
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 "TileRecUtils/TileDQstatusAlg_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5069 configurables from 8 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.19
+EventInfoMgtInit: Got release version Athena-22.0.42
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
@@ -27,25 +27,24 @@ Py:TileInfoConf. INFO Setting 10-bit Tile ADC
Py:Athena INFO including file "AthenaCommon/runbatch.py"
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
- running on aibuild028.cern.ch on Tue Oct 6 19:54:24 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v36r0)
+ running on aibuild028.cern.ch on Sat Aug 21 21:49:24 2021
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 6906 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6689 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc
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-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
-PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
+PoolSvc INFO Unable find catalog apcfile:poolcond/PoolCat_oflcond.xml in $ATLAS_POOLCOND_PATH and $DATAPATH
PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
DbSession INFO Open DbSession
@@ -57,7 +56,9 @@ IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
IOVDbSvc INFO Initialised with 3 connections and 14 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
-ClassIDSvc INFO getRegistryEntries: read 1629 CLIDRegistry entries for module ALL
+IOVDbSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+TagInfoMgr INFO AlgTool: TagInfoMgr.IOVDbMetaDataTool
+ClassIDSvc INFO getRegistryEntries: read 1513 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
@@ -78,8 +79,8 @@ IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 26 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 23 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -93,6 +94,7 @@ DetDescrCnvSvc INFO filling address for AtlasID with CLID 164875623 and s
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 HGTD_ID with CLID 79264207 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
@@ -119,6 +121,8 @@ DetDescrCnvSvc INFO filling address for CaloCell_ID with CLID 123500438 a
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
+DetDescrCnvSvc INFO filling address for JTower_ID with CLID 218674799 and storage type 68 to detector store
+DetDescrCnvSvc INFO filling address for GTower_ID with CLID 49678914 and storage type 68 to detector store
GeoModelSvc::RD...WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RD...WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RD...WARNING Getting InDetMatComponents with default tag
@@ -170,7 +174,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 3005 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3295 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -179,7 +183,7 @@ EMECConstruction INFO multi-layered version of absorbers activated, paramete
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstru... INFO Start building EC electronics geometry
-GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24356Kb Time = 0.6S
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24124Kb Time = 0.66S
GeoModelSvc.Til... INFO Entering TileDetectorTool::create()
TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
@@ -190,11 +194,11 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
-ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloCell_ID helper object in the detector store
CaloIDHelper_ID... INFO in createObj: creating a LArEM_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -202,9 +206,9 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -239,8 +243,10 @@ GeoModelSvc.Til... INFO Global positioning of barrel with rotation (0,0,0)) a
GeoModelSvc.Til... INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
GeoModelSvc.Til... INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrMan... INFO Entering create_elements()
-GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3576Kb Time = 0.14S
-ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3528Kb Time = 0.16S
+ClassIDSvc INFO getRegistryEntries: read 71 CLIDRegistry entries for module ALL
+GeoModelSvc INFO AlgTool: GeoModelSvc.LArDetectorToolNV
+GeoModelSvc INFO AlgTool: GeoModelSvc.TileDetectorTool
TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_ID... INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
@@ -250,9 +256,11 @@ TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr
-ClassIDSvc INFO getRegistryEntries: read 270 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 444 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
+ClassIDSvc INFO getRegistryEntries: read 12 CLIDRegistry entries for module ALL
CondInputLoader INFO Adding base classes:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' ) -> no bases
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' ) ->
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' ) ->
@@ -264,7 +272,9 @@ CondInputLoader INFO Adding base classes:
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' ) ->
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' ) ->
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' ) ->
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' ) ->
CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' )
@@ -276,6 +286,7 @@ CondInputLoader INFO Will create WriteCondHandle dependencies for the follo
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' )
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' )
TileBadChannels... INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OnlBch) for folder: "/TILE/ONL01/STATUS/ADC"
TileBadChannels... INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OflBch) for folder: "/TILE/OFL02/STATUS/ADC"
TileBadChannels... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
@@ -294,12 +305,13 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlEms) for folder: "/TILE/OFL02/CALIB/EMS"
TileSampleNoise... INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.TileCondProxyCool_NoiseSample) for folder: "/TILE/OFL02/NOISE/SAMPLE"
TileTimingCondA... INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
-ClassIDSvc INFO getRegistryEntries: read 5090 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 4980 CLIDRegistry entries for module ALL
PyComponentMgr INFO Initializing PyComponentMgr...
record1 INFO Initializing record1...
-ClassIDSvc INFO getRegistryEntries: read 108 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 108 CLIDRegistry entries for module ALL
check1 INFO Initializing check1...
ApplicationMgr INFO Application Manager Initialized successfully
+CondInputLoader INFO created CondCont<CaloRec::CaloCellPositionShift> with key 'ConditionStore+LArCellPositionShift'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN'
@@ -311,21 +323,23 @@ CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'Con
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/STATUS/ADC'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/ONL01/STATUS/ADC'
+CondInputLoader INFO created CondCont<DetCondKeyTrans> with key 'ConditionStore+/LAR/Align'
ApplicationMgr INFO Application Manager Started successfully
AthenaEventLoopMgr INFO ===>>> start of run 1 <<<===
-EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
-EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc INFO getRegistryEntries: read 201 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 207 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -339,12 +353,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -352,6 +366,8 @@ Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8667C6F
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
AthenaEventLoopMgr INFO ===>>> start processing event #1, run #1 0 events processed so far <<<===
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCes-SIM-06 for folder /TILE/OFL02/CALIB/CES
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCisFitLin-COM-00 for folder /TILE/OFL02/CALIB/CIS/FIT/LIN
@@ -364,6 +380,7 @@ IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02Nois
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02StatusAdc-IOVDEP-03 for folder /TILE/OFL02/STATUS/ADC
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02TimeChanneloffsetPhy-000-00 for folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY
IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200
+LArAlignCondAlg INFO recorded new GeoAlignmentStore object for LAr with key LArAlignmentStore and range {[0,l:0] - [177530,l:0]}
TileBadChannels... INFO Updating TileBchStatus::isBad() definition from DB
TileBadChannels... INFO Updating TileBchStatus::isNoisy() definition from DB
TileBadChannels... INFO No TileBchStatus::isNoGainL1() definition found in DB, using defaults
@@ -375,50 +392,49 @@ TileBadChannels... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
TileBadChannels... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
TileBadChannels... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
TileBadChannels... INFO No drawer trips probabilities found in DB
-ClassIDSvc INFO getRegistryEntries: read 657 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 2221 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 3 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 649 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1287 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 1 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #2, run #1 1 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 2 events processed so far <<<===
/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
+AthenaEventLoopMgr INFO ===>>> start processing event #2, run #1 1 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 2 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...
record1 INFO Finalizing record1...
check1 INFO Finalizing check1...
-IncidentProcAlg2 INFO Finalize
PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.24 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/2 objs/chan/bytes 1/1/170 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.06 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.04 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.04 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.03 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.03 ))s
IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 (( 0.25 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 (( 0.04 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.05 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.03 ))s
IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.01 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.01 ))s
-IOVDbSvc INFO bytes in (( 0.81 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/2 objs/chan/bytes 2/1/390 (( 0.04 ))s
+IOVDbSvc INFO bytes in (( 0.65 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.04 ))s
-IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.77 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 3 nFolders: 2 ReadTime: (( 0.07 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.58 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 0.52 [s] Ave/Min/Max= 0.26(+- 0.25)/ 0.01/ 0.51 [s] #= 2
-cObj_ALL INFO Time User : Tot= 0.57 [s] Ave/Min/Max= 0.0438(+- 0.141)/ 0/ 0.53 [s] #= 13
-ChronoStatSvc INFO Time User : Tot= 36.3 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 140 [ms] Ave/Min/Max= 35(+- 55)/ 0/ 130 [ms] #= 4
+cObj_ALL INFO Time User : Tot= 180 [ms] Ave/Min/Max= 12(+- 37.6)/ 0/ 150 [ms] #= 15
+ChronoStatSvc INFO Time User : Tot= 43.2 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileRecUtils/share/TileDQstatusTool_test.ref b/TileCalorimeter/TileRecUtils/share/TileDQstatusTool_test.ref
index d5b11871c58e..8e71f6e82635 100644
--- a/TileCalorimeter/TileRecUtils/share/TileDQstatusTool_test.ref
+++ b/TileCalorimeter/TileRecUtils/share/TileDQstatusTool_test.ref
@@ -1,16 +1,16 @@
-Tue Oct 6 19:55:07 CEST 2020
+Sat Aug 21 21:50:13 CEST 2021
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
+Py:Athena INFO using release [WorkDir-22.0.42] [x86_64-centos7-gcc8-opt] [master-calo-ctests/ec2fa09c9e3] -- built on [2021-08-21T2138]
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 "TileRecUtils/TileDQstatusTool_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5069 configurables from 8 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.19
+EventInfoMgtInit: Got release version Athena-22.0.42
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
@@ -27,25 +27,24 @@ Py:TileInfoConf. INFO Setting 10-bit Tile ADC
Py:Athena INFO including file "AthenaCommon/runbatch.py"
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
- running on aibuild028.cern.ch on Tue Oct 6 19:55:18 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v36r0)
+ running on aibuild028.cern.ch on Sat Aug 21 21:50:28 2021
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 6906 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6689 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc
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-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
-PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
+PoolSvc INFO Unable find catalog apcfile:poolcond/PoolCat_oflcond.xml in $ATLAS_POOLCOND_PATH and $DATAPATH
PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
DbSession INFO Open DbSession
@@ -57,7 +56,9 @@ IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
IOVDbSvc INFO Initialised with 3 connections and 14 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
-ClassIDSvc INFO getRegistryEntries: read 1629 CLIDRegistry entries for module ALL
+IOVDbSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+TagInfoMgr INFO AlgTool: TagInfoMgr.IOVDbMetaDataTool
+ClassIDSvc INFO getRegistryEntries: read 1513 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
@@ -78,8 +79,8 @@ IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 26 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 23 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -93,6 +94,7 @@ DetDescrCnvSvc INFO filling address for AtlasID with CLID 164875623 and s
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 HGTD_ID with CLID 79264207 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
@@ -119,6 +121,8 @@ DetDescrCnvSvc INFO filling address for CaloCell_ID with CLID 123500438 a
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
+DetDescrCnvSvc INFO filling address for JTower_ID with CLID 218674799 and storage type 68 to detector store
+DetDescrCnvSvc INFO filling address for GTower_ID with CLID 49678914 and storage type 68 to detector store
GeoModelSvc::RD...WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RD...WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RD...WARNING Getting InDetMatComponents with default tag
@@ -170,7 +174,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 3005 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3295 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -179,7 +183,7 @@ EMECConstruction INFO multi-layered version of absorbers activated, paramete
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstru... INFO Start building EC electronics geometry
-GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24356Kb Time = 0.56S
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24124Kb Time = 0.61S
GeoModelSvc.Til... INFO Entering TileDetectorTool::create()
TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
@@ -190,11 +194,11 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
-ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloCell_ID helper object in the detector store
CaloIDHelper_ID... INFO in createObj: creating a LArEM_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -202,9 +206,9 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -239,8 +243,10 @@ GeoModelSvc.Til... INFO Global positioning of barrel with rotation (0,0,0)) a
GeoModelSvc.Til... INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
GeoModelSvc.Til... INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrMan... INFO Entering create_elements()
-GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3576Kb Time = 0.15S
-ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3528Kb Time = 0.2S
+ClassIDSvc INFO getRegistryEntries: read 71 CLIDRegistry entries for module ALL
+GeoModelSvc INFO AlgTool: GeoModelSvc.LArDetectorToolNV
+GeoModelSvc INFO AlgTool: GeoModelSvc.TileDetectorTool
TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_ID... INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
@@ -250,9 +256,11 @@ TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr
-ClassIDSvc INFO getRegistryEntries: read 270 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 444 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
+ClassIDSvc INFO getRegistryEntries: read 12 CLIDRegistry entries for module ALL
CondInputLoader INFO Adding base classes:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' ) -> no bases
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' ) ->
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' ) ->
@@ -264,7 +272,9 @@ CondInputLoader INFO Adding base classes:
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' ) ->
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' ) ->
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' ) ->
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' ) ->
CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' )
@@ -276,6 +286,7 @@ CondInputLoader INFO Will create WriteCondHandle dependencies for the follo
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' )
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' )
TileBadChannels... INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OnlBch) for folder: "/TILE/ONL01/STATUS/ADC"
TileBadChannels... INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OflBch) for folder: "/TILE/OFL02/STATUS/ADC"
TileBadChannels... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
@@ -296,9 +307,10 @@ TileSampleNoise... INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.Tile
TileTimingCondA... INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
PyComponentMgr INFO Initializing PyComponentMgr...
test1 INFO Initializing test1...
-ClassIDSvc INFO getRegistryEntries: read 7355 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 8169 CLIDRegistry entries for module ALL
ApplicationMgr INFO Application Manager Initialized successfully
-ClassIDSvc INFO getRegistryEntries: read 270 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 270 CLIDRegistry entries for module ALL
+CondInputLoader INFO created CondCont<CaloRec::CaloCellPositionShift> with key 'ConditionStore+LArCellPositionShift'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN'
@@ -310,21 +322,23 @@ CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'Con
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/STATUS/ADC'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/ONL01/STATUS/ADC'
+CondInputLoader INFO created CondCont<DetCondKeyTrans> with key 'ConditionStore+/LAR/Align'
ApplicationMgr INFO Application Manager Started successfully
AthenaEventLoopMgr INFO ===>>> start of run 1 <<<===
-EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
-EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc INFO getRegistryEntries: read 201 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 207 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -338,12 +352,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -351,6 +365,8 @@ Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8667C6F
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
AthenaEventLoopMgr INFO ===>>> start processing event #1, run #1 0 events processed so far <<<===
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCes-SIM-06 for folder /TILE/OFL02/CALIB/CES
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCisFitLin-COM-00 for folder /TILE/OFL02/CALIB/CIS/FIT/LIN
@@ -363,6 +379,7 @@ IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02Nois
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02StatusAdc-IOVDEP-03 for folder /TILE/OFL02/STATUS/ADC
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02TimeChanneloffsetPhy-000-00 for folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY
IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200
+LArAlignCondAlg INFO recorded new GeoAlignmentStore object for LAr with key LArAlignmentStore and range {[0,l:0] - [177530,l:0]}
TileBadChannels... INFO Updating TileBchStatus::isBad() definition from DB
TileBadChannels... INFO Updating TileBchStatus::isNoisy() definition from DB
TileBadChannels... INFO No TileBchStatus::isNoGainL1() definition found in DB, using defaults
@@ -375,8 +392,8 @@ TileBadChannels... INFO TileBchStatus::isBadTiming() is defined by: Bad timing
TileBadChannels... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
TileBadChannels... INFO No drawer trips probabilities found in DB
*** Starting test1
-ClassIDSvc INFO getRegistryEntries: read 657 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 155 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 649 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 106 CLIDRegistry entries for module ALL
*** Starting test2
*** Starting test3
*** Starting test4
@@ -391,38 +408,37 @@ Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] EACFEBD
/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
-IncidentProcAlg1 INFO Finalize
CondInputLoader INFO Finalizing CondInputLoader...
test1 INFO Finalizing test1...
-IncidentProcAlg2 INFO Finalize
PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.02 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.02 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.02 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.02 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.02 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.02 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 (( 0.03 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/2 objs/chan/bytes 1/1/170 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.23 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 (( 0.45 ))s
IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.04 ))s
IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.01 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.01 ))s
-IOVDbSvc INFO bytes in (( 0.27 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/2 objs/chan/bytes 2/1/390 (( 0.03 ))s
+IOVDbSvc INFO bytes in (( 1.01 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.04 ))s
-IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.23 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 3 nFolders: 2 ReadTime: (( 0.07 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.94 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 0.52 [s] Ave/Min/Max= 0.26(+- 0.25)/ 0.01/ 0.51 [s] #= 2
-cObj_ALL INFO Time User : Tot= 0.57 [s] Ave/Min/Max= 0.0438(+- 0.141)/ 0/ 0.53 [s] #= 13
-ChronoStatSvc INFO Time User : Tot= 39.5 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 150 [ms] Ave/Min/Max= 37.5(+- 59.3)/ 0/ 140 [ms] #= 4
+cObj_ALL INFO Time User : Tot= 190 [ms] Ave/Min/Max= 12.7(+- 40.1)/ 0/ 160 [ms] #= 15
+ChronoStatSvc INFO Time User : Tot= 46.2 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.ref b/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.ref
index 8e8626067143..9de13cb7255c 100644
--- a/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.ref
+++ b/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.ref
@@ -1,16 +1,16 @@
-Tue Oct 6 19:53:18 CEST 2020
+Sat Aug 21 21:48:04 CEST 2021
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
+Py:Athena INFO using release [WorkDir-22.0.42] [x86_64-centos7-gcc8-opt] [master-calo-ctests/ec2fa09c9e3] -- built on [2021-08-21T2138]
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 "TileRecUtils/TileRawChannelBuilder_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5069 configurables from 8 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.19
+EventInfoMgtInit: Got release version Athena-22.0.42
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
@@ -27,25 +27,24 @@ Py:TileInfoConf. INFO Setting 10-bit Tile ADC
Py:Athena INFO including file "AthenaCommon/runbatch.py"
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
- running on aibuild028.cern.ch on Tue Oct 6 19:53:29 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v36r0)
+ running on aibuild028.cern.ch on Sat Aug 21 21:48:19 2021
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 6906 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6689 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc
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-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
-PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
+PoolSvc INFO Unable find catalog apcfile:poolcond/PoolCat_oflcond.xml in $ATLAS_POOLCOND_PATH and $DATAPATH
PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
DbSession INFO Open DbSession
@@ -57,7 +56,9 @@ IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
IOVDbSvc INFO Initialised with 3 connections and 14 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
-ClassIDSvc INFO getRegistryEntries: read 1629 CLIDRegistry entries for module ALL
+IOVDbSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+TagInfoMgr INFO AlgTool: TagInfoMgr.IOVDbMetaDataTool
+ClassIDSvc INFO getRegistryEntries: read 1513 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
@@ -78,8 +79,8 @@ IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 26 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 23 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -93,6 +94,7 @@ DetDescrCnvSvc INFO filling address for AtlasID with CLID 164875623 and s
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 HGTD_ID with CLID 79264207 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
@@ -119,6 +121,8 @@ DetDescrCnvSvc INFO filling address for CaloCell_ID with CLID 123500438 a
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
+DetDescrCnvSvc INFO filling address for JTower_ID with CLID 218674799 and storage type 68 to detector store
+DetDescrCnvSvc INFO filling address for GTower_ID with CLID 49678914 and storage type 68 to detector store
GeoModelSvc::RD...WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RD...WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RD...WARNING Getting InDetMatComponents with default tag
@@ -170,7 +174,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 3005 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3295 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -179,7 +183,7 @@ EMECConstruction INFO multi-layered version of absorbers activated, paramete
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstru... INFO Start building EC electronics geometry
-GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24356Kb Time = 0.55S
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24124Kb Time = 0.55S
GeoModelSvc.Til... INFO Entering TileDetectorTool::create()
TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
@@ -190,11 +194,11 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
-ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloCell_ID helper object in the detector store
CaloIDHelper_ID... INFO in createObj: creating a LArEM_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -202,9 +206,9 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -239,8 +243,10 @@ GeoModelSvc.Til... INFO Global positioning of barrel with rotation (0,0,0)) a
GeoModelSvc.Til... INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
GeoModelSvc.Til... INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrMan... INFO Entering create_elements()
-GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 4600Kb Time = 0.16S
-ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 4552Kb Time = 0.19S
+ClassIDSvc INFO getRegistryEntries: read 71 CLIDRegistry entries for module ALL
+GeoModelSvc INFO AlgTool: GeoModelSvc.LArDetectorToolNV
+GeoModelSvc INFO AlgTool: GeoModelSvc.TileDetectorTool
TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_ID... INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
@@ -250,9 +256,11 @@ TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr
-ClassIDSvc INFO getRegistryEntries: read 270 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 444 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
+ClassIDSvc INFO getRegistryEntries: read 12 CLIDRegistry entries for module ALL
CondInputLoader INFO Adding base classes:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' ) -> no bases
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' ) ->
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' ) ->
@@ -264,7 +272,9 @@ CondInputLoader INFO Adding base classes:
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' ) ->
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' ) ->
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' ) ->
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' ) ->
CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' )
@@ -276,6 +286,7 @@ CondInputLoader INFO Will create WriteCondHandle dependencies for the follo
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' )
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' )
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' )
TileBadChannels... INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OnlBch) for folder: "/TILE/ONL01/STATUS/ADC"
TileBadChannels... INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OflBch) for folder: "/TILE/OFL02/STATUS/ADC"
TileBadChannels... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
@@ -294,21 +305,21 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlEms) for folder: "/TILE/OFL02/CALIB/EMS"
TileSampleNoise... INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.TileCondProxyCool_NoiseSample) for folder: "/TILE/OFL02/NOISE/SAMPLE"
TileTimingCondA... INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
-ClassIDSvc INFO getRegistryEntries: read 452 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 5090 CLIDRegistry entries for module ALL
-xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
-xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
-xAODMaker::Even...WARNING Beam conditions service not available
-xAODMaker::Even...WARNING Will not fill beam spot information into xAOD::EventInfo
+ClassIDSvc INFO getRegistryEntries: read 452 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 4963 CLIDRegistry entries for module ALL
+xAODMaker::Even... INFO Initializing xAODMaker::EventInfoCnvAlg
+xAODMaker::Even... INFO Beam conditions service not available
+xAODMaker::Even... INFO Will not fill beam spot information into xAOD::EventInfo
PyComponentMgr INFO Initializing PyComponentMgr...
prepalg1 INFO Initializing prepalg1...
-ClassIDSvc INFO getRegistryEntries: read 108 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 108 CLIDRegistry entries for module ALL
testalg1 INFO Initializing testalg1...
-ClassIDSvc INFO getRegistryEntries: read 2182 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3106 CLIDRegistry entries for module ALL
ToolSvc.tool1 INFO TileRawChannelBuilder::initialize()
ToolSvc.tool2 INFO TileRawChannelBuilder::initialize()
ToolSvc.tool2.n... INFO Initializing...
ApplicationMgr INFO Application Manager Initialized successfully
+CondInputLoader INFO created CondCont<CaloRec::CaloCellPositionShift> with key 'ConditionStore+LArCellPositionShift'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN'
@@ -320,21 +331,23 @@ CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'Con
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/STATUS/ADC'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/ONL01/STATUS/ADC'
+CondInputLoader INFO created CondCont<DetCondKeyTrans> with key 'ConditionStore+/LAR/Align'
ApplicationMgr INFO Application Manager Started successfully
AthenaEventLoopMgr INFO ===>>> start of run 1 <<<===
-EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
-EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc INFO getRegistryEntries: read 201 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 207 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -348,12 +361,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -361,6 +374,8 @@ Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8667C6F
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
AthenaEventLoopMgr INFO ===>>> start processing event #1, run #1 0 events processed so far <<<===
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCes-SIM-06 for folder /TILE/OFL02/CALIB/CES
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCisFitLin-COM-00 for folder /TILE/OFL02/CALIB/CIS/FIT/LIN
@@ -373,6 +388,7 @@ IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02Nois
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02StatusAdc-IOVDEP-03 for folder /TILE/OFL02/STATUS/ADC
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02TimeChanneloffsetPhy-000-00 for folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY
IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200
+LArAlignCondAlg INFO recorded new GeoAlignmentStore object for LAr with key LArAlignmentStore and range {[0,l:0] - [177530,l:0]}
TileBadChannels... INFO Updating TileBchStatus::isBad() definition from DB
TileBadChannels... INFO Updating TileBchStatus::isNoisy() definition from DB
TileBadChannels... INFO No TileBchStatus::isNoGainL1() definition found in DB, using defaults
@@ -384,45 +400,44 @@ TileBadChannels... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
TileBadChannels... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
TileBadChannels... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
TileBadChannels... INFO No drawer trips probabilities found in DB
-ClassIDSvc INFO getRegistryEntries: read 657 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 133 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 649 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 84 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 1 events processed so far <<<===
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
AthenaEventLoopMgr INFO ===>>> start processing event #2, run #1 1 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 2 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #3, run #1 2 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> done processing event #3, run #1 3 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #4, run #1 3 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> done processing event #4, run #1 4 events processed so far <<<===
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
-IncidentProcAlg1 INFO Finalize
CondInputLoader INFO Finalizing CondInputLoader...
prepalg1 INFO Finalizing prepalg1...
testalg1 INFO Finalizing testalg1...
-IncidentProcAlg2 INFO Finalize
PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.03 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/2 objs/chan/bytes 1/1/170 (( 0.51 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.06 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.04 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.05 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 (( 0.25 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 (( 0.04 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.01 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.01 ))s
-IOVDbSvc INFO bytes in (( 0.61 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 (( 0.05 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.00 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/2 objs/chan/bytes 2/1/390 (( 0.04 ))s
+IOVDbSvc INFO bytes in (( 0.96 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.04 ))s
-IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.57 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 3 nFolders: 2 ReadTime: (( 0.55 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.40 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
ToolSvc.tool2 INFO Finalizing
@@ -430,9 +445,9 @@ ToolSvc.tool1 INFO Finalizing
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 0.52 [s] Ave/Min/Max= 0.26(+- 0.26)/ 0/ 0.52 [s] #= 2
-cObj_ALL INFO Time User : Tot= 0.57 [s] Ave/Min/Max= 0.0438(+- 0.143)/ 0/ 0.54 [s] #= 13
-ChronoStatSvc INFO Time User : Tot= 37.6 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 160 [ms] Ave/Min/Max= 40(+- 63.6)/ 0/ 150 [ms] #= 4
+cObj_ALL INFO Time User : Tot= 200 [ms] Ave/Min/Max= 13.3(+- 42.5)/ 0/ 170 [ms] #= 15
+ChronoStatSvc INFO Time User : Tot= 43.7 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileBeamElemContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileBeamElemContByteStreamCnv_test.ref
index fa0edcce61a2..603063ff6d23 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileBeamElemContByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileBeamElemContByteStreamCnv_test.ref
@@ -1,6 +1,20 @@
+Sat Aug 21 21:54:51 CEST 2021
+Preloading tcmalloc_minimal.so
+Py:Athena INFO including file "AthenaCommon/Preparation.py"
+Py:Athena INFO using release [WorkDir-22.0.42] [x86_64-centos7-gcc8-opt] [master-calo-ctests/ec2fa09c9e3] -- built on [2021-08-21T2138]
+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 "TileByteStream/TileBeamElemContByteStreamCnv_test.py"
+Py:Athena INFO SetGeometryVersion.py obtained major release version 22
+Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
+Py:ConfigurableDb INFO Read module info for 5069 configurables from 8 genConfDb files
+Py:ConfigurableDb INFO No duplicates have been found: that's good !
+EventInfoMgtInit: Got release version Athena-22.0.42
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
+Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
+Py:TileConditions_jobOptions.py INFO Forcing RUN2 (2014-2017) cabling for run 204073 with geometry ATLAS-R2-2016-01-00-01
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo for 7 samples
Py:TileConditions_jobOptions.py INFO setting up COOL for TileCal conditions data
Py:TileInfoConf. INFO Changing default TileBadChanTool configuration to COOL source
@@ -10,16 +24,111 @@ Py:TileInfoConf. INFO Changing default TileCondToolTiming configuration to C
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise for Opt.Filter without iterations
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
+Py:Athena INFO including file "AthenaCommon/runbatch.py"
+ApplicationMgr SUCCESS
+====================================================================================================================================
+ Welcome to ApplicationMgr (GaudiCoreSvc v36r0)
+ running on aibuild028.cern.ch on Sat Aug 21 21:55:05 2021
+====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
+ClassIDSvc INFO getRegistryEntries: read 6689 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
+MetaDataSvc INFO Initializing MetaDataSvc
+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/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+PoolSvc INFO Successfully setup replica sorting algorithm
+PoolSvc INFO Setting up APR FileCatalog and Streams
+PoolSvc INFO Unable find catalog apcfile:poolcond/PoolCat_oflcond.xml in $ATLAS_POOLCOND_PATH and $DATAPATH
+PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
+PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+ToolSvc.ByteStr... INFO Initializing
+MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool','ByteStreamMetadataTool'])
+MetaDataSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+MetaDataSvc INFO AlgTool: ToolSvc.ByteStreamMetadataTool
+IOVDbSvc INFO Only 5 POOL conditions files will be open at once
+IOVDbSvc INFO Cache alignment will be done in 3 slices
+IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
+IOVDbSvc INFO Initialised with 3 connections and 14 folders
+IOVDbSvc INFO Service IOVDbSvc initialised successfully
+IOVDbSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+ByteStreamAddre... INFO Initializing
ByteStreamAddre... INFO -- Will fill Store with id = 0
+TagInfoMgr INFO AlgTool: TagInfoMgr.IOVDbMetaDataTool
+ClassIDSvc INFO getRegistryEntries: read 2810 CLIDRegistry entries for module ALL
+IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+ClassIDSvc INFO getRegistryEntries: read 273 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_TILE/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200
+IOVDbSvc INFO Added taginfo remove for /LAR/Align
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CES
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/LIN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/NLN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/EMS
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/FIBER
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/LIN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/NLN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/NOISE/SAMPLE
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
+IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
+IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
+ClassIDSvc INFO getRegistryEntries: read 1844 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 23 CLIDRegistry entries for module ALL
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 HGTD_ID with CLID 79264207 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
+DetDescrCnvSvc INFO filling address for JTower_ID with CLID 218674799 and storage type 68 to detector store
+DetDescrCnvSvc INFO filling address for GTower_ID with CLID 49678914 and storage type 68 to detector store
GeoModelSvc::RD...WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RD...WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RD...WARNING Getting InDetMatComponents with default tag
@@ -59,15 +168,19 @@ LArHVLineID INFO setDictVersion of LArHighVoltage is OK
LArHVLineID INFO [initLevelsFromDict] m_dict OK ...
LArHVLineID INFO [initialize_from_dictionary] > HV line range -> 11/1/48:79/0:15 | 11/1/148:179/0:15 | 11/1/80:93/0:7 | 11/1/180:193/0:7 | 11/1/200:231/0:15 | 11/1/232:263/0:15 | 11/1/296,297,306,307/0:15 | 11/1/299,304,305,308,309/0:15 | 11/1/264:279/0:15 | 11/1/280:295/0:15 | 11/1/0:47/0:15 | 11/1/320:322/0:15 | 11/1/100:147/0:15 | 11/1/324,325/0:15 | 11/1/312:315/0:15 | 11/1/316:319/0:15 | 11/1/300:303/0:15 | 11/1/310,311/0:15 | 11/1/323/0:15 | 11/1/326,327/0:15 | 11/1/94:99/0:15 | 11/1/194:199/0:15
LArHVLineID INFO [init_hashes()] > Hvline_size= 5008
+GeoModelSvc.LAr... INFO Keys for LAr are ATLAS-R2-2016-01-00-01 ATLAS
+GeoModelSvc.LAr... INFO Building LAr version LAr-Revised-17-01 while ATLAS version is ATLAS-R2-2016-01-00-01
GeoModelSvc.LAr... INFO LAr Geometry Options:
GeoModelSvc.LAr... INFO Sagging = false
GeoModelSvc.LAr... INFO Barrel = ON
GeoModelSvc.LAr... INFO Endcap = ON
+BarrelConstruction INFO Getting primary numbers for ATLAS, ATLAS-R2-2016-01-00-01
BarrelConstruction INFO Makes detailed absorber sandwich ? 1 1
BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
+ClassIDSvc INFO getRegistryEntries: read 3249 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -76,6 +189,9 @@ EMECConstruction INFO multi-layered version of absorbers activated, paramete
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstru... INFO Start building EC electronics geometry
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 25148Kb Time = 0.68S
+GeoModelSvc.Til... INFO Entering TileDetectorTool::create()
+TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
TileDddbManager INFO n_timod = 320
TileDddbManager INFO n_cuts = 9
@@ -84,9 +200,11 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloCell_ID helper object in the detector store
CaloIDHelper_ID... INFO in createObj: creating a LArEM_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -94,6 +212,9 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -128,13 +249,50 @@ GeoModelSvc.Til... INFO Global positioning of barrel with rotation (0,0,0)) a
GeoModelSvc.Til... INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
GeoModelSvc.Til... INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrMan... INFO Entering create_elements()
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3528Kb Time = 0.2S
+ClassIDSvc INFO getRegistryEntries: read 71 CLIDRegistry entries for module ALL
+GeoModelSvc INFO AlgTool: GeoModelSvc.LArDetectorToolNV
+GeoModelSvc INFO AlgTool: GeoModelSvc.TileDetectorTool
+TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
+TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_ID... INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
CaloLVL1_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-R2-2016-01-00-01
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
+AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr
+ClassIDSvc INFO getRegistryEntries: read 444 CLIDRegistry entries for module ALL
+CondInputLoader INFO Initializing CondInputLoader...
+ClassIDSvc INFO getRegistryEntries: read 12 CLIDRegistry entries for module ALL
CondInputLoader INFO Adding base classes:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' ) -> no bases
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' ) ->
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' ) ->
CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' )
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' )
TileBadChannels... INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OnlBch) for folder: "/TILE/ONL01/STATUS/ADC"
TileBadChannels... INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OflBch) for folder: "/TILE/OFL02/STATUS/ADC"
TileBadChannels... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
@@ -153,22 +311,52 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlEms) for folder: "/TILE/OFL02/CALIB/EMS"
TileSampleNoise... INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.TileCondProxyCool_NoiseSample) for folder: "/TILE/OFL02/NOISE/SAMPLE"
TileTimingCondA... INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
+ClassIDSvc INFO getRegistryEntries: read 4121 CLIDRegistry entries for module ALL
+PyComponentMgr INFO Initializing PyComponentMgr...
+Finalizer INFO Initializing Finalizer...
+ByteStreamInputSvc INFO Initializing
+ROBDataProviderSvc INFO Initializing
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
EventSelector INFO reinitialization...
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
+ClassIDSvc INFO getRegistryEntries: read 379 CLIDRegistry entries for module ALL
+ByteStreamInputSvc INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data12_8TeV.00204073.physics_JetTauEtmiss.merge.RAW._lb0144._SFO-5._0001.1
+CondInputLoader INFO created CondCont<CaloRec::CaloCellPositionShift> with key 'ConditionStore+LArCellPositionShift'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/EMS'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/STATUS/ADC'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/ONL01/STATUS/ADC'
+CondInputLoader INFO created CondCont<DetCondKeyTrans> with key 'ConditionStore+/LAR/Align'
ApplicationMgr INFO Application Manager Started successfully
+EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistenc... INFO Added successfully Conversion service:ByteStreamCnvSvc
EventInfoByteSt... INFO IsSimulation : 0
EventInfoByteSt... INFO IsTestbeam : 0
EventInfoByteSt... INFO IsCalibration : 0
AthenaEventLoopMgr INFO ===>>> start of run 204073 <<<===
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
+ClassIDSvc INFO getRegistryEntries: read 207 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -182,10 +370,22 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
+CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
+AthenaEventLoopMgr INFO ===>>> start processing event #1129572, run #204073 0 events processed so far <<<===
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCes-SIM-06 for folder /TILE/OFL02/CALIB/CES
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCisFitLin-COM-00 for folder /TILE/OFL02/CALIB/CIS/FIT/LIN
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCisFitNln-COM-00 for folder /TILE/OFL02/CALIB/CIS/FIT/NLN
@@ -196,6 +396,8 @@ IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02Cali
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02NoiseSample-TwoGauss-19 for folder /TILE/OFL02/NOISE/SAMPLE
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02StatusAdc-IOVDEP-03 for folder /TILE/OFL02/STATUS/ADC
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02TimeChanneloffsetPhy-000-00 for folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY
+IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200
+LArAlignCondAlg INFO recorded new GeoAlignmentStore object for LAr with key LArAlignmentStore and range {[177530,l:0] - [INVALID]}
TileBadChannels... INFO Updating TileBchStatus::isBad() definition from DB
TileBadChannels... INFO Updating TileBchStatus::isNoisy() definition from DB
TileBadChannels... INFO No TileBchStatus::isNoGainL1() definition found in DB, using defaults
@@ -207,25 +409,271 @@ TileBadChannels... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
TileBadChannels... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
TileBadChannels... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
TileBadChannels... INFO No drawer trips probabilities found in DB
+ClassIDSvc INFO getRegistryEntries: read 2258 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 92 CLIDRegistry entries for module ALL
+ToolSvc.TileROD... INFO TileL2Builder initialization completed
+AthenaEventLoopMgr INFO ===>>> done processing event #1129572, run #204073 1 events processed so far <<<===
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
+AthenaEventLoopMgr INFO ===>>> start processing event #1129665, run #204073 1 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1129665, run #204073 2 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1131212, run #204073 2 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1131212, run #204073 3 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1131086, run #204073 3 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1131086, run #204073 4 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1130272, run #204073 4 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1130272, run #204073 5 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1131269, run #204073 5 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1131269, run #204073 6 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1130716, run #204073 6 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1130716, run #204073 7 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1132019, run #204073 7 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1132019, run #204073 8 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1132092, run #204073 8 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1132092, run #204073 9 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1130238, run #204073 9 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1130238, run #204073 10 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1134553, run #204073 10 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1134553, run #204073 11 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1130999, run #204073 11 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1130999, run #204073 12 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1133461, run #204073 12 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1133461, run #204073 13 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1131152, run #204073 13 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1131152, run #204073 14 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1130142, run #204073 14 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1130142, run #204073 15 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1132770, run #204073 15 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1132770, run #204073 16 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1132365, run #204073 16 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1132365, run #204073 17 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1136791, run #204073 17 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1136791, run #204073 18 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1133781, run #204073 18 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1133781, run #204073 19 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1132067, run #204073 19 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1132067, run #204073 20 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1138637, run #204073 20 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1138637, run #204073 21 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139495, run #204073 21 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139495, run #204073 22 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1140193, run #204073 22 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1140193, run #204073 23 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142953, run #204073 23 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142953, run #204073 24 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139127, run #204073 24 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139127, run #204073 25 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1141272, run #204073 25 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1141272, run #204073 26 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1137117, run #204073 26 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1137117, run #204073 27 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139599, run #204073 27 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139599, run #204073 28 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1140314, run #204073 28 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1140314, run #204073 29 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1133685, run #204073 29 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1133685, run #204073 30 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143279, run #204073 30 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143279, run #204073 31 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1137563, run #204073 31 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1137563, run #204073 32 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139927, run #204073 32 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139927, run #204073 33 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1141197, run #204073 33 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1141197, run #204073 34 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1140039, run #204073 34 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1140039, run #204073 35 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142531, run #204073 35 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142531, run #204073 36 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139475, run #204073 36 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139475, run #204073 37 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139958, run #204073 37 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139958, run #204073 38 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143765, run #204073 38 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143765, run #204073 39 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143097, run #204073 39 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143097, run #204073 40 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1134147, run #204073 40 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1134147, run #204073 41 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1137156, run #204073 41 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1137156, run #204073 42 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1136377, run #204073 42 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1136377, run #204073 43 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1137842, run #204073 43 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1137842, run #204073 44 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1141705, run #204073 44 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1141705, run #204073 45 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143410, run #204073 45 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143410, run #204073 46 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1144170, run #204073 46 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1144170, run #204073 47 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1145987, run #204073 47 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1145987, run #204073 48 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1145633, run #204073 48 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1145633, run #204073 49 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1135005, run #204073 49 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1135005, run #204073 50 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142167, run #204073 50 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142167, run #204073 51 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1144646, run #204073 51 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1144646, run #204073 52 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1145027, run #204073 52 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1145027, run #204073 53 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1144112, run #204073 53 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1144112, run #204073 54 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1138485, run #204073 54 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1138485, run #204073 55 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1144565, run #204073 55 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1144565, run #204073 56 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139498, run #204073 56 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139498, run #204073 57 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1136546, run #204073 57 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1136546, run #204073 58 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143799, run #204073 58 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143799, run #204073 59 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142877, run #204073 59 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142877, run #204073 60 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1149894, run #204073 60 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1149894, run #204073 61 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1145364, run #204073 61 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1145364, run #204073 62 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143770, run #204073 62 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143770, run #204073 63 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1148361, run #204073 63 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1148361, run #204073 64 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1148167, run #204073 64 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1148167, run #204073 65 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1138948, run #204073 65 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1138948, run #204073 66 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1144808, run #204073 66 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1144808, run #204073 67 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1145832, run #204073 67 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1145832, run #204073 68 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1153100, run #204073 68 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1153100, run #204073 69 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142524, run #204073 69 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142524, run #204073 70 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1138294, run #204073 70 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1138294, run #204073 71 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1138350, run #204073 71 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1138350, run #204073 72 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1149424, run #204073 72 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1149424, run #204073 73 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1151102, run #204073 73 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1151102, run #204073 74 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1152242, run #204073 74 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1152242, run #204073 75 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1148416, run #204073 75 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1148416, run #204073 76 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142753, run #204073 76 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142753, run #204073 77 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1149997, run #204073 77 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1149997, run #204073 78 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1151617, run #204073 78 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1151617, run #204073 79 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1149794, run #204073 79 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1149794, run #204073 80 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1152504, run #204073 80 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1152504, run #204073 81 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142485, run #204073 81 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142485, run #204073 82 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1151364, run #204073 82 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1151364, run #204073 83 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143901, run #204073 83 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143901, run #204073 84 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1153979, run #204073 84 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1153979, run #204073 85 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1150212, run #204073 85 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1150212, run #204073 86 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1152633, run #204073 86 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1152633, run #204073 87 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1155482, run #204073 87 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1155482, run #204073 88 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1150472, run #204073 88 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1150472, run #204073 89 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1140275, run #204073 89 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1140275, run #204073 90 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1145882, run #204073 90 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1145882, run #204073 91 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1151732, run #204073 91 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1151732, run #204073 92 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1137896, run #204073 92 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1137896, run #204073 93 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1156381, run #204073 93 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1156381, run #204073 94 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1149161, run #204073 94 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1149161, run #204073 95 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1153794, run #204073 95 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1153794, run #204073 96 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1151312, run #204073 96 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1151312, run #204073 97 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1148893, run #204073 97 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1148893, run #204073 98 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1156938, run #204073 98 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1156938, run #204073 99 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1156351, run #204073 99 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1156351, run #204073 100 events processed so far <<<===
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
+CondInputLoader INFO Finalizing CondInputLoader...
+Finalizer INFO Finalizing Finalizer...
Finalize: compared 10 dumps
+PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/2 objs/chan/bytes 1/1/170 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.22 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641504 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/93060 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/2 objs/chan/bytes 2/1/390 (( 0.03 ))s
+IOVDbSvc INFO bytes in (( 0.53 ))s
+IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 3 nFolders: 2 ReadTime: (( 0.06 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.47 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
+ToolSvc.TileROD... INFO Finalizing
ToolSvc.ByteStr... INFO in finalize()
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
+cObjR_ALL INFO Time User : Tot= 140 [ms] Ave/Min/Max= 35(+- 55)/ 0/ 130 [ms] #= 4
+cObj_ALL INFO Time User : Tot= 180 [ms] Ave/Min/Max= 12(+- 37.6)/ 0/ 150 [ms] #= 15
+ChronoStatSvc INFO Time User : Tot= 8.4 [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"
+Sat Aug 21 21:55:18 CEST 2021
+Preloading tcmalloc_minimal.so
+Py:Athena INFO including file "AthenaCommon/Preparation.py"
+Py:Athena INFO using release [WorkDir-22.0.42] [x86_64-centos7-gcc8-opt] [master-calo-ctests/ec2fa09c9e3] -- built on [2021-08-21T2138]
+Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO configuring AthenaHive with [4] concurrent threads and [4] concurrent events
Py:AlgScheduler INFO setting up AvalancheSchedulerSvc/AvalancheSchedulerSvc with 4 threads
+Py:Athena INFO including file "AthenaCommon/Execution.py"
+Py:Athena INFO including file "TileByteStream/TileBeamElemContByteStreamCnv_test.py"
+Py:Athena INFO SetGeometryVersion.py obtained major release version 22
+Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
+Py:ConfigurableDb INFO Read module info for 5069 configurables from 8 genConfDb files
+Py:ConfigurableDb INFO No duplicates have been found: that's good !
+EventInfoMgtInit: Got release version Athena-22.0.42
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
+Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
+Py:TileConditions_jobOptions.py INFO Forcing RUN2 (2014-2017) cabling for run 204073 with geometry ATLAS-R2-2016-01-00-01
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo for 7 samples
Py:TileConditions_jobOptions.py INFO setting up COOL for TileCal conditions data
Py:TileInfoConf. INFO Changing default TileBadChanTool configuration to COOL source
@@ -235,17 +683,112 @@ Py:TileInfoConf. INFO Changing default TileCondToolTiming configuration to C
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise for Opt.Filter without iterations
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
+Py:Athena INFO including file "AthenaCommon/runbatch.py"
MessageSvc INFO Activating in a separate thread
+ApplicationMgr SUCCESS
+====================================================================================================================================
+ Welcome to ApplicationMgr (GaudiCoreSvc v36r0)
+ running on aibuild028.cern.ch on Sat Aug 21 21:55:31 2021
+====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
+ClassIDSvc INFO getRegistryEntries: read 6689 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
+MetaDataSvc INFO Initializing MetaDataSvc
+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/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+PoolSvc INFO Successfully setup replica sorting algorithm
+PoolSvc INFO Setting up APR FileCatalog and Streams
+PoolSvc INFO Unable find catalog apcfile:poolcond/PoolCat_oflcond.xml in $ATLAS_POOLCOND_PATH and $DATAPATH
+PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
+PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+ToolSvc.ByteStreamMetadataTool INFO Initializing
+MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool','ByteStreamMetadataTool'])
+MetaDataSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+MetaDataSvc INFO AlgTool: ToolSvc.ByteStreamMetadataTool
+IOVDbSvc INFO Only 5 POOL conditions files will be open at once
+IOVDbSvc INFO Cache alignment will be done in 3 slices
+IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
+IOVDbSvc INFO Initialised with 3 connections and 14 folders
+IOVDbSvc INFO Service IOVDbSvc initialised successfully
+IOVDbSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+ByteStreamAddressProviderSvc INFO Initializing
ByteStreamAddressProviderSvc INFO -- Will fill Store with id = 0
+TagInfoMgr INFO AlgTool: TagInfoMgr.IOVDbMetaDataTool
+ClassIDSvc INFO getRegistryEntries: read 2810 CLIDRegistry entries for module ALL
+IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+ClassIDSvc INFO getRegistryEntries: read 273 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_TILE/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200
+IOVDbSvc INFO Added taginfo remove for /LAR/Align
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CES
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/LIN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/NLN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/EMS
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/FIBER
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/LIN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/NLN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/NOISE/SAMPLE
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
+IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
+IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
+ClassIDSvc INFO getRegistryEntries: read 1844 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 23 CLIDRegistry entries for module ALL
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 HGTD_ID with CLID 79264207 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
+DetDescrCnvSvc INFO filling address for JTower_ID with CLID 218674799 and storage type 68 to detector store
+DetDescrCnvSvc INFO filling address for GTower_ID with CLID 49678914 and storage type 68 to detector store
GeoModelSvc::RDBMaterialManager WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RDBMaterialManager WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RDBMaterialManager WARNING Getting InDetMatComponents with default tag
@@ -285,11 +828,19 @@ LArHVLineID INFO setDictVe
LArHVLineID INFO [initLevelsFromDict] m_dict OK ...
LArHVLineID INFO [initialize_from_dictionary] > HV line range -> 11/1/48:79/0:15 | 11/1/148:179/0:15 | 11/1/80:93/0:7 | 11/1/180:193/0:7 | 11/1/200:231/0:15 | 11/1/232:263/0:15 | 11/1/296,297,306,307/0:15 | 11/1/299,304,305,308,309/0:15 | 11/1/264:279/0:15 | 11/1/280:295/0:15 | 11/1/0:47/0:15 | 11/1/320:322/0:15 | 11/1/100:147/0:15 | 11/1/324,325/0:15 | 11/1/312:315/0:15 | 11/1/316:319/0:15 | 11/1/300:303/0:15 | 11/1/310,311/0:15 | 11/1/323/0:15 | 11/1/326,327/0:15 | 11/1/94:99/0:15 | 11/1/194:199/0:15
LArHVLineID INFO [init_hashes()] > Hvline_size= 5008
+GeoModelSvc.LArDetectorToolNV INFO Keys for LAr are ATLAS-R2-2016-01-00-01 ATLAS
+GeoModelSvc.LArDetectorToolNV INFO Building LAr version LAr-Revised-17-01 while ATLAS version is ATLAS-R2-2016-01-00-01
+GeoModelSvc.LArDetectorToolNV INFO LAr Geometry Options:
+GeoModelSvc.LArDetectorToolNV INFO Sagging = false
+GeoModelSvc.LArDetectorToolNV INFO Barrel = ON
+GeoModelSvc.LArDetectorToolNV INFO Endcap = ON
+BarrelConstruction INFO Getting primary numbers for ATLAS, ATLAS-R2-2016-01-00-01
BarrelConstruction INFO Makes detailed absorber sandwich ? 1 1
BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
+ClassIDSvc INFO getRegistryEntries: read 3249 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -298,6 +849,9 @@ EMECConstruction INFO multi-lay
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstruction INFO Start building EC electronics geometry
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24124Kb Time = 0.64S
+GeoModelSvc.TileDetectorTool INFO Entering TileDetectorTool::create()
+TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
TileDddbManager INFO n_timod = 320
TileDddbManager INFO n_cuts = 9
@@ -306,9 +860,11 @@ TileDddbManager INFO n_tilb =
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDescrCnv INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a CaloCell_ID helper object in the detector store
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArEM_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -316,18 +872,90 @@ CaloIDHelper_IDDetDescrCnv INFO in create
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
AtlasDetectorID INFO initialize_from_dictionary - OK
+GeoModelSvc.TileDetectorTool INFO U-shape parameter from database is: 1
+GeoModelSvc.TileDetectorTool INFO Glue parameter from database is: 1
+GeoModelSvc.TileDetectorTool INFO Cs Tube parameter from database is: 0
+GeoModelSvc.TileDetectorTool INFO Entering TileAtlasFactory::create()
+GeoModelSvc.TileDetectorTool INFO Tile Geometry with Saddle supports, starting from TileCal-CSC-02 xxx
+GeoModelSvc.TileDetectorTool INFO => New BFingerLengthPos 430.5
+GeoModelSvc.TileDetectorTool INFO => New BFingerLengthNeg 420.5
+GeoModelSvc.TileDetectorTool INFO Positioning barrel with translation 0
+GeoModelSvc.TileDetectorTool INFO Positioning positive barrel finger with translation 3035.25
+GeoModelSvc.TileDetectorTool INFO Positioning negative barrel finger with translation -3030.25
+GeoModelSvc.TileDetectorTool INFO Positioning positive ext.barrel with translation 4854.75
+GeoModelSvc.TileDetectorTool INFO Positioning positive ext.barrel finger with translation ztrans= 6338.5
+GeoModelSvc.TileDetectorTool INFO Positioning positive ext.barrel saddle with translation ztrans= 6192.5
+GeoModelSvc.TileDetectorTool INFO Positive ITC envelope parameters: PLUG1 Rmin= 3438.85 Rmax= 4250 dzITC1= 154.5
+GeoModelSvc.TileDetectorTool INFO PLUG2 Rmin= 2981 Rmax= 3440 dzITC2= 47.425
+GeoModelSvc.TileDetectorTool INFO Positioning positive ITC with translation 3405
+GeoModelSvc.TileDetectorTool INFO Positioning positive Gap with translation 3552
+GeoModelSvc.TileDetectorTool INFO Positioning positive Crack with translation 3536
+GeoModelSvc.TileDetectorTool INFO Positioning negative ext.barrel with translation ztrans -4854.75
+GeoModelSvc.TileDetectorTool INFO Positioning negative ext.barrel finger with translation ztrans= -6338.5
+GeoModelSvc.TileDetectorTool INFO Positioning negative ext.barrel saddle with translation ztrans= -6192.5
+GeoModelSvc.TileDetectorTool INFO Negative ITC envelope parameters: PLUG1 Rmin= 3438.85 Rmax= 4250 dzITC1= 154.5
+GeoModelSvc.TileDetectorTool INFO PLUG2 Rmin= 2981 Rmax= 3440 dzITC2= 47.425
+GeoModelSvc.TileDetectorTool INFO Positioning negative ITC with translation -3405
+GeoModelSvc.TileDetectorTool INFO Positioning negative Gap with translation -3552
+GeoModelSvc.TileDetectorTool INFO Positioning negative Crack with translation -3536
+GeoModelSvc.TileDetectorTool INFO Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.TileDetectorTool INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.TileDetectorTool INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrManager INFO Entering create_elements()
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3528Kb Time = 0.19S
+ClassIDSvc INFO getRegistryEntries: read 71 CLIDRegistry entries for module ALL
+GeoModelSvc INFO AlgTool: GeoModelSvc.LArDetectorToolNV
+GeoModelSvc INFO AlgTool: GeoModelSvc.TileDetectorTool
+TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
+TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
CaloLVL1_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-R2-2016-01-00-01
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
+AthenaHiveEventLoopMgr INFO Initializing AthenaHiveEventLoopMgr
+ClassIDSvc 0 INFO getRegistryEntries: read 4391 CLIDRegistry entries for module ALL
+PyComponentMgr 0 INFO Initializing PyComponentMgr...
+Finalizer 0 INFO Initializing Finalizer...
+ClassIDSvc 0 INFO getRegistryEntries: read 553 CLIDRegistry entries for module ALL
+CondInputLoader 0 INFO Initializing CondInputLoader...
+ClassIDSvc 0 INFO getRegistryEntries: read 12 CLIDRegistry entries for module ALL
CondInputLoader 0 INFO Adding base classes:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' ) -> no bases
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' ) ->
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' ) ->
CondInputLoader 0 INFO Will create WriteCondHandle dependencies for the following DataObjects:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' )
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' )
TileBadChannelsCondAlg.TileCondProxyCool_OnlBch 0 INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OnlBch) for folder: "/TILE/ONL01/STATUS/ADC"
TileBadChannelsCondAlg.TileCondProxyCool_OflBch 0 INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OflBch) for folder: "/TILE/OFL02/STATUS/ADC"
TileBadChannelsCondAlg 0 INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
@@ -348,7 +976,7 @@ TileSampleNoiseCon...TileCondProxyCool_NoiseSample 0 INFO Creating
TileTimingCondAlg.TileCondProxyCool_AdcOffset 0 INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
ThreadPoolSvc 0 INFO no thread init tools attached
AvalancheSchedulerSvc 0 INFO Activating scheduler in a separate thread
-AvalancheSchedulerSvc 0 INFO Found 14 algorithms
+AvalancheSchedulerSvc 0 INFO Found 15 algorithms
AvalancheSchedulerSvc 0 INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
AvalancheSchedulerSvc 0 INFO o ( 'TileBeamElemContainer' , 'StoreGateSvc+TileBeamElemCnt' ) required by Algorithm:
AvalancheSchedulerSvc 0 INFO * TileBeamElemCntDumper
@@ -362,23 +990,50 @@ AvalancheSchedulerSvc 0 INFO Task sche
AvalancheSchedulerSvc 0 INFO o Avalanche generation mode: disabled
AvalancheSchedulerSvc 0 INFO o Preemptive scheduling of CPU-blocking tasks: disabled
AvalancheSchedulerSvc 0 INFO o Scheduling of condition tasks: disabled
+ByteStreamInputSvc 0 INFO Initializing
+ROBDataProviderSvc 0 INFO Initializing
ROBDataProviderSvc 0 INFO ---> Filter out empty ROB fragments = 'filterEmptyROB':False
ROBDataProviderSvc 0 INFO ---> Filter out specific ROBs by Status Code: # ROBs = 0
ROBDataProviderSvc 0 INFO ---> Filter out Sub Detector ROBs by Status Code: # Sub Detectors = 0
EventSelector 0 INFO reinitialization...
AthenaHiveEventLoopMgr 0 INFO Setup EventSelector service EventSelector
ApplicationMgr 0 INFO Application Manager Initialized successfully
+PoolSvc 0 INFO Enabled implicit multithreading in ROOT via PersistencySvc to: 3
+CondInputLoader 0 INFO created CondCont<CaloRec::CaloCellPositionShift> with key 'ConditionStore+LArCellPositionShift'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/EMS'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/STATUS/ADC'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/ONL01/STATUS/ADC'
+CondInputLoader 0 INFO created CondCont<DetCondKeyTrans> with key 'ConditionStore+/LAR/Align'
+ByteStreamInputSvc 0 INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data12_8TeV.00204073.physics_JetTauEtmiss.merge.RAW._lb0144._SFO-5._0001.1
ApplicationMgr 0 INFO Application Manager Started successfully
AthenaHiveEventLoopMgr 0 INFO Starting loop on events
+EventPersistencySvc 0 0 INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistencySvc 0 0 INFO Added successfully Conversion service:ByteStreamCnvSvc
EventInfoByteStreamAuxCnv 0 0 INFO IsSimulation : 0
EventInfoByteStreamAuxCnv 0 0 INFO IsTestbeam : 0
EventInfoByteStreamAuxCnv 0 0 INFO IsCalibration : 0
AthenaHiveEventLoopMgr 0 0 INFO ===>>> start of run 204073 <<<===
+IOVDbSvc 0 0 INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder 0 0 INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder 0 0 INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
+IOVDbSvc 0 0 INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc 0 0 INFO Opened read transaction for POOL PersistencySvc
+DbSession 0 0 INFO Open DbSession
+Domain[ROOT_All] 0 0 INFO > Access DbDomain READ [ROOT_All]
+Domain[ROOT_All] 0 0 INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
+Domain[ROOT_All] 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
+RootDatabase.open 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv 0 0 INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDescrCnv 0 0 INFO in createObj: creating a CaloDescrManager object in the detector store
+ClassIDSvc 0 0 INFO getRegistryEntries: read 207 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID 0 0 INFO initialize_from_dictionary
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
@@ -392,19 +1047,266 @@ CaloIDHelper_IDDetDescrCnv 0 0 INFO in create
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
+TileNeighbour 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
CaloIdMgrDetDescrCnv 0 0 INFO Finished
+CaloIdMgrDetDescrCnv 0 0 INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
+Domain[ROOT_All] 0 0 INFO -> Access DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
+RootDatabase.open 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
+AthenaHiveEventLoopMgr 0 0 INFO ===>>> start processing event #1129572, run #204073 on slot 0, 0 events processed so far <<<===
+ClassIDSvc 0 0 INFO getRegistryEntries: read 495 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 1763 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 92 CLIDRegistry entries for module ALL
+ToolSvc.TileROD_Decoder.TileL2Builder 0 0 INFO TileL2Builder initialization completed
+/cvmfs/atlas-condb.cern.ch/repo/conditions/...root 0 0 INFO Database being retired...
+Domain[ROOT_All] 0 0 INFO -> Deaccess DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
+/cvmfs/atlas-condb.cern.ch/repo/conditions/...root 0 0 INFO Database being retired...
+Domain[ROOT_All] 0 0 INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] 0 0 INFO > Deaccess DbDomain READ [ROOT_All]
+AthenaHiveEventLoopMgr 0 0 INFO ===>>> done processing event #1129572, run #204073 on slot 0, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 1 0 INFO ===>>> start processing event #1129665, run #204073 on slot 0, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 2 1 INFO ===>>> start processing event #1131212, run #204073 on slot 1, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 3 2 INFO ===>>> start processing event #1131086, run #204073 on slot 2, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 4 3 INFO ===>>> start processing event #1130272, run #204073 on slot 3, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 1 0 INFO ===>>> done processing event #1129665, run #204073 on slot 0, 2 events processed so far <<<===
+AthenaHiveEventLoopMgr 2 1 INFO ===>>> done processing event #1131212, run #204073 on slot 1, 3 events processed so far <<<===
+AthenaHiveEventLoopMgr 3 2 INFO ===>>> done processing event #1131086, run #204073 on slot 2, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 5 0 INFO ===>>> start processing event #1131269, run #204073 on slot 0, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 6 1 INFO ===>>> start processing event #1130716, run #204073 on slot 1, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 7 2 INFO ===>>> start processing event #1132019, run #204073 on slot 2, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 4 3 INFO ===>>> done processing event #1130272, run #204073 on slot 3, 5 events processed so far <<<===
+AthenaHiveEventLoopMgr 5 0 INFO ===>>> done processing event #1131269, run #204073 on slot 0, 6 events processed so far <<<===
+AthenaHiveEventLoopMgr 6 1 INFO ===>>> done processing event #1130716, run #204073 on slot 1, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 8 0 INFO ===>>> start processing event #1132092, run #204073 on slot 0, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 9 1 INFO ===>>> start processing event #1130238, run #204073 on slot 1, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 10 3 INFO ===>>> start processing event #1134553, run #204073 on slot 3, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 7 2 INFO ===>>> done processing event #1132019, run #204073 on slot 2, 8 events processed so far <<<===
+AthenaHiveEventLoopMgr 8 0 INFO ===>>> done processing event #1132092, run #204073 on slot 0, 9 events processed so far <<<===
+AthenaHiveEventLoopMgr 9 1 INFO ===>>> done processing event #1130238, run #204073 on slot 1, 10 events processed so far <<<===
+AthenaHiveEventLoopMgr 11 0 INFO ===>>> start processing event #1130999, run #204073 on slot 0, 10 events processed so far <<<===
+AthenaHiveEventLoopMgr 12 1 INFO ===>>> start processing event #1133461, run #204073 on slot 1, 10 events processed so far <<<===
+AthenaHiveEventLoopMgr 13 2 INFO ===>>> start processing event #1131152, run #204073 on slot 2, 10 events processed so far <<<===
+AthenaHiveEventLoopMgr 10 3 INFO ===>>> done processing event #1134553, run #204073 on slot 3, 11 events processed so far <<<===
+AthenaHiveEventLoopMgr 11 0 INFO ===>>> done processing event #1130999, run #204073 on slot 0, 12 events processed so far <<<===
+AthenaHiveEventLoopMgr 12 1 INFO ===>>> done processing event #1133461, run #204073 on slot 1, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 14 0 INFO ===>>> start processing event #1130142, run #204073 on slot 0, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 15 1 INFO ===>>> start processing event #1132770, run #204073 on slot 1, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 16 3 INFO ===>>> start processing event #1132365, run #204073 on slot 3, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 13 2 INFO ===>>> done processing event #1131152, run #204073 on slot 2, 14 events processed so far <<<===
+AthenaHiveEventLoopMgr 14 0 INFO ===>>> done processing event #1130142, run #204073 on slot 0, 15 events processed so far <<<===
+AthenaHiveEventLoopMgr 15 1 INFO ===>>> done processing event #1132770, run #204073 on slot 1, 16 events processed so far <<<===
+AthenaHiveEventLoopMgr 17 0 INFO ===>>> start processing event #1136791, run #204073 on slot 0, 16 events processed so far <<<===
+AthenaHiveEventLoopMgr 18 1 INFO ===>>> start processing event #1133781, run #204073 on slot 1, 16 events processed so far <<<===
+AthenaHiveEventLoopMgr 19 2 INFO ===>>> start processing event #1132067, run #204073 on slot 2, 16 events processed so far <<<===
+AthenaHiveEventLoopMgr 16 3 INFO ===>>> done processing event #1132365, run #204073 on slot 3, 17 events processed so far <<<===
+AthenaHiveEventLoopMgr 17 0 INFO ===>>> done processing event #1136791, run #204073 on slot 0, 18 events processed so far <<<===
+AthenaHiveEventLoopMgr 18 1 INFO ===>>> done processing event #1133781, run #204073 on slot 1, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 20 0 INFO ===>>> start processing event #1138637, run #204073 on slot 0, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 21 1 INFO ===>>> start processing event #1139495, run #204073 on slot 1, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 22 3 INFO ===>>> start processing event #1140193, run #204073 on slot 3, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 19 2 INFO ===>>> done processing event #1132067, run #204073 on slot 2, 20 events processed so far <<<===
+AthenaHiveEventLoopMgr 20 0 INFO ===>>> done processing event #1138637, run #204073 on slot 0, 21 events processed so far <<<===
+AthenaHiveEventLoopMgr 21 1 INFO ===>>> done processing event #1139495, run #204073 on slot 1, 22 events processed so far <<<===
+AthenaHiveEventLoopMgr 23 0 INFO ===>>> start processing event #1142953, run #204073 on slot 0, 22 events processed so far <<<===
+AthenaHiveEventLoopMgr 24 1 INFO ===>>> start processing event #1139127, run #204073 on slot 1, 22 events processed so far <<<===
+AthenaHiveEventLoopMgr 25 2 INFO ===>>> start processing event #1141272, run #204073 on slot 2, 22 events processed so far <<<===
+AthenaHiveEventLoopMgr 22 3 INFO ===>>> done processing event #1140193, run #204073 on slot 3, 23 events processed so far <<<===
+AthenaHiveEventLoopMgr 23 0 INFO ===>>> done processing event #1142953, run #204073 on slot 0, 24 events processed so far <<<===
+AthenaHiveEventLoopMgr 24 1 INFO ===>>> done processing event #1139127, run #204073 on slot 1, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 26 0 INFO ===>>> start processing event #1137117, run #204073 on slot 0, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 27 1 INFO ===>>> start processing event #1139599, run #204073 on slot 1, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 28 3 INFO ===>>> start processing event #1140314, run #204073 on slot 3, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 25 2 INFO ===>>> done processing event #1141272, run #204073 on slot 2, 26 events processed so far <<<===
+AthenaHiveEventLoopMgr 26 0 INFO ===>>> done processing event #1137117, run #204073 on slot 0, 27 events processed so far <<<===
+AthenaHiveEventLoopMgr 27 1 INFO ===>>> done processing event #1139599, run #204073 on slot 1, 28 events processed so far <<<===
+AthenaHiveEventLoopMgr 29 0 INFO ===>>> start processing event #1133685, run #204073 on slot 0, 28 events processed so far <<<===
+AthenaHiveEventLoopMgr 30 1 INFO ===>>> start processing event #1143279, run #204073 on slot 1, 28 events processed so far <<<===
+AthenaHiveEventLoopMgr 31 2 INFO ===>>> start processing event #1137563, run #204073 on slot 2, 28 events processed so far <<<===
+AthenaHiveEventLoopMgr 28 3 INFO ===>>> done processing event #1140314, run #204073 on slot 3, 29 events processed so far <<<===
+AthenaHiveEventLoopMgr 29 0 INFO ===>>> done processing event #1133685, run #204073 on slot 0, 30 events processed so far <<<===
+AthenaHiveEventLoopMgr 30 1 INFO ===>>> done processing event #1143279, run #204073 on slot 1, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 32 0 INFO ===>>> start processing event #1139927, run #204073 on slot 0, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 33 1 INFO ===>>> start processing event #1141197, run #204073 on slot 1, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 34 3 INFO ===>>> start processing event #1140039, run #204073 on slot 3, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 31 2 INFO ===>>> done processing event #1137563, run #204073 on slot 2, 32 events processed so far <<<===
+AthenaHiveEventLoopMgr 32 0 INFO ===>>> done processing event #1139927, run #204073 on slot 0, 33 events processed so far <<<===
+AthenaHiveEventLoopMgr 33 1 INFO ===>>> done processing event #1141197, run #204073 on slot 1, 34 events processed so far <<<===
+AthenaHiveEventLoopMgr 35 0 INFO ===>>> start processing event #1142531, run #204073 on slot 0, 34 events processed so far <<<===
+AthenaHiveEventLoopMgr 36 1 INFO ===>>> start processing event #1139475, run #204073 on slot 1, 34 events processed so far <<<===
+AthenaHiveEventLoopMgr 37 2 INFO ===>>> start processing event #1139958, run #204073 on slot 2, 34 events processed so far <<<===
+AthenaHiveEventLoopMgr 34 3 INFO ===>>> done processing event #1140039, run #204073 on slot 3, 35 events processed so far <<<===
+AthenaHiveEventLoopMgr 35 0 INFO ===>>> done processing event #1142531, run #204073 on slot 0, 36 events processed so far <<<===
+AthenaHiveEventLoopMgr 36 1 INFO ===>>> done processing event #1139475, run #204073 on slot 1, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 38 0 INFO ===>>> start processing event #1143765, run #204073 on slot 0, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 39 1 INFO ===>>> start processing event #1143097, run #204073 on slot 1, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 40 3 INFO ===>>> start processing event #1134147, run #204073 on slot 3, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 37 2 INFO ===>>> done processing event #1139958, run #204073 on slot 2, 38 events processed so far <<<===
+AthenaHiveEventLoopMgr 38 0 INFO ===>>> done processing event #1143765, run #204073 on slot 0, 39 events processed so far <<<===
+AthenaHiveEventLoopMgr 39 1 INFO ===>>> done processing event #1143097, run #204073 on slot 1, 40 events processed so far <<<===
+AthenaHiveEventLoopMgr 41 0 INFO ===>>> start processing event #1137156, run #204073 on slot 0, 40 events processed so far <<<===
+AthenaHiveEventLoopMgr 42 1 INFO ===>>> start processing event #1136377, run #204073 on slot 1, 40 events processed so far <<<===
+AthenaHiveEventLoopMgr 43 2 INFO ===>>> start processing event #1137842, run #204073 on slot 2, 40 events processed so far <<<===
+AthenaHiveEventLoopMgr 40 3 INFO ===>>> done processing event #1134147, run #204073 on slot 3, 41 events processed so far <<<===
+AthenaHiveEventLoopMgr 41 0 INFO ===>>> done processing event #1137156, run #204073 on slot 0, 42 events processed so far <<<===
+AthenaHiveEventLoopMgr 42 1 INFO ===>>> done processing event #1136377, run #204073 on slot 1, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 44 0 INFO ===>>> start processing event #1141705, run #204073 on slot 0, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 45 1 INFO ===>>> start processing event #1143410, run #204073 on slot 1, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 46 3 INFO ===>>> start processing event #1144170, run #204073 on slot 3, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 43 2 INFO ===>>> done processing event #1137842, run #204073 on slot 2, 44 events processed so far <<<===
+AthenaHiveEventLoopMgr 44 0 INFO ===>>> done processing event #1141705, run #204073 on slot 0, 45 events processed so far <<<===
+AthenaHiveEventLoopMgr 45 1 INFO ===>>> done processing event #1143410, run #204073 on slot 1, 46 events processed so far <<<===
+AthenaHiveEventLoopMgr 47 0 INFO ===>>> start processing event #1145987, run #204073 on slot 0, 46 events processed so far <<<===
+AthenaHiveEventLoopMgr 48 1 INFO ===>>> start processing event #1145633, run #204073 on slot 1, 46 events processed so far <<<===
+AthenaHiveEventLoopMgr 49 2 INFO ===>>> start processing event #1135005, run #204073 on slot 2, 46 events processed so far <<<===
+AthenaHiveEventLoopMgr 46 3 INFO ===>>> done processing event #1144170, run #204073 on slot 3, 47 events processed so far <<<===
+AthenaHiveEventLoopMgr 47 0 INFO ===>>> done processing event #1145987, run #204073 on slot 0, 48 events processed so far <<<===
+AthenaHiveEventLoopMgr 48 1 INFO ===>>> done processing event #1145633, run #204073 on slot 1, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 50 0 INFO ===>>> start processing event #1142167, run #204073 on slot 0, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 51 1 INFO ===>>> start processing event #1144646, run #204073 on slot 1, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 52 3 INFO ===>>> start processing event #1145027, run #204073 on slot 3, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 49 2 INFO ===>>> done processing event #1135005, run #204073 on slot 2, 50 events processed so far <<<===
+AthenaHiveEventLoopMgr 50 0 INFO ===>>> done processing event #1142167, run #204073 on slot 0, 51 events processed so far <<<===
+AthenaHiveEventLoopMgr 51 1 INFO ===>>> done processing event #1144646, run #204073 on slot 1, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 53 0 INFO ===>>> start processing event #1144112, run #204073 on slot 0, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 54 1 INFO ===>>> start processing event #1138485, run #204073 on slot 1, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 55 2 INFO ===>>> start processing event #1144565, run #204073 on slot 2, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 52 3 INFO ===>>> done processing event #1145027, run #204073 on slot 3, 53 events processed so far <<<===
+AthenaHiveEventLoopMgr 53 0 INFO ===>>> done processing event #1144112, run #204073 on slot 0, 54 events processed so far <<<===
+AthenaHiveEventLoopMgr 54 1 INFO ===>>> done processing event #1138485, run #204073 on slot 1, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 56 0 INFO ===>>> start processing event #1139498, run #204073 on slot 0, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 57 1 INFO ===>>> start processing event #1136546, run #204073 on slot 1, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 58 3 INFO ===>>> start processing event #1143799, run #204073 on slot 3, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 55 2 INFO ===>>> done processing event #1144565, run #204073 on slot 2, 56 events processed so far <<<===
+AthenaHiveEventLoopMgr 56 0 INFO ===>>> done processing event #1139498, run #204073 on slot 0, 57 events processed so far <<<===
+AthenaHiveEventLoopMgr 57 1 INFO ===>>> done processing event #1136546, run #204073 on slot 1, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 59 0 INFO ===>>> start processing event #1142877, run #204073 on slot 0, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 60 1 INFO ===>>> start processing event #1149894, run #204073 on slot 1, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 61 2 INFO ===>>> start processing event #1145364, run #204073 on slot 2, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 58 3 INFO ===>>> done processing event #1143799, run #204073 on slot 3, 59 events processed so far <<<===
+AthenaHiveEventLoopMgr 59 0 INFO ===>>> done processing event #1142877, run #204073 on slot 0, 60 events processed so far <<<===
+AthenaHiveEventLoopMgr 60 1 INFO ===>>> done processing event #1149894, run #204073 on slot 1, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 62 0 INFO ===>>> start processing event #1143770, run #204073 on slot 0, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 63 1 INFO ===>>> start processing event #1148361, run #204073 on slot 1, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 64 3 INFO ===>>> start processing event #1148167, run #204073 on slot 3, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 61 2 INFO ===>>> done processing event #1145364, run #204073 on slot 2, 62 events processed so far <<<===
+AthenaHiveEventLoopMgr 62 0 INFO ===>>> done processing event #1143770, run #204073 on slot 0, 63 events processed so far <<<===
+AthenaHiveEventLoopMgr 63 1 INFO ===>>> done processing event #1148361, run #204073 on slot 1, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 65 0 INFO ===>>> start processing event #1138948, run #204073 on slot 0, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 66 1 INFO ===>>> start processing event #1144808, run #204073 on slot 1, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 67 2 INFO ===>>> start processing event #1145832, run #204073 on slot 2, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 64 3 INFO ===>>> done processing event #1148167, run #204073 on slot 3, 65 events processed so far <<<===
+AthenaHiveEventLoopMgr 65 0 INFO ===>>> done processing event #1138948, run #204073 on slot 0, 66 events processed so far <<<===
+AthenaHiveEventLoopMgr 66 1 INFO ===>>> done processing event #1144808, run #204073 on slot 1, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 68 0 INFO ===>>> start processing event #1153100, run #204073 on slot 0, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 69 1 INFO ===>>> start processing event #1142524, run #204073 on slot 1, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 70 3 INFO ===>>> start processing event #1138294, run #204073 on slot 3, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 67 2 INFO ===>>> done processing event #1145832, run #204073 on slot 2, 68 events processed so far <<<===
+AthenaHiveEventLoopMgr 68 0 INFO ===>>> done processing event #1153100, run #204073 on slot 0, 69 events processed so far <<<===
+AthenaHiveEventLoopMgr 69 1 INFO ===>>> done processing event #1142524, run #204073 on slot 1, 70 events processed so far <<<===
+AthenaHiveEventLoopMgr 71 0 INFO ===>>> start processing event #1138350, run #204073 on slot 0, 70 events processed so far <<<===
+AthenaHiveEventLoopMgr 72 1 INFO ===>>> start processing event #1149424, run #204073 on slot 1, 70 events processed so far <<<===
+AthenaHiveEventLoopMgr 73 2 INFO ===>>> start processing event #1151102, run #204073 on slot 2, 70 events processed so far <<<===
+AthenaHiveEventLoopMgr 70 3 INFO ===>>> done processing event #1138294, run #204073 on slot 3, 71 events processed so far <<<===
+AthenaHiveEventLoopMgr 71 0 INFO ===>>> done processing event #1138350, run #204073 on slot 0, 72 events processed so far <<<===
+AthenaHiveEventLoopMgr 72 1 INFO ===>>> done processing event #1149424, run #204073 on slot 1, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 74 0 INFO ===>>> start processing event #1152242, run #204073 on slot 0, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 75 1 INFO ===>>> start processing event #1148416, run #204073 on slot 1, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 76 3 INFO ===>>> start processing event #1142753, run #204073 on slot 3, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 73 2 INFO ===>>> done processing event #1151102, run #204073 on slot 2, 74 events processed so far <<<===
+AthenaHiveEventLoopMgr 74 0 INFO ===>>> done processing event #1152242, run #204073 on slot 0, 75 events processed so far <<<===
+AthenaHiveEventLoopMgr 75 1 INFO ===>>> done processing event #1148416, run #204073 on slot 1, 76 events processed so far <<<===
+AthenaHiveEventLoopMgr 77 0 INFO ===>>> start processing event #1149997, run #204073 on slot 0, 76 events processed so far <<<===
+AthenaHiveEventLoopMgr 78 1 INFO ===>>> start processing event #1151617, run #204073 on slot 1, 76 events processed so far <<<===
+AthenaHiveEventLoopMgr 79 2 INFO ===>>> start processing event #1149794, run #204073 on slot 2, 76 events processed so far <<<===
+AthenaHiveEventLoopMgr 76 3 INFO ===>>> done processing event #1142753, run #204073 on slot 3, 77 events processed so far <<<===
+AthenaHiveEventLoopMgr 77 0 INFO ===>>> done processing event #1149997, run #204073 on slot 0, 78 events processed so far <<<===
+AthenaHiveEventLoopMgr 78 1 INFO ===>>> done processing event #1151617, run #204073 on slot 1, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 80 0 INFO ===>>> start processing event #1152504, run #204073 on slot 0, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 81 1 INFO ===>>> start processing event #1142485, run #204073 on slot 1, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 82 3 INFO ===>>> start processing event #1151364, run #204073 on slot 3, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 79 2 INFO ===>>> done processing event #1149794, run #204073 on slot 2, 80 events processed so far <<<===
+AthenaHiveEventLoopMgr 80 0 INFO ===>>> done processing event #1152504, run #204073 on slot 0, 81 events processed so far <<<===
+AthenaHiveEventLoopMgr 81 1 INFO ===>>> done processing event #1142485, run #204073 on slot 1, 82 events processed so far <<<===
+AthenaHiveEventLoopMgr 83 0 INFO ===>>> start processing event #1143901, run #204073 on slot 0, 82 events processed so far <<<===
+AthenaHiveEventLoopMgr 84 1 INFO ===>>> start processing event #1153979, run #204073 on slot 1, 82 events processed so far <<<===
+AthenaHiveEventLoopMgr 85 2 INFO ===>>> start processing event #1150212, run #204073 on slot 2, 82 events processed so far <<<===
+AthenaHiveEventLoopMgr 82 3 INFO ===>>> done processing event #1151364, run #204073 on slot 3, 83 events processed so far <<<===
+AthenaHiveEventLoopMgr 83 0 INFO ===>>> done processing event #1143901, run #204073 on slot 0, 84 events processed so far <<<===
+AthenaHiveEventLoopMgr 84 1 INFO ===>>> done processing event #1153979, run #204073 on slot 1, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 86 0 INFO ===>>> start processing event #1152633, run #204073 on slot 0, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 87 1 INFO ===>>> start processing event #1155482, run #204073 on slot 1, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 88 3 INFO ===>>> start processing event #1150472, run #204073 on slot 3, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 85 2 INFO ===>>> done processing event #1150212, run #204073 on slot 2, 86 events processed so far <<<===
+AthenaHiveEventLoopMgr 86 0 INFO ===>>> done processing event #1152633, run #204073 on slot 0, 87 events processed so far <<<===
+AthenaHiveEventLoopMgr 87 1 INFO ===>>> done processing event #1155482, run #204073 on slot 1, 88 events processed so far <<<===
+AthenaHiveEventLoopMgr 89 0 INFO ===>>> start processing event #1140275, run #204073 on slot 0, 88 events processed so far <<<===
+AthenaHiveEventLoopMgr 90 1 INFO ===>>> start processing event #1145882, run #204073 on slot 1, 88 events processed so far <<<===
+AthenaHiveEventLoopMgr 91 2 INFO ===>>> start processing event #1151732, run #204073 on slot 2, 88 events processed so far <<<===
+AthenaHiveEventLoopMgr 88 3 INFO ===>>> done processing event #1150472, run #204073 on slot 3, 89 events processed so far <<<===
+AthenaHiveEventLoopMgr 89 0 INFO ===>>> done processing event #1140275, run #204073 on slot 0, 90 events processed so far <<<===
+AthenaHiveEventLoopMgr 90 1 INFO ===>>> done processing event #1145882, run #204073 on slot 1, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 92 0 INFO ===>>> start processing event #1137896, run #204073 on slot 0, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 93 1 INFO ===>>> start processing event #1156381, run #204073 on slot 1, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 94 3 INFO ===>>> start processing event #1149161, run #204073 on slot 3, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 91 2 INFO ===>>> done processing event #1151732, run #204073 on slot 2, 92 events processed so far <<<===
+AthenaHiveEventLoopMgr 92 0 INFO ===>>> done processing event #1137896, run #204073 on slot 0, 93 events processed so far <<<===
+AthenaHiveEventLoopMgr 93 1 INFO ===>>> done processing event #1156381, run #204073 on slot 1, 94 events processed so far <<<===
+AthenaHiveEventLoopMgr 95 0 INFO ===>>> start processing event #1153794, run #204073 on slot 0, 94 events processed so far <<<===
+AthenaHiveEventLoopMgr 96 1 INFO ===>>> start processing event #1151312, run #204073 on slot 1, 94 events processed so far <<<===
+AthenaHiveEventLoopMgr 97 2 INFO ===>>> start processing event #1148893, run #204073 on slot 2, 94 events processed so far <<<===
+AthenaHiveEventLoopMgr 94 3 INFO ===>>> done processing event #1149161, run #204073 on slot 3, 95 events processed so far <<<===
+AthenaHiveEventLoopMgr 95 0 INFO ===>>> done processing event #1153794, run #204073 on slot 0, 96 events processed so far <<<===
+AthenaHiveEventLoopMgr 96 1 INFO ===>>> done processing event #1151312, run #204073 on slot 1, 97 events processed so far <<<===
+AthenaHiveEventLoopMgr 98 0 INFO ===>>> start processing event #1156938, run #204073 on slot 0, 97 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 1 INFO ===>>> start processing event #1156351, run #204073 on slot 1, 97 events processed so far <<<===
+AthenaHiveEventLoopMgr 97 2 INFO ===>>> done processing event #1148893, run #204073 on slot 2, 98 events processed so far <<<===
+AthenaHiveEventLoopMgr 98 0 INFO ===>>> done processing event #1156938, run #204073 on slot 0, 99 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 1 INFO ===>>> done processing event #1156351, run #204073 on slot 1, 100 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 1 INFO ---> Loop Finished (seconds): 5.15436
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
+SGInputLoader INFO Finalizing SGInputLoader...
+Finalizer INFO Finalizing Finalizer...
Finalize: compared 10 dumps
+CondInputLoader INFO Finalizing CondInputLoader...
+AvalancheSchedulerSvc INFO Joining Scheduler thread
+PyComponentMgr INFO Finalizing PyComponentMgr...
+EventDataSvc INFO Finalizing EventDataSvc
IdDictDetDescrCnv INFO in finalize
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.01 ))s
+IOVDbSvc INFO bytes in (( 0.04 ))s
+IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.04 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 1 nFolders: 11 ReadTime: (( 0.00 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
+ToolSvc.TileROD_Decoder.TileL2Builder INFO Finalizing
ToolSvc.ByteStreamMetadataTool INFO in finalize()
*****Chrono***** INFO ****************************************************************************************************
+*****Chrono***** INFO WARNING: MT job; statistics are unreliable
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
+cObjR_ALL INFO Time User : Tot= 160 [ms] Ave/Min/Max= 80(+- 70)/ 10/ 150 [ms] #= 2
+cObj_ALL INFO Time User : Tot= 200 [ms] Ave/Min/Max= 100(+- 70)/ 30/ 170 [ms] #= 2
+ChronoStatSvc INFO Time User : Tot= 8.57 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.finalize() INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.ref
index 10f8efaa197d..6a2ee9478696 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.ref
@@ -1,6 +1,20 @@
+Sat Aug 21 21:52:43 CEST 2021
+Preloading tcmalloc_minimal.so
+Py:Athena INFO including file "AthenaCommon/Preparation.py"
+Py:Athena INFO using release [WorkDir-22.0.42] [x86_64-centos7-gcc8-opt] [master-calo-ctests/ec2fa09c9e3] -- built on [2021-08-21T2138]
+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 "TileByteStream/TileDigitsContByteStreamCnv_test.py"
+Py:Athena INFO SetGeometryVersion.py obtained major release version 22
+Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
+Py:ConfigurableDb INFO Read module info for 5069 configurables from 8 genConfDb files
+Py:ConfigurableDb INFO No duplicates have been found: that's good !
+EventInfoMgtInit: Got release version Athena-22.0.42
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
+Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
+Py:TileConditions_jobOptions.py INFO Forcing RUN2 (2014-2017) cabling for run 204073 with geometry ATLAS-R2-2016-01-00-01
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo for 7 samples
Py:TileConditions_jobOptions.py INFO setting up COOL for TileCal conditions data
Py:TileInfoConf. INFO Changing default TileBadChanTool configuration to COOL source
@@ -10,16 +24,111 @@ Py:TileInfoConf. INFO Changing default TileCondToolTiming configuration to C
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise for Opt.Filter without iterations
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
+Py:Athena INFO including file "AthenaCommon/runbatch.py"
+ApplicationMgr SUCCESS
+====================================================================================================================================
+ Welcome to ApplicationMgr (GaudiCoreSvc v36r0)
+ running on aibuild028.cern.ch on Sat Aug 21 21:52:57 2021
+====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
+ClassIDSvc INFO getRegistryEntries: read 6689 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
+MetaDataSvc INFO Initializing MetaDataSvc
+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/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+PoolSvc INFO Successfully setup replica sorting algorithm
+PoolSvc INFO Setting up APR FileCatalog and Streams
+PoolSvc INFO Unable find catalog apcfile:poolcond/PoolCat_oflcond.xml in $ATLAS_POOLCOND_PATH and $DATAPATH
+PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
+PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+ToolSvc.ByteStr... INFO Initializing
+MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool','ByteStreamMetadataTool'])
+MetaDataSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+MetaDataSvc INFO AlgTool: ToolSvc.ByteStreamMetadataTool
+IOVDbSvc INFO Only 5 POOL conditions files will be open at once
+IOVDbSvc INFO Cache alignment will be done in 3 slices
+IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
+IOVDbSvc INFO Initialised with 3 connections and 14 folders
+IOVDbSvc INFO Service IOVDbSvc initialised successfully
+IOVDbSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+ByteStreamAddre... INFO Initializing
ByteStreamAddre... INFO -- Will fill Store with id = 0
+TagInfoMgr INFO AlgTool: TagInfoMgr.IOVDbMetaDataTool
+ClassIDSvc INFO getRegistryEntries: read 2810 CLIDRegistry entries for module ALL
+IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1844 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_TILE/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200
+IOVDbSvc INFO Added taginfo remove for /LAR/Align
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CES
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/LIN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/NLN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/EMS
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/FIBER
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/LIN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/NLN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/NOISE/SAMPLE
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
+IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
+IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
+ClassIDSvc INFO getRegistryEntries: read 23 CLIDRegistry entries for module ALL
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 HGTD_ID with CLID 79264207 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
+DetDescrCnvSvc INFO filling address for JTower_ID with CLID 218674799 and storage type 68 to detector store
+DetDescrCnvSvc INFO filling address for GTower_ID with CLID 49678914 and storage type 68 to detector store
GeoModelSvc::RD...WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RD...WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RD...WARNING Getting InDetMatComponents with default tag
@@ -59,15 +168,19 @@ LArHVLineID INFO setDictVersion of LArHighVoltage is OK
LArHVLineID INFO [initLevelsFromDict] m_dict OK ...
LArHVLineID INFO [initialize_from_dictionary] > HV line range -> 11/1/48:79/0:15 | 11/1/148:179/0:15 | 11/1/80:93/0:7 | 11/1/180:193/0:7 | 11/1/200:231/0:15 | 11/1/232:263/0:15 | 11/1/296,297,306,307/0:15 | 11/1/299,304,305,308,309/0:15 | 11/1/264:279/0:15 | 11/1/280:295/0:15 | 11/1/0:47/0:15 | 11/1/320:322/0:15 | 11/1/100:147/0:15 | 11/1/324,325/0:15 | 11/1/312:315/0:15 | 11/1/316:319/0:15 | 11/1/300:303/0:15 | 11/1/310,311/0:15 | 11/1/323/0:15 | 11/1/326,327/0:15 | 11/1/94:99/0:15 | 11/1/194:199/0:15
LArHVLineID INFO [init_hashes()] > Hvline_size= 5008
+GeoModelSvc.LAr... INFO Keys for LAr are ATLAS-R2-2016-01-00-01 ATLAS
+GeoModelSvc.LAr... INFO Building LAr version LAr-Revised-17-01 while ATLAS version is ATLAS-R2-2016-01-00-01
GeoModelSvc.LAr... INFO LAr Geometry Options:
GeoModelSvc.LAr... INFO Sagging = false
GeoModelSvc.LAr... INFO Barrel = ON
GeoModelSvc.LAr... INFO Endcap = ON
+BarrelConstruction INFO Getting primary numbers for ATLAS, ATLAS-R2-2016-01-00-01
BarrelConstruction INFO Makes detailed absorber sandwich ? 1 1
BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
+ClassIDSvc INFO getRegistryEntries: read 3249 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -76,6 +189,9 @@ EMECConstruction INFO multi-layered version of absorbers activated, paramete
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstru... INFO Start building EC electronics geometry
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 25148Kb Time = 0.69S
+GeoModelSvc.Til... INFO Entering TileDetectorTool::create()
+TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
TileDddbManager INFO n_timod = 320
TileDddbManager INFO n_cuts = 9
@@ -84,9 +200,11 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloCell_ID helper object in the detector store
CaloIDHelper_ID... INFO in createObj: creating a LArEM_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -94,6 +212,9 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -128,13 +249,50 @@ GeoModelSvc.Til... INFO Global positioning of barrel with rotation (0,0,0)) a
GeoModelSvc.Til... INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
GeoModelSvc.Til... INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrMan... INFO Entering create_elements()
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3528Kb Time = 0.15S
+ClassIDSvc INFO getRegistryEntries: read 71 CLIDRegistry entries for module ALL
+GeoModelSvc INFO AlgTool: GeoModelSvc.LArDetectorToolNV
+GeoModelSvc INFO AlgTool: GeoModelSvc.TileDetectorTool
+TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
+TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_ID... INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
CaloLVL1_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-R2-2016-01-00-01
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
+AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr
+ClassIDSvc INFO getRegistryEntries: read 444 CLIDRegistry entries for module ALL
+CondInputLoader INFO Initializing CondInputLoader...
+ClassIDSvc INFO getRegistryEntries: read 12 CLIDRegistry entries for module ALL
CondInputLoader INFO Adding base classes:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' ) -> no bases
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' ) ->
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' ) ->
CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' )
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' )
TileBadChannels... INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OnlBch) for folder: "/TILE/ONL01/STATUS/ADC"
TileBadChannels... INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OflBch) for folder: "/TILE/OFL02/STATUS/ADC"
TileBadChannels... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
@@ -153,22 +311,52 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlEms) for folder: "/TILE/OFL02/CALIB/EMS"
TileSampleNoise... INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.TileCondProxyCool_NoiseSample) for folder: "/TILE/OFL02/NOISE/SAMPLE"
TileTimingCondA... INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
+ClassIDSvc INFO getRegistryEntries: read 4121 CLIDRegistry entries for module ALL
+PyComponentMgr INFO Initializing PyComponentMgr...
+Finalizer INFO Initializing Finalizer...
+ByteStreamInputSvc INFO Initializing
+ROBDataProviderSvc INFO Initializing
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
EventSelector INFO reinitialization...
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
+ClassIDSvc INFO getRegistryEntries: read 379 CLIDRegistry entries for module ALL
+ByteStreamInputSvc INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data12_8TeV.00204073.physics_JetTauEtmiss.merge.RAW._lb0144._SFO-5._0001.1
+CondInputLoader INFO created CondCont<CaloRec::CaloCellPositionShift> with key 'ConditionStore+LArCellPositionShift'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/EMS'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/STATUS/ADC'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/ONL01/STATUS/ADC'
+CondInputLoader INFO created CondCont<DetCondKeyTrans> with key 'ConditionStore+/LAR/Align'
ApplicationMgr INFO Application Manager Started successfully
+EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistenc... INFO Added successfully Conversion service:ByteStreamCnvSvc
EventInfoByteSt... INFO IsSimulation : 0
EventInfoByteSt... INFO IsTestbeam : 0
EventInfoByteSt... INFO IsCalibration : 0
AthenaEventLoopMgr INFO ===>>> start of run 204073 <<<===
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
+ClassIDSvc INFO getRegistryEntries: read 207 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -182,10 +370,22 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
+CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
+AthenaEventLoopMgr INFO ===>>> start processing event #1129572, run #204073 0 events processed so far <<<===
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCes-SIM-06 for folder /TILE/OFL02/CALIB/CES
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCisFitLin-COM-00 for folder /TILE/OFL02/CALIB/CIS/FIT/LIN
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCisFitNln-COM-00 for folder /TILE/OFL02/CALIB/CIS/FIT/NLN
@@ -196,6 +396,8 @@ IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02Cali
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02NoiseSample-TwoGauss-19 for folder /TILE/OFL02/NOISE/SAMPLE
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02StatusAdc-IOVDEP-03 for folder /TILE/OFL02/STATUS/ADC
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02TimeChanneloffsetPhy-000-00 for folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY
+IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200
+LArAlignCondAlg INFO recorded new GeoAlignmentStore object for LAr with key LArAlignmentStore and range {[177530,l:0] - [INVALID]}
TileBadChannels... INFO Updating TileBchStatus::isBad() definition from DB
TileBadChannels... INFO Updating TileBchStatus::isNoisy() definition from DB
TileBadChannels... INFO No TileBchStatus::isNoGainL1() definition found in DB, using defaults
@@ -207,25 +409,273 @@ TileBadChannels... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
TileBadChannels... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
TileBadChannels... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
TileBadChannels... INFO No drawer trips probabilities found in DB
+ClassIDSvc INFO getRegistryEntries: read 2258 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 92 CLIDRegistry entries for module ALL
+ToolSvc.TileROD... INFO TileL2Builder initialization completed
+ToolSvc.TileDig... INFO Initializing TileDigitsContByteStreamTool
+AthenaEventLoopMgr INFO ===>>> done processing event #1129572, run #204073 1 events processed so far <<<===
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
+AthenaEventLoopMgr INFO ===>>> start processing event #1129665, run #204073 1 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1129665, run #204073 2 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1131212, run #204073 2 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1131212, run #204073 3 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1131086, run #204073 3 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1131086, run #204073 4 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1130272, run #204073 4 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1130272, run #204073 5 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1131269, run #204073 5 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1131269, run #204073 6 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1130716, run #204073 6 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1130716, run #204073 7 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1132019, run #204073 7 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1132019, run #204073 8 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1132092, run #204073 8 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1132092, run #204073 9 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1130238, run #204073 9 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1130238, run #204073 10 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1134553, run #204073 10 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1134553, run #204073 11 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1130999, run #204073 11 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1130999, run #204073 12 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1133461, run #204073 12 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1133461, run #204073 13 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1131152, run #204073 13 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1131152, run #204073 14 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1130142, run #204073 14 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1130142, run #204073 15 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1132770, run #204073 15 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1132770, run #204073 16 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1132365, run #204073 16 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1132365, run #204073 17 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1136791, run #204073 17 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1136791, run #204073 18 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1133781, run #204073 18 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1133781, run #204073 19 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1132067, run #204073 19 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1132067, run #204073 20 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1138637, run #204073 20 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1138637, run #204073 21 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139495, run #204073 21 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139495, run #204073 22 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1140193, run #204073 22 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1140193, run #204073 23 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142953, run #204073 23 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142953, run #204073 24 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139127, run #204073 24 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139127, run #204073 25 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1141272, run #204073 25 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1141272, run #204073 26 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1137117, run #204073 26 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1137117, run #204073 27 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139599, run #204073 27 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139599, run #204073 28 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1140314, run #204073 28 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1140314, run #204073 29 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1133685, run #204073 29 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1133685, run #204073 30 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143279, run #204073 30 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143279, run #204073 31 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1137563, run #204073 31 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1137563, run #204073 32 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139927, run #204073 32 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139927, run #204073 33 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1141197, run #204073 33 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1141197, run #204073 34 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1140039, run #204073 34 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1140039, run #204073 35 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142531, run #204073 35 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142531, run #204073 36 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139475, run #204073 36 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139475, run #204073 37 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139958, run #204073 37 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139958, run #204073 38 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143765, run #204073 38 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143765, run #204073 39 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143097, run #204073 39 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143097, run #204073 40 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1134147, run #204073 40 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1134147, run #204073 41 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1137156, run #204073 41 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1137156, run #204073 42 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1136377, run #204073 42 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1136377, run #204073 43 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1137842, run #204073 43 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1137842, run #204073 44 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1141705, run #204073 44 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1141705, run #204073 45 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143410, run #204073 45 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143410, run #204073 46 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1144170, run #204073 46 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1144170, run #204073 47 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1145987, run #204073 47 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1145987, run #204073 48 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1145633, run #204073 48 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1145633, run #204073 49 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1135005, run #204073 49 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1135005, run #204073 50 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142167, run #204073 50 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142167, run #204073 51 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1144646, run #204073 51 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1144646, run #204073 52 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1145027, run #204073 52 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1145027, run #204073 53 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1144112, run #204073 53 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1144112, run #204073 54 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1138485, run #204073 54 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1138485, run #204073 55 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1144565, run #204073 55 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1144565, run #204073 56 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139498, run #204073 56 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139498, run #204073 57 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1136546, run #204073 57 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1136546, run #204073 58 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143799, run #204073 58 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143799, run #204073 59 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142877, run #204073 59 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142877, run #204073 60 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1149894, run #204073 60 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1149894, run #204073 61 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1145364, run #204073 61 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1145364, run #204073 62 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143770, run #204073 62 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143770, run #204073 63 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1148361, run #204073 63 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1148361, run #204073 64 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1148167, run #204073 64 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1148167, run #204073 65 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1138948, run #204073 65 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1138948, run #204073 66 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1144808, run #204073 66 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1144808, run #204073 67 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1145832, run #204073 67 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1145832, run #204073 68 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1153100, run #204073 68 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1153100, run #204073 69 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142524, run #204073 69 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142524, run #204073 70 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1138294, run #204073 70 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1138294, run #204073 71 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1138350, run #204073 71 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1138350, run #204073 72 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1149424, run #204073 72 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1149424, run #204073 73 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1151102, run #204073 73 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1151102, run #204073 74 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1152242, run #204073 74 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1152242, run #204073 75 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1148416, run #204073 75 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1148416, run #204073 76 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142753, run #204073 76 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142753, run #204073 77 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1149997, run #204073 77 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1149997, run #204073 78 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1151617, run #204073 78 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1151617, run #204073 79 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1149794, run #204073 79 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1149794, run #204073 80 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1152504, run #204073 80 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1152504, run #204073 81 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142485, run #204073 81 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142485, run #204073 82 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1151364, run #204073 82 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1151364, run #204073 83 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143901, run #204073 83 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143901, run #204073 84 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1153979, run #204073 84 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1153979, run #204073 85 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1150212, run #204073 85 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1150212, run #204073 86 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1152633, run #204073 86 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1152633, run #204073 87 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1155482, run #204073 87 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1155482, run #204073 88 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1150472, run #204073 88 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1150472, run #204073 89 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1140275, run #204073 89 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1140275, run #204073 90 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1145882, run #204073 90 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1145882, run #204073 91 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1151732, run #204073 91 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1151732, run #204073 92 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1137896, run #204073 92 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1137896, run #204073 93 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1156381, run #204073 93 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1156381, run #204073 94 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1149161, run #204073 94 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1149161, run #204073 95 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1153794, run #204073 95 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1153794, run #204073 96 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1151312, run #204073 96 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1151312, run #204073 97 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1148893, run #204073 97 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1148893, run #204073 98 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1156938, run #204073 98 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1156938, run #204073 99 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1156351, run #204073 99 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1156351, run #204073 100 events processed so far <<<===
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
+CondInputLoader INFO Finalizing CondInputLoader...
+Finalizer INFO Finalizing Finalizer...
Finalize: compared 20 dumps
+PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/2 objs/chan/bytes 1/1/170 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.05 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.24 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641504 (( 0.06 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/93060 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/2 objs/chan/bytes 2/1/390 (( 0.05 ))s
+IOVDbSvc INFO bytes in (( 0.66 ))s
+IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 3 nFolders: 2 ReadTime: (( 0.08 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.59 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
+ToolSvc.TileDig... INFO Finalizing TileDigitsContByteStreamTool successfuly
+ToolSvc.TileROD... INFO Finalizing
ToolSvc.ByteStr... INFO in finalize()
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
+cObjR_ALL INFO Time User : Tot= 150 [ms] Ave/Min/Max= 37.5(+- 65)/ 0/ 150 [ms] #= 4
+cObj_ALL INFO Time User : Tot= 210 [ms] Ave/Min/Max= 14(+- 42.9)/ 0/ 170 [ms] #= 15
+ChronoStatSvc INFO Time User : Tot= 11.4 [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"
+Sat Aug 21 21:53:19 CEST 2021
+Preloading tcmalloc_minimal.so
+Py:Athena INFO including file "AthenaCommon/Preparation.py"
+Py:Athena INFO using release [WorkDir-22.0.42] [x86_64-centos7-gcc8-opt] [master-calo-ctests/ec2fa09c9e3] -- built on [2021-08-21T2138]
+Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO configuring AthenaHive with [4] concurrent threads and [4] concurrent events
Py:AlgScheduler INFO setting up AvalancheSchedulerSvc/AvalancheSchedulerSvc with 4 threads
+Py:Athena INFO including file "AthenaCommon/Execution.py"
+Py:Athena INFO including file "TileByteStream/TileDigitsContByteStreamCnv_test.py"
+Py:Athena INFO SetGeometryVersion.py obtained major release version 22
+Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
+Py:ConfigurableDb INFO Read module info for 5069 configurables from 8 genConfDb files
+Py:ConfigurableDb INFO No duplicates have been found: that's good !
+EventInfoMgtInit: Got release version Athena-22.0.42
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
+Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
+Py:TileConditions_jobOptions.py INFO Forcing RUN2 (2014-2017) cabling for run 204073 with geometry ATLAS-R2-2016-01-00-01
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo for 7 samples
Py:TileConditions_jobOptions.py INFO setting up COOL for TileCal conditions data
Py:TileInfoConf. INFO Changing default TileBadChanTool configuration to COOL source
@@ -235,17 +685,112 @@ Py:TileInfoConf. INFO Changing default TileCondToolTiming configuration to C
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise for Opt.Filter without iterations
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
+Py:Athena INFO including file "AthenaCommon/runbatch.py"
MessageSvc INFO Activating in a separate thread
+ApplicationMgr SUCCESS
+====================================================================================================================================
+ Welcome to ApplicationMgr (GaudiCoreSvc v36r0)
+ running on aibuild028.cern.ch on Sat Aug 21 21:53:31 2021
+====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
+ClassIDSvc INFO getRegistryEntries: read 6689 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
+MetaDataSvc INFO Initializing MetaDataSvc
+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/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+PoolSvc INFO Successfully setup replica sorting algorithm
+PoolSvc INFO Setting up APR FileCatalog and Streams
+PoolSvc INFO Unable find catalog apcfile:poolcond/PoolCat_oflcond.xml in $ATLAS_POOLCOND_PATH and $DATAPATH
+PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
+PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+ToolSvc.ByteStreamMetadataTool INFO Initializing
+MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool','ByteStreamMetadataTool'])
+MetaDataSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+MetaDataSvc INFO AlgTool: ToolSvc.ByteStreamMetadataTool
+IOVDbSvc INFO Only 5 POOL conditions files will be open at once
+IOVDbSvc INFO Cache alignment will be done in 3 slices
+IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
+IOVDbSvc INFO Initialised with 3 connections and 14 folders
+IOVDbSvc INFO Service IOVDbSvc initialised successfully
+IOVDbSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+ByteStreamAddressProviderSvc INFO Initializing
ByteStreamAddressProviderSvc INFO -- Will fill Store with id = 0
+TagInfoMgr INFO AlgTool: TagInfoMgr.IOVDbMetaDataTool
+ClassIDSvc INFO getRegistryEntries: read 2810 CLIDRegistry entries for module ALL
+IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1844 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_TILE/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200
+IOVDbSvc INFO Added taginfo remove for /LAR/Align
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CES
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/LIN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/NLN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/EMS
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/FIBER
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/LIN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/NLN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/NOISE/SAMPLE
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
+IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
+IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
+ClassIDSvc INFO getRegistryEntries: read 23 CLIDRegistry entries for module ALL
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 HGTD_ID with CLID 79264207 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
+DetDescrCnvSvc INFO filling address for JTower_ID with CLID 218674799 and storage type 68 to detector store
+DetDescrCnvSvc INFO filling address for GTower_ID with CLID 49678914 and storage type 68 to detector store
GeoModelSvc::RDBMaterialManager WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RDBMaterialManager WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RDBMaterialManager WARNING Getting InDetMatComponents with default tag
@@ -285,11 +830,19 @@ LArHVLineID INFO setDictVe
LArHVLineID INFO [initLevelsFromDict] m_dict OK ...
LArHVLineID INFO [initialize_from_dictionary] > HV line range -> 11/1/48:79/0:15 | 11/1/148:179/0:15 | 11/1/80:93/0:7 | 11/1/180:193/0:7 | 11/1/200:231/0:15 | 11/1/232:263/0:15 | 11/1/296,297,306,307/0:15 | 11/1/299,304,305,308,309/0:15 | 11/1/264:279/0:15 | 11/1/280:295/0:15 | 11/1/0:47/0:15 | 11/1/320:322/0:15 | 11/1/100:147/0:15 | 11/1/324,325/0:15 | 11/1/312:315/0:15 | 11/1/316:319/0:15 | 11/1/300:303/0:15 | 11/1/310,311/0:15 | 11/1/323/0:15 | 11/1/326,327/0:15 | 11/1/94:99/0:15 | 11/1/194:199/0:15
LArHVLineID INFO [init_hashes()] > Hvline_size= 5008
+GeoModelSvc.LArDetectorToolNV INFO Keys for LAr are ATLAS-R2-2016-01-00-01 ATLAS
+GeoModelSvc.LArDetectorToolNV INFO Building LAr version LAr-Revised-17-01 while ATLAS version is ATLAS-R2-2016-01-00-01
+GeoModelSvc.LArDetectorToolNV INFO LAr Geometry Options:
+GeoModelSvc.LArDetectorToolNV INFO Sagging = false
+GeoModelSvc.LArDetectorToolNV INFO Barrel = ON
+GeoModelSvc.LArDetectorToolNV INFO Endcap = ON
+BarrelConstruction INFO Getting primary numbers for ATLAS, ATLAS-R2-2016-01-00-01
BarrelConstruction INFO Makes detailed absorber sandwich ? 1 1
BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
+ClassIDSvc INFO getRegistryEntries: read 3249 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -298,6 +851,9 @@ EMECConstruction INFO multi-lay
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstruction INFO Start building EC electronics geometry
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24124Kb Time = 0.68S
+GeoModelSvc.TileDetectorTool INFO Entering TileDetectorTool::create()
+TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
TileDddbManager INFO n_timod = 320
TileDddbManager INFO n_cuts = 9
@@ -306,9 +862,11 @@ TileDddbManager INFO n_tilb =
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDescrCnv INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a CaloCell_ID helper object in the detector store
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArEM_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -316,18 +874,90 @@ CaloIDHelper_IDDetDescrCnv INFO in create
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
AtlasDetectorID INFO initialize_from_dictionary - OK
+GeoModelSvc.TileDetectorTool INFO U-shape parameter from database is: 1
+GeoModelSvc.TileDetectorTool INFO Glue parameter from database is: 1
+GeoModelSvc.TileDetectorTool INFO Cs Tube parameter from database is: 0
+GeoModelSvc.TileDetectorTool INFO Entering TileAtlasFactory::create()
+GeoModelSvc.TileDetectorTool INFO Tile Geometry with Saddle supports, starting from TileCal-CSC-02 xxx
+GeoModelSvc.TileDetectorTool INFO => New BFingerLengthPos 430.5
+GeoModelSvc.TileDetectorTool INFO => New BFingerLengthNeg 420.5
+GeoModelSvc.TileDetectorTool INFO Positioning barrel with translation 0
+GeoModelSvc.TileDetectorTool INFO Positioning positive barrel finger with translation 3035.25
+GeoModelSvc.TileDetectorTool INFO Positioning negative barrel finger with translation -3030.25
+GeoModelSvc.TileDetectorTool INFO Positioning positive ext.barrel with translation 4854.75
+GeoModelSvc.TileDetectorTool INFO Positioning positive ext.barrel finger with translation ztrans= 6338.5
+GeoModelSvc.TileDetectorTool INFO Positioning positive ext.barrel saddle with translation ztrans= 6192.5
+GeoModelSvc.TileDetectorTool INFO Positive ITC envelope parameters: PLUG1 Rmin= 3438.85 Rmax= 4250 dzITC1= 154.5
+GeoModelSvc.TileDetectorTool INFO PLUG2 Rmin= 2981 Rmax= 3440 dzITC2= 47.425
+GeoModelSvc.TileDetectorTool INFO Positioning positive ITC with translation 3405
+GeoModelSvc.TileDetectorTool INFO Positioning positive Gap with translation 3552
+GeoModelSvc.TileDetectorTool INFO Positioning positive Crack with translation 3536
+GeoModelSvc.TileDetectorTool INFO Positioning negative ext.barrel with translation ztrans -4854.75
+GeoModelSvc.TileDetectorTool INFO Positioning negative ext.barrel finger with translation ztrans= -6338.5
+GeoModelSvc.TileDetectorTool INFO Positioning negative ext.barrel saddle with translation ztrans= -6192.5
+GeoModelSvc.TileDetectorTool INFO Negative ITC envelope parameters: PLUG1 Rmin= 3438.85 Rmax= 4250 dzITC1= 154.5
+GeoModelSvc.TileDetectorTool INFO PLUG2 Rmin= 2981 Rmax= 3440 dzITC2= 47.425
+GeoModelSvc.TileDetectorTool INFO Positioning negative ITC with translation -3405
+GeoModelSvc.TileDetectorTool INFO Positioning negative Gap with translation -3552
+GeoModelSvc.TileDetectorTool INFO Positioning negative Crack with translation -3536
+GeoModelSvc.TileDetectorTool INFO Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.TileDetectorTool INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.TileDetectorTool INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrManager INFO Entering create_elements()
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3528Kb Time = 0.2S
+ClassIDSvc INFO getRegistryEntries: read 71 CLIDRegistry entries for module ALL
+GeoModelSvc INFO AlgTool: GeoModelSvc.LArDetectorToolNV
+GeoModelSvc INFO AlgTool: GeoModelSvc.TileDetectorTool
+TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
+TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
CaloLVL1_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-R2-2016-01-00-01
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
+AthenaHiveEventLoopMgr INFO Initializing AthenaHiveEventLoopMgr
+ClassIDSvc 0 INFO getRegistryEntries: read 4391 CLIDRegistry entries for module ALL
+PyComponentMgr 0 INFO Initializing PyComponentMgr...
+Finalizer 0 INFO Initializing Finalizer...
+ClassIDSvc 0 INFO getRegistryEntries: read 553 CLIDRegistry entries for module ALL
+CondInputLoader 0 INFO Initializing CondInputLoader...
+ClassIDSvc 0 INFO getRegistryEntries: read 12 CLIDRegistry entries for module ALL
CondInputLoader 0 INFO Adding base classes:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' ) -> no bases
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' ) ->
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' ) ->
CondInputLoader 0 INFO Will create WriteCondHandle dependencies for the following DataObjects:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' )
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' )
TileBadChannelsCondAlg.TileCondProxyCool_OnlBch 0 INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OnlBch) for folder: "/TILE/ONL01/STATUS/ADC"
TileBadChannelsCondAlg.TileCondProxyCool_OflBch 0 INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OflBch) for folder: "/TILE/OFL02/STATUS/ADC"
TileBadChannelsCondAlg 0 INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
@@ -348,7 +978,7 @@ TileSampleNoiseCon...TileCondProxyCool_NoiseSample 0 INFO Creating
TileTimingCondAlg.TileCondProxyCool_AdcOffset 0 INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
ThreadPoolSvc 0 INFO no thread init tools attached
AvalancheSchedulerSvc 0 INFO Activating scheduler in a separate thread
-AvalancheSchedulerSvc 0 INFO Found 15 algorithms
+AvalancheSchedulerSvc 0 INFO Found 16 algorithms
AvalancheSchedulerSvc 0 INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
AvalancheSchedulerSvc 0 INFO o ( 'TileDigitsContainer' , 'StoreGateSvc+MuRcvDigitsCnt' ) required by Algorithm:
AvalancheSchedulerSvc 0 INFO * MuRcvDigitsCntDumper
@@ -364,23 +994,50 @@ AvalancheSchedulerSvc 0 INFO Task sche
AvalancheSchedulerSvc 0 INFO o Avalanche generation mode: disabled
AvalancheSchedulerSvc 0 INFO o Preemptive scheduling of CPU-blocking tasks: disabled
AvalancheSchedulerSvc 0 INFO o Scheduling of condition tasks: disabled
+ByteStreamInputSvc 0 INFO Initializing
+ROBDataProviderSvc 0 INFO Initializing
ROBDataProviderSvc 0 INFO ---> Filter out empty ROB fragments = 'filterEmptyROB':False
ROBDataProviderSvc 0 INFO ---> Filter out specific ROBs by Status Code: # ROBs = 0
ROBDataProviderSvc 0 INFO ---> Filter out Sub Detector ROBs by Status Code: # Sub Detectors = 0
EventSelector 0 INFO reinitialization...
AthenaHiveEventLoopMgr 0 INFO Setup EventSelector service EventSelector
ApplicationMgr 0 INFO Application Manager Initialized successfully
+PoolSvc 0 INFO Enabled implicit multithreading in ROOT via PersistencySvc to: 3
+CondInputLoader 0 INFO created CondCont<CaloRec::CaloCellPositionShift> with key 'ConditionStore+LArCellPositionShift'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/EMS'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/STATUS/ADC'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/ONL01/STATUS/ADC'
+CondInputLoader 0 INFO created CondCont<DetCondKeyTrans> with key 'ConditionStore+/LAR/Align'
+ByteStreamInputSvc 0 INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data12_8TeV.00204073.physics_JetTauEtmiss.merge.RAW._lb0144._SFO-5._0001.1
ApplicationMgr 0 INFO Application Manager Started successfully
AthenaHiveEventLoopMgr 0 INFO Starting loop on events
+EventPersistencySvc 0 0 INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistencySvc 0 0 INFO Added successfully Conversion service:ByteStreamCnvSvc
EventInfoByteStreamAuxCnv 0 0 INFO IsSimulation : 0
EventInfoByteStreamAuxCnv 0 0 INFO IsTestbeam : 0
EventInfoByteStreamAuxCnv 0 0 INFO IsCalibration : 0
AthenaHiveEventLoopMgr 0 0 INFO ===>>> start of run 204073 <<<===
+IOVDbSvc 0 0 INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder 0 0 INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder 0 0 INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
+IOVDbSvc 0 0 INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc 0 0 INFO Opened read transaction for POOL PersistencySvc
+DbSession 0 0 INFO Open DbSession
+Domain[ROOT_All] 0 0 INFO > Access DbDomain READ [ROOT_All]
+Domain[ROOT_All] 0 0 INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
+Domain[ROOT_All] 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
+RootDatabase.open 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv 0 0 INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDescrCnv 0 0 INFO in createObj: creating a CaloDescrManager object in the detector store
+ClassIDSvc 0 0 INFO getRegistryEntries: read 207 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID 0 0 INFO initialize_from_dictionary
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
@@ -394,19 +1051,268 @@ CaloIDHelper_IDDetDescrCnv 0 0 INFO in create
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
+TileNeighbour 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
CaloIdMgrDetDescrCnv 0 0 INFO Finished
+CaloIdMgrDetDescrCnv 0 0 INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
+Domain[ROOT_All] 0 0 INFO -> Access DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
+RootDatabase.open 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
+AthenaHiveEventLoopMgr 0 0 INFO ===>>> start processing event #1129572, run #204073 on slot 0, 0 events processed so far <<<===
+ClassIDSvc 0 0 INFO getRegistryEntries: read 495 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 1763 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 92 CLIDRegistry entries for module ALL
+ToolSvc.TileROD_Decoder.TileL2Builder 0 0 INFO TileL2Builder initialization completed
+ToolSvc.TileDigitsContByteStreamTool 0 0 INFO Initializing TileDigitsContByteStreamTool
+/cvmfs/atlas-condb.cern.ch/repo/conditions/...root 0 0 INFO Database being retired...
+Domain[ROOT_All] 0 0 INFO -> Deaccess DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
+/cvmfs/atlas-condb.cern.ch/repo/conditions/...root 0 0 INFO Database being retired...
+Domain[ROOT_All] 0 0 INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] 0 0 INFO > Deaccess DbDomain READ [ROOT_All]
+AthenaHiveEventLoopMgr 0 0 INFO ===>>> done processing event #1129572, run #204073 on slot 0, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 1 0 INFO ===>>> start processing event #1129665, run #204073 on slot 0, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 2 1 INFO ===>>> start processing event #1131212, run #204073 on slot 1, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 3 2 INFO ===>>> start processing event #1131086, run #204073 on slot 2, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 4 3 INFO ===>>> start processing event #1130272, run #204073 on slot 3, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 1 0 INFO ===>>> done processing event #1129665, run #204073 on slot 0, 2 events processed so far <<<===
+AthenaHiveEventLoopMgr 2 1 INFO ===>>> done processing event #1131212, run #204073 on slot 1, 3 events processed so far <<<===
+AthenaHiveEventLoopMgr 3 2 INFO ===>>> done processing event #1131086, run #204073 on slot 2, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 5 0 INFO ===>>> start processing event #1131269, run #204073 on slot 0, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 6 1 INFO ===>>> start processing event #1130716, run #204073 on slot 1, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 7 2 INFO ===>>> start processing event #1132019, run #204073 on slot 2, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 4 3 INFO ===>>> done processing event #1130272, run #204073 on slot 3, 5 events processed so far <<<===
+AthenaHiveEventLoopMgr 5 0 INFO ===>>> done processing event #1131269, run #204073 on slot 0, 6 events processed so far <<<===
+AthenaHiveEventLoopMgr 6 1 INFO ===>>> done processing event #1130716, run #204073 on slot 1, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 8 0 INFO ===>>> start processing event #1132092, run #204073 on slot 0, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 9 1 INFO ===>>> start processing event #1130238, run #204073 on slot 1, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 10 3 INFO ===>>> start processing event #1134553, run #204073 on slot 3, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 7 2 INFO ===>>> done processing event #1132019, run #204073 on slot 2, 8 events processed so far <<<===
+AthenaHiveEventLoopMgr 8 0 INFO ===>>> done processing event #1132092, run #204073 on slot 0, 9 events processed so far <<<===
+AthenaHiveEventLoopMgr 9 1 INFO ===>>> done processing event #1130238, run #204073 on slot 1, 10 events processed so far <<<===
+AthenaHiveEventLoopMgr 11 0 INFO ===>>> start processing event #1130999, run #204073 on slot 0, 10 events processed so far <<<===
+AthenaHiveEventLoopMgr 12 1 INFO ===>>> start processing event #1133461, run #204073 on slot 1, 10 events processed so far <<<===
+AthenaHiveEventLoopMgr 13 2 INFO ===>>> start processing event #1131152, run #204073 on slot 2, 10 events processed so far <<<===
+AthenaHiveEventLoopMgr 10 3 INFO ===>>> done processing event #1134553, run #204073 on slot 3, 11 events processed so far <<<===
+AthenaHiveEventLoopMgr 11 0 INFO ===>>> done processing event #1130999, run #204073 on slot 0, 12 events processed so far <<<===
+AthenaHiveEventLoopMgr 12 1 INFO ===>>> done processing event #1133461, run #204073 on slot 1, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 14 0 INFO ===>>> start processing event #1130142, run #204073 on slot 0, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 15 1 INFO ===>>> start processing event #1132770, run #204073 on slot 1, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 16 3 INFO ===>>> start processing event #1132365, run #204073 on slot 3, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 13 2 INFO ===>>> done processing event #1131152, run #204073 on slot 2, 14 events processed so far <<<===
+AthenaHiveEventLoopMgr 14 0 INFO ===>>> done processing event #1130142, run #204073 on slot 0, 15 events processed so far <<<===
+AthenaHiveEventLoopMgr 15 1 INFO ===>>> done processing event #1132770, run #204073 on slot 1, 16 events processed so far <<<===
+AthenaHiveEventLoopMgr 17 0 INFO ===>>> start processing event #1136791, run #204073 on slot 0, 16 events processed so far <<<===
+AthenaHiveEventLoopMgr 18 1 INFO ===>>> start processing event #1133781, run #204073 on slot 1, 16 events processed so far <<<===
+AthenaHiveEventLoopMgr 19 2 INFO ===>>> start processing event #1132067, run #204073 on slot 2, 16 events processed so far <<<===
+AthenaHiveEventLoopMgr 16 3 INFO ===>>> done processing event #1132365, run #204073 on slot 3, 17 events processed so far <<<===
+AthenaHiveEventLoopMgr 17 0 INFO ===>>> done processing event #1136791, run #204073 on slot 0, 18 events processed so far <<<===
+AthenaHiveEventLoopMgr 18 1 INFO ===>>> done processing event #1133781, run #204073 on slot 1, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 20 0 INFO ===>>> start processing event #1138637, run #204073 on slot 0, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 21 1 INFO ===>>> start processing event #1139495, run #204073 on slot 1, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 22 3 INFO ===>>> start processing event #1140193, run #204073 on slot 3, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 19 2 INFO ===>>> done processing event #1132067, run #204073 on slot 2, 20 events processed so far <<<===
+AthenaHiveEventLoopMgr 20 0 INFO ===>>> done processing event #1138637, run #204073 on slot 0, 21 events processed so far <<<===
+AthenaHiveEventLoopMgr 21 1 INFO ===>>> done processing event #1139495, run #204073 on slot 1, 22 events processed so far <<<===
+AthenaHiveEventLoopMgr 23 0 INFO ===>>> start processing event #1142953, run #204073 on slot 0, 22 events processed so far <<<===
+AthenaHiveEventLoopMgr 24 1 INFO ===>>> start processing event #1139127, run #204073 on slot 1, 22 events processed so far <<<===
+AthenaHiveEventLoopMgr 25 2 INFO ===>>> start processing event #1141272, run #204073 on slot 2, 22 events processed so far <<<===
+AthenaHiveEventLoopMgr 22 3 INFO ===>>> done processing event #1140193, run #204073 on slot 3, 23 events processed so far <<<===
+AthenaHiveEventLoopMgr 23 0 INFO ===>>> done processing event #1142953, run #204073 on slot 0, 24 events processed so far <<<===
+AthenaHiveEventLoopMgr 26 0 INFO ===>>> start processing event #1137117, run #204073 on slot 0, 24 events processed so far <<<===
+AthenaHiveEventLoopMgr 27 3 INFO ===>>> start processing event #1139599, run #204073 on slot 3, 24 events processed so far <<<===
+AthenaHiveEventLoopMgr 24 1 INFO ===>>> done processing event #1139127, run #204073 on slot 1, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 25 2 INFO ===>>> done processing event #1141272, run #204073 on slot 2, 26 events processed so far <<<===
+AthenaHiveEventLoopMgr 28 1 INFO ===>>> start processing event #1140314, run #204073 on slot 1, 26 events processed so far <<<===
+AthenaHiveEventLoopMgr 29 2 INFO ===>>> start processing event #1133685, run #204073 on slot 2, 26 events processed so far <<<===
+AthenaHiveEventLoopMgr 26 0 INFO ===>>> done processing event #1137117, run #204073 on slot 0, 27 events processed so far <<<===
+AthenaHiveEventLoopMgr 27 3 INFO ===>>> done processing event #1139599, run #204073 on slot 3, 28 events processed so far <<<===
+AthenaHiveEventLoopMgr 28 1 INFO ===>>> done processing event #1140314, run #204073 on slot 1, 29 events processed so far <<<===
+AthenaHiveEventLoopMgr 30 0 INFO ===>>> start processing event #1143279, run #204073 on slot 0, 29 events processed so far <<<===
+AthenaHiveEventLoopMgr 31 1 INFO ===>>> start processing event #1137563, run #204073 on slot 1, 29 events processed so far <<<===
+AthenaHiveEventLoopMgr 32 3 INFO ===>>> start processing event #1139927, run #204073 on slot 3, 29 events processed so far <<<===
+AthenaHiveEventLoopMgr 29 2 INFO ===>>> done processing event #1133685, run #204073 on slot 2, 30 events processed so far <<<===
+AthenaHiveEventLoopMgr 30 0 INFO ===>>> done processing event #1143279, run #204073 on slot 0, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 31 1 INFO ===>>> done processing event #1137563, run #204073 on slot 1, 32 events processed so far <<<===
+AthenaHiveEventLoopMgr 33 0 INFO ===>>> start processing event #1141197, run #204073 on slot 0, 32 events processed so far <<<===
+AthenaHiveEventLoopMgr 34 1 INFO ===>>> start processing event #1140039, run #204073 on slot 1, 32 events processed so far <<<===
+AthenaHiveEventLoopMgr 35 2 INFO ===>>> start processing event #1142531, run #204073 on slot 2, 32 events processed so far <<<===
+AthenaHiveEventLoopMgr 32 3 INFO ===>>> done processing event #1139927, run #204073 on slot 3, 33 events processed so far <<<===
+AthenaHiveEventLoopMgr 33 0 INFO ===>>> done processing event #1141197, run #204073 on slot 0, 34 events processed so far <<<===
+AthenaHiveEventLoopMgr 34 1 INFO ===>>> done processing event #1140039, run #204073 on slot 1, 35 events processed so far <<<===
+AthenaHiveEventLoopMgr 36 0 INFO ===>>> start processing event #1139475, run #204073 on slot 0, 35 events processed so far <<<===
+AthenaHiveEventLoopMgr 37 1 INFO ===>>> start processing event #1139958, run #204073 on slot 1, 35 events processed so far <<<===
+AthenaHiveEventLoopMgr 38 3 INFO ===>>> start processing event #1143765, run #204073 on slot 3, 35 events processed so far <<<===
+AthenaHiveEventLoopMgr 35 2 INFO ===>>> done processing event #1142531, run #204073 on slot 2, 36 events processed so far <<<===
+AthenaHiveEventLoopMgr 36 0 INFO ===>>> done processing event #1139475, run #204073 on slot 0, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 37 1 INFO ===>>> done processing event #1139958, run #204073 on slot 1, 38 events processed so far <<<===
+AthenaHiveEventLoopMgr 39 0 INFO ===>>> start processing event #1143097, run #204073 on slot 0, 38 events processed so far <<<===
+AthenaHiveEventLoopMgr 40 1 INFO ===>>> start processing event #1134147, run #204073 on slot 1, 38 events processed so far <<<===
+AthenaHiveEventLoopMgr 41 2 INFO ===>>> start processing event #1137156, run #204073 on slot 2, 38 events processed so far <<<===
+AthenaHiveEventLoopMgr 38 3 INFO ===>>> done processing event #1143765, run #204073 on slot 3, 39 events processed so far <<<===
+AthenaHiveEventLoopMgr 39 0 INFO ===>>> done processing event #1143097, run #204073 on slot 0, 40 events processed so far <<<===
+AthenaHiveEventLoopMgr 40 1 INFO ===>>> done processing event #1134147, run #204073 on slot 1, 41 events processed so far <<<===
+AthenaHiveEventLoopMgr 42 0 INFO ===>>> start processing event #1136377, run #204073 on slot 0, 41 events processed so far <<<===
+AthenaHiveEventLoopMgr 43 1 INFO ===>>> start processing event #1137842, run #204073 on slot 1, 41 events processed so far <<<===
+AthenaHiveEventLoopMgr 44 3 INFO ===>>> start processing event #1141705, run #204073 on slot 3, 41 events processed so far <<<===
+AthenaHiveEventLoopMgr 41 2 INFO ===>>> done processing event #1137156, run #204073 on slot 2, 42 events processed so far <<<===
+AthenaHiveEventLoopMgr 42 0 INFO ===>>> done processing event #1136377, run #204073 on slot 0, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 43 1 INFO ===>>> done processing event #1137842, run #204073 on slot 1, 44 events processed so far <<<===
+AthenaHiveEventLoopMgr 45 0 INFO ===>>> start processing event #1143410, run #204073 on slot 0, 44 events processed so far <<<===
+AthenaHiveEventLoopMgr 46 1 INFO ===>>> start processing event #1144170, run #204073 on slot 1, 44 events processed so far <<<===
+AthenaHiveEventLoopMgr 47 2 INFO ===>>> start processing event #1145987, run #204073 on slot 2, 44 events processed so far <<<===
+AthenaHiveEventLoopMgr 44 3 INFO ===>>> done processing event #1141705, run #204073 on slot 3, 45 events processed so far <<<===
+AthenaHiveEventLoopMgr 45 0 INFO ===>>> done processing event #1143410, run #204073 on slot 0, 46 events processed so far <<<===
+AthenaHiveEventLoopMgr 48 0 INFO ===>>> start processing event #1145633, run #204073 on slot 0, 46 events processed so far <<<===
+AthenaHiveEventLoopMgr 49 3 INFO ===>>> start processing event #1135005, run #204073 on slot 3, 46 events processed so far <<<===
+AthenaHiveEventLoopMgr 46 1 INFO ===>>> done processing event #1144170, run #204073 on slot 1, 47 events processed so far <<<===
+AthenaHiveEventLoopMgr 47 2 INFO ===>>> done processing event #1145987, run #204073 on slot 2, 48 events processed so far <<<===
+AthenaHiveEventLoopMgr 48 0 INFO ===>>> done processing event #1145633, run #204073 on slot 0, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 50 0 INFO ===>>> start processing event #1142167, run #204073 on slot 0, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 51 1 INFO ===>>> start processing event #1144646, run #204073 on slot 1, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 52 2 INFO ===>>> start processing event #1145027, run #204073 on slot 2, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 49 3 INFO ===>>> done processing event #1135005, run #204073 on slot 3, 50 events processed so far <<<===
+AthenaHiveEventLoopMgr 50 0 INFO ===>>> done processing event #1142167, run #204073 on slot 0, 51 events processed so far <<<===
+AthenaHiveEventLoopMgr 51 1 INFO ===>>> done processing event #1144646, run #204073 on slot 1, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 53 0 INFO ===>>> start processing event #1144112, run #204073 on slot 0, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 54 1 INFO ===>>> start processing event #1138485, run #204073 on slot 1, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 55 3 INFO ===>>> start processing event #1144565, run #204073 on slot 3, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 52 2 INFO ===>>> done processing event #1145027, run #204073 on slot 2, 53 events processed so far <<<===
+AthenaHiveEventLoopMgr 53 0 INFO ===>>> done processing event #1144112, run #204073 on slot 0, 54 events processed so far <<<===
+AthenaHiveEventLoopMgr 54 1 INFO ===>>> done processing event #1138485, run #204073 on slot 1, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 56 0 INFO ===>>> start processing event #1139498, run #204073 on slot 0, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 57 1 INFO ===>>> start processing event #1136546, run #204073 on slot 1, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 58 2 INFO ===>>> start processing event #1143799, run #204073 on slot 2, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 55 3 INFO ===>>> done processing event #1144565, run #204073 on slot 3, 56 events processed so far <<<===
+AthenaHiveEventLoopMgr 56 0 INFO ===>>> done processing event #1139498, run #204073 on slot 0, 57 events processed so far <<<===
+AthenaHiveEventLoopMgr 57 1 INFO ===>>> done processing event #1136546, run #204073 on slot 1, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 59 0 INFO ===>>> start processing event #1142877, run #204073 on slot 0, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 60 1 INFO ===>>> start processing event #1149894, run #204073 on slot 1, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 61 3 INFO ===>>> start processing event #1145364, run #204073 on slot 3, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 58 2 INFO ===>>> done processing event #1143799, run #204073 on slot 2, 59 events processed so far <<<===
+AthenaHiveEventLoopMgr 59 0 INFO ===>>> done processing event #1142877, run #204073 on slot 0, 60 events processed so far <<<===
+AthenaHiveEventLoopMgr 60 1 INFO ===>>> done processing event #1149894, run #204073 on slot 1, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 62 0 INFO ===>>> start processing event #1143770, run #204073 on slot 0, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 63 1 INFO ===>>> start processing event #1148361, run #204073 on slot 1, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 64 2 INFO ===>>> start processing event #1148167, run #204073 on slot 2, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 61 3 INFO ===>>> done processing event #1145364, run #204073 on slot 3, 62 events processed so far <<<===
+AthenaHiveEventLoopMgr 62 0 INFO ===>>> done processing event #1143770, run #204073 on slot 0, 63 events processed so far <<<===
+AthenaHiveEventLoopMgr 63 1 INFO ===>>> done processing event #1148361, run #204073 on slot 1, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 65 0 INFO ===>>> start processing event #1138948, run #204073 on slot 0, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 66 1 INFO ===>>> start processing event #1144808, run #204073 on slot 1, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 67 3 INFO ===>>> start processing event #1145832, run #204073 on slot 3, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 64 2 INFO ===>>> done processing event #1148167, run #204073 on slot 2, 65 events processed so far <<<===
+AthenaHiveEventLoopMgr 65 0 INFO ===>>> done processing event #1138948, run #204073 on slot 0, 66 events processed so far <<<===
+AthenaHiveEventLoopMgr 66 1 INFO ===>>> done processing event #1144808, run #204073 on slot 1, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 68 0 INFO ===>>> start processing event #1153100, run #204073 on slot 0, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 69 1 INFO ===>>> start processing event #1142524, run #204073 on slot 1, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 70 2 INFO ===>>> start processing event #1138294, run #204073 on slot 2, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 67 3 INFO ===>>> done processing event #1145832, run #204073 on slot 3, 68 events processed so far <<<===
+AthenaHiveEventLoopMgr 68 0 INFO ===>>> done processing event #1153100, run #204073 on slot 0, 69 events processed so far <<<===
+AthenaHiveEventLoopMgr 69 1 INFO ===>>> done processing event #1142524, run #204073 on slot 1, 70 events processed so far <<<===
+AthenaHiveEventLoopMgr 71 0 INFO ===>>> start processing event #1138350, run #204073 on slot 0, 70 events processed so far <<<===
+AthenaHiveEventLoopMgr 72 1 INFO ===>>> start processing event #1149424, run #204073 on slot 1, 70 events processed so far <<<===
+AthenaHiveEventLoopMgr 73 3 INFO ===>>> start processing event #1151102, run #204073 on slot 3, 70 events processed so far <<<===
+AthenaHiveEventLoopMgr 70 2 INFO ===>>> done processing event #1138294, run #204073 on slot 2, 71 events processed so far <<<===
+AthenaHiveEventLoopMgr 71 0 INFO ===>>> done processing event #1138350, run #204073 on slot 0, 72 events processed so far <<<===
+AthenaHiveEventLoopMgr 72 1 INFO ===>>> done processing event #1149424, run #204073 on slot 1, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 74 0 INFO ===>>> start processing event #1152242, run #204073 on slot 0, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 75 1 INFO ===>>> start processing event #1148416, run #204073 on slot 1, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 76 2 INFO ===>>> start processing event #1142753, run #204073 on slot 2, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 73 3 INFO ===>>> done processing event #1151102, run #204073 on slot 3, 74 events processed so far <<<===
+AthenaHiveEventLoopMgr 74 0 INFO ===>>> done processing event #1152242, run #204073 on slot 0, 75 events processed so far <<<===
+AthenaHiveEventLoopMgr 77 0 INFO ===>>> start processing event #1149997, run #204073 on slot 0, 75 events processed so far <<<===
+AthenaHiveEventLoopMgr 78 3 INFO ===>>> start processing event #1151617, run #204073 on slot 3, 75 events processed so far <<<===
+AthenaHiveEventLoopMgr 75 1 INFO ===>>> done processing event #1148416, run #204073 on slot 1, 76 events processed so far <<<===
+AthenaHiveEventLoopMgr 76 2 INFO ===>>> done processing event #1142753, run #204073 on slot 2, 77 events processed so far <<<===
+AthenaHiveEventLoopMgr 77 0 INFO ===>>> done processing event #1149997, run #204073 on slot 0, 78 events processed so far <<<===
+AthenaHiveEventLoopMgr 79 0 INFO ===>>> start processing event #1149794, run #204073 on slot 0, 78 events processed so far <<<===
+AthenaHiveEventLoopMgr 80 1 INFO ===>>> start processing event #1152504, run #204073 on slot 1, 78 events processed so far <<<===
+AthenaHiveEventLoopMgr 81 2 INFO ===>>> start processing event #1142485, run #204073 on slot 2, 78 events processed so far <<<===
+AthenaHiveEventLoopMgr 78 3 INFO ===>>> done processing event #1151617, run #204073 on slot 3, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 79 0 INFO ===>>> done processing event #1149794, run #204073 on slot 0, 80 events processed so far <<<===
+AthenaHiveEventLoopMgr 80 1 INFO ===>>> done processing event #1152504, run #204073 on slot 1, 81 events processed so far <<<===
+AthenaHiveEventLoopMgr 82 0 INFO ===>>> start processing event #1151364, run #204073 on slot 0, 81 events processed so far <<<===
+AthenaHiveEventLoopMgr 83 1 INFO ===>>> start processing event #1143901, run #204073 on slot 1, 81 events processed so far <<<===
+AthenaHiveEventLoopMgr 84 3 INFO ===>>> start processing event #1153979, run #204073 on slot 3, 81 events processed so far <<<===
+AthenaHiveEventLoopMgr 81 2 INFO ===>>> done processing event #1142485, run #204073 on slot 2, 82 events processed so far <<<===
+AthenaHiveEventLoopMgr 82 0 INFO ===>>> done processing event #1151364, run #204073 on slot 0, 83 events processed so far <<<===
+AthenaHiveEventLoopMgr 83 1 INFO ===>>> done processing event #1143901, run #204073 on slot 1, 84 events processed so far <<<===
+AthenaHiveEventLoopMgr 85 0 INFO ===>>> start processing event #1150212, run #204073 on slot 0, 84 events processed so far <<<===
+AthenaHiveEventLoopMgr 86 1 INFO ===>>> start processing event #1152633, run #204073 on slot 1, 84 events processed so far <<<===
+AthenaHiveEventLoopMgr 87 2 INFO ===>>> start processing event #1155482, run #204073 on slot 2, 84 events processed so far <<<===
+AthenaHiveEventLoopMgr 84 3 INFO ===>>> done processing event #1153979, run #204073 on slot 3, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 85 0 INFO ===>>> done processing event #1150212, run #204073 on slot 0, 86 events processed so far <<<===
+AthenaHiveEventLoopMgr 86 1 INFO ===>>> done processing event #1152633, run #204073 on slot 1, 87 events processed so far <<<===
+AthenaHiveEventLoopMgr 88 0 INFO ===>>> start processing event #1150472, run #204073 on slot 0, 87 events processed so far <<<===
+AthenaHiveEventLoopMgr 89 1 INFO ===>>> start processing event #1140275, run #204073 on slot 1, 87 events processed so far <<<===
+AthenaHiveEventLoopMgr 90 3 INFO ===>>> start processing event #1145882, run #204073 on slot 3, 87 events processed so far <<<===
+AthenaHiveEventLoopMgr 87 2 INFO ===>>> done processing event #1155482, run #204073 on slot 2, 88 events processed so far <<<===
+AthenaHiveEventLoopMgr 88 0 INFO ===>>> done processing event #1150472, run #204073 on slot 0, 89 events processed so far <<<===
+AthenaHiveEventLoopMgr 89 1 INFO ===>>> done processing event #1140275, run #204073 on slot 1, 90 events processed so far <<<===
+AthenaHiveEventLoopMgr 91 0 INFO ===>>> start processing event #1151732, run #204073 on slot 0, 90 events processed so far <<<===
+AthenaHiveEventLoopMgr 92 1 INFO ===>>> start processing event #1137896, run #204073 on slot 1, 90 events processed so far <<<===
+AthenaHiveEventLoopMgr 93 2 INFO ===>>> start processing event #1156381, run #204073 on slot 2, 90 events processed so far <<<===
+AthenaHiveEventLoopMgr 90 3 INFO ===>>> done processing event #1145882, run #204073 on slot 3, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 91 0 INFO ===>>> done processing event #1151732, run #204073 on slot 0, 92 events processed so far <<<===
+AthenaHiveEventLoopMgr 92 1 INFO ===>>> done processing event #1137896, run #204073 on slot 1, 93 events processed so far <<<===
+AthenaHiveEventLoopMgr 94 0 INFO ===>>> start processing event #1149161, run #204073 on slot 0, 93 events processed so far <<<===
+AthenaHiveEventLoopMgr 95 1 INFO ===>>> start processing event #1153794, run #204073 on slot 1, 93 events processed so far <<<===
+AthenaHiveEventLoopMgr 96 3 INFO ===>>> start processing event #1151312, run #204073 on slot 3, 93 events processed so far <<<===
+AthenaHiveEventLoopMgr 93 2 INFO ===>>> done processing event #1156381, run #204073 on slot 2, 94 events processed so far <<<===
+AthenaHiveEventLoopMgr 94 0 INFO ===>>> done processing event #1149161, run #204073 on slot 0, 95 events processed so far <<<===
+AthenaHiveEventLoopMgr 95 1 INFO ===>>> done processing event #1153794, run #204073 on slot 1, 96 events processed so far <<<===
+AthenaHiveEventLoopMgr 97 0 INFO ===>>> start processing event #1148893, run #204073 on slot 0, 96 events processed so far <<<===
+AthenaHiveEventLoopMgr 98 1 INFO ===>>> start processing event #1156938, run #204073 on slot 1, 96 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 2 INFO ===>>> start processing event #1156351, run #204073 on slot 2, 96 events processed so far <<<===
+AthenaHiveEventLoopMgr 96 3 INFO ===>>> done processing event #1151312, run #204073 on slot 3, 97 events processed so far <<<===
+AthenaHiveEventLoopMgr 97 0 INFO ===>>> done processing event #1148893, run #204073 on slot 0, 98 events processed so far <<<===
+AthenaHiveEventLoopMgr 98 1 INFO ===>>> done processing event #1156938, run #204073 on slot 1, 99 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 2 INFO ===>>> done processing event #1156351, run #204073 on slot 2, 100 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 2 INFO ---> Loop Finished (seconds): 5.12013
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
+SGInputLoader INFO Finalizing SGInputLoader...
+Finalizer INFO Finalizing Finalizer...
Finalize: compared 20 dumps
+CondInputLoader INFO Finalizing CondInputLoader...
+AvalancheSchedulerSvc INFO Joining Scheduler thread
+PyComponentMgr INFO Finalizing PyComponentMgr...
+EventDataSvc INFO Finalizing EventDataSvc
IdDictDetDescrCnv INFO in finalize
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.02 ))s
+IOVDbSvc INFO bytes in (( 0.05 ))s
+IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.05 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 1 nFolders: 11 ReadTime: (( 0.00 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
+ToolSvc.TileDigitsContByteStreamTool INFO Finalizing TileDigitsContByteStreamTool successfuly
+ToolSvc.TileROD_Decoder.TileL2Builder INFO Finalizing
ToolSvc.ByteStreamMetadataTool INFO in finalize()
*****Chrono***** INFO ****************************************************************************************************
+*****Chrono***** INFO WARNING: MT job; statistics are unreliable
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
+cObjR_ALL INFO Time User : Tot= 130 [ms] Ave/Min/Max= 65(+- 65)/ 0/ 130 [ms] #= 2
+cObj_ALL INFO Time User : Tot= 180 [ms] Ave/Min/Max= 90(+- 70)/ 20/ 160 [ms] #= 2
+ChronoStatSvc INFO Time User : Tot= 11.3 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.finalize() INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileL2ContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileL2ContByteStreamCnv_test.ref
index 68fbf36bbb51..f5c91815f4b1 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileL2ContByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileL2ContByteStreamCnv_test.ref
@@ -1,6 +1,20 @@
+Sat Aug 21 21:55:46 CEST 2021
+Preloading tcmalloc_minimal.so
+Py:Athena INFO including file "AthenaCommon/Preparation.py"
+Py:Athena INFO using release [WorkDir-22.0.42] [x86_64-centos7-gcc8-opt] [master-calo-ctests/ec2fa09c9e3] -- built on [2021-08-21T2138]
+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 "TileByteStream/TileL2ContByteStreamCnv_test.py"
+Py:Athena INFO SetGeometryVersion.py obtained major release version 22
+Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
+Py:ConfigurableDb INFO Read module info for 5069 configurables from 8 genConfDb files
+Py:ConfigurableDb INFO No duplicates have been found: that's good !
+EventInfoMgtInit: Got release version Athena-22.0.42
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
+Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
+Py:TileConditions_jobOptions.py INFO Forcing RUN2 (2014-2017) cabling for run 204073 with geometry ATLAS-R2-2016-01-00-01
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo for 7 samples
Py:TileConditions_jobOptions.py INFO setting up COOL for TileCal conditions data
Py:TileInfoConf. INFO Changing default TileBadChanTool configuration to COOL source
@@ -10,16 +24,111 @@ Py:TileInfoConf. INFO Changing default TileCondToolTiming configuration to C
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise for Opt.Filter without iterations
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
+Py:Athena INFO including file "AthenaCommon/runbatch.py"
+ApplicationMgr SUCCESS
+====================================================================================================================================
+ Welcome to ApplicationMgr (GaudiCoreSvc v36r0)
+ running on aibuild028.cern.ch on Sat Aug 21 21:56:00 2021
+====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
+ClassIDSvc INFO getRegistryEntries: read 6689 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
+MetaDataSvc INFO Initializing MetaDataSvc
+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/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+PoolSvc INFO Successfully setup replica sorting algorithm
+PoolSvc INFO Setting up APR FileCatalog and Streams
+PoolSvc INFO Unable find catalog apcfile:poolcond/PoolCat_oflcond.xml in $ATLAS_POOLCOND_PATH and $DATAPATH
+PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
+PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+ToolSvc.ByteStr... INFO Initializing
+MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool','ByteStreamMetadataTool'])
+MetaDataSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+MetaDataSvc INFO AlgTool: ToolSvc.ByteStreamMetadataTool
+IOVDbSvc INFO Only 5 POOL conditions files will be open at once
+IOVDbSvc INFO Cache alignment will be done in 3 slices
+IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
+IOVDbSvc INFO Initialised with 3 connections and 14 folders
+IOVDbSvc INFO Service IOVDbSvc initialised successfully
+IOVDbSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+ByteStreamAddre... INFO Initializing
ByteStreamAddre... INFO -- Will fill Store with id = 0
+TagInfoMgr INFO AlgTool: TagInfoMgr.IOVDbMetaDataTool
+ClassIDSvc INFO getRegistryEntries: read 2810 CLIDRegistry entries for module ALL
+IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+ClassIDSvc INFO getRegistryEntries: read 273 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_TILE/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200
+IOVDbSvc INFO Added taginfo remove for /LAR/Align
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CES
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/LIN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/NLN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/EMS
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/FIBER
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/LIN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/NLN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/NOISE/SAMPLE
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
+IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
+IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
+ClassIDSvc INFO getRegistryEntries: read 1854 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 23 CLIDRegistry entries for module ALL
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 HGTD_ID with CLID 79264207 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
+DetDescrCnvSvc INFO filling address for JTower_ID with CLID 218674799 and storage type 68 to detector store
+DetDescrCnvSvc INFO filling address for GTower_ID with CLID 49678914 and storage type 68 to detector store
GeoModelSvc::RD...WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RD...WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RD...WARNING Getting InDetMatComponents with default tag
@@ -59,15 +168,19 @@ LArHVLineID INFO setDictVersion of LArHighVoltage is OK
LArHVLineID INFO [initLevelsFromDict] m_dict OK ...
LArHVLineID INFO [initialize_from_dictionary] > HV line range -> 11/1/48:79/0:15 | 11/1/148:179/0:15 | 11/1/80:93/0:7 | 11/1/180:193/0:7 | 11/1/200:231/0:15 | 11/1/232:263/0:15 | 11/1/296,297,306,307/0:15 | 11/1/299,304,305,308,309/0:15 | 11/1/264:279/0:15 | 11/1/280:295/0:15 | 11/1/0:47/0:15 | 11/1/320:322/0:15 | 11/1/100:147/0:15 | 11/1/324,325/0:15 | 11/1/312:315/0:15 | 11/1/316:319/0:15 | 11/1/300:303/0:15 | 11/1/310,311/0:15 | 11/1/323/0:15 | 11/1/326,327/0:15 | 11/1/94:99/0:15 | 11/1/194:199/0:15
LArHVLineID INFO [init_hashes()] > Hvline_size= 5008
+GeoModelSvc.LAr... INFO Keys for LAr are ATLAS-R2-2016-01-00-01 ATLAS
+GeoModelSvc.LAr... INFO Building LAr version LAr-Revised-17-01 while ATLAS version is ATLAS-R2-2016-01-00-01
GeoModelSvc.LAr... INFO LAr Geometry Options:
GeoModelSvc.LAr... INFO Sagging = false
GeoModelSvc.LAr... INFO Barrel = ON
GeoModelSvc.LAr... INFO Endcap = ON
+BarrelConstruction INFO Getting primary numbers for ATLAS, ATLAS-R2-2016-01-00-01
BarrelConstruction INFO Makes detailed absorber sandwich ? 1 1
BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
+ClassIDSvc INFO getRegistryEntries: read 3249 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -76,6 +189,9 @@ EMECConstruction INFO multi-layered version of absorbers activated, paramete
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstru... INFO Start building EC electronics geometry
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24124Kb Time = 0.53S
+GeoModelSvc.Til... INFO Entering TileDetectorTool::create()
+TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
TileDddbManager INFO n_timod = 320
TileDddbManager INFO n_cuts = 9
@@ -84,9 +200,11 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloCell_ID helper object in the detector store
CaloIDHelper_ID... INFO in createObj: creating a LArEM_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -94,6 +212,9 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -128,13 +249,50 @@ GeoModelSvc.Til... INFO Global positioning of barrel with rotation (0,0,0)) a
GeoModelSvc.Til... INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
GeoModelSvc.Til... INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrMan... INFO Entering create_elements()
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 4552Kb Time = 0.15S
+ClassIDSvc INFO getRegistryEntries: read 71 CLIDRegistry entries for module ALL
+GeoModelSvc INFO AlgTool: GeoModelSvc.LArDetectorToolNV
+GeoModelSvc INFO AlgTool: GeoModelSvc.TileDetectorTool
+TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
+TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_ID... INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
CaloLVL1_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-R2-2016-01-00-01
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
+AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr
+ClassIDSvc INFO getRegistryEntries: read 444 CLIDRegistry entries for module ALL
+CondInputLoader INFO Initializing CondInputLoader...
+ClassIDSvc INFO getRegistryEntries: read 12 CLIDRegistry entries for module ALL
CondInputLoader INFO Adding base classes:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' ) -> no bases
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' ) ->
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' ) ->
CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' )
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' )
TileBadChannels... INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OnlBch) for folder: "/TILE/ONL01/STATUS/ADC"
TileBadChannels... INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OflBch) for folder: "/TILE/OFL02/STATUS/ADC"
TileBadChannels... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
@@ -153,22 +311,52 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlEms) for folder: "/TILE/OFL02/CALIB/EMS"
TileSampleNoise... INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.TileCondProxyCool_NoiseSample) for folder: "/TILE/OFL02/NOISE/SAMPLE"
TileTimingCondA... INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
+ClassIDSvc INFO getRegistryEntries: read 4121 CLIDRegistry entries for module ALL
+PyComponentMgr INFO Initializing PyComponentMgr...
+Finalizer INFO Initializing Finalizer...
+ByteStreamInputSvc INFO Initializing
+ROBDataProviderSvc INFO Initializing
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
EventSelector INFO reinitialization...
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
+ClassIDSvc INFO getRegistryEntries: read 379 CLIDRegistry entries for module ALL
+ByteStreamInputSvc INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data12_8TeV.00204073.physics_JetTauEtmiss.merge.RAW._lb0144._SFO-5._0001.1
+CondInputLoader INFO created CondCont<CaloRec::CaloCellPositionShift> with key 'ConditionStore+LArCellPositionShift'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/EMS'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/STATUS/ADC'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/ONL01/STATUS/ADC'
+CondInputLoader INFO created CondCont<DetCondKeyTrans> with key 'ConditionStore+/LAR/Align'
ApplicationMgr INFO Application Manager Started successfully
+EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistenc... INFO Added successfully Conversion service:ByteStreamCnvSvc
EventInfoByteSt... INFO IsSimulation : 0
EventInfoByteSt... INFO IsTestbeam : 0
EventInfoByteSt... INFO IsCalibration : 0
AthenaEventLoopMgr INFO ===>>> start of run 204073 <<<===
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
+ClassIDSvc INFO getRegistryEntries: read 207 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -182,10 +370,22 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
+CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
+AthenaEventLoopMgr INFO ===>>> start processing event #1129572, run #204073 0 events processed so far <<<===
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCes-SIM-06 for folder /TILE/OFL02/CALIB/CES
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCisFitLin-COM-00 for folder /TILE/OFL02/CALIB/CIS/FIT/LIN
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCisFitNln-COM-00 for folder /TILE/OFL02/CALIB/CIS/FIT/NLN
@@ -196,6 +396,8 @@ IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02Cali
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02NoiseSample-TwoGauss-19 for folder /TILE/OFL02/NOISE/SAMPLE
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02StatusAdc-IOVDEP-03 for folder /TILE/OFL02/STATUS/ADC
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02TimeChanneloffsetPhy-000-00 for folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY
+IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200
+LArAlignCondAlg INFO recorded new GeoAlignmentStore object for LAr with key LArAlignmentStore and range {[177530,l:0] - [INVALID]}
TileBadChannels... INFO Updating TileBchStatus::isBad() definition from DB
TileBadChannels... INFO Updating TileBchStatus::isNoisy() definition from DB
TileBadChannels... INFO No TileBchStatus::isNoGainL1() definition found in DB, using defaults
@@ -207,25 +409,272 @@ TileBadChannels... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
TileBadChannels... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
TileBadChannels... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
TileBadChannels... INFO No drawer trips probabilities found in DB
+ClassIDSvc INFO getRegistryEntries: read 2258 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 92 CLIDRegistry entries for module ALL
+ToolSvc.TileROD... INFO TileL2Builder initialization completed
+ToolSvc.TileL2C... INFO Initializing TileL2ContByteStreamTool
+AthenaEventLoopMgr INFO ===>>> done processing event #1129572, run #204073 1 events processed so far <<<===
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
+AthenaEventLoopMgr INFO ===>>> start processing event #1129665, run #204073 1 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1129665, run #204073 2 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1131212, run #204073 2 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1131212, run #204073 3 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1131086, run #204073 3 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1131086, run #204073 4 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1130272, run #204073 4 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1130272, run #204073 5 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1131269, run #204073 5 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1131269, run #204073 6 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1130716, run #204073 6 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1130716, run #204073 7 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1132019, run #204073 7 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1132019, run #204073 8 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1132092, run #204073 8 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1132092, run #204073 9 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1130238, run #204073 9 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1130238, run #204073 10 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1134553, run #204073 10 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1134553, run #204073 11 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1130999, run #204073 11 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1130999, run #204073 12 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1133461, run #204073 12 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1133461, run #204073 13 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1131152, run #204073 13 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1131152, run #204073 14 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1130142, run #204073 14 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1130142, run #204073 15 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1132770, run #204073 15 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1132770, run #204073 16 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1132365, run #204073 16 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1132365, run #204073 17 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1136791, run #204073 17 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1136791, run #204073 18 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1133781, run #204073 18 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1133781, run #204073 19 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1132067, run #204073 19 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1132067, run #204073 20 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1138637, run #204073 20 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1138637, run #204073 21 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139495, run #204073 21 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139495, run #204073 22 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1140193, run #204073 22 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1140193, run #204073 23 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142953, run #204073 23 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142953, run #204073 24 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139127, run #204073 24 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139127, run #204073 25 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1141272, run #204073 25 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1141272, run #204073 26 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1137117, run #204073 26 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1137117, run #204073 27 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139599, run #204073 27 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139599, run #204073 28 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1140314, run #204073 28 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1140314, run #204073 29 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1133685, run #204073 29 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1133685, run #204073 30 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143279, run #204073 30 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143279, run #204073 31 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1137563, run #204073 31 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1137563, run #204073 32 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139927, run #204073 32 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139927, run #204073 33 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1141197, run #204073 33 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1141197, run #204073 34 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1140039, run #204073 34 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1140039, run #204073 35 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142531, run #204073 35 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142531, run #204073 36 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139475, run #204073 36 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139475, run #204073 37 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139958, run #204073 37 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139958, run #204073 38 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143765, run #204073 38 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143765, run #204073 39 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143097, run #204073 39 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143097, run #204073 40 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1134147, run #204073 40 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1134147, run #204073 41 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1137156, run #204073 41 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1137156, run #204073 42 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1136377, run #204073 42 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1136377, run #204073 43 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1137842, run #204073 43 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1137842, run #204073 44 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1141705, run #204073 44 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1141705, run #204073 45 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143410, run #204073 45 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143410, run #204073 46 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1144170, run #204073 46 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1144170, run #204073 47 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1145987, run #204073 47 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1145987, run #204073 48 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1145633, run #204073 48 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1145633, run #204073 49 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1135005, run #204073 49 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1135005, run #204073 50 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142167, run #204073 50 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142167, run #204073 51 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1144646, run #204073 51 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1144646, run #204073 52 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1145027, run #204073 52 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1145027, run #204073 53 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1144112, run #204073 53 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1144112, run #204073 54 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1138485, run #204073 54 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1138485, run #204073 55 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1144565, run #204073 55 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1144565, run #204073 56 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139498, run #204073 56 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139498, run #204073 57 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1136546, run #204073 57 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1136546, run #204073 58 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143799, run #204073 58 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143799, run #204073 59 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142877, run #204073 59 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142877, run #204073 60 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1149894, run #204073 60 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1149894, run #204073 61 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1145364, run #204073 61 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1145364, run #204073 62 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143770, run #204073 62 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143770, run #204073 63 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1148361, run #204073 63 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1148361, run #204073 64 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1148167, run #204073 64 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1148167, run #204073 65 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1138948, run #204073 65 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1138948, run #204073 66 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1144808, run #204073 66 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1144808, run #204073 67 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1145832, run #204073 67 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1145832, run #204073 68 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1153100, run #204073 68 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1153100, run #204073 69 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142524, run #204073 69 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142524, run #204073 70 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1138294, run #204073 70 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1138294, run #204073 71 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1138350, run #204073 71 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1138350, run #204073 72 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1149424, run #204073 72 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1149424, run #204073 73 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1151102, run #204073 73 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1151102, run #204073 74 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1152242, run #204073 74 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1152242, run #204073 75 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1148416, run #204073 75 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1148416, run #204073 76 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142753, run #204073 76 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142753, run #204073 77 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1149997, run #204073 77 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1149997, run #204073 78 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1151617, run #204073 78 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1151617, run #204073 79 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1149794, run #204073 79 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1149794, run #204073 80 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1152504, run #204073 80 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1152504, run #204073 81 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142485, run #204073 81 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142485, run #204073 82 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1151364, run #204073 82 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1151364, run #204073 83 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143901, run #204073 83 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143901, run #204073 84 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1153979, run #204073 84 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1153979, run #204073 85 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1150212, run #204073 85 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1150212, run #204073 86 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1152633, run #204073 86 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1152633, run #204073 87 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1155482, run #204073 87 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1155482, run #204073 88 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1150472, run #204073 88 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1150472, run #204073 89 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1140275, run #204073 89 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1140275, run #204073 90 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1145882, run #204073 90 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1145882, run #204073 91 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1151732, run #204073 91 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1151732, run #204073 92 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1137896, run #204073 92 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1137896, run #204073 93 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1156381, run #204073 93 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1156381, run #204073 94 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1149161, run #204073 94 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1149161, run #204073 95 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1153794, run #204073 95 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1153794, run #204073 96 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1151312, run #204073 96 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1151312, run #204073 97 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1148893, run #204073 97 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1148893, run #204073 98 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1156938, run #204073 98 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1156938, run #204073 99 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1156351, run #204073 99 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1156351, run #204073 100 events processed so far <<<===
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
+CondInputLoader INFO Finalizing CondInputLoader...
+Finalizer INFO Finalizing Finalizer...
Finalize: compared 10 dumps
+PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/2 objs/chan/bytes 1/1/170 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641504 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/93060 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.00 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/2 objs/chan/bytes 2/1/390 (( 0.03 ))s
+IOVDbSvc INFO bytes in (( 0.27 ))s
+IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 3 nFolders: 2 ReadTime: (( 0.05 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.21 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
+ToolSvc.TileROD... INFO Finalizing
ToolSvc.ByteStr... INFO in finalize()
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
+cObjR_ALL INFO Time User : Tot= 150 [ms] Ave/Min/Max= 37.5(+- 59.3)/ 0/ 140 [ms] #= 4
+cObj_ALL INFO Time User : Tot= 190 [ms] Ave/Min/Max= 12.7(+- 40.1)/ 0/ 160 [ms] #= 15
+ChronoStatSvc INFO Time User : Tot= 8.87 [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"
+Sat Aug 21 21:56:14 CEST 2021
+Preloading tcmalloc_minimal.so
+Py:Athena INFO including file "AthenaCommon/Preparation.py"
+Py:Athena INFO using release [WorkDir-22.0.42] [x86_64-centos7-gcc8-opt] [master-calo-ctests/ec2fa09c9e3] -- built on [2021-08-21T2138]
+Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO configuring AthenaHive with [4] concurrent threads and [4] concurrent events
Py:AlgScheduler INFO setting up AvalancheSchedulerSvc/AvalancheSchedulerSvc with 4 threads
+Py:Athena INFO including file "AthenaCommon/Execution.py"
+Py:Athena INFO including file "TileByteStream/TileL2ContByteStreamCnv_test.py"
+Py:Athena INFO SetGeometryVersion.py obtained major release version 22
+Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
+Py:ConfigurableDb INFO Read module info for 5069 configurables from 8 genConfDb files
+Py:ConfigurableDb INFO No duplicates have been found: that's good !
+EventInfoMgtInit: Got release version Athena-22.0.42
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
+Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
+Py:TileConditions_jobOptions.py INFO Forcing RUN2 (2014-2017) cabling for run 204073 with geometry ATLAS-R2-2016-01-00-01
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo for 7 samples
Py:TileConditions_jobOptions.py INFO setting up COOL for TileCal conditions data
Py:TileInfoConf. INFO Changing default TileBadChanTool configuration to COOL source
@@ -235,17 +684,112 @@ Py:TileInfoConf. INFO Changing default TileCondToolTiming configuration to C
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise for Opt.Filter without iterations
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
+Py:Athena INFO including file "AthenaCommon/runbatch.py"
MessageSvc INFO Activating in a separate thread
+ApplicationMgr SUCCESS
+====================================================================================================================================
+ Welcome to ApplicationMgr (GaudiCoreSvc v36r0)
+ running on aibuild028.cern.ch on Sat Aug 21 21:56:29 2021
+====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
+ClassIDSvc INFO getRegistryEntries: read 6689 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
+MetaDataSvc INFO Initializing MetaDataSvc
+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/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+PoolSvc INFO Successfully setup replica sorting algorithm
+PoolSvc INFO Setting up APR FileCatalog and Streams
+PoolSvc INFO Unable find catalog apcfile:poolcond/PoolCat_oflcond.xml in $ATLAS_POOLCOND_PATH and $DATAPATH
+PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
+PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+ToolSvc.ByteStreamMetadataTool INFO Initializing
+MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool','ByteStreamMetadataTool'])
+MetaDataSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+MetaDataSvc INFO AlgTool: ToolSvc.ByteStreamMetadataTool
+IOVDbSvc INFO Only 5 POOL conditions files will be open at once
+IOVDbSvc INFO Cache alignment will be done in 3 slices
+IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
+IOVDbSvc INFO Initialised with 3 connections and 14 folders
+IOVDbSvc INFO Service IOVDbSvc initialised successfully
+IOVDbSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+ByteStreamAddressProviderSvc INFO Initializing
ByteStreamAddressProviderSvc INFO -- Will fill Store with id = 0
+TagInfoMgr INFO AlgTool: TagInfoMgr.IOVDbMetaDataTool
+ClassIDSvc INFO getRegistryEntries: read 2810 CLIDRegistry entries for module ALL
+IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+ClassIDSvc INFO getRegistryEntries: read 273 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_TILE/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200
+IOVDbSvc INFO Added taginfo remove for /LAR/Align
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CES
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/LIN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/NLN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/EMS
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/FIBER
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/LIN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/NLN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/NOISE/SAMPLE
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
+IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
+IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
+ClassIDSvc INFO getRegistryEntries: read 1854 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 23 CLIDRegistry entries for module ALL
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 HGTD_ID with CLID 79264207 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
+DetDescrCnvSvc INFO filling address for JTower_ID with CLID 218674799 and storage type 68 to detector store
+DetDescrCnvSvc INFO filling address for GTower_ID with CLID 49678914 and storage type 68 to detector store
GeoModelSvc::RDBMaterialManager WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RDBMaterialManager WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RDBMaterialManager WARNING Getting InDetMatComponents with default tag
@@ -285,11 +829,19 @@ LArHVLineID INFO setDictVe
LArHVLineID INFO [initLevelsFromDict] m_dict OK ...
LArHVLineID INFO [initialize_from_dictionary] > HV line range -> 11/1/48:79/0:15 | 11/1/148:179/0:15 | 11/1/80:93/0:7 | 11/1/180:193/0:7 | 11/1/200:231/0:15 | 11/1/232:263/0:15 | 11/1/296,297,306,307/0:15 | 11/1/299,304,305,308,309/0:15 | 11/1/264:279/0:15 | 11/1/280:295/0:15 | 11/1/0:47/0:15 | 11/1/320:322/0:15 | 11/1/100:147/0:15 | 11/1/324,325/0:15 | 11/1/312:315/0:15 | 11/1/316:319/0:15 | 11/1/300:303/0:15 | 11/1/310,311/0:15 | 11/1/323/0:15 | 11/1/326,327/0:15 | 11/1/94:99/0:15 | 11/1/194:199/0:15
LArHVLineID INFO [init_hashes()] > Hvline_size= 5008
+GeoModelSvc.LArDetectorToolNV INFO Keys for LAr are ATLAS-R2-2016-01-00-01 ATLAS
+GeoModelSvc.LArDetectorToolNV INFO Building LAr version LAr-Revised-17-01 while ATLAS version is ATLAS-R2-2016-01-00-01
+GeoModelSvc.LArDetectorToolNV INFO LAr Geometry Options:
+GeoModelSvc.LArDetectorToolNV INFO Sagging = false
+GeoModelSvc.LArDetectorToolNV INFO Barrel = ON
+GeoModelSvc.LArDetectorToolNV INFO Endcap = ON
+BarrelConstruction INFO Getting primary numbers for ATLAS, ATLAS-R2-2016-01-00-01
BarrelConstruction INFO Makes detailed absorber sandwich ? 1 1
BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
+ClassIDSvc INFO getRegistryEntries: read 3249 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -298,6 +850,9 @@ EMECConstruction INFO multi-lay
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstruction INFO Start building EC electronics geometry
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24124Kb Time = 0.61S
+GeoModelSvc.TileDetectorTool INFO Entering TileDetectorTool::create()
+TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
TileDddbManager INFO n_timod = 320
TileDddbManager INFO n_cuts = 9
@@ -306,9 +861,11 @@ TileDddbManager INFO n_tilb =
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDescrCnv INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a CaloCell_ID helper object in the detector store
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArEM_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -316,18 +873,90 @@ CaloIDHelper_IDDetDescrCnv INFO in create
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
AtlasDetectorID INFO initialize_from_dictionary - OK
+GeoModelSvc.TileDetectorTool INFO U-shape parameter from database is: 1
+GeoModelSvc.TileDetectorTool INFO Glue parameter from database is: 1
+GeoModelSvc.TileDetectorTool INFO Cs Tube parameter from database is: 0
+GeoModelSvc.TileDetectorTool INFO Entering TileAtlasFactory::create()
+GeoModelSvc.TileDetectorTool INFO Tile Geometry with Saddle supports, starting from TileCal-CSC-02 xxx
+GeoModelSvc.TileDetectorTool INFO => New BFingerLengthPos 430.5
+GeoModelSvc.TileDetectorTool INFO => New BFingerLengthNeg 420.5
+GeoModelSvc.TileDetectorTool INFO Positioning barrel with translation 0
+GeoModelSvc.TileDetectorTool INFO Positioning positive barrel finger with translation 3035.25
+GeoModelSvc.TileDetectorTool INFO Positioning negative barrel finger with translation -3030.25
+GeoModelSvc.TileDetectorTool INFO Positioning positive ext.barrel with translation 4854.75
+GeoModelSvc.TileDetectorTool INFO Positioning positive ext.barrel finger with translation ztrans= 6338.5
+GeoModelSvc.TileDetectorTool INFO Positioning positive ext.barrel saddle with translation ztrans= 6192.5
+GeoModelSvc.TileDetectorTool INFO Positive ITC envelope parameters: PLUG1 Rmin= 3438.85 Rmax= 4250 dzITC1= 154.5
+GeoModelSvc.TileDetectorTool INFO PLUG2 Rmin= 2981 Rmax= 3440 dzITC2= 47.425
+GeoModelSvc.TileDetectorTool INFO Positioning positive ITC with translation 3405
+GeoModelSvc.TileDetectorTool INFO Positioning positive Gap with translation 3552
+GeoModelSvc.TileDetectorTool INFO Positioning positive Crack with translation 3536
+GeoModelSvc.TileDetectorTool INFO Positioning negative ext.barrel with translation ztrans -4854.75
+GeoModelSvc.TileDetectorTool INFO Positioning negative ext.barrel finger with translation ztrans= -6338.5
+GeoModelSvc.TileDetectorTool INFO Positioning negative ext.barrel saddle with translation ztrans= -6192.5
+GeoModelSvc.TileDetectorTool INFO Negative ITC envelope parameters: PLUG1 Rmin= 3438.85 Rmax= 4250 dzITC1= 154.5
+GeoModelSvc.TileDetectorTool INFO PLUG2 Rmin= 2981 Rmax= 3440 dzITC2= 47.425
+GeoModelSvc.TileDetectorTool INFO Positioning negative ITC with translation -3405
+GeoModelSvc.TileDetectorTool INFO Positioning negative Gap with translation -3552
+GeoModelSvc.TileDetectorTool INFO Positioning negative Crack with translation -3536
+GeoModelSvc.TileDetectorTool INFO Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.TileDetectorTool INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.TileDetectorTool INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrManager INFO Entering create_elements()
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 4552Kb Time = 0.15S
+ClassIDSvc INFO getRegistryEntries: read 71 CLIDRegistry entries for module ALL
+GeoModelSvc INFO AlgTool: GeoModelSvc.LArDetectorToolNV
+GeoModelSvc INFO AlgTool: GeoModelSvc.TileDetectorTool
+TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
+TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
CaloLVL1_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-R2-2016-01-00-01
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
+AthenaHiveEventLoopMgr INFO Initializing AthenaHiveEventLoopMgr
+ClassIDSvc 0 INFO getRegistryEntries: read 4391 CLIDRegistry entries for module ALL
+PyComponentMgr 0 INFO Initializing PyComponentMgr...
+Finalizer 0 INFO Initializing Finalizer...
+ClassIDSvc 0 INFO getRegistryEntries: read 553 CLIDRegistry entries for module ALL
+CondInputLoader 0 INFO Initializing CondInputLoader...
+ClassIDSvc 0 INFO getRegistryEntries: read 12 CLIDRegistry entries for module ALL
CondInputLoader 0 INFO Adding base classes:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' ) -> no bases
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' ) ->
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' ) ->
CondInputLoader 0 INFO Will create WriteCondHandle dependencies for the following DataObjects:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' )
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' )
TileBadChannelsCondAlg.TileCondProxyCool_OnlBch 0 INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OnlBch) for folder: "/TILE/ONL01/STATUS/ADC"
TileBadChannelsCondAlg.TileCondProxyCool_OflBch 0 INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OflBch) for folder: "/TILE/OFL02/STATUS/ADC"
TileBadChannelsCondAlg 0 INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
@@ -348,7 +977,7 @@ TileSampleNoiseCon...TileCondProxyCool_NoiseSample 0 INFO Creating
TileTimingCondAlg.TileCondProxyCool_AdcOffset 0 INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
ThreadPoolSvc 0 INFO no thread init tools attached
AvalancheSchedulerSvc 0 INFO Activating scheduler in a separate thread
-AvalancheSchedulerSvc 0 INFO Found 14 algorithms
+AvalancheSchedulerSvc 0 INFO Found 15 algorithms
AvalancheSchedulerSvc 0 INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
AvalancheSchedulerSvc 0 INFO o ( 'TileL2Container' , 'StoreGateSvc+TileL2Cnt' ) required by Algorithm:
AvalancheSchedulerSvc 0 INFO * TileL2CntDumper
@@ -362,23 +991,50 @@ AvalancheSchedulerSvc 0 INFO Task sche
AvalancheSchedulerSvc 0 INFO o Avalanche generation mode: disabled
AvalancheSchedulerSvc 0 INFO o Preemptive scheduling of CPU-blocking tasks: disabled
AvalancheSchedulerSvc 0 INFO o Scheduling of condition tasks: disabled
+ByteStreamInputSvc 0 INFO Initializing
+ROBDataProviderSvc 0 INFO Initializing
ROBDataProviderSvc 0 INFO ---> Filter out empty ROB fragments = 'filterEmptyROB':False
ROBDataProviderSvc 0 INFO ---> Filter out specific ROBs by Status Code: # ROBs = 0
ROBDataProviderSvc 0 INFO ---> Filter out Sub Detector ROBs by Status Code: # Sub Detectors = 0
EventSelector 0 INFO reinitialization...
AthenaHiveEventLoopMgr 0 INFO Setup EventSelector service EventSelector
ApplicationMgr 0 INFO Application Manager Initialized successfully
+PoolSvc 0 INFO Enabled implicit multithreading in ROOT via PersistencySvc to: 3
+CondInputLoader 0 INFO created CondCont<CaloRec::CaloCellPositionShift> with key 'ConditionStore+LArCellPositionShift'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/EMS'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/STATUS/ADC'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/ONL01/STATUS/ADC'
+CondInputLoader 0 INFO created CondCont<DetCondKeyTrans> with key 'ConditionStore+/LAR/Align'
+ByteStreamInputSvc 0 INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data12_8TeV.00204073.physics_JetTauEtmiss.merge.RAW._lb0144._SFO-5._0001.1
ApplicationMgr 0 INFO Application Manager Started successfully
AthenaHiveEventLoopMgr 0 INFO Starting loop on events
+EventPersistencySvc 0 0 INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistencySvc 0 0 INFO Added successfully Conversion service:ByteStreamCnvSvc
EventInfoByteStreamAuxCnv 0 0 INFO IsSimulation : 0
EventInfoByteStreamAuxCnv 0 0 INFO IsTestbeam : 0
EventInfoByteStreamAuxCnv 0 0 INFO IsCalibration : 0
AthenaHiveEventLoopMgr 0 0 INFO ===>>> start of run 204073 <<<===
+IOVDbSvc 0 0 INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder 0 0 INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder 0 0 INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
+IOVDbSvc 0 0 INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc 0 0 INFO Opened read transaction for POOL PersistencySvc
+DbSession 0 0 INFO Open DbSession
+Domain[ROOT_All] 0 0 INFO > Access DbDomain READ [ROOT_All]
+Domain[ROOT_All] 0 0 INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
+Domain[ROOT_All] 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
+RootDatabase.open 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv 0 0 INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDescrCnv 0 0 INFO in createObj: creating a CaloDescrManager object in the detector store
+ClassIDSvc 0 0 INFO getRegistryEntries: read 207 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID 0 0 INFO initialize_from_dictionary
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
@@ -392,19 +1048,267 @@ CaloIDHelper_IDDetDescrCnv 0 0 INFO in create
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
+TileNeighbour 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
CaloIdMgrDetDescrCnv 0 0 INFO Finished
+CaloIdMgrDetDescrCnv 0 0 INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
+Domain[ROOT_All] 0 0 INFO -> Access DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
+RootDatabase.open 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
+AthenaHiveEventLoopMgr 0 0 INFO ===>>> start processing event #1129572, run #204073 on slot 0, 0 events processed so far <<<===
+ClassIDSvc 0 0 INFO getRegistryEntries: read 495 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 1763 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 92 CLIDRegistry entries for module ALL
+ToolSvc.TileROD_Decoder.TileL2Builder 0 0 INFO TileL2Builder initialization completed
+ToolSvc.TileL2ContByteStreamTool 0 0 INFO Initializing TileL2ContByteStreamTool
+/cvmfs/atlas-condb.cern.ch/repo/conditions/...root 0 0 INFO Database being retired...
+Domain[ROOT_All] 0 0 INFO -> Deaccess DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
+/cvmfs/atlas-condb.cern.ch/repo/conditions/...root 0 0 INFO Database being retired...
+Domain[ROOT_All] 0 0 INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] 0 0 INFO > Deaccess DbDomain READ [ROOT_All]
+AthenaHiveEventLoopMgr 0 0 INFO ===>>> done processing event #1129572, run #204073 on slot 0, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 1 0 INFO ===>>> start processing event #1129665, run #204073 on slot 0, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 2 1 INFO ===>>> start processing event #1131212, run #204073 on slot 1, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 3 2 INFO ===>>> start processing event #1131086, run #204073 on slot 2, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 4 3 INFO ===>>> start processing event #1130272, run #204073 on slot 3, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 1 0 INFO ===>>> done processing event #1129665, run #204073 on slot 0, 2 events processed so far <<<===
+AthenaHiveEventLoopMgr 2 1 INFO ===>>> done processing event #1131212, run #204073 on slot 1, 3 events processed so far <<<===
+AthenaHiveEventLoopMgr 3 2 INFO ===>>> done processing event #1131086, run #204073 on slot 2, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 5 0 INFO ===>>> start processing event #1131269, run #204073 on slot 0, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 6 1 INFO ===>>> start processing event #1130716, run #204073 on slot 1, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 7 2 INFO ===>>> start processing event #1132019, run #204073 on slot 2, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 4 3 INFO ===>>> done processing event #1130272, run #204073 on slot 3, 5 events processed so far <<<===
+AthenaHiveEventLoopMgr 5 0 INFO ===>>> done processing event #1131269, run #204073 on slot 0, 6 events processed so far <<<===
+AthenaHiveEventLoopMgr 6 1 INFO ===>>> done processing event #1130716, run #204073 on slot 1, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 8 0 INFO ===>>> start processing event #1132092, run #204073 on slot 0, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 9 1 INFO ===>>> start processing event #1130238, run #204073 on slot 1, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 10 3 INFO ===>>> start processing event #1134553, run #204073 on slot 3, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 7 2 INFO ===>>> done processing event #1132019, run #204073 on slot 2, 8 events processed so far <<<===
+AthenaHiveEventLoopMgr 8 0 INFO ===>>> done processing event #1132092, run #204073 on slot 0, 9 events processed so far <<<===
+AthenaHiveEventLoopMgr 9 1 INFO ===>>> done processing event #1130238, run #204073 on slot 1, 10 events processed so far <<<===
+AthenaHiveEventLoopMgr 11 0 INFO ===>>> start processing event #1130999, run #204073 on slot 0, 10 events processed so far <<<===
+AthenaHiveEventLoopMgr 12 1 INFO ===>>> start processing event #1133461, run #204073 on slot 1, 10 events processed so far <<<===
+AthenaHiveEventLoopMgr 13 2 INFO ===>>> start processing event #1131152, run #204073 on slot 2, 10 events processed so far <<<===
+AthenaHiveEventLoopMgr 10 3 INFO ===>>> done processing event #1134553, run #204073 on slot 3, 11 events processed so far <<<===
+AthenaHiveEventLoopMgr 11 0 INFO ===>>> done processing event #1130999, run #204073 on slot 0, 12 events processed so far <<<===
+AthenaHiveEventLoopMgr 12 1 INFO ===>>> done processing event #1133461, run #204073 on slot 1, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 14 0 INFO ===>>> start processing event #1130142, run #204073 on slot 0, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 15 1 INFO ===>>> start processing event #1132770, run #204073 on slot 1, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 16 3 INFO ===>>> start processing event #1132365, run #204073 on slot 3, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 13 2 INFO ===>>> done processing event #1131152, run #204073 on slot 2, 14 events processed so far <<<===
+AthenaHiveEventLoopMgr 14 0 INFO ===>>> done processing event #1130142, run #204073 on slot 0, 15 events processed so far <<<===
+AthenaHiveEventLoopMgr 15 1 INFO ===>>> done processing event #1132770, run #204073 on slot 1, 16 events processed so far <<<===
+AthenaHiveEventLoopMgr 17 0 INFO ===>>> start processing event #1136791, run #204073 on slot 0, 16 events processed so far <<<===
+AthenaHiveEventLoopMgr 18 1 INFO ===>>> start processing event #1133781, run #204073 on slot 1, 16 events processed so far <<<===
+AthenaHiveEventLoopMgr 19 2 INFO ===>>> start processing event #1132067, run #204073 on slot 2, 16 events processed so far <<<===
+AthenaHiveEventLoopMgr 16 3 INFO ===>>> done processing event #1132365, run #204073 on slot 3, 17 events processed so far <<<===
+AthenaHiveEventLoopMgr 17 0 INFO ===>>> done processing event #1136791, run #204073 on slot 0, 18 events processed so far <<<===
+AthenaHiveEventLoopMgr 18 1 INFO ===>>> done processing event #1133781, run #204073 on slot 1, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 20 0 INFO ===>>> start processing event #1138637, run #204073 on slot 0, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 21 1 INFO ===>>> start processing event #1139495, run #204073 on slot 1, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 22 3 INFO ===>>> start processing event #1140193, run #204073 on slot 3, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 19 2 INFO ===>>> done processing event #1132067, run #204073 on slot 2, 20 events processed so far <<<===
+AthenaHiveEventLoopMgr 20 0 INFO ===>>> done processing event #1138637, run #204073 on slot 0, 21 events processed so far <<<===
+AthenaHiveEventLoopMgr 21 1 INFO ===>>> done processing event #1139495, run #204073 on slot 1, 22 events processed so far <<<===
+AthenaHiveEventLoopMgr 23 0 INFO ===>>> start processing event #1142953, run #204073 on slot 0, 22 events processed so far <<<===
+AthenaHiveEventLoopMgr 24 1 INFO ===>>> start processing event #1139127, run #204073 on slot 1, 22 events processed so far <<<===
+AthenaHiveEventLoopMgr 25 2 INFO ===>>> start processing event #1141272, run #204073 on slot 2, 22 events processed so far <<<===
+AthenaHiveEventLoopMgr 22 3 INFO ===>>> done processing event #1140193, run #204073 on slot 3, 23 events processed so far <<<===
+AthenaHiveEventLoopMgr 23 0 INFO ===>>> done processing event #1142953, run #204073 on slot 0, 24 events processed so far <<<===
+AthenaHiveEventLoopMgr 24 1 INFO ===>>> done processing event #1139127, run #204073 on slot 1, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 26 0 INFO ===>>> start processing event #1137117, run #204073 on slot 0, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 27 1 INFO ===>>> start processing event #1139599, run #204073 on slot 1, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 28 3 INFO ===>>> start processing event #1140314, run #204073 on slot 3, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 25 2 INFO ===>>> done processing event #1141272, run #204073 on slot 2, 26 events processed so far <<<===
+AthenaHiveEventLoopMgr 26 0 INFO ===>>> done processing event #1137117, run #204073 on slot 0, 27 events processed so far <<<===
+AthenaHiveEventLoopMgr 27 1 INFO ===>>> done processing event #1139599, run #204073 on slot 1, 28 events processed so far <<<===
+AthenaHiveEventLoopMgr 29 0 INFO ===>>> start processing event #1133685, run #204073 on slot 0, 28 events processed so far <<<===
+AthenaHiveEventLoopMgr 30 1 INFO ===>>> start processing event #1143279, run #204073 on slot 1, 28 events processed so far <<<===
+AthenaHiveEventLoopMgr 31 2 INFO ===>>> start processing event #1137563, run #204073 on slot 2, 28 events processed so far <<<===
+AthenaHiveEventLoopMgr 28 3 INFO ===>>> done processing event #1140314, run #204073 on slot 3, 29 events processed so far <<<===
+AthenaHiveEventLoopMgr 29 0 INFO ===>>> done processing event #1133685, run #204073 on slot 0, 30 events processed so far <<<===
+AthenaHiveEventLoopMgr 30 1 INFO ===>>> done processing event #1143279, run #204073 on slot 1, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 32 0 INFO ===>>> start processing event #1139927, run #204073 on slot 0, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 33 1 INFO ===>>> start processing event #1141197, run #204073 on slot 1, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 34 3 INFO ===>>> start processing event #1140039, run #204073 on slot 3, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 31 2 INFO ===>>> done processing event #1137563, run #204073 on slot 2, 32 events processed so far <<<===
+AthenaHiveEventLoopMgr 32 0 INFO ===>>> done processing event #1139927, run #204073 on slot 0, 33 events processed so far <<<===
+AthenaHiveEventLoopMgr 33 1 INFO ===>>> done processing event #1141197, run #204073 on slot 1, 34 events processed so far <<<===
+AthenaHiveEventLoopMgr 35 0 INFO ===>>> start processing event #1142531, run #204073 on slot 0, 34 events processed so far <<<===
+AthenaHiveEventLoopMgr 36 1 INFO ===>>> start processing event #1139475, run #204073 on slot 1, 34 events processed so far <<<===
+AthenaHiveEventLoopMgr 37 2 INFO ===>>> start processing event #1139958, run #204073 on slot 2, 34 events processed so far <<<===
+AthenaHiveEventLoopMgr 34 3 INFO ===>>> done processing event #1140039, run #204073 on slot 3, 35 events processed so far <<<===
+AthenaHiveEventLoopMgr 35 0 INFO ===>>> done processing event #1142531, run #204073 on slot 0, 36 events processed so far <<<===
+AthenaHiveEventLoopMgr 36 1 INFO ===>>> done processing event #1139475, run #204073 on slot 1, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 38 0 INFO ===>>> start processing event #1143765, run #204073 on slot 0, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 39 1 INFO ===>>> start processing event #1143097, run #204073 on slot 1, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 40 3 INFO ===>>> start processing event #1134147, run #204073 on slot 3, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 37 2 INFO ===>>> done processing event #1139958, run #204073 on slot 2, 38 events processed so far <<<===
+AthenaHiveEventLoopMgr 38 0 INFO ===>>> done processing event #1143765, run #204073 on slot 0, 39 events processed so far <<<===
+AthenaHiveEventLoopMgr 39 1 INFO ===>>> done processing event #1143097, run #204073 on slot 1, 40 events processed so far <<<===
+AthenaHiveEventLoopMgr 41 0 INFO ===>>> start processing event #1137156, run #204073 on slot 0, 40 events processed so far <<<===
+AthenaHiveEventLoopMgr 42 1 INFO ===>>> start processing event #1136377, run #204073 on slot 1, 40 events processed so far <<<===
+AthenaHiveEventLoopMgr 43 2 INFO ===>>> start processing event #1137842, run #204073 on slot 2, 40 events processed so far <<<===
+AthenaHiveEventLoopMgr 40 3 INFO ===>>> done processing event #1134147, run #204073 on slot 3, 41 events processed so far <<<===
+AthenaHiveEventLoopMgr 41 0 INFO ===>>> done processing event #1137156, run #204073 on slot 0, 42 events processed so far <<<===
+AthenaHiveEventLoopMgr 42 1 INFO ===>>> done processing event #1136377, run #204073 on slot 1, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 44 0 INFO ===>>> start processing event #1141705, run #204073 on slot 0, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 45 1 INFO ===>>> start processing event #1143410, run #204073 on slot 1, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 46 3 INFO ===>>> start processing event #1144170, run #204073 on slot 3, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 43 2 INFO ===>>> done processing event #1137842, run #204073 on slot 2, 44 events processed so far <<<===
+AthenaHiveEventLoopMgr 44 0 INFO ===>>> done processing event #1141705, run #204073 on slot 0, 45 events processed so far <<<===
+AthenaHiveEventLoopMgr 45 1 INFO ===>>> done processing event #1143410, run #204073 on slot 1, 46 events processed so far <<<===
+AthenaHiveEventLoopMgr 47 0 INFO ===>>> start processing event #1145987, run #204073 on slot 0, 46 events processed so far <<<===
+AthenaHiveEventLoopMgr 48 1 INFO ===>>> start processing event #1145633, run #204073 on slot 1, 46 events processed so far <<<===
+AthenaHiveEventLoopMgr 49 2 INFO ===>>> start processing event #1135005, run #204073 on slot 2, 46 events processed so far <<<===
+AthenaHiveEventLoopMgr 46 3 INFO ===>>> done processing event #1144170, run #204073 on slot 3, 47 events processed so far <<<===
+AthenaHiveEventLoopMgr 47 0 INFO ===>>> done processing event #1145987, run #204073 on slot 0, 48 events processed so far <<<===
+AthenaHiveEventLoopMgr 48 1 INFO ===>>> done processing event #1145633, run #204073 on slot 1, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 50 0 INFO ===>>> start processing event #1142167, run #204073 on slot 0, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 51 1 INFO ===>>> start processing event #1144646, run #204073 on slot 1, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 52 3 INFO ===>>> start processing event #1145027, run #204073 on slot 3, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 49 2 INFO ===>>> done processing event #1135005, run #204073 on slot 2, 50 events processed so far <<<===
+AthenaHiveEventLoopMgr 50 0 INFO ===>>> done processing event #1142167, run #204073 on slot 0, 51 events processed so far <<<===
+AthenaHiveEventLoopMgr 51 1 INFO ===>>> done processing event #1144646, run #204073 on slot 1, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 53 0 INFO ===>>> start processing event #1144112, run #204073 on slot 0, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 54 1 INFO ===>>> start processing event #1138485, run #204073 on slot 1, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 55 2 INFO ===>>> start processing event #1144565, run #204073 on slot 2, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 52 3 INFO ===>>> done processing event #1145027, run #204073 on slot 3, 53 events processed so far <<<===
+AthenaHiveEventLoopMgr 53 0 INFO ===>>> done processing event #1144112, run #204073 on slot 0, 54 events processed so far <<<===
+AthenaHiveEventLoopMgr 54 1 INFO ===>>> done processing event #1138485, run #204073 on slot 1, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 56 0 INFO ===>>> start processing event #1139498, run #204073 on slot 0, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 57 1 INFO ===>>> start processing event #1136546, run #204073 on slot 1, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 58 3 INFO ===>>> start processing event #1143799, run #204073 on slot 3, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 55 2 INFO ===>>> done processing event #1144565, run #204073 on slot 2, 56 events processed so far <<<===
+AthenaHiveEventLoopMgr 56 0 INFO ===>>> done processing event #1139498, run #204073 on slot 0, 57 events processed so far <<<===
+AthenaHiveEventLoopMgr 57 1 INFO ===>>> done processing event #1136546, run #204073 on slot 1, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 59 0 INFO ===>>> start processing event #1142877, run #204073 on slot 0, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 60 1 INFO ===>>> start processing event #1149894, run #204073 on slot 1, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 61 2 INFO ===>>> start processing event #1145364, run #204073 on slot 2, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 58 3 INFO ===>>> done processing event #1143799, run #204073 on slot 3, 59 events processed so far <<<===
+AthenaHiveEventLoopMgr 59 0 INFO ===>>> done processing event #1142877, run #204073 on slot 0, 60 events processed so far <<<===
+AthenaHiveEventLoopMgr 60 1 INFO ===>>> done processing event #1149894, run #204073 on slot 1, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 62 0 INFO ===>>> start processing event #1143770, run #204073 on slot 0, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 63 1 INFO ===>>> start processing event #1148361, run #204073 on slot 1, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 64 3 INFO ===>>> start processing event #1148167, run #204073 on slot 3, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 61 2 INFO ===>>> done processing event #1145364, run #204073 on slot 2, 62 events processed so far <<<===
+AthenaHiveEventLoopMgr 62 0 INFO ===>>> done processing event #1143770, run #204073 on slot 0, 63 events processed so far <<<===
+AthenaHiveEventLoopMgr 63 1 INFO ===>>> done processing event #1148361, run #204073 on slot 1, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 65 0 INFO ===>>> start processing event #1138948, run #204073 on slot 0, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 66 1 INFO ===>>> start processing event #1144808, run #204073 on slot 1, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 67 2 INFO ===>>> start processing event #1145832, run #204073 on slot 2, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 64 3 INFO ===>>> done processing event #1148167, run #204073 on slot 3, 65 events processed so far <<<===
+AthenaHiveEventLoopMgr 65 0 INFO ===>>> done processing event #1138948, run #204073 on slot 0, 66 events processed so far <<<===
+AthenaHiveEventLoopMgr 66 1 INFO ===>>> done processing event #1144808, run #204073 on slot 1, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 68 0 INFO ===>>> start processing event #1153100, run #204073 on slot 0, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 69 1 INFO ===>>> start processing event #1142524, run #204073 on slot 1, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 70 3 INFO ===>>> start processing event #1138294, run #204073 on slot 3, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 67 2 INFO ===>>> done processing event #1145832, run #204073 on slot 2, 68 events processed so far <<<===
+AthenaHiveEventLoopMgr 68 0 INFO ===>>> done processing event #1153100, run #204073 on slot 0, 69 events processed so far <<<===
+AthenaHiveEventLoopMgr 69 1 INFO ===>>> done processing event #1142524, run #204073 on slot 1, 70 events processed so far <<<===
+AthenaHiveEventLoopMgr 71 0 INFO ===>>> start processing event #1138350, run #204073 on slot 0, 70 events processed so far <<<===
+AthenaHiveEventLoopMgr 72 1 INFO ===>>> start processing event #1149424, run #204073 on slot 1, 70 events processed so far <<<===
+AthenaHiveEventLoopMgr 73 2 INFO ===>>> start processing event #1151102, run #204073 on slot 2, 70 events processed so far <<<===
+AthenaHiveEventLoopMgr 70 3 INFO ===>>> done processing event #1138294, run #204073 on slot 3, 71 events processed so far <<<===
+AthenaHiveEventLoopMgr 71 0 INFO ===>>> done processing event #1138350, run #204073 on slot 0, 72 events processed so far <<<===
+AthenaHiveEventLoopMgr 72 1 INFO ===>>> done processing event #1149424, run #204073 on slot 1, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 74 0 INFO ===>>> start processing event #1152242, run #204073 on slot 0, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 75 1 INFO ===>>> start processing event #1148416, run #204073 on slot 1, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 76 3 INFO ===>>> start processing event #1142753, run #204073 on slot 3, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 73 2 INFO ===>>> done processing event #1151102, run #204073 on slot 2, 74 events processed so far <<<===
+AthenaHiveEventLoopMgr 74 0 INFO ===>>> done processing event #1152242, run #204073 on slot 0, 75 events processed so far <<<===
+AthenaHiveEventLoopMgr 75 1 INFO ===>>> done processing event #1148416, run #204073 on slot 1, 76 events processed so far <<<===
+AthenaHiveEventLoopMgr 77 0 INFO ===>>> start processing event #1149997, run #204073 on slot 0, 76 events processed so far <<<===
+AthenaHiveEventLoopMgr 78 1 INFO ===>>> start processing event #1151617, run #204073 on slot 1, 76 events processed so far <<<===
+AthenaHiveEventLoopMgr 79 2 INFO ===>>> start processing event #1149794, run #204073 on slot 2, 76 events processed so far <<<===
+AthenaHiveEventLoopMgr 76 3 INFO ===>>> done processing event #1142753, run #204073 on slot 3, 77 events processed so far <<<===
+AthenaHiveEventLoopMgr 77 0 INFO ===>>> done processing event #1149997, run #204073 on slot 0, 78 events processed so far <<<===
+AthenaHiveEventLoopMgr 78 1 INFO ===>>> done processing event #1151617, run #204073 on slot 1, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 80 0 INFO ===>>> start processing event #1152504, run #204073 on slot 0, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 81 1 INFO ===>>> start processing event #1142485, run #204073 on slot 1, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 82 3 INFO ===>>> start processing event #1151364, run #204073 on slot 3, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 79 2 INFO ===>>> done processing event #1149794, run #204073 on slot 2, 80 events processed so far <<<===
+AthenaHiveEventLoopMgr 80 0 INFO ===>>> done processing event #1152504, run #204073 on slot 0, 81 events processed so far <<<===
+AthenaHiveEventLoopMgr 81 1 INFO ===>>> done processing event #1142485, run #204073 on slot 1, 82 events processed so far <<<===
+AthenaHiveEventLoopMgr 83 0 INFO ===>>> start processing event #1143901, run #204073 on slot 0, 82 events processed so far <<<===
+AthenaHiveEventLoopMgr 84 1 INFO ===>>> start processing event #1153979, run #204073 on slot 1, 82 events processed so far <<<===
+AthenaHiveEventLoopMgr 85 2 INFO ===>>> start processing event #1150212, run #204073 on slot 2, 82 events processed so far <<<===
+AthenaHiveEventLoopMgr 82 3 INFO ===>>> done processing event #1151364, run #204073 on slot 3, 83 events processed so far <<<===
+AthenaHiveEventLoopMgr 83 0 INFO ===>>> done processing event #1143901, run #204073 on slot 0, 84 events processed so far <<<===
+AthenaHiveEventLoopMgr 84 1 INFO ===>>> done processing event #1153979, run #204073 on slot 1, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 86 0 INFO ===>>> start processing event #1152633, run #204073 on slot 0, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 87 1 INFO ===>>> start processing event #1155482, run #204073 on slot 1, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 88 3 INFO ===>>> start processing event #1150472, run #204073 on slot 3, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 85 2 INFO ===>>> done processing event #1150212, run #204073 on slot 2, 86 events processed so far <<<===
+AthenaHiveEventLoopMgr 86 0 INFO ===>>> done processing event #1152633, run #204073 on slot 0, 87 events processed so far <<<===
+AthenaHiveEventLoopMgr 87 1 INFO ===>>> done processing event #1155482, run #204073 on slot 1, 88 events processed so far <<<===
+AthenaHiveEventLoopMgr 89 0 INFO ===>>> start processing event #1140275, run #204073 on slot 0, 88 events processed so far <<<===
+AthenaHiveEventLoopMgr 90 1 INFO ===>>> start processing event #1145882, run #204073 on slot 1, 88 events processed so far <<<===
+AthenaHiveEventLoopMgr 91 2 INFO ===>>> start processing event #1151732, run #204073 on slot 2, 88 events processed so far <<<===
+AthenaHiveEventLoopMgr 88 3 INFO ===>>> done processing event #1150472, run #204073 on slot 3, 89 events processed so far <<<===
+AthenaHiveEventLoopMgr 89 0 INFO ===>>> done processing event #1140275, run #204073 on slot 0, 90 events processed so far <<<===
+AthenaHiveEventLoopMgr 90 1 INFO ===>>> done processing event #1145882, run #204073 on slot 1, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 92 0 INFO ===>>> start processing event #1137896, run #204073 on slot 0, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 93 1 INFO ===>>> start processing event #1156381, run #204073 on slot 1, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 94 3 INFO ===>>> start processing event #1149161, run #204073 on slot 3, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 91 2 INFO ===>>> done processing event #1151732, run #204073 on slot 2, 92 events processed so far <<<===
+AthenaHiveEventLoopMgr 92 0 INFO ===>>> done processing event #1137896, run #204073 on slot 0, 93 events processed so far <<<===
+AthenaHiveEventLoopMgr 93 1 INFO ===>>> done processing event #1156381, run #204073 on slot 1, 94 events processed so far <<<===
+AthenaHiveEventLoopMgr 95 0 INFO ===>>> start processing event #1153794, run #204073 on slot 0, 94 events processed so far <<<===
+AthenaHiveEventLoopMgr 96 1 INFO ===>>> start processing event #1151312, run #204073 on slot 1, 94 events processed so far <<<===
+AthenaHiveEventLoopMgr 97 2 INFO ===>>> start processing event #1148893, run #204073 on slot 2, 94 events processed so far <<<===
+AthenaHiveEventLoopMgr 94 3 INFO ===>>> done processing event #1149161, run #204073 on slot 3, 95 events processed so far <<<===
+AthenaHiveEventLoopMgr 95 0 INFO ===>>> done processing event #1153794, run #204073 on slot 0, 96 events processed so far <<<===
+AthenaHiveEventLoopMgr 96 1 INFO ===>>> done processing event #1151312, run #204073 on slot 1, 97 events processed so far <<<===
+AthenaHiveEventLoopMgr 98 0 INFO ===>>> start processing event #1156938, run #204073 on slot 0, 97 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 1 INFO ===>>> start processing event #1156351, run #204073 on slot 1, 97 events processed so far <<<===
+AthenaHiveEventLoopMgr 97 2 INFO ===>>> done processing event #1148893, run #204073 on slot 2, 98 events processed so far <<<===
+AthenaHiveEventLoopMgr 98 0 INFO ===>>> done processing event #1156938, run #204073 on slot 0, 99 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 1 INFO ===>>> done processing event #1156351, run #204073 on slot 1, 100 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 1 INFO ---> Loop Finished (seconds): 5.90471
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
+SGInputLoader INFO Finalizing SGInputLoader...
+Finalizer INFO Finalizing Finalizer...
Finalize: compared 10 dumps
+CondInputLoader INFO Finalizing CondInputLoader...
+AvalancheSchedulerSvc INFO Joining Scheduler thread
+PyComponentMgr INFO Finalizing PyComponentMgr...
+EventDataSvc INFO Finalizing EventDataSvc
IdDictDetDescrCnv INFO in finalize
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.01 ))s
+IOVDbSvc INFO bytes in (( 0.05 ))s
+IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.05 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 1 nFolders: 11 ReadTime: (( 0.00 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
+ToolSvc.TileROD_Decoder.TileL2Builder INFO Finalizing
ToolSvc.ByteStreamMetadataTool INFO in finalize()
*****Chrono***** INFO ****************************************************************************************************
+*****Chrono***** INFO WARNING: MT job; statistics are unreliable
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
+cObjR_ALL INFO Time User : Tot= 160 [ms] Ave/Min/Max= 80(+- 70)/ 10/ 150 [ms] #= 2
+cObj_ALL INFO Time User : Tot= 200 [ms] Ave/Min/Max= 100(+- 70)/ 30/ 170 [ms] #= 2
+ChronoStatSvc INFO Time User : Tot= 10.4 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.finalize() INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileLaserObjByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileLaserObjByteStreamCnv_test.ref
index c68aa9940f02..6b660dea3876 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileLaserObjByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileLaserObjByteStreamCnv_test.ref
@@ -1,6 +1,20 @@
+Sat Aug 21 21:56:45 CEST 2021
+Preloading tcmalloc_minimal.so
+Py:Athena INFO including file "AthenaCommon/Preparation.py"
+Py:Athena INFO using release [WorkDir-22.0.42] [x86_64-centos7-gcc8-opt] [master-calo-ctests/ec2fa09c9e3] -- built on [2021-08-21T2138]
+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 "TileByteStream/TileLaserObjByteStreamCnv_test.py"
+Py:Athena INFO SetGeometryVersion.py obtained major release version 22
+Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
+Py:ConfigurableDb INFO Read module info for 5069 configurables from 8 genConfDb files
+Py:ConfigurableDb INFO No duplicates have been found: that's good !
+EventInfoMgtInit: Got release version Athena-22.0.42
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
+Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
+Py:TileConditions_jobOptions.py INFO Forcing RUN2a (2018) cabling for run 363899 with geometry ATLAS-R2-2016-01-00-01
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo for 7 samples
Py:TileConditions_jobOptions.py INFO setting up COOL for TileCal conditions data
Py:TileInfoConf. INFO Changing default TileBadChanTool configuration to COOL source
@@ -10,16 +24,110 @@ Py:TileInfoConf. INFO Changing default TileCondToolTiming configuration to C
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise for Opt.Filter without iterations
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
+Py:Athena INFO including file "AthenaCommon/runbatch.py"
+ApplicationMgr SUCCESS
+====================================================================================================================================
+ Welcome to ApplicationMgr (GaudiCoreSvc v36r0)
+ running on aibuild028.cern.ch on Sat Aug 21 21:56:59 2021
+====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
+ClassIDSvc INFO getRegistryEntries: read 6689 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
+MetaDataSvc INFO Initializing MetaDataSvc
+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/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+PoolSvc INFO Successfully setup replica sorting algorithm
+PoolSvc INFO Setting up APR FileCatalog and Streams
+PoolSvc INFO Unable find catalog apcfile:poolcond/PoolCat_oflcond.xml in $ATLAS_POOLCOND_PATH and $DATAPATH
+PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
+PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+ToolSvc.ByteStr... INFO Initializing
+MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool','ByteStreamMetadataTool'])
+MetaDataSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+MetaDataSvc INFO AlgTool: ToolSvc.ByteStreamMetadataTool
+IOVDbSvc INFO Only 5 POOL conditions files will be open at once
+IOVDbSvc INFO Cache alignment will be done in 3 slices
+IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
+IOVDbSvc INFO Initialised with 3 connections and 14 folders
+IOVDbSvc INFO Service IOVDbSvc initialised successfully
+IOVDbSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+ByteStreamAddre... INFO Initializing
ByteStreamAddre... INFO -- Will fill Store with id = 0
+TagInfoMgr INFO AlgTool: TagInfoMgr.IOVDbMetaDataTool
+ClassIDSvc INFO getRegistryEntries: read 2810 CLIDRegistry entries for module ALL
+IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+ClassIDSvc INFO getRegistryEntries: read 273 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_TILE/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200
+IOVDbSvc INFO Added taginfo remove for /LAR/Align
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CES
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/LIN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/NLN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/EMS
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/FIBER
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/LIN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/NLN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/NOISE/SAMPLE
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
+IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
+IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
+ClassIDSvc INFO getRegistryEntries: read 23 CLIDRegistry entries for module ALL
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 HGTD_ID with CLID 79264207 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
+DetDescrCnvSvc INFO filling address for JTower_ID with CLID 218674799 and storage type 68 to detector store
+DetDescrCnvSvc INFO filling address for GTower_ID with CLID 49678914 and storage type 68 to detector store
GeoModelSvc::RD...WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RD...WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RD...WARNING Getting InDetMatComponents with default tag
@@ -59,15 +167,19 @@ LArHVLineID INFO setDictVersion of LArHighVoltage is OK
LArHVLineID INFO [initLevelsFromDict] m_dict OK ...
LArHVLineID INFO [initialize_from_dictionary] > HV line range -> 11/1/48:79/0:15 | 11/1/148:179/0:15 | 11/1/80:93/0:7 | 11/1/180:193/0:7 | 11/1/200:231/0:15 | 11/1/232:263/0:15 | 11/1/296,297,306,307/0:15 | 11/1/299,304,305,308,309/0:15 | 11/1/264:279/0:15 | 11/1/280:295/0:15 | 11/1/0:47/0:15 | 11/1/320:322/0:15 | 11/1/100:147/0:15 | 11/1/324,325/0:15 | 11/1/312:315/0:15 | 11/1/316:319/0:15 | 11/1/300:303/0:15 | 11/1/310,311/0:15 | 11/1/323/0:15 | 11/1/326,327/0:15 | 11/1/94:99/0:15 | 11/1/194:199/0:15
LArHVLineID INFO [init_hashes()] > Hvline_size= 5008
+GeoModelSvc.LAr... INFO Keys for LAr are ATLAS-R2-2016-01-00-01 ATLAS
+GeoModelSvc.LAr... INFO Building LAr version LAr-Revised-17-01 while ATLAS version is ATLAS-R2-2016-01-00-01
GeoModelSvc.LAr... INFO LAr Geometry Options:
GeoModelSvc.LAr... INFO Sagging = false
GeoModelSvc.LAr... INFO Barrel = ON
GeoModelSvc.LAr... INFO Endcap = ON
+BarrelConstruction INFO Getting primary numbers for ATLAS, ATLAS-R2-2016-01-00-01
BarrelConstruction INFO Makes detailed absorber sandwich ? 1 1
BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
+ClassIDSvc INFO getRegistryEntries: read 3295 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -76,6 +188,9 @@ EMECConstruction INFO multi-layered version of absorbers activated, paramete
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstru... INFO Start building EC electronics geometry
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 25148Kb Time = 0.62S
+GeoModelSvc.Til... INFO Entering TileDetectorTool::create()
+TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
TileDddbManager INFO n_timod = 320
TileDddbManager INFO n_cuts = 9
@@ -84,9 +199,11 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloCell_ID helper object in the detector store
CaloIDHelper_ID... INFO in createObj: creating a LArEM_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -94,6 +211,9 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -128,13 +248,50 @@ GeoModelSvc.Til... INFO Global positioning of barrel with rotation (0,0,0)) a
GeoModelSvc.Til... INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
GeoModelSvc.Til... INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrMan... INFO Entering create_elements()
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3528Kb Time = 0.19S
+ClassIDSvc INFO getRegistryEntries: read 71 CLIDRegistry entries for module ALL
+GeoModelSvc INFO AlgTool: GeoModelSvc.LArDetectorToolNV
+GeoModelSvc INFO AlgTool: GeoModelSvc.TileDetectorTool
+TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
+TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_ID... INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
CaloLVL1_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-R2-2016-01-00-01
TileCablingSvc INFO Cabling for RUN2a (2018) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 5
+AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr
+ClassIDSvc INFO getRegistryEntries: read 444 CLIDRegistry entries for module ALL
+CondInputLoader INFO Initializing CondInputLoader...
+ClassIDSvc INFO getRegistryEntries: read 12 CLIDRegistry entries for module ALL
CondInputLoader INFO Adding base classes:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' ) -> no bases
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' ) ->
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' ) ->
CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' )
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' )
TileBadChannels... INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OnlBch) for folder: "/TILE/ONL01/STATUS/ADC"
TileBadChannels... INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OflBch) for folder: "/TILE/OFL02/STATUS/ADC"
TileBadChannels... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
@@ -153,22 +310,52 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlEms) for folder: "/TILE/OFL02/CALIB/EMS"
TileSampleNoise... INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.TileCondProxyCool_NoiseSample) for folder: "/TILE/OFL02/NOISE/SAMPLE"
TileTimingCondA... INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
+ClassIDSvc INFO getRegistryEntries: read 4709 CLIDRegistry entries for module ALL
+PyComponentMgr INFO Initializing PyComponentMgr...
+Finalizer INFO Initializing Finalizer...
+ByteStreamInputSvc INFO Initializing
+ROBDataProviderSvc INFO Initializing
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
EventSelector INFO reinitialization...
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
+ClassIDSvc INFO getRegistryEntries: read 379 CLIDRegistry entries for module ALL
+ByteStreamInputSvc INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TileByteStream/TileByteStream-02-00-00/data18_tilecomm.00363899.calibration_tile.daq.RAW._lb0000._TileREB-ROS._0005-200ev.data
+CondInputLoader INFO created CondCont<CaloRec::CaloCellPositionShift> with key 'ConditionStore+LArCellPositionShift'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/EMS'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/STATUS/ADC'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/ONL01/STATUS/ADC'
+CondInputLoader INFO created CondCont<DetCondKeyTrans> with key 'ConditionStore+/LAR/Align'
ApplicationMgr INFO Application Manager Started successfully
+EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistenc... INFO Added successfully Conversion service:ByteStreamCnvSvc
EventInfoByteSt... INFO IsSimulation : 0
EventInfoByteSt... INFO IsTestbeam : 0
EventInfoByteSt... INFO IsCalibration : 0
AthenaEventLoopMgr INFO ===>>> start of run 363899 <<<===
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
+ClassIDSvc INFO getRegistryEntries: read 207 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -182,10 +369,22 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
+CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
+AthenaEventLoopMgr INFO ===>>> start processing event #18124, run #363899 0 events processed so far <<<===
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCes-SIM-06 for folder /TILE/OFL02/CALIB/CES
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCisFitLin-COM-00 for folder /TILE/OFL02/CALIB/CIS/FIT/LIN
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCisFitNln-COM-00 for folder /TILE/OFL02/CALIB/CIS/FIT/NLN
@@ -196,6 +395,8 @@ IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02Cali
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02NoiseSample-TwoGauss-19 for folder /TILE/OFL02/NOISE/SAMPLE
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02StatusAdc-IOVDEP-03 for folder /TILE/OFL02/STATUS/ADC
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02TimeChanneloffsetPhy-000-00 for folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY
+IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200
+LArAlignCondAlg INFO recorded new GeoAlignmentStore object for LAr with key LArAlignmentStore and range {[177530,l:0] - [INVALID]}
TileBadChannels... INFO Updating TileBchStatus::isBad() definition from DB
TileBadChannels... INFO Updating TileBchStatus::isNoisy() definition from DB
TileBadChannels... INFO No TileBchStatus::isNoGainL1() definition found in DB, using defaults
@@ -207,25 +408,271 @@ TileBadChannels... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
TileBadChannels... INFO TileBchStatus::isBadTiming() is defined by: Bad timing;
TileBadChannels... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
TileBadChannels... INFO No drawer trips probabilities found in DB
+ClassIDSvc INFO getRegistryEntries: read 2258 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 92 CLIDRegistry entries for module ALL
+ToolSvc.TileROD... INFO TileL2Builder initialization completed
+AthenaEventLoopMgr INFO ===>>> done processing event #18124, run #363899 1 events processed so far <<<===
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
+AthenaEventLoopMgr INFO ===>>> start processing event #18125, run #363899 1 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18125, run #363899 2 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18126, run #363899 2 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18126, run #363899 3 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18127, run #363899 3 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18127, run #363899 4 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18128, run #363899 4 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18128, run #363899 5 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18129, run #363899 5 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18129, run #363899 6 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18130, run #363899 6 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18130, run #363899 7 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18131, run #363899 7 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18131, run #363899 8 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18132, run #363899 8 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18132, run #363899 9 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18133, run #363899 9 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18133, run #363899 10 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18134, run #363899 10 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18134, run #363899 11 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18135, run #363899 11 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18135, run #363899 12 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18136, run #363899 12 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18136, run #363899 13 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18137, run #363899 13 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18137, run #363899 14 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18138, run #363899 14 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18138, run #363899 15 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18139, run #363899 15 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18139, run #363899 16 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18140, run #363899 16 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18140, run #363899 17 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18141, run #363899 17 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18141, run #363899 18 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18142, run #363899 18 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18142, run #363899 19 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18143, run #363899 19 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18143, run #363899 20 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18144, run #363899 20 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18144, run #363899 21 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18145, run #363899 21 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18145, run #363899 22 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18146, run #363899 22 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18146, run #363899 23 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18147, run #363899 23 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18147, run #363899 24 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18148, run #363899 24 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18148, run #363899 25 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18149, run #363899 25 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18149, run #363899 26 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18150, run #363899 26 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18150, run #363899 27 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18151, run #363899 27 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18151, run #363899 28 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18152, run #363899 28 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18152, run #363899 29 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18153, run #363899 29 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18153, run #363899 30 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18154, run #363899 30 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18154, run #363899 31 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18155, run #363899 31 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18155, run #363899 32 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18156, run #363899 32 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18156, run #363899 33 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18157, run #363899 33 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18157, run #363899 34 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18158, run #363899 34 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18158, run #363899 35 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18159, run #363899 35 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18159, run #363899 36 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18160, run #363899 36 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18160, run #363899 37 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18161, run #363899 37 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18161, run #363899 38 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18162, run #363899 38 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18162, run #363899 39 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18163, run #363899 39 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18163, run #363899 40 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18164, run #363899 40 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18164, run #363899 41 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18165, run #363899 41 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18165, run #363899 42 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18166, run #363899 42 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18166, run #363899 43 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18167, run #363899 43 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18167, run #363899 44 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18168, run #363899 44 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18168, run #363899 45 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18169, run #363899 45 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18169, run #363899 46 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18170, run #363899 46 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18170, run #363899 47 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18171, run #363899 47 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18171, run #363899 48 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18172, run #363899 48 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18172, run #363899 49 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18173, run #363899 49 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18173, run #363899 50 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18174, run #363899 50 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18174, run #363899 51 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18175, run #363899 51 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18175, run #363899 52 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18176, run #363899 52 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18176, run #363899 53 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18177, run #363899 53 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18177, run #363899 54 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18178, run #363899 54 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18178, run #363899 55 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18179, run #363899 55 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18179, run #363899 56 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18180, run #363899 56 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18180, run #363899 57 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18181, run #363899 57 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18181, run #363899 58 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18182, run #363899 58 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18182, run #363899 59 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18183, run #363899 59 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18183, run #363899 60 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18184, run #363899 60 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18184, run #363899 61 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18185, run #363899 61 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18185, run #363899 62 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18186, run #363899 62 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18186, run #363899 63 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18187, run #363899 63 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18187, run #363899 64 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18188, run #363899 64 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18188, run #363899 65 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18189, run #363899 65 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18189, run #363899 66 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18190, run #363899 66 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18190, run #363899 67 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18191, run #363899 67 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18191, run #363899 68 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18192, run #363899 68 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18192, run #363899 69 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18193, run #363899 69 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18193, run #363899 70 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18194, run #363899 70 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18194, run #363899 71 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18195, run #363899 71 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18195, run #363899 72 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18196, run #363899 72 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18196, run #363899 73 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18197, run #363899 73 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18197, run #363899 74 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18198, run #363899 74 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18198, run #363899 75 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18199, run #363899 75 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18199, run #363899 76 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18200, run #363899 76 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18200, run #363899 77 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18201, run #363899 77 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18201, run #363899 78 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18202, run #363899 78 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18202, run #363899 79 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18203, run #363899 79 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18203, run #363899 80 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18204, run #363899 80 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18204, run #363899 81 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18205, run #363899 81 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18205, run #363899 82 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18206, run #363899 82 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18206, run #363899 83 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18207, run #363899 83 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18207, run #363899 84 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18208, run #363899 84 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18208, run #363899 85 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18209, run #363899 85 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18209, run #363899 86 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18210, run #363899 86 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18210, run #363899 87 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18211, run #363899 87 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18211, run #363899 88 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18212, run #363899 88 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18212, run #363899 89 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18213, run #363899 89 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18213, run #363899 90 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18214, run #363899 90 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18214, run #363899 91 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18215, run #363899 91 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18215, run #363899 92 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18216, run #363899 92 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18216, run #363899 93 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18217, run #363899 93 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18217, run #363899 94 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18218, run #363899 94 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18218, run #363899 95 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18219, run #363899 95 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18219, run #363899 96 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18220, run #363899 96 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18220, run #363899 97 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18221, run #363899 97 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18221, run #363899 98 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18222, run #363899 98 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18222, run #363899 99 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18223, run #363899 99 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18223, run #363899 100 events processed so far <<<===
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
+CondInputLoader INFO Finalizing CondInputLoader...
+Finalizer INFO Finalizing Finalizer...
Finalize: compared 10 dumps
+PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/2 objs/chan/bytes 1/1/170 (( 0.27 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104912 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641536 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/43176 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/2 objs/chan/bytes 2/1/390 (( 0.04 ))s
+IOVDbSvc INFO bytes in (( 0.62 ))s
+IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 3 nFolders: 2 ReadTime: (( 0.31 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.31 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
+ToolSvc.TileROD... INFO Finalizing
ToolSvc.ByteStr... INFO in finalize()
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
+cObjR_ALL INFO Time User : Tot= 160 [ms] Ave/Min/Max= 40(+- 63.6)/ 0/ 150 [ms] #= 4
+cObj_ALL INFO Time User : Tot= 210 [ms] Ave/Min/Max= 14(+- 45)/ 0/ 180 [ms] #= 15
+ChronoStatSvc INFO Time User : Tot= 4.39 [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"
+Sat Aug 21 21:57:10 CEST 2021
+Preloading tcmalloc_minimal.so
+Py:Athena INFO including file "AthenaCommon/Preparation.py"
+Py:Athena INFO using release [WorkDir-22.0.42] [x86_64-centos7-gcc8-opt] [master-calo-ctests/ec2fa09c9e3] -- built on [2021-08-21T2138]
+Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO configuring AthenaHive with [4] concurrent threads and [4] concurrent events
Py:AlgScheduler INFO setting up AvalancheSchedulerSvc/AvalancheSchedulerSvc with 4 threads
+Py:Athena INFO including file "AthenaCommon/Execution.py"
+Py:Athena INFO including file "TileByteStream/TileLaserObjByteStreamCnv_test.py"
+Py:Athena INFO SetGeometryVersion.py obtained major release version 22
+Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
+Py:ConfigurableDb INFO Read module info for 5069 configurables from 8 genConfDb files
+Py:ConfigurableDb INFO No duplicates have been found: that's good !
+EventInfoMgtInit: Got release version Athena-22.0.42
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
+Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
+Py:TileConditions_jobOptions.py INFO Forcing RUN2a (2018) cabling for run 363899 with geometry ATLAS-R2-2016-01-00-01
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo for 7 samples
Py:TileConditions_jobOptions.py INFO setting up COOL for TileCal conditions data
Py:TileInfoConf. INFO Changing default TileBadChanTool configuration to COOL source
@@ -235,17 +682,111 @@ Py:TileInfoConf. INFO Changing default TileCondToolTiming configuration to C
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise for Opt.Filter without iterations
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
+Py:Athena INFO including file "AthenaCommon/runbatch.py"
MessageSvc INFO Activating in a separate thread
+ApplicationMgr SUCCESS
+====================================================================================================================================
+ Welcome to ApplicationMgr (GaudiCoreSvc v36r0)
+ running on aibuild028.cern.ch on Sat Aug 21 21:57:24 2021
+====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
+ClassIDSvc INFO getRegistryEntries: read 6689 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
+MetaDataSvc INFO Initializing MetaDataSvc
+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/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+PoolSvc INFO Successfully setup replica sorting algorithm
+PoolSvc INFO Setting up APR FileCatalog and Streams
+PoolSvc INFO Unable find catalog apcfile:poolcond/PoolCat_oflcond.xml in $ATLAS_POOLCOND_PATH and $DATAPATH
+PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
+PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+ToolSvc.ByteStreamMetadataTool INFO Initializing
+MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool','ByteStreamMetadataTool'])
+MetaDataSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+MetaDataSvc INFO AlgTool: ToolSvc.ByteStreamMetadataTool
+IOVDbSvc INFO Only 5 POOL conditions files will be open at once
+IOVDbSvc INFO Cache alignment will be done in 3 slices
+IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
+IOVDbSvc INFO Initialised with 3 connections and 14 folders
+IOVDbSvc INFO Service IOVDbSvc initialised successfully
+IOVDbSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+ByteStreamAddressProviderSvc INFO Initializing
ByteStreamAddressProviderSvc INFO -- Will fill Store with id = 0
+TagInfoMgr INFO AlgTool: TagInfoMgr.IOVDbMetaDataTool
+ClassIDSvc INFO getRegistryEntries: read 2810 CLIDRegistry entries for module ALL
+IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+ClassIDSvc INFO getRegistryEntries: read 273 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_TILE/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200
+IOVDbSvc INFO Added taginfo remove for /LAR/Align
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CES
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/LIN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/NLN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/EMS
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/FIBER
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/LIN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/NLN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/NOISE/SAMPLE
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
+IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
+IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
+ClassIDSvc INFO getRegistryEntries: read 23 CLIDRegistry entries for module ALL
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 HGTD_ID with CLID 79264207 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
+DetDescrCnvSvc INFO filling address for JTower_ID with CLID 218674799 and storage type 68 to detector store
+DetDescrCnvSvc INFO filling address for GTower_ID with CLID 49678914 and storage type 68 to detector store
GeoModelSvc::RDBMaterialManager WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RDBMaterialManager WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RDBMaterialManager WARNING Getting InDetMatComponents with default tag
@@ -285,11 +826,19 @@ LArHVLineID INFO setDictVe
LArHVLineID INFO [initLevelsFromDict] m_dict OK ...
LArHVLineID INFO [initialize_from_dictionary] > HV line range -> 11/1/48:79/0:15 | 11/1/148:179/0:15 | 11/1/80:93/0:7 | 11/1/180:193/0:7 | 11/1/200:231/0:15 | 11/1/232:263/0:15 | 11/1/296,297,306,307/0:15 | 11/1/299,304,305,308,309/0:15 | 11/1/264:279/0:15 | 11/1/280:295/0:15 | 11/1/0:47/0:15 | 11/1/320:322/0:15 | 11/1/100:147/0:15 | 11/1/324,325/0:15 | 11/1/312:315/0:15 | 11/1/316:319/0:15 | 11/1/300:303/0:15 | 11/1/310,311/0:15 | 11/1/323/0:15 | 11/1/326,327/0:15 | 11/1/94:99/0:15 | 11/1/194:199/0:15
LArHVLineID INFO [init_hashes()] > Hvline_size= 5008
+GeoModelSvc.LArDetectorToolNV INFO Keys for LAr are ATLAS-R2-2016-01-00-01 ATLAS
+GeoModelSvc.LArDetectorToolNV INFO Building LAr version LAr-Revised-17-01 while ATLAS version is ATLAS-R2-2016-01-00-01
+GeoModelSvc.LArDetectorToolNV INFO LAr Geometry Options:
+GeoModelSvc.LArDetectorToolNV INFO Sagging = false
+GeoModelSvc.LArDetectorToolNV INFO Barrel = ON
+GeoModelSvc.LArDetectorToolNV INFO Endcap = ON
+BarrelConstruction INFO Getting primary numbers for ATLAS, ATLAS-R2-2016-01-00-01
BarrelConstruction INFO Makes detailed absorber sandwich ? 1 1
BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
+ClassIDSvc INFO getRegistryEntries: read 3295 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -298,6 +847,9 @@ EMECConstruction INFO multi-lay
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstruction INFO Start building EC electronics geometry
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 25148Kb Time = 0.6S
+GeoModelSvc.TileDetectorTool INFO Entering TileDetectorTool::create()
+TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
TileDddbManager INFO n_timod = 320
TileDddbManager INFO n_cuts = 9
@@ -306,9 +858,11 @@ TileDddbManager INFO n_tilb =
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDescrCnv INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a CaloCell_ID helper object in the detector store
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArEM_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -316,18 +870,90 @@ CaloIDHelper_IDDetDescrCnv INFO in create
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
AtlasDetectorID INFO initialize_from_dictionary - OK
+GeoModelSvc.TileDetectorTool INFO U-shape parameter from database is: 1
+GeoModelSvc.TileDetectorTool INFO Glue parameter from database is: 1
+GeoModelSvc.TileDetectorTool INFO Cs Tube parameter from database is: 0
+GeoModelSvc.TileDetectorTool INFO Entering TileAtlasFactory::create()
+GeoModelSvc.TileDetectorTool INFO Tile Geometry with Saddle supports, starting from TileCal-CSC-02 xxx
+GeoModelSvc.TileDetectorTool INFO => New BFingerLengthPos 430.5
+GeoModelSvc.TileDetectorTool INFO => New BFingerLengthNeg 420.5
+GeoModelSvc.TileDetectorTool INFO Positioning barrel with translation 0
+GeoModelSvc.TileDetectorTool INFO Positioning positive barrel finger with translation 3035.25
+GeoModelSvc.TileDetectorTool INFO Positioning negative barrel finger with translation -3030.25
+GeoModelSvc.TileDetectorTool INFO Positioning positive ext.barrel with translation 4854.75
+GeoModelSvc.TileDetectorTool INFO Positioning positive ext.barrel finger with translation ztrans= 6338.5
+GeoModelSvc.TileDetectorTool INFO Positioning positive ext.barrel saddle with translation ztrans= 6192.5
+GeoModelSvc.TileDetectorTool INFO Positive ITC envelope parameters: PLUG1 Rmin= 3438.85 Rmax= 4250 dzITC1= 154.5
+GeoModelSvc.TileDetectorTool INFO PLUG2 Rmin= 2981 Rmax= 3440 dzITC2= 47.425
+GeoModelSvc.TileDetectorTool INFO Positioning positive ITC with translation 3405
+GeoModelSvc.TileDetectorTool INFO Positioning positive Gap with translation 3552
+GeoModelSvc.TileDetectorTool INFO Positioning positive Crack with translation 3536
+GeoModelSvc.TileDetectorTool INFO Positioning negative ext.barrel with translation ztrans -4854.75
+GeoModelSvc.TileDetectorTool INFO Positioning negative ext.barrel finger with translation ztrans= -6338.5
+GeoModelSvc.TileDetectorTool INFO Positioning negative ext.barrel saddle with translation ztrans= -6192.5
+GeoModelSvc.TileDetectorTool INFO Negative ITC envelope parameters: PLUG1 Rmin= 3438.85 Rmax= 4250 dzITC1= 154.5
+GeoModelSvc.TileDetectorTool INFO PLUG2 Rmin= 2981 Rmax= 3440 dzITC2= 47.425
+GeoModelSvc.TileDetectorTool INFO Positioning negative ITC with translation -3405
+GeoModelSvc.TileDetectorTool INFO Positioning negative Gap with translation -3552
+GeoModelSvc.TileDetectorTool INFO Positioning negative Crack with translation -3536
+GeoModelSvc.TileDetectorTool INFO Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.TileDetectorTool INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.TileDetectorTool INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrManager INFO Entering create_elements()
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3528Kb Time = 0.17S
+ClassIDSvc INFO getRegistryEntries: read 71 CLIDRegistry entries for module ALL
+GeoModelSvc INFO AlgTool: GeoModelSvc.LArDetectorToolNV
+GeoModelSvc INFO AlgTool: GeoModelSvc.TileDetectorTool
+TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
+TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
CaloLVL1_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-R2-2016-01-00-01
TileCablingSvc INFO Cabling for RUN2a (2018) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 5
+AthenaHiveEventLoopMgr INFO Initializing AthenaHiveEventLoopMgr
+ClassIDSvc 0 INFO getRegistryEntries: read 4979 CLIDRegistry entries for module ALL
+PyComponentMgr 0 INFO Initializing PyComponentMgr...
+Finalizer 0 INFO Initializing Finalizer...
+ClassIDSvc 0 INFO getRegistryEntries: read 553 CLIDRegistry entries for module ALL
+CondInputLoader 0 INFO Initializing CondInputLoader...
+ClassIDSvc 0 INFO getRegistryEntries: read 12 CLIDRegistry entries for module ALL
CondInputLoader 0 INFO Adding base classes:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' ) -> no bases
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' ) ->
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' ) ->
CondInputLoader 0 INFO Will create WriteCondHandle dependencies for the following DataObjects:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' )
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' )
TileBadChannelsCondAlg.TileCondProxyCool_OnlBch 0 INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OnlBch) for folder: "/TILE/ONL01/STATUS/ADC"
TileBadChannelsCondAlg.TileCondProxyCool_OflBch 0 INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OflBch) for folder: "/TILE/OFL02/STATUS/ADC"
TileBadChannelsCondAlg 0 INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
@@ -348,7 +974,7 @@ TileSampleNoiseCon...TileCondProxyCool_NoiseSample 0 INFO Creating
TileTimingCondAlg.TileCondProxyCool_AdcOffset 0 INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
ThreadPoolSvc 0 INFO no thread init tools attached
AvalancheSchedulerSvc 0 INFO Activating scheduler in a separate thread
-AvalancheSchedulerSvc 0 INFO Found 14 algorithms
+AvalancheSchedulerSvc 0 INFO Found 15 algorithms
AvalancheSchedulerSvc 0 INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
AvalancheSchedulerSvc 0 INFO o ( 'TileLaserObject' , 'StoreGateSvc+TileLaserObj' ) required by Algorithm:
AvalancheSchedulerSvc 0 INFO * TileLaserObjectDumper
@@ -362,23 +988,50 @@ AvalancheSchedulerSvc 0 INFO Task sche
AvalancheSchedulerSvc 0 INFO o Avalanche generation mode: disabled
AvalancheSchedulerSvc 0 INFO o Preemptive scheduling of CPU-blocking tasks: disabled
AvalancheSchedulerSvc 0 INFO o Scheduling of condition tasks: disabled
+ByteStreamInputSvc 0 INFO Initializing
+ROBDataProviderSvc 0 INFO Initializing
ROBDataProviderSvc 0 INFO ---> Filter out empty ROB fragments = 'filterEmptyROB':False
ROBDataProviderSvc 0 INFO ---> Filter out specific ROBs by Status Code: # ROBs = 0
ROBDataProviderSvc 0 INFO ---> Filter out Sub Detector ROBs by Status Code: # Sub Detectors = 0
EventSelector 0 INFO reinitialization...
AthenaHiveEventLoopMgr 0 INFO Setup EventSelector service EventSelector
ApplicationMgr 0 INFO Application Manager Initialized successfully
+PoolSvc 0 INFO Enabled implicit multithreading in ROOT via PersistencySvc to: 3
+CondInputLoader 0 INFO created CondCont<CaloRec::CaloCellPositionShift> with key 'ConditionStore+LArCellPositionShift'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/EMS'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/STATUS/ADC'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/ONL01/STATUS/ADC'
+CondInputLoader 0 INFO created CondCont<DetCondKeyTrans> with key 'ConditionStore+/LAR/Align'
+ByteStreamInputSvc 0 INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TileByteStream/TileByteStream-02-00-00/data18_tilecomm.00363899.calibration_tile.daq.RAW._lb0000._TileREB-ROS._0005-200ev.data
ApplicationMgr 0 INFO Application Manager Started successfully
AthenaHiveEventLoopMgr 0 INFO Starting loop on events
+EventPersistencySvc 0 0 INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistencySvc 0 0 INFO Added successfully Conversion service:ByteStreamCnvSvc
EventInfoByteStreamAuxCnv 0 0 INFO IsSimulation : 0
EventInfoByteStreamAuxCnv 0 0 INFO IsTestbeam : 0
EventInfoByteStreamAuxCnv 0 0 INFO IsCalibration : 0
AthenaHiveEventLoopMgr 0 0 INFO ===>>> start of run 363899 <<<===
+IOVDbSvc 0 0 INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder 0 0 INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder 0 0 INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
+IOVDbSvc 0 0 INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc 0 0 INFO Opened read transaction for POOL PersistencySvc
+DbSession 0 0 INFO Open DbSession
+Domain[ROOT_All] 0 0 INFO > Access DbDomain READ [ROOT_All]
+Domain[ROOT_All] 0 0 INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
+Domain[ROOT_All] 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
+RootDatabase.open 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv 0 0 INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDescrCnv 0 0 INFO in createObj: creating a CaloDescrManager object in the detector store
+ClassIDSvc 0 0 INFO getRegistryEntries: read 207 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID 0 0 INFO initialize_from_dictionary
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
@@ -392,19 +1045,266 @@ CaloIDHelper_IDDetDescrCnv 0 0 INFO in create
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
+TileNeighbour 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
CaloIdMgrDetDescrCnv 0 0 INFO Finished
+CaloIdMgrDetDescrCnv 0 0 INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
+Domain[ROOT_All] 0 0 INFO -> Access DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
+RootDatabase.open 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
+AthenaHiveEventLoopMgr 0 0 INFO ===>>> start processing event #18124, run #363899 on slot 0, 0 events processed so far <<<===
+ClassIDSvc 0 0 INFO getRegistryEntries: read 495 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 1763 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 92 CLIDRegistry entries for module ALL
+ToolSvc.TileROD_Decoder.TileL2Builder 0 0 INFO TileL2Builder initialization completed
+/cvmfs/atlas-condb.cern.ch/repo/conditions/...root 0 0 INFO Database being retired...
+Domain[ROOT_All] 0 0 INFO -> Deaccess DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
+/cvmfs/atlas-condb.cern.ch/repo/conditions/...root 0 0 INFO Database being retired...
+Domain[ROOT_All] 0 0 INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] 0 0 INFO > Deaccess DbDomain READ [ROOT_All]
+AthenaHiveEventLoopMgr 0 0 INFO ===>>> done processing event #18124, run #363899 on slot 0, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 1 0 INFO ===>>> start processing event #18125, run #363899 on slot 0, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 2 1 INFO ===>>> start processing event #18126, run #363899 on slot 1, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 3 2 INFO ===>>> start processing event #18127, run #363899 on slot 2, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 4 3 INFO ===>>> start processing event #18128, run #363899 on slot 3, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 2 1 INFO ===>>> done processing event #18126, run #363899 on slot 1, 2 events processed so far <<<===
+AthenaHiveEventLoopMgr 5 1 INFO ===>>> start processing event #18129, run #363899 on slot 1, 2 events processed so far <<<===
+AthenaHiveEventLoopMgr 1 0 INFO ===>>> done processing event #18125, run #363899 on slot 0, 3 events processed so far <<<===
+AthenaHiveEventLoopMgr 6 0 INFO ===>>> start processing event #18130, run #363899 on slot 0, 3 events processed so far <<<===
+AthenaHiveEventLoopMgr 5 1 INFO ===>>> done processing event #18129, run #363899 on slot 1, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 7 1 INFO ===>>> start processing event #18131, run #363899 on slot 1, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 3 2 INFO ===>>> done processing event #18127, run #363899 on slot 2, 5 events processed so far <<<===
+AthenaHiveEventLoopMgr 8 2 INFO ===>>> start processing event #18132, run #363899 on slot 2, 5 events processed so far <<<===
+AthenaHiveEventLoopMgr 6 0 INFO ===>>> done processing event #18130, run #363899 on slot 0, 6 events processed so far <<<===
+AthenaHiveEventLoopMgr 4 3 INFO ===>>> done processing event #18128, run #363899 on slot 3, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 9 0 INFO ===>>> start processing event #18133, run #363899 on slot 0, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 10 3 INFO ===>>> start processing event #18134, run #363899 on slot 3, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 7 1 INFO ===>>> done processing event #18131, run #363899 on slot 1, 8 events processed so far <<<===
+AthenaHiveEventLoopMgr 8 2 INFO ===>>> done processing event #18132, run #363899 on slot 2, 9 events processed so far <<<===
+AthenaHiveEventLoopMgr 11 1 INFO ===>>> start processing event #18135, run #363899 on slot 1, 9 events processed so far <<<===
+AthenaHiveEventLoopMgr 12 2 INFO ===>>> start processing event #18136, run #363899 on slot 2, 9 events processed so far <<<===
+AthenaHiveEventLoopMgr 9 0 INFO ===>>> done processing event #18133, run #363899 on slot 0, 10 events processed so far <<<===
+AthenaHiveEventLoopMgr 10 3 INFO ===>>> done processing event #18134, run #363899 on slot 3, 11 events processed so far <<<===
+AthenaHiveEventLoopMgr 13 0 INFO ===>>> start processing event #18137, run #363899 on slot 0, 11 events processed so far <<<===
+AthenaHiveEventLoopMgr 14 3 INFO ===>>> start processing event #18138, run #363899 on slot 3, 11 events processed so far <<<===
+AthenaHiveEventLoopMgr 11 1 INFO ===>>> done processing event #18135, run #363899 on slot 1, 12 events processed so far <<<===
+AthenaHiveEventLoopMgr 12 2 INFO ===>>> done processing event #18136, run #363899 on slot 2, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 15 1 INFO ===>>> start processing event #18139, run #363899 on slot 1, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 16 2 INFO ===>>> start processing event #18140, run #363899 on slot 2, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 13 0 INFO ===>>> done processing event #18137, run #363899 on slot 0, 14 events processed so far <<<===
+AthenaHiveEventLoopMgr 14 3 INFO ===>>> done processing event #18138, run #363899 on slot 3, 15 events processed so far <<<===
+AthenaHiveEventLoopMgr 17 0 INFO ===>>> start processing event #18141, run #363899 on slot 0, 15 events processed so far <<<===
+AthenaHiveEventLoopMgr 18 3 INFO ===>>> start processing event #18142, run #363899 on slot 3, 15 events processed so far <<<===
+AthenaHiveEventLoopMgr 15 1 INFO ===>>> done processing event #18139, run #363899 on slot 1, 16 events processed so far <<<===
+AthenaHiveEventLoopMgr 16 2 INFO ===>>> done processing event #18140, run #363899 on slot 2, 17 events processed so far <<<===
+AthenaHiveEventLoopMgr 19 1 INFO ===>>> start processing event #18143, run #363899 on slot 1, 17 events processed so far <<<===
+AthenaHiveEventLoopMgr 20 2 INFO ===>>> start processing event #18144, run #363899 on slot 2, 17 events processed so far <<<===
+AthenaHiveEventLoopMgr 17 0 INFO ===>>> done processing event #18141, run #363899 on slot 0, 18 events processed so far <<<===
+AthenaHiveEventLoopMgr 18 3 INFO ===>>> done processing event #18142, run #363899 on slot 3, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 21 0 INFO ===>>> start processing event #18145, run #363899 on slot 0, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 22 3 INFO ===>>> start processing event #18146, run #363899 on slot 3, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 19 1 INFO ===>>> done processing event #18143, run #363899 on slot 1, 20 events processed so far <<<===
+AthenaHiveEventLoopMgr 20 2 INFO ===>>> done processing event #18144, run #363899 on slot 2, 21 events processed so far <<<===
+AthenaHiveEventLoopMgr 23 1 INFO ===>>> start processing event #18147, run #363899 on slot 1, 21 events processed so far <<<===
+AthenaHiveEventLoopMgr 24 2 INFO ===>>> start processing event #18148, run #363899 on slot 2, 21 events processed so far <<<===
+AthenaHiveEventLoopMgr 21 0 INFO ===>>> done processing event #18145, run #363899 on slot 0, 22 events processed so far <<<===
+AthenaHiveEventLoopMgr 22 3 INFO ===>>> done processing event #18146, run #363899 on slot 3, 23 events processed so far <<<===
+AthenaHiveEventLoopMgr 25 0 INFO ===>>> start processing event #18149, run #363899 on slot 0, 23 events processed so far <<<===
+AthenaHiveEventLoopMgr 26 3 INFO ===>>> start processing event #18150, run #363899 on slot 3, 23 events processed so far <<<===
+AthenaHiveEventLoopMgr 23 1 INFO ===>>> done processing event #18147, run #363899 on slot 1, 24 events processed so far <<<===
+AthenaHiveEventLoopMgr 24 2 INFO ===>>> done processing event #18148, run #363899 on slot 2, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 27 1 INFO ===>>> start processing event #18151, run #363899 on slot 1, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 28 2 INFO ===>>> start processing event #18152, run #363899 on slot 2, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 25 0 INFO ===>>> done processing event #18149, run #363899 on slot 0, 26 events processed so far <<<===
+AthenaHiveEventLoopMgr 26 3 INFO ===>>> done processing event #18150, run #363899 on slot 3, 27 events processed so far <<<===
+AthenaHiveEventLoopMgr 29 0 INFO ===>>> start processing event #18153, run #363899 on slot 0, 27 events processed so far <<<===
+AthenaHiveEventLoopMgr 30 3 INFO ===>>> start processing event #18154, run #363899 on slot 3, 27 events processed so far <<<===
+AthenaHiveEventLoopMgr 27 1 INFO ===>>> done processing event #18151, run #363899 on slot 1, 28 events processed so far <<<===
+AthenaHiveEventLoopMgr 28 2 INFO ===>>> done processing event #18152, run #363899 on slot 2, 29 events processed so far <<<===
+AthenaHiveEventLoopMgr 31 1 INFO ===>>> start processing event #18155, run #363899 on slot 1, 29 events processed so far <<<===
+AthenaHiveEventLoopMgr 32 2 INFO ===>>> start processing event #18156, run #363899 on slot 2, 29 events processed so far <<<===
+AthenaHiveEventLoopMgr 29 0 INFO ===>>> done processing event #18153, run #363899 on slot 0, 30 events processed so far <<<===
+AthenaHiveEventLoopMgr 30 3 INFO ===>>> done processing event #18154, run #363899 on slot 3, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 33 0 INFO ===>>> start processing event #18157, run #363899 on slot 0, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 34 3 INFO ===>>> start processing event #18158, run #363899 on slot 3, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 31 1 INFO ===>>> done processing event #18155, run #363899 on slot 1, 32 events processed so far <<<===
+AthenaHiveEventLoopMgr 32 2 INFO ===>>> done processing event #18156, run #363899 on slot 2, 33 events processed so far <<<===
+AthenaHiveEventLoopMgr 35 1 INFO ===>>> start processing event #18159, run #363899 on slot 1, 33 events processed so far <<<===
+AthenaHiveEventLoopMgr 36 2 INFO ===>>> start processing event #18160, run #363899 on slot 2, 33 events processed so far <<<===
+AthenaHiveEventLoopMgr 33 0 INFO ===>>> done processing event #18157, run #363899 on slot 0, 34 events processed so far <<<===
+AthenaHiveEventLoopMgr 34 3 INFO ===>>> done processing event #18158, run #363899 on slot 3, 35 events processed so far <<<===
+AthenaHiveEventLoopMgr 37 0 INFO ===>>> start processing event #18161, run #363899 on slot 0, 35 events processed so far <<<===
+AthenaHiveEventLoopMgr 38 3 INFO ===>>> start processing event #18162, run #363899 on slot 3, 35 events processed so far <<<===
+AthenaHiveEventLoopMgr 35 1 INFO ===>>> done processing event #18159, run #363899 on slot 1, 36 events processed so far <<<===
+AthenaHiveEventLoopMgr 36 2 INFO ===>>> done processing event #18160, run #363899 on slot 2, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 39 1 INFO ===>>> start processing event #18163, run #363899 on slot 1, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 40 2 INFO ===>>> start processing event #18164, run #363899 on slot 2, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 37 0 INFO ===>>> done processing event #18161, run #363899 on slot 0, 38 events processed so far <<<===
+AthenaHiveEventLoopMgr 38 3 INFO ===>>> done processing event #18162, run #363899 on slot 3, 39 events processed so far <<<===
+AthenaHiveEventLoopMgr 41 0 INFO ===>>> start processing event #18165, run #363899 on slot 0, 39 events processed so far <<<===
+AthenaHiveEventLoopMgr 42 3 INFO ===>>> start processing event #18166, run #363899 on slot 3, 39 events processed so far <<<===
+AthenaHiveEventLoopMgr 39 1 INFO ===>>> done processing event #18163, run #363899 on slot 1, 40 events processed so far <<<===
+AthenaHiveEventLoopMgr 40 2 INFO ===>>> done processing event #18164, run #363899 on slot 2, 41 events processed so far <<<===
+AthenaHiveEventLoopMgr 43 1 INFO ===>>> start processing event #18167, run #363899 on slot 1, 41 events processed so far <<<===
+AthenaHiveEventLoopMgr 44 2 INFO ===>>> start processing event #18168, run #363899 on slot 2, 41 events processed so far <<<===
+AthenaHiveEventLoopMgr 41 0 INFO ===>>> done processing event #18165, run #363899 on slot 0, 42 events processed so far <<<===
+AthenaHiveEventLoopMgr 42 3 INFO ===>>> done processing event #18166, run #363899 on slot 3, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 45 0 INFO ===>>> start processing event #18169, run #363899 on slot 0, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 46 3 INFO ===>>> start processing event #18170, run #363899 on slot 3, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 43 1 INFO ===>>> done processing event #18167, run #363899 on slot 1, 44 events processed so far <<<===
+AthenaHiveEventLoopMgr 44 2 INFO ===>>> done processing event #18168, run #363899 on slot 2, 45 events processed so far <<<===
+AthenaHiveEventLoopMgr 47 1 INFO ===>>> start processing event #18171, run #363899 on slot 1, 45 events processed so far <<<===
+AthenaHiveEventLoopMgr 48 2 INFO ===>>> start processing event #18172, run #363899 on slot 2, 45 events processed so far <<<===
+AthenaHiveEventLoopMgr 45 0 INFO ===>>> done processing event #18169, run #363899 on slot 0, 46 events processed so far <<<===
+AthenaHiveEventLoopMgr 46 3 INFO ===>>> done processing event #18170, run #363899 on slot 3, 47 events processed so far <<<===
+AthenaHiveEventLoopMgr 49 0 INFO ===>>> start processing event #18173, run #363899 on slot 0, 47 events processed so far <<<===
+AthenaHiveEventLoopMgr 50 3 INFO ===>>> start processing event #18174, run #363899 on slot 3, 47 events processed so far <<<===
+AthenaHiveEventLoopMgr 47 1 INFO ===>>> done processing event #18171, run #363899 on slot 1, 48 events processed so far <<<===
+AthenaHiveEventLoopMgr 48 2 INFO ===>>> done processing event #18172, run #363899 on slot 2, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 51 1 INFO ===>>> start processing event #18175, run #363899 on slot 1, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 52 2 INFO ===>>> start processing event #18176, run #363899 on slot 2, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 49 0 INFO ===>>> done processing event #18173, run #363899 on slot 0, 50 events processed so far <<<===
+AthenaHiveEventLoopMgr 50 3 INFO ===>>> done processing event #18174, run #363899 on slot 3, 51 events processed so far <<<===
+AthenaHiveEventLoopMgr 53 0 INFO ===>>> start processing event #18177, run #363899 on slot 0, 51 events processed so far <<<===
+AthenaHiveEventLoopMgr 54 3 INFO ===>>> start processing event #18178, run #363899 on slot 3, 51 events processed so far <<<===
+AthenaHiveEventLoopMgr 51 1 INFO ===>>> done processing event #18175, run #363899 on slot 1, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 52 2 INFO ===>>> done processing event #18176, run #363899 on slot 2, 53 events processed so far <<<===
+AthenaHiveEventLoopMgr 55 1 INFO ===>>> start processing event #18179, run #363899 on slot 1, 53 events processed so far <<<===
+AthenaHiveEventLoopMgr 56 2 INFO ===>>> start processing event #18180, run #363899 on slot 2, 53 events processed so far <<<===
+AthenaHiveEventLoopMgr 53 0 INFO ===>>> done processing event #18177, run #363899 on slot 0, 54 events processed so far <<<===
+AthenaHiveEventLoopMgr 54 3 INFO ===>>> done processing event #18178, run #363899 on slot 3, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 57 0 INFO ===>>> start processing event #18181, run #363899 on slot 0, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 58 3 INFO ===>>> start processing event #18182, run #363899 on slot 3, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 55 1 INFO ===>>> done processing event #18179, run #363899 on slot 1, 56 events processed so far <<<===
+AthenaHiveEventLoopMgr 56 2 INFO ===>>> done processing event #18180, run #363899 on slot 2, 57 events processed so far <<<===
+AthenaHiveEventLoopMgr 59 1 INFO ===>>> start processing event #18183, run #363899 on slot 1, 57 events processed so far <<<===
+AthenaHiveEventLoopMgr 60 2 INFO ===>>> start processing event #18184, run #363899 on slot 2, 57 events processed so far <<<===
+AthenaHiveEventLoopMgr 57 0 INFO ===>>> done processing event #18181, run #363899 on slot 0, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 58 3 INFO ===>>> done processing event #18182, run #363899 on slot 3, 59 events processed so far <<<===
+AthenaHiveEventLoopMgr 61 0 INFO ===>>> start processing event #18185, run #363899 on slot 0, 59 events processed so far <<<===
+AthenaHiveEventLoopMgr 62 3 INFO ===>>> start processing event #18186, run #363899 on slot 3, 59 events processed so far <<<===
+AthenaHiveEventLoopMgr 59 1 INFO ===>>> done processing event #18183, run #363899 on slot 1, 60 events processed so far <<<===
+AthenaHiveEventLoopMgr 60 2 INFO ===>>> done processing event #18184, run #363899 on slot 2, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 63 1 INFO ===>>> start processing event #18187, run #363899 on slot 1, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 64 2 INFO ===>>> start processing event #18188, run #363899 on slot 2, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 61 0 INFO ===>>> done processing event #18185, run #363899 on slot 0, 62 events processed so far <<<===
+AthenaHiveEventLoopMgr 62 3 INFO ===>>> done processing event #18186, run #363899 on slot 3, 63 events processed so far <<<===
+AthenaHiveEventLoopMgr 65 0 INFO ===>>> start processing event #18189, run #363899 on slot 0, 63 events processed so far <<<===
+AthenaHiveEventLoopMgr 66 3 INFO ===>>> start processing event #18190, run #363899 on slot 3, 63 events processed so far <<<===
+AthenaHiveEventLoopMgr 63 1 INFO ===>>> done processing event #18187, run #363899 on slot 1, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 64 2 INFO ===>>> done processing event #18188, run #363899 on slot 2, 65 events processed so far <<<===
+AthenaHiveEventLoopMgr 67 1 INFO ===>>> start processing event #18191, run #363899 on slot 1, 65 events processed so far <<<===
+AthenaHiveEventLoopMgr 68 2 INFO ===>>> start processing event #18192, run #363899 on slot 2, 65 events processed so far <<<===
+AthenaHiveEventLoopMgr 65 0 INFO ===>>> done processing event #18189, run #363899 on slot 0, 66 events processed so far <<<===
+AthenaHiveEventLoopMgr 66 3 INFO ===>>> done processing event #18190, run #363899 on slot 3, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 69 0 INFO ===>>> start processing event #18193, run #363899 on slot 0, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 70 3 INFO ===>>> start processing event #18194, run #363899 on slot 3, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 67 1 INFO ===>>> done processing event #18191, run #363899 on slot 1, 68 events processed so far <<<===
+AthenaHiveEventLoopMgr 68 2 INFO ===>>> done processing event #18192, run #363899 on slot 2, 69 events processed so far <<<===
+AthenaHiveEventLoopMgr 71 1 INFO ===>>> start processing event #18195, run #363899 on slot 1, 69 events processed so far <<<===
+AthenaHiveEventLoopMgr 72 2 INFO ===>>> start processing event #18196, run #363899 on slot 2, 69 events processed so far <<<===
+AthenaHiveEventLoopMgr 69 0 INFO ===>>> done processing event #18193, run #363899 on slot 0, 70 events processed so far <<<===
+AthenaHiveEventLoopMgr 70 3 INFO ===>>> done processing event #18194, run #363899 on slot 3, 71 events processed so far <<<===
+AthenaHiveEventLoopMgr 73 0 INFO ===>>> start processing event #18197, run #363899 on slot 0, 71 events processed so far <<<===
+AthenaHiveEventLoopMgr 74 3 INFO ===>>> start processing event #18198, run #363899 on slot 3, 71 events processed so far <<<===
+AthenaHiveEventLoopMgr 71 1 INFO ===>>> done processing event #18195, run #363899 on slot 1, 72 events processed so far <<<===
+AthenaHiveEventLoopMgr 72 2 INFO ===>>> done processing event #18196, run #363899 on slot 2, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 75 1 INFO ===>>> start processing event #18199, run #363899 on slot 1, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 76 2 INFO ===>>> start processing event #18200, run #363899 on slot 2, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 73 0 INFO ===>>> done processing event #18197, run #363899 on slot 0, 74 events processed so far <<<===
+AthenaHiveEventLoopMgr 74 3 INFO ===>>> done processing event #18198, run #363899 on slot 3, 75 events processed so far <<<===
+AthenaHiveEventLoopMgr 77 0 INFO ===>>> start processing event #18201, run #363899 on slot 0, 75 events processed so far <<<===
+AthenaHiveEventLoopMgr 78 3 INFO ===>>> start processing event #18202, run #363899 on slot 3, 75 events processed so far <<<===
+AthenaHiveEventLoopMgr 75 1 INFO ===>>> done processing event #18199, run #363899 on slot 1, 76 events processed so far <<<===
+AthenaHiveEventLoopMgr 76 2 INFO ===>>> done processing event #18200, run #363899 on slot 2, 77 events processed so far <<<===
+AthenaHiveEventLoopMgr 79 1 INFO ===>>> start processing event #18203, run #363899 on slot 1, 77 events processed so far <<<===
+AthenaHiveEventLoopMgr 80 2 INFO ===>>> start processing event #18204, run #363899 on slot 2, 77 events processed so far <<<===
+AthenaHiveEventLoopMgr 77 0 INFO ===>>> done processing event #18201, run #363899 on slot 0, 78 events processed so far <<<===
+AthenaHiveEventLoopMgr 78 3 INFO ===>>> done processing event #18202, run #363899 on slot 3, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 81 0 INFO ===>>> start processing event #18205, run #363899 on slot 0, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 82 3 INFO ===>>> start processing event #18206, run #363899 on slot 3, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 79 1 INFO ===>>> done processing event #18203, run #363899 on slot 1, 80 events processed so far <<<===
+AthenaHiveEventLoopMgr 80 2 INFO ===>>> done processing event #18204, run #363899 on slot 2, 81 events processed so far <<<===
+AthenaHiveEventLoopMgr 83 1 INFO ===>>> start processing event #18207, run #363899 on slot 1, 81 events processed so far <<<===
+AthenaHiveEventLoopMgr 84 2 INFO ===>>> start processing event #18208, run #363899 on slot 2, 81 events processed so far <<<===
+AthenaHiveEventLoopMgr 81 0 INFO ===>>> done processing event #18205, run #363899 on slot 0, 82 events processed so far <<<===
+AthenaHiveEventLoopMgr 82 3 INFO ===>>> done processing event #18206, run #363899 on slot 3, 83 events processed so far <<<===
+AthenaHiveEventLoopMgr 85 0 INFO ===>>> start processing event #18209, run #363899 on slot 0, 83 events processed so far <<<===
+AthenaHiveEventLoopMgr 86 3 INFO ===>>> start processing event #18210, run #363899 on slot 3, 83 events processed so far <<<===
+AthenaHiveEventLoopMgr 83 1 INFO ===>>> done processing event #18207, run #363899 on slot 1, 84 events processed so far <<<===
+AthenaHiveEventLoopMgr 84 2 INFO ===>>> done processing event #18208, run #363899 on slot 2, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 87 1 INFO ===>>> start processing event #18211, run #363899 on slot 1, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 88 2 INFO ===>>> start processing event #18212, run #363899 on slot 2, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 85 0 INFO ===>>> done processing event #18209, run #363899 on slot 0, 86 events processed so far <<<===
+AthenaHiveEventLoopMgr 86 3 INFO ===>>> done processing event #18210, run #363899 on slot 3, 87 events processed so far <<<===
+AthenaHiveEventLoopMgr 89 0 INFO ===>>> start processing event #18213, run #363899 on slot 0, 87 events processed so far <<<===
+AthenaHiveEventLoopMgr 90 3 INFO ===>>> start processing event #18214, run #363899 on slot 3, 87 events processed so far <<<===
+AthenaHiveEventLoopMgr 87 1 INFO ===>>> done processing event #18211, run #363899 on slot 1, 88 events processed so far <<<===
+AthenaHiveEventLoopMgr 88 2 INFO ===>>> done processing event #18212, run #363899 on slot 2, 89 events processed so far <<<===
+AthenaHiveEventLoopMgr 91 1 INFO ===>>> start processing event #18215, run #363899 on slot 1, 89 events processed so far <<<===
+AthenaHiveEventLoopMgr 92 2 INFO ===>>> start processing event #18216, run #363899 on slot 2, 89 events processed so far <<<===
+AthenaHiveEventLoopMgr 89 0 INFO ===>>> done processing event #18213, run #363899 on slot 0, 90 events processed so far <<<===
+AthenaHiveEventLoopMgr 90 3 INFO ===>>> done processing event #18214, run #363899 on slot 3, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 93 0 INFO ===>>> start processing event #18217, run #363899 on slot 0, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 94 3 INFO ===>>> start processing event #18218, run #363899 on slot 3, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 91 1 INFO ===>>> done processing event #18215, run #363899 on slot 1, 92 events processed so far <<<===
+AthenaHiveEventLoopMgr 92 2 INFO ===>>> done processing event #18216, run #363899 on slot 2, 93 events processed so far <<<===
+AthenaHiveEventLoopMgr 95 1 INFO ===>>> start processing event #18219, run #363899 on slot 1, 93 events processed so far <<<===
+AthenaHiveEventLoopMgr 96 2 INFO ===>>> start processing event #18220, run #363899 on slot 2, 93 events processed so far <<<===
+AthenaHiveEventLoopMgr 93 0 INFO ===>>> done processing event #18217, run #363899 on slot 0, 94 events processed so far <<<===
+AthenaHiveEventLoopMgr 94 3 INFO ===>>> done processing event #18218, run #363899 on slot 3, 95 events processed so far <<<===
+AthenaHiveEventLoopMgr 97 0 INFO ===>>> start processing event #18221, run #363899 on slot 0, 95 events processed so far <<<===
+AthenaHiveEventLoopMgr 98 3 INFO ===>>> start processing event #18222, run #363899 on slot 3, 95 events processed so far <<<===
+AthenaHiveEventLoopMgr 95 1 INFO ===>>> done processing event #18219, run #363899 on slot 1, 96 events processed so far <<<===
+AthenaHiveEventLoopMgr 96 2 INFO ===>>> done processing event #18220, run #363899 on slot 2, 97 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 1 INFO ===>>> start processing event #18223, run #363899 on slot 1, 97 events processed so far <<<===
+AthenaHiveEventLoopMgr 97 0 INFO ===>>> done processing event #18221, run #363899 on slot 0, 98 events processed so far <<<===
+AthenaHiveEventLoopMgr 98 3 INFO ===>>> done processing event #18222, run #363899 on slot 3, 99 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 1 INFO ===>>> done processing event #18223, run #363899 on slot 1, 100 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 1 INFO ---> Loop Finished (seconds): 0.914641
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
+SGInputLoader INFO Finalizing SGInputLoader...
+Finalizer INFO Finalizing Finalizer...
Finalize: compared 10 dumps
+CondInputLoader INFO Finalizing CondInputLoader...
+AvalancheSchedulerSvc INFO Joining Scheduler thread
+PyComponentMgr INFO Finalizing PyComponentMgr...
+EventDataSvc INFO Finalizing EventDataSvc
IdDictDetDescrCnv INFO in finalize
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.01 ))s
+IOVDbSvc INFO bytes in (( 0.04 ))s
+IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.04 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 1 nFolders: 11 ReadTime: (( 0.00 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
+ToolSvc.TileROD_Decoder.TileL2Builder INFO Finalizing
ToolSvc.ByteStreamMetadataTool INFO in finalize()
*****Chrono***** INFO ****************************************************************************************************
+*****Chrono***** INFO WARNING: MT job; statistics are unreliable
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
+cObjR_ALL INFO Time User : Tot= 170 [ms] Ave/Min/Max= 85(+- 75)/ 10/ 160 [ms] #= 2
+cObj_ALL INFO Time User : Tot= 240 [ms] Ave/Min/Max= 120(+- 60)/ 60/ 180 [ms] #= 2
+ChronoStatSvc INFO Time User : Tot= 4.36 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.finalize() INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileMuRcvContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileMuRcvContByteStreamCnv_test.ref
index 1b043239df52..663669d0f30a 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileMuRcvContByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileMuRcvContByteStreamCnv_test.ref
@@ -1,6 +1,20 @@
+Sun Aug 22 06:50:53 CEST 2021
+Preloading tcmalloc_minimal.so
+Py:Athena INFO including file "AthenaCommon/Preparation.py"
+Py:Athena INFO using release [WorkDir-22.0.42] [x86_64-centos7-gcc8-opt] [master-calo-ctests/b78ddd66878] -- built on [2021-08-22T0649]
+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 "TileByteStream/TileMuRcvContByteStreamCnv_test.py"
+Py:Athena INFO SetGeometryVersion.py obtained major release version 22
+Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
+Py:ConfigurableDb INFO Read module info for 5069 configurables from 4 genConfDb files
+Py:ConfigurableDb INFO No duplicates have been found: that's good !
+EventInfoMgtInit: Got release version Athena-22.0.42
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
+Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
+Py:TileConditions_jobOptions.py INFO Forcing RUN2a (2018) cabling for run 363899 with geometry ATLAS-R2-2016-01-00-01
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo for 7 samples
Py:TileConditions_jobOptions.py INFO setting up COOL for TileCal conditions data
Py:TileInfoConf. INFO Changing default TileBadChanTool configuration to COOL source
@@ -10,16 +24,111 @@ Py:TileInfoConf. INFO Changing default TileCondToolTiming configuration to C
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise for Opt.Filter without iterations
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
+Py:Athena INFO including file "AthenaCommon/runbatch.py"
+ApplicationMgr SUCCESS
+====================================================================================================================================
+ Welcome to ApplicationMgr (GaudiCoreSvc v36r0)
+ running on aibuild028.cern.ch on Sun Aug 22 06:51:08 2021
+====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
+ClassIDSvc INFO getRegistryEntries: read 6689 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
+MetaDataSvc INFO Initializing MetaDataSvc
+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/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+PoolSvc INFO Successfully setup replica sorting algorithm
+PoolSvc INFO Setting up APR FileCatalog and Streams
+PoolSvc INFO Unable find catalog apcfile:poolcond/PoolCat_oflcond.xml in $ATLAS_POOLCOND_PATH and $DATAPATH
+PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
+PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+ToolSvc.ByteStr... INFO Initializing
+MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool','ByteStreamMetadataTool'])
+MetaDataSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+MetaDataSvc INFO AlgTool: ToolSvc.ByteStreamMetadataTool
+IOVDbSvc INFO Only 5 POOL conditions files will be open at once
+IOVDbSvc INFO Cache alignment will be done in 3 slices
+IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
+IOVDbSvc INFO Initialised with 3 connections and 14 folders
+IOVDbSvc INFO Service IOVDbSvc initialised successfully
+IOVDbSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+ByteStreamAddre... INFO Initializing
ByteStreamAddre... INFO -- Will fill Store with id = 0
+TagInfoMgr INFO AlgTool: TagInfoMgr.IOVDbMetaDataTool
+ClassIDSvc INFO getRegistryEntries: read 2810 CLIDRegistry entries for module ALL
+IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+ClassIDSvc INFO getRegistryEntries: read 273 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_TILE/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200
+IOVDbSvc INFO Added taginfo remove for /LAR/Align
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CES
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/LIN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/NLN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/EMS
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/FIBER
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/LIN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/NLN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/NOISE/SAMPLE
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
+IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
+IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
+ClassIDSvc INFO getRegistryEntries: read 1854 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 23 CLIDRegistry entries for module ALL
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 HGTD_ID with CLID 79264207 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
+DetDescrCnvSvc INFO filling address for JTower_ID with CLID 218674799 and storage type 68 to detector store
+DetDescrCnvSvc INFO filling address for GTower_ID with CLID 49678914 and storage type 68 to detector store
GeoModelSvc::RD...WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RD...WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RD...WARNING Getting InDetMatComponents with default tag
@@ -59,15 +168,19 @@ LArHVLineID INFO setDictVersion of LArHighVoltage is OK
LArHVLineID INFO [initLevelsFromDict] m_dict OK ...
LArHVLineID INFO [initialize_from_dictionary] > HV line range -> 11/1/48:79/0:15 | 11/1/148:179/0:15 | 11/1/80:93/0:7 | 11/1/180:193/0:7 | 11/1/200:231/0:15 | 11/1/232:263/0:15 | 11/1/296,297,306,307/0:15 | 11/1/299,304,305,308,309/0:15 | 11/1/264:279/0:15 | 11/1/280:295/0:15 | 11/1/0:47/0:15 | 11/1/320:322/0:15 | 11/1/100:147/0:15 | 11/1/324,325/0:15 | 11/1/312:315/0:15 | 11/1/316:319/0:15 | 11/1/300:303/0:15 | 11/1/310,311/0:15 | 11/1/323/0:15 | 11/1/326,327/0:15 | 11/1/94:99/0:15 | 11/1/194:199/0:15
LArHVLineID INFO [init_hashes()] > Hvline_size= 5008
+GeoModelSvc.LAr... INFO Keys for LAr are ATLAS-R2-2016-01-00-01 ATLAS
+GeoModelSvc.LAr... INFO Building LAr version LAr-Revised-17-01 while ATLAS version is ATLAS-R2-2016-01-00-01
GeoModelSvc.LAr... INFO LAr Geometry Options:
GeoModelSvc.LAr... INFO Sagging = false
GeoModelSvc.LAr... INFO Barrel = ON
GeoModelSvc.LAr... INFO Endcap = ON
+BarrelConstruction INFO Getting primary numbers for ATLAS, ATLAS-R2-2016-01-00-01
BarrelConstruction INFO Makes detailed absorber sandwich ? 1 1
BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
+ClassIDSvc INFO getRegistryEntries: read 3249 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -76,6 +189,9 @@ EMECConstruction INFO multi-layered version of absorbers activated, paramete
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstru... INFO Start building EC electronics geometry
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24124Kb Time = 0.6S
+GeoModelSvc.Til... INFO Entering TileDetectorTool::create()
+TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
TileDddbManager INFO n_timod = 320
TileDddbManager INFO n_cuts = 9
@@ -84,9 +200,11 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloCell_ID helper object in the detector store
CaloIDHelper_ID... INFO in createObj: creating a LArEM_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -94,6 +212,9 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -128,13 +249,50 @@ GeoModelSvc.Til... INFO Global positioning of barrel with rotation (0,0,0)) a
GeoModelSvc.Til... INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
GeoModelSvc.Til... INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrMan... INFO Entering create_elements()
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 4552Kb Time = 0.16S
+ClassIDSvc INFO getRegistryEntries: read 71 CLIDRegistry entries for module ALL
+GeoModelSvc INFO AlgTool: GeoModelSvc.LArDetectorToolNV
+GeoModelSvc INFO AlgTool: GeoModelSvc.TileDetectorTool
+TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
+TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_ID... INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
CaloLVL1_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-R2-2016-01-00-01
TileCablingSvc INFO Cabling for RUN2a (2018) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 5
+AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr
+ClassIDSvc INFO getRegistryEntries: read 444 CLIDRegistry entries for module ALL
+CondInputLoader INFO Initializing CondInputLoader...
+ClassIDSvc INFO getRegistryEntries: read 12 CLIDRegistry entries for module ALL
CondInputLoader INFO Adding base classes:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' ) -> no bases
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' ) ->
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' ) ->
CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' )
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' )
TileBadChannels... INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OnlBch) for folder: "/TILE/ONL01/STATUS/ADC"
TileBadChannels... INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OflBch) for folder: "/TILE/OFL02/STATUS/ADC"
TileBadChannels... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
@@ -153,22 +311,52 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlEms) for folder: "/TILE/OFL02/CALIB/EMS"
TileSampleNoise... INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.TileCondProxyCool_NoiseSample) for folder: "/TILE/OFL02/NOISE/SAMPLE"
TileTimingCondA... INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
+ClassIDSvc INFO getRegistryEntries: read 4121 CLIDRegistry entries for module ALL
+PyComponentMgr INFO Initializing PyComponentMgr...
+Finalizer INFO Initializing Finalizer...
+ByteStreamInputSvc INFO Initializing
+ROBDataProviderSvc INFO Initializing
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
EventSelector INFO reinitialization...
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
+ClassIDSvc INFO getRegistryEntries: read 379 CLIDRegistry entries for module ALL
+ByteStreamInputSvc INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TileByteStream/TileByteStream-02-00-00/data18_tilecomm.00363899.calibration_tile.daq.RAW._lb0000._TileREB-ROS._0005-200ev.data
+CondInputLoader INFO created CondCont<CaloRec::CaloCellPositionShift> with key 'ConditionStore+LArCellPositionShift'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/EMS'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/STATUS/ADC'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/ONL01/STATUS/ADC'
+CondInputLoader INFO created CondCont<DetCondKeyTrans> with key 'ConditionStore+/LAR/Align'
ApplicationMgr INFO Application Manager Started successfully
+EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistenc... INFO Added successfully Conversion service:ByteStreamCnvSvc
EventInfoByteSt... INFO IsSimulation : 0
EventInfoByteSt... INFO IsTestbeam : 0
EventInfoByteSt... INFO IsCalibration : 0
AthenaEventLoopMgr INFO ===>>> start of run 363899 <<<===
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
+ClassIDSvc INFO getRegistryEntries: read 207 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -182,10 +370,22 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
+CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
+AthenaEventLoopMgr INFO ===>>> start processing event #18124, run #363899 0 events processed so far <<<===
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCes-SIM-06 for folder /TILE/OFL02/CALIB/CES
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCisFitLin-COM-00 for folder /TILE/OFL02/CALIB/CIS/FIT/LIN
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCisFitNln-COM-00 for folder /TILE/OFL02/CALIB/CIS/FIT/NLN
@@ -196,6 +396,8 @@ IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02Cali
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02NoiseSample-TwoGauss-19 for folder /TILE/OFL02/NOISE/SAMPLE
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02StatusAdc-IOVDEP-03 for folder /TILE/OFL02/STATUS/ADC
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02TimeChanneloffsetPhy-000-00 for folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY
+IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200
+LArAlignCondAlg INFO recorded new GeoAlignmentStore object for LAr with key LArAlignmentStore and range {[177530,l:0] - [INVALID]}
TileBadChannels... INFO Updating TileBchStatus::isBad() definition from DB
TileBadChannels... INFO Updating TileBchStatus::isNoisy() definition from DB
TileBadChannels... INFO No TileBchStatus::isNoGainL1() definition found in DB, using defaults
@@ -207,25 +409,273 @@ TileBadChannels... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
TileBadChannels... INFO TileBchStatus::isBadTiming() is defined by: Bad timing;
TileBadChannels... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
TileBadChannels... INFO No drawer trips probabilities found in DB
+ClassIDSvc INFO getRegistryEntries: read 2258 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 92 CLIDRegistry entries for module ALL
+ToolSvc.TileROD... INFO TileL2Builder initialization completed
+ToolSvc.TileMuR... INFO Initializing TileMuRcvContByteStreamTool
+AthenaEventLoopMgr INFO ===>>> done processing event #18124, run #363899 1 events processed so far <<<===
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
+AthenaEventLoopMgr INFO ===>>> start processing event #18125, run #363899 1 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18125, run #363899 2 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18126, run #363899 2 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18126, run #363899 3 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18127, run #363899 3 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18127, run #363899 4 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18128, run #363899 4 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18128, run #363899 5 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18129, run #363899 5 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18129, run #363899 6 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18130, run #363899 6 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18130, run #363899 7 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18131, run #363899 7 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18131, run #363899 8 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18132, run #363899 8 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18132, run #363899 9 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18133, run #363899 9 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18133, run #363899 10 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18134, run #363899 10 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18134, run #363899 11 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18135, run #363899 11 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18135, run #363899 12 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18136, run #363899 12 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18136, run #363899 13 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18137, run #363899 13 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18137, run #363899 14 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18138, run #363899 14 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18138, run #363899 15 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18139, run #363899 15 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18139, run #363899 16 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18140, run #363899 16 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18140, run #363899 17 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18141, run #363899 17 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18141, run #363899 18 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18142, run #363899 18 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18142, run #363899 19 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18143, run #363899 19 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18143, run #363899 20 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18144, run #363899 20 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18144, run #363899 21 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18145, run #363899 21 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18145, run #363899 22 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18146, run #363899 22 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18146, run #363899 23 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18147, run #363899 23 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18147, run #363899 24 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18148, run #363899 24 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18148, run #363899 25 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18149, run #363899 25 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18149, run #363899 26 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18150, run #363899 26 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18150, run #363899 27 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18151, run #363899 27 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18151, run #363899 28 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18152, run #363899 28 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18152, run #363899 29 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18153, run #363899 29 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18153, run #363899 30 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18154, run #363899 30 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18154, run #363899 31 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18155, run #363899 31 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18155, run #363899 32 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18156, run #363899 32 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18156, run #363899 33 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18157, run #363899 33 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18157, run #363899 34 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18158, run #363899 34 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18158, run #363899 35 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18159, run #363899 35 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18159, run #363899 36 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18160, run #363899 36 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18160, run #363899 37 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18161, run #363899 37 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18161, run #363899 38 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18162, run #363899 38 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18162, run #363899 39 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18163, run #363899 39 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18163, run #363899 40 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18164, run #363899 40 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18164, run #363899 41 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18165, run #363899 41 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18165, run #363899 42 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18166, run #363899 42 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18166, run #363899 43 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18167, run #363899 43 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18167, run #363899 44 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18168, run #363899 44 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18168, run #363899 45 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18169, run #363899 45 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18169, run #363899 46 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18170, run #363899 46 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18170, run #363899 47 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18171, run #363899 47 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18171, run #363899 48 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18172, run #363899 48 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18172, run #363899 49 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18173, run #363899 49 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18173, run #363899 50 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18174, run #363899 50 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18174, run #363899 51 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18175, run #363899 51 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18175, run #363899 52 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18176, run #363899 52 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18176, run #363899 53 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18177, run #363899 53 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18177, run #363899 54 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18178, run #363899 54 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18178, run #363899 55 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18179, run #363899 55 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18179, run #363899 56 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18180, run #363899 56 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18180, run #363899 57 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18181, run #363899 57 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18181, run #363899 58 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18182, run #363899 58 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18182, run #363899 59 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18183, run #363899 59 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18183, run #363899 60 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18184, run #363899 60 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18184, run #363899 61 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18185, run #363899 61 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18185, run #363899 62 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18186, run #363899 62 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18186, run #363899 63 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18187, run #363899 63 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18187, run #363899 64 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18188, run #363899 64 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18188, run #363899 65 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18189, run #363899 65 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18189, run #363899 66 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18190, run #363899 66 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18190, run #363899 67 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18191, run #363899 67 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18191, run #363899 68 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18192, run #363899 68 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18192, run #363899 69 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18193, run #363899 69 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18193, run #363899 70 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18194, run #363899 70 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18194, run #363899 71 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18195, run #363899 71 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18195, run #363899 72 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18196, run #363899 72 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18196, run #363899 73 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18197, run #363899 73 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18197, run #363899 74 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18198, run #363899 74 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18198, run #363899 75 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18199, run #363899 75 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18199, run #363899 76 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18200, run #363899 76 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18200, run #363899 77 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18201, run #363899 77 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18201, run #363899 78 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18202, run #363899 78 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18202, run #363899 79 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18203, run #363899 79 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18203, run #363899 80 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18204, run #363899 80 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18204, run #363899 81 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18205, run #363899 81 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18205, run #363899 82 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18206, run #363899 82 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18206, run #363899 83 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18207, run #363899 83 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18207, run #363899 84 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18208, run #363899 84 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18208, run #363899 85 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18209, run #363899 85 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18209, run #363899 86 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18210, run #363899 86 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18210, run #363899 87 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18211, run #363899 87 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18211, run #363899 88 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18212, run #363899 88 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18212, run #363899 89 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18213, run #363899 89 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18213, run #363899 90 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18214, run #363899 90 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18214, run #363899 91 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18215, run #363899 91 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18215, run #363899 92 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18216, run #363899 92 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18216, run #363899 93 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18217, run #363899 93 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18217, run #363899 94 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18218, run #363899 94 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18218, run #363899 95 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18219, run #363899 95 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18219, run #363899 96 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18220, run #363899 96 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18220, run #363899 97 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18221, run #363899 97 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18221, run #363899 98 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18222, run #363899 98 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18222, run #363899 99 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #18223, run #363899 99 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #18223, run #363899 100 events processed so far <<<===
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
+CondInputLoader INFO Finalizing CondInputLoader...
+Finalizer INFO Finalizing Finalizer...
Finalize: compared 10 dumps
+PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/2 objs/chan/bytes 1/1/170 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104912 (( 0.26 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641536 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/43176 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/2 objs/chan/bytes 2/1/390 (( 0.03 ))s
+IOVDbSvc INFO bytes in (( 0.60 ))s
+IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 3 nFolders: 2 ReadTime: (( 0.07 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.52 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
+ToolSvc.TileMuR... INFO Finalizing TileMuRcvContByteStreamTool successfuly
+ToolSvc.TileROD... INFO Finalizing
ToolSvc.ByteStr... INFO in finalize()
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
+cObjR_ALL INFO Time User : Tot= 140 [ms] Ave/Min/Max= 35(+- 60.6)/ 0/ 140 [ms] #= 4
+cObj_ALL INFO Time User : Tot= 190 [ms] Ave/Min/Max= 12.7(+- 40.1)/ 0/ 160 [ms] #= 15
+ChronoStatSvc INFO Time User : Tot= 4.2 [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"
+Sun Aug 22 06:51:18 CEST 2021
+Preloading tcmalloc_minimal.so
+Py:Athena INFO including file "AthenaCommon/Preparation.py"
+Py:Athena INFO using release [WorkDir-22.0.42] [x86_64-centos7-gcc8-opt] [master-calo-ctests/b78ddd66878] -- built on [2021-08-22T0649]
+Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO configuring AthenaHive with [4] concurrent threads and [4] concurrent events
Py:AlgScheduler INFO setting up AvalancheSchedulerSvc/AvalancheSchedulerSvc with 4 threads
+Py:Athena INFO including file "AthenaCommon/Execution.py"
+Py:Athena INFO including file "TileByteStream/TileMuRcvContByteStreamCnv_test.py"
+Py:Athena INFO SetGeometryVersion.py obtained major release version 22
+Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
+Py:ConfigurableDb INFO Read module info for 5069 configurables from 4 genConfDb files
+Py:ConfigurableDb INFO No duplicates have been found: that's good !
+EventInfoMgtInit: Got release version Athena-22.0.42
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
+Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
+Py:TileConditions_jobOptions.py INFO Forcing RUN2a (2018) cabling for run 363899 with geometry ATLAS-R2-2016-01-00-01
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo for 7 samples
Py:TileConditions_jobOptions.py INFO setting up COOL for TileCal conditions data
Py:TileInfoConf. INFO Changing default TileBadChanTool configuration to COOL source
@@ -235,17 +685,112 @@ Py:TileInfoConf. INFO Changing default TileCondToolTiming configuration to C
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise for Opt.Filter without iterations
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
+Py:Athena INFO including file "AthenaCommon/runbatch.py"
MessageSvc INFO Activating in a separate thread
+ApplicationMgr SUCCESS
+====================================================================================================================================
+ Welcome to ApplicationMgr (GaudiCoreSvc v36r0)
+ running on aibuild028.cern.ch on Sun Aug 22 06:51:31 2021
+====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
+ClassIDSvc INFO getRegistryEntries: read 6689 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
+MetaDataSvc INFO Initializing MetaDataSvc
+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/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+PoolSvc INFO Successfully setup replica sorting algorithm
+PoolSvc INFO Setting up APR FileCatalog and Streams
+PoolSvc INFO Unable find catalog apcfile:poolcond/PoolCat_oflcond.xml in $ATLAS_POOLCOND_PATH and $DATAPATH
+PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
+PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+ToolSvc.ByteStreamMetadataTool INFO Initializing
+MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool','ByteStreamMetadataTool'])
+MetaDataSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+MetaDataSvc INFO AlgTool: ToolSvc.ByteStreamMetadataTool
+IOVDbSvc INFO Only 5 POOL conditions files will be open at once
+IOVDbSvc INFO Cache alignment will be done in 3 slices
+IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
+IOVDbSvc INFO Initialised with 3 connections and 14 folders
+IOVDbSvc INFO Service IOVDbSvc initialised successfully
+IOVDbSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+ByteStreamAddressProviderSvc INFO Initializing
ByteStreamAddressProviderSvc INFO -- Will fill Store with id = 0
+TagInfoMgr INFO AlgTool: TagInfoMgr.IOVDbMetaDataTool
+ClassIDSvc INFO getRegistryEntries: read 2810 CLIDRegistry entries for module ALL
+IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+ClassIDSvc INFO getRegistryEntries: read 273 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_TILE/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200
+IOVDbSvc INFO Added taginfo remove for /LAR/Align
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CES
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/LIN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/NLN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/EMS
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/FIBER
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/LIN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/NLN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/NOISE/SAMPLE
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
+IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
+IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
+ClassIDSvc INFO getRegistryEntries: read 1854 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 23 CLIDRegistry entries for module ALL
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 HGTD_ID with CLID 79264207 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
+DetDescrCnvSvc INFO filling address for JTower_ID with CLID 218674799 and storage type 68 to detector store
+DetDescrCnvSvc INFO filling address for GTower_ID with CLID 49678914 and storage type 68 to detector store
GeoModelSvc::RDBMaterialManager WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RDBMaterialManager WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RDBMaterialManager WARNING Getting InDetMatComponents with default tag
@@ -285,11 +830,19 @@ LArHVLineID INFO setDictVe
LArHVLineID INFO [initLevelsFromDict] m_dict OK ...
LArHVLineID INFO [initialize_from_dictionary] > HV line range -> 11/1/48:79/0:15 | 11/1/148:179/0:15 | 11/1/80:93/0:7 | 11/1/180:193/0:7 | 11/1/200:231/0:15 | 11/1/232:263/0:15 | 11/1/296,297,306,307/0:15 | 11/1/299,304,305,308,309/0:15 | 11/1/264:279/0:15 | 11/1/280:295/0:15 | 11/1/0:47/0:15 | 11/1/320:322/0:15 | 11/1/100:147/0:15 | 11/1/324,325/0:15 | 11/1/312:315/0:15 | 11/1/316:319/0:15 | 11/1/300:303/0:15 | 11/1/310,311/0:15 | 11/1/323/0:15 | 11/1/326,327/0:15 | 11/1/94:99/0:15 | 11/1/194:199/0:15
LArHVLineID INFO [init_hashes()] > Hvline_size= 5008
+GeoModelSvc.LArDetectorToolNV INFO Keys for LAr are ATLAS-R2-2016-01-00-01 ATLAS
+GeoModelSvc.LArDetectorToolNV INFO Building LAr version LAr-Revised-17-01 while ATLAS version is ATLAS-R2-2016-01-00-01
+GeoModelSvc.LArDetectorToolNV INFO LAr Geometry Options:
+GeoModelSvc.LArDetectorToolNV INFO Sagging = false
+GeoModelSvc.LArDetectorToolNV INFO Barrel = ON
+GeoModelSvc.LArDetectorToolNV INFO Endcap = ON
+BarrelConstruction INFO Getting primary numbers for ATLAS, ATLAS-R2-2016-01-00-01
BarrelConstruction INFO Makes detailed absorber sandwich ? 1 1
BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
+ClassIDSvc INFO getRegistryEntries: read 3249 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -298,6 +851,9 @@ EMECConstruction INFO multi-lay
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstruction INFO Start building EC electronics geometry
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 25148Kb Time = 0.53S
+GeoModelSvc.TileDetectorTool INFO Entering TileDetectorTool::create()
+TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
TileDddbManager INFO n_timod = 320
TileDddbManager INFO n_cuts = 9
@@ -306,9 +862,11 @@ TileDddbManager INFO n_tilb =
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDescrCnv INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a CaloCell_ID helper object in the detector store
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArEM_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -316,18 +874,90 @@ CaloIDHelper_IDDetDescrCnv INFO in create
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
AtlasDetectorID INFO initialize_from_dictionary - OK
+GeoModelSvc.TileDetectorTool INFO U-shape parameter from database is: 1
+GeoModelSvc.TileDetectorTool INFO Glue parameter from database is: 1
+GeoModelSvc.TileDetectorTool INFO Cs Tube parameter from database is: 0
+GeoModelSvc.TileDetectorTool INFO Entering TileAtlasFactory::create()
+GeoModelSvc.TileDetectorTool INFO Tile Geometry with Saddle supports, starting from TileCal-CSC-02 xxx
+GeoModelSvc.TileDetectorTool INFO => New BFingerLengthPos 430.5
+GeoModelSvc.TileDetectorTool INFO => New BFingerLengthNeg 420.5
+GeoModelSvc.TileDetectorTool INFO Positioning barrel with translation 0
+GeoModelSvc.TileDetectorTool INFO Positioning positive barrel finger with translation 3035.25
+GeoModelSvc.TileDetectorTool INFO Positioning negative barrel finger with translation -3030.25
+GeoModelSvc.TileDetectorTool INFO Positioning positive ext.barrel with translation 4854.75
+GeoModelSvc.TileDetectorTool INFO Positioning positive ext.barrel finger with translation ztrans= 6338.5
+GeoModelSvc.TileDetectorTool INFO Positioning positive ext.barrel saddle with translation ztrans= 6192.5
+GeoModelSvc.TileDetectorTool INFO Positive ITC envelope parameters: PLUG1 Rmin= 3438.85 Rmax= 4250 dzITC1= 154.5
+GeoModelSvc.TileDetectorTool INFO PLUG2 Rmin= 2981 Rmax= 3440 dzITC2= 47.425
+GeoModelSvc.TileDetectorTool INFO Positioning positive ITC with translation 3405
+GeoModelSvc.TileDetectorTool INFO Positioning positive Gap with translation 3552
+GeoModelSvc.TileDetectorTool INFO Positioning positive Crack with translation 3536
+GeoModelSvc.TileDetectorTool INFO Positioning negative ext.barrel with translation ztrans -4854.75
+GeoModelSvc.TileDetectorTool INFO Positioning negative ext.barrel finger with translation ztrans= -6338.5
+GeoModelSvc.TileDetectorTool INFO Positioning negative ext.barrel saddle with translation ztrans= -6192.5
+GeoModelSvc.TileDetectorTool INFO Negative ITC envelope parameters: PLUG1 Rmin= 3438.85 Rmax= 4250 dzITC1= 154.5
+GeoModelSvc.TileDetectorTool INFO PLUG2 Rmin= 2981 Rmax= 3440 dzITC2= 47.425
+GeoModelSvc.TileDetectorTool INFO Positioning negative ITC with translation -3405
+GeoModelSvc.TileDetectorTool INFO Positioning negative Gap with translation -3552
+GeoModelSvc.TileDetectorTool INFO Positioning negative Crack with translation -3536
+GeoModelSvc.TileDetectorTool INFO Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.TileDetectorTool INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.TileDetectorTool INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrManager INFO Entering create_elements()
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3528Kb Time = 0.15S
+ClassIDSvc INFO getRegistryEntries: read 71 CLIDRegistry entries for module ALL
+GeoModelSvc INFO AlgTool: GeoModelSvc.LArDetectorToolNV
+GeoModelSvc INFO AlgTool: GeoModelSvc.TileDetectorTool
+TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
+TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
CaloLVL1_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-R2-2016-01-00-01
TileCablingSvc INFO Cabling for RUN2a (2018) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 5
+AthenaHiveEventLoopMgr INFO Initializing AthenaHiveEventLoopMgr
+ClassIDSvc 0 INFO getRegistryEntries: read 4391 CLIDRegistry entries for module ALL
+PyComponentMgr 0 INFO Initializing PyComponentMgr...
+Finalizer 0 INFO Initializing Finalizer...
+ClassIDSvc 0 INFO getRegistryEntries: read 553 CLIDRegistry entries for module ALL
+CondInputLoader 0 INFO Initializing CondInputLoader...
+ClassIDSvc 0 INFO getRegistryEntries: read 12 CLIDRegistry entries for module ALL
CondInputLoader 0 INFO Adding base classes:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' ) -> no bases
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' ) ->
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' ) ->
CondInputLoader 0 INFO Will create WriteCondHandle dependencies for the following DataObjects:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' )
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' )
TileBadChannelsCondAlg.TileCondProxyCool_OnlBch 0 INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OnlBch) for folder: "/TILE/ONL01/STATUS/ADC"
TileBadChannelsCondAlg.TileCondProxyCool_OflBch 0 INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OflBch) for folder: "/TILE/OFL02/STATUS/ADC"
TileBadChannelsCondAlg 0 INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
@@ -348,7 +978,7 @@ TileSampleNoiseCon...TileCondProxyCool_NoiseSample 0 INFO Creating
TileTimingCondAlg.TileCondProxyCool_AdcOffset 0 INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
ThreadPoolSvc 0 INFO no thread init tools attached
AvalancheSchedulerSvc 0 INFO Activating scheduler in a separate thread
-AvalancheSchedulerSvc 0 INFO Found 14 algorithms
+AvalancheSchedulerSvc 0 INFO Found 15 algorithms
AvalancheSchedulerSvc 0 INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
AvalancheSchedulerSvc 0 INFO o ( 'TileMuonReceiverContainer' , 'StoreGateSvc+TileMuRcvCnt' ) required by Algorithm:
AvalancheSchedulerSvc 0 INFO * TileMuonReceiverDumper
@@ -362,23 +992,50 @@ AvalancheSchedulerSvc 0 INFO Task sche
AvalancheSchedulerSvc 0 INFO o Avalanche generation mode: disabled
AvalancheSchedulerSvc 0 INFO o Preemptive scheduling of CPU-blocking tasks: disabled
AvalancheSchedulerSvc 0 INFO o Scheduling of condition tasks: disabled
+ByteStreamInputSvc 0 INFO Initializing
+ROBDataProviderSvc 0 INFO Initializing
ROBDataProviderSvc 0 INFO ---> Filter out empty ROB fragments = 'filterEmptyROB':False
ROBDataProviderSvc 0 INFO ---> Filter out specific ROBs by Status Code: # ROBs = 0
ROBDataProviderSvc 0 INFO ---> Filter out Sub Detector ROBs by Status Code: # Sub Detectors = 0
EventSelector 0 INFO reinitialization...
AthenaHiveEventLoopMgr 0 INFO Setup EventSelector service EventSelector
ApplicationMgr 0 INFO Application Manager Initialized successfully
+PoolSvc 0 INFO Enabled implicit multithreading in ROOT via PersistencySvc to: 3
+CondInputLoader 0 INFO created CondCont<CaloRec::CaloCellPositionShift> with key 'ConditionStore+LArCellPositionShift'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/EMS'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/STATUS/ADC'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/ONL01/STATUS/ADC'
+CondInputLoader 0 INFO created CondCont<DetCondKeyTrans> with key 'ConditionStore+/LAR/Align'
+ByteStreamInputSvc 0 INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TileByteStream/TileByteStream-02-00-00/data18_tilecomm.00363899.calibration_tile.daq.RAW._lb0000._TileREB-ROS._0005-200ev.data
ApplicationMgr 0 INFO Application Manager Started successfully
AthenaHiveEventLoopMgr 0 INFO Starting loop on events
+EventPersistencySvc 0 0 INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistencySvc 0 0 INFO Added successfully Conversion service:ByteStreamCnvSvc
EventInfoByteStreamAuxCnv 0 0 INFO IsSimulation : 0
EventInfoByteStreamAuxCnv 0 0 INFO IsTestbeam : 0
EventInfoByteStreamAuxCnv 0 0 INFO IsCalibration : 0
AthenaHiveEventLoopMgr 0 0 INFO ===>>> start of run 363899 <<<===
+IOVDbSvc 0 0 INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder 0 0 INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder 0 0 INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
+IOVDbSvc 0 0 INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc 0 0 INFO Opened read transaction for POOL PersistencySvc
+DbSession 0 0 INFO Open DbSession
+Domain[ROOT_All] 0 0 INFO > Access DbDomain READ [ROOT_All]
+Domain[ROOT_All] 0 0 INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
+Domain[ROOT_All] 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
+RootDatabase.open 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv 0 0 INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDescrCnv 0 0 INFO in createObj: creating a CaloDescrManager object in the detector store
+ClassIDSvc 0 0 INFO getRegistryEntries: read 207 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID 0 0 INFO initialize_from_dictionary
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
@@ -392,19 +1049,268 @@ CaloIDHelper_IDDetDescrCnv 0 0 INFO in create
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
+TileNeighbour 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
CaloIdMgrDetDescrCnv 0 0 INFO Finished
+CaloIdMgrDetDescrCnv 0 0 INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
+Domain[ROOT_All] 0 0 INFO -> Access DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
+RootDatabase.open 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
+AthenaHiveEventLoopMgr 0 0 INFO ===>>> start processing event #18124, run #363899 on slot 0, 0 events processed so far <<<===
+ClassIDSvc 0 0 INFO getRegistryEntries: read 495 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 1763 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 92 CLIDRegistry entries for module ALL
+ToolSvc.TileROD_Decoder.TileL2Builder 0 0 INFO TileL2Builder initialization completed
+ToolSvc.TileMuRcvContByteStreamTool 0 0 INFO Initializing TileMuRcvContByteStreamTool
+/cvmfs/atlas-condb.cern.ch/repo/conditions/...root 0 0 INFO Database being retired...
+Domain[ROOT_All] 0 0 INFO -> Deaccess DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
+/cvmfs/atlas-condb.cern.ch/repo/conditions/...root 0 0 INFO Database being retired...
+Domain[ROOT_All] 0 0 INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] 0 0 INFO > Deaccess DbDomain READ [ROOT_All]
+AthenaHiveEventLoopMgr 0 0 INFO ===>>> done processing event #18124, run #363899 on slot 0, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 1 0 INFO ===>>> start processing event #18125, run #363899 on slot 0, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 2 1 INFO ===>>> start processing event #18126, run #363899 on slot 1, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 3 2 INFO ===>>> start processing event #18127, run #363899 on slot 2, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 4 3 INFO ===>>> start processing event #18128, run #363899 on slot 3, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 1 0 INFO ===>>> done processing event #18125, run #363899 on slot 0, 2 events processed so far <<<===
+AthenaHiveEventLoopMgr 2 1 INFO ===>>> done processing event #18126, run #363899 on slot 1, 3 events processed so far <<<===
+AthenaHiveEventLoopMgr 5 0 INFO ===>>> start processing event #18129, run #363899 on slot 0, 3 events processed so far <<<===
+AthenaHiveEventLoopMgr 6 1 INFO ===>>> start processing event #18130, run #363899 on slot 1, 3 events processed so far <<<===
+AthenaHiveEventLoopMgr 3 2 INFO ===>>> done processing event #18127, run #363899 on slot 2, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 4 3 INFO ===>>> done processing event #18128, run #363899 on slot 3, 5 events processed so far <<<===
+AthenaHiveEventLoopMgr 7 2 INFO ===>>> start processing event #18131, run #363899 on slot 2, 5 events processed so far <<<===
+AthenaHiveEventLoopMgr 8 3 INFO ===>>> start processing event #18132, run #363899 on slot 3, 5 events processed so far <<<===
+AthenaHiveEventLoopMgr 6 1 INFO ===>>> done processing event #18130, run #363899 on slot 1, 6 events processed so far <<<===
+AthenaHiveEventLoopMgr 9 1 INFO ===>>> start processing event #18133, run #363899 on slot 1, 6 events processed so far <<<===
+AthenaHiveEventLoopMgr 7 2 INFO ===>>> done processing event #18131, run #363899 on slot 2, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 5 0 INFO ===>>> done processing event #18129, run #363899 on slot 0, 8 events processed so far <<<===
+AthenaHiveEventLoopMgr 8 3 INFO ===>>> done processing event #18132, run #363899 on slot 3, 9 events processed so far <<<===
+AthenaHiveEventLoopMgr 10 0 INFO ===>>> start processing event #18134, run #363899 on slot 0, 9 events processed so far <<<===
+AthenaHiveEventLoopMgr 11 2 INFO ===>>> start processing event #18135, run #363899 on slot 2, 9 events processed so far <<<===
+AthenaHiveEventLoopMgr 12 3 INFO ===>>> start processing event #18136, run #363899 on slot 3, 9 events processed so far <<<===
+AthenaHiveEventLoopMgr 9 1 INFO ===>>> done processing event #18133, run #363899 on slot 1, 10 events processed so far <<<===
+AthenaHiveEventLoopMgr 13 1 INFO ===>>> start processing event #18137, run #363899 on slot 1, 10 events processed so far <<<===
+AthenaHiveEventLoopMgr 10 0 INFO ===>>> done processing event #18134, run #363899 on slot 0, 11 events processed so far <<<===
+AthenaHiveEventLoopMgr 11 2 INFO ===>>> done processing event #18135, run #363899 on slot 2, 12 events processed so far <<<===
+AthenaHiveEventLoopMgr 12 3 INFO ===>>> done processing event #18136, run #363899 on slot 3, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 14 0 INFO ===>>> start processing event #18138, run #363899 on slot 0, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 15 2 INFO ===>>> start processing event #18139, run #363899 on slot 2, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 16 3 INFO ===>>> start processing event #18140, run #363899 on slot 3, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 13 1 INFO ===>>> done processing event #18137, run #363899 on slot 1, 14 events processed so far <<<===
+AthenaHiveEventLoopMgr 17 1 INFO ===>>> start processing event #18141, run #363899 on slot 1, 14 events processed so far <<<===
+AthenaHiveEventLoopMgr 15 2 INFO ===>>> done processing event #18139, run #363899 on slot 2, 15 events processed so far <<<===
+AthenaHiveEventLoopMgr 14 0 INFO ===>>> done processing event #18138, run #363899 on slot 0, 16 events processed so far <<<===
+AthenaHiveEventLoopMgr 16 3 INFO ===>>> done processing event #18140, run #363899 on slot 3, 17 events processed so far <<<===
+AthenaHiveEventLoopMgr 18 0 INFO ===>>> start processing event #18142, run #363899 on slot 0, 17 events processed so far <<<===
+AthenaHiveEventLoopMgr 19 2 INFO ===>>> start processing event #18143, run #363899 on slot 2, 17 events processed so far <<<===
+AthenaHiveEventLoopMgr 20 3 INFO ===>>> start processing event #18144, run #363899 on slot 3, 17 events processed so far <<<===
+AthenaHiveEventLoopMgr 17 1 INFO ===>>> done processing event #18141, run #363899 on slot 1, 18 events processed so far <<<===
+AthenaHiveEventLoopMgr 21 1 INFO ===>>> start processing event #18145, run #363899 on slot 1, 18 events processed so far <<<===
+AthenaHiveEventLoopMgr 18 0 INFO ===>>> done processing event #18142, run #363899 on slot 0, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 19 2 INFO ===>>> done processing event #18143, run #363899 on slot 2, 20 events processed so far <<<===
+AthenaHiveEventLoopMgr 22 0 INFO ===>>> start processing event #18146, run #363899 on slot 0, 20 events processed so far <<<===
+AthenaHiveEventLoopMgr 23 2 INFO ===>>> start processing event #18147, run #363899 on slot 2, 20 events processed so far <<<===
+AthenaHiveEventLoopMgr 20 3 INFO ===>>> done processing event #18144, run #363899 on slot 3, 21 events processed so far <<<===
+AthenaHiveEventLoopMgr 21 1 INFO ===>>> done processing event #18145, run #363899 on slot 1, 22 events processed so far <<<===
+AthenaHiveEventLoopMgr 24 1 INFO ===>>> start processing event #18148, run #363899 on slot 1, 22 events processed so far <<<===
+AthenaHiveEventLoopMgr 25 3 INFO ===>>> start processing event #18149, run #363899 on slot 3, 22 events processed so far <<<===
+AthenaHiveEventLoopMgr 22 0 INFO ===>>> done processing event #18146, run #363899 on slot 0, 23 events processed so far <<<===
+AthenaHiveEventLoopMgr 26 0 INFO ===>>> start processing event #18150, run #363899 on slot 0, 23 events processed so far <<<===
+AthenaHiveEventLoopMgr 23 2 INFO ===>>> done processing event #18147, run #363899 on slot 2, 24 events processed so far <<<===
+AthenaHiveEventLoopMgr 24 1 INFO ===>>> done processing event #18148, run #363899 on slot 1, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 27 1 INFO ===>>> start processing event #18151, run #363899 on slot 1, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 28 2 INFO ===>>> start processing event #18152, run #363899 on slot 2, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 25 3 INFO ===>>> done processing event #18149, run #363899 on slot 3, 26 events processed so far <<<===
+AthenaHiveEventLoopMgr 26 0 INFO ===>>> done processing event #18150, run #363899 on slot 0, 27 events processed so far <<<===
+AthenaHiveEventLoopMgr 29 0 INFO ===>>> start processing event #18153, run #363899 on slot 0, 27 events processed so far <<<===
+AthenaHiveEventLoopMgr 30 3 INFO ===>>> start processing event #18154, run #363899 on slot 3, 27 events processed so far <<<===
+AthenaHiveEventLoopMgr 27 1 INFO ===>>> done processing event #18151, run #363899 on slot 1, 28 events processed so far <<<===
+AthenaHiveEventLoopMgr 28 2 INFO ===>>> done processing event #18152, run #363899 on slot 2, 29 events processed so far <<<===
+AthenaHiveEventLoopMgr 31 1 INFO ===>>> start processing event #18155, run #363899 on slot 1, 29 events processed so far <<<===
+AthenaHiveEventLoopMgr 32 2 INFO ===>>> start processing event #18156, run #363899 on slot 2, 29 events processed so far <<<===
+AthenaHiveEventLoopMgr 29 0 INFO ===>>> done processing event #18153, run #363899 on slot 0, 30 events processed so far <<<===
+AthenaHiveEventLoopMgr 30 3 INFO ===>>> done processing event #18154, run #363899 on slot 3, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 33 0 INFO ===>>> start processing event #18157, run #363899 on slot 0, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 34 3 INFO ===>>> start processing event #18158, run #363899 on slot 3, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 31 1 INFO ===>>> done processing event #18155, run #363899 on slot 1, 32 events processed so far <<<===
+AthenaHiveEventLoopMgr 32 2 INFO ===>>> done processing event #18156, run #363899 on slot 2, 33 events processed so far <<<===
+AthenaHiveEventLoopMgr 35 1 INFO ===>>> start processing event #18159, run #363899 on slot 1, 33 events processed so far <<<===
+AthenaHiveEventLoopMgr 36 2 INFO ===>>> start processing event #18160, run #363899 on slot 2, 33 events processed so far <<<===
+AthenaHiveEventLoopMgr 33 0 INFO ===>>> done processing event #18157, run #363899 on slot 0, 34 events processed so far <<<===
+AthenaHiveEventLoopMgr 34 3 INFO ===>>> done processing event #18158, run #363899 on slot 3, 35 events processed so far <<<===
+AthenaHiveEventLoopMgr 37 0 INFO ===>>> start processing event #18161, run #363899 on slot 0, 35 events processed so far <<<===
+AthenaHiveEventLoopMgr 38 3 INFO ===>>> start processing event #18162, run #363899 on slot 3, 35 events processed so far <<<===
+AthenaHiveEventLoopMgr 35 1 INFO ===>>> done processing event #18159, run #363899 on slot 1, 36 events processed so far <<<===
+AthenaHiveEventLoopMgr 36 2 INFO ===>>> done processing event #18160, run #363899 on slot 2, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 39 1 INFO ===>>> start processing event #18163, run #363899 on slot 1, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 40 2 INFO ===>>> start processing event #18164, run #363899 on slot 2, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 37 0 INFO ===>>> done processing event #18161, run #363899 on slot 0, 38 events processed so far <<<===
+AthenaHiveEventLoopMgr 38 3 INFO ===>>> done processing event #18162, run #363899 on slot 3, 39 events processed so far <<<===
+AthenaHiveEventLoopMgr 41 0 INFO ===>>> start processing event #18165, run #363899 on slot 0, 39 events processed so far <<<===
+AthenaHiveEventLoopMgr 42 3 INFO ===>>> start processing event #18166, run #363899 on slot 3, 39 events processed so far <<<===
+AthenaHiveEventLoopMgr 39 1 INFO ===>>> done processing event #18163, run #363899 on slot 1, 40 events processed so far <<<===
+AthenaHiveEventLoopMgr 40 2 INFO ===>>> done processing event #18164, run #363899 on slot 2, 41 events processed so far <<<===
+AthenaHiveEventLoopMgr 43 1 INFO ===>>> start processing event #18167, run #363899 on slot 1, 41 events processed so far <<<===
+AthenaHiveEventLoopMgr 44 2 INFO ===>>> start processing event #18168, run #363899 on slot 2, 41 events processed so far <<<===
+AthenaHiveEventLoopMgr 41 0 INFO ===>>> done processing event #18165, run #363899 on slot 0, 42 events processed so far <<<===
+AthenaHiveEventLoopMgr 42 3 INFO ===>>> done processing event #18166, run #363899 on slot 3, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 45 0 INFO ===>>> start processing event #18169, run #363899 on slot 0, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 46 3 INFO ===>>> start processing event #18170, run #363899 on slot 3, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 43 1 INFO ===>>> done processing event #18167, run #363899 on slot 1, 44 events processed so far <<<===
+AthenaHiveEventLoopMgr 47 1 INFO ===>>> start processing event #18171, run #363899 on slot 1, 44 events processed so far <<<===
+AthenaHiveEventLoopMgr 44 2 INFO ===>>> done processing event #18168, run #363899 on slot 2, 45 events processed so far <<<===
+AthenaHiveEventLoopMgr 45 0 INFO ===>>> done processing event #18169, run #363899 on slot 0, 46 events processed so far <<<===
+AthenaHiveEventLoopMgr 48 0 INFO ===>>> start processing event #18172, run #363899 on slot 0, 46 events processed so far <<<===
+AthenaHiveEventLoopMgr 49 2 INFO ===>>> start processing event #18173, run #363899 on slot 2, 46 events processed so far <<<===
+AthenaHiveEventLoopMgr 46 3 INFO ===>>> done processing event #18170, run #363899 on slot 3, 47 events processed so far <<<===
+AthenaHiveEventLoopMgr 47 1 INFO ===>>> done processing event #18171, run #363899 on slot 1, 48 events processed so far <<<===
+AthenaHiveEventLoopMgr 50 1 INFO ===>>> start processing event #18174, run #363899 on slot 1, 48 events processed so far <<<===
+AthenaHiveEventLoopMgr 51 3 INFO ===>>> start processing event #18175, run #363899 on slot 3, 48 events processed so far <<<===
+AthenaHiveEventLoopMgr 48 0 INFO ===>>> done processing event #18172, run #363899 on slot 0, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 49 2 INFO ===>>> done processing event #18173, run #363899 on slot 2, 50 events processed so far <<<===
+AthenaHiveEventLoopMgr 52 0 INFO ===>>> start processing event #18176, run #363899 on slot 0, 50 events processed so far <<<===
+AthenaHiveEventLoopMgr 53 2 INFO ===>>> start processing event #18177, run #363899 on slot 2, 50 events processed so far <<<===
+AthenaHiveEventLoopMgr 50 1 INFO ===>>> done processing event #18174, run #363899 on slot 1, 51 events processed so far <<<===
+AthenaHiveEventLoopMgr 51 3 INFO ===>>> done processing event #18175, run #363899 on slot 3, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 54 1 INFO ===>>> start processing event #18178, run #363899 on slot 1, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 55 3 INFO ===>>> start processing event #18179, run #363899 on slot 3, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 52 0 INFO ===>>> done processing event #18176, run #363899 on slot 0, 53 events processed so far <<<===
+AthenaHiveEventLoopMgr 53 2 INFO ===>>> done processing event #18177, run #363899 on slot 2, 54 events processed so far <<<===
+AthenaHiveEventLoopMgr 56 0 INFO ===>>> start processing event #18180, run #363899 on slot 0, 54 events processed so far <<<===
+AthenaHiveEventLoopMgr 57 2 INFO ===>>> start processing event #18181, run #363899 on slot 2, 54 events processed so far <<<===
+AthenaHiveEventLoopMgr 54 1 INFO ===>>> done processing event #18178, run #363899 on slot 1, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 55 3 INFO ===>>> done processing event #18179, run #363899 on slot 3, 56 events processed so far <<<===
+AthenaHiveEventLoopMgr 58 1 INFO ===>>> start processing event #18182, run #363899 on slot 1, 56 events processed so far <<<===
+AthenaHiveEventLoopMgr 59 3 INFO ===>>> start processing event #18183, run #363899 on slot 3, 56 events processed so far <<<===
+AthenaHiveEventLoopMgr 56 0 INFO ===>>> done processing event #18180, run #363899 on slot 0, 57 events processed so far <<<===
+AthenaHiveEventLoopMgr 57 2 INFO ===>>> done processing event #18181, run #363899 on slot 2, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 60 0 INFO ===>>> start processing event #18184, run #363899 on slot 0, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 61 2 INFO ===>>> start processing event #18185, run #363899 on slot 2, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 58 1 INFO ===>>> done processing event #18182, run #363899 on slot 1, 59 events processed so far <<<===
+AthenaHiveEventLoopMgr 62 1 INFO ===>>> start processing event #18186, run #363899 on slot 1, 59 events processed so far <<<===
+AthenaHiveEventLoopMgr 59 3 INFO ===>>> done processing event #18183, run #363899 on slot 3, 60 events processed so far <<<===
+AthenaHiveEventLoopMgr 63 3 INFO ===>>> start processing event #18187, run #363899 on slot 3, 60 events processed so far <<<===
+AthenaHiveEventLoopMgr 60 0 INFO ===>>> done processing event #18184, run #363899 on slot 0, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 61 2 INFO ===>>> done processing event #18185, run #363899 on slot 2, 62 events processed so far <<<===
+AthenaHiveEventLoopMgr 64 0 INFO ===>>> start processing event #18188, run #363899 on slot 0, 62 events processed so far <<<===
+AthenaHiveEventLoopMgr 65 2 INFO ===>>> start processing event #18189, run #363899 on slot 2, 62 events processed so far <<<===
+AthenaHiveEventLoopMgr 62 1 INFO ===>>> done processing event #18186, run #363899 on slot 1, 63 events processed so far <<<===
+AthenaHiveEventLoopMgr 66 1 INFO ===>>> start processing event #18190, run #363899 on slot 1, 63 events processed so far <<<===
+AthenaHiveEventLoopMgr 63 3 INFO ===>>> done processing event #18187, run #363899 on slot 3, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 67 3 INFO ===>>> start processing event #18191, run #363899 on slot 3, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 64 0 INFO ===>>> done processing event #18188, run #363899 on slot 0, 65 events processed so far <<<===
+AthenaHiveEventLoopMgr 65 2 INFO ===>>> done processing event #18189, run #363899 on slot 2, 66 events processed so far <<<===
+AthenaHiveEventLoopMgr 68 0 INFO ===>>> start processing event #18192, run #363899 on slot 0, 66 events processed so far <<<===
+AthenaHiveEventLoopMgr 69 2 INFO ===>>> start processing event #18193, run #363899 on slot 2, 66 events processed so far <<<===
+AthenaHiveEventLoopMgr 66 1 INFO ===>>> done processing event #18190, run #363899 on slot 1, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 67 3 INFO ===>>> done processing event #18191, run #363899 on slot 3, 68 events processed so far <<<===
+AthenaHiveEventLoopMgr 70 1 INFO ===>>> start processing event #18194, run #363899 on slot 1, 68 events processed so far <<<===
+AthenaHiveEventLoopMgr 71 3 INFO ===>>> start processing event #18195, run #363899 on slot 3, 68 events processed so far <<<===
+AthenaHiveEventLoopMgr 68 0 INFO ===>>> done processing event #18192, run #363899 on slot 0, 69 events processed so far <<<===
+AthenaHiveEventLoopMgr 72 0 INFO ===>>> start processing event #18196, run #363899 on slot 0, 69 events processed so far <<<===
+AthenaHiveEventLoopMgr 69 2 INFO ===>>> done processing event #18193, run #363899 on slot 2, 70 events processed so far <<<===
+AthenaHiveEventLoopMgr 73 2 INFO ===>>> start processing event #18197, run #363899 on slot 2, 70 events processed so far <<<===
+AthenaHiveEventLoopMgr 70 1 INFO ===>>> done processing event #18194, run #363899 on slot 1, 71 events processed so far <<<===
+AthenaHiveEventLoopMgr 71 3 INFO ===>>> done processing event #18195, run #363899 on slot 3, 72 events processed so far <<<===
+AthenaHiveEventLoopMgr 74 1 INFO ===>>> start processing event #18198, run #363899 on slot 1, 72 events processed so far <<<===
+AthenaHiveEventLoopMgr 75 3 INFO ===>>> start processing event #18199, run #363899 on slot 3, 72 events processed so far <<<===
+AthenaHiveEventLoopMgr 72 0 INFO ===>>> done processing event #18196, run #363899 on slot 0, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 73 2 INFO ===>>> done processing event #18197, run #363899 on slot 2, 74 events processed so far <<<===
+AthenaHiveEventLoopMgr 76 0 INFO ===>>> start processing event #18200, run #363899 on slot 0, 74 events processed so far <<<===
+AthenaHiveEventLoopMgr 77 2 INFO ===>>> start processing event #18201, run #363899 on slot 2, 74 events processed so far <<<===
+AthenaHiveEventLoopMgr 74 1 INFO ===>>> done processing event #18198, run #363899 on slot 1, 75 events processed so far <<<===
+AthenaHiveEventLoopMgr 78 1 INFO ===>>> start processing event #18202, run #363899 on slot 1, 75 events processed so far <<<===
+AthenaHiveEventLoopMgr 75 3 INFO ===>>> done processing event #18199, run #363899 on slot 3, 76 events processed so far <<<===
+AthenaHiveEventLoopMgr 79 3 INFO ===>>> start processing event #18203, run #363899 on slot 3, 76 events processed so far <<<===
+AthenaHiveEventLoopMgr 76 0 INFO ===>>> done processing event #18200, run #363899 on slot 0, 77 events processed so far <<<===
+AthenaHiveEventLoopMgr 77 2 INFO ===>>> done processing event #18201, run #363899 on slot 2, 78 events processed so far <<<===
+AthenaHiveEventLoopMgr 80 0 INFO ===>>> start processing event #18204, run #363899 on slot 0, 78 events processed so far <<<===
+AthenaHiveEventLoopMgr 81 2 INFO ===>>> start processing event #18205, run #363899 on slot 2, 78 events processed so far <<<===
+AthenaHiveEventLoopMgr 78 1 INFO ===>>> done processing event #18202, run #363899 on slot 1, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 79 3 INFO ===>>> done processing event #18203, run #363899 on slot 3, 80 events processed so far <<<===
+AthenaHiveEventLoopMgr 82 1 INFO ===>>> start processing event #18206, run #363899 on slot 1, 80 events processed so far <<<===
+AthenaHiveEventLoopMgr 83 3 INFO ===>>> start processing event #18207, run #363899 on slot 3, 80 events processed so far <<<===
+AthenaHiveEventLoopMgr 80 0 INFO ===>>> done processing event #18204, run #363899 on slot 0, 81 events processed so far <<<===
+AthenaHiveEventLoopMgr 84 0 INFO ===>>> start processing event #18208, run #363899 on slot 0, 81 events processed so far <<<===
+AthenaHiveEventLoopMgr 81 2 INFO ===>>> done processing event #18205, run #363899 on slot 2, 82 events processed so far <<<===
+AthenaHiveEventLoopMgr 85 2 INFO ===>>> start processing event #18209, run #363899 on slot 2, 82 events processed so far <<<===
+AthenaHiveEventLoopMgr 82 1 INFO ===>>> done processing event #18206, run #363899 on slot 1, 83 events processed so far <<<===
+AthenaHiveEventLoopMgr 86 1 INFO ===>>> start processing event #18210, run #363899 on slot 1, 83 events processed so far <<<===
+AthenaHiveEventLoopMgr 83 3 INFO ===>>> done processing event #18207, run #363899 on slot 3, 84 events processed so far <<<===
+AthenaHiveEventLoopMgr 84 0 INFO ===>>> done processing event #18208, run #363899 on slot 0, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 87 0 INFO ===>>> start processing event #18211, run #363899 on slot 0, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 88 3 INFO ===>>> start processing event #18212, run #363899 on slot 3, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 85 2 INFO ===>>> done processing event #18209, run #363899 on slot 2, 86 events processed so far <<<===
+AthenaHiveEventLoopMgr 86 1 INFO ===>>> done processing event #18210, run #363899 on slot 1, 87 events processed so far <<<===
+AthenaHiveEventLoopMgr 89 1 INFO ===>>> start processing event #18213, run #363899 on slot 1, 87 events processed so far <<<===
+AthenaHiveEventLoopMgr 90 2 INFO ===>>> start processing event #18214, run #363899 on slot 2, 87 events processed so far <<<===
+AthenaHiveEventLoopMgr 87 0 INFO ===>>> done processing event #18211, run #363899 on slot 0, 88 events processed so far <<<===
+AthenaHiveEventLoopMgr 88 3 INFO ===>>> done processing event #18212, run #363899 on slot 3, 89 events processed so far <<<===
+AthenaHiveEventLoopMgr 91 0 INFO ===>>> start processing event #18215, run #363899 on slot 0, 89 events processed so far <<<===
+AthenaHiveEventLoopMgr 92 3 INFO ===>>> start processing event #18216, run #363899 on slot 3, 89 events processed so far <<<===
+AthenaHiveEventLoopMgr 89 1 INFO ===>>> done processing event #18213, run #363899 on slot 1, 90 events processed so far <<<===
+AthenaHiveEventLoopMgr 90 2 INFO ===>>> done processing event #18214, run #363899 on slot 2, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 93 1 INFO ===>>> start processing event #18217, run #363899 on slot 1, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 94 2 INFO ===>>> start processing event #18218, run #363899 on slot 2, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 91 0 INFO ===>>> done processing event #18215, run #363899 on slot 0, 92 events processed so far <<<===
+AthenaHiveEventLoopMgr 92 3 INFO ===>>> done processing event #18216, run #363899 on slot 3, 93 events processed so far <<<===
+AthenaHiveEventLoopMgr 95 0 INFO ===>>> start processing event #18219, run #363899 on slot 0, 93 events processed so far <<<===
+AthenaHiveEventLoopMgr 96 3 INFO ===>>> start processing event #18220, run #363899 on slot 3, 93 events processed so far <<<===
+AthenaHiveEventLoopMgr 93 1 INFO ===>>> done processing event #18217, run #363899 on slot 1, 94 events processed so far <<<===
+AthenaHiveEventLoopMgr 94 2 INFO ===>>> done processing event #18218, run #363899 on slot 2, 95 events processed so far <<<===
+AthenaHiveEventLoopMgr 97 1 INFO ===>>> start processing event #18221, run #363899 on slot 1, 95 events processed so far <<<===
+AthenaHiveEventLoopMgr 98 2 INFO ===>>> start processing event #18222, run #363899 on slot 2, 95 events processed so far <<<===
+AthenaHiveEventLoopMgr 95 0 INFO ===>>> done processing event #18219, run #363899 on slot 0, 96 events processed so far <<<===
+AthenaHiveEventLoopMgr 96 3 INFO ===>>> done processing event #18220, run #363899 on slot 3, 97 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 0 INFO ===>>> start processing event #18223, run #363899 on slot 0, 97 events processed so far <<<===
+AthenaHiveEventLoopMgr 97 1 INFO ===>>> done processing event #18221, run #363899 on slot 1, 98 events processed so far <<<===
+AthenaHiveEventLoopMgr 98 2 INFO ===>>> done processing event #18222, run #363899 on slot 2, 99 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 0 INFO ===>>> done processing event #18223, run #363899 on slot 0, 100 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 0 INFO ---> Loop Finished (seconds): 0.897523
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
+SGInputLoader INFO Finalizing SGInputLoader...
+Finalizer INFO Finalizing Finalizer...
Finalize: compared 10 dumps
+CondInputLoader INFO Finalizing CondInputLoader...
+AvalancheSchedulerSvc INFO Joining Scheduler thread
+PyComponentMgr INFO Finalizing PyComponentMgr...
+EventDataSvc INFO Finalizing EventDataSvc
IdDictDetDescrCnv INFO in finalize
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.01 ))s
+IOVDbSvc INFO bytes in (( 0.05 ))s
+IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.05 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 1 nFolders: 11 ReadTime: (( 0.00 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
+ToolSvc.TileMuRcvContByteStreamTool INFO Finalizing TileMuRcvContByteStreamTool successfuly
+ToolSvc.TileROD_Decoder.TileL2Builder INFO Finalizing
ToolSvc.ByteStreamMetadataTool INFO in finalize()
*****Chrono***** INFO ****************************************************************************************************
+*****Chrono***** INFO WARNING: MT job; statistics are unreliable
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
+cObjR_ALL INFO Time User : Tot= 150 [ms] Ave/Min/Max= 75(+- 65)/ 10/ 140 [ms] #= 2
+cObj_ALL INFO Time User : Tot= 180 [ms] Ave/Min/Max= 90(+- 60)/ 30/ 150 [ms] #= 2
+ChronoStatSvc INFO Time User : Tot= 4.27 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.finalize() INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.ref
index d187596664da..ce18f5800902 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.ref
@@ -1,6 +1,20 @@
+Sat Aug 21 21:53:47 CEST 2021
+Preloading tcmalloc_minimal.so
+Py:Athena INFO including file "AthenaCommon/Preparation.py"
+Py:Athena INFO using release [WorkDir-22.0.42] [x86_64-centos7-gcc8-opt] [master-calo-ctests/ec2fa09c9e3] -- built on [2021-08-21T2138]
+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 "TileByteStream/TileRawChannelContByteStreamCnv_test.py"
+Py:Athena INFO SetGeometryVersion.py obtained major release version 22
+Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
+Py:ConfigurableDb INFO Read module info for 5069 configurables from 8 genConfDb files
+Py:ConfigurableDb INFO No duplicates have been found: that's good !
+EventInfoMgtInit: Got release version Athena-22.0.42
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
+Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
+Py:TileConditions_jobOptions.py INFO Forcing RUN2 (2014-2017) cabling for run 204073 with geometry ATLAS-R2-2016-01-00-01
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo for 7 samples
Py:TileConditions_jobOptions.py INFO setting up COOL for TileCal conditions data
Py:TileInfoConf. INFO Changing default TileBadChanTool configuration to COOL source
@@ -10,16 +24,111 @@ Py:TileInfoConf. INFO Changing default TileCondToolTiming configuration to C
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise for Opt.Filter without iterations
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
+Py:Athena INFO including file "AthenaCommon/runbatch.py"
+ApplicationMgr SUCCESS
+====================================================================================================================================
+ Welcome to ApplicationMgr (GaudiCoreSvc v36r0)
+ running on aibuild028.cern.ch on Sat Aug 21 21:54:01 2021
+====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
+ClassIDSvc INFO getRegistryEntries: read 6689 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
+MetaDataSvc INFO Initializing MetaDataSvc
+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/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+PoolSvc INFO Successfully setup replica sorting algorithm
+PoolSvc INFO Setting up APR FileCatalog and Streams
+PoolSvc INFO Unable find catalog apcfile:poolcond/PoolCat_oflcond.xml in $ATLAS_POOLCOND_PATH and $DATAPATH
+PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
+PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+ToolSvc.ByteStr... INFO Initializing
+MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool','ByteStreamMetadataTool'])
+MetaDataSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+MetaDataSvc INFO AlgTool: ToolSvc.ByteStreamMetadataTool
+IOVDbSvc INFO Only 5 POOL conditions files will be open at once
+IOVDbSvc INFO Cache alignment will be done in 3 slices
+IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
+IOVDbSvc INFO Initialised with 3 connections and 14 folders
+IOVDbSvc INFO Service IOVDbSvc initialised successfully
+IOVDbSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+ByteStreamAddre... INFO Initializing
ByteStreamAddre... INFO -- Will fill Store with id = 0
+TagInfoMgr INFO AlgTool: TagInfoMgr.IOVDbMetaDataTool
+ClassIDSvc INFO getRegistryEntries: read 2810 CLIDRegistry entries for module ALL
+IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1844 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_TILE/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200
+IOVDbSvc INFO Added taginfo remove for /LAR/Align
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CES
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/LIN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/NLN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/EMS
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/FIBER
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/LIN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/NLN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/NOISE/SAMPLE
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
+IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
+IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
+ClassIDSvc INFO getRegistryEntries: read 23 CLIDRegistry entries for module ALL
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 HGTD_ID with CLID 79264207 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
+DetDescrCnvSvc INFO filling address for JTower_ID with CLID 218674799 and storage type 68 to detector store
+DetDescrCnvSvc INFO filling address for GTower_ID with CLID 49678914 and storage type 68 to detector store
GeoModelSvc::RD...WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RD...WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RD...WARNING Getting InDetMatComponents with default tag
@@ -59,15 +168,19 @@ LArHVLineID INFO setDictVersion of LArHighVoltage is OK
LArHVLineID INFO [initLevelsFromDict] m_dict OK ...
LArHVLineID INFO [initialize_from_dictionary] > HV line range -> 11/1/48:79/0:15 | 11/1/148:179/0:15 | 11/1/80:93/0:7 | 11/1/180:193/0:7 | 11/1/200:231/0:15 | 11/1/232:263/0:15 | 11/1/296,297,306,307/0:15 | 11/1/299,304,305,308,309/0:15 | 11/1/264:279/0:15 | 11/1/280:295/0:15 | 11/1/0:47/0:15 | 11/1/320:322/0:15 | 11/1/100:147/0:15 | 11/1/324,325/0:15 | 11/1/312:315/0:15 | 11/1/316:319/0:15 | 11/1/300:303/0:15 | 11/1/310,311/0:15 | 11/1/323/0:15 | 11/1/326,327/0:15 | 11/1/94:99/0:15 | 11/1/194:199/0:15
LArHVLineID INFO [init_hashes()] > Hvline_size= 5008
+GeoModelSvc.LAr... INFO Keys for LAr are ATLAS-R2-2016-01-00-01 ATLAS
+GeoModelSvc.LAr... INFO Building LAr version LAr-Revised-17-01 while ATLAS version is ATLAS-R2-2016-01-00-01
GeoModelSvc.LAr... INFO LAr Geometry Options:
GeoModelSvc.LAr... INFO Sagging = false
GeoModelSvc.LAr... INFO Barrel = ON
GeoModelSvc.LAr... INFO Endcap = ON
+BarrelConstruction INFO Getting primary numbers for ATLAS, ATLAS-R2-2016-01-00-01
BarrelConstruction INFO Makes detailed absorber sandwich ? 1 1
BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
+ClassIDSvc INFO getRegistryEntries: read 3249 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -76,6 +189,9 @@ EMECConstruction INFO multi-layered version of absorbers activated, paramete
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstru... INFO Start building EC electronics geometry
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 25148Kb Time = 0.71S
+GeoModelSvc.Til... INFO Entering TileDetectorTool::create()
+TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
TileDddbManager INFO n_timod = 320
TileDddbManager INFO n_cuts = 9
@@ -84,9 +200,11 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloCell_ID helper object in the detector store
CaloIDHelper_ID... INFO in createObj: creating a LArEM_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -94,6 +212,9 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -128,13 +249,50 @@ GeoModelSvc.Til... INFO Global positioning of barrel with rotation (0,0,0)) a
GeoModelSvc.Til... INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
GeoModelSvc.Til... INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrMan... INFO Entering create_elements()
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3528Kb Time = 0.16S
+ClassIDSvc INFO getRegistryEntries: read 71 CLIDRegistry entries for module ALL
+GeoModelSvc INFO AlgTool: GeoModelSvc.LArDetectorToolNV
+GeoModelSvc INFO AlgTool: GeoModelSvc.TileDetectorTool
+TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
+TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_ID... INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
CaloLVL1_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-R2-2016-01-00-01
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
+AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr
+ClassIDSvc INFO getRegistryEntries: read 444 CLIDRegistry entries for module ALL
+CondInputLoader INFO Initializing CondInputLoader...
+ClassIDSvc INFO getRegistryEntries: read 12 CLIDRegistry entries for module ALL
CondInputLoader INFO Adding base classes:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' ) -> no bases
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' ) ->
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' ) ->
CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' )
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' )
TileBadChannels... INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OnlBch) for folder: "/TILE/ONL01/STATUS/ADC"
TileBadChannels... INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OflBch) for folder: "/TILE/OFL02/STATUS/ADC"
TileBadChannels... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
@@ -153,22 +311,52 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlEms) for folder: "/TILE/OFL02/CALIB/EMS"
TileSampleNoise... INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.TileCondProxyCool_NoiseSample) for folder: "/TILE/OFL02/NOISE/SAMPLE"
TileTimingCondA... INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
+ClassIDSvc INFO getRegistryEntries: read 4121 CLIDRegistry entries for module ALL
+PyComponentMgr INFO Initializing PyComponentMgr...
+Finalizer INFO Initializing Finalizer...
+ByteStreamInputSvc INFO Initializing
+ROBDataProviderSvc INFO Initializing
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
EventSelector INFO reinitialization...
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
+ClassIDSvc INFO getRegistryEntries: read 379 CLIDRegistry entries for module ALL
+ByteStreamInputSvc INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data12_8TeV.00204073.physics_JetTauEtmiss.merge.RAW._lb0144._SFO-5._0001.1
+CondInputLoader INFO created CondCont<CaloRec::CaloCellPositionShift> with key 'ConditionStore+LArCellPositionShift'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/EMS'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/STATUS/ADC'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY'
+CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/ONL01/STATUS/ADC'
+CondInputLoader INFO created CondCont<DetCondKeyTrans> with key 'ConditionStore+/LAR/Align'
ApplicationMgr INFO Application Manager Started successfully
+EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistenc... INFO Added successfully Conversion service:ByteStreamCnvSvc
EventInfoByteSt... INFO IsSimulation : 0
EventInfoByteSt... INFO IsTestbeam : 0
EventInfoByteSt... INFO IsCalibration : 0
AthenaEventLoopMgr INFO ===>>> start of run 204073 <<<===
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
+ClassIDSvc INFO getRegistryEntries: read 207 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -182,10 +370,22 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
+CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
+AthenaEventLoopMgr INFO ===>>> start processing event #1129572, run #204073 0 events processed so far <<<===
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCes-SIM-06 for folder /TILE/OFL02/CALIB/CES
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCisFitLin-COM-00 for folder /TILE/OFL02/CALIB/CIS/FIT/LIN
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCisFitNln-COM-00 for folder /TILE/OFL02/CALIB/CIS/FIT/NLN
@@ -196,6 +396,8 @@ IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02Cali
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02NoiseSample-TwoGauss-19 for folder /TILE/OFL02/NOISE/SAMPLE
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02StatusAdc-IOVDEP-03 for folder /TILE/OFL02/STATUS/ADC
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02TimeChanneloffsetPhy-000-00 for folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY
+IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200
+LArAlignCondAlg INFO recorded new GeoAlignmentStore object for LAr with key LArAlignmentStore and range {[177530,l:0] - [INVALID]}
TileBadChannels... INFO Updating TileBchStatus::isBad() definition from DB
TileBadChannels... INFO Updating TileBchStatus::isNoisy() definition from DB
TileBadChannels... INFO No TileBchStatus::isNoGainL1() definition found in DB, using defaults
@@ -207,25 +409,273 @@ TileBadChannels... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
TileBadChannels... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
TileBadChannels... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
TileBadChannels... INFO No drawer trips probabilities found in DB
+ClassIDSvc INFO getRegistryEntries: read 2258 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 92 CLIDRegistry entries for module ALL
+ToolSvc.TileROD... INFO TileL2Builder initialization completed
+ToolSvc.TileRaw... INFO Initializing TileRawChannelContByteStreamTool
+AthenaEventLoopMgr INFO ===>>> done processing event #1129572, run #204073 1 events processed so far <<<===
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
+AthenaEventLoopMgr INFO ===>>> start processing event #1129665, run #204073 1 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1129665, run #204073 2 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1131212, run #204073 2 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1131212, run #204073 3 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1131086, run #204073 3 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1131086, run #204073 4 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1130272, run #204073 4 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1130272, run #204073 5 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1131269, run #204073 5 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1131269, run #204073 6 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1130716, run #204073 6 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1130716, run #204073 7 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1132019, run #204073 7 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1132019, run #204073 8 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1132092, run #204073 8 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1132092, run #204073 9 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1130238, run #204073 9 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1130238, run #204073 10 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1134553, run #204073 10 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1134553, run #204073 11 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1130999, run #204073 11 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1130999, run #204073 12 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1133461, run #204073 12 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1133461, run #204073 13 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1131152, run #204073 13 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1131152, run #204073 14 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1130142, run #204073 14 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1130142, run #204073 15 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1132770, run #204073 15 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1132770, run #204073 16 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1132365, run #204073 16 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1132365, run #204073 17 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1136791, run #204073 17 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1136791, run #204073 18 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1133781, run #204073 18 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1133781, run #204073 19 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1132067, run #204073 19 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1132067, run #204073 20 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1138637, run #204073 20 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1138637, run #204073 21 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139495, run #204073 21 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139495, run #204073 22 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1140193, run #204073 22 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1140193, run #204073 23 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142953, run #204073 23 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142953, run #204073 24 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139127, run #204073 24 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139127, run #204073 25 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1141272, run #204073 25 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1141272, run #204073 26 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1137117, run #204073 26 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1137117, run #204073 27 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139599, run #204073 27 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139599, run #204073 28 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1140314, run #204073 28 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1140314, run #204073 29 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1133685, run #204073 29 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1133685, run #204073 30 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143279, run #204073 30 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143279, run #204073 31 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1137563, run #204073 31 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1137563, run #204073 32 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139927, run #204073 32 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139927, run #204073 33 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1141197, run #204073 33 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1141197, run #204073 34 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1140039, run #204073 34 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1140039, run #204073 35 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142531, run #204073 35 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142531, run #204073 36 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139475, run #204073 36 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139475, run #204073 37 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139958, run #204073 37 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139958, run #204073 38 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143765, run #204073 38 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143765, run #204073 39 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143097, run #204073 39 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143097, run #204073 40 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1134147, run #204073 40 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1134147, run #204073 41 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1137156, run #204073 41 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1137156, run #204073 42 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1136377, run #204073 42 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1136377, run #204073 43 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1137842, run #204073 43 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1137842, run #204073 44 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1141705, run #204073 44 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1141705, run #204073 45 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143410, run #204073 45 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143410, run #204073 46 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1144170, run #204073 46 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1144170, run #204073 47 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1145987, run #204073 47 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1145987, run #204073 48 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1145633, run #204073 48 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1145633, run #204073 49 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1135005, run #204073 49 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1135005, run #204073 50 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142167, run #204073 50 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142167, run #204073 51 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1144646, run #204073 51 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1144646, run #204073 52 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1145027, run #204073 52 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1145027, run #204073 53 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1144112, run #204073 53 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1144112, run #204073 54 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1138485, run #204073 54 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1138485, run #204073 55 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1144565, run #204073 55 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1144565, run #204073 56 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1139498, run #204073 56 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1139498, run #204073 57 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1136546, run #204073 57 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1136546, run #204073 58 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143799, run #204073 58 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143799, run #204073 59 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142877, run #204073 59 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142877, run #204073 60 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1149894, run #204073 60 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1149894, run #204073 61 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1145364, run #204073 61 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1145364, run #204073 62 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143770, run #204073 62 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143770, run #204073 63 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1148361, run #204073 63 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1148361, run #204073 64 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1148167, run #204073 64 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1148167, run #204073 65 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1138948, run #204073 65 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1138948, run #204073 66 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1144808, run #204073 66 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1144808, run #204073 67 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1145832, run #204073 67 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1145832, run #204073 68 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1153100, run #204073 68 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1153100, run #204073 69 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142524, run #204073 69 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142524, run #204073 70 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1138294, run #204073 70 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1138294, run #204073 71 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1138350, run #204073 71 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1138350, run #204073 72 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1149424, run #204073 72 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1149424, run #204073 73 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1151102, run #204073 73 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1151102, run #204073 74 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1152242, run #204073 74 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1152242, run #204073 75 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1148416, run #204073 75 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1148416, run #204073 76 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142753, run #204073 76 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142753, run #204073 77 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1149997, run #204073 77 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1149997, run #204073 78 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1151617, run #204073 78 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1151617, run #204073 79 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1149794, run #204073 79 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1149794, run #204073 80 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1152504, run #204073 80 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1152504, run #204073 81 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1142485, run #204073 81 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1142485, run #204073 82 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1151364, run #204073 82 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1151364, run #204073 83 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1143901, run #204073 83 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1143901, run #204073 84 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1153979, run #204073 84 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1153979, run #204073 85 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1150212, run #204073 85 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1150212, run #204073 86 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1152633, run #204073 86 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1152633, run #204073 87 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1155482, run #204073 87 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1155482, run #204073 88 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1150472, run #204073 88 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1150472, run #204073 89 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1140275, run #204073 89 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1140275, run #204073 90 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1145882, run #204073 90 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1145882, run #204073 91 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1151732, run #204073 91 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1151732, run #204073 92 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1137896, run #204073 92 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1137896, run #204073 93 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1156381, run #204073 93 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1156381, run #204073 94 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1149161, run #204073 94 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1149161, run #204073 95 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1153794, run #204073 95 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1153794, run #204073 96 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1151312, run #204073 96 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1151312, run #204073 97 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1148893, run #204073 97 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1148893, run #204073 98 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1156938, run #204073 98 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1156938, run #204073 99 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> start processing event #1156351, run #204073 99 events processed so far <<<===
+AthenaEventLoopMgr INFO ===>>> done processing event #1156351, run #204073 100 events processed so far <<<===
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
+CondInputLoader INFO Finalizing CondInputLoader...
+Finalizer INFO Finalizing Finalizer...
Finalize: compared 20 dumps
+PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/2 objs/chan/bytes 1/1/170 (( 0.26 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.24 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641504 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/93060 (( 0.27 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/2 objs/chan/bytes 2/1/390 (( 0.03 ))s
+IOVDbSvc INFO bytes in (( 1.04 ))s
+IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 3 nFolders: 2 ReadTime: (( 0.29 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.74 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
+ToolSvc.TileRaw... INFO Finalizing TileRawChannelContByteStreamTool successfuly
+ToolSvc.TileROD... INFO Finalizing
ToolSvc.ByteStr... INFO in finalize()
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
+cObjR_ALL INFO Time User : Tot= 140 [ms] Ave/Min/Max= 35(+- 60.6)/ 0/ 140 [ms] #= 4
+cObj_ALL INFO Time User : Tot= 190 [ms] Ave/Min/Max= 12.7(+- 42.3)/ 0/ 170 [ms] #= 15
+ChronoStatSvc INFO Time User : Tot= 14.2 [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"
+Sat Aug 21 21:54:22 CEST 2021
+Preloading tcmalloc_minimal.so
+Py:Athena INFO including file "AthenaCommon/Preparation.py"
+Py:Athena INFO using release [WorkDir-22.0.42] [x86_64-centos7-gcc8-opt] [master-calo-ctests/ec2fa09c9e3] -- built on [2021-08-21T2138]
+Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO configuring AthenaHive with [4] concurrent threads and [4] concurrent events
Py:AlgScheduler INFO setting up AvalancheSchedulerSvc/AvalancheSchedulerSvc with 4 threads
+Py:Athena INFO including file "AthenaCommon/Execution.py"
+Py:Athena INFO including file "TileByteStream/TileRawChannelContByteStreamCnv_test.py"
+Py:Athena INFO SetGeometryVersion.py obtained major release version 22
+Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
+Py:ConfigurableDb INFO Read module info for 5069 configurables from 8 genConfDb files
+Py:ConfigurableDb INFO No duplicates have been found: that's good !
+EventInfoMgtInit: Got release version Athena-22.0.42
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
+Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
+Py:TileConditions_jobOptions.py INFO Forcing RUN2 (2014-2017) cabling for run 204073 with geometry ATLAS-R2-2016-01-00-01
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo for 7 samples
Py:TileConditions_jobOptions.py INFO setting up COOL for TileCal conditions data
Py:TileInfoConf. INFO Changing default TileBadChanTool configuration to COOL source
@@ -235,17 +685,112 @@ Py:TileInfoConf. INFO Changing default TileCondToolTiming configuration to C
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise for Opt.Filter without iterations
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
+Py:Athena INFO including file "AthenaCommon/runbatch.py"
MessageSvc INFO Activating in a separate thread
+ApplicationMgr SUCCESS
+====================================================================================================================================
+ Welcome to ApplicationMgr (GaudiCoreSvc v36r0)
+ running on aibuild028.cern.ch on Sat Aug 21 21:54:35 2021
+====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
+ClassIDSvc INFO getRegistryEntries: read 6689 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
+MetaDataSvc INFO Initializing MetaDataSvc
+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/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+PoolSvc INFO Successfully setup replica sorting algorithm
+PoolSvc INFO Setting up APR FileCatalog and Streams
+PoolSvc INFO Unable find catalog apcfile:poolcond/PoolCat_oflcond.xml in $ATLAS_POOLCOND_PATH and $DATAPATH
+PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
+PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+ToolSvc.ByteStreamMetadataTool INFO Initializing
+MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool','ByteStreamMetadataTool'])
+MetaDataSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+MetaDataSvc INFO AlgTool: ToolSvc.ByteStreamMetadataTool
+IOVDbSvc INFO Only 5 POOL conditions files will be open at once
+IOVDbSvc INFO Cache alignment will be done in 3 slices
+IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
+IOVDbSvc INFO Initialised with 3 connections and 14 folders
+IOVDbSvc INFO Service IOVDbSvc initialised successfully
+IOVDbSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
+ByteStreamAddressProviderSvc INFO Initializing
ByteStreamAddressProviderSvc INFO -- Will fill Store with id = 0
+TagInfoMgr INFO AlgTool: TagInfoMgr.IOVDbMetaDataTool
+ClassIDSvc INFO getRegistryEntries: read 2810 CLIDRegistry entries for module ALL
+IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1844 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_TILE/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200
+IOVDbSvc INFO Added taginfo remove for /LAR/Align
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CES
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/LIN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/NLN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/EMS
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/FIBER
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/LIN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/NLN
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/NOISE/SAMPLE
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
+IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
+IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
+IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
+ClassIDSvc INFO getRegistryEntries: read 23 CLIDRegistry entries for module ALL
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 HGTD_ID with CLID 79264207 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
+DetDescrCnvSvc INFO filling address for JTower_ID with CLID 218674799 and storage type 68 to detector store
+DetDescrCnvSvc INFO filling address for GTower_ID with CLID 49678914 and storage type 68 to detector store
GeoModelSvc::RDBMaterialManager WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RDBMaterialManager WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RDBMaterialManager WARNING Getting InDetMatComponents with default tag
@@ -285,11 +830,19 @@ LArHVLineID INFO setDictVe
LArHVLineID INFO [initLevelsFromDict] m_dict OK ...
LArHVLineID INFO [initialize_from_dictionary] > HV line range -> 11/1/48:79/0:15 | 11/1/148:179/0:15 | 11/1/80:93/0:7 | 11/1/180:193/0:7 | 11/1/200:231/0:15 | 11/1/232:263/0:15 | 11/1/296,297,306,307/0:15 | 11/1/299,304,305,308,309/0:15 | 11/1/264:279/0:15 | 11/1/280:295/0:15 | 11/1/0:47/0:15 | 11/1/320:322/0:15 | 11/1/100:147/0:15 | 11/1/324,325/0:15 | 11/1/312:315/0:15 | 11/1/316:319/0:15 | 11/1/300:303/0:15 | 11/1/310,311/0:15 | 11/1/323/0:15 | 11/1/326,327/0:15 | 11/1/94:99/0:15 | 11/1/194:199/0:15
LArHVLineID INFO [init_hashes()] > Hvline_size= 5008
+GeoModelSvc.LArDetectorToolNV INFO Keys for LAr are ATLAS-R2-2016-01-00-01 ATLAS
+GeoModelSvc.LArDetectorToolNV INFO Building LAr version LAr-Revised-17-01 while ATLAS version is ATLAS-R2-2016-01-00-01
+GeoModelSvc.LArDetectorToolNV INFO LAr Geometry Options:
+GeoModelSvc.LArDetectorToolNV INFO Sagging = false
+GeoModelSvc.LArDetectorToolNV INFO Barrel = ON
+GeoModelSvc.LArDetectorToolNV INFO Endcap = ON
+BarrelConstruction INFO Getting primary numbers for ATLAS, ATLAS-R2-2016-01-00-01
BarrelConstruction INFO Makes detailed absorber sandwich ? 1 1
BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
+ClassIDSvc INFO getRegistryEntries: read 3249 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -298,6 +851,9 @@ EMECConstruction INFO multi-lay
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstruction INFO Start building EC electronics geometry
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24124Kb Time = 0.7S
+GeoModelSvc.TileDetectorTool INFO Entering TileDetectorTool::create()
+TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
TileDddbManager INFO n_timod = 320
TileDddbManager INFO n_cuts = 9
@@ -306,9 +862,11 @@ TileDddbManager INFO n_tilb =
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDescrCnv INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a CaloCell_ID helper object in the detector store
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArEM_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -316,18 +874,90 @@ CaloIDHelper_IDDetDescrCnv INFO in create
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
AtlasDetectorID INFO initialize_from_dictionary - OK
+GeoModelSvc.TileDetectorTool INFO U-shape parameter from database is: 1
+GeoModelSvc.TileDetectorTool INFO Glue parameter from database is: 1
+GeoModelSvc.TileDetectorTool INFO Cs Tube parameter from database is: 0
+GeoModelSvc.TileDetectorTool INFO Entering TileAtlasFactory::create()
+GeoModelSvc.TileDetectorTool INFO Tile Geometry with Saddle supports, starting from TileCal-CSC-02 xxx
+GeoModelSvc.TileDetectorTool INFO => New BFingerLengthPos 430.5
+GeoModelSvc.TileDetectorTool INFO => New BFingerLengthNeg 420.5
+GeoModelSvc.TileDetectorTool INFO Positioning barrel with translation 0
+GeoModelSvc.TileDetectorTool INFO Positioning positive barrel finger with translation 3035.25
+GeoModelSvc.TileDetectorTool INFO Positioning negative barrel finger with translation -3030.25
+GeoModelSvc.TileDetectorTool INFO Positioning positive ext.barrel with translation 4854.75
+GeoModelSvc.TileDetectorTool INFO Positioning positive ext.barrel finger with translation ztrans= 6338.5
+GeoModelSvc.TileDetectorTool INFO Positioning positive ext.barrel saddle with translation ztrans= 6192.5
+GeoModelSvc.TileDetectorTool INFO Positive ITC envelope parameters: PLUG1 Rmin= 3438.85 Rmax= 4250 dzITC1= 154.5
+GeoModelSvc.TileDetectorTool INFO PLUG2 Rmin= 2981 Rmax= 3440 dzITC2= 47.425
+GeoModelSvc.TileDetectorTool INFO Positioning positive ITC with translation 3405
+GeoModelSvc.TileDetectorTool INFO Positioning positive Gap with translation 3552
+GeoModelSvc.TileDetectorTool INFO Positioning positive Crack with translation 3536
+GeoModelSvc.TileDetectorTool INFO Positioning negative ext.barrel with translation ztrans -4854.75
+GeoModelSvc.TileDetectorTool INFO Positioning negative ext.barrel finger with translation ztrans= -6338.5
+GeoModelSvc.TileDetectorTool INFO Positioning negative ext.barrel saddle with translation ztrans= -6192.5
+GeoModelSvc.TileDetectorTool INFO Negative ITC envelope parameters: PLUG1 Rmin= 3438.85 Rmax= 4250 dzITC1= 154.5
+GeoModelSvc.TileDetectorTool INFO PLUG2 Rmin= 2981 Rmax= 3440 dzITC2= 47.425
+GeoModelSvc.TileDetectorTool INFO Positioning negative ITC with translation -3405
+GeoModelSvc.TileDetectorTool INFO Positioning negative Gap with translation -3552
+GeoModelSvc.TileDetectorTool INFO Positioning negative Crack with translation -3536
+GeoModelSvc.TileDetectorTool INFO Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.TileDetectorTool INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.TileDetectorTool INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrManager INFO Entering create_elements()
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3528Kb Time = 0.19S
+ClassIDSvc INFO getRegistryEntries: read 71 CLIDRegistry entries for module ALL
+GeoModelSvc INFO AlgTool: GeoModelSvc.LArDetectorToolNV
+GeoModelSvc INFO AlgTool: GeoModelSvc.TileDetectorTool
+TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
+TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
CaloLVL1_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
+TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-R2-2016-01-00-01
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
+AthenaHiveEventLoopMgr INFO Initializing AthenaHiveEventLoopMgr
+ClassIDSvc 0 INFO getRegistryEntries: read 4391 CLIDRegistry entries for module ALL
+PyComponentMgr 0 INFO Initializing PyComponentMgr...
+Finalizer 0 INFO Initializing Finalizer...
+ClassIDSvc 0 INFO getRegistryEntries: read 553 CLIDRegistry entries for module ALL
+CondInputLoader 0 INFO Initializing CondInputLoader...
+ClassIDSvc 0 INFO getRegistryEntries: read 12 CLIDRegistry entries for module ALL
CondInputLoader 0 INFO Adding base classes:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' ) -> no bases
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' ) ->
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' ) ->
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' ) ->
CondInputLoader 0 INFO Will create WriteCondHandle dependencies for the following DataObjects:
+ + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' )
+ + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' )
+ + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' )
TileBadChannelsCondAlg.TileCondProxyCool_OnlBch 0 INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OnlBch) for folder: "/TILE/ONL01/STATUS/ADC"
TileBadChannelsCondAlg.TileCondProxyCool_OflBch 0 INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OflBch) for folder: "/TILE/OFL02/STATUS/ADC"
TileBadChannelsCondAlg 0 INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
@@ -348,7 +978,7 @@ TileSampleNoiseCon...TileCondProxyCool_NoiseSample 0 INFO Creating
TileTimingCondAlg.TileCondProxyCool_AdcOffset 0 INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
ThreadPoolSvc 0 INFO no thread init tools attached
AvalancheSchedulerSvc 0 INFO Activating scheduler in a separate thread
-AvalancheSchedulerSvc 0 INFO Found 15 algorithms
+AvalancheSchedulerSvc 0 INFO Found 16 algorithms
AvalancheSchedulerSvc 0 INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
AvalancheSchedulerSvc 0 INFO o ( 'TileRawChannelContainer' , 'StoreGateSvc+MuRcvRawChCnt' ) required by Algorithm:
AvalancheSchedulerSvc 0 INFO * MuRcvRawChannelCntDumper
@@ -364,23 +994,50 @@ AvalancheSchedulerSvc 0 INFO Task sche
AvalancheSchedulerSvc 0 INFO o Avalanche generation mode: disabled
AvalancheSchedulerSvc 0 INFO o Preemptive scheduling of CPU-blocking tasks: disabled
AvalancheSchedulerSvc 0 INFO o Scheduling of condition tasks: disabled
+ByteStreamInputSvc 0 INFO Initializing
+ROBDataProviderSvc 0 INFO Initializing
ROBDataProviderSvc 0 INFO ---> Filter out empty ROB fragments = 'filterEmptyROB':False
ROBDataProviderSvc 0 INFO ---> Filter out specific ROBs by Status Code: # ROBs = 0
ROBDataProviderSvc 0 INFO ---> Filter out Sub Detector ROBs by Status Code: # Sub Detectors = 0
EventSelector 0 INFO reinitialization...
AthenaHiveEventLoopMgr 0 INFO Setup EventSelector service EventSelector
ApplicationMgr 0 INFO Application Manager Initialized successfully
+PoolSvc 0 INFO Enabled implicit multithreading in ROOT via PersistencySvc to: 3
+CondInputLoader 0 INFO created CondCont<CaloRec::CaloCellPositionShift> with key 'ConditionStore+LArCellPositionShift'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/EMS'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/STATUS/ADC'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY'
+CondInputLoader 0 INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/ONL01/STATUS/ADC'
+CondInputLoader 0 INFO created CondCont<DetCondKeyTrans> with key 'ConditionStore+/LAR/Align'
+ByteStreamInputSvc 0 INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data12_8TeV.00204073.physics_JetTauEtmiss.merge.RAW._lb0144._SFO-5._0001.1
ApplicationMgr 0 INFO Application Manager Started successfully
AthenaHiveEventLoopMgr 0 INFO Starting loop on events
+EventPersistencySvc 0 0 INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistencySvc 0 0 INFO Added successfully Conversion service:ByteStreamCnvSvc
EventInfoByteStreamAuxCnv 0 0 INFO IsSimulation : 0
EventInfoByteStreamAuxCnv 0 0 INFO IsTestbeam : 0
EventInfoByteStreamAuxCnv 0 0 INFO IsCalibration : 0
AthenaHiveEventLoopMgr 0 0 INFO ===>>> start of run 204073 <<<===
+IOVDbSvc 0 0 INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder 0 0 INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder 0 0 INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
+IOVDbSvc 0 0 INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc 0 0 INFO Opened read transaction for POOL PersistencySvc
+DbSession 0 0 INFO Open DbSession
+Domain[ROOT_All] 0 0 INFO > Access DbDomain READ [ROOT_All]
+Domain[ROOT_All] 0 0 INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
+Domain[ROOT_All] 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
+RootDatabase.open 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv 0 0 INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDescrCnv 0 0 INFO in createObj: creating a CaloDescrManager object in the detector store
+ClassIDSvc 0 0 INFO getRegistryEntries: read 207 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID 0 0 INFO initialize_from_dictionary
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
@@ -394,19 +1051,268 @@ CaloIDHelper_IDDetDescrCnv 0 0 INFO in create
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
+TileNeighbour 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-08-20T2101/Athena/22.0.42/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
CaloIdMgrDetDescrCnv 0 0 INFO Finished
+CaloIdMgrDetDescrCnv 0 0 INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
+Domain[ROOT_All] 0 0 INFO -> Access DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
+RootDatabase.open 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
+AthenaHiveEventLoopMgr 0 0 INFO ===>>> start processing event #1129572, run #204073 on slot 0, 0 events processed so far <<<===
+ClassIDSvc 0 0 INFO getRegistryEntries: read 495 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 1763 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 92 CLIDRegistry entries for module ALL
+ToolSvc.TileROD_Decoder.TileL2Builder 0 0 INFO TileL2Builder initialization completed
+ToolSvc.TileRawChannelContByteStreamTool 0 0 INFO Initializing TileRawChannelContByteStreamTool
+/cvmfs/atlas-condb.cern.ch/repo/conditions/...root 0 0 INFO Database being retired...
+Domain[ROOT_All] 0 0 INFO -> Deaccess DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
+/cvmfs/atlas-condb.cern.ch/repo/conditions/...root 0 0 INFO Database being retired...
+Domain[ROOT_All] 0 0 INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
+Domain[ROOT_All] 0 0 INFO > Deaccess DbDomain READ [ROOT_All]
+AthenaHiveEventLoopMgr 0 0 INFO ===>>> done processing event #1129572, run #204073 on slot 0, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 1 0 INFO ===>>> start processing event #1129665, run #204073 on slot 0, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 2 1 INFO ===>>> start processing event #1131212, run #204073 on slot 1, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 3 2 INFO ===>>> start processing event #1131086, run #204073 on slot 2, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 4 3 INFO ===>>> start processing event #1130272, run #204073 on slot 3, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 1 0 INFO ===>>> done processing event #1129665, run #204073 on slot 0, 2 events processed so far <<<===
+AthenaHiveEventLoopMgr 2 1 INFO ===>>> done processing event #1131212, run #204073 on slot 1, 3 events processed so far <<<===
+AthenaHiveEventLoopMgr 5 0 INFO ===>>> start processing event #1131269, run #204073 on slot 0, 3 events processed so far <<<===
+AthenaHiveEventLoopMgr 6 1 INFO ===>>> start processing event #1130716, run #204073 on slot 1, 3 events processed so far <<<===
+AthenaHiveEventLoopMgr 3 2 INFO ===>>> done processing event #1131086, run #204073 on slot 2, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 4 3 INFO ===>>> done processing event #1130272, run #204073 on slot 3, 5 events processed so far <<<===
+AthenaHiveEventLoopMgr 7 2 INFO ===>>> start processing event #1132019, run #204073 on slot 2, 5 events processed so far <<<===
+AthenaHiveEventLoopMgr 8 3 INFO ===>>> start processing event #1132092, run #204073 on slot 3, 5 events processed so far <<<===
+AthenaHiveEventLoopMgr 5 0 INFO ===>>> done processing event #1131269, run #204073 on slot 0, 6 events processed so far <<<===
+AthenaHiveEventLoopMgr 6 1 INFO ===>>> done processing event #1130716, run #204073 on slot 1, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 9 0 INFO ===>>> start processing event #1130238, run #204073 on slot 0, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 10 1 INFO ===>>> start processing event #1134553, run #204073 on slot 1, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 7 2 INFO ===>>> done processing event #1132019, run #204073 on slot 2, 8 events processed so far <<<===
+AthenaHiveEventLoopMgr 8 3 INFO ===>>> done processing event #1132092, run #204073 on slot 3, 9 events processed so far <<<===
+AthenaHiveEventLoopMgr 11 2 INFO ===>>> start processing event #1130999, run #204073 on slot 2, 9 events processed so far <<<===
+AthenaHiveEventLoopMgr 12 3 INFO ===>>> start processing event #1133461, run #204073 on slot 3, 9 events processed so far <<<===
+AthenaHiveEventLoopMgr 9 0 INFO ===>>> done processing event #1130238, run #204073 on slot 0, 10 events processed so far <<<===
+AthenaHiveEventLoopMgr 10 1 INFO ===>>> done processing event #1134553, run #204073 on slot 1, 11 events processed so far <<<===
+AthenaHiveEventLoopMgr 13 0 INFO ===>>> start processing event #1131152, run #204073 on slot 0, 11 events processed so far <<<===
+AthenaHiveEventLoopMgr 14 1 INFO ===>>> start processing event #1130142, run #204073 on slot 1, 11 events processed so far <<<===
+AthenaHiveEventLoopMgr 11 2 INFO ===>>> done processing event #1130999, run #204073 on slot 2, 12 events processed so far <<<===
+AthenaHiveEventLoopMgr 12 3 INFO ===>>> done processing event #1133461, run #204073 on slot 3, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 15 2 INFO ===>>> start processing event #1132770, run #204073 on slot 2, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 16 3 INFO ===>>> start processing event #1132365, run #204073 on slot 3, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 13 0 INFO ===>>> done processing event #1131152, run #204073 on slot 0, 14 events processed so far <<<===
+AthenaHiveEventLoopMgr 14 1 INFO ===>>> done processing event #1130142, run #204073 on slot 1, 15 events processed so far <<<===
+AthenaHiveEventLoopMgr 17 0 INFO ===>>> start processing event #1136791, run #204073 on slot 0, 15 events processed so far <<<===
+AthenaHiveEventLoopMgr 18 1 INFO ===>>> start processing event #1133781, run #204073 on slot 1, 15 events processed so far <<<===
+AthenaHiveEventLoopMgr 15 2 INFO ===>>> done processing event #1132770, run #204073 on slot 2, 16 events processed so far <<<===
+AthenaHiveEventLoopMgr 16 3 INFO ===>>> done processing event #1132365, run #204073 on slot 3, 17 events processed so far <<<===
+AthenaHiveEventLoopMgr 19 2 INFO ===>>> start processing event #1132067, run #204073 on slot 2, 17 events processed so far <<<===
+AthenaHiveEventLoopMgr 20 3 INFO ===>>> start processing event #1138637, run #204073 on slot 3, 17 events processed so far <<<===
+AthenaHiveEventLoopMgr 17 0 INFO ===>>> done processing event #1136791, run #204073 on slot 0, 18 events processed so far <<<===
+AthenaHiveEventLoopMgr 18 1 INFO ===>>> done processing event #1133781, run #204073 on slot 1, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 21 0 INFO ===>>> start processing event #1139495, run #204073 on slot 0, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 22 1 INFO ===>>> start processing event #1140193, run #204073 on slot 1, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 19 2 INFO ===>>> done processing event #1132067, run #204073 on slot 2, 20 events processed so far <<<===
+AthenaHiveEventLoopMgr 20 3 INFO ===>>> done processing event #1138637, run #204073 on slot 3, 21 events processed so far <<<===
+AthenaHiveEventLoopMgr 23 2 INFO ===>>> start processing event #1142953, run #204073 on slot 2, 21 events processed so far <<<===
+AthenaHiveEventLoopMgr 24 3 INFO ===>>> start processing event #1139127, run #204073 on slot 3, 21 events processed so far <<<===
+AthenaHiveEventLoopMgr 21 0 INFO ===>>> done processing event #1139495, run #204073 on slot 0, 22 events processed so far <<<===
+AthenaHiveEventLoopMgr 22 1 INFO ===>>> done processing event #1140193, run #204073 on slot 1, 23 events processed so far <<<===
+AthenaHiveEventLoopMgr 25 0 INFO ===>>> start processing event #1141272, run #204073 on slot 0, 23 events processed so far <<<===
+AthenaHiveEventLoopMgr 26 1 INFO ===>>> start processing event #1137117, run #204073 on slot 1, 23 events processed so far <<<===
+AthenaHiveEventLoopMgr 23 2 INFO ===>>> done processing event #1142953, run #204073 on slot 2, 24 events processed so far <<<===
+AthenaHiveEventLoopMgr 24 3 INFO ===>>> done processing event #1139127, run #204073 on slot 3, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 27 2 INFO ===>>> start processing event #1139599, run #204073 on slot 2, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 28 3 INFO ===>>> start processing event #1140314, run #204073 on slot 3, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 25 0 INFO ===>>> done processing event #1141272, run #204073 on slot 0, 26 events processed so far <<<===
+AthenaHiveEventLoopMgr 26 1 INFO ===>>> done processing event #1137117, run #204073 on slot 1, 27 events processed so far <<<===
+AthenaHiveEventLoopMgr 29 0 INFO ===>>> start processing event #1133685, run #204073 on slot 0, 27 events processed so far <<<===
+AthenaHiveEventLoopMgr 30 1 INFO ===>>> start processing event #1143279, run #204073 on slot 1, 27 events processed so far <<<===
+AthenaHiveEventLoopMgr 27 2 INFO ===>>> done processing event #1139599, run #204073 on slot 2, 28 events processed so far <<<===
+AthenaHiveEventLoopMgr 28 3 INFO ===>>> done processing event #1140314, run #204073 on slot 3, 29 events processed so far <<<===
+AthenaHiveEventLoopMgr 31 2 INFO ===>>> start processing event #1137563, run #204073 on slot 2, 29 events processed so far <<<===
+AthenaHiveEventLoopMgr 32 3 INFO ===>>> start processing event #1139927, run #204073 on slot 3, 29 events processed so far <<<===
+AthenaHiveEventLoopMgr 29 0 INFO ===>>> done processing event #1133685, run #204073 on slot 0, 30 events processed so far <<<===
+AthenaHiveEventLoopMgr 30 1 INFO ===>>> done processing event #1143279, run #204073 on slot 1, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 33 0 INFO ===>>> start processing event #1141197, run #204073 on slot 0, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 34 1 INFO ===>>> start processing event #1140039, run #204073 on slot 1, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 31 2 INFO ===>>> done processing event #1137563, run #204073 on slot 2, 32 events processed so far <<<===
+AthenaHiveEventLoopMgr 32 3 INFO ===>>> done processing event #1139927, run #204073 on slot 3, 33 events processed so far <<<===
+AthenaHiveEventLoopMgr 35 2 INFO ===>>> start processing event #1142531, run #204073 on slot 2, 33 events processed so far <<<===
+AthenaHiveEventLoopMgr 36 3 INFO ===>>> start processing event #1139475, run #204073 on slot 3, 33 events processed so far <<<===
+AthenaHiveEventLoopMgr 33 0 INFO ===>>> done processing event #1141197, run #204073 on slot 0, 34 events processed so far <<<===
+AthenaHiveEventLoopMgr 34 1 INFO ===>>> done processing event #1140039, run #204073 on slot 1, 35 events processed so far <<<===
+AthenaHiveEventLoopMgr 37 0 INFO ===>>> start processing event #1139958, run #204073 on slot 0, 35 events processed so far <<<===
+AthenaHiveEventLoopMgr 38 1 INFO ===>>> start processing event #1143765, run #204073 on slot 1, 35 events processed so far <<<===
+AthenaHiveEventLoopMgr 35 2 INFO ===>>> done processing event #1142531, run #204073 on slot 2, 36 events processed so far <<<===
+AthenaHiveEventLoopMgr 36 3 INFO ===>>> done processing event #1139475, run #204073 on slot 3, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 39 2 INFO ===>>> start processing event #1143097, run #204073 on slot 2, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 40 3 INFO ===>>> start processing event #1134147, run #204073 on slot 3, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 37 0 INFO ===>>> done processing event #1139958, run #204073 on slot 0, 38 events processed so far <<<===
+AthenaHiveEventLoopMgr 38 1 INFO ===>>> done processing event #1143765, run #204073 on slot 1, 39 events processed so far <<<===
+AthenaHiveEventLoopMgr 41 0 INFO ===>>> start processing event #1137156, run #204073 on slot 0, 39 events processed so far <<<===
+AthenaHiveEventLoopMgr 42 1 INFO ===>>> start processing event #1136377, run #204073 on slot 1, 39 events processed so far <<<===
+AthenaHiveEventLoopMgr 39 2 INFO ===>>> done processing event #1143097, run #204073 on slot 2, 40 events processed so far <<<===
+AthenaHiveEventLoopMgr 40 3 INFO ===>>> done processing event #1134147, run #204073 on slot 3, 41 events processed so far <<<===
+AthenaHiveEventLoopMgr 43 2 INFO ===>>> start processing event #1137842, run #204073 on slot 2, 41 events processed so far <<<===
+AthenaHiveEventLoopMgr 44 3 INFO ===>>> start processing event #1141705, run #204073 on slot 3, 41 events processed so far <<<===
+AthenaHiveEventLoopMgr 41 0 INFO ===>>> done processing event #1137156, run #204073 on slot 0, 42 events processed so far <<<===
+AthenaHiveEventLoopMgr 42 1 INFO ===>>> done processing event #1136377, run #204073 on slot 1, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 45 0 INFO ===>>> start processing event #1143410, run #204073 on slot 0, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 46 1 INFO ===>>> start processing event #1144170, run #204073 on slot 1, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 43 2 INFO ===>>> done processing event #1137842, run #204073 on slot 2, 44 events processed so far <<<===
+AthenaHiveEventLoopMgr 44 3 INFO ===>>> done processing event #1141705, run #204073 on slot 3, 45 events processed so far <<<===
+AthenaHiveEventLoopMgr 47 2 INFO ===>>> start processing event #1145987, run #204073 on slot 2, 45 events processed so far <<<===
+AthenaHiveEventLoopMgr 48 3 INFO ===>>> start processing event #1145633, run #204073 on slot 3, 45 events processed so far <<<===
+AthenaHiveEventLoopMgr 45 0 INFO ===>>> done processing event #1143410, run #204073 on slot 0, 46 events processed so far <<<===
+AthenaHiveEventLoopMgr 46 1 INFO ===>>> done processing event #1144170, run #204073 on slot 1, 47 events processed so far <<<===
+AthenaHiveEventLoopMgr 49 0 INFO ===>>> start processing event #1135005, run #204073 on slot 0, 47 events processed so far <<<===
+AthenaHiveEventLoopMgr 50 1 INFO ===>>> start processing event #1142167, run #204073 on slot 1, 47 events processed so far <<<===
+AthenaHiveEventLoopMgr 47 2 INFO ===>>> done processing event #1145987, run #204073 on slot 2, 48 events processed so far <<<===
+AthenaHiveEventLoopMgr 48 3 INFO ===>>> done processing event #1145633, run #204073 on slot 3, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 51 2 INFO ===>>> start processing event #1144646, run #204073 on slot 2, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 52 3 INFO ===>>> start processing event #1145027, run #204073 on slot 3, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 49 0 INFO ===>>> done processing event #1135005, run #204073 on slot 0, 50 events processed so far <<<===
+AthenaHiveEventLoopMgr 50 1 INFO ===>>> done processing event #1142167, run #204073 on slot 1, 51 events processed so far <<<===
+AthenaHiveEventLoopMgr 53 0 INFO ===>>> start processing event #1144112, run #204073 on slot 0, 51 events processed so far <<<===
+AthenaHiveEventLoopMgr 54 1 INFO ===>>> start processing event #1138485, run #204073 on slot 1, 51 events processed so far <<<===
+AthenaHiveEventLoopMgr 51 2 INFO ===>>> done processing event #1144646, run #204073 on slot 2, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 52 3 INFO ===>>> done processing event #1145027, run #204073 on slot 3, 53 events processed so far <<<===
+AthenaHiveEventLoopMgr 55 2 INFO ===>>> start processing event #1144565, run #204073 on slot 2, 53 events processed so far <<<===
+AthenaHiveEventLoopMgr 56 3 INFO ===>>> start processing event #1139498, run #204073 on slot 3, 53 events processed so far <<<===
+AthenaHiveEventLoopMgr 53 0 INFO ===>>> done processing event #1144112, run #204073 on slot 0, 54 events processed so far <<<===
+AthenaHiveEventLoopMgr 54 1 INFO ===>>> done processing event #1138485, run #204073 on slot 1, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 57 0 INFO ===>>> start processing event #1136546, run #204073 on slot 0, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 58 1 INFO ===>>> start processing event #1143799, run #204073 on slot 1, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 55 2 INFO ===>>> done processing event #1144565, run #204073 on slot 2, 56 events processed so far <<<===
+AthenaHiveEventLoopMgr 56 3 INFO ===>>> done processing event #1139498, run #204073 on slot 3, 57 events processed so far <<<===
+AthenaHiveEventLoopMgr 59 2 INFO ===>>> start processing event #1142877, run #204073 on slot 2, 57 events processed so far <<<===
+AthenaHiveEventLoopMgr 60 3 INFO ===>>> start processing event #1149894, run #204073 on slot 3, 57 events processed so far <<<===
+AthenaHiveEventLoopMgr 57 0 INFO ===>>> done processing event #1136546, run #204073 on slot 0, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 58 1 INFO ===>>> done processing event #1143799, run #204073 on slot 1, 59 events processed so far <<<===
+AthenaHiveEventLoopMgr 61 0 INFO ===>>> start processing event #1145364, run #204073 on slot 0, 59 events processed so far <<<===
+AthenaHiveEventLoopMgr 62 1 INFO ===>>> start processing event #1143770, run #204073 on slot 1, 59 events processed so far <<<===
+AthenaHiveEventLoopMgr 59 2 INFO ===>>> done processing event #1142877, run #204073 on slot 2, 60 events processed so far <<<===
+AthenaHiveEventLoopMgr 60 3 INFO ===>>> done processing event #1149894, run #204073 on slot 3, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 63 2 INFO ===>>> start processing event #1148361, run #204073 on slot 2, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 64 3 INFO ===>>> start processing event #1148167, run #204073 on slot 3, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 61 0 INFO ===>>> done processing event #1145364, run #204073 on slot 0, 62 events processed so far <<<===
+AthenaHiveEventLoopMgr 62 1 INFO ===>>> done processing event #1143770, run #204073 on slot 1, 63 events processed so far <<<===
+AthenaHiveEventLoopMgr 65 0 INFO ===>>> start processing event #1138948, run #204073 on slot 0, 63 events processed so far <<<===
+AthenaHiveEventLoopMgr 66 1 INFO ===>>> start processing event #1144808, run #204073 on slot 1, 63 events processed so far <<<===
+AthenaHiveEventLoopMgr 63 2 INFO ===>>> done processing event #1148361, run #204073 on slot 2, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 64 3 INFO ===>>> done processing event #1148167, run #204073 on slot 3, 65 events processed so far <<<===
+AthenaHiveEventLoopMgr 67 2 INFO ===>>> start processing event #1145832, run #204073 on slot 2, 65 events processed so far <<<===
+AthenaHiveEventLoopMgr 68 3 INFO ===>>> start processing event #1153100, run #204073 on slot 3, 65 events processed so far <<<===
+AthenaHiveEventLoopMgr 65 0 INFO ===>>> done processing event #1138948, run #204073 on slot 0, 66 events processed so far <<<===
+AthenaHiveEventLoopMgr 66 1 INFO ===>>> done processing event #1144808, run #204073 on slot 1, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 69 0 INFO ===>>> start processing event #1142524, run #204073 on slot 0, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 70 1 INFO ===>>> start processing event #1138294, run #204073 on slot 1, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 67 2 INFO ===>>> done processing event #1145832, run #204073 on slot 2, 68 events processed so far <<<===
+AthenaHiveEventLoopMgr 68 3 INFO ===>>> done processing event #1153100, run #204073 on slot 3, 69 events processed so far <<<===
+AthenaHiveEventLoopMgr 71 2 INFO ===>>> start processing event #1138350, run #204073 on slot 2, 69 events processed so far <<<===
+AthenaHiveEventLoopMgr 72 3 INFO ===>>> start processing event #1149424, run #204073 on slot 3, 69 events processed so far <<<===
+AthenaHiveEventLoopMgr 69 0 INFO ===>>> done processing event #1142524, run #204073 on slot 0, 70 events processed so far <<<===
+AthenaHiveEventLoopMgr 70 1 INFO ===>>> done processing event #1138294, run #204073 on slot 1, 71 events processed so far <<<===
+AthenaHiveEventLoopMgr 73 0 INFO ===>>> start processing event #1151102, run #204073 on slot 0, 71 events processed so far <<<===
+AthenaHiveEventLoopMgr 74 1 INFO ===>>> start processing event #1152242, run #204073 on slot 1, 71 events processed so far <<<===
+AthenaHiveEventLoopMgr 71 2 INFO ===>>> done processing event #1138350, run #204073 on slot 2, 72 events processed so far <<<===
+AthenaHiveEventLoopMgr 72 3 INFO ===>>> done processing event #1149424, run #204073 on slot 3, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 75 2 INFO ===>>> start processing event #1148416, run #204073 on slot 2, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 76 3 INFO ===>>> start processing event #1142753, run #204073 on slot 3, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 73 0 INFO ===>>> done processing event #1151102, run #204073 on slot 0, 74 events processed so far <<<===
+AthenaHiveEventLoopMgr 74 1 INFO ===>>> done processing event #1152242, run #204073 on slot 1, 75 events processed so far <<<===
+AthenaHiveEventLoopMgr 77 0 INFO ===>>> start processing event #1149997, run #204073 on slot 0, 75 events processed so far <<<===
+AthenaHiveEventLoopMgr 78 1 INFO ===>>> start processing event #1151617, run #204073 on slot 1, 75 events processed so far <<<===
+AthenaHiveEventLoopMgr 75 2 INFO ===>>> done processing event #1148416, run #204073 on slot 2, 76 events processed so far <<<===
+AthenaHiveEventLoopMgr 76 3 INFO ===>>> done processing event #1142753, run #204073 on slot 3, 77 events processed so far <<<===
+AthenaHiveEventLoopMgr 79 2 INFO ===>>> start processing event #1149794, run #204073 on slot 2, 77 events processed so far <<<===
+AthenaHiveEventLoopMgr 80 3 INFO ===>>> start processing event #1152504, run #204073 on slot 3, 77 events processed so far <<<===
+AthenaHiveEventLoopMgr 77 0 INFO ===>>> done processing event #1149997, run #204073 on slot 0, 78 events processed so far <<<===
+AthenaHiveEventLoopMgr 78 1 INFO ===>>> done processing event #1151617, run #204073 on slot 1, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 81 0 INFO ===>>> start processing event #1142485, run #204073 on slot 0, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 82 1 INFO ===>>> start processing event #1151364, run #204073 on slot 1, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 79 2 INFO ===>>> done processing event #1149794, run #204073 on slot 2, 80 events processed so far <<<===
+AthenaHiveEventLoopMgr 80 3 INFO ===>>> done processing event #1152504, run #204073 on slot 3, 81 events processed so far <<<===
+AthenaHiveEventLoopMgr 83 2 INFO ===>>> start processing event #1143901, run #204073 on slot 2, 81 events processed so far <<<===
+AthenaHiveEventLoopMgr 84 3 INFO ===>>> start processing event #1153979, run #204073 on slot 3, 81 events processed so far <<<===
+AthenaHiveEventLoopMgr 81 0 INFO ===>>> done processing event #1142485, run #204073 on slot 0, 82 events processed so far <<<===
+AthenaHiveEventLoopMgr 82 1 INFO ===>>> done processing event #1151364, run #204073 on slot 1, 83 events processed so far <<<===
+AthenaHiveEventLoopMgr 85 0 INFO ===>>> start processing event #1150212, run #204073 on slot 0, 83 events processed so far <<<===
+AthenaHiveEventLoopMgr 86 1 INFO ===>>> start processing event #1152633, run #204073 on slot 1, 83 events processed so far <<<===
+AthenaHiveEventLoopMgr 83 2 INFO ===>>> done processing event #1143901, run #204073 on slot 2, 84 events processed so far <<<===
+AthenaHiveEventLoopMgr 84 3 INFO ===>>> done processing event #1153979, run #204073 on slot 3, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 87 2 INFO ===>>> start processing event #1155482, run #204073 on slot 2, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 88 3 INFO ===>>> start processing event #1150472, run #204073 on slot 3, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 85 0 INFO ===>>> done processing event #1150212, run #204073 on slot 0, 86 events processed so far <<<===
+AthenaHiveEventLoopMgr 86 1 INFO ===>>> done processing event #1152633, run #204073 on slot 1, 87 events processed so far <<<===
+AthenaHiveEventLoopMgr 89 0 INFO ===>>> start processing event #1140275, run #204073 on slot 0, 87 events processed so far <<<===
+AthenaHiveEventLoopMgr 90 1 INFO ===>>> start processing event #1145882, run #204073 on slot 1, 87 events processed so far <<<===
+AthenaHiveEventLoopMgr 87 2 INFO ===>>> done processing event #1155482, run #204073 on slot 2, 88 events processed so far <<<===
+AthenaHiveEventLoopMgr 88 3 INFO ===>>> done processing event #1150472, run #204073 on slot 3, 89 events processed so far <<<===
+AthenaHiveEventLoopMgr 91 2 INFO ===>>> start processing event #1151732, run #204073 on slot 2, 89 events processed so far <<<===
+AthenaHiveEventLoopMgr 92 3 INFO ===>>> start processing event #1137896, run #204073 on slot 3, 89 events processed so far <<<===
+AthenaHiveEventLoopMgr 89 0 INFO ===>>> done processing event #1140275, run #204073 on slot 0, 90 events processed so far <<<===
+AthenaHiveEventLoopMgr 90 1 INFO ===>>> done processing event #1145882, run #204073 on slot 1, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 93 0 INFO ===>>> start processing event #1156381, run #204073 on slot 0, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 94 1 INFO ===>>> start processing event #1149161, run #204073 on slot 1, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 91 2 INFO ===>>> done processing event #1151732, run #204073 on slot 2, 92 events processed so far <<<===
+AthenaHiveEventLoopMgr 92 3 INFO ===>>> done processing event #1137896, run #204073 on slot 3, 93 events processed so far <<<===
+AthenaHiveEventLoopMgr 95 2 INFO ===>>> start processing event #1153794, run #204073 on slot 2, 93 events processed so far <<<===
+AthenaHiveEventLoopMgr 96 3 INFO ===>>> start processing event #1151312, run #204073 on slot 3, 93 events processed so far <<<===
+AthenaHiveEventLoopMgr 93 0 INFO ===>>> done processing event #1156381, run #204073 on slot 0, 94 events processed so far <<<===
+AthenaHiveEventLoopMgr 94 1 INFO ===>>> done processing event #1149161, run #204073 on slot 1, 95 events processed so far <<<===
+AthenaHiveEventLoopMgr 97 0 INFO ===>>> start processing event #1148893, run #204073 on slot 0, 95 events processed so far <<<===
+AthenaHiveEventLoopMgr 98 1 INFO ===>>> start processing event #1156938, run #204073 on slot 1, 95 events processed so far <<<===
+AthenaHiveEventLoopMgr 95 2 INFO ===>>> done processing event #1153794, run #204073 on slot 2, 96 events processed so far <<<===
+AthenaHiveEventLoopMgr 96 3 INFO ===>>> done processing event #1151312, run #204073 on slot 3, 97 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 2 INFO ===>>> start processing event #1156351, run #204073 on slot 2, 97 events processed so far <<<===
+AthenaHiveEventLoopMgr 97 0 INFO ===>>> done processing event #1148893, run #204073 on slot 0, 98 events processed so far <<<===
+AthenaHiveEventLoopMgr 98 1 INFO ===>>> done processing event #1156938, run #204073 on slot 1, 99 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 2 INFO ===>>> done processing event #1156351, run #204073 on slot 2, 100 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 2 INFO ---> Loop Finished (seconds): 5.43728
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
+SGInputLoader INFO Finalizing SGInputLoader...
+Finalizer INFO Finalizing Finalizer...
Finalize: compared 20 dumps
+CondInputLoader INFO Finalizing CondInputLoader...
+AvalancheSchedulerSvc INFO Joining Scheduler thread
+PyComponentMgr INFO Finalizing PyComponentMgr...
+EventDataSvc INFO Finalizing EventDataSvc
IdDictDetDescrCnv INFO in finalize
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.02 ))s
+IOVDbSvc INFO bytes in (( 0.06 ))s
+IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.06 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 1 nFolders: 11 ReadTime: (( 0.00 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
+ToolSvc.TileRawChannelContByteStreamTool INFO Finalizing TileRawChannelContByteStreamTool successfuly
+ToolSvc.TileROD_Decoder.TileL2Builder INFO Finalizing
ToolSvc.ByteStreamMetadataTool INFO in finalize()
*****Chrono***** INFO ****************************************************************************************************
+*****Chrono***** INFO WARNING: MT job; statistics are unreliable
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
+cObjR_ALL INFO Time User : Tot= 150 [ms] Ave/Min/Max= 75(+- 65)/ 10/ 140 [ms] #= 2
+cObj_ALL INFO Time User : Tot= 200 [ms] Ave/Min/Max= 100(+- 70)/ 30/ 170 [ms] #= 2
+ChronoStatSvc INFO Time User : Tot= 14.6 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.finalize() INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
--
GitLab
From 9434e012d74991a04a3773e27725b8d201fe5fe2 Mon Sep 17 00:00:00 2001
From: Vakho Tsulaia <vakhtang.tsulaia@cern.ch>
Date: Sun, 22 Aug 2021 07:13:37 +0200
Subject: [PATCH 220/272] Updated ATLAS_REFERENCE_TAG for the CaloTowerBuilder
ctest
---
Calorimeter/CaloUtils/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Calorimeter/CaloUtils/CMakeLists.txt b/Calorimeter/CaloUtils/CMakeLists.txt
index 7fadb490c86c..9ddd5c3e55d6 100644
--- a/Calorimeter/CaloUtils/CMakeLists.txt
+++ b/Calorimeter/CaloUtils/CMakeLists.txt
@@ -60,7 +60,7 @@ atlas_add_test( CaloTowerStore_test
atlas_add_test( CaloTowerBuilderTool_test
SCRIPT test/CaloTowerBuilderTool_test.sh
LOG_IGNORE_PATTERN "Reading file|Unable to locate catalog|Cache alignment|IOVDbSvc +INFO|INFO Initializing"
- ENVIRONMENT "ATLAS_REFERENCE_TAG=CaloUtils/CaloUtils-01-00-13"
+ ENVIRONMENT "ATLAS_REFERENCE_TAG=CaloUtils/CaloUtils-01-00-15"
PROPERTIES TIMEOUT 500 )
atlas_add_test( ToolWithConstants_test
--
GitLab
From 872d19df26edcca96efebd1c4f97ae03dad7fd52 Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Sun, 22 Aug 2021 23:11:58 +0200
Subject: [PATCH 221/272] egammaSuperClusterBuilder make some simple helpels
simple functions in an anonymous namespace
---
.../src/egammaSuperClusterBuilderBase.cxx | 222 +++++++++---------
.../src/egammaSuperClusterBuilderBase.h | 22 --
2 files changed, 109 insertions(+), 135 deletions(-)
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilderBase.cxx b/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilderBase.cxx
index 61837fe02760..a5c9b5563aea 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilderBase.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilderBase.cxx
@@ -100,6 +100,113 @@ etaphi_range(const CaloDetDescrManager& dd_man,
dphi = 2 * std::max(dphi_l, dphi_r);
}
+/** Function to decorate the calo cluster with position variables.
+ * Filling eta phi in calo-frame:
+ * - xAOD::CaloCluster::ETACALOFRAME
+ * - xAOD::CaloCluster::PHICALOFRAME
+ * - xAOD::CaloCluster::ETA2CALOFRAME
+ * - xAOD::CaloCluster::PHI2CALOFRAME
+ * - xAOD::CaloCluster::ETA1CALOFRAME
+ * - xAOD::CaloCluster::PHI1CALOFRAME
+ */
+
+void
+fillPositionsInCalo(xAOD::CaloCluster* cluster, const CaloDetDescrManager& mgr)
+{
+ const bool isBarrel = xAOD::EgammaHelpers::isBarrel(cluster);
+ CaloCell_ID::CaloSample sample =
+ isBarrel ? CaloCell_ID::EMB2 : CaloCell_ID::EME2;
+ // eta and phi of the cluster in the calorimeter frame
+ double eta;
+ double phi;
+ CaloCellDetPos::getDetPosition(
+ mgr, sample, cluster->eta(), cluster->phi(), eta, phi);
+ cluster->insertMoment(xAOD::CaloCluster::ETACALOFRAME, eta);
+ cluster->insertMoment(xAOD::CaloCluster::PHICALOFRAME, phi);
+ // eta in the second sampling
+ CaloCellDetPos::getDetPosition(
+ mgr, sample, cluster->etaBE(2), cluster->phiBE(2), eta, phi);
+ cluster->insertMoment(xAOD::CaloCluster::ETA2CALOFRAME, eta);
+ cluster->insertMoment(xAOD::CaloCluster::PHI2CALOFRAME, phi);
+ // eta in the first sampling
+ sample = isBarrel ? CaloCell_ID::EMB1 : CaloCell_ID::EME1;
+ CaloCellDetPos::getDetPosition(
+ mgr, sample, cluster->etaBE(1), cluster->phiBE(1), eta, phi);
+ cluster->insertMoment(xAOD::CaloCluster::ETA1CALOFRAME, eta);
+ cluster->insertMoment(xAOD::CaloCluster::PHI1CALOFRAME, phi);
+}
+
+/** functions to make 1st sampling (strips) specific corrections*/
+void
+makeCorrection1(xAOD::CaloCluster* cluster,
+ const CaloDetDescrManager& mgr,
+ const CaloSampling::CaloSample sample)
+{
+ // Protections.
+ if (cluster->etamax(sample) == -999. || cluster->phimax(sample) == -999.) {
+ return;
+ }
+ if (std::abs(cluster->etamax(sample)) < 1E-6 &&
+ std::abs(cluster->phimax(sample)) < 1E-6) {
+ return;
+ }
+ // Get the hottest in raw co-ordinates
+ // We have two kinds of enums ...
+ CaloCell_ID::CaloSample xsample =
+ (sample == CaloSampling::EMB1) ? CaloCell_ID::EMB1 : CaloCell_ID::EME1;
+ //
+ const CaloDetDescrElement* dde =
+ mgr.get_element(xsample, cluster->etamax(sample), cluster->phimax(sample));
+ if (!dde) {
+ return;
+ }
+ //
+ double etamax = dde->eta_raw();
+ double phimax = dde->phi_raw();
+ // now Locate the +-1 range
+ double detastr(-999);
+ double dphistr(-999);
+ // Raw co-ordinates used here
+ etaphi_range(mgr, etamax, phimax, xsample, detastr, dphistr);
+ //
+ // Given the range refine the position employing the smaller window
+ if (detastr > 0 && dphistr > 0) {
+ CaloLayerCalculator helper;
+ const auto* const cellLink = cluster->getCellLinks();
+ helper.fill(cellLink->begin(),
+ cellLink->end(),
+ etamax,
+ phimax,
+ detastr,
+ dphistr,
+ sample);
+
+ // Here is where we (re-)fill the eta in the 1st sampling
+ if (helper.etam() != -999.) {
+ // This is "real" atlas co-ordinates
+ cluster->setEta(sample, helper.etam());
+ }
+ }
+}
+
+/** function to refine position in eta1*/
+void
+refineEta1Position(xAOD::CaloCluster* cluster, const CaloDetDescrManager& mgr)
+{
+ // This only makes sense if we have cells there
+ if (!cluster->hasSampling(CaloSampling::EMB1) &&
+ !cluster->hasSampling(CaloSampling::EME1)) {
+ return;
+ }
+ // Now calculare the position using cells in barrel or endcap or both
+ const double aeta = std::abs(cluster->etaBE(2));
+ if (aeta < 1.6 && cluster->hasSampling(CaloSampling::EMB1)) {
+ makeCorrection1(cluster, mgr, CaloSampling::EMB1);
+ }
+ if (aeta > 1.3 && cluster->hasSampling(CaloSampling::EME1)) {
+ makeCorrection1(cluster, mgr, CaloSampling::EME1);
+ }
+}
/** Find the reference position (eta, phi) relative to which cells are
restricted.
*/
@@ -612,7 +719,7 @@ egammaSuperClusterBuilderBase::calibrateCluster(
const xAOD::EgammaParameters::EgammaType egType) const
{
- ATH_CHECK(refineEta1Position(newCluster, mgr));
+ refineEta1Position(newCluster, mgr);
// Save the state before the corrections
newCluster->setAltE(newCluster->e());
newCluster->setAltEta(newCluster->eta());
@@ -624,123 +731,12 @@ egammaSuperClusterBuilderBase::calibrateCluster(
newCluster->setRawEta(newCluster->eta());
newCluster->setRawPhi(newCluster->phi());
//
- ATH_CHECK(fillPositionsInCalo(newCluster, mgr));
+ fillPositionsInCalo(newCluster, mgr);
ATH_CHECK(m_MVACalibSvc->execute(*newCluster, egType));
return StatusCode::SUCCESS;
}
-StatusCode
-egammaSuperClusterBuilderBase::fillPositionsInCalo(
- xAOD::CaloCluster* cluster,
- const CaloDetDescrManager& mgr) const
-{
- const bool isBarrel = xAOD::EgammaHelpers::isBarrel(cluster);
- CaloCell_ID::CaloSample sample =
- isBarrel ? CaloCell_ID::EMB2 : CaloCell_ID::EME2;
- // eta and phi of the cluster in the calorimeter frame
- double eta;
- double phi;
- m_caloCellDetPos.getDetPosition(
- mgr, sample, cluster->eta(), cluster->phi(), eta, phi);
- cluster->insertMoment(xAOD::CaloCluster::ETACALOFRAME, eta);
- cluster->insertMoment(xAOD::CaloCluster::PHICALOFRAME, phi);
- // eta in the second sampling
- m_caloCellDetPos.getDetPosition(
- mgr, sample, cluster->etaBE(2), cluster->phiBE(2), eta, phi);
- cluster->insertMoment(xAOD::CaloCluster::ETA2CALOFRAME, eta);
- cluster->insertMoment(xAOD::CaloCluster::PHI2CALOFRAME, phi);
- // eta in the first sampling
- sample = isBarrel ? CaloCell_ID::EMB1 : CaloCell_ID::EME1;
- m_caloCellDetPos.getDetPosition(
- mgr, sample, cluster->etaBE(1), cluster->phiBE(1), eta, phi);
- cluster->insertMoment(xAOD::CaloCluster::ETA1CALOFRAME, eta);
- cluster->insertMoment(xAOD::CaloCluster::PHI1CALOFRAME, phi);
-
- return StatusCode::SUCCESS;
-}
-
-StatusCode
-egammaSuperClusterBuilderBase::refineEta1Position(
- xAOD::CaloCluster* cluster,
- const CaloDetDescrManager& mgr) const
-{
-
- // This only makes sense if we have cells there
- if (!cluster->hasSampling(CaloSampling::EMB1) &&
- !cluster->hasSampling(CaloSampling::EME1)) {
- return StatusCode::SUCCESS;
- }
- // Now calculare the position using cells in barrel or endcap or both
- const double aeta = std::abs(cluster->etaBE(2));
- if (aeta < 1.6 && cluster->hasSampling(CaloSampling::EMB1)) {
- ATH_CHECK(makeCorrection1(cluster, mgr, CaloSampling::EMB1));
- }
- if (aeta > 1.3 && cluster->hasSampling(CaloSampling::EME1)) {
- ATH_CHECK(makeCorrection1(cluster, mgr, CaloSampling::EME1));
- }
- return StatusCode::SUCCESS;
-}
-
-StatusCode
-egammaSuperClusterBuilderBase::makeCorrection1(
- xAOD::CaloCluster* cluster,
- const CaloDetDescrManager& mgr,
- const CaloSampling::CaloSample sample) const
-{
- // Protections.
- if (cluster->etamax(sample) == -999. || cluster->phimax(sample) == -999.) {
- return StatusCode::SUCCESS;
- }
- if (std::abs(cluster->etamax(sample)) < 1E-6 &&
- std::abs(cluster->phimax(sample)) < 1E-6) {
- return StatusCode::SUCCESS;
- }
- // Get the hottest in raw co-ordinates
- // We have two kinds of enums ...
- CaloCell_ID::CaloSample xsample =
- (sample == CaloSampling::EMB1) ? CaloCell_ID::EMB1 : CaloCell_ID::EME1;
- //
- const CaloDetDescrElement* dde =
- mgr.get_element(xsample, cluster->etamax(sample), cluster->phimax(sample));
- if (!dde) {
- ATH_MSG_WARNING("Couldn't get CaloDetDescrElement from mgr for: "
- "cluster->etamax(sample): "
- << cluster->etamax(sample)
- << " cluster->phimax(sample): " << cluster->phimax(sample)
- << " will not refine the position in layer1");
- return StatusCode::SUCCESS;
- }
- //
- double etamax = dde->eta_raw();
- double phimax = dde->phi_raw();
- // now Locate the +-1 range
- double detastr(-999);
- double dphistr(-999);
- // Raw co-ordinates used here
- etaphi_range(mgr, etamax, phimax, xsample, detastr, dphistr);
- //
- // Given the range refine the position employing the smaller window
- if (detastr > 0 && dphistr > 0) {
- CaloLayerCalculator helper;
- const auto* const cellLink = cluster->getCellLinks();
- helper.fill(cellLink->begin(),
- cellLink->end(),
- etamax,
- phimax,
- detastr,
- dphistr,
- sample);
-
- // Here is where we (re-)fill the eta in the 1st sampling
- if (helper.etam() != -999.) {
- // This is "real" atlas co-ordinates
- cluster->setEta(sample, helper.etam());
- }
- }
- return StatusCode::SUCCESS;
-}
-
egammaSuperClusterBuilderBase::PhiSize
egammaSuperClusterBuilderBase::findPhiSize(
const egammaSuperClusterBuilderBase::CentralPosition& cp0,
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilderBase.h b/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilderBase.h
index d8a41c85ed87..1d10b2ff0e8c 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilderBase.h
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilderBase.h
@@ -230,25 +230,6 @@ private:
const CaloDetDescrManager& mgr,
const xAOD::EgammaParameters::EgammaType egType) const;
- /** Function to decorate the calo cluster with position variables.
- * Filling eta phi in calo-frame:
- * - xAOD::CaloCluster::ETACALOFRAME
- * - xAOD::CaloCluster::PHICALOFRAME
- * - xAOD::CaloCluster::ETA2CALOFRAME
- * - xAOD::CaloCluster::PHI2CALOFRAME
- * - xAOD::CaloCluster::ETA1CALOFRAME
- * - xAOD::CaloCluster::PHI1CALOFRAME
- */
- StatusCode fillPositionsInCalo(xAOD::CaloCluster* cluster,
- const CaloDetDescrManager& mgr) const;
-
- /** functions to refine position in eta1*/
- StatusCode refineEta1Position(xAOD::CaloCluster* cluster,
- const CaloDetDescrManager& mgr) const;
- StatusCode makeCorrection1(xAOD::CaloCluster* cluster,
- const CaloDetDescrManager& mgr,
- const CaloSampling::CaloSample sample) const;
-
// window values for the windows
// in which cells of topoclusters are added
// half of addCells window size, converted in units of eta/phi
@@ -259,9 +240,6 @@ private:
// Extra opening in eta for L3 cells
float m_extraL3EtaSize;
- /** @brief Position in Calo frame**/
- CaloCellDetPos m_caloCellDetPos;
-
/** @brief Size of topocluster search window in eta for the barrel */
Gaudi::Property<int> m_searchWindowEtaCellsBarrel{
this,
--
GitLab
From c4f031244bc4f8bd1fe5d8f42e3f4f1456f5312a Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Sun, 22 Aug 2021 23:14:36 +0200
Subject: [PATCH 222/272] ATLASRECTS-6562 rm unused not thread safe overload of
setBinUtility
---
Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/Layer.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/Layer.h b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/Layer.h
index 16987e4256de..4952d608c8bc 100644
--- a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/Layer.h
+++ b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/Layer.h
@@ -172,8 +172,6 @@ class Layer {
const BinUtility* binUtility() const;
/** set the BinUtility*/
void setBinUtility(const BinUtility*);
- /** set the BinUtility const not const thread safe*/
- void setBinUtility ATLAS_NOT_THREAD_SAFE(const BinUtility*) const;
/** Surface seen on approach - if not defined differently, it is the
* surfaceRepresentation() */
--
GitLab
From 33bcf47f6062fe034cd6eb3a226afa62dc398067 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Mon, 23 Aug 2021 09:47:26 +0200
Subject: [PATCH 223/272] DecisionHandling+TriggerMenuMT: Fix control flow DOT
graph generation
Fix DOT graph generation and related unit test failure (ATR-24043). Also
update unit test definition to use `PRIVATE_WORKING_DIRECTORY`.
---
Trigger/TrigSteer/DecisionHandling/CMakeLists.txt | 12 +++---------
.../python/HLTMenuConfig/Menu/HLTCFDot.py | 6 +++---
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/Trigger/TrigSteer/DecisionHandling/CMakeLists.txt b/Trigger/TrigSteer/DecisionHandling/CMakeLists.txt
index c333a0133a36..7c7509139fe4 100644
--- a/Trigger/TrigSteer/DecisionHandling/CMakeLists.txt
+++ b/Trigger/TrigSteer/DecisionHandling/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( DecisionHandling )
@@ -33,20 +33,14 @@ atlas_add_component( DecisionHandling
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
atlas_install_data( share/*.ref)
-
atlas_install_scripts( test/test_emu_step_menu_processing.sh )
-
-
+# Tests
foreach(test emu_step_processing emu_step_menu_processing)
- set( rundir ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_${test} )
- file( REMOVE_RECURSE ${rundir} )
- file( MAKE_DIRECTORY ${rundir} )
atlas_add_test( ${test}
SCRIPT test/test_${test}.sh
LOG_SELECT_PATTERN "TrigSignatureMoni.*INFO HLT_.*|TrigSignatureMoni.*-- #[0-9]+ (Events|Features).*|TriggerSummaryStep.* chains passed:|TriggerSummaryStep.*+++ HLT_.*|TriggerSummaryStep.*+++ leg.*"
- PROPERTIES WORKING_DIRECTORY ${rundir}
- )
+ PRIVATE_WORKING_DIRECTORY )
endforeach()
atlas_add_test( test_ComboHypoTool
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFDot.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFDot.py
index ed3f0d215ca5..35c7ae217d80 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFDot.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFDot.py
@@ -14,9 +14,9 @@ DrawHypoTools=True
def drawHypoTools(file, all_hypos):
all_hypos=list(set(all_hypos))
for hp in all_hypos:
- for hypotool in hp.tools:
- file.write(" %s[fillcolor=yellow,style=filled,shape= Mdiamond]\n"%(hypotool))
- file.write(" %s -> %s [style=dashed, color=grey]\n"%(compName(hp.Alg), hypotool))
+ for hypotool in hp.Alg.HypoTools:
+ file.write(" %s[fillcolor=yellow,style=filled,shape= Mdiamond]\n" % hypotool.getName())
+ file.write(" %s -> %s [style=dashed, color=grey]\n"%(compName(hp.Alg), hypotool.getName()))
def stepCF_ControlFlow_to_dot(stepCF):
--
GitLab
From 711e6b375495c02ad5fa996acf13c5beecda59a2 Mon Sep 17 00:00:00 2001
From: Petr Balek <petr.balek@cern.ch>
Date: Mon, 23 Aug 2021 12:06:13 +0200
Subject: [PATCH 224/272] updated python script
---
.../scripts/AFPLocalAlignDBCreate.py | 54 +++++++++++++------
1 file changed, 38 insertions(+), 16 deletions(-)
diff --git a/ForwardDetectors/AFP/AFP_DBTools/scripts/AFPLocalAlignDBCreate.py b/ForwardDetectors/AFP/AFP_DBTools/scripts/AFPLocalAlignDBCreate.py
index 8c36fceca8d2..bca8ecdcf634 100644
--- a/ForwardDetectors/AFP/AFP_DBTools/scripts/AFPLocalAlignDBCreate.py
+++ b/ForwardDetectors/AFP/AFP_DBTools/scripts/AFPLocalAlignDBCreate.py
@@ -180,8 +180,9 @@ def main():
print ("Created database", dbString)
# define the folder in the database, its specification and its tag
- folderBlkLoc=makeFolderAndSpec(db,folderName="/FWD/Onl/AFP/Align/Local", tag="AFPAlignLoc-01")
- folderBlkGlob=makeFolderAndSpec(db,folderName="/FWD/Onl/AFP/Align/Global", tag="AFPAlignGlob-01")
+ folderBlkLoc_01=makeFolderAndSpec(db,folderName="/FWD/Onl/AFP/Align/Local", tag="AFPAlignLoc-01")
+ folderBlkLoc_02=makeFolderAndSpec(db,folderName="/FWD/Onl/AFP/Align/Local", tag="AFPAlignLoc-02")
+ folderBlkGlob_01=makeFolderAndSpec(db,folderName="/FWD/Onl/AFP/Align/Global", tag="AFPAlignGlob-01")
# copy everything from the xml file here
# https://gitlab.cern.ch/afp/AfpAnalysisToolbox/-/blob/master/AfpAnalysisTools/share/align.xml, commit 3a62232e1e3584704ccbb612f5fdf62821dd6fed from October 10, 2020
@@ -190,12 +191,12 @@ def main():
# save an empty entry, just to have the same ranges in local and global alignments
# fromRun, toRun = 203302, 203302
fromRun = 203302
- myDict = AFPDBDict(folderBlk=folderBlkLoc)
- myDict.savePayload(folderBlk=folderBlkLoc, fromRun=fromRun)
+ myDict = AFPDBDict(folderBlk=folderBlkLoc_01)
+ myDict.savePayload(folderBlk=folderBlkLoc_01, fromRun=fromRun)
# fromRun, toRun = 329484, 348002
fromRun = 329484
- myDict = AFPDBDict(folderBlkLoc)
+ myDict = AFPDBDict(folderBlkLoc_01)
myDict.append(stationID=0, layerID=1, shiftX=17.1871e-3, shiftY=-31.4828e-3, shiftZ=0.0000, alpha=2.8832e-3,beta=0.0000, gamma=0.0000)
myDict.append(stationID=0, layerID=2, shiftX=15.2353e-3, shiftY=-51.4641e-3, shiftZ=0.0000, alpha=3.1571e-3,beta=0.0000, gamma=0.0000)
myDict.append(stationID=0, layerID=3, shiftX=0.0000, shiftY=0.0000, shiftZ=0.0000, alpha=0.0000, beta=0.0000, gamma=0.0000)
@@ -208,21 +209,42 @@ def main():
myDict.append(stationID=3, layerID=1, shiftX=-184.2146e-3,shiftY=55.3273e-3, shiftZ=0.0000, alpha=-0.7655e-3,beta=0.0000, gamma=0.0000)
myDict.append(stationID=3, layerID=2, shiftX=-154.2151e-3,shiftY=133.8304e-3, shiftZ=0.0000, alpha=-3.2126e-3,beta=0.0000, gamma=0.0000)
myDict.append(stationID=3, layerID=3, shiftX=13.2748e-3, shiftY=138.4570e-3, shiftZ=0.0000, alpha=0.5984e-3, beta=0.0000, gamma=0.0000)
- myDict.savePayload(folderBlk=folderBlkLoc, fromRun=fromRun)
+ myDict.savePayload(folderBlk=folderBlkLoc_01, fromRun=fromRun)
+
+ # update July 30, 2021
+ fromRun = 203302
+ myDict = AFPDBDict(folderBlk=folderBlkLoc_02)
+ myDict.savePayload(folderBlk=folderBlkLoc_02, fromRun=fromRun)
+
+ fromRun = 329484
+ myDict = AFPDBDict(folderBlkLoc_02)
+ myDict.append(stationID=0, layerID=1, shiftX=17.1313e-3, shiftY=-46.7438e-3, shiftZ=0.0000, alpha=2.9785e-3, beta=0.0000, gamma=0.0000)
+ myDict.append(stationID=0, layerID=2, shiftX=15.7960e-3, shiftY=-53.7707e-3, shiftZ=0.0000, alpha=3.3048e-3, beta=0.0000, gamma=0.0000)
+ myDict.append(stationID=0, layerID=3, shiftX=0.0000, shiftY=0.0000, shiftZ=0.0000, alpha=0.0000, beta=0.0000, gamma=0.0000)
+ myDict.append(stationID=1, layerID=1, shiftX=138.0070e-3, shiftY=6.0528e-3, shiftZ=0.0000, alpha=-1.4420e-3, beta=0.0000, gamma=0.0000)
+ myDict.append(stationID=1, layerID=2, shiftX=-80.6720e-3, shiftY=24.1310e-3, shiftZ=0.0000, alpha=-3.6605e-3, beta=0.0000, gamma=0.0000)
+ myDict.append(stationID=1, layerID=3, shiftX=-51.5111e-3, shiftY=-32.9151e-3, shiftZ=0.0000, alpha=1.0762e-3, beta=0.0000, gamma=0.0000)
+ myDict.append(stationID=2, layerID=1, shiftX=149.6927e-3, shiftY=103.5674e-3, shiftZ=0.0000, alpha=-3.9565e-3, beta=0.0000, gamma=0.0000)
+ myDict.append(stationID=2, layerID=2, shiftX=144.1316e-3, shiftY=88.0891e-3, shiftZ=0.0000, alpha=3.3219e-3, beta=0.0000, gamma=0.0000)
+ myDict.append(stationID=2, layerID=3, shiftX=47.8090e-3, shiftY=153.5737e-3, shiftZ=0.0000, alpha=5.1961e-3, beta=0.0000, gamma=0.0000)
+ myDict.append(stationID=3, layerID=1, shiftX=0.0000, shiftY=0.0000, shiftZ=0.0000, alpha=0.0000, beta=0.0000, gamma=0.0000)
+ myDict.append(stationID=3, layerID=2, shiftX=-153.0397e-3,shiftY=132.8483e-3, shiftZ=0.0000, alpha=-3.9787e-3, beta=0.0000, gamma=0.0000)
+ myDict.append(stationID=3, layerID=3, shiftX=13.9500e-3, shiftY=136.9500e-3, shiftZ=0.0000, alpha=0.3829e-3, beta=0.0000, gamma=0.0000)
+ myDict.savePayload(folderBlk=folderBlkLoc_02, fromRun=fromRun)
# fromRun, toRun = 203302, 203302
fromRun = 203302
- myDict = AFPDBDict(folderBlk=folderBlkGlob)
+ myDict = AFPDBDict(folderBlk=folderBlkGlob_01)
myDict.append(stationID=0, alignType="RP", shiftX=-2.34, shiftY=-13.22)
myDict.append(stationID=1, alignType="RP", shiftX=-3.68, shiftY=-13.28)
myDict.append(stationID=2, alignType="RP", shiftX=-3.61, shiftY=-10.09)
myDict.append(stationID=3, alignType="RP", shiftX=-2.39, shiftY=-10.53)
- myDict.savePayload(folderBlk=folderBlkGlob, fromRun=fromRun)
+ myDict.savePayload(folderBlk=folderBlkGlob_01, fromRun=fromRun)
# fromRun, toRun = 329484, 330470
fromRun = 329484
- myDict = AFPDBDict(folderBlk=folderBlkGlob)
+ myDict = AFPDBDict(folderBlk=folderBlkGlob_01)
myDict.append(stationID=0, alignType="tracker", shiftX=-0.5)
myDict.append(stationID=1, alignType="tracker", shiftX=-0.5)
myDict.append(stationID=2, alignType="tracker", shiftX=-0.5)
@@ -239,11 +261,11 @@ def main():
myDict.append(stationID=1, alignType="correction", shiftX=-0.320)
myDict.append(stationID=2, alignType="correction", shiftX=-0.220)
myDict.append(stationID=3, alignType="correction", shiftX=-0.320)
- myDict.savePayload(folderBlk=folderBlkGlob, fromRun=fromRun)
+ myDict.savePayload(folderBlk=folderBlkGlob_01, fromRun=fromRun)
# fromRun, toRun = 331020, 335302
fromRun = 331020
- myDict = AFPDBDict(folderBlk=folderBlkGlob)
+ myDict = AFPDBDict(folderBlk=folderBlkGlob_01)
myDict.append(stationID=0, alignType="tracker", shiftX=-0.5)
myDict.append(stationID=1, alignType="tracker", shiftX=-0.5)
myDict.append(stationID=2, alignType="tracker", shiftX=-0.5)
@@ -260,11 +282,11 @@ def main():
myDict.append(stationID=1, alignType="correction", shiftX=-0.320)
myDict.append(stationID=2, alignType="correction", shiftX=-0.220)
myDict.append(stationID=3, alignType="correction", shiftX=-0.320)
- myDict.savePayload(folderBlk=folderBlkGlob, fromRun=fromRun)
+ myDict.savePayload(folderBlk=folderBlkGlob_01, fromRun=fromRun)
# fromRun, toRun = 336288, 341692
fromRun = 336288
- myDict = AFPDBDict(folderBlk=folderBlkGlob)
+ myDict = AFPDBDict(folderBlk=folderBlkGlob_01)
myDict.append(stationID=0, alignType="tracker", shiftX=-0.5)
myDict.append(stationID=1, alignType="tracker", shiftX=-0.5)
myDict.append(stationID=2, alignType="tracker", shiftX=-0.5)
@@ -281,16 +303,16 @@ def main():
myDict.append(stationID=1, alignType="correction", shiftX=-0.320)
myDict.append(stationID=2, alignType="correction", shiftX=-0.220)
myDict.append(stationID=3, alignType="correction", shiftX=-0.320)
- myDict.savePayload(folderBlk=folderBlkGlob, fromRun=fromRun)
+ myDict.savePayload(folderBlk=folderBlkGlob_01, fromRun=fromRun)
# fromRun, toRun = 347955, 348002
fromRun = 347955
- myDict = AFPDBDict(folderBlk=folderBlkGlob)
+ myDict = AFPDBDict(folderBlk=folderBlkGlob_01)
myDict.append(stationID=0, alignType="RP", shiftX=-2.34, shiftY=-13.22)
myDict.append(stationID=1, alignType="RP", shiftX=-3.68, shiftY=-13.28)
myDict.append(stationID=2, alignType="RP", shiftX=-6.46, shiftY=-5.47)
myDict.append(stationID=3, alignType="RP", shiftX=-6.79, shiftY=-5.03)
- myDict.savePayload(folderBlk=folderBlkGlob, fromRun=fromRun)
+ myDict.savePayload(folderBlk=folderBlkGlob_01, fromRun=fromRun)
print ("\nClose database")
db.closeDatabase()
--
GitLab
From 139207f75e1330465e4f5e72a910a2c276bd7d72 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Mon, 23 Aug 2021 12:45:29 +0200
Subject: [PATCH 225/272] ComponentAccumulator: fix empty ToolHandle warning in
conf2toConfigurable
Fix these type of warnings
```
Py:conf2toConfigurable WARNING Component: "" is of type string, no conversion, some properties possibly not set?
```
that appear when trying to convert an empty `ToolHandle` property. This
is a valid use-case and we should not be warning about that.
Also fix some of the debug message text and indentation.
---
.../python/ComponentAccumulator.py | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/Control/AthenaConfiguration/python/ComponentAccumulator.py b/Control/AthenaConfiguration/python/ComponentAccumulator.py
index 78371985c189..78747d410e68 100644
--- a/Control/AthenaConfiguration/python/ComponentAccumulator.py
+++ b/Control/AthenaConfiguration/python/ComponentAccumulator.py
@@ -931,9 +931,9 @@ def __setProperties( destConfigurableInstance, sourceConf2Instance, indent="" ):
propType = sourceConf2Instance._descriptors[pname].cpp_type
if "PrivateToolHandleArray" in propType:
setattr( destConfigurableInstance, pname, [conf2toConfigurable( tool, indent=__indent( indent ), parent = sourceConf2Instance.getName() ) for tool in pvalue] )
- _log.debug( "%sSet the private tools array %s of %s", indent, pname, destConfigurableInstance.name() )
+ _log.debug( "%sSetting private tool array property %s of %s", indent, pname, destConfigurableInstance.name() )
elif "PrivateToolHandle" in propType or "GaudiConfig2.Configurables" in propType or "ServiceHandle" in propType:
- _log.debug( "%sSet the property %s that is private tool %s", indent, pname, destConfigurableInstance.name() )
+ _log.debug( "%sSetting private tool property %s of %s", indent, pname, destConfigurableInstance.name() )
try: #sometimes it is not printable
_log.debug("%sTool: %s", indent, pvalue)
except Exception:
@@ -969,7 +969,8 @@ def conf2toConfigurable( comp, indent="", parent="", suppressDupes=False ):
return comp
if isinstance( comp, str ):
- _log.warning( "%sComponent: \"%s\" is of type string, no conversion, some properties possibly not set?", indent, comp )
+ if comp: # warning for non-empty string
+ _log.warning( "%sComponent: \"%s\" is of type string, no conversion, some properties possibly not set?", indent, comp )
return comp
_log.debug( "%sConverting from GaudiConfig2 object %s type %s, parent %s", indent, compName(comp), comp.__class__.__name__ , parent)
@@ -1144,7 +1145,7 @@ def conf2toConfigurable( comp, indent="", parent="", suppressDupes=False ):
try:
setattr(existingConfigurableInstance, pname, pvalue)
except AttributeError:
- _log.info("%s Could not set attribute. Type of existingConfigurableInstance %s.",indent, type(existingConfigurableInstance) )
+ _log.info("%sCould not set attribute. Type of existingConfigurableInstance %s.",indent, type(existingConfigurableInstance) )
raise
elif alreadySetProperties[pname] != pvalue:
# Old configuration writes some properties differently e.g. like ConditionStore+TileBadChannels instead of just TileBadChannels
@@ -1157,7 +1158,7 @@ def conf2toConfigurable( comp, indent="", parent="", suppressDupes=False ):
and pvalue.split('/')[-1] == alreadySetProperties[pname]):
# Okay. so they probably are actually the same. Can't check type.
merge=False
- _log.warning( "%s Properties here are strings and not exactly the same. ASSUMING they match types but we cannot check. %s for %s", indent, pname, newConf2Instance.getName() )
+ _log.warning( "%sProperties here are strings and not exactly the same. ASSUMING they match types but we cannot check. %s for %s", indent, pname, newConf2Instance.getName() )
try:
if ('+' in alreadySetProperties[pname].toStringProperty() \
@@ -1186,7 +1187,7 @@ def conf2toConfigurable( comp, indent="", parent="", suppressDupes=False ):
setattr(existingConfigurableInstance, pname, updatedPropValue)
del clone
- _log.debug("%s invoked GaudiConf2 semantics to merge the %s and the %s to %s "
+ _log.debug("%sInvoked GaudiConf2 semantics to merge the %s and the %s to %s "
"for property %s of %s",
indent, alreadySetProperties[pname], pvalue, pname,
updatedPropValue, existingConfigurable.getFullName())
--
GitLab
From e5477c55c59751ddcb8465b4edb48c5e3caa28af Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Mon, 23 Aug 2021 12:15:57 +0000
Subject: [PATCH 226/272] TrigEFMissingET: fix duplicate property name
The "TrackExtrapolationQuarticTerm" property was defined twice. Rename the wrong one to "Linear".
---
.../TrigEFMissingET/src/ApproximateTrackToLayerTool.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Trigger/TrigAlgorithms/TrigEFMissingET/src/ApproximateTrackToLayerTool.h b/Trigger/TrigAlgorithms/TrigEFMissingET/src/ApproximateTrackToLayerTool.h
index 69e00c336fb1..2021921e1a1f 100644
--- a/Trigger/TrigAlgorithms/TrigEFMissingET/src/ApproximateTrackToLayerTool.h
+++ b/Trigger/TrigAlgorithms/TrigEFMissingET/src/ApproximateTrackToLayerTool.h
@@ -28,7 +28,7 @@ private:
this, "TrackExtrapolationQuadraticTerm", -44.7818374,
"The quadratic term in the track extrapolation"};
Gaudi::Property<double> m_trackExtrapolationLinear{
- this, "TrackExtrapolationQuarticTerm", 540.656643,
+ this, "TrackExtrapolationLinearTerm", 540.656643,
"The linear term in the track extrapolation"};
}; //> end class ApproximateTrackToLayerTool
--
GitLab
From 773fac00a54dd77ef40b0a593a20cbe30e856360 Mon Sep 17 00:00:00 2001
From: Shaun Roe <shaun.roe@cern.ch>
Date: Mon, 23 Aug 2021 14:26:10 +0200
Subject: [PATCH 227/272] solve cppcheck warnings
---
.../InDetRecStatistics/scripts/doall.cc | 10 +++++-----
.../InDetRecStatistics/scripts/eff.cc | 2 +-
.../InDetRecStatistics/scripts/fake.cc | 2 +-
.../InDetRecStatistics/scripts/hits.cc | 10 +++++-----
.../InDetRecStatistics/scripts/interaction.cc | 15 ++++-----------
.../InDetRecStatistics/scripts/pulls.cc | 5 ++---
.../InDetRecStatistics/scripts/residuals.cc | 2 +-
.../InDetRecStatistics/scripts/resolution_cot.cc | 3 ++-
.../InDetRecStatistics/scripts/resolution_d0.cc | 3 ++-
.../InDetRecStatistics/scripts/resolution_phi.cc | 3 ++-
.../InDetRecStatistics/scripts/resolution_pt.cc | 3 ++-
.../InDetRecStatistics/scripts/resolution_z0.cc | 3 ++-
.../InDetRecStatistics/scripts/vertex.cc | 16 +++-------------
.../src/InDetRecStatisticsAlg.cxx | 16 ++++++++--------
14 files changed, 40 insertions(+), 53 deletions(-)
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/doall.cc b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/doall.cc
index d550955fd749..8c8e4e7281b6 100755
--- a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/doall.cc
+++ b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/doall.cc
@@ -47,11 +47,11 @@ string doall_doplot;
Long64_t doall_nentries= 0;
int doall_cutset= 1; // 0=none, 1=no TRTStandalong, 2=standard cuts,...
-int doall (const string file= "InDetRecStatistics.root",
- const string plotdir= ".",
- const string plotext= ".eps",
- const string histfilename= "InDetRTTHistos.root",
- const string doplot= doall_doplot,
+int doall (const string & file= "InDetRecStatistics.root",
+ const string & plotdir= ".",
+ const string & plotext= ".eps",
+ const string & histfilename= "InDetRTTHistos.root",
+ const string & doplot= doall_doplot,
const int compile= 0,
const int abseta = 0, //added by SCZ; abseta = 1 for old default behavior
const int cutset = doall_cutset,
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/eff.cc b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/eff.cc
index b1ea34cd248a..d95745c2125f 100755
--- a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/eff.cc
+++ b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/eff.cc
@@ -240,7 +240,7 @@ void eff_part (TTree* tree, const int hstyle=0,
}
void eff (TTree* tracktree[3], const char* name[3],
- const string plotprefix="efficiency_", const string plotext="",
+ const string & plotprefix="efficiency_", const string & plotext="",
const int ntrack_finders=3,
const TCut data_cut="", const TCut mc_cut="",
const bool primary= true, const double match=-1,
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/fake.cc b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/fake.cc
index dbc396d91552..8490f0a9eac6 100755
--- a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/fake.cc
+++ b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/fake.cc
@@ -175,7 +175,7 @@ void fake_part (TTree* tree, const int hstyle=0, const TCut data_cut="", double
void fake (TTree* tracktree[3], const char* name[3],
- const string plotprefix="fake_", const string plotext="",
+ const string & plotprefix="fake_", const string & plotext="",
const int ntrack_finders=3,
const TCut data_cut="", const double match=-1, const int s_bins=20)
{
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/hits.cc b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/hits.cc
index 0677e4dc7ab8..0ab688fa5a81 100644
--- a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/hits.cc
+++ b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/hits.cc
@@ -45,7 +45,7 @@ public:
Long64_t _nentries, _firstentry;
HitPlots() : _chain(0), _nentries(1000000000), _firstentry(0) {};
HitPlots(TTree *chain, const TCut hit_cut="", const TCut track_cut="",
- const string pre="", const string ext="",
+ const string & pre="", const string & ext="",
Long64_t nentries=1000000000, Long64_t firstentry=0);
~HitPlots() { gROOT->SetStyle("Default"); };
Long64_t Draw (const char* name, const char* title, const char* varexp, const TCut selection="", const char* opt1="", const char* opt2="",
@@ -54,12 +54,12 @@ public:
Double_t min=-1111, Double_t max=-1111);
Long64_t DrawTracks (const char* name, const char* title, const char* varexp, const char* selection="", const char* option="",
Double_t min=-1111, Double_t max=-1111);
- void DrawGif(const string name);
+ void DrawGif(const string & name);
TH1* GetHistogram() const { return _chain->GetHistogram(); }
};
HitPlots::HitPlots (TTree *chain, const TCut hit_cut, const TCut track_cut,
- const string pre, const string ext, Long64_t nentries, Long64_t firstentry)
+ const string & pre, const string & ext, Long64_t nentries, Long64_t firstentry)
: _chain(chain), _canvas("chits","ID Hits Canvas"), _style("shits","ID Hits Style"),
_hit_cut(hit_cut), _track_cut(track_cut),
_pre(pre), _ext(ext), _nentries(nentries), _firstentry(firstentry)
@@ -108,13 +108,13 @@ Long64_t HitPlots::DrawTracks (const char* name, const char* title, const char*
return Draw(name,title,varexp,_track_cut&&TCut(selection),"profile",option,min,max);
}
-void HitPlots::DrawGif(const string name) {
+void HitPlots::DrawGif(const string & name) {
if (_ext=="") return;
string epsname= _pre+name+_ext;
_canvas.SaveAs(epsname.c_str());
}
-void hits(TTree *chain, const string pre="", const string ext="",
+void hits(TTree *chain, const string & pre="", const string & ext="",
const TCut hit_cut="",
const TCut track_cut="",
const bool maps= false)
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/interaction.cc b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/interaction.cc
index ff7d62e70c4d..b15b1d2da8f4 100755
--- a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/interaction.cc
+++ b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/interaction.cc
@@ -11,23 +11,16 @@
using std::string;
-void interaction (TTree *tree, const string plotprefix="interaction_", const string plotext="",
+void interaction (TTree *tree, const string & plotprefix="interaction_", const string & plotext="",
const TCut mc_cut="")
{
-
+ //cppcheck-suppress incorrectStringBooleanError
TCut cut_electron (mc_cut && "abs(mctrack_pdgid)==11 && sqrt(pow(mctrack_endvertexx,2)+pow(mctrack_endvertexy,2))<3000");
+ //cppcheck-suppress incorrectStringBooleanError
TCut cut_pion (mc_cut && "abs(mctrack_pdgid)==211 && sqrt(pow(mctrack_endvertexx,2)+pow(mctrack_endvertexy,2))<3000");
- // TCanvas *beginxy_e = new TCanvas("beginxy_e", "electron truth track begin vertex");
- // TCanvas *beginrz_e = new TCanvas("beginrz_e", "electron truth track begin vertex");
- // TCanvas *beginxy_pi = new TCanvas("beginxy_pi", "pion truth track begin vertex");
- // TCanvas *beginrz_pi = new TCanvas("beginrz_pi", "pion truth track begin vertex");
-
- // TCanvas *endxy_e = new TCanvas("endxy_e", "electron truth track end vertex");
- // TCanvas *endrz_e = new TCanvas("endrz_e", "electron truth track end vertex");
- // TCanvas *endxy_pi = new TCanvas("endxy", "pion truth track end vertex");
- // TCanvas *endrz_pi = new TCanvas("endrz", "pion truth track end vertex");
+
TCanvas *end_e = new TCanvas("end_e", "electron truth track end vertex",800,400);
TCanvas *end_pi = new TCanvas("end_pi", "pion truth track end vertex",800,400);
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/pulls.cc b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/pulls.cc
index a37ddcd996e5..f24b6df7cd0a 100755
--- a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/pulls.cc
+++ b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/pulls.cc
@@ -15,7 +15,7 @@
using std::string;
-void pulls (TTree *n1, TTree *n2=0, TTree *n3=0, const string plotfile= "",
+void pulls (TTree *n1, TTree *n2=0, TTree *n3=0, const string & plotfile= "",
const TCut data_cut="", double match=-1)
{
TStyle plotStyle ("PlotStyle", "My Plot Style");
@@ -25,8 +25,7 @@ void pulls (TTree *n1, TTree *n2=0, TTree *n3=0, const string plotfile= "",
const int s_bins = 50;
const double s_pullMax = 6.0;
TCut truth_cut ("track_truth_prob>"+TString::Format("%g",(match>=0?match:0.8)));
- // TCut cuta("abs(1/track_qoverpt)>1000");
-// TCut cuta("track_truth_prob>0.8 && abs(1./track_truth_qoverpt)>3 && abs(track_truth_pdgid)==13");
+ //cppcheck-suppress incorrectStringBooleanError
TCut cuta(data_cut && truth_cut && "abs(1/track_truth_qoverpt)>3");
TCut cutb(data_cut);
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/residuals.cc b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/residuals.cc
index 95695ad77681..322bfdf07005 100755
--- a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/residuals.cc
+++ b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/residuals.cc
@@ -14,7 +14,7 @@
using std::string;
-void residuals(TTree *ntuple, const string plotprefix="", const string plotext="",
+void residuals(TTree *ntuple, const string & plotprefix="", const string & plotext="",
const TCut hit_cut="")
{
// turn on outlier display, increase some text sizes
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/resolution_cot.cc b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/resolution_cot.cc
index aee8a6dbb167..b9c770c4f947 100755
--- a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/resolution_cot.cc
+++ b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/resolution_cot.cc
@@ -29,7 +29,7 @@ using std::endl;
using std::string;
void resolution_cot (TTree* tree[3], const char* name[3],
- const string plotfile= "",
+ const string & plotfile= "",
const int abseta = 1, const int pull = 0, const float etamax = 2.5,
// previous line added by SCZ, default settings same as old
const int ntrack_finders=3, const TCut data_cut="", double match=-1)
@@ -56,6 +56,7 @@ void resolution_cot (TTree* tree[3], const char* name[3],
// -------------- cuts ---------------------------
TCut truth_cut ("track_truth_prob>"+TString::Format("%g",(match>=0?match:0.5)));
+ //cppcheck-suppress incorrectStringBooleanError
TCut cut_track_preselection = data_cut && "abs(1/track_qoverpt)>1000" && truth_cut;
// -------------- style --------------------------
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/resolution_d0.cc b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/resolution_d0.cc
index 01b3d43713d5..09d0404ac74a 100755
--- a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/resolution_d0.cc
+++ b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/resolution_d0.cc
@@ -29,7 +29,7 @@ using std::endl;
using std::string;
void resolution_d0 (TTree* tree[3], const char* name[3],
- const string plotfile= "",
+ const string & plotfile= "",
const int abseta = 1, const int pull = 0, const float etamax = 2.5, // added by SCZ
const int ntrack_finders=3, const TCut data_cut="", double match=-1)
{
@@ -56,6 +56,7 @@ void resolution_d0 (TTree* tree[3], const char* name[3],
// -------------- cuts ---------------------------
TCut truth_cut ("track_truth_prob>"+TString::Format("%g",(match>=0?match:0.5)));
+ //cppcheck-suppress incorrectStringBooleanError
TCut cut_track_preselection = data_cut && "abs(1/track_qoverpt)>1000" && truth_cut;
// -------------- style --------------------------
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/resolution_phi.cc b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/resolution_phi.cc
index 24646514fff6..3b2c1c615b70 100755
--- a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/resolution_phi.cc
+++ b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/resolution_phi.cc
@@ -29,7 +29,7 @@ using std::endl;
using std::string;
void resolution_phi (TTree* tree[3], const char* name[3],
- const string plotfile= "",
+ const string & plotfile= "",
const int abseta = 1, const int pull = 0, const float etamax=2.5, // added by SCZ
const int ntrack_finders=3, const TCut data_cut="", double match=-1)
{
@@ -56,6 +56,7 @@ void resolution_phi (TTree* tree[3], const char* name[3],
// -------------- cuts ---------------------------
TCut truth_cut ("track_truth_prob>"+TString::Format("%g",(match>=0?match:0.5)));
+ //cppcheck-suppress incorrectStringBooleanError
TCut cut_track_preselection = data_cut && "abs(1/track_qoverpt)>1000" && truth_cut;
// -------------- style --------------------------
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/resolution_pt.cc b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/resolution_pt.cc
index 3c39c95a4b52..b6b4e3eced47 100755
--- a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/resolution_pt.cc
+++ b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/resolution_pt.cc
@@ -29,7 +29,7 @@ using std::endl;
using std::string;
void resolution_pt (TTree* tree[3], const char* name[3],
- const string plotfile= "",
+ const string & plotfile= "",
const int abseta = 1, const int pull = 0, const float etamax = 2.5, // added by SCZ
const int ntrack_finders=3, const TCut data_cut="", double match=-1)
{
@@ -55,6 +55,7 @@ void resolution_pt (TTree* tree[3], const char* name[3],
// -------------- cuts ---------------------------
TCut truth_cut ("track_truth_prob>"+TString::Format("%g",(match>=0?match:0.5)));
+ //cppcheck-suppress incorrectStringBooleanError
TCut cut_track_preselection = data_cut && "abs(1/track_qoverpt)>1000" && truth_cut;
// -------------- style --------------------------
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/resolution_z0.cc b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/resolution_z0.cc
index 658fea8e376f..3daa671a806c 100755
--- a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/resolution_z0.cc
+++ b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/resolution_z0.cc
@@ -29,7 +29,7 @@ using std::endl;
using std::string;
void resolution_z0 (TTree* tree[3], const char* name[3],
- const string plotfile= "",
+ const string & plotfile= "",
const int abseta = 1, const int pull = 0, const float etamax = 2.5, // added by SCZ
const int ntrack_finders=3, const TCut data_cut="", double match=-1)
{
@@ -56,6 +56,7 @@ void resolution_z0 (TTree* tree[3], const char* name[3],
// -------------- cuts ---------------------------
TCut truth_cut ("track_truth_prob>"+TString::Format("%g",(match>=0?match:0.5)));
+ //cppcheck-suppress incorrectStringBooleanError
TCut cut_track_preselection = data_cut && "abs(1/track_qoverpt)>1000" && truth_cut;
// -------------- style --------------------------
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/vertex.cc b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/vertex.cc
index 6d30cf0207cb..360b42abad31 100755
--- a/InnerDetector/InDetValidation/InDetRecStatistics/scripts/vertex.cc
+++ b/InnerDetector/InDetValidation/InDetRecStatistics/scripts/vertex.cc
@@ -10,7 +10,7 @@
#include "TCut.h"
#include "TLegend.h"
-void vertex (TTree *tree, const string plotfile= "",
+void vertex (TTree *tree, const string & plotfile= "",
const TCut data_cut="", const TCut mc_cut="", double match=-1,
const int s_bins=20)
{
@@ -27,21 +27,12 @@ void vertex (TTree *tree, const string plotfile= "",
TCut truth_cut ("track_truth_prob>"+TString::Format("%g",(match>=0?match:0.7)));
tree->Project("vertexgen", "mctrack_z0", "abs(1/mctrack_qoverpt)>1000" && mc_cut);
+ //cppcheck-suppress incorrectStringBooleanError
tree->Project("vertexgenrec", "track_truth_z0", truth_cut && "abs(1/track_truth_qoverpt)>1000" && data_cut);
tree->Project("vertexrec", "track_z0", "abs(1/track_qoverpt)>1000" && data_cut);
tree->Project("vertexdiff", "track_z0-track_truth_z0", "abs(1/track_qoverpt)>1000" && data_cut);
- /*
- TH1F *etaeff = etagenrec->Clone("etaeff");
- etaeff->SetTitle("tracking efficiency versus eta");
- etaeff->Reset();
- etaeff->Divide(etagenrec,etagen,1,1);
-
- TH1F *pteff = ptgenrec->Clone("pteff");
- pteff->SetTitle("tracking efficiency versus P_T");
- pteff->Reset();
- pteff->Divide(ptgenrec,ptgen,1,1);
- */
+
vertexgen->GetXaxis()->SetTitle("z0 [mm]");
vertexdiff->GetXaxis()->SetTitle("#Deltaz0 (gen-rec) [mm]");
@@ -57,7 +48,6 @@ void vertex (TTree *tree, const string plotfile= "",
eff->cd(1); vertexgenrec->Draw("same");
leg->Draw();
- //eff->cd(3); vertexrec->Draw();
eff->cd(2); vertexdiff->Draw();
if (plotfile != "") eff->Print(plotfile.c_str());
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/src/InDetRecStatisticsAlg.cxx b/InnerDetector/InDetValidation/InDetRecStatistics/src/InDetRecStatisticsAlg.cxx
index 7d7f07bf716a..a986646f8680 100755
--- a/InnerDetector/InDetValidation/InDetRecStatistics/src/InDetRecStatisticsAlg.cxx
+++ b/InnerDetector/InDetValidation/InDetRecStatistics/src/InDetRecStatisticsAlg.cxx
@@ -408,7 +408,7 @@ StatusCode InDet :: InDetRecStatisticsAlg :: finalize() {
for (std::vector <class TrackStatHelper *>::const_iterator collection =
m_SignalCounters.begin(); collection != m_SignalCounters.end();
- collection++) {
+ ++collection) {
ATH_MSG_DEBUG(s_linestr2);
delete (*collection);
}
@@ -663,7 +663,7 @@ void InDet :: InDetRecStatisticsAlg :: printStatistics() {
bool first = true;
for (std::vector <class TrackStatHelper *>::const_iterator collection =
m_SignalCounters.begin();
- collection != m_SignalCounters.end(); collection++)
+ collection != m_SignalCounters.end(); ++collection)
{
if (first) {
first = false;
@@ -683,7 +683,7 @@ void InDet :: InDetRecStatisticsAlg :: printStatistics() {
<< "\t" << "TrackTruthCollections : ";
first = true;
for (std::vector <class TrackStatHelper *>::const_iterator collection = m_SignalCounters.begin();
- collection != m_SignalCounters.end(); collection++)
+ collection != m_SignalCounters.end(); ++collection)
{
if (first) {
first = false;
@@ -741,7 +741,7 @@ void InDet :: InDetRecStatisticsAlg :: printStatistics() {
RestoreStream<MsgStream> restore(out);
for (std::vector <class TrackStatHelper *>::const_iterator collection =
m_SignalCounters.begin();
- collection != m_SignalCounters.end(); collection++) {
+ collection != m_SignalCounters.end(); ++collection) {
if ((*collection)->key()=="CombinedInDetTracks"){
out << "\n" << s_linestr2 << "\n";
(*collection)->print(out);
@@ -796,7 +796,7 @@ void InDet :: InDetRecStatisticsAlg :: printStatistics() {
outstr.str("");
for (std::vector <class TrackStatHelper *>::const_iterator collection =
m_SignalCounters.begin();
- collection != m_SignalCounters.end(); collection++) {
+ collection != m_SignalCounters.end(); ++collection) {
if ((*collection)->key()=="CombinedInDetTracks"){
out << "\n" << s_linestr2 << "\n";
(*collection)->printSecondary(out);
@@ -817,7 +817,7 @@ void InDet :: InDetRecStatisticsAlg ::printTrackSummary (MsgStream &out, enum et
bool printed = false;
for (std::vector <class TrackStatHelper *>::const_iterator collection =
m_SignalCounters.begin();
- collection != m_SignalCounters.end(); collection++) {
+ collection != m_SignalCounters.end(); ++collection) {
if ((*collection)->key()=="CombinedInDetTracks"){
printed = (*collection)->printTrackSummaryRegion(out, TRACK_ALL, eta_reg) || printed;
}
@@ -829,7 +829,7 @@ void InDet :: InDetRecStatisticsAlg ::printTrackSummary (MsgStream &out, enum et
printed = false;
for (std::vector <class TrackStatHelper *>::const_iterator collection =
m_SignalCounters.begin();
- collection != m_SignalCounters.end(); collection++) {
+ collection != m_SignalCounters.end(); ++collection) {
if ((*collection)->key()=="CombinedInDetTracks"){
printed = (*collection)->printTrackSummaryRegion(out, TRACK_LOWTRUTHPROB, eta_reg) || printed;
}
@@ -840,7 +840,7 @@ void InDet :: InDetRecStatisticsAlg ::printTrackSummary (MsgStream &out, enum et
}
for (std::vector <class TrackStatHelper *>::const_iterator collection =
m_SignalCounters.begin();
- collection != m_SignalCounters.end(); collection++) {
+ collection != m_SignalCounters.end(); ++collection) {
if ((*collection)->key()=="CombinedInDetTracks"){
(*collection)->printTrackSummaryRegion(out, TRACK_LOWTRUTHPROB2, eta_reg);
}
--
GitLab
From f28497b573ef13955724f0b7ed9598e60bacd593 Mon Sep 17 00:00:00 2001
From: Shaun Roe <shaun.roe@cern.ch>
Date: Mon, 23 Aug 2021 15:06:39 +0200
Subject: [PATCH 228/272] fix cppcheck warnings
---
.../InDetJiveXML/src/PixelClusterRetriever.cxx | 6 +++---
.../InDetEventCnv/InDetJiveXML/src/SCTRDORetriever.cxx | 7 +++----
.../InDetEventCnv/InDetJiveXML/src/SiClusterRetriever.cxx | 6 +++---
.../InDetJiveXML/src/SiSpacePointRetriever.cxx | 4 ++--
.../InDetEventCnv/InDetJiveXML/src/TRTRetriever.cxx | 2 +-
5 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelClusterRetriever.cxx b/InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelClusterRetriever.cxx
index cead2f1ceb10..6ad47f02be6f 100755
--- a/InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelClusterRetriever.cxx
+++ b/InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelClusterRetriever.cxx
@@ -81,7 +81,7 @@ namespace JiveXML {
//Loop over all collections in the container and count the clusters
unsigned long NClusterTotal = 0;
InDet::SiClusterContainer::const_iterator SiClusterCollItr = SiClusterCont->begin();
- for (; SiClusterCollItr!= SiClusterCont->end(); SiClusterCollItr++)
+ for (; SiClusterCollItr!= SiClusterCont->end(); ++SiClusterCollItr)
NClusterTotal += (**SiClusterCollItr).size();
//Now prepare the output data vectors
@@ -101,7 +101,7 @@ namespace JiveXML {
DataVect etaModule; etaModule.reserve(NClusterTotal);
//Loop over all cluster collections in the container
- for (SiClusterCollItr = SiClusterCont->begin(); SiClusterCollItr!= SiClusterCont->end(); SiClusterCollItr++){
+ for (SiClusterCollItr = SiClusterCont->begin(); SiClusterCollItr!= SiClusterCont->end(); ++SiClusterCollItr){
//Get the collection
const InDet::SiClusterCollection* SiClusterColl = (*SiClusterCollItr);
@@ -111,7 +111,7 @@ namespace JiveXML {
//Now loop over all clusters in that collection
InDet::SiClusterCollection::const_iterator SiClusterItr = SiClusterColl->begin();
- for (; SiClusterItr!=SiClusterColl->end(); SiClusterItr++){
+ for (; SiClusterItr!=SiClusterColl->end(); ++SiClusterItr){
//Get the cluster
const InDet::SiCluster* sicluster = (*SiClusterItr);
diff --git a/InnerDetector/InDetEventCnv/InDetJiveXML/src/SCTRDORetriever.cxx b/InnerDetector/InDetEventCnv/InDetJiveXML/src/SCTRDORetriever.cxx
index 1c69277b23e6..cf24aa3b52b2 100755
--- a/InnerDetector/InDetEventCnv/InDetJiveXML/src/SCTRDORetriever.cxx
+++ b/InnerDetector/InDetEventCnv/InDetJiveXML/src/SCTRDORetriever.cxx
@@ -8,7 +8,6 @@
#include "InDetRawData/SCT3_RawData.h"
#include "InDetReadoutGeometry/SiDetectorElement.h"
#include "InDetIdentifier/SCT_ID.h"
-//#include "TrkEventPrimitives/LocalPosition.h"
#include "StoreGate/ReadCondHandle.h"
#include "StoreGate/ReadHandle.h"
@@ -63,7 +62,7 @@ namespace JiveXML {
unsigned long NSCTRDO = 0;
//Loop over SCTRDO containers
SCT_RDO_Container::const_iterator SCTRDOContItr = SCTRDOContainer->begin();
- for ( ; SCTRDOContItr!=SCTRDOContainer->end(); SCTRDOContItr++)
+ for ( ; SCTRDOContItr!=SCTRDOContainer->end(); ++SCTRDOContItr)
//and get number of SCTRDO in this collection
NSCTRDO+=(*SCTRDOContItr)->size();
@@ -88,7 +87,7 @@ namespace JiveXML {
//Now loop again over SCTRDO collections to retrieve the data
SCTRDOContItr = SCTRDOContainer->begin();
- for (; SCTRDOContItr!=SCTRDOContainer->end(); SCTRDOContItr++) {
+ for (; SCTRDOContItr!=SCTRDOContainer->end(); ++SCTRDOContItr) {
//Get the collection of SCT raw hits
const SCT_RDO_Collection* SCTRDORawCollection = (*SCTRDOContItr);
@@ -96,7 +95,7 @@ namespace JiveXML {
//Loop over raw hit collection
SCT_RDO_Collection::const_iterator SCTRDORawCollItr = SCTRDORawCollection->begin();
- for ( ; SCTRDORawCollItr != SCTRDORawCollection->end(); SCTRDORawCollItr++) {
+ for ( ; SCTRDORawCollItr != SCTRDORawCollection->end(); ++SCTRDORawCollItr) {
//Get the raw hit object
const SCT_RDORawData *rdoData = (*SCTRDORawCollItr);
diff --git a/InnerDetector/InDetEventCnv/InDetJiveXML/src/SiClusterRetriever.cxx b/InnerDetector/InDetEventCnv/InDetJiveXML/src/SiClusterRetriever.cxx
index f168f27707c1..61d65adb01c7 100755
--- a/InnerDetector/InDetEventCnv/InDetJiveXML/src/SiClusterRetriever.cxx
+++ b/InnerDetector/InDetEventCnv/InDetJiveXML/src/SiClusterRetriever.cxx
@@ -76,7 +76,7 @@ namespace JiveXML {
//Loop over all collections in the container and count the clusters
unsigned long NClusterTotal = 0;
InDet::SiClusterContainer::const_iterator SiClusterCollItr = SiClusterCont->begin();
- for (; SiClusterCollItr!= SiClusterCont->end(); SiClusterCollItr++)
+ for (; SiClusterCollItr!= SiClusterCont->end(); ++SiClusterCollItr)
NClusterTotal += (**SiClusterCollItr).size();
//Now prepare the output data vectors
@@ -98,7 +98,7 @@ namespace JiveXML {
DataVect side; side.reserve(NClusterTotal);
//Loop over all cluster collections in the container
- for (SiClusterCollItr = SiClusterCont->begin(); SiClusterCollItr!= SiClusterCont->end(); SiClusterCollItr++){
+ for (SiClusterCollItr = SiClusterCont->begin(); SiClusterCollItr!= SiClusterCont->end(); ++SiClusterCollItr){
//Get the collection
const InDet::SiClusterCollection* SiClusterColl = (*SiClusterCollItr);
@@ -110,7 +110,7 @@ namespace JiveXML {
//Now loop over all clusters in that collection
InDet::SiClusterCollection::const_iterator SiClusterItr = SiClusterColl->begin();
- for (; SiClusterItr!=SiClusterColl->end(); SiClusterItr++){
+ for (; SiClusterItr!=SiClusterColl->end(); ++SiClusterItr){
//Get the cluster
const InDet::SiCluster* cluster = (*SiClusterItr);
diff --git a/InnerDetector/InDetEventCnv/InDetJiveXML/src/SiSpacePointRetriever.cxx b/InnerDetector/InDetEventCnv/InDetJiveXML/src/SiSpacePointRetriever.cxx
index f2f539b18f10..5afd14920be1 100755
--- a/InnerDetector/InDetEventCnv/InDetJiveXML/src/SiSpacePointRetriever.cxx
+++ b/InnerDetector/InDetEventCnv/InDetJiveXML/src/SiSpacePointRetriever.cxx
@@ -71,7 +71,7 @@ namespace JiveXML
//Get the set of particle barcodes associated with the first cluster identifier
std::pair<PRDTruthIter,PRDTruthIter> equalRangeFirst = truthColl->equal_range(idFirst);
- for(PRDTruthIter TruthCollItr=equalRangeFirst.first; TruthCollItr!= equalRangeFirst.second; TruthCollItr++)
+ for(PRDTruthIter TruthCollItr=equalRangeFirst.first; TruthCollItr!= equalRangeFirst.second; ++TruthCollItr)
barcodesFirst.insert(TruthCollItr->second.barcode());
//Check if we have only have one valid cluster identifier
@@ -85,7 +85,7 @@ namespace JiveXML
//Get the set of particle barcodes associated with the second cluster identifier
std::pair<PRDTruthIter,PRDTruthIter> equalRangeSecond = truthColl->equal_range(idSecond);
- for(PRDTruthIter TruthCollItr=equalRangeSecond.first; TruthCollItr!= equalRangeSecond.second; TruthCollItr++)
+ for(PRDTruthIter TruthCollItr=equalRangeSecond.first; TruthCollItr!= equalRangeSecond.second; ++TruthCollItr)
barcodesSecond.insert(TruthCollItr->second.barcode());
//Copy the list of particle barcodes that are associated with both clusters
diff --git a/InnerDetector/InDetEventCnv/InDetJiveXML/src/TRTRetriever.cxx b/InnerDetector/InDetEventCnv/InDetJiveXML/src/TRTRetriever.cxx
index 9ff0c7d6eeba..7c39876c706c 100755
--- a/InnerDetector/InDetEventCnv/InDetJiveXML/src/TRTRetriever.cxx
+++ b/InnerDetector/InDetEventCnv/InDetJiveXML/src/TRTRetriever.cxx
@@ -156,7 +156,7 @@ namespace JiveXML {
//Loop over associated truth tracks with same id
typedef PRD_MultiTruthCollection::const_iterator iter;
std::pair<iter,iter> equalIDRange = TRTMultiTruthMap->equal_range(id);
- for ( iter TRTMultiTruthMapItr = equalIDRange.first; TRTMultiTruthMapItr != equalIDRange.second; TRTMultiTruthMapItr++){
+ for ( iter TRTMultiTruthMapItr = equalIDRange.first; TRTMultiTruthMapItr != equalIDRange.second; ++TRTMultiTruthMapItr){
NBarcodes++;
barcodes.push_back(DataType(TRTMultiTruthMapItr->second.barcode()));
}
--
GitLab
From 97c93fdd6984faec4e7f46982dc85668c7730f03 Mon Sep 17 00:00:00 2001
From: Yasuyuki Okumura <yasuyuki.okumura@cern.ch>
Date: Mon, 23 Aug 2021 15:29:05 +0200
Subject: [PATCH 229/272] ttbar MC sample update as discussed in ATR-23703
---
.../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 12030 +++++++++-------
.../TrigValTools/share/TrigValInputs.json | 4 +-
2 files changed, 6465 insertions(+), 5569 deletions(-)
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 2c2f2885d07e..3a4e6e1f66c9 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -3,45 +3,56 @@ HLT_10j40_L14J15:
HLT_10j40_ftf_L14J15:
eventCount: 0
stepCounts:
- 0: 9
+ 0: 13
stepFeatures:
- 0: 9
+ 0: 13
HLT_10j40_pf_ftf_presel7j21_L14J15:
eventCount: 0
stepCounts:
- 0: 7
+ 0: 12
stepFeatures:
- 0: 7
+ 0: 12
HLT_10j40_pf_ftf_presel7j28_L14J15:
eventCount: 0
stepCounts:
- 0: 5
+ 0: 7
stepFeatures:
- 0: 5
+ 0: 7
HLT_10j40_pf_ftf_presel7j35_L14J15:
eventCount: 0
+ stepCounts:
+ 0: 3
+ stepFeatures:
+ 0: 3
HLT_2e12_lhloose_mu10_L12EM8VH_MU10:
eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ stepFeatures:
+ 0: 6
+ 1: 7
+ 2: 1
HLT_2e17_gsf_lhvloose_L12EM15VHI:
eventCount: 0
stepFeatures:
- 0: 1
+ 0: 3
HLT_2e17_idperf_gsf_loose_L12EM15VHI:
eventCount: 0
stepFeatures:
- 0: 1
+ 0: 3
HLT_2e17_idperf_loose_L12EM15VHI:
eventCount: 0
stepFeatures:
- 0: 1
+ 0: 3
HLT_2e17_lhvloose_L12EM15VHI:
eventCount: 0
stepFeatures:
- 0: 1
+ 0: 3
HLT_2e24_lhvloose_L12EM20VH:
eventCount: 0
stepFeatures:
- 0: 1
+ 0: 2
HLT_2e5_lhmedium_j70_0eta320_j50_0eta490_j0_DJMASS900j50_L1MJJ-500-NFF:
eventCount: 0
stepCounts:
@@ -50,30 +61,38 @@ HLT_2e5_lhmedium_j70_0eta320_j50_0eta490_j0_DJMASS900j50_L1MJJ-500-NFF:
2: 1
3: 1
stepFeatures:
- 0: 17
- 1: 49
- 2: 4
- 3: 3
+ 0: 8
+ 1: 19
+ 2: 5
+ 3: 4
+ 4: 1
HLT_2e5_lhvloose_bBeeM6000_L12EM3:
eventCount: 0
stepCounts:
- 0: 14
- 1: 4
- 2: 4
- 3: 4
+ 0: 15
+ 1: 8
+ 2: 6
+ 3: 5
stepFeatures:
- 0: 64
- 1: 129
- 2: 11
- 3: 11
- 4: 4
+ 0: 50
+ 1: 104
+ 2: 20
+ 3: 15
+ 4: 5
HLT_2g10_loose_mu20_L1MU20:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 5
+ 1: 3
+ 2: 2
+ 3: 1
+ 4: 1
stepFeatures:
- 0: 14
- 1: 1
+ 0: 23
+ 1: 7
+ 2: 8
+ 3: 2
+ 4: 1
HLT_2g15_loose_25dphiAA_invmAA80_L1DPHI-M70-2eEM12M:
eventCount: 0
HLT_2g15_loose_dPhi25_m80_L1DPHI-M70-2eEM12M:
@@ -89,30 +108,39 @@ HLT_2g15_tight_dPhi25_L1DPHI-M70-2eEM12M:
HLT_2g15_tight_dPhi25_m80_L1DPHI-M70-2eEM12M:
eventCount: 0
HLT_2g20_loose_L12EM15VH:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 2
- 1: 1
- 2: 1
- stepFeatures:
- 0: 5
+ 0: 4
1: 3
- 2: 2
+ 2: 3
3: 1
+ stepFeatures:
+ 0: 14
+ 1: 9
+ 2: 9
+ 3: 3
HLT_2g20_tight_icaloloose_L12EM15VHI:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 4
+ 1: 2
+ 2: 2
stepFeatures:
- 0: 2
- 1: 1
+ 0: 11
+ 1: 7
+ 2: 6
+ 3: 1
HLT_2g22_tight_L12EM15VHI:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 4
+ 1: 2
+ 2: 2
stepFeatures:
- 0: 2
- 1: 1
+ 0: 11
+ 1: 7
+ 2: 6
+ 3: 1
HLT_2g22_tight_L1EM7_EMPTY:
eventCount: 0
HLT_2g22_tight_L1EM7_UNPAIRED_ISO:
@@ -120,33 +148,41 @@ HLT_2g22_tight_L1EM7_UNPAIRED_ISO:
HLT_2g25_loose_g15_loose_L12EM20VH:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 3
+ 1: 2
+ 2: 2
stepFeatures:
- 0: 10
- 1: 4
+ 0: 25
+ 1: 17
+ 2: 14
+ 3: 2
HLT_2g50_loose_L12EM20VH:
eventCount: 0
stepCounts:
- 0: 1
- stepFeatures:
0: 3
- 1: 1
+ 1: 2
+ 2: 2
+ stepFeatures:
+ 0: 8
+ 1: 6
+ 2: 5
+ 3: 1
HLT_2g50_tight_L1EM7_EMPTY:
eventCount: 0
HLT_2g50_tight_L1EM7_UNPAIRED_ISO:
eventCount: 0
HLT_2j100_L1CEP-CJ50:
- eventCount: 4
+ eventCount: 2
stepCounts:
- 0: 4
+ 0: 2
stepFeatures:
- 0: 9
+ 0: 4
HLT_2j100_L1CEP-CJ60:
eventCount: 1
stepCounts:
0: 1
stepFeatures:
- 0: 3
+ 0: 2
HLT_2j120_mb_afprec_afpdijet_L1CEP-CJ50:
eventCount: 0
stepCounts:
@@ -156,283 +192,307 @@ HLT_2j120_mb_afprec_afpdijet_L1CEP-CJ50:
1: 1
HLT_2j135_mb_afprec_afpdijet_L1CEP-CJ60:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
+ 1: 1
HLT_2j20_mb_afprec_afpdijet_L1RD0_FILLED:
eventCount: 0
stepCounts:
0: 20
stepFeatures:
- 0: 202
+ 0: 213
1: 20
HLT_2j250_ftf_0eta240_j120_ftf_0eta240_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 6
+ 0: 10
+ 1: 7
HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 6
+ 0: 10
+ 1: 7
HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_L1J100:
eventCount: 0
stepCounts:
- 0: 3
+ 0: 5
stepFeatures:
- 0: 3
+ 0: 5
HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_L1SC111-CJ15:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 5
stepFeatures:
- 0: 4
+ 0: 5
HLT_2j330_a10sd_cssk_pf_nojcalib_ftf_35smcINF_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 2
HLT_2j330_a10t_lcw_jes_35smcINF_L1J100:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_2j330_a10t_lcw_jes_35smcINF_L1SC111-CJ15:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_2j330_a10t_lcw_nojcalib_35smcINF_L1J100:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_2j35_0eta240_020jvt_pf_ftf_2j35_0eta240_020jvt_pf_ftf_L14J15p0ETA25:
- eventCount: 4
+ eventCount: 8
stepCounts:
- 0: 7
- 1: 4
+ 0: 9
+ 1: 8
stepFeatures:
- 0: 14
- 1: 44
+ 0: 18
+ 1: 82
HLT_2j35_0eta240_020jvt_pf_ftf_bdl1r60_2j35_0eta240_020jvt_pf_ftf_L14J15p0ETA25:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 7
- 1: 4
+ 0: 9
+ 1: 8
+ 2: 1
stepFeatures:
- 0: 14
- 1: 44
- 2: 3
+ 0: 18
+ 1: 82
+ 2: 5
HLT_2j35_0eta240_2j35_0eta240_L14J15p0ETA25:
- eventCount: 6
+ eventCount: 8
stepCounts:
- 0: 6
+ 0: 8
stepFeatures:
- 0: 60
+ 0: 82
HLT_2j35_0eta290_020jvt_pf_ftf_bdl1r60_3j35_pf_ftf_0eta320_L15J15p0ETA25:
eventCount: 0
stepCounts:
- 0: 5
+ 0: 3
1: 3
stepFeatures:
- 0: 10
- 1: 37
- 2: 2
+ 0: 6
+ 1: 35
+ 2: 1
HLT_2j35_0eta290_020jvt_pf_ftf_bdl1r70_2j35_0eta290_020jvt_pf_ftf_bdl1r85_L14J15p0ETA25:
eventCount: 0
stepCounts:
- 0: 7
- 1: 4
+ 0: 9
+ 1: 8
stepFeatures:
- 0: 14
- 1: 44
- 2: 12
+ 0: 18
+ 1: 86
+ 2: 15
? HLT_2j40_pf_ftf_0eta490_SHARED_2j45_pf_ftf_0eta290_bdl1r70_j0_pf_ftf_HT300_j0_pf_ftf_DJMASS700j35_L1HT150-J20s5pETA31_MJJ-400-CF
-: eventCount: 0
+: eventCount: 1
stepCounts:
- 0: 3
+ 0: 1
+ 1: 1
+ 2: 1
stepFeatures:
- 0: 12
+ 0: 4
+ 1: 17
+ 2: 2
HLT_2j45_0eta290_020jvt_pf_ftf_bdl1r60_2j45_pf_ftf_L14J15p0ETA25:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 7
- 1: 4
+ 0: 9
+ 1: 5
+ 2: 1
stepFeatures:
- 0: 14
- 1: 35
- 2: 3
+ 0: 18
+ 1: 48
+ 2: 4
HLT_2j45_0eta290_020jvt_pf_ftf_bdl1r60_3j45_pf_ftf_0eta320_L15J15p0ETA25:
eventCount: 0
stepCounts:
- 0: 5
+ 0: 3
1: 2
stepFeatures:
- 0: 10
- 1: 20
- 2: 2
+ 0: 6
+ 1: 22
HLT_2j45_pf_ftf_bdl1r60_xe50_cell_xe85_pfopufit_L12J15_XE55:
- eventCount: 0
+ eventCount: 1
stepCounts:
0: 6
1: 5
+ 2: 1
stepFeatures:
- 0: 22
- 1: 19
- 2: 3
+ 0: 20
+ 1: 23
+ 2: 4
HLT_2j45_pf_ftf_bdl1r60_xe50_cell_xe85_tcpufit_L12J15_XE55:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 4
+ 0: 3
1: 3
+ 2: 1
stepFeatures:
- 0: 20
- 1: 9
+ 0: 16
+ 1: 11
2: 3
HLT_2j45_pf_ftf_bdl1r70_j0_pf_ftf_HT300_j0_pf_ftf_DJMASS700j35_L1HT150-J20s5pETA31_MJJ-400-CF:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 1
+ 1: 1
+ 2: 1
stepFeatures:
- 0: 9
+ 0: 3
+ 1: 12
+ 2: 2
HLT_2j55_0eta290_020jvt_pf_ftf_bdl1r60_2j55_pf_ftf_0eta320_L14J15p0ETA25:
eventCount: 0
stepCounts:
- 0: 7
- 1: 3
+ 0: 9
+ 1: 4
stepFeatures:
- 0: 14
- 1: 26
- 2: 3
+ 0: 18
+ 1: 33
+ 2: 2
HLT_2mu10_bJpsimumu_L12MU10:
eventCount: 0
stepCounts:
- 0: 3
+ 0: 2
1: 1
2: 1
3: 1
stepFeatures:
- 0: 6
- 1: 6
+ 0: 4
+ 1: 3
2: 2
3: 2
4: 2
HLT_2mu10_bJpsimumu_L12MU8F:
eventCount: 0
stepCounts:
- 0: 3
+ 0: 2
1: 1
2: 1
3: 1
stepFeatures:
- 0: 6
- 1: 6
+ 0: 4
+ 1: 3
2: 2
3: 2
4: 2
HLT_2mu10_bUpsimumu_L12MU10:
eventCount: 0
stepCounts:
- 0: 3
+ 0: 2
1: 1
2: 1
3: 1
stepFeatures:
- 0: 6
- 1: 6
+ 0: 4
+ 1: 3
2: 2
3: 2
4: 2
HLT_2mu10_bUpsimumu_L12MU8F:
eventCount: 0
stepCounts:
- 0: 3
+ 0: 2
1: 1
2: 1
3: 1
stepFeatures:
- 0: 6
- 1: 6
+ 0: 4
+ 1: 3
2: 2
3: 2
4: 2
HLT_2mu10_l2mt_L1MU10:
- eventCount: 2
- stepCounts:
- 0: 2
- 1: 2
- 2: 2
- 3: 2
- stepFeatures:
- 0: 4
- 1: 4
- 2: 4
- 3: 4
+ eventCount: 0
HLT_2mu14_L12MU10:
eventCount: 1
stepCounts:
- 0: 3
+ 0: 2
1: 1
2: 1
3: 1
stepFeatures:
- 0: 6
+ 0: 4
1: 2
2: 2
3: 2
HLT_2mu14_L12MU8F:
eventCount: 1
stepCounts:
- 0: 3
+ 0: 2
1: 1
2: 1
3: 1
stepFeatures:
- 0: 6
+ 0: 4
1: 2
2: 2
3: 2
HLT_2mu14_l2io_L12MU10:
eventCount: 1
stepCounts:
- 0: 3
- 1: 2
+ 0: 2
+ 1: 1
2: 1
3: 1
stepFeatures:
- 0: 6
- 1: 5
+ 0: 4
+ 1: 2
2: 2
3: 2
HLT_2mu15_L12MU10:
eventCount: 1
stepCounts:
- 0: 3
+ 0: 2
1: 1
2: 1
3: 1
stepFeatures:
- 0: 6
+ 0: 4
1: 2
2: 2
3: 2
HLT_2mu15_L12MU8F:
eventCount: 1
stepCounts:
- 0: 3
+ 0: 2
1: 1
2: 1
3: 1
stepFeatures:
- 0: 6
+ 0: 4
1: 2
2: 2
3: 2
HLT_2mu4_L12MU4:
- eventCount: 4
+ eventCount: 3
stepCounts:
0: 4
- 1: 4
- 2: 4
- 3: 4
+ 1: 3
+ 2: 3
+ 3: 3
stepFeatures:
0: 8
- 1: 8
- 2: 12
- 3: 10
+ 1: 6
+ 2: 10
+ 3: 8
HLT_2mu4_bBmumu_L1BPH-2M9-0DR15-2MU4:
eventCount: 0
HLT_2mu4_bBmumu_Lxy0_L1BPH-2M9-0DR15-2MU4:
@@ -441,268 +501,266 @@ HLT_2mu4_bBmumux_BcmumuDsloose_L12MU4:
eventCount: 0
stepCounts:
0: 4
- 1: 2
- 2: 2
+ 1: 3
+ 2: 3
3: 1
stepFeatures:
- 0: 8
- 1: 13
- 2: 5
- 3: 4
- 4: 2
+ 0: 9
+ 1: 9
+ 2: 10
+ 3: 8
+ 4: 4
HLT_2mu4_bBmumux_BcmumuPi_L12MU4:
eventCount: 0
stepCounts:
0: 4
- 1: 2
- 2: 2
+ 1: 3
+ 2: 3
3: 1
stepFeatures:
- 0: 8
- 1: 13
- 2: 5
- 3: 4
- 4: 2
+ 0: 9
+ 1: 9
+ 2: 10
+ 3: 8
+ 4: 4
HLT_2mu4_bBmumux_BdmumuKst_L12MU4:
eventCount: 1
stepCounts:
0: 4
- 1: 2
- 2: 2
+ 1: 3
+ 2: 3
3: 1
4: 1
stepFeatures:
- 0: 8
- 1: 13
- 2: 5
- 3: 4
- 4: 2
+ 0: 9
+ 1: 9
+ 2: 10
+ 3: 8
+ 4: 4
HLT_2mu4_bBmumux_BpmumuKp_L12MU4:
eventCount: 1
stepCounts:
0: 4
- 1: 2
- 2: 2
+ 1: 3
+ 2: 3
3: 1
4: 1
stepFeatures:
- 0: 8
- 1: 13
- 2: 5
- 3: 4
- 4: 2
+ 0: 9
+ 1: 9
+ 2: 10
+ 3: 8
+ 4: 4
HLT_2mu4_bBmumux_BpmumuKp_L1BPH-2M9-0DR15-2MU4:
eventCount: 0
HLT_2mu4_bBmumux_BsmumuPhi_L12MU4:
- eventCount: 1
+ eventCount: 0
stepCounts:
0: 4
- 1: 2
- 2: 2
+ 1: 3
+ 2: 3
3: 1
- 4: 1
stepFeatures:
- 0: 8
- 1: 13
- 2: 5
- 3: 4
- 4: 2
+ 0: 9
+ 1: 9
+ 2: 10
+ 3: 8
+ 4: 4
HLT_2mu4_bBmumux_BsmumuPhi_L1BPH-2M9-0DR15-2MU4:
eventCount: 0
HLT_2mu4_bBmumux_LbPqKm_L12MU4:
eventCount: 0
stepCounts:
0: 4
- 1: 2
- 2: 2
+ 1: 3
+ 2: 3
3: 1
stepFeatures:
- 0: 8
- 1: 13
- 2: 5
- 3: 4
- 4: 2
+ 0: 9
+ 1: 9
+ 2: 10
+ 3: 8
+ 4: 4
HLT_2mu4_bDimu_L12MU4:
eventCount: 1
stepCounts:
0: 4
- 1: 2
- 2: 2
- 3: 2
+ 1: 3
+ 2: 3
+ 3: 3
4: 1
stepFeatures:
- 0: 8
- 1: 13
- 2: 5
- 3: 4
- 4: 4
+ 0: 9
+ 1: 9
+ 2: 10
+ 3: 8
+ 4: 8
HLT_2mu4_bJpsimumu_L12MU4:
eventCount: 1
stepCounts:
0: 4
- 1: 2
- 2: 2
- 3: 2
+ 1: 3
+ 2: 3
+ 3: 3
4: 1
stepFeatures:
- 0: 8
- 1: 13
- 2: 5
- 3: 4
- 4: 4
+ 0: 9
+ 1: 9
+ 2: 10
+ 3: 8
+ 4: 8
HLT_2mu4_bJpsimumu_Lxy0_L1BPH-2M9-0DR15-2MU4:
eventCount: 0
HLT_2mu4_bUpsimumu_L12MU4:
eventCount: 0
stepCounts:
0: 4
- 1: 2
- 2: 2
- 3: 2
+ 1: 3
+ 2: 3
+ 3: 3
stepFeatures:
- 0: 8
- 1: 13
- 2: 5
- 3: 4
- 4: 4
+ 0: 9
+ 1: 9
+ 2: 10
+ 3: 8
+ 4: 8
HLT_2mu4_muonqual_L12MU4:
- eventCount: 4
+ eventCount: 3
stepCounts:
0: 4
- 1: 4
- 2: 4
- 3: 4
+ 1: 3
+ 2: 3
+ 3: 3
stepFeatures:
0: 8
- 1: 8
- 2: 12
- 3: 10
+ 1: 6
+ 2: 10
+ 3: 8
HLT_2mu4_noL2Comb_bBmumux_BcmumuPi_L12MU4:
eventCount: 0
stepCounts:
0: 4
- 1: 2
- 2: 2
+ 1: 3
+ 2: 3
3: 1
stepFeatures:
- 0: 8
- 1: 8
- 2: 8
- 3: 6
+ 0: 9
+ 1: 9
+ 2: 10
+ 3: 8
4: 4
HLT_2mu4_noL2Comb_bBmumux_BdmumuKst_L12MU4:
eventCount: 1
stepCounts:
0: 4
- 1: 2
- 2: 2
+ 1: 3
+ 2: 3
3: 1
4: 1
stepFeatures:
- 0: 8
- 1: 8
- 2: 8
- 3: 6
+ 0: 9
+ 1: 9
+ 2: 10
+ 3: 8
4: 4
HLT_2mu4_noL2Comb_bBmumux_BpmumuKp_L12MU4:
eventCount: 1
stepCounts:
0: 4
- 1: 2
- 2: 2
+ 1: 3
+ 2: 3
3: 1
4: 1
stepFeatures:
- 0: 8
- 1: 8
- 2: 8
- 3: 6
+ 0: 9
+ 1: 9
+ 2: 10
+ 3: 8
4: 4
HLT_2mu4_noL2Comb_bBmumux_BsmumuPhi_L12MU4:
- eventCount: 1
+ eventCount: 0
stepCounts:
0: 4
- 1: 2
- 2: 2
+ 1: 3
+ 2: 3
3: 1
- 4: 1
stepFeatures:
- 0: 8
- 1: 8
- 2: 8
- 3: 6
+ 0: 9
+ 1: 9
+ 2: 10
+ 3: 8
4: 4
HLT_2mu4_noL2Comb_bBmumux_LbPqKm_L12MU4:
eventCount: 0
stepCounts:
0: 4
- 1: 2
- 2: 2
+ 1: 3
+ 2: 3
3: 1
stepFeatures:
- 0: 8
- 1: 8
- 2: 8
- 3: 6
+ 0: 9
+ 1: 9
+ 2: 10
+ 3: 8
4: 4
HLT_2mu4_noL2Comb_bJpsimumu_L12MU4:
eventCount: 1
stepCounts:
0: 4
- 1: 2
- 2: 2
- 3: 2
+ 1: 3
+ 2: 3
+ 3: 3
4: 1
stepFeatures:
- 0: 8
- 1: 8
- 2: 8
- 3: 6
- 4: 6
+ 0: 9
+ 1: 9
+ 2: 10
+ 3: 8
+ 4: 8
HLT_2mu50_msonly_L1MU20:
eventCount: 0
stepCounts:
- 0: 2
+ 0: 1
stepFeatures:
- 0: 4
+ 0: 2
HLT_2mu6_10invm70_L1MU6:
eventCount: 2
stepCounts:
- 0: 4
+ 0: 3
1: 3
2: 3
3: 2
stepFeatures:
- 0: 8
+ 0: 6
1: 6
2: 8
- 3: 8
+ 3: 7
HLT_2mu6_10invmAA70_L1MU6:
eventCount: 2
stepCounts:
- 0: 4
+ 0: 3
1: 3
2: 3
3: 2
stepFeatures:
- 0: 8
+ 0: 6
1: 6
2: 8
- 3: 8
+ 3: 7
HLT_2mu6_2j50_0eta490_j0_DJMASS900j50_L1MJJ-500-NFF:
eventCount: 0
HLT_2mu6_L12MU6:
eventCount: 3
stepCounts:
- 0: 4
+ 0: 3
1: 3
2: 3
3: 3
stepFeatures:
- 0: 8
+ 0: 6
1: 6
2: 8
- 3: 8
+ 3: 7
HLT_2mu6_bBmumu_L1BPH-2M9-2DR15-2MU6:
eventCount: 0
HLT_2mu6_bBmumu_Lxy0_L1BPH-2M9-2DR15-2MU6:
@@ -712,63 +770,62 @@ HLT_2mu6_bBmumux_BpmumuKp_L1BPH-2M9-2DR15-2MU6:
HLT_2mu6_bBmumux_BpmumuKp_L1LFV-MU6:
eventCount: 1
stepCounts:
- 0: 4
- 1: 2
- 2: 2
+ 0: 3
+ 1: 3
+ 2: 3
3: 1
4: 1
stepFeatures:
- 0: 8
- 1: 9
- 2: 4
- 3: 4
- 4: 2
+ 0: 6
+ 1: 8
+ 2: 8
+ 3: 7
+ 4: 3
HLT_2mu6_bBmumux_BsmumuPhi_L1BPH-2M9-2DR15-2MU6:
eventCount: 0
HLT_2mu6_bBmumux_BsmumuPhi_L1LFV-MU6:
- eventCount: 1
+ eventCount: 0
stepCounts:
- 0: 4
- 1: 2
- 2: 2
+ 0: 3
+ 1: 3
+ 2: 3
3: 1
- 4: 1
stepFeatures:
- 0: 8
- 1: 9
- 2: 4
- 3: 4
- 4: 2
+ 0: 6
+ 1: 8
+ 2: 8
+ 3: 7
+ 4: 3
HLT_2mu6_bDimu_L12MU6:
eventCount: 1
stepCounts:
- 0: 4
- 1: 2
- 2: 2
- 3: 2
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
4: 1
stepFeatures:
- 0: 8
- 1: 9
- 2: 4
- 3: 4
- 4: 4
+ 0: 6
+ 1: 8
+ 2: 8
+ 3: 7
+ 4: 7
HLT_2mu6_bDimu_L1BPH-2M9-2DR15-2MU6:
eventCount: 0
HLT_2mu6_bDimu_L1LFV-MU6:
eventCount: 1
stepCounts:
- 0: 4
- 1: 2
- 2: 2
- 3: 2
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
4: 1
stepFeatures:
- 0: 8
- 1: 9
- 2: 4
- 3: 4
- 4: 4
+ 0: 6
+ 1: 8
+ 2: 8
+ 3: 7
+ 4: 7
HLT_2mu6_bJpsimumu_L1BPH-2M9-2DR15-2MU6:
eventCount: 0
HLT_2mu6_bJpsimumu_Lxy0_L1BPH-2M9-2DR15-2MU6:
@@ -776,30 +833,30 @@ HLT_2mu6_bJpsimumu_Lxy0_L1BPH-2M9-2DR15-2MU6:
HLT_2mu6_bPhi_L1LFV-MU6:
eventCount: 0
stepCounts:
- 0: 4
- 1: 2
- 2: 2
- 3: 2
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
stepFeatures:
- 0: 8
- 1: 9
- 2: 4
- 3: 4
- 4: 4
+ 0: 6
+ 1: 8
+ 2: 8
+ 3: 7
+ 4: 7
HLT_2mu6_bUpsimumu_L1BPH-8M15-0DR22-2MU6:
eventCount: 0
HLT_2mu6_l2io_L12MU6:
eventCount: 3
stepCounts:
- 0: 4
+ 0: 3
1: 3
2: 3
3: 3
stepFeatures:
- 0: 8
- 1: 9
- 2: 6
- 3: 6
+ 0: 6
+ 1: 8
+ 2: 8
+ 3: 7
HLT_2mu6_mu4_bTau_L12MU6_3MU4:
eventCount: 0
HLT_2mu6_mu4_bUpsi_L12MU6_3MU4:
@@ -807,143 +864,187 @@ HLT_2mu6_mu4_bUpsi_L12MU6_3MU4:
HLT_2mu6_muonqual_L12MU6:
eventCount: 3
stepCounts:
- 0: 4
+ 0: 3
1: 3
2: 3
3: 3
stepFeatures:
- 0: 8
+ 0: 6
1: 6
2: 8
- 3: 8
+ 3: 7
HLT_2mu6_noL2Comb_bJpsimumu_L12MU6:
eventCount: 1
stepCounts:
- 0: 4
- 1: 2
- 2: 2
- 3: 2
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
4: 1
stepFeatures:
- 0: 8
- 1: 8
- 2: 6
- 3: 6
- 4: 6
+ 0: 6
+ 1: 6
+ 2: 8
+ 3: 7
+ 4: 7
HLT_3j200_L1J100:
- eventCount: 0
-HLT_3j200_ftf_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 1
stepFeatures:
0: 3
-HLT_3j200_pf_ftf_L1J100:
- eventCount: 0
+HLT_3j200_ftf_L1J100:
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 3
-HLT_3j20_pf_ftf_020jvt_j20_0eta290_pf_ftf_boffperf_L1HT190-J15s5pETA21:
- eventCount: 4
+ 0: 5
+ 1: 3
+HLT_3j200_pf_ftf_L1J100:
+ eventCount: 1
stepCounts:
- 0: 4
- 1: 4
- 2: 4
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 8
- 1: 71
- 2: 38
+ 0: 5
+ 1: 3
+HLT_3j20_pf_ftf_020jvt_j20_0eta290_pf_ftf_boffperf_L1HT190-J15s5pETA21:
+ eventCount: 5
+ stepCounts:
+ 0: 5
+ 1: 5
+ 2: 5
+ stepFeatures:
+ 0: 10
+ 1: 79
+ 2: 43
HLT_3j35_0eta290_020jvt_pf_ftf_bdl1r70_j35_pf_ftf_0eta320_L14J15p0ETA25:
eventCount: 0
stepCounts:
- 0: 7
- 1: 4
+ 0: 9
+ 1: 8
stepFeatures:
- 0: 14
- 1: 45
- 2: 4
+ 0: 18
+ 1: 90
+ 2: 6
HLT_3j35_pf_ftf_bdl1r60_xe50_cell_xe70_pfopufit_L13J15p0ETA25_XE40:
eventCount: 0
stepCounts:
0: 7
- 1: 6
+ 1: 4
stepFeatures:
0: 25
- 1: 31
- 2: 4
+ 1: 37
+ 2: 2
HLT_3j35_pf_ftf_bdl1r60_xe50_cell_xe70_tcpufit_L13J15p0ETA25_XE40:
eventCount: 0
stepCounts:
- 0: 6
- 1: 5
+ 0: 4
+ 1: 4
stepFeatures:
- 0: 24
- 1: 21
- 2: 4
+ 0: 21
+ 1: 19
+ 2: 3
HLT_3j65_0eta290_020jvt_pf_ftf_bdl1r60_L1J45p0ETA21_3J15p0ETA25:
eventCount: 0
stepCounts:
- 0: 9
- 1: 4
+ 0: 12
+ 1: 6
stepFeatures:
- 0: 9
- 1: 15
+ 0: 12
+ 1: 20
2: 4
HLT_3j65_0eta290_020jvt_pf_ftf_bdl1r70_L1J45p0ETA21_3J15p0ETA25:
eventCount: 0
stepCounts:
- 0: 9
- 1: 4
+ 0: 12
+ 1: 6
stepFeatures:
- 0: 9
- 1: 15
+ 0: 12
+ 1: 20
2: 5
HLT_3j65_0eta290_020jvt_pf_ftf_bdl1r77_L13J35p0ETA23:
eventCount: 0
stepCounts:
- 0: 4
- 1: 4
+ 0: 5
+ 1: 5
stepFeatures:
- 0: 4
- 1: 15
+ 0: 5
+ 1: 17
2: 5
HLT_3j65_0eta290_020jvt_pf_ftf_bdl1r77_L1J45p0ETA21_3J15p0ETA25:
eventCount: 0
stepCounts:
- 0: 9
- 1: 4
+ 0: 12
+ 1: 6
stepFeatures:
- 0: 9
- 1: 15
+ 0: 12
+ 1: 20
2: 5
HLT_3j65_0eta290_020jvt_pf_ftf_bdl1r85_L1J45p0ETA21_3J15p0ETA25:
eventCount: 0
stepCounts:
- 0: 9
- 1: 4
+ 0: 12
+ 1: 6
stepFeatures:
- 0: 9
- 1: 15
- 2: 6
+ 0: 12
+ 1: 20
+ 2: 7
HLT_3mu4_bDimu2700_L13MU4:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_3mu4_bJpsi_L13MU3V:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_3mu4_bJpsi_L13MU4:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_3mu4_bPhi_L13MU3V:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_3mu4_bPhi_L13MU4:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_3mu4_bTau_L13MU3V:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_3mu4_bTau_L13MU4:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_3mu4_bUpsi_L13MU3V:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_3mu4_bUpsi_L13MU4:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_3mu6_L13MU5VF:
eventCount: 0
HLT_3mu6_L13MU6:
@@ -971,118 +1072,130 @@ HLT_3mu8_msonly_L13MU5VF:
HLT_3mu8_msonly_L13MU6:
eventCount: 0
HLT_4j115_ftf_L13J50:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 2
+ 0: 3
+ 1: 1
stepFeatures:
- 0: 2
+ 0: 3
+ 1: 4
HLT_4j115_pf_ftf_presel4j33_L13J50:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 2
+ 0: 3
+ 1: 1
stepFeatures:
- 0: 2
+ 0: 3
+ 1: 4
HLT_4j115_pf_ftf_presel4j55_L13J50:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 1
+ 0: 2
+ 1: 1
stepFeatures:
- 0: 1
+ 0: 2
+ 1: 4
HLT_4j115_pf_ftf_presel4j85_L13J50:
- eventCount: 0
+ eventCount: 1
stepCounts:
0: 1
+ 1: 1
stepFeatures:
0: 1
+ 1: 4
HLT_4j120_L13J50:
- eventCount: 0
-HLT_4j20_0eta290_pf_ftf_boffperf_L1HT190-J15s5pETA21:
- eventCount: 4
+ eventCount: 1
stepCounts:
- 0: 4
- 1: 4
- 2: 4
+ 0: 1
stepFeatures:
0: 4
- 1: 38
- 2: 38
+HLT_4j20_0eta290_pf_ftf_boffperf_L1HT190-J15s5pETA21:
+ eventCount: 5
+ stepCounts:
+ 0: 5
+ 1: 5
+ 2: 5
+ stepFeatures:
+ 0: 5
+ 1: 43
+ 2: 43
HLT_4j20_pf_ftf_020jvt_boffperf_L1HT190-J15s5pETA21:
- eventCount: 4
+ eventCount: 5
stepCounts:
- 0: 4
- 1: 4
- 2: 4
+ 0: 5
+ 1: 5
+ 2: 5
stepFeatures:
- 0: 4
- 1: 32
- 2: 32
+ 0: 5
+ 1: 33
+ 2: 33
HLT_4j20_pf_ftf_020jvt_boffperf_L1J45p0ETA21_3J15p0ETA25:
- eventCount: 9
+ eventCount: 11
stepCounts:
- 0: 9
- 1: 9
- 2: 9
+ 0: 12
+ 1: 11
+ 2: 11
stepFeatures:
- 0: 9
- 1: 69
- 2: 69
+ 0: 12
+ 1: 75
+ 2: 75
HLT_4j33_L13J50:
- eventCount: 2
+ eventCount: 3
stepCounts:
- 0: 2
+ 0: 3
stepFeatures:
- 0: 10
+ 0: 18
HLT_4j35_0eta290_020jvt_pf_ftf_bdl1r60_L1J45p0ETA21_3J15p0ETA25:
eventCount: 0
stepCounts:
- 0: 9
- 1: 5
+ 0: 12
+ 1: 9
stepFeatures:
- 0: 9
- 1: 26
- 2: 3
+ 0: 12
+ 1: 45
+ 2: 8
HLT_4j35_0eta290_020jvt_pf_ftf_bdl1r70_L1J45p0ETA21_3J15p0ETA25:
eventCount: 0
stepCounts:
- 0: 9
- 1: 5
+ 0: 12
+ 1: 9
stepFeatures:
- 0: 9
- 1: 26
- 2: 5
+ 0: 12
+ 1: 45
+ 2: 9
HLT_4j35_0eta290_020jvt_pf_ftf_bdl1r77_L14J15p0ETA25:
eventCount: 0
stepCounts:
- 0: 7
- 1: 4
+ 0: 9
+ 1: 8
stepFeatures:
- 0: 7
- 1: 22
+ 0: 9
+ 1: 43
2: 6
HLT_4j35_0eta290_020jvt_pf_ftf_bdl1r77_L1J45p0ETA21_3J15p0ETA25:
eventCount: 0
stepCounts:
- 0: 9
- 1: 5
+ 0: 12
+ 1: 9
stepFeatures:
- 0: 9
- 1: 26
- 2: 7
+ 0: 12
+ 1: 45
+ 2: 9
HLT_4j35_0eta290_020jvt_pf_ftf_bdl1r85_L1J45p0ETA21_3J15p0ETA25:
eventCount: 0
stepCounts:
- 0: 9
- 1: 5
+ 0: 12
+ 1: 9
stepFeatures:
- 0: 9
- 1: 26
- 2: 9
+ 0: 12
+ 1: 45
+ 2: 13
HLT_4j55_L13J50:
- eventCount: 1
+ eventCount: 2
stepCounts:
- 0: 1
+ 0: 2
stepFeatures:
- 0: 5
+ 0: 8
HLT_4j85_L13J50:
eventCount: 1
stepCounts:
@@ -1098,443 +1211,499 @@ HLT_4mu4_bDimu6000_L14MU3V:
HLT_4mu4_bDimu6000_L14MU4:
eventCount: 0
HLT_5j24_L14J15:
- eventCount: 8
+ eventCount: 13
stepCounts:
- 0: 8
+ 0: 13
stepFeatures:
- 0: 71
+ 0: 108
HLT_5j25_pf_ftf_0eta240_020jvt_j25_pf_ftf_0eta240_020jvt_bdl1r60_L14J15:
- eventCount: 3
+ eventCount: 2
stepCounts:
- 0: 9
- 1: 3
- 2: 3
+ 0: 13
+ 1: 5
+ 2: 2
stepFeatures:
- 0: 18
- 1: 44
- 2: 3
+ 0: 26
+ 1: 68
+ 2: 2
HLT_5j25_pf_ftf_0eta240_j25_pf_ftf_0eta240_boffperf_L14J15:
- eventCount: 5
+ eventCount: 9
stepCounts:
- 0: 9
- 1: 5
- 2: 5
+ 0: 13
+ 1: 9
+ 2: 9
stepFeatures:
- 0: 18
- 1: 72
- 2: 36
+ 0: 26
+ 1: 128
+ 2: 64
HLT_5j35_L14J15:
eventCount: 8
stepCounts:
0: 8
stepFeatures:
- 0: 42
+ 0: 47
HLT_5j35_pf_ftf_0eta240_020jvt_j25_pf_ftf_0eta240_020jvt_bdl1r60_L14J15:
- eventCount: 3
- stepCounts:
- 0: 9
- 1: 3
- 2: 3
- stepFeatures:
- 0: 18
- 1: 40
- 2: 3
-HLT_5j45_pf_ftf_0eta240_020jvt_j25_pf_ftf_0eta240_020jvt_bdl1r60_L14J15:
eventCount: 2
stepCounts:
- 0: 9
- 1: 2
+ 0: 13
+ 1: 5
2: 2
stepFeatures:
- 0: 18
- 1: 24
+ 0: 26
+ 1: 60
2: 2
+HLT_5j45_pf_ftf_0eta240_020jvt_j25_pf_ftf_0eta240_020jvt_bdl1r60_L14J15:
+ eventCount: 0
+ stepCounts:
+ 0: 13
+ 1: 1
+ stepFeatures:
+ 0: 26
+ 1: 11
HLT_5j50_L14J15:
eventCount: 2
stepCounts:
0: 2
stepFeatures:
- 0: 10
+ 0: 11
HLT_5j70_0eta240_L14J15:
- eventCount: 1
- stepCounts:
- 0: 1
- stepFeatures:
- 0: 5
+ eventCount: 0
HLT_5j70_ftf_0eta240_L14J15:
- eventCount: 1
+ eventCount: 0
stepCounts:
- 0: 9
- 1: 1
+ 0: 13
stepFeatures:
- 0: 9
- 1: 5
+ 0: 13
HLT_5j70_pf_ftf_0eta240_presel5j24_L14J15:
- eventCount: 1
+ eventCount: 0
stepCounts:
- 0: 8
- 1: 1
+ 0: 13
stepFeatures:
- 0: 8
- 1: 5
+ 0: 13
HLT_5j70_pf_ftf_0eta240_presel5j35_L14J15:
- eventCount: 1
+ eventCount: 0
stepCounts:
0: 8
- 1: 1
stepFeatures:
0: 8
- 1: 5
HLT_5j70_pf_ftf_0eta240_presel5j50_L14J15:
- eventCount: 1
+ eventCount: 0
stepCounts:
0: 2
- 1: 1
stepFeatures:
0: 2
- 1: 5
HLT_5j85_L14J15:
eventCount: 0
HLT_5j85_ftf_L14J15:
eventCount: 0
stepCounts:
- 0: 9
+ 0: 13
stepFeatures:
- 0: 9
+ 0: 13
HLT_5j85_pf_ftf_presel5j24_L14J15:
- eventCount: 1
+ eventCount: 0
stepCounts:
- 0: 8
- 1: 1
+ 0: 13
stepFeatures:
- 0: 8
- 1: 5
+ 0: 13
HLT_5j85_pf_ftf_presel5j35_L14J15:
- eventCount: 1
+ eventCount: 0
stepCounts:
0: 8
- 1: 1
stepFeatures:
0: 8
- 1: 5
HLT_5j85_pf_ftf_presel5j50_L14J15:
- eventCount: 1
+ eventCount: 0
stepCounts:
0: 2
- 1: 1
stepFeatures:
0: 2
- 1: 5
HLT_6j25_0eta240_L14J15:
- eventCount: 7
+ eventCount: 12
stepCounts:
- 0: 7
+ 0: 12
stepFeatures:
- 0: 57
+ 0: 91
HLT_6j25_ftf_0eta240_010jvt_L14J15:
- eventCount: 3
+ eventCount: 4
stepCounts:
- 0: 9
- 1: 3
+ 0: 13
+ 1: 4
stepFeatures:
- 0: 9
- 1: 19
+ 0: 13
+ 1: 28
HLT_6j25_ftf_0eta240_020jvt_L14J15:
eventCount: 3
stepCounts:
- 0: 9
+ 0: 13
1: 3
stepFeatures:
- 0: 9
- 1: 19
+ 0: 13
+ 1: 20
HLT_6j25_ftf_0eta240_050jvt_L14J15:
eventCount: 3
stepCounts:
- 0: 9
+ 0: 13
1: 3
stepFeatures:
- 0: 9
+ 0: 13
1: 19
HLT_6j25_ftf_0eta240_L14J15:
- eventCount: 7
+ eventCount: 11
stepCounts:
- 0: 9
- 1: 7
+ 0: 13
+ 1: 11
stepFeatures:
- 0: 9
- 1: 62
+ 0: 13
+ 1: 92
HLT_6j25_pf_ftf_0eta240_010jvt_L14J15:
- eventCount: 3
+ eventCount: 6
stepCounts:
- 0: 9
- 1: 3
+ 0: 13
+ 1: 6
stepFeatures:
- 0: 9
- 1: 22
+ 0: 13
+ 1: 40
HLT_6j25_pf_ftf_0eta240_020jvt_L14J15:
- eventCount: 3
+ eventCount: 5
stepCounts:
- 0: 9
- 1: 3
+ 0: 13
+ 1: 5
stepFeatures:
- 0: 9
- 1: 22
+ 0: 13
+ 1: 34
HLT_6j25_pf_ftf_0eta240_050jvt_L14J15:
eventCount: 3
stepCounts:
- 0: 9
+ 0: 13
1: 3
stepFeatures:
- 0: 9
- 1: 22
+ 0: 13
+ 1: 21
HLT_6j25_pf_ftf_0eta240_L14J15:
- eventCount: 5
+ eventCount: 9
stepCounts:
- 0: 9
- 1: 5
+ 0: 13
+ 1: 9
stepFeatures:
- 0: 9
- 1: 36
+ 0: 13
+ 1: 64
HLT_6j35_0eta240_L14J15:
- eventCount: 1
+ eventCount: 3
stepCounts:
- 0: 1
+ 0: 3
stepFeatures:
- 0: 6
+ 0: 19
HLT_6j35_ftf_0eta240_010jvt_L14J15:
eventCount: 1
stepCounts:
- 0: 9
+ 0: 13
1: 1
stepFeatures:
- 0: 9
+ 0: 13
1: 6
HLT_6j35_ftf_0eta240_020jvt_L14J15:
- eventCount: 1
+ eventCount: 0
stepCounts:
- 0: 9
- 1: 1
+ 0: 13
stepFeatures:
- 0: 9
- 1: 6
+ 0: 13
HLT_6j35_ftf_0eta240_050jvt_L14J15:
- eventCount: 1
+ eventCount: 0
stepCounts:
- 0: 9
- 1: 1
+ 0: 13
stepFeatures:
- 0: 9
- 1: 6
+ 0: 13
HLT_6j35_ftf_0eta240_L14J15:
- eventCount: 1
+ eventCount: 3
stepCounts:
- 0: 9
- 1: 1
+ 0: 13
+ 1: 3
stepFeatures:
- 0: 9
- 1: 6
+ 0: 13
+ 1: 20
HLT_6j35_pf_ftf_0eta240_010jvt_L14J15:
- eventCount: 3
+ eventCount: 1
stepCounts:
- 0: 9
- 1: 3
+ 0: 13
+ 1: 1
stepFeatures:
- 0: 9
- 1: 18
+ 0: 13
+ 1: 6
HLT_6j35_pf_ftf_0eta240_020jvt_L14J15:
- eventCount: 3
+ eventCount: 1
stepCounts:
- 0: 9
- 1: 3
+ 0: 13
+ 1: 1
stepFeatures:
- 0: 9
- 1: 18
+ 0: 13
+ 1: 6
HLT_6j35_pf_ftf_0eta240_050jvt_L14J15:
- eventCount: 3
+ eventCount: 1
stepCounts:
- 0: 9
- 1: 3
+ 0: 13
+ 1: 1
stepFeatures:
- 0: 9
- 1: 18
+ 0: 13
+ 1: 6
HLT_6j35_pf_ftf_0eta240_L14J15:
- eventCount: 3
+ eventCount: 4
stepCounts:
- 0: 9
- 1: 3
+ 0: 13
+ 1: 4
stepFeatures:
- 0: 9
- 1: 18
+ 0: 13
+ 1: 25
HLT_6j36_L14J15:
- eventCount: 1
+ eventCount: 4
stepCounts:
- 0: 1
+ 0: 4
stepFeatures:
- 0: 6
+ 0: 27
HLT_6j40_L14J15:
- eventCount: 0
+ eventCount: 2
+ stepCounts:
+ 0: 2
+ stepFeatures:
+ 0: 14
HLT_6j45_0eta240_L14J15:
eventCount: 0
HLT_6j45_L14J15:
- eventCount: 0
+ eventCount: 2
+ stepCounts:
+ 0: 2
+ stepFeatures:
+ 0: 13
HLT_6j45_ftf_0eta240_010jvt_L14J15:
eventCount: 0
stepCounts:
- 0: 9
+ 0: 13
stepFeatures:
- 0: 9
+ 0: 13
HLT_6j45_ftf_0eta240_020jvt_L14J15:
eventCount: 0
stepCounts:
- 0: 9
+ 0: 13
stepFeatures:
- 0: 9
+ 0: 13
HLT_6j45_ftf_0eta240_050jvt_L14J15:
eventCount: 0
stepCounts:
- 0: 9
+ 0: 13
stepFeatures:
- 0: 9
+ 0: 13
HLT_6j45_ftf_0eta240_L14J15:
eventCount: 0
stepCounts:
- 0: 9
+ 0: 13
stepFeatures:
- 0: 9
+ 0: 13
HLT_6j45_pf_ftf_0eta240_010jvt_L14J15:
eventCount: 0
stepCounts:
- 0: 9
+ 0: 13
stepFeatures:
- 0: 9
+ 0: 13
HLT_6j45_pf_ftf_0eta240_020jvt_L14J15:
eventCount: 0
stepCounts:
- 0: 9
+ 0: 13
stepFeatures:
- 0: 9
+ 0: 13
HLT_6j45_pf_ftf_0eta240_050jvt_L14J15:
eventCount: 0
stepCounts:
- 0: 9
+ 0: 13
stepFeatures:
- 0: 9
+ 0: 13
HLT_6j45_pf_ftf_0eta240_L14J15:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 9
+ 0: 13
+ 1: 1
stepFeatures:
- 0: 9
+ 0: 13
+ 1: 6
HLT_6j55_0eta240_L14J15:
eventCount: 0
HLT_6j55_ftf_0eta240_L14J15:
eventCount: 0
stepCounts:
- 0: 9
+ 0: 13
stepFeatures:
- 0: 9
+ 0: 13
HLT_6j55_pf_ftf_0eta240_presel6j36_L14J15:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 4
stepFeatures:
- 0: 1
+ 0: 4
HLT_6j55_pf_ftf_0eta240_presel6j40_L14J15:
eventCount: 0
+ stepCounts:
+ 0: 2
+ stepFeatures:
+ 0: 2
HLT_6j55_pf_ftf_0eta240_presel6j45_L14J15:
eventCount: 0
+ stepCounts:
+ 0: 2
+ stepFeatures:
+ 0: 2
HLT_6j70_L14J15:
eventCount: 0
HLT_6j70_ftf_L14J15:
eventCount: 0
stepCounts:
- 0: 9
+ 0: 13
stepFeatures:
- 0: 9
+ 0: 13
HLT_6j70_pf_ftf_presel6j36_L14J15:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 4
stepFeatures:
- 0: 1
+ 0: 4
HLT_6j70_pf_ftf_presel6j40_L14J15:
eventCount: 0
+ stepCounts:
+ 0: 2
+ stepFeatures:
+ 0: 2
HLT_6j70_pf_ftf_presel6j45_L14J15:
eventCount: 0
+ stepCounts:
+ 0: 2
+ stepFeatures:
+ 0: 2
HLT_7j21_L14J15:
- eventCount: 7
+ eventCount: 12
stepCounts:
- 0: 7
+ 0: 12
stepFeatures:
- 0: 84
+ 0: 131
HLT_7j28_L14J15:
- eventCount: 5
+ eventCount: 7
stepCounts:
- 0: 5
+ 0: 7
stepFeatures:
- 0: 41
+ 0: 59
HLT_7j35_L14J15:
- eventCount: 0
+ eventCount: 3
+ stepCounts:
+ 0: 3
+ stepFeatures:
+ 0: 21
HLT_7j45_L14J15:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 7
HLT_7j45_ftf_L14J15:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 9
+ 0: 13
+ 1: 1
stepFeatures:
- 0: 9
+ 0: 13
+ 1: 7
HLT_7j45_pf_ftf_presel7j21_L14J15:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 7
+ 0: 12
+ 1: 1
stepFeatures:
- 0: 7
+ 0: 12
+ 1: 7
HLT_7j45_pf_ftf_presel7j28_L14J15:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 5
+ 0: 7
+ 1: 1
stepFeatures:
- 0: 5
+ 0: 7
+ 1: 7
HLT_7j45_pf_ftf_presel7j35_L14J15:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 3
+ 1: 1
+ stepFeatures:
+ 0: 3
+ 1: 7
HLT_beamspot_allTE_trkfast_BeamSpotPEB_L1J15:
eventCount: 0
HLT_beamspot_trkFS_trkfast_BeamSpotPEB_L1J15:
eventCount: 0
HLT_e100_lhvloose_L1EM22VHI:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ stepFeatures:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
HLT_e10_lhmedium_ivarloose_j70_0eta320_j50_0eta490_j0_DJMASS900j50_L1MJJ-500-NFF:
eventCount: 0
stepCounts:
- 0: 3
- 1: 3
- 2: 2
- 3: 2
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
4: 1
stepFeatures:
- 0: 3
- 1: 10
+ 0: 2
+ 1: 7
2: 2
3: 2
4: 1
HLT_e10_lhvloose_L1EM7:
- eventCount: 6
+ eventCount: 7
stepCounts:
- 0: 9
- 1: 8
- 2: 6
- 3: 6
- 4: 6
- stepFeatures:
- 0: 12
- 1: 25
- 2: 9
- 3: 9
+ 0: 11
+ 1: 11
+ 2: 8
+ 3: 8
4: 7
+ stepFeatures:
+ 0: 16
+ 1: 50
+ 2: 11
+ 3: 11
+ 4: 8
HLT_e120_etcut_L1EM22VHI:
- eventCount: 0
+ eventCount: 2
+ stepCounts:
+ 0: 2
+ 1: 2
+ 2: 2
+ 3: 2
+ stepFeatures:
+ 0: 5
+ 1: 39
+ 2: 5
+ 3: 5
HLT_e120_lhvloose_L1EM22VHI:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ stepFeatures:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
HLT_e12_lhloose_2mu10_L12MU10:
eventCount: 0
HLT_e140_dnnloose_L1EM22VHI:
@@ -1547,165 +1716,142 @@ HLT_e140_lhloose_L1eEM22M:
eventCount: 0
HLT_e140_lhloose_noringer_L1EM22VHI:
eventCount: 0
+ stepCounts:
+ 0: 2
+ 1: 2
+ 2: 2
+ 3: 2
+ stepFeatures:
+ 0: 3
+ 1: 31
+ 2: 3
+ 3: 3
HLT_e14_lhtight_e4_etcut_1invmAB3_L1JPSI-1M5-EM12:
eventCount: 0
- stepFeatures:
- 0: 14
HLT_e14_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM12:
eventCount: 0
- stepFeatures:
- 0: 14
HLT_e14_lhtight_e4_etcut_probe_1invmAB3_L1JPSI-1M5-EM12:
eventCount: 0
HLT_e14_lhtight_noringer_e4_etcut_1invmAB3_L1JPSI-1M5-EM12:
eventCount: 0
- stepCounts:
- 0: 1
- 1: 1
- 2: 1
- 3: 1
- stepFeatures:
- 0: 15
- 1: 18
- 2: 12
- 3: 7
HLT_e14_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM12:
eventCount: 0
- stepCounts:
- 0: 1
- 1: 1
- 2: 1
- 3: 1
- stepFeatures:
- 0: 15
- 1: 18
- 2: 12
- 3: 7
HLT_e14_lhtight_noringer_e4_etcut_probe_1invmAB3_L1JPSI-1M5-EM12:
eventCount: 0
+HLT_e15_lhvloose_L1EM10VH:
+ eventCount: 7
stepCounts:
- 0: 1
- 1: 1
- 2: 1
- 3: 1
+ 0: 9
+ 1: 9
+ 2: 7
+ 3: 7
+ 4: 7
stepFeatures:
- 0: 1
- 1: 2
- 2: 1
- 3: 1
-HLT_e15_lhvloose_L1EM10VH:
- eventCount: 5
+ 0: 11
+ 1: 19
+ 2: 7
+ 3: 7
+ 4: 7
+HLT_e17_lhloose_mu14_L1EM15VH_MU10:
+ eventCount: 2
stepCounts:
- 0: 6
+ 0: 5
1: 5
2: 5
3: 5
4: 5
- stepFeatures:
- 0: 7
- 1: 12
- 2: 5
- 3: 5
- 4: 5
-HLT_e17_lhloose_mu14_L1EM15VH_MU10:
- eventCount: 2
- stepCounts:
- 0: 2
- 1: 2
- 2: 2
- 3: 2
- 4: 2
- 5: 2
+ 5: 5
6: 2
7: 2
8: 2
stepFeatures:
- 0: 2
- 1: 3
- 2: 2
- 3: 2
- 4: 2
- 5: 2
+ 0: 5
+ 1: 9
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
6: 2
7: 2
8: 2
HLT_e17_lhmedium_ivarloose_tau25_medium1_tracktwo_03dRAB_L1EM15VHI_2TAU12IM_4J12:
- eventCount: 0
+ eventCount: 1
stepCounts:
0: 4
- 1: 3
- 2: 3
- 3: 3
- 4: 2
- 5: 2
- 6: 2
- 7: 2
- 8: 2
- 9: 2
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 4
+ 6: 4
+ 7: 4
+ 8: 4
+ 9: 4
+ 10: 1
stepFeatures:
0: 4
- 1: 4
- 2: 3
- 3: 3
- 4: 2
- 5: 5
- 6: 5
- 7: 5
- 8: 3
- 9: 3
- 10: 2
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 12
+ 6: 12
+ 7: 12
+ 8: 8
+ 9: 8
+ 10: 4
HLT_e17_lhmedium_ivarloose_tau25_mediumRNN_tracktwoMVABDT_03dRAB_L1EM15VHI_2TAU12IM_4J12:
eventCount: 1
stepCounts:
0: 4
- 1: 3
- 2: 3
- 3: 3
- 4: 2
- 5: 2
- 6: 2
- 7: 2
- 8: 2
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 4
+ 6: 4
+ 7: 4
+ 8: 4
9: 1
stepFeatures:
0: 4
- 1: 4
- 2: 3
- 3: 3
- 4: 2
- 5: 5
- 6: 5
- 7: 5
- 8: 5
- 9: 3
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 12
+ 6: 12
+ 7: 12
+ 8: 12
+ 9: 4
HLT_e17_lhmedium_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1EM15VHI_2TAU12IM_4J12:
eventCount: 1
stepCounts:
0: 4
- 1: 3
- 2: 3
- 3: 3
- 4: 2
- 5: 2
- 6: 2
- 7: 2
- 8: 2
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 4
+ 6: 4
+ 7: 4
+ 8: 4
9: 1
stepFeatures:
0: 4
- 1: 4
- 2: 3
- 3: 3
- 4: 2
- 5: 5
- 6: 5
- 7: 5
- 8: 5
- 9: 3
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 12
+ 6: 12
+ 7: 12
+ 8: 12
+ 9: 4
HLT_e17_lhmedium_tau25_mediumRNN_tracktwoMVABDT_xe50_cell_03dRAB_L1EM15VHI_2TAU12IM_XE35:
- eventCount: 1
+ eventCount: 0
stepCounts:
- 0: 3
+ 0: 2
1: 2
2: 2
3: 2
@@ -1714,24 +1860,23 @@ HLT_e17_lhmedium_tau25_mediumRNN_tracktwoMVABDT_xe50_cell_03dRAB_L1EM15VHI_2TAU1
6: 2
7: 2
8: 2
- 9: 2
- 10: 1
+ 9: 1
stepFeatures:
- 0: 3
- 1: 3
+ 0: 2
+ 1: 2
2: 2
3: 2
4: 2
- 5: 5
- 6: 5
- 7: 5
- 8: 5
- 9: 3
+ 5: 7
+ 6: 7
+ 7: 7
+ 8: 7
+ 9: 1
10: 1
HLT_e17_lhmedium_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1EM15VHI_2TAU12IM_XE35:
- eventCount: 1
+ eventCount: 0
stepCounts:
- 0: 3
+ 0: 2
1: 2
2: 2
3: 2
@@ -1740,34 +1885,33 @@ HLT_e17_lhmedium_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1EM15VHI_2TAU12IM
6: 2
7: 2
8: 2
- 9: 2
- 10: 1
+ 9: 1
stepFeatures:
- 0: 3
- 1: 3
+ 0: 2
+ 1: 2
2: 2
3: 2
4: 2
- 5: 5
- 6: 5
- 7: 5
- 8: 5
- 9: 3
+ 5: 7
+ 6: 7
+ 7: 7
+ 8: 7
+ 9: 1
10: 1
HLT_e20_lhloose_L1EM7:
- eventCount: 5
+ eventCount: 6
stepCounts:
- 0: 6
- 1: 5
- 2: 5
- 3: 5
- 4: 5
- stepFeatures:
- 0: 6
+ 0: 7
1: 7
- 2: 5
- 3: 5
- 4: 5
+ 2: 6
+ 3: 6
+ 4: 6
+ stepFeatures:
+ 0: 7
+ 1: 11
+ 2: 6
+ 3: 6
+ 4: 6
HLT_e20_lhloose_L1EM7_AFP_A_AND_C:
eventCount: 0
HLT_e20_lhloose_L1EM7_AFP_A_OR_C:
@@ -1775,859 +1919,897 @@ HLT_e20_lhloose_L1EM7_AFP_A_OR_C:
HLT_e20_lhtight_ivarloose_L1ZAFB-25DPHI-eEM18M:
eventCount: 0
HLT_e20_lhvloose_L1EM15VH:
- eventCount: 4
+ eventCount: 6
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 4
+ 0: 7
+ 1: 7
+ 2: 6
+ 3: 6
+ 4: 6
stepFeatures:
- 0: 5
- 1: 6
- 2: 4
- 3: 4
- 4: 4
+ 0: 7
+ 1: 11
+ 2: 6
+ 3: 6
+ 4: 6
HLT_e24_lhmedium_g12_loose_g12_loose_02dRAB_02dRAC_L1EM20VH_3EM10VH:
eventCount: 0
stepCounts:
- 0: 1
- 1: 1
+ 0: 3
+ 1: 3
+ 2: 2
stepFeatures:
- 0: 13
- 1: 5
- 2: 5
+ 0: 31
+ 1: 21
+ 2: 19
+ 3: 8
HLT_e24_lhmedium_g25_medium_02dRAB_L12EM20VH:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 1
- 1: 1
- 2: 1
+ 0: 2
+ 1: 2
+ 2: 2
+ 3: 1
+ 4: 1
stepFeatures:
- 0: 6
- 1: 3
- 2: 3
- 3: 2
+ 0: 14
+ 1: 7
+ 2: 7
+ 3: 5
+ 4: 1
HLT_e24_lhmedium_ivarloose_tau20_medium1_tracktwo_03dRAB_L1EM22VHI:
- eventCount: 0
+ eventCount: 3
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 3
- 6: 3
- 7: 3
- 8: 3
- 9: 3
- stepFeatures:
- 0: 5
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 13
- 6: 13
- 7: 13
- 8: 6
- 9: 6
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
+ 6: 5
+ 7: 5
+ 8: 5
+ 9: 5
10: 3
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 20
+ 6: 20
+ 7: 20
+ 8: 14
+ 9: 14
+ 10: 7
HLT_e24_lhmedium_ivarloose_tau20_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI:
eventCount: 2
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 3
- 6: 3
- 7: 3
- 8: 3
+ 0: 6
+ 1: 6
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
+ 6: 5
+ 7: 5
+ 8: 5
9: 2
stepFeatures:
- 0: 5
- 1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 13
- 6: 13
- 7: 13
- 8: 13
- 9: 5
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 22
+ 6: 22
+ 7: 22
+ 8: 22
+ 9: 7
HLT_e24_lhmedium_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI:
- eventCount: 1
+ eventCount: 3
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 3
- 6: 3
- 7: 3
- 8: 3
- 9: 1
- stepFeatures:
- 0: 5
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 13
- 6: 13
- 7: 13
- 8: 13
- 9: 4
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
+ 6: 5
+ 7: 5
+ 8: 5
+ 9: 3
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 22
+ 6: 22
+ 7: 22
+ 8: 22
+ 9: 8
HLT_e24_lhmedium_mu8noL1_L1EM22VHI:
- eventCount: 2
+ eventCount: 3
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 4
- 5: 2
- 6: 2
- stepFeatures:
- 0: 5
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 4
- 5: 2
- 6: 2
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 3
+ 6: 3
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 3
+ 6: 3
HLT_e24_lhtight_ivarloose_L1EM22VHI:
- eventCount: 3
+ eventCount: 5
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- stepFeatures:
- 0: 5
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
-HLT_e24_lhvloose_2e12_lhvloose_L1EM20VH_3EM10VH:
- eventCount: 0
+ 2: 5
+ 3: 5
+ 4: 5
stepFeatures:
- 0: 3
-HLT_e250_etcut_L1EM22VHI:
- eventCount: 0
-HLT_e25_mergedtight_g35_medium_Heg_02dRAB_L12EM20VH:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+HLT_e24_lhvloose_2e12_lhvloose_L1EM20VH_3EM10VH:
eventCount: 0
stepCounts:
0: 1
1: 1
+ 2: 1
+ 3: 1
stepFeatures:
- 0: 5
- 1: 2
- 2: 2
-HLT_e26_dnnloose_L1EM22VHI:
- eventCount: 4
- stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 4
- stepFeatures:
- 0: 5
- 1: 6
- 2: 4
- 3: 4
- 4: 4
-HLT_e26_dnnmedium_L1EM22VHI:
- eventCount: 3
- stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- stepFeatures:
- 0: 5
- 1: 6
- 2: 4
- 3: 4
- 4: 3
-HLT_e26_dnntight_L1EM22VHI:
- eventCount: 3
- stepCounts:
- 0: 5
+ 0: 8
1: 4
2: 4
3: 4
4: 3
- stepFeatures:
- 0: 5
- 1: 6
- 2: 4
- 3: 4
- 4: 3
-HLT_e26_gsf_dnntight_ivarloose_L1EM22VHI:
- eventCount: 4
+HLT_e250_etcut_L1EM22VHI:
+ eventCount: 1
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 4
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
stepFeatures:
- 0: 5
- 1: 6
- 2: 4
- 3: 4
- 4: 4
-HLT_e26_gsf_lhtight_ivarloose_L1EM22VHI:
- eventCount: 4
+ 0: 2
+ 1: 27
+ 2: 2
+ 3: 2
+HLT_e25_mergedtight_g35_medium_Heg_02dRAB_L12EM20VH:
+ eventCount: 0
stepCounts:
- 0: 5
+ 0: 4
1: 4
2: 4
- 3: 4
- 4: 4
+ 3: 3
stepFeatures:
- 0: 5
- 1: 6
- 2: 4
- 3: 4
- 4: 4
-HLT_e26_idperf_gsf_tight_L1EM22VHI:
+ 0: 22
+ 1: 70
+ 2: 22
+ 3: 15
+ 4: 3
+HLT_e26_dnnloose_L1EM22VHI:
eventCount: 5
stepCounts:
- 0: 5
- 1: 5
+ 0: 6
+ 1: 6
2: 5
3: 5
4: 5
stepFeatures:
- 0: 5
- 1: 5
+ 0: 6
+ 1: 10
2: 5
3: 5
4: 5
-HLT_e26_idperf_loose_L1EM24VHI:
- eventCount: 5
+HLT_e26_dnnmedium_L1EM22VHI:
+ eventCount: 4
stepCounts:
- 0: 5
- 1: 5
+ 0: 6
+ 1: 6
+ 2: 5
+ 3: 5
+ 4: 4
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 4
+HLT_e26_dnntight_L1EM22VHI:
+ eventCount: 4
+ stepCounts:
+ 0: 6
+ 1: 6
+ 2: 5
+ 3: 5
+ 4: 4
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 4
+HLT_e26_gsf_dnntight_ivarloose_L1EM22VHI:
+ eventCount: 4
+ stepCounts:
+ 0: 6
+ 1: 6
+ 2: 5
+ 3: 5
+ 4: 4
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 4
+HLT_e26_gsf_lhtight_ivarloose_L1EM22VHI:
+ eventCount: 5
+ stepCounts:
+ 0: 6
+ 1: 6
2: 5
3: 5
4: 5
stepFeatures:
- 0: 5
- 1: 5
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+HLT_e26_idperf_gsf_tight_L1EM22VHI:
+ eventCount: 5
+ stepCounts:
+ 0: 6
+ 1: 6
+ 2: 5
+ 3: 5
+ 4: 5
+ stepFeatures:
+ 0: 6
+ 1: 6
+ 2: 5
+ 3: 5
+ 4: 5
+HLT_e26_idperf_loose_L1EM24VHI:
+ eventCount: 5
+ stepCounts:
+ 0: 6
+ 1: 6
+ 2: 5
+ 3: 5
+ 4: 5
+ stepFeatures:
+ 0: 6
+ 1: 6
2: 5
3: 5
4: 5
HLT_e26_idperf_loose_lrtloose_L1EM22VHI:
eventCount: 5
stepCounts:
- 0: 5
- 1: 5
+ 0: 6
+ 1: 6
2: 5
3: 5
4: 5
stepFeatures:
- 0: 5
- 1: 5
+ 0: 6
+ 1: 6
2: 5
3: 5
4: 5
HLT_e26_idperf_tight_L1EM22VHI:
eventCount: 5
stepCounts:
- 0: 5
- 1: 5
+ 0: 6
+ 1: 6
2: 5
3: 5
4: 5
stepFeatures:
- 0: 5
- 1: 5
+ 0: 6
+ 1: 6
2: 5
3: 5
4: 5
HLT_e26_lhloose_nopix_lrttight_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 5
+ 0: 6
1: 2
2: 2
3: 2
stepFeatures:
- 0: 5
- 1: 3
+ 0: 6
+ 1: 2
2: 2
3: 2
HLT_e26_lhloose_nopix_lrttight_probe_g25_medium_L1EM20VH:
eventCount: 0
HLT_e26_lhmedium_mu8noL1_L1EM22VHI:
- eventCount: 2
+ eventCount: 3
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 4
- 5: 2
- 6: 2
- stepFeatures:
- 0: 5
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 4
- 5: 2
- 6: 2
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 3
+ 6: 3
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 3
+ 6: 3
HLT_e26_lhmedium_nopix_lrttight_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 5
+ 0: 6
1: 2
2: 2
3: 2
stepFeatures:
- 0: 5
- 1: 3
+ 0: 6
+ 1: 2
2: 2
3: 2
HLT_e26_lhtight_L1EM22VHI:
+ eventCount: 5
+ stepCounts:
+ 0: 6
+ 1: 6
+ 2: 5
+ 3: 5
+ 4: 5
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+HLT_e26_lhtight_e15_etcut_50invmAB130_L1EM22VHI:
eventCount: 4
stepCounts:
0: 5
- 1: 4
+ 1: 5
2: 4
3: 4
4: 4
stepFeatures:
+ 0: 34
+ 1: 87
+ 2: 23
+ 3: 19
+ 4: 4
+HLT_e26_lhtight_e15_etcut_L1EM22VHI:
+ eventCount: 4
+ stepCounts:
0: 5
- 1: 6
+ 1: 5
2: 4
3: 4
4: 4
-HLT_e26_lhtight_e15_etcut_50invmAB130_L1EM22VHI:
- eventCount: 3
- stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 3
- stepFeatures:
- 0: 23
- 1: 65
- 2: 19
- 3: 16
- 4: 3
-HLT_e26_lhtight_e15_etcut_L1EM22VHI:
- eventCount: 3
- stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 3
stepFeatures:
- 0: 23
- 1: 65
- 2: 19
- 3: 16
- 4: 3
+ 0: 34
+ 1: 87
+ 2: 23
+ 3: 19
+ 4: 4
HLT_e26_lhtight_e15_etcut_Zee_L1EM22VHI:
- eventCount: 3
- stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 3
- stepFeatures:
- 0: 23
- 1: 65
- 2: 19
- 3: 16
- 4: 3
-HLT_e26_lhtight_e15_etcut_idperf_Zee_L1EM22VHI:
- eventCount: 3
- stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 3
- stepFeatures:
- 0: 23
- 1: 17
- 2: 19
- 3: 16
- 4: 3
-HLT_e26_lhtight_e15_etcut_probe_50invmAB130_L1EM22VHI:
- eventCount: 3
+ eventCount: 4
stepCounts:
0: 5
- 1: 4
+ 1: 5
2: 4
3: 4
4: 4
- 5: 3
- 6: 3
- 7: 3
- 8: 3
stepFeatures:
- 0: 5
- 1: 6
- 2: 4
- 3: 4
+ 0: 34
+ 1: 87
+ 2: 23
+ 3: 19
4: 4
- 5: 14
- 6: 61
- 7: 16
- 8: 13
-HLT_e26_lhtight_ivarloose_2j20_0eta290_020jvt_pf_ftf_boffperf_L1EM22VHI:
- eventCount: 3
+HLT_e26_lhtight_e15_etcut_idperf_Zee_L1EM22VHI:
+ eventCount: 4
stepCounts:
0: 5
- 1: 4
+ 1: 5
2: 4
3: 4
- 4: 3
- 5: 3
- 6: 3
- 7: 3
+ 4: 4
stepFeatures:
- 0: 5
- 1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 3
- 6: 21
- 7: 21
-HLT_e26_lhtight_ivarloose_L1EM22VHI:
- eventCount: 3
+ 0: 34
+ 1: 26
+ 2: 23
+ 3: 19
+ 4: 4
+HLT_e26_lhtight_e15_etcut_probe_50invmAB130_L1EM22VHI:
+ eventCount: 4
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
+ 0: 6
+ 1: 6
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 4
+ 6: 4
+ 7: 4
+ 8: 4
stepFeatures:
- 0: 5
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 18
+ 6: 74
+ 7: 17
+ 8: 15
+HLT_e26_lhtight_ivarloose_2j20_0eta290_020jvt_pf_ftf_boffperf_L1EM22VHI:
+ eventCount: 5
+ stepCounts:
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
+ 6: 5
+ 7: 5
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
+ 6: 31
+ 7: 31
+HLT_e26_lhtight_ivarloose_L1EM22VHI:
+ eventCount: 5
+ stepCounts:
+ 0: 6
+ 1: 6
+ 2: 5
+ 3: 5
+ 4: 5
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
HLT_e26_lhtight_ivarloose_L1eEM22M:
eventCount: 0
HLT_e26_lhtight_ivarloose_L1eEM22T:
eventCount: 0
HLT_e26_lhtight_ivarloose_e12_lhvloose_probe_L1EM22VHI:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
+ 0: 6
+ 1: 6
+ 2: 5
+ 3: 5
+ 4: 5
5: 1
6: 1
7: 1
8: 1
- stepFeatures:
- 0: 5
- 1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 4
- 6: 7
- 7: 2
- 8: 2
9: 1
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 7
+ 6: 3
+ 7: 3
+ 8: 3
+ 9: 2
HLT_e26_lhtight_ivarloose_e14_etcut_probe_L1EM22VHI:
- eventCount: 2
+ eventCount: 4
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 2
- 6: 2
- 7: 2
- 8: 2
- stepFeatures:
- 0: 5
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 11
- 6: 40
- 7: 14
- 8: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 4
+ 6: 4
+ 7: 4
+ 8: 4
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 18
+ 6: 74
+ 7: 20
+ 8: 17
HLT_e26_lhtight_ivarloose_e14_lhtight_noringer_probe_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- stepFeatures:
- 0: 5
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
+ 2: 5
+ 3: 5
+ 4: 5
5: 3
+ 6: 3
+ 7: 2
+ 8: 2
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 11
+ 6: 19
+ 7: 6
+ 8: 5
+ 9: 2
HLT_e26_lhtight_ivarloose_e14_lhtight_probe_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
+ 0: 6
+ 1: 6
+ 2: 5
+ 3: 5
+ 4: 5
5: 1
6: 1
- 7: 1
- 8: 1
stepFeatures:
- 0: 5
- 1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 4
- 6: 7
- 7: 2
- 8: 2
- 9: 1
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 7
+ 6: 3
+ 7: 1
HLT_e26_lhtight_ivarloose_e15_etcut_idperf_probe_L1EM22VHI:
- eventCount: 2
+ eventCount: 4
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 2
- 6: 2
- 7: 2
- 8: 2
- stepFeatures:
- 0: 5
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 11
- 6: 10
- 7: 13
- 8: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 4
+ 6: 4
+ 7: 4
+ 8: 4
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 18
+ 6: 17
+ 7: 17
+ 8: 15
HLT_e26_lhtight_ivarloose_e15_etcut_probe_L1EM22VHI:
- eventCount: 2
+ eventCount: 4
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 2
- 6: 2
- 7: 2
- 8: 2
- stepFeatures:
- 0: 5
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 11
- 6: 40
- 7: 13
- 8: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 4
+ 6: 4
+ 7: 4
+ 8: 4
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 18
+ 6: 74
+ 7: 17
+ 8: 15
HLT_e26_lhtight_ivarloose_e17_lhvloose_probe_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- stepFeatures:
- 0: 5
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 3
+ 2: 5
+ 3: 5
+ 4: 5
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
HLT_e26_lhtight_ivarloose_e20_lhtight_ivarloose_probe_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- stepFeatures:
- 0: 5
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 3
+ 2: 5
+ 3: 5
+ 4: 5
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
HLT_e26_lhtight_ivarloose_e24_lhvloose_probe_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- stepFeatures:
- 0: 5
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 3
+ 2: 5
+ 3: 5
+ 4: 5
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
HLT_e26_lhtight_ivarloose_e26_lhloose_nopix_lrttight_probe_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- stepFeatures:
- 0: 5
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 3
+ 2: 5
+ 3: 5
+ 4: 5
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
HLT_e26_lhtight_ivarloose_e26_lhtight_probe_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- stepFeatures:
- 0: 5
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 3
+ 2: 5
+ 3: 5
+ 4: 5
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
HLT_e26_lhtight_ivarloose_e4_etcut_probe_L1EM22VHI:
- eventCount: 3
+ eventCount: 5
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 3
- 6: 3
- 7: 3
- 8: 3
- stepFeatures:
- 0: 5
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 34
- 6: 100
- 7: 55
- 8: 28
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
+ 6: 5
+ 7: 5
+ 8: 5
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 49
+ 6: 151
+ 7: 80
+ 8: 41
HLT_e26_lhtight_ivarloose_e5_lhtight_noringer_probe_L1EM22VHI:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 2
- 6: 2
- 7: 2
- 8: 2
- stepFeatures:
- 0: 5
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 13
- 6: 29
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
+ 6: 5
7: 5
8: 5
- 9: 2
+ 9: 1
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 23
+ 6: 69
+ 7: 22
+ 8: 18
+ 9: 6
HLT_e26_lhtight_ivarloose_e5_lhtight_probe_L1EM22VHI:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 2
- 6: 2
+ 0: 6
+ 1: 6
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
+ 6: 4
7: 2
8: 2
+ 9: 1
stepFeatures:
- 0: 5
- 1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 15
- 6: 27
- 7: 5
- 8: 5
- 9: 2
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 18
+ 6: 26
+ 7: 10
+ 8: 8
+ 9: 3
HLT_e26_lhtight_ivarloose_e5_lhvloose_idperf_probe_L1EM22VHI:
- eventCount: 2
+ eventCount: 3
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 2
- 6: 2
- 7: 2
- 8: 2
- 9: 2
+ 0: 6
+ 1: 6
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
+ 6: 5
+ 7: 3
+ 8: 3
+ 9: 3
stepFeatures:
- 0: 5
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 19
+ 6: 16
+ 7: 12
+ 8: 10
+ 9: 10
+HLT_e26_lhtight_ivarloose_e5_lhvloose_nopix_lrtloose_idperf_probe_L1EM22VHI:
+ eventCount: 5
+ stepCounts:
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 15
- 6: 13
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
+ 6: 5
7: 5
8: 5
9: 5
-HLT_e26_lhtight_ivarloose_e5_lhvloose_nopix_lrtloose_idperf_probe_L1EM22VHI:
- eventCount: 2
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 19
+ 6: 19
+ 7: 11
+ 8: 11
+ 9: 11
+HLT_e26_lhtight_ivarloose_e9_etcut_probe_L1EM22VHI:
+ eventCount: 5
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 2
- 6: 2
- 7: 2
- 8: 2
- 9: 2
+ 0: 6
+ 1: 6
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
+ 6: 5
+ 7: 5
+ 8: 5
stepFeatures:
- 0: 5
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 22
+ 6: 96
+ 7: 31
+ 8: 22
+HLT_e26_lhtight_ivarloose_e9_lhtight_noringer_probe_L1EM22VHI:
+ eventCount: 1
+ stepCounts:
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 15
- 6: 14
- 7: 6
- 8: 6
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
+ 6: 5
+ 7: 5
+ 8: 5
+ 9: 1
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 16
+ 6: 57
+ 7: 17
+ 8: 16
9: 6
-HLT_e26_lhtight_ivarloose_e9_etcut_probe_L1EM22VHI:
- eventCount: 3
+HLT_e26_lhtight_ivarloose_e9_lhtight_probe_L1EM22VHI:
+ eventCount: 1
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 3
- 6: 3
- 7: 3
- 8: 3
- stepFeatures:
- 0: 5
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 14
- 6: 48
- 7: 22
- 8: 13
-HLT_e26_lhtight_ivarloose_e9_lhtight_noringer_probe_L1EM22VHI:
- eventCount: 0
- stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
+ 2: 5
+ 3: 5
+ 4: 5
5: 2
6: 2
7: 2
8: 2
+ 9: 1
stepFeatures:
- 0: 5
- 1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 7
- 6: 12
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 8
+ 6: 10
7: 5
8: 5
- 9: 2
-HLT_e26_lhtight_ivarloose_e9_lhtight_probe_L1EM22VHI:
- eventCount: 0
- stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 1
- 6: 1
- 7: 1
- 8: 1
- stepFeatures:
- 0: 5
- 1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 6
- 6: 9
- 7: 3
- 8: 3
- 9: 1
+ 9: 3
HLT_e26_lhtight_ivarloose_noringer_L1EM22VHI:
- eventCount: 3
+ eventCount: 5
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- stepFeatures:
- 0: 5
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
+ 2: 6
+ 3: 6
+ 4: 5
+ stepFeatures:
+ 0: 7
+ 1: 15
+ 2: 7
+ 3: 7
+ 4: 5
HLT_e26_lhtight_ivarloose_tau100_mediumRNN_tracktwoLLP_03dRAB_L1EM22VHI:
eventCount: 0
stepCounts:
@@ -2635,292 +2817,349 @@ HLT_e26_lhtight_ivarloose_tau100_mediumRNN_tracktwoLLP_03dRAB_L1EM22VHI:
1: 2
2: 2
3: 2
+ 4: 2
+ 5: 2
+ 6: 2
+ 7: 2
+ 8: 2
+ stepFeatures:
+ 0: 6
+ 1: 4
+ 2: 2
+ 3: 2
+ 4: 2
+ 5: 3
+ 6: 3
+ 7: 3
+ 8: 3
+ 9: 1
+HLT_e26_lhtight_ivarloose_tau160_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
4: 1
5: 1
6: 1
7: 1
8: 1
stepFeatures:
- 0: 5
- 1: 2
- 2: 2
- 3: 2
+ 0: 6
+ 1: 1
+ 2: 1
+ 3: 1
4: 1
5: 1
6: 1
7: 1
8: 1
-HLT_e26_lhtight_ivarloose_tau160_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI:
- eventCount: 0
- stepFeatures:
- 0: 5
HLT_e26_lhtight_ivarloose_tau160_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI:
eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+ 6: 1
+ 7: 1
+ 8: 1
stepFeatures:
- 0: 5
+ 0: 6
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+ 6: 1
+ 7: 1
+ 8: 1
HLT_e26_lhtight_ivarloose_tau180_mediumRNN_tracktwoLLP_03dRAB_L1EM22VHI:
eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+ 6: 1
+ 7: 1
+ 8: 1
stepFeatures:
- 0: 5
+ 0: 6
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+ 6: 1
+ 7: 1
+ 8: 1
HLT_e26_lhtight_ivarloose_tau20_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI:
eventCount: 2
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 3
- 6: 3
- 7: 3
- 8: 3
+ 0: 6
+ 1: 6
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
+ 6: 5
+ 7: 5
+ 8: 5
9: 2
stepFeatures:
- 0: 5
- 1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 13
- 6: 13
- 7: 13
- 8: 13
- 9: 5
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 22
+ 6: 22
+ 7: 22
+ 8: 22
+ 9: 7
HLT_e26_lhtight_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI:
- eventCount: 1
+ eventCount: 3
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 3
- 6: 3
- 7: 3
- 8: 3
- 9: 1
- stepFeatures:
- 0: 5
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 13
- 6: 13
- 7: 13
- 8: 13
- 9: 4
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
+ 6: 5
+ 7: 5
+ 8: 5
+ 9: 3
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 22
+ 6: 22
+ 7: 22
+ 8: 22
+ 9: 8
HLT_e26_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI:
eventCount: 1
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 3
- 6: 3
- 7: 3
- 8: 3
+ 0: 6
+ 1: 6
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
+ 6: 5
+ 7: 5
+ 8: 5
9: 1
stepFeatures:
- 0: 5
- 1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 6
- 6: 6
- 7: 6
- 8: 6
- 9: 4
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 13
+ 6: 13
+ 7: 13
+ 8: 13
+ 9: 5
HLT_e26_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI:
eventCount: 1
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 3
- 6: 3
- 7: 3
- 8: 3
+ 0: 6
+ 1: 6
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
+ 6: 5
+ 7: 5
+ 8: 5
9: 1
stepFeatures:
- 0: 5
- 1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 6
- 6: 6
- 7: 6
- 8: 6
- 9: 4
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 13
+ 6: 13
+ 7: 13
+ 8: 13
+ 9: 5
HLT_e26_lhtight_ivarloose_tau35_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI:
eventCount: 1
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 3
- 6: 3
- 7: 3
- 8: 3
+ 0: 6
+ 1: 6
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
+ 6: 5
+ 7: 5
+ 8: 5
9: 1
stepFeatures:
- 0: 5
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 11
+ 6: 11
+ 7: 11
+ 8: 11
+ 9: 5
+HLT_e26_lhtight_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI:
+ eventCount: 1
+ stepCounts:
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
+ 2: 5
+ 3: 5
+ 4: 5
5: 5
6: 5
7: 5
8: 5
- 9: 4
-HLT_e26_lhtight_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI:
+ 9: 1
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 11
+ 6: 11
+ 7: 11
+ 8: 11
+ 9: 5
+HLT_e26_lhtight_ivarloose_tau40_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI:
eventCount: 1
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 3
- 6: 3
- 7: 3
- 8: 3
+ 0: 6
+ 1: 6
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
+ 6: 5
+ 7: 5
+ 8: 5
9: 1
stepFeatures:
- 0: 5
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 11
+ 6: 11
+ 7: 11
+ 8: 11
+ 9: 5
+HLT_e26_lhtight_ivarloose_tau40_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI:
+ eventCount: 1
+ stepCounts:
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
+ 2: 5
+ 3: 5
+ 4: 5
5: 5
6: 5
7: 5
8: 5
- 9: 4
-HLT_e26_lhtight_ivarloose_tau40_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI:
+ 9: 1
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 11
+ 6: 11
+ 7: 11
+ 8: 11
+ 9: 5
+HLT_e26_lhtight_ivarloose_tau60_mediumRNN_tracktwoLLP_03dRAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 2
- 6: 2
- 7: 2
- 8: 2
- stepFeatures:
- 0: 5
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
+ 2: 5
+ 3: 5
+ 4: 5
5: 3
6: 3
7: 3
8: 3
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 6
+ 6: 6
+ 7: 6
+ 8: 6
9: 2
-HLT_e26_lhtight_ivarloose_tau40_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI:
+HLT_e26_lhtight_ivarloose_tau60_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 2
- 6: 2
- 7: 2
- 8: 2
- stepFeatures:
- 0: 5
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
- 5: 3
- 6: 3
- 7: 3
- 8: 3
- 9: 2
-HLT_e26_lhtight_ivarloose_tau60_mediumRNN_tracktwoLLP_03dRAB_L1EM22VHI:
- eventCount: 0
- stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 2
- 5: 1
- 6: 1
- 7: 1
- 8: 1
- stepFeatures:
- 0: 5
- 1: 4
- 2: 3
- 3: 3
- 4: 2
+ 2: 5
+ 3: 5
+ 4: 5
5: 3
6: 3
7: 3
8: 3
- 9: 1
-HLT_e26_lhtight_ivarloose_tau60_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI:
- eventCount: 0
- stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 2
- 5: 1
- 6: 1
- 7: 1
- 8: 1
stepFeatures:
- 0: 5
- 1: 4
- 2: 3
- 3: 3
- 4: 2
- 5: 3
- 6: 3
- 7: 3
- 8: 3
- 9: 1
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 6
+ 6: 6
+ 7: 6
+ 8: 6
+ 9: 2
HLT_e26_lhtight_ivarloose_tau60_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 2
- 5: 1
- 6: 1
- 7: 1
- 8: 1
- stepFeatures:
- 0: 5
- 1: 4
- 2: 3
- 3: 3
- 4: 2
+ 0: 6
+ 1: 6
+ 2: 5
+ 3: 5
+ 4: 5
5: 3
6: 3
7: 3
8: 3
- 9: 1
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 6
+ 6: 6
+ 7: 6
+ 8: 6
+ 9: 2
HLT_e26_lhtight_ivarloose_tau80_mediumRNN_tracktwoLLP_03dRAB_L1EM22VHI:
eventCount: 0
stepCounts:
@@ -2928,21 +3167,21 @@ HLT_e26_lhtight_ivarloose_tau80_mediumRNN_tracktwoLLP_03dRAB_L1EM22VHI:
1: 2
2: 2
3: 2
- 4: 1
- 5: 1
- 6: 1
- 7: 1
- 8: 1
- stepFeatures:
- 0: 5
- 1: 2
- 2: 2
- 3: 2
- 4: 1
+ 4: 2
5: 2
6: 2
7: 2
8: 2
+ stepFeatures:
+ 0: 6
+ 1: 4
+ 2: 2
+ 3: 2
+ 4: 2
+ 5: 3
+ 6: 3
+ 7: 3
+ 8: 3
9: 1
HLT_e26_lhtight_ivarloose_tau80_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI:
eventCount: 0
@@ -2951,21 +3190,21 @@ HLT_e26_lhtight_ivarloose_tau80_mediumRNN_tracktwoMVABDT_03dRAB_L1EM22VHI:
1: 2
2: 2
3: 2
- 4: 1
- 5: 1
- 6: 1
- 7: 1
- 8: 1
- stepFeatures:
- 0: 5
- 1: 2
- 2: 2
- 3: 2
- 4: 1
+ 4: 2
5: 2
6: 2
7: 2
8: 2
+ stepFeatures:
+ 0: 6
+ 1: 4
+ 2: 2
+ 3: 2
+ 4: 2
+ 5: 3
+ 6: 3
+ 7: 3
+ 8: 3
9: 1
HLT_e26_lhtight_ivarloose_tau80_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI:
eventCount: 0
@@ -2974,434 +3213,329 @@ HLT_e26_lhtight_ivarloose_tau80_mediumRNN_tracktwoMVA_03dRAB_L1EM22VHI:
1: 2
2: 2
3: 2
- 4: 1
- 5: 1
- 6: 1
- 7: 1
- 8: 1
- stepFeatures:
- 0: 5
- 1: 2
- 2: 2
- 3: 2
- 4: 1
+ 4: 2
5: 2
6: 2
7: 2
8: 2
+ stepFeatures:
+ 0: 6
+ 1: 4
+ 2: 2
+ 3: 2
+ 4: 2
+ 5: 3
+ 6: 3
+ 7: 3
+ 8: 3
9: 1
HLT_e26_lhtight_ivarmedium_L1EM22VHI:
- eventCount: 3
+ eventCount: 5
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- stepFeatures:
- 0: 5
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
+ 2: 5
+ 3: 5
+ 4: 5
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
HLT_e26_lhtight_ivartight_L1EM22VHI:
- eventCount: 3
+ eventCount: 5
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- stepFeatures:
- 0: 5
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 3
+ 2: 5
+ 3: 5
+ 4: 5
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
HLT_e28_idperf_loose_L1EM24VHI:
eventCount: 5
stepCounts:
- 0: 5
- 1: 5
+ 0: 6
+ 1: 6
2: 5
3: 5
4: 5
stepFeatures:
- 0: 5
- 1: 5
+ 0: 6
+ 1: 6
2: 5
3: 5
4: 5
HLT_e28_lhmedium_mu8noL1_L1EM24VHI:
- eventCount: 2
+ eventCount: 3
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 4
- 5: 2
- 6: 2
- stepFeatures:
- 0: 5
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 4
- 5: 2
- 6: 2
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 3
+ 6: 3
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 3
+ 6: 3
HLT_e300_etcut_L1EM22VHI:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 1
+ 1: 13
+ 2: 1
+ 3: 1
HLT_e300_etcut_L1eEM22M:
eventCount: 0
HLT_e30_lhvloose_L1EM22VHI:
- eventCount: 4
+ eventCount: 5
stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 4
- stepFeatures:
- 0: 5
+ 0: 6
1: 6
- 2: 4
- 3: 4
- 4: 4
+ 2: 5
+ 3: 5
+ 4: 5
+ stepFeatures:
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
HLT_e40_lhvloose_L1EM22VHI:
- eventCount: 3
+ eventCount: 5
stepCounts:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
- 4: 3
+ 0: 6
+ 1: 6
+ 2: 5
+ 3: 5
+ 4: 5
stepFeatures:
- 0: 4
- 1: 4
- 2: 3
- 3: 3
- 4: 3
+ 0: 6
+ 1: 10
+ 2: 5
+ 3: 5
+ 4: 5
HLT_e50_etcut_L1EM22VHI:
- eventCount: 4
+ eventCount: 6
stepCounts:
- 0: 4
- 1: 4
- 2: 4
- 3: 4
+ 0: 7
+ 1: 7
+ 2: 6
+ 3: 6
stepFeatures:
- 0: 5
- 1: 27
- 2: 4
- 3: 4
+ 0: 12
+ 1: 79
+ 2: 11
+ 3: 11
HLT_e5_dnnloose_L1EM3:
- eventCount: 5
+ eventCount: 7
stepCounts:
- 0: 18
- 1: 15
- 2: 14
- 3: 14
- 4: 5
+ 0: 19
+ 1: 16
+ 2: 13
+ 3: 13
+ 4: 7
stepFeatures:
- 0: 63
- 1: 138
- 2: 23
+ 0: 48
+ 1: 92
+ 2: 25
3: 23
- 4: 5
+ 4: 7
HLT_e5_dnnmedium_L1EM3:
- eventCount: 3
+ eventCount: 6
stepCounts:
- 0: 18
- 1: 15
- 2: 14
- 3: 14
- 4: 3
+ 0: 19
+ 1: 16
+ 2: 13
+ 3: 13
+ 4: 6
stepFeatures:
- 0: 60
- 1: 122
- 2: 22
- 3: 22
- 4: 3
+ 0: 48
+ 1: 89
+ 2: 25
+ 3: 23
+ 4: 6
HLT_e5_dnntight_L1EM3:
- eventCount: 3
+ eventCount: 6
stepCounts:
- 0: 18
- 1: 15
- 2: 14
- 3: 14
- 4: 3
+ 0: 19
+ 1: 16
+ 2: 13
+ 3: 13
+ 4: 6
stepFeatures:
- 0: 59
- 1: 120
- 2: 22
+ 0: 47
+ 1: 85
+ 2: 24
3: 22
- 4: 3
+ 4: 6
HLT_e5_etcut_L1eEM3:
eventCount: 0
HLT_e5_idperf_gsf_tight_L1EM3:
- eventCount: 15
+ eventCount: 13
stepCounts:
- 0: 18
- 1: 17
- 2: 15
- 3: 15
- 4: 15
+ 0: 19
+ 1: 18
+ 2: 13
+ 3: 13
+ 4: 13
stepFeatures:
- 0: 59
- 1: 53
+ 0: 47
+ 1: 42
2: 24
- 3: 24
- 4: 24
+ 3: 22
+ 4: 22
HLT_e5_idperf_loose_L1EM3:
- eventCount: 15
+ eventCount: 13
stepCounts:
- 0: 18
- 1: 17
- 2: 15
- 3: 15
- 4: 15
+ 0: 19
+ 1: 18
+ 2: 13
+ 3: 13
+ 4: 13
stepFeatures:
- 0: 63
- 1: 57
+ 0: 48
+ 1: 43
2: 25
- 3: 25
- 4: 25
+ 3: 23
+ 4: 23
HLT_e5_idperf_loose_lrtloose_L1EM3:
eventCount: 15
stepCounts:
- 0: 18
- 1: 18
+ 0: 19
+ 1: 19
2: 15
3: 15
4: 15
stepFeatures:
- 0: 63
- 1: 63
- 2: 29
- 3: 28
- 4: 28
+ 0: 48
+ 1: 48
+ 2: 25
+ 3: 24
+ 4: 24
HLT_e5_idperf_medium_L1EM3:
- eventCount: 15
+ eventCount: 13
stepCounts:
- 0: 18
- 1: 17
- 2: 15
- 3: 15
- 4: 15
+ 0: 19
+ 1: 18
+ 2: 13
+ 3: 13
+ 4: 13
stepFeatures:
- 0: 60
- 1: 54
- 2: 24
- 3: 24
- 4: 24
+ 0: 48
+ 1: 43
+ 2: 25
+ 3: 23
+ 4: 23
HLT_e5_idperf_tight_L1EM3:
- eventCount: 15
+ eventCount: 13
stepCounts:
- 0: 18
- 1: 17
- 2: 15
- 3: 15
- 4: 15
+ 0: 19
+ 1: 18
+ 2: 13
+ 3: 13
+ 4: 13
stepFeatures:
- 0: 59
- 1: 53
+ 0: 47
+ 1: 42
2: 24
- 3: 24
- 4: 24
+ 3: 22
+ 4: 22
HLT_e5_lhtight_e14_etcut_1invmAB3_L1JPSI-1M5-EM12:
eventCount: 0
+HLT_e5_lhtight_e14_etcut_Jpsiee_L1JPSI-1M5-EM12:
+ eventCount: 0
+HLT_e5_lhtight_e14_etcut_probe_1invmAB3_L1JPSI-1M5-EM12:
+ eventCount: 0
+HLT_e5_lhtight_e9_etcut_1invmAB3_L1JPSI-1M5-EM7:
+ eventCount: 0
+HLT_e5_lhtight_e9_etcut_Jpsiee_L1JPSI-1M5-EM7:
+ eventCount: 0
+HLT_e5_lhtight_e9_etcut_probe_1invmAB3_L1JPSI-1M5-EM7:
+ eventCount: 0
+HLT_e5_lhtight_noringer_e14_etcut_1invmAB3_L1JPSI-1M5-EM12:
+ eventCount: 0
+HLT_e5_lhtight_noringer_e14_etcut_Jpsiee_L1JPSI-1M5-EM12:
+ eventCount: 0
+HLT_e5_lhtight_noringer_e14_etcut_probe_1invmAB3_L1JPSI-1M5-EM12:
+ eventCount: 0
+HLT_e5_lhtight_noringer_e9_etcut_1invmAB3_L1JPSI-1M5-EM7:
+ eventCount: 0
+HLT_e5_lhtight_noringer_e9_etcut_Jpsiee_L1JPSI-1M5-EM7:
+ eventCount: 0
+HLT_e5_lhtight_noringer_e9_etcut_probe_1invmAB3_L1JPSI-1M5-EM7:
+ eventCount: 0
+HLT_e5_lhvloose_j70_0eta320_j50_0eta490_j0_DJMASS1000j50_xe50_tcpufit_L1MJJ-500-NFF:
+ eventCount: 0
stepCounts:
- 0: 2
+ 0: 3
1: 2
2: 2
3: 2
+ 4: 1
stepFeatures:
- 0: 8
- 1: 23
- 2: 4
- 3: 4
-HLT_e5_lhtight_e14_etcut_Jpsiee_L1JPSI-1M5-EM12:
+ 0: 9
+ 1: 22
+ 2: 5
+ 3: 5
+ 4: 2
+HLT_e5_lhvloose_nopix_lrtloose_idperf_probe_g25_medium_L1EM20VH:
eventCount: 0
+HLT_e60_dnnmedium_L1EM22VHI:
+ eventCount: 1
stepCounts:
0: 2
1: 2
2: 2
3: 2
+ 4: 1
stepFeatures:
- 0: 8
- 1: 23
- 2: 4
- 3: 4
-HLT_e5_lhtight_e14_etcut_probe_1invmAB3_L1JPSI-1M5-EM12:
- eventCount: 0
+ 0: 2
+ 1: 4
+ 2: 2
+ 3: 2
+ 4: 1
+HLT_e60_gsf_dnnmedium_L1EM22VHI:
+ eventCount: 1
stepCounts:
0: 2
1: 2
2: 2
3: 2
+ 4: 1
stepFeatures:
- 0: 4
- 1: 5
+ 0: 2
+ 1: 4
2: 2
3: 2
-HLT_e5_lhtight_e9_etcut_1invmAB3_L1JPSI-1M5-EM7:
- eventCount: 0
+ 4: 1
+HLT_e60_gsf_lhmedium_L1EM22VHI:
+ eventCount: 2
stepCounts:
- 0: 3
- 1: 3
- 2: 3
+ 0: 2
+ 1: 2
+ 2: 2
3: 2
- stepFeatures:
- 0: 17
- 1: 48
- 2: 10
- 3: 9
-HLT_e5_lhtight_e9_etcut_Jpsiee_L1JPSI-1M5-EM7:
- eventCount: 0
- stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 2
- stepFeatures:
- 0: 17
- 1: 48
- 2: 10
- 3: 9
-HLT_e5_lhtight_e9_etcut_probe_1invmAB3_L1JPSI-1M5-EM7:
- eventCount: 0
- stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- stepFeatures:
- 0: 10
- 1: 22
- 2: 3
- 3: 3
-HLT_e5_lhtight_noringer_e14_etcut_1invmAB3_L1JPSI-1M5-EM12:
- eventCount: 0
- stepCounts:
- 0: 1
- 1: 1
- stepFeatures:
- 0: 5
- 1: 10
- 2: 2
-HLT_e5_lhtight_noringer_e14_etcut_Jpsiee_L1JPSI-1M5-EM12:
- eventCount: 0
- stepCounts:
- 0: 1
- 1: 1
- stepFeatures:
- 0: 5
- 1: 10
- 2: 2
-HLT_e5_lhtight_noringer_e14_etcut_probe_1invmAB3_L1JPSI-1M5-EM12:
- eventCount: 0
- stepCounts:
- 0: 1
- 1: 1
- 2: 1
- 3: 1
- stepFeatures:
- 0: 1
- 1: 2
- 2: 1
- 3: 1
-HLT_e5_lhtight_noringer_e9_etcut_1invmAB3_L1JPSI-1M5-EM7:
- eventCount: 0
- stepCounts:
- 0: 2
- 1: 2
- 2: 2
- 3: 1
- stepFeatures:
- 0: 10
- 1: 21
- 2: 6
- 3: 5
-HLT_e5_lhtight_noringer_e9_etcut_Jpsiee_L1JPSI-1M5-EM7:
- eventCount: 0
- stepCounts:
- 0: 2
- 1: 2
- 2: 2
- 3: 1
- stepFeatures:
- 0: 10
- 1: 21
- 2: 6
- 3: 5
-HLT_e5_lhtight_noringer_e9_etcut_probe_1invmAB3_L1JPSI-1M5-EM7:
- eventCount: 0
- stepCounts:
- 0: 2
- 1: 2
- 2: 2
- 3: 2
- stepFeatures:
- 0: 3
- 1: 9
- 2: 2
- 3: 2
-HLT_e5_lhvloose_j70_0eta320_j50_0eta490_j0_DJMASS1000j50_xe50_tcpufit_L1MJJ-500-NFF:
- eventCount: 0
- stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 2
- stepFeatures:
- 0: 19
- 1: 64
- 2: 6
- 3: 6
- 4: 3
- 5: 1
-HLT_e5_lhvloose_nopix_lrtloose_idperf_probe_g25_medium_L1EM20VH:
- eventCount: 0
-HLT_e60_dnnmedium_L1EM22VHI:
- eventCount: 1
- stepCounts:
- 0: 2
- 1: 2
- 2: 2
- 3: 2
- 4: 1
- stepFeatures:
- 0: 2
- 1: 2
- 2: 2
- 3: 2
- 4: 1
-HLT_e60_gsf_dnnmedium_L1EM22VHI:
- eventCount: 2
- stepCounts:
- 0: 2
- 1: 2
- 2: 2
- 3: 2
- 4: 2
- stepFeatures:
- 0: 2
- 1: 2
- 2: 2
- 3: 2
- 4: 2
-HLT_e60_gsf_lhmedium_L1EM22VHI:
- eventCount: 2
- stepCounts:
- 0: 2
- 1: 2
- 2: 2
- 3: 2
- 4: 2
+ 4: 2
stepFeatures:
0: 2
- 1: 2
+ 1: 4
2: 2
3: 2
4: 2
@@ -3443,7 +3577,7 @@ HLT_e60_lhmedium_L1EM22VHI:
4: 2
stepFeatures:
0: 2
- 1: 2
+ 1: 4
2: 2
3: 2
4: 2
@@ -3452,16 +3586,16 @@ HLT_e60_lhmedium_L1eEM22M:
HLT_e60_lhmedium_noringer_L1EM22VHI:
eventCount: 2
stepCounts:
- 0: 2
- 1: 2
- 2: 2
- 3: 2
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
4: 2
stepFeatures:
- 0: 2
- 1: 2
- 2: 2
- 3: 2
+ 0: 4
+ 1: 10
+ 2: 4
+ 3: 4
4: 2
HLT_e60_lhvloose_L1EM22VHI:
eventCount: 2
@@ -3473,187 +3607,172 @@ HLT_e60_lhvloose_L1EM22VHI:
4: 2
stepFeatures:
0: 2
- 1: 2
+ 1: 4
2: 2
3: 2
4: 2
HLT_e70_lhloose_xe70_cell_L1EM22VHI:
- eventCount: 0
+ eventCount: 1
stepCounts:
0: 1
1: 1
2: 1
3: 1
4: 1
+ 5: 1
stepFeatures:
0: 1
1: 1
2: 1
3: 1
4: 1
+ 5: 1
HLT_e7_lhmedium_mu24_L1MU20:
eventCount: 1
stepCounts:
- 0: 6
- 1: 4
- 2: 3
- 3: 3
- 4: 2
- 5: 2
+ 0: 5
+ 1: 5
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 3
6: 1
7: 1
8: 1
stepFeatures:
- 0: 8
- 1: 9
- 2: 3
- 3: 3
- 4: 2
- 5: 2
+ 0: 9
+ 1: 17
+ 2: 4
+ 3: 4
+ 4: 3
+ 5: 3
6: 1
7: 1
8: 1
HLT_e80_lhvloose_L1EM22VHI:
- eventCount: 0
-HLT_e9_lhtight_e4_etcut_1invmAB3_L1JPSI-1M5-EM7:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 2
- 1: 2
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
stepFeatures:
- 0: 32
- 1: 88
- 2: 22
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+HLT_e9_lhtight_e4_etcut_1invmAB3_L1JPSI-1M5-EM7:
+ eventCount: 0
HLT_e9_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM7:
eventCount: 0
- stepCounts:
- 0: 2
- 1: 2
- stepFeatures:
- 0: 32
- 1: 88
- 2: 22
HLT_e9_lhtight_e4_etcut_L1JPSI-1M5-EM7:
eventCount: 0
- stepCounts:
- 0: 2
- 1: 2
- stepFeatures:
- 0: 32
- 1: 88
- 2: 22
HLT_e9_lhtight_e4_etcut_probe_1invmAB3_L1JPSI-1M5-EM7:
eventCount: 0
- stepCounts:
- 0: 2
- 1: 2
- stepFeatures:
- 0: 2
- 1: 6
HLT_e9_lhtight_noringer_e4_etcut_1invmAB3_L1JPSI-1M5-EM7:
eventCount: 0
- stepCounts:
- 0: 2
- 1: 2
- 2: 1
- 3: 1
- stepFeatures:
- 0: 32
- 1: 86
- 2: 29
- 3: 7
HLT_e9_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM7:
eventCount: 0
- stepCounts:
- 0: 2
- 1: 2
- 2: 1
- 3: 1
- stepFeatures:
- 0: 32
- 1: 86
- 2: 29
- 3: 7
HLT_e9_lhtight_noringer_e4_etcut_probe_1invmAB3_L1JPSI-1M5-EM7:
eventCount: 0
+HLT_e9_lhvloose_mu20_mu8noL1_L1MU20:
+ eventCount: 0
stepCounts:
- 0: 2
- 1: 2
- 2: 1
- 3: 1
- stepFeatures:
- 0: 2
- 1: 6
- 2: 1
- 3: 1
-HLT_e9_lhvloose_mu20_mu8noL1_L1MU20:
- eventCount: 0
- stepCounts:
- 0: 3
- 1: 3
+ 0: 4
+ 1: 4
2: 3
3: 3
- 4: 2
- 5: 2
+ 4: 3
+ 5: 3
6: 1
7: 1
8: 1
stepFeatures:
- 0: 4
- 1: 5
+ 0: 5
+ 1: 14
2: 3
3: 3
- 4: 2
- 5: 2
+ 4: 3
+ 5: 3
6: 1
7: 1
8: 1
HLT_eb_low_L1RD2_FILLED:
- eventCount: 20
- stepCounts:
- 0: 20
- stepFeatures:
- 0: 20
-HLT_eb_medium_L1RD2_FILLED:
eventCount: 19
stepCounts:
0: 19
stepFeatures:
0: 19
+HLT_eb_medium_L1RD2_FILLED:
+ eventCount: 20
+ stepCounts:
+ 0: 20
+ stepFeatures:
+ 0: 20
HLT_g0_hiptrt_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 6
+ 0: 10
stepFeatures:
- 0: 7
+ 0: 16
HLT_g100_loose_L1EM22VHI:
- eventCount: 0
-HLT_g10_loose_L1EM7:
- eventCount: 6
+ eventCount: 1
stepCounts:
- 0: 18
- 1: 9
- 2: 8
- 3: 6
+ 0: 3
+ 1: 2
+ 2: 2
+ 3: 1
stepFeatures:
- 0: 49
+ 0: 6
+ 1: 5
+ 2: 5
+ 3: 1
+HLT_g10_loose_L1EM7:
+ eventCount: 8
+ stepCounts:
+ 0: 19
1: 11
2: 11
- 3: 7
+ 3: 8
+ stepFeatures:
+ 0: 55
+ 1: 22
+ 2: 25
+ 3: 10
HLT_g120_loose_L1EM22VHI:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 2
+ 1: 2
+ 2: 2
+ 3: 1
+ stepFeatures:
+ 0: 5
+ 1: 5
+ 2: 5
+ 3: 1
HLT_g12_loose_LArPEBHLT_L1EM10VH:
eventCount: 0
HLT_g140_loose_L1EM22VHI:
eventCount: 0
+ stepCounts:
+ 0: 2
+ 1: 2
+ 2: 2
+ stepFeatures:
+ 0: 3
+ 1: 3
+ 2: 3
HLT_g15_loose_2mu10_msonly_L12MU10:
eventCount: 0
stepCounts:
- 0: 1
+ 0: 2
1: 1
2: 1
stepFeatures:
- 0: 1
+ 0: 2
1: 1
2: 1
HLT_g15_loose_2mu10_msonly_L1MU4_EMPTY:
@@ -3663,716 +3782,715 @@ HLT_g15_loose_2mu10_msonly_L1MU4_UNPAIRED_ISO:
HLT_g15_loose_2mu10_msonly_L1MU6_EMPTY:
eventCount: 0
HLT_g15_loose_L1EM10VH:
- eventCount: 5
+ eventCount: 8
stepCounts:
- 0: 9
- 1: 7
- 2: 7
- 3: 5
+ 0: 15
+ 1: 11
+ 2: 11
+ 3: 8
stepFeatures:
- 0: 13
- 1: 8
- 2: 8
- 3: 5
+ 0: 26
+ 1: 19
+ 2: 17
+ 3: 9
HLT_g15_tight_L1EM10VH:
- eventCount: 5
+ eventCount: 7
stepCounts:
- 0: 9
- 1: 7
- 2: 7
- 3: 5
+ 0: 15
+ 1: 11
+ 2: 11
+ 3: 7
stepFeatures:
- 0: 13
- 1: 8
- 2: 8
- 3: 5
+ 0: 26
+ 1: 19
+ 2: 17
+ 3: 8
HLT_g20_loose_L1EM15VH:
- eventCount: 6
+ eventCount: 7
stepCounts:
- 0: 8
- 1: 8
- 2: 7
- 3: 6
+ 0: 13
+ 1: 10
+ 2: 10
+ 3: 7
stepFeatures:
- 0: 11
- 1: 9
- 2: 8
- 3: 6
+ 0: 22
+ 1: 15
+ 2: 16
+ 3: 8
HLT_g20_loose_LArPEBHLT_L1EM15:
eventCount: 0
HLT_g20_tight_L1EM15VHI:
- eventCount: 5
+ eventCount: 6
stepCounts:
- 0: 7
- 1: 7
- 2: 6
- 3: 5
+ 0: 11
+ 1: 9
+ 2: 9
+ 3: 6
stepFeatures:
- 0: 8
- 1: 7
- 2: 6
- 3: 5
+ 0: 17
+ 1: 12
+ 2: 13
+ 3: 6
HLT_g20_tight_icaloloose_L1EM15VHI:
- eventCount: 5
+ eventCount: 6
stepCounts:
- 0: 7
- 1: 7
- 2: 6
- 3: 5
+ 0: 11
+ 1: 9
+ 2: 9
+ 3: 6
stepFeatures:
- 0: 8
- 1: 7
- 2: 6
- 3: 5
+ 0: 17
+ 1: 12
+ 2: 13
+ 3: 6
HLT_g20_tight_icaloloose_j35_pf_ftf_bdl1r77_3j35_pf_ftf_0eta490_j0_pf_ftf_DJMASS500j35_L1EM18VHI_MJJ-300:
- eventCount: 0
+ eventCount: 2
stepCounts:
- 0: 4
- 1: 4
- 2: 4
- 3: 3
- 4: 3
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 4
+ 4: 4
+ 5: 2
+ 6: 2
stepFeatures:
- 0: 4
- 1: 4
- 2: 4
- 3: 3
- 4: 9
+ 0: 11
+ 1: 9
+ 2: 10
+ 3: 4
+ 4: 12
+ 5: 31
+ 6: 3
HLT_g22_tight_L1EM15VHI:
eventCount: 5
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 10
+ 1: 8
+ 2: 7
3: 5
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 16
+ 1: 11
+ 2: 11
3: 5
HLT_g250_etcut_L1EM22VHI:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ stepFeatures:
+ 0: 2
+ 1: 2
+ 2: 2
HLT_g25_loose_L1EM20VH:
eventCount: 6
stepCounts:
- 0: 7
+ 0: 10
1: 7
2: 7
3: 6
stepFeatures:
- 0: 10
- 1: 8
- 2: 8
- 3: 6
+ 0: 18
+ 1: 12
+ 2: 13
+ 3: 7
HLT_g25_medium_2j35_pf_ftf_0eta490_bdl1r77_2j35_pf_ftf_0eta490_L1EM22VHI:
- eventCount: 2
+ eventCount: 1
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 6
4: 6
5: 4
- 6: 2
+ 6: 1
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
- 3: 6
- 4: 12
+ 0: 15
+ 1: 10
+ 2: 11
+ 3: 6
+ 4: 12
5: 44
- 6: 6
+ 6: 4
HLT_g25_medium_4j35_0eta490_j0_DJMASS1000j35_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 6
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 6
HLT_g25_medium_L1EM20VH:
eventCount: 6
stepCounts:
- 0: 7
+ 0: 10
1: 7
2: 7
3: 6
stepFeatures:
- 0: 10
- 1: 8
- 2: 8
- 3: 6
+ 0: 18
+ 1: 12
+ 2: 13
+ 3: 7
HLT_g25_medium_j35_pf_ftf_0eta490_bdl1r77_3j35_pf_ftf_0eta490_j0_pf_ftf_DJMASS700j35_L1EM22VHI:
- eventCount: 2
+ eventCount: 1
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 6
4: 6
- 5: 2
- 6: 2
+ 5: 1
+ 6: 1
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 6
4: 18
- 5: 30
- 6: 3
+ 5: 16
+ 6: 2
HLT_g25_medium_mu24_L1MU20:
- eventCount: 1
+ eventCount: 0
stepCounts:
- 0: 2
- 1: 2
- 2: 2
+ 0: 4
+ 1: 3
+ 2: 3
3: 2
4: 2
- 5: 1
- 6: 1
- 7: 1
stepFeatures:
- 0: 2
- 1: 2
- 2: 2
- 3: 2
+ 0: 9
+ 1: 6
+ 2: 7
+ 3: 3
4: 2
- 5: 1
- 6: 1
- 7: 1
HLT_g25_medium_mu24_ivarmedium_L1MU20:
eventCount: 0
stepCounts:
- 0: 2
- 1: 2
- 2: 2
+ 0: 3
+ 1: 3
+ 2: 3
3: 2
4: 2
- 5: 1
- 6: 1
- 7: 1
stepFeatures:
- 0: 2
- 1: 2
- 2: 2
+ 0: 7
+ 1: 5
+ 2: 6
3: 2
4: 2
- 5: 1
- 6: 1
- 7: 1
HLT_g25_medium_tau25_dikaonmass_tracktwoMVABDT_50invmAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 6
4: 6
5: 6
6: 6
7: 6
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 6
- 4: 22
- 5: 22
- 6: 22
- 7: 22
+ 4: 23
+ 5: 23
+ 6: 23
+ 7: 23
HLT_g25_medium_tau25_dikaonmass_tracktwoMVA_50invmAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 6
4: 6
5: 6
6: 6
7: 6
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 6
- 4: 22
- 5: 22
- 6: 22
- 7: 22
+ 4: 23
+ 5: 23
+ 6: 23
+ 7: 23
HLT_g25_medium_tau25_dipion1_tracktwoMVABDT_50invmAB_L1EM22VHI:
- eventCount: 1
+ eventCount: 0
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 6
4: 6
5: 6
6: 6
7: 6
- 8: 1
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 6
- 4: 22
- 5: 22
- 6: 22
- 7: 22
- 8: 1
+ 4: 23
+ 5: 23
+ 6: 23
+ 7: 23
HLT_g25_medium_tau25_dipion1_tracktwoMVA_50invmAB_L1EM22VHI:
- eventCount: 1
+ eventCount: 0
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 6
4: 6
5: 6
6: 6
7: 6
- 8: 1
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 6
- 4: 22
- 5: 22
- 6: 22
- 7: 22
- 8: 1
+ 4: 23
+ 5: 23
+ 6: 23
+ 7: 23
HLT_g25_medium_tau25_dipion2_tracktwoMVABDT_50invmAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 6
4: 6
5: 6
6: 6
7: 6
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 6
- 4: 22
- 5: 22
- 6: 22
- 7: 22
+ 4: 23
+ 5: 23
+ 6: 23
+ 7: 23
HLT_g25_medium_tau25_dipion2_tracktwoMVA_50invmAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 6
4: 6
5: 6
6: 6
7: 6
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 6
- 4: 22
- 5: 22
- 6: 22
- 7: 22
+ 4: 23
+ 5: 23
+ 6: 23
+ 7: 23
HLT_g25_medium_tau25_dipion4_tracktwoMVABDT_50invmAB_L1EM22VHI:
- eventCount: 1
+ eventCount: 0
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 6
4: 6
5: 6
6: 6
7: 6
- 8: 1
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 6
- 4: 22
- 5: 22
- 6: 22
- 7: 22
- 8: 1
+ 4: 23
+ 5: 23
+ 6: 23
+ 7: 23
HLT_g25_medium_tau25_dipion4_tracktwoMVA_50invmAB_L1EM22VHI:
- eventCount: 1
+ eventCount: 0
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 6
4: 6
5: 6
6: 6
7: 6
- 8: 1
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 6
- 4: 22
- 5: 22
- 6: 22
- 7: 22
- 8: 1
+ 4: 23
+ 5: 23
+ 6: 23
+ 7: 23
HLT_g25_medium_tau25_kaonpi1_tracktwoMVABDT_50invmAB_L1EM22VHI:
- eventCount: 1
+ eventCount: 0
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 6
4: 6
5: 6
6: 6
7: 6
- 8: 1
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 6
- 4: 22
- 5: 22
- 6: 22
- 7: 22
- 8: 1
+ 4: 23
+ 5: 23
+ 6: 23
+ 7: 23
HLT_g25_medium_tau25_kaonpi1_tracktwoMVA_50invmAB_L1EM22VHI:
- eventCount: 1
+ eventCount: 0
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 6
4: 6
5: 6
6: 6
7: 6
- 8: 1
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 6
- 4: 22
- 5: 22
- 6: 22
- 7: 22
- 8: 1
+ 4: 23
+ 5: 23
+ 6: 23
+ 7: 23
HLT_g25_medium_tau25_kaonpi2_tracktwoMVABDT_50invmAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 6
4: 6
5: 6
6: 6
7: 6
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 6
- 4: 22
- 5: 22
- 6: 22
- 7: 22
+ 4: 23
+ 5: 23
+ 6: 23
+ 7: 23
HLT_g25_medium_tau25_kaonpi2_tracktwoMVA_50invmAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 6
4: 6
5: 6
6: 6
7: 6
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 6
- 4: 22
- 5: 22
- 6: 22
- 7: 22
+ 4: 23
+ 5: 23
+ 6: 23
+ 7: 23
HLT_g25_medium_tau25_singlepion_tracktwoMVABDT_50invmAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 6
4: 6
5: 6
6: 6
7: 6
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 6
- 4: 22
- 5: 22
- 6: 22
- 7: 22
+ 4: 23
+ 5: 23
+ 6: 23
+ 7: 23
HLT_g25_medium_tau25_singlepion_tracktwoMVA_50invmAB_L1EM22VHI:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 6
4: 6
5: 6
6: 6
7: 6
+ 8: 1
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 6
- 4: 22
- 5: 22
- 6: 22
- 7: 22
+ 4: 23
+ 5: 23
+ 6: 23
+ 7: 23
+ 8: 1
HLT_g25_tight_icalotight_xe40_cell_xe40_tcpufit_xe40_pfopufit_18dphiAB_18dphiAC_80mTAC_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 6
- 1: 6
- 2: 6
- 3: 3
+ 0: 9
+ 1: 7
+ 2: 7
+ 3: 4
4: 2
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
- 3: 3
- 4: 8
- 5: 1
+ 0: 15
+ 1: 10
+ 2: 11
+ 3: 4
+ 4: 10
+ 5: 2
HLT_g25_tight_icalotight_xe40_cell_xe50_tcpufit_18dphiAB_18dphiAC_80mTAC_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 6
- 1: 6
- 2: 6
- 3: 3
+ 0: 9
+ 1: 7
+ 2: 7
+ 3: 4
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
- 3: 3
- 4: 5
+ 0: 15
+ 1: 10
+ 2: 11
+ 3: 4
+ 4: 6
HLT_g300_etcut_L1EM22VHI:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ stepFeatures:
+ 0: 1
+ 1: 1
+ 2: 1
HLT_g30_loose_L1EM20VH:
eventCount: 6
stepCounts:
- 0: 7
+ 0: 10
1: 7
- 2: 6
+ 2: 7
3: 6
stepFeatures:
- 0: 8
- 1: 7
- 2: 6
- 3: 6
+ 0: 17
+ 1: 11
+ 2: 12
+ 3: 7
HLT_g35_loose_3j25_pf_ftf_L1EM22VHI:
eventCount: 6
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 6
4: 6
5: 6
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 6
4: 6
- 5: 43
+ 5: 45
HLT_g35_loose_L1EM22VHI:
eventCount: 6
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 6
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 6
HLT_g35_loose_PhotonDS_L1EM22VHI:
eventCount: 6
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 6
4: 6
5: 6
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 6
4: 6
5: 6
HLT_g35_loose_mu15_mu2noL1_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 2
- 1: 2
- 2: 2
- 3: 2
- 4: 2
+ 0: 5
+ 1: 5
+ 2: 5
+ 3: 4
+ 4: 4
5: 2
6: 2
7: 1
stepFeatures:
- 0: 7
- 1: 2
- 2: 2
- 3: 2
- 4: 2
+ 0: 15
+ 1: 8
+ 2: 9
+ 3: 4
+ 4: 5
5: 2
6: 2
7: 1
HLT_g35_loose_mu15_mu2noL1_L1EM24VHI:
eventCount: 0
stepCounts:
- 0: 2
- 1: 2
- 2: 2
- 3: 2
- 4: 2
+ 0: 5
+ 1: 5
+ 2: 5
+ 3: 4
+ 4: 4
5: 2
6: 2
7: 1
stepFeatures:
- 0: 7
- 1: 2
- 2: 2
- 3: 2
- 4: 2
+ 0: 15
+ 1: 8
+ 2: 9
+ 3: 4
+ 4: 5
5: 2
6: 2
7: 1
HLT_g35_loose_mu18_L1EM22VHI:
eventCount: 1
stepCounts:
- 0: 2
- 1: 2
- 2: 2
- 3: 2
- 4: 2
+ 0: 5
+ 1: 5
+ 2: 5
+ 3: 4
+ 4: 4
5: 1
6: 1
7: 1
stepFeatures:
- 0: 7
- 1: 2
- 2: 2
- 3: 2
- 4: 2
+ 0: 15
+ 1: 8
+ 2: 9
+ 3: 4
+ 4: 4
5: 1
6: 1
7: 1
HLT_g35_loose_mu18_L1EM24VHI:
eventCount: 1
stepCounts:
- 0: 2
- 1: 2
- 2: 2
- 3: 2
- 4: 2
+ 0: 5
+ 1: 5
+ 2: 5
+ 3: 4
+ 4: 4
5: 1
6: 1
7: 1
stepFeatures:
- 0: 7
- 1: 2
- 2: 2
- 3: 2
- 4: 2
+ 0: 15
+ 1: 8
+ 2: 9
+ 3: 4
+ 4: 4
5: 1
6: 1
7: 1
HLT_g35_medium_3j25_pf_ftf_L1EM22VHI:
eventCount: 6
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 6
4: 6
5: 6
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 6
4: 6
- 5: 43
+ 5: 45
HLT_g35_medium_L1EM20VH:
eventCount: 6
stepCounts:
- 0: 7
+ 0: 10
1: 7
- 2: 6
+ 2: 7
3: 6
stepFeatures:
- 0: 8
- 1: 7
- 2: 6
- 3: 6
+ 0: 17
+ 1: 11
+ 2: 12
+ 3: 7
HLT_g35_medium_L1EM22VHI:
eventCount: 6
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 6
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 6
HLT_g35_medium_g25_medium_L12EM20VH:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 2
- 1: 1
- 2: 1
- stepFeatures:
- 0: 8
- 1: 5
+ 0: 4
+ 1: 3
2: 3
- 3: 2
+ 3: 1
+ stepFeatures:
+ 0: 23
+ 1: 17
+ 2: 17
+ 3: 6
HLT_g35_medium_g25_medium_L1EM7_EMPTY:
eventCount: 0
HLT_g35_medium_g25_medium_L1EM7_UNPAIRED_ISO:
@@ -4380,57 +4498,57 @@ HLT_g35_medium_g25_medium_L1EM7_UNPAIRED_ISO:
HLT_g35_medium_tau25_dipion3_tracktwoMVABDT_60invmAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 6
4: 6
5: 6
6: 6
7: 6
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 6
- 4: 22
- 5: 22
- 6: 22
- 7: 22
+ 4: 23
+ 5: 23
+ 6: 23
+ 7: 23
HLT_g35_medium_tau25_dipion3_tracktwoMVA_60invmAB_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 6
4: 6
5: 6
6: 6
7: 6
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 6
- 4: 22
- 5: 22
- 6: 22
- 7: 22
+ 4: 23
+ 5: 23
+ 6: 23
+ 7: 23
HLT_g35_tight_3j25_0eta290_pf_ftf_boffperf_L1EM22VHI:
eventCount: 5
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 5
4: 5
5: 5
6: 5
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 5
4: 5
5: 34
@@ -4438,257 +4556,321 @@ HLT_g35_tight_3j25_0eta290_pf_ftf_boffperf_L1EM22VHI:
HLT_g35_tight_3j25_pf_ftf_L1EM22VHI:
eventCount: 5
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 5
4: 5
5: 5
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 5
4: 5
5: 37
HLT_g35_tight_L1EM22VHI:
eventCount: 5
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 5
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 5
HLT_g35_tight_icaloloose_L1EM22VHI:
eventCount: 5
stepCounts:
- 0: 6
- 1: 6
- 2: 6
+ 0: 9
+ 1: 7
+ 2: 7
3: 5
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
+ 0: 15
+ 1: 10
+ 2: 11
3: 5
HLT_g35_tight_icalotight_mu15noL1_mu2noL1_L1EM22VHI:
eventCount: 0
stepCounts:
- 0: 6
- 1: 6
- 2: 6
- 3: 3
+ 0: 9
+ 1: 7
+ 2: 7
+ 3: 4
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
- 3: 3
+ 0: 15
+ 1: 10
+ 2: 11
+ 3: 4
HLT_g35_tight_icalotight_mu15noL1_mu2noL1_L1EM24VHI:
eventCount: 0
stepCounts:
- 0: 6
- 1: 6
- 2: 6
- 3: 3
+ 0: 9
+ 1: 7
+ 2: 7
+ 3: 4
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
- 3: 3
+ 0: 15
+ 1: 10
+ 2: 11
+ 3: 4
HLT_g35_tight_icalotight_mu18noL1_L1EM22VHI:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 6
- 1: 6
- 2: 6
- 3: 3
+ 0: 9
+ 1: 7
+ 2: 7
+ 3: 4
+ 4: 1
+ 5: 1
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
- 3: 3
+ 0: 15
+ 1: 10
+ 2: 11
+ 3: 4
+ 4: 1
+ 5: 1
HLT_g35_tight_icalotight_mu18noL1_L1EM24VHI:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 6
- 1: 6
- 2: 6
- 3: 3
+ 0: 9
+ 1: 7
+ 2: 7
+ 3: 4
+ 4: 1
+ 5: 1
stepFeatures:
- 0: 7
- 1: 6
- 2: 6
- 3: 3
+ 0: 15
+ 1: 10
+ 2: 11
+ 3: 4
+ 4: 1
+ 5: 1
HLT_g3_loose_LArPEBHLT_L1EM3:
eventCount: 0
HLT_g40_loose_L1EM20VH:
- eventCount: 4
+ eventCount: 6
stepCounts:
- 0: 5
- 1: 5
- 2: 4
- 3: 4
+ 0: 10
+ 1: 7
+ 2: 7
+ 3: 6
stepFeatures:
- 0: 6
- 1: 5
- 2: 4
- 3: 4
+ 0: 15
+ 1: 10
+ 2: 10
+ 3: 6
HLT_g40_loose_LArPEBHLT_L1EM20VHI:
eventCount: 0
HLT_g40_loose_mu40_msonly_L1MU20:
- eventCount: 1
+ eventCount: 0
stepCounts:
- 0: 2
- 1: 2
- 2: 2
+ 0: 4
+ 1: 3
+ 2: 3
3: 2
4: 2
- 5: 1
stepFeatures:
- 0: 2
- 1: 2
- 2: 2
+ 0: 7
+ 1: 5
+ 2: 5
3: 2
4: 2
- 5: 1
HLT_g45_loose_6j45_L14J15p0ETA25:
eventCount: 0
stepCounts:
- 0: 2
- 1: 2
- 2: 2
- 3: 2
- stepFeatures:
- 0: 4
- 1: 2
- 2: 2
- 3: 2
+ 0: 7
+ 1: 5
+ 2: 5
+ 3: 4
+ stepFeatures:
+ 0: 11
+ 1: 8
+ 2: 8
+ 3: 4
HLT_g50_loose_L1EM20VH:
eventCount: 4
stepCounts:
- 0: 4
- 1: 4
- 2: 4
+ 0: 7
+ 1: 5
+ 2: 5
3: 4
stepFeatures:
- 0: 5
- 1: 4
- 2: 4
+ 0: 12
+ 1: 8
+ 2: 8
3: 4
HLT_g60_loose_L1EM22VHI:
eventCount: 3
stepCounts:
- 0: 3
- 1: 3
- 2: 3
+ 0: 4
+ 1: 4
+ 2: 4
3: 3
stepFeatures:
- 0: 3
- 1: 3
- 2: 3
+ 0: 9
+ 1: 7
+ 2: 7
3: 3
HLT_g60_loose_LArPEBHLT_L1EM20VHI:
eventCount: 0
HLT_g80_loose_L1EM22VHI:
- eventCount: 0
+ eventCount: 2
stepCounts:
- 0: 1
- 1: 1
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 2
stepFeatures:
- 0: 1
- 1: 1
+ 0: 7
+ 1: 6
+ 2: 6
+ 3: 2
HLT_g80_loose_LArPEBHLT_L1EM20VHI:
eventCount: 0
HLT_g85_tight_3j50_L1EM22VHI:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 1
+ 4: 1
+ stepFeatures:
+ 0: 7
+ 1: 6
+ 2: 6
+ 3: 1
+ 4: 5
HLT_g90_loose_xe90_cell_L1EM22VHI:
eventCount: 0
+ stepCounts:
+ 0: 3
+ 1: 2
+ 2: 2
+ 3: 1
+ stepFeatures:
+ 0: 6
+ 1: 5
+ 2: 5
+ 3: 1
HLT_j0_DIJET20j12etXX110djmass_L1J20:
- eventCount: 18
+ eventCount: 20
stepCounts:
- 0: 18
+ 0: 20
stepFeatures:
- 0: 184
+ 0: 204
HLT_j0_DIJET20j12etXX110djmass_PTRANGE2r3_L1J20:
- eventCount: 11
+ eventCount: 10
stepCounts:
- 0: 11
+ 0: 10
stepFeatures:
- 0: 22
+ 0: 20
HLT_j0_DIJET20j12ptXX110djmass_L1J20:
- eventCount: 18
+ eventCount: 20
stepCounts:
- 0: 18
+ 0: 20
stepFeatures:
- 0: 182
+ 0: 200
HLT_j0_DIJET20j12ptXX110djmass_PTRANGE2r3_L1J20:
- eventCount: 11
+ eventCount: 10
stepCounts:
- 0: 11
+ 0: 10
stepFeatures:
- 0: 22
+ 0: 20
HLT_j0_DIJET70j12etXX1000djmassXXdjdphi200XX400djdeta_L1J20:
eventCount: 0
HLT_j0_DIJET70j12ptXX1000djmassXXdjdphi200XX400djdeta_L1J20:
eventCount: 0
HLT_j0_DIJET80j12etXX0j12eta240XX700djmass_L1J20:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_j0_DIJET80j12etXX700djmassXXdjdphi260_L1J20:
eventCount: 0
HLT_j0_DIJET80j12ptXX0j12eta240XX700djmass_L1J20:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_j0_DIJET80j12ptXX700djmassXXdjdphi260_L1J20:
eventCount: 0
HLT_j0_FBDJNOSHARED10etXX20etXX34massXX50fbet_L1J20:
- eventCount: 7
+ eventCount: 8
stepCounts:
- 0: 7
+ 0: 8
stepFeatures:
- 0: 125
+ 0: 156
HLT_j0_FBDJSHARED_L1J20:
- eventCount: 7
+ eventCount: 8
stepCounts:
- 0: 7
+ 0: 8
stepFeatures:
- 0: 129
+ 0: 164
HLT_j0_HT1000XX30et_L1J20:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 5
HLT_j0_HT1000_L1HT190-J15s5pETA21:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 5
HLT_j0_HT1000_L1J100:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 5
HLT_j0_HT1000_L1J20:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 5
HLT_j0_HT1000_j0_DIJET80j12ptXX0j12eta240XX700djmass_L1J20:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 8
HLT_j0_HT1000_pf_ftf_L1HT190-J15s5pETA21:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 4
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 4
+ 0: 5
+ 1: 5
HLT_j0_HT1000_pf_ftf_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 5
HLT_j0_HT500XX30et_L1J20:
- eventCount: 1
+ eventCount: 4
stepCounts:
- 0: 1
+ 0: 4
stepFeatures:
- 0: 5
+ 0: 29
HLT_j0_HT500_L1J20:
- eventCount: 1
+ eventCount: 4
stepCounts:
- 0: 1
+ 0: 4
stepFeatures:
- 0: 5
+ 0: 27
HLT_j0_perf_L1J12_EMPTY:
eventCount: 0
HLT_j0_perf_L1RD0_FILLED:
@@ -4696,173 +4878,185 @@ HLT_j0_perf_L1RD0_FILLED:
HLT_j0_perf_pf_ftf_L1RD0_FILLED:
eventCount: 0
HLT_j0_pf_ftf_HT50XX010jvt_L1J20:
- eventCount: 19
+ eventCount: 20
stepCounts:
- 0: 19
- 1: 19
+ 0: 20
+ 1: 20
stepFeatures:
- 0: 19
- 1: 83
+ 0: 20
+ 1: 96
HLT_j0_pf_ftf_HT50XX30etXX010jvt_L1J20:
- eventCount: 19
+ eventCount: 20
stepCounts:
- 0: 19
- 1: 19
+ 0: 20
+ 1: 20
stepFeatures:
- 0: 19
- 1: 83
+ 0: 20
+ 1: 96
HLT_j0_pf_ftf_HT50XX30et_L1J20:
- eventCount: 19
+ eventCount: 20
stepCounts:
- 0: 19
- 1: 19
+ 0: 20
+ 1: 20
stepFeatures:
- 0: 19
- 1: 92
+ 0: 20
+ 1: 105
HLT_j0_pf_ftf_HT50_L1J20:
- eventCount: 19
+ eventCount: 20
stepCounts:
- 0: 19
- 1: 19
+ 0: 20
+ 1: 20
stepFeatures:
- 0: 19
- 1: 92
+ 0: 20
+ 1: 105
HLT_j100_0eta290_020jvt_pf_ftf_boffperf_L1J50:
- eventCount: 12
+ eventCount: 10
stepCounts:
- 0: 13
- 1: 12
- 2: 12
+ 0: 14
+ 1: 10
+ 2: 10
stepFeatures:
- 0: 13
- 1: 17
- 2: 17
+ 0: 14
+ 1: 18
+ 2: 18
HLT_j100_pf_ftf_0eta320_j20_0eta290_pf_ftf_boffperf_L1HT190-J15s5pETA21:
- eventCount: 4
+ eventCount: 5
stepCounts:
- 0: 4
- 1: 4
- 2: 4
+ 0: 5
+ 1: 5
+ 2: 5
stepFeatures:
- 0: 8
- 1: 46
- 2: 38
+ 0: 10
+ 1: 55
+ 2: 43
HLT_j100_pf_ftf_bdl1r60_xe50_cell_xe85_pfopufit_L1XE55:
- eventCount: 0
+ eventCount: 3
stepCounts:
0: 7
1: 4
+ 2: 3
stepFeatures:
- 0: 25
- 1: 13
+ 0: 23
+ 1: 15
+ 2: 3
HLT_j100_pf_ftf_bdl1r60_xe50_cell_xe85_tcpufit_L1XE55:
- eventCount: 0
+ eventCount: 2
stepCounts:
- 0: 5
- 1: 4
+ 0: 4
+ 1: 3
+ 2: 2
stepFeatures:
- 0: 23
- 1: 5
+ 0: 19
+ 1: 7
+ 2: 2
HLT_j110_320eta490_L1J30p31ETA49:
eventCount: 0
HLT_j110_a10r_subjesIS_ftf_0eta200_ExoticPTF0p0dR1p2_L1J100:
eventCount: 0
stepCounts:
- 0: 3
- 1: 2
- stepFeatures:
- 0: 3
- 1: 4
+ 0: 5
+ 1: 5
+ stepFeatures:
+ 0: 5
+ 1: 10
HLT_j110_a10r_subjesIS_ftf_0eta200_ExoticPTF0p0dR1p2_L1SC111-CJ15:
eventCount: 0
stepCounts:
- 0: 4
- 1: 4
+ 0: 5
+ 1: 5
stepFeatures:
- 0: 4
- 1: 7
+ 0: 5
+ 1: 10
HLT_j110_a10r_subjesIS_ftf_0eta200_ExoticPTF0p1dR1p2_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
- 1: 2
+ 0: 5
+ 1: 5
+ 2: 1
stepFeatures:
- 0: 3
- 1: 4
+ 0: 5
+ 1: 10
+ 2: 1
HLT_j110_a10r_subjesIS_ftf_0eta200_ExoticPTF0p1dR1p2_L1SC111-CJ15:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 4
- 1: 4
+ 0: 5
+ 1: 5
+ 2: 1
stepFeatures:
- 0: 4
- 1: 7
+ 0: 5
+ 1: 10
+ 2: 1
HLT_j110_a10r_subjesIS_ftf_0eta200_ExoticPTF0p2dR1p2_L1J100:
- eventCount: 0
+ eventCount: 2
stepCounts:
- 0: 3
- 1: 2
+ 0: 5
+ 1: 5
+ 2: 2
stepFeatures:
- 0: 3
- 1: 4
+ 0: 5
+ 1: 10
+ 2: 2
HLT_j110_a10r_subjesIS_ftf_0eta200_ExoticPTF0p2dR1p2_L1SC111-CJ15:
- eventCount: 0
+ eventCount: 2
stepCounts:
- 0: 4
- 1: 4
+ 0: 5
+ 1: 5
+ 2: 2
stepFeatures:
- 0: 4
- 1: 7
+ 0: 5
+ 1: 10
+ 2: 2
HLT_j110_a10r_subjesIS_ftf_0eta200_ExoticPTF0p3dR1p2_L1J100:
- eventCount: 1
+ eventCount: 4
stepCounts:
- 0: 3
- 1: 2
- 2: 1
+ 0: 5
+ 1: 5
+ 2: 4
stepFeatures:
- 0: 3
- 1: 4
- 2: 1
+ 0: 5
+ 1: 10
+ 2: 5
HLT_j110_a10r_subjesIS_ftf_0eta200_ExoticPTF0p3dR1p2_L1SC111-CJ15:
- eventCount: 1
+ eventCount: 4
stepCounts:
- 0: 4
- 1: 4
- 2: 1
+ 0: 5
+ 1: 5
+ 2: 4
stepFeatures:
- 0: 4
- 1: 7
- 2: 1
+ 0: 5
+ 1: 10
+ 2: 5
HLT_j110_a10r_subjesIS_ftf_0eta200_TracklessdR1p2_L1J100:
eventCount: 0
stepCounts:
- 0: 3
- 1: 2
+ 0: 5
+ 1: 5
stepFeatures:
- 0: 3
- 1: 4
+ 0: 5
+ 1: 10
HLT_j110_a10r_subjesIS_ftf_0eta200_TracklessdR1p2_L1SC111-CJ15:
eventCount: 0
stepCounts:
- 0: 4
- 1: 4
+ 0: 5
+ 1: 5
stepFeatures:
- 0: 4
- 1: 7
+ 0: 5
+ 1: 10
HLT_j110_a10sd_cssk_pf_jes_ftf_L1J30:
- eventCount: 14
+ eventCount: 13
stepCounts:
0: 17
- 1: 14
+ 1: 13
stepFeatures:
0: 17
- 1: 23
+ 1: 21
HLT_j110_a10t_lcw_jes_L1J30:
eventCount: 16
stepCounts:
0: 16
stepFeatures:
- 0: 62
+ 0: 58
HLT_j110_pf_ftf_preselj20_L1J30:
eventCount: 10
stepCounts:
@@ -4870,65 +5064,69 @@ HLT_j110_pf_ftf_preselj20_L1J30:
1: 10
stepFeatures:
0: 17
- 1: 13
+ 1: 17
HLT_j110_subjesgscIS_ftf_bdl1r60_j45_subjesgscIS_ftf_bdl1r70_L1J50:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 13
- 1: 6
+ 0: 14
+ 1: 8
+ 2: 1
stepFeatures:
- 0: 26
- 1: 31
- 2: 6
+ 0: 28
+ 1: 46
+ 2: 10
HLT_j110_subjesgscIS_ftf_j45_subjesgscIS_ftf_L1J50:
- eventCount: 6
+ eventCount: 8
stepCounts:
- 0: 13
- 1: 6
+ 0: 14
+ 1: 8
stepFeatures:
- 0: 26
- 1: 31
+ 0: 28
+ 1: 46
HLT_j120_mb_afprec_afpdijet_L1AFP_A_AND_C_TOF_J50:
eventCount: 0
HLT_j135_L1J100:
- eventCount: 2
+ eventCount: 5
stepCounts:
- 0: 2
+ 0: 5
stepFeatures:
- 0: 2
+ 0: 9
HLT_j140_320eta490_LArPEBHLT_L1J75p31ETA49:
eventCount: 0
HLT_j150_0eta290_020jvt_pf_ftf_boffperf_L1J100:
- eventCount: 1
+ eventCount: 5
stepCounts:
- 0: 3
- 1: 1
- 2: 1
+ 0: 5
+ 1: 5
+ 2: 5
stepFeatures:
- 0: 3
- 1: 1
- 2: 1
+ 0: 5
+ 1: 9
+ 2: 9
HLT_j150_0eta320_pf_ftf_2j55_0eta290_020jvt_pf_ftf_bdl1r70_L1J85_3J30:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
- 1: 2
+ 0: 5
+ 1: 5
+ 2: 1
stepFeatures:
- 0: 6
- 1: 9
- 2: 2
+ 0: 10
+ 1: 27
+ 2: 4
HLT_j150_ftf_2j55_ftf_L1J85_3J30:
- eventCount: 0
+ eventCount: 5
stepCounts:
- 0: 3
+ 0: 5
+ 1: 5
stepFeatures:
- 0: 6
+ 0: 10
+ 1: 25
HLT_j15_320eta490_L1RD0_FILLED:
- eventCount: 8
+ eventCount: 6
stepCounts:
- 0: 8
+ 0: 6
stepFeatures:
- 0: 16
+ 0: 7
HLT_j15_pf_ftf_L1RD0_FILLED:
eventCount: 20
stepCounts:
@@ -4942,123 +5140,146 @@ HLT_j165_LArPEBHLT_L1J100:
HLT_j175_0eta290_020jvt_pf_ftf_bdl1r60_j60_0eta290_020jvt_pf_ftf_bdl1r60_L1J100:
eventCount: 0
stepCounts:
- 0: 3
+ 0: 5
+ 1: 4
stepFeatures:
- 0: 6
+ 0: 10
+ 1: 20
+ 2: 5
HLT_j175_320eta490_L1J50p31ETA49:
eventCount: 0
HLT_j175_a10r_subjesIS_ftf_0eta200_ExoticPTF0p0dR1p2_L1J100:
eventCount: 0
stepCounts:
- 0: 3
- 1: 2
+ 0: 5
+ 1: 4
stepFeatures:
- 0: 3
- 1: 3
+ 0: 5
+ 1: 7
HLT_j175_a10r_subjesIS_ftf_0eta200_ExoticPTF0p0dR1p2_L1SC111-CJ15:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 5
1: 4
stepFeatures:
- 0: 4
- 1: 5
+ 0: 5
+ 1: 7
HLT_j175_a10r_subjesIS_ftf_0eta200_ExoticPTF0p1dR1p2_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
- 1: 2
+ 0: 5
+ 1: 4
+ 2: 1
stepFeatures:
- 0: 3
- 1: 3
+ 0: 5
+ 1: 7
+ 2: 1
HLT_j175_a10r_subjesIS_ftf_0eta200_ExoticPTF0p1dR1p2_L1SC111-CJ15:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 4
+ 0: 5
1: 4
+ 2: 1
stepFeatures:
- 0: 4
- 1: 5
+ 0: 5
+ 1: 7
+ 2: 1
HLT_j175_a10r_subjesIS_ftf_0eta200_ExoticPTF0p2dR1p2_L1J100:
- eventCount: 0
+ eventCount: 2
stepCounts:
- 0: 3
- 1: 2
+ 0: 5
+ 1: 4
+ 2: 2
stepFeatures:
- 0: 3
- 1: 3
+ 0: 5
+ 1: 7
+ 2: 2
HLT_j175_a10r_subjesIS_ftf_0eta200_ExoticPTF0p2dR1p2_L1SC111-CJ15:
- eventCount: 0
+ eventCount: 2
stepCounts:
- 0: 4
+ 0: 5
1: 4
+ 2: 2
stepFeatures:
- 0: 4
- 1: 5
+ 0: 5
+ 1: 7
+ 2: 2
HLT_j175_a10r_subjesIS_ftf_0eta200_ExoticPTF0p3dR1p2_L1J100:
- eventCount: 0
+ eventCount: 4
stepCounts:
- 0: 3
- 1: 2
- stepFeatures:
- 0: 3
- 1: 3
+ 0: 5
+ 1: 4
+ 2: 4
+ stepFeatures:
+ 0: 5
+ 1: 7
+ 2: 5
HLT_j175_a10r_subjesIS_ftf_0eta200_ExoticPTF0p3dR1p2_L1SC111-CJ15:
- eventCount: 0
+ eventCount: 4
stepCounts:
- 0: 4
+ 0: 5
1: 4
+ 2: 4
stepFeatures:
- 0: 4
- 1: 5
+ 0: 5
+ 1: 7
+ 2: 5
HLT_j175_a10r_subjesIS_ftf_0eta200_TracklessdR1p2_L1J100:
eventCount: 0
stepCounts:
- 0: 3
- 1: 2
+ 0: 5
+ 1: 4
stepFeatures:
- 0: 3
- 1: 3
+ 0: 5
+ 1: 7
HLT_j175_a10r_subjesIS_ftf_0eta200_TracklessdR1p2_L1SC111-CJ15:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 5
1: 4
stepFeatures:
- 0: 4
- 1: 5
+ 0: 5
+ 1: 7
HLT_j175_a10sd_cssk_pf_jes_ftf_L1J50:
- eventCount: 5
+ eventCount: 7
stepCounts:
- 0: 13
- 1: 5
+ 0: 14
+ 1: 7
stepFeatures:
- 0: 13
- 1: 6
+ 0: 14
+ 1: 10
HLT_j175_a10t_lcw_jes_L1J50:
- eventCount: 7
+ eventCount: 9
stepCounts:
- 0: 7
+ 0: 9
stepFeatures:
- 0: 11
+ 0: 13
HLT_j175_mb_afprec_afpdijet_L1AFP_A_AND_C_TOF_J75:
eventCount: 0
HLT_j175_pf_ftf_preselj20_L1J50:
- eventCount: 1
+ eventCount: 4
stepCounts:
- 0: 13
- 1: 1
+ 0: 14
+ 1: 4
stepFeatures:
- 0: 13
- 1: 1
+ 0: 14
+ 1: 7
HLT_j180_L1J100:
- eventCount: 0
+ eventCount: 5
+ stepCounts:
+ 0: 5
+ stepFeatures:
+ 0: 8
HLT_j200_0eta290_020jvt_pf_ftf_boffperf_L1J100:
- eventCount: 0
+ eventCount: 4
stepCounts:
- 0: 3
+ 0: 5
+ 1: 4
+ 2: 4
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 6
+ 2: 6
HLT_j20_0eta290_020jvt_pf_ftf_boffperf_L1J15:
eventCount: 20
stepCounts:
@@ -5067,86 +5288,110 @@ HLT_j20_0eta290_020jvt_pf_ftf_boffperf_L1J15:
2: 20
stepFeatures:
0: 20
- 1: 125
- 2: 125
+ 1: 129
+ 2: 129
HLT_j20_0eta290_pf_ftf_boffperf_L1HT190-J15s5pETA21:
- eventCount: 4
+ eventCount: 5
stepCounts:
- 0: 4
- 1: 4
- 2: 4
+ 0: 5
+ 1: 5
+ 2: 5
stepFeatures:
- 0: 4
- 1: 38
- 2: 38
+ 0: 5
+ 1: 43
+ 2: 43
HLT_j20_JetDS_L1HT190-J15s5pETA21:
- eventCount: 4
+ eventCount: 5
stepCounts:
- 0: 4
- 1: 4
- 2: 4
+ 0: 5
+ 1: 5
+ 2: 5
stepFeatures:
- 0: 42
- 1: 42
- 2: 4
+ 0: 55
+ 1: 55
+ 2: 5
HLT_j20_JetDS_L1J100:
- eventCount: 3
+ eventCount: 5
stepCounts:
- 0: 3
- 1: 3
- 2: 3
+ 0: 5
+ 1: 5
+ 2: 5
stepFeatures:
- 0: 27
- 1: 27
- 2: 3
+ 0: 57
+ 1: 57
+ 2: 5
HLT_j20_JetDS_L1J50_DETA20-J50J:
- eventCount: 9
+ eventCount: 10
stepCounts:
- 0: 9
- 1: 9
- 2: 9
+ 0: 10
+ 1: 10
+ 2: 10
stepFeatures:
- 0: 87
- 1: 87
- 2: 9
+ 0: 111
+ 1: 111
+ 2: 10
HLT_j225_0eta290_020jvt_pf_ftf_bmv2c1040_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 3
+ 2: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 5
+ 2: 1
HLT_j225_0eta290_pf_ftf_bdl1r60_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 3
+ 2: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 5
+ 2: 1
HLT_j225_0eta290_pf_ftf_bdl1r70_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 3
+ 2: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 5
+ 2: 2
HLT_j225_0eta290_pf_ftf_bdl1r77_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 3
+ 2: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 5
+ 2: 2
HLT_j225_0eta290_pf_ftf_bdl1r85_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 3
+ 2: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 5
+ 2: 2
HLT_j225_L1J100:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_j25_320eta490_L1RD0_FILLED:
- eventCount: 5
+ eventCount: 2
stepCounts:
- 0: 5
+ 0: 2
stepFeatures:
- 0: 6
+ 0: 2
HLT_j25_pf_ftf_L1RD0_FILLED:
eventCount: 20
stepCounts:
@@ -5154,7 +5399,7 @@ HLT_j25_pf_ftf_L1RD0_FILLED:
1: 20
stepFeatures:
0: 20
- 1: 142
+ 1: 143
HLT_j260_320eta490_L1J20:
eventCount: 0
HLT_j260_320eta490_L1J75p31ETA49:
@@ -5162,169 +5407,237 @@ HLT_j260_320eta490_L1J75p31ETA49:
HLT_j260_a10r_subjesIS_ftf_0eta200_ExoticPTF0p0dR1p2_L1J100:
eventCount: 0
stepCounts:
- 0: 3
+ 0: 5
+ 1: 4
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 5
HLT_j260_a10r_subjesIS_ftf_0eta200_ExoticPTF0p0dR1p2_L1SC111-CJ15:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 5
+ 1: 4
stepFeatures:
- 0: 4
+ 0: 5
+ 1: 5
HLT_j260_a10r_subjesIS_ftf_0eta200_ExoticPTF0p1dR1p2_L1J100:
eventCount: 0
stepCounts:
- 0: 3
+ 0: 5
+ 1: 4
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 5
HLT_j260_a10r_subjesIS_ftf_0eta200_ExoticPTF0p1dR1p2_L1SC111-CJ15:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 5
+ 1: 4
stepFeatures:
- 0: 4
+ 0: 5
+ 1: 5
HLT_j260_a10r_subjesIS_ftf_0eta200_ExoticPTF0p2dR1p2_L1J100:
eventCount: 0
stepCounts:
- 0: 3
+ 0: 5
+ 1: 4
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 5
HLT_j260_a10r_subjesIS_ftf_0eta200_ExoticPTF0p2dR1p2_L1SC111-CJ15:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 5
+ 1: 4
stepFeatures:
- 0: 4
+ 0: 5
+ 1: 5
HLT_j260_a10r_subjesIS_ftf_0eta200_ExoticPTF0p3dR1p2_L1J100:
- eventCount: 0
+ eventCount: 3
stepCounts:
- 0: 3
+ 0: 5
+ 1: 4
+ 2: 3
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 5
+ 2: 3
HLT_j260_a10r_subjesIS_ftf_0eta200_ExoticPTF0p3dR1p2_L1SC111-CJ15:
- eventCount: 0
+ eventCount: 3
stepCounts:
- 0: 4
+ 0: 5
+ 1: 4
+ 2: 3
stepFeatures:
- 0: 4
+ 0: 5
+ 1: 5
+ 2: 3
HLT_j260_a10r_subjesIS_ftf_0eta200_TracklessdR1p2_L1J100:
eventCount: 0
stepCounts:
- 0: 3
+ 0: 5
+ 1: 4
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 5
HLT_j260_a10r_subjesIS_ftf_0eta200_TracklessdR1p2_L1SC111-CJ15:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 5
+ 1: 4
stepFeatures:
- 0: 4
+ 0: 5
+ 1: 5
HLT_j260_a10sd_cssk_pf_jes_ftf_L1J75:
- eventCount: 1
+ eventCount: 3
stepCounts:
- 0: 6
- 1: 1
+ 0: 8
+ 1: 3
stepFeatures:
- 0: 6
- 1: 1
+ 0: 8
+ 1: 4
HLT_j260_a10t_lcw_jes_L1J75:
- eventCount: 1
+ eventCount: 4
stepCounts:
- 0: 1
+ 0: 4
stepFeatures:
- 0: 1
+ 0: 5
HLT_j260_pf_ftf_preselj20_L1J75:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 6
+ 0: 8
+ 1: 1
stepFeatures:
- 0: 6
+ 0: 8
+ 1: 3
HLT_j275_0eta290_020jvt_pf_ftf_bdl1r60_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
+ 2: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 3
+ 2: 1
HLT_j275_0eta290_pf_ftf_bdl1r70_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
+ 2: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 3
+ 2: 2
HLT_j275_0eta290_pf_ftf_bdl1r77_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
+ 2: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 3
+ 2: 2
HLT_j275_0eta290_pf_ftf_bdl1r85_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
+ 2: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 3
+ 2: 2
HLT_j275_subjesgscIS_ftf_bdl1r60_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
+ 2: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 3
+ 2: 1
HLT_j280_320eta490_L1J75p31ETA49:
eventCount: 0
HLT_j300_0eta290_020jvt_pf_ftf_bdl1r70_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
+ 2: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 2
+ 2: 1
HLT_j300_0eta290_020jvt_pf_ftf_boffperf_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
+ 2: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 2
+ 2: 2
HLT_j300_0eta290_pf_ftf_bdl1r60_L1J100:
eventCount: 0
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 2
HLT_j300_0eta290_pf_ftf_bdl1r77_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
+ 2: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 2
+ 2: 1
HLT_j300_0eta290_pf_ftf_bdl1r85_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
+ 2: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 2
+ 2: 1
HLT_j300_320eta490_L1J75p31ETA49:
eventCount: 0
HLT_j300_subjesgscIS_ftf_bdl1r70_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
+ 2: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 2
+ 2: 1
HLT_j30_0eta290_020jvt_pf_ftf_boffperf_L1J20:
- eventCount: 18
+ eventCount: 20
stepCounts:
- 0: 19
- 1: 18
- 2: 18
+ 0: 20
+ 1: 20
+ 2: 20
stepFeatures:
- 0: 19
- 1: 71
- 2: 71
+ 0: 20
+ 1: 87
+ 2: 87
HLT_j35_320eta490_L1RD0_FILLED:
- eventCount: 2
+ eventCount: 1
stepCounts:
- 0: 2
+ 0: 1
stepFeatures:
- 0: 3
+ 0: 1
HLT_j35_pf_ftf_L1RD0_FILLED:
eventCount: 20
stepCounts:
@@ -5332,103 +5645,163 @@ HLT_j35_pf_ftf_L1RD0_FILLED:
1: 20
stepFeatures:
0: 20
- 1: 74
+ 1: 90
HLT_j360_0eta290_020jvt_pf_ftf_bdl1r77_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
+ 2: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 2
+ 2: 1
HLT_j360_0eta290_pf_ftf_bdl1r60_L1J100:
eventCount: 0
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 2
HLT_j360_0eta290_pf_ftf_bdl1r70_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
+ 2: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 2
+ 2: 1
HLT_j360_0eta290_pf_ftf_bdl1r85_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
+ 2: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 2
+ 2: 1
HLT_j360_a10sd_cssk_pf_jes_ftf_60smcINF_j360_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 4
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 8
+ 0: 10
+ 1: 3
HLT_j360_a10sd_cssk_pf_jes_ftf_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 2
HLT_j360_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 4
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 4
+ 0: 5
+ 1: 2
HLT_j360_a10t_lcw_jes_60smcINF_j360_a10t_lcw_jes_L1SC111-CJ15:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 3
HLT_j360_a10t_lcw_jes_L1J100:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_j360_a10t_lcw_jes_L1SC111-CJ15:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_j360_pf_ftf_preselj20_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 2
HLT_j360_subjesgscIS_ftf_bdl1r77_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
+ 2: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 2
+ 2: 1
HLT_j370_a10sd_cssk_pf_jes_ftf_35smcINF_j370_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 4
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 8
+ 0: 10
+ 1: 3
HLT_j370_a10t_lcw_jes_35smcINF_j370_a10t_lcw_jes_L1SC111-CJ15:
- eventCount: 0
-HLT_j380_pf_ftf_preselj20_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 1
stepFeatures:
- 0: 3
-HLT_j400_a10sd_cssk_pf_jes_ftf_L1J100:
- eventCount: 0
+ 0: 4
+HLT_j380_pf_ftf_preselj20_L1J100:
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 2
+HLT_j400_a10sd_cssk_pf_jes_ftf_L1J100:
+ eventCount: 1
+ stepCounts:
+ 0: 5
+ 1: 1
+ stepFeatures:
+ 0: 5
+ 1: 2
HLT_j400_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 4
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 4
+ 0: 5
+ 1: 2
HLT_j400_a10t_lcw_jes_L1J100:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_j400_a10t_lcw_jes_L1SC111-CJ15:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_j400_pf_ftf_preselj20_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 2
HLT_j40_LArPEBHLT_L1J20:
eventCount: 0
HLT_j40_j0_HT50XX10etXX0eta320_L1J20:
@@ -5436,117 +5809,163 @@ HLT_j40_j0_HT50XX10etXX0eta320_L1J20:
stepCounts:
0: 19
stepFeatures:
- 0: 431
+ 0: 479
HLT_j40_j0_HT50XX10ptXX0eta320_L1J20:
eventCount: 19
stepCounts:
0: 19
stepFeatures:
- 0: 431
+ 0: 479
HLT_j420_L1J100:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 1
HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_L1SC111-CJ15:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 4
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 4
+ 0: 5
+ 1: 1
HLT_j420_a10sd_cssk_pf_jes_ftf_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 2
HLT_j420_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 4
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 4
+ 0: 5
+ 1: 2
HLT_j420_a10t_lcw_jes_35smcINF_L1J100:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_j420_a10t_lcw_jes_35smcINF_L1SC111-CJ15:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_j420_a10t_lcw_jes_L1J100:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_j420_a10t_lcw_jes_L1SC111-CJ15:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_j420_ftf_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 2
HLT_j420_pf_ftf_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 2
HLT_j420_pf_ftf_preselj135_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 2
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 2
+ 0: 5
+ 1: 2
HLT_j420_pf_ftf_preselj180_L1J100:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 5
+ 1: 1
+ stepFeatures:
+ 0: 5
+ 1: 2
HLT_j420_pf_ftf_preselj225_L1J100:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ 1: 1
+ stepFeatures:
+ 0: 1
+ 1: 2
HLT_j440_pf_ftf_preselj135_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 2
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 2
+ 0: 5
+ 1: 2
HLT_j450_pf_ftf_preselj135_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 2
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 2
+ 0: 5
+ 1: 2
HLT_j45_0eta290_020jvt_020jvt_pf_ftf_bdl1r70_L1J20:
- eventCount: 12
+ eventCount: 10
stepCounts:
- 0: 19
- 1: 18
- 2: 12
+ 0: 20
+ 1: 19
+ 2: 10
stepFeatures:
- 0: 19
- 1: 50
- 2: 14
+ 0: 20
+ 1: 62
+ 2: 13
HLT_j45_0eta290_020jvt_pf_ftf_boffperf_L1J20:
- eventCount: 18
+ eventCount: 19
stepCounts:
- 0: 19
- 1: 18
- 2: 18
+ 0: 20
+ 1: 19
+ 2: 19
stepFeatures:
- 0: 19
- 1: 50
- 2: 50
+ 0: 20
+ 1: 62
+ 2: 62
HLT_j45_0eta290_020jvt_pf_ftf_boffperf_split_L1J20:
- eventCount: 18
+ eventCount: 19
stepCounts:
- 0: 19
- 1: 18
- 2: 18
+ 0: 20
+ 1: 19
+ 2: 19
stepFeatures:
- 0: 19
- 1: 50
- 2: 50
+ 0: 20
+ 1: 62
+ 2: 62
HLT_j45_320eta490_L1J15p31ETA49:
- eventCount: 2
- stepCounts:
- 0: 2
- stepFeatures:
- 0: 3
+ eventCount: 0
HLT_j45_L1J15:
eventCount: 0
HLT_j45_cssk_nojcalib_L1J15:
@@ -5554,15 +5973,15 @@ HLT_j45_cssk_nojcalib_L1J15:
stepCounts:
0: 15
stepFeatures:
- 0: 26
+ 0: 30
HLT_j45_cssk_pf_nojcalib_ftf_L1J15:
- eventCount: 17
+ eventCount: 19
stepCounts:
0: 20
- 1: 17
+ 1: 19
stepFeatures:
0: 20
- 1: 39
+ 1: 50
HLT_j45_ftf_L1J15:
eventCount: 19
stepCounts:
@@ -5570,7 +5989,7 @@ HLT_j45_ftf_L1J15:
1: 19
stepFeatures:
0: 20
- 1: 53
+ 1: 66
HLT_j45_ftf_preselj20_L1J15:
eventCount: 19
stepCounts:
@@ -5578,13 +5997,13 @@ HLT_j45_ftf_preselj20_L1J15:
1: 19
stepFeatures:
0: 20
- 1: 53
+ 1: 66
HLT_j45_nojcalib_L1J15:
- eventCount: 16
+ eventCount: 19
stepCounts:
- 0: 16
+ 0: 19
stepFeatures:
- 0: 38
+ 0: 49
HLT_j45_pf_ftf_010jvt_L1J15:
eventCount: 19
stepCounts:
@@ -5592,7 +6011,7 @@ HLT_j45_pf_ftf_010jvt_L1J15:
1: 19
stepFeatures:
0: 20
- 1: 54
+ 1: 62
HLT_j45_pf_ftf_020jvt_L1J15:
eventCount: 19
stepCounts:
@@ -5600,7 +6019,7 @@ HLT_j45_pf_ftf_020jvt_L1J15:
1: 19
stepFeatures:
0: 20
- 1: 54
+ 1: 62
HLT_j45_pf_ftf_050jvt_L1J15:
eventCount: 19
stepCounts:
@@ -5608,7 +6027,7 @@ HLT_j45_pf_ftf_050jvt_L1J15:
1: 19
stepFeatures:
0: 20
- 1: 54
+ 1: 62
HLT_j45_pf_ftf_L1J15:
eventCount: 19
stepCounts:
@@ -5616,7 +6035,7 @@ HLT_j45_pf_ftf_L1J15:
1: 19
stepFeatures:
0: 20
- 1: 55
+ 1: 65
HLT_j45_pf_ftf_preselj20_L1J15:
eventCount: 19
stepCounts:
@@ -5624,7 +6043,7 @@ HLT_j45_pf_ftf_preselj20_L1J15:
1: 19
stepFeatures:
0: 20
- 1: 55
+ 1: 65
HLT_j45_pf_ftf_preselj20_L1RD0_FILLED:
eventCount: 19
stepCounts:
@@ -5632,15 +6051,15 @@ HLT_j45_pf_ftf_preselj20_L1RD0_FILLED:
1: 19
stepFeatures:
0: 20
- 1: 55
+ 1: 65
HLT_j45_pf_nojcalib_ftf_L1J15:
- eventCount: 18
+ eventCount: 19
stepCounts:
0: 20
- 1: 18
+ 1: 19
stepFeatures:
0: 20
- 1: 46
+ 1: 60
HLT_j45_pf_subjesgscIS_ftf_L1J15:
eventCount: 19
stepCounts:
@@ -5648,7 +6067,7 @@ HLT_j45_pf_subjesgscIS_ftf_L1J15:
1: 19
stepFeatures:
0: 20
- 1: 48
+ 1: 62
HLT_j45_pf_subjesgsc_ftf_L1J15:
eventCount: 19
stepCounts:
@@ -5656,7 +6075,7 @@ HLT_j45_pf_subjesgsc_ftf_L1J15:
1: 19
stepFeatures:
0: 20
- 1: 48
+ 1: 62
HLT_j45_pf_subresjesgsc_ftf_L1J15:
eventCount: 19
stepCounts:
@@ -5664,13 +6083,13 @@ HLT_j45_pf_subresjesgsc_ftf_L1J15:
1: 19
stepFeatures:
0: 20
- 1: 55
+ 1: 65
HLT_j45_sk_nojcalib_L1J15:
- eventCount: 15
+ eventCount: 17
stepCounts:
- 0: 15
+ 0: 17
stepFeatures:
- 0: 26
+ 0: 32
HLT_j45_subjesIS_ftf_preselj20_L1J15:
eventCount: 19
stepCounts:
@@ -5678,31 +6097,31 @@ HLT_j45_subjesIS_ftf_preselj20_L1J15:
1: 19
stepFeatures:
0: 20
- 1: 51
+ 1: 65
HLT_j45_subjesgscIS_ftf_011jvt_L1J15:
- eventCount: 18
+ eventCount: 19
stepCounts:
0: 20
- 1: 18
+ 1: 19
stepFeatures:
0: 20
- 1: 46
+ 1: 57
HLT_j45_subjesgscIS_ftf_015jvt_L1J15:
- eventCount: 18
+ eventCount: 19
stepCounts:
0: 20
- 1: 18
+ 1: 19
stepFeatures:
0: 20
- 1: 46
+ 1: 57
HLT_j45_subjesgscIS_ftf_059jvt_L1J15:
- eventCount: 18
+ eventCount: 19
stepCounts:
0: 20
- 1: 18
+ 1: 19
stepFeatures:
0: 20
- 1: 46
+ 1: 57
HLT_j45_subjesgscIS_ftf_L1J15:
eventCount: 19
stepCounts:
@@ -5710,17 +6129,17 @@ HLT_j45_subjesgscIS_ftf_L1J15:
1: 19
stepFeatures:
0: 20
- 1: 51
+ 1: 64
HLT_j45_subjesgscIS_ftf_bdl1r70_L1J20:
eventCount: 11
stepCounts:
- 0: 19
+ 0: 20
1: 19
2: 11
stepFeatures:
- 0: 19
- 1: 49
- 2: 12
+ 0: 20
+ 1: 64
+ 2: 14
HLT_j45_subjesgsc_ftf_L1J15:
eventCount: 19
stepCounts:
@@ -5728,7 +6147,7 @@ HLT_j45_subjesgsc_ftf_L1J15:
1: 19
stepFeatures:
0: 20
- 1: 51
+ 1: 64
HLT_j45_subresjesgsc_ftf_L1J15:
eventCount: 19
stepCounts:
@@ -5736,99 +6155,165 @@ HLT_j45_subresjesgsc_ftf_L1J15:
1: 19
stepFeatures:
0: 20
- 1: 53
+ 1: 66
HLT_j460_a10_lcw_subjes_L1J100:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_j460_a10_lcw_subjes_L1J20:
eventCount: 0
HLT_j460_a10_lcw_subjes_L1SC111-CJ15:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_j460_a10r_L1J100:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_j460_a10r_L1J20:
eventCount: 0
HLT_j460_a10r_L1SC111-CJ15:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_j460_a10sd_cssk_pf_jes_ftf_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 2
HLT_j460_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 4
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 4
+ 0: 5
+ 1: 2
HLT_j460_a10sd_cssk_pf_nojcalib_ftf_35smcINF_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 2
HLT_j460_a10sd_cssk_pf_nojcalib_ftf_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 2
HLT_j460_a10sd_lcw_nojcalib_L1J100:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_j460_a10sd_pf_nojcalib_ftf_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 2
HLT_j460_a10t_lcw_jes_L1J100:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_j460_a10t_lcw_jes_L1SC111-CJ15:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_j460_a10t_lcw_nojcalib_35smcINF_L1J100:
- eventCount: 0
-HLT_j460_a10t_lcw_nojcalib_L1J100:
- eventCount: 0
-HLT_j460_pf_ftf_preselj135_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
+ 0: 1
+ stepFeatures:
0: 2
+HLT_j460_a10t_lcw_nojcalib_L1J100:
+ eventCount: 1
+ stepCounts:
+ 0: 1
stepFeatures:
0: 2
+HLT_j460_pf_ftf_preselj135_L1J100:
+ eventCount: 1
+ stepCounts:
+ 0: 5
+ 1: 1
+ stepFeatures:
+ 0: 5
+ 1: 2
HLT_j480_a10sd_cssk_pf_jes_ftf_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 3
+ 0: 5
+ 1: 2
HLT_j480_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 4
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 4
+ 0: 5
+ 1: 2
HLT_j480_a10t_lcw_jes_L1J100:
- eventCount: 0
-HLT_j480_a10t_lcw_jes_L1SC111-CJ15:
- eventCount: 0
-HLT_j480_pf_ftf_preselj135_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
+ 0: 1
+ stepFeatures:
0: 2
+HLT_j480_a10t_lcw_jes_L1SC111-CJ15:
+ eventCount: 1
+ stepCounts:
+ 0: 1
stepFeatures:
0: 2
+HLT_j480_pf_ftf_preselj135_L1J100:
+ eventCount: 1
+ stepCounts:
+ 0: 5
+ 1: 1
+ stepFeatures:
+ 0: 5
+ 1: 2
HLT_j500_pf_ftf_preselj135_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 2
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 2
+ 0: 5
+ 1: 2
HLT_j520_pf_ftf_preselj135_L1J100:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 2
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 2
+ 0: 5
+ 1: 2
HLT_j55_0eta240_xe50_cell_L1J30_EMPTY:
eventCount: 0
HLT_j55_0eta240_xe50_cell_L1J30_FIRSTEMPTY:
@@ -5836,59 +6321,61 @@ HLT_j55_0eta240_xe50_cell_L1J30_FIRSTEMPTY:
HLT_j55_pf_ftf_0eta320_bdl1r70_2j45_pf_ftf_320eta490_L1J25p0ETA23_2J15p31ETA49:
eventCount: 0
stepCounts:
- 0: 5
- 1: 1
+ 0: 4
stepFeatures:
- 0: 10
- 1: 4
+ 0: 8
HLT_j60_0eta290_020jvt_pf_ftf_boffperf_L1J50:
- eventCount: 13
+ eventCount: 14
stepCounts:
- 0: 13
- 1: 13
- 2: 13
+ 0: 14
+ 1: 14
+ 2: 14
stepFeatures:
- 0: 13
- 1: 29
- 2: 29
+ 0: 14
+ 1: 36
+ 2: 36
HLT_j60_320eta490_L1J20p31ETA49:
eventCount: 0
HLT_j60_j0_FBDJSHARED_L1J20:
- eventCount: 7
+ eventCount: 8
stepCounts:
- 0: 7
+ 0: 8
stepFeatures:
- 0: 147
+ 0: 180
HLT_j60_j45_2j20_JetDS_L1J45p0ETA21_3J15p0ETA25:
- eventCount: 9
+ eventCount: 12
stepCounts:
- 0: 9
- 1: 9
- 2: 9
+ 0: 12
+ 1: 12
+ 2: 12
stepFeatures:
- 0: 149
- 1: 149
- 2: 27
+ 0: 202
+ 1: 202
+ 2: 36
HLT_j60_pf_ftf_preselj20_L1J20:
eventCount: 19
stepCounts:
- 0: 19
+ 0: 20
1: 19
stepFeatures:
- 0: 19
- 1: 40
+ 0: 20
+ 1: 49
HLT_j70_0eta320_j50_0eta490_j0_DJMASS1000j50dphi200x400deta_L1MJJ-500-NFF:
eventCount: 0
HLT_j70_0eta320_j50_0eta490_j0_DJMASS1000j50dphi240_xe90_tcpufit_xe50_cell_L1MJJ-500-NFF:
eventCount: 0
stepFeatures:
- 0: 3
+ 0: 2
? HLT_j70_pf_ftf_0eta490_j50_pf_ftf_0eta490_2j35_pf_ftf_0eta490_SHARED_2j35_pf_ftf_0eta290_bdl1r70_j0_pf_ftf_DJMASS1000j50_L1MJJ-500-NFF
-: eventCount: 0
+: eventCount: 1
stepCounts:
0: 3
+ 1: 1
+ 2: 1
stepFeatures:
0: 15
+ 1: 21
+ 2: 2
HLT_j75_0eta290_020jvt_pf_ftf_bdl1r60_3j75_pf_ftf_L14J20:
eventCount: 1
stepCounts:
@@ -5897,530 +6384,531 @@ HLT_j75_0eta290_020jvt_pf_ftf_bdl1r60_3j75_pf_ftf_L14J20:
2: 1
stepFeatures:
0: 14
- 1: 10
+ 1: 8
2: 1
HLT_j75_320eta490_LArPEBHLT_L1J30p31ETA49:
eventCount: 0
? HLT_j75_pf_ftf_0eta240_020jvt_j50_pf_ftf_0eta240_020jvt_j35_pf_ftf_0eta240_020jvt_j25_pf_ftf_0eta240_020jvt_L1J45p0ETA21_3J15p0ETA25
: eventCount: 8
stepCounts:
- 0: 9
+ 0: 12
1: 8
stepFeatures:
- 0: 36
- 1: 123
+ 0: 48
+ 1: 129
? HLT_j75_pf_ftf_0eta240_020jvt_j50_pf_ftf_0eta240_020jvt_j35_pf_ftf_0eta240_020jvt_j25_pf_ftf_0eta240_020jvt_SHARED_2j25_pf_ftf_0eta240_020jvt_bdl1r60_L1J45p0ETA21_3J15p0ETA25
-: eventCount: 2
+: eventCount: 1
stepCounts:
- 0: 9
+ 0: 12
1: 8
- 2: 2
+ 2: 1
stepFeatures:
- 0: 45
- 1: 167
- 2: 9
+ 0: 60
+ 1: 173
+ 2: 6
? HLT_j75_pf_ftf_0eta240_020jvt_j50_pf_ftf_0eta240_020jvt_j35_pf_ftf_0eta240_020jvt_j25_pf_ftf_0eta240_020jvt_SHARED_2j25_pf_ftf_0eta240_020jvt_bdl1r70_L1J45p0ETA21_3J15p0ETA25
-: eventCount: 3
+: eventCount: 2
stepCounts:
- 0: 9
+ 0: 12
1: 8
- 2: 3
+ 2: 2
stepFeatures:
- 0: 45
- 1: 167
- 2: 11
+ 0: 60
+ 1: 173
+ 2: 7
? HLT_j75_pf_ftf_0eta240_020jvt_j50_pf_ftf_0eta240_020jvt_j35_pf_ftf_0eta240_020jvt_j25_pf_ftf_0eta240_020jvt_SHARED_2j25_pf_ftf_0eta240_020jvt_bdl1r77_L1J45p0ETA21_3J15p0ETA25
-: eventCount: 5
+: eventCount: 2
stepCounts:
- 0: 9
+ 0: 12
1: 8
- 2: 5
+ 2: 2
stepFeatures:
- 0: 45
- 1: 167
- 2: 13
+ 0: 60
+ 1: 173
+ 2: 7
? HLT_j75_pf_ftf_0eta240_020jvt_j50_pf_ftf_0eta240_020jvt_j35_pf_ftf_0eta240_020jvt_j25_pf_ftf_0eta240_020jvt_SHARED_2j25_pf_ftf_0eta240_020jvt_bdl1r85_L1J45p0ETA21_3J15p0ETA25
-: eventCount: 6
+: eventCount: 4
stepCounts:
- 0: 9
+ 0: 12
1: 8
- 2: 6
+ 2: 4
stepFeatures:
- 0: 45
- 1: 167
- 2: 15
+ 0: 60
+ 1: 173
+ 2: 11
? HLT_j75_pf_ftf_0eta240_020jvt_j50_pf_ftf_0eta240_020jvt_j35_pf_ftf_0eta240_020jvt_j25_pf_ftf_0eta240_020jvt_SHARED_3j25_pf_ftf_0eta240_020jvt_bdl1r70_L1J45p0ETA21_3J15p0ETA25
: eventCount: 0
stepCounts:
- 0: 9
+ 0: 12
1: 8
stepFeatures:
- 0: 45
- 1: 167
- 2: 11
+ 0: 60
+ 1: 173
+ 2: 7
? HLT_j75_pf_ftf_0eta240_020jvt_j50_pf_ftf_0eta240_020jvt_j35_pf_ftf_0eta240_020jvt_j25_pf_ftf_0eta240_020jvt_SHARED_3j25_pf_ftf_0eta240_020jvt_bdl1r77_L1J45p0ETA21_3J15p0ETA25
: eventCount: 0
stepCounts:
- 0: 9
+ 0: 12
1: 8
stepFeatures:
- 0: 45
- 1: 167
- 2: 13
+ 0: 60
+ 1: 173
+ 2: 7
? HLT_j75_pf_ftf_0eta240_020jvt_j50_pf_ftf_0eta240_020jvt_j35_pf_ftf_0eta240_020jvt_j25_pf_ftf_0eta240_020jvt_SHARED_3j25_pf_ftf_0eta240_020jvt_bdl1r85_L1J45p0ETA21_3J15p0ETA25
-: eventCount: 1
+: eventCount: 0
stepCounts:
- 0: 9
+ 0: 12
1: 8
- 2: 1
stepFeatures:
- 0: 45
- 1: 167
- 2: 15
+ 0: 60
+ 1: 173
+ 2: 11
? HLT_j75_pf_ftf_0eta240_020jvt_j50_pf_ftf_0eta240_020jvt_j35_pf_ftf_0eta240_020jvt_j25_pf_ftf_0eta240_020jvt_SHARED_j35_pf_ftf_0eta240_020jvt_bdl1r60_j25_pf_ftf_0eta240_020jvt_bdl1r60_L1J45p0ETA21_3J15p0ETA25
-: eventCount: 2
+: eventCount: 1
stepCounts:
- 0: 9
+ 0: 12
1: 8
- 2: 2
+ 2: 1
stepFeatures:
- 0: 54
- 1: 201
- 2: 15
+ 0: 72
+ 1: 211
+ 2: 12
? HLT_j75_pf_ftf_0eta240_020jvt_j50_pf_ftf_0eta240_020jvt_j35_pf_ftf_0eta240_020jvt_j25_pf_ftf_0eta240_020jvt_SHARED_j35_pf_ftf_0eta240_020jvt_bdl1r70_j25_pf_ftf_0eta240_020jvt_bdl1r70_L1J45p0ETA21_3J15p0ETA25
-: eventCount: 3
+: eventCount: 2
stepCounts:
- 0: 9
+ 0: 12
1: 8
- 2: 3
+ 2: 2
stepFeatures:
- 0: 54
- 1: 201
- 2: 19
+ 0: 72
+ 1: 211
+ 2: 14
? HLT_j75_pf_ftf_0eta240_020jvt_j50_pf_ftf_0eta240_020jvt_j35_pf_ftf_0eta240_020jvt_j25_pf_ftf_0eta240_020jvt_SHARED_j35_pf_ftf_0eta240_020jvt_bdl1r77_j25_pf_ftf_0eta240_020jvt_bdl1r77_L1J45p0ETA21_3J15p0ETA25
-: eventCount: 5
+: eventCount: 2
stepCounts:
- 0: 9
+ 0: 12
1: 8
- 2: 5
+ 2: 2
stepFeatures:
- 0: 54
- 1: 201
- 2: 23
+ 0: 72
+ 1: 211
+ 2: 14
? HLT_j75_pf_ftf_0eta240_020jvt_j50_pf_ftf_0eta240_020jvt_j35_pf_ftf_0eta240_020jvt_j25_pf_ftf_0eta240_020jvt_SHARED_j35_pf_ftf_0eta240_020jvt_bdl1r85_j25_pf_ftf_0eta240_020jvt_bdl1r85_L1J45p0ETA21_3J15p0ETA25
-: eventCount: 6
+: eventCount: 4
stepCounts:
- 0: 9
+ 0: 12
1: 8
- 2: 6
+ 2: 4
stepFeatures:
- 0: 54
- 1: 201
- 2: 27
+ 0: 72
+ 1: 211
+ 2: 22
? HLT_j75_pf_ftf_0eta240_020jvt_j50_pf_ftf_0eta240_020jvt_j35_pf_ftf_0eta240_020jvt_j25_pf_ftf_0eta240_020jvt_SHARED_j50_pf_ftf_0eta240_020jvt_bdl1r70_j35_pf_ftf_0eta240_020jvt_bdl1r70_j25_pf_ftf_0eta240_020jvt_bdl1r70_L1J45p0ETA21_3J15p0ETA25
: eventCount: 0
stepCounts:
- 0: 9
+ 0: 12
1: 8
stepFeatures:
- 0: 63
- 1: 226
- 2: 26
+ 0: 84
+ 1: 240
+ 2: 20
? HLT_j75_pf_ftf_0eta240_020jvt_j50_pf_ftf_0eta240_020jvt_j35_pf_ftf_0eta240_020jvt_j25_pf_ftf_0eta240_020jvt_SHARED_j50_pf_ftf_0eta240_020jvt_bdl1r77_j35_pf_ftf_0eta240_020jvt_bdl1r77_j25_pf_ftf_0eta240_020jvt_bdl1r77_L1J45p0ETA21_3J15p0ETA25
: eventCount: 0
stepCounts:
- 0: 9
+ 0: 12
1: 8
stepFeatures:
- 0: 63
- 1: 226
- 2: 31
+ 0: 84
+ 1: 240
+ 2: 20
? HLT_j75_pf_ftf_0eta240_020jvt_j50_pf_ftf_0eta240_020jvt_j35_pf_ftf_0eta240_020jvt_j25_pf_ftf_0eta240_020jvt_SHARED_j50_pf_ftf_0eta240_020jvt_bdl1r85_j35_pf_ftf_0eta240_020jvt_bdl1r85_j25_pf_ftf_0eta240_020jvt_bdl1r85_L1J45p0ETA21_3J15p0ETA25
: eventCount: 0
stepCounts:
- 0: 9
+ 0: 12
1: 8
stepFeatures:
- 0: 63
- 1: 226
- 2: 36
+ 0: 84
+ 1: 240
+ 2: 31
HLT_j80_0eta240_2j60_320eta490_j0_DJMASS700j80x0eta240_L1J20:
eventCount: 0
HLT_j80_0eta290_020jvt_pf_ftf_boffperf_L1J50:
- eventCount: 12
+ eventCount: 13
stepCounts:
- 0: 13
- 1: 12
- 2: 12
+ 0: 14
+ 1: 13
+ 2: 13
stepFeatures:
- 0: 13
- 1: 24
- 2: 24
+ 0: 14
+ 1: 25
+ 2: 25
HLT_j80_j60_SHARED_j40__L1J15:
- eventCount: 8
+ eventCount: 9
stepCounts:
- 0: 8
+ 0: 9
stepFeatures:
- 0: 70
+ 0: 89
? HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_L1J45p0ETA21_3J15p0ETA25
-: eventCount: 7
+: eventCount: 8
stepCounts:
- 0: 9
- 1: 7
+ 0: 12
+ 1: 8
stepFeatures:
- 0: 36
- 1: 130
+ 0: 48
+ 1: 136
? HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_L1MU10_2J15_J20
-: eventCount: 4
+: eventCount: 5
stepCounts:
- 0: 7
- 1: 4
+ 0: 10
+ 1: 5
stepFeatures:
- 0: 28
- 1: 62
+ 0: 40
+ 1: 92
HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_L1MU20:
eventCount: 4
stepCounts:
- 0: 8
+ 0: 6
1: 4
stepFeatures:
- 0: 32
- 1: 62
+ 0: 24
+ 1: 71
? HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_SHARED_2j20_pf_ftf_0eta240_020jvt_bdl1r60_L1J45p0ETA21_3J15p0ETA25
-: eventCount: 1
+: eventCount: 2
stepCounts:
- 0: 9
- 1: 7
- 2: 1
+ 0: 12
+ 1: 8
+ 2: 2
stepFeatures:
- 0: 45
- 1: 183
+ 0: 60
+ 1: 187
2: 7
? HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_SHARED_2j20_pf_ftf_0eta240_020jvt_bdl1r70_L1J45p0ETA21_3J15p0ETA25
-: eventCount: 2
+: eventCount: 3
stepCounts:
- 0: 9
- 1: 7
- 2: 2
+ 0: 12
+ 1: 8
+ 2: 3
stepFeatures:
- 0: 45
- 1: 183
+ 0: 60
+ 1: 187
2: 9
? HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_SHARED_2j20_pf_ftf_0eta240_020jvt_bdl1r77_L1J45p0ETA21_3J15p0ETA25
-: eventCount: 4
+: eventCount: 3
stepCounts:
- 0: 9
- 1: 7
- 2: 4
+ 0: 12
+ 1: 8
+ 2: 3
stepFeatures:
- 0: 45
- 1: 183
- 2: 11
+ 0: 60
+ 1: 187
+ 2: 9
? HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_SHARED_2j20_pf_ftf_0eta240_020jvt_bdl1r85_L1J45p0ETA21_3J15p0ETA25
-: eventCount: 5
+: eventCount: 4
stepCounts:
- 0: 9
- 1: 7
- 2: 5
+ 0: 12
+ 1: 8
+ 2: 4
stepFeatures:
- 0: 45
- 1: 183
+ 0: 60
+ 1: 187
2: 13
? HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_SHARED_3j20_pf_ftf_0eta240_020jvt_bdl1r70_L1J45p0ETA21_3J15p0ETA25
: eventCount: 0
stepCounts:
- 0: 9
- 1: 7
+ 0: 12
+ 1: 8
stepFeatures:
- 0: 45
- 1: 183
+ 0: 60
+ 1: 187
2: 9
? HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_SHARED_3j20_pf_ftf_0eta240_020jvt_bdl1r77_L1J45p0ETA21_3J15p0ETA25
: eventCount: 0
stepCounts:
- 0: 9
- 1: 7
+ 0: 12
+ 1: 8
stepFeatures:
- 0: 45
- 1: 183
- 2: 11
+ 0: 60
+ 1: 187
+ 2: 9
? HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_SHARED_3j20_pf_ftf_0eta240_020jvt_bdl1r85_L1J45p0ETA21_3J15p0ETA25
: eventCount: 1
stepCounts:
- 0: 9
- 1: 7
+ 0: 12
+ 1: 8
2: 1
stepFeatures:
- 0: 45
- 1: 183
+ 0: 60
+ 1: 187
2: 13
? HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_SHARED_j28_pf_ftf_0eta240_020jvt_bdl1r60_j20_pf_ftf_0eta240_020jvt_bdl1r60_L1J45p0ETA21_3J15p0ETA25
-: eventCount: 1
+: eventCount: 2
stepCounts:
- 0: 9
- 1: 7
- 2: 1
+ 0: 12
+ 1: 8
+ 2: 2
stepFeatures:
- 0: 54
- 1: 219
- 2: 12
+ 0: 72
+ 1: 228
+ 2: 13
? HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_SHARED_j28_pf_ftf_0eta240_020jvt_bdl1r70_j20_pf_ftf_0eta240_020jvt_bdl1r70_L1J45p0ETA21_3J15p0ETA25
-: eventCount: 2
+: eventCount: 3
stepCounts:
- 0: 9
- 1: 7
- 2: 2
+ 0: 12
+ 1: 8
+ 2: 3
stepFeatures:
- 0: 54
- 1: 219
+ 0: 72
+ 1: 228
2: 16
? HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_SHARED_j28_pf_ftf_0eta240_020jvt_bdl1r70_j20_pf_ftf_0eta240_020jvt_bdl1r70_L1MU10_2J15_J20
-: eventCount: 2
+: eventCount: 3
stepCounts:
- 0: 7
- 1: 4
- 2: 2
+ 0: 10
+ 1: 5
+ 2: 3
stepFeatures:
- 0: 42
- 1: 105
- 2: 11
+ 0: 60
+ 1: 153
+ 2: 12
? HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_SHARED_j28_pf_ftf_0eta240_020jvt_bdl1r77_j20_pf_ftf_0eta240_020jvt_bdl1r77_L1J45p0ETA21_3J15p0ETA25
-: eventCount: 4
+: eventCount: 3
stepCounts:
- 0: 9
- 1: 7
- 2: 4
+ 0: 12
+ 1: 8
+ 2: 3
stepFeatures:
- 0: 54
- 1: 219
- 2: 20
+ 0: 72
+ 1: 228
+ 2: 16
? HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_SHARED_j28_pf_ftf_0eta240_020jvt_bdl1r85_j20_pf_ftf_0eta240_020jvt_bdl1r85_L1J45p0ETA21_3J15p0ETA25
-: eventCount: 5
+: eventCount: 4
stepCounts:
- 0: 9
- 1: 7
- 2: 5
+ 0: 12
+ 1: 8
+ 2: 4
stepFeatures:
- 0: 54
- 1: 219
+ 0: 72
+ 1: 228
2: 24
? HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_SHARED_j55_pf_ftf_0eta240_020jvt_bdl1r70_j28_pf_ftf_0eta240_020jvt_bdl1r70_j20_pf_ftf_0eta240_020jvt_bdl1r70_L1J45p0ETA21_3J15p0ETA25
: eventCount: 0
stepCounts:
- 0: 9
- 1: 7
+ 0: 12
+ 1: 8
stepFeatures:
- 0: 63
- 1: 242
- 2: 23
+ 0: 84
+ 1: 254
+ 2: 22
? HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_SHARED_j55_pf_ftf_0eta240_020jvt_bdl1r77_j28_pf_ftf_0eta240_020jvt_bdl1r77_j20_pf_ftf_0eta240_020jvt_bdl1r77_L1J45p0ETA21_3J15p0ETA25
: eventCount: 0
stepCounts:
- 0: 9
- 1: 7
+ 0: 12
+ 1: 8
stepFeatures:
- 0: 63
- 1: 242
- 2: 28
+ 0: 84
+ 1: 254
+ 2: 22
? HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_SHARED_j55_pf_ftf_0eta240_020jvt_bdl1r85_j28_pf_ftf_0eta240_020jvt_bdl1r85_j20_pf_ftf_0eta240_020jvt_bdl1r85_L1J45p0ETA21_3J15p0ETA25
-: eventCount: 0
+: eventCount: 1
stepCounts:
- 0: 9
- 1: 7
+ 0: 12
+ 1: 8
+ 2: 1
stepFeatures:
- 0: 63
- 1: 242
+ 0: 84
+ 1: 254
2: 33
? HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_bdl1r70_L1MU10_2J15_J20
: eventCount: 4
stepCounts:
- 0: 7
- 1: 4
+ 0: 10
+ 1: 5
2: 4
stepFeatures:
- 0: 28
- 1: 62
- 2: 6
+ 0: 40
+ 1: 92
+ 2: 7
HLT_j80_pf_ftf_0eta240_j55_pf_ftf_0eta240_j28_pf_ftf_0eta240_j20_pf_ftf_0eta240_L1J45p0ETA21_3J15p0ETA25:
- eventCount: 8
+ eventCount: 10
stepCounts:
- 0: 9
- 1: 8
+ 0: 12
+ 1: 10
stepFeatures:
- 0: 36
- 1: 156
+ 0: 48
+ 1: 186
HLT_j80_pf_ftf_0eta240_j55_pf_ftf_0eta240_j28_pf_ftf_0eta240_j20_pf_ftf_0eta240_L1MU10_2J15_J20:
- eventCount: 4
+ eventCount: 6
stepCounts:
- 0: 7
- 1: 4
+ 0: 10
+ 1: 6
stepFeatures:
- 0: 28
- 1: 72
+ 0: 40
+ 1: 115
HLT_j80_pf_ftf_0eta240_j55_pf_ftf_0eta240_j28_pf_ftf_0eta240_j20_pf_ftf_0eta240_L1MU20:
- eventCount: 4
+ eventCount: 5
stepCounts:
- 0: 8
- 1: 4
+ 0: 6
+ 1: 5
stepFeatures:
- 0: 32
- 1: 72
+ 0: 24
+ 1: 92
? HLT_j80_pf_ftf_0eta240_j60_pf_ftf_0eta320_j45_pf_ftf_320eta490_SHARED_2j45_pf_ftf_0eta290_bdl1r60_L1J40p0ETA25_2J25_J20p31ETA49
-: eventCount: 0
+: eventCount: 1
stepCounts:
- 0: 4
- 1: 2
- stepFeatures:
- 0: 16
- 1: 17
+ 0: 5
+ 1: 1
2: 1
+ stepFeatures:
+ 0: 20
+ 1: 12
+ 2: 2
HLT_j80_pf_ftf_0eta320_bdl1r70_j60_pf_ftf_0eta320_bdl1r85_j45_pf_ftf_320eta490_L1J40p0ETA25_2J25_J20p31ETA49:
eventCount: 0
stepCounts:
- 0: 4
- 1: 2
+ 0: 5
+ 1: 1
stepFeatures:
- 0: 12
- 1: 13
+ 0: 15
+ 1: 7
2: 2
HLT_j80_pf_ftf_bdl1r60_xe60_cell_L12J50_XE40:
- eventCount: 1
+ eventCount: 2
stepCounts:
- 0: 2
- 1: 2
- 2: 1
+ 0: 3
+ 1: 3
+ 2: 2
stepFeatures:
0: 6
- 1: 5
- 2: 1
+ 1: 9
+ 2: 2
HLT_j80_pf_ftf_j55_pf_ftf_j28_pf_ftf_j20_0eta290_pf_ftf_boffperf_L1J45p0ETA21_3J15p0ETA25:
- eventCount: 8
+ eventCount: 10
stepCounts:
- 0: 9
- 1: 8
- 2: 8
+ 0: 12
+ 1: 10
+ 2: 10
stepFeatures:
- 0: 36
- 1: 173
- 2: 80
+ 0: 48
+ 1: 213
+ 2: 94
HLT_j85_050momemfrac100XXmomhecfrac010_L1J20:
eventCount: 9
stepCounts:
0: 9
stepFeatures:
- 0: 14
+ 0: 15
HLT_j85_050momemfrac100_L1J20:
- eventCount: 12
+ eventCount: 10
stepCounts:
- 0: 12
+ 0: 10
stepFeatures:
- 0: 18
+ 0: 19
HLT_j85_320eta490_L1J20p31ETA49:
eventCount: 0
HLT_j85_CLEANlb_L1J20:
- eventCount: 13
+ eventCount: 11
stepCounts:
- 0: 13
+ 0: 11
stepFeatures:
0: 21
HLT_j85_CLEANllp_L1J20:
- eventCount: 13
+ eventCount: 11
stepCounts:
- 0: 13
+ 0: 11
stepFeatures:
0: 21
HLT_j85_L1J20:
- eventCount: 13
+ eventCount: 11
stepCounts:
- 0: 13
+ 0: 11
stepFeatures:
0: 21
HLT_j85_a10sd_cssk_pf_jes_ftf_L1J20:
- eventCount: 17
+ eventCount: 20
stepCounts:
- 0: 19
- 1: 17
+ 0: 20
+ 1: 20
stepFeatures:
- 0: 19
- 1: 36
+ 0: 20
+ 1: 44
HLT_j85_a10sd_cssk_pf_nojcalib_ftf_L1J20:
- eventCount: 12
+ eventCount: 16
stepCounts:
- 0: 19
- 1: 12
+ 0: 20
+ 1: 16
stepFeatures:
- 0: 19
- 1: 21
+ 0: 20
+ 1: 25
HLT_j85_a10t_lcw_jes_L1J20:
- eventCount: 19
+ eventCount: 20
stepCounts:
- 0: 19
+ 0: 20
stepFeatures:
- 0: 131
+ 0: 139
HLT_j85_a10t_lcw_nojcalib_L1J20:
- eventCount: 19
+ eventCount: 20
stepCounts:
- 0: 19
+ 0: 20
stepFeatures:
- 0: 115
+ 0: 122
HLT_j85_ftf_L1J20:
- eventCount: 13
+ eventCount: 11
stepCounts:
- 0: 19
- 1: 13
+ 0: 20
+ 1: 11
stepFeatures:
- 0: 19
- 1: 23
+ 0: 20
+ 1: 21
HLT_j85_ftf_MASK300ceta210XX300nphi10_L1J20:
- eventCount: 10
+ eventCount: 9
stepCounts:
- 0: 19
- 1: 10
+ 0: 20
+ 1: 9
stepFeatures:
- 0: 19
- 1: 15
+ 0: 20
+ 1: 11
HLT_j85_momhecfrac010_L1J20:
eventCount: 10
stepCounts:
0: 10
stepFeatures:
- 0: 16
+ 0: 17
HLT_j85_pf_ftf_L1J20:
- eventCount: 13
+ eventCount: 11
stepCounts:
- 0: 19
- 1: 13
+ 0: 20
+ 1: 11
stepFeatures:
- 0: 19
- 1: 25
+ 0: 20
+ 1: 23
HLT_j85_pf_ftf_preselj20_L1J20:
- eventCount: 13
+ eventCount: 11
stepCounts:
- 0: 19
- 1: 13
+ 0: 20
+ 1: 11
stepFeatures:
- 0: 19
- 1: 25
+ 0: 20
+ 1: 23
HLT_l1topodebug_legacy_L1All:
eventCount: 0
HLT_larnoiseburst_L1XE60:
- eventCount: 6
+ eventCount: 5
stepCounts:
- 0: 6
+ 0: 5
stepFeatures:
- 0: 6
+ 0: 5
HLT_larpsall_L1J15:
- eventCount: 14
+ eventCount: 13
stepCounts:
- 0: 14
+ 0: 13
stepFeatures:
- 0: 14
+ 0: 13
HLT_larpsallem_L1EM3:
eventCount: 20
stepCounts:
0: 20
stepFeatures:
- 0: 166
+ 0: 139
HLT_mb_afprec_L1AFP_A_AND_C_TOF_J20:
eventCount: 0
HLT_mb_afprec_L1AFP_A_AND_C_TOF_J30:
@@ -6550,1081 +7038,1065 @@ HLT_mu0_muoncalib_L1MU20:
HLT_mu0_muoncalib_L1MU4_EMPTY:
eventCount: 0
HLT_mu10_L1MU10:
- eventCount: 9
+ eventCount: 8
stepCounts:
0: 10
- 1: 10
+ 1: 8
+ 2: 8
+ 3: 8
+ stepFeatures:
+ 0: 12
+ 1: 9
2: 10
3: 9
- stepFeatures:
- 0: 13
- 1: 12
- 2: 13
- 3: 11
HLT_mu10_ivarmedium_j70_0eta320_j50_0eta490_j0_DJMASS900j50_L1MJJ-500-NFF:
- eventCount: 0
- stepCounts:
- 0: 1
- 1: 1
- 2: 1
- 3: 1
- stepFeatures:
- 0: 1
- 1: 1
- 2: 1
- 3: 1
-HLT_mu10_ivarmedium_mu10_10invm70_L12MU10:
- eventCount: 2
+ eventCount: 1
stepCounts:
- 0: 3
+ 0: 2
1: 2
2: 2
3: 2
- 4: 2
+ 4: 1
+ 5: 1
stepFeatures:
- 0: 12
- 1: 10
- 2: 8
- 3: 8
- 4: 2
-HLT_mu10_ivarmedium_mu10_10invm70_L12MU8F:
- eventCount: 2
- stepCounts:
- 0: 3
+ 0: 2
1: 2
2: 2
3: 2
- 4: 2
+ 4: 1
+ 5: 11
+HLT_mu10_ivarmedium_mu10_10invm70_L12MU10:
+ eventCount: 1
+ stepCounts:
+ 0: 2
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
stepFeatures:
- 0: 12
- 1: 10
- 2: 8
- 3: 8
- 4: 2
+ 0: 8
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 1
+HLT_mu10_ivarmedium_mu10_10invm70_L12MU8F:
+ eventCount: 1
+ stepCounts:
+ 0: 2
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ stepFeatures:
+ 0: 8
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 1
HLT_mu10_lateMu_L1LATE-MU10_XE50:
eventCount: 0
HLT_mu11_mu6_bBmumu_L1LFV-MU11:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
2: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
4: 4
HLT_mu11_mu6_bBmumu_L1MU11_2MU6:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
2: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
4: 4
HLT_mu11_mu6_bBmumu_L1MU8VF_2MU5VF:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
2: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
4: 4
HLT_mu11_mu6_bBmumux_BcmumuPi_L1MU11_2MU6:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
HLT_mu11_mu6_bBmumux_BcmumuPi_L1MU8VF_2MU5VF:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
HLT_mu11_mu6_bBmumux_BdmumuKst_L1MU11_2MU6:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
HLT_mu11_mu6_bBmumux_BdmumuKst_L1MU8VF_2MU5VF:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
HLT_mu11_mu6_bBmumux_BpmumuKp_L1LFV-MU11:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
HLT_mu11_mu6_bBmumux_BpmumuKp_L1MU11_2MU6:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
HLT_mu11_mu6_bBmumux_BpmumuKp_L1MU8VF_2MU5VF:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
HLT_mu11_mu6_bBmumux_BsmumuPhi_L1MU11_2MU6:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
HLT_mu11_mu6_bBmumux_BsmumuPhi_L1MU8VF_2MU5VF:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
HLT_mu11_mu6_bBmumux_LbPqKm_L1MU11_2MU6:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
HLT_mu11_mu6_bBmumux_LbPqKm_L1MU8VF_2MU5VF:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
HLT_mu11_mu6_bDimu2700_L1LFV-MU11:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
2: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
4: 4
HLT_mu11_mu6_bDimu2700_L1MU11_2MU6:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
2: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
4: 4
HLT_mu11_mu6_bDimu2700_L1MU8VF_2MU5VF:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
2: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
4: 4
HLT_mu11_mu6_bDimu2700_Lxy0_L1MU11_2MU6:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
2: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
4: 4
HLT_mu11_mu6_bDimu_L1LFV-MU11:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
2: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
4: 4
HLT_mu11_mu6_bDimu_L1MU11_2MU6:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
2: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
4: 4
HLT_mu11_mu6_bDimu_L1MU8VF_2MU5VF:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
2: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
4: 4
HLT_mu11_mu6_bDimu_Lxy0_L1MU11_2MU6:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
2: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
4: 4
HLT_mu11_mu6_bJpsimumu_L1LFV-MU11:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
2: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
4: 4
HLT_mu11_mu6_bJpsimumu_L1MU11_2MU6:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
2: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
4: 4
HLT_mu11_mu6_bJpsimumu_L1MU8VF_2MU5VF:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
2: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
4: 4
HLT_mu11_mu6_bJpsimumu_Lxy0_L1MU11_2MU6:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
2: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
4: 4
HLT_mu11_mu6_bPhi_L1LFV-MU11:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
2: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
4: 4
HLT_mu11_mu6_bPhi_L1MU11_2MU6:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
2: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
4: 4
HLT_mu11_mu6_bPhi_L1MU8VF_2MU5VF:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
2: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
4: 4
HLT_mu11_mu6_bTau_L1LFV-MU11:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
2: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
4: 4
HLT_mu11_mu6_bTau_L1MU11_2MU6:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
2: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
4: 4
HLT_mu11_mu6_bTau_L1MU8VF_2MU5VF:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
2: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
4: 4
HLT_mu11_mu6_bUpsimumu_L1LFV-MU11:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
2: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
4: 4
HLT_mu11_mu6_bUpsimumu_L1MU11_2MU6:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
2: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
4: 4
HLT_mu11_mu6_bUpsimumu_L1MU8VF_2MU5VF:
eventCount: 0
stepCounts:
- 0: 4
+ 0: 3
1: 1
2: 1
stepFeatures:
- 0: 15
- 1: 19
- 2: 8
+ 0: 11
+ 1: 11
+ 2: 10
3: 4
4: 4
HLT_mu14_L1MU10:
- eventCount: 7
+ eventCount: 6
stepCounts:
0: 10
+ 1: 6
+ 2: 6
+ 3: 6
+ stepFeatures:
+ 0: 12
1: 7
2: 7
3: 7
- stepFeatures:
- 0: 13
- 1: 8
- 2: 8
- 3: 8
HLT_mu14_ivarloose_tau25_medium1_tracktwo_03dRAB_L1MU10_TAU12IM_3J12:
- eventCount: 1
- stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 3
- 6: 3
- 7: 3
- 8: 2
- 9: 2
- 10: 1
- stepFeatures:
- 0: 6
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 6
- 6: 6
- 7: 6
- 8: 2
- 9: 2
- 10: 1
-HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVABDT_03dRAB_L1MU10_TAU12IM_3J12:
- eventCount: 1
- stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 3
- 6: 3
- 7: 3
- 8: 3
- 9: 1
- stepFeatures:
- 0: 6
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 6
- 6: 6
- 7: 6
- 8: 6
- 9: 1
-HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1MU10_TAU12IM_3J12:
- eventCount: 1
- stepCounts:
- 0: 5
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 3
- 6: 3
- 7: 3
- 8: 3
- 9: 1
- stepFeatures:
- 0: 6
- 1: 4
- 2: 4
- 3: 4
- 4: 3
- 5: 6
- 6: 6
- 7: 6
- 8: 6
- 9: 1
-HLT_mu14_ivarloose_tau35_medium1_tracktwo_03dRAB_L1MU10_TAU20IM:
- eventCount: 1
+ eventCount: 2
stepCounts:
- 0: 5
- 1: 5
- 2: 5
- 3: 5
- 4: 4
+ 0: 10
+ 1: 6
+ 2: 6
+ 3: 6
+ 4: 5
5: 4
6: 4
7: 4
- 8: 2
- 9: 2
- 10: 1
+ 8: 4
+ 9: 4
+ 10: 2
stepFeatures:
- 0: 6
+ 0: 12
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 5
+ 5: 9
+ 6: 9
+ 7: 9
+ 8: 9
+ 9: 9
+ 10: 4
+HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVABDT_03dRAB_L1MU10_TAU12IM_3J12:
+ eventCount: 3
+ stepCounts:
+ 0: 10
1: 6
2: 6
3: 6
- 4: 4
- 5: 7
- 6: 7
- 7: 7
- 8: 2
- 9: 2
- 10: 1
-HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVABDT_03dRAB_L1MU10_TAU20IM:
- eventCount: 1
- stepCounts:
- 0: 5
- 1: 5
- 2: 5
- 3: 5
- 4: 4
+ 4: 5
5: 4
6: 4
7: 4
8: 4
- 9: 1
+ 9: 3
stepFeatures:
- 0: 6
+ 0: 12
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 5
+ 5: 9
+ 6: 9
+ 7: 9
+ 8: 9
+ 9: 5
+HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1MU10_TAU12IM_3J12:
+ eventCount: 3
+ stepCounts:
+ 0: 10
1: 6
2: 6
3: 6
- 4: 4
- 5: 7
- 6: 7
- 7: 7
- 8: 7
- 9: 1
-HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU10_TAU20IM:
- eventCount: 1
- stepCounts:
- 0: 5
- 1: 5
- 2: 5
- 3: 5
- 4: 4
+ 4: 5
5: 4
6: 4
7: 4
8: 4
- 9: 1
+ 9: 3
stepFeatures:
- 0: 6
- 1: 6
- 2: 6
- 3: 6
- 4: 4
- 5: 7
- 6: 7
- 7: 7
- 8: 7
- 9: 1
-HLT_mu14_tau25_mediumRNN_tracktwoMVABDT_xe50_cell_03dRAB_L1MU10_TAU12IM_XE35:
- eventCount: 0
+ 0: 12
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 5
+ 5: 9
+ 6: 9
+ 7: 9
+ 8: 9
+ 9: 5
+HLT_mu14_ivarloose_tau35_medium1_tracktwo_03dRAB_L1MU10_TAU20IM:
+ eventCount: 2
stepCounts:
- 0: 4
+ 0: 7
1: 3
2: 3
3: 3
- 4: 3
- 5: 3
- 6: 3
- 7: 3
- 8: 1
+ 4: 2
+ 5: 2
+ 6: 2
+ 7: 2
+ 8: 2
+ 9: 2
+ 10: 2
stepFeatures:
- 0: 5
+ 0: 8
1: 3
2: 3
3: 3
- 4: 6
+ 4: 2
5: 6
6: 6
7: 6
- 8: 1
-HLT_mu14_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1MU10_TAU12IM_XE35:
- eventCount: 0
+ 8: 6
+ 9: 6
+ 10: 4
+HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVABDT_03dRAB_L1MU10_TAU20IM:
+ eventCount: 2
stepCounts:
- 0: 4
+ 0: 7
1: 3
2: 3
3: 3
- 4: 3
- 5: 3
- 6: 3
- 7: 3
- 8: 1
+ 4: 2
+ 5: 2
+ 6: 2
+ 7: 2
+ 8: 2
+ 9: 2
stepFeatures:
- 0: 5
+ 0: 8
1: 3
2: 3
3: 3
- 4: 6
+ 4: 2
5: 6
6: 6
7: 6
- 8: 1
-HLT_mu20_2mu4noL1_L1MU14FCH:
- eventCount: 0
+ 8: 6
+ 9: 4
+HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU10_TAU20IM:
+ eventCount: 2
stepCounts:
- 0: 8
- 1: 6
- 2: 6
- 3: 6
- 4: 1
- stepFeatures:
- 0: 10
- 1: 7
- 2: 7
- 3: 7
- 4: 3
-HLT_mu20_2mu4noL1_L1MU20:
- eventCount: 0
- stepCounts:
- 0: 8
- 1: 6
- 2: 6
- 3: 6
- 4: 1
- stepFeatures:
- 0: 10
- 1: 7
- 2: 7
- 3: 7
- 4: 3
-HLT_mu20_L1MU6:
- eventCount: 6
- stepCounts:
- 0: 10
- 1: 6
- 2: 6
- 3: 6
+ 0: 7
+ 1: 3
+ 2: 3
+ 3: 3
+ 4: 2
+ 5: 2
+ 6: 2
+ 7: 2
+ 8: 2
+ 9: 2
stepFeatures:
- 0: 14
- 1: 7
- 2: 7
- 3: 7
-HLT_mu20_L1MU6_AFP_A_AND_C:
- eventCount: 0
-HLT_mu20_L1MU6_AFP_A_OR_C:
- eventCount: 0
-HLT_mu20_ivarloose_tau20_medium1_tracktwo_03dRAB_L1MU20:
+ 0: 8
+ 1: 3
+ 2: 3
+ 3: 3
+ 4: 2
+ 5: 6
+ 6: 6
+ 7: 6
+ 8: 6
+ 9: 4
+HLT_mu14_tau25_mediumRNN_tracktwoMVABDT_xe50_cell_03dRAB_L1MU10_TAU12IM_XE35:
eventCount: 1
stepCounts:
0: 7
- 1: 5
- 2: 5
- 3: 5
+ 1: 3
+ 2: 3
+ 3: 3
+ 4: 2
+ 5: 2
+ 6: 2
+ 7: 2
+ 8: 1
+ 9: 1
+ stepFeatures:
+ 0: 8
+ 1: 3
+ 2: 3
+ 3: 3
4: 5
5: 5
6: 5
7: 5
8: 3
- 9: 3
- 10: 1
- stepFeatures:
- 0: 10
- 1: 6
- 2: 6
- 3: 6
- 4: 5
- 5: 14
- 6: 14
- 7: 14
- 8: 5
- 9: 5
- 10: 2
-HLT_mu20_ivarloose_tau20_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20:
+ 9: 1
+HLT_mu14_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1MU10_TAU12IM_XE35:
eventCount: 1
stepCounts:
0: 7
- 1: 5
- 2: 5
- 3: 5
+ 1: 3
+ 2: 3
+ 3: 3
+ 4: 2
+ 5: 2
+ 6: 2
+ 7: 2
+ 8: 1
+ 9: 1
+ stepFeatures:
+ 0: 8
+ 1: 3
+ 2: 3
+ 3: 3
4: 5
5: 5
6: 5
7: 5
- 8: 5
+ 8: 3
9: 1
+HLT_mu20_2mu4noL1_L1MU14FCH:
+ eventCount: 0
+ stepCounts:
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
stepFeatures:
- 0: 10
- 1: 6
- 2: 6
- 3: 6
- 4: 5
- 5: 14
- 6: 14
- 7: 14
- 8: 14
- 9: 2
-HLT_mu20_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRAB_L1MU20:
- eventCount: 1
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+HLT_mu20_2mu4noL1_L1MU20:
+ eventCount: 0
stepCounts:
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
+ stepFeatures:
0: 7
- 1: 5
- 2: 5
- 3: 5
- 4: 5
- 5: 5
- 6: 5
- 7: 5
- 8: 5
- 9: 1
+ 1: 4
+ 2: 4
+ 3: 4
+HLT_mu20_L1MU6:
+ eventCount: 4
+ stepCounts:
+ 0: 11
+ 1: 4
+ 2: 4
+ 3: 4
stepFeatures:
- 0: 10
- 1: 6
- 2: 6
- 3: 6
- 4: 5
- 5: 14
- 6: 14
- 7: 14
- 8: 14
- 9: 2
+ 0: 14
+ 1: 4
+ 2: 4
+ 3: 4
+HLT_mu20_L1MU6_AFP_A_AND_C:
+ eventCount: 0
+HLT_mu20_L1MU6_AFP_A_OR_C:
+ eventCount: 0
+HLT_mu20_ivarloose_tau20_medium1_tracktwo_03dRAB_L1MU20:
+ eventCount: 2
+ stepCounts:
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 4
+ 6: 4
+ 7: 4
+ 8: 4
+ 9: 4
+ 10: 2
+ stepFeatures:
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 15
+ 6: 15
+ 7: 15
+ 8: 9
+ 9: 9
+ 10: 5
+HLT_mu20_ivarloose_tau20_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20:
+ eventCount: 3
+ stepCounts:
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 4
+ 6: 4
+ 7: 4
+ 8: 4
+ 9: 3
+ stepFeatures:
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 15
+ 6: 15
+ 7: 15
+ 8: 15
+ 9: 6
+HLT_mu20_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRAB_L1MU20:
+ eventCount: 3
+ stepCounts:
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 4
+ 6: 4
+ 7: 4
+ 8: 4
+ 9: 3
+ stepFeatures:
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 15
+ 6: 15
+ 7: 15
+ 8: 15
+ 9: 6
HLT_mu20_ivarmedium_mu4noL1_10invm70_L1MU14FCH:
eventCount: 2
stepCounts:
- 0: 8
- 1: 6
- 2: 6
- 3: 6
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
4: 4
- 5: 2
+ 5: 3
6: 2
stepFeatures:
- 0: 10
- 1: 7
- 2: 7
- 3: 7
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
4: 4
- 5: 5
+ 5: 6
6: 4
HLT_mu20_ivarmedium_mu4noL1_10invm70_L1MU20:
eventCount: 2
stepCounts:
- 0: 8
- 1: 6
- 2: 6
- 3: 6
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
4: 4
- 5: 2
+ 5: 3
6: 2
stepFeatures:
- 0: 10
- 1: 7
- 2: 7
- 3: 7
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
4: 4
- 5: 5
+ 5: 6
6: 4
HLT_mu20_ivarmedium_mu8noL1_L1MU14FCH:
- eventCount: 1
+ eventCount: 2
stepCounts:
- 0: 8
- 1: 6
- 2: 6
- 3: 6
- 4: 4
- 5: 1
- 6: 1
- stepFeatures:
- 0: 10
- 1: 7
- 2: 7
- 3: 7
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
4: 4
5: 2
6: 2
+ stepFeatures:
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 4
+ 6: 4
HLT_mu20_ivarmedium_mu8noL1_L1MU20:
- eventCount: 1
+ eventCount: 2
stepCounts:
- 0: 8
- 1: 6
- 2: 6
- 3: 6
- 4: 4
- 5: 1
- 6: 1
- stepFeatures:
- 0: 10
- 1: 7
- 2: 7
- 3: 7
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
4: 4
5: 2
6: 2
+ stepFeatures:
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 4
+ 6: 4
HLT_mu20_msonly_L1MU20:
- eventCount: 6
+ eventCount: 5
stepCounts:
- 0: 8
- 1: 6
+ 0: 6
+ 1: 5
stepFeatures:
- 0: 10
- 1: 7
+ 0: 7
+ 1: 6
HLT_mu20_msonly_iloosems_mu6noL1_msonly_nscan_L110DR-MU20-MU6:
eventCount: 0
HLT_mu20_msonly_iloosems_mu6noL1_msonly_nscan_L1MU20_J40:
eventCount: 1
stepCounts:
- 0: 5
- 1: 4
+ 0: 6
+ 1: 5
2: 1
3: 1
stepFeatures:
- 0: 5
- 1: 4
+ 0: 7
+ 1: 6
2: 1
3: 2
HLT_mu20_msonly_iloosems_mu6noL1_msonly_nscan_L1MU20_XE30:
eventCount: 1
stepCounts:
- 0: 5
- 1: 5
+ 0: 4
+ 1: 3
2: 1
3: 1
stepFeatures:
- 0: 6
- 1: 5
+ 0: 4
+ 1: 3
2: 1
3: 2
HLT_mu20_mu2noL1_invmJPsi_os_L1MU20:
eventCount: 0
stepCounts:
- 0: 8
- 1: 6
- 2: 6
- 3: 6
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
4: 3
stepFeatures:
- 0: 10
- 1: 7
- 2: 7
- 3: 7
- 4: 7
- 5: 7
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 6
+ 5: 4
HLT_mu22_2mu4noL1_L1MU14FCH:
eventCount: 0
stepCounts:
- 0: 8
- 1: 6
- 2: 6
- 3: 6
- 4: 1
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
stepFeatures:
- 0: 10
- 1: 7
- 2: 7
- 3: 7
- 4: 3
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
HLT_mu22_2mu4noL1_L1MU20:
eventCount: 0
stepCounts:
- 0: 8
- 1: 6
- 2: 6
- 3: 6
- 4: 1
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
stepFeatures:
- 0: 10
- 1: 7
- 2: 7
- 3: 7
- 4: 3
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
HLT_mu22_mu10noL1_L1MU14FCH:
eventCount: 2
stepCounts:
- 0: 8
- 1: 6
- 2: 6
- 3: 6
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
4: 2
5: 2
stepFeatures:
- 0: 10
- 1: 7
- 2: 7
- 3: 7
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
4: 4
5: 4
HLT_mu22_mu10noL1_L1MU20:
eventCount: 2
stepCounts:
- 0: 8
- 1: 6
- 2: 6
- 3: 6
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
4: 2
5: 2
stepFeatures:
- 0: 10
- 1: 7
- 2: 7
- 3: 7
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
4: 4
5: 4
HLT_mu22_mu8noL1_L1MU14FCH:
eventCount: 2
stepCounts:
- 0: 8
- 1: 6
- 2: 6
- 3: 6
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
4: 2
5: 2
stepFeatures:
- 0: 10
- 1: 7
- 2: 7
- 3: 7
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
4: 4
5: 4
HLT_mu22_mu8noL1_L1MU20:
eventCount: 2
stepCounts:
- 0: 8
- 1: 6
- 2: 6
- 3: 6
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
4: 2
5: 2
stepFeatures:
- 0: 10
- 1: 7
- 2: 7
- 3: 7
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
4: 4
5: 4
HLT_mu24_L1MU20:
- eventCount: 6
+ eventCount: 4
stepCounts:
- 0: 8
- 1: 6
- 2: 6
- 3: 6
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
stepFeatures:
- 0: 10
- 1: 7
- 2: 7
- 3: 7
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
HLT_mu24_LRT_d0loose_L1MU14FCH:
eventCount: 0
stepCounts:
- 0: 8
- 1: 1
- 2: 1
+ 0: 6
stepFeatures:
- 0: 10
- 1: 1
- 2: 1
+ 0: 7
HLT_mu24_LRT_d0loose_L1MU20:
eventCount: 0
stepCounts:
- 0: 8
- 1: 1
- 2: 1
+ 0: 6
stepFeatures:
- 0: 10
- 1: 1
- 2: 1
+ 0: 7
HLT_mu24_LRT_d0medium_L1MU20:
eventCount: 0
stepCounts:
- 0: 8
- 1: 1
- 2: 1
+ 0: 6
stepFeatures:
- 0: 10
- 1: 1
- 2: 1
+ 0: 7
HLT_mu24_LRT_d0tight_L1MU20:
eventCount: 0
stepCounts:
- 0: 8
- 1: 1
- 2: 1
+ 0: 6
stepFeatures:
- 0: 10
- 1: 1
- 2: 1
+ 0: 7
HLT_mu24_LRT_idperf_L1MU20:
- eventCount: 6
+ eventCount: 4
stepCounts:
- 0: 6
- 1: 6
- 2: 6
- 3: 6
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 4
stepFeatures:
- 0: 7
- 1: 7
- 2: 7
- 3: 7
+ 0: 5
+ 1: 5
+ 2: 4
+ 3: 4
HLT_mu24_idperf_L1MU20:
- eventCount: 6
+ eventCount: 4
stepCounts:
- 0: 6
- 1: 6
- 2: 6
- 3: 6
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 4
stepFeatures:
- 0: 7
- 1: 7
- 2: 7
- 3: 7
+ 0: 5
+ 1: 5
+ 2: 4
+ 3: 4
HLT_mu24_ivarmedium_L1MU20:
eventCount: 4
stepCounts:
- 0: 8
- 1: 6
- 2: 6
- 3: 6
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
4: 4
stepFeatures:
- 0: 10
- 1: 7
- 2: 7
- 3: 7
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
4: 4
HLT_mu24_ivarmedium_mu6_L1MU20:
eventCount: 1
@@ -7632,13 +8104,13 @@ HLT_mu24_ivarmedium_mu6_L1MU20:
0: 3
1: 2
2: 2
- 3: 2
+ 3: 1
4: 1
stepFeatures:
- 0: 21
+ 0: 17
1: 9
2: 7
- 3: 7
+ 3: 5
4: 1
HLT_mu24_ivarmedium_mu6_ivarmedium_L1MU20:
eventCount: 0
@@ -7646,35 +8118,35 @@ HLT_mu24_ivarmedium_mu6_ivarmedium_L1MU20:
0: 3
1: 2
2: 2
- 3: 2
+ 3: 1
stepFeatures:
- 0: 21
+ 0: 17
1: 9
2: 7
- 3: 7
- 4: 3
+ 3: 5
+ 4: 2
HLT_mu24_ivarmedium_mu6_ivarmedium_probe_L1MU20:
eventCount: 0
stepCounts:
- 0: 8
- 1: 6
- 2: 6
- 3: 6
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
4: 4
5: 2
- 6: 1
- 7: 1
+ 6: 2
+ 7: 2
8: 1
stepFeatures:
- 0: 10
- 1: 7
- 2: 7
- 3: 7
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
4: 4
- 5: 6
- 6: 3
- 7: 2
- 8: 2
+ 5: 7
+ 6: 5
+ 7: 5
+ 8: 3
9: 1
HLT_mu24_ivarmedium_mu6_ivarperf_L1MU20:
eventCount: 1
@@ -7682,848 +8154,981 @@ HLT_mu24_ivarmedium_mu6_ivarperf_L1MU20:
0: 3
1: 2
2: 2
- 3: 2
+ 3: 1
4: 1
stepFeatures:
- 0: 21
+ 0: 17
1: 9
2: 7
- 3: 7
- 4: 5
+ 3: 5
+ 4: 3
HLT_mu24_ivarmedium_mu6_ivarperf_probe_L1MU20:
eventCount: 1
stepCounts:
- 0: 8
- 1: 6
- 2: 6
- 3: 6
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
4: 4
5: 2
- 6: 1
- 7: 1
+ 6: 2
+ 7: 2
8: 1
9: 1
stepFeatures:
- 0: 10
- 1: 7
- 2: 7
- 3: 7
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
4: 4
- 5: 6
- 6: 3
- 7: 2
- 8: 2
+ 5: 7
+ 6: 5
+ 7: 5
+ 8: 3
9: 2
HLT_mu24_ivarmedium_mu6_probe_L1MU20:
eventCount: 1
stepCounts:
- 0: 8
- 1: 6
- 2: 6
- 3: 6
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
4: 4
5: 2
- 6: 1
- 7: 1
+ 6: 2
+ 7: 2
8: 1
stepFeatures:
- 0: 10
- 1: 7
- 2: 7
- 3: 7
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
4: 4
- 5: 6
- 6: 3
- 7: 2
- 8: 2
+ 5: 7
+ 6: 5
+ 7: 5
+ 8: 3
HLT_mu24_mu10noL1_L1MU20:
eventCount: 2
stepCounts:
- 0: 8
- 1: 6
- 2: 6
- 3: 6
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
4: 2
5: 2
stepFeatures:
- 0: 10
- 1: 7
- 2: 7
- 3: 7
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
4: 4
5: 4
HLT_mu24_mu6_L1MU20:
- eventCount: 2
+ eventCount: 1
stepCounts:
0: 3
1: 2
2: 2
- 3: 2
+ 3: 1
stepFeatures:
- 0: 21
+ 0: 17
1: 9
2: 7
- 3: 7
+ 3: 5
HLT_mu24_mu6_probe_L1MU20:
- eventCount: 2
+ eventCount: 1
stepCounts:
- 0: 8
- 1: 6
- 2: 6
- 3: 6
- 4: 3
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 2
5: 2
6: 2
- 7: 2
+ 7: 1
stepFeatures:
- 0: 10
- 1: 7
- 2: 7
- 3: 7
- 4: 9
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 7
5: 5
- 6: 4
- 7: 4
+ 6: 5
+ 7: 3
HLT_mu24_mu8noL1_L1MU14FCH:
eventCount: 2
stepCounts:
- 0: 8
- 1: 6
- 2: 6
- 3: 6
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
4: 2
5: 2
stepFeatures:
- 0: 10
- 1: 7
- 2: 7
- 3: 7
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
4: 4
5: 4
HLT_mu24_mu8noL1_L1MU20:
eventCount: 2
stepCounts:
- 0: 8
- 1: 6
- 2: 6
- 3: 6
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
4: 2
5: 2
stepFeatures:
- 0: 10
- 1: 7
- 2: 7
- 3: 7
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
4: 4
5: 4
HLT_mu26_L1MU20:
eventCount: 4
stepCounts:
- 0: 8
- 1: 6
- 2: 5
+ 0: 6
+ 1: 4
+ 2: 4
3: 4
stepFeatures:
- 0: 10
- 1: 7
- 2: 6
- 3: 5
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
HLT_mu26_ivarmedium_2j20_0eta290_020jvt_pf_ftf_boffperf_L1MU20:
- eventCount: 3
+ eventCount: 4
stepCounts:
- 0: 8
- 1: 6
- 2: 5
+ 0: 6
+ 1: 4
+ 2: 4
3: 4
- 4: 3
- 5: 3
- 6: 3
- 7: 3
+ 4: 4
+ 5: 4
+ 6: 4
+ 7: 4
stepFeatures:
- 0: 10
- 1: 7
- 2: 6
- 3: 5
- 4: 3
- 5: 3
- 6: 24
- 7: 24
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 4
+ 6: 21
+ 7: 21
HLT_mu26_ivarmedium_L1MU14FCH:
- eventCount: 3
+ eventCount: 4
stepCounts:
- 0: 8
- 1: 6
- 2: 5
+ 0: 6
+ 1: 4
+ 2: 4
3: 4
- 4: 3
+ 4: 4
stepFeatures:
- 0: 10
- 1: 7
- 2: 6
- 3: 5
- 4: 3
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
HLT_mu26_ivarmedium_L1MU20:
- eventCount: 3
+ eventCount: 4
stepCounts:
- 0: 8
- 1: 6
- 2: 5
+ 0: 6
+ 1: 4
+ 2: 4
3: 4
- 4: 3
+ 4: 4
stepFeatures:
- 0: 10
- 1: 7
- 2: 6
- 3: 5
- 4: 3
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
HLT_mu26_ivarmedium_tau100_mediumRNN_tracktwoLLP_03dRAB_L1MU20:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 2
- 5: 2
- 6: 2
- 7: 2
- 8: 2
+ 0: 2
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+ 6: 1
+ 7: 1
+ 8: 1
+ 9: 1
stepFeatures:
- 0: 10
- 1: 3
- 2: 3
- 3: 3
- 4: 2
- 5: 2
- 6: 2
- 7: 2
- 8: 2
+ 0: 7
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 3
+ 6: 3
+ 7: 3
+ 8: 3
+ 9: 3
HLT_mu26_ivarmedium_tau160_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+ 6: 1
+ 7: 1
+ 8: 1
+ 9: 1
stepFeatures:
- 0: 10
+ 0: 7
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 3
+ 6: 3
+ 7: 3
+ 8: 3
+ 9: 3
HLT_mu26_ivarmedium_tau160_mediumRNN_tracktwoMVA_03dRAB_L1MU20:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+ 6: 1
+ 7: 1
+ 8: 1
+ 9: 1
stepFeatures:
- 0: 10
+ 0: 7
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 3
+ 6: 3
+ 7: 3
+ 8: 3
+ 9: 3
HLT_mu26_ivarmedium_tau180_mediumRNN_tracktwoLLP_03dRAB_L1MU20:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+ 6: 1
+ 7: 1
+ 8: 1
+ 9: 1
stepFeatures:
- 0: 10
+ 0: 7
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 3
+ 6: 3
+ 7: 3
+ 8: 3
+ 9: 3
HLT_mu26_ivarmedium_tau20_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20:
- eventCount: 0
+ eventCount: 3
+ stepCounts:
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 4
+ 6: 4
+ 7: 4
+ 8: 4
+ 9: 3
+ stepFeatures:
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 15
+ 6: 15
+ 7: 15
+ 8: 15
+ 9: 6
+HLT_mu26_ivarmedium_tau20_mediumRNN_tracktwoMVA_03dRAB_L1MU20:
+ eventCount: 3
stepCounts:
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 4
+ 6: 4
+ 7: 4
+ 8: 4
+ 9: 3
+ stepFeatures:
0: 7
- 1: 5
+ 1: 4
2: 4
3: 4
- 4: 3
+ 4: 4
+ 5: 15
+ 6: 15
+ 7: 15
+ 8: 15
+ 9: 6
+HLT_mu26_ivarmedium_tau25_idperf_tracktwoMVABDT_03dRAB_L1MU20:
+ eventCount: 3
+ stepCounts:
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
5: 3
6: 3
7: 3
8: 3
+ 9: 3
stepFeatures:
- 0: 10
- 1: 6
- 2: 5
- 3: 5
- 4: 3
- 5: 9
- 6: 9
- 7: 9
- 8: 9
- 9: 1
-HLT_mu26_ivarmedium_tau20_mediumRNN_tracktwoMVA_03dRAB_L1MU20:
- eventCount: 0
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 6
+ 6: 6
+ 7: 6
+ 8: 6
+ 9: 6
+HLT_mu26_ivarmedium_tau25_idperf_tracktwoMVA_03dRAB_L1MU20:
+ eventCount: 3
stepCounts:
- 0: 7
- 1: 5
+ 0: 4
+ 1: 4
2: 4
3: 4
- 4: 3
+ 4: 4
5: 3
6: 3
7: 3
8: 3
+ 9: 3
stepFeatures:
- 0: 10
- 1: 6
- 2: 5
- 3: 5
- 4: 3
- 5: 9
- 6: 9
- 7: 9
- 8: 9
- 9: 1
-HLT_mu26_ivarmedium_tau25_idperf_tracktwoMVABDT_03dRAB_L1MU20:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 6
+ 6: 6
+ 7: 6
+ 8: 6
+ 9: 6
+HLT_mu26_ivarmedium_tau25_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20:
eventCount: 2
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 2
- 5: 2
- 6: 2
- 7: 2
- 8: 2
- 9: 2
- stepFeatures:
0: 6
1: 4
2: 4
3: 4
- 4: 2
- 5: 2
- 6: 2
- 7: 2
- 8: 2
+ 4: 4
+ 5: 3
+ 6: 3
+ 7: 3
+ 8: 3
9: 2
-HLT_mu26_ivarmedium_tau25_idperf_tracktwoMVA_03dRAB_L1MU20:
+ stepFeatures:
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 6
+ 6: 6
+ 7: 6
+ 8: 6
+ 9: 4
+HLT_mu26_ivarmedium_tau25_mediumRNN_tracktwoMVA_03dRAB_L1MU20:
eventCount: 2
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 2
- 5: 2
- 6: 2
- 7: 2
- 8: 2
- 9: 2
- stepFeatures:
0: 6
1: 4
2: 4
3: 4
- 4: 2
- 5: 2
- 6: 2
- 7: 2
- 8: 2
+ 4: 4
+ 5: 3
+ 6: 3
+ 7: 3
+ 8: 3
9: 2
-HLT_mu26_ivarmedium_tau25_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20:
- eventCount: 0
+ stepFeatures:
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 6
+ 6: 6
+ 7: 6
+ 8: 6
+ 9: 4
+HLT_mu26_ivarmedium_tau25_perf_tracktwoMVABDT_03dRAB_L1MU20:
+ eventCount: 3
stepCounts:
0: 6
1: 4
2: 4
3: 4
- 4: 3
+ 4: 4
5: 3
6: 3
7: 3
8: 3
+ 9: 3
stepFeatures:
- 0: 10
- 1: 5
- 2: 5
- 3: 5
- 4: 3
- 5: 5
- 6: 5
- 7: 5
- 8: 5
-HLT_mu26_ivarmedium_tau25_mediumRNN_tracktwoMVA_03dRAB_L1MU20:
- eventCount: 0
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 6
+ 6: 6
+ 7: 6
+ 8: 6
+ 9: 6
+HLT_mu26_ivarmedium_tau25_perf_tracktwoMVA_03dRAB_L1MU20:
+ eventCount: 3
stepCounts:
0: 6
1: 4
2: 4
3: 4
- 4: 3
+ 4: 4
5: 3
6: 3
7: 3
8: 3
+ 9: 3
stepFeatures:
- 0: 10
- 1: 5
- 2: 5
- 3: 5
- 4: 3
- 5: 5
- 6: 5
- 7: 5
- 8: 5
-HLT_mu26_ivarmedium_tau25_perf_tracktwoMVABDT_03dRAB_L1MU20:
- eventCount: 0
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 6
+ 6: 6
+ 7: 6
+ 8: 6
+ 9: 6
+HLT_mu26_ivarmedium_tau35_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20:
+ eventCount: 1
+ stepCounts:
+ 0: 3
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+ 6: 1
+ 7: 1
+ 8: 1
+ 9: 1
+ stepFeatures:
+ 0: 7
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 4
+ 6: 4
+ 7: 4
+ 8: 4
+ 9: 3
+HLT_mu26_ivarmedium_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU20:
+ eventCount: 1
+ stepCounts:
+ 0: 3
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+ 6: 1
+ 7: 1
+ 8: 1
+ 9: 1
+ stepFeatures:
+ 0: 7
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 4
+ 6: 4
+ 7: 4
+ 8: 4
+ 9: 3
+HLT_mu26_ivarmedium_tau40_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20:
+ eventCount: 1
stepCounts:
- 0: 6
- 1: 4
- 2: 4
- 3: 4
- 4: 3
+ 0: 3
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+ 6: 1
+ 7: 1
+ 8: 1
+ 9: 1
+ stepFeatures:
+ 0: 7
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
5: 3
6: 3
7: 3
8: 3
- stepFeatures:
- 0: 10
- 1: 5
- 2: 5
- 3: 5
- 4: 3
- 5: 5
- 6: 5
- 7: 5
- 8: 5
-HLT_mu26_ivarmedium_tau25_perf_tracktwoMVA_03dRAB_L1MU20:
- eventCount: 0
+ 9: 3
+HLT_mu26_ivarmedium_tau40_mediumRNN_tracktwoMVA_03dRAB_L1MU20:
+ eventCount: 1
stepCounts:
- 0: 6
- 1: 4
- 2: 4
- 3: 4
- 4: 3
+ 0: 3
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+ 6: 1
+ 7: 1
+ 8: 1
+ 9: 1
+ stepFeatures:
+ 0: 7
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
5: 3
6: 3
7: 3
8: 3
- stepFeatures:
- 0: 10
- 1: 5
- 2: 5
- 3: 5
- 4: 3
- 5: 5
- 6: 5
- 7: 5
- 8: 5
-HLT_mu26_ivarmedium_tau35_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20:
- eventCount: 0
+ 9: 3
+HLT_mu26_ivarmedium_tau60_mediumRNN_tracktwoLLP_03dRAB_L1MU20:
+ eventCount: 1
stepCounts:
- 0: 5
+ 0: 6
1: 4
2: 4
3: 4
- 4: 3
- 5: 3
- 6: 3
- 7: 3
- 8: 3
+ 4: 4
+ 5: 4
+ 6: 4
+ 7: 4
+ 8: 4
+ 9: 1
stepFeatures:
- 0: 10
- 1: 5
- 2: 5
- 3: 5
- 4: 3
- 5: 5
- 6: 5
- 7: 5
- 8: 5
-HLT_mu26_ivarmedium_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU20:
- eventCount: 0
- stepCounts:
- 0: 5
+ 0: 7
1: 4
2: 4
3: 4
- 4: 3
- 5: 3
- 6: 3
- 7: 3
- 8: 3
- stepFeatures:
- 0: 10
- 1: 5
- 2: 5
- 3: 5
- 4: 3
- 5: 5
- 6: 5
- 7: 5
- 8: 5
-HLT_mu26_ivarmedium_tau40_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20:
- eventCount: 0
+ 4: 4
+ 5: 7
+ 6: 7
+ 7: 7
+ 8: 7
+ 9: 3
+HLT_mu26_ivarmedium_tau60_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20:
+ eventCount: 1
stepCounts:
- 0: 5
+ 0: 6
1: 4
2: 4
3: 4
- 4: 3
- 5: 3
- 6: 3
- 7: 3
- 8: 3
- stepFeatures:
- 0: 10
- 1: 5
- 2: 5
- 3: 5
- 4: 3
+ 4: 4
5: 4
6: 4
7: 4
8: 4
-HLT_mu26_ivarmedium_tau40_mediumRNN_tracktwoMVA_03dRAB_L1MU20:
- eventCount: 0
+ 9: 1
+ stepFeatures:
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 7
+ 6: 7
+ 7: 7
+ 8: 7
+ 9: 3
+HLT_mu26_ivarmedium_tau60_mediumRNN_tracktwoMVA_03dRAB_L1MU20:
+ eventCount: 1
stepCounts:
- 0: 5
+ 0: 6
1: 4
2: 4
3: 4
- 4: 3
- 5: 3
- 6: 3
- 7: 3
- 8: 3
- stepFeatures:
- 0: 10
- 1: 5
- 2: 5
- 3: 5
- 4: 3
+ 4: 4
5: 4
6: 4
7: 4
8: 4
-HLT_mu26_ivarmedium_tau60_mediumRNN_tracktwoLLP_03dRAB_L1MU20:
- eventCount: 0
- stepCounts:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
- 4: 2
- 5: 2
- 6: 2
- 7: 2
- 8: 2
+ 9: 1
stepFeatures:
- 0: 10
- 1: 3
- 2: 3
- 3: 3
- 4: 2
- 5: 3
- 6: 3
- 7: 3
- 8: 3
-HLT_mu26_ivarmedium_tau60_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20:
- eventCount: 0
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 7
+ 6: 7
+ 7: 7
+ 8: 7
+ 9: 3
+HLT_mu26_ivarmedium_tau80_mediumRNN_tracktwoLLP_03dRAB_L1MU20:
+ eventCount: 1
stepCounts:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
- 4: 2
- 5: 2
- 6: 2
- 7: 2
- 8: 2
+ 0: 2
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+ 6: 1
+ 7: 1
+ 8: 1
+ 9: 1
stepFeatures:
- 0: 10
- 1: 3
- 2: 3
- 3: 3
- 4: 2
+ 0: 7
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
5: 3
6: 3
7: 3
8: 3
-HLT_mu26_ivarmedium_tau60_mediumRNN_tracktwoMVA_03dRAB_L1MU20:
- eventCount: 0
+ 9: 3
+HLT_mu26_ivarmedium_tau80_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20:
+ eventCount: 1
stepCounts:
- 0: 4
- 1: 3
- 2: 3
- 3: 3
- 4: 2
- 5: 2
- 6: 2
- 7: 2
- 8: 2
+ 0: 2
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+ 6: 1
+ 7: 1
+ 8: 1
+ 9: 1
stepFeatures:
- 0: 10
- 1: 3
- 2: 3
- 3: 3
- 4: 2
+ 0: 7
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
5: 3
6: 3
7: 3
8: 3
-HLT_mu26_ivarmedium_tau80_mediumRNN_tracktwoLLP_03dRAB_L1MU20:
- eventCount: 0
- stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 2
- 5: 2
- 6: 2
- 7: 2
- 8: 2
- stepFeatures:
- 0: 10
- 1: 3
- 2: 3
- 3: 3
- 4: 2
- 5: 2
- 6: 2
- 7: 2
- 8: 2
-HLT_mu26_ivarmedium_tau80_mediumRNN_tracktwoMVABDT_03dRAB_L1MU20:
- eventCount: 0
- stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 2
- 5: 2
- 6: 2
- 7: 2
- 8: 2
- stepFeatures:
- 0: 10
- 1: 3
- 2: 3
- 3: 3
- 4: 2
- 5: 2
- 6: 2
- 7: 2
- 8: 2
+ 9: 3
HLT_mu26_ivarmedium_tau80_mediumRNN_tracktwoMVA_03dRAB_L1MU20:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
- 4: 2
- 5: 2
- 6: 2
- 7: 2
- 8: 2
+ 0: 2
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+ 6: 1
+ 7: 1
+ 8: 1
+ 9: 1
stepFeatures:
- 0: 10
- 1: 3
- 2: 3
- 3: 3
- 4: 2
- 5: 2
- 6: 2
- 7: 2
- 8: 2
+ 0: 7
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 3
+ 6: 3
+ 7: 3
+ 8: 3
+ 9: 3
HLT_mu26_ivarperf_L1MU20:
eventCount: 4
stepCounts:
- 0: 8
- 1: 6
- 2: 5
+ 0: 6
+ 1: 4
+ 2: 4
3: 4
4: 4
stepFeatures:
- 0: 10
- 1: 7
- 2: 6
- 3: 5
- 4: 5
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
HLT_mu28_ivarmedium_L1MU20:
- eventCount: 3
+ eventCount: 4
stepCounts:
- 0: 8
- 1: 6
- 2: 5
+ 0: 6
+ 1: 4
+ 2: 4
3: 4
- 4: 3
+ 4: 4
stepFeatures:
- 0: 10
- 1: 7
- 2: 6
+ 0: 7
+ 1: 4
+ 2: 4
3: 4
- 4: 3
+ 4: 4
HLT_mu4_j70_0eta320_j50_0eta490_j0_DJMASS1000j50_xe50_tcpufit_L1MJJ-500-NFF:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 1
- 1: 1
- 2: 1
- 3: 1
+ 0: 2
+ 1: 2
+ 2: 2
+ 3: 2
+ 4: 1
stepFeatures:
- 0: 1
- 1: 1
- 2: 1
- 3: 1
+ 0: 2
+ 1: 2
+ 2: 2
+ 3: 2
+ 4: 12
HLT_mu4_l2io_L1MU4:
- eventCount: 11
+ eventCount: 12
stepCounts:
- 0: 11
- 1: 11
- 2: 11
- 3: 11
+ 0: 12
+ 1: 12
+ 2: 12
+ 3: 12
stepFeatures:
- 0: 15
- 1: 23
- 2: 19
+ 0: 17
+ 1: 25
+ 2: 21
3: 17
HLT_mu50_L1MU14FCH:
- eventCount: 1
+ eventCount: 3
stepCounts:
- 0: 8
- 1: 6
- 2: 1
- 3: 1
+ 0: 6
+ 1: 4
+ 2: 3
+ 3: 3
stepFeatures:
- 0: 10
- 1: 7
- 2: 1
- 3: 1
+ 0: 7
+ 1: 4
+ 2: 3
+ 3: 3
HLT_mu50_L1MU20:
- eventCount: 1
+ eventCount: 3
stepCounts:
- 0: 8
- 1: 6
- 2: 1
- 3: 1
+ 0: 6
+ 1: 4
+ 2: 3
+ 3: 3
stepFeatures:
- 0: 10
- 1: 7
- 2: 1
- 3: 1
+ 0: 7
+ 1: 4
+ 2: 3
+ 3: 3
HLT_mu50_RPCPEBSecondaryReadout_L1MU20:
- eventCount: 1
+ eventCount: 3
stepCounts:
- 0: 8
- 1: 6
- 2: 1
- 3: 1
- 4: 1
+ 0: 6
+ 1: 4
+ 2: 3
+ 3: 3
+ 4: 3
stepFeatures:
- 0: 10
- 1: 7
- 2: 1
- 3: 1
- 4: 1
+ 0: 7
+ 1: 4
+ 2: 3
+ 3: 3
+ 4: 3
HLT_mu60_0eta105_msonly_L1MU14FCH:
+ eventCount: 2
+ stepCounts:
+ 0: 3
+ 1: 2
+ stepFeatures:
+ 0: 3
+ 1: 2
+HLT_mu60_0eta105_msonly_L1MU20:
+ eventCount: 2
+ stepCounts:
+ 0: 3
+ 1: 2
+ stepFeatures:
+ 0: 3
+ 1: 2
+HLT_mu60_L1MU20:
+ eventCount: 3
+ stepCounts:
+ 0: 6
+ 1: 4
+ 2: 3
+ 3: 3
+ stepFeatures:
+ 0: 7
+ 1: 4
+ 2: 3
+ 3: 3
+HLT_mu6_2mu4_bDimu2700_L1MU5VF_3MU3V:
eventCount: 0
stepCounts:
0: 1
stepFeatures:
- 0: 2
-HLT_mu60_0eta105_msonly_L1MU20:
+ 0: 4
+ 1: 1
+HLT_mu6_2mu4_bDimu2700_L1MU6_3MU4:
eventCount: 0
stepCounts:
0: 1
stepFeatures:
- 0: 2
-HLT_mu60_L1MU20:
- eventCount: 1
- stepCounts:
- 0: 8
- 1: 6
- 2: 1
- 3: 1
- stepFeatures:
- 0: 10
- 1: 7
- 2: 1
- 3: 1
-HLT_mu6_2mu4_bDimu2700_L1MU5VF_3MU3V:
- eventCount: 0
-HLT_mu6_2mu4_bDimu2700_L1MU6_3MU4:
- eventCount: 0
+ 0: 4
+ 1: 1
HLT_mu6_2mu4_bDimu6000_L1MU5VF_3MU3V:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 4
+ 1: 1
HLT_mu6_2mu4_bDimu6000_L1MU6_3MU4:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 4
+ 1: 1
HLT_mu6_2mu4_bJpsi_L1MU6_3MU4:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 4
+ 1: 1
HLT_mu6_2mu4_bTau_L1MU6_3MU4:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 4
+ 1: 1
HLT_mu6_2mu4_bUpsi_L1MU6_3MU4:
eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 4
+ 1: 1
HLT_mu6_L1MU6:
- eventCount: 10
+ eventCount: 11
stepCounts:
- 0: 10
- 1: 10
- 2: 10
- 3: 10
+ 0: 11
+ 1: 11
+ 2: 11
+ 3: 11
stepFeatures:
0: 14
- 1: 13
- 2: 15
+ 1: 14
+ 2: 16
3: 15
HLT_mu6_LRT_idperf_L1MU6:
- eventCount: 10
+ eventCount: 11
stepCounts:
- 0: 10
- 1: 10
- 2: 10
- 3: 10
+ 0: 11
+ 1: 11
+ 2: 11
+ 3: 11
stepFeatures:
0: 14
1: 14
2: 16
3: 16
HLT_mu6_idperf_L1MU6:
- eventCount: 10
+ eventCount: 11
stepCounts:
- 0: 10
- 1: 10
- 2: 10
- 3: 10
+ 0: 11
+ 1: 11
+ 2: 11
+ 3: 11
stepFeatures:
0: 14
1: 14
2: 16
3: 16
HLT_mu6_ivarmedium_L1MU6:
- eventCount: 6
+ eventCount: 7
stepCounts:
- 0: 10
- 1: 10
- 2: 10
- 3: 10
- 4: 6
+ 0: 11
+ 1: 11
+ 2: 11
+ 3: 11
+ 4: 7
stepFeatures:
0: 14
- 1: 13
- 2: 15
+ 1: 14
+ 2: 16
3: 15
- 4: 6
+ 4: 7
HLT_mu6_j45_nojcalib_L1J20:
- eventCount: 7
+ eventCount: 10
stepCounts:
- 0: 9
- 1: 9
- 2: 9
- 3: 9
- 4: 7
- stepFeatures:
- 0: 12
+ 0: 11
1: 11
- 2: 13
- 3: 13
- 4: 14
+ 2: 11
+ 3: 11
+ 4: 10
+ stepFeatures:
+ 0: 14
+ 1: 14
+ 2: 16
+ 3: 15
+ 4: 28
HLT_mu6_msonly_L1MU6:
- eventCount: 10
+ eventCount: 11
stepCounts:
- 0: 10
- 1: 10
+ 0: 11
+ 1: 11
stepFeatures:
0: 14
1: 16
HLT_mu6_mu4_L12MU4:
- eventCount: 4
+ eventCount: 3
stepCounts:
0: 4
1: 4
2: 4
- 3: 4
+ 3: 3
stepFeatures:
- 0: 16
- 1: 15
- 2: 21
- 3: 19
+ 0: 18
+ 1: 18
+ 2: 24
+ 3: 17
HLT_mu6_mu4_bBmumu_L1BPH-2M9-0DR15-MU6MU4:
eventCount: 0
HLT_mu6_mu4_bBmumu_Lxy0_L1BPH-2M9-0DR15-MU6MU4:
@@ -8538,15 +9143,15 @@ HLT_mu6_mu4_bDimu_L1MU6_2MU4:
eventCount: 1
stepCounts:
0: 4
- 1: 2
- 2: 2
+ 1: 3
+ 2: 3
3: 1
stepFeatures:
0: 16
- 1: 27
- 2: 14
- 3: 12
- 4: 12
+ 1: 23
+ 2: 18
+ 3: 15
+ 4: 15
HLT_mu6_mu4_bJpsimumu_L1BPH-2M9-0DR15-MU6MU4:
eventCount: 0
HLT_mu6_mu4_bJpsimumu_Lxy0_L1BPH-2M9-0DR15-MU6MU4:
@@ -8554,34 +9159,34 @@ HLT_mu6_mu4_bJpsimumu_Lxy0_L1BPH-2M9-0DR15-MU6MU4:
HLT_mu6_mu4_bUpsimumu_L1BPH-8M15-0DR22-MU6MU4-BO:
eventCount: 0
HLT_mu6_mu6noL1_L1MU6:
- eventCount: 3
+ eventCount: 4
stepCounts:
- 0: 10
- 1: 10
- 2: 10
- 3: 10
- 4: 5
- 5: 3
+ 0: 11
+ 1: 11
+ 2: 11
+ 3: 11
+ 4: 4
+ 5: 4
stepFeatures:
0: 14
- 1: 13
- 2: 15
+ 1: 14
+ 2: 16
3: 15
- 4: 11
- 5: 6
+ 4: 9
+ 5: 8
HLT_mu6_noL2Comb_mu4_noL2Comb_bJpsimumu_L1MU6_2MU4:
eventCount: 1
stepCounts:
0: 4
- 1: 2
- 2: 2
+ 1: 3
+ 2: 3
3: 1
stepFeatures:
0: 16
1: 16
- 2: 14
- 3: 12
- 4: 12
+ 2: 18
+ 3: 15
+ 4: 15
HLT_mu6_xe30_mht_L1XE30:
eventCount: 7
stepCounts:
@@ -8591,43 +9196,51 @@ HLT_mu6_xe30_mht_L1XE30:
3: 7
4: 7
stepFeatures:
- 0: 10
+ 0: 9
1: 9
2: 11
- 3: 11
+ 3: 10
4: 7
HLT_mu80_L1MU20:
- eventCount: 0
+ eventCount: 3
stepCounts:
- 0: 8
- 1: 6
+ 0: 6
+ 1: 4
+ 2: 3
+ 3: 3
stepFeatures:
- 0: 10
- 1: 7
+ 0: 7
+ 1: 4
+ 2: 3
+ 3: 3
HLT_mu80_msonly_3layersEC_L1MU14FCH:
- eventCount: 0
+ eventCount: 3
stepCounts:
0: 4
+ 1: 3
stepFeatures:
- 0: 5
+ 0: 4
+ 1: 3
HLT_mu80_msonly_3layersEC_L1MU20:
- eventCount: 0
+ eventCount: 3
stepCounts:
0: 4
+ 1: 3
stepFeatures:
- 0: 5
+ 0: 4
+ 1: 3
HLT_mu8_L1MU6:
- eventCount: 10
+ eventCount: 9
stepCounts:
- 0: 10
+ 0: 11
1: 10
- 2: 10
- 3: 10
+ 2: 9
+ 3: 9
stepFeatures:
0: 14
- 1: 13
- 2: 15
- 3: 15
+ 1: 12
+ 2: 13
+ 3: 12
HLT_noalg_AlfaPEB_L1ALFA_ANY:
eventCount: 0
HLT_noalg_CIS_TilePEB_L1CALREQ1:
@@ -8663,47 +9276,47 @@ HLT_noalg_L1Calo:
HLT_noalg_L1Calo_EMPTY:
eventCount: 0
HLT_noalg_L1EM10VH:
- eventCount: 11
+ eventCount: 17
HLT_noalg_L1EM12:
- eventCount: 16
+ eventCount: 18
HLT_noalg_L1EM15:
- eventCount: 14
+ eventCount: 17
HLT_noalg_L1EM15VH:
- eventCount: 8
+ eventCount: 15
HLT_noalg_L1EM20VH:
- eventCount: 7
+ eventCount: 13
HLT_noalg_L1EM22VHI:
- eventCount: 6
+ eventCount: 10
HLT_noalg_L1EM3:
eventCount: 20
HLT_noalg_L1EM7:
- eventCount: 20
+ eventCount: 19
HLT_noalg_L1EM7_AFP_A_AND_C:
eventCount: 0
HLT_noalg_L1EM7_AFP_A_OR_C:
eventCount: 0
HLT_noalg_L1EM8VH:
- eventCount: 14
+ eventCount: 18
HLT_noalg_L1J100:
- eventCount: 3
+ eventCount: 5
HLT_noalg_L1J15:
eventCount: 20
HLT_noalg_L1J20:
- eventCount: 19
+ eventCount: 20
HLT_noalg_L1J25:
- eventCount: 17
+ eventCount: 18
HLT_noalg_L1J30:
eventCount: 17
HLT_noalg_L1J40:
- eventCount: 14
+ eventCount: 17
HLT_noalg_L1J400:
- eventCount: 0
+ eventCount: 1
HLT_noalg_L1J50:
- eventCount: 13
+ eventCount: 14
HLT_noalg_L1J75:
- eventCount: 6
+ eventCount: 8
HLT_noalg_L1J85:
- eventCount: 5
+ eventCount: 7
HLT_noalg_L1MBTSA0:
eventCount: 0
HLT_noalg_L1MBTSA1:
@@ -8787,7 +9400,7 @@ HLT_noalg_L1MBTS_2_EMPTY:
HLT_noalg_L1MBTS_2_UNPAIRED_ISO:
eventCount: 0
HLT_noalg_L1MU6:
- eventCount: 10
+ eventCount: 11
HLT_noalg_L1MU6_AFP_A_AND_C:
eventCount: 0
HLT_noalg_L1MU6_AFP_A_OR_C:
@@ -8799,31 +9412,31 @@ HLT_noalg_L1RD0_FILLED:
HLT_noalg_L1Standby:
eventCount: 20
HLT_noalg_L1TAU12IM:
- eventCount: 15
+ eventCount: 17
HLT_noalg_L1TAU20IM:
- eventCount: 10
+ eventCount: 14
HLT_noalg_L1TAU40:
- eventCount: 7
+ eventCount: 15
HLT_noalg_L1TAU60:
- eventCount: 5
+ eventCount: 7
HLT_noalg_L1TAU8:
- eventCount: 19
+ eventCount: 20
HLT_noalg_L1XE30:
eventCount: 14
HLT_noalg_L1XE300:
- eventCount: 0
+ eventCount: 1
HLT_noalg_L1XE35:
- eventCount: 14
+ eventCount: 13
HLT_noalg_L1XE40:
eventCount: 12
HLT_noalg_L1XE45:
- eventCount: 11
+ eventCount: 10
HLT_noalg_L1XE50:
- eventCount: 9
+ eventCount: 8
HLT_noalg_L1XE55:
- eventCount: 9
-HLT_noalg_L1XE60:
eventCount: 8
+HLT_noalg_L1XE60:
+ eventCount: 6
HLT_noalg_L1eEM10:
eventCount: 0
HLT_noalg_L1eEM10L:
@@ -8913,7 +9526,7 @@ HLT_noalg_eb_L1FIRSTEMPTY_noPS:
HLT_noalg_eb_L1PhysicsHigh_noPS:
eventCount: 18
HLT_noalg_eb_L1PhysicsVeryHigh_noPS:
- eventCount: 11
+ eventCount: 6
HLT_noalg_eb_L1RD3_EMPTY:
eventCount: 0
HLT_noalg_eb_L1RD3_FILLED:
@@ -8929,7 +9542,7 @@ HLT_noalg_idmon_L1RD0_FILLED:
HLT_noalg_idmon_L1RD0_UNPAIRED_ISO:
eventCount: 0
HLT_noalg_l1calo_L1J400:
- eventCount: 0
+ eventCount: 1
HLT_noalg_laser_TilePEB_L1CALREQ2:
eventCount: 0
HLT_noalg_mb_L1RD2_EMPTY:
@@ -8937,214 +9550,445 @@ HLT_noalg_mb_L1RD2_EMPTY:
HLT_noalg_zb_L1ZB:
eventCount: 0
HLT_tau0_ptonly_L1TAU60:
- eventCount: 5
+ eventCount: 7
stepCounts:
- 0: 5
+ 0: 7
stepFeatures:
- 0: 6
+ 0: 12
HLT_tau0_ptonly_L1TAU8:
- eventCount: 19
+ eventCount: 20
+ stepCounts:
+ 0: 20
+ stepFeatures:
+ 0: 70
+HLT_tau100_mediumRNN_tracktwoLLP_tau80_mediumRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40:
+ eventCount: 1
+ stepCounts:
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 1
+ stepFeatures:
+ 0: 18
+ 1: 18
+ 2: 18
+ 3: 18
+ 4: 8
+HLT_tau160_idperf_tracktwoMVABDT_L1TAU100:
+ eventCount: 3
+ stepCounts:
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
+ 4: 3
+ stepFeatures:
+ 0: 5
+ 1: 5
+ 2: 5
+ 3: 5
+ 4: 5
+HLT_tau160_idperf_tracktwoMVA_L1TAU100:
+ eventCount: 3
+ stepCounts:
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
+ 4: 3
+ stepFeatures:
+ 0: 5
+ 1: 5
+ 2: 5
+ 3: 5
+ 4: 5
+HLT_tau160_idperf_tracktwo_L1TAU100:
+ eventCount: 3
+ stepCounts:
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
+ 4: 3
+ 5: 3
+ stepFeatures:
+ 0: 5
+ 1: 5
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
+HLT_tau160_medium1_tracktwo_L1TAU100:
+ eventCount: 1
+ stepCounts:
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 2
+ 4: 2
+ 5: 1
+ stepFeatures:
+ 0: 5
+ 1: 5
+ 2: 5
+ 3: 4
+ 4: 4
+ 5: 3
+HLT_tau160_mediumRNN_tracktwoMVABDT_L1TAU100:
+ eventCount: 1
+ stepCounts:
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
+ 4: 1
+ stepFeatures:
+ 0: 5
+ 1: 5
+ 2: 5
+ 3: 5
+ 4: 3
+HLT_tau160_mediumRNN_tracktwoMVABDT_L1eTAU100:
+ eventCount: 0
+HLT_tau160_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
+HLT_tau160_mediumRNN_tracktwoMVATest_L1TAU100:
+ eventCount: 0
+ stepCounts:
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
+ stepFeatures:
+ 0: 5
+ 1: 5
+ 2: 5
+ 3: 5
+HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100:
+ eventCount: 1
+ stepCounts:
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
+ 4: 1
+ stepFeatures:
+ 0: 5
+ 1: 5
+ 2: 5
+ 3: 5
+ 4: 3
+HLT_tau160_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
+HLT_tau160_perf_tracktwoMVABDT_L1TAU100:
+ eventCount: 2
+ stepCounts:
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
+ 4: 2
+ stepFeatures:
+ 0: 5
+ 1: 5
+ 2: 5
+ 3: 5
+ 4: 4
+HLT_tau160_perf_tracktwoMVATest_L1TAU100:
+ eventCount: 1
+ stepCounts:
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
+ 4: 1
+ stepFeatures:
+ 0: 5
+ 1: 5
+ 2: 5
+ 3: 5
+ 4: 2
+HLT_tau160_perf_tracktwoMVA_L1TAU100:
+ eventCount: 2
+ stepCounts:
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
+ 4: 2
+ stepFeatures:
+ 0: 5
+ 1: 5
+ 2: 5
+ 3: 5
+ 4: 4
+HLT_tau160_perf_tracktwo_L1TAU100:
+ eventCount: 2
+ stepCounts:
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 2
+ 4: 2
+ 5: 2
+ stepFeatures:
+ 0: 5
+ 1: 5
+ 2: 5
+ 3: 4
+ 4: 4
+ 5: 4
+HLT_tau160_ptonly_L1TAU100:
+ eventCount: 3
+ stepCounts:
+ 0: 3
+ stepFeatures:
+ 0: 5
+HLT_tau180_mediumRNN_tracktwoLLP_L1TAU100:
+ eventCount: 1
+ stepCounts:
+ 0: 2
+ 1: 2
+ 2: 2
+ 3: 2
+ 4: 1
+ stepFeatures:
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
+HLT_tau180_mediumRNN_tracktwoLLP_probe_xe110_pfsum_vssk_L1XE50:
+ eventCount: 0
+HLT_tau180_tightRNN_tracktwoLLP_L1TAU100:
+ eventCount: 1
+ stepCounts:
+ 0: 2
+ 1: 2
+ 2: 2
+ 3: 2
+ 4: 1
+ stepFeatures:
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
+HLT_tau200_medium1_tracktwo_L1TAU100:
+ eventCount: 1
stepCounts:
- 0: 19
+ 0: 2
+ 1: 2
+ 2: 2
+ 3: 2
+ 4: 2
+ 5: 1
stepFeatures:
- 0: 64
-HLT_tau100_mediumRNN_tracktwoLLP_tau80_mediumRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40:
- eventCount: 0
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 3
+HLT_tau200_mediumRNN_tracktwoLLP_L1TAU100:
+ eventCount: 1
stepCounts:
0: 2
1: 2
2: 2
3: 2
- stepFeatures:
- 0: 8
- 1: 7
- 2: 7
- 3: 7
4: 1
-HLT_tau160_idperf_tracktwoMVABDT_L1TAU100:
- eventCount: 0
-HLT_tau160_idperf_tracktwoMVA_L1TAU100:
- eventCount: 0
-HLT_tau160_idperf_tracktwo_L1TAU100:
- eventCount: 0
-HLT_tau160_medium1_tracktwo_L1TAU100:
- eventCount: 0
-HLT_tau160_mediumRNN_tracktwoMVABDT_L1TAU100:
- eventCount: 0
-HLT_tau160_mediumRNN_tracktwoMVABDT_L1eTAU100:
- eventCount: 0
-HLT_tau160_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
- eventCount: 0
-HLT_tau160_mediumRNN_tracktwoMVATest_L1TAU100:
- eventCount: 0
-HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100:
- eventCount: 0
-HLT_tau160_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
- eventCount: 0
-HLT_tau160_perf_tracktwoMVABDT_L1TAU100:
- eventCount: 0
-HLT_tau160_perf_tracktwoMVATest_L1TAU100:
- eventCount: 0
-HLT_tau160_perf_tracktwoMVA_L1TAU100:
- eventCount: 0
-HLT_tau160_perf_tracktwo_L1TAU100:
- eventCount: 0
-HLT_tau160_ptonly_L1TAU100:
- eventCount: 0
-HLT_tau180_mediumRNN_tracktwoLLP_L1TAU100:
- eventCount: 0
-HLT_tau180_mediumRNN_tracktwoLLP_probe_xe110_pfsum_vssk_L1XE50:
- eventCount: 0
-HLT_tau180_tightRNN_tracktwoLLP_L1TAU100:
- eventCount: 0
-HLT_tau200_medium1_tracktwo_L1TAU100:
- eventCount: 0
-HLT_tau200_mediumRNN_tracktwoLLP_L1TAU100:
- eventCount: 0
+ stepFeatures:
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
HLT_tau200_mediumRNN_tracktwoMVABDT_L1TAU100:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 2
+ 1: 2
+ 2: 2
+ 3: 2
+ 4: 1
+ stepFeatures:
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
HLT_tau200_mediumRNN_tracktwoMVA_L1TAU100:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 2
+ 1: 2
+ 2: 2
+ 3: 2
+ 4: 1
+ stepFeatures:
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
HLT_tau200_ptonly_L1TAU100:
- eventCount: 0
+ eventCount: 2
+ stepCounts:
+ 0: 2
+ stepFeatures:
+ 0: 4
HLT_tau200_tightRNN_tracktwoLLP_L1TAU100:
- eventCount: 0
+ eventCount: 1
+ stepCounts:
+ 0: 2
+ 1: 2
+ 2: 2
+ 3: 2
+ 4: 1
+ stepFeatures:
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
HLT_tau20_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
eventCount: 0
HLT_tau20_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
eventCount: 0
HLT_tau25_idperf_tracktwoMVABDT_L1TAU12IM:
- eventCount: 13
+ eventCount: 16
stepCounts:
- 0: 13
- 1: 13
- 2: 13
- 3: 13
- 4: 13
+ 0: 16
+ 1: 16
+ 2: 16
+ 3: 16
+ 4: 16
stepFeatures:
- 0: 22
- 1: 22
- 2: 22
- 3: 22
- 4: 22
+ 0: 30
+ 1: 30
+ 2: 30
+ 3: 30
+ 4: 30
HLT_tau25_idperf_tracktwoMVA_L1TAU12IM:
- eventCount: 13
+ eventCount: 16
stepCounts:
- 0: 13
- 1: 13
- 2: 13
- 3: 13
- 4: 13
+ 0: 16
+ 1: 16
+ 2: 16
+ 3: 16
+ 4: 16
stepFeatures:
- 0: 22
- 1: 22
- 2: 22
- 3: 22
- 4: 22
+ 0: 30
+ 1: 30
+ 2: 30
+ 3: 30
+ 4: 30
HLT_tau25_idperf_tracktwo_L1TAU12IM:
- eventCount: 13
+ eventCount: 16
stepCounts:
- 0: 13
- 1: 13
- 2: 13
- 3: 13
- 4: 13
- 5: 13
+ 0: 16
+ 1: 16
+ 2: 16
+ 3: 16
+ 4: 16
+ 5: 16
stepFeatures:
- 0: 22
- 1: 22
- 2: 22
- 3: 22
- 4: 22
- 5: 22
+ 0: 30
+ 1: 30
+ 2: 30
+ 3: 30
+ 4: 30
+ 5: 30
HLT_tau25_looseRNN_tracktwoLLP_L1TAU12IM:
- eventCount: 6
+ eventCount: 10
stepCounts:
- 0: 13
- 1: 13
- 2: 13
- 3: 13
- 4: 6
+ 0: 16
+ 1: 16
+ 2: 16
+ 3: 16
+ 4: 10
stepFeatures:
- 0: 22
- 1: 22
- 2: 22
- 3: 22
- 4: 7
+ 0: 30
+ 1: 30
+ 2: 30
+ 3: 30
+ 4: 13
HLT_tau25_looseRNN_tracktwoMVABDT_L1TAU12IM:
- eventCount: 5
+ eventCount: 8
stepCounts:
- 0: 13
- 1: 13
- 2: 13
- 3: 13
- 4: 5
+ 0: 16
+ 1: 16
+ 2: 16
+ 3: 16
+ 4: 8
stepFeatures:
- 0: 22
- 1: 22
- 2: 22
- 3: 22
- 4: 6
+ 0: 30
+ 1: 30
+ 2: 30
+ 3: 30
+ 4: 12
HLT_tau25_looseRNN_tracktwoMVA_L1TAU12IM:
- eventCount: 5
+ eventCount: 8
stepCounts:
- 0: 13
- 1: 13
- 2: 13
- 3: 13
- 4: 5
+ 0: 16
+ 1: 16
+ 2: 16
+ 3: 16
+ 4: 8
stepFeatures:
- 0: 22
- 1: 22
- 2: 22
- 3: 22
- 4: 6
+ 0: 30
+ 1: 30
+ 2: 30
+ 3: 30
+ 4: 12
HLT_tau25_medium1_tracktwo_L1TAU12IM:
- eventCount: 5
+ eventCount: 8
stepCounts:
- 0: 13
- 1: 13
- 2: 13
- 3: 8
- 4: 8
- 5: 5
+ 0: 16
+ 1: 16
+ 2: 16
+ 3: 13
+ 4: 13
+ 5: 8
stepFeatures:
- 0: 22
- 1: 22
- 2: 22
- 3: 9
- 4: 9
- 5: 5
+ 0: 30
+ 1: 30
+ 2: 30
+ 3: 21
+ 4: 21
+ 5: 11
HLT_tau25_medium1_tracktwo_probe_xe110_pfsum_vssk_L1XE50:
eventCount: 0
HLT_tau25_mediumRNN_tracktwoLLP_L1TAU12IM:
- eventCount: 5
- stepCounts:
- 0: 13
- 1: 13
- 2: 13
- 3: 13
- 4: 5
+ eventCount: 10
+ stepCounts:
+ 0: 16
+ 1: 16
+ 2: 16
+ 3: 16
+ 4: 10
stepFeatures:
- 0: 22
- 1: 22
- 2: 22
- 3: 22
- 4: 6
+ 0: 30
+ 1: 30
+ 2: 30
+ 3: 30
+ 4: 13
HLT_tau25_mediumRNN_tracktwoMVABDT_L1TAU12IM:
- eventCount: 4
+ eventCount: 8
stepCounts:
- 0: 13
- 1: 13
- 2: 13
- 3: 13
- 4: 4
+ 0: 16
+ 1: 16
+ 2: 16
+ 3: 16
+ 4: 8
stepFeatures:
- 0: 22
- 1: 22
- 2: 22
- 3: 22
- 4: 5
+ 0: 30
+ 1: 30
+ 2: 30
+ 3: 30
+ 4: 11
HLT_tau25_mediumRNN_tracktwoMVABDT_L1eTAU12:
eventCount: 0
HLT_tau25_mediumRNN_tracktwoMVABDT_L1eTAU12M:
@@ -9152,255 +9996,262 @@ HLT_tau25_mediumRNN_tracktwoMVABDT_L1eTAU12M:
HLT_tau25_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
eventCount: 0
? HLT_tau25_mediumRNN_tracktwoMVABDT_tau20_mediumRNN_tracktwoMVABDT_03dRAB_j70_0eta320_j50_0eta490_j0_DJMASS900j50_L1MJJ-500-NFF
-: eventCount: 0
+: eventCount: 1
stepCounts:
- 0: 2
- 1: 2
- 2: 2
- 3: 2
- stepFeatures:
- 0: 13
- 1: 10
- 2: 10
- 3: 10
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
4: 2
+ 5: 1
+ stepFeatures:
+ 0: 20
+ 1: 20
+ 2: 20
+ 3: 20
+ 4: 10
+ 5: 11
HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM:
- eventCount: 4
+ eventCount: 8
stepCounts:
- 0: 13
- 1: 13
- 2: 13
- 3: 13
- 4: 4
+ 0: 16
+ 1: 16
+ 2: 16
+ 3: 16
+ 4: 8
stepFeatures:
- 0: 22
- 1: 22
- 2: 22
- 3: 22
- 4: 5
+ 0: 30
+ 1: 30
+ 2: 30
+ 3: 30
+ 4: 11
HLT_tau25_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
eventCount: 0
HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_j70_0eta320_j50_0eta490_j0_DJMASS900j50_L1MJJ-500-NFF:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 2
- 1: 2
- 2: 2
- 3: 2
- stepFeatures:
- 0: 13
- 1: 10
- 2: 10
- 3: 10
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
4: 2
+ 5: 1
+ stepFeatures:
+ 0: 20
+ 1: 20
+ 2: 20
+ 3: 20
+ 4: 10
+ 5: 11
HLT_tau25_perf_tracktwoMVABDT_L1TAU12IM:
- eventCount: 6
+ eventCount: 11
stepCounts:
- 0: 13
- 1: 13
- 2: 13
- 3: 13
- 4: 6
+ 0: 16
+ 1: 16
+ 2: 16
+ 3: 16
+ 4: 11
stepFeatures:
- 0: 22
- 1: 22
- 2: 22
- 3: 22
- 4: 7
+ 0: 30
+ 1: 30
+ 2: 30
+ 3: 30
+ 4: 16
HLT_tau25_perf_tracktwoMVA_L1TAU12IM:
- eventCount: 6
+ eventCount: 11
stepCounts:
- 0: 13
- 1: 13
- 2: 13
- 3: 13
- 4: 6
+ 0: 16
+ 1: 16
+ 2: 16
+ 3: 16
+ 4: 11
stepFeatures:
- 0: 22
- 1: 22
- 2: 22
- 3: 22
- 4: 7
+ 0: 30
+ 1: 30
+ 2: 30
+ 3: 30
+ 4: 17
HLT_tau25_perf_tracktwo_L1TAU12IM:
- eventCount: 6
+ eventCount: 11
stepCounts:
- 0: 13
- 1: 13
- 2: 13
- 3: 8
- 4: 8
- 5: 6
+ 0: 16
+ 1: 16
+ 2: 16
+ 3: 13
+ 4: 13
+ 5: 11
stepFeatures:
- 0: 22
- 1: 22
- 2: 22
- 3: 9
- 4: 9
- 5: 7
+ 0: 30
+ 1: 30
+ 2: 30
+ 3: 21
+ 4: 21
+ 5: 17
HLT_tau25_ptonly_L1TAU12IM:
- eventCount: 13
+ eventCount: 16
stepCounts:
- 0: 13
+ 0: 16
stepFeatures:
- 0: 22
+ 0: 30
HLT_tau25_tightRNN_tracktwoLLP_L1TAU12IM:
- eventCount: 5
+ eventCount: 9
stepCounts:
- 0: 13
- 1: 13
- 2: 13
- 3: 13
- 4: 5
+ 0: 16
+ 1: 16
+ 2: 16
+ 3: 16
+ 4: 9
stepFeatures:
- 0: 22
- 1: 22
- 2: 22
- 3: 22
- 4: 6
+ 0: 30
+ 1: 30
+ 2: 30
+ 3: 30
+ 4: 12
HLT_tau25_tightRNN_tracktwoMVABDT_L1TAU12IM:
- eventCount: 3
+ eventCount: 7
stepCounts:
- 0: 13
- 1: 13
- 2: 13
- 3: 13
- 4: 3
+ 0: 16
+ 1: 16
+ 2: 16
+ 3: 16
+ 4: 7
stepFeatures:
- 0: 22
- 1: 22
- 2: 22
- 3: 22
- 4: 4
+ 0: 30
+ 1: 30
+ 2: 30
+ 3: 30
+ 4: 10
HLT_tau25_tightRNN_tracktwoMVA_L1TAU12IM:
- eventCount: 3
+ eventCount: 7
+ stepCounts:
+ 0: 16
+ 1: 16
+ 2: 16
+ 3: 16
+ 4: 7
+ stepFeatures:
+ 0: 30
+ 1: 30
+ 2: 30
+ 3: 30
+ 4: 10
+HLT_tau35_idperf_tracktwoMVABDT_L1TAU20IM:
+ eventCount: 13
stepCounts:
0: 13
1: 13
2: 13
3: 13
- 4: 3
- stepFeatures:
- 0: 22
- 1: 22
- 2: 22
- 3: 22
- 4: 4
-HLT_tau35_idperf_tracktwoMVABDT_L1TAU20IM:
- eventCount: 10
- stepCounts:
- 0: 10
- 1: 10
- 2: 10
- 3: 10
- 4: 10
+ 4: 13
stepFeatures:
- 0: 17
- 1: 17
- 2: 17
- 3: 17
- 4: 17
+ 0: 24
+ 1: 24
+ 2: 24
+ 3: 24
+ 4: 24
HLT_tau35_idperf_tracktwoMVA_L1TAU20IM:
- eventCount: 10
+ eventCount: 13
stepCounts:
- 0: 10
- 1: 10
- 2: 10
- 3: 10
- 4: 10
+ 0: 13
+ 1: 13
+ 2: 13
+ 3: 13
+ 4: 13
stepFeatures:
- 0: 17
- 1: 17
- 2: 17
- 3: 17
- 4: 17
+ 0: 24
+ 1: 24
+ 2: 24
+ 3: 24
+ 4: 24
HLT_tau35_idperf_tracktwo_L1TAU20IM:
- eventCount: 10
- stepCounts:
- 0: 10
- 1: 10
- 2: 10
- 3: 10
- 4: 10
- 5: 10
+ eventCount: 12
+ stepCounts:
+ 0: 12
+ 1: 12
+ 2: 12
+ 3: 12
+ 4: 12
+ 5: 12
stepFeatures:
- 0: 16
- 1: 16
- 2: 16
- 3: 16
- 4: 16
- 5: 16
+ 0: 23
+ 1: 23
+ 2: 23
+ 3: 23
+ 4: 23
+ 5: 23
HLT_tau35_looseRNN_tracktwoMVABDT_L1TAU20IM:
- eventCount: 5
+ eventCount: 6
stepCounts:
- 0: 10
- 1: 10
- 2: 10
- 3: 10
- 4: 5
- stepFeatures:
- 0: 17
- 1: 17
- 2: 17
- 3: 17
+ 0: 13
+ 1: 13
+ 2: 13
+ 3: 13
4: 6
+ stepFeatures:
+ 0: 24
+ 1: 24
+ 2: 24
+ 3: 24
+ 4: 10
HLT_tau35_looseRNN_tracktwoMVA_L1TAU20IM:
- eventCount: 5
+ eventCount: 6
stepCounts:
- 0: 10
- 1: 10
- 2: 10
- 3: 10
- 4: 5
- stepFeatures:
- 0: 17
- 1: 17
- 2: 17
- 3: 17
+ 0: 13
+ 1: 13
+ 2: 13
+ 3: 13
4: 6
+ stepFeatures:
+ 0: 24
+ 1: 24
+ 2: 24
+ 3: 24
+ 4: 10
HLT_tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dRAB30_L1DR-TAU20ITAU12I-J25:
eventCount: 0
stepCounts:
0: 6
1: 6
2: 6
- 3: 1
- 4: 1
+ 3: 5
+ 4: 5
stepFeatures:
- 0: 26
- 1: 26
- 2: 26
- 3: 13
- 4: 3
- 5: 1
+ 0: 36
+ 1: 34
+ 2: 34
+ 3: 27
+ 4: 25
+ 5: 14
HLT_tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dRAB_L1TAU20IM_2TAU12IM_4J12p0ETA25:
- eventCount: 0
+ eventCount: 2
stepCounts:
0: 6
1: 6
2: 6
- 3: 1
- 4: 1
+ 3: 5
+ 4: 5
+ 5: 2
stepFeatures:
- 0: 26
- 1: 26
- 2: 26
- 3: 13
- 4: 3
- 5: 1
+ 0: 36
+ 1: 34
+ 2: 34
+ 3: 27
+ 4: 25
+ 5: 14
HLT_tau35_mediumRNN_tracktwoMVABDT_L1TAU20IM:
- eventCount: 4
+ eventCount: 6
stepCounts:
- 0: 10
- 1: 10
- 2: 10
- 3: 10
- 4: 4
+ 0: 13
+ 1: 13
+ 2: 13
+ 3: 13
+ 4: 6
stepFeatures:
- 0: 17
- 1: 17
- 2: 17
- 3: 17
- 4: 5
+ 0: 24
+ 1: 24
+ 2: 24
+ 3: 24
+ 4: 9
HLT_tau35_mediumRNN_tracktwoMVABDT_L1eTAU20:
eventCount: 0
HLT_tau35_mediumRNN_tracktwoMVABDT_L1eTAU20M:
@@ -9408,407 +10259,440 @@ HLT_tau35_mediumRNN_tracktwoMVABDT_L1eTAU20M:
HLT_tau35_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
eventCount: 0
HLT_tau35_mediumRNN_tracktwoMVABDT_tau25_mediumRNN_tracktwoMVABDT_03dRAB30_L1DR-TAU20ITAU12I-J25:
- eventCount: 1
+ eventCount: 0
stepCounts:
- 0: 6
- 1: 6
- 2: 6
- 3: 6
- 4: 1
+ 0: 7
+ 1: 7
+ 2: 7
+ 3: 7
stepFeatures:
- 0: 27
- 1: 27
- 2: 27
- 3: 27
- 4: 8
+ 0: 37
+ 1: 37
+ 2: 37
+ 3: 37
+ 4: 14
HLT_tau35_mediumRNN_tracktwoMVABDT_tau25_mediumRNN_tracktwoMVABDT_03dRAB_L1TAU20IM_2TAU12IM_4J12p0ETA25:
- eventCount: 1
+ eventCount: 2
stepCounts:
- 0: 6
- 1: 6
- 2: 6
- 3: 6
- 4: 1
+ 0: 7
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 2
stepFeatures:
- 0: 27
- 1: 27
- 2: 27
- 3: 27
- 4: 8
+ 0: 37
+ 1: 37
+ 2: 37
+ 3: 37
+ 4: 14
HLT_tau35_mediumRNN_tracktwoMVA_L1TAU20IM:
- eventCount: 4
+ eventCount: 6
stepCounts:
- 0: 10
- 1: 10
- 2: 10
- 3: 10
- 4: 4
+ 0: 13
+ 1: 13
+ 2: 13
+ 3: 13
+ 4: 6
stepFeatures:
- 0: 17
- 1: 17
- 2: 17
- 3: 17
- 4: 5
+ 0: 24
+ 1: 24
+ 2: 24
+ 3: 24
+ 4: 9
HLT_tau35_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
eventCount: 0
HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1DR-TAU20ITAU12I-J25:
- eventCount: 1
+ eventCount: 0
stepCounts:
- 0: 6
- 1: 6
- 2: 6
- 3: 6
- 4: 1
+ 0: 7
+ 1: 7
+ 2: 7
+ 3: 7
stepFeatures:
- 0: 27
- 1: 27
- 2: 27
- 3: 27
- 4: 8
+ 0: 37
+ 1: 37
+ 2: 37
+ 3: 37
+ 4: 14
HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1TAU20IM_2TAU12IM_4J12p0ETA25:
- eventCount: 1
+ eventCount: 2
stepCounts:
- 0: 6
- 1: 6
- 2: 6
- 3: 6
- 4: 1
+ 0: 7
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 2
stepFeatures:
- 0: 27
- 1: 27
- 2: 27
- 3: 27
- 4: 8
+ 0: 37
+ 1: 37
+ 2: 37
+ 3: 37
+ 4: 14
HLT_tau35_perf_tracktwoMVABDT_L1TAU20IM:
- eventCount: 6
+ eventCount: 8
stepCounts:
- 0: 10
- 1: 10
- 2: 10
- 3: 10
- 4: 6
+ 0: 13
+ 1: 13
+ 2: 13
+ 3: 13
+ 4: 8
stepFeatures:
- 0: 17
- 1: 17
- 2: 17
- 3: 17
- 4: 7
+ 0: 24
+ 1: 24
+ 2: 24
+ 3: 24
+ 4: 13
HLT_tau35_perf_tracktwoMVA_L1TAU20IM:
- eventCount: 6
+ eventCount: 8
stepCounts:
- 0: 10
- 1: 10
- 2: 10
- 3: 10
- 4: 6
+ 0: 13
+ 1: 13
+ 2: 13
+ 3: 13
+ 4: 8
stepFeatures:
- 0: 17
- 1: 17
- 2: 17
- 3: 17
- 4: 7
+ 0: 24
+ 1: 24
+ 2: 24
+ 3: 24
+ 4: 14
HLT_tau35_perf_tracktwo_L1TAU20IM:
- eventCount: 6
- stepCounts:
- 0: 10
- 1: 10
- 2: 10
- 3: 7
- 4: 7
- 5: 6
+ eventCount: 8
+ stepCounts:
+ 0: 12
+ 1: 12
+ 2: 12
+ 3: 9
+ 4: 9
+ 5: 8
stepFeatures:
- 0: 16
- 1: 16
- 2: 16
- 3: 7
- 4: 7
- 5: 6
+ 0: 23
+ 1: 23
+ 2: 23
+ 3: 16
+ 4: 16
+ 5: 14
HLT_tau35_ptonly_L1TAU20IM:
- eventCount: 10
+ eventCount: 12
stepCounts:
- 0: 10
+ 0: 12
stepFeatures:
- 0: 16
+ 0: 23
HLT_tau35_tightRNN_tracktwoMVABDT_L1TAU20IM:
- eventCount: 3
+ eventCount: 5
stepCounts:
- 0: 10
- 1: 10
- 2: 10
- 3: 10
- 4: 3
+ 0: 13
+ 1: 13
+ 2: 13
+ 3: 13
+ 4: 5
stepFeatures:
- 0: 17
- 1: 17
- 2: 17
- 3: 17
- 4: 4
+ 0: 24
+ 1: 24
+ 2: 24
+ 3: 24
+ 4: 8
HLT_tau35_tightRNN_tracktwoMVA_L1TAU20IM:
- eventCount: 3
+ eventCount: 5
stepCounts:
- 0: 10
- 1: 10
- 2: 10
- 3: 10
- 4: 3
+ 0: 13
+ 1: 13
+ 2: 13
+ 3: 13
+ 4: 5
stepFeatures:
- 0: 17
- 1: 17
- 2: 17
- 3: 17
- 4: 4
+ 0: 24
+ 1: 24
+ 2: 24
+ 3: 24
+ 4: 8
HLT_tau40_medium1_tracktwo_tau35_medium1_tracktwo_03dRAB_L1TAU25IM_2TAU20IM_2J25_3J20:
- eventCount: 0
+ eventCount: 2
stepCounts:
- 0: 5
- 1: 5
- 2: 5
+ 0: 7
+ 1: 7
+ 2: 7
+ 3: 5
+ 4: 5
+ 5: 2
stepFeatures:
- 0: 20
- 1: 19
- 2: 19
- 3: 9
+ 0: 35
+ 1: 35
+ 2: 35
+ 3: 25
+ 4: 23
+ 5: 14
HLT_tau40_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
eventCount: 0
HLT_tau40_mediumRNN_tracktwoMVABDT_tau35_mediumRNN_tracktwoMVABDT_03dRAB_L1TAU25IM_2TAU20IM_2J25_3J20:
- eventCount: 0
+ eventCount: 2
stepCounts:
- 0: 5
- 1: 5
- 2: 5
- 3: 5
+ 0: 7
+ 1: 7
+ 2: 7
+ 3: 7
+ 4: 2
stepFeatures:
- 0: 21
- 1: 19
- 2: 19
- 3: 19
- 4: 4
+ 0: 35
+ 1: 35
+ 2: 35
+ 3: 35
+ 4: 14
HLT_tau40_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
eventCount: 0
HLT_tau40_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB_L1TAU25IM_2TAU20IM_2J25_3J20:
- eventCount: 0
- stepCounts:
- 0: 5
- 1: 5
- 2: 5
- 3: 5
- stepFeatures:
- 0: 21
- 1: 19
- 2: 19
- 3: 19
- 4: 4
-HLT_tau50_mediumRNN_tracktwoMVABDT_xe80_pfopufit_xe50_cell_L1XE50:
- eventCount: 0
+ eventCount: 2
stepCounts:
- 0: 5
- 1: 5
- 2: 5
- 3: 5
- 4: 1
- stepFeatures:
0: 7
1: 7
2: 7
3: 7
- 4: 1
- 5: 1
+ 4: 2
+ stepFeatures:
+ 0: 35
+ 1: 35
+ 2: 35
+ 3: 35
+ 4: 14
+HLT_tau50_mediumRNN_tracktwoMVABDT_xe80_pfopufit_xe50_cell_L1XE50:
+ eventCount: 2
+ stepCounts:
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 2
+ 5: 2
+ 6: 2
+ stepFeatures:
+ 0: 8
+ 1: 8
+ 2: 8
+ 3: 8
+ 4: 4
+ 5: 4
+ 6: 2
HLT_tau50_mediumRNN_tracktwoMVABDT_xe80_tcpufit_xe50_cell_L1XE50:
- eventCount: 0
+ eventCount: 2
stepCounts:
- 0: 5
- 1: 5
- 2: 5
- 3: 5
- 4: 1
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 2
+ 5: 2
stepFeatures:
- 0: 7
- 1: 7
- 2: 7
- 3: 7
- 4: 1
- 5: 1
+ 0: 8
+ 1: 8
+ 2: 8
+ 3: 8
+ 4: 4
+ 5: 4
HLT_tau50_mediumRNN_tracktwoMVA_xe80_pfopufit_xe50_cell_L1XE50:
- eventCount: 0
+ eventCount: 2
stepCounts:
- 0: 5
- 1: 5
- 2: 5
- 3: 5
- 4: 1
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 2
+ 5: 2
+ 6: 2
stepFeatures:
- 0: 7
- 1: 7
- 2: 7
- 3: 7
- 4: 1
- 5: 1
+ 0: 8
+ 1: 8
+ 2: 8
+ 3: 8
+ 4: 4
+ 5: 4
+ 6: 2
HLT_tau50_mediumRNN_tracktwoMVA_xe80_tcpufit_xe50_cell_L1XE50:
- eventCount: 0
+ eventCount: 2
stepCounts:
- 0: 5
- 1: 5
- 2: 5
- 3: 5
- 4: 1
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 2
+ 5: 2
stepFeatures:
- 0: 7
- 1: 7
- 2: 7
- 3: 7
- 4: 1
- 5: 1
+ 0: 8
+ 1: 8
+ 2: 8
+ 3: 8
+ 4: 4
+ 5: 4
HLT_tau60_mediumRNN_tracktwoLLP_probe_xe110_pfsum_vssk_L1XE50:
eventCount: 0
HLT_tau60_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
eventCount: 0
HLT_tau60_mediumRNN_tracktwoMVABDT_tau25_mediumRNN_tracktwoMVABDT_xe50_cell_03dRAB_L1TAU40_2TAU12IM_XE40:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 1
+ 5: 1
stepFeatures:
- 0: 12
- 1: 12
- 2: 12
- 3: 12
- 4: 2
+ 0: 22
+ 1: 22
+ 2: 22
+ 3: 22
+ 4: 8
+ 5: 1
HLT_tau60_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
eventCount: 0
HLT_tau60_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1TAU40_2TAU12IM_XE40:
- eventCount: 0
- stepCounts:
- 0: 3
- 1: 3
- 2: 3
- 3: 3
+ eventCount: 1
+ stepCounts:
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 1
+ 5: 1
stepFeatures:
- 0: 12
- 1: 12
- 2: 12
- 3: 12
- 4: 2
+ 0: 22
+ 1: 22
+ 2: 22
+ 3: 22
+ 4: 8
+ 5: 1
HLT_tau80_medium1_tracktwo_tau35_medium1_tracktwo_03dRAB30_L1TAU60_DR-TAU20ITAU12I:
eventCount: 0
stepCounts:
- 0: 2
- 1: 2
- 2: 2
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
stepFeatures:
- 0: 9
- 1: 7
- 2: 7
- 3: 2
+ 0: 19
+ 1: 19
+ 2: 19
+ 3: 18
+ 4: 18
+ 5: 9
HLT_tau80_medium1_tracktwo_tau60_medium1_tracktwo_03dRAB_L1TAU60_2TAU40:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 2
- 1: 2
- 2: 2
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 3
+ 4: 3
+ 5: 1
stepFeatures:
- 0: 9
- 1: 7
- 2: 7
- 3: 1
+ 0: 19
+ 1: 19
+ 2: 19
+ 3: 13
+ 4: 13
+ 5: 9
HLT_tau80_mediumRNN_tracktwoLLP_probe_xe110_pfsum_vssk_L1XE50:
eventCount: 0
HLT_tau80_mediumRNN_tracktwoLLP_tau60_mediumRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 2
- 1: 2
- 2: 2
- 3: 2
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 1
stepFeatures:
- 0: 10
- 1: 8
- 2: 8
- 3: 8
- 4: 2
+ 0: 19
+ 1: 19
+ 2: 19
+ 3: 19
+ 4: 9
HLT_tau80_mediumRNN_tracktwoLLP_tau60_tightRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 2
- 1: 2
- 2: 2
- 3: 2
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 1
stepFeatures:
- 0: 10
- 1: 8
- 2: 8
- 3: 8
- 4: 2
+ 0: 19
+ 1: 19
+ 2: 19
+ 3: 19
+ 4: 9
HLT_tau80_mediumRNN_tracktwoMVABDT_probe_xe110_pfsum_vssk_L1XE50:
eventCount: 0
HLT_tau80_mediumRNN_tracktwoMVABDT_tau35_mediumRNN_tracktwoMVABDT_03dRAB30_L1TAU60_DR-TAU20ITAU12I:
eventCount: 0
stepCounts:
- 0: 2
- 1: 2
- 2: 2
- 3: 2
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 4
stepFeatures:
- 0: 10
- 1: 8
- 2: 8
- 3: 8
- 4: 2
+ 0: 19
+ 1: 19
+ 2: 19
+ 3: 19
+ 4: 9
HLT_tau80_mediumRNN_tracktwoMVABDT_tau60_mediumRNN_tracktwoMVABDT_03dRAB_L1TAU60_2TAU40:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 2
- 1: 2
- 2: 2
- 3: 2
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 1
stepFeatures:
- 0: 10
- 1: 8
- 2: 8
- 3: 8
- 4: 2
+ 0: 19
+ 1: 19
+ 2: 19
+ 3: 19
+ 4: 9
HLT_tau80_mediumRNN_tracktwoMVA_probe_xe110_pfsum_vssk_L1XE50:
eventCount: 0
HLT_tau80_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB30_L1TAU60_DR-TAU20ITAU12I:
eventCount: 0
stepCounts:
- 0: 2
- 1: 2
- 2: 2
- 3: 2
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 4
stepFeatures:
- 0: 10
- 1: 8
- 2: 8
- 3: 8
- 4: 2
+ 0: 19
+ 1: 19
+ 2: 19
+ 3: 19
+ 4: 9
HLT_tau80_mediumRNN_tracktwoMVA_tau60_mediumRNN_tracktwoMVA_03dRAB_L1TAU60_2TAU40:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 2
- 1: 2
- 2: 2
- 3: 2
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 1
stepFeatures:
- 0: 10
- 1: 8
- 2: 8
- 3: 8
- 4: 2
+ 0: 19
+ 1: 19
+ 2: 19
+ 3: 19
+ 4: 9
HLT_tau80_tightRNN_tracktwoLLP_tau60_tightRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 2
- 1: 2
- 2: 2
- 3: 2
+ 0: 4
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 1
stepFeatures:
- 0: 10
- 1: 8
- 2: 8
- 3: 8
- 4: 2
+ 0: 19
+ 1: 19
+ 2: 19
+ 3: 19
+ 4: 9
HLT_timeburner_L1All:
eventCount: 0
HLT_unconvtrk0_fslrt_L1All:
@@ -9818,109 +10702,109 @@ HLT_unconvtrk0_fslrt_L1All:
stepFeatures:
0: 20
HLT_unconvtrk0_fslrt_L1XE50:
- eventCount: 9
+ eventCount: 8
stepCounts:
- 0: 9
+ 0: 8
stepFeatures:
- 0: 9
+ 0: 8
HLT_unconvtrk20_distrk_medium_L1XE50:
eventCount: 0
stepCounts:
- 0: 9
+ 0: 8
stepFeatures:
- 0: 9
+ 0: 8
HLT_unconvtrk20_distrk_tight_L1XE50:
eventCount: 0
stepCounts:
- 0: 9
+ 0: 8
stepFeatures:
- 0: 9
+ 0: 8
HLT_unconvtrk260_hitdv_medium_L1J100:
eventCount: 0
stepCounts:
- 0: 3
- 1: 3
+ 0: 5
+ 1: 5
stepFeatures:
- 0: 3
- 1: 3
+ 0: 5
+ 1: 5
HLT_unconvtrk260_hitdv_tight_L1J100:
eventCount: 0
stepCounts:
- 0: 3
- 1: 3
+ 0: 5
+ 1: 5
stepFeatures:
- 0: 3
- 1: 3
+ 0: 5
+ 1: 5
HLT_unconvtrk50_isohpttrack_L1XE50:
- eventCount: 1
+ eventCount: 3
stepCounts:
- 0: 9
- 1: 1
+ 0: 8
+ 1: 3
stepFeatures:
- 0: 9
- 1: 1
+ 0: 8
+ 1: 5
HLT_xe110_mht_L1XE50:
- eventCount: 8
+ eventCount: 5
stepCounts:
- 0: 8
+ 0: 5
stepFeatures:
- 0: 8
+ 0: 5
HLT_xe110_pfsum_L1XE50:
eventCount: 4
stepCounts:
- 0: 9
+ 0: 8
1: 4
stepFeatures:
- 0: 9
+ 0: 8
1: 4
HLT_xe110_pfsum_cssk_L1XE50:
- eventCount: 4
+ eventCount: 3
stepCounts:
- 0: 9
- 1: 4
+ 0: 8
+ 1: 3
stepFeatures:
- 0: 9
- 1: 4
+ 0: 8
+ 1: 3
HLT_xe110_pfsum_vssk_L1XE50:
eventCount: 3
stepCounts:
- 0: 9
+ 0: 8
1: 3
stepFeatures:
- 0: 9
+ 0: 8
1: 3
HLT_xe110_tc_em_L1XE50:
- eventCount: 4
+ eventCount: 3
stepCounts:
- 0: 4
+ 0: 3
stepFeatures:
- 0: 4
+ 0: 3
HLT_xe110_tcpufit_L1XE50:
- eventCount: 5
+ eventCount: 2
stepCounts:
- 0: 5
+ 0: 2
stepFeatures:
- 0: 5
+ 0: 2
HLT_xe30_cell_L1XE30:
- eventCount: 12
+ eventCount: 14
stepCounts:
- 0: 12
+ 0: 14
stepFeatures:
- 0: 12
+ 0: 14
HLT_xe30_cell_xe30_tcpufit_L1XE30:
- eventCount: 11
+ eventCount: 10
stepCounts:
- 0: 11
+ 0: 10
stepFeatures:
0: 24
HLT_xe30_cvfpufit_L1XE30:
- eventCount: 14
+ eventCount: 10
stepCounts:
0: 14
- 1: 14
+ 1: 10
stepFeatures:
0: 14
- 1: 14
+ 1: 10
HLT_xe30_mht_L1XE30:
eventCount: 14
stepCounts:
@@ -9928,140 +10812,140 @@ HLT_xe30_mht_L1XE30:
stepFeatures:
0: 14
HLT_xe30_mhtpufit_em_subjesgscIS_L1XE30:
- eventCount: 14
+ eventCount: 12
stepCounts:
0: 14
- 1: 14
+ 1: 12
stepFeatures:
0: 14
- 1: 14
+ 1: 12
HLT_xe30_mhtpufit_pf_subjesgscIS_L1XE30:
- eventCount: 14
+ eventCount: 12
stepCounts:
0: 14
- 1: 14
+ 1: 12
stepFeatures:
0: 14
- 1: 14
+ 1: 12
HLT_xe30_pfopufit_L1XE30:
- eventCount: 13
+ eventCount: 12
stepCounts:
0: 14
- 1: 13
+ 1: 12
stepFeatures:
0: 14
- 1: 13
+ 1: 12
HLT_xe30_pfsum_L1XE30:
- eventCount: 12
+ eventCount: 11
stepCounts:
0: 14
- 1: 12
+ 1: 11
stepFeatures:
0: 14
- 1: 12
+ 1: 11
HLT_xe30_pfsum_cssk_L1XE30:
- eventCount: 13
+ eventCount: 11
stepCounts:
0: 14
- 1: 13
+ 1: 11
stepFeatures:
0: 14
- 1: 13
+ 1: 11
HLT_xe30_pfsum_vssk_L1XE30:
- eventCount: 14
+ eventCount: 10
stepCounts:
0: 14
- 1: 14
+ 1: 10
stepFeatures:
0: 14
- 1: 14
+ 1: 10
HLT_xe30_tcpufit_L1XE30:
- eventCount: 12
+ eventCount: 10
stepCounts:
- 0: 12
+ 0: 10
stepFeatures:
- 0: 12
+ 0: 10
HLT_xe30_trkmht_L1XE30:
- eventCount: 12
+ eventCount: 8
stepCounts:
0: 14
- 1: 12
+ 1: 8
stepFeatures:
0: 14
- 1: 12
+ 1: 8
HLT_xe55_cell_xe70_tcpufit_L1XE50:
- eventCount: 5
+ eventCount: 4
stepCounts:
- 0: 5
+ 0: 4
stepFeatures:
- 0: 13
+ 0: 11
HLT_xe55_cell_xe70_tcpufit_xe90_pfsum_vssk_L1XE50:
- eventCount: 3
+ eventCount: 4
stepCounts:
- 0: 5
- 1: 3
+ 0: 4
+ 1: 4
stepFeatures:
- 0: 22
- 1: 3
+ 0: 19
+ 1: 4
HLT_xe55_cell_xe70_tcpufit_xe95_pfsum_cssk_L1XE50:
eventCount: 3
stepCounts:
- 0: 5
+ 0: 4
1: 3
stepFeatures:
- 0: 22
+ 0: 19
1: 3
HLT_xe60_cell_L1XE50:
- eventCount: 6
+ eventCount: 7
stepCounts:
- 0: 6
+ 0: 7
stepFeatures:
- 0: 6
+ 0: 7
HLT_xe60_cell_xe95_pfsum_cssk_L1XE50:
eventCount: 4
stepCounts:
- 0: 6
+ 0: 7
1: 4
stepFeatures:
0: 15
1: 4
HLT_xe65_cell_xe100_mhtpufit_pf_subjesgscIS_L1XE50:
- eventCount: 5
+ eventCount: 4
stepCounts:
- 0: 6
- 1: 5
+ 0: 4
+ 1: 4
stepFeatures:
- 0: 15
- 1: 5
+ 0: 12
+ 1: 4
HLT_xe65_cell_xe105_mhtpufit_em_subjesgscIS_L1XE50:
- eventCount: 5
+ eventCount: 4
stepCounts:
- 0: 6
- 1: 5
+ 0: 4
+ 1: 4
stepFeatures:
- 0: 15
- 1: 5
+ 0: 12
+ 1: 4
HLT_xe65_cell_xe110_tcpufit_L1XE50:
- eventCount: 4
+ eventCount: 2
stepCounts:
- 0: 4
+ 0: 2
stepFeatures:
- 0: 11
+ 0: 6
HLT_xe65_cell_xe90_pfopufit_L1XE50:
eventCount: 4
stepCounts:
- 0: 6
+ 0: 4
1: 4
stepFeatures:
- 0: 15
+ 0: 12
1: 4
HLT_xe65_cell_xe95_pfsum_vssk_L1XE50:
eventCount: 4
stepCounts:
- 0: 6
+ 0: 4
1: 4
stepFeatures:
- 0: 15
+ 0: 12
1: 4
HLT_xe75_cell_xe65_tcpufit_xe90_trkmht_L1XE50:
eventCount: 3
@@ -10069,93 +10953,105 @@ HLT_xe75_cell_xe65_tcpufit_xe90_trkmht_L1XE50:
0: 3
1: 3
stepFeatures:
- 0: 20
+ 0: 16
1: 3
HLT_xe80_cell_xe115_tcpufit_L1XE50:
- eventCount: 2
+ eventCount: 1
stepCounts:
- 0: 2
+ 0: 1
stepFeatures:
- 0: 8
+ 0: 4
HLT_xe80_tcpufit_unconvtrk100_isohpttrack_medium_iaggrmedium_L1XE50:
- eventCount: 0
+ eventCount: 3
stepCounts:
- 0: 7
- 1: 7
+ 0: 4
+ 1: 4
+ 2: 3
stepFeatures:
- 0: 7
- 1: 7
+ 0: 4
+ 1: 4
+ 2: 3
HLT_xe80_tcpufit_unconvtrk120_isohpttrack_medium_iaggrloose_L1XE50:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 7
- 1: 7
+ 0: 4
+ 1: 4
+ 2: 1
stepFeatures:
- 0: 7
- 1: 7
+ 0: 4
+ 1: 4
+ 2: 1
HLT_xe80_tcpufit_unconvtrk120_isohpttrack_medium_iaggrmedium_L1XE50:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 7
- 1: 7
+ 0: 4
+ 1: 4
+ 2: 1
stepFeatures:
- 0: 7
- 1: 7
+ 0: 4
+ 1: 4
+ 2: 1
HLT_xe80_tcpufit_unconvtrk140_isohpttrack_medium_iaggrmedium_L1XE50:
eventCount: 0
stepCounts:
- 0: 7
- 1: 7
+ 0: 4
+ 1: 4
stepFeatures:
- 0: 7
- 1: 7
+ 0: 4
+ 1: 4
HLT_xe80_tcpufit_unconvtrk200_hitdv_medium_L1XE50:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 7
- 1: 7
+ 0: 4
+ 1: 4
+ 2: 1
stepFeatures:
- 0: 16
- 1: 7
+ 0: 12
+ 1: 4
+ 2: 1
HLT_xe80_tcpufit_unconvtrk200_hitdv_tight_L1XE50:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 7
- 1: 7
+ 0: 4
+ 1: 4
+ 2: 1
stepFeatures:
- 0: 16
- 1: 7
+ 0: 12
+ 1: 4
+ 2: 1
HLT_xe80_tcpufit_unconvtrk20_distrk_medium_L1XE50:
eventCount: 0
stepCounts:
- 0: 7
- 1: 7
+ 0: 4
+ 1: 4
stepFeatures:
- 0: 7
- 1: 7
+ 0: 4
+ 1: 4
HLT_xe80_tcpufit_unconvtrk20_distrk_tight_L1XE50:
eventCount: 0
stepCounts:
- 0: 7
- 1: 7
+ 0: 4
+ 1: 4
stepFeatures:
- 0: 7
- 1: 7
+ 0: 4
+ 1: 4
HLT_xe80_tcpufit_unconvtrk25_dedx_medium_L1XE50:
eventCount: 1
stepCounts:
- 0: 7
- 1: 7
+ 0: 4
+ 1: 4
2: 1
stepFeatures:
- 0: 7
- 1: 7
+ 0: 4
+ 1: 4
2: 1
HLT_xe80_tcpufit_unconvtrk50_dedx_medium_L1XE50:
- eventCount: 0
+ eventCount: 1
stepCounts:
- 0: 7
- 1: 7
+ 0: 4
+ 1: 4
+ 2: 1
stepFeatures:
- 0: 7
- 1: 7
+ 0: 4
+ 1: 4
+ 2: 1
diff --git a/Trigger/TrigValidation/TrigValTools/share/TrigValInputs.json b/Trigger/TrigValidation/TrigValTools/share/TrigValInputs.json
index 7d0e90d5d4a8..80d543c14724 100644
--- a/Trigger/TrigValidation/TrigValTools/share/TrigValInputs.json
+++ b/Trigger/TrigValidation/TrigValTools/share/TrigValInputs.json
@@ -74,8 +74,8 @@
"source": "mc",
"format": "RDO",
"paths": [
- "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.RDO.e4993_s3214_r11315/RDO.17533168._000001.pool.root.1",
- "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.RDO.e4993_s3214_r11315/RDO.17533168._000002.pool.root.1"
+ "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.digit.RDO.e4993_s3214_d1697_tid26494053_00/RDO.26494053._000001.pool.root.1",
+ "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.digit.RDO.e4993_s3214_d1697_tid26494053_00/RDO.26494053._000007.pool.root.1"
]
},
"pbpb": {
--
GitLab
From 2b9c9a004245d2e5be048576a2df2d85f48b7ce8 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Mon, 23 Aug 2021 15:31:04 +0200
Subject: [PATCH 230/272] TrigConf: remove remaining uses of "UseNewConfig"
Remove remaining settings of `UseNewConfig` which has been the default
since quite some time.
Relates to ATR-21865 and ATR-23102.
---
.../python/AnalysisTriggerAlgsConfig.py | 24 -------------------
...1CaloMonitoring_forRecExCommission_Run2.py | 10 --------
.../BStoESD_Tier0_HLTConfig_jobOptions.py | 4 +---
3 files changed, 1 insertion(+), 37 deletions(-)
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/python/AnalysisTriggerAlgsConfig.py b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/python/AnalysisTriggerAlgsConfig.py
index 3168c6c132f5..745785898d2d 100644
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/python/AnalysisTriggerAlgsConfig.py
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/python/AnalysisTriggerAlgsConfig.py
@@ -15,38 +15,14 @@ class RoIBResultToxAOD( Conf.RoIBResultToxAOD ):
from AthenaCommon.Logging import logging
log = logging.getLogger( 'RoIBResultToxAOD' )
- #
- # Get the handle to the LVL1 config service:
- #
- from AthenaCommon.AppMgr import ServiceMgr
- if hasattr( ServiceMgr, "TrigConfigSvc" ):
- log.info( "Using ServiceMgr.TrigConfigSvc for LVL1 configuration" )
- lvl1ConfigSvc = ServiceMgr.TrigConfigSvc
- elif hasattr( ServiceMgr, "LVL1ConfigSvc" ):
- log.info( "Using ServiceMgr.LVL1ConfigSvc for LVL1 configuration" )
- lvl1ConfigSvc = ServiceMgr.LVL1ConfigSvc
- else:
- log.warning( "Did not find a configured LVL1 configuration service!" )
- log.warning( "Will assume that one called 'TrigConf::TrigConfigSvc/TrigConfigSvc'" )
- log.warning( "will be available at runtime. --> The job could crash later on!" )
- lvl1ConfigSvc = "TrigConf::TrigConfigSvc/TrigConfigSvc" # Hopefully it will be configured correctly
- # later on in the job configuration...
-
- # Set the handle for the algorithm:
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
-
#
# Set up the L1Calo tools:
#
log.info( "will add L1CPMTools instance to the algorithm" )
self.L1CPMTools = CfgMgr.LVL1__L1CPMTools( 'L1CPMTools' )
- self.L1CPMTools.LVL1ConfigSvc = lvl1ConfigSvc
- self.L1CPMTools.UseNewConfig = ConfigFlags.Trigger.readLVL1FromJSON
log.info( "will add L1JEMJetTools instance to the algorithm" )
self.L1JEMJetTools = CfgMgr.LVL1__L1JEMJetTools( 'L1JEMJetTools' )
- self.L1JEMJetTools.LVL1ConfigSvc = lvl1ConfigSvc
- self.L1JEMJetTools.UseNewConfig = ConfigFlags.Trigger.readLVL1FromJSON
#
# Set up the muon RoI tools:
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run2.py b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run2.py
index a417d51f2be5..19fb9626aa43 100755
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run2.py
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run2.py
@@ -362,13 +362,3 @@ if l1caloRawMon:
L1CaloMan.ManualDataTypeSetup = DQMonFlags.monManManualDataTypeSetup()
L1CaloMan.DataType = DQMonFlags.monManDataType()
topSequence += L1CaloMan
-
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
- from AthenaCommon.Logging import logging
- _log = logging.getLogger("TrigT1CaloMonitoring_forRecExCommission_Run2")
- for monTool in L1CaloMan.AthenaMonTools:
- if 'UseNewConfig' in monTool.getProperties():
- _log.info("Setting %s.UseNewConfig to %s", monTool.name(), ConfigFlags.Trigger.readLVL1FromJSON)
- monTool.UseNewConfig = ConfigFlags.Trigger.readLVL1FromJSON
-
- #====
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/BStoESD_Tier0_HLTConfig_jobOptions.py b/Trigger/TriggerCommon/TriggerJobOpts/share/BStoESD_Tier0_HLTConfig_jobOptions.py
index db9ed22b77b3..8b575acdf0d6 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/BStoESD_Tier0_HLTConfig_jobOptions.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/BStoESD_Tier0_HLTConfig_jobOptions.py
@@ -94,9 +94,7 @@ if rec.doTrigger():
theTool = getattr(ToolSvc, toolName)
if 'LVL1ConfigSvc' in theTool.getProperties():
theTool.LVL1ConfigSvc="TrigConf::TrigConfigSvc/TrigConfigSvc"
- if 'UseNewConfig' in theTool.getProperties():
- _log.info("Setting ToolSvc.%s.UseNewConfig to %s", theTool.name(), ConfigFlags.Trigger.readLVL1FromJSON)
- theTool.UseNewConfig = ConfigFlags.Trigger.readLVL1FromJSON
+
#---------------------------------------------------------------------------
try:
from TriggerJobOpts.T0TriggerGetter import T0TriggerGetter
--
GitLab
From 49043fd2f41a572a651b44f0f5fc3243337994f8 Mon Sep 17 00:00:00 2001
From: Shaun Roe <shaun.roe@cern.ch>
Date: Mon, 23 Aug 2021 15:41:57 +0200
Subject: [PATCH 231/272] fix cppcheck warnings
---
.../InDetPerformanceMonitoring/scripts/AtlasStyle.C | 8 +++++---
.../InDetPerformanceMonitoring/scripts/fit_EoverP.C | 1 +
.../src/ElectronSelector.cxx | 2 +-
.../InDetPerformanceMonitoring/src/FourMuonEvent.cxx | 12 ++++--------
.../src/IDPerfMonEoverP.cxx | 2 +-
.../InDetPerformanceMonitoring/src/ZmumuEvent.cxx | 12 ++++--------
6 files changed, 16 insertions(+), 21 deletions(-)
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/scripts/AtlasStyle.C b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/scripts/AtlasStyle.C
index 2836f3b984bb..32b38108a3f4 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/scripts/AtlasStyle.C
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/scripts/AtlasStyle.C
@@ -119,7 +119,7 @@ TGraphErrors* myTGraphErrorsDivide(TGraphErrors* g1,TGraphErrors* g2) {
if (!g1) printf("**myTGraphErrorsDivide: g1 does not exist ! \n");
if (!g2) printf("**myTGraphErrorsDivide: g2 does not exist ! \n");
-
+ if (!g1 or !g2) return nullptr;
Int_t n1=g1->GetN();
Int_t n2=g2->GetN();
@@ -336,8 +336,10 @@ void myAddtoBand(TGraphErrors* g1, TGraphAsymmErrors* g2) {
TGraphErrors* TH1TOTGraph(TH1 *h1){
- if (!h1) std::cout << "TH1TOTGraph: histogram not found !" << std::endl;
-
+ if (!h1){
+ std::cout << "TH1TOTGraph: histogram not found !" << std::endl;
+ return nullptr;
+ }
TGraphErrors* g1= new TGraphErrors();
Double_t x, y, ex, ey;
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/scripts/fit_EoverP.C b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/scripts/fit_EoverP.C
index b870e0eb788f..76f623a2de7a 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/scripts/fit_EoverP.C
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/scripts/fit_EoverP.C
@@ -1466,6 +1466,7 @@ void MakeScaling(TString inputDir)
if(!meanPlotNeg || !meanPlotNeg){
std::cout<< "ERROR : inputfile does not contain the desired histograms " << std::endl;
+ return;
}
meanPlotNeg->Draw("colz");
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/ElectronSelector.cxx b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/ElectronSelector.cxx
index 3a21e9c057a7..a7a964eb851d 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/ElectronSelector.cxx
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/ElectronSelector.cxx
@@ -112,7 +112,7 @@ void ElectronSelector::PrepareElectronList(const xAOD::ElectronContainer* pxElec
// Loop over the Electrons
int electroncount = 0;
- for(; iter != iterEnd ; iter++) {
+ for(; iter != iterEnd ; ++iter) {
electroncount++;
(*m_msgStream) << MSG::DEBUG << " -- ElectronSelector::PrepareElectronList -- candiate electron " << electroncount
<< " has author " << (*iter)->author(xAOD::EgammaParameters::AuthorElectron)
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/FourMuonEvent.cxx b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/FourMuonEvent.cxx
index f1530ed00756..b4d1e6eaf29d 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/FourMuonEvent.cxx
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/FourMuonEvent.cxx
@@ -115,7 +115,7 @@ bool FourMuonEvent::Reco()
RecordMuon( pxCMuon );
(*m_msgStream) << MSG::DEBUG << " * FourMuonEvent::Reco ** muon " << theCount << " is accepted " << endmsg;
}
- xMuonItr++;
+ ++xMuonItr;
} // end loop on muons
// ordering of muons
@@ -1295,15 +1295,11 @@ const xAOD::TrackParticle* FourMuonEvent::getLooseIDTk( unsigned int /*uPart*/
while ( xTrkItr != xTrkItrE )
{
const xAOD::TrackParticle* pxTrack = *xTrkItr;
- if(!(pxTrack->track())) continue;
- const Trk::Track* pxTrkTrack = pxTrack->track();
if ( !pxTrack ) continue;
+ const Trk::Track* pxTrkTrack = pxTrack->track();
+ if(!pxTrkTrack) continue;
const Trk::Perigee* pxPerigee = pxTrkTrack->perigeeParameters() ;
if ( !pxPerigee ) continue;
-
- // const float fTrkPt = pxPerigee->pT()*1.0e-3;
- // const float fTrkPtErr = fabs( pxPerigee->localErrorMatrix().error(Trk::qOverP) );
- // const float fPtSig = ( 1.0f / pxPerigee->pT() ) / fTrkPtErr; // Potential problem.
const float fTrkPhi = pxPerigee->parameters()[Trk::phi];
const float fTrkEta = pxPerigee->eta();
@@ -1316,7 +1312,7 @@ const xAOD::TrackParticle* FourMuonEvent::getLooseIDTk( unsigned int /*uPart*/
return pxTrack;
}
- xTrkItr++;
+ ++xTrkItr;
}
}
// if ()
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonEoverP.cxx b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonEoverP.cxx
index 0329a9d705f0..23f0897fb458 100755
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonEoverP.cxx
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonEoverP.cxx
@@ -518,7 +518,7 @@ StatusCode IDPerfMonEoverP::execute()
// Loop over the Electrons
ATH_MSG_DEBUG("Electron info. being stored");
- for(; iter != iterEnd ; iter++) {
+ for(; iter != iterEnd ; ++iter) {
if (m_electronCounter >= NOS_ELECTRONS) break;
const xAOD::Electron *pThisElectron = (*iter);
m_author[m_electronCounter] = pThisElectron->author(xAOD::EgammaParameters::AuthorElectron);
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/ZmumuEvent.cxx b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/ZmumuEvent.cxx
index f4c01fc19014..c89d00435073 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/ZmumuEvent.cxx
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/ZmumuEvent.cxx
@@ -149,7 +149,7 @@ bool ZmumuEvent::Reco()
if (m_doDebug) {std::cout << " This muon is accepeted !! this is muon number " << acceptedMuonCount << " & full pass" << m_numberOfFullPassMuons << std::endl; }
}
}
- xMuonItr++;
+ ++xMuonItr;
} // end loop on muons
if (m_doDebug) {std::cout << " * ZmumuEvent * accepted " << acceptedMuonCount << " muons from the input list of "<< pxMuonContainer->size() <<std::endl; }
@@ -555,15 +555,11 @@ const xAOD::TrackParticle* ZmumuEvent::getLooseIDTk( unsigned int /*uPart*/ )
while ( xTrkItr != xTrkItrE )
{
const xAOD::TrackParticle* pxTrack = *xTrkItr;
- if(!(pxTrack->track())) continue;
- const Trk::Track* pxTrkTrack = pxTrack->track();
if ( !pxTrack ) continue;
+ const Trk::Track* pxTrkTrack = pxTrack->track();
+ if(!pxTrkTrack) continue;
const Trk::Perigee* pxPerigee = pxTrkTrack->perigeeParameters() ;
if ( !pxPerigee ) continue;
-
- // const float fTrkPt = pxPerigee->pT()*1.0e-3;
- // const float fTrkPtErr = fabs( pxPerigee->localErrorMatrix().error(Trk::qOverP) );
- // const float fPtSig = ( 1.0f / pxPerigee->pT() ) / fTrkPtErr; // Potential problem.
const float fTrkPhi = pxPerigee->parameters()[Trk::phi];
const float fTrkEta = pxPerigee->eta();
@@ -576,7 +572,7 @@ const xAOD::TrackParticle* ZmumuEvent::getLooseIDTk( unsigned int /*uPart*/ )
return pxTrack;
}
- xTrkItr++;
+ ++xTrkItr;
}
}
// if ()
--
GitLab
From 68797cd58494a87e9143ff21d037668418e301ec Mon Sep 17 00:00:00 2001
From: Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
Date: Mon, 23 Aug 2021 14:44:26 +0200
Subject: [PATCH 232/272] Fixed the passing of extra "make arguments" to the
underlying build tool.
When updating the scripts to perform the build through cmake and not using
make/ninja directly, the passing of user-provided flags was not updated
correctly in the code.
---
Build/AtlasBuildScripts/build_atlasexternals.sh | 2 +-
Build/AtlasBuildScripts/build_project.sh | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Build/AtlasBuildScripts/build_atlasexternals.sh b/Build/AtlasBuildScripts/build_atlasexternals.sh
index 29c7b8a88222..be83e1139efa 100755
--- a/Build/AtlasBuildScripts/build_atlasexternals.sh
+++ b/Build/AtlasBuildScripts/build_atlasexternals.sh
@@ -107,7 +107,7 @@ rm -f $error_stamp
# Build it:
error_stamp=`mktemp .tmp.error.XXXXX` ; rm -f $error_stamp
{
- cmake --build "${BUILDDIR}" ${EXTRAMAKE[@]} || touch $error_stamp
+ cmake --build "${BUILDDIR}" -- ${EXTRAMAKE[@]} || touch $error_stamp
} 2>&1 | tee "${BUILDDIR}/cmake_build.log"
test -f $error_stamp && ((ERROR_COUNT++))
rm -f $error_stamp
diff --git a/Build/AtlasBuildScripts/build_project.sh b/Build/AtlasBuildScripts/build_project.sh
index 4805fa296f16..d915575e6375 100644
--- a/Build/AtlasBuildScripts/build_project.sh
+++ b/Build/AtlasBuildScripts/build_project.sh
@@ -109,9 +109,9 @@ fi
# on build errors. To be able to see all failures at once.
if [[ "${ATLAS_EXTRA_MAKE_ARGS[@]}" = "" ]]; then
if [[ "${ATLAS_EXTRA_CMAKE_ARGS[@]}" =~ "Ninja" ]]; then
- ATLAS_EXTRA_MAKE_ARGS+=(-- -k0)
+ ATLAS_EXTRA_MAKE_ARGS+=(-k0)
else
- ATLAS_EXTRA_MAKE_ARGS+=(-- -k)
+ ATLAS_EXTRA_MAKE_ARGS+=(-k)
fi
fi
@@ -176,7 +176,7 @@ if [ -n "${ATLAS_EXE_MAKE}" ]; then
"${ATLAS_BUILD_DIR}/build/${ATLAS_PROJECT_NAME}/*/share/clid.db"
# Build the project.
{ atlas_build_time PROJECT_BUILD cmake \
- --build "${ATLAS_BUILD_DIR}/build/${ATLAS_PROJECT_NAME}" \
+ --build "${ATLAS_BUILD_DIR}/build/${ATLAS_PROJECT_NAME}" -- \
${ATLAS_EXTRA_MAKE_ARGS[@]}; } \
2>&1 | tee "${ATLAS_BUILD_DIR}/build/${ATLAS_PROJECT_NAME}/cmake_build.log" \
|| ((ERROR_COUNT++))
--
GitLab
From 497e357daceffc926c71edcc6694f7f098eaa921 Mon Sep 17 00:00:00 2001
From: Shaun Roe <shaun.roe@cern.ch>
Date: Mon, 23 Aug 2021 14:03:19 +0000
Subject: [PATCH 233/272] 22.0-cppcheck-SCT_Monitoring
---
.../include/VectorOperations.h | 24 +-
.../src/VectorOperations.cpp | 524 ++++++++----------
.../SCT_Monitoring/src/SCTErrMonAlg.cxx | 2 +-
.../SCT_Monitoring/src/SCTHitEffMonAlg.cxx | 4 +-
.../SCT_Monitoring/src/SCTHitEffMonAlg.h | 3 +-
.../SCT_Monitoring/src/SCTHitEffMonTool.cxx | 3 +-
.../SCT_Monitoring/src/SCTHitEffMonTool.h | 2 +-
7 files changed, 246 insertions(+), 316 deletions(-)
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/scripts/CheckReprocessing/include/VectorOperations.h b/InnerDetector/InDetMonitoring/SCT_Monitoring/scripts/CheckReprocessing/include/VectorOperations.h
index 412c86f78f16..c7fe5d3a636b 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/scripts/CheckReprocessing/include/VectorOperations.h
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/scripts/CheckReprocessing/include/VectorOperations.h
@@ -17,20 +17,16 @@
#include <vector>
#include <string>
-using namespace std;
-
-class VectorOperations
-{
- public:
- static void PathCOUT( vector<string> );
- static void PathCERR( vector<string> );
- static vector<string> SplitString( string, char, bool IncludeEmptyStrings = false );
- static vector<string> CombineUniques( vector<string>, vector<string> );
- static int VectorContains( vector<string>*, string* );
- static bool FullSearch( vector<string>&, vector<string>& );
- static int ComparePaths( vector<string>, vector<string> );
- static int CompareObjectNames( string, string );
- static int CyclicCompareNames( string, string );
+namespace VectorOperations{
+ void PathCOUT( const std::vector<std::string> & vec);
+ void PathCERR( const std::vector<std::string> & vec );
+ std::vector<std::string> SplitString( std::string & s, char delimiter, bool IncludeEmptyStrings = false );
+ std::vector<std::string> CombineUniques( const std::vector<std::string> & v1, const std::vector<std::string> & v2);
+ int VectorContains( std::vector<std::string>*, std::string* );
+ bool FullSearch( const std::vector<std::string> & v1, const std::vector<std::string> & v2);
+ int ComparePaths( const std::vector<std::string> & v1, const std::vector<std::string> & v2 );
+ int CompareObjectNames( const std::string& name1, const std::string & name2 );
+ int CyclicCompareNames( const std::string& name1, const std::string & name2 );
};
#endif
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/scripts/CheckReprocessing/src/VectorOperations.cpp b/InnerDetector/InDetMonitoring/SCT_Monitoring/scripts/CheckReprocessing/src/VectorOperations.cpp
index 27bb7f79f58f..305c2e821b93 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/scripts/CheckReprocessing/src/VectorOperations.cpp
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/scripts/CheckReprocessing/src/VectorOperations.cpp
@@ -13,303 +13,237 @@
#include "VectorOperations.h"
#include <iostream>
+#include <algorithm>
+#include <iterator>
#include <cstring>
using namespace std;
-//Methods to output a histogram path
-void VectorOperations::PathCOUT( vector<string> InputPath )
-{
- for ( int objectIndex = 0; objectIndex < InputPath.size(); objectIndex++ )
- {
- cout << "/" << InputPath[objectIndex];
- }
-}
-void VectorOperations::PathCERR( vector<string> InputPath )
-{
- for ( int objectIndex = 0; objectIndex < InputPath.size(); objectIndex++ )
- {
- cerr << "/" << InputPath[objectIndex];
- }
-}
-
-//Split a string every time you find a given character
-vector<string> VectorOperations::SplitString( string Input, char SplitCharacter, bool IncludeEmptyStrings )
-{
- vector<string> splitParts;
-
- while(true)
- {
- //Search for the character
- int position = Input.find_first_of(SplitCharacter);
-
- if ( position == -1 )
- {
- //Ignore empty strings
- if ( Input != "" || IncludeEmptyStrings )
- {
- splitParts.push_back( Input );
- }
-
- //If it's not found, you've reached the end
- break;
- }
- else
- {
- //Split the string at the character postion
- string tempString( Input, 0, position );
- Input = Input.substr( position + 1 );
-
- //Ignore empty strings
- if ( tempString != "" || IncludeEmptyStrings )
- {
- splitParts.push_back( tempString );
- }
- }
- }
-
- return splitParts;
-}
-
-//Return a vector containing all the unique strings from the two input vectors
-vector<string> VectorOperations::CombineUniques( vector<string> VectorOne, vector<string> VectorTwo )
-{
- vector<string> result;
- vector<string>::iterator stringIterator;
-
- //Don't assume VectorOne is unique
- for ( stringIterator = VectorOne.begin(); stringIterator != VectorOne.end(); stringIterator++ )
- {
- if ( VectorContains( &result, &(*stringIterator) ) == -1 )
- {
- result.push_back( *stringIterator );
- }
- }
-
- //Now add in VectorTwo
- for ( stringIterator = VectorTwo.begin(); stringIterator != VectorTwo.end(); stringIterator++ )
- {
- if ( VectorContains( &result, &(*stringIterator) ) == -1 )
- {
- result.push_back( *stringIterator );
- }
- }
-
- return result;
-}
-
-//Return the position of a search string within a vector of strings, or -1 if not found
-int VectorOperations::VectorContains( vector<string> * InputVector, string * SearchString )
-{
- for ( int searchIndex = 0; searchIndex < InputVector->size(); searchIndex++ )
- {
- if ( (*InputVector)[searchIndex] == (*SearchString) )
- {
- //Found the search string
- return searchIndex;
- }
- }
-
- //If you've got this far, it wasn't found
- return -1;
-}
-
-//Return true if a path matches a given search vector
-bool VectorOperations::FullSearch( vector<string> & TestPath, vector<string> & SearchVector )
-{
- if ( TestPath.size() <= SearchVector.size() )
- {
- //Check the full depth of the vector
- for ( int pathIndex = 0; pathIndex < TestPath.size(); pathIndex++ )
- {
- //Examine all the parts of this search string
- vector<string> searchParts = VectorOperations::SplitString( SearchVector[pathIndex], ',' );
- for ( int partIndex = 0; partIndex < searchParts.size(); partIndex++ )
- {
- string part = searchParts[partIndex];
- if ( part == "*" )
- {
- //* matches anything
-
- if ( pathIndex + 1 == TestPath.size() && partIndex + 1 == searchParts.size() )
- {
- //If it matches all the way to the end of the path, return true
- return true;
- }
- }
- else if ( strstr( TestPath[pathIndex].c_str(), part.c_str() ) != 0 )
- {
- //Match if this part is found in the test string
-
- if ( pathIndex + 1 == TestPath.size() && partIndex + 1 == searchParts.size() )
- {
- //If it matches all the way to the end of the path, return true
- return true;
- }
- }
- else if ( part[0] == '!' && strstr( TestPath[pathIndex].c_str(), part.substr(1).c_str() ) == 0 )
- {
- //Match if this part is not found in the test string
-
- if ( pathIndex + 1 == TestPath.size() && partIndex + 1 == searchParts.size() )
- {
- //If it matches all the way to the end of the path, return true
- return true;
- }
- }
- else
- {
- //Mismatch
- return false;
- }
- }
- }
- }
- else
- {
- //Search string does not go to this depth
- return false;
- }
-}
-
-//Return a score indicating the compatibility of two paths. 0 = identical
-int VectorOperations::ComparePaths( vector<string> FirstPath, vector<string> SecondPath )
-{
- int pathScore = 0;
-
- //Make sure the first path is the shortest
- if ( SecondPath.size() < FirstPath.size() )
- {
- vector<string> temporaryPath = FirstPath;
- FirstPath = SecondPath;
- SecondPath = temporaryPath;
- }
-
- //Compare the object names for where the paths overlap
- for ( int objectIndex = 0; objectIndex < FirstPath.size(); objectIndex++ )
- {
- int score = CompareObjectNames( FirstPath[objectIndex], SecondPath[objectIndex] );
- if ( objectIndex != FirstPath.size() - 1 )
- {
- score *= 100;
- }
- pathScore += score;
- }
-
- //Add the length of every additional part of the longer path
- for ( int objectIndex = FirstPath.size(); objectIndex < SecondPath.size(); objectIndex++ )
- {
- pathScore += 100 * SecondPath[objectIndex].size();
- }
-
- return pathScore;
-}
-
-//Return a score indicating the compatibility of two strings. 0 = identical
-int VectorOperations::CompareObjectNames( string FirstName, string SecondName )
-{
- //Make sure the first name is the shortest
- if ( SecondName.size() < FirstName.size() )
- {
- string temporaryName = FirstName;
- FirstName = SecondName;
- SecondName = temporaryName;
- }
-
- //Compare the names character by character from the beginning
- int fromBeginningMatches = 0;
- for ( int characterIndex = 0; characterIndex < FirstName.size(); characterIndex++ )
- {
- if ( FirstName[characterIndex] == SecondName[characterIndex] )
- {
- fromBeginningMatches++;
- }
- else
- {
- break;
- }
- }
-
- //Return 0 if identical, extra length of longer string
- if ( fromBeginningMatches == FirstName.size() )
- {
- return SecondName.size() - fromBeginningMatches;
- }
- else
- {
- //Compare the names character by character from the end
- int fromEndMatches = 0;
- for ( int characterIndex = 0; characterIndex < FirstName.size(); characterIndex++ )
- {
- if ( FirstName[ FirstName.size() - characterIndex - 1 ] == SecondName[ SecondName.size() - characterIndex - 1 ] )
- {
- fromEndMatches++;
- }
- else
- {
- break;
- }
-
- }
-
- //If there's a mismatched chunk in the middle, examine it
- if ( FirstName.size() - fromBeginningMatches - fromEndMatches > 2 )
- {
- string firstNameChunk = FirstName.substr( fromBeginningMatches, FirstName.size() - fromBeginningMatches - fromEndMatches );
- string secondNameChunk = SecondName.substr( fromBeginningMatches, SecondName.size() - fromBeginningMatches - fromEndMatches );
- return SecondName.size() - fromBeginningMatches - fromEndMatches - CyclicCompareNames( firstNameChunk, secondNameChunk );
- }
- else
- {
- return SecondName.size() - fromBeginningMatches - fromEndMatches;
- }
- }
-}
-
-//Return the length of a matching character sequence in two strings
-int VectorOperations::CyclicCompareNames( string FirstName, string SecondName )
-{
- //Make sure the first name is the shortest
- if ( SecondName.size() < FirstName.size() )
- {
- string temporaryName = FirstName;
- FirstName = SecondName;
- SecondName = temporaryName;
- }
-
- //Find the first matching character
- int firstMatch = -1;
- for ( int characterIndex = 0; characterIndex < SecondName.size(); characterIndex++ )
- {
- if ( FirstName[0] == SecondName[characterIndex] )
- {
- firstMatch = characterIndex;
- break;
- }
- }
-
- if ( firstMatch == -1 )
- {
- //Strings are completely dissimilar
- return 0;
- }
- else
- {
- //Assume there's a similar character seqence that has just been offset (and possibly cycled) in the second string
- int numberMatching = 1;
- for ( int characterIndex = 1; characterIndex < FirstName.size(); characterIndex++ )
- {
- int secondIndex = ( characterIndex + firstMatch ) % SecondName.size();
- if ( FirstName[characterIndex] == SecondName[secondIndex] )
- {
- numberMatching++;
- }
- else
- {
- break;
- }
- }
-
- return numberMatching;
- }
+namespace VectorOperations{
+ //Methods to output a histogram path
+ void
+ PathCOUT( const vector<string> & InputPath ){
+ for ( const auto & i: InputPath){
+ cout << "/" << i;
+ }
+ }
+
+ void
+ PathCERR( const vector<string> & InputPath ){
+ for ( const auto & i: InputPath){
+ cerr << "/" << i;
+ }
+ }
+
+ //Split a string every time you find a given character
+ vector<string>
+ SplitString( const string & Input, char SplitCharacter, bool IncludeEmptyStrings )
+ {
+ vector<string> splitParts;
+
+ while(true)
+ {
+ //Search for the character
+ int position = Input.find_first_of(SplitCharacter);
+ if ( position == -1 ){
+ //Ignore empty strings
+ if ( Input != "" || IncludeEmptyStrings ){
+ splitParts.push_back( Input );
+ }
+ //If it's not found, you've reached the end
+ break;
+ } else {
+ //Split the string at the character postion
+ string tempString( Input, 0, position );
+ Input = Input.substr( position + 1 );
+ //Ignore empty strings
+ if ( tempString != "" || IncludeEmptyStrings ){
+ splitParts.push_back( tempString );
+ }
+ }
+ }
+ return splitParts;
+ }
+
+ //Return a vector containing all the unique strings from the two input vectors
+ vector<string>
+ CombineUniques( const vector<string> & VectorOne, const vector<string> & VectorTwo ){
+ vector<string> result;
+ //Don't assume VectorOne is unique
+ for ( const auto & i1: VectorOne ){
+ if ( VectorContains( result, i1) == -1 ){
+ result.push_back( i1 );
+ }
+ }
+
+ //Now add in VectorTwo
+ for ( const auto & i2: VectorTwo){
+ if ( VectorContains( result, i2 ) == -1 ){
+ result.push_back( i2 );
+ }
+ }
+ return result;
+ }
+
+ //Return the position of a search string within a vector of strings, or -1 if not found
+ int
+ VectorContains( const vector<string> & InputVector, const string & SearchString ){
+ auto position = std::find(InputVector.begin(), InputVector.end(), SearchString);
+ return (position != InputVector.end()) ? std::distance(InputVector.begin(), position) : -1;
+ }
+
+ //Return true if a path matches a given search vector
+ bool
+ FullSearch( const vector<string> & TestPath, const vector<string> & SearchVector ){
+ if ( TestPath.size() <= SearchVector.size() ){
+ //Check the full depth of the vector
+ for ( int pathIndex = 0; pathIndex < TestPath.size(); pathIndex++ ){
+ //Examine all the parts of this search string
+ vector<string> searchParts = SplitString( SearchVector[pathIndex], ',' );
+ for ( int partIndex = 0; partIndex < searchParts.size(); partIndex++ ){
+ string part = searchParts[partIndex];
+ if ( part == "*" ){
+ //* matches anything
+ if ( pathIndex + 1 == TestPath.size() && partIndex + 1 == searchParts.size() ){
+ //If it matches all the way to the end of the path, return true
+ return true;
+ }
+ } else if ( strstr( TestPath[pathIndex].c_str(), part.c_str() ) != 0 ){
+ //Match if this part is found in the test string
+ if ( pathIndex + 1 == TestPath.size() && partIndex + 1 == searchParts.size() ){
+ //If it matches all the way to the end of the path, return true
+ return true;
+ }
+ } else if ( part[0] == '!' && strstr( TestPath[pathIndex].c_str(), part.substr(1).c_str() ) == 0 ){
+ //Match if this part is not found in the test string
+
+ if ( pathIndex + 1 == TestPath.size() && partIndex + 1 == searchParts.size() ){
+ //If it matches all the way to the end of the path, return true
+ return true;
+ }
+ } else {
+ //Mismatch
+ return false;
+ }
+ }
+ }
+ } else {
+ //Search string does not go to this depth
+ return false;
+ }
+ }
+
+ //Return a score indicating the compatibility of two paths. 0 = identical
+ int
+ ComparePaths( const vector<string> & FirstPath, const vector<string> & SecondPath ){
+ int pathScore = 0;
+
+ auto & v1{FirstPath};
+ auto & v2{SecondPath};
+ if ( SecondPath.size() < FirstPath.size() ){
+ v2=FirstPath;
+ v1=SecondPath;
+ }
+
+ //Compare the object names for where the paths overlap
+ for ( int objectIndex = 0; objectIndex < v1.size(); objectIndex++ ){
+ int score = CompareObjectNames( v1[objectIndex], v2[objectIndex] );
+ if ( objectIndex != v1.size() - 1 ){
+ score *= 100;
+ }
+ pathScore += score;
+ }
+
+ //Add the length of every additional part of the longer path
+ for ( int objectIndex = v1.size(); objectIndex < v2.size(); objectIndex++ ){
+ pathScore += 100 * v2[objectIndex].size();
+ }
+
+ return pathScore;
+ }
+
+ //Return a score indicating the compatibility of two strings. 0 = identical
+ int CompareObjectNames( const string & FirstName, string & SecondName ){
+ //Make sure the first name is the shortest
+ auto & s1{FirstName};
+ auto & s2{SecondName};
+ if ( SecondName.size() < FirstName.size() ){
+ s2=FirstName;
+ s1=SecondName;
+ }
+
+ //Compare the names character by character from the beginning
+ int fromBeginningMatches = 0;
+ for ( int characterIndex = 0; characterIndex < s1.size(); characterIndex++ ) {
+ if ( s1[characterIndex] == s2[characterIndex] ) {
+ fromBeginningMatches++;
+ } else {
+ break;
+ }
+ }
+
+ //Return 0 if identical, extra length of longer string
+ if ( fromBeginningMatches == s1.size() )
+ {
+ return s2.size() - fromBeginningMatches;
+ } else {
+ //Compare the names character by character from the end
+ int fromEndMatches = 0;
+ for ( int characterIndex = 0; characterIndex < s1.size(); characterIndex++ ) {
+ if ( s1[ s1.size() - characterIndex - 1 ] == s2[ s2.size() - characterIndex - 1 ] ) {
+ fromEndMatches++;
+ } else {
+ break;
+ }
+
+ }
+
+ //If there's a mismatched chunk in the middle, examine it
+ if ( s1.size() - fromBeginningMatches - fromEndMatches > 2 ) {
+ string firstNameChunk = s1.substr( fromBeginningMatches, s1.size() - fromBeginningMatches - fromEndMatches );
+ string secondNameChunk = s2.substr( fromBeginningMatches, s2.size() - fromBeginningMatches - fromEndMatches );
+ return s2.size() - fromBeginningMatches - fromEndMatches - CyclicCompareNames( firstNameChunk, secondNameChunk );
+ } else {
+ return s2.size() - fromBeginningMatches - fromEndMatches;
+ }
+ }
+ }
+
+ //Return the length of a matching character sequence in two strings
+ int
+ CyclicCompareNames( const string & FirstName, const string & SecondName ){
+ //Make sure the first name is the shortest
+ auto & s1{FirstName};
+ auto & s2{SecondName};
+ if ( SecondName.size() < FirstName.size() ){
+ s2=FirstName;
+ s1=SecondName;
+ }
+
+ //Find the first matching character
+ int firstMatch = -1;
+ for ( int characterIndex = 0; characterIndex < s2.size(); characterIndex++ ){
+ if ( s1[0] == s2[characterIndex] ){
+ firstMatch = characterIndex;
+ break;
+ }
+ }
+
+ if ( firstMatch == -1 ) {
+ //Strings are completely dissimilar
+ return 0;
+ } else {
+ //Assume there's a similar character seqence that has just been offset (and possibly cycled) in the second string
+ int numberMatching = 1;
+ for ( int characterIndex = 1; characterIndex < s1.size(); characterIndex++ ) {
+ int secondIndex = ( characterIndex + firstMatch ) % s2.size();
+ if ( s1[characterIndex] == s2[secondIndex] ) {
+ numberMatching++;
+ } else {
+ break;
+ }
+ }
+ return numberMatching;
+ }
+ }
}
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTErrMonAlg.cxx b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTErrMonAlg.cxx
index 9d06c7b9c227..ce6808140de9 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTErrMonAlg.cxx
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTErrMonAlg.cxx
@@ -93,7 +93,7 @@ StatusCode SCTErrMonAlg::fillHistograms(const EventContext& ctx) const {
}
// The numbers of disabled modules, links, strips do not change during a run.
- if (m_isFirstConfigurationDetails) {
+ { //scope for lock
std::lock_guard<std::mutex> glock{m_mutex};
if (m_isFirstConfigurationDetails) {
ATH_CHECK(fillConfigurationDetails(ctx));
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonAlg.cxx b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonAlg.cxx
index 970b7bd7cd29..29be909d25eb 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonAlg.cxx
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonAlg.cxx
@@ -27,7 +27,7 @@
#include "TrkSurfaces/Surface.h"
#include "TrkMeasurementBase/MeasurementBase.h"
#include "TrkParameters/TrackParameters.h"
-
+#include "TrkTrack/Track.h"
#include "TrkTrackSummary/TrackSummary.h"
// SCT
@@ -243,7 +243,7 @@ int SCTHitEffMonAlg::previousChip(double xl, int side, bool swap) const {
return chipPos;
}
-StatusCode SCTHitEffMonAlg::failCut(bool value, std::string name) const {
+StatusCode SCTHitEffMonAlg::failCut(bool value, const std::string & name) const {
if (value) {
ATH_MSG_VERBOSE("Passed " << name);
return StatusCode::FAILURE;
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonAlg.h b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonAlg.h
index 2b58a1289a5e..422df336d269 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonAlg.h
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonAlg.h
@@ -21,7 +21,6 @@
#include "TrkToolInterfaces/ITrackHoleSearchTool.h"
#include "TrkToolInterfaces/IResidualPullCalculator.h"
#include "TrkToolInterfaces/IRIO_OnTrackCreator.h"
-#include "TrkTrack/Track.h"
#include "TrkTrack/TrackCollection.h"
//Gaudi
@@ -45,7 +44,7 @@ class SCTHitEffMonAlg : public AthMonitorAlgorithm {
private:
// Method to cut on track or hit variables and automatize DEBUG statements
- StatusCode failCut(bool value, std::string name) const;
+ StatusCode failCut(bool value, const std::string & name) const;
// Method to compute incident angle of track to wafer
StatusCode findAnglesToWaferSurface(const Amg::Vector3D& mom, const Identifier id,
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonTool.cxx b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonTool.cxx
index b4dc63e2d645..1fb3a7ccbd3b 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonTool.cxx
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonTool.cxx
@@ -111,6 +111,7 @@ namespace {// anonymous namespace for functions at file scope
}// namespace end
// Constructor with parameters:
+//cppcheck-suppress uninitMemberVar
SCTHitEffMonTool::SCTHitEffMonTool(const string& type, const string& name, const IInterface* parent) :
ManagedMonitorToolBase(type, name, parent) {
m_Eff_summaryHisto.fill(0);
@@ -894,7 +895,7 @@ SCTHitEffMonTool::procHistograms() {
}
StatusCode
-SCTHitEffMonTool::failCut(bool value, string name) const {
+SCTHitEffMonTool::failCut(bool value, const string & name) const {
if (value) {
ATH_MSG_VERBOSE("Passed " << name);
return StatusCode::FAILURE;
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonTool.h b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonTool.h
index 7fd3a1d1aa4b..fb092d6b1ee8 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonTool.h
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonTool.h
@@ -82,7 +82,7 @@ class SCTHitEffMonTool : public ManagedMonitorToolBase {
typedef std::array<std::array<TH2F*, SCT_Monitoring::N_ENDCAPS>, SCT_Monitoring::N_REGIONS> TH2FArrayLayer;
/** Method to cut on track or hit variables and automatize DEBUG statements */
- StatusCode failCut(bool value, std::string name) const;
+ StatusCode failCut(bool value, const std::string & name) const;
/** Method to compute incident angle of track to wafer */
StatusCode findAnglesToWaferSurface(const Amg::Vector3D& mom, const Identifier id,
--
GitLab
From 9dec31b3dea7f4e7debc8bec933352b1407728b1 Mon Sep 17 00:00:00 2001
From: Shaun Roe <shaun.roe@cern.ch>
Date: Mon, 23 Aug 2021 16:12:28 +0200
Subject: [PATCH 234/272] fix cppcheck warnings, convert to using cmath
functions
---
.../EnhancedVertexMonitoring.C | 10 +++---
.../src/InDetGlobalBCMTool.cxx | 22 +++----------
.../src/InDetGlobalNoiseOccupancyMonTool.cxx | 2 +-
.../src/InDetGlobalPixelTool.cxx | 2 --
.../src/InDetGlobalPrimaryVertexMonTool.cxx | 33 ++++++++++---------
.../src/InDetGlobalTopBottomMonTool.cxx | 2 --
.../src/InDetGlobalTrackMonTool.cxx | 16 ++++-----
7 files changed, 32 insertions(+), 55 deletions(-)
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/macros/EnhancedPrimaryVertexMonitoring/EnhancedVertexMonitoring.C b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/macros/EnhancedPrimaryVertexMonitoring/EnhancedVertexMonitoring.C
index 5c8ac57619f1..a55f9872554a 100755
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/macros/EnhancedPrimaryVertexMonitoring/EnhancedVertexMonitoring.C
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/macros/EnhancedPrimaryVertexMonitoring/EnhancedVertexMonitoring.C
@@ -111,12 +111,10 @@ TFile* f(0);
while (!inputFileStream.eof()) {
string currentRootInFile;
inputFileStream >> currentRootInFile;
- if (currentRootInFile[0] == '#')
- continue; //skip this line
- if (!currentRootInFile.empty()) {
- std::cout << currentRootInFile << std::endl;
- inputRootFilesTxt.push_back(currentRootInFile);
- }
+ if (currentRootInFile.empty()) continue;
+ if (currentRootInFile[0] == '#') continue; //skip this line
+ std::cout << currentRootInFile << std::endl;
+ inputRootFilesTxt.push_back(currentRootInFile);
}
}
catch ( char* errstr) {
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalBCMTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalBCMTool.cxx
index a8310764e7af..7fc19ad91e6b 100755
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalBCMTool.cxx
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalBCMTool.cxx
@@ -21,7 +21,6 @@
#include "GaudiKernel/StatusCode.h"
#include "StoreGate/ReadHandle.h"
//Root
-#include "TMath.h"
#include "TH1F.h"
#include "TH2F.h"
@@ -35,7 +34,6 @@
//EventInfo
#include "EventInfo/EventID.h"
-using namespace TMath;
//Standard c++
#include <string>
#include <list>
@@ -682,23 +680,20 @@ StatusCode InDetGlobalBCMTool::fillHistograms(){
int BC_counter = -1;
int channel_counter = -1;
- for (; BCM_RDO_itr != BCM_RDO_itr_end; BCM_RDO_itr++) { // loops over 16 channels (HR counter 0 to 15)
+ for (; BCM_RDO_itr != BCM_RDO_itr_end; ++BCM_RDO_itr) { // loops over 16 channels (HR counter 0 to 15)
channel_counter++;
- //ATH_MSG_WARNING ( "channel_counter: " << channel_counter);
if ( !(*BCM_RDO_itr)->empty()) {
BCM_RDO_Collection::const_iterator RDO_element = (*BCM_RDO_itr)->begin();
BCM_RDO_Collection::const_iterator RDO_element_last = (*BCM_RDO_itr)->end();
BC_counter = -1;
- for (; RDO_element != RDO_element_last; RDO_element++){ // loops over 31 BCs read out per L1A
- BC_counter++;
- //ATH_MSG_WARNING ( "BC_counter: " << BC_counter);
+ for (; RDO_element != RDO_element_last; ++RDO_element){ // loops over 31 BCs read out per L1A
+ ++BC_counter;
if (*RDO_element == nullptr)
{
ATH_MSG_WARNING ("NULL pointer!");
continue;
}
- //else ATH_MSG_WARNING ("RDO_element :" << *RDO_element );
int bcm_lvl1a = (*RDO_element)->getLVL1A();
int bcm_channel = (*RDO_element)->getChannel();
@@ -1041,7 +1036,7 @@ StatusCode InDetGlobalBCMTool::fillHistograms(){
unsigned int detector_a=(positions_A[gain].front()).detector;
- for (std::list<deltat_data>::iterator it_c =positions_C[gain].begin();it_c!=positions_C[gain].end();it_c++){
+ for (std::list<deltat_data>::iterator it_c =positions_C[gain].begin();it_c!=positions_C[gain].end();++it_c){
if(bcid<(*it_c).bcid) continue;
if (bcid==(*it_c).bcid) { // i.e. (positions_A[gain].front()).bcid == (positions_C[gain].begin()).bcid
int deltatbins=(*it_c).position-(positions_A[gain].front()).position;
@@ -1081,13 +1076,6 @@ StatusCode InDetGlobalBCMTool::fillHistograms(){
*Filling Abort Fraction arrays
**********************************/
- /*for(int i=0; i < 31; i++){
-
- ATH_MSG_WARNING("nROD0HitLG["<<i<<"]: " <<nROD0HitLG[i] );
- ATH_MSG_WARNING("nROD1HitLG["<<i<<"]: " <<nROD1HitLG[i] );
- ATH_MSG_WARNING("nROD0HitHG["<<i<<"]: " <<nROD0HitHG[i] );
- ATH_MSG_WARNING("nROD1HitHG["<<i<<"]: " <<nROD1HitHG[i] );
- } */
for(unsigned int bc_counter = 0; bc_counter < bc_readout; bc_counter++){
double nROD0abortfraction = 100*((nROD0HitLG[bc_counter]*11)+nROD0HitHG[bc_counter])/36.0;
@@ -1102,13 +1090,11 @@ StatusCode InDetGlobalBCMTool::fillHistograms(){
}
}
if (nROD0abortfraction != 0) {
- //ATH_MSG_WARNING("nROD0abortfraction: " << nROD0abortfraction);
m_AbortFractionROD0->Fill(nROD0abortfraction);
m_AbortFractionROD0VsECR->Fill(ecr,nROD0abortfraction);
m_AbortFractionROD0VsBCID->Fill(nROD0BCID[bc_counter],nROD0abortfraction);
}
if (nROD1abortfraction != 0) {
- //ATH_MSG_WARNING("nROD1abortfraction: " << nROD1abortfraction);
m_AbortFractionROD1->Fill(nROD1abortfraction);
m_AbortFractionROD1VsECR->Fill(ecr,nROD1abortfraction);
m_AbortFractionROD1VsBCID->Fill(nROD1BCID[bc_counter],nROD1abortfraction);
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalNoiseOccupancyMonTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalNoiseOccupancyMonTool.cxx
index 1312bc816ca3..7e818fb5059d 100755
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalNoiseOccupancyMonTool.cxx
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalNoiseOccupancyMonTool.cxx
@@ -429,7 +429,7 @@ StatusCode InDetGlobalNoiseOccupancyMonTool::fillHistograms( )
it=trackStates->begin();
DataVector<const Trk::TrackStateOnSurface>::const_iterator
it_end=trackStates->end();
- for ( ; it != it_end ; it++) {
+ for ( ; it != it_end ; ++it) {
const Trk::TrackStateOnSurface* trackState=(*it);
if (trackState == nullptr) {
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalPixelTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalPixelTool.cxx
index 926ec361f905..61fbfd86ce7f 100755
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalPixelTool.cxx
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalPixelTool.cxx
@@ -19,7 +19,6 @@
#include "GaudiKernel/IInterface.h"
#include "GaudiKernel/StatusCode.h"
//Root
-#include "TMath.h"
#include "TH1F.h"
#include "TH2F.h"
//Standard c++
@@ -37,7 +36,6 @@
#include "EventPrimitives/EventPrimitivesHelpers.h"
-using namespace TMath;
InDetGlobalPixelTool::InDetGlobalPixelTool(
const std::string & type,
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalPrimaryVertexMonTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalPrimaryVertexMonTool.cxx
index c76a2aebf35a..9b626856b329 100755
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalPrimaryVertexMonTool.cxx
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalPrimaryVertexMonTool.cxx
@@ -2,12 +2,11 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include <vector>
+
#include "LWHists/TH1F_LW.h"
#include "LWHists/TH2F_LW.h"
#include "LWHists/TProfile_LW.h"
#include "TGraph.h"
-#include "TMath.h"
#include "AthenaBaseComps/AthMessaging.h"
#include "StoreGate/ReadHandle.h"
@@ -18,6 +17,8 @@
#include "EventPrimitives/EventPrimitivesHelpers.h"
#include "InDetGlobalPrimaryVertexMonTool.h"
+#include <vector>
+#include <cmath>
InDetGlobalPrimaryVertexMonTool::InDetGlobalPrimaryVertexMonTool( const std::string & type, const std::string & name, const IInterface* parent )
:ManagedMonitorToolBase( type, name, parent ),
@@ -298,7 +299,7 @@ StatusCode InDetGlobalPrimaryVertexMonTool::fillHistograms() {
m_hVrt_Yerr_vs_ntrk->Fill(vxTrackAtVertex.size(), Amg::error( (*vxIter)->covariancePosition(), Trk::y) );
m_hVrt_Zerr_vs_ntrk->Fill(vxTrackAtVertex.size(), Amg::error( (*vxIter)->covariancePosition(), Trk::z) );
- float sqrt_sumpt2(TMath::Sqrt(sumpt2));
+ float sqrt_sumpt2(std::sqrt(sumpt2));
m_hVrt_Xerr_vs_pt2->Fill(sqrt_sumpt2, Amg::error( (*vxIter)->covariancePosition(), Trk::x) );
m_hVrt_Yerr_vs_pt2->Fill(sqrt_sumpt2, Amg::error( (*vxIter)->covariancePosition(), Trk::y) );
m_hVrt_Zerr_vs_pt2->Fill(sqrt_sumpt2, Amg::error( (*vxIter)->covariancePosition(), Trk::z) );
@@ -351,12 +352,12 @@ StatusCode InDetGlobalPrimaryVertexMonTool::fillHistograms() {
float y_distance = splitVxCandiate1->position().y()-splitVxCandiate2->position().y();
float z_distance = splitVxCandiate1->position().z()-splitVxCandiate2->position().z();
- float x_error = TMath::Sqrt(TMath::Power( Amg::error( splitVxCandiate1->covariancePosition(), Trk::x ),2) +
- TMath::Power( Amg::error( splitVxCandiate2->covariancePosition(), Trk::x ),2) );
- float y_error = TMath::Sqrt(TMath::Power( Amg::error( splitVxCandiate1->covariancePosition(), Trk::y ),2) +
- TMath::Power( Amg::error( splitVxCandiate2->covariancePosition(), Trk::y ),2) );
- float z_error = TMath::Sqrt(TMath::Power( Amg::error( splitVxCandiate1->covariancePosition(), Trk::z ),2) +
- TMath::Power( Amg::error( splitVxCandiate2->covariancePosition(), Trk::z ),2) );
+ float x_error = std::sqrt(std::pow( Amg::error( splitVxCandiate1->covariancePosition(), Trk::x ),2) +
+ std::pow( Amg::error( splitVxCandiate2->covariancePosition(), Trk::x ),2) );
+ float y_error = std::sqrt(std::pow( Amg::error( splitVxCandiate1->covariancePosition(), Trk::y ),2) +
+ std::pow( Amg::error( splitVxCandiate2->covariancePosition(), Trk::y ),2) );
+ float z_error = std::sqrt(std::pow( Amg::error( splitVxCandiate1->covariancePosition(), Trk::z ),2) +
+ std::pow( Amg::error( splitVxCandiate2->covariancePosition(), Trk::z ),2) );
float x_split_pull = x_distance/x_error;
float y_split_pull = y_distance/y_error;
@@ -387,10 +388,10 @@ StatusCode InDetGlobalPrimaryVertexMonTool::fillHistograms() {
{
// std::cout << measuredPerigee->pT() << std::endl;
float pT = measuredPerigee->pT()/1000.;
- sum_pt2_1 += TMath::Power(pT,2);
+ sum_pt2_1 += std::pow(pT,2);
}
}
- float sqrt_sum_pt2_1(TMath::Sqrt(sum_pt2_1));
+ float sqrt_sum_pt2_1(std::sqrt(sum_pt2_1));
for (std::vector<Trk::VxTrackAtVertex>::const_iterator trkIter = splitVxTrackAtVertexVector2.begin();
trkIter != splitVxTrackAtVertexVector2.end() ; ++trkIter)
@@ -401,10 +402,10 @@ StatusCode InDetGlobalPrimaryVertexMonTool::fillHistograms() {
if (measuredPerigee!=nullptr)
{
float pT = measuredPerigee->pT()/1000.;
- sum_pt2_2 += TMath::Power(pT,2);
+ sum_pt2_2 += std::pow(pT,2);
}
}
- float sqrt_sum_pt2_2(TMath::Sqrt(sum_pt2_2));
+ float sqrt_sum_pt2_2(std::sqrt(sum_pt2_2));
float sqrt_sum_pt2_average((sqrt_sum_pt2_1+sqrt_sum_pt2_2)/2.);
m_hVrt_XpullVsPt2Average_split->Fill(sqrt_sum_pt2_average, x_split_pull);
@@ -493,15 +494,15 @@ double InDetGlobalPrimaryVertexMonTool::GetSplitMatchDistance(const xAOD::Vertex
case 2:
{
// 3-D distance divided by the error (dominated by Delta z)
- double d = TMath::Sqrt(dx*dx+dy*dy+dz*dz);
- double dErr = TMath::Sqrt(TMath::Power(dx*dxError/d,2)+TMath::Power(dy*dyError/d,2)+TMath::Power(dz*dzError/d,2));
+ double d = std::sqrt(dx*dx+dy*dy+dz*dz);
+ double dErr = std::sqrt(std::pow(dx*dxError/d,2)+std::pow(dy*dyError/d,2)+std::pow(dz*dzError/d,2));
return d/dErr;
break;
}
case 3:
{
// quadratic sum of significance distances in the 3 directions. Expected RMS = 1
- return TMath::Sqrt(TMath::Power(dx/dxError,2)+TMath::Power(dy/dyError,2)+TMath::Power(dz/dzError,2));
+ return std::sqrt(std::pow(dx/dxError,2)+std::pow(dy/dyError,2)+std::pow(dz/dzError,2));
break;
}
default:
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTopBottomMonTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTopBottomMonTool.cxx
index dad568c0d523..c4fc1988edf5 100755
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTopBottomMonTool.cxx
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTopBottomMonTool.cxx
@@ -25,12 +25,10 @@
#include <string>
//Root
#include "TH1F.h"
-#include "TMath.h"
#include <cmath>
#include "EventPrimitives/EventPrimitivesHelpers.h"
-using namespace TMath;
InDetGlobalTopBottomMonTool::InDetGlobalTopBottomMonTool(
const std::string & type,
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTrackMonTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTrackMonTool.cxx
index 02f81ed4fd29..1481d8e5555b 100644
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTrackMonTool.cxx
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalTrackMonTool.cxx
@@ -45,15 +45,11 @@
#include "EventPrimitives/EventPrimitivesHelpers.h"
-//Root
-#include "TMath.h"
//Standard c++
-#include <algorithm>
#include <vector>
#include <string>
#include <cmath>
-#include <functional>
InDetGlobalTrackMonTool::InDetGlobalTrackMonTool( const std::string & type,
@@ -932,7 +928,7 @@ void InDetGlobalTrackMonTool::FillTIDE()
if ( !(*jetItr)->getAssociatedObjects<xAOD::IParticle>(xAOD::JetAttribute::GhostTrack, trackVector) )
continue;
- for ( std::vector<const xAOD::IParticle*>::const_iterator trkItr = trackVector.begin(); trkItr != trackVector.end() ; trkItr++ )
+ for ( std::vector<const xAOD::IParticle*>::const_iterator trkItr = trackVector.begin(); trkItr != trackVector.end() ; ++trkItr )
{
const xAOD::TrackParticle* trackPart = dynamic_cast<const xAOD::TrackParticle*>(*trkItr);
@@ -969,9 +965,9 @@ void InDetGlobalTrackMonTool::FillTIDE()
foundVertex ));
if ( myIPandSigma )
{
- m_trk_jetassoc_d0_reso_dr->Fill( trackPart->p4().DeltaR( (*jetItr)->p4() ), fabs( myIPandSigma->IPd0 / sqrt( myIPandSigma->sigmad0*myIPandSigma->sigmad0 + myIPandSigma->PVsigmad0*myIPandSigma->PVsigmad0 ) ) );
- m_trk_jetassoc_z0_reso_dr->Fill( trackPart->p4().DeltaR( (*jetItr)->p4() ), fabs( myIPandSigma->IPz0 / sqrt( myIPandSigma->sigmaz0*myIPandSigma->sigmaz0 + myIPandSigma->PVsigmaz0*myIPandSigma->PVsigmaz0 ) ) );
- m_trk_jetassoc_ip_reso_lb->Fill( AthenaMonManager::lumiBlockNumber(), fabs( myIPandSigma->IPd0 / sqrt( myIPandSigma->sigmad0*myIPandSigma->sigmad0 + myIPandSigma->PVsigmad0*myIPandSigma->PVsigmad0 ) ) );
+ m_trk_jetassoc_d0_reso_dr->Fill( trackPart->p4().DeltaR( (*jetItr)->p4() ), std::abs( myIPandSigma->IPd0 / std::sqrt( myIPandSigma->sigmad0*myIPandSigma->sigmad0 + myIPandSigma->PVsigmad0*myIPandSigma->PVsigmad0 ) ) );
+ m_trk_jetassoc_z0_reso_dr->Fill( trackPart->p4().DeltaR( (*jetItr)->p4() ), std::abs( myIPandSigma->IPz0 / std::sqrt( myIPandSigma->sigmaz0*myIPandSigma->sigmaz0 + myIPandSigma->PVsigmaz0*myIPandSigma->PVsigmaz0 ) ) );
+ m_trk_jetassoc_ip_reso_lb->Fill( AthenaMonManager::lumiBlockNumber(), std::abs( myIPandSigma->IPd0 / std::sqrt( myIPandSigma->sigmad0*myIPandSigma->sigmad0 + myIPandSigma->PVsigmad0*myIPandSigma->PVsigmad0 ) ) );
}
}
if ( trackPart->summaryValue( split, xAOD::numberOfPixelSplitHits) )
@@ -1223,7 +1219,7 @@ void InDetGlobalTrackMonTool::FillHoleMaps( const Trk::Track *track )
} else {
for (DataVector<const Trk::TrackStateOnSurface>::const_iterator it=holesOnTrack->begin();
it!=holesOnTrack->end();
- it++) {
+ ++it) {
if (!(*it)) {
msg(MSG::WARNING) << "TrackStateOnSurface from hole search tool == Null" << endmsg;
continue;
@@ -1233,7 +1229,7 @@ void InDetGlobalTrackMonTool::FillHoleMaps( const Trk::Track *track )
if (clus){
m_HolesMAP_XY->Fill(clus->position()[0],clus->position()[1]);
m_HolesMAP_ZX->Fill( clus->position()[2], clus->position()[0]);
- m_HolesMAP_ZR->Fill(clus->position()[2], sqrt( pow( clus->position()[0], 2) + pow( clus->position()[1], 2) ));
+ m_HolesMAP_ZR->Fill(clus->position()[2], std::sqrt( std::pow( clus->position()[0], 2) + std::pow( clus->position()[1], 2) ));
}
}
--
GitLab
From 8ff1c893ce1544e9eed8683ddf12169dc178f2ff Mon Sep 17 00:00:00 2001
From: Shaun Roe <shaun.roe@cern.ch>
Date: Mon, 23 Aug 2021 16:31:03 +0200
Subject: [PATCH 235/272] fix cppcheck warnings, tidy includes
---
.../src/PixelRawContByteStreamTool.cxx | 3 +++
.../src/PixelRawContByteStreamTool.h | 18 ++++++++++++------
.../src/PixelRodDecoder.h | 10 +++++-----
3 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawContByteStreamTool.cxx b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawContByteStreamTool.cxx
index 5d7d8f95404f..b6300584816d 100644
--- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawContByteStreamTool.cxx
+++ b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawContByteStreamTool.cxx
@@ -13,6 +13,9 @@
///////////////////////////////////////////////////////////////////
#include "PixelRawContByteStreamTool.h"
+#include "InDetIdentifier/PixelID.h"
+#include "PixelReadoutGeometry/PixelDetectorManager.h"
+
//#define PIXEL_DEBUG ;
//#define PLOTS ;
diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawContByteStreamTool.h b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawContByteStreamTool.h
index 522a0801de53..eca8e7ec7964 100644
--- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawContByteStreamTool.h
+++ b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawContByteStreamTool.h
@@ -17,8 +17,7 @@
// #define _DEBUG
-#include <stdint.h>
-#include <string>
+
#include "AthenaBaseComps/AthAlgTool.h"
@@ -26,19 +25,26 @@
#include "ByteStreamData/RawEvent.h"
#include "InDetRawData/InDetRawDataCLASS_DEF.h"
-#include "PixelReadoutGeometry/PixelDetectorManager.h"
#include "ByteStreamCnvSvcBase/FullEventAssembler.h" // needed, template class
#include "ByteStreamCnvSvc/ByteStreamCnvSvc.h"
#include "PixelByteStreamModuleMask.h"
-#include "InDetIdentifier/PixelID.h"
+
#include "ByteStreamCnvSvcBase/SrcIdMap.h"
#include "PixelConditionsData/PixelCablingCondData.h"
#include "PixelConditionsData/PixelHitDiscCnfgData.h"
#include "PixelReadoutGeometry/IPixelReadoutManager.h"
#include "StoreGate/ReadCondHandleKey.h"
+#include <cstdint>
+#include <string>
+
+class PixelID;
+
+namespace InDetDD{
+ class PixelDetectorManager;
+}
class PixelRawContByteStreamTool: public AthAlgTool {
@@ -74,9 +80,9 @@ class PixelRawContByteStreamTool: public AthAlgTool {
ServiceHandle<InDetDD::IPixelReadoutManager> m_pixelReadout
{ this, "PixelReadoutManager", "PixelReadoutManager", "Pixel readout manager" };
- const PixelID* m_PixelID;
+ const PixelID* m_PixelID{};
- const InDetDD::PixelDetectorManager* m_pixelManager;
+ const InDetDD::PixelDetectorManager* m_pixelManager{};
unsigned short m_RodBlockVersion;
int m_BCs_per_LVL1ID;
diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRodDecoder.h b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRodDecoder.h
index d82f1b810d87..a0e66419c67c 100644
--- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRodDecoder.h
+++ b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRodDecoder.h
@@ -5,7 +5,7 @@
#ifndef PIXELRAWDATABYTESTREAM_PIXEL_RODDECODER_H
#define PIXELRAWDATABYTESTREAM_PIXEL_RODDECODER_H
-#include <atomic>
+
#include "PixelRawDataByteStreamCnv/IPixelRodDecoder.h"
#include "AthenaBaseComps/AthAlgTool.h"
@@ -16,7 +16,7 @@
#include "PixelConditionsData/PixelHitDiscCnfgData.h"
#include "PixelReadoutGeometry/IPixelReadoutManager.h"
#include "StoreGate/ReadCondHandleKey.h"
-
+#include <atomic>
class PixelID;
class PixelRodDecoder : virtual public IPixelRodDecoder, public AthAlgTool {
@@ -146,9 +146,9 @@ class PixelRodDecoder : virtual public IPixelRodDecoder, public AthAlgTool {
bool checkDataWordsCorruption( uint32_t word ) const;
//!< flags concerning the detector configuration; set at config time
- bool m_is_ibl_present;
- bool m_is_ibl_module;
- bool m_is_dbm_module;
+ bool m_is_ibl_present{};
+ bool m_is_ibl_module{};
+ bool m_is_dbm_module{};
//!< if the flag is set to true appropriate bits are set in event info
StatusCode updateEventInfoIfEventCorrupted( bool isCorrupted ) const;
--
GitLab
From c0c0da3a0437a84859b7847891835c2eafbff119 Mon Sep 17 00:00:00 2001
From: Peter Onyisi <ponyisi@utexas.edu>
Date: Mon, 23 Aug 2021 14:36:48 +0000
Subject: [PATCH 236/272] Handle flag arguments that do not parse as valid
Python expressions
---
Control/AthenaConfiguration/python/AthConfigFlags.py | 2 +-
Control/AthenaConfiguration/python/TestAthConfigFlags.py | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Control/AthenaConfiguration/python/AthConfigFlags.py b/Control/AthenaConfiguration/python/AthConfigFlags.py
index c2c43763587a..2272a1d8e51d 100644
--- a/Control/AthenaConfiguration/python/AthConfigFlags.py
+++ b/Control/AthenaConfiguration/python/AthConfigFlags.py
@@ -464,7 +464,7 @@ class AthConfigFlags(object):
try:
exec("type({})".format( value ) )
- except NameError: #Can't determine type, assume we got an un-quoted string
+ except (NameError, SyntaxError): #Can't determine type, assume we got an un-quoted string
value="\"{}\"".format( value )
#Arg looks good enough, just exec it:
diff --git a/Control/AthenaConfiguration/python/TestAthConfigFlags.py b/Control/AthenaConfiguration/python/TestAthConfigFlags.py
index fe8371e8929a..cd6500bef973 100644
--- a/Control/AthenaConfiguration/python/TestAthConfigFlags.py
+++ b/Control/AthenaConfiguration/python/TestAthConfigFlags.py
@@ -142,9 +142,10 @@ class flagsFromArgsTest(unittest.TestCase):
self.flags.addFlag("Exec.DebugStage","")
self.flags.addFlag('Input.Files',[])
self.flags.addFlag('detA.flagB',0)
+ self.flags.addFlag("detA.flagC","")
def runTest(self):
- argline="-l VERBOSE --debug exec --evtMax=10 --skipEvents=3 --filesInput=bla1.data,bla2.data detA.flagB=7"
+ argline="-l VERBOSE --debug exec --evtMax=10 --skipEvents=3 --filesInput=bla1.data,bla2.data detA.flagB=7 detA.flagC=a.2"
print ("Interpreting arguments:")
print (argline)
self.flags.fillFromArgs(argline.split())
@@ -154,6 +155,7 @@ class flagsFromArgsTest(unittest.TestCase):
self.assertEqual(self.flags.Exec.DebugStage,"exec","Failed to set DebugStage from args")
self.assertEqual(self.flags.Input.Files,["bla1.data","bla2.data"],"Failed to set FileInput from args")
self.assertEqual(self.flags.detA.flagB,7,"Failed to set arbitrary from args")
+ self.assertEqual(self.flags.detA.flagC,"a.2","Failed to set arbitrary unquoted string from args")
class TestHash(TestFlagsSetupDynamic):
def runTest(self):
--
GitLab
From 5c59c0175d6004b5fb7fe62dcdd7a8fe932f0cbe Mon Sep 17 00:00:00 2001
From: James Richard Catmore <james.catmore@cern.ch>
Date: Mon, 23 Aug 2021 16:39:15 +0200
Subject: [PATCH 237/272] Modifications to ensure RandomRunNumber does not get
written in DAOD_PHYS when run in a train with PHYSLITE
It is necessary to be able to run DAOD_PHYS and PHYSLITE together in a train. The latter runs pile-up re-weighting and thus produces a transient RandomRunNumber. Due to the smart slimming option in PHYS being set to AllVariables, this led to the RandomRunNumber being written also in PHYS, which is fatal for running onward production from PHYS where pile-up re-weighting is needed.
The changes are:
- switch PHYS to use the smart slimming for EventInfo (plus some extra variables)
- remove RandomRunNumber from the EventInfo smart slimming, which was there erroneously
- Add RandomRunNumber to PHYSLITE, where it is needed for analysis-level pile-up reweighting
---
.../DerivationFrameworkCore/python/EventInfoContent.py | 2 +-
.../DerivationFrameworkPhys/share/PHYS.py | 7 ++++---
.../DerivationFrameworkPhys/share/PHYSLITE.py | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/EventInfoContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/EventInfoContent.py
index 68351b7ae78c..b69a68782d0f 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/EventInfoContent.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/EventInfoContent.py
@@ -2,4 +2,4 @@
EventInfoContent = [
"EventInfo",
-"EventInfoAux.beamPosZ.sctFlags.trtFlags.coreFlags.lumiFlags.muonFlags.beamPosX.beamPosY.beamStatus.beamTiltXZ.beamTiltYZ.pixelFlags.larFlags.runNumber.beamPosSigmaXY.beamPosSigmaX.beamPosSigmaY.beamPosSigmaZ.forwardDetFlags.eventTypeBitmask.DFCommonJets_isBadBatman.DFCommonJets_eventClean_LooseBad.mcChannelNumber.DFCommonJets_eventClean_LooseBadLLP.tileFlags.lumiBlock.timeStamp.actualInteractionsPerCrossing.averageInteractionsPerCrossing.eventNumber.detDescrTags.RandomRunNumber.bcid.mcEventNumber.hardScatterVertexLink.beamSpotWeight.pileUpMixtureIDLowBits.pileUpMixtureIDHighBits.mcEventWeights"]
+"EventInfoAux.beamPosZ.sctFlags.trtFlags.coreFlags.lumiFlags.muonFlags.beamPosX.beamPosY.beamStatus.beamTiltXZ.beamTiltYZ.pixelFlags.larFlags.runNumber.beamPosSigmaXY.beamPosSigmaX.beamPosSigmaY.beamPosSigmaZ.forwardDetFlags.eventTypeBitmask.DFCommonJets_isBadBatman.DFCommonJets_eventClean_LooseBad.mcChannelNumber.DFCommonJets_eventClean_LooseBadLLP.tileFlags.lumiBlock.timeStamp.actualInteractionsPerCrossing.averageInteractionsPerCrossing.eventNumber.detDescrTags.bcid.mcEventNumber.hardScatterVertexLink.beamSpotWeight.pileUpMixtureIDLowBits.pileUpMixtureIDHighBits.mcEventWeights"]
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py
index 749f7153a853..b1e611a6cdd3 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py
@@ -132,7 +132,8 @@ SeqPHYS += CfgMgr.DerivationFramework__DerivationKernel("PHYSKernel",
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
PHYSSlimmingHelper = SlimmingHelper("PHYSSlimmingHelper")
-PHYSSlimmingHelper.SmartCollections = ["Electrons",
+PHYSSlimmingHelper.SmartCollections = ["EventInfo",
+ "Electrons",
"Photons",
"Muons",
"PrimaryVertices",
@@ -205,7 +206,6 @@ if DerivationFrameworkIsMonteCarlo:
addTruth3ContentToSlimmerTool(PHYSSlimmingHelper)
PHYSSlimmingHelper.AllVariables += ['TruthHFWithDecayParticles','TruthHFWithDecayVertices','TruthCharm']
-PHYSSlimmingHelper.AllVariables += ['EventInfo']
PHYSSlimmingHelper.ExtraVariables += ["AntiKt10TruthTrimmedPtFrac5SmallR20Jets.Tau1_wta.Tau2_wta.Tau3_wta.D2.GhostBHadronsFinalCount",
"Electrons.TruthLink",
"Muons.TruthLink",
@@ -216,7 +216,8 @@ PHYSSlimmingHelper.ExtraVariables += ["AntiKt10TruthTrimmedPtFrac5SmallR20Jets.T
"AntiKtVR30Rmax4Rmin02TrackJets_BTagging201903.GhostBHadronsFinal.GhostCHadronsFinal.GhostBHadronsFinalCount.GhostBHadronsFinalPt.GhostCHadronsFinalCount.GhostCHadronsFinalPt.GhostTausFinal.GhostTausFinalCount",
"AntiKtVR30Rmax4Rmin02TrackJets_BTagging201810.GhostBHadronsFinal.GhostCHadronsFinal.GhostBHadronsFinalCount.GhostBHadronsFinalPt.GhostCHadronsFinalCount.GhostCHadronsFinalPt.GhostTausFinal.GhostTausFinalCount",
"TruthPrimaryVertices.t.x.y.z",
- "InDetTrackParticles.TTVA_AMVFVertices.TTVA_AMVFWeights"]
+ "InDetTrackParticles.TTVA_AMVFVertices.TTVA_AMVFWeights",
+ "EventInfo.hardScatterVertexLink.timeStampNSOffset"]
# Add trigger matching
PhysCommonTrigger.trigmatching_helper_notau.add_to_slimming(PHYSSlimmingHelper)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYSLITE.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYSLITE.py
index e5685ab3dc32..80cd084b7e1b 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYSLITE.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYSLITE.py
@@ -346,7 +346,7 @@ PHYSLITESlimmingHelper.ExtraVariables = [
"MET_Core_AnalysisMET.name.mpx.mpy.sumet.source",
"METAssoc_AnalysisMET.",
"InDetTrackParticles.TTVA_AMVFVertices.TTVA_AMVFWeights",
- "EventInfo.hardScatterVertexLink"
+ "EventInfo.hardScatterVertexLink.RandomRunNumber"
]
if DerivationFrameworkIsMonteCarlo:
--
GitLab
From 71a3aa1cc13b4f206b4dd0eb3701881b6e7b635a Mon Sep 17 00:00:00 2001
From: Peter Onyisi <ponyisi@utexas.edu>
Date: Mon, 23 Aug 2021 14:55:54 +0000
Subject: [PATCH 238/272] Improve DQ handling of R21 AOD files (and ART
updates)
---
.../python/AthenaMonitoringAODRecoCfg.py | 7 ++++++-
Control/AthenaMonitoring/test/test_run3dq_r21_aod.sh | 2 +-
Control/AthenaMonitoring/test/test_run3dq_r21_esd.sh | 10 ++++++++--
.../AthenaMonitoring/test/test_run3dq_r21_esd_mc.sh | 2 +-
...3dq_r21_esd_mt.sh => test_run3dq_r21_esd_serial.sh} | 10 ++--------
Control/AthenaMonitoring/test/test_run3dq_r22_aod.sh | 2 +-
.../test/test_run3dq_r22_aod_trigger.sh | 6 +++++-
...ger_mt.sh => test_run3dq_r22_aod_trigger_serial.sh} | 6 +-----
Control/AthenaMonitoring/test/test_run3dq_r22_esd.sh | 2 +-
.../test/test_run3dq_r22_esd_cosmics.sh | 2 +-
10 files changed, 27 insertions(+), 22 deletions(-)
rename Control/AthenaMonitoring/test/{test_run3dq_r21_esd_mt.sh => test_run3dq_r21_esd_serial.sh} (67%)
rename Control/AthenaMonitoring/test/{test_run3dq_r22_aod_trigger_mt.sh => test_run3dq_r22_aod_trigger_serial.sh} (71%)
diff --git a/Control/AthenaMonitoring/python/AthenaMonitoringAODRecoCfg.py b/Control/AthenaMonitoring/python/AthenaMonitoringAODRecoCfg.py
index cc96c0c72fc0..d5727101cdf1 100644
--- a/Control/AthenaMonitoring/python/AthenaMonitoringAODRecoCfg.py
+++ b/Control/AthenaMonitoring/python/AthenaMonitoringAODRecoCfg.py
@@ -12,8 +12,13 @@ def AthenaMonitoringAODRecoCfg(flags):
info('Running on AOD: Scheduling rebuild of standard jet collections if necessary')
from JetRecConfig.StandardSmallRJets import AntiKt4EMTopo, AntiKt4EMPFlow, AntiKt4LCTopo
from JetRecConfig.StandardLargeRJets import AntiKt10LCTopo
- jets_to_schedule = [_ for _ in (AntiKt4EMTopo, AntiKt4EMPFlow, AntiKt4LCTopo, AntiKt10LCTopo)
+ # first, check small R jets
+ jets_to_schedule = [_ for _ in (AntiKt4EMTopo, AntiKt4EMPFlow, AntiKt4LCTopo)
if _.fullname() not in flags.Input.Collections]
+ # if we reschedule small R jets, check if we need to reschedule large R as well
+ if jets_to_schedule:
+ jets_to_schedule += [_ for _ in (AntiKt10LCTopo,)
+ if _.fullname() not in flags.Input.Collections]
if jets_to_schedule:
info(f'Ensuring presence of jet collections for monitoring: {jets_to_schedule}')
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r21_aod.sh b/Control/AthenaMonitoring/test/test_run3dq_r21_aod.sh
index 1f96575f43fa..a1e4b10b3bc9 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_r21_aod.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_r21_aod.sh
@@ -6,7 +6,7 @@
# art-output: ExampleMonitorOutput.root
# art-output: log*
-Run3DQTestingDriver.py --inputFiles=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/AthenaMonitoring/data18_13TeV.00354309.physics_Main.recon.AOD.f946._lb0130._0001.1 DQ.Steering.doHLTMon=False DQ.Environment=AOD > log.HIST_Creation 2>&1
+Run3DQTestingDriver.py --threads=1 --inputFiles=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/AthenaMonitoring/data18_13TeV.00354309.physics_Main.recon.AOD.f946._lb0130._0001.1 DQ.Steering.doHLTMon=False DQ.Environment=AOD > log.HIST_Creation 2>&1
echo "art-result: $? HIST_Creation"
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r21_esd.sh b/Control/AthenaMonitoring/test/test_run3dq_r21_esd.sh
index 14d2758a5ab5..7fcdfbb26f1d 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_r21_esd.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_r21_esd.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# art-description: ESD->HIST, R21 data ESD
+# art-description: ESD->HIST, R21 data ESD, MT
# art-type: grid
# art-memory: 4096
# art-include: master/Athena
@@ -7,7 +7,7 @@
# art-output: ExampleMonitorOutput.root
# art-output: log*
-Run3DQTestingDriver.py --inputFiles=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/AthenaMonitoring/q431/21.0/f946/myESD.pool.root DQ.Steering.doHLTMon=False IOVDb.GlobalTag=\"CONDBR2-BLKPA-RUN2-06\" > log.HIST_Creation 2>&1
+Run3DQTestingDriver.py --inputFiles=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/AthenaMonitoring/q431/21.0/f946/myESD.pool.root DQ.Steering.doHLTMon=False IOVDb.GlobalTag=\"CONDBR2-BLKPA-RUN2-06\" --threads=1 > log.HIST_Creation 2>&1
echo "art-result: $? HIST_Creation"
@@ -17,3 +17,9 @@ art.py download ${ArtPackage} ${ArtJobName}
REFFILE=(./ref-*/ExampleMonitorOutput.root)
hist_diff.sh ExampleMonitorOutput.root $REFFILE -x TIME_execute -i > log.HIST_Diff 2>&1
echo "art-result: $? HIST_Diff"
+rm -rf ref-*
+
+art.py download AthenaMonitoring test_run3dq_r21_esd.sh
+hist_diff.sh ExampleMonitorOutput.root $REFFILE -x TIME_execute -i > log.HIST_Diff_Serial 2>&1
+echo "art-result: $? HIST_Diff_Serial"
+
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r21_esd_mc.sh b/Control/AthenaMonitoring/test/test_run3dq_r21_esd_mc.sh
index b660834e5be7..db12533f5703 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_r21_esd_mc.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_r21_esd_mc.sh
@@ -7,7 +7,7 @@
# art-output: ExampleMonitorOutput.root
# art-output: log*
-Run3DQTestingDriver.py --inputFiles=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q221/21.0/myESD.pool.root DQ.Steering.doHLTMon=False > log.HIST_Creation 2>&1
+Run3DQTestingDriver.py --threads=1 --inputFiles=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q221/21.0/myESD.pool.root DQ.Steering.doHLTMon=False > log.HIST_Creation 2>&1
echo "art-result: $? HIST_Creation"
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r21_esd_mt.sh b/Control/AthenaMonitoring/test/test_run3dq_r21_esd_serial.sh
similarity index 67%
rename from Control/AthenaMonitoring/test/test_run3dq_r21_esd_mt.sh
rename to Control/AthenaMonitoring/test/test_run3dq_r21_esd_serial.sh
index 7fcdfbb26f1d..14d2758a5ab5 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_r21_esd_mt.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_r21_esd_serial.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# art-description: ESD->HIST, R21 data ESD, MT
+# art-description: ESD->HIST, R21 data ESD
# art-type: grid
# art-memory: 4096
# art-include: master/Athena
@@ -7,7 +7,7 @@
# art-output: ExampleMonitorOutput.root
# art-output: log*
-Run3DQTestingDriver.py --inputFiles=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/AthenaMonitoring/q431/21.0/f946/myESD.pool.root DQ.Steering.doHLTMon=False IOVDb.GlobalTag=\"CONDBR2-BLKPA-RUN2-06\" --threads=1 > log.HIST_Creation 2>&1
+Run3DQTestingDriver.py --inputFiles=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/AthenaMonitoring/q431/21.0/f946/myESD.pool.root DQ.Steering.doHLTMon=False IOVDb.GlobalTag=\"CONDBR2-BLKPA-RUN2-06\" > log.HIST_Creation 2>&1
echo "art-result: $? HIST_Creation"
@@ -17,9 +17,3 @@ art.py download ${ArtPackage} ${ArtJobName}
REFFILE=(./ref-*/ExampleMonitorOutput.root)
hist_diff.sh ExampleMonitorOutput.root $REFFILE -x TIME_execute -i > log.HIST_Diff 2>&1
echo "art-result: $? HIST_Diff"
-rm -rf ref-*
-
-art.py download AthenaMonitoring test_run3dq_r21_esd.sh
-hist_diff.sh ExampleMonitorOutput.root $REFFILE -x TIME_execute -i > log.HIST_Diff_Serial 2>&1
-echo "art-result: $? HIST_Diff_Serial"
-
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r22_aod.sh b/Control/AthenaMonitoring/test/test_run3dq_r22_aod.sh
index c7c1e87c4478..7e283d9eb02d 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_r22_aod.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_r22_aod.sh
@@ -8,7 +8,7 @@
art.py download Tier0ChainTests test_q431.sh
AODFILE=(./ref-*/myAOD.pool.root)
-Run3DQTestingDriver.py --inputFiles=${AODFILE} DQ.Environment=AOD DQ.Steering.doHLTMon=False > log.HIST_Creation 2>&1
+Run3DQTestingDriver.py --inputFiles=${AODFILE} DQ.Environment=AOD DQ.Steering.doHLTMon=False --threads=1 > log.HIST_Creation 2>&1
echo "art-result: $? HIST_Creation"
rm -rf ref-*
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger.sh b/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger.sh
index 9ec8123d5b52..754e8d30b662 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger.sh
@@ -9,7 +9,7 @@
art.py download TrigAnalysisTest test_trigAna_RDOtoAOD_v1Dev_grid.py
AODFILE=(./ref-*/AOD.pool.root)
-Run3DQTestingDriver.py --inputFiles=${AODFILE} DQ.Steering.doHLTMon=True DQ.Environment=AOD --dqOffByDefault > log.HIST_Creation 2>&1
+Run3DQTestingDriver.py --inputFiles=${AODFILE} DQ.Steering.doHLTMon=True DQ.Environment=AOD --threads=1 --dqOffByDefault > log.HIST_Creation 2>&1
echo "art-result: $? HIST_Creation"
rm -rf ref-*
@@ -20,3 +20,7 @@ art.py download ${ArtPackage} ${ArtJobName}
REFFILE=(./ref-*/ExampleMonitorOutput.root)
hist_diff.sh ExampleMonitorOutput.root $REFFILE -i > log.HIST_Diff 2>&1
echo "art-result: $? HIST_Diff"
+
+art.py download AthenaMonitoring test_run3dq_r22_aod_trigger.sh
+hist_diff.sh ExampleMonitorOutput.root $REFFILE -i > log.HIST_Diff_Serial 2>&1
+echo "art-result: $? HIST_Diff_Serial"
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger_mt.sh b/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger_serial.sh
similarity index 71%
rename from Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger_mt.sh
rename to Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger_serial.sh
index 754e8d30b662..9ec8123d5b52 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger_mt.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger_serial.sh
@@ -9,7 +9,7 @@
art.py download TrigAnalysisTest test_trigAna_RDOtoAOD_v1Dev_grid.py
AODFILE=(./ref-*/AOD.pool.root)
-Run3DQTestingDriver.py --inputFiles=${AODFILE} DQ.Steering.doHLTMon=True DQ.Environment=AOD --threads=1 --dqOffByDefault > log.HIST_Creation 2>&1
+Run3DQTestingDriver.py --inputFiles=${AODFILE} DQ.Steering.doHLTMon=True DQ.Environment=AOD --dqOffByDefault > log.HIST_Creation 2>&1
echo "art-result: $? HIST_Creation"
rm -rf ref-*
@@ -20,7 +20,3 @@ art.py download ${ArtPackage} ${ArtJobName}
REFFILE=(./ref-*/ExampleMonitorOutput.root)
hist_diff.sh ExampleMonitorOutput.root $REFFILE -i > log.HIST_Diff 2>&1
echo "art-result: $? HIST_Diff"
-
-art.py download AthenaMonitoring test_run3dq_r22_aod_trigger.sh
-hist_diff.sh ExampleMonitorOutput.root $REFFILE -i > log.HIST_Diff_Serial 2>&1
-echo "art-result: $? HIST_Diff_Serial"
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r22_esd.sh b/Control/AthenaMonitoring/test/test_run3dq_r22_esd.sh
index d1016a151d9c..cff1471d445b 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_r22_esd.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_r22_esd.sh
@@ -9,7 +9,7 @@
art.py download Tier0ChainTests test_q431.sh
ESDFILE=(./ref-*/myESD.pool.root)
-Run3DQTestingDriver.py --inputFiles=${ESDFILE} DQ.Steering.doHLTMon=False > log.HIST_Creation 2>&1
+Run3DQTestingDriver.py --inputFiles=${ESDFILE} DQ.Steering.doHLTMon=False --threads=1 > log.HIST_Creation 2>&1
echo "art-result: $? HIST_Creation"
rm -rf ref-*
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r22_esd_cosmics.sh b/Control/AthenaMonitoring/test/test_run3dq_r22_esd_cosmics.sh
index e258de3cf107..bd5c2f0ae1ae 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_r22_esd_cosmics.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_r22_esd_cosmics.sh
@@ -9,7 +9,7 @@
art.py download Tier0ChainTests test_q220.sh
ESDFILE=(./ref-*/myESD.pool.root)
-Run3DQTestingDriver.py --inputFiles=${ESDFILE} DQ.Steering.doHLTMon=False > log.HIST_Creation 2>&1
+Run3DQTestingDriver.py --inputFiles=${ESDFILE} DQ.Steering.doHLTMon=False --threads=1 > log.HIST_Creation 2>&1
echo "art-result: $? HIST_Creation"
rm -rf ref-*
--
GitLab
From df82b4b08764b8fef4d3342ddabf871e86a0db5b Mon Sep 17 00:00:00 2001
From: Shaun Roe <shaun.roe@cern.ch>
Date: Mon, 23 Aug 2021 16:28:39 +0000
Subject: [PATCH 239/272] 22.0-cppcheck-PixelMonitoring
---
.../src/PixelAthClusterMonAlg.cxx | 568 +++++++++---------
.../src/PixelAthClusterMonAlg.h | 74 ++-
.../src/PixelAthErrorMonAlg.cxx | 378 ++++++------
.../PixelMonitoring/src/PixelAthErrorMonAlg.h | 165 ++---
.../PixelMonitoring/src/PixelAthHitMonAlg.cxx | 250 ++++----
.../PixelMonitoring/src/PixelAthHitMonAlg.h | 61 +-
.../src/PixelAthMonitoringBase.cxx | 274 +++++----
.../src/PixelAthMonitoringBase.h | 122 ++--
8 files changed, 1007 insertions(+), 885 deletions(-)
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx
index 309437423862..a79f601e252a 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx
@@ -1,16 +1,27 @@
/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ */
#include "PixelAthClusterMonAlg.h"
+#include "AtlasDetDescr/AtlasDetectorID.h"
+//for Amg::error helper function:
+#include "EventPrimitives/EventPrimitivesHelpers.h"
+#include "TrkTrackSummary/TrackSummary.h"
+#include "TrkMeasurementBase/MeasurementBase.h"
+#include "TrkRIO_OnTrack/RIO_OnTrack.h"
+#include "InDetReadoutGeometry/SiDetectorElement.h"
+#include "InDetRIO_OnTrack/SiClusterOnTrack.h"
-PixelAthClusterMonAlg::PixelAthClusterMonAlg( const std::string& name, ISvcLocator* pSvcLocator ) :
+
+
+
+
+PixelAthClusterMonAlg::PixelAthClusterMonAlg(const std::string& name, ISvcLocator* pSvcLocator) :
AthMonitorAlgorithm(name, pSvcLocator),
m_holeSearchTool("InDet::InDetTrackHoleSearchTool/InDetHoleSearchTool", this),
m_trackSelTool("InDet::InDetTrackSelectionTool/TrackSelectionTool", this),
m_atlasid(nullptr),
- m_pixelid(nullptr)
-{
+ m_pixelid(nullptr) {
//jo flags go here, keys and some tools -> in class
declareProperty("HoleSearchTool", m_holeSearchTool);
declareProperty("TrackSelectionTool", m_trackSelTool); //needed for cfg in python jo
@@ -23,26 +34,23 @@ PixelAthClusterMonAlg::PixelAthClusterMonAlg( const std::string& name, ISvcLocat
declareProperty("doFEPlots", m_doFEPlots = false);
}
-
PixelAthClusterMonAlg::~PixelAthClusterMonAlg() {}
StatusCode PixelAthClusterMonAlg::initialize() {
-
- ATH_CHECK( detStore()->retrieve(m_atlasid, "AtlasID") );
- ATH_CHECK( detStore()->retrieve(m_pixelid, "PixelID") );
- ATH_CHECK( m_pixelCondSummaryTool.retrieve() );
- ATH_CHECK( m_pixelReadout.retrieve() );
- if ( !m_holeSearchTool.empty() ) ATH_CHECK( m_holeSearchTool.retrieve() );
- if ( !m_trackSelTool.empty() ) ATH_CHECK( m_trackSelTool.retrieve() );
-
- ATH_CHECK( m_tracksKey.initialize() );
- ATH_CHECK( m_clustersKey.initialize() );
+ ATH_CHECK(detStore()->retrieve(m_atlasid, "AtlasID"));
+ ATH_CHECK(detStore()->retrieve(m_pixelid, "PixelID"));
+ ATH_CHECK(m_pixelCondSummaryTool.retrieve());
+ ATH_CHECK(m_pixelReadout.retrieve());
+ if (!m_holeSearchTool.empty()) ATH_CHECK(m_holeSearchTool.retrieve());
+ if (!m_trackSelTool.empty()) ATH_CHECK(m_trackSelTool.retrieve());
+
+ ATH_CHECK(m_tracksKey.initialize());
+ ATH_CHECK(m_clustersKey.initialize());
return AthMonitorAlgorithm::initialize();
}
-
-StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) const {
+StatusCode PixelAthClusterMonAlg::fillHistograms(const EventContext& ctx) const {
using namespace Monitored;
int lb = GetEventInfo(ctx)->lumiBlock();
@@ -54,23 +62,27 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons
ATH_MSG_DEBUG("Filling Status Monitoring Histograms");
float index = 1.0;
- float nBadMod[PixLayers::COUNT] = {0.};
- float nDisabledMod[PixLayers::COUNT] = {0.};
+ float nBadMod[PixLayers::COUNT] = {
+ 0.
+ };
+ float nDisabledMod[PixLayers::COUNT] = {
+ 0.
+ };
int phiMod(-99);
int etaMod(-99);
bool copyFEval(false);
- AccumulatorArrays clusPerEventArray = { {{0}}, {{0}}, {{0}}, {{0}}, {{0}}, {{0}} };
+ AccumulatorArrays clusPerEventArray = {{{0}}, {{0}}, {{0}}, {{0}}, {{0}}, {{0}}};
VecAccumulator2DMap Map_Of_Modules_Status("MapOfModulesStatus", true);
- VecAccumulator2DMap Map_Of_FEs_Status("MapOfFEsStatus");
+ VecAccumulator2DMap Map_Of_FEs_Status("MapOfFEsStatus");
- for (auto idIt = m_pixelid->wafer_begin(); idIt!=m_pixelid->wafer_end(); ++idIt) {
- Identifier waferID = *idIt;
+ for (auto idIt = m_pixelid->wafer_begin(); idIt != m_pixelid->wafer_end(); ++idIt) {
+ Identifier waferID = *idIt;
IdentifierHash id_hash = m_pixelid->wafer_hash(waferID);
-
- int pixlayer = getPixLayersID(m_pixelid->barrel_ec(waferID), m_pixelid->layer_disk(waferID) );
+
+ int pixlayer = getPixLayersID(m_pixelid->barrel_ec(waferID), m_pixelid->layer_disk(waferID));
if (pixlayer == 99) continue;
-
+
// read https://twiki.cern.ch/twiki/bin/view/AtlasComputing/MultiThreadingConditionsAccess
if (m_pixelCondSummaryTool->isActive(id_hash) == true && m_pixelCondSummaryTool->isGood(id_hash) == true) {
index = 0;
@@ -79,31 +91,36 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons
nDisabledMod[pixlayer]++;
getPhiEtaMod(m_pixelid, waferID, phiMod, etaMod, copyFEval);
switch (pixlayer) {
- case PixLayers::kECA :
- clusPerEventArray.DA[phiMod][etaMod] = -1;
- break;
- case PixLayers::kECC :
- clusPerEventArray.DC[phiMod][etaMod] = -1;
- break;
- case PixLayers::kB0 :
- clusPerEventArray.B0[phiMod][etaMod] = -1;
- break;
- case PixLayers::kB1 :
- clusPerEventArray.B1[phiMod][etaMod] = -1;
- break;
- case PixLayers::kB2 :
- clusPerEventArray.B2[phiMod][etaMod] = -1;
- break;
- case PixLayers::kIBL :
- clusPerEventArray.IBL[phiMod][etaMod] = -1;
- if (copyFEval) clusPerEventArray.IBL[phiMod][++etaMod] = -1;
- break;
+ case PixLayers::kECA:
+ clusPerEventArray.DA[phiMod][etaMod] = -1;
+ break;
+
+ case PixLayers::kECC:
+ clusPerEventArray.DC[phiMod][etaMod] = -1;
+ break;
+
+ case PixLayers::kB0:
+ clusPerEventArray.B0[phiMod][etaMod] = -1;
+ break;
+
+ case PixLayers::kB1:
+ clusPerEventArray.B1[phiMod][etaMod] = -1;
+ break;
+
+ case PixLayers::kB2:
+ clusPerEventArray.B2[phiMod][etaMod] = -1;
+ break;
+
+ case PixLayers::kIBL:
+ clusPerEventArray.IBL[phiMod][etaMod] = -1;
+ if (copyFEval) clusPerEventArray.IBL[phiMod][++etaMod] = -1;
+ break;
}
} else {
index = 1; // bad but active modules
- nBadMod[pixlayer]+= inv_nmod_per_layer[pixlayer];
+ nBadMod[pixlayer] += inv_nmod_per_layer[pixlayer];
}
-
+
Map_Of_Modules_Status.add(pixlayer, waferID, m_pixelid, index);
// Per FE Status
@@ -112,30 +129,33 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons
// code requires testing w/ different pixel conditions - could cause segfault!
if (m_doFEPlots) {
int nFE = getNumberOfFEs(pixlayer, m_pixelid->eta_module(waferID));
- for (int iFE=0; iFE<nFE; iFE++) {
- Identifier pixelID = m_pixelReadout->getPixelIdfromHash(id_hash, iFE, 1, 1);
- if (pixelID.is_valid()) {
- if (m_pixelCondSummaryTool->isActive(id_hash, pixelID) == true && m_pixelCondSummaryTool->isGood(id_hash, pixelID) == true) {
- index = 0; // active and good FE
- } else if (m_pixelCondSummaryTool->isActive(id_hash, pixelID) == false) {
- index = 2; // inactive or bad FE
- } else {
- index = 1; // active and bad FE
- }
- Map_Of_FEs_Status.add(pixlayer, waferID, m_pixelid, iFE, index);
- } else {
- ATH_MSG_ERROR("PixelMonitoring: got invalid pixelID " << pixelID << " from id_hash " << id_hash << " with FE#"<< iFE << ".");
- }
+ for (int iFE = 0; iFE < nFE; iFE++) {
+ Identifier pixelID = m_pixelReadout->getPixelIdfromHash(id_hash, iFE, 1, 1);
+ if (pixelID.is_valid()) {
+ if (m_pixelCondSummaryTool->isActive(id_hash,
+ pixelID) == true &&
+ m_pixelCondSummaryTool->isGood(id_hash, pixelID) == true) {
+ index = 0; // active and good FE
+ } else if (m_pixelCondSummaryTool->isActive(id_hash, pixelID) == false) {
+ index = 2; // inactive or bad FE
+ } else {
+ index = 1; // active and bad FE
+ }
+ Map_Of_FEs_Status.add(pixlayer, waferID, m_pixelid, iFE, index);
+ } else {
+ ATH_MSG_ERROR(
+ "PixelMonitoring: got invalid pixelID " << pixelID << " from id_hash " << id_hash << " with FE#" << iFE <<
+ ".");
+ }
}
}
-
} // end of pixelid wafer loop
- fill2DProfLayerAccum( Map_Of_Modules_Status );
+ fill2DProfLayerAccum(Map_Of_Modules_Status);
fill1DProfLumiLayers("BadModulesPerLumi", lb, nBadMod);
fill1DProfLumiLayers("DisabledModulesPerLumi", lb, nDisabledMod);
- if (m_doFEPlots) fill2DProfLayerAccum( Map_Of_FEs_Status );
+ if (m_doFEPlots) fill2DProfLayerAccum(Map_Of_FEs_Status);
//*******************************************************************************
//*************************** End of filling Status Histograms ******************
@@ -155,55 +175,58 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons
VecAccumulator2DMap HolesRatio("HolesRatio", true);
VecAccumulator2DMap MissHitsRatio("MissHitsRatio", true);
auto trackGroup = getGroup("Track");
-
+
auto tracks = SG::makeHandle(m_tracksKey, ctx);
- if ( !(tracks.isValid()) ) {
- ATH_MSG_ERROR("PixelMonitoring: Track container "<< m_tracksKey.key() << " could not be found.");
- auto dataread_err = Monitored::Scalar<int>( "trkdataread_err", DataReadErrors::ContainerInvalid );
+ if (!(tracks.isValid())) {
+ ATH_MSG_ERROR("PixelMonitoring: Track container " << m_tracksKey.key() << " could not be found.");
+ auto dataread_err = Monitored::Scalar<int>("trkdataread_err", DataReadErrors::ContainerInvalid);
fill(trackGroup, dataread_err);
return StatusCode::RECOVERABLE;
} else {
- ATH_MSG_DEBUG("PixelMonitoring: Track container "<< tracks.name() <<" is found.");
+ ATH_MSG_DEBUG("PixelMonitoring: Track container " << tracks.name() << " is found.");
}
int ntracksPerEvent = 0;
bool havePixelHits(false);
std::vector<std::pair<Identifier, double> > ClusterIDs;
- auto lbval = Monitored::Scalar<int>( "pixclusmontool_lb", lb );
+ auto lbval = Monitored::Scalar<int>("pixclusmontool_lb", lb);
TrackCollection::const_iterator itrack = tracks->begin();
TrackCollection::const_iterator itrack_end = tracks->end();
for (; itrack != itrack_end; ++itrack) {
- if ((*itrack) == nullptr || (*itrack)->perigeeParameters() == nullptr || (*itrack)->trackSummary() == nullptr || (*itrack)->trackSummary()->get(Trk::numberOfPixelHits) == 0) {
+ if ((*itrack) == nullptr || (*itrack)->perigeeParameters() == nullptr || (*itrack)->trackSummary() == nullptr ||
+ (*itrack)->trackSummary()->get(Trk::numberOfPixelHits) == 0) {
ATH_MSG_DEBUG("PixelMonitoring: Track either invalid or it does not contain pixel hits, continuing...");
continue;
}
int nPixelHits = 0;
- const Trk::Perigee* measPerigee = static_cast<const Trk::Perigee *>((*itrack)->perigeeParameters());
- bool passJOTrkTightCut = static_cast<bool>( m_trackSelTool->accept(**itrack) );
+ const Trk::Perigee* measPerigee = static_cast<const Trk::Perigee*>((*itrack)->perigeeParameters());
+ bool passJOTrkTightCut = static_cast<bool>(m_trackSelTool->accept(**itrack));
bool pass1hole1GeVptTightCut = (passJOTrkTightCut && (measPerigee->pT() / 1000.0 > 1.0)); // misshit ratios
bool pass1hole5GeVptTightCut = (passJOTrkTightCut && (measPerigee->pT() / 1000.0 > 5.0)); // eff vs lumi
- const Trk::Track* trackWithHoles( (*itrack) );
+ const Trk::Track* trackWithHoles((*itrack));
std::unique_ptr<const Trk::Track> trackWithHolesUnique = nullptr;
- if ( (*itrack)->trackSummary()->get(Trk::numberOfPixelHoles) > 0 ) {
- trackWithHolesUnique.reset( m_holeSearchTool->getTrackWithHoles(**itrack) );
+ if ((*itrack)->trackSummary()->get(Trk::numberOfPixelHoles) > 0) {
+ trackWithHolesUnique.reset(m_holeSearchTool->getTrackWithHoles(**itrack));
trackWithHoles = trackWithHolesUnique.get();
}
- const DataVector<const Trk::TrackStateOnSurface> *trackStates = trackWithHoles->trackStateOnSurfaces();
- for (DataVector<const Trk::TrackStateOnSurface>::const_iterator trackStateOnSurfaceIterator = trackStates->begin(); trackStateOnSurfaceIterator != trackStates->end(); trackStateOnSurfaceIterator++) {
-
+ const DataVector<const Trk::TrackStateOnSurface>* trackStates = trackWithHoles->trackStateOnSurfaces();
+ for (DataVector<const Trk::TrackStateOnSurface>::const_iterator trackStateOnSurfaceIterator = trackStates->begin();
+ trackStateOnSurfaceIterator != trackStates->end(); ++trackStateOnSurfaceIterator) {
const Trk::MeasurementBase* mesBase = (*trackStateOnSurfaceIterator)->measurementOnTrack();
const Trk::RIO_OnTrack* RIOOnTrack = nullptr;
- if ( mesBase && mesBase->type(Trk::MeasurementBaseType::RIO_OnTrack) ) {
+ if (mesBase && mesBase->type(Trk::MeasurementBaseType::RIO_OnTrack)) {
RIOOnTrack = static_cast<const Trk::RIO_OnTrack*>(mesBase);
}
- if (mesBase && !RIOOnTrack) continue; // skip pseudomeasurements but not hits, holes, outliers
+ if (mesBase && !RIOOnTrack) continue; // skip pseudomeasurements
+ // but not hits, holes,
+ // outliers
const Trk::TrackParameters* trkParameters = (*trackStateOnSurfaceIterator)->trackParameters();
Identifier surfaceID;
@@ -218,119 +241,116 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons
}
}
if (!m_atlasid->is_pixel(surfaceID)) continue;
- int pixlayer = getPixLayersID(m_pixelid->barrel_ec(surfaceID), m_pixelid->layer_disk(surfaceID) );
+ int pixlayer = getPixLayersID(m_pixelid->barrel_ec(surfaceID), m_pixelid->layer_disk(surfaceID));
if (pixlayer == 99) continue;
-
+
float nOutlier = 0.;
- float nHole = 0.;
- auto effval = Monitored::Scalar<float>( "HitEffAll_val", 0. );
- auto efflb = Monitored::Scalar<float>( "HitEffAll_lb", lb );
+ float nHole = 0.;
+ auto effval = Monitored::Scalar<float>("HitEffAll_val", 0.);
+ auto efflb = Monitored::Scalar<float>("HitEffAll_lb", lb);
if ((*trackStateOnSurfaceIterator)->type(Trk::TrackStateOnSurface::Outlier)) {
nOutlier = 1.0;
- if (!m_doOnline) TSOS_Outlier.add(pixlayer, surfaceID, m_pixelid, 1.0);
+ if (!m_doOnline) TSOS_Outlier.add(pixlayer, surfaceID, m_pixelid, 1.0);
if (pass1hole5GeVptTightCut) fill(pixLayersLabel[pixlayer], efflb, effval);
-
} else if ((*trackStateOnSurfaceIterator)->type(Trk::TrackStateOnSurface::Hole)) {
nHole = 1.0;
- if (!m_doOnline) TSOS_Hole.add(pixlayer, surfaceID, m_pixelid, 1.0);
+ if (!m_doOnline) TSOS_Hole.add(pixlayer, surfaceID, m_pixelid, 1.0);
if (pass1hole5GeVptTightCut) fill(pixLayersLabel[pixlayer], efflb, effval);
-
} else if ((*trackStateOnSurfaceIterator)->type(Trk::TrackStateOnSurface::Measurement)) {
+ if (!m_doOnline) TSOS_Measurement.add(pixlayer, surfaceID, m_pixelid, 1.0);
+ effval = 1.;
+ if (pass1hole5GeVptTightCut) fill(pixLayersLabel[pixlayer], efflb, effval);
- if (!m_doOnline) TSOS_Measurement.add(pixlayer, surfaceID, m_pixelid, 1.0);
- effval = 1.;
- if (pass1hole5GeVptTightCut) fill(pixLayersLabel[pixlayer], efflb, effval);
-
- if (not mesBase) continue;
- const InDetDD::SiDetectorElement *side = dynamic_cast<const InDetDD::SiDetectorElement *>(mesBase->associatedSurface().associatedDetectorElement());
- const InDet::SiClusterOnTrack *clus = dynamic_cast<const InDet::SiClusterOnTrack *>(mesBase);
- if (!side || !clus) continue;
- const InDet::SiCluster *RawDataClus = dynamic_cast<const InDet::SiCluster *>(clus->prepRawData());
- if (!RawDataClus || !RawDataClus->detectorElement()->isPixel()) continue;
-
- nPixelHits++;
-
- const Trk::AtaPlane *trackAtPlane = dynamic_cast<const Trk::AtaPlane *>(trkParameters);
- if (trackAtPlane) {
- const Amg::Vector2D localpos = trackAtPlane->localPosition();
-
- // Get local error matrix for hit and track and calc pull
- const AmgSymMatrix(5) trackErrMat = (*trackAtPlane->covariance());
- const Amg::MatrixX clusErrMat = clus->localCovariance();
-
- double error_sum = sqrt(pow(Amg::error(trackErrMat, Trk::locX), 2) + pow(Amg::error(clusErrMat, Trk::locX), 2));
- auto resPhi = Monitored::Scalar<float>( "res_phi", clus->localParameters()[Trk::locX] - localpos[0]);
- fill(trackGroup, resPhi);
- if (error_sum != 0) {
- auto pullPhi = Monitored::Scalar<float>( "pull_phi", resPhi / error_sum);
- fill(trackGroup, pullPhi);
- }
-
- error_sum = sqrt(pow(Amg::error(trackErrMat, Trk::locY), 2) + pow(Amg::error(clusErrMat, Trk::locY), 2));
- auto resEta = Monitored::Scalar<float>( "res_eta", clus->localParameters()[Trk::locY] - localpos[1]);
- fill(trackGroup, resEta);
- if (error_sum != 0) {
- auto pullEta = Monitored::Scalar<float>( "pull_eta", resEta / error_sum);
- fill(trackGroup, pullEta);
- }
- // Filling containers, which hold id's of hits and clusters on track
- // _and_ incident angle information for later normalization
-
- Amg::Vector3D mynormal = side->normal();
- Amg::Vector3D mytrack = trackAtPlane->momentum();
- double trknormcomp = mytrack.dot(mynormal);
-
- double mytrack_mag = mytrack.mag();
- double cosalpha = 0.;
- if (mytrack_mag != 0) cosalpha = fabs(trknormcomp / mytrack_mag);
- ClusterIDs.push_back(std::make_pair(clus->identify(), cosalpha));
- }
-
-
+ if (not mesBase) continue;
+ const InDetDD::SiDetectorElement* side =
+ dynamic_cast<const InDetDD::SiDetectorElement*>(mesBase->associatedSurface().associatedDetectorElement());
+ const InDet::SiClusterOnTrack* clus = dynamic_cast<const InDet::SiClusterOnTrack*>(mesBase);
+ if (!side || !clus) continue;
+ const InDet::SiCluster* RawDataClus = dynamic_cast<const InDet::SiCluster*>(clus->prepRawData());
+ if (!RawDataClus || !RawDataClus->detectorElement()->isPixel()) continue;
+
+ nPixelHits++;
+
+ const Trk::AtaPlane* trackAtPlane = dynamic_cast<const Trk::AtaPlane*>(trkParameters);
+ if (trackAtPlane) {
+ const Amg::Vector2D localpos = trackAtPlane->localPosition();
+
+ // Get local error matrix for hit and track and calc pull
+ const AmgSymMatrix(5) trackErrMat = (*trackAtPlane->covariance());
+ const Amg::MatrixX clusErrMat = clus->localCovariance();
+
+ double error_sum =
+ sqrt(pow(Amg::error(trackErrMat, Trk::locX), 2) + pow(Amg::error(clusErrMat, Trk::locX), 2));
+ auto resPhi = Monitored::Scalar<float>("res_phi", clus->localParameters()[Trk::locX] - localpos[0]);
+ fill(trackGroup, resPhi);
+ if (error_sum != 0) {
+ auto pullPhi = Monitored::Scalar<float>("pull_phi", resPhi / error_sum);
+ fill(trackGroup, pullPhi);
+ }
+
+ error_sum = sqrt(pow(Amg::error(trackErrMat, Trk::locY), 2) + pow(Amg::error(clusErrMat, Trk::locY), 2));
+ auto resEta = Monitored::Scalar<float>("res_eta", clus->localParameters()[Trk::locY] - localpos[1]);
+ fill(trackGroup, resEta);
+ if (error_sum != 0) {
+ auto pullEta = Monitored::Scalar<float>("pull_eta", resEta / error_sum);
+ fill(trackGroup, pullEta);
+ }
+ // Filling containers, which hold id's of hits and clusters on track
+ // _and_ incident angle information for later normalization
+
+ Amg::Vector3D mynormal = side->normal();
+ Amg::Vector3D mytrack = trackAtPlane->momentum();
+ double trknormcomp = mytrack.dot(mynormal);
+
+ double mytrack_mag = mytrack.mag();
+ double cosalpha = 0.;
+ if (mytrack_mag != 0) cosalpha = fabs(trknormcomp / mytrack_mag);
+ ClusterIDs.push_back(std::make_pair(clus->identify(), cosalpha));
+ }
} // end of measurement case
-
+
if (pass1hole1GeVptTightCut) {
- HolesRatio.add(pixlayer, surfaceID, m_pixelid, nHole);
- MissHitsRatio.add(pixlayer, surfaceID, m_pixelid, nOutlier + nHole);
+ HolesRatio.add(pixlayer, surfaceID, m_pixelid, nHole);
+ MissHitsRatio.add(pixlayer, surfaceID, m_pixelid, nOutlier + nHole);
}
-
} // end of TSOS loop
ntracksPerEvent++;
- auto nph = Monitored::Scalar<int>( "npixhits_per_track", nPixelHits);
- auto nphwgt = Monitored::Scalar<float>( "npixhits_per_track_wgt", 1.0 );
+ auto nph = Monitored::Scalar<int>("npixhits_per_track", nPixelHits);
+ auto nphwgt = Monitored::Scalar<float>("npixhits_per_track_wgt", 1.0);
fill(trackGroup, lbval, nph, nphwgt);
- int trkfitndf = (*itrack)->fitQuality()->numberDoF();
+ int trkfitndf = (*itrack)->fitQuality()->numberDoF();
double trkfitchi2 = (*itrack)->fitQuality()->chiSquared();
if (trkfitndf != 0) {
- auto trkChiN = Monitored::Scalar<float>( "fit_chi2byndf", trkfitchi2 / trkfitndf);
+ auto trkChiN = Monitored::Scalar<float>("fit_chi2byndf", trkfitchi2 / trkfitndf);
fill(trackGroup, trkChiN);
}
havePixelHits = havePixelHits || (nPixelHits > 0);
} // end of track loop
-
+
if (!havePixelHits) {
- auto dataread_err = Monitored::Scalar<int>( "trkdataread_err", DataReadErrors::EmptyContainer );
- fill(trackGroup, dataread_err);
+ auto dataread_err = Monitored::Scalar<int>("trkdataread_err", DataReadErrors::EmptyContainer);
+ fill(trackGroup, dataread_err);
}
- fill2DProfLayerAccum( HolesRatio );
- fill2DProfLayerAccum( MissHitsRatio );
- if (!m_doOnline) {
- fill2DProfLayerAccum( TSOS_Outlier );
- fill2DProfLayerAccum( TSOS_Hole );
- fill2DProfLayerAccum( TSOS_Measurement );
+ fill2DProfLayerAccum(HolesRatio);
+ fill2DProfLayerAccum(MissHitsRatio);
+ if (!m_doOnline) {
+ fill2DProfLayerAccum(TSOS_Outlier);
+ fill2DProfLayerAccum(TSOS_Hole);
+ fill2DProfLayerAccum(TSOS_Measurement);
}
- sort(ClusterIDs.begin(), ClusterIDs.end(), [](const std::pair<Identifier, double> &left, const std::pair<Identifier, double> &right) {
- return left.first < right.first;
- });
-
+ sort(ClusterIDs.begin(), ClusterIDs.end(),
+ [](const std::pair<Identifier, double>& left, const std::pair<Identifier, double>& right) {
+ return left.first < right.first;
+ });
+
// Filling per-event histograms
//
- auto nTrks = Monitored::Scalar<int>( "ntrks_per_event", ntracksPerEvent);
+ auto nTrks = Monitored::Scalar<int>("ntrks_per_event", ntracksPerEvent);
fill(trackGroup, lbval, nTrks);
//m_npixhits_per_track_lastXlb-> // m_npixhits_per_track_lumi TH2F vs lumi
@@ -345,7 +365,7 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons
ATH_MSG_DEBUG("Filling Cluster Monitoring Histograms");
- auto clToTcosAlphaLB = Monitored::Scalar<float>( "ClusterToTxCosAlphaOnTrack_lb", lb);
+ auto clToTcosAlphaLB = Monitored::Scalar<float>("ClusterToTxCosAlphaOnTrack_lb", lb);
VecAccumulator2DMap Cluster_LVL1A_Mod("ClusterLVL1AMod");
VecAccumulator2DMap Cluster_LVL1A_SizeCut("ClusterLVL1ASizeCut");
@@ -366,19 +386,23 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons
auto pixel_clcontainer = SG::makeHandle(m_clustersKey, ctx);
- if ( !(pixel_clcontainer.isValid()) ) {
- ATH_MSG_ERROR("Pixel Monitoring: Pixel Cluster container "<< m_clustersKey.key() << " could not be found.");
- auto dataread_err = Monitored::Scalar<int>( "clsdataread_err", DataReadErrors::ContainerInvalid );
+ if (!(pixel_clcontainer.isValid())) {
+ ATH_MSG_ERROR("Pixel Monitoring: Pixel Cluster container " << m_clustersKey.key() << " could not be found.");
+ auto dataread_err = Monitored::Scalar<int>("clsdataread_err", DataReadErrors::ContainerInvalid);
fill(clusterGroup, dataread_err);
return StatusCode::RECOVERABLE;
} else {
- ATH_MSG_DEBUG("Pixel Monitoring: Pixel Cluster container "<< pixel_clcontainer.name() <<" is found.");
+ ATH_MSG_DEBUG("Pixel Monitoring: Pixel Cluster container " << pixel_clcontainer.name() << " is found.");
}
int nclusters = 0;
int nclusters_ontrack = 0;
- float nclusters_mod[PixLayers::COUNT] = {0.};
- float nclusters_ontrack_mod[PixLayers::COUNT] = {0.};
+ float nclusters_mod[PixLayers::COUNT] = {
+ 0.
+ };
+ float nclusters_ontrack_mod[PixLayers::COUNT] = {
+ 0.
+ };
Identifier clusID;
InDet::PixelClusterContainer::const_iterator colNext = pixel_clcontainer->begin();
@@ -386,18 +410,17 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons
DataVector<InDet::PixelCluster>::const_iterator p_clus;
for (; colNext != lastCol; ++colNext) {
-
const InDet::PixelClusterCollection* ClusterCollection(*colNext);
if (!ClusterCollection) {
ATH_MSG_DEBUG("Pixel Monitoring: Pixel Cluster container is empty.");
- auto dataread_err = Monitored::Scalar<int>( "clsdataread_err", DataReadErrors::CollectionInvalid );
+ auto dataread_err = Monitored::Scalar<int>("clsdataread_err", DataReadErrors::CollectionInvalid);
fill(clusterGroup, dataread_err);
continue;
}
for (p_clus = ClusterCollection->begin(); p_clus != ClusterCollection->end(); ++p_clus) {
clusID = (*p_clus)->identify();
- int pixlayer = getPixLayersID(m_pixelid->barrel_ec(clusID), m_pixelid->layer_disk(clusID) );
+ int pixlayer = getPixLayersID(m_pixelid->barrel_ec(clusID), m_pixelid->layer_disk(clusID));
if (pixlayer == 99) continue;
const InDet::PixelCluster& cluster = **p_clus;
@@ -407,99 +430,106 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons
// begin timing histos
//
- auto clLVL1A = Monitored::Scalar<float>( "Cluster_LVL1A_lvl1a", cluster.LVL1A() );
- fill( clusterGroup, clLVL1A);
+ auto clLVL1A = Monitored::Scalar<float>("Cluster_LVL1A_lvl1a", cluster.LVL1A());
+ fill(clusterGroup, clLVL1A);
Cluster_LVL1A_Mod.add(pixlayer, clusID, m_pixelid, cluster.LVL1A() + 0.00001);
- if (cluster.rdoList().size() > 1) Cluster_LVL1A_SizeCut.add(pixlayer, clusID, m_pixelid, cluster.LVL1A() + 0.00001);
- if (cluster.totalToT() > clusterToTMinCut[pixlayer]) fill( "ClusterLVL1AToTCut_" + pixLayersLabel[pixlayer], clLVL1A);
+ if (cluster.rdoList().size() >
+ 1) Cluster_LVL1A_SizeCut.add(pixlayer, clusID, m_pixelid, cluster.LVL1A() + 0.00001);
+ if (cluster.totalToT() > clusterToTMinCut[pixlayer]) fill("ClusterLVL1AToTCut_" + pixLayersLabel[pixlayer],
+ clLVL1A);
- //
+ //
// end timing histos
// begin cluster rate
//
if (m_doOnline) ClusterMap_Mon.add(pixlayer, clusID, m_pixelid);
- //
+ //
// end cluster rate
// begin cluster occupancy
//
Cluster_Occupancy.add(pixlayer, clusID, m_pixelid);
if (m_doFEPlots) {
- Cluster_FE_Occupancy.add(pixlayer, clusID, m_pixelid, m_pixelReadout->getFE(clusID, clusID), 1.0);
+ Cluster_FE_Occupancy.add(pixlayer, clusID, m_pixelid, m_pixelReadout->getFE(clusID, clusID), 1.0);
}
if (cluster.rdoList().size() > 1) Clus_Occ_SizeCut.add(pixlayer, clusID, m_pixelid);
// end cluster occupancy
- double cosalpha(0.);
- if ( isClusterOnTrack(clusID, ClusterIDs, cosalpha) ) {
- nclusters_ontrack++;
- nclusters_ontrack_mod[pixlayer]++;
- getPhiEtaMod(m_pixelid, clusID, phiMod, etaMod, copyFEval);
- switch (pixlayer) {
- case PixLayers::kECA :
- clusPerEventArray.DA[phiMod][etaMod]++;
- break;
- case PixLayers::kECC :
- clusPerEventArray.DC[phiMod][etaMod]++;
- break;
- case PixLayers::kB0 :
- clusPerEventArray.B0[phiMod][etaMod]++;
- break;
- case PixLayers::kB1 :
- clusPerEventArray.B1[phiMod][etaMod]++;
- break;
- case PixLayers::kB2 :
- clusPerEventArray.B2[phiMod][etaMod]++;
- break;
- case PixLayers::kIBL :
- clusPerEventArray.IBL[phiMod][etaMod]++;
- break;
- }
- // begin timing histos
- //
- clLVL1A = cluster.LVL1A();
- fill( clusterGroup_OnTrack, clLVL1A);
- Cluster_LVL1A_Mod_OnTrack.add(pixlayer, clusID, m_pixelid, cluster.LVL1A() + 0.00001);
- if (cluster.rdoList().size() > 1) Cluster_LVL1A_SizeCut_OnTrack.add(pixlayer, clusID, m_pixelid, cluster.LVL1A() + 0.00001);
- if (cluster.totalToT() > clusterToTMinCut[pixlayer]) fill( "ClusterLVL1AToTCutOnTrack_" + pixLayersLabel[pixlayer], clLVL1A);
- //
- // end timing histos
- // begin cluster sizes
- //
- auto clSize = Monitored::Scalar<float>( "ClusterSizeOnTrack_clsize", cluster.rdoList().size());
- auto etaModule = Monitored::Scalar<float>( "ClusterSizeOnTrack_em", m_pixelid->eta_module(clusID) );
- if ( abs(m_pixelid->barrel_ec(clusID))!=0 ) etaModule = m_pixelid->layer_disk(clusID) + 1;
- fill( "ClusterGroupsizeVsEtaOnTrack_" + pixLayersLabel[pixlayer], etaModule, clSize );
- Cluster_Size_Map_OnTrack.add(pixlayer, clusID, m_pixelid, cluster.rdoList().size());
- //
- // end cluster sizes
- // begin cluster rate
- //
- if (m_doOnline) ClusterMap_Mon_OnTrack.add(pixlayer, clusID, m_pixelid);
- //
- // end cluster rate
- // begin cluster occupancy
- //
- Cluster_Occupancy_OnTrack.add(pixlayer, clusID, m_pixelid);
- if (m_doFEPlots) {
- Cluster_FE_Occupancy_OnTrack.add(pixlayer, clusID, m_pixelid, m_pixelReadout->getFE(clusID, clusID), 1.0);
- }
- if (cluster.rdoList().size() > 1) Clus_Occ_SizeCut_OnTrack.add(pixlayer, clusID, m_pixelid);
- //
- // end cluster occupancy
- // begin cluster ToT and charge
- //
- auto clToTcosAlpha = Monitored::Scalar<float>( "ClusterToTxCosAlphaOnTrack_val", cluster.totalToT() * cosalpha );
- fill( pixLayersLabel[pixlayer], clToTcosAlphaLB, clToTcosAlpha);
-
- if (!m_doOnline) {
- auto clQcosAlpha = Monitored::Scalar<float>( "ClusterQxCosAlphaOnTrack_val", cluster.totalCharge() * cosalpha);
- fill( pixLayersLabel[pixlayer], clQcosAlpha);
- }
- //
- // end cluster ToT and charge
+ double cosalpha(0.);
+ if (isClusterOnTrack(clusID, ClusterIDs, cosalpha)) {
+ nclusters_ontrack++;
+ nclusters_ontrack_mod[pixlayer]++;
+ getPhiEtaMod(m_pixelid, clusID, phiMod, etaMod, copyFEval);
+ switch (pixlayer) {
+ case PixLayers::kECA:
+ clusPerEventArray.DA[phiMod][etaMod]++;
+ break;
+
+ case PixLayers::kECC:
+ clusPerEventArray.DC[phiMod][etaMod]++;
+ break;
+
+ case PixLayers::kB0:
+ clusPerEventArray.B0[phiMod][etaMod]++;
+ break;
+
+ case PixLayers::kB1:
+ clusPerEventArray.B1[phiMod][etaMod]++;
+ break;
+
+ case PixLayers::kB2:
+ clusPerEventArray.B2[phiMod][etaMod]++;
+ break;
+
+ case PixLayers::kIBL:
+ clusPerEventArray.IBL[phiMod][etaMod]++;
+ break;
+ }
+ // begin timing histos
+ //
+ clLVL1A = cluster.LVL1A();
+ fill(clusterGroup_OnTrack, clLVL1A);
+ Cluster_LVL1A_Mod_OnTrack.add(pixlayer, clusID, m_pixelid, cluster.LVL1A() + 0.00001);
+ if (cluster.rdoList().size() > 1) Cluster_LVL1A_SizeCut_OnTrack.add(pixlayer, clusID, m_pixelid,
+ cluster.LVL1A() + 0.00001);
+ if (cluster.totalToT() > clusterToTMinCut[pixlayer]) fill("ClusterLVL1AToTCutOnTrack_" + pixLayersLabel[pixlayer], clLVL1A);
+ //
+ // end timing histos
+ // begin cluster sizes
+ //
+ auto clSize = Monitored::Scalar<float>("ClusterSizeOnTrack_clsize", cluster.rdoList().size());
+ auto etaModule = Monitored::Scalar<float>("ClusterSizeOnTrack_em", m_pixelid->eta_module(clusID));
+ if (abs(m_pixelid->barrel_ec(clusID)) != 0) etaModule = m_pixelid->layer_disk(clusID) + 1;
+ fill("ClusterGroupsizeVsEtaOnTrack_" + pixLayersLabel[pixlayer], etaModule, clSize);
+ Cluster_Size_Map_OnTrack.add(pixlayer, clusID, m_pixelid, cluster.rdoList().size());
+ //
+ // end cluster sizes
+ // begin cluster rate
+ //
+ if (m_doOnline) ClusterMap_Mon_OnTrack.add(pixlayer, clusID, m_pixelid);
+ //
+ // end cluster rate
+ // begin cluster occupancy
+ //
+ Cluster_Occupancy_OnTrack.add(pixlayer, clusID, m_pixelid);
+ if (m_doFEPlots) {
+ Cluster_FE_Occupancy_OnTrack.add(pixlayer, clusID, m_pixelid, m_pixelReadout->getFE(clusID, clusID), 1.0);
+ }
+ if (cluster.rdoList().size() > 1) Clus_Occ_SizeCut_OnTrack.add(pixlayer, clusID, m_pixelid);
+ //
+ // end cluster occupancy
+ // begin cluster ToT and charge
+ //
+ auto clToTcosAlpha = Monitored::Scalar<float>("ClusterToTxCosAlphaOnTrack_val", cluster.totalToT() * cosalpha);
+ fill(pixLayersLabel[pixlayer], clToTcosAlphaLB, clToTcosAlpha);
+
+ if (!m_doOnline) {
+ auto clQcosAlpha = Monitored::Scalar<float>("ClusterQxCosAlphaOnTrack_val", cluster.totalCharge() * cosalpha);
+ fill(pixLayersLabel[pixlayer], clQcosAlpha);
+ }
+ //
+ // end cluster ToT and charge
}
}
-
}
fill2DProfLayerAccum(Cluster_LVL1A_Mod);
fill2DProfLayerAccum(Cluster_LVL1A_SizeCut);
@@ -520,41 +550,41 @@ StatusCode PixelAthClusterMonAlg::fillHistograms( const EventContext& ctx ) cons
}
// begin cluster rates
//
- auto nCls = Monitored::Scalar<int>( "ClustersPerEvent_val", nclusters );
- fill( clusterGroup, lbval, nCls);
- auto nClsOnTrk = Monitored::Scalar<int>( "ClustersPerEventOnTrack_val", nclusters_ontrack );
- fill( clusterGroup_OnTrack, lbval, nClsOnTrk);
- for (unsigned int ii=0; ii<PixLayers::COUNT; ii++) {
- auto vals = Monitored::Scalar<float>( "ClustersPerEvent_val", nclusters_mod[ii] );
- auto vals_ontrack = Monitored::Scalar<float>( "ClustersPerEventOnTrack_val", nclusters_ontrack_mod[ii] );
- fill( pixLayersLabel[ii], vals, vals_ontrack);
+ auto nCls = Monitored::Scalar<int>("ClustersPerEvent_val", nclusters);
+ fill(clusterGroup, lbval, nCls);
+ auto nClsOnTrk = Monitored::Scalar<int>("ClustersPerEventOnTrack_val", nclusters_ontrack);
+ fill(clusterGroup_OnTrack, lbval, nClsOnTrk);
+ for (unsigned int ii = 0; ii < PixLayers::COUNT; ii++) {
+ auto vals = Monitored::Scalar<float>("ClustersPerEvent_val", nclusters_mod[ii]);
+ auto vals_ontrack = Monitored::Scalar<float>("ClustersPerEventOnTrack_val", nclusters_ontrack_mod[ii]);
+ fill(pixLayersLabel[ii], vals, vals_ontrack);
}
- if (nclusters>0) {
- auto clsFracOnTrack = Monitored::Scalar<float>( "cls_frac_ontrack", (float)nclusters_ontrack / nclusters );
+ if (nclusters > 0) {
+ auto clsFracOnTrack = Monitored::Scalar<float>("cls_frac_ontrack", (float) nclusters_ontrack / nclusters);
fill(clusterGroup_OnTrack, lbval, clsFracOnTrack);
} else {
- auto dataread_err = Monitored::Scalar<int>( "clsdataread_err", DataReadErrors::EmptyContainer );
+ auto dataread_err = Monitored::Scalar<int>("clsdataread_err", DataReadErrors::EmptyContainer);
fill(clusterGroup, dataread_err);
}
- fill1DProfLumiLayers( "ClustersPerLumi", lb, nclusters_mod);
- fill1DProfLumiLayers( "ClustersPerLumiOnTrack", lb, nclusters_ontrack_mod);
+ fill1DProfLumiLayers("ClustersPerLumi", lb, nclusters_mod);
+ fill1DProfLumiLayers("ClustersPerLumiOnTrack", lb, nclusters_ontrack_mod);
- fillFromArrays( "ClusterOccupancyPP0OnTrack", clusPerEventArray);
+ fillFromArrays("ClusterOccupancyPP0OnTrack", clusPerEventArray);
- if (ntracksPerEvent>0) {
- for (unsigned int ii=0; ii<PixLayers::COUNT; ii++) nclusters_ontrack_mod[ii]/= ntracksPerEvent; // keep as in Run 1,2
- fill1DProfLumiLayers( "NumClustersPerTrackPerLumi", lb, nclusters_ontrack_mod);
+ if (ntracksPerEvent > 0) {
+ for (unsigned int ii = 0; ii < PixLayers::COUNT; ii++) nclusters_ontrack_mod[ii] /= ntracksPerEvent; // keep as in
+ // Run 1,2
+ fill1DProfLumiLayers("NumClustersPerTrackPerLumi", lb, nclusters_ontrack_mod);
}
- //
+ //
// end cluster rate
ClusterIDs.clear();
-
+
//*******************************************************************************
//************************** End of filling Cluster Histograms ******************
//*******************************************************************************
return StatusCode::SUCCESS;
}
-
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.h b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.h
index 1009b787b341..9d8b2d989c11 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.h
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.h
@@ -1,36 +1,27 @@
/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ */
#ifndef PIXELATHCLUSTERMONTOOL_H
#define PIXELATHCLUSTERMONTOOL_H
#include "PixelAthMonitoringBase.h"
-#include "AtlasDetDescr/AtlasDetectorID.h"
-#include "InDetConditionsSummaryService/IInDetConditionsTool.h"
-#include "PixelReadoutGeometry/IPixelReadoutManager.h"
-#include "InDetPrepRawData/PixelClusterContainer.h"
-
-//------------TrackMon------------
-#include <algorithm>
#include "TrkToolInterfaces/ITrackHoleSearchTool.h"
#include "InDetTrackSelectionTool/IInDetTrackSelectionTool.h"
+#include "InDetConditionsSummaryService/IInDetConditionsTool.h"
+#include "PixelReadoutGeometry/IPixelReadoutManager.h"
+#include "InDetPrepRawData/PixelClusterContainer.h"
#include "TrkTrack/TrackCollection.h"
-#include "TrkTrackSummary/TrackSummary.h"
-#include "TrkMeasurementBase/MeasurementBase.h"
-#include "TrkRIO_OnTrack/RIO_OnTrack.h"
-#include "InDetReadoutGeometry/SiDetectorElement.h"
-#include "InDetRIO_OnTrack/SiClusterOnTrack.h"
-//for Amg::error helper function:
-#include "EventPrimitives/EventPrimitivesHelpers.h"
+
//------------------------------
class PixelID;
+class AtlasDetectorID;
namespace InDet {
class PixelCluster;
@@ -41,35 +32,40 @@ namespace Trk {
}
-class PixelAthClusterMonAlg : public PixelAthMonitoringBase {
-
- public:
-
- PixelAthClusterMonAlg( const std::string& name, ISvcLocator* pSvcLocator );
+class PixelAthClusterMonAlg: public PixelAthMonitoringBase {
+public:
+ PixelAthClusterMonAlg(const std::string& name, ISvcLocator* pSvcLocator);
virtual ~PixelAthClusterMonAlg();
virtual StatusCode initialize() override;
- virtual StatusCode fillHistograms( const EventContext& ctx ) const override;
+ virtual StatusCode fillHistograms(const EventContext& ctx) const override;
std::string findComponentString(int bec, int ld) const;
-
- private:
+private:
ServiceHandle<InDetDD::IPixelReadoutManager> m_pixelReadout
- {this, "PixelReadoutManager", "PixelReadoutManager", "Pixel readout manager" };
+ {
+ this, "PixelReadoutManager", "PixelReadoutManager", "Pixel readout manager"
+ };
ToolHandle<Trk::ITrackHoleSearchTool> m_holeSearchTool;
ToolHandle<InDet::IInDetTrackSelectionTool> m_trackSelTool;
- ToolHandle<IInDetConditionsTool> m_pixelCondSummaryTool{this, "PixelConditionsSummaryTool", "PixelConditionsSummaryTool", "Tool to retrieve Pixel Conditions summary"};
-
- const AtlasDetectorID* m_atlasid; //tracks only
- const PixelID* m_pixelid;
-
- SG::ReadHandleKey<InDet::PixelClusterContainer> m_clustersKey{this, "ClusterName", "PixelClusters", "pixel cluster data key" };
- SG::ReadHandleKey<TrackCollection> m_tracksKey{this, "TrackName", "CombinedInDetTracks", "track data key"};
-
- bool m_doOnline;
- bool m_doLumiBlock;
- bool m_doLowOccupancy;
- bool m_doHighOccupancy;
- bool m_doHeavyIonMon;
- bool m_doFEPlots;
+ ToolHandle<IInDetConditionsTool> m_pixelCondSummaryTool {
+ this, "PixelConditionsSummaryTool", "PixelConditionsSummaryTool", "Tool to retrieve Pixel Conditions summary"
+ };
+
+ const AtlasDetectorID* m_atlasid {}; //tracks only
+ const PixelID* m_pixelid {};
+
+ SG::ReadHandleKey<InDet::PixelClusterContainer> m_clustersKey {
+ this, "ClusterName", "PixelClusters", "pixel cluster data key"
+ };
+ SG::ReadHandleKey<TrackCollection> m_tracksKey {
+ this, "TrackName", "CombinedInDetTracks", "track data key"
+ };
+
+ bool m_doOnline {};
+ bool m_doLumiBlock {};
+ bool m_doLowOccupancy {};
+ bool m_doHighOccupancy {};
+ bool m_doHeavyIonMon {};
+ bool m_doFEPlots {};
};
#endif
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.cxx
index 62c6097c9914..c6a74049c754 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.cxx
@@ -1,13 +1,12 @@
/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ */
#include "PixelAthErrorMonAlg.h"
-PixelAthErrorMonAlg::PixelAthErrorMonAlg( const std::string& name, ISvcLocator* pSvcLocator ) :
+PixelAthErrorMonAlg::PixelAthErrorMonAlg(const std::string& name, ISvcLocator* pSvcLocator) :
AthMonitorAlgorithm(name, pSvcLocator),
- m_pixelid(nullptr)
-{
+ m_pixelid(nullptr) {
// jo flags
declareProperty("doOnline", m_doOnline = false);
declareProperty("doLumiBlock", m_doLumiBlock = false);
@@ -16,21 +15,18 @@ PixelAthErrorMonAlg::PixelAthErrorMonAlg( const std::string& name, ISvcLocator*
declareProperty("doHeavyIonMon", m_doHeavyIonMon = false);
}
-
PixelAthErrorMonAlg::~PixelAthErrorMonAlg() {}
StatusCode PixelAthErrorMonAlg::initialize() {
-
- ATH_CHECK( detStore()->retrieve(m_pixelid, "PixelID") );
- ATH_CHECK( m_pixelCondSummaryTool.retrieve() );
- ATH_CHECK( m_pixelReadout.retrieve() );
+ ATH_CHECK(detStore()->retrieve(m_pixelid, "PixelID"));
+ ATH_CHECK(m_pixelCondSummaryTool.retrieve());
+ ATH_CHECK(m_pixelReadout.retrieve());
return AthMonitorAlgorithm::initialize();
}
-
-StatusCode PixelAthErrorMonAlg::fillHistograms( const EventContext& ctx ) const {
+StatusCode PixelAthErrorMonAlg::fillHistograms(const EventContext& ctx) const {
using namespace Monitored;
int lb = GetEventInfo(ctx)->lumiBlock();
@@ -42,30 +38,34 @@ StatusCode PixelAthErrorMonAlg::fillHistograms( const EventContext& ctx ) const
std::vector<VecAccumulator2DMap> error_maps_per_state;
error_maps_per_state.reserve(kNumErrorStatesFEI3 + kNumErrorStatesFEI4);
for (const auto& state : error_names_stateFEI3) {
- error_maps_per_state.emplace_back( state + std::string("Map") );
+ error_maps_per_state.emplace_back(state + std::string("Map"));
}
for (const auto& state : error_names_stateFEI4) {
- error_maps_per_state.emplace_back( state + std::string("Map") );
+ error_maps_per_state.emplace_back(state + std::string("Map"));
}
- std::vector<VecAccumulator2DMap> error_maps_per_cat_rodmod;
- // only first four rodmod histos are unique, others are covered by
+ 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] );
+ for (unsigned int cat = 0; cat < ErrorCategoryRODMOD::kTruncROD + 1; ++cat) {
+ error_maps_per_cat_rodmod.emplace_back(error_names_cat_rodmod[cat]);
}
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] );
+ error_maps_per_cat.emplace_back(error_names_cat[cat]);
}
// 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};
+ int nActive_layer[PixLayers::COUNT] = {
+ 0
+ };
// Array to count number of errors occurring in all layers.
- float num_errors[PixLayers::COUNT] = {0};
+ float num_errors[PixLayers::COUNT] = {
+ 0
+ };
float num_errors_per_state[std::max(kNumErrorStatesFEI3, kNumErrorStatesFEI4)][PixLayers::COUNT] = {{0}};
// Counters for erroneous modules in a layer, per
@@ -84,16 +84,16 @@ StatusCode PixelAthErrorMonAlg::fillHistograms( const EventContext& ctx ) const
//====================================================================================
// This is an example how to read the Error informaiton.
//
- // The Error word is defined in
+ // The Error word is defined in
// InDetConditions/PixelConditionsData/PixelConditionsData/PixelByteStreamErrors.h
//
- // The IDCInDetBSErrContainer can be accessed through
- // m_pixelCondSummaryTool->getBSErrorWord(i,ctx)
+ // The IDCInDetBSErrContainer can be accessed through
+ // m_pixelCondSummaryTool->getBSErrorWord(i,ctx)
// where
// i= [ 0, 2047] : module error
// ( [0, 11] - DBMC, [12, 155] - ECC, [156, 435] - IBL,
// [436, 721] - B0, [722, 1215] - B1, [1216, 1891] - B2,
- // [1892, 2035] - ECA, [2036, 2047] - DBMA )
+ // [1892, 2035] - ECA, [2036, 2047] - DBMA )
//
// for PIXEL(FEI3):
// = [ 2048, 4095] : FE-0 error
@@ -119,14 +119,14 @@ StatusCode PixelAthErrorMonAlg::fillHistograms( const EventContext& ctx ) const
const int maxHash = m_pixelid->wafer_hash_max(); // 2048
// Loop over modules except DBM, s.a.
- for (int modHash=12; modHash<maxHash-12; modHash++) {
+ for (int modHash = 12; modHash < maxHash - 12; modHash++) {
Identifier waferID = m_pixelid->wafer_id(modHash);
- int pixlayer = getPixLayersID(m_pixelid->barrel_ec(waferID), m_pixelid->layer_disk(waferID) );
+ int pixlayer = getPixLayersID(m_pixelid->barrel_ec(waferID), m_pixelid->layer_disk(waferID));
int nFE;
bool is_fei4;
if (pixlayer == PixLayers::kIBL) {
nFE = 1; // IBL 3D
- if (m_pixelid->eta_module(waferID)>-7 && m_pixelid->eta_module(waferID)<6) nFE = 2; //IBL Planar
+ if (m_pixelid->eta_module(waferID) > -7 && m_pixelid->eta_module(waferID) < 6) nFE = 2; //IBL Planar
is_fei4 = true;
} else { // for fei3 Pixel layers
nFE = 16;
@@ -143,92 +143,88 @@ StatusCode PixelAthErrorMonAlg::fillHistograms( const EventContext& ctx ) const
// extracting ROB error information
//
- if ( PixelByteStreamErrors::hasError(mod_errorword, PixelByteStreamErrors::TruncatedROB) ) {
+ if (PixelByteStreamErrors::hasError(mod_errorword, PixelByteStreamErrors::TruncatedROB)) {
trunc_rob_errors_maps.add(pixlayer, waferID, m_pixelid, 1.0);
}
- if ( PixelByteStreamErrors::hasError(mod_errorword, PixelByteStreamErrors::MaskedROB) ) {
+ if (PixelByteStreamErrors::hasError(mod_errorword, PixelByteStreamErrors::MaskedROB)) {
masked_rob_errors_maps.add(pixlayer, waferID, m_pixelid, 1.0);
}
// getting module_error information (only fei3 layers)
//
if (!is_fei4) {
- std::bitset<kNumErrorStatesFEI3> stateFEI3 = getErrorStateFEI3Mod(mod_errorword);
- num_errors[pixlayer]+=stateFEI3.count();
+ std::bitset<kNumErrorStatesFEI3> stateFEI3 = getErrorStateFEI3Mod(mod_errorword);
+ num_errors[pixlayer] += stateFEI3.count();
for (unsigned int state = 0; state < stateFEI3.size(); ++state) {
- if (stateFEI3[state]) {
- num_errors_per_state[state][pixlayer]++;
- error_maps_per_state[state].add(pixlayer, waferID, m_pixelid, 1.0);
- }
+ if (stateFEI3[state]) {
+ num_errors_per_state[state][pixlayer]++;
+ error_maps_per_state[state].add(pixlayer, waferID, m_pixelid, 1.0);
+ }
}
fillErrorCatRODmod(mod_errorword, nerrors_cat_rodmod);
}
// getting fe_error information (all pixel layers)
//
- for (int iFE=0; iFE<nFE; iFE++) {
-
- int offsetFE = (1+iFE)*maxHash + modHash; // (FE index+1)*2048 + moduleHash
+ for (int iFE = 0; iFE < nFE; iFE++) {
+ int offsetFE = (1 + iFE) * maxHash + modHash; // (FE index+1)*2048 + moduleHash
uint64_t fe_errorword = m_pixelCondSummaryTool->getBSErrorWord(modHash, offsetFE, ctx);
fillErrorCatRODmod(fe_errorword, is_fei4, nerrors_cat_rodmod, iFE);
if (!is_fei4) {
- std::bitset<kNumErrorStatesFEI3> stateFEI3 = getErrorStateFE(fe_errorword, is_fei4);
- num_errors[pixlayer]+=stateFEI3.count();
- if ( stateFEI3.any() ) num_femcc_errwords++;
- for (unsigned int state = 0; state < stateFEI3.size(); ++state) {
- if (stateFEI3[state]) {
- num_errors_per_state[state][pixlayer]++;
- error_maps_per_state[state].add(pixlayer, waferID, m_pixelid, 1.0);
- }
- }
+ std::bitset<kNumErrorStatesFEI3> stateFEI3 = getErrorStateFE(fe_errorword, is_fei4);
+ num_errors[pixlayer] += stateFEI3.count();
+ if (stateFEI3.any()) num_femcc_errwords++;
+ for (unsigned int state = 0; state < stateFEI3.size(); ++state) {
+ if (stateFEI3[state]) {
+ num_errors_per_state[state][pixlayer]++;
+ error_maps_per_state[state].add(pixlayer, waferID, m_pixelid, 1.0);
+ }
+ }
} else {
- std::bitset<kNumErrorStatesFEI3> stateFEI4 = getErrorStateFE(fe_errorword, is_fei4);
- num_errors[pixlayer]+=stateFEI4.count();
- Identifier pixelIDperFEI4 = m_pixelReadout->getPixelIdfromHash(modHash, iFE, 1, 1);
- for (unsigned int state = 0; state < stateFEI4.size(); ++state) {
- if (stateFEI4[state]) {
- num_errors_per_state[state][pixlayer]++;
- error_maps_per_state[state+kNumErrorStatesFEI3].add(pixlayer, pixelIDperFEI4, m_pixelid, 1.0);
- }
- }
+ std::bitset<kNumErrorStatesFEI3> stateFEI4 = getErrorStateFE(fe_errorword, is_fei4);
+ num_errors[pixlayer] += stateFEI4.count();
+ Identifier pixelIDperFEI4 = m_pixelReadout->getPixelIdfromHash(modHash, iFE, 1, 1);
+ for (unsigned int state = 0; state < stateFEI4.size(); ++state) {
+ if (stateFEI4[state]) {
+ num_errors_per_state[state][pixlayer]++;
+ error_maps_per_state[state + kNumErrorStatesFEI3].add(pixlayer, pixelIDperFEI4, m_pixelid, 1.0);
+ }
+ }
}
-
} // FE loop
if (!is_fei4) femcc_errwords_maps.add(pixlayer, waferID, m_pixelid, num_femcc_errwords);
// getting error information from service records (only IBL)
//
int state_offset(8); // serviceCode part starts from state 8 of kNumErrorStatesFEI4
- const int serviceRecordFieldOffset = 17*maxHash;
+ const int serviceRecordFieldOffset = 17 * maxHash;
if (pixlayer == PixLayers::kIBL) {
- int moduleOffset = (modHash-156)*nFE;
- for (int serviceCode=0; serviceCode<32; serviceCode++) {
- // skip irrelevant SR's (as in rel21)
- if ( (serviceCode >= 9 && serviceCode <=14) || (serviceCode >=17 && serviceCode <=23) ) {
- state_offset--;
- continue;
- }
- int serviceCodeOffset = serviceCode*280*nFE;
- for (int iFE=0; iFE<nFE; iFE++) {
- Identifier pixelIDperFEI4 = m_pixelReadout->getPixelIdfromHash(modHash, iFE, 1, 1);
- // index = offset + (serviceCode)*(#IBL*nFE) + (moduleHash-156)*nFE + FE
+ int moduleOffset = (modHash - 156) * nFE;
+ for (int serviceCode = 0; serviceCode < 32; serviceCode++) {
+ // skip irrelevant SR's (as in rel21)
+ if ((serviceCode >= 9 && serviceCode <= 14) || (serviceCode >= 17 && serviceCode <= 23)) {
+ state_offset--;
+ continue;
+ }
+ int serviceCodeOffset = serviceCode * 280 * nFE;
+ for (int iFE = 0; iFE < nFE; iFE++) {
+ Identifier pixelIDperFEI4 = m_pixelReadout->getPixelIdfromHash(modHash, iFE, 1, 1);
+ // index = offset + (serviceCode)*(#IBL*nFE) + (moduleHash-156)*nFE + FE
int serviceCodeCounterIndex = serviceRecordFieldOffset + serviceCodeOffset + moduleOffset + iFE;
uint64_t serviceCodeCounter = m_pixelCondSummaryTool->getBSErrorWord(modHash, serviceCodeCounterIndex, ctx);
- if (serviceCodeCounter>0) {
-
- float payload = serviceCodeCounter; // NB: + 1, as in rel 21, is now added upstream
- flagged_ibl_error_bits.push_back(serviceCode);
- weights_of_flagged_ibl_error_bits.push_back(payload);
-
- int state = serviceCode + state_offset;
- num_errors[pixlayer] += payload;
- num_errors_per_state[state][pixlayer] += payload;
- error_maps_per_state[state+kNumErrorStatesFEI3].add(pixlayer, pixelIDperFEI4, m_pixelid, payload);
-
- fillErrorCatRODmod(serviceCode, payload, nerrors_cat_rodmod, iFE);
- }
-
+ if (serviceCodeCounter > 0) {
+ float payload = serviceCodeCounter; // NB: + 1, as in rel 21, is now added upstream
+ flagged_ibl_error_bits.push_back(serviceCode);
+ weights_of_flagged_ibl_error_bits.push_back(payload);
+
+ int state = serviceCode + state_offset;
+ num_errors[pixlayer] += payload;
+ num_errors_per_state[state][pixlayer] += payload;
+ error_maps_per_state[state + kNumErrorStatesFEI3].add(pixlayer, pixelIDperFEI4, m_pixelid, payload);
+
+ fillErrorCatRODmod(serviceCode, payload, nerrors_cat_rodmod, iFE);
+ }
} // over FE
} //over service codes
} // IBL modules
@@ -236,73 +232,74 @@ StatusCode PixelAthErrorMonAlg::fillHistograms( const EventContext& ctx ) const
// access categorized error information per module
// access categorized error information per module (for IBL - FE)
// it is only flagged - the actual number of errors per category is not tracked
- for (int iFE=0; iFE<nFE; iFE++) {
-
- if (pixlayer != PixLayers::kIBL && iFE>0) continue;
+ for (int iFE = 0; iFE < nFE; iFE++) {
+ if (pixlayer != PixLayers::kIBL && iFE > 0) continue;
Identifier pixID = waferID;
if (pixlayer == PixLayers::kIBL) {
- pixID = m_pixelReadout->getPixelIdfromHash(modHash, iFE, 1, 1);
+ pixID = m_pixelReadout->getPixelIdfromHash(modHash, iFE, 1, 1);
}
if (pixID.is_valid()) {
- for (int i = 0; i < ErrorCategoryRODMOD::COUNT; i++) {
- if (nerrors_cat_rodmod[i][iFE]) {
- if (getErrorCategory(i+1)!=99) has_err_cat[getErrorCategory(i+1)][iFE] = true;
- num_errormodules_per_cat_rodmod[i][pixlayer]++;
- if (!m_doOnline) {
- all_errors_maps.add(pixlayer, pixID, m_pixelid, nerrors_cat_rodmod[i][iFE]);
- if (i<ErrorCategoryRODMOD::kTruncROD+1) {
- error_maps_per_cat_rodmod[i].add(pixlayer, pixID, m_pixelid, 1.0);
- if (i==0) modsync_errors_maps.add(pixlayer, pixID, m_pixelid, 1.0);
- if (i==1) rodsync_errors_maps.add(pixlayer, pixID, m_pixelid, 1.0);
- }
- }
- }
- }
- for (int i = 0; i < ErrorCategory::COUNT; i++) {
- if (has_err_cat[i][iFE]) {
- num_errormodules_per_cat[i][pixlayer]++;
- if (!m_doOnline) {
- error_maps_per_cat[i].add(pixlayer, pixID, m_pixelid, 1.0);
- }
- }
- }
-
- // filling nActive modules per layer for later normalization
- // for IBL normalization is done by number of FEI4
- if ( (pixlayer != PixLayers::kIBL && m_pixelCondSummaryTool->isActive(modHash) == true) ||
- (pixlayer == PixLayers::kIBL && m_pixelCondSummaryTool->isActive(modHash, pixID) == true) ) {
- nActive_layer[pixlayer]++;
- }
+ for (int i = 0; i < ErrorCategoryRODMOD::COUNT; i++) {
+ if (nerrors_cat_rodmod[i][iFE]) {
+ if (getErrorCategory(i + 1) != 99) has_err_cat[getErrorCategory(i + 1)][iFE] = true;
+ num_errormodules_per_cat_rodmod[i][pixlayer]++;
+ if (!m_doOnline) {
+ all_errors_maps.add(pixlayer, pixID, m_pixelid, nerrors_cat_rodmod[i][iFE]);
+ if (i < ErrorCategoryRODMOD::kTruncROD + 1) {
+ error_maps_per_cat_rodmod[i].add(pixlayer, pixID, m_pixelid, 1.0);
+ if (i == 0) modsync_errors_maps.add(pixlayer, pixID, m_pixelid, 1.0);
+ if (i == 1) rodsync_errors_maps.add(pixlayer, pixID, m_pixelid, 1.0);
+ }
+ }
+ }
+ }
+ for (int i = 0; i < ErrorCategory::COUNT; i++) {
+ if (has_err_cat[i][iFE]) {
+ num_errormodules_per_cat[i][pixlayer]++;
+ if (!m_doOnline) {
+ error_maps_per_cat[i].add(pixlayer, pixID, m_pixelid, 1.0);
+ }
+ }
+ }
+
+ // filling nActive modules per layer for later normalization
+ // for IBL normalization is done by number of FEI4
+ if ((pixlayer != PixLayers::kIBL && m_pixelCondSummaryTool->isActive(modHash) == true) ||
+ (pixlayer == PixLayers::kIBL && m_pixelCondSummaryTool->isActive(modHash, pixID) == true)) {
+ nActive_layer[pixlayer]++;
+ }
} else {
- ATH_MSG_ERROR("PixelMonitoring: got invalid pixID " << pixID);
+ ATH_MSG_ERROR("PixelMonitoring: got invalid pixID " << pixID);
}
} // loop over FEs
-
} // loop over modules
// normalization by active modules (or FE's in IBL case)
//
for (int i = 0; i < PixLayers::COUNT; i++) {
- if (nActive_layer[i]>0) {
+ if (nActive_layer[i] > 0) {
for (int state = 0; state < numErrorStatesLayer[i]; state++) {
- num_errors_per_state[state][i] /= nActive_layer[i];
+ num_errors_per_state[state][i] /= nActive_layer[i];
}
for (int cat = 0; cat < ErrorCategoryRODMOD::COUNT; cat++) {
- num_errormodules_per_cat_rodmod[cat][i] /= nActive_layer[i];
+ 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];
+ num_errormodules_per_cat[cat][i] /= nActive_layer[i];
}
}
}
- for (unsigned int state = 0; state < kNumErrorStatesFEI3+kNumErrorStatesFEI4; state++) {
- if ( state < kNumErrorStatesFEI3 ) {
+ for (unsigned int state = 0; state < kNumErrorStatesFEI3 + kNumErrorStatesFEI4; state++) {
+ if (state < kNumErrorStatesFEI3) {
fill2DProfLayerAccum(error_maps_per_state[state]);
- fill1DProfLumiLayers(error_names_stateFEI3[state] + std::string("PerLumi"), lb, num_errors_per_state[state], PixLayers::NFEI3LAYERS);
+ fill1DProfLumiLayers(error_names_stateFEI3[state] + std::string(
+ "PerLumi"), lb, num_errors_per_state[state], PixLayers::NFEI3LAYERS);
} else {
fill2DProfLayerAccum(error_maps_per_state[state]);
- fill1DProfLumiLayers(error_names_stateFEI4[state-kNumErrorStatesFEI3] + std::string("PerLumi"), lb, num_errors_per_state[state-kNumErrorStatesFEI3], PixLayers::COUNT - PixLayers::NFEI3LAYERS);
+ fill1DProfLumiLayers(error_names_stateFEI4[state - kNumErrorStatesFEI3] + std::string(
+ "PerLumi"), lb, num_errors_per_state[state - kNumErrorStatesFEI3],
+ PixLayers::COUNT - PixLayers::NFEI3LAYERS);
}
}
// Fill the accumulated maps
@@ -314,7 +311,7 @@ StatusCode PixelAthErrorMonAlg::fillHistograms( const EventContext& ctx ) const
fill2DProfLayerAccum(rodsync_errors_maps);
if (!m_doOnline) {
- for (unsigned int cat = 0; cat < ErrorCategoryRODMOD::kTruncROD+1; ++cat) {
+ 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) {
@@ -324,9 +321,9 @@ StatusCode PixelAthErrorMonAlg::fillHistograms( const EventContext& ctx ) const
// Fill the luminosity error profiles for all layers.
fill1DProfLumiLayers("ErrorsPerLumi", lb, num_errors);
- 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);
+ 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);
// Fill 2D luminosity error profiles per error bit and cat split by ROD/MOD for all layers.
fill2DProfLumiLayers("ErrorStatePerLumi", lb, num_errors_per_state, numErrorStatesLayer);
@@ -345,6 +342,7 @@ StatusCode PixelAthErrorMonAlg::fillHistograms( const EventContext& ctx ) const
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;
@@ -355,82 +353,86 @@ int PixelAthErrorMonAlg::getErrorCategory(int error_cat_rodmod) const {
std::bitset<kNumErrorStatesFEI3> PixelAthErrorMonAlg::getErrorStateFEI3Mod(uint64_t errorword) const {
std::bitset<kNumErrorStatesFEI3> result(0);
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::TimeOut) ) result|= 1;
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::BCID) ) result|= 1<<1;
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::LVL1ID) ) result|= 1<<2;
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::Preamble) ) result|= 1<<3;
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::RODTrailerBitError) ) result|= 1<<14;
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::RODHeaderLimit) ) result|= 1<<15;
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::RODDataOVerflow) ) result|= 1<<16;
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::TimeOut)) result |= 1;
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::BCID)) result |= 1 << 1;
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::LVL1ID)) result |= 1 << 2;
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::Preamble)) result |= 1 << 3;
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::RODTrailerBitError)) result |= 1 << 14;
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::RODHeaderLimit)) result |= 1 << 15;
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::RODDataOVerflow)) result |= 1 << 16;
return result;
}
std::bitset<kNumErrorStatesFEI3> PixelAthErrorMonAlg::getErrorStateFE(uint64_t errorword, bool is_fei4) const {
std::bitset<kNumErrorStatesFEI3> result(0);
if (!is_fei4) {
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::MCCLVL1IDEoECheck) ) result|= 1<<4;
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::MCCBCIDEoECheck) ) result|= 1<<5;
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::MCCLVL1IDCheck) ) result|= 1<<6;
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::MCCEoEOverflow) ) result|= 1<<7;
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::MCCHitOverflow) ) result|= 1<<8;
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::FEWarning) ) result|= 1<<9;
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::FEHitParity) ) result|= 1<<10;
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::FERegisterParity) ) result|= 1<<11;
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::FEHammingCode) ) result|= 1<<12;
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::FEEoCOverflow) ) result|= 1<<13;
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::MCCLVL1IDEoECheck)) result |= 1 << 4;
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::MCCBCIDEoECheck)) result |= 1 << 5;
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::MCCLVL1IDCheck)) result |= 1 << 6;
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::MCCEoEOverflow)) result |= 1 << 7;
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::MCCHitOverflow)) result |= 1 << 8;
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::FEWarning)) result |= 1 << 9;
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::FEHitParity)) result |= 1 << 10;
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::FERegisterParity)) result |= 1 << 11;
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::FEHammingCode)) result |= 1 << 12;
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::FEEoCOverflow)) result |= 1 << 13;
} else {
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::TimeOut) ) result|= 1;
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::BCID) ) result|= 1<<1;
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::LVL1ID) ) result|= 1<<2;
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::Preamble) ) result|= 1<<3;
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::Trailer) ) result|= 1<<4;
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::Invalid) ) result|= 1<<5;
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::LinkMaskedByPPC) ) result|= 1<<6;
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::Limit) ) result|= 1<<7;
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::TimeOut)) result |= 1;
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::BCID)) result |= 1 << 1;
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::LVL1ID)) result |= 1 << 2;
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::Preamble)) result |= 1 << 3;
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::Trailer)) result |= 1 << 4;
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::Invalid)) result |= 1 << 5;
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::LinkMaskedByPPC)) result |= 1 << 6;
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::Limit)) result |= 1 << 7;
}
return result;
}
-void PixelAthErrorMonAlg::fillErrorCatRODmod(uint64_t errorword, int (&nerrors_cat_rodmod)[ErrorCategoryRODMOD::COUNT][nFEIBL2D]) const {
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::TimeOut) ) nerrors_cat_rodmod[6][0]++; // timeout errors
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::BCID) ) nerrors_cat_rodmod[1][0]++; // ROD synchronization
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::LVL1ID) ) nerrors_cat_rodmod[1][0]++; // ROD synchronization
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::Preamble) ) nerrors_cat_rodmod[4][0]++; // optical errors
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::RODHeaderLimit) ) nerrors_cat_rodmod[3][0]++; // ROD truncation
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::RODDataOVerflow) ) nerrors_cat_rodmod[3][0]++; // ROD truncation
+void PixelAthErrorMonAlg::fillErrorCatRODmod(uint64_t errorword,
+ int (&nerrors_cat_rodmod)[ErrorCategoryRODMOD::COUNT][nFEIBL2D]) const {
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::TimeOut)) nerrors_cat_rodmod[6][0]++;// timeout errors
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::BCID)) nerrors_cat_rodmod[1][0]++;// ROD synchronization
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::LVL1ID)) nerrors_cat_rodmod[1][0]++;// ROD synchronization
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::Preamble)) nerrors_cat_rodmod[4][0]++;// optical errors
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::RODHeaderLimit)) nerrors_cat_rodmod[3][0]++;// ROD truncation
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::RODDataOVerflow)) nerrors_cat_rodmod[3][0]++;// ROD truncation
}
-void PixelAthErrorMonAlg::fillErrorCatRODmod(uint64_t errorword, bool is_fei4,
- int (&nerrors_cat_rodmod)[ErrorCategoryRODMOD::COUNT][nFEIBL2D], int ife) const {
+void PixelAthErrorMonAlg::fillErrorCatRODmod(uint64_t errorword, bool is_fei4,
+ int (&nerrors_cat_rodmod)[ErrorCategoryRODMOD::COUNT][nFEIBL2D],
+ int ife) const {
if (!is_fei4) {
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::MCCLVL1IDEoECheck) ) nerrors_cat_rodmod[0][0]++; // module synchronization
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::MCCBCIDEoECheck) ) nerrors_cat_rodmod[0][0]++; // ---
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::MCCLVL1IDCheck) ) nerrors_cat_rodmod[0][0]++; // ---
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::MCCEoEOverflow) ) nerrors_cat_rodmod[2][0]++; // module truncation
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::MCCHitOverflow) ) nerrors_cat_rodmod[2][0]++; // ---
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::FEEoCOverflow) ) nerrors_cat_rodmod[2][0]++; // ---
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::FEHitParity) ) nerrors_cat_rodmod[5][0]++; // SEU (single event upset)
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::FERegisterParity) ) nerrors_cat_rodmod[5][0]++; // ---
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::FEHammingCode) ) nerrors_cat_rodmod[5][0]++; // ---
+ if (PixelByteStreamErrors::hasError(errorword,
+ PixelByteStreamErrors::MCCLVL1IDEoECheck)) nerrors_cat_rodmod[0][0]++;// module synchronization
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::MCCBCIDEoECheck)) nerrors_cat_rodmod[0][0]++; // ---
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::MCCLVL1IDCheck)) nerrors_cat_rodmod[0][0]++; // ---
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::MCCEoEOverflow)) nerrors_cat_rodmod[2][0]++;// module truncation
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::MCCHitOverflow)) nerrors_cat_rodmod[2][0]++; // ---
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::FEEoCOverflow)) nerrors_cat_rodmod[2][0]++;// ---
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::FEHitParity)) nerrors_cat_rodmod[5][0]++;// SEU (single event upset)
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::FERegisterParity)) nerrors_cat_rodmod[5][0]++;
+ // ---
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::FEHammingCode)) nerrors_cat_rodmod[5][0]++;// ---
} else {
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::TimeOut) ) nerrors_cat_rodmod[6][ife]++; // timeout errors
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::BCID) ) nerrors_cat_rodmod[1][ife]++; // ROD synchronization
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::LVL1ID) ) nerrors_cat_rodmod[1][ife]++; // ROD synchronization
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::Preamble) ) nerrors_cat_rodmod[4][ife]++; // optical errors
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::Trailer) ) nerrors_cat_rodmod[6][ife]++; // timeout errors
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::Invalid) ) nerrors_cat_rodmod[3][ife]++; // ROD truncation
- if ( PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::Limit) ) nerrors_cat_rodmod[3][ife]++; // ROD truncation
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::TimeOut)) nerrors_cat_rodmod[6][ife]++;// timeout errors
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::BCID)) nerrors_cat_rodmod[1][ife]++;// ROD synchronization
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::LVL1ID)) nerrors_cat_rodmod[1][ife]++;// ROD synchronization
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::Preamble)) nerrors_cat_rodmod[4][ife]++;// optical errors
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::Trailer)) nerrors_cat_rodmod[6][ife]++;// timeout errors
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::Invalid)) nerrors_cat_rodmod[3][ife]++;// ROD truncation
+ if (PixelByteStreamErrors::hasError(errorword, PixelByteStreamErrors::Limit)) nerrors_cat_rodmod[3][ife]++;// ROD truncation
}
}
-void PixelAthErrorMonAlg::fillErrorCatRODmod(int sc, int payload,
- int (&nerrors_cat_rodmod)[ErrorCategoryRODMOD::COUNT][nFEIBL2D], int ife) const {
-
- if (sc == 0) nerrors_cat_rodmod[0][ife]+=payload; // synchronization error (SR0:BCID counter)
- if (sc == 16) nerrors_cat_rodmod[2][ife]+=payload; // truncation error (SR16:Truncated event)
+void PixelAthErrorMonAlg::fillErrorCatRODmod(int sc, int payload,
+ int (&nerrors_cat_rodmod)[ErrorCategoryRODMOD::COUNT][nFEIBL2D],
+ int ife) const {
+ if (sc == 0) nerrors_cat_rodmod[0][ife] += payload;// synchronization error (SR0:BCID counter)
+ if (sc == 16) nerrors_cat_rodmod[2][ife] += payload;// truncation error (SR16:Truncated event)
if (sc == 1 || sc == 2 || // (SR1:Hamming code 0, SR2:Hamming code 1,
sc == 3 || sc == 24 || // SR3:Hamming code 2, SR24:Triple redundant CNFGMEM,
sc == 28 || sc == 29 || // SR28:Bit flip in CMD, SR29:Triple redundant CMD,
- sc == 31) // SR31:Triple redundant EFUSE)
- nerrors_cat_rodmod[5][ife]+=payload; // SEU error
+ sc == 31) // SR31:Triple redundant EFUSE)
+ nerrors_cat_rodmod[5][ife] += payload;// SEU error
}
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.h b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.h
index 67b0c2a257ed..cf8bcfa5e856 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.h
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.h
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ */
#ifndef PIXELATHERRORMONTOOL_H
#define PIXELATHERRORMONTOOL_H
@@ -13,68 +13,76 @@
class PixelID;
class ErrorCategory {
- public:
- enum ErrorCategoryID {kSync = 0, kTrunc, kOpt, kSeu, kTout, COUNT};
+public:
+ enum ErrorCategoryID {
+ kSync = 0, kTrunc, kOpt, kSeu, kTout, COUNT
+ };
};
class ErrorCategoryRODMOD {
- public:
- enum ErrorCategoryRODMODID {kSyncMod = 0, kSyncROD, kTruncMod, kTruncROD, kOpt, kSeu, kTout, COUNT};
+public:
+ enum ErrorCategoryRODMODID {
+ kSyncMod = 0, kSyncROD, kTruncMod, kTruncROD, kOpt, kSeu, kTout, COUNT
+ };
};
-static const int kNumErrorStatesFEI3{17};
-static const int kNumErrorStatesFEI4{27};
+static const int kNumErrorStatesFEI3 {
+ 17
+};
+static const int kNumErrorStatesFEI4 {
+ 27
+};
// error states = enumerators of PixelByteStreamErrors and FEI4 SR's we care about
//
static constexpr std::array<const char*, kNumErrorStatesFEI3> error_names_stateFEI3 {
- "RODTimeout",
- "RODSyncBCIDErrors",
- "RODSyncLVL1IDErrors",
- "OpticalErrors",
- "ModSyncLVL1IDErrors",
- "ModSyncBCID2Errors",
- "ModSyncBCID1Errors",
- "ModTruncEoEOverflowErrors",
- "ModTruncHitOverflowErrors",
- "FEWarning",
- "SEUHitParity",
- "SEURegisterParity",
- "SEUHamming",
- "ModTruncEOCErrors",
- "RODTrailerBitErrors",
- "RODTruncHTLimitErrors",
- "RODTruncRODOFErrors"
+ "RODTimeout",
+ "RODSyncBCIDErrors",
+ "RODSyncLVL1IDErrors",
+ "OpticalErrors",
+ "ModSyncLVL1IDErrors",
+ "ModSyncBCID2Errors",
+ "ModSyncBCID1Errors",
+ "ModTruncEoEOverflowErrors",
+ "ModTruncHitOverflowErrors",
+ "FEWarning",
+ "SEUHitParity",
+ "SEURegisterParity",
+ "SEUHamming",
+ "ModTruncEOCErrors",
+ "RODTrailerBitErrors",
+ "RODTruncHTLimitErrors",
+ "RODTruncRODOFErrors"
};
static constexpr std::array<const char*, kNumErrorStatesFEI4> error_names_stateFEI4 {
- "RODTimeoutErrors",
- "RODBCIDErrors",
- "RODLVL1IDErrors",
- "RODPreambleErrors",
- "RODTrailerErrors",
- "RODRowColumnErrors",
- "RODMaskedLink",
- "RODLimitErrors",
- "SR0BCIDCounterErrors",
- "SR1HammingCode0Errors",
- "SR2HammingCode1Errors",
- "SR3HammingCode2Errors",
- "SR4L1InCounterErrors",
- "SR5L1RequestCounterErrors",
- "SR6L1RegisterErrors",
- "SR7L1TriggerIDErrors",
- "SR8FEReadoutProcessErrors",
- "SR15SkipppedTrigCountErrors",
- "SR16TruncatedEventFlagErrors",
- "SR24TripleRedundantErrorsCNFGMEM",
- "SR25WriteRegDataErrors",
- "SR26AddressErrors",
- "SR27OtherCMDDecoderErrors",
- "SR28CMDDecoderBitflipErrors",
- "SR29TripleRedundantErrorsCMD",
- "SR30DataBusAddressErrors",
- "SR31TripleRedundantErrorsEFUSE"
+ "RODTimeoutErrors",
+ "RODBCIDErrors",
+ "RODLVL1IDErrors",
+ "RODPreambleErrors",
+ "RODTrailerErrors",
+ "RODRowColumnErrors",
+ "RODMaskedLink",
+ "RODLimitErrors",
+ "SR0BCIDCounterErrors",
+ "SR1HammingCode0Errors",
+ "SR2HammingCode1Errors",
+ "SR3HammingCode2Errors",
+ "SR4L1InCounterErrors",
+ "SR5L1RequestCounterErrors",
+ "SR6L1RegisterErrors",
+ "SR7L1TriggerIDErrors",
+ "SR8FEReadoutProcessErrors",
+ "SR15SkipppedTrigCountErrors",
+ "SR16TruncatedEventFlagErrors",
+ "SR24TripleRedundantErrorsCNFGMEM",
+ "SR25WriteRegDataErrors",
+ "SR26AddressErrors",
+ "SR27OtherCMDDecoderErrors",
+ "SR28CMDDecoderBitflipErrors",
+ "SR29TripleRedundantErrorsCMD",
+ "SR30DataBusAddressErrors",
+ "SR31TripleRedundantErrorsEFUSE"
};
static constexpr std::array<const char*, ErrorCategoryRODMOD::COUNT> error_names_cat_rodmod {
@@ -103,10 +111,10 @@ static constexpr std::array<const char*, ErrorCategory::COUNT> error_names_cat {
};
static constexpr std::array<const char*, ErrorCategory::COUNT> error_names_cat_norm {
- "SyncErrorsFracPerEvent",
- "TruncationErrorsFracPerEvent",
- "OpticalErrorsFracPerEvent",
- "SEUErrorsFracPerEvent",
+ "SyncErrorsFracPerEvent",
+ "TruncationErrorsFracPerEvent",
+ "OpticalErrorsFracPerEvent",
+ "SEUErrorsFracPerEvent",
"TimeoutErrorsFracPerEvent"
};
@@ -114,40 +122,44 @@ static const int numErrorStatesLayer[PixLayers::COUNT] = {
kNumErrorStatesFEI3, kNumErrorStatesFEI3, kNumErrorStatesFEI3, kNumErrorStatesFEI3,
kNumErrorStatesFEI3, kNumErrorStatesFEI4
};
-static const int kNumErrorCatRODMods{ErrorCategoryRODMOD::COUNT};
+static const int kNumErrorCatRODMods {
+ ErrorCategoryRODMOD::COUNT
+};
static const int numErrorCatRODModsLayer[PixLayers::COUNT] = {
kNumErrorCatRODMods, kNumErrorCatRODMods, kNumErrorCatRODMods, kNumErrorCatRODMods,
kNumErrorCatRODMods, kNumErrorCatRODMods
};
-static const int nFEIBL2D{2};
-
-class PixelAthErrorMonAlg : public PixelAthMonitoringBase {
+static const int nFEIBL2D {
+ 2
+};
- public:
-
- PixelAthErrorMonAlg( const std::string& name, ISvcLocator* pSvcLocator );
+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;
+ virtual StatusCode fillHistograms(const EventContext& ctx) const override;
std::string findComponentString(int bec, int ld) const;
int getErrorCategory(int error_cat_rodmod) const;
std::bitset<kNumErrorStatesFEI3> getErrorStateFEI3Mod(uint64_t errorword) const;
std::bitset<kNumErrorStatesFEI3> getErrorStateFE(uint64_t errorword, bool isibl) const;
- void fillErrorCatRODmod(uint64_t mod_errorword,
- int (&nerrors_cat_rodmod)[ErrorCategoryRODMOD::COUNT][nFEIBL2D]) const;
- void fillErrorCatRODmod(uint64_t fe_errorword, bool is_fei4,
- int (&nerrors_cat_rodmod)[ErrorCategoryRODMOD::COUNT][nFEIBL2D], int ife) const;
- void fillErrorCatRODmod(int servicecode, int payload,
- int (&nerrors_cat_rodmod)[ErrorCategoryRODMOD::COUNT][nFEIBL2D], int ife) const;
-
- private:
-
+ void fillErrorCatRODmod(uint64_t mod_errorword,
+ int (&nerrors_cat_rodmod)[ErrorCategoryRODMOD::COUNT][nFEIBL2D]) const;
+ void fillErrorCatRODmod(uint64_t fe_errorword, bool is_fei4,
+ int (&nerrors_cat_rodmod)[ErrorCategoryRODMOD::COUNT][nFEIBL2D], int ife) const;
+ void fillErrorCatRODmod(int servicecode, int payload,
+ int (&nerrors_cat_rodmod)[ErrorCategoryRODMOD::COUNT][nFEIBL2D], int ife) const;
+private:
ServiceHandle<InDetDD::IPixelReadoutManager> m_pixelReadout
- {this, "PixelReadoutManager", "PixelReadoutManager", "Pixel readout manager" };
+ {
+ this, "PixelReadoutManager", "PixelReadoutManager", "Pixel readout manager"
+ };
- ToolHandle<IInDetConditionsTool> m_pixelCondSummaryTool{this, "PixelConditionsSummaryTool",
- "PixelConditionsSummaryTool", "Tool to retrieve Pixel Conditions summary"};
+ ToolHandle<IInDetConditionsTool> m_pixelCondSummaryTool {
+ this, "PixelConditionsSummaryTool",
+ "PixelConditionsSummaryTool", "Tool to retrieve Pixel Conditions summary"
+ };
const PixelID* m_pixelid;
@@ -156,6 +168,5 @@ class PixelAthErrorMonAlg : public PixelAthMonitoringBase {
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 7ff8efee248d..91974022b1e3 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx
@@ -1,13 +1,13 @@
/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ */
#include "PixelAthHitMonAlg.h"
+#include <stdexcept>
-PixelAthHitMonAlg::PixelAthHitMonAlg( const std::string& name, ISvcLocator* pSvcLocator ) :
+PixelAthHitMonAlg::PixelAthHitMonAlg(const std::string& name, ISvcLocator* pSvcLocator) :
AthMonitorAlgorithm(name, pSvcLocator),
- m_pixelid(nullptr)
-{
+ m_pixelid(nullptr) {
//jo flags
declareProperty("doOnline", m_doOnline = false);
declareProperty("doLumiBlock", m_doLumiBlock = false);
@@ -17,113 +17,128 @@ PixelAthHitMonAlg::PixelAthHitMonAlg( const std::string& name, ISvcLocator* pSvc
declareProperty("doFEPlots", m_doFEPlots = false);
}
-
-PixelAthHitMonAlg::~PixelAthHitMonAlg() {}
-
-
StatusCode PixelAthHitMonAlg::initialize() {
-
- ATH_CHECK( detStore()->retrieve(m_pixelid, "PixelID") );
- ATH_CHECK( m_pixelCondSummaryTool.retrieve() );
- ATH_CHECK( m_pixelReadout.retrieve() );
- ATH_CHECK( m_pixelRDOName.initialize() );
+ ATH_CHECK(detStore()->retrieve(m_pixelid, "PixelID"));
+ ATH_CHECK(m_pixelCondSummaryTool.retrieve());
+ ATH_CHECK(m_pixelReadout.retrieve());
+ ATH_CHECK(m_pixelRDOName.initialize());
return AthMonitorAlgorithm::initialize();
}
-
-StatusCode PixelAthHitMonAlg::fillHistograms( const EventContext& ctx ) const {
+StatusCode PixelAthHitMonAlg::fillHistograms(const EventContext& ctx) const {
using namespace Monitored;
int lb = GetEventInfo(ctx)->lumiBlock();
- auto lbval = Monitored::Scalar<int>( "pixhitsmontool_lb", lb );
+ auto lbval = Monitored::Scalar<int>("pixhitsmontool_lb", lb);
auto hitGroup = getGroup("Hit");
unsigned int bcid = GetEventInfo(ctx)->bcid();
- auto bcidval = Monitored::Scalar<unsigned int>( "pixhitsmontool_bcid", bcid );
+ auto bcidval = Monitored::Scalar<unsigned int>("pixhitsmontool_bcid", bcid);
auto rdocontainer = SG::makeHandle(m_pixelRDOName, ctx);
- if ( !(rdocontainer.isValid()) ) {
- ATH_MSG_ERROR("Pixel Monitoring: Pixel RDO container "<< m_pixelRDOName << " could not be found.");
- auto dataread_err = Monitored::Scalar<int>( "hitdataread_err", DataReadErrors::ContainerInvalid );
+ if (!(rdocontainer.isValid())) {
+ ATH_MSG_ERROR("Pixel Monitoring: Pixel RDO container " << m_pixelRDOName << " could not be found.");
+ auto dataread_err = Monitored::Scalar<int>("hitdataread_err", DataReadErrors::ContainerInvalid);
fill(hitGroup, dataread_err);
return StatusCode::RECOVERABLE;
} else {
- ATH_MSG_DEBUG("Pixel Monitoring: Pixel RDO container "<< rdocontainer.name() <<" is found.");
+ ATH_MSG_DEBUG("Pixel Monitoring: Pixel RDO container " << rdocontainer.name() << " is found.");
}
int nhits = 0;
- float nhits_layer[PixLayers::COUNT] = {0};
+ float nhits_layer[PixLayers::COUNT] = {
+ 0
+ };
int phiMod(-99);
int etaMod(-99);
bool copyFEval(false);
- AccumulatorArrays hitsPerEventArray = { {{0}}, {{0}}, {{0}}, {{0}}, {{0}}, {{0}} };
+ AccumulatorArrays hitsPerEventArray = {{{0}}, {{0}}, {{0}}, {{0}}, {{0}}, {{0}}};
// for inactive or bad modules init corresponding arrays entries to -1
- for (auto idIt = m_pixelid->wafer_begin(); idIt!=m_pixelid->wafer_end(); ++idIt) {
- Identifier waferID = *idIt;
+ for (auto idIt = m_pixelid->wafer_begin(); idIt != m_pixelid->wafer_end(); ++idIt) {
+ Identifier waferID = *idIt;
IdentifierHash id_hash = m_pixelid->wafer_hash(waferID);
- int pixlayer = getPixLayersID(m_pixelid->barrel_ec(waferID), m_pixelid->layer_disk(waferID) );
+ int pixlayer = getPixLayersID(m_pixelid->barrel_ec(waferID), m_pixelid->layer_disk(waferID));
if (pixlayer == 99) continue;
- if (m_pixelCondSummaryTool->isActive(id_hash) == false) {
+ if (m_pixelCondSummaryTool->isActive(id_hash) == false) {
getPhiEtaMod(m_pixelid, waferID, phiMod, etaMod, copyFEval);
switch (pixlayer) {
- case PixLayers::kECA :
- hitsPerEventArray.DA[phiMod][etaMod] = -1;
- break;
- case PixLayers::kECC :
- hitsPerEventArray.DC[phiMod][etaMod] = -1;
- break;
- case PixLayers::kB0 :
- hitsPerEventArray.B0[phiMod][etaMod] = -1;
- break;
- case PixLayers::kB1 :
- hitsPerEventArray.B1[phiMod][etaMod] = -1;
- break;
- case PixLayers::kB2 :
- hitsPerEventArray.B2[phiMod][etaMod] = -1;
- break;
- case PixLayers::kIBL :
- hitsPerEventArray.IBL[phiMod][etaMod] = -1;
- if (copyFEval) hitsPerEventArray.IBL[phiMod][++etaMod] = -1;
- break;
+ case PixLayers::kECA:
+ hitsPerEventArray.DA[phiMod][etaMod] = -1;
+ break;
+
+ case PixLayers::kECC:
+ hitsPerEventArray.DC[phiMod][etaMod] = -1;
+ break;
+
+ case PixLayers::kB0:
+ hitsPerEventArray.B0[phiMod][etaMod] = -1;
+ break;
+
+ case PixLayers::kB1:
+ hitsPerEventArray.B1[phiMod][etaMod] = -1;
+ break;
+
+ case PixLayers::kB2:
+ hitsPerEventArray.B2[phiMod][etaMod] = -1;
+ break;
+
+ case PixLayers::kIBL:
+ hitsPerEventArray.IBL[phiMod][etaMod] = -1;
+ if (copyFEval) hitsPerEventArray.IBL[phiMod][++etaMod] = -1;
+ break;
}
}
}
- int nGood_layer[PixLayers::COUNT] = {0};
- int nActive_layer[PixLayers::COUNT] = {0};
- float avgocc_active_layer[PixLayers::COUNT] = {0};
- float avgocc_good_layer[PixLayers::COUNT] = {0};
- float avgocc_ratio_toIBL_layer[PixLayers::COUNT] = {0};
+ int nGood_layer[PixLayers::COUNT] = {
+ 0
+ };
+ int nActive_layer[PixLayers::COUNT] = {
+ 0
+ };
+ float avgocc_active_layer[PixLayers::COUNT] = {
+ 0
+ };
+ float avgocc_good_layer[PixLayers::COUNT] = {
+ 0
+ };
+ float avgocc_ratio_toIBL_layer[PixLayers::COUNT] = {
+ 0
+ };
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);
- int pixlayer = getPixLayersID(m_pixelid->barrel_ec(waferID), m_pixelid->layer_disk(waferID) );
+ int pixlayer = getPixLayersID(m_pixelid->barrel_ec(waferID), m_pixelid->layer_disk(waferID));
if (pixlayer == 99) continue;
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;
+ if (pixlayer == PixLayers::kIBL && m_pixelid->eta_module(waferID) > -7 &&
+ m_pixelid->eta_module(waferID) < 6) nActive_layer[pixlayer] += 2;
else nActive_layer[pixlayer]++;
-
+
if (m_pixelCondSummaryTool->isGood(id_hash) == true) {
- if (pixlayer == PixLayers::kIBL && m_pixelid->eta_module(waferID)>-7 && m_pixelid->eta_module(waferID)<6) nGood_layer[pixlayer]+=2;
- else nGood_layer[pixlayer]++;
+ if (pixlayer == PixLayers::kIBL && m_pixelid->eta_module(waferID) > -7 &&
+ m_pixelid->eta_module(waferID) < 6) nGood_layer[pixlayer] += 2;
+ else nGood_layer[pixlayer]++;
}
}
}
- const int nChannels_mod[PixLayers::COUNT] = {46080, 46080, 46080, 46080, 46080, 26880};
+ const int nChannels_mod[PixLayers::COUNT] = {
+ 46080, 46080, 46080, 46080, 46080, 26880
+ };
float nGoodChannels_total = 0.;
float nGoodChannels_layer[PixLayers::COUNT];
float nActiveChannels_layer[PixLayers::COUNT];
for (int i = 0; i < PixLayers::COUNT; i++) {
- nGoodChannels_layer[i] = 1.0 * nChannels_mod[i] * nGood_layer[i];
+ nGoodChannels_layer[i] = 1.0 * nChannels_mod[i] * nGood_layer[i];
nActiveChannels_layer[i] = 1.0 * nChannels_mod[i] * nActive_layer[i];
- nGoodChannels_total += nGoodChannels_layer[i];
+ nGoodChannels_total += nGoodChannels_layer[i];
}
//*******************************************************************************
@@ -136,8 +151,8 @@ StatusCode PixelAthHitMonAlg::fillHistograms( const EventContext& ctx ) const {
VecAccumulator2DMap HitMap("HitMap");
VecAccumulator2DMap HitFEMap("HitFEMap");
std::vector<int> hitLvl1a;
- std::unordered_map<int, std::vector<int>> hitLvl1aLayer;
- std::unordered_map<int, std::vector<int>> hitToTLayer;
+ std::unordered_map<int, std::vector<int> > hitLvl1aLayer;
+ std::unordered_map<int, std::vector<int> > hitToTLayer;
Identifier rdoID;
PixelRDO_Container::const_iterator colNext = rdocontainer->begin();
@@ -145,91 +160,105 @@ StatusCode PixelAthHitMonAlg::fillHistograms( const EventContext& ctx ) const {
DataVector<PixelRDORawData>::const_iterator p_rdo;
for (; colNext != lastCol; ++colNext) {
-
const InDetRawDataCollection<PixelRDORawData>* PixelCollection(*colNext);
if (!PixelCollection) {
ATH_MSG_DEBUG("Pixel Monitoring: Pixel Hit container is empty.");
- auto dataread_err = Monitored::Scalar<int>( "hitdataread_err", DataReadErrors::CollectionInvalid );
+ auto dataread_err = Monitored::Scalar<int>("hitdataread_err", DataReadErrors::CollectionInvalid);
fill(hitGroup, dataread_err);
continue;
}
for (p_rdo = PixelCollection->begin(); p_rdo != PixelCollection->end(); ++p_rdo) {
rdoID = (*p_rdo)->identify();
- int pixlayer = getPixLayersID(m_pixelid->barrel_ec(rdoID), m_pixelid->layer_disk(rdoID) );
+ int pixlayer = getPixLayersID(m_pixelid->barrel_ec(rdoID), m_pixelid->layer_disk(rdoID));
if (pixlayer == 99) continue;
HitMap.add(pixlayer, rdoID, m_pixelid, 1.0);
if (m_doFEPlots) HitFEMap.add(pixlayer, rdoID, m_pixelid, m_pixelReadout->getFE(rdoID, rdoID), 1.0);
nhits++;
nhits_layer[pixlayer]++;
- hitLvl1a.push_back( (*p_rdo)->getLVL1A() );
- hitLvl1aLayer[pixlayer].push_back( (*p_rdo)->getLVL1A() );
- hitToTLayer[pixlayer].push_back( (*p_rdo)->getToT() );
+ hitLvl1a.push_back((*p_rdo)->getLVL1A());
+ hitLvl1aLayer[pixlayer].push_back((*p_rdo)->getLVL1A());
+ hitToTLayer[pixlayer].push_back((*p_rdo)->getToT());
getPhiEtaMod(m_pixelid, rdoID, phiMod, etaMod, copyFEval);
switch (pixlayer) {
- case PixLayers::kECA :
- hitsPerEventArray.DA[phiMod][etaMod]++;
- break;
- case PixLayers::kECC :
- hitsPerEventArray.DC[phiMod][etaMod]++;
- break;
- case PixLayers::kB0 :
- hitsPerEventArray.B0[phiMod][etaMod]++;
- break;
- case PixLayers::kB1 :
- hitsPerEventArray.B1[phiMod][etaMod]++;
- break;
- case PixLayers::kB2 :
- hitsPerEventArray.B2[phiMod][etaMod]++;
- break;
- case PixLayers::kIBL :
- hitsPerEventArray.IBL[phiMod][etaMod]++;
- break;
+ case PixLayers::kECA:
+ hitsPerEventArray.DA[phiMod][etaMod]++;
+ break;
+
+ case PixLayers::kECC:
+ hitsPerEventArray.DC[phiMod][etaMod]++;
+ break;
+
+ case PixLayers::kB0:
+ hitsPerEventArray.B0[phiMod][etaMod]++;
+ break;
+
+ case PixLayers::kB1:
+ hitsPerEventArray.B1[phiMod][etaMod]++;
+ break;
+
+ case PixLayers::kB2:
+ hitsPerEventArray.B2[phiMod][etaMod]++;
+ break;
+
+ case PixLayers::kIBL:
+ hitsPerEventArray.IBL[phiMod][etaMod]++;
+ break;
}
}
}
- fill2DProfLayerAccum( HitMap );
- if (m_doFEPlots) fill2DProfLayerAccum( HitFEMap );
+ fill2DProfLayerAccum(HitMap);
+ if (m_doFEPlots) fill2DProfLayerAccum(HitFEMap);
- auto vals = Monitored::Collection( "Hit_LVL1A_pixel", hitLvl1a );
- fill( hitGroup, vals);
- for ( const auto& itr : hitLvl1aLayer ) {
+ auto vals = Monitored::Collection("Hit_LVL1A_pixel", hitLvl1a);
+ fill(hitGroup, vals);
+ for (const auto& itr : hitLvl1aLayer) {
int layer = itr.first;
- auto vals = Monitored::Collection( "Hit_LVL1A_layer", hitLvl1aLayer.at(layer) );
- fill( pixLayersLabel[layer], vals);
+ try {
+ //cppcheck-suppress containerOutOfBounds
+ auto vals = Monitored::Collection("Hit_LVL1A_layer", hitLvl1aLayer.at(layer));
+ fill(pixLayersLabel[layer], vals);
+ } catch (std::out_of_range& e) {
+ ATH_MSG_ERROR("Out of range access in PixelAthHitMonAlg::fillHistograms");
+ }
}
- for ( const auto& itr : hitToTLayer ) {
+ for (const auto& itr : hitToTLayer) {
int layer = itr.first;
- auto vals = Monitored::Collection( "HitToT_val", hitToTLayer.at(layer) );
- fill( pixLayersLabel[layer], vals);
+ try {
+ //cppcheck-suppress containerOutOfBounds
+ auto vals = Monitored::Collection("HitToT_val", hitToTLayer.at(layer));
+ fill(pixLayersLabel[layer], vals);
+ } catch (std::out_of_range& e) {
+ ATH_MSG_ERROR("Out of range access in PixelAthHitMonAlg::fillHistograms");
+ }
}
- auto nhitsval = Monitored::Scalar<int>( "nhits_per_event", nhits );
- fill( hitGroup, lbval, nhitsval );
- fill1DProfLumiLayers( "HitsPerLumi", lb, nhits_layer );
+ auto nhitsval = Monitored::Scalar<int>("nhits_per_event", nhits);
+ fill(hitGroup, lbval, nhitsval);
+ fill1DProfLumiLayers("HitsPerLumi", lb, nhits_layer);
- fillFromArrays( "HitOccupancyPP0", hitsPerEventArray, "OccupancyPerPixelEvent");
+ fillFromArrays("HitOccupancyPP0", hitsPerEventArray, "OccupancyPerPixelEvent");
for (int i = 0; i < PixLayers::COUNT; i++) {
- if (nGoodChannels_layer[i]>0) avgocc_good_layer[i] = nhits_layer[i] / nGoodChannels_layer[i];
- auto val = Monitored::Scalar<float>( "AvgOccPerBCID_val", avgocc_good_layer[i]);
- fill( pixLayersLabel[i], bcidval, val );
- if (nActiveChannels_layer[i]>0) avgocc_active_layer[i] = nhits_layer[i] / nActiveChannels_layer[i];
+ if (nGoodChannels_layer[i] > 0) avgocc_good_layer[i] = nhits_layer[i] / nGoodChannels_layer[i];
+ auto val = Monitored::Scalar<float>("AvgOccPerBCID_val", avgocc_good_layer[i]);
+ fill(pixLayersLabel[i], bcidval, val);
+ if (nActiveChannels_layer[i] > 0) avgocc_active_layer[i] = nhits_layer[i] / nActiveChannels_layer[i];
}
- fill1DProfLumiLayers( "AvgOccActivePerLumi", lb, avgocc_active_layer );
- fill1DProfLumiLayers( "AvgOccGoodPerLumi", lb, avgocc_good_layer );
+ fill1DProfLumiLayers("AvgOccActivePerLumi", lb, avgocc_active_layer);
+ fill1DProfLumiLayers("AvgOccGoodPerLumi", lb, avgocc_good_layer);
- if (avgocc_good_layer[PixLayers::kIBL]>0) {
+ if (avgocc_good_layer[PixLayers::kIBL] > 0) {
for (int i = 0; i < PixLayers::COUNT; i++) {
avgocc_ratio_toIBL_layer[i] = avgocc_good_layer[i] / avgocc_good_layer[PixLayers::kIBL];
}
- fill1DProfLumiLayers( "AvgOccRatioToIBLPerLumi", lb, avgocc_ratio_toIBL_layer );
+ fill1DProfLumiLayers("AvgOccRatioToIBLPerLumi", lb, avgocc_ratio_toIBL_layer);
}
- if (nhits==0) {
- auto dataread_err = Monitored::Scalar<int>( "hitdataread_err", DataReadErrors::EmptyContainer );
+ if (nhits == 0) {
+ auto dataread_err = Monitored::Scalar<int>("hitdataread_err", DataReadErrors::EmptyContainer);
fill(hitGroup, dataread_err);
}
//*******************************************************************************
@@ -238,4 +267,3 @@ StatusCode PixelAthHitMonAlg::fillHistograms( const EventContext& ctx ) const {
return StatusCode::SUCCESS;
}
-
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.h b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.h
index 8da355e8d99e..9a5fb662f380 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.h
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.h
@@ -1,48 +1,45 @@
/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ */
#ifndef PIXELATHHITMONTOOL_H
#define PIXELATHHITMONTOOL_H
#include "PixelAthMonitoringBase.h"
#include "InDetConditionsSummaryService/IInDetConditionsTool.h"
-//#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
+#include "InDetRawData/PixelRDO_Container.h"
#include "PixelReadoutGeometry/IPixelReadoutManager.h"
-#include "InDetRawData/InDetRawDataCLASS_DEF.h"
-#include "InDetRawData/InDetRawDataContainer.h"
-#include "InDetRawData/InDetTimeCollection.h"
-
class PixelID;
-class PixelRDORawData;
-
-class PixelAthHitMonAlg : public PixelAthMonitoringBase {
- public:
-
- PixelAthHitMonAlg( const std::string& name, ISvcLocator* pSvcLocator );
- virtual ~PixelAthHitMonAlg();
+class PixelAthHitMonAlg: public PixelAthMonitoringBase {
+public:
+ PixelAthHitMonAlg(const std::string& name, ISvcLocator* pSvcLocator);
+ virtual ~PixelAthHitMonAlg() = default;
virtual StatusCode initialize() override;
- virtual StatusCode fillHistograms( const EventContext& ctx ) const override;
+ virtual StatusCode fillHistograms(const EventContext& ctx) const override;
std::string findComponentString(int bec, int ld) const;
-
- private:
-
+private:
ServiceHandle<InDetDD::IPixelReadoutManager> m_pixelReadout
- {this, "PixelReadoutManager", "PixelReadoutManager", "Pixel readout manager" };
-
- ToolHandle<IInDetConditionsTool> m_pixelCondSummaryTool{this, "PixelConditionsSummaryTool", "PixelConditionsSummaryTool", "Tool to retrieve Pixel Conditions summary"};
-
- const PixelID* m_pixelid;
-
- SG::ReadHandleKey<PixelRDO_Container> m_pixelRDOName{this, "RDOName", "PixelRDOs", "rdo data key"};
-
- bool m_doOnline;
- bool m_doLumiBlock;
- bool m_doLowOccupancy;
- bool m_doHighOccupancy;
- bool m_doHeavyIonMon;
- bool m_doFEPlots;
+ {
+ this, "PixelReadoutManager", "PixelReadoutManager", "Pixel readout manager"
+ };
+
+ ToolHandle<IInDetConditionsTool> m_pixelCondSummaryTool {
+ this, "PixelConditionsSummaryTool", "PixelConditionsSummaryTool", "Tool to retrieve Pixel Conditions summary"
+ };
+
+ const PixelID* m_pixelid {};
+
+ SG::ReadHandleKey<PixelRDO_Container> m_pixelRDOName {
+ this, "RDOName", "PixelRDOs", "rdo data key"
+ };
+
+ bool m_doOnline {};
+ bool m_doLumiBlock {};
+ bool m_doLowOccupancy {};
+ bool m_doHighOccupancy {};
+ bool m_doHeavyIonMon {};
+ bool m_doFEPlots {};
};
#endif
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthMonitoringBase.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthMonitoringBase.cxx
index 539f12bee3e2..b51c37f6c89b 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthMonitoringBase.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthMonitoringBase.cxx
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ */
#include "PixelAthMonitoringBase.h"
@@ -9,8 +9,8 @@
///
/// helper class to accumulate points to fill a 2D per-module plot with
///
-void PixelAthMonitoringBase::VecAccumulator2DMap::add( const int layer, const Identifier& id,
- const PixelID* pid, float value ) {
+void PixelAthMonitoringBase::VecAccumulator2DMap::add(const int layer, const Identifier& id,
+ const PixelID* pid, float value) {
m_pm[layer].push_back(pid->phi_module(id));
int ld = pid->layer_disk(id);
int em = ld;
@@ -23,48 +23,46 @@ void PixelAthMonitoringBase::VecAccumulator2DMap::add( const int layer, const Id
int feid = 0;
int emf = 0;
if (em < -6) {
- emf = em - 6;
+ emf = em - 6;
} else if (em > -7 && em < 6) {
- if (pid->eta_index(id) >= 80) feid = 1;
- emf = 2 * em + feid;
- copy = true;
+ if (pid->eta_index(id) >= 80) feid = 1;
+ emf = 2 * em + feid;
+ copy = true;
} else {
- emf = em + 6;
+ emf = em + 6;
}
em = emf;
}
}
m_em[layer].push_back(em);
-
+
if (m_copy2DFEval && copy) {
++em;
m_pm[layer].push_back(pid->phi_module(id));
m_em[layer].push_back(em);
m_val[layer].push_back(value);
- }
+ }
}
//////////////////////////////////////////////
///
/// helper class to accumulate points to fill a 2D per-FE plot with
///
-void PixelAthMonitoringBase::VecAccumulator2DMap::add( const int layer, const Identifier& id,
- const PixelID* pid, int iFE, float value ) {
-
+void PixelAthMonitoringBase::VecAccumulator2DMap::add(const int layer, const Identifier& id,
+ const PixelID* pid, int iFE, float value) {
// value
m_val[layer].push_back(value);
// for old pixel see https://twiki.cern.ch/twiki/pub/Atlas/PixelCOOLoffline/pixel_modules_sketch.png
- //
+ //
// phi (Y) coordinate
- if ( layer == PixLayers::kIBL )
- m_pm[layer].push_back( pid->phi_module(id) );
+ if (layer == PixLayers::kIBL) m_pm[layer].push_back(pid->phi_module(id));
else {
- if ( (layer == PixLayers::kECA || layer == PixLayers::kECC) && ( pid->phi_module(id) % 2 == 0 ) ) {
+ if ((layer == PixLayers::kECA || layer == PixLayers::kECC) && (pid->phi_module(id) % 2 == 0)) {
// even disk modules
- m_pm[layer].push_back( pid->phi_module(id)*2 + iFE/8 );
- } else {
- m_pm[layer].push_back( pid->phi_module(id)*2 + 1 - iFE/8 );
+ m_pm[layer].push_back(pid->phi_module(id) * 2 + iFE / 8);
+ } else {
+ m_pm[layer].push_back(pid->phi_module(id) * 2 + 1 - iFE / 8);
}
}
// eta (X) coordinate
@@ -72,27 +70,27 @@ void PixelAthMonitoringBase::VecAccumulator2DMap::add( const int layer, const Id
int em(0);
// endcaps
em = ld * 8;
- if (iFE<8) em+= ( 7 - iFE%8 );
- else em+= iFE%8;
+ if (iFE < 8) em += (7 - iFE % 8);
+ else em += iFE % 8;
// barrel
//
- if (pid->barrel_ec(id) == 0) {
+ if (pid->barrel_ec(id) == 0) {
if (ld == 0) { //ibl
em = pid->eta_module(id);
int emf;
if (em < -6) {
- emf = em - 6;
+ emf = em - 6;
} else if (em > -7 && em < 6) {
- emf = 2 * em + iFE;
+ emf = 2 * em + iFE;
} else {
- emf = em + 6;
+ emf = em + 6;
}
em = emf;
} else {
em = pid->eta_module(id) * 8 - 4;
- if (iFE<8) em+= ( 7 - iFE%8 );
- else em+= iFE%8;
+ if (iFE < 8) em += (7 - iFE % 8);
+ else em += iFE % 8;
}
} // end barrel
m_em[layer].push_back(em);
@@ -102,163 +100,169 @@ void PixelAthMonitoringBase::VecAccumulator2DMap::add( const int layer, const Id
///
/// take VecAccumulator2DMap and fill the corresponding group
///
-void PixelAthMonitoringBase::fill2DProfLayerAccum( const VecAccumulator2DMap& accumulator ) const {
+void PixelAthMonitoringBase::fill2DProfLayerAccum(const VecAccumulator2DMap& accumulator) const {
// iterate over all actually filled layers
- for ( const auto& itr : accumulator.m_pm ) {
+ for (const auto& itr : accumulator.m_pm) {
// Define the monitored variables
int layer = itr.first;
- auto pm = Monitored::Collection(accumulator.m_prof2Dname + "_pm", accumulator.m_pm.at(layer));
+ auto pm = Monitored::Collection(accumulator.m_prof2Dname + "_pm", accumulator.m_pm.at(layer));
auto val = Monitored::Collection(accumulator.m_prof2Dname + "_val", accumulator.m_val.at(layer));
- auto em = Monitored::Collection(accumulator.m_prof2Dname + "_em", accumulator.m_em.at(layer));
+ auto em = Monitored::Collection(accumulator.m_prof2Dname + "_em", accumulator.m_em.at(layer));
fill(pixLayersLabel[layer], pm, em, val);
}
}
-
+
///
/// filling 1DProf per-lumi per-layer histograms ["ECA","ECC","B0","B1","B2","IBL"]
///
-void PixelAthMonitoringBase::fill1DProfLumiLayers( const std::string& prof1Dname, int lumiblock, float* values, int nlayers) const {
- ATH_MSG_VERBOSE( "in fill1DProfLumiLayers()" );
+void PixelAthMonitoringBase::fill1DProfLumiLayers(const std::string& prof1Dname, int lumiblock, float* values,
+ int nlayers) const {
+ ATH_MSG_VERBOSE("in fill1DProfLumiLayers()");
// Define the monitored variables
- auto lb = Monitored::Scalar<int>( prof1Dname + "_lb", lumiblock );
- auto val = Monitored::Scalar<float>( prof1Dname + "_val", 1.0);
+ auto lb = Monitored::Scalar<int>(prof1Dname + "_lb", lumiblock);
+ auto val = Monitored::Scalar<float>(prof1Dname + "_val", 1.0);
int i_start = 0;
- int i_end = PixLayers::COUNT;
+ int i_end = PixLayers::COUNT;
if (nlayers == PixLayers::NFEI3LAYERS) i_end = nlayers;
if (nlayers == PixLayers::COUNT - PixLayers::NFEI3LAYERS) i_start = PixLayers::NFEI3LAYERS;
for (int i = i_start; i < i_end; i++) {
val = values[i];
- fill( pixLayersLabel[i], lb, val);
+ fill(pixLayersLabel[i], lb, val);
}
}
+
//////////////////////////////////////////////
///
/// filling 2DProf per-lumi per-layer histograms ["ECA","ECC","B0","B1","B2","IBL"]
///
-void PixelAthMonitoringBase::fill2DProfLumiLayers( const std::string& prof2Dname, int lumiblock, float(*values)[PixLayers::COUNT], const int* nCategories) const {
- ATH_MSG_VERBOSE( "in fill2DProfLumiLayers()" );
+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");
+ 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);
+ fill(pixLayersLabel[i], lb, cat, val);
}
}
}
+
//////////////////////////////////////////////
///
/// filling 1DProfile per-pp0(ROD) histograms for ["ECA","ECC","B0","B1","B2","IBLA","IBLC"]
///
-void PixelAthMonitoringBase::fillFromArrays( const std::string& namePP0, AccumulatorArrays& pixarrays, const std::string& name2DMap) const {
- ATH_MSG_VERBOSE( "in fillFromArrays()" );
+void PixelAthMonitoringBase::fillFromArrays(const std::string& namePP0, AccumulatorArrays& pixarrays,
+ const std::string& name2DMap) const {
+ ATH_MSG_VERBOSE("in fillFromArrays()");
- const float weightPix = 1.0 / 46080.0;
- const float weightIBL = 1.0 / 26880.0;
+ const float weightPix = 1.0 / 46080.0;
+ const float weightIBL = 1.0 / 26880.0;
bool fillPP0only(name2DMap == "");
std::string pospp0varx = namePP0 + "_pospp0x";
- std::string valvarp = namePP0 + "_val";
- std::string posvarx = name2DMap + "_em";
- std::string posvary = name2DMap + "_pm";
- std::string valvarm = name2DMap + "_val";
+ std::string valvarp = namePP0 + "_val";
+ std::string posvarx = name2DMap + "_em";
+ std::string posvary = name2DMap + "_pm";
+ std::string valvarm = name2DMap + "_val";
for (unsigned int a = 0; a < PixMon::kNumModulesDisk; ++a) {
- auto posy = Monitored::Scalar<int>( posvary, a);
+ auto posy = Monitored::Scalar<int>(posvary, a);
for (unsigned int b = 0; b < PixMon::kNumLayersDisk; ++b) {
// to find out (and fill together into one PP0-histogram bin)
// array content of the modules belonging to the same sector (or PP0)
// the translation (a-1)/6 is used
// to show PP0 values from other disks of the same endcap
- // in the same plot
+ // in the same plot
// the shift (b-1)*8 applies per disk counter b
// (there are in total 8 sectors/disk)
- auto pospp0x = Monitored::Scalar<int>( pospp0varx, a/6 + b*8);
- auto posx = Monitored::Scalar<int>( posvarx, b);
- auto valp = Monitored::Scalar<float>( valvarp, pixarrays.DA[a][b]);
- auto valm = Monitored::Scalar<float>( valvarm, pixarrays.DA[a][b]*weightPix);
- if (pixarrays.DA[a][b]>-1) {
- fill("ECA", pospp0x, valp);
- if (!fillPP0only) fill("ECA", posx, posy, valm);
+ auto pospp0x = Monitored::Scalar<int>(pospp0varx, a / 6 + b * 8);
+ auto posx = Monitored::Scalar<int>(posvarx, b);
+ auto valp = Monitored::Scalar<float>(valvarp, pixarrays.DA[a][b]);
+ auto valm = Monitored::Scalar<float>(valvarm, pixarrays.DA[a][b] * weightPix);
+ if (pixarrays.DA[a][b] > -1) {
+ fill("ECA", pospp0x, valp);
+ if (!fillPP0only) fill("ECA", posx, posy, valm);
}
valp = pixarrays.DC[a][b];
- valm = pixarrays.DC[a][b]*weightPix;
- if (pixarrays.DC[a][b]>-1) {
- fill("ECC", pospp0x, valp);
- if (!fillPP0only) fill("ECC", posx, posy, valm);
- }
+ valm = pixarrays.DC[a][b] * weightPix;
+ if (pixarrays.DC[a][b] > -1) {
+ fill("ECC", pospp0x, valp);
+ if (!fillPP0only) fill("ECC", posx, posy, valm);
+ }
}
}
for (unsigned int b = 0; b < PixMon::kNumModulesBarrel; ++b) {
// translating array index into old Pixel module eta on a stave
- // i.e. 0..12 into -6..6 so that standard per-layer histograms
+ // i.e. 0..12 into -6..6 so that standard per-layer histograms
// declared by define2DProfHist method can be filled
- auto posx = Monitored::Scalar<int>( posvarx, b-6);
+ auto posx = Monitored::Scalar<int>(posvarx, b - 6);
for (unsigned int a = 0; a < PixMon::kNumStavesL0; ++a) {
- auto posy = Monitored::Scalar<int>( posvary, a);
- auto pospp0x = Monitored::Scalar<int>( pospp0varx, a);
- auto valp = Monitored::Scalar<float>( valvarp, pixarrays.B0[a][b]);
- auto valm = Monitored::Scalar<float>( valvarm, pixarrays.B0[a][b]*weightPix);
- if (pixarrays.B0[a][b]>-1) {
- fill("B0", pospp0x, valp);
- if (!fillPP0only) fill("B0", posx, posy, valm);
+ auto posy = Monitored::Scalar<int>(posvary, a);
+ auto pospp0x = Monitored::Scalar<int>(pospp0varx, a);
+ auto valp = Monitored::Scalar<float>(valvarp, pixarrays.B0[a][b]);
+ auto valm = Monitored::Scalar<float>(valvarm, pixarrays.B0[a][b] * weightPix);
+ if (pixarrays.B0[a][b] > -1) {
+ fill("B0", pospp0x, valp);
+ if (!fillPP0only) fill("B0", posx, posy, valm);
}
}
for (unsigned int a = 0; a < PixMon::kNumStavesL1; ++a) {
- auto posy = Monitored::Scalar<int>( posvary, a);
- auto pospp0x = Monitored::Scalar<int>( pospp0varx, a);
- auto valp = Monitored::Scalar<float>( valvarp, pixarrays.B1[a][b]);
- auto valm = Monitored::Scalar<float>( valvarm, pixarrays.B1[a][b]*weightPix);
- if (pixarrays.B1[a][b]>-1) {
- fill("B1", pospp0x, valp);
- if (!fillPP0only) fill("B1", posx, posy, valm);
+ auto posy = Monitored::Scalar<int>(posvary, a);
+ auto pospp0x = Monitored::Scalar<int>(pospp0varx, a);
+ auto valp = Monitored::Scalar<float>(valvarp, pixarrays.B1[a][b]);
+ auto valm = Monitored::Scalar<float>(valvarm, pixarrays.B1[a][b] * weightPix);
+ if (pixarrays.B1[a][b] > -1) {
+ fill("B1", pospp0x, valp);
+ if (!fillPP0only) fill("B1", posx, posy, valm);
}
}
for (unsigned int a = 0; a < PixMon::kNumStavesL2; ++a) {
- auto posy = Monitored::Scalar<int>( posvary, a);
- auto pospp0x = Monitored::Scalar<int>( pospp0varx, a);
- auto valp = Monitored::Scalar<float>( valvarp, pixarrays.B2[a][b]);
- auto valm = Monitored::Scalar<float>( valvarm, pixarrays.B2[a][b]*weightPix);
- if (pixarrays.B2[a][b]>-1) {
- fill("B2", pospp0x, valp);
- if (!fillPP0only) fill("B2", posx, posy, valm);
+ auto posy = Monitored::Scalar<int>(posvary, a);
+ auto pospp0x = Monitored::Scalar<int>(pospp0varx, a);
+ auto valp = Monitored::Scalar<float>(valvarp, pixarrays.B2[a][b]);
+ auto valm = Monitored::Scalar<float>(valvarm, pixarrays.B2[a][b] * weightPix);
+ if (pixarrays.B2[a][b] > -1) {
+ fill("B2", pospp0x, valp);
+ if (!fillPP0only) fill("B2", posx, posy, valm);
}
}
}
unsigned int nbina = PixMon::kNumStavesIBL;
unsigned int nbinb = PixMon::kNumFEsIBL;
for (unsigned int a = 0; a < nbina; ++a) {
- auto posy = Monitored::Scalar<int>( posvary, a);
- auto pospp0x = Monitored::Scalar<int>( pospp0varx, a);
+ auto posy = Monitored::Scalar<int>(posvary, a);
+ auto pospp0x = Monitored::Scalar<int>(pospp0varx, a);
for (unsigned int b = 0; b < nbinb; ++b) {
// translating array index into IBL frontend eta on a stave
- // i.e. 0..31 into -16..15 so that standard per-layer histograms
- // declared by define2DProfHist method can be filled
- auto posx = Monitored::Scalar<int>( posvarx, b-16);
- auto valp = Monitored::Scalar<float>( valvarp, pixarrays.IBL[a][b]);
- auto valm = Monitored::Scalar<float>( valvarm, pixarrays.IBL[a][b]*weightIBL);
- if (pixarrays.IBL[a][b]>-1) {
- if ( b > (0.5*nbinb-1) ) {
- fill("IBLA", pospp0x, valp);
- } else {
- fill("IBLC", pospp0x, valp);
- }
- if (!fillPP0only) fill("IBL", posx, posy, valm);
+ // i.e. 0..31 into -16..15 so that standard per-layer histograms
+ // declared by define2DProfHist method can be filled
+ auto posx = Monitored::Scalar<int>(posvarx, b - 16);
+ auto valp = Monitored::Scalar<float>(valvarp, pixarrays.IBL[a][b]);
+ auto valm = Monitored::Scalar<float>(valvarm, pixarrays.IBL[a][b] * weightIBL);
+ if (pixarrays.IBL[a][b] > -1) {
+ if (b > (0.5 * nbinb - 1)) {
+ fill("IBLA", pospp0x, valp);
+ } else {
+ fill("IBLC", pospp0x, valp);
+ }
+ if (!fillPP0only) fill("IBL", posx, posy, valm);
}
}
}
}
+
//////////////////////////////////////////////
@@ -267,18 +271,20 @@ void PixelAthMonitoringBase::fillFromArrays( const std::string& namePP0, Accumul
///
int PixelAthMonitoringBase::getPixLayersID(int ec, int ld) const {
int layer = 99;
+
if (ec == 2) {
layer = PixLayers::kECA;
} else if (ec == -2) {
layer = PixLayers::kECC;
} else if (ec == 0) {
- if (ld == 0) layer = PixLayers::kIBL;
- if (ld == 1) layer = PixLayers::kB0;
- if (ld == 2) layer = PixLayers::kB1;
- if (ld == 3) layer = PixLayers::kB2;
+ if (ld == 0) layer = PixLayers::kIBL;
+ if (ld == 1) layer = PixLayers::kB0;
+ if (ld == 2) layer = PixLayers::kB1;
+ if (ld == 3) layer = PixLayers::kB2;
}
return layer;
}
+
//////////////////////////////////////////////
///
@@ -286,22 +292,24 @@ int PixelAthMonitoringBase::getPixLayersID(int ec, int ld) const {
///
int PixelAthMonitoringBase::getNumberOfFEs(int pixlayer, int etaMod) const {
int nFE(16);
+
if (pixlayer == PixLayers::kIBL) {
nFE = 1; // IBL 3D
- if (etaMod>-7 && etaMod<6) nFE = 2; // IBL Planar
+ if (etaMod > -7 && etaMod < 6) nFE = 2; // IBL Planar
}
return nFE;
}
+
//////////////////////////////////////////////
///
/// helper function to get eta phi coordinates of per-layer arrays
///
-void PixelAthMonitoringBase::getPhiEtaMod(const PixelID* pid, Identifier& id, int& phiMod, int& etaMod, bool& copyFE) const {
-
+void PixelAthMonitoringBase::getPhiEtaMod(const PixelID* pid, Identifier& id, int& phiMod, int& etaMod,
+ bool& copyFE) const {
phiMod = pid->phi_module(id);
-
+
int layerDisk = pid->layer_disk(id);
etaMod = layerDisk;
copyFE = false;
@@ -309,18 +317,18 @@ void PixelAthMonitoringBase::getPhiEtaMod(const PixelID* pid, Identifier& id, in
etaMod = pid->eta_module(id);
if (layerDisk == 0) {
if (etaMod < -6) {
- etaMod = etaMod - 6;
+ etaMod = etaMod - 6;
} else if (etaMod > -7 && etaMod < 6) {
- int feid = 0;
- if (pid->eta_index(id) >= 80) feid = 1;
- etaMod = 2 * etaMod + feid;
- copyFE = true;
+ int feid = 0;
+ if (pid->eta_index(id) >= 80) feid = 1;
+ etaMod = 2 * etaMod + feid;
+ copyFE = true;
} else {
- etaMod = etaMod + 6;
+ etaMod = etaMod + 6;
}
etaMod = etaMod + 16;
} else etaMod = etaMod + 6;
- }
+ }
}
//////////////////////////////////////////////
@@ -328,9 +336,12 @@ void PixelAthMonitoringBase::getPhiEtaMod(const PixelID* pid, Identifier& id, in
/// checks if hit is on track
///
-bool PixelAthMonitoringBase::isHitOnTrack(Identifier id, std::vector<Identifier> const &RDOIDs) const {
- return binary_search(RDOIDs.begin(), RDOIDs.end(), id);;
+bool PixelAthMonitoringBase::isHitOnTrack(Identifier id, std::vector<Identifier> const& RDOIDs) const {
+ return binary_search(RDOIDs.begin(), RDOIDs.end(), id);
+
+ ;
}
+
//////////////////////////////////////////////
@@ -338,23 +349,33 @@ bool PixelAthMonitoringBase::isHitOnTrack(Identifier id, std::vector<Identifier>
/// checks if cluster is on track
///
-bool PixelAthMonitoringBase::isClusterOnTrack(Identifier id, std::vector<std::pair<Identifier, double> > const &ClusterIDs) const {
+bool PixelAthMonitoringBase::isClusterOnTrack(Identifier id, std::vector<std::pair<Identifier,
+ double> > const& ClusterIDs) const {
bool onTrack = false;
+
std::pair<Identifier, double> searchVal = std::make_pair(id, -1.0);
onTrack = std::binary_search(ClusterIDs.begin(), ClusterIDs.end(), searchVal,
- [](std::pair<Identifier, double> l, std::pair<Identifier, double> r) -> bool { return l.first < r.first; });
+ [](std::pair<Identifier, double> l, std::pair<Identifier, double> r) -> bool {
+ return l.first < r.first;
+ });
return onTrack;
}
+
//////////////////////////////////////////////
///
/// checks if cluster is on track and returns its cosalpha
///
-bool PixelAthMonitoringBase::isClusterOnTrack(Identifier id, std::vector<std::pair<Identifier, double> > const &ClusterIDs, double& cosalpha) const {
+bool PixelAthMonitoringBase::isClusterOnTrack(Identifier id, std::vector<std::pair<Identifier,
+ double> > const& ClusterIDs,
+ double& cosalpha) const {
bool onTrack(false);
+
std::pair<Identifier, double> searchVal = std::make_pair(id, -1.0);
auto it = std::lower_bound(ClusterIDs.begin(), ClusterIDs.end(), searchVal,
- [](std::pair<Identifier, double> l, std::pair<Identifier, double> r) -> bool { return l.first < r.first; });
+ [](std::pair<Identifier, double> l, std::pair<Identifier, double> r) -> bool {
+ return l.first < r.first;
+ });
if (it != ClusterIDs.end() && !(id < (*it).first)) {
onTrack = true;
@@ -362,4 +383,5 @@ bool PixelAthMonitoringBase::isClusterOnTrack(Identifier id, std::vector<std::pa
}
return onTrack;
}
+
//////////////////////////////////////////////
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthMonitoringBase.h b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthMonitoringBase.h
index 3b0ad1caef21..b1c5c317303b 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthMonitoringBase.h
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthMonitoringBase.h
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ */
#ifndef PIXELATHMONITORINGBASE_H
#define PIXELATHMONITORINGBASE_H
@@ -13,64 +13,100 @@
class PixelID;
class PixLayers {
- public:
- enum PixLayersID {kECA = 0, kECC, kB0, kB1, kB2, kIBL, NFEI3LAYERS=kIBL, COUNT};
+public:
+ enum PixLayersID {
+ kECA = 0, kECC, kB0, kB1, kB2, kIBL, NFEI3LAYERS=kIBL, COUNT
+ };
};
class DataReadErrors {
- public:
- enum DataReadErrorsID {ContainerInvalid = 0, CollectionInvalid, EmptyContainer, COUNT};
+public:
+ enum DataReadErrorsID {
+ ContainerInvalid = 0, CollectionInvalid, EmptyContainer, COUNT
+ };
+};
+const std::string pixLayersLabel[PixLayers::COUNT] = {
+ "ECA", "ECC", "B0", "B1", "B2", "IBL"
+};
+const float inv_nmod_per_layer[PixLayers::COUNT] = {
+ 1. / 144., 1. / 144., 1. / 286., 1. / 494., 1. / 676., 1. / 448.
+};
+const int clusterToTMinCut[PixLayers::COUNT] = {
+ 15, 15, 15, 15, 15, 4
};
-const std::string pixLayersLabel[PixLayers::COUNT] = {"ECA", "ECC", "B0", "B1", "B2", "IBL"};
-const float inv_nmod_per_layer[PixLayers::COUNT] = {1./144., 1./144., 1./286., 1./494., 1./676., 1./448.};
-const int clusterToTMinCut[PixLayers::COUNT] = {15, 15, 15, 15, 15, 4};
namespace PixMon {
- const unsigned int kNumLayersDisk{3};
- const unsigned int kNumStavesIBL{14};
- const unsigned int kNumStavesL0{22};
- const unsigned int kNumStavesL1{38};
- const unsigned int kNumStavesL2{52};
-
- const unsigned int kNumFEsIBL{32};
- const unsigned int kNumModulesIBL{20};
- const unsigned int kNumModulesIBL2D{12};
- const unsigned int kNumModulesIBL3D{8};
- const unsigned int kNumModulesBarrel{13};
- const unsigned int kNumModulesDisk{48};
- const unsigned int kNumPP0sEC{24};
-}
+ const unsigned int kNumLayersDisk {
+ 3
+ };
+ const unsigned int kNumStavesIBL {
+ 14
+ };
+ const unsigned int kNumStavesL0 {
+ 22
+ };
+ const unsigned int kNumStavesL1 {
+ 38
+ };
+ const unsigned int kNumStavesL2 {
+ 52
+ };
-class PixelAthMonitoringBase : public virtual AthMonitorAlgorithm {
+ const unsigned int kNumFEsIBL {
+ 32
+ };
+ const unsigned int kNumModulesIBL {
+ 20
+ };
+ const unsigned int kNumModulesIBL2D {
+ 12
+ };
+ const unsigned int kNumModulesIBL3D {
+ 8
+ };
+ const unsigned int kNumModulesBarrel {
+ 13
+ };
+ const unsigned int kNumModulesDisk {
+ 48
+ };
+ const unsigned int kNumPP0sEC {
+ 24
+ };
+}
- public:
- void fill1DProfLumiLayers( const std::string& prof1Dname, int lb, float* weights, int nlayers = PixLayers::COUNT ) const;
- void fill2DProfLumiLayers( const std::string& prof2Dname, int lb, float (*weights)[PixLayers::COUNT], const int* nCategories ) const;
+class PixelAthMonitoringBase: public virtual AthMonitorAlgorithm {
+public:
+ void fill1DProfLumiLayers(const std::string& prof1Dname, int lb, float* weights,
+ int nlayers = PixLayers::COUNT) const;
+ void fill2DProfLumiLayers(const std::string& prof2Dname, int lb, float (*weights)[PixLayers::COUNT],
+ const int* nCategories) const;
int getPixLayersID(int ec, int ld) const;
int getNumberOfFEs(int pixlayer, int etaMod) const;
void getPhiEtaMod(const PixelID* pid, Identifier& id, int& phiMod, int& etaMod, bool& copyFE) const;
- bool isHitOnTrack(Identifier id, std::vector<Identifier> const &RDOIDs) const;
- bool isClusterOnTrack(Identifier id, std::vector<std::pair<Identifier, double> > const &ClusterIDs) const;
- bool isClusterOnTrack(Identifier id, std::vector<std::pair<Identifier, double> > const &ClusterIDs, double& cosalpha) const;
+ bool isHitOnTrack(Identifier id, std::vector<Identifier> const& RDOIDs) const;
+ bool isClusterOnTrack(Identifier id, std::vector<std::pair<Identifier, double> > const& ClusterIDs) const;
+ bool isClusterOnTrack(Identifier id, std::vector<std::pair<Identifier, double> > const& ClusterIDs,
+ double& cosalpha) const;
/// helper class to accumulate points to fill a 2D plot with
struct VecAccumulator2DMap {
- std::unordered_map<int, std::vector<int>> m_pm;
- std::unordered_map<int, std::vector<int>> m_em;
- std::unordered_map<int, std::vector<float>> m_val;
+ std::unordered_map<int, std::vector<int> > m_pm;
+ std::unordered_map<int, std::vector<int> > m_em;
+ std::unordered_map<int, std::vector<float> > m_val;
bool m_copy2DFEval;
std::string m_prof2Dname;
- VecAccumulator2DMap( const std::string& prof2Dname, bool copy2DFEval = false )
+ VecAccumulator2DMap(const std::string& prof2Dname, bool copy2DFEval = false)
: m_copy2DFEval(copy2DFEval)
, m_prof2Dname(prof2Dname) {}
-
- void add( const int layer, const Identifier& id,
- const PixelID* pid, float value=1.0 );
- void add( const int layer, const Identifier& id,
- const PixelID* pid, int iFE, float value);
+
+ void add(const int layer, const Identifier& id,
+ const PixelID* pid, float value = 1.0);
+ void add(const int layer, const Identifier& id,
+ const PixelID* pid, int iFE, float value);
};
- void fill2DProfLayerAccum( const VecAccumulator2DMap& accumulator ) const;
+ void fill2DProfLayerAccum(const VecAccumulator2DMap& accumulator) const;
struct AccumulatorArrays {
int DA[PixMon::kNumModulesDisk][PixMon::kNumLayersDisk];
@@ -79,9 +115,9 @@ class PixelAthMonitoringBase : public virtual AthMonitorAlgorithm {
int B1[PixMon::kNumStavesL1][PixMon::kNumModulesBarrel];
int B2[PixMon::kNumStavesL2][PixMon::kNumModulesBarrel];
int IBL[PixMon::kNumStavesIBL][PixMon::kNumFEsIBL];
- };
- void fillFromArrays( const std::string& namePP0, AccumulatorArrays& pixarrays, const std::string& name2DMap="" ) const;
-
+ };
+ void fillFromArrays(const std::string& namePP0, AccumulatorArrays& pixarrays,
+ const std::string& name2DMap = "") const;
};
#endif
--
GitLab
From b505c2eabf4136a8408ba080bb3e6613e0be42b6 Mon Sep 17 00:00:00 2001
From: Adam Edward Barton <adam.edward.barton@cern.ch>
Date: Mon, 23 Aug 2021 16:33:15 +0000
Subject: [PATCH 240/272] Find single char in string 4
---
.../DataQualityInterfaces/src/HanOutput.cxx | 2 +-
.../AthenaPOOL/RootFileTools/src/merge.cxx | 2 +-
.../CoolConvUtilities/src/AtlCoolCopy.cxx | 2 +-
Database/IOVDbSvc/src/CrestFunctions.cxx | 2 +-
.../src/DataHeaderCnv.cxx | 2 +-
.../TRT_CalibAlgs/share/CalibrateTRT.cpp | 6 +--
.../TRT_CalibTools/src/Calibrator.cxx | 46 ++++++++--------
.../TRT_CalibTools/src/Calibrator.h | 4 +-
.../TRT_CalibTools/src/TRTCalibrator.cxx | 32 +++++------
.../LArRecUtils/src/LArHVIdMappingAlg.cxx | 2 +-
.../test/CheckDifferences.cxx | 10 ++--
.../src/SGxAODProxyLoader.cxx | 2 +-
.../Analysis/src/ConfAnalysis.h | 8 +--
.../Analysis/src/TagNProbe.cxx | 12 ++---
.../Analysis/src/chainparser.cxx | 30 ++++++-----
.../Analysis/src/comparitor.cxx | 54 +++++++++----------
.../Analysis/src/computils.cxx | 3 ++
.../Analysis/src/computils.h | 9 ++--
.../Analysis/src/cpucost.cxx | 8 +--
.../Analysis/src/dependence.cxx | 4 +-
.../Analysis/src/rmain.cxx | 4 +-
.../Analysis/src/skim.cxx | 4 +-
.../Readcards/src/ReadCards.cxx | 34 ++++++------
.../Readcards/src/utils.cxx | 25 +++++----
.../Readcards/src/utils.h | 1 +
.../TrigConfIO/src/JsonFileLoader.cxx | 2 +-
.../TrigCostAnalysis/src/TrigCostAnalysis.cxx | 14 ++---
.../TrigIDtrkMonitoring/utils/hanconfig.cxx | 30 +++++------
.../TrigT1/TrigT1CTP/src/CTPSimulation.cxx | 2 +-
graphics/JiveXML/src/XMLFormatTool.cxx | 2 +-
30 files changed, 181 insertions(+), 177 deletions(-)
diff --git a/DataQuality/DataQualityInterfaces/src/HanOutput.cxx b/DataQuality/DataQualityInterfaces/src/HanOutput.cxx
index 14531cdd6a7d..2375c2fcf893 100644
--- a/DataQuality/DataQualityInterfaces/src/HanOutput.cxx
+++ b/DataQuality/DataQualityInterfaces/src/HanOutput.cxx
@@ -226,7 +226,7 @@ flushResults()
if (*regex + "_" == name.substr(0, regexlen+1)) {
isRegex = true;
parname = *regex;
- std::string::size_type atsign = regex->rfind("@");
+ std::string::size_type atsign = regex->rfind('@');
if (atsign != std::string::npos) {
extra = regex->substr(atsign, std::string::npos);
}
diff --git a/Database/AthenaPOOL/RootFileTools/src/merge.cxx b/Database/AthenaPOOL/RootFileTools/src/merge.cxx
index 9a4ef6d8ad8c..718661dea3d7 100644
--- a/Database/AthenaPOOL/RootFileTools/src/merge.cxx
+++ b/Database/AthenaPOOL/RootFileTools/src/merge.cxx
@@ -316,7 +316,7 @@ DbStatus DbDatabaseMerger::attach(const string& fid) {
m_sectionBranch->GetEntry(m_sectionsMin);
string dsc = text;
size_t id1 = dsc.find("[CNT=");
- size_t id2 = dsc.find("]");
+ size_t id2 = dsc.find(']');
if (id1 != string::npos && id2 != string::npos) {
string cnt = dsc.substr(id1+5, id2-5);
std::map<std::string, size_t>::iterator it = m_sectionsCounts.find(cnt);
diff --git a/Database/CoolConvUtilities/src/AtlCoolCopy.cxx b/Database/CoolConvUtilities/src/AtlCoolCopy.cxx
index 541096990838..01d45b3c5975 100755
--- a/Database/CoolConvUtilities/src/AtlCoolCopy.cxx
+++ b/Database/CoolConvUtilities/src/AtlCoolCopy.cxx
@@ -3218,7 +3218,7 @@ pool::IFileCatalog* AtlCoolCopy::setupCatalog(
icat!=catvec.end();++icat) {
std::cout << "Add catalogue: " << *icat << std::endl;
// if catalogue contains no ":" specifier, assume plain file
- if (icat->find(":")==std::string::npos) {
+ if (icat->find(':')==std::string::npos) {
catalog->addReadCatalog("file:"+(*icat));
} else {
catalog->addReadCatalog(*icat);
diff --git a/Database/IOVDbSvc/src/CrestFunctions.cxx b/Database/IOVDbSvc/src/CrestFunctions.cxx
index 7e09eee67648..d9d55c306ca0 100644
--- a/Database/IOVDbSvc/src/CrestFunctions.cxx
+++ b/Database/IOVDbSvc/src/CrestFunctions.cxx
@@ -27,7 +27,7 @@ namespace IOVDbNamespace{
auto signaturePosition=jsonReply.rfind(signature);
if (signaturePosition == std::string::npos) throw std::runtime_error("signature "+signature+" not found");
auto startOfHash=signaturePosition + signature.size();
- auto endOfHash=jsonReply.rfind("\"");
+ auto endOfHash=jsonReply.rfind('\"');
auto len=endOfHash-startOfHash;
if (startOfHash > jsonReply.size()) throw std::runtime_error("Hash start is beyond end of string");
hash=jsonReply.substr(startOfHash, len);
diff --git a/Database/PersistentDataModelAthenaPool/src/DataHeaderCnv.cxx b/Database/PersistentDataModelAthenaPool/src/DataHeaderCnv.cxx
index c39e01b49a8c..bb2f0bd7c05e 100755
--- a/Database/PersistentDataModelAthenaPool/src/DataHeaderCnv.cxx
+++ b/Database/PersistentDataModelAthenaPool/src/DataHeaderCnv.cxx
@@ -126,7 +126,7 @@ StatusCode DataHeaderCnv::updateRep(IOpaqueAddress* pAddress, DataObject* pObjec
m_sharedWriterCachedDH = reinterpret_cast<DataHeader_p6*>( pObject );
m_sharedWriterCachedDHToken = pAddress->par()[0];
std::size_t tagBeg = pAddress->par()[1].find("[KEY=") + 5;
- std::size_t tagSize = pAddress->par()[1].find("]", tagBeg) - tagBeg;
+ std::size_t tagSize = pAddress->par()[1].find(']', tagBeg) - tagBeg;
m_sharedWriterCachedDHKey = pAddress->par()[1].substr( tagBeg, tagSize );
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CalibrateTRT.cpp b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CalibrateTRT.cpp
index 1b330facb382..e63fd451b01d 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CalibrateTRT.cpp
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/CalibrateTRT.cpp
@@ -161,11 +161,11 @@ float Calibrator::FitRt(const string & key, const string & opt, TH2F* rtHist){
if (isdines) trfunc2.SetParameters(0.21, 3.57, 17.0);
else trfunc2.SetParameters(0.0, 0.0, 0.0);
trfunc2.SetRange(0,2);
- if (opt.find("3")==string::npos) trfunc2.FixParameter(3,0);
+ if (opt.find('3')==string::npos) trfunc2.FixParameter(3,0);
trfunc2.SetLineColor(4) ;
int result3 = trgr.Fit(&trfunc2,"QR"); // always fit the t-r relation
trgr.SetTitle(trrelation.data());
- if (opt.find("Q")==string::npos) trgr.Write();
+ if (opt.find('Q')==string::npos) trgr.Write();
rtpars[0] = trfunc2.GetParameter(0);
rtpars[1] = trfunc2.GetParameter(1);
rtpars[2] = trfunc2.GetParameter(2);
@@ -174,7 +174,7 @@ float Calibrator::FitRt(const string & key, const string & opt, TH2F* rtHist){
// r-t relation
TF1 rtfunc2("rtfunc2",rtrelation.data(),mintime,200);
rtfunc2.SetRange(-0.1,60);
- if (opt.find("3")==string::npos) rtfunc2.FixParameter(3,0);
+ if (opt.find('3')==string::npos) rtfunc2.FixParameter(3,0);
rtfunc2.SetLineColor(4) ;
if (isdines) rtfunc2.SetParameters(trfunc2.GetParameter(0),trfunc2.GetParameter(1),trfunc2.GetParameter(2),trfunc2.GetParameter(3));
else {
diff --git a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/Calibrator.cxx b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/Calibrator.cxx
index 0bf227d58431..45c8936bf730 100644
--- a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/Calibrator.cxx
+++ b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/Calibrator.cxx
@@ -443,7 +443,7 @@ float Calibrator::AccumulativeMean(float n, float oldmean, float newvalue){
return oldmean*((n-1)/n)+newvalue/n;
}
-bool Calibrator::HasKey(std::string key){
+bool Calibrator::HasKey(const std::string &key) const {
return data.find(key) != data.end();
}
@@ -474,19 +474,19 @@ std::string Calibrator::PrintStat(){
return info;
}
-std::string Calibrator::GetOptString(){
+std::string Calibrator::GetOptString() const {
std::string optstr="";
- if (dort) optstr = optstr + "R";
- if (dot0) optstr = optstr + "T";
- if (printlog) optstr = optstr + "P";
- if (printt0) optstr = optstr + "F";
- if (printrt) optstr = optstr + "G";
- if (bequiet) optstr = optstr + "Q";
- if (usebref) optstr = optstr + "B";
- if (useshortstraws) optstr = optstr + "S";
- if (usep0 && dort) optstr = optstr + "0";
- if (floatp3 && dort) optstr = optstr + "3";
- if (!(dort || dot0 || usebref || bequiet || printlog || printt0 || printrt)) optstr = optstr + "N";
+ if (dort) optstr += 'R';
+ if (dot0) optstr += 'T';
+ if (printlog) optstr +='P';
+ if (printt0) optstr += 'F';
+ if (printrt) optstr += 'G';
+ if (bequiet) optstr += 'Q';
+ if (usebref) optstr += 'B';
+ if (useshortstraws) optstr += 'S';
+ if (usep0 && dort) optstr += '0';
+ if (floatp3 && dort) optstr += '3';
+ if (!(dort || dot0 || usebref || bequiet || printlog || printt0 || printrt)) optstr += 'N';
return optstr;
}
@@ -549,7 +549,7 @@ float Calibrator::FitRt ATLAS_NOT_THREAD_SAFE (std::string key, std::string opt,
float rtpars[4];
//create r-m_t and m_t-r graphs
- RtGraph* rtg = m_rtbinning.find("t")==std::string::npos ? new RtGraph(rtHist,1,std::string("abs(rtrack)").data(),!bequiet,dir) : new RtGraph(rtHist,0,std::string("t-t0").data(),!bequiet,dir);
+ RtGraph* rtg = m_rtbinning.find('t')==std::string::npos ? new RtGraph(rtHist,1,std::string("abs(rtrack)").data(),!bequiet,dir) : new RtGraph(rtHist,0,std::string("t-t0").data(),!bequiet,dir);
TF1 dtfitfunc("dtfitfunc","gaus(0)");
@@ -581,7 +581,7 @@ float Calibrator::FitRt ATLAS_NOT_THREAD_SAFE (std::string key, std::string opt,
// m_t-r relation
trfunc->SetRange(0,2);
- if (opt.find("3")==std::string::npos) trfunc->FixParameter(3,0);
+ if (opt.find('3')==std::string::npos) trfunc->FixParameter(3,0);
trfunc->SetLineColor(4) ;
rtg->trgr->Fit(trfunc,"QR"); // always fit the m_t-r relation
if (!bequiet) rtg->trgr->Write();
@@ -589,7 +589,7 @@ float Calibrator::FitRt ATLAS_NOT_THREAD_SAFE (std::string key, std::string opt,
// r-m_t relation
rtfunc->SetRange(0,45);
- if (opt.find("3")==std::string::npos) rtfunc->FixParameter(3,0);
+ if (opt.find('3')==std::string::npos) rtfunc->FixParameter(3,0);
rtfunc->SetLineColor(4) ;
if (m_isdines) {
rtfunc->SetParameters(trfunc->GetParameter(0),trfunc->GetParameter(1),trfunc->GetParameter(2),trfunc->GetParameter(3));
@@ -646,7 +646,7 @@ float Calibrator::FitRt ATLAS_NOT_THREAD_SAFE (std::string key, std::string opt,
}
}
- if (opt.find("0")==std::string::npos) {
+ if (opt.find('0')==std::string::npos) {
if (m_isdines){
data[key].rtpar[0] = rtpars[0];
data[key].rtpar[1] = rtpars[1];
@@ -786,12 +786,12 @@ float Calibrator::FitResidual ATLAS_NOT_THREAD_SAFE (std::string key, TH1F* resH
TDirectory* Calibrator::Calibrate ATLAS_NOT_THREAD_SAFE (TDirectory* dir, std::string key, std::string opt, caldata * caldata_above){ // Thread unsafe FitResidual, FitRt, FitTimeResidual are used.
//set some bool flags
- bool calrt=opt.find("R")!=std::string::npos;
- bool calt0=opt.find("T")!=std::string::npos;
- bool donothing=opt.find("N")!=std::string::npos;
- bool prnt=opt.find("P")!=std::string::npos;
- bool useref=opt.find("B")!=std::string::npos;
- bool useshortstw=opt.find("S")!=std::string::npos;
+ bool calrt=opt.find('R')!=std::string::npos;
+ bool calt0=opt.find('T')!=std::string::npos;
+ bool donothing=opt.find('N')!=std::string::npos;
+ bool prnt=opt.find('P')!=std::string::npos;
+ bool useref=opt.find('B')!=std::string::npos;
+ bool useshortstw=opt.find('S')!=std::string::npos;
if (donothing) return dir;
diff --git a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/Calibrator.h b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/Calibrator.h
index 80eeb38aa92f..99cbf614e020 100755
--- a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/Calibrator.h
+++ b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/Calibrator.h
@@ -294,7 +294,7 @@ public:
/**
...
*/
- bool HasKey(std::string);
+ bool HasKey(const std::string&) const;
/**
...
@@ -317,7 +317,7 @@ public:
Creates a string summarizing what is being done at this sub-level
@return the string
*/
- std::string GetOptString();
+ std::string GetOptString() const;
/**
...
diff --git a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/TRTCalibrator.cxx b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/TRTCalibrator.cxx
index 699e23218893..4136c5bb016d 100755
--- a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/TRTCalibrator.cxx
+++ b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/TRTCalibrator.cxx
@@ -266,9 +266,9 @@ std::string TRTCalibrator::SubLev(std::string pat, int lev){
std::string sublev;
for (int i=0;i<lev;i++){
- pat.replace(pat.find("_"),1,"");
- sublev = pat.substr(0,pat.find("_"));
- pat.replace(0,pat.find("_"),"");
+ pat.replace(pat.find('_'),1,"");
+ sublev = pat.substr(0,pat.find('_'));
+ pat.replace(0,pat.find('_'),"");
}
return sublev;
}
@@ -296,10 +296,10 @@ bool TRTCalibrator::IsSubLev(const std::string& key, int lev, const std::string&
if (sl.compare(SubLev(key,lev))==0) return true;
- while(sl.compare(sl.substr(sl.find(",")+1))!=0){
- if (SubLev(key,lev).compare(sl.substr(0,sl.find(",")))==0) return true;
- sl=sl.substr(sl.find(",")+1);
- if (SubLev(key,lev).compare(sl.substr(0,sl.find(",")))==0) return true;
+ while(sl.compare(sl.substr(sl.find(',')+1))!=0){
+ if (SubLev(key,lev).compare(sl.substr(0,sl.find(',')))==0) return true;
+ sl=sl.substr(sl.find(',')+1);
+ if (SubLev(key,lev).compare(sl.substr(0,sl.find(',')))==0) return true;
}
return false;
@@ -318,23 +318,23 @@ int TRTCalibrator::GetSubLevels(const std::string& key, int lev, std::set<int>*
return 999;
}
- if(sl.find(",")!=std::string::npos){
+ if(sl.find(',')!=std::string::npos){
int value;
- while(sl.find(",")!=std::string::npos){
- sscanf(sl.substr(0,sl.find(",")).data(),"%i",&value);
+ while(sl.find(',')!=std::string::npos){
+ sscanf(sl.substr(0,sl.find(',')).data(),"%i",&value);
levels->insert(value);
- sl=sl.substr(sl.find(",")+1);
+ sl=sl.substr(sl.find(',')+1);
}
sscanf(sl.data(),"%i",&value);
levels->insert(value);
return levels->size();
}
- if(sl.find("t")!=std::string::npos){
+ if(sl.find('t')!=std::string::npos){
int min,max;
- sscanf(sl.substr(0,sl.find("t")).data(),"%i",&min);
+ sscanf(sl.substr(0,sl.find('t')).data(),"%i",&min);
std::cout << "min=" << min << std::endl;
- sl=sl.substr(sl.find("t")+1);
+ sl=sl.substr(sl.find('t')+1);
sscanf(sl.data(),"%i",&max);
std::cout << "max=" << max << std::endl;
for (int imod=min; imod<=max; imod++){
@@ -488,8 +488,8 @@ bool TRTCalibrator::calibrate ATLAS_NOT_THREAD_SAFE () {
- m_options = "_" + TRT.GetOptString() + "_" + Detector.GetOptString() + "_" + Layer.GetOptString() + "_" + Module.GetOptString() + "_" + Board.GetOptString() + "_" + Chip.GetOptString() + "_" + Straw.GetOptString();
- if(m_calsub!="user") m_selstring = "_" + TRT.GetSelString() + "_" + Detector.GetSelString() + "_" + Layer.GetSelString() + "_" + Module.GetSelString() + "_" + Board.GetSelString() + "_" + Chip.GetSelString() + "_" + Straw.GetSelString();
+ m_options = '_' + TRT.GetOptString() + '_' + Detector.GetOptString() + '_' + Layer.GetOptString() + '_' + Module.GetOptString() + '_' + Board.GetOptString() + '_' + Chip.GetOptString() + '_' + Straw.GetOptString();
+ if(m_calsub!="user") m_selstring = '_' + TRT.GetSelString() + '_' + Detector.GetSelString() + '_' + Layer.GetSelString() + '_' + Module.GetSelString() + '_' + Board.GetSelString() + '_' + Chip.GetSelString() + '_' + Straw.GetSelString();
//print some info
msg(MSG::INFO) << endmsg;
diff --git a/LArCalorimeter/LArRecUtils/src/LArHVIdMappingAlg.cxx b/LArCalorimeter/LArRecUtils/src/LArHVIdMappingAlg.cxx
index c726f08d19db..7b9a405abc0b 100644
--- a/LArCalorimeter/LArRecUtils/src/LArHVIdMappingAlg.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArHVIdMappingAlg.cxx
@@ -82,7 +82,7 @@ StatusCode LArHVIdMappingAlg::execute() {
std::ostringstream attrStr1;
coral::AttributeList::const_iterator itr=attr->begin();
itr->toOutputStream(attrStr1);
- std::string::size_type pos = attrStr1.str().find(":");
+ std::string::size_type pos = attrStr1.str().find(':');
if (pos == std::string::npos)
pos = 0;
else
diff --git a/MuonSpectrometer/MuonGeoModelTest/test/CheckDifferences.cxx b/MuonSpectrometer/MuonGeoModelTest/test/CheckDifferences.cxx
index 0b9a9c32b3c0..10134eedf6b1 100644
--- a/MuonSpectrometer/MuonGeoModelTest/test/CheckDifferences.cxx
+++ b/MuonSpectrometer/MuonGeoModelTest/test/CheckDifferences.cxx
@@ -280,7 +280,7 @@ int MaterialMap::readMapRecord() {
std::string::size_type locchiudi;
if ((locapri = s.find('(')) != std::string::npos)
{
- if ((locchiudi = s.find(")", locapri+1)) != std::string::npos)
+ if ((locchiudi = s.find(')', locapri+1)) != std::string::npos)
{
if (print_level < 1) std::cout<<"first ( is at "<<locapri<<" first ) at "<<locchiudi<<std::endl;
my_isstream istrvar(s.substr(locapri+1,locchiudi-locapri-1));
@@ -292,7 +292,7 @@ int MaterialMap::readMapRecord() {
}
if ((locapri = s.find('(',locchiudi)) != std::string::npos)
{
- if ((locchiudi = s.find(")", locapri+1)) != std::string::npos)
+ if ((locchiudi = s.find(')', locapri+1)) != std::string::npos)
{
if (print_level < 1) std::cout<<"second ( is at "<<locapri<<" last ) at "<<locchiudi<<std::endl;
my_isstream istrvar(s.substr(locapri+1,locchiudi-locapri-1));
@@ -324,7 +324,7 @@ int MaterialMap::readMapRecord() {
std::string::size_type locchiudi;
if ((locapri = s.find('(')) != std::string::npos)
{
- if ((locchiudi = s.find(")", locapri+1)) != std::string::npos)
+ if ((locchiudi = s.find(')', locapri+1)) != std::string::npos)
{
if (print_level < 1) std::cout<<"first ( is at "<<locapri<<" first ) at "<<locchiudi<<std::endl;
my_isstream istrvar(s.substr(locapri+1,locchiudi-locapri-1));
@@ -355,7 +355,7 @@ int MaterialMap::readMapRecord() {
std::string::size_type locchiudi;
if ((locapri = s.find('(')) != std::string::npos)
{
- if ((locchiudi = s.find(")", locapri+1)) != std::string::npos)
+ if ((locchiudi = s.find(')', locapri+1)) != std::string::npos)
{
if (print_level < 1) std::cout<<"first ( is at "<<locapri<<" first ) at "<<locchiudi<<std::endl;
my_isstream istrvar(s.substr(locapri+1,locchiudi-locapri-1));
@@ -410,7 +410,7 @@ int MaterialMap::readMapRecord() {
std::string::size_type locchiudi;
if ((locapri = s.find('(')) != std::string::npos)
{
- if ((locchiudi = s.find(")", locapri+1)) != std::string::npos)
+ if ((locchiudi = s.find(')', locapri+1)) != std::string::npos)
{
if (print_level < 1) std::cout<<"first ( is at "<<locapri<<" first ) at "<<locchiudi<<std::endl;
my_isstream istrvar(s.substr(locapri+1,locchiudi-locapri-1));
diff --git a/PhysicsAnalysis/CommonTools/ExpressionEvaluation/src/SGxAODProxyLoader.cxx b/PhysicsAnalysis/CommonTools/ExpressionEvaluation/src/SGxAODProxyLoader.cxx
index 930028e7959a..8f2b2349aab8 100644
--- a/PhysicsAnalysis/CommonTools/ExpressionEvaluation/src/SGxAODProxyLoader.cxx
+++ b/PhysicsAnalysis/CommonTools/ExpressionEvaluation/src/SGxAODProxyLoader.cxx
@@ -267,7 +267,7 @@ namespace ExpressionParsing {
// or refers to a method call
auto set_ids = [&method_data_id,&container_data_id,&var_name,&container_name,verbose](const DataObjID *obj_data_id) -> bool {
std::string_view handle_key(obj_data_id->key());
- std::string::size_type pos=obj_data_id->key().find("+");
+ std::string::size_type pos=obj_data_id->key().find('+');
pos = (pos==std::string::npos ? 0 : pos+1);
handle_key=handle_key.substr(pos,handle_key.size()-pos);
if (verbose && (handle_key == container_name || handle_key == var_name)) {
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.h
index c67eb7c744d6..872d4e1b2bb7 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.h
@@ -37,12 +37,8 @@
inline const std::string clean( std::string s) {
- while (true ){
- if ( s.find(":")==std::string::npos &&
- s.find(";")==std::string::npos ) return s;
- if ( s.find(":")!=std::string::npos ) s.replace( s.find(":"), 1, "_" );
- if ( s.find(";")!=std::string::npos ) s.replace( s.find(";"), 1, "_" );
- }
+ std::replace(s.begin(), s.end(), ':', '_');
+ std::replace(s.begin(), s.end(), ';', '_');
return s; /// return to keep the compiler quiet
}
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/TagNProbe.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/TagNProbe.cxx
index 373f42e318b7..10f6581d99e0 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/TagNProbe.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/TagNProbe.cxx
@@ -275,8 +275,8 @@ std::vector<TIDA::Roi*> TagNProbe::GetRois( TIDA::Chain * chain, std::vector<TID
void TagNProbe::BookMinvHisto( std::string chain_name ) {
std::string hname_base = chain_name;
- replace( hname_base, "/", "_" );
- replace( hname_base, ":", "_" );
+ replace( hname_base, '/', '_' );
+ replace( hname_base, ':', '_' );
std::string hname_1 = hname_base + "_Minv_TnP";
std::string hname_2 = hname_base + "_Minv_obj_TnP";
@@ -318,8 +318,8 @@ void TagNProbe::WriteMinvHisto( TDirectory* foutdir ) {
for ( hMinv_itr=m_hMinv_map.begin() ; hMinv_itr!=m_hMinv_map.end() ; hMinv_itr++ ) {
std::string dirname = hMinv_itr->first;
- replace( dirname, "/", "_" );
- replace( dirname, ":", "_" );
+ replace( dirname, '/', '_' );
+ replace( dirname, ':', '_' );
std::string dirpath( foutdir->GetPath() );
dirpath += dirname;
@@ -338,8 +338,8 @@ void TagNProbe::WriteMinvHisto( TDirectory* foutdir ) {
for ( hMinv_obj_itr=m_hMinv_obj_map.begin() ; hMinv_obj_itr!=m_hMinv_obj_map.end() ; hMinv_obj_itr++ ) {
std::string dirname = hMinv_obj_itr->first;
- replace( dirname, "/", "_" );
- replace( dirname, ":", "_" );
+ replace( dirname, '/', '_' );
+ replace( dirname, ':', '_' );
std::string dirpath( foutdir->GetPath() );
dirpath += dirname;
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chainparser.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chainparser.cxx
index 817768583eee..9689ea7b1996 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chainparser.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chainparser.cxx
@@ -36,26 +36,30 @@ bool contains( const std::string& s, const std::string& regx ) {
return s.find( regx )!=std::string::npos;
}
+bool contains( const std::string& s, char c ) {
+ return s.find( c )!=std::string::npos;
+}
+
+
bool contains_end( const std::string& s, const std::string& regx ) {
- return std::regex_match( s, std::regex(regx+"$") );
+ return std::regex_match( s, std::regex(regx+'$') );
}
std::vector<std::string> split( std::string& line ) {
std::vector<std::string> strings;
-
- while ( contains( line, "/" ) ) line.replace( line.find("/"), 1, " " );
- while ( contains( line, "\t" ) ) line.replace( line.find("\t"), 1, " " );
+ while ( contains( line, '/' ) ) line.replace( line.find('/'), 1, " " );
+ std::replace(line.begin(), line.end(), '\t', ' ');
- while ( contains( line, " " ) ) {
+ while ( contains( line, ' ' ) ) {
std::string _s = chop( line, " " );
std::string s = chop( _s, "\t" );
- if ( contains( s, "\t" ) ) {
- line.replace( s.find("\t"), 1, " " );
+ if ( contains( s, '\t' ) ) {
+ line.replace( s.find('\t'), 1, " " );
continue;
}
- while ( contains( s, " " ) ) line.replace( s.find(" "), 1, "" );
- if ( s != "" ) strings.push_back( s );
+ while ( contains( s, ' ' ) ) line.replace( s.find(' '), 1, "" );
+ if ( !s.empty() ) strings.push_back( s );
}
strings.push_back( line );
@@ -218,7 +222,7 @@ int main( int argc, char** argv ) {
if ( aslice=="" ) return usage( argc, argv, 9 );
- std::string slice = "/" + aslice + "/";
+ std::string slice = "/" + aslice + '/';
std::string rawslice = aslice;
@@ -309,10 +313,10 @@ int main( int argc, char** argv ) {
std::string tmp = expl[expected_size-2];
- if ( tag != "" ) {
+ if ( !tag.empty() ) {
if ( contains( tmp, tag ) ) tmp.replace( tmp.find(tag), tag.size(), "" );
- size_t pos = tmp.find("_");
+ size_t pos = tmp.find('_');
if ( pos!=std::string::npos ) tmp.replace( pos, tmp.size()-pos, "" );
}
@@ -343,7 +347,7 @@ int main( int argc, char** argv ) {
threshold t( thresh_var, it++, expl[expected_size-2], expl[expected_size-1], counts_var );
- if ( verbose && fullpath=="" ) for ( unsigned ip=0 ; ip<expected_size-2 ; ip++ ) fullpath += expl[ip]+"/";
+ if ( verbose && fullpath=="" ) for ( unsigned ip=0 ; ip<expected_size-2 ; ip++ ) fullpath += expl[ip]+'/';
// std::cout << "\tfullpath " << fullpath << std::endl;
// std::cout << "\t" << t << "\t" << contains( expl[4], "_track_" ) << std::endl;
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/comparitor.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/comparitor.cxx
index 3db9cb726eb1..f6ee8d4e7221 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/comparitor.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/comparitor.cxx
@@ -176,16 +176,16 @@ T* Get( TFile& f, const std::string& n, const std::string& dir="",
std::string name;
- size_t pos = n.find("+");
+ size_t pos = n.find('+');
if ( pos!=std::string::npos ) name = n.substr( 0, pos );
else name = n;
T* h = (T*)f.Get( name.c_str() );
- if ( h || dir=="" || name.find(dir)!=std::string::npos ) {
+ if ( h || dir.empty() || name.find(dir)!=std::string::npos ) {
std::cout << "Get() name 0 " << name << " :: " << h << std::endl;
}
else {
- name = dir+"/"+name;
+ name = dir+'/'+name;
h = (T*)f.Get( name.c_str() );
std::cout << "Get() name 1 " << name << " :: " << h << std::endl;
}
@@ -496,22 +496,22 @@ int main(int argc, char** argv) {
std::string arg = argv[i];
- if ( arg.find("-")!=0 && addinglabels ) {
+ if ( arg.find('-')!=0 && addinglabels ) {
std::string label = arg;
fullreplace( label, "__", " " );
- replace( label, "#", " " );
+ replace( label, '#', ' ' );
usrlabels.push_back( label );
continue;
}
else addinglabels = false;
- if ( arg.find("-")!=0 && addingrefchains ) {
+ if ( arg.find('-')!=0 && addingrefchains ) {
refchains.push_back( arg );
continue;
}
else addingrefchains = false;
- if ( arg.find("-")!=0 && addingtags ) {
+ if ( arg.find('-')!=0 && addingtags ) {
taglabels.push_back( fullreplace( arg, "__", " " ) );
std::cout << "\tadding tag label: " << taglabels.back() << std::endl;
continue;
@@ -671,7 +671,7 @@ int main(int argc, char** argv) {
if ( ++i<argc ) xpattern=argv[i];
else return usage(argv[0], -1, "no patterns provided");
}
- else if ( arg.find("-")==0 ) {
+ else if ( arg.find('-')==0 ) {
std::cerr << "unknown option: " << arg << "\n" << std::endl;
return usage(argv[0], -4);
}
@@ -689,8 +689,8 @@ int main(int argc, char** argv) {
std::string chain = arg;
- replace ( chain, ":", "_" );
- replace ( chain, ";", "_" );
+ replace ( chain, ':', '_' );
+ replace ( chain, ';', '_' );
chains.push_back(chain);
std::cout << "file: " << file << "\tchain: " << chain << std::endl;
@@ -699,7 +699,7 @@ int main(int argc, char** argv) {
}
}
- if ( ftestname=="" ) {
+ if ( ftestname.empty() ) {
std::cerr << "main(): test file not specified " << std::endl;
return -1;
}
@@ -729,7 +729,7 @@ int main(int argc, char** argv) {
if ( noref==false ) {
- if ( frefname=="" ) {
+ if ( frefname.empty() ) {
std::cerr << "main(): ref file not specified " << std::endl;
Plotter::setplotref(false);
noref = true;
@@ -879,12 +879,12 @@ int main(int argc, char** argv) {
// Make output directory
- if (dir != "") {
+ if (!dir.empty()) {
gDirectory->pwd();
std::cout << "trying to make directory" << std::endl;
- dir += "/";
+ dir += '/';
if ( !quiet && !noplots && !exists(dir) ) {
if ( mkdir( dir.c_str(), 0777 ) ) std::cerr << "main() couldn't create directory " << dir << std::endl;
else std::cout << "main() output will be sent to directory " << dir << std::endl;
@@ -905,21 +905,21 @@ int main(int argc, char** argv) {
std::cout << "testrun: " << testrun << "\nrefrun: " << refrun << std::endl;
- if ( testrun != "" && refrun != testrun ) {
- if ( pattern == "" ) {
+ if ( !testrun.empty() && refrun != testrun ) {
+ if ( pattern.empty() ) {
pattern = testrun;
regex = refrun;
}
}
- if ( refrun != "" ) {
+ if ( !refrun.empty() ) {
std::string newtag = "Reference: ";
std::cout << "refrun: " << refrun << std::endl;
size_t pos;
- while ( (pos=refrun.find("_"))!=std::string::npos ) refrun.replace( pos, 1, " " );
+ while ( (pos=refrun.find('_'))!=std::string::npos ) refrun.replace( pos, 1, " " );
newtag += refrun;
std::string rawrun = refrun.erase( refrun.find("run"), 4 );
@@ -931,8 +931,8 @@ int main(int argc, char** argv) {
release.erase( 0, release.find(rawrun) );
if ( contains(release,"HIST") ) release.erase( 0, release.find("HIST")+5 );
- while ( contains(release,".") ) release.erase( release.find("."), release.size() );
- while ( contains(release,"-") ) release.erase( release.find("-"), release.size() );
+ while ( contains(release,".") ) release.erase( release.find('.'), release.size() );
+ while ( contains(release,"-") ) release.erase( release.find('-'), release.size() );
while ( contains(release,"_p") ) release.erase( release.find("_p"), release.size() );
while ( contains(release,"_t") ) release.erase( release.find("_t"), release.size() );
@@ -981,9 +981,9 @@ int main(int argc, char** argv) {
chainmap_t* chainmap = nullptr;
- if ( mapfile == "" ) mapfile = configfile;
+ if ( mapfile.empty() ) mapfile = configfile;
- if ( mapfile != "" ) {
+ if ( !mapfile.empty() ) {
ReadCards m( mapfile );
@@ -1049,7 +1049,7 @@ int main(int argc, char** argv) {
std::cout << "name: " << name << std::endl;
- if ( contains( name, ":" ) ) chain_name[j] = name.substr( 0, name.find(":") ) + " : ";
+ if ( contains( name, ":" ) ) chain_name[j] = name.substr( 0, name.find(':') ) + " : ";
else chain_name[j] = name;
if ( chain_name[j] == " : " ) chain_name[j] = "";
@@ -1343,7 +1343,7 @@ int main(int argc, char** argv) {
std::string xaxis = histo.xtitle();
std::string yaxis = histo.ytitle();
- if ( xregex!="" ) {
+ if ( !xregex.empty() ) {
size_t pos = xaxis.find(xregex);
if ( pos!=std::string::npos ) xaxis.replace( pos, xregex.size(), xpattern );
pos = yaxis.find(xregex);
@@ -1991,7 +1991,7 @@ int main(int argc, char** argv) {
/// replace the "/" in the filename so we don't try to
/// make plots in subdirectories by accident
- replace(plotname, "/", "_");
+ replace(plotname, '/', '_');
}
@@ -2518,7 +2518,7 @@ int main(int argc, char** argv) {
plots_eff.Draw( legend_eff );
}
- if ( noreflabel!="" ) DrawLabel(0.1, 0.06, noreflabel, kRed, 0.03 );
+ if ( !noreflabel.empty() ) DrawLabel(0.1, 0.06, noreflabel, kRed, 0.03 );
} // no plots
@@ -2541,7 +2541,7 @@ int main(int argc, char** argv) {
if ( panel.size()>1 ) {
useplotname = panel.name();
- replace( useplotname, "/", "_" );
+ replace( useplotname, '/', '_' );
}
else {
useplotname = plotname;
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.cxx
index 79a4de129490..9d2dbeaa610e 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.cxx
@@ -220,6 +220,9 @@ bool contains( const std::string& s, const std::string& p) {
return (s.find(p)!=std::string::npos);
}
+bool contains( const std::string& s, char p) noexcept {
+ return (s.find(p)!=std::string::npos);
+}
/// contains a string at the *beginning* of the string
bool fcontains( const std::string& s, const std::string& p) {
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.h
index 3ce4de7cda18..4e17ee380be9 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.h
@@ -55,6 +55,7 @@ double Entries( TH1* h );
/// does a string contain the substring
bool contains( const std::string& s, const std::string& p);
+bool contains( const std::string& s, char p) noexcept;
/// does a string contain the substring at the beginning of the string
bool fcontains( const std::string& s, const std::string& p);
@@ -1083,12 +1084,12 @@ private:
void getextra() {
if ( contains( m_details[0], "-" ) ) {
- m_extra = m_details[0].substr( m_details[0].find("-"), m_details[0].size() );
- m_details[0] = m_details[0].substr( 0, m_details[0].find("-") );
+ m_extra = m_details[0].substr( m_details[0].find('-'), m_details[0].size() );
+ m_details[0] = m_details[0].substr( 0, m_details[0].find('-') );
}
if ( contains( m_details[0], "+" ) ) {
- m_extra = m_details[0].substr( m_details[0].find("+"), m_details[0].size() );
- m_details[0] = m_details[0].substr( 0, m_details[0].find("+") );
+ m_extra = m_details[0].substr( m_details[0].find('+'), m_details[0].size() );
+ m_details[0] = m_details[0].substr( 0, m_details[0].find('+') );
}
}
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/cpucost.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/cpucost.cxx
index 3162f0104f6e..d612bfcb0807 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/cpucost.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/cpucost.cxx
@@ -461,7 +461,7 @@ int main(int argc, char** argv) {
std::string algname = tail(algorithms[algorithm], "/" );
std::string dirname = tail( head(algorithms[algorithm], "/" ), "/" );
std::string algpname = algorithms[algorithm];
- replace( algpname, "/", "_" );
+ replace( algpname, '/', '_' );
if ( algname.find("h_")==0 ) algname.erase(0, 2);
@@ -474,14 +474,14 @@ int main(int argc, char** argv) {
std::string stub = directory;
- size_t pos = stub.find("/");
- while ( pos!=std::string::npos ) { stub.erase( pos, 1 ); pos = stub.find("/"); }
+ size_t pos = stub.find('/');
+ while ( pos!=std::string::npos ) { stub.erase( pos, 1 ); pos = stub.find('/'); }
while ( plotname.find(stub)!=std::string::npos ) {
plotname.erase( 0, plotname.find(stub)+stub.size() );
}
- while ( plotname.find("_")==0 ) plotname.erase( 0, 1 );
+ while ( plotname.find('_')==0 ) plotname.erase( 0, 1 );
plotname = output_dir + plotname;
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/dependence.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/dependence.cxx
index 6fd772d56792..3181a61b6c27 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/dependence.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/dependence.cxx
@@ -132,7 +132,7 @@ void efficiency( std::vector<double>& bins, std::vector<double>& values, const s
std::string plotname = tplotname;
std::string labels = ";value;mean";
- size_t pos = plotname.find(";");
+ size_t pos = plotname.find(';');
if ( pos!=std::string::npos ) {
labels = plotname.substr( pos, plotname.size() );
@@ -265,7 +265,7 @@ void mean( std::vector<double>& bins, std::vector<double>& values, const std::ve
std::string plotname = tplotname;
std::string labels = ";value;mean";
- size_t pos = plotname.find(";");
+ size_t pos = plotname.find(';');
if ( pos!=std::string::npos ) {
labels = plotname.substr( pos, plotname.size() );
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/rmain.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/rmain.cxx
index fe902aafbd21..368a88e7e8c7 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/rmain.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/rmain.cxx
@@ -115,7 +115,7 @@ std::string time_str() {
std::string s(ctime(&_t));
// std::string::size_type pos = s.find("\n");
// if ( pos != std::string::npos )
- return s.substr(0,s.find("\n"));
+ return s.substr(0,s.find('\n'));
// return s;
}
@@ -471,7 +471,7 @@ int main(int argc, char** argv)
if ( ++i>=argc ) return usage(argv[0], -1);
binningConfigFile = std::string(argv[i]);
}
- else if ( std::string(argv[i]).find("-")==0 ) {
+ else if ( std::string(argv[i]).find('-')==0 ) {
/// unknown option
std::cerr << "unknown option " << argv[i] << std::endl;
return usage(argv[0], -1);
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/skim.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/skim.cxx
index 32086bf33d7e..78e59f734f77 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/skim.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/skim.cxx
@@ -38,7 +38,7 @@ std::string time_str() {
time_t _t;
time(&_t);
std::string s(ctime(&_t));
- return s.substr(0,s.find("\n"));
+ return s.substr(0,s.find('\n'));
}
int usage(int e=0) {
@@ -123,7 +123,7 @@ int main(int argc, char** argv) {
std::string arg(argv[i]);
- if ( arg.find("-")!=0 ) {
+ if ( arg.find('-')!=0 ) {
if ( adding_chains || deleting_chains ) {
require_chains.insert(argv[i]);
continue;
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.cxx
index cf112b3c1442..412ed6c8b8a3 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.cxx
@@ -47,11 +47,11 @@ void ReadCards::CreatePath() {
std::string config_path = getenv("CONFIG_PATH");
std::cout << "ReadCards::CONFIG_PATH " << config_path << std::endl;
while ( config_path.size() ) {
- mPath.push_back(chop(config_path, ":")+"/");
+ mPath.push_back(chop(config_path, ":")+'/');
}
}
mPath.push_back("");
- mPath.push_back(std::string( RESPLOTDIR )+"/");
+ mPath.push_back(std::string( RESPLOTDIR )+'/');
// for ( int i=0 ; i<mPath.size() ; i++ ) cout << "ReadCards>>CreatePath() mPath[" << i << "]=" << mPath[i] << endl;
}
@@ -80,7 +80,7 @@ void ReadCards::Construct(const std::string& filename) {
char tfile[1024];
- if ( mFileName.find("/")==std::string::npos ) std::sprintf( tfile, ".readcards-%s-%d", mFileName.c_str(), pid );
+ if ( mFileName.find('/')==std::string::npos ) std::sprintf( tfile, ".readcards-%s-%d", mFileName.c_str(), pid );
else std::sprintf( tfile, ".readcards-%d", pid );
char cmd[2056];
@@ -152,13 +152,13 @@ void ReadCards::clean() {
// size_t n = std::count(tmpline.begin(), tmpline.end(), "\"");
// size_t n = count( tmpline, "\"");
// if ( n%2==0 )
- line = tmpline;
+ line = std::move(tmpline);
}
}
#if 0
/// no longer allow # as a comment character
- if ( (pos=line.find("#")) != std::string::npos ) {
+ if ( (pos=line.find('#')) != std::string::npos ) {
int quotecount = 0;
@@ -210,7 +210,7 @@ void ReadCards::parse()
// break at semi colons that are not within "" pairs
- size_t pos = mString.find(";");
+ size_t pos = mString.find(';');
while ( pos != std::string::npos ) {
@@ -230,11 +230,11 @@ void ReadCards::parse()
// std::cout << "duff: " << duff << " : " << n << " " << std::endl;
- pos = mString.find(";");
+ pos = mString.find(';');
}
- if ( mString.find("|")==std::string::npos ) {
+ if ( mString.find('|')==std::string::npos ) {
error("syntax error, missing semicolon at end of input " + mString );
}
@@ -372,12 +372,12 @@ void ReadCards::parse()
}
// check no spaces in values not enclosed in quotes
- if ( qo.size()==0 ) {
- if ( token.find(" ")!=string::npos ) error("space not within quotes : " + input);
+ if ( qo.empty()) {
+ if ( token.find(' ')!=string::npos ) error("space not within quotes : " + input);
}
// missing value
- if ( qo.size()==0 && token.size()==0 ) error("missing token : " + input);
+ if ( qo.empty() && token.empty() ) error("missing token : " + input);
size_t pos = token.find("####");
@@ -392,10 +392,10 @@ void ReadCards::parse()
if ( !_empty ) {
// check the vector had braces
- if ( bra.size()==0 && values.size()>1 ) error("missing braces : " + input);
+ if ( bra.empty() && values.size()>1 ) error("missing braces : " + input);
// missing value
- if ( values.size()==0 ) {
+ if ( values.empty() ) {
// std::cout << "shafted :" << shafted << ":" << std::endl;
// std::cout << "\nmString " << mString << std::endl;
error("tag with no value : " + input);
@@ -455,16 +455,16 @@ vector<string> ReadCards::parseright(std::string& s) {
if ( qc.size()!=qo.size() ) error("mismatched \" : " + input);
// check no spaces in values not enclosed in quotes
- if ( qo.size()==0 ) {
- if ( token.find(" ")!=string::npos ) error("space not wintin \"\" : " + input);
+ if ( qo.empty() ) {
+ if ( token.find(' ')!=string::npos ) error("space not wintin \"\" : " + input);
}
- if ( token.size()==0 ) error("missing token : " + input);
+ if ( token.empty() ) error("missing token : " + input);
sv.push_back(token);
}
- if ( sv.size()==0 ) error("tag with no value " + input);
+ if ( sv.empty() ) error("tag with no value " + input);
return sv;
}
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.cxx
index 6a11cdb79a76..b5d68d022ad5 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.cxx
@@ -28,7 +28,7 @@
#include <stdio.h>
#include "utils.h"
-
+#include <algorithm>
// chop tokens off the end of a string, leave string unchanged
// return choped string
std::string choptoken(std::string& s1, const std::string& s2)
@@ -67,7 +67,7 @@ std::string chopfirst(std::string& s1, const std::string& s2)
}
else {
s3 = s1;
- s1 = "";
+ s1.clear();
}
return s3;
}
@@ -100,12 +100,12 @@ std::string chop(std::string& s1, const std::string& s2)
std::string::size_type pos = s1.find(s2);
std::string s3;
if ( pos == std::string::npos ) {
- s3 = s1;
- s1.erase(0, s1.size());
+ s3 = std::move(s1);
+ s1.clear();
}
else {
s3 = s1.substr(0, pos);
- s1.erase(0, pos+s2.size());
+ s1.clear();
}
return s3;
}
@@ -117,8 +117,8 @@ std::string chomp(std::string& s1, const std::string& s2)
std::string::size_type pos = s1.find(s2);
std::string s3;
if ( pos == std::string::npos ) {
- s3 = s1;
- s1.erase(0,s1.size());
+ s3 = std::move(s1);
+ s1.clear();
}
else {
s3 = s1.substr(pos+s2.size(),s1.size());
@@ -149,12 +149,15 @@ void replace(std::string& s, const std::string& s2, const std::string& s3)
}
}
+void replace(std::string& s, char c1, char c2) noexcept {
+ std::replace(s.begin(), s.end(), c1, c2);
+}
// remove colons from a string
void depunctuate(std::string& s)
{
std::string::size_type pos;
- while ( (pos = s.find(":"))!=std::string::npos ) {
+ while ( (pos = s.find(':'))!=std::string::npos ) {
s.erase(pos, 1);
}
}
@@ -195,17 +198,17 @@ std::string number(const int& i, const std::string& s) {
std::string dirname( std::string name ) {
- std::string::size_type pos = name.find_last_of( "/" );
+ std::string::size_type pos = name.find_last_of( '/' );
if ( pos!=std::string::npos ) name = name.substr( 0, pos );
return name;
}
std::string basename( std::string name ) {
- std::string::size_type pos = name.find( "/" );
+ std::string::size_type pos = name.find( '/' );
while ( pos!=std::string::npos ) {
name = name.substr( pos+1, name.size()-pos-1 );
- pos = name.find( "/" );
+ pos = name.find( '/' );
}
return name;
}
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.h
index 01652fed106d..b11b11ee1f21 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.h
@@ -42,6 +42,7 @@ void removespace(std::string& s, const std::string& s2=" \t");
// replaces whitespace
void replace(std::string& s, const std::string& s2=" \t", const std::string& s3="-");
+void replace(std::string& s, char c1, char c2) noexcept;
// chops s1 to the first not of s2
std::string chopfirst(std::string& s1, const std::string& s2="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_.:/");
diff --git a/Trigger/TrigConfiguration/TrigConfIO/src/JsonFileLoader.cxx b/Trigger/TrigConfiguration/TrigConfIO/src/JsonFileLoader.cxx
index 165a25e77a7e..a07f3ba5e7b2 100644
--- a/Trigger/TrigConfiguration/TrigConfIO/src/JsonFileLoader.cxx
+++ b/Trigger/TrigConfiguration/TrigConfIO/src/JsonFileLoader.cxx
@@ -36,7 +36,7 @@ TrigConf::JsonFileLoader::findFile(const std::string & filename) const {
}
// check if absolute location has been specified
- if (filename.find("/")==0) {
+ if (filename.find('/')==0) {
TRG_MSG_WARNING("Can not find file with absolute location " << filename);
return {};
}
diff --git a/Trigger/TrigCost/TrigCostAnalysis/src/TrigCostAnalysis.cxx b/Trigger/TrigCost/TrigCostAnalysis/src/TrigCostAnalysis.cxx
index a07b07cea6b8..91770e3c3542 100644
--- a/Trigger/TrigCost/TrigCostAnalysis/src/TrigCostAnalysis.cxx
+++ b/Trigger/TrigCost/TrigCostAnalysis/src/TrigCostAnalysis.cxx
@@ -81,12 +81,10 @@ StatusCode TrigCostAnalysis::start() {
ATH_MSG_VERBOSE("Found Sequencer:" << sequencer.first);
for (const auto& alg : sequencer.second) {
// Data stored in Gaudi format of "AlgClassType/AlgInstanceName"
- size_t breakPoint = alg.second.data().find("/");
+ size_t breakPoint = alg.second.data().find('/');
std::string algType = alg.second.data().substr(0, breakPoint);
const std::string algName = alg.second.data().substr(breakPoint+1, alg.second.data().size());
- while(algType.find(":") != std::string::npos) {
- algType.replace(algType.find(":"), 1, "_");
- }
+ std::replace(algType.begin(), algType.end(), ':', '_');
m_algTypeMap[ TrigConf::HLTUtils::string2hash(algName, "ALG") ] = algType;
ATH_MSG_VERBOSE("AlgType:" << algType << ", AlgName:" << algName );
if (algType.find("EventViewCreatorAlgorithm") != std::string::npos) {
@@ -114,14 +112,12 @@ StatusCode TrigCostAnalysis::start() {
// Save identifiers and classes for additional HLTJobOptions map
if (not m_additionalHashList.empty()){
for (const std::string& entry : m_additionalHashList){
- size_t breakPoint = entry.find("/");
+ size_t breakPoint = entry.find('/');
if (breakPoint != std::string::npos){
std::string algType = entry.substr(0, breakPoint);
const std::string algName = entry.substr(breakPoint+1, entry.size());
- while(algType.find(":") != std::string::npos) {
- algType.replace(algType.find(":"), 1, "_");
- }
- m_algTypeMap[ TrigConf::HLTUtils::string2hash(algName, "ALG") ] = algType;
+ std::replace(algType.begin(), algType.end(), ':', '_');
+ m_algTypeMap[ TrigConf::HLTUtils::string2hash(algName, "ALG") ] = std::move(algType);
} else {
TrigConf::HLTUtils::string2hash(entry, "ALG");
}
diff --git a/Trigger/TrigMonitoring/TrigIDtrkMonitoring/utils/hanconfig.cxx b/Trigger/TrigMonitoring/TrigIDtrkMonitoring/utils/hanconfig.cxx
index fa5d064c0a4f..d766451ed25c 100644
--- a/Trigger/TrigMonitoring/TrigIDtrkMonitoring/utils/hanconfig.cxx
+++ b/Trigger/TrigMonitoring/TrigIDtrkMonitoring/utils/hanconfig.cxx
@@ -70,10 +70,10 @@ std::vector<std::string> exclude;
std::string tail( const std::string& s ) {
std::string _s = s;
- size_t pos = _s.find("/");
+ size_t pos = _s.find('/');
while ( pos!=std::string::npos ) {
_s.erase( 0, pos+1 );
- pos = _s.find("/");
+ pos = _s.find('/');
}
return _s;
}
@@ -83,12 +83,12 @@ std::string head( const std::string& s ) {
std::string h = "";
std::string _s = s;
- size_t pos = _s.find("/");
+ size_t pos = _s.find('/');
while ( pos!=std::string::npos ) {
- if ( h!="" ) h += "/";
+ if ( !h.empty() ) h += '/';
h += _s.substr( 0, pos );
_s.erase( 0, pos+1 );
- pos = _s.find("/");
+ pos = _s.find('/');
}
return h;
}
@@ -100,12 +100,12 @@ std::string strip( const std::string& s, const std::string& dir ) {
if ( dir=="" ) return s;
std::string _s = s;
- size_t pos = _s.find("/");
+ size_t pos = _s.find('/');
while ( pos!=std::string::npos ) {
std::string h = _s.substr( 0, pos );
if ( h==dir ) return _s;
_s.erase( 0, pos+1 );
- pos = _s.find("/");
+ pos = _s.find('/');
}
return _s;
}
@@ -113,14 +113,14 @@ std::string strip( const std::string& s, const std::string& dir ) {
std::string chop( const std::string& s ) {
std::string _s = s;
- size_t pos = _s.find("/");
+ size_t pos = _s.find('/');
if ( pos!=std::string::npos ) _s.erase( 0, pos+1 );
return _s;
}
std::string first( const std::string& s ) {
- size_t pos = s.find("/");
+ size_t pos = s.find('/');
if ( pos!=std::string::npos ) return s.substr( 0, pos );
return s;
}
@@ -170,7 +170,7 @@ bool add( const std::string& hname, TKey* tobj, const std::string depth="" ) {
if ( dbg ) out << depth << spacer << "\033[91;1m" << base << " - object :" << hname << ":\t:" << cwd << ":\t:" << strip(cwd, base) << ":\t:" << head(strip(cwd, base)) << ":\t:" << head(cwd) << ":\t:" << strip( head(cwd), base ) << ": \033[m\n";
- if ( basepath!="" ) out << depth << spacer << spacer << "output = " << head(basepath+"/"+hname) << "\n";
+ if ( basepath!="" ) out << depth << spacer << spacer << "output = " << head(basepath+'/'+hname) << "\n";
else out << depth << spacer << spacer << "output = " << head(hname) << "\n";
std::cerr << depth << spacer << spacer << "output = " << head(hname) << "\t\t " << basepath << " " << h0->GetName() << "\tFilled: " << hfilled( h0 ) << "\t" << h0->GetEntries() << "\n";
@@ -258,7 +258,7 @@ void search(TDirectory* td=0, const std::string& s="") {
std::string ns = s;
- if ( ns!="" ) ns += "/";
+ if ( !ns.empty() ) ns += '/';
bool print_trailer = false;
@@ -316,7 +316,7 @@ void search(TDirectory* td=0, const std::string& s="") {
// bool status = false;
std::string objname = ns;
- if ( objname!="" ) objname += std::string("/") + tobj->GetName();
+ if ( !objname.empty()) objname += std::string('/') + tobj->GetName();
// if ( std::string(tobj->GetClassName()).find("TH1")!=std::string::npos ) status = add<TH1>( objname.c_str(), tobj );
// if ( std::string(tobj->GetClassName()).find("TH2")!=std::string::npos ) status = add<TH2>( objname.c_str(), tobj );
@@ -433,7 +433,7 @@ void cost( std::vector<std::string>& files, const std::string& directory="" ) {
fptr[i]->cd();
- if ( directory!="" ) fptr[i]->cd(directory.c_str());
+ if ( !directory.empty() ) fptr[i]->cd(directory.c_str());
// gDirectory->pwd();
@@ -578,7 +578,7 @@ int main(int argc, char** argv) {
}
}
- if ( base == "" ) base = directory;
+ if ( base.empty() ) base = directory;
/// if output file is not defined
// if ( output_file == "" ) return usage( std::cerr, argc, argv );
@@ -593,7 +593,7 @@ int main(int argc, char** argv) {
basepath = strip( directory, base );
- // if ( basepath!="" ) basepath += "/";
+ // if ( basepath!="" ) basepath += '/';
std::cerr << directory << "\t" << base << "\tbasepath " << basepath << std::endl;
diff --git a/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.cxx b/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.cxx
index 1f5a641f7582..d9d141c352e0 100644
--- a/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.cxx
+++ b/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.cxx
@@ -740,7 +740,7 @@ LVL1CTP::CTPSimulation::calculateJetMultiplicity( const TrigConf::L1Threshold &
rhk = & m_iKeyGFexJets;
} else if( confThr.name().find("jL") == 0 ) {
rhk = & m_iKeyJFexLJets;
- } else if( confThr.name().find("j") == 0 ) {
+ } else if( confThr.name().find('j') == 0 ) {
rhk = & m_iKeyJFexJets;
} else {
ATH_MSG_ERROR( "Unexpected threshold name " << confThr.name() << ". Should start with j, jL, g, or J.");
diff --git a/graphics/JiveXML/src/XMLFormatTool.cxx b/graphics/JiveXML/src/XMLFormatTool.cxx
index 5d283f95643b..072811b3468a 100755
--- a/graphics/JiveXML/src/XMLFormatTool.cxx
+++ b/graphics/JiveXML/src/XMLFormatTool.cxx
@@ -161,7 +161,7 @@ namespace JiveXML {
}
// I don't understand this bit
- int i = (*itr).first.find(" ");
+ int i = (*itr).first.find(' ');
if (i != int(std::string::npos))
(*m_EventBuffer) << "\n</" << (*itr).first.substr(0,i) <<">\n";
else
--
GitLab
From 91165e1fb547c14038beff8c262259293e1666da Mon Sep 17 00:00:00 2001
From: Rafal Bielski <rafal.bielski@cern.ch>
Date: Mon, 23 Aug 2021 18:39:13 +0200
Subject: [PATCH 241/272] Fix uninitialised variables
---
.../TrigBSExtraction/src/TrigBStoxAODTool.cxx | 8 +--
.../TrigInDetEvent/src/TrigHisto1D.cxx | 15 ++--
.../TrigInDetEvent/src/TrigHisto2D.cxx | 55 ++++++--------
.../src/TrigInDetTrackHelper.cxx | 2 +-
.../TrigInDetEvent/src/TrigL2Vertex.cxx | 72 +++++++++----------
.../src/TrigInDetTrackCnv_p4.cxx | 2 +-
.../src/TrigInDetTrackFitParCnv_p2.cxx | 8 +--
.../src/TrigInDetTrackFitParCnv_p3.cxx | 8 +--
.../test/TrigInDetTrackCnv_p4_test.cxx | 2 +-
.../TrigMuonEvent/src/CombinedMuonFeature.cxx | 2 +-
.../TrigMuonEvent/src/TrigMuonEFInfo.cxx | 9 +--
.../Root/StandaloneNavigation.cxx | 4 +-
.../Root/TrigNavStructure.cxx | 7 +-
.../TrigNavStructure/Root/TriggerElement.cxx | 2 +-
.../test/ut_build_trignav_test.cxx | 4 +-
.../test/ut_features_test.cxx | 4 +-
.../test/ut_iterators_test.cxx | 4 +-
.../TrigNavigation/src/FullHolderFactory.cxx | 4 +-
.../TrigEvent/TrigNavigation/src/Holder.cxx | 2 +-
.../TrigNavigation/src/Navigation.cxx | 2 +-
.../test/HLTNavigation_test.cxx | 33 ++++-----
.../TrigNavigation/test/Holder_test.cxx | 14 ++--
.../TrigNavigation/test/Ownership_test.cxx | 22 +++---
.../TrigNavigation/test/Registration_test.cxx | 30 ++++----
.../TrigNavigation/test/RoICache_test.cxx | 36 +++++-----
.../TrigSteeringEvent/src/HLTResult.cxx | 4 +-
.../src/TrigOperationalInfo.cxx | 3 +-
.../test/HLTResultCnv_p1_test.cxx | 4 +-
.../DecisionHandling/src/ComboHypo.cxx | 4 +-
.../test/test_ComboHypoTool.cxx | 4 +-
.../Root/TrigCompositeUtilsRoot.cxx | 5 +-
.../TrigCompositeUtils/KFromNItr.h | 2 +-
.../TrigCompositeUtils/LinkInfo.h | 7 +-
.../test/TrigCompositeUtils_test.cxx | 4 +-
.../test/TrigTraversal_test.cxx | 28 ++++----
.../src/HLTResultByteStreamCnv.cxx | 5 +-
.../src/TriggerEDMDeserialiserAlg.cxx | 2 +-
.../src/TriggerEDMSerialiserTool.cxx | 4 +-
.../test/schema_evolution_test.cxx | 4 +-
.../test/serial_deserial_test.cxx | 4 +-
.../test/void_record_test.cxx | 4 +-
41 files changed, 207 insertions(+), 232 deletions(-)
diff --git a/Trigger/TrigEvent/TrigBSExtraction/src/TrigBStoxAODTool.cxx b/Trigger/TrigEvent/TrigBSExtraction/src/TrigBStoxAODTool.cxx
index 03491b763b6e..f1f54b1f61c5 100755
--- a/Trigger/TrigEvent/TrigBSExtraction/src/TrigBStoxAODTool.cxx
+++ b/Trigger/TrigEvent/TrigBSExtraction/src/TrigBStoxAODTool.cxx
@@ -153,8 +153,8 @@ namespace BStoXAODHelper{
return HLTNavDetails::formatSGkey(this->m_AODprefix,ClassID_traits<T>::typeName(),label);
}
protected:
- MsgStream* m_msg;
- StoreGateSvc* m_sg;
+ MsgStream* m_msg{nullptr};
+ StoreGateSvc* m_sg{nullptr};
const std::string m_AODprefix = "HLT";
};
@@ -696,7 +696,7 @@ StatusCode TrigBStoxAODTool::classLabel2CLIDLabel(const std::vector<std::string>
std::vector<std::pair<CLID,std::string> >& decoded,
std::vector<std::pair<CLID,std::string> >& decodedNewNames) {
// translate Class names into CLID numbers
- IClassIDSvc* clidSvc;
+ IClassIDSvc* clidSvc{nullptr};
if( service("ClassIDSvc", clidSvc).isFailure() ) {
ATH_MSG_FATAL("Unable to get pointer to CLIDSvc Service");
return StatusCode::FAILURE;
@@ -710,7 +710,7 @@ StatusCode TrigBStoxAODTool::classLabel2CLIDLabel(const std::vector<std::string>
std::vector<std::string>::const_iterator it;
std::vector<std::string>::const_iterator itNew = newProperty.begin();
for ( it = property.begin(); it != property.end(); ++it, ++itNew ) {
- CLID clid;
+ CLID clid{0};
std::string label;
std::string label_new;
std::string type;
diff --git a/Trigger/TrigEvent/TrigInDetEvent/src/TrigHisto1D.cxx b/Trigger/TrigEvent/TrigInDetEvent/src/TrigHisto1D.cxx
index 6c7dfd058c65..411a0b59803f 100644
--- a/Trigger/TrigEvent/TrigInDetEvent/src/TrigHisto1D.cxx
+++ b/Trigger/TrigEvent/TrigInDetEvent/src/TrigHisto1D.cxx
@@ -116,9 +116,7 @@ TrigHisto1D& TrigHisto1D::operator=(TrigHisto1D&& trigHisto) {
//---------------------------------------------------------------
void TrigHisto1D::fill(float value_x, float weight) {
- unsigned int ibin;
-
- ibin = findBin(m_nbins_x, m_min_x, m_max_x, m_binSize_x, value_x);
+ const unsigned int ibin = findBin(m_nbins_x, m_min_x, m_max_x, m_binSize_x, value_x);
m_contents[ibin] += weight; // Append the weight to this bin.
}
@@ -126,13 +124,10 @@ void TrigHisto1D::fill(float value_x, float weight) {
//---------------------------------------------------------------
double TrigHisto1D::sumEntries(float value_x, int cutType) const {
- unsigned int ibin_x, ibin_x_selected;
- double entries;
-
// Find which bin contains the value_x.
- ibin_x_selected = findBin(m_nbins_x, m_min_x, m_max_x, m_binSize_x, value_x);
+ const unsigned int ibin_x_selected = findBin(m_nbins_x, m_min_x, m_max_x, m_binSize_x, value_x);
- entries = 0.;
+ double entries = 0.;
if( m_nbins_x==0 ){
return 0;
@@ -140,12 +135,12 @@ double TrigHisto1D::sumEntries(float value_x, int cutType) const {
else{
if (cutType == BELOW_X) {
- for(ibin_x = m_underflowBin_x; ibin_x <= ibin_x_selected; ibin_x++) {
+ for(unsigned int ibin_x = m_underflowBin_x; ibin_x <= ibin_x_selected; ibin_x++) {
entries += m_contents[ibin_x];
}
}
else if(cutType == ABOVE_X) {
- for(ibin_x = ibin_x_selected; ibin_x <= m_overflowBin_x; ibin_x++) {
+ for(unsigned int ibin_x = ibin_x_selected; ibin_x <= m_overflowBin_x; ibin_x++) {
entries += m_contents[ibin_x];
}
}
diff --git a/Trigger/TrigEvent/TrigInDetEvent/src/TrigHisto2D.cxx b/Trigger/TrigEvent/TrigInDetEvent/src/TrigHisto2D.cxx
index 173542cdeed7..a851d72619ef 100644
--- a/Trigger/TrigEvent/TrigInDetEvent/src/TrigHisto2D.cxx
+++ b/Trigger/TrigEvent/TrigInDetEvent/src/TrigHisto2D.cxx
@@ -32,9 +32,7 @@ TrigHisto2D::TrigHisto2D(unsigned int nbins_x,
m_min_x = min_x;
m_max_x = max_x;
- unsigned int nbins;
-
- nbins = (nbins_x+2)*(nbins_y+2); // Two additional bins for under and overflow per 1d profile.
+ unsigned int nbins = (nbins_x+2)*(nbins_y+2); // Two additional bins for under and overflow per 1d profile.
m_contents = contents;
m_contents.resize(nbins, 0.); // Two additional bins for under and overflow per 1d profile.
@@ -170,12 +168,10 @@ TrigHisto2D& TrigHisto2D::operator=(TrigHisto2D&& trigHisto) {
//---------------------------------------------------------------
void TrigHisto2D::fill(float value_x, float value_y, float weight) {
- unsigned int ibin_x, ibin_y, ibin;
-
- ibin_x = findBin(m_nbins_x, m_min_x, m_max_x, m_binSize_x, value_x);
- ibin_y = findBin(m_nbins_y, m_min_y, m_max_y, m_binSize_y, value_y);
+ const unsigned int ibin_x = findBin(m_nbins_x, m_min_x, m_max_x, m_binSize_x, value_x);
+ const unsigned int ibin_y = findBin(m_nbins_y, m_min_y, m_max_y, m_binSize_y, value_y);
- ibin = ibin_y*(m_nbins_x+2) + ibin_x; // Find position in 1d data array
+ const unsigned int ibin = ibin_y*(m_nbins_x+2) + ibin_x; // Find position in 1d data array
m_contents[ibin] += weight; // Append the weight to this bin
}
@@ -183,18 +179,13 @@ void TrigHisto2D::fill(float value_x, float value_y, float weight) {
//---------------------------------------------------------------
double TrigHisto2D::sumEntries(float value_x, float value_y, int cutType) const {
- unsigned int ibin, ibin_x, ibin_y, ibin_x_selected, ibin_y_selected;
- double entries;
-
-
-
// Find the x bin index that the cut corresponds to.
- ibin_x_selected = findBin(m_nbins_x, m_min_x, m_max_x, m_binSize_x, value_x);
+ const unsigned int ibin_x_selected = findBin(m_nbins_x, m_min_x, m_max_x, m_binSize_x, value_x);
// Find the y bin index that the cut corresponds to.
- ibin_y_selected = findBin(m_nbins_y, m_min_y, m_max_y, m_binSize_y, value_y);
+ const unsigned int ibin_y_selected = findBin(m_nbins_y, m_min_y, m_max_y, m_binSize_y, value_y);
- entries = 0.;
+ double entries = 0.;
if( m_nbins_x==0 || m_nbins_y==0 ){
@@ -203,33 +194,33 @@ double TrigHisto2D::sumEntries(float value_x, float value_y, int cutType) const
else{
if(cutType == BELOW_X_BELOW_Y) {
- for(ibin_x = m_underflowBin_x; ibin_x <= ibin_x_selected; ibin_x++) {
- for(ibin_y = m_underflowBin_y; ibin_y <= ibin_y_selected; ibin_y++) {
- ibin = ibin_y*(m_nbins_x+2) + ibin_x; // Find position in 1d data array
+ for(unsigned int ibin_x = m_underflowBin_x; ibin_x <= ibin_x_selected; ibin_x++) {
+ for(unsigned int ibin_y = m_underflowBin_y; ibin_y <= ibin_y_selected; ibin_y++) {
+ const unsigned int ibin = ibin_y*(m_nbins_x+2) + ibin_x; // Find position in 1d data array
entries += m_contents[ibin];
}
}
}
else if(cutType == ABOVE_X_BELOW_Y) {
- for(ibin_x = ibin_x_selected; ibin_x <= m_overflowBin_x; ibin_x++) {
- for(ibin_y = m_underflowBin_y; ibin_y <= ibin_y_selected; ibin_y++) {
- ibin = ibin_y*(m_nbins_x+2) + ibin_x; // Find position in 1d data array
+ for(unsigned int ibin_x = ibin_x_selected; ibin_x <= m_overflowBin_x; ibin_x++) {
+ for(unsigned int ibin_y = m_underflowBin_y; ibin_y <= ibin_y_selected; ibin_y++) {
+ const unsigned int ibin = ibin_y*(m_nbins_x+2) + ibin_x; // Find position in 1d data array
entries += m_contents[ibin];
}
}
}
else if(cutType == BELOW_X_ABOVE_Y) {
- for(ibin_x = m_underflowBin_x; ibin_x <= ibin_x_selected; ibin_x++) {
- for(ibin_y = ibin_y_selected; ibin_y <= m_overflowBin_y; ibin_y++) {
- ibin = ibin_y*(m_nbins_x+2) + ibin_x; // Find position in 1d data array
+ for(unsigned int ibin_x = m_underflowBin_x; ibin_x <= ibin_x_selected; ibin_x++) {
+ for(unsigned int ibin_y = ibin_y_selected; ibin_y <= m_overflowBin_y; ibin_y++) {
+ const unsigned int ibin = ibin_y*(m_nbins_x+2) + ibin_x; // Find position in 1d data array
entries += m_contents[ibin];
}
}
}
else if(cutType == ABOVE_X_ABOVE_Y) {
- for(ibin_x = ibin_x_selected; ibin_x <= m_overflowBin_x; ibin_x++) {
- for(ibin_y = ibin_y_selected; ibin_y <= m_overflowBin_y; ibin_y++) {
- ibin = ibin_y*(m_nbins_x+2) + ibin_x; // Find position in 1d data array
+ for(unsigned int ibin_x = ibin_x_selected; ibin_x <= m_overflowBin_x; ibin_x++) {
+ for(unsigned int ibin_y = ibin_y_selected; ibin_y <= m_overflowBin_y; ibin_y++) {
+ const unsigned int ibin = ibin_y*(m_nbins_x+2) + ibin_x; // Find position in 1d data array
entries += m_contents[ibin];
}
}
@@ -265,15 +256,13 @@ TrigHisto1D TrigHisto2D::profileX(void) const {
//---------------------------------------------------------------
TrigHisto1D TrigHisto2D::profileY(void) const {
- unsigned int ibin, ibin_x, ibin_y;
-
// Define size carefully to avoid memory problems in for loop.
std::vector<float> contents((m_overflowBin_y-m_underflowBin_y+1),0.);
// Sum all x bins for each y bin.
- for(ibin_y = m_underflowBin_y; ibin_y <= m_overflowBin_y; ibin_y++) {
- for(ibin_x = m_underflowBin_x; ibin_x <= m_overflowBin_x; ibin_x++) {
- ibin = ibin_y*(m_nbins_x+2) + ibin_x; // Find position in 1d data array
+ for(unsigned int ibin_y = m_underflowBin_y; ibin_y <= m_overflowBin_y; ibin_y++) {
+ for(unsigned int ibin_x = m_underflowBin_x; ibin_x <= m_overflowBin_x; ibin_x++) {
+ const unsigned int ibin = ibin_y*(m_nbins_x+2) + ibin_x; // Find position in 1d data array
contents[ibin_y] += m_contents[ibin];
}
}
diff --git a/Trigger/TrigEvent/TrigInDetEvent/src/TrigInDetTrackHelper.cxx b/Trigger/TrigEvent/TrigInDetEvent/src/TrigInDetTrackHelper.cxx
index 8b2e26ee44d7..e628d6d6e868 100755
--- a/Trigger/TrigEvent/TrigInDetEvent/src/TrigInDetTrackHelper.cxx
+++ b/Trigger/TrigEvent/TrigInDetEvent/src/TrigInDetTrackHelper.cxx
@@ -28,7 +28,7 @@ void TrigInDetTrackHelper::extrapolate(double rC, double zC, double &phiC, doubl
* *
*----------------------------------------------------------------------*/
#define BFIELD 2.0
- double Rcurv,r, z, xD, xN, dphi;
+ double Rcurv{0}, r{0}, z{0}, xD{0}, xN{0}, dphi{0};
double pt = m_param->pT();
double eta = m_param->eta();
diff --git a/Trigger/TrigEvent/TrigInDetEvent/src/TrigL2Vertex.cxx b/Trigger/TrigEvent/TrigInDetEvent/src/TrigL2Vertex.cxx
index 94c15e3ce07d..f9de71bd5012 100755
--- a/Trigger/TrigEvent/TrigInDetEvent/src/TrigL2Vertex.cxx
+++ b/Trigger/TrigEvent/TrigInDetEvent/src/TrigL2Vertex.cxx
@@ -11,7 +11,7 @@ TrigVertexFitInputTrack::TrigVertexFitInputTrack(const TrigInDetTrack* pT, doubl
m_nTrackType=1;m_active=true;
m_pTrigTrack=pT;m_pTrkTrack=NULL;
double Ck[5][5];
- int i,j;
+ int i{0},j{0};
const TrigInDetTrackFitPar* p=pT->param();
@@ -102,10 +102,8 @@ TrigVertexFitInputTrack::TrigVertexFitInputTrack(const Trk::Track* pT,double mas
Ck[3][4]=Ck[4][3]=(*TC)(Trk::theta,Trk::qOverP);
Ck[4][4]=(*TC)(Trk::qOverP,Trk::qOverP);
- double a,b;
-
- a=cos(pP->parameters()[Trk::theta])/ptC;
- b=-sin(pP->parameters()[Trk::theta])/(pP->parameters()[Trk::qOverP]*ptC);
+ const double a = cos(pP->parameters()[Trk::theta])/ptC;
+ const double b = -sin(pP->parameters()[Trk::theta])/(pP->parameters()[Trk::qOverP]*ptC);
Ck[3][3]=Ck[3][3]+2.0*a*Ck[3][4]+a*a*Ck[4][4];
Ck[3][4]=Ck[4][3]=b*Ck[3][4]+a*b*Ck[4][4];
@@ -189,9 +187,8 @@ double TrigVertexFitInputTrack::PerigeeCovariance(int i, int j) const
void TrigVertexFitInputTrack::initializeVertex(class TrigL2Vertex* pV)
{
- int i,j;
- i=3+m_index*3;
- for(j=0;j<3;j++)
+ const int i = 3+m_index*3;
+ for(int j=0;j<3;j++)
pV->getParametersVector()[i+j]=m_q[j];
}
@@ -199,14 +196,13 @@ double TrigVertexFitInputTrack::getChi2Distance(class TrigL2Vertex* pV)
{
const double C=0.02997;
const double B=20.84;
+ const double alpha=C*B/1000.0;
double Sk[2][2],detr,chi2;
double AC[2][3],BV[2][3];
- int i,j,k,shift;
- double psi,sinPsi,cosPsi,alpha=C*B/1000.0,xv,yv,zv,
- cosPhi0,sinPhi0,ctt,sint,phi0,theta0,P0;
+ int i{0},j{0},k{0};
- shift=m_index*3;
+ const int shift=m_index*3;
k=3+shift;
for(i=0;i<3;i++)
@@ -214,20 +210,21 @@ double TrigVertexFitInputTrack::getChi2Distance(class TrigL2Vertex* pV)
pV->m_Gk[i+k][j+k]=m_Vqq[i][j];
initializeVertex(pV);
- xv=pV->getParametersVector()[0];
- yv=pV->getParametersVector()[1];
- zv=pV->getParametersVector()[2];
- phi0=pV->getParametersVector()[3+shift];
- theta0=pV->getParametersVector()[4+shift];
- P0=pV->getParametersVector()[5+shift];
-
- cosPhi0=cos(phi0);sinPhi0=sin(phi0);
- sinPsi=-alpha*(xv*cosPhi0+yv*sinPhi0)/P0;
+ const double xv=pV->getParametersVector()[0];
+ const double yv=pV->getParametersVector()[1];
+ const double zv=pV->getParametersVector()[2];
+ const double phi0=pV->getParametersVector()[3+shift];
+ const double theta0=pV->getParametersVector()[4+shift];
+ const double P0=pV->getParametersVector()[5+shift];
+
+ const double cosPhi0=cos(phi0);
+ const double sinPhi0=sin(phi0);
+ const double sinPsi=-alpha*(xv*cosPhi0+yv*sinPhi0)/P0;
if(fabs(sinPsi)>1.0) return -999.9;
- cosPsi=sqrt(1.0-sinPsi*sinPsi);
- psi=asin(sinPsi);
- sint=sin(theta0);
- ctt=cos(theta0)/sint;
+ const double cosPsi=sqrt(1.0-sinPsi*sinPsi);
+ const double psi=asin(sinPsi);
+ const double sint=sin(theta0);
+ const double ctt=cos(theta0)/sint;
m_A[0][0]=-sin(phi0+psi)/cosPsi;
m_A[0][1]= cos(phi0+psi)/cosPsi;
@@ -304,7 +301,8 @@ double TrigVertexFitInputTrack::getChi2Distance(class TrigL2Vertex* pV)
void TrigVertexFitInputTrack::updateVertex(class TrigL2Vertex* pV)
{
- int i,j,k,nSize=6+3*m_index;
+ int i{0},j{0},k{0};
+ const int nSize=6+3*m_index;
double K[2][MAX_SIZE_VERT_COVM];
@@ -329,14 +327,12 @@ void TrigVertexFitInputTrack::updateVertex(class TrigL2Vertex* pV)
MsgStream& TrigVertexFitInputTrack::report( MsgStream& out ) const
{
- int i;
-
out<<"Track "<<m_index<<" : mass="<<m_mass<<endmsg;
- for(i=0;i<2;i++)
+ for(int i=0;i<2;i++)
{
out<<" u"<<i<<" = "<<m_u[i]<<" "<<m_Vuu[i][0]<<" "<<m_Vuu[i][1]<<endmsg;
}
- for(i=0;i<3;i++)
+ for(int i=0;i<3;i++)
{
out<<" q"<<i<<" = "<<m_q[i]<<" "<<m_Vqq[i][0]<<" "<<m_Vqq[i][1]<<" "<<m_Vqq[i][2]<<endmsg;
}
@@ -374,12 +370,11 @@ double TrigVertexFitConstraint::calculateInvariantMass(TrigL2Vertex* pV)
double invMass=0.0,alpha=C*B/1000.0;
double P[3];double E=0.0;
- int i;
double* Rk = pV->getParametersVector();
int offset=0;
- for(i=0;i<3;i++) P[i]=0.0;
+ for(int i=0;i<3;i++) P[i]=0.0;
for(std::list<const TrigVertexFitInputTrack*>::iterator it=m_trackList.begin();it!=m_trackList.end();++it)
{
@@ -409,7 +404,7 @@ double TrigVertexFitConstraint::getChi2Distance(TrigL2Vertex* pV)
double invMass=0.0,alpha=C*B/1000.0;
double P[3];
double E=0.0;
- int i,j;
+ int i{0},j{0};
bool linFailed=false;
double* Rk = pV->getParametersVector();
@@ -513,8 +508,9 @@ double TrigVertexFitConstraint::getChi2Distance(TrigL2Vertex* pV)
void TrigVertexFitConstraint::updateVertex(TrigL2Vertex* pV)
{
double K[MAX_SIZE_VERT_COVM];
- int i,j,nSize=3+3*pV->getTracks()->size();
- double gain;
+ int i{0},j{0};
+ const int nSize=3+3*pV->getTracks()->size();
+ double gain{0};
for(i=0;i<nSize;i++)
{
@@ -693,12 +689,12 @@ bool TrigL2Vertex::isReadyForFit()
MsgStream& TrigL2Vertex::report( MsgStream& msg) const
{
- int i,j,nSize=3+3*m_pvTracks->size();
+ const int nSize=3+3*m_pvTracks->size();
- for(i=0;i<nSize;i++)
+ for(int i=0;i<nSize;i++)
{
msg<<m_Rk[i]<<" ";
- for(j=0;j<nSize;j++) msg<<m_Gk[i][j]<<" ";
+ for(int j=0;j<nSize;j++) msg<<m_Gk[i][j]<<" ";
msg<<endmsg;
}
return msg;
diff --git a/Trigger/TrigEvent/TrigInDetEventTPCnv/src/TrigInDetTrackCnv_p4.cxx b/Trigger/TrigEvent/TrigInDetEventTPCnv/src/TrigInDetTrackCnv_p4.cxx
index 5d8644f8b4ae..c99467525e13 100644
--- a/Trigger/TrigEvent/TrigInDetEventTPCnv/src/TrigInDetTrackCnv_p4.cxx
+++ b/Trigger/TrigEvent/TrigInDetEventTPCnv/src/TrigInDetTrackCnv_p4.cxx
@@ -92,7 +92,7 @@ StatusCode TrigInDetTrackCnv_p4::initialize(MsgStream &log) {
}
// get DetectorStore service
- StoreGateSvc *detStore;
+ StoreGateSvc *detStore{nullptr};
sc = svcLocator->service("DetectorStore", detStore);
if (sc.isFailure()) {
log << MSG::FATAL << "DetectorStore service not found !" << endmsg;
diff --git a/Trigger/TrigEvent/TrigInDetEventTPCnv/src/TrigInDetTrackFitParCnv_p2.cxx b/Trigger/TrigEvent/TrigInDetEventTPCnv/src/TrigInDetTrackFitParCnv_p2.cxx
index bcac51a9cd38..8b7e13b9c1fd 100644
--- a/Trigger/TrigEvent/TrigInDetEventTPCnv/src/TrigInDetTrackFitParCnv_p2.cxx
+++ b/Trigger/TrigEvent/TrigInDetEventTPCnv/src/TrigInDetTrackFitParCnv_p2.cxx
@@ -10,7 +10,7 @@ using std::memset;
bool TrigInDetTrackFitParCnv_p2 :: calculateSquareRoot(const TrigInDetTrackFitPar* p, TrigInDetTrackFitPar_p2* pP)
{
- int i,j,idx=0;
+ int i{0},j{0},idx{0};
double a[5][5];
float L[5][5];
@@ -49,7 +49,7 @@ std::unique_ptr<std::vector<double> >
TrigInDetTrackFitParCnv_p2 :: restoreCovariance(const TrigInDetTrackFitPar_p2* pP)
{
- int i,j,k,idx=0;
+ int i{0},j{0},k{0},idx{0};
float L[5][5], LT[5][5];
if(pP->m_cov[0]<0.0)
{
@@ -86,8 +86,8 @@ TrigInDetTrackFitParCnv_p2 :: restoreCovariance(const TrigInDetTrackFitPar_p2* p
bool TrigInDetTrackFitParCnv_p2 :: CholeskyDecomposition(double a[5][5], float L[5][5])
{
- int i,j,k;
- double sum;
+ int i{0},j{0},k{0};
+ double sum{0};
float p[5];
for(i=0;i<5;i++)
diff --git a/Trigger/TrigEvent/TrigInDetEventTPCnv/src/TrigInDetTrackFitParCnv_p3.cxx b/Trigger/TrigEvent/TrigInDetEventTPCnv/src/TrigInDetTrackFitParCnv_p3.cxx
index 5c3967bd7ae9..d9edccedf0b7 100644
--- a/Trigger/TrigEvent/TrigInDetEventTPCnv/src/TrigInDetTrackFitParCnv_p3.cxx
+++ b/Trigger/TrigEvent/TrigInDetEventTPCnv/src/TrigInDetTrackFitParCnv_p3.cxx
@@ -10,7 +10,7 @@ using std::memset;
bool TrigInDetTrackFitParCnv_p3 :: calculateSquareRoot(const TrigInDetTrackFitPar* p, TrigInDetTrackFitPar_p3* pP)
{
- int i,j,idx=0;
+ int i{0},j{0},idx{0};
double a[5][5];
float L[5][5];
@@ -49,7 +49,7 @@ std::unique_ptr<std::vector<double> >
TrigInDetTrackFitParCnv_p3 :: restoreCovariance(const TrigInDetTrackFitPar_p3* pP)
{
- int i,j,k,idx=0;
+ int i{0},j{0},k{0},idx{0};
float L[5][5], LT[5][5];
if(pP->m_cov[0]<0.0)
{
@@ -86,8 +86,8 @@ TrigInDetTrackFitParCnv_p3 :: restoreCovariance(const TrigInDetTrackFitPar_p3* p
bool TrigInDetTrackFitParCnv_p3 :: CholeskyDecomposition(double a[5][5], float L[5][5])
{
- int i,j,k;
- double sum;
+ int i{0},j{0},k{0};
+ double sum{0};
float p[5];
for(i=0;i<5;i++)
diff --git a/Trigger/TrigEvent/TrigInDetEventTPCnv/test/TrigInDetTrackCnv_p4_test.cxx b/Trigger/TrigEvent/TrigInDetEventTPCnv/test/TrigInDetTrackCnv_p4_test.cxx
index a58ab9744d4d..813acaa81920 100644
--- a/Trigger/TrigEvent/TrigInDetEventTPCnv/test/TrigInDetTrackCnv_p4_test.cxx
+++ b/Trigger/TrigEvent/TrigInDetEventTPCnv/test/TrigInDetTrackCnv_p4_test.cxx
@@ -199,7 +199,7 @@ void make_dd()
int main()
{
- ISvcLocator* pSvcLoc;
+ ISvcLocator* pSvcLoc{nullptr};
if (!Athena_test::initGaudi("TrigInDetEventTPCnv_test.txt", pSvcLoc)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/Trigger/TrigEvent/TrigMuonEvent/src/CombinedMuonFeature.cxx b/Trigger/TrigEvent/TrigMuonEvent/src/CombinedMuonFeature.cxx
index bffcf6882e8d..171c583b61e6 100755
--- a/Trigger/TrigEvent/TrigMuonEvent/src/CombinedMuonFeature.cxx
+++ b/Trigger/TrigEvent/TrigMuonEvent/src/CombinedMuonFeature.cxx
@@ -85,7 +85,7 @@ double CombinedMuonFeature::sigma_pt(void) const {
if (m_charge == 0) {//for backward compatibility
if (m_sigma_pt < 0) return 0.;
else {
- double ftmp;
+ double ftmp{0};
double stmp = modf(m_sigma_pt/10000., &ftmp)*1000000.;
return static_cast<float>(stmp);
}
diff --git a/Trigger/TrigEvent/TrigMuonEvent/src/TrigMuonEFInfo.cxx b/Trigger/TrigEvent/TrigMuonEvent/src/TrigMuonEFInfo.cxx
index e906cdd2d0e3..6ec25262066b 100644
--- a/Trigger/TrigEvent/TrigMuonEvent/src/TrigMuonEFInfo.cxx
+++ b/Trigger/TrigEvent/TrigMuonEvent/src/TrigMuonEFInfo.cxx
@@ -276,11 +276,10 @@ void TrigMuonEFInfo::addTrack(TrigMuonEFInfoTrack* theTrack){
void TrigMuonEFInfo::setSpectrometerTrack( TrigMuonEFTrack* theTrack )
{
- TrigMuonEFInfoTrack *track;
if (!hasTrack()) {
addTrack( new TrigMuonEFInfoTrack());
}
- track = (*(m_trackContainer->begin()));
+ TrigMuonEFInfoTrack *track = (*(m_trackContainer->begin()));
track->setSpectrometerTrack(theTrack);
return;
}
@@ -299,11 +298,10 @@ TrigMuonEFTrack* TrigMuonEFInfo::SpectrometerTrack()
void TrigMuonEFInfo::setExtrapolatedTrack( TrigMuonEFTrack* theTrack )
{
- TrigMuonEFInfoTrack *track;
if (!hasTrack()) {
addTrack( new TrigMuonEFInfoTrack());
}
- track = (*(m_trackContainer->begin()));
+ TrigMuonEFInfoTrack *track = (*(m_trackContainer->begin()));
track->setExtrapolatedTrack(theTrack);
return;
}
@@ -323,11 +321,10 @@ TrigMuonEFTrack* TrigMuonEFInfo::ExtrapolatedTrack()
void TrigMuonEFInfo::setCombinedTrack( TrigMuonEFCbTrack* theTrack )
{
- TrigMuonEFInfoTrack *track;
if (!hasTrack()) {
addTrack( new TrigMuonEFInfoTrack());
}
- track = (*(m_trackContainer->begin()));
+ TrigMuonEFInfoTrack *track = (*(m_trackContainer->begin()));
track->setCombinedTrack(theTrack);
return;
}
diff --git a/Trigger/TrigEvent/TrigNavStructure/Root/StandaloneNavigation.cxx b/Trigger/TrigEvent/TrigNavStructure/Root/StandaloneNavigation.cxx
index 1d01966f238f..46d6c6c9ace6 100644
--- a/Trigger/TrigEvent/TrigNavStructure/Root/StandaloneNavigation.cxx
+++ b/Trigger/TrigEvent/TrigNavStructure/Root/StandaloneNavigation.cxx
@@ -44,9 +44,9 @@ bool HLT::StandaloneNavigation::deserializeHolders(std::vector<uint32_t>::const_
const size_t holderPayloadSize = *start;
++start;
- class_id_type clid;
+ class_id_type clid{0};
std::string label;
- sub_index_type sub;
+ sub_index_type sub{0};
std::vector<uint32_t>::const_iterator oneBlobIt = start;
bool couldRead = BaseHolder::enquireSerialized(oneBlobIt, end, clid, label, sub);
diff --git a/Trigger/TrigEvent/TrigNavStructure/Root/TrigNavStructure.cxx b/Trigger/TrigEvent/TrigNavStructure/Root/TrigNavStructure.cxx
index 1f5347b46606..f0fabc9165be 100644
--- a/Trigger/TrigEvent/TrigNavStructure/Root/TrigNavStructure.cxx
+++ b/Trigger/TrigEvent/TrigNavStructure/Root/TrigNavStructure.cxx
@@ -731,8 +731,7 @@ bool TrigNavStructure::getTopologicallySpannedBy( const TriggerElement* te, cons
return false;
}
- unsigned i;
- for ( i = 0 ; i < types.size(); ++i ) {
+ for ( unsigned i = 0 ; i < types.size(); ++i ) {
TriggerElement* child = const_cast<TriggerElement*>(getSuccessor( getDirectPredecessors(te)[i], types[i]));
if(child!=0) {
if(activeOnly && !child->getActiveState()) {
@@ -850,10 +849,10 @@ bool TrigNavStructure::getFeatureAccessorsSingleTE( const TriggerElement* te, cl
//remove unused warning
(void)(with_cache_recording);
- int size = te->getFeatureAccessHelpers().size(), it;
+ int size = te->getFeatureAccessHelpers().size();
// loop the feature access helper in order depending of type of request (i.e. if single featyure needed then loop from back, if all then loop from the front)
- for ( it = ( only_single_feature ? size-1 : 0 ); it != (only_single_feature ? -1 : size ); only_single_feature ? it--: it++ ) {
+ for ( int it = ( only_single_feature ? size-1 : 0 ); it != (only_single_feature ? -1 : size ); only_single_feature ? it--: it++ ) {
auto& fea = te->getFeatureAccessHelpers().at(it);
//ATH_MSG_VERBOSE("getFeatureAccessors: in a loop over FeatureAccessHelpers got ObjectIndex " << fea);
diff --git a/Trigger/TrigEvent/TrigNavStructure/Root/TriggerElement.cxx b/Trigger/TrigEvent/TrigNavStructure/Root/TriggerElement.cxx
index d00380c07667..ee8c9fbaab16 100644
--- a/Trigger/TrigEvent/TrigNavStructure/Root/TriggerElement.cxx
+++ b/Trigger/TrigEvent/TrigNavStructure/Root/TriggerElement.cxx
@@ -188,7 +188,7 @@ void TriggerElement::deserialize( std::vector<uint32_t>::const_iterator& inputIt
std::map<uint16_t, TriggerElement*>::const_iterator id;
unsigned relationsCount = 0;
- uint16_t key;
+ uint16_t key{0};
for ( unsigned int i = 0 ; i < size; ++i ) {
extractUint16FromUint32Vector(inputIt, key, relationsCount); // extract the key from the payload
++relationsCount;
diff --git a/Trigger/TrigEvent/TrigNavStructure/test/ut_build_trignav_test.cxx b/Trigger/TrigEvent/TrigNavStructure/test/ut_build_trignav_test.cxx
index e7b621e40a73..0fc47037fd6c 100644
--- a/Trigger/TrigEvent/TrigNavStructure/test/ut_build_trignav_test.cxx
+++ b/Trigger/TrigEvent/TrigNavStructure/test/ut_build_trignav_test.cxx
@@ -163,8 +163,8 @@ bool truncate() {
int main() {
// initialize Gaudi, SG
- ISvcLocator* pSvcLoc;
- Athena_test::initGaudi(pSvcLoc);
+ ISvcLocator* pSvcLoc{nullptr};
+ assert( Athena_test::initGaudi(pSvcLoc) );
StoreGateSvc* pSG(nullptr);
assert( pSvcLoc->service("StoreGateSvc", pSG, true).isSuccess() );
diff --git a/Trigger/TrigEvent/TrigNavStructure/test/ut_features_test.cxx b/Trigger/TrigEvent/TrigNavStructure/test/ut_features_test.cxx
index ad1268300f9f..75eff6bed7b6 100644
--- a/Trigger/TrigEvent/TrigNavStructure/test/ut_features_test.cxx
+++ b/Trigger/TrigEvent/TrigNavStructure/test/ut_features_test.cxx
@@ -304,8 +304,8 @@ bool ser() {
int main() {
// initialize Gaudi, SG
- ISvcLocator* pSvcLoc;
- Athena_test::initGaudi(pSvcLoc);
+ ISvcLocator* pSvcLoc{nullptr};
+ assert( Athena_test::initGaudi(pSvcLoc) );
StoreGateSvc* pSG(nullptr);
assert( pSvcLoc->service("StoreGateSvc", pSG, true).isSuccess() );
diff --git a/Trigger/TrigEvent/TrigNavStructure/test/ut_iterators_test.cxx b/Trigger/TrigEvent/TrigNavStructure/test/ut_iterators_test.cxx
index c1eabaed632c..9d4700045fc5 100644
--- a/Trigger/TrigEvent/TrigNavStructure/test/ut_iterators_test.cxx
+++ b/Trigger/TrigEvent/TrigNavStructure/test/ut_iterators_test.cxx
@@ -194,8 +194,8 @@ bool testTopoIterator() {
int main() {
// initialize Gaudi, SG
- ISvcLocator* pSvcLoc;
- Athena_test::initGaudi(pSvcLoc);
+ ISvcLocator* pSvcLoc{nullptr};
+ assert( Athena_test::initGaudi(pSvcLoc) );
StoreGateSvc* pSG(nullptr);
assert( pSvcLoc->service("StoreGateSvc", pSG, true).isSuccess() );
diff --git a/Trigger/TrigEvent/TrigNavigation/src/FullHolderFactory.cxx b/Trigger/TrigEvent/TrigNavigation/src/FullHolderFactory.cxx
index f85995e4d948..c7aab56054c8 100644
--- a/Trigger/TrigEvent/TrigNavigation/src/FullHolderFactory.cxx
+++ b/Trigger/TrigEvent/TrigNavigation/src/FullHolderFactory.cxx
@@ -22,8 +22,8 @@ HLT::FullHolderFactory::FullHolderFactory(const std::string& prefix)
}
HLT::BaseHolder* HLT::FullHolderFactory::fromSerialized(int version, const std::vector<uint32_t>::const_iterator& start, const std::vector<uint32_t>::const_iterator& end){
- class_id_type clid;
- sub_index_type idx;
+ class_id_type clid{0};
+ sub_index_type idx{0};
std::string label;
std::vector<uint32_t>::const_iterator blobIt = start;
diff --git a/Trigger/TrigEvent/TrigNavigation/src/Holder.cxx b/Trigger/TrigEvent/TrigNavigation/src/Holder.cxx
index e3e789e8c179..f7897e2e4316 100644
--- a/Trigger/TrigEvent/TrigNavigation/src/Holder.cxx
+++ b/Trigger/TrigEvent/TrigNavigation/src/Holder.cxx
@@ -425,7 +425,7 @@ namespace {
std::string stripStdVec (const std::string& s_in)
{
std::string s = s_in;
- std::string::size_type pos;
+ std::string::size_type pos{0};
while ((pos = s.find ("std::vector<")) != std::string::npos) {
s.erase (pos, 5);
}
diff --git a/Trigger/TrigEvent/TrigNavigation/src/Navigation.cxx b/Trigger/TrigEvent/TrigNavigation/src/Navigation.cxx
index dbae154ca18b..12a7b418908b 100644
--- a/Trigger/TrigEvent/TrigNavigation/src/Navigation.cxx
+++ b/Trigger/TrigEvent/TrigNavigation/src/Navigation.cxx
@@ -116,7 +116,7 @@ Navigation::classKey2CLIDKey(const std::vector<std::string>& property,
// translate Class names into CLID numbers
for ( const std::string& cname : property ) {
- CLID clid;
+ CLID clid{0};
std::string key;
std::string type;
diff --git a/Trigger/TrigEvent/TrigNavigation/test/HLTNavigation_test.cxx b/Trigger/TrigEvent/TrigNavigation/test/HLTNavigation_test.cxx
index d21668b37d30..343e8fe8d64a 100644
--- a/Trigger/TrigEvent/TrigNavigation/test/HLTNavigation_test.cxx
+++ b/Trigger/TrigEvent/TrigNavigation/test/HLTNavigation_test.cxx
@@ -435,7 +435,7 @@ bool construction_test(HLT::Navigation* hns) {
// add ghost TES
- TriggerElement* ghost;
+ TriggerElement* ghost{nullptr};
ghost = hns->addNode(telist, 33399, true); ghost->setActiveState(false);
ghost = hns->addNode(telist, 33399, true);
ghost = hns->addNode(telist, 33399, true);
@@ -446,15 +446,14 @@ bool construction_test(HLT::Navigation* hns) {
// build one long branch
TriggerElement* te1 = roi1eltr1;
- TriggerElement* te2;
- int i;
- for ( i = 0; i < 25; i++ ) {
+ TriggerElement* te2{nullptr};
+ for ( int i = 0; i < 25; i++ ) {
te2 = hns->addNode(te1, 5000+i);
te1 = te2;
}
// add many leafs to one of the RoI
- for ( i = 0; i < 24; i++ ) {
+ for ( int i = 0; i < 24; i++ ) {
te1 = hns->addNode(roi1, 50);
// bunch of inactive TEes
TriggerElement* te3 = hns->addNode(roi1, 60);
@@ -806,12 +805,12 @@ bool run () {
// using namespace Athena_test;
- ISvcLocator* pSvcLoc;
+ ISvcLocator* pSvcLoc{nullptr};
if (!Athena_test::initGaudi("test.txt", pSvcLoc)) {
cerr << "ERROR This test can not be run" << endl;
return 0;
}
- assert(pSvcLoc);
+ assert(pSvcLoc!=nullptr);
MsgStream log(Athena::getMessageSvc(), "HLTNavigation_test");
@@ -826,25 +825,27 @@ bool run () {
} else REPORT_AND_STOP( "no SG available" );
- IToolSvc* toolSvc;
+ IToolSvc* toolSvc{nullptr};
if( pSvcLoc->service("ToolSvc", toolSvc, true).isSuccess() ) {
log << MSG::DEBUG << "ToolSvc pointer: " << toolSvc << endmsg;
- } else
+ } else {
ABORT ( "no ToolSvc available" );
+ }
-
- HLT::Navigation* hns;
- IAlgTool* algTool;
+ HLT::Navigation* hns{nullptr};
+ IAlgTool* algTool{nullptr};
if ( toolSvc->retrieveTool("HLT::Navigation/Navigation", algTool).isSuccess() ) {
log << MSG::DEBUG << "OK navigation tool retrieved" << endmsg;
hns = dynamic_cast< HLT::Navigation*>(algTool);
- if ( hns ) {
+ if ( hns != nullptr ) {
log << MSG::DEBUG << "OK navigation casted" << endmsg;
- } else
+ } else {
ABORT( "navigation cast failed" );
-
- } else ABORT ("navigation tool NOT retrieved" );
+ }
+ } else {
+ ABORT ("navigation tool NOT retrieved" );
+ }
hns->reset();
diff --git a/Trigger/TrigEvent/TrigNavigation/test/Holder_test.cxx b/Trigger/TrigEvent/TrigNavigation/test/Holder_test.cxx
index 75c5b1bfaa08..e168f5e8f4af 100644
--- a/Trigger/TrigEvent/TrigNavigation/test/Holder_test.cxx
+++ b/Trigger/TrigEvent/TrigNavigation/test/Holder_test.cxx
@@ -218,8 +218,8 @@ bool serialization() {
IHolder * realH = cch;
std::vector<uint32_t> blob;
- CLID c;
- uint16_t idx;
+ CLID c{0};
+ uint16_t idx{0};
string label;
realH->serialize(blob);
@@ -294,7 +294,7 @@ bool serialize_xAOD() {
REPORT_AND_STOP("It should have failed before");
IHolder * realH = cch;
std::vector<uint32_t> blob;
- size_t payloadSize;
+ size_t payloadSize{0};
xAOD::AuxSelection sel;
sel.selectAux (std::set<std::string> {"-dyn2"});
realH->serializeWithPayload(sel, blob, payloadSize);
@@ -308,8 +308,8 @@ bool serialize_xAOD() {
REPORT_AND_STOP("It should have failed before");
//IHolder * realH = cch;
- CLID c;
- uint16_t idx;
+ CLID c{0};
+ uint16_t idx{0};
string label;
std::vector<uint32_t>::const_iterator it = blob.begin();
IHolder::enquireSerialized(it,blob.end(), c, label, idx);
@@ -361,12 +361,12 @@ bool serialize_xAOD() {
int main() {
CxxUtils::ubsan_suppress ([]() { TInterpreter::Instance(); } );
- ISvcLocator* pSvcLoc;
+ ISvcLocator* pSvcLoc{nullptr};
if (!Athena_test::initGaudi("test.txt", pSvcLoc)) {
cerr << "ERROR This test can not be run" << endl;
return 0;
}
- assert(pSvcLoc);
+ assert(pSvcLoc!=nullptr);
MsgStream log(Athena::getMessageSvc(), "Holder_test");
msglog = &log;
diff --git a/Trigger/TrigEvent/TrigNavigation/test/Ownership_test.cxx b/Trigger/TrigEvent/TrigNavigation/test/Ownership_test.cxx
index e013de3fbeaf..d63444dc0320 100644
--- a/Trigger/TrigEvent/TrigNavigation/test/Ownership_test.cxx
+++ b/Trigger/TrigEvent/TrigNavigation/test/Ownership_test.cxx
@@ -27,8 +27,8 @@ using namespace TrigNavTest;
//const int OK=1;
//const int FAILED=0;
-StoreGateSvc* pStore(0);
-HLT::Navigation* hns;
+StoreGateSvc* pStore{nullptr};
+HLT::Navigation* hns{nullptr};
template <class T>
@@ -165,12 +165,12 @@ bool viewContainerAttachTest() {
int main() {
- ISvcLocator* pSvcLoc;
+ ISvcLocator* pSvcLoc{nullptr};
if (!Athena_test::initGaudi("test.txt", pSvcLoc)) {
cerr << "ERROR This test can not be run" << endl;
return 0;
}
- assert(pSvcLoc);
+ assert(pSvcLoc!=nullptr);
MsgStream log(Athena::getMessageSvc(), "Ownership_test");
msglog = &log;
@@ -180,24 +180,24 @@ int main() {
ABORT( "ERROR no SG available" );
}
- IToolSvc* toolSvc;
+ IToolSvc* toolSvc{nullptr};
if( pSvcLoc->service("ToolSvc", toolSvc, true).isSuccess() ) {
log << MSG::DEBUG << "ToolSvc pointer: " << toolSvc << endmsg;
- } else
+ } else {
ABORT ( "no ToolSvc available" );
+ }
-
- IAlgTool* algTool;
+ IAlgTool* algTool{nullptr};
if ( toolSvc->retrieveTool("HLT::Navigation/Navigation", algTool).isSuccess() ) {
log << MSG::DEBUG << "OK navigation tool retrieved" << endmsg;
hns = dynamic_cast< HLT::Navigation*>(algTool);
- if ( hns ) {
+ if ( hns!=nullptr ) {
log << MSG::DEBUG << "OK navigation casted" << endmsg;
- } else
+ } else {
ABORT( "navigation cast failed" );
-
+ }
} else ABORT("navigation tool NOT retrieved" );
if ( !firsInsertDecidesPolicy() )
diff --git a/Trigger/TrigEvent/TrigNavigation/test/Registration_test.cxx b/Trigger/TrigEvent/TrigNavigation/test/Registration_test.cxx
index b54c2e893bf2..ce4685899767 100644
--- a/Trigger/TrigEvent/TrigNavigation/test/Registration_test.cxx
+++ b/Trigger/TrigEvent/TrigNavigation/test/Registration_test.cxx
@@ -33,12 +33,12 @@ int main () {
using namespace HLT;
- ISvcLocator* pSvcLoc;
+ ISvcLocator* pSvcLoc{nullptr};
if (!Athena_test::initGaudi("test.txt", pSvcLoc)) {
cerr << "ERROR This test can not be run" << endl;
return 0;
}
- assert(pSvcLoc);
+ assert(pSvcLoc!=nullptr);
MsgStream log(Athena::getMessageSvc(), "Registration_test");
@@ -46,35 +46,37 @@ int main () {
- StoreGateSvc* pStore(0);
+ StoreGateSvc* pStore{nullptr};
if( pSvcLoc->service("StoreGateSvc", pStore, true).isSuccess() ) {
log << MSG::DEBUG << "SG pointer: " << pStore << endmsg;
- } else
+ } else {
ABORT ( "ERROR no SG available" );
-
- IToolSvc* toolSvc;
+ }
+
+ IToolSvc* toolSvc{nullptr};
if( pSvcLoc->service("ToolSvc", toolSvc, true).isSuccess() ) {
log << MSG::DEBUG << "ToolSvc pointer: " << toolSvc << endmsg;
- } else
+ } else {
ABORT( "ERROR no ToolSvc available" );
+ }
- HLT::Navigation* hns;
- IAlgTool* algTool;
+ HLT::Navigation* hns{nullptr};
+ IAlgTool* algTool{nullptr};
if ( toolSvc->retrieveTool("HLT::Navigation/Navigation", algTool).isSuccess() ) {
log << MSG::DEBUG << "OK navigation tool retrieved" << endmsg;
hns = dynamic_cast< HLT::Navigation*>(algTool);
- if ( hns ) {
+ if ( hns!=nullptr ) {
log << MSG::DEBUG << "OK navigation casted" << endmsg;
- } else
+ } else {
ABORT( "ERROR navigation casted" );
-
- } else
+ }
+ } else {
ABORT( "ERROR navigation tool NOT retrieved" );
-
+ }
hns->reset( );
hns->prepare();
diff --git a/Trigger/TrigEvent/TrigNavigation/test/RoICache_test.cxx b/Trigger/TrigEvent/TrigNavigation/test/RoICache_test.cxx
index c7da883150ee..bef485f113b8 100644
--- a/Trigger/TrigEvent/TrigNavigation/test/RoICache_test.cxx
+++ b/Trigger/TrigEvent/TrigNavigation/test/RoICache_test.cxx
@@ -78,14 +78,14 @@ bool run() {
MsgStream* msglog = &log;
BEGIN_TEST("RoIcaching test");
- ISvcLocator* pSvcLoc;
+ ISvcLocator* pSvcLoc{nullptr};
if (!Athena_test::initGaudi("test2.txt", pSvcLoc)) {
REPORT_AND_STOP("Can not intit Gaudi");
}
- assert(pSvcLoc);
+ assert(pSvcLoc!=nullptr);
- StoreGateSvc* pStore(0);
+ StoreGateSvc* pStore{nullptr};
if( pSvcLoc->service("StoreGateSvc", pStore, true).isSuccess() ) {
@@ -94,7 +94,7 @@ bool run() {
REPORT_AND_STOP("SG not available");
}
- IToolSvc* toolSvc;
+ IToolSvc* toolSvc{nullptr};
if( pSvcLoc->service("ToolSvc", toolSvc, true).isSuccess() ) {
REPORT_AND_CONTINUE("ToolSvc pointer obtained: " << toolSvc );
@@ -103,11 +103,11 @@ bool run() {
}
- IAlgTool* algTool;
+ IAlgTool* algTool{nullptr};
if ( toolSvc->retrieveTool("HLT::Navigation/Navigation", algTool).isSuccess() ) {
REPORT_AND_CONTINUE("OK navigation tool retrieved" );
hns = dynamic_cast< HLT::Navigation*>(algTool);
- if ( hns ) {
+ if ( hns!=nullptr ) {
REPORT_AND_CONTINUE("OK navigation casted" );
} else {
REPORT_AND_STOP("navigation not casted" );
@@ -156,8 +156,8 @@ bool run() {
auto calo = createAlgo("calo",
[](TriggerElement* te) -> StatusCode { // get RoI
- const TestA* back(0);
- const TriggerElement* tsource;
+ const TestA* back{nullptr};
+ const TriggerElement* tsource{nullptr};
std::string lsource;
hns->getRecentFeature(te, back, "", tsource, lsource);
return StatusCode::SUCCESS;
@@ -183,8 +183,8 @@ bool run() {
// next algo will depend on this extra objects and there shoudl be apropriate caching kicking in only wto times
auto caloaux = createAlgo("caux",
[](TriggerElement* te) -> StatusCode { // require TestBContainer
- const TestBContainer* back(0);
- const TriggerElement* tsource;
+ const TestBContainer* back{nullptr};
+ const TriggerElement* tsource{nullptr};
std::string lsource;
hns->getRecentFeature(te, back, "", tsource, lsource);
return StatusCode::SUCCESS;
@@ -205,8 +205,8 @@ bool run() {
auto calo2 = createAlgo("calo2",
[&](TriggerElement* te) -> StatusCode { // get RoI
- const TestA* back(0);
- const TriggerElement* tsource;
+ const TestA* back{nullptr};
+ const TriggerElement* tsource{nullptr};
std::string lsource;
hns->getRecentFeature(te, back, "", tsource, lsource);
REPORT_AND_CONTINUE("got back object " << back->value());
@@ -246,8 +246,8 @@ bool run() {
// we expect now high level of caching as we dpend on the common object
auto trk = createAlgo("trk",
[&](TriggerElement* te) -> StatusCode { // get RoI
- const TestA* back(0);
- const TriggerElement* tsource;
+ const TestA* back{nullptr};
+ const TriggerElement* tsource{nullptr};
std::string lsource;
hns->getRecentFeature(te, back, "initialRoI", tsource, lsource);
if ( back ) REPORT_AND_CONTINUE("got back object " << back->value());
@@ -289,8 +289,8 @@ bool run() {
auto matcher = createAlgo("matcher",
[&](TriggerElement* te) -> StatusCode { // get RoI
- const TestC* back(0);
- const TriggerElement* tsource;
+ const TestC* back{nullptr};
+ const TriggerElement* tsource{nullptr};
std::string lsource;
hns->getRecentFeature(te, back, "", tsource, lsource);
if ( back ) {
@@ -338,8 +338,8 @@ bool run() {
auto overlap = createAlgo ("overlap",
[&](TriggerElement* te) -> StatusCode { // get obj made by ma
- const TestDContainer* back(0);
- const TriggerElement* tsource;
+ const TestDContainer* back{nullptr};
+ const TriggerElement* tsource{nullptr};
std::string lsource;
hns->getRecentFeature(te, back, "", tsource, lsource);
return StatusCode::SUCCESS;
diff --git a/Trigger/TrigEvent/TrigSteeringEvent/src/HLTResult.cxx b/Trigger/TrigEvent/TrigSteeringEvent/src/HLTResult.cxx
index eca55294878b..db8dba85faac 100644
--- a/Trigger/TrigEvent/TrigSteeringEvent/src/HLTResult.cxx
+++ b/Trigger/TrigEvent/TrigSteeringEvent/src/HLTResult.cxx
@@ -413,7 +413,7 @@ bool HLTResult::serialize_regular(uint32_t*& output,
int max_size)
{
updateExtras();
- bool truncating;
+ bool truncating{false};
auto estim_size = estimateSize();
return serialize_bootstrap(output, data_size, truncating,
max_size, estim_size) &&
@@ -428,7 +428,7 @@ bool HLTResult::serialize_DS(uint32_t*& output,
{
assert(mod_id);
- bool truncating;
+ bool truncating{false};
auto dscuts = findDSCuts(mod_id);
auto navsize = calc_colls_size(dscuts.first) + calc_colls_size(dscuts.second);
diff --git a/Trigger/TrigEvent/TrigSteeringEvent/src/TrigOperationalInfo.cxx b/Trigger/TrigEvent/TrigSteeringEvent/src/TrigOperationalInfo.cxx
index 2304e5e3f40b..01bf1d8ad638 100644
--- a/Trigger/TrigEvent/TrigSteeringEvent/src/TrigOperationalInfo.cxx
+++ b/Trigger/TrigEvent/TrigSteeringEvent/src/TrigOperationalInfo.cxx
@@ -57,10 +57,9 @@ void TrigOperationalInfo::updateAtLocation(unsigned int location, float value) {
std::string str ( const TrigOperationalInfo& d ) {
std::stringstream ss;
std::pair<std::vector<std::string>, std::vector<float> > quantities = d.infos();
- unsigned int i;
std::vector<std::string>::const_iterator keyIt = quantities.first.begin();
std::vector<float>::const_iterator valueIt = quantities.second.begin();
- for ( i = 0; i < quantities.first.size(); i++ ) {
+ for (unsigned int i = 0; i < quantities.first.size(); i++ ) {
ss << " " << *keyIt << ": " << *valueIt;
++keyIt;
++valueIt;
diff --git a/Trigger/TrigEvent/TrigSteeringEventTPCnv/test/HLTResultCnv_p1_test.cxx b/Trigger/TrigEvent/TrigSteeringEventTPCnv/test/HLTResultCnv_p1_test.cxx
index 0a1d47fabee9..288a792e1bfd 100644
--- a/Trigger/TrigEvent/TrigSteeringEventTPCnv/test/HLTResultCnv_p1_test.cxx
+++ b/Trigger/TrigEvent/TrigSteeringEventTPCnv/test/HLTResultCnv_p1_test.cxx
@@ -31,8 +31,8 @@ void compare (const HLT::HLTResult& p1,
assert (p1.getLvlConverterStatus() == p2.getLvlConverterStatus());
assert (p1.getHLTLevel() == p2.getHLTLevel());
assert (p1.getNumOfSatisfiedSigs() == p2.getNumOfSatisfiedSigs());
- unsigned int chainCounter1, step1;
- unsigned int chainCounter2, step2;
+ unsigned int chainCounter1{0}, step1{0};
+ unsigned int chainCounter2{0}, step2{0};
p1.getErrorCoordinates (chainCounter1, step1);
p2.getErrorCoordinates (chainCounter2, step2);
assert (chainCounter1 == chainCounter2);
diff --git a/Trigger/TrigSteer/DecisionHandling/src/ComboHypo.cxx b/Trigger/TrigSteer/DecisionHandling/src/ComboHypo.cxx
index 716acc08b505..cd9a3bce1169 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/ComboHypo.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/ComboHypo.cxx
@@ -440,8 +440,8 @@ StatusCode ComboHypo::extractFeatureAndRoI(const HLT::Identifier& chainLegId,
}
// Try and get seeding ROI data too.
- uint32_t roiClid; // Unused
- const Decision* roiSource; // Unused
+ uint32_t roiClid{0}; // Unused
+ const Decision* roiSource{nullptr}; // Unused
const bool foundROI = typelessFindLink(subGraph, initialRoIString(), roiKey, roiClid, roiIndex, roiSource);
if (foundROI) {
ElementLink<TrigRoiDescriptorCollection> roiEL(roiKey, roiIndex);
diff --git a/Trigger/TrigSteer/DecisionHandling/test/test_ComboHypoTool.cxx b/Trigger/TrigSteer/DecisionHandling/test/test_ComboHypoTool.cxx
index 41a199402903..41689a0ea801 100644
--- a/Trigger/TrigSteer/DecisionHandling/test/test_ComboHypoTool.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/test/test_ComboHypoTool.cxx
@@ -50,8 +50,8 @@ int main ATLAS_NOT_THREAD_SAFE () {
errorcheck::ReportMessage::hideFunctionNames (true);
// initialize Gaudi, SG
- ISvcLocator* pSvcLoc;
- Athena_test::initGaudi(pSvcLoc);
+ ISvcLocator* pSvcLoc{nullptr};
+ assert( Athena_test::initGaudi(pSvcLoc) );
StoreGateSvc* pSG(nullptr);
assert( pSvcLoc->service("StoreGateSvc", pSG, true).isSuccess() );
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/Root/TrigCompositeUtilsRoot.cxx b/Trigger/TrigSteer/TrigCompositeUtils/Root/TrigCompositeUtilsRoot.cxx
index d69d9057a0e5..229bfb7f4e37 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/Root/TrigCompositeUtilsRoot.cxx
+++ b/Trigger/TrigSteer/TrigCompositeUtils/Root/TrigCompositeUtilsRoot.cxx
@@ -566,8 +566,9 @@ namespace TrigCompositeUtils {
found = start->typelessGetObjectCollectionLinks(linkName, tmpKeyVec, tmpClidVec, tmpIndexVec);
}
if (start->hasObjectLink(linkName)) {
- uint32_t tmpKey, tmpClid;
- uint16_t tmpIndex;
+ uint32_t tmpKey{0};
+ uint32_t tmpClid{0};
+ uint16_t tmpIndex{0};
found |= start->typelessGetObjectLink(linkName, tmpKey, tmpClid, tmpIndex);
tmpKeyVec.push_back(tmpKey);
tmpClidVec.push_back(tmpClid);
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/KFromNItr.h b/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/KFromNItr.h
index 990116f17021..0d976d3798e7 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/KFromNItr.h
+++ b/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/KFromNItr.h
@@ -72,7 +72,7 @@ namespace TrigCompositeUtils {
private:
/// The number of indices
- std::size_t m_N;
+ std::size_t m_N{0};
/// The current combination
std::vector<std::size_t> m_current;
}; //> end class KFromNItr
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/LinkInfo.h b/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/LinkInfo.h
index 8155ed2ab4ca..2469e20d9c89 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/LinkInfo.h
+++ b/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/LinkInfo.h
@@ -24,8 +24,7 @@ namespace TrigCompositeUtils {
**/
template<typename T>
struct LinkInfo {
- LinkInfo()
- : source{0} {}
+ LinkInfo() = default;
LinkInfo(const Decision* s, const ElementLink<T>& l, ActiveState as = ActiveState::UNSET)
: source{s}, link{l}, state{as} {}
@@ -39,9 +38,9 @@ namespace TrigCompositeUtils {
return (isValid() ? StatusCode::SUCCESS : StatusCode::FAILURE);
}
- const Decision* source;
+ const Decision* source{nullptr};
ElementLink<T> link;
- ActiveState state;
+ ActiveState state{ActiveState::UNSET};
};
} //> end namespace TrigCompositeUtils
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/test/TrigCompositeUtils_test.cxx b/Trigger/TrigSteer/TrigCompositeUtils/test/TrigCompositeUtils_test.cxx
index a94aa2bb3bac..694e4ea7dcb8 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/test/TrigCompositeUtils_test.cxx
+++ b/Trigger/TrigSteer/TrigCompositeUtils/test/TrigCompositeUtils_test.cxx
@@ -23,8 +23,8 @@ int main ATLAS_NOT_THREAD_SAFE () {
errorcheck::ReportMessage::hideFunctionNames (true);
// initialize Gaudi, SG
- ISvcLocator* pSvcLoc;
- Athena_test::initGaudi(pSvcLoc);
+ ISvcLocator* pSvcLoc{nullptr};
+ assert( Athena_test::initGaudi(pSvcLoc) );
StoreGateSvc* pSG(0);
assert( pSvcLoc->service("StoreGateSvc", pSG, true).isSuccess() );
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/test/TrigTraversal_test.cxx b/Trigger/TrigSteer/TrigCompositeUtils/test/TrigTraversal_test.cxx
index 5e2524448fb2..f839542e65a1 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/test/TrigTraversal_test.cxx
+++ b/Trigger/TrigSteer/TrigCompositeUtils/test/TrigTraversal_test.cxx
@@ -37,8 +37,8 @@ int main ATLAS_NOT_THREAD_SAFE () {
errorcheck::ReportMessage::hideFunctionNames (true);
// initialize Gaudi, SG
- ISvcLocator* pSvcLoc;
- Athena_test::initGaudi(pSvcLoc);
+ ISvcLocator* pSvcLoc{nullptr};
+ assert( Athena_test::initGaudi(pSvcLoc) );
StoreGateSvc* pSG(nullptr);
assert( pSvcLoc->service("StoreGateSvc", pSG, true).isSuccess() );
@@ -452,19 +452,17 @@ int main ATLAS_NOT_THREAD_SAFE () {
// Collect statistics from before thinning
- size_t muf_n, mu_n, muem_n, em_n, all_n, muf_e, mu_e, muem_e, em_e, all_e = 0;
-
- muf_n = graph_HLT_mufast_chain.nodes();
- mu_n = graph_HLT_mu_chain.nodes();
- muem_n = graph_HLT_mu_em_chain.nodes();
- em_n = graph_HLT_em_chain.nodes();
- all_n = graph_HLT_all.nodes();
-
- muf_e = graph_HLT_mu_chain.edges();
- mu_e = graph_HLT_mu_chain.edges();
- muem_e = graph_HLT_mu_em_chain.edges();
- em_e = graph_HLT_em_chain.edges();
- all_e = graph_HLT_all.edges();
+ size_t muf_n = graph_HLT_mufast_chain.nodes();
+ size_t mu_n = graph_HLT_mu_chain.nodes();
+ size_t muem_n = graph_HLT_mu_em_chain.nodes();
+ size_t em_n = graph_HLT_em_chain.nodes();
+ size_t all_n = graph_HLT_all.nodes();
+
+ size_t muf_e = graph_HLT_mu_chain.edges();
+ size_t mu_e = graph_HLT_mu_chain.edges();
+ size_t muem_e = graph_HLT_mu_em_chain.edges();
+ size_t em_e = graph_HLT_em_chain.edges();
+ size_t all_e = graph_HLT_all.edges();
// Do the thinning
graph_HLT_mufast_chain.thin();
diff --git a/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultByteStreamCnv.cxx b/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultByteStreamCnv.cxx
index 9c0fab61a340..5a73c7b1947a 100755
--- a/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultByteStreamCnv.cxx
+++ b/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultByteStreamCnv.cxx
@@ -149,9 +149,8 @@ StatusCode HLT::HLTResultByteStreamCnv::createObj(IOpaqueAddress* pAddr, DataObj
{
HLTResult* result = new HLTResult();
- ByteStreamAddress *pBS_Addr;
- pBS_Addr = dynamic_cast<ByteStreamAddress*>(pAddr);
- if(!pBS_Addr) {
+ ByteStreamAddress *pBS_Addr = dynamic_cast<ByteStreamAddress*>(pAddr);
+ if(pBS_Addr==nullptr) {
(*m_log) << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg ;
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.cxx
index c0359c60ae8f..07f5f4726c37 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.cxx
@@ -59,7 +59,7 @@ namespace {
std::string stripStdVec (const std::string& s_in) {
std::string s = s_in;
- std::string::size_type pos;
+ std::string::size_type pos{0};
while ((pos = s.find ("std::vector<")) != std::string::npos) {
s.erase (pos, 5);
}
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMSerialiserTool.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMSerialiserTool.cxx
index 2bcfce11dae2..b1283b543f3b 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMSerialiserTool.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMSerialiserTool.cxx
@@ -97,7 +97,7 @@ StatusCode TriggerEDMSerialiserTool::addCollectionToSerialise(const std::string&
} else {
transientType = configuredType.substr( 0, configuredType.find('_') );
}
- CLID clid;
+ CLID clid{0};
if ( m_clidSvc->getIDOfTypeName(transientType, clid).isFailure() ) {
ATH_MSG_ERROR( "Can not find CLID for " << transientType << " that is needed for serialisation " << key );
return StatusCode::FAILURE;
@@ -224,7 +224,7 @@ StatusCode TriggerEDMSerialiserTool::serialiseDynAux( DataObject* dObj, const Ad
ATH_MSG_DEBUG( "Streaming '" << decorationName << "' of type '" << typeName
<< "' fulltype '" << fullTypeName << "' aux ID '" << auxVarID << "' class '" << cls->GetName() );
- CLID clid;
+ CLID clid{0};
if ( m_clidSvc->getIDOfTypeName(typeName, clid).isFailure() ) { // First try
if ( m_clidSvc->getIDOfTypeInfoName(fullTypeName, clid).isFailure() ) { // Second try
ATH_MSG_ERROR("Unable to obtain CLID for either typeName:" << typeName << " or fullTypeName:" << fullTypeName);
diff --git a/Trigger/TrigSteer/TrigOutputHandling/test/schema_evolution_test.cxx b/Trigger/TrigSteer/TrigOutputHandling/test/schema_evolution_test.cxx
index 71a979a7db27..7ce24babd561 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/test/schema_evolution_test.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/test/schema_evolution_test.cxx
@@ -63,7 +63,7 @@ StatusCode tester( TriggerEDMSerialiserTool* ser) {
int main() {
CxxUtils::ubsan_suppress ( []() { TInterpreter::Instance(); } );
using namespace std;
- ISvcLocator* pSvcLoc;
+ ISvcLocator* pSvcLoc{nullptr};
if( !Athena_test::initGaudi("test.txt", pSvcLoc) ) {
cerr << "ERROR This test can not be run" << endl;
return -1;
@@ -77,7 +77,7 @@ int main() {
IToolSvc * toolSvc = nullptr;
VALUE( pSvcLoc->service("ToolSvc", toolSvc, true) ) EXPECTED ( StatusCode::SUCCESS );
- IAlgTool* algTool;
+ IAlgTool* algTool{nullptr};
VALUE( toolSvc->retrieveTool("TriggerEDMSerialiserTool/schemaTest", algTool) ) EXPECTED( StatusCode::SUCCESS );
TriggerEDMSerialiserTool* ser = dynamic_cast< TriggerEDMSerialiserTool*>(algTool);
VALUE( ser == nullptr ) EXPECTED ( false );
diff --git a/Trigger/TrigSteer/TrigOutputHandling/test/serial_deserial_test.cxx b/Trigger/TrigSteer/TrigOutputHandling/test/serial_deserial_test.cxx
index 00dc6dd1137b..a9ef7cc3019e 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/test/serial_deserial_test.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/test/serial_deserial_test.cxx
@@ -44,7 +44,7 @@ void testRoIDescriptorReadAndCheck(StoreGateSvc*);
int main() {
CxxUtils::ubsan_suppress ( []() { TInterpreter::Instance(); } );
using namespace std;
- ISvcLocator* pSvcLoc;
+ ISvcLocator* pSvcLoc{nullptr};
if( !Athena_test::initGaudi("test.txt", pSvcLoc) ) {
cerr << "ERROR This test can not be run" << endl;
return -1;
@@ -58,7 +58,7 @@ int main() {
IToolSvc * toolSvc = nullptr;
VALUE( pSvcLoc->service("ToolSvc", toolSvc, true) ) EXPECTED ( StatusCode::SUCCESS );
- IAlgTool* algTool;
+ IAlgTool* algTool{nullptr};
VALUE( toolSvc->retrieveTool("TriggerEDMSerialiserTool/serialiser", algTool) ) EXPECTED( StatusCode::SUCCESS );
TriggerEDMSerialiserTool* ser = dynamic_cast< TriggerEDMSerialiserTool*>(algTool);
diff --git a/Trigger/TrigSteer/TrigOutputHandling/test/void_record_test.cxx b/Trigger/TrigSteer/TrigOutputHandling/test/void_record_test.cxx
index 9abc21b4c2a2..61ae4cd0120c 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/test/void_record_test.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/test/void_record_test.cxx
@@ -16,7 +16,7 @@ int main() {
using namespace std;
using TrigCompositeUtils::DecisionID;
- ISvcLocator* pSvcLoc;
+ ISvcLocator* pSvcLoc{nullptr};
if (!Athena_test::initGaudi("test.txt", pSvcLoc)) {
cerr << "ERROR This test can not be run" << endl;
return 0;
@@ -24,7 +24,7 @@ int main() {
assert(pSvcLoc);
MsgStream log(Athena::getMessageSvc(), "void_record_test");
- StoreGateSvc* pStore = 0;
+ StoreGateSvc* pStore{nullptr};
if( pSvcLoc->service("StoreGateSvc", pStore, true).isSuccess() ) {
log << MSG::INFO << "SG pointer: " << pStore << endmsg;
} else {
--
GitLab
From d1a2bd764ee3b7c70a25835ed7717155b7a0170d Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Mon, 23 Aug 2021 20:09:22 +0200
Subject: [PATCH 242/272] ElectronPhotonSelectorTools cppcheck warnings. rm
unused calcIsEm, fix arguement order in calocuts_electrons , rm redundant
check (done already in the outer if)
---
.../AsgElectronLikelihoodTool.h | 2 +-
.../Root/AsgForwardElectronIsEMSelector.cxx | 2 -
.../Root/TElectronIsEMSelector.cxx | 55 +++++++++----------
.../Root/TForwardElectronIsEMSelector.cxx | 35 ------------
.../Root/TForwardElectronIsEMSelector.h | 27 ++-------
5 files changed, 32 insertions(+), 89 deletions(-)
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgElectronLikelihoodTool.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgElectronLikelihoodTool.h
index 887aac211894..1db84223ab6f 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgElectronLikelihoodTool.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgElectronLikelihoodTool.h
@@ -162,7 +162,7 @@ private:
bool m_skipDeltaPoverP;
/// Flag to toggle the correction of deltaEta1 for the pear shape distortion of the LAr
- bool m_correctDeltaEta;
+ bool m_correctDeltaEta = false;
/// read handle key to heavy ion container
SG::ReadHandleKey<xAOD::HIEventShapeContainer> m_HIESContKey{
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgForwardElectronIsEMSelector.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgForwardElectronIsEMSelector.cxx
index 619e87302a04..9380fcb446f4 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgForwardElectronIsEMSelector.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgForwardElectronIsEMSelector.cxx
@@ -320,8 +320,6 @@ AsgForwardElectronIsEMSelector::calocuts_electrons(const xAOD::Egamma* eg,
// trigETthr : threshold in ET to apply the cuts at trigger level
// iflag: the starting isEM
//
-
- // std::cout<<" NVTX "<<nvtx<<" eta2 "<<eta2<<" eta "<<eta2<<std::endl;
const xAOD::CaloCluster* cluster2 = eg->caloCluster();
double secondLambda(0);
double lateral(0);
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronIsEMSelector.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronIsEMSelector.cxx
index bfcc420172a3..2c1012e39a42 100755
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronIsEMSelector.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronIsEMSelector.cxx
@@ -742,8 +742,9 @@ Root::TElectronIsEMSelector::TrackCut(
if (ibin_eta >= 0 && ibin_combined >= 0) {
// Track quality cuts
// cuts on number of b-layer hits
- if(CheckVar(m_cutBL,1) && m_cutBL[ibin_eta] == 1 && !passBLayerRequirement){
- iflag |= ( 0x1 << egammaPID::TrackBlayer_Electron);
+ if (CheckVar(m_cutBL, 1) && m_cutBL[ibin_eta] == 1 &&
+ !passBLayerRequirement) {
+ iflag |= (0x1 << egammaPID::TrackBlayer_Electron);
}
// cuts on number of pixel hits
if (CheckVar(m_cutPi, 1)) {
@@ -766,34 +767,32 @@ Root::TElectronIsEMSelector::TrackCut(
iflag |= (0x1 << egammaPID::TrackA0Tight_Electron);
}
- if (ibin_combined>=0) {
- // matching (eta,phi) and energy-momentum
- // cut on Delta Eta and Delta Phi
- deltaeta=std::abs(deltaeta);
+ // matching (eta,phi) and energy-momentum
+ // cut on Delta Eta and Delta Phi
+ deltaeta = std::abs(deltaeta);
- if (CheckVar(m_cutDeltaEta, 4)) {
- if (deltaeta > m_cutDeltaEta[ibin_combined])
- iflag |= (0x1 << egammaPID::TrackMatchEta_Electron);
- }
- if (CheckVar(m_cutminDeltaPhi, 4)) {
- if (deltaphi < m_cutminDeltaPhi[ibin_combined])
- iflag |= (0x1 << egammaPID::TrackMatchPhi_Electron);
- }
- if (CheckVar(m_cutmaxDeltaPhi, 4)) {
- if (deltaphi > m_cutmaxDeltaPhi[ibin_combined])
- iflag |= (0x1 << egammaPID::TrackMatchPhi_Electron);
- }
- // cut on Delta Eta for Tight selection
- if (CheckVar(m_cutDeltaEtaTight, 4)) {
- if (deltaeta > m_cutDeltaEtaTight[ibin_combined])
- iflag |= (0x1 << egammaPID::TrackMatchEtaTight_Electron);
- }
+ if (CheckVar(m_cutDeltaEta, 4)) {
+ if (deltaeta > m_cutDeltaEta[ibin_combined])
+ iflag |= (0x1 << egammaPID::TrackMatchEta_Electron);
+ }
+ if (CheckVar(m_cutminDeltaPhi, 4)) {
+ if (deltaphi < m_cutminDeltaPhi[ibin_combined])
+ iflag |= (0x1 << egammaPID::TrackMatchPhi_Electron);
+ }
+ if (CheckVar(m_cutmaxDeltaPhi, 4)) {
+ if (deltaphi > m_cutmaxDeltaPhi[ibin_combined])
+ iflag |= (0x1 << egammaPID::TrackMatchPhi_Electron);
+ }
+ // cut on Delta Eta for Tight selection
+ if (CheckVar(m_cutDeltaEtaTight, 4)) {
+ if (deltaeta > m_cutDeltaEtaTight[ibin_combined])
+ iflag |= (0x1 << egammaPID::TrackMatchEtaTight_Electron);
+ }
- // cut on E/p
- if (CheckVar(m_cutminEp, 4) && CheckVar(m_cutmaxEp, 4)) {
- if (ep < m_cutminEp[ibin_combined] || ep > m_cutmaxEp[ibin_combined])
- iflag |= (0x1 << egammaPID::TrackMatchEoverP_Electron);
- }
+ // cut on E/p
+ if (CheckVar(m_cutminEp, 4) && CheckVar(m_cutmaxEp, 4)) {
+ if (ep < m_cutminEp[ibin_combined] || ep > m_cutmaxEp[ibin_combined])
+ iflag |= (0x1 << egammaPID::TrackMatchEoverP_Electron);
}
}
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TForwardElectronIsEMSelector.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TForwardElectronIsEMSelector.cxx
index 5cc881a4f526..964efdce00e2 100755
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TForwardElectronIsEMSelector.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TForwardElectronIsEMSelector.cxx
@@ -163,41 +163,6 @@ Root::TForwardElectronIsEMSelector::fillAccept(unsigned int isEM) const
return acceptData;
}
-// return the isem
-//
-unsigned int
-Root::TForwardElectronIsEMSelector::calcIsEm(
- // eta position in second sampling
- float eta,
- // transverse energy in calorimeter (using eta position in second sampling)
- float nvtx,
- //////////////// - calo
- // E(3*3) in 2nd sampling e233
- float secondLambda,
- // E(3*7) in 2nd sampling e237
- float lateral,
- // transverse energy in 1st scintillator of hadronic calorimeter
- float longitudinal,
- // E(min) in strips
- float fracMax, // emin,
- // total shower width in 1st sampling
- float centerLambda,
- // fraction of energy reconstructed in the 3rd sampling
- float secondR) const
-{
- unsigned int iflag = calocuts_electrons(eta,
- nvtx,
- secondLambda, // e233,
- lateral, // e237,
- longitudinal, // ethad1,
- fracMax, // emin,
- centerLambda,
- secondR,
- 0);
-
- return iflag;
-}
-
// ======================================================================
unsigned int
Root::TForwardElectronIsEMSelector::calocuts_electrons(
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TForwardElectronIsEMSelector.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TForwardElectronIsEMSelector.h
index 7cdf1df2e377..01fd456b467e 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TForwardElectronIsEMSelector.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TForwardElectronIsEMSelector.h
@@ -50,27 +50,8 @@ public:
/** Return dummy accept with only info */
asg::AcceptData accept() const { return asg::AcceptData(&m_acceptInfo); }
- // calculate the isEM.
- unsigned int calcIsEm(
- // eta
- float eta,
- // NPV
- float nvtx,
- // secondlambda
- float secondLambda,
- // lateral
- float lateral,
- // lateral
- float longitudinal,
- // longitudinal
- float centerLambda,
- // fracMax
- float fracMax,
- // secondR
- float secondR) const;
-
- // used internally by calcIsEm, but left public because it can be useful for
- // users. Note that it doesn't necessarily zero all the values that pass, so
+ // used to calcIsEm.
+ // Note that it doesn't necessarily zero all the values that pass, so
// make sure that the input iflag bits that you are concerned with start out
// with 0.
unsigned int calocuts_electrons(
@@ -84,10 +65,10 @@ public:
float lateral,
// lateral
float longitudinal,
- // longitudinal
- float centerLambda,
// fracMax
float fracMax,
+ // longitudinal
+ float centerLambda,
// secondR
float secondR,
// the starting isEM (should be 0 if new)
--
GitLab
From a49a0559b860baa4349c21d3dd7800cf1682663d Mon Sep 17 00:00:00 2001
From: Shaun Roe <shaun.roe@cern.ch>
Date: Mon, 23 Aug 2021 18:12:06 +0000
Subject: [PATCH 243/272] 22.0-cppcheck-InDetIncSecVxFinderTool
---
.../InDetIterativeSecVtxFinderTool.h | 7 +--
.../src/InDetIterativeSecVtxFinderTool.cxx | 59 ++++++-------------
2 files changed, 20 insertions(+), 46 deletions(-)
diff --git a/InnerDetector/InDetRecTools/InDetIncSecVxFinderTool/InDetIncSecVxFinderTool/InDetIterativeSecVtxFinderTool.h b/InnerDetector/InDetRecTools/InDetIncSecVxFinderTool/InDetIncSecVxFinderTool/InDetIterativeSecVtxFinderTool.h
index 9bfa728fa7bd..18ec42c6a484 100755
--- a/InnerDetector/InDetRecTools/InDetIncSecVxFinderTool/InDetIncSecVxFinderTool/InDetIterativeSecVtxFinderTool.h
+++ b/InnerDetector/InDetRecTools/InDetIncSecVxFinderTool/InDetIncSecVxFinderTool/InDetIterativeSecVtxFinderTool.h
@@ -30,14 +30,16 @@
#include "TrkParticleBase/TrackParticleBaseCollection.h" // type def ...
#include "TrkParameters/TrackParameters.h"
// we may save out some private stuff
-#include "TTree.h"
#include "xAODTracking/VertexFwd.h"
#include "xAODTracking/TrackParticleFwd.h"
#include "xAODTracking/VertexContainerFwd.h"
#include "xAODTracking/TrackParticleContainerFwd.h"
#include "BeamSpotConditionsData/BeamSpotData.h"
+#include <vector>
+class TTree;
+
namespace Trk
{
class IVertexFitter;
@@ -46,10 +48,7 @@ namespace Trk
class ITrackLink;
class IVertexSeedFinder;
class IImpactPoint3dEstimator;
-// class IVertexTrackCompatibilityEstimator;
-// class ImpactPoint3dAtaPlaneFactory;
class IVertexLinearizedTrackFactory;
-// class ITrkDistanceFinder;
class IVxCandidateXAODVertex;
}
//
diff --git a/InnerDetector/InDetRecTools/InDetIncSecVxFinderTool/src/InDetIterativeSecVtxFinderTool.cxx b/InnerDetector/InDetRecTools/InDetIncSecVxFinderTool/src/InDetIterativeSecVtxFinderTool.cxx
index 1dcc6e258b81..3c402ebc844a 100644
--- a/InnerDetector/InDetRecTools/InDetIncSecVxFinderTool/src/InDetIterativeSecVtxFinderTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetIncSecVxFinderTool/src/InDetIterativeSecVtxFinderTool.cxx
@@ -23,23 +23,18 @@
#include "TrkParticleBase/TrackParticleBase.h"
#include "TrkEventPrimitives/ParamDefs.h"
#include "TrkVertexSeedFinderUtils/IMode3dFinder.h"
-#include <map>
-#include <vector>
-#include <utility>
+
#include "TrkSurfaces/PlaneSurface.h"
#include "EventPrimitives/EventPrimitives.h"
#include "EventPrimitives/EventPrimitivesHelpers.h"
#include "GeoPrimitives/GeoPrimitives.h"
-//#include <TMath.h>
#include "TrkVertexFitterInterfaces/IImpactPoint3dEstimator.h"
#include "InDetTrackSelectionTool/IInDetTrackSelectionTool.h"
#include "TrkVertexFitterInterfaces/IVertexSeedFinder.h"
-//#include "VxVertex/VxContainer.h"
#include "VxVertex/RecVertex.h"
#include "VxVertex/VxTrackAtVertex.h"
-//#include "DataModel/DataVector.h"
#include "AthContainers/DataVector.h"
#include "TrkVertexFitterInterfaces/IVertexFitter.h"
@@ -55,11 +50,14 @@
#include "xAODTracking/VertexAuxContainer.h"
#include "xAODTracking/TrackParticleContainer.h"
#include "xAODTracking/TrackParticleAuxContainer.h"
+#include <map>
+#include <utility>
// we may save out some private stuff
#ifdef MONITORTUNES
#include "GaudiKernel/ITHistSvc.h"
#include "TFile.h"
+ #include "TTree.h"
#endif
namespace InDet
@@ -253,15 +251,14 @@ std::pair<xAOD::VertexContainer*, xAOD::VertexAuxContainer*>
}
-// The working horse ...
-std::pair<xAOD::VertexContainer*, xAOD::VertexAuxContainer*> InDetIterativeSecVtxFinderTool::findVertex(
- const std::vector<Trk::ITrackLink*> & trackVector)
+// The workhorse ...
+std::pair<xAOD::VertexContainer*, xAOD::VertexAuxContainer*>
+InDetIterativeSecVtxFinderTool::findVertex(const std::vector<Trk::ITrackLink*> & trackVector)
{
//two things need to be added
//1) the seeding mechanism
//2) the iterative removal of tracks
-
std::vector<Trk::ITrackLink*> origTracks=trackVector;
std::vector<Trk::ITrackLink*> seedTracks=trackVector;
// in the iteration from the below do { ... } while () loop,
@@ -272,18 +269,11 @@ std::pair<xAOD::VertexContainer*, xAOD::VertexAuxContainer*> InDetIterativeSecVt
xAOD::VertexContainer* theVertexContainer = new xAOD::VertexContainer;
xAOD::VertexAuxContainer* theVertexAuxContainer = new xAOD::VertexAuxContainer;
theVertexContainer->setStore( theVertexAuxContainer );
+ const auto invalidResponse = std::make_pair(theVertexContainer, theVertexAuxContainer);
//bail out early with only Dummy vertex if multiplicity cut is applied and exceeded
if (m_doMaxTracksCut && (trackVector.size() > m_maxTracks)){
ATH_MSG_WARNING( trackVector.size() << " tracks - exceeds maximum (" << m_maxTracks << "), skipping vertexing and returning only dummy..." );
-/**
- xAOD::Vertex * dummyxAODVertex = new xAOD::Vertex;
- theVertexContainer->push_back( dummyxAODVertex ); // have to add vertex to container here first so it can use its aux store
- dummyxAODVertex->setPosition( m_iBeamCondSvc->beamVtx().position() );
- dummyxAODVertex->setCovariancePosition( m_iBeamCondSvc->beamVtx().covariancePosition() );
- dummyxAODVertex->vxTrackAtVertex() = std::vector<Trk::VxTrackAtVertex>();
- dummyxAODVertex->setVertexType(xAOD::VxType::NoVtx);
-**/
return std::make_pair(theVertexContainer, theVertexAuxContainer);
}
@@ -392,10 +382,6 @@ std::pair<xAOD::VertexContainer*, xAOD::VertexAuxContainer*> InDetIterativeSecVt
m_seedZdist->push_back( cZ ) ;
#endif
-/**
- ATH_MSG_DEBUG( " Check perigeesAtSeed " );
- ncandi = info->perigeesAtSeed( *m_seedperigees, perigeeList ) ;
-**/
Amg::MatrixX looseConstraintCovariance(3,3);
looseConstraintCovariance.setIdentity();
@@ -692,10 +678,8 @@ std::pair<xAOD::VertexContainer*, xAOD::VertexAuxContainer*> InDetIterativeSecVt
for (xAOD::VertexContainer::iterator vxIter=vxBegin;vxIter!=vxEnd;++vxIter)
{
// A vertex should not rob tracks from itself
-// if ( *myxAODVertex == dynamic_cast<xAOD::Vertex>( *(*vxIter) ) ) continue ;
#ifdef MONITORTUNES
if ( (*vxIter)->vertexType() == xAOD::VxType::NoVtx ) continue ;
-// if ( (*vxIter)->vertexType() == xAOD::VxType::KinkVtx ) continue ;
#endif
std::vector<Trk::VxTrackAtVertex>* myVxTracksAtVtx=(&(*vxIter)->vxTrackAtVertex());
@@ -730,7 +714,9 @@ std::pair<xAOD::VertexContainer*, xAOD::VertexAuxContainer*> InDetIterativeSecVt
if (trackPerigee==nullptr)
{
- ATH_MSG_ERROR( " Cast to perigee gives 0 pointer " );
+ ATH_MSG_ERROR( " Cast to perigee gives 0 pointer, cannot continue " );
+ return invalidResponse;
+;
}
double chi2_newvtx=compatibility(*trackPerigee, covariance, position );
@@ -1177,7 +1163,7 @@ std::pair<xAOD::VertexContainer*, xAOD::VertexAuxContainer*> InDetIterativeSecVt
++ vxIter ;
- if ( QxAODVertex ) delete QxAODVertex ;
+ delete QxAODVertex ;
}
// update vertices, while fix the TrackParticles linked to the vertex
@@ -1191,19 +1177,7 @@ std::pair<xAOD::VertexContainer*, xAOD::VertexAuxContainer*> InDetIterativeSecVt
<< " vxType = " << (*vxIter)->vertexType() ) ;
std::vector<float> trkWght ;
-/**
-#ifdef MONITORTUNES
- if ( (*vxIter)->vertexType() == xAOD::VxType::NoVtx )
- {
- mDecor_trkDOE( *(*vxIter) ) = trkWght ;
- mDecor_trkWght( *(*vxIter) ) = trkWght ;
-// The mass and HitsFilter have been calculated, keep then UN-overwriten
- mDecor_sumPt2( *(*vxIter) ) = -99.9 ;
- mDecor_nrobbed( *(*vxIter) ) = 0 ;
- continue ;
- }
-#endif
-**/
+
std::vector<Trk::VxTrackAtVertex>* myVxTracksAtVtx = &((*vxIter)->vxTrackAtVertex());
if ( ! myVxTracksAtVtx )
@@ -1840,7 +1814,7 @@ std::pair<xAOD::VertexContainer*, xAOD::VertexAuxContainer*> InDetIterativeSecVt
using TrackDataVecIter = DataVector<Trk::Track>::const_iterator;
bool selectionPassed;
- for (TrackDataVecIter itr = (*trackTES).begin(); itr != (*trackTES).end(); itr++) {
+ for (TrackDataVecIter itr = (*trackTES).begin(); itr != (*trackTES).end(); ++itr) {
if (m_useBeamConstraint) {
selectionPassed=static_cast<bool>(m_trkFilter->accept(**itr,&beamposition));
if ( selectionPassed ) selectionPassed=static_cast<bool>(m_SVtrkFilter->accept(**itr,&beamposition));
@@ -1885,8 +1859,7 @@ std::pair<xAOD::VertexContainer*, xAOD::VertexAuxContainer*> InDetIterativeSecVt
using TrackParticleDataVecIter = DataVector<Trk::TrackParticleBase>::const_iterator;
bool selectionPassed;
- for (TrackParticleDataVecIter itr = (*trackTES).begin(); itr != (*trackTES).end(); itr++) {
-// const xAOD::TrackParticle * tmp=dynamic_cast<const xAOD::TrackParticle *> ((*itr));
+ for (TrackParticleDataVecIter itr = (*trackTES).begin(); itr != (*trackTES).end(); ++itr) {
if (m_useBeamConstraint) {
selectionPassed=static_cast<bool>(m_trkFilter->accept( *((*itr)->originalTrack()), &beamposition));
if ( selectionPassed ) selectionPassed
@@ -2303,6 +2276,8 @@ void InDetIterativeSecVtxFinderTool::removeCompatibleTracks(xAOD::Vertex * myxAO
if (myPerigee==nullptr)
{
ATH_MSG_ERROR( " Cast to perigee gives 0 pointer " );
+ return;
+
}
double chi2=compatibility(*myPerigee, covariance, position );
--
GitLab
From 921f43662277bac43e16af8a409a3a511f5744e3 Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Mon, 23 Aug 2021 20:56:11 +0200
Subject: [PATCH 244/272] TrigMuonMonitoringMT, clang-tidy related fixes
---
.../TrigMuonMonitoringMT/src/EFMuonMonMT.cxx | 2 +-
.../src/L2OverlapRemoverMonMT.cxx | 28 +++++++-------
.../src/L2OverlapRemoverMonMT.h | 6 +--
.../src/L2muCombMonMT.cxx | 4 +-
.../src/MuonMatchingTool.cxx | 38 ++++++++++---------
.../src/MuonMatchingTool.h | 8 ++--
.../src/MuonTriggerCountMT.cxx | 2 +-
.../src/TrigMuonEfficiencyMonMT.cxx | 2 +-
8 files changed, 47 insertions(+), 43 deletions(-)
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/EFMuonMonMT.cxx b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/EFMuonMonMT.cxx
index 92b072e62eee..2236b9e44eff 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/EFMuonMonMT.cxx
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/EFMuonMonMT.cxx
@@ -21,7 +21,7 @@ StatusCode EFMuonMonMT :: initialize(){
ATH_CHECK( m_CBtrackContainerKey.initialize() );
ATH_CHECK( m_muonIso30Key.initialize() );
- for( std::string chain : m_monitored_chains ){
+ for( const std::string& chain : m_monitored_chains ){
m_doEFSA[chain] = true;
if( chain.find("msonly") != std::string::npos ) m_doEFCB[chain] = false;
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2OverlapRemoverMonMT.cxx b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2OverlapRemoverMonMT.cxx
index fdc99449d1db..5faf971596a3 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2OverlapRemoverMonMT.cxx
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2OverlapRemoverMonMT.cxx
@@ -21,7 +21,7 @@ StatusCode L2OverlapRemoverMonMT :: fillVariablesPerChain(const EventContext &,
}
-bool L2OverlapRemoverMonMT :: isOverlap(const std::string &chain, const ElementLink<xAOD::L2StandAloneMuonContainer> muEL1, const ElementLink<xAOD::L2StandAloneMuonContainer> muEL2) const {
+bool L2OverlapRemoverMonMT :: isOverlap(const std::string &chain, const ElementLink<xAOD::L2StandAloneMuonContainer>& muEL1, const ElementLink<xAOD::L2StandAloneMuonContainer>& muEL2) const {
const float ZERO_LIMIT = 0.00001;
@@ -39,8 +39,8 @@ bool L2OverlapRemoverMonMT :: isOverlap(const std::string &chain, const ElementL
double dRThres = 9999.;
double massThres = 9999.;
- bool isBarrel1 = (*muEL1)->sAddress() != -1 ? true : false;
- bool isBarrel2 = (*muEL2)->sAddress() != -1 ? true : false;
+ bool isBarrel1 = (*muEL1)->sAddress() != -1;
+ bool isBarrel2 = (*muEL2)->sAddress() != -1;
if( isBarrel1 && isBarrel2 ) { // BB
dRThres =m_dRSAThresBB;
@@ -62,17 +62,17 @@ bool L2OverlapRemoverMonMT :: isOverlap(const std::string &chain, const ElementL
// same sign cut
- bool sameSign = ( mu1Pt*mu2Pt > 0) ? true : false;
+ bool sameSign = mu1Pt*mu2Pt > 0;
// dR cut
float deta = mu1Eta - mu2Eta;
float dphi = xAOD::P4Helpers::deltaPhi(mu1Phi, mu2Phi);
dR = sqrt(deta*deta + dphi*dphi);
- bool dRisClose = ( dR < dRThres ) ? true : false;
+ bool dRisClose = dR < dRThres;
// mass cut
invMass = calcinvMass(0., mu1Pt, mu1Eta, mu1Phi, 0., mu2Pt, mu2Eta, mu2Phi);
- bool massIsClose = ( invMass < massThres ) ? true : false;
+ bool massIsClose = invMass < massThres;
// for monitorinng log10 plot
const float monitor_limit = 1e-4;
@@ -81,7 +81,7 @@ bool L2OverlapRemoverMonMT :: isOverlap(const std::string &chain, const ElementL
// total judge
- bool overlap = ( sameSign && dRisClose && massIsClose ) ? true : false;
+ bool overlap = sameSign && dRisClose && massIsClose;
ATH_MSG_DEBUG( " ...=> isOverlap=" << overlap );
fill(m_group+"_"+chain, dR, invMass, dRLog10, invMassLog10);
@@ -90,7 +90,7 @@ bool L2OverlapRemoverMonMT :: isOverlap(const std::string &chain, const ElementL
}
-bool L2OverlapRemoverMonMT :: isOverlap(const std::string &chain, const ElementLink<xAOD::L2CombinedMuonContainer> muEL1, const ElementLink<xAOD::L2CombinedMuonContainer> muEL2) const {
+bool L2OverlapRemoverMonMT :: isOverlap(const std::string &chain, const ElementLink<xAOD::L2CombinedMuonContainer>& muEL1, const ElementLink<xAOD::L2CombinedMuonContainer>& muEL2) const {
const float ZERO_LIMIT = 0.00001;
@@ -117,19 +117,19 @@ bool L2OverlapRemoverMonMT :: isOverlap(const std::string &chain, const ElementL
// same sign cut
- bool sameSign = ( mu1Pt*mu2Pt > 0) ? true : false;
+ bool sameSign = mu1Pt*mu2Pt > 0;
// dR cut
float deta = mu1Eta - mu2Eta;
float dphi = xAOD::P4Helpers::deltaPhi(mu1Phi, mu2Phi);
dR = sqrt(deta*deta + dphi*dphi);
- bool dRisClose = ( dR < dRThres ) ? true : false;
+ bool dRisClose = dR < dRThres;
// dR(by L2SA) cut
bool dRbySAisClose = false;
const xAOD::L2StandAloneMuon* muSA1 = (*muEL1)->muSATrack();
const xAOD::L2StandAloneMuon* muSA2 = (*muEL2)->muSATrack();
- if( muSA1 == 0 || muSA2 == 0 ) return false;
+ if( muSA1 == nullptr || muSA2 == nullptr ) return false;
else {
float deta = muSA1->etaMS() - muSA2->etaMS();
float dphi = xAOD::P4Helpers::deltaPhi(muSA1->phiMS(), muSA2->phiMS());
@@ -139,7 +139,7 @@ bool L2OverlapRemoverMonMT :: isOverlap(const std::string &chain, const ElementL
// mass cut
invMass = calcinvMass(0., mu1Pt, mu1Eta, mu1Phi, 0., mu2Pt, mu2Eta, mu2Phi);
- bool massIsClose = ( invMass < massThres ) ? true : false;
+ bool massIsClose = invMass < massThres;
// for monitorinng log10 plot
const float monitor_limit = 1e-4;
@@ -148,7 +148,7 @@ bool L2OverlapRemoverMonMT :: isOverlap(const std::string &chain, const ElementL
// total judge
- bool overlap = ( sameSign && dRisClose && massIsClose && dRbySAisClose ) ? true : false;
+ bool overlap = sameSign && dRisClose && massIsClose && dRbySAisClose;
ATH_MSG_DEBUG( " ...=> isOverlap=" << overlap );
fill(m_group+"_"+chain, dR, invMass, dRLog10, invMassLog10);
@@ -278,7 +278,7 @@ StatusCode L2OverlapRemoverMonMT::chooseBestMuon(const std::string &chain, std::
float L2OverlapRemoverMonMT::calcinvMass(double m1, double pt1, double eta1, double phi1,
- double m2, double pt2, double eta2, double phi2) const
+ double m2, double pt2, double eta2, double phi2)
{
const double ZERO_LIMIT = 1e-12;
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2OverlapRemoverMonMT.h b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2OverlapRemoverMonMT.h
index 187e035e48da..fad814cc17b7 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2OverlapRemoverMonMT.h
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2OverlapRemoverMonMT.h
@@ -30,8 +30,8 @@ class L2OverlapRemoverMonMT : public TrigMuonMonitorAlgorithm{
template<class T>
StatusCode fillVariablesOverlapRemoverPlots(const std::string &chain, std::string &&trigstep) const;
- bool isOverlap(const std::string &chain, const ElementLink<xAOD::L2StandAloneMuonContainer> muEL1, const ElementLink<xAOD::L2StandAloneMuonContainer> muEL2) const;
- bool isOverlap(const std::string &chain, const ElementLink<xAOD::L2CombinedMuonContainer> muEL1, const ElementLink<xAOD::L2CombinedMuonContainer> muEL2) const;
+ bool isOverlap(const std::string &chain, const ElementLink<xAOD::L2StandAloneMuonContainer>& muEL1, const ElementLink<xAOD::L2StandAloneMuonContainer>& muEL2) const;
+ bool isOverlap(const std::string &chain, const ElementLink<xAOD::L2CombinedMuonContainer>& muEL1, const ElementLink<xAOD::L2CombinedMuonContainer>& muEL2) const;
/**
* @brief Function that choose best muon.
@@ -42,7 +42,7 @@ class L2OverlapRemoverMonMT : public TrigMuonMonitorAlgorithm{
StatusCode chooseBestMuon(const std::string &chain, std::vector< TrigCompositeUtils::LinkInfo<xAOD::L2StandAloneMuonContainer> > featureCont, std::vector<unsigned int> muResult) const;
StatusCode chooseBestMuon(const std::string &chain, std::vector< TrigCompositeUtils::LinkInfo<xAOD::L2CombinedMuonContainer> > featureCont, std::vector<unsigned int> muResult) const;
- float calcinvMass(double m1, double pt1, double eta1, double phi1, double m2, double pt2, double eta2, double phi2) const;
+ static float calcinvMass(double m1, double pt1, double eta1, double phi1, double m2, double pt2, double eta2, double phi2) ;
static inline std::tuple<float,float,float> L2ORPosForMatchFunc(const xAOD::L2StandAloneMuon *trig);
static inline std::tuple<float,float,float> L2ORPosForMatchFunc(const xAOD::L2CombinedMuon *trig);
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2muCombMonMT.cxx b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2muCombMonMT.cxx
index c84bb5e61d21..ddb9893081ee 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2muCombMonMT.cxx
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2muCombMonMT.cxx
@@ -73,8 +73,8 @@ StatusCode L2muCombMonMT :: fillVariablesPerChain(const EventContext &ctx, const
auto L2CB_failure = Monitored::Scalar<bool>(chain+"_L2CB_failure",false);
bool off_cb_match = false;
bool off_sa_match = false;
- L2SA_success = (std::abs(saPt) > ZERO_LIMIT)? true:false;
- L2CB_success = (std::abs(cbPt) > ZERO_LIMIT)? true:false;
+ L2SA_success = std::abs(saPt) > ZERO_LIMIT;
+ L2CB_success = std::abs(cbPt) > ZERO_LIMIT;
// matching to offline
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.cxx b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.cxx
index 22f3535ccecc..f65f62467309 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.cxx
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.cxx
@@ -2,6 +2,10 @@
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
+#include <utility>
+
+
+
#include "MuonMatchingTool.h"
#include "xAODTrigger/MuonRoIContainer.h"
@@ -75,7 +79,7 @@ const xAOD::Muon* MuonMatchingTool :: matchEFSA(const xAOD::Muon *mu, std::strin
MuonTrack = mu->trackParticle(type);
if (MuonTrack) break;
}
- return MuonTrack ? match<xAOD::Muon>(MuonTrack, trig, m_EFreqdR, pass, "HLT_Muons_.*", &MuonMatchingTool::trigPosForMatchSATrack) : nullptr;
+ return MuonTrack ? match<xAOD::Muon>(MuonTrack, std::move(trig), m_EFreqdR, pass, "HLT_Muons_.*", &MuonMatchingTool::trigPosForMatchSATrack) : nullptr;
}
const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> MuonMatchingTool :: matchEFSALinkInfo(const xAOD::Muon *mu, std::string trig) const {
@@ -91,7 +95,7 @@ const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> MuonMatchingTool :: matc
MuonTrack = mu->trackParticle(type);
if (MuonTrack) break;
}
- return MuonTrack ? matchLinkInfo<xAOD::Muon>(MuonTrack, trig, m_EFreqdR, pass, "HLT_Muons_.*", &MuonMatchingTool::trigPosForMatchSATrack) : muonLinkInfo;
+ return MuonTrack ? matchLinkInfo<xAOD::Muon>(MuonTrack, std::move(trig), m_EFreqdR, pass, "HLT_Muons_.*", &MuonMatchingTool::trigPosForMatchSATrack) : muonLinkInfo;
}
@@ -113,7 +117,7 @@ const xAOD::Muon* MuonMatchingTool :: matchEFSAReadHandle( const EventContext& c
const xAOD::Muon* MuonMatchingTool :: matchEFCB( const xAOD::Muon *mu, std::string trig, bool &pass) const {
ATH_MSG_DEBUG("MuonMonitoring::matchEFCB()");
const xAOD::TrackParticle* MuonTrack = mu->trackParticle(xAOD::Muon::TrackParticleType::Primary);
- return MuonTrack ? match<xAOD::Muon>( MuonTrack, trig, m_EFreqdR, pass, "HLT_MuonsCB.*", &MuonMatchingTool::trigPosForMatchCBTrack) : nullptr;
+ return MuonTrack ? match<xAOD::Muon>( MuonTrack, std::move(trig), m_EFreqdR, pass, "HLT_MuonsCB.*", &MuonMatchingTool::trigPosForMatchCBTrack) : nullptr;
}
const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> MuonMatchingTool :: matchEFCBLinkInfo( const xAOD::Muon *mu, std::string trig) const {
@@ -121,7 +125,7 @@ const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> MuonMatchingTool :: matc
bool pass = false;
TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> muonLinkInfo;
const xAOD::TrackParticle* MuonTrack = mu->trackParticle(xAOD::Muon::TrackParticleType::Primary);
- return MuonTrack ? matchLinkInfo<xAOD::Muon>(MuonTrack, trig, m_EFreqdR, pass, "HLT_MuonsCB.*", &MuonMatchingTool::trigPosForMatchCBTrack) : muonLinkInfo;
+ return MuonTrack ? matchLinkInfo<xAOD::Muon>(MuonTrack, std::move(trig), m_EFreqdR, pass, "HLT_MuonsCB.*", &MuonMatchingTool::trigPosForMatchCBTrack) : muonLinkInfo;
}
const xAOD::Muon* MuonMatchingTool :: matchEFCBReadHandle( const EventContext& ctx, const xAOD::Muon *mu) const {
@@ -134,11 +138,11 @@ const xAOD::Muon* MuonMatchingTool :: matchEFCBReadHandle( const EventContext& c
const xAOD::Muon* MuonMatchingTool :: matchEFIso( const xAOD::Muon *mu, std::string trig, bool &pass) const {
ATH_MSG_DEBUG("MuonMonitoring::matchEFIso()");
const xAOD::TrackParticle* MuonTrack = mu->trackParticle(xAOD::Muon::TrackParticleType::Primary);
- return MuonTrack ? match<xAOD::Muon>( MuonTrack, trig, m_EFreqdR, pass, "HLT_MuonsIso", &MuonMatchingTool::trigPosForMatchCBTrack) : nullptr;
+ return MuonTrack ? match<xAOD::Muon>( MuonTrack, std::move(trig), m_EFreqdR, pass, "HLT_MuonsIso", &MuonMatchingTool::trigPosForMatchCBTrack) : nullptr;
}
-const xAOD::TrackParticle* MuonMatchingTool :: SearchEFTrack(const EventContext &ctx, const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer>& muLinkInfo, SG::ReadHandleKey<xAOD::TrackParticleContainer> ReadHandleKey) const {
+const xAOD::TrackParticle* MuonMatchingTool :: SearchEFTrack(const EventContext &ctx, const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer>& muLinkInfo, const SG::ReadHandleKey<xAOD::TrackParticleContainer>& ReadHandleKey) const {
const xAOD::TrackParticle* MatchedTrack = nullptr;
const ElementLink<xAOD::MuonContainer> muEL = muLinkInfo.link;
float EFEta = (*muEL)->eta();
@@ -173,11 +177,11 @@ const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> MuonMatchingTool :: matc
bool pass = false;
TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> muonLinkInfo;
const xAOD::TrackParticle* MuonTrack = mu->trackParticle(xAOD::Muon::TrackParticleType::Primary);
- return MuonTrack ? matchLinkInfo<xAOD::Muon>(MuonTrack, trig, m_EFreqdR, pass, "HLT_MuonsIso", &MuonMatchingTool::trigPosForMatchCBTrack) : muonLinkInfo;
+ return MuonTrack ? matchLinkInfo<xAOD::Muon>(MuonTrack, std::move(trig), m_EFreqdR, pass, "HLT_MuonsIso", &MuonMatchingTool::trigPosForMatchCBTrack) : muonLinkInfo;
}
-const xAOD::L2StandAloneMuon* MuonMatchingTool :: matchL2SA( const xAOD::Muon *mu, std::string trig, bool &pass) const {
+const xAOD::L2StandAloneMuon* MuonMatchingTool :: matchL2SA( const xAOD::Muon *mu, const std::string& trig, bool &pass) const {
ATH_MSG_DEBUG("MuonMonitoring::matchL2SA()");
float reqdR = m_L2SAreqdR;
if(m_use_extrapolator){
@@ -193,7 +197,7 @@ const xAOD::L2StandAloneMuon* MuonMatchingTool :: matchL2SA( const xAOD::Muon *
const TrigCompositeUtils::LinkInfo<xAOD::L2StandAloneMuonContainer> MuonMatchingTool :: searchL2SALinkInfo( const xAOD::Muon *mu, std::string trig) const {
ATH_MSG_DEBUG("MuonMonitoring::searchL2SALinkInfo()");
bool pass = false;
- return matchLinkInfo<xAOD::L2StandAloneMuon>( mu, trig, 1000., pass, "HLT_MuonL2SAInfo");
+ return matchLinkInfo<xAOD::L2StandAloneMuon>( mu, std::move(trig), 1000., pass, "HLT_MuonL2SAInfo");
}
const xAOD::L2StandAloneMuon* MuonMatchingTool :: matchL2SAReadHandle( const EventContext& ctx, const xAOD::Muon *mu) const {
@@ -221,13 +225,13 @@ const xAOD::L2StandAloneMuon* MuonMatchingTool :: matchL2SAReadHandle( const Eve
const xAOD::L2CombinedMuon* MuonMatchingTool :: matchL2CB( const xAOD::Muon *mu, std::string trig, bool &pass) const {
ATH_MSG_DEBUG("MuonMonitoring::matchL2CB()");
- return match<xAOD::L2CombinedMuon>( mu, trig, m_L2CBreqdR, pass, "HLT_MuonL2CBInfo");
+ return match<xAOD::L2CombinedMuon>( mu, std::move(trig), m_L2CBreqdR, pass, "HLT_MuonL2CBInfo");
}
const TrigCompositeUtils::LinkInfo<xAOD::L2CombinedMuonContainer> MuonMatchingTool :: searchL2CBLinkInfo( const xAOD::Muon *mu, std::string trig) const {
ATH_MSG_DEBUG("MuonMonitoring::searchL2CBLinkInfo()");
bool pass = false;
- return matchLinkInfo<xAOD::L2CombinedMuon>( mu, trig, 1000., pass, "HLT_MuonL2CBInfo");
+ return matchLinkInfo<xAOD::L2CombinedMuon>( mu, std::move(trig), 1000., pass, "HLT_MuonL2CBInfo");
}
const xAOD::L2CombinedMuon* MuonMatchingTool :: matchL2CBReadHandle( const EventContext& ctx, const xAOD::Muon *mu) const {
@@ -237,7 +241,7 @@ const xAOD::L2CombinedMuon* MuonMatchingTool :: matchL2CBReadHandle( const Event
}
-const xAOD::MuonRoI* MuonMatchingTool :: matchL1( const xAOD::Muon *mu, const EventContext& ctx, std::string trig, bool &pass) const {
+const xAOD::MuonRoI* MuonMatchingTool :: matchL1( const xAOD::Muon *mu, const EventContext& ctx, const std::string& trig, bool &pass) const {
double refEta = mu->eta();
double refPhi = mu->phi();
@@ -298,16 +302,16 @@ bool MuonMatchingTool :: isMatchedL2SA(const xAOD::L2StandAloneMuon* samu, const
float deta = offlEta - trigEta;
float dphi = xAOD::P4Helpers::deltaPhi(offlPhi, trigPhi);
float dR = sqrt(deta*deta + dphi*dphi);
- return (dR < m_L2SAreqdR) ? true : false;
+ return dR < m_L2SAreqdR;
}
bool MuonMatchingTool :: isMatchedL2CB(const xAOD::L2CombinedMuon* cbmu, const xAOD::Muon* mu) const{
float dR = xAOD::P4Helpers::deltaR(cbmu, mu, false);
- return (dR < m_L2CBreqdR) ? true : false;
+ return dR < m_L2CBreqdR;
}
-double MuonMatchingTool :: FermiFunction(double x, double x0, double w) const {
+double MuonMatchingTool :: FermiFunction(double x, double x0, double w) {
return 1/(1+TMath::Exp(-10*(x-x0)/w));
}
@@ -334,7 +338,7 @@ const Trk::TrackParameters* MuonMatchingTool :: extTrackToPivot(const xAOD::Trac
extEta = extRPC->position().eta();
if(fabs(extEta)>=1.05){
extTGC = extTrackToTGC(track);
- isBarrel = (extTGC)? false : true;
+ isBarrel = (extTGC) == nullptr;
}
}
}
@@ -349,7 +353,7 @@ const Trk::TrackParameters* MuonMatchingTool :: extTrackToPivot(const xAOD::Trac
extEta = extTGC->position().eta();
if(fabs(extEta)<1.05){
extRPC = extTrackToRPC(track);
- isBarrel = (extRPC) ? true : false;
+ isBarrel = (extRPC) != nullptr;
}
}
}
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.h b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.h
index 1f35f6c17170..ce7fd78149ee 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.h
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.h
@@ -40,7 +40,7 @@ class MuonMatchingTool : public AthAlgTool {
* @param pass True if a candidate is found.
* @return Pointer to the matched candidate. This is @c nullptr when there is no candidate found.
*/
- const xAOD::MuonRoI* matchL1(const xAOD::Muon *mu, const EventContext& ctx, std::string trigger, bool &pass) const;
+ const xAOD::MuonRoI* matchL1(const xAOD::Muon *mu, const EventContext& ctx, const std::string& trigger, bool &pass) const;
/**
* @brief Function that searches for an L2 standalone muon (L2MuonSA) candidate and judges if it is matched to a given offline muon.
@@ -50,7 +50,7 @@ class MuonMatchingTool : public AthAlgTool {
* @return Pointer to the matched candidate. This is @c nullptr when there is no candidate found.
* Important: a valid pointer doesn't mean that it passed the hypothesis, users should check @c pass for the decision.
*/
- const xAOD::L2StandAloneMuon* matchL2SA(const xAOD::Muon *mu, std::string trigger, bool &pass) const;
+ const xAOD::L2StandAloneMuon* matchL2SA(const xAOD::Muon *mu, const std::string& trigger, bool &pass) const;
/**
* @brief Function that searches for the L2 standalone muon (L2MuonSA) candidate closest to a given offline muon.
@@ -177,7 +177,7 @@ class MuonMatchingTool : public AthAlgTool {
* @param ReadHandleKey of TrackParticle container.
* @return Pointer to the matched TrackParticle. This is @c nullpt rwhen there is no TrackParticle found.
*/
- const xAOD::TrackParticle* SearchEFTrack(const EventContext &ctx, const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer>& muLinkInfo, SG::ReadHandleKey<xAOD::TrackParticleContainer> ReadHandleKey) const;
+ const xAOD::TrackParticle* SearchEFTrack(const EventContext &ctx, const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer>& muLinkInfo, const SG::ReadHandleKey<xAOD::TrackParticleContainer>& ReadHandleKey) const;
/**
@@ -308,7 +308,7 @@ class MuonMatchingTool : public AthAlgTool {
const Amg::Vector3D offlineMuonAtPivot(const xAOD::Muon *mu) const;
- double FermiFunction(double x, double x0, double w) const;
+ static double FermiFunction(double x, double x0, double w) ;
const Trk::TrackParameters* extTrackToTGC(const xAOD::TrackParticle *track) const;
const Trk::TrackParameters* extTrackToRPC(const xAOD::TrackParticle *track) const;
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonTriggerCountMT.cxx b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonTriggerCountMT.cxx
index dd0937ebbddd..2d1cc47e5854 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonTriggerCountMT.cxx
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonTriggerCountMT.cxx
@@ -15,7 +15,7 @@ StatusCode MuonTriggerCountMT :: fillVariables(const EventContext&) const {
ATH_MSG_DEBUG ("Filling histograms for " << name() << "...");
std::vector<std::string> passed_chains;
- for ( auto c: m_monitored_chains ) { if (getTrigDecisionTool()->isPassed(c)) passed_chains.push_back(c); }
+ for ( const auto& c: m_monitored_chains ) { if (getTrigDecisionTool()->isPassed(c)) passed_chains.push_back(c); }
auto passed = Monitored::Collection("TriggerCount", passed_chains );
fill(m_group, passed);
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/TrigMuonEfficiencyMonMT.cxx b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/TrigMuonEfficiencyMonMT.cxx
index 4fb627e73ca9..88d47795e911 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/TrigMuonEfficiencyMonMT.cxx
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/TrigMuonEfficiencyMonMT.cxx
@@ -199,7 +199,7 @@ StatusCode TrigMuonEfficiencyMonMT :: selectMuonsTagAndProbe(SG::ReadHandle<xAOD
// For Zmumu events
if( m_eff_method == "ZTagAndProbe" && !(bit_mass && bit_dR) ) continue;
- dimuons.push_back(std::make_pair(mu1,mu2));
+ dimuons.emplace_back(mu1,mu2);
}
}// loop over muons
--
GitLab
From ef062afcbca83e3ebc8325fd97bb1891cd7b7661 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Tue, 29 Jun 2021 14:05:51 -0400
Subject: [PATCH 245/272] VP1Base: Fix cppcheck warnings.
Fix cppcheck warnings.
---
graphics/VP1/VP1Base/VP1Base/VP1ExaminerViewer.h | 5 ++++-
graphics/VP1/VP1Base/src/IVP13DSystem.cxx | 8 +++-----
graphics/VP1/VP1Base/src/SoCooperativeSelection.cxx | 4 ++--
graphics/VP1/VP1Base/src/VP1ExaminerViewer.cxx | 3 ++-
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/graphics/VP1/VP1Base/VP1Base/VP1ExaminerViewer.h b/graphics/VP1/VP1Base/VP1Base/VP1ExaminerViewer.h
index fcd7dc9ecf1a..5305768aea56 100644
--- a/graphics/VP1/VP1Base/VP1Base/VP1ExaminerViewer.h
+++ b/graphics/VP1/VP1Base/VP1Base/VP1ExaminerViewer.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
@@ -38,6 +38,9 @@ public:
SoQtFullViewer::BuildFlag flag = BUILD_ALL,
SoQtViewer::Type type = BROWSER);
+ VP1ExaminerViewer (const VP1ExaminerViewer&) = delete;
+ VP1ExaminerViewer& operator= (const VP1ExaminerViewer&) = delete;
+
virtual ~VP1ExaminerViewer();//NB: SoQtExaminerViewer has non-virtual destructor!
virtual void removeDecorationMenuOption();
diff --git a/graphics/VP1/VP1Base/src/IVP13DSystem.cxx b/graphics/VP1/VP1Base/src/IVP13DSystem.cxx
index d31eca54a259..7f31fda455d9 100644
--- a/graphics/VP1/VP1Base/src/IVP13DSystem.cxx
+++ b/graphics/VP1/VP1Base/src/IVP13DSystem.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////
@@ -410,8 +410,7 @@ std::set<SoCamera*> IVP13DSystem::getCameraList()
void IVP13DSystem::registerCamera(SoCamera *cam) {
if (!cam)
return;
- if (m_d->staticcameras.find(cam)==m_d->staticcameras.end())
- m_d->staticcameras.insert(cam);
+ m_d->staticcameras.insert(cam);
cam->ref();
}
@@ -420,6 +419,5 @@ void IVP13DSystem::registerViewer(SoQtViewer *viewer)
{
if (!viewer)
return;
- if (m_d->viewers.find(viewer)==m_d->viewers.end())
- m_d->viewers.insert(viewer);
+ m_d->viewers.insert(viewer);
}
diff --git a/graphics/VP1/VP1Base/src/SoCooperativeSelection.cxx b/graphics/VP1/VP1Base/src/SoCooperativeSelection.cxx
index 9778fe77fb57..c1e4e1cde21e 100644
--- a/graphics/VP1/VP1Base/src/SoCooperativeSelection.cxx
+++ b/graphics/VP1/VP1Base/src/SoCooperativeSelection.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// Class: SoCooperativeSelection.
@@ -127,7 +127,7 @@ void SoCooperativeSelection::handleEvent(SoHandleEventAction * action)
SoCooperativeSelection * lastsoselectionfrompath = getLastActiveSoSelectionFromPath(selectionpath);
- if (selectionpath&&lastsoselectionfrompath==this) {
+ if (lastsoselectionfrompath==this) {
//We are the selection node furthest down the path => handle the event.
this->mouseDownPickPath = selectionpath;
this->mouseDownPickPath->ref();
diff --git a/graphics/VP1/VP1Base/src/VP1ExaminerViewer.cxx b/graphics/VP1/VP1Base/src/VP1ExaminerViewer.cxx
index 739a910d60d0..1497746f4520 100644
--- a/graphics/VP1/VP1Base/src/VP1ExaminerViewer.cxx
+++ b/graphics/VP1/VP1Base/src/VP1ExaminerViewer.cxx
@@ -68,6 +68,8 @@
class VP1ExaminerViewer::Imp {
public:
+ Imp (const Imp&) = delete;
+ Imp& operator= (const Imp&) = delete;
Imp(VP1ExaminerViewer*tc,bool dvb)
: theclass(tc),
@@ -151,7 +153,6 @@ public:
// theclass->setClearBeforeOverlayRender(FALSE);
}
-
~Imp()
{
VP1Msg::messageVerbose("VP1ExaminerViewer::~Imp() destructor");
--
GitLab
From 0df14792fc95f8da7217ada7d27831ecd45ca8da Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Wed, 30 Jun 2021 00:06:39 -0400
Subject: [PATCH 246/272] VP1Utils: cppcheck fix
Work around cppcheck false positive.
---
graphics/VP1/VP1Utils/src/VP1ParticleData.cxx | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/graphics/VP1/VP1Utils/src/VP1ParticleData.cxx b/graphics/VP1/VP1Utils/src/VP1ParticleData.cxx
index 2d53d7ba54c1..6e111fe22812 100644
--- a/graphics/VP1/VP1Utils/src/VP1ParticleData.cxx
+++ b/graphics/VP1/VP1Utils/src/VP1ParticleData.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
@@ -63,8 +63,9 @@ const HepPDT::ParticleData * VP1ParticleData::particleData( const int& pdgcode )
Imp::m_badInit = true;
return 0;
}
- Imp::m_particleDataTable = partPropSvc->PDT();
- if (!Imp::m_particleDataTable) {
+ const HepPDT::ParticleDataTable* tab = partPropSvc->PDT();
+ Imp::m_particleDataTable = tab;
+ if (!tab) {
VP1Msg::message("VP1ParticleData ERROR: Could not get particle data table from particle property service.");
Imp::m_badInit = true;
return 0;
--
GitLab
From c289d92e2a89364eceadf8f61c2dc539038ca2a4 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Wed, 7 Jul 2021 00:52:45 -0400
Subject: [PATCH 247/272] TrkParametersBase: cmake fix
Missing find_package for Boost.
Don't list headers as library sources.
---
Tracking/TrkEvent/TrkParametersBase/CMakeLists.txt | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Tracking/TrkEvent/TrkParametersBase/CMakeLists.txt b/Tracking/TrkEvent/TrkParametersBase/CMakeLists.txt
index 04f24d01fea3..5f20ba5fd8d5 100644
--- a/Tracking/TrkEvent/TrkParametersBase/CMakeLists.txt
+++ b/Tracking/TrkEvent/TrkParametersBase/CMakeLists.txt
@@ -1,17 +1,18 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkParametersBase )
+find_package( Boost )
+
# Declare an interface library for the headers of the package:
atlas_add_library( TrkParametersBase
- TrkParametersBase/*.h TrkParametersBase/*.icc
INTERFACE
PUBLIC_HEADERS TrkParametersBase
LINK_LIBRARIES GeoPrimitives EventPrimitives TrkEventPrimitives GaudiKernel )
atlas_add_test( ParametersBase_test
- SOURCES test/ParametersBase_test.cxx TrkParametersBase/*.h TrkParametersBase/*.icc
+ SOURCES test/ParametersBase_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES}
GaudiKernel TrkParametersBase
--
GitLab
From 91e750cb9ba96e101d2351118f2663c3f0849991 Mon Sep 17 00:00:00 2001
From: tstreble <thomas.strebler@cern.ch>
Date: Tue, 24 Aug 2021 10:20:28 +0200
Subject: [PATCH 248/272] Updated PixelConditionsSummaryTool to deal with RD53
design
---
.../python/ITkPixelConditionsSummaryConfig.py | 1 +
.../src/PixelConditionsSummaryTool.cxx | 7 ++++---
.../PixelConditionsTools/src/PixelConditionsSummaryTool.h | 3 +++
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/python/ITkPixelConditionsSummaryConfig.py b/InnerDetector/InDetConditions/PixelConditionsTools/python/ITkPixelConditionsSummaryConfig.py
index 371781f5f6fe..674f033510da 100644
--- a/InnerDetector/InDetConditions/PixelConditionsTools/python/ITkPixelConditionsSummaryConfig.py
+++ b/InnerDetector/InDetConditions/PixelConditionsTools/python/ITkPixelConditionsSummaryConfig.py
@@ -23,6 +23,7 @@ def ITkPixelConditionsSummaryCfg(flags, name="ITkPixelConditionsSummary", **kwar
kwargs.setdefault("PixelDeadMapCondData", "ITkPixelDeadMapCondData")
kwargs.setdefault("UseByteStreamFEI4", not flags.Input.isMC)
kwargs.setdefault("UseByteStreamFEI3", not flags.Input.isMC)
+ kwargs.setdefault("UseByteStreamRD53", False) # Turned off until BS format is defined
if flags.InDet.usePixelDCS:
kwargs.setdefault("IsActiveStates", [ 'READY', 'ON', 'UNKNOWN', 'TRANSITION', 'UNDEFINED' ])
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx
index 2960453866dd..82dbf35a4413 100644
--- a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx
@@ -27,7 +27,7 @@ StatusCode PixelConditionsSummaryTool::initialize(){
// const EventContext& ctx{Gaudi::Hive::currentContext()};
// bool useByteStream = (SG::ReadCondHandle<PixelModuleData>(m_configKey,ctx)->getUseByteStreamErrFEI4() || SG::ReadCondHandle<PixelModuleData>(m_configKey,ctx)->getUseByteStreamErrFEI3());
- bool useByteStream = (m_useByteStreamFEI4 || m_useByteStreamFEI3);
+ bool useByteStream = (m_useByteStreamFEI4 || m_useByteStreamFEI3 || m_useByteStreamRD53);
// ATH_CHECK(m_BSErrContReadKey.initialize(useByteStream && !m_BSErrContReadKey.empty()));
ATH_CHECK(m_BSErrContReadKey.initialize(useByteStream && !m_BSErrContReadKey.empty()));
ATH_CHECK(detStore()->retrieve(m_pixelID,"PixelID"));
@@ -108,6 +108,7 @@ uint64_t PixelConditionsSummaryTool::getBSErrorWord(const IdentifierHash& module
if (!m_useByteStreamFEI4 && p_design->getReadoutTechnology() == InDetDD::PixelReadoutTechnology::FEI4) { return 0; }
if (!m_useByteStreamFEI3 && p_design->getReadoutTechnology() == InDetDD::PixelReadoutTechnology::FEI3) { return 0; }
+ if (!m_useByteStreamRD53 && p_design->getReadoutTechnology() == InDetDD::PixelReadoutTechnology::RD53) { return 0; }
std::scoped_lock<std::mutex> lock{*m_cacheMutex.get(ctx)};
const auto *idcCachePtr = getCacheEntry(ctx)->IDCCache;
@@ -191,7 +192,7 @@ bool PixelConditionsSummaryTool::isActive(const IdentifierHash& moduleHash, cons
// The index array is defined in PixelRawDataProviderTool::SizeOfIDCInDetBSErrContainer()
// Here, 52736 is a separator beween error flags and isActive flags.
- bool useByteStream = (m_useByteStreamFEI4 || m_useByteStreamFEI3);
+ bool useByteStream = (m_useByteStreamFEI4 || m_useByteStreamFEI3 || m_useByteStreamRD53);
if (useByteStream && getBSErrorWord(moduleHash,moduleHash+52736,ctx)!=1) { return false; }
SG::ReadCondHandle<PixelDCSStateData> dcsstate_data(m_condDCSStateKey,ctx);
@@ -212,7 +213,7 @@ bool PixelConditionsSummaryTool::isActive(const IdentifierHash& moduleHash, cons
// The index array is defined in PixelRawDataProviderTool::SizeOfIDCInDetBSErrContainer()
// Here, 52736 is a separator beween error flags and isActive flags.
- bool useByteStream = (m_useByteStreamFEI4 || m_useByteStreamFEI3);
+ bool useByteStream = (m_useByteStreamFEI4 || m_useByteStreamFEI3 || m_useByteStreamRD53);
if (useByteStream && getBSErrorWord(moduleHash,moduleHash+52736,ctx)!=1) { return false; }
SG::ReadCondHandle<PixelDCSStateData> dcsstate_data(m_condDCSStateKey,ctx);
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.h b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.h
index 9e9d8b30ea9b..1f98d325a03c 100644
--- a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.h
+++ b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.h
@@ -85,6 +85,9 @@ class PixelConditionsSummaryTool: public AthAlgTool, public IInDetConditionsTool
Gaudi::Property<bool> m_useByteStreamFEI3
{this, "UseByteStreamFEI3", false, "Switch of the ByteStream error for FEI3"};
+ Gaudi::Property<bool> m_useByteStreamRD53
+ {this, "UseByteStreamRD53", false, "Switch of the ByteStream error for RD53"};
+
SG::ReadCondHandleKey<PixelDCSStateData> m_condDCSStateKey
{this, "PixelDCSStateCondData", "PixelDCSStateCondData", "Pixel FSM state key"};
--
GitLab
From 9054a38288307ca44ab47d4af29053495c260606 Mon Sep 17 00:00:00 2001
From: Shaun Roe <shaun.roe@cern.ch>
Date: Tue, 24 Aug 2021 10:47:38 +0200
Subject: [PATCH 249/272] remove use-after-erase iterators
---
Reconstruction/tauEvent/src/TauJet.cxx | 49 ++++++++++++--------------
1 file changed, 23 insertions(+), 26 deletions(-)
diff --git a/Reconstruction/tauEvent/src/TauJet.cxx b/Reconstruction/tauEvent/src/TauJet.cxx
index d5e1cd9400f2..6c050020c1d6 100644
--- a/Reconstruction/tauEvent/src/TauJet.cxx
+++ b/Reconstruction/tauEvent/src/TauJet.cxx
@@ -30,6 +30,7 @@
#include "tauEvent/TauCommonDetails.h"
#include "tauEvent/TauCommonExtraDetails.h"
#include "tauEvent/TauDetailsContainer.h"
+#include <algorithm> //for remove_if
@@ -216,8 +217,7 @@ namespace Analysis
}
//Delete all existing details links
- while(!m_tauDetails.empty())
- m_tauDetails.erase(m_tauDetails.begin());
+ m_tauDetails.erase(m_tauDetails.begin(), m_tauDetails.end());
//Add new details (if there is a container and a detail)
if( (tauDetailsContainer!=0) && (tauCommonDetails!=0)) {
@@ -417,30 +417,27 @@ namespace Analysis
void TauJet::CleanDetailsForAOD()
{
- ElementLinkVector<TauDetailsContainer>::iterator idetail
- = m_tauDetails.begin();
- while(idetail != m_tauDetails.end()) {
- // counter
- const unsigned int i = idetail - m_tauDetails.begin();
-
- //Remove invalid details
- if (!(*idetail).isValid()) {
- m_tauDetails.erase(idetail);
- continue;
- }
- const TauDetails* detail =* m_tauDetails[i];
- //Remove 0 details
- if (detail==0) {
- m_tauDetails.erase(idetail);
- continue;
- }
- //Remove any extra detail
- if ( (dynamic_cast<const TauCommonExtraDetails*>(detail)!=0) ||
- (dynamic_cast<const TauRecExtraDetails*>(detail)!=0) ||
- (dynamic_cast<const Tau1P3PExtraDetails*>(detail)!=0) )
- m_tauDetails.erase(idetail);
- ++idetail;
- }
+ //remove invalid details
+ //sroe:I couldn't work out the type here, so use an 'auto' argument
+ auto isInvalid = [](const auto t){return not t.isValid();};
+ auto validEnd = std::remove_if(m_tauDetails.begin(), m_tauDetails.end(), isInvalid);
+ m_tauDetails.erase(validEnd, m_tauDetails.end());
+ //
+ //remove nullptrs before next step
+ auto goodPointerEnd = std::remove(m_tauDetails.begin(), m_tauDetails.end(), nullptr);
+ m_tauDetails.erase(goodPointerEnd, m_tauDetails.end());
+ //remove pointers which cast to details
+ auto castsToDetail = [](const auto t){
+ const TauDetails* detail = * t;
+ auto isNull = (detail == nullptr);
+ auto castToCommon = dynamic_cast<const TauCommonExtraDetails*>(detail);
+ auto castToRec = dynamic_cast<const TauRecExtraDetails*>(detail);
+ auto castTo1P3P = dynamic_cast<const Tau1P3PExtraDetails*>(detail);
+ //rely on pointer to bool conversion
+ return (isNull or castToCommon or castToRec or castTo1P3P);
+ };
+ auto detailPointerEnd = std::remove_if(m_tauDetails.begin(), m_tauDetails.end(), castsToDetail);
+ m_tauDetails.erase(detailPointerEnd, m_tauDetails.end());
}
void TauJet::CopyToCommonDetails(
--
GitLab
From 80458ccd841b5f581a0c2ec9db32b3a284850b1a Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Tue, 24 Aug 2021 12:09:32 +0200
Subject: [PATCH 250/272] Digitization+EventOverlay: remove support of LVL1 XML
configuration
We no longer support XML-based trigger configurations. Although, very
likely these job options are not relevant anyways anymore.
---
.../share/Level1Overlay_jobOptions.py | 7 ++-----
Simulation/Digitization/share/LVL1Digitization.py | 5 ++---
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Level1Overlay_jobOptions.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Level1Overlay_jobOptions.py
index 82e26febc3bf..69a618dad25f 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Level1Overlay_jobOptions.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Level1Overlay_jobOptions.py
@@ -80,7 +80,7 @@ if DetFlags.overlay.LVL1_on():
if not hasattr(ServiceMgr, 'LVL1ConfigSvc'):
log.info("Will setup LVL1ConfigSvc and add instance to ServiceMgr")
- from TrigConfigSvc.TrigConfigSvcConfig import LVL1ConfigSvc, findFileInXMLPATH
+ from TrigConfigSvc.TrigConfigSvcConfig import LVL1ConfigSvc
LVL1ConfigSvc = LVL1ConfigSvc('LVL1ConfigSvc')
# If read from DB then set up the connection and pass keys
@@ -109,10 +109,7 @@ if DetFlags.overlay.LVL1_on():
# Otherwise read from xml
else:
- log.info("LVL1ConfigSvc uses xml file %s ",
- TriggerFlags.inputLVL1configFile())
- LVL1ConfigSvc.XMLFile = findFileInXMLPATH(
- TriggerFlags.inputLVL1configFile())
+ raise RuntimeError("LVL1ConfigSvc: XML trigger configuration is not supported anymore")
ServiceMgr += LVL1ConfigSvc
else:
diff --git a/Simulation/Digitization/share/LVL1Digitization.py b/Simulation/Digitization/share/LVL1Digitization.py
index 593abbebba1b..d2339a0f595b 100755
--- a/Simulation/Digitization/share/LVL1Digitization.py
+++ b/Simulation/Digitization/share/LVL1Digitization.py
@@ -64,7 +64,7 @@ if DetFlags.digitize.LVL1_on():
if not hasattr( ServiceMgr, 'LVL1ConfigSvc' ):
log.info( "Will setup LVL1ConfigSvc and add instance to ServiceMgr" )
- from TrigConfigSvc.TrigConfigSvcConfig import LVL1ConfigSvc,findFileInXMLPATH
+ from TrigConfigSvc.TrigConfigSvcConfig import LVL1ConfigSvc
LVL1ConfigSvc = LVL1ConfigSvc('LVL1ConfigSvc')
#If read from DB then set up the connection and pass keys
@@ -91,8 +91,7 @@ if DetFlags.digitize.LVL1_on():
#Otherwise read from xml
else:
- log.info( "LVL1ConfigSvc uses xml file %s ", TriggerFlags.inputLVL1configFile() )
- LVL1ConfigSvc.XMLFile = findFileInXMLPATH(TriggerFlags.inputLVL1configFile())
+ raise RuntimeError("LVL1ConfigSvc: XML trigger configuration is not supported anymore")
ServiceMgr += LVL1ConfigSvc
else:
--
GitLab
From 221571a839cd8883b88758534e0f91117bbd1689 Mon Sep 17 00:00:00 2001
From: Debottam Bakshi Gupta <debottam.bakshi.gupta@cern.ch>
Date: Tue, 24 Aug 2021 13:05:15 +0200
Subject: [PATCH 251/272] Changing base IONNXRuntimeSvc from IService to
ASGService
---
.../AthOnnxruntimeServiceDict.h | 12 +++++++++++
.../AthOnnxruntimeService/IONNXRuntimeSvc.h | 10 ++++++----
.../ONNXRuntimeSvc.h | 7 +++----
.../AthOnnxruntimeService/selection.xml | 6 ++++++
Control/AthOnnxruntimeService/CMakeLists.txt | 20 +++++++++++++------
.../{src => Root}/ONNXRuntimeSvc.cxx | 8 ++++++--
.../AthOnnxruntimeService_entries.cxx | 2 +-
Projects/AnalysisBase/package_filters.txt | 5 +++++
Projects/AthAnalysis/package_filters.txt | 6 ++++++
9 files changed, 59 insertions(+), 17 deletions(-)
create mode 100644 Control/AthOnnxruntimeService/AthOnnxruntimeService/AthOnnxruntimeServiceDict.h
rename Control/AthOnnxruntimeService/{src => AthOnnxruntimeService}/ONNXRuntimeSvc.h (87%)
create mode 100644 Control/AthOnnxruntimeService/AthOnnxruntimeService/selection.xml
rename Control/AthOnnxruntimeService/{src => Root}/ONNXRuntimeSvc.cxx (77%)
diff --git a/Control/AthOnnxruntimeService/AthOnnxruntimeService/AthOnnxruntimeServiceDict.h b/Control/AthOnnxruntimeService/AthOnnxruntimeService/AthOnnxruntimeServiceDict.h
new file mode 100644
index 000000000000..e8453362a499
--- /dev/null
+++ b/Control/AthOnnxruntimeService/AthOnnxruntimeService/AthOnnxruntimeServiceDict.h
@@ -0,0 +1,12 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+
+#ifndef ATHONNXRUNTIMESERVICE__ATHONNXRUNTIMESERVICE_DICT_H
+#define ATHONNXRUNTIMESERVICE__ATHONNXRUNTIMESERVICE_DICT_H
+
+#include "AthOnnxruntimeService/ONNXRuntimeSvc.h"
+
+#endif
+
diff --git a/Control/AthOnnxruntimeService/AthOnnxruntimeService/IONNXRuntimeSvc.h b/Control/AthOnnxruntimeService/AthOnnxruntimeService/IONNXRuntimeSvc.h
index 45877848099e..cae4f26e3049 100644
--- a/Control/AthOnnxruntimeService/AthOnnxruntimeService/IONNXRuntimeSvc.h
+++ b/Control/AthOnnxruntimeService/AthOnnxruntimeService/IONNXRuntimeSvc.h
@@ -4,14 +4,16 @@
#define ATHEXONNXRUNTIME_IONNXRUNTIMESVC_H
// Gaudi include(s).
-#include "GaudiKernel/IService.h"
+#include <AsgServices/IAsgService.h>
// ONNX include(s).
#include <core/session/onnxruntime_cxx_api.h>
+
/// Namespace holding all of the ONNX Runtime example code
namespace AthONNX {
+ //class IAsgService
/// Service used for managing global objects used by ONNX Runtime
///
/// In order to allow multiple clients to use ONNX Runtime at the same
@@ -20,14 +22,14 @@ namespace AthONNX {
///
/// @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
///
- class IONNXRuntimeSvc : public virtual IService {
+ class IONNXRuntimeSvc : virtual public asg::IAsgService{
public:
/// Virtual destructor, to make vtable happy
virtual ~IONNXRuntimeSvc() = default;
- /// Declare an ID for this interface
- DeclareInterfaceID( AthONNX::IONNXRuntimeSvc, 1, 0 );
+ /// Declare the interface that this class provides
+ DeclareInterfaceID (AthONNX::IONNXRuntimeSvc, 1, 0);
/// Return the ONNX Runtime environment object
virtual Ort::Env& env() const = 0;
diff --git a/Control/AthOnnxruntimeService/src/ONNXRuntimeSvc.h b/Control/AthOnnxruntimeService/AthOnnxruntimeService/ONNXRuntimeSvc.h
similarity index 87%
rename from Control/AthOnnxruntimeService/src/ONNXRuntimeSvc.h
rename to Control/AthOnnxruntimeService/AthOnnxruntimeService/ONNXRuntimeSvc.h
index 4422521ba17a..475c36f9dfd6 100644
--- a/Control/AthOnnxruntimeService/src/ONNXRuntimeSvc.h
+++ b/Control/AthOnnxruntimeService/AthOnnxruntimeService/ONNXRuntimeSvc.h
@@ -7,7 +7,7 @@
#include "AthOnnxruntimeService/IONNXRuntimeSvc.h"
// Framework include(s).
-#include "AthenaBaseComps/AthService.h"
+#include <AsgServices/AsgService.h>
// ONNX include(s).
#include <core/session/onnxruntime_cxx_api.h>
@@ -24,14 +24,13 @@ namespace AthONNX {
///
/// @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
///
- class ONNXRuntimeSvc : public extends< AthService, IONNXRuntimeSvc > {
+ class ONNXRuntimeSvc : public asg::AsgService, virtual public IONNXRuntimeSvc {
public:
- /// Inherit the base class's constructor
- using extends::extends;
/// @name Function(s) inherited from @c Service
/// @{
+ ONNXRuntimeSvc (const std::string& name, ISvcLocator* svc);
/// Function initialising the service
virtual StatusCode initialize() override;
diff --git a/Control/AthOnnxruntimeService/AthOnnxruntimeService/selection.xml b/Control/AthOnnxruntimeService/AthOnnxruntimeService/selection.xml
new file mode 100644
index 000000000000..7ab8a4333797
--- /dev/null
+++ b/Control/AthOnnxruntimeService/AthOnnxruntimeService/selection.xml
@@ -0,0 +1,6 @@
+<lcgdict>
+
+ <class name="AthONNX::IONNXRuntimeSvc" />
+ <class name="AthONNX::ONNXRuntimeSvc" />
+
+</lcgdict>
diff --git a/Control/AthOnnxruntimeService/CMakeLists.txt b/Control/AthOnnxruntimeService/CMakeLists.txt
index ff2fce4cd97d..ae172540d4d5 100644
--- a/Control/AthOnnxruntimeService/CMakeLists.txt
+++ b/Control/AthOnnxruntimeService/CMakeLists.txt
@@ -8,16 +8,24 @@ find_package( onnxruntime )
# Component(s) in the package.
atlas_add_library( AthOnnxruntimeServiceLib
- AthOnnxruntimeService/*.h
+ AthOnnxruntimeService/*.h Root/*.cxx
INTERFACE
PUBLIC_HEADERS AthOnnxruntimeService
INCLUDE_DIRS ${ONNXRUNTIME_INCLUDE_DIRS}
- LINK_LIBRARIES ${ONNXRUNTIME_LIBRARIES} GaudiKernel )
+ LINK_LIBRARIES ${ONNXRUNTIME_LIBRARIES} AsgServicesLib)
-atlas_add_component( AthOnnxruntimeService
- src/*.h src/*.cxx src/components/*.cxx
- INCLUDE_DIRS ${ONNXRUNTIME_INCLUDE_DIRS}
- LINK_LIBRARIES ${ONNXRUNTIME_LIBRARIES} AthOnnxruntimeServiceLib AthenaBaseComps GaudiKernel)
+if (XAOD_STANDALONE)
+atlas_add_dictionary( AthOnnxruntimeServiceDict
+ AthOnnxruntimeService/AthOnnxruntimeServiceDict.h
+ AthOnnxruntimeService/selection.xml
+ LINK_LIBRARIES AthOnnxruntimeServiceLib )
+endif ()
+if (NOT XAOD_STANDALONE)
+ atlas_add_component( AthOnnxruntimeService
+ src/*.h src/*.cxx src/components/*.cxx
+ INCLUDE_DIRS ${ONNXRUNTIME_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ONNXRUNTIME_LIBRARIES} AthOnnxruntimeServiceLib AthenaBaseComps GaudiKernel AsgServicesLib)
+endif ()
diff --git a/Control/AthOnnxruntimeService/src/ONNXRuntimeSvc.cxx b/Control/AthOnnxruntimeService/Root/ONNXRuntimeSvc.cxx
similarity index 77%
rename from Control/AthOnnxruntimeService/src/ONNXRuntimeSvc.cxx
rename to Control/AthOnnxruntimeService/Root/ONNXRuntimeSvc.cxx
index accf5587f80a..6e37a9074ae9 100644
--- a/Control/AthOnnxruntimeService/src/ONNXRuntimeSvc.cxx
+++ b/Control/AthOnnxruntimeService/Root/ONNXRuntimeSvc.cxx
@@ -1,10 +1,14 @@
// Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
// Local include(s).
-#include "ONNXRuntimeSvc.h"
+#include "AthOnnxruntimeService/ONNXRuntimeSvc.h"
namespace AthONNX {
-
+ ONNXRuntimeSvc::ONNXRuntimeSvc(const std::string& name, ISvcLocator* svc) :
+ asg::AsgService(name, svc)
+ {
+ declareServiceInterface<AthONNX::IONNXRuntimeSvc>();
+ }
StatusCode ONNXRuntimeSvc::initialize() {
// Create the environment object.
diff --git a/Control/AthOnnxruntimeService/src/components/AthOnnxruntimeService_entries.cxx b/Control/AthOnnxruntimeService/src/components/AthOnnxruntimeService_entries.cxx
index a1fd2e2e7897..fcc3ac20e682 100644
--- a/Control/AthOnnxruntimeService/src/components/AthOnnxruntimeService_entries.cxx
+++ b/Control/AthOnnxruntimeService/src/components/AthOnnxruntimeService_entries.cxx
@@ -1,7 +1,7 @@
// Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
// Local include(s).
-#include "../ONNXRuntimeSvc.h"
+#include <AthOnnxruntimeService/ONNXRuntimeSvc.h>
// Declare the package's components.
DECLARE_COMPONENT( AthONNX::ONNXRuntimeSvc )
diff --git a/Projects/AnalysisBase/package_filters.txt b/Projects/AnalysisBase/package_filters.txt
index 728c4c36aca0..4fcc15eb4b1f 100644
--- a/Projects/AnalysisBase/package_filters.txt
+++ b/Projects/AnalysisBase/package_filters.txt
@@ -148,4 +148,9 @@
+ PhysicsAnalysis/TopPhys/xAOD/TopPartons
+ PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker
+#
+### Onnxruntime Service
+#
+
++ Control/AthOnnxruntimeService
- .*
diff --git a/Projects/AthAnalysis/package_filters.txt b/Projects/AthAnalysis/package_filters.txt
index 74f2c61796cb..a022a04e400d 100644
--- a/Projects/AthAnalysis/package_filters.txt
+++ b/Projects/AthAnalysis/package_filters.txt
@@ -211,5 +211,11 @@
+ DetectorDescription/Identifier
+ DetectorDescription/GeoModel/GeoModelInterfaces
+#
+### Onnxruntime Service
+#
+
++ Control/AthOnnxruntimeService
+
# Don't build anything else:
- .*
--
GitLab
From 86805a860a5ab28531a5524f040de18b5fbff6d8 Mon Sep 17 00:00:00 2001
From: Stylianos Angelidakis <stylianos.angelidakis@cern.ch>
Date: Tue, 24 Aug 2021 13:07:41 +0200
Subject: [PATCH 252/272] NSW bytestream decoders
---
.../MuonCnv/MuonByteStream/CMakeLists.txt | 2 +-
.../MuonByteStream/MM_RawDataProvider.h | 56 +++++
.../MuonByteStream/sTgcRawDataProvider.h | 51 ++++
.../MuonByteStream/src/MM_RawDataProvider.cxx | 81 ++++++
.../src/components/MuonByteStream_entries.cxx | 12 +-
.../src/sTgcRawDataProvider.cxx | 82 +++++++
.../python/MuonCnvExampleConfigDb.py | 8 +
.../MuonCnvExample/python/MuonReadBSConfig.py | 42 ++++
.../share/MuonReadBS_jobOptions.py | 14 +-
.../MuonCnv/MuonMM_CnvTools/CMakeLists.txt | 4 +-
.../MuonMM_CnvTools/IMM_ROD_Decoder.h | 38 +++
.../MuonMM_CnvTools/src/MM_ROD_Decoder.cxx | 120 +++++++++
.../MuonMM_CnvTools/src/MM_ROD_Decoder.h | 37 +++
.../src/MM_RawDataProviderToolCore.cxx | 52 ++++
.../src/MM_RawDataProviderToolCore.h | 59 +++++
.../src/MM_RawDataProviderToolMT.cxx | 126 ++++++++++
.../src/MM_RawDataProviderToolMT.h | 55 +++++
.../components/MuonMM_CnvTools_entries.cxx | 6 +-
.../MuonCnv/MuonSTGC_CnvTools/CMakeLists.txt | 2 +-
.../MuonSTGC_CnvTools/IPadTrig_ROD_Decoder.h | 25 ++
.../MuonSTGC_CnvTools/ISTGC_ROD_Decoder.h | 38 +++
.../src/PadTrig_ROD_Decoder.cxx | 231 ++++++++++++++++++
.../src/PadTrig_ROD_Decoder.h | 55 +++++
.../src/PadTrig_RawDataProviderTool.cxx | 37 +++
.../src/PadTrig_RawDataProviderTool.h | 29 +++
.../src/PadTrig_RawDataProviderToolMT.cxx | 104 ++++++++
.../src/PadTrig_RawDataProviderToolMT.h | 47 ++++
.../src/STGC_ROD_Decoder.cxx | 129 ++++++++++
.../MuonSTGC_CnvTools/src/STGC_ROD_Decoder.h | 34 +++
.../src/STGC_RawDataProviderToolCore.cxx | 50 ++++
.../src/STGC_RawDataProviderToolCore.h | 58 +++++
.../src/STGC_RawDataProviderToolMT.cxx | 125 ++++++++++
.../src/STGC_RawDataProviderToolMT.h | 54 ++++
.../components/MuonSTGC_CnvTools_entries.cxx | 10 +
.../python/MuonBytestreamDecodeConfig.py | 124 +++++++++-
35 files changed, 1979 insertions(+), 18 deletions(-)
create mode 100644 MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/MM_RawDataProvider.h
create mode 100644 MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/sTgcRawDataProvider.h
create mode 100644 MuonSpectrometer/MuonCnv/MuonByteStream/src/MM_RawDataProvider.cxx
create mode 100644 MuonSpectrometer/MuonCnv/MuonByteStream/src/sTgcRawDataProvider.cxx
create mode 100644 MuonSpectrometer/MuonCnv/MuonMM_CnvTools/MuonMM_CnvTools/IMM_ROD_Decoder.h
create mode 100644 MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MM_ROD_Decoder.cxx
create mode 100644 MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MM_ROD_Decoder.h
create mode 100644 MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MM_RawDataProviderToolCore.cxx
create mode 100644 MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MM_RawDataProviderToolCore.h
create mode 100644 MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MM_RawDataProviderToolMT.cxx
create mode 100644 MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MM_RawDataProviderToolMT.h
create mode 100644 MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/MuonSTGC_CnvTools/IPadTrig_ROD_Decoder.h
create mode 100644 MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/MuonSTGC_CnvTools/ISTGC_ROD_Decoder.h
create mode 100644 MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/PadTrig_ROD_Decoder.cxx
create mode 100644 MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/PadTrig_ROD_Decoder.h
create mode 100644 MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/PadTrig_RawDataProviderTool.cxx
create mode 100644 MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/PadTrig_RawDataProviderTool.h
create mode 100644 MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/PadTrig_RawDataProviderToolMT.cxx
create mode 100644 MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/PadTrig_RawDataProviderToolMT.h
create mode 100644 MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/STGC_ROD_Decoder.cxx
create mode 100644 MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/STGC_ROD_Decoder.h
create mode 100644 MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/STGC_RawDataProviderToolCore.cxx
create mode 100644 MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/STGC_RawDataProviderToolCore.h
create mode 100644 MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/STGC_RawDataProviderToolMT.cxx
create mode 100644 MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/STGC_RawDataProviderToolMT.h
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/CMakeLists.txt b/MuonSpectrometer/MuonCnv/MuonByteStream/CMakeLists.txt
index 9251acf7a7a2..eeaa1d1fdf38 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStream/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/CMakeLists.txt
@@ -15,7 +15,7 @@ atlas_add_component( MuonByteStream
src/components/*.cxx
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test GaudiKernel StoreGateLib AthenaPoolUtilities CSCcablingLib MuonIdHelpersLib MuonRDO TrigSteeringEvent AthViews MuonMDT_CnvToolsLib MuonCSC_CnvToolsLib MuonRPC_CnvToolsLib MuonCnvToolInterfacesLib ViewAlgsLib MuonAlignmentData )
+ LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test GaudiKernel StoreGateLib AthenaPoolUtilities CSCcablingLib MuonIdHelpersLib MuonRDO TrigSteeringEvent AthViews MuonMDT_CnvToolsLib MuonCSC_CnvToolsLib MuonRPC_CnvToolsLib MuonSTGC_CnvToolsLib MuonCnvToolInterfacesLib ViewAlgsLib MuonAlignmentData )
# Install files from the package:
atlas_install_headers( MuonByteStream )
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/MM_RawDataProvider.h b/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/MM_RawDataProvider.h
new file mode 100644
index 000000000000..1dcad8602153
--- /dev/null
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/MM_RawDataProvider.h
@@ -0,0 +1,56 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONBYTESTREAM_MM_RAWDATAPROVIDER_H
+#define MUONBYTESTREAM_MM_RAWDATAPROVIDER_H
+
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
+#include "GaudiKernel/ServiceHandle.h"
+#include "GaudiKernel/ToolHandle.h"
+
+#include "IRegionSelector/IRegSelTool.h"
+#include "TrigSteeringEvent/TrigRoiDescriptor.h"
+#include "AthenaPoolUtilities/CondAttrListCollection.h"
+#include "MuonCnvToolInterfaces/IMuonRawDataProviderTool.h"
+
+namespace Muon {
+
+class MM_RawDataProvider : public AthReentrantAlgorithm
+{
+public:
+
+ //! Constructor.
+ MM_RawDataProvider(const std::string &name, ISvcLocator *pSvcLocator);
+
+ //! Initialize
+ virtual StatusCode initialize() override;
+
+ //! Execute
+ virtual StatusCode execute(const EventContext& ctx) const override;
+
+ //! Destructur
+ ~MM_RawDataProvider() = default;
+
+
+private:
+ /// Tool handle for raw data provider tool
+ ToolHandle<Muon::IMuonRawDataProviderTool> m_rawDataTool{this, "ProviderTool", "Muon::MM_RawDataProviderToolMT/MmRawDataProviderTool"};
+
+ /// Handle for region selector service
+ ToolHandle<IRegSelTool> m_regsel_mm{this, "RegionSelectionTool", "RegSelTool/RegSelTool_MM", "MM Region Selector Tool"};
+
+ /// Property to decide whether or not to do RoI based decoding
+ Gaudi::Property< bool > m_seededDecoding { this, "DoSeededDecoding", false, "If true do decoding in RoIs"};
+
+ /// ReadHandle for the input RoIs
+ SG::ReadHandleKey<TrigRoiDescriptorCollection> m_roiCollectionKey{ this, "RoIs", "OutputRoIs", "Name of RoI collection to read in" };
+
+
+};
+} // ns end
+
+#endif
+
+
+
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/sTgcRawDataProvider.h b/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/sTgcRawDataProvider.h
new file mode 100644
index 000000000000..9f4a6adb87db
--- /dev/null
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/MuonByteStream/sTgcRawDataProvider.h
@@ -0,0 +1,51 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONBYTESTREAM_STGCRAWDATAPROVIDER_H
+#define MUONBYTESTREAM_STGCRAWDATAPROVIDER_H
+
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
+#include "GaudiKernel/ToolHandle.h"
+
+#include "IRegionSelector/IRegSelTool.h"
+#include "TrigSteeringEvent/TrigRoiDescriptor.h"
+#include "MuonCnvToolInterfaces/IMuonRawDataProviderTool.h"
+
+namespace Muon
+{
+ class sTgcRawDataProvider : public AthReentrantAlgorithm
+ {
+ public:
+ //! Constructor.
+ sTgcRawDataProvider(const std::string &name, ISvcLocator *pSvcLocator);
+
+ //! Initialize
+ virtual StatusCode initialize() override;
+
+ //! Execute
+ virtual StatusCode execute(const EventContext& ctx) const override;
+
+ //! Destructor
+ ~sTgcRawDataProvider( ) =default;
+
+ private:
+
+ /// Handle for the RawDataProviderTool
+ ToolHandle<Muon::IMuonRawDataProviderTool> m_rawDataTool{this, "ProviderTool", "Muon::STGC_RawDataProviderToolMT/sTgcRawDataProviderTool"};
+
+ /// Handle for region selector service
+ ToolHandle<IRegSelTool> m_regsel_stgc{this, "RegionSelectionTool", "RegSelTool/RegSelTool_STGC", "sTGC Region Selector Tool"};
+
+ /// Property to decide whether or not to do RoI based decoding
+ Gaudi::Property< bool > m_seededDecoding { this, "DoSeededDecoding", false, "If true do decoding in RoIs"};
+
+ /// ReadHandle for the input RoIs
+ SG::ReadHandleKey<TrigRoiDescriptorCollection> m_roiCollectionKey{ this, "RoIs", "OutputRoIs", "Name of RoI collection to read in" };
+ };
+} // namespace end
+
+#endif
+
+
+
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/src/MM_RawDataProvider.cxx b/MuonSpectrometer/MuonCnv/MuonByteStream/src/MM_RawDataProvider.cxx
new file mode 100644
index 000000000000..0d92ae7978bf
--- /dev/null
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/src/MM_RawDataProvider.cxx
@@ -0,0 +1,81 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "MuonByteStream/MM_RawDataProvider.h"
+
+//===============================================================================================
+Muon::MM_RawDataProvider::MM_RawDataProvider(const std::string& name,ISvcLocator* pSvcLocator)
+: AthReentrantAlgorithm(name, pSvcLocator)
+{ }
+
+
+//===============================================================================================
+StatusCode Muon::MM_RawDataProvider::initialize()
+{
+
+ ATH_MSG_INFO( "MM_RawDataProvider::initialize" );
+ ATH_MSG_INFO( m_seededDecoding );
+
+ ATH_CHECK( m_rawDataTool.retrieve() );
+ ATH_CHECK( m_roiCollectionKey.initialize(m_seededDecoding) ); // mark the RoI-collection flag as used or not used
+
+ if (m_seededDecoding) {
+ if (m_regsel_mm.retrieve().isFailure()) { // in RoI - seeded mode, retrieve the region selector
+ ATH_MSG_FATAL("Unable to retrieve RegionSelector Tool");
+ return StatusCode::FAILURE;
+ }
+ } else {
+ m_regsel_mm.disable();
+ }
+
+ return StatusCode::SUCCESS;
+}
+
+//===============================================================================================
+StatusCode Muon::MM_RawDataProvider::execute(const EventContext& ctx) const
+{
+ // The hash IDs corresponding to each ROI (in seeded mode) have module-level granularity, not sector level.
+ // Therefore, we pass the list of hash IDs to the decoder to make the selection based on decoded elink info.
+
+ ATH_MSG_VERBOSE( "MM_RawDataProvider::execute" );
+
+ if(m_seededDecoding) {
+
+ ATH_MSG_DEBUG("converting MM BS into RDOs in ROI-seeded mode");
+
+ // read the RoIs to process
+ SG::ReadHandle<TrigRoiDescriptorCollection> muonRoI(m_roiCollectionKey, ctx);
+ if(!muonRoI.isValid()) {
+ ATH_MSG_FATAL("Cannot retrieve muonRoI "<<m_roiCollectionKey.key());
+ return StatusCode::FAILURE;
+ }
+
+ // get list of offline hash IDs (module context) from region selection,
+ // using an unordered_set to make sure that hash ID entries are unique
+ std::vector<IdentifierHash> mm_hash_ids;
+ std::unordered_set<IdentifierHash> mm_hash_ids_set;
+ for(auto roi : *muonRoI) {
+ ATH_MSG_DEBUG("Getting ROBs for RoI " << *roi);
+ m_regsel_mm->HashIDList(*roi, mm_hash_ids);
+ for (IdentifierHash& hash : mm_hash_ids) mm_hash_ids_set.insert(hash);
+ mm_hash_ids.clear();
+ }
+
+ // put the IDs back in the vector and decode
+ mm_hash_ids.insert(mm_hash_ids.end(), mm_hash_ids_set.begin(), mm_hash_ids_set.end());
+ if (!m_rawDataTool->convert(mm_hash_ids, ctx).isSuccess()) {
+ ATH_MSG_FATAL("MM BS conversion into RDOs failed");
+ return StatusCode::FAILURE;
+ }
+
+ } else {
+ ATH_MSG_DEBUG("converting MM BS into RDOs in unseeded mode");
+ if (!m_rawDataTool->convert(ctx).isSuccess()) {
+ ATH_MSG_FATAL("MM BS conversion into RDOs failed");
+ return StatusCode::FAILURE;
+ }
+ }
+
+ return StatusCode::SUCCESS;
+}
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/src/components/MuonByteStream_entries.cxx b/MuonSpectrometer/MuonCnv/MuonByteStream/src/components/MuonByteStream_entries.cxx
index 3e5c68804400..457f117e0d5e 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStream/src/components/MuonByteStream_entries.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/src/components/MuonByteStream_entries.cxx
@@ -2,16 +2,20 @@
#include "MuonByteStream/RpcRawDataProvider.h"
#include "MuonByteStream/TgcRawDataProvider.h"
#include "MuonByteStream/CscRawDataProvider.h"
+#include "MuonByteStream/MM_RawDataProvider.h"
+#include "MuonByteStream/sTgcRawDataProvider.h"
#include "MuonByteStream/MdtCsmContByteStreamCnv.h"
#include "MuonByteStream/CscRdoContByteStreamCnv.h"
#include "MuonByteStream/RpcPadContByteStreamCnv.h"
#include "MuonByteStream/TgcRdoContByteStreamCnv.h"
#include "../MuonCacheCreator.h"
-DECLARE_COMPONENT( Muon::MdtRawDataProvider )
-DECLARE_COMPONENT( Muon::RpcRawDataProvider )
-DECLARE_COMPONENT( Muon::TgcRawDataProvider )
-DECLARE_COMPONENT( Muon::CscRawDataProvider )
+DECLARE_COMPONENT( Muon::MdtRawDataProvider )
+DECLARE_COMPONENT( Muon::RpcRawDataProvider )
+DECLARE_COMPONENT( Muon::TgcRawDataProvider )
+DECLARE_COMPONENT( Muon::CscRawDataProvider )
+DECLARE_COMPONENT( Muon::sTgcRawDataProvider )
+DECLARE_COMPONENT( Muon::MM_RawDataProvider )
DECLARE_CONVERTER( MdtCsmContByteStreamCnv )
DECLARE_CONVERTER( CscRdoContByteStreamCnv )
DECLARE_CONVERTER( RpcPadContByteStreamCnv )
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/src/sTgcRawDataProvider.cxx b/MuonSpectrometer/MuonCnv/MuonByteStream/src/sTgcRawDataProvider.cxx
new file mode 100644
index 000000000000..ab4cf4490f63
--- /dev/null
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/src/sTgcRawDataProvider.cxx
@@ -0,0 +1,82 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "MuonByteStream/sTgcRawDataProvider.h"
+
+//=====================================================================
+Muon::sTgcRawDataProvider::sTgcRawDataProvider(const std::string& name, ISvcLocator* pSvcLocator)
+: AthReentrantAlgorithm(name, pSvcLocator)
+{ }
+
+
+//=====================================================================
+StatusCode Muon::sTgcRawDataProvider::initialize()
+{
+ ATH_MSG_INFO("sTgcRawDataProvider::initialize");
+ ATH_MSG_INFO(m_seededDecoding);
+
+ ATH_CHECK(m_rawDataTool.retrieve());
+ ATH_CHECK(m_roiCollectionKey.initialize(m_seededDecoding)); // mark the RoI-collection flag as used or not used
+
+ if(m_seededDecoding) {
+ if (m_regsel_stgc.retrieve().isFailure()) { // in RoI - seeded mode, retrieve the region selector
+ ATH_MSG_FATAL("Unable to retrieve RegionSelector Tool");
+ return StatusCode::FAILURE;
+ }
+ } else {
+ m_regsel_stgc.disable();
+ }
+
+ return StatusCode::SUCCESS;
+}
+
+
+//=====================================================================
+StatusCode Muon::sTgcRawDataProvider::execute(const EventContext& ctx) const
+{
+ // This method is substantially different than the one for TGCs because the hash IDs
+ // corresponding to each ROI (in seeded mode) have quadruplet-level granularity (module=quadruplet).
+ // Thus, ROB-level selection is not enough; we need quadruplet-level selection. Therefore,
+ // we pass the list of hash IDs to the decoder to make the selection based on decoded elink info.
+
+ ATH_MSG_VERBOSE("sTgcRawDataProvider::execute");
+
+ if(m_seededDecoding) { // RoI - seeded mode
+
+ ATH_MSG_DEBUG("converting sTGC BS into RDOs in ROI-seeded mode");
+
+ // get the RoIs to process
+ SG::ReadHandle<TrigRoiDescriptorCollection> muonRoI(m_roiCollectionKey, ctx);
+ if(!muonRoI.isValid()){
+ ATH_MSG_FATAL("Cannot retrieve muonRoI "<<m_roiCollectionKey.key());
+ return StatusCode::FAILURE;
+ }
+
+ // get list of offline hash IDs (module context i.e. STGC quadruplets) from region selection
+ // using an unordered_set to make sure each hash ID entry is unique
+ std::vector<IdentifierHash> stgc_hash_ids;
+ std::unordered_set<IdentifierHash> stgc_hash_ids_set;
+ for(auto roi : *muonRoI) {
+ ATH_MSG_DEBUG("Getting ROBs for RoI " << *roi);
+ m_regsel_stgc->HashIDList(*roi, stgc_hash_ids);
+ for (IdentifierHash& hash : stgc_hash_ids) stgc_hash_ids_set.insert(hash);
+ stgc_hash_ids.clear();
+ }
+
+ // put the IDs back in the vector and decode
+ stgc_hash_ids.insert(stgc_hash_ids.end(), stgc_hash_ids_set.begin(), stgc_hash_ids_set.end());
+ if (!m_rawDataTool->convert(stgc_hash_ids, ctx).isSuccess()) {
+ ATH_MSG_FATAL("STGC BS conversion into RDOs failed");
+ return StatusCode::FAILURE;
+ }
+ } else {
+ ATH_MSG_DEBUG("converting sTGC BS into RDOs in unseeded mode");
+ if (!m_rawDataTool->convert(ctx).isSuccess()) {
+ ATH_MSG_FATAL("STGC BS conversion into RDOs failed");
+ return StatusCode::FAILURE;
+ }
+ }
+
+ return StatusCode::SUCCESS;
+}
diff --git a/MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonCnvExampleConfigDb.py b/MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonCnvExampleConfigDb.py
index 82a7cbd101a8..e20a8264a134 100644
--- a/MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonCnvExampleConfigDb.py
+++ b/MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonCnvExampleConfigDb.py
@@ -2,6 +2,7 @@
from AthenaCommon.CfgGetter import addTool, addService, addAlgorithm
+
################################################################################
# Standard BS algorithms
################################################################################
@@ -21,6 +22,13 @@ addTool( "MuonCnvExample.MuonReadBSConfig.CscROD_Decoder", "CscROD_Decod
addTool( "MuonCnvExample.MuonReadBSConfig.CscRawDataProviderTool", "CscRawDataProviderTool" )
addAlgorithm("Muon::CscRawDataProvider", "MuonCscRawDataProvider" )
+addTool( "MuonCnvExample.MuonReadBSConfig.MmROD_Decoder", "MmROD_Decoder" )
+addTool( "MuonCnvExample.MuonReadBSConfig.MmRawDataProviderTool", "MmRawDataProviderTool" )
+addAlgorithm( "Muon::MM_RawDataProvider", "MuonMmRawDataProvider" )
+
+addTool( "MuonCnvExample.MuonReadBSConfig.sTgcROD_Decoder", "sTgcROD_Decoder" )
+addTool( "MuonCnvExample.MuonReadBSConfig.sTgcRawDataProviderTool", "sTgcRawDataProviderTool" )
+addAlgorithm("Muon::sTgcRawDataProvider", "MuonsTgcRawDataProvider" )
################################################################################
# Tools/algorithms/services from MuonCnvExample.MuonCalibConfig
diff --git a/MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonReadBSConfig.py b/MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonReadBSConfig.py
index c74325471414..988f76fc23e0 100644
--- a/MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonReadBSConfig.py
+++ b/MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonReadBSConfig.py
@@ -84,7 +84,39 @@ def CscRawDataProviderTool(name = "CscRawDataProviderTool",**kwargs):
else:
kwargs.setdefault("RdoLocation", overlayFlags.dataStore()+"+CSCRDO")
return CfgMgr.Muon__CSC_RawDataProviderToolMT(name,**kwargs)
+
+#================================================================================
+# MM Bytestream reading setup
+#================================================================================
+
+def MmROD_Decoder(name="MmROD_Decoder",**kwargs):
+ return CfgMgr.Muon__MM_ROD_Decoder(name,**kwargs)
+
+def MmRawDataProviderTool(name="MmRawDataProviderTool",**kwargs):
+ kwargs.setdefault("Decoder", "MmROD_Decoder")
+ if DetFlags.overlay.Micromegas_on() and overlayFlags.isDataOverlay():
+ if overlayFlags.isOverlayMT():
+ kwargs.setdefault("RdoLocation", overlayFlags.bkgPrefix() + "MMRDO")
+ else:
+ kwargs.setdefault("RdoLocation", overlayFlags.dataStore() + "+MMRDO")
+ return CfgMgr.Muon__MM_RawDataProviderToolMT(name,**kwargs)
+#================================================================================
+# sTGC Bytestream reading setup
+#================================================================================
+
+def sTgcROD_Decoder(name = "sTgcROD_Decoder",**kwargs):
+ return CfgMgr.Muon__STGC_ROD_Decoder(name,**kwargs)
+
+
+def sTgcRawDataProviderTool(name = "sTgcRawDataProviderTool",**kwargs):
+ kwargs.setdefault("Decoder", "sTgcROD_Decoder")
+ if DetFlags.overlay.sTGC_on() and overlayFlags.isDataOverlay():
+ if overlayFlags.isOverlayMT():
+ kwargs.setdefault("RdoLocation", overlayFlags.bkgPrefix()+"sTGCRDO")
+ else:
+ kwargs.setdefault("RdoLocation", overlayFlags.dataStore()+"+sTGCRDO")
+ return CfgMgr.Muon__STGC_RawDataProviderToolMT(name,**kwargs)
#
# For backwards compat - TO BE REMOVED as soon as all clients get these tools via AthenaCommon.CfgGetter
@@ -109,3 +141,13 @@ if DetFlags.readRDOBS.CSC_on():
MuonCscRawDataProviderTool = getPublicTool("CscRawDataProviderTool")
else:
MuonCscRawDataProviderTool = None
+
+if DetFlags.readRDOBS.Micromegas_on():
+ MuonMmRawDataProviderTool = getPublicTool("MmRawDataProviderTool")
+else:
+ MuonMmRawDataProviderTool = None
+
+if DetFlags.readRDOBS.sTGC_on():
+ MuonsTgcRawDataProviderTool = getPublicTool("sTgcRawDataProviderTool")
+else:
+ MuonsTgcRawDataProviderTool = None
diff --git a/MuonSpectrometer/MuonCnv/MuonCnvExample/share/MuonReadBS_jobOptions.py b/MuonSpectrometer/MuonCnv/MuonCnvExample/share/MuonReadBS_jobOptions.py
index d25aa7276b94..1aeae17c3137 100644
--- a/MuonSpectrometer/MuonCnv/MuonCnvExample/share/MuonReadBS_jobOptions.py
+++ b/MuonSpectrometer/MuonCnv/MuonCnvExample/share/MuonReadBS_jobOptions.py
@@ -13,6 +13,7 @@ include.block("MuonCnvExample/MuonReadBS_jobOptions.py")
from AthenaCommon.DetFlags import DetFlags
from AthenaCommon.CfgGetter import getAlgorithm
from MuonRecExample.MuonRecFlags import muonRecFlags
+from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags
# ================= MDT ===========================
if DetFlags.readRDOBS.MDT_on() and muonRecFlags.makePRDs():
@@ -27,5 +28,14 @@ if DetFlags.readRDOBS.TGC_on() and muonRecFlags.makePRDs():
topSequence += getAlgorithm("MuonTgcRawDataProvider")
# ================= CSC ===========================
-if DetFlags.readRDOBS.CSC_on() and muonRecFlags.makePRDs():
- topSequence += getAlgorithm("MuonCscRawDataProvider")
+if MuonGeometryFlags.hasCSC():
+ if DetFlags.readRDOBS.CSC_on() and muonRecFlags.makePRDs():
+ topSequence += getAlgorithm("MuonCscRawDataProvider")
+
+# ================= NSW ===========================
+if (MuonGeometryFlags.hasSTGC() and MuonGeometryFlags.hasMM()):
+ if DetFlags.readRDOBS.Micromegas_on() and muonRecFlags.makePRDs():
+ topSequence += getAlgorithm("MuonMmRawDataProvider")
+
+ if DetFlags.readRDOBS.sTGC_on() and muonRecFlags.makePRDs():
+ topSequence += getAlgorithm("MuonsTgcRawDataProvider")
diff --git a/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/CMakeLists.txt b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/CMakeLists.txt
index 95cbf382ad3c..af52c2d3b7ff 100644
--- a/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/CMakeLists.txt
@@ -12,12 +12,12 @@ atlas_add_library( MuonMM_CnvToolsLib
MuonMM_CnvTools/*.h
INTERFACE
PUBLIC_HEADERS MuonMM_CnvTools
- LINK_LIBRARIES GaudiKernel )
+ LINK_LIBRARIES GaudiKernel)
# Component(s) in the package:
atlas_add_component( MuonMM_CnvTools
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ByteStreamData ByteStreamData_test GaudiKernel AthenaBaseComps SGTools StoreGateLib AtlasDetDescr Identifier ByteStreamCnvSvcBaseLib MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonRDO MuonPrepRawData MMClusterizationLib NSWCalibToolsLib MuonCnvToolInterfacesLib MuonMM_CnvToolsLib CxxUtils )
+ LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test GaudiKernel AthenaBaseComps SGTools StoreGateLib SGtests AtlasDetDescr Identifier EventPrimitives MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonNSWCommonDecode MuonRDO MuonPrepRawData MMClusterizationLib NSWCalibToolsLib MuonCnvToolInterfacesLib MuonMM_CnvToolsLib )
diff --git a/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/MuonMM_CnvTools/IMM_ROD_Decoder.h b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/MuonMM_CnvTools/IMM_ROD_Decoder.h
new file mode 100644
index 000000000000..ec74c3a6a036
--- /dev/null
+++ b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/MuonMM_CnvTools/IMM_ROD_Decoder.h
@@ -0,0 +1,38 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+///////////////////////////////////////////////////////////////////
+// IMM_ROD_Decoder.h, (c) ATLAS Detector software
+///////////////////////////////////////////////////////////////////
+#ifndef MUONMM_CNVTOOLS_IMUONMM_ROD_DECODER_H
+#define MUONMM_CNVTOOLS_IMUONMM_ROD_DECODER_H
+
+#include "GaudiKernel/IAlgTool.h"
+#include "ByteStreamData/RawEvent.h"
+
+namespace Muon
+{
+ class MM_RawDataContainer;
+
+ static const InterfaceID IID_IMM_ROD_Decoder("Muon::IMM_ROD_Decoder", 1, 0);
+
+ /** @class IMM_ROD_Decoder, based on the respective class for TGCs.
+ * The interface for AlgTool which decodes an MM ROB fragment into MM RDO.
+ * @author Stelios Angelidakis <sangelid@cern.ch>
+ */
+
+ class IMM_ROD_Decoder : virtual public IAlgTool
+ {
+ public:
+ /** Provide interface ID of IMM_ROD_Decoder */
+ static const InterfaceID& interfaceID() { return IID_IMM_ROD_Decoder; }
+
+ /** Convert ROBFragments to RDOs */
+ virtual StatusCode fillCollection(const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment&, const std::vector<IdentifierHash>&, MM_RawDataContainer&) const = 0;
+ };
+
+} // end of namespace
+
+#endif // MUONMM_CNVTOOLS_IMUONMM_ROD_DECODER_H
+
diff --git a/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MM_ROD_Decoder.cxx b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MM_ROD_Decoder.cxx
new file mode 100644
index 000000000000..1bba00867838
--- /dev/null
+++ b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MM_ROD_Decoder.cxx
@@ -0,0 +1,120 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include <memory>
+#include <unordered_map>
+
+#include "MuonRDO/MM_RawDataContainer.h"
+#include "MuonIdHelpers/MmIdHelper.h"
+
+#include "MuonNSWCommonDecode/NSWCommonDecoder.h"
+#include "MuonNSWCommonDecode/NSWElink.h"
+#include "MuonNSWCommonDecode/VMMChannel.h"
+#include "MuonNSWCommonDecode/NSWResourceId.h"
+
+#include "Identifier/IdentifierHash.h"
+#include "eformat/Issue.h"
+#include "MM_ROD_Decoder.h"
+
+//===============================================================================
+Muon::MM_ROD_Decoder::MM_ROD_Decoder( const std::string& type, const std::string& name,const IInterface* parent )
+: AthAlgTool(type, name, parent)
+{
+ declareInterface<IMM_ROD_Decoder>( this );
+}
+
+
+//===============================================================================
+StatusCode Muon::MM_ROD_Decoder::initialize()
+{
+ ATH_CHECK(detStore()->retrieve(m_MmIdHelper, "MMIDHELPER"));
+ return StatusCode::SUCCESS;
+}
+
+
+//===============================================================================
+// Processes a ROB fragment and fills the RDO container.
+// If the vector of IdentifierHashes is not empty, then seeded mode is assumed
+// (only requested modules are decoded). This must be made here, because the
+// trigger granularity is a module, whereas ROB granularity is a whole sector.
+// Therefore, refined selection is needed with decoded information.
+StatusCode Muon::MM_ROD_Decoder::fillCollection(const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment& robFrag, const std::vector<IdentifierHash>& rdoIdhVect, MM_RawDataContainer& rdoIdc) const
+{
+ // check fragment for errors
+ try {
+ robFrag.check();
+ } catch (eformat::Issue &ex) {
+ ATH_MSG_WARNING(ex.what());
+ return StatusCode::SUCCESS;
+ }
+
+ // if the vector of hashes is not empty, then we are in seeded mode
+ bool seeded_mode(!rdoIdhVect.empty());
+
+ // have the NSWCommonDecoder take care of the decoding
+ Muon::nsw::NSWCommonDecoder common_decoder(robFrag);
+ const std::vector<Muon::nsw::NSWElink *> elinks = common_decoder.get_elinks();
+ ATH_MSG_DEBUG("Retrieved "<<elinks.size()<<" elinks");
+ if (!elinks.size()) return StatusCode::SUCCESS;
+
+ // temporary storage of the individual RDOs corresponding to this ROB
+ // (expecting to have one per module).
+ std::unordered_map<IdentifierHash, std::unique_ptr<MM_RawDataCollection>> rdo_map;
+
+ // loop on elinks. we need an RDO (collection) per quadruplet!
+ for (auto* elink : elinks) {
+
+ // get the offline ID hash (module ctx) to be passed to the RDO
+ // also specifies the index of the RDO in the container.
+ bool is_validID(false);
+ const char* station_name = elink->elinkId()->is_large_station() ? "MML" : "MMS";
+ int station_eta = (int)elink->elinkId()->station_eta();
+ unsigned int station_phi = (unsigned int)elink->elinkId()->station_phi();
+ unsigned int multi_layer = (unsigned int)elink->elinkId()->multi_layer();
+ unsigned int gas_gap = (unsigned int)elink->elinkId()->gas_gap();
+ Identifier module_ID = m_MmIdHelper->elementID(station_name, station_eta, station_phi, true, &is_validID);
+
+ if (!is_validID) { ATH_MSG_ERROR("Invalid identifier created for MM station"); continue; }
+
+ IdentifierHash module_hashID;
+ m_MmIdHelper->get_module_hash(module_ID, module_hashID);
+
+ // if we are in ROI-seeded mode, check if this hashID is requested
+ if (seeded_mode && std::find(rdoIdhVect.begin(), rdoIdhVect.end(), module_hashID) == rdoIdhVect.end()) continue;
+
+ // get the RDO... RDO hash IDs should not repeat for different ROBs,
+ // but may repeat for the different elinks of a single ROB.
+ // To handle possible repetition, we temporarily store them in an STL map.
+ if (rdoIdc.indexFindPtr(module_hashID)) {
+ ATH_MSG_WARNING("Collection with hashID "<<module_hashID<<" already exists in the identifiable container. Skipping this elink.\n");
+ continue;
+ }
+
+ if (!rdo_map[module_hashID]) rdo_map[module_hashID] = std::make_unique<MM_RawDataCollection>(module_hashID);
+ MM_RawDataCollection* rdo = rdo_map[module_hashID].get();
+
+ // loop on all channels of this elink to fill the collection
+ const std::vector<Muon::nsw::VMMChannel *>& channels = elink->get_channels();
+ for (auto channel : channels) {
+ unsigned int channel_number = channel->channel_number();
+ if (channel_number == 0) continue; // skip disconnected vmm channels
+ Identifier channel_ID = m_MmIdHelper->channelID(module_ID, multi_layer, gas_gap, channel_number, true, &is_validID);
+ if (!is_validID) { ATH_MSG_ERROR("Invalid identifier created for MM channel"); continue; }
+
+ rdo->push_back(new MM_RawData(channel_ID, channel_number, channel->tdo(), channel->pdo())); // isDead = false (ok?)
+ }
+ }
+
+ // add the RDO collections created from the data of this ROB into the identifiable container
+ for (auto& pair : rdo_map) {
+ if (pair.second->size() && !rdoIdc.addCollection(pair.second.release(), pair.first).isSuccess()) {
+ ATH_MSG_ERROR("Failed to add STGC RDO into the identifiable container");
+ }
+ }
+
+ rdo_map.clear();
+
+ return StatusCode::SUCCESS;
+}
+
diff --git a/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MM_ROD_Decoder.h b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MM_ROD_Decoder.h
new file mode 100644
index 000000000000..099051782a26
--- /dev/null
+++ b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MM_ROD_Decoder.h
@@ -0,0 +1,37 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONBYTESTREAM_MM_ROD_DECODER_H
+#define MUONBYTESTREAM_MM_ROD_DECODER_H
+
+#include <string>
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "MuonMM_CnvTools/IMM_ROD_Decoder.h"
+
+class MmIdHelper;
+
+namespace Muon
+{
+
+class MM_RawData;
+class MM_RawDataCollection;
+
+class MM_ROD_Decoder : virtual public IMM_ROD_Decoder, public AthAlgTool
+{
+ public:
+ MM_ROD_Decoder(const std::string& type, const std::string& name, const IInterface* parent ) ;
+ virtual ~MM_ROD_Decoder() = default;
+ virtual StatusCode initialize() override;
+ virtual StatusCode fillCollection(const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment&, const std::vector<IdentifierHash>&, MM_RawDataContainer&) const override;
+
+ protected:
+ const MmIdHelper* m_MmIdHelper;
+};
+
+}
+
+#endif
+
+
+
diff --git a/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MM_RawDataProviderToolCore.cxx b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MM_RawDataProviderToolCore.cxx
new file mode 100644
index 000000000000..aec063f7e244
--- /dev/null
+++ b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MM_RawDataProviderToolCore.cxx
@@ -0,0 +1,52 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include <atomic>
+#include "MM_RawDataProviderToolCore.h"
+using OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment;
+
+//================ Constructor =================================================
+
+Muon::MM_RawDataProviderToolCore::MM_RawDataProviderToolCore(const std::string& t, const std::string& n, const IInterface* p)
+: AthAlgTool(t, n, p)
+, m_robDataProvider("ROBDataProviderSvc",n)
+{ }
+
+//================ Initialisation ==============================================
+StatusCode Muon::MM_RawDataProviderToolCore::initialize()
+{
+ ATH_CHECK(AthAlgTool::initialize());
+ ATH_CHECK(m_idHelperSvc.retrieve());
+ ATH_CHECK(m_decoder.retrieve());
+ ATH_CHECK(m_robDataProvider.retrieve());
+ ATH_CHECK(m_rdoContainerKey.initialize());
+
+ m_maxhashtoUse = m_idHelperSvc->mmIdHelper().module_hash_max();
+
+ return StatusCode::SUCCESS;
+}
+
+//==============================================================================
+StatusCode Muon::MM_RawDataProviderToolCore::convertIntoContainer(const std::vector<const ROBFragment*>& vecRobs, const std::vector<IdentifierHash>& rdoIdhVect, MM_RawDataContainer& mmRdoContainer) const
+{
+ // Loop on the passed ROB fragments, and call the decoder for each one to fill the RDO container.
+
+ static std::atomic_int DecodeErrCount{0};
+
+ for (const ROBFragment* fragment : vecRobs) {
+ if (m_decoder->fillCollection(*fragment, rdoIdhVect, mmRdoContainer).isFailure()) {
+ if (DecodeErrCount < 100) {
+ ATH_MSG_INFO( "Problem with MM ByteStream Decoding!" );
+ ++DecodeErrCount;
+ } else if (DecodeErrCount == 100) {
+ ATH_MSG_INFO( "Too many Problems with MM Bytestream Decoding messages. Turning messaging off." );
+ ++DecodeErrCount;
+ }
+ }
+ }
+
+ ATH_MSG_DEBUG("Size of mmRdoContainer is " << mmRdoContainer.size());
+ return StatusCode::SUCCESS;
+}
+
diff --git a/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MM_RawDataProviderToolCore.h b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MM_RawDataProviderToolCore.h
new file mode 100644
index 000000000000..b95fe2b9341b
--- /dev/null
+++ b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MM_RawDataProviderToolCore.h
@@ -0,0 +1,59 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONMM_CNVTOOLS_MM_RAWDATAPROVIDERTOOLCORE_H
+#define MUONMM_CNVTOOLS_MM_RAWDATAPROVIDERTOOLCORE_H
+
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "GaudiKernel/ServiceHandle.h"
+#include "GaudiKernel/ToolHandle.h"
+#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
+#include "MuonIdHelpers/IMuonIdHelperSvc.h"
+#include "MuonMM_CnvTools/IMM_ROD_Decoder.h"
+
+#include "MuonRDO/MM_RawDataContainer.h"
+
+namespace Muon {
+
+ /** @class MM_RawDataProviderToolCore
+ * A tool to decode MM ROB fragments into MM RDO (based on the sTGC tool).
+ * @author Leonidas Fountas <leonidas.fountas@cern.ch>
+ */
+
+ class MM_RawDataProviderToolCore : public AthAlgTool
+ {
+ public:
+ /** Default constructor */
+ MM_RawDataProviderToolCore(const std::string& t, const std::string& n, const IInterface* p);
+
+ /** Default destructor */
+ virtual ~MM_RawDataProviderToolCore() = default;
+
+ /** Standard AlgTool method */
+ virtual StatusCode initialize() override;
+
+ /** Method that converts the ROBFragments into the passed container */
+ virtual StatusCode convertIntoContainer(const std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>&,
+ const std::vector<IdentifierHash>&, MM_RawDataContainer&) const;
+
+ protected:
+
+ /** The ID helper */
+ ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
+
+ /** Decoder for ROB fragment RDO conversion */
+ ToolHandle<IMM_ROD_Decoder> m_decoder{this, "Decoder", "Muon::MmROD_Decoder/MmROD_Decoder"};
+
+ /** RDO container key */
+ SG::WriteHandleKey<MM_RawDataContainer> m_rdoContainerKey{ this, "RdoLocation", "MMRDO", "Name of the MMRDO produced by RawDataProvider"}; //MT
+
+ unsigned int m_maxhashtoUse{0}; //MT
+
+ /** Rob Data Provider handle */
+ ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
+ };
+} // end of namespace
+
+#endif // MUONMM_CNVTOOLS_MM_RAWDATAPROVIDERTOOLCORE_H
+
diff --git a/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MM_RawDataProviderToolMT.cxx b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MM_RawDataProviderToolMT.cxx
new file mode 100644
index 000000000000..573c633b64be
--- /dev/null
+++ b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MM_RawDataProviderToolMT.cxx
@@ -0,0 +1,126 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+///////////////////////////////////////////////////////////////////
+// MM_RawDataProviderToolMT.cxx, (c) ATLAS Detector software
+///////////////////////////////////////////////////////////////////
+
+#include "MM_RawDataProviderToolMT.h"
+#include "MuonRDO/MM_RawDataContainer.h"
+#include "eformat/SourceIdentifier.h"
+using eformat::helper::SourceIdentifier;
+
+//==============================================================================
+Muon::MM_RawDataProviderToolMT::MM_RawDataProviderToolMT(const std::string& t, const std::string& n, const IInterface* p)
+: MM_RawDataProviderToolCore(t, n, p)
+{
+ declareInterface<IMuonRawDataProviderTool>(this);
+ declareProperty("MmContainerCacheKey", m_rdoContainerCacheKey, "Optional external cache for the MM container");
+}
+
+
+//==============================================================================
+StatusCode Muon::MM_RawDataProviderToolMT::initialize()
+{
+ // generate all the Source Identifiers for MicroMegas to request the fragments.
+ // assume 16 RODs per side (one per sector) and that ROB ID = ROD ID.
+ for (uint32_t detID : {eformat::MUON_MMEGA_ENDCAP_A_SIDE, eformat::MUON_MMEGA_ENDCAP_C_SIDE}) { //0x6B, 0x6C
+ for (uint32_t sectorID(0); sectorID < 16; ++sectorID) {
+ SourceIdentifier sid(static_cast<eformat::SubDetector>(detID), sectorID);
+ m_allRobIds.push_back(sid.simple_code());
+ }
+ }
+
+ ATH_CHECK(m_rdoContainerCacheKey.initialize(!m_rdoContainerCacheKey.key().empty()));
+ ATH_CHECK(MM_RawDataProviderToolCore::initialize());
+ return StatusCode::SUCCESS;
+}
+
+
+//==============================================================================
+StatusCode Muon::MM_RawDataProviderToolMT::initRdoContainer(const EventContext& ctx, MM_RawDataContainer*& rdoContainer) const
+{
+ // Create the identifiable RdoContainer in StoreGate to be filled with decoded fragment contents.
+ SG::WriteHandle<MM_RawDataContainer> rdoContainerHandle(m_rdoContainerKey, ctx);
+
+ const bool externalCacheRDO = !m_rdoContainerCacheKey.key().empty();
+ if(!externalCacheRDO){
+ ATH_CHECK(rdoContainerHandle.record(std::make_unique<MM_RawDataContainer>(m_maxhashtoUse)));
+ ATH_MSG_DEBUG("Created MM container");
+ } else {
+ SG::UpdateHandle<MM_RawDataCollection_Cache> update(m_rdoContainerCacheKey, ctx);
+ ATH_CHECK(update.isValid());
+ ATH_CHECK(rdoContainerHandle.record(std::make_unique<MM_RawDataContainer>(update.ptr())));
+ ATH_MSG_DEBUG("Created MM container using cache for " << m_rdoContainerCacheKey.key());
+ }
+
+ // this should never happen, but since we dereference the pointer, we should check
+ if (!(rdoContainer = rdoContainerHandle.ptr())) {
+ ATH_MSG_ERROR("the MM RDO container is null, cannot decode MM data");
+ return StatusCode::FAILURE;
+ }
+
+ return StatusCode::SUCCESS;
+}
+
+
+//==============================================================================
+StatusCode Muon::MM_RawDataProviderToolMT::convert(const std::vector<IdentifierHash>& rdoIdhVect, const EventContext& ctx) const
+{
+ // method for RoI-seeded mode. we don't let empty hash containers reach the decoder,
+ // since an empty container means unseeded mode (decode everything).
+
+ MM_RawDataContainer* rdoContainer{nullptr};
+ ATH_CHECK(initRdoContainer(ctx, rdoContainer));
+
+ std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*> vecRobf;
+ m_robDataProvider->getROBData(m_allRobIds, vecRobf);
+
+ return rdoIdhVect.empty() ? StatusCode::SUCCESS : convertIntoContainer(vecRobf, rdoIdhVect, *rdoContainer);
+}
+
+
+//==============================================================================
+StatusCode Muon::MM_RawDataProviderToolMT::convert(const EventContext& ctx) const
+{
+ // method for unseeded mode. just decode everything.
+
+ MM_RawDataContainer* rdoContainer{nullptr};
+ ATH_CHECK(initRdoContainer(ctx, rdoContainer));
+
+ std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*> vecRobf;
+ m_robDataProvider->getROBData(m_allRobIds, vecRobf);
+
+ // dummy hashID vector for the decoder (empty = unseeded mode)
+ const std::vector<IdentifierHash> rdoIdhVect;
+
+ return convertIntoContainer(vecRobf, rdoIdhVect, *rdoContainer);
+}
+
+
+//==============================================================================
+StatusCode Muon::MM_RawDataProviderToolMT::convert() const //call decoding function using list of all detector ROBId's
+{
+ ATH_MSG_ERROR("MM_RawDataProviderToolMT::convert() Not implemented.");
+ return StatusCode::FAILURE;
+}
+
+StatusCode Muon::MM_RawDataProviderToolMT::convert(const std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>&) const
+{
+ ATH_MSG_ERROR("MM_RawDataProviderToolMT::convert(const ROBFragmentList&) not implemented.");
+ return StatusCode::FAILURE;
+}
+
+StatusCode Muon::MM_RawDataProviderToolMT::convert(const std::vector<IdentifierHash>&) const
+{
+ ATH_MSG_ERROR("MM_RawDataProviderToolMT::convert(const std::vector<IdentifierHash>&) not implemented.");
+ return StatusCode::FAILURE;
+}
+
+StatusCode Muon::MM_RawDataProviderToolMT::convert( const std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>&, const std::vector<IdentifierHash>&) const
+{
+ ATH_MSG_ERROR("MM_RawDataProviderToolMT::convert(const ROBFragmentList&) not implemented.");
+ return StatusCode::FAILURE;
+}
+
diff --git a/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MM_RawDataProviderToolMT.h b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MM_RawDataProviderToolMT.h
new file mode 100644
index 000000000000..6f584fef13b5
--- /dev/null
+++ b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MM_RawDataProviderToolMT.h
@@ -0,0 +1,55 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONMM_CNVTOOLS_MM_RAWDATAPROVIDERTOOLMT_H
+#define MUONMM_CNVTOOLS_MM_RAWDATAPROVIDERTOOLMT_H
+
+#include "MM_RawDataProviderToolCore.h"
+#include "MuonCnvToolInterfaces/IMuonRawDataProviderTool.h"
+#include "MuonRDO/MM_RawDataCollection_Cache.h"
+
+namespace Muon
+{
+ /** @class STGC_RawDataProviderToolMT
+ * A tool to decode Micromegas ROB fragments into Micromegas RDO (based on the sTGC tool).
+ * @author Leonidas <leonidas.fountas@cern.ch>
+ */
+
+ class MM_RawDataProviderToolMT: virtual public IMuonRawDataProviderTool, public MM_RawDataProviderToolCore
+ {
+ public:
+
+ using IMuonRawDataProviderTool::convert; // Otherwise get a -Woverloaded-virtual warning about hiding convert(const std::vector<IdentifierHash>& rdoIdhVect)
+
+ /** Default constructor */
+ MM_RawDataProviderToolMT(const std::string& t, const std::string& n, const IInterface* p);
+
+ /** Default destructor */
+ virtual ~MM_RawDataProviderToolMT() = default;
+
+ /** Standard AlgTool method */
+ virtual StatusCode initialize() override;
+
+ // unused, needing initialization
+ virtual StatusCode convert() const override; //!< for the entire event
+ virtual StatusCode convert(const ROBFragmentList&) const override;
+ virtual StatusCode convert(const std::vector<IdentifierHash>& rdoIdhVect) const override;
+ virtual StatusCode convert(const ROBFragmentList&, const std::vector<IdentifierHash>&) const override;
+
+ // used
+ virtual StatusCode convert(const EventContext&) const override;
+ virtual StatusCode convert(const std::vector<IdentifierHash>&, const EventContext&) const override;
+
+ protected:
+
+ StatusCode initRdoContainer(const EventContext&, MM_RawDataContainer*&) const;
+ std::vector<uint32_t> m_allRobIds;
+
+ // Key for the cache for the CSM containers; can be empty,
+ SG::UpdateHandleKey<MM_RawDataCollection_Cache> m_rdoContainerCacheKey;
+ };
+} // end of namespace
+
+#endif // MUONMM_CNVTOOLS_MM_RAWDATAPROVIDERTOOLMT_H
+
diff --git a/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/components/MuonMM_CnvTools_entries.cxx b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/components/MuonMM_CnvTools_entries.cxx
index 0422090c5b99..9a150cbd66dc 100644
--- a/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/components/MuonMM_CnvTools_entries.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/components/MuonMM_CnvTools_entries.cxx
@@ -1,8 +1,12 @@
#include "../MmRdoToPrepDataTool.h"
#include "../MmRdoToPrepDataToolMT.h"
#include "../MM_RDO_Decoder.h"
+#include "../MM_ROD_Decoder.h"
+#include "../MM_RawDataProviderToolMT.h"
DECLARE_COMPONENT(Muon::MmRdoToPrepDataTool)
DECLARE_COMPONENT(Muon::MmRdoToPrepDataToolMT)
-DECLARE_COMPONENT( Muon::MM_RDO_Decoder )
+DECLARE_COMPONENT(Muon::MM_RDO_Decoder)
+DECLARE_COMPONENT(Muon::MM_ROD_Decoder)
+DECLARE_COMPONENT(Muon::MM_RawDataProviderToolMT)
diff --git a/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/CMakeLists.txt b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/CMakeLists.txt
index 668c32448a5e..0e4c9f4f9d7a 100644
--- a/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/CMakeLists.txt
@@ -19,4 +19,4 @@ atlas_add_component( MuonSTGC_CnvTools
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test GaudiKernel AthenaBaseComps Identifier EventPrimitives TGCcablingInterfaceLib MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonRDO MuonPrepRawData MuonTrigCoinData TrkSurfaces STgcClusterizationLib MuonCnvToolInterfacesLib MuonSTGC_CnvToolsLib )
+ LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test GaudiKernel AthenaBaseComps Identifier EventPrimitives MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonNSWCommonDecode MuonRDO MuonPrepRawData MuonTrigCoinData TrkSurfaces STgcClusterizationLib MuonCnvToolInterfacesLib MuonSTGC_CnvToolsLib )
diff --git a/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/MuonSTGC_CnvTools/IPadTrig_ROD_Decoder.h b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/MuonSTGC_CnvTools/IPadTrig_ROD_Decoder.h
new file mode 100644
index 000000000000..ea45cc58bfcb
--- /dev/null
+++ b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/MuonSTGC_CnvTools/IPadTrig_ROD_Decoder.h
@@ -0,0 +1,25 @@
+#ifndef MUONSTGC_CNVTOOLS_IPADTRIG_ROD_DECODER_H
+#define MUONSTGC_CNVTOOLS_IPADTRIG_ROD_DECODER_H
+
+#include "ByteStreamData/RawEvent.h"
+#include "GaudiKernel/IAlgTool.h"
+#include "MuonRDO/NSW_PadTriggerDataContainer.h"
+
+namespace Muon {
+static const InterfaceID IID_IPadTrig_ROD_Decoder("Muon::IPadTrig_ROD_Decoder",
+ 1, 0);
+
+// IAlgTool which facilitates conversion from Pad Trigger ROBFragments to RDO.
+class IPadTrig_ROD_Decoder : virtual public IAlgTool {
+ public:
+ // InterfaceID for this AlgTool
+ static const InterfaceID& interfaceID() { return IID_IPadTrig_ROD_Decoder; }
+
+ // Fill the given Pad Trigger RDO container with data from the given
+ // ROBFragments.
+ virtual StatusCode fillCollection(
+ const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment& fragment,
+ NSW_PadTriggerDataContainer& rdo) const = 0;
+};
+} // namespace Muon
+#endif // MUONSTGC_CNVTOOLS_IPADTRIG_ROD_DECODER_H
\ No newline at end of file
diff --git a/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/MuonSTGC_CnvTools/ISTGC_ROD_Decoder.h b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/MuonSTGC_CnvTools/ISTGC_ROD_Decoder.h
new file mode 100644
index 000000000000..a307f2370a59
--- /dev/null
+++ b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/MuonSTGC_CnvTools/ISTGC_ROD_Decoder.h
@@ -0,0 +1,38 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+///////////////////////////////////////////////////////////////////
+// ISTGC_ROD_Decoder.h, (c) ATLAS Detector software
+///////////////////////////////////////////////////////////////////
+#ifndef MUONSTGC_CNVTOOLS_IMUONSTGC_ROD_DECODER_H
+#define MUONSTGC_CNVTOOLS_IMUONSTGC_ROD_DECODER_H
+
+#include "GaudiKernel/IAlgTool.h"
+#include "ByteStreamData/RawEvent.h"
+
+namespace Muon
+{
+ class STGC_RawDataContainer;
+
+ static const InterfaceID IID_ISTGC_ROD_Decoder("Muon::ISTGC_ROD_Decoder", 1, 0);
+
+ /** @class ISTGC_ROD_Decoder, based on the respective class for TGCs.
+ * The interface for AlgTool which decodes an STGC ROB fragment into STGC RDO.
+ * @author Stelios Angelidakis <sangelid@cern.ch>
+ */
+
+ class ISTGC_ROD_Decoder : virtual public IAlgTool
+ {
+ public:
+ /** Provide interface ID of ISTGC_ROD_Decoder */
+ static const InterfaceID& interfaceID() { return IID_ISTGC_ROD_Decoder; }
+
+ /** Convert ROBFragments to RDOs */
+ virtual StatusCode fillCollection(const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment&, const std::vector<IdentifierHash>&, STGC_RawDataContainer&) const = 0;
+ };
+
+} // end of namespace
+
+#endif // MUONSTGC_CNVTOOLS_IMUONSTGC_ROD_DECODER_H
+
diff --git a/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/PadTrig_ROD_Decoder.cxx b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/PadTrig_ROD_Decoder.cxx
new file mode 100644
index 000000000000..78599be7923b
--- /dev/null
+++ b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/PadTrig_ROD_Decoder.cxx
@@ -0,0 +1,231 @@
+#include "PadTrig_ROD_Decoder.h"
+
+#include <byteswap.h>
+
+#include <vector>
+
+#include "Identifier/Identifier.h"
+#include "eformat/Issue.h"
+#include "eformat/SourceIdentifier.h"
+
+namespace Muon {
+
+//=====================================================================
+PadTrig_ROD_Decoder::PadTrig_ROD_Decoder(const std::string& type, const std::string& name, const IInterface* parent)
+: AthAlgTool(type, name, parent)
+{
+ declareInterface<IPadTrig_ROD_Decoder>(this);
+}
+
+
+//=====================================================================
+StatusCode PadTrig_ROD_Decoder::fillCollection(const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment& fragment, NSW_PadTriggerDataContainer& rdo) const
+{
+ try {
+ fragment.check();
+ } catch (const eformat::Issue& ex) {
+ ATH_MSG_ERROR(ex.what());
+ return StatusCode::FAILURE;
+ }
+
+ eformat::helper::SourceIdentifier sourceID{fragment.rob_source_id()};
+
+ // FIXME this hash calculation MUST be done in an IdHelper!
+ // Extract sector from module ID (lowest 4 bits).
+ uint32_t hashID = (sourceID.module_id() & 0xf);
+ if (sourceID.subdetector_id() == eformat::MUON_STGC_ENDCAP_C_SIDE) {
+ // Add 16 sector offset for side C
+ hashID += 16;
+ }
+
+ if (rdo.indexFind(hashID) != rdo.end()) {
+ ATH_MSG_ERROR("Collection ID " << hashID << " already found in RDO container, skipping");
+ return StatusCode::FAILURE;
+ }
+
+ OFFLINE_FRAGMENTS_NAMESPACE::PointerType data{};
+ fragment.rod_data(data);
+ if (!data) {
+ ATH_MSG_WARNING("No data found for this ROBFragment, skipping");
+ return StatusCode::FAILURE;
+ }
+
+ // TODO better error handling?
+ return parseBytestream(data, fragment.rod_ndata(), rdo, hashID);
+}
+
+//=====================================================================
+StatusCode PadTrig_ROD_Decoder::parseBytestream(OFFLINE_FRAGMENTS_NAMESPACE::PointerType data, std::size_t size, NSW_PadTriggerDataContainer& rdo, const IdentifierHash hashID) const
+{
+ // Refer to:
+ // https://espace.cern.ch/ATLAS-NSW-ELX/Shared%20Documents/Pad%20Trigger/PadTrig_Raw_Format.pdf
+ constexpr std::size_t BITMAP_SIZE = 256;
+ const std::size_t EXPECTED_SIZE = [&]() -> std::size_t {
+ // netio header + NSW readout header + 3 BCs * (hit_multi + bitmap) + status
+ std::size_t packetSize = 8 + 8 + 3 * (2 + BITMAP_SIZE) + 2;
+ if (m_pfebBCIDs) packetSize += 3 * 48; // 3 BCs * (2 bytes per BCID * 24 pFEBs)
+ if (m_toTPData) packetSize += 12;
+ return (packetSize + 3) / 4; // Round up to nearest 4-byte multiple
+ }();
+
+ if (size != EXPECTED_SIZE) {
+ ATH_MSG_ERROR("Corrupted ROBFragment, skipping! Expected " << EXPECTED_SIZE << " words, got " << size);
+ return StatusCode::FAILURE;
+ }
+
+ const uint16_t bcid = (extractByte(data, 2) >> 4 & 0xf) << 8 | extractByte(data, 3);
+ const uint32_t l1id = __builtin_bswap32(data[3]);
+ const uint8_t endcap = (data[2] & (0b1 << 7)) ? 1 : 0; // 1 = Endcap A, 0 = Endcap C
+ const uint8_t sector = ((data[2] & 0x0f00) >> 8) + 1; // In range [1, 16]
+ const uint8_t sectorSize = sector % 2; // Small is 0, Large is 1. S is even, L is odd.
+ const uint8_t sectorID = (sector + sectorSize) / 2; // In range [1, 8]
+
+ // Skip netio + NSW headers
+ std::size_t byteIndex{16};
+
+ std::array<std::vector<uint16_t>, 3> hitAddresses;
+
+ // Bitmap parsing loop
+ for (std::size_t bc{}; bc < 3; bc++) {
+ uint16_t hitMultiplicity = (extractByte(data, byteIndex) << 8) | extractByte(data, byteIndex + 1);
+ byteIndex += 2;
+ // Skip pFEB BCIDs, if they were sent (used only for commissioning debugging)
+ if (m_pfebBCIDs) byteIndex += 48; // 2 bytes per BCID, 24 pFEBs
+
+ std::size_t observedHits{};
+ const bool isSmallSector(sectorSize == 0);
+ hitAddresses[bc] = parseBitmap(data, byteIndex, observedHits, isSmallSector);
+ if (observedHits != (hitMultiplicity & 0xfff)) {
+ ATH_MSG_WARNING("Expected " << static_cast<uint32_t>(hitMultiplicity & 0xfff) << " set bits, observed " << observedHits);
+ }
+
+ byteIndex += BITMAP_SIZE;
+ }
+
+ auto collection = new NSW_PadTriggerData{ hashID, sectorID, sectorSize, endcap, bcid, l1id, hitAddresses};
+
+ // Status word length
+ byteIndex += 2;
+
+ if (m_toTPData) {
+ parseSegments(data, byteIndex, *collection);
+ byteIndex += 12;
+ }
+
+ ATH_CHECK(rdo.addCollection(collection, collection->identifierHash()));
+ return StatusCode::SUCCESS;
+}
+
+
+//=====================================================================
+std::vector<uint16_t> PadTrig_ROD_Decoder::parseBitmap(OFFLINE_FRAGMENTS_NAMESPACE::PointerType data, std::size_t byteIndex, std::size_t& hitCount, bool isSmallSector) const
+{
+ std::vector<uint16_t> addressList{};
+ constexpr std::size_t PFEB_COUNT = 24;
+ std::array<std::vector<bool>, PFEB_COUNT> bitmaps{};
+ std::size_t bitOffset{};
+
+ size_t Nchannels{85}; // default value
+ for (std::size_t pfeb{}; pfeb < PFEB_COUNT; pfeb++) {
+
+ // pFEBs are sent in reverse order: last pFEB (pFEB23) sent first
+ auto& currentBitmap = bitmaps[PFEB_COUNT - pfeb - 1];
+
+ // Size of the current pFEB bitmap
+ if (m_channelMapping) Nchannels = isSmallSector ? SMALL_PFEB_SIZES[PFEB_COUNT - pfeb - 1] : LARGE_PFEB_SIZES[PFEB_COUNT - pfeb - 1];
+
+ for (std::size_t channel{}; channel < Nchannels; channel++)
+ currentBitmap.push_back(extractBit(data, byteIndex * 8 + (bitOffset + channel) + 8));
+
+ bitOffset += currentBitmap.size();
+ }
+
+ // Discard disconnected pFEBs, convert to addresses
+ std::size_t chOffset{};
+ for (std::size_t pfeb{}; pfeb < PFEB_COUNT; pfeb++) {
+ const auto popcount = std::count(bitmaps[pfeb].begin(), bitmaps[pfeb].end(), 1);
+ bool disconnected{true};
+ bool lastChannel = bitmaps[pfeb][0];
+
+ // Disconnected: alternating 01010... or 10101... pattern
+ for (std::size_t i{1}; i < bitmaps[pfeb].size(); i++) {
+ if (bitmaps[pfeb][i] == lastChannel) {
+ disconnected = false;
+ break;
+ }
+ lastChannel = bitmaps[pfeb][i];
+ }
+ hitCount += popcount;
+
+ if (disconnected) {
+ chOffset += bitmaps[pfeb].size();
+ continue;
+ }
+
+ for (std::size_t ch{}; ch < bitmaps[pfeb].size(); ch++) {
+ if (bitmaps[pfeb][ch]) {
+ // TODO The address is a simple running counter for now.
+ // Replace with an actual scheme (maybe a LUT for layer/pad-id or layer/eta/phi?)
+ addressList.push_back(chOffset + ch);
+ }
+ }
+ chOffset += bitmaps[pfeb].size();
+ }
+ return addressList;
+}
+
+
+//=====================================================================
+void PadTrig_ROD_Decoder::parseSegments(OFFLINE_FRAGMENTS_NAMESPACE::PointerType data, std::size_t byteIndex, NSW_PadTriggerData& collection) const
+{
+ // Refer to:
+ // https://espace.cern.ch/ATLAS-NSW-ELX/Shared%20Documents/Pad%20Trigger/Pad_to_TP_data_format.pdf
+ // const uint16_t bcidAndFlags = extractByte(data, byteIndex) << 8 | extractByte(data, byteIndex + 1);
+
+ // TODO compare BCID with one found in header? Do something with flags?
+ //const uint8_t flags = (bcidAndFlags & 0xf000) >> 12;
+ //const uint16_t bcid = bcidAndFlags & 0xfff;
+ byteIndex += 2;
+
+ // Max. 4 segments
+ for (std::size_t i{}; i < 4; i++) {
+ const auto bandID = extractByte(data, byteIndex + i);
+ // If 0xff, no bandID
+ if (bandID == 0xff) {
+ continue;
+ }
+
+ // FIXME phiID currently bit-packed (6 bits * 4), should be 8 bits * 4?
+ const uint8_t phiID = extractByte(data, byteIndex + 4 + i);
+ const auto wedge0ActiveLayers = extractByte(data, byteIndex + 8);
+ const auto wedge1ActiveLayers = extractByte(data, byteIndex + 9);
+ std::array<uint8_t, 2> activeLayers{};
+ // 2 bits per bandID; assume wedge0 is inner
+ activeLayers[0] = (wedge0ActiveLayers & (0x3 << i * 2)) >> i * 2;
+ activeLayers[1] = (wedge1ActiveLayers & (0x3 << i * 2)) >> i * 2;
+ auto segment = std::make_unique<NSW_PadTriggerSegment>(bandID, phiID, activeLayers);
+ collection.push_back(std::move(segment));
+ }
+}
+
+
+//=====================================================================
+bool PadTrig_ROD_Decoder::extractBit(OFFLINE_FRAGMENTS_NAMESPACE::PointerType data, std::size_t index) const
+{
+ // Swap to big endian, as we're dealing with a contiguous bit vector
+ const uint32_t word = __builtin_bswap32(data[index / 32]);
+ // Treat index 0 as the most significant bit -- again, contiguous bit vector
+ std::size_t subWordIndex = 31 - (index % 32);
+ return (word & (0b1 << subWordIndex)) != 0;
+}
+
+
+//=====================================================================
+uint8_t PadTrig_ROD_Decoder::extractByte(OFFLINE_FRAGMENTS_NAMESPACE::PointerType data, std::size_t index) const
+{
+ // Swap to big endian, so byte extracted will match the byte at the given index in the contiguous packet
+ const uint32_t word = data[index / 4];
+ return reinterpret_cast<const uint8_t*>(&word)[index % 4];
+}
+
+} // namespace Muon
diff --git a/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/PadTrig_ROD_Decoder.h b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/PadTrig_ROD_Decoder.h
new file mode 100644
index 000000000000..1bc462b66a92
--- /dev/null
+++ b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/PadTrig_ROD_Decoder.h
@@ -0,0 +1,55 @@
+#ifndef MUONSTGC_CNVTOOLS_PADTRIG_ROD_DECODER_H
+#define MUONSTGC_CNVTOOLS_PADTRIG_ROD_DECODER_H
+
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "MuonSTGC_CnvTools/IPadTrig_ROD_Decoder.h"
+
+namespace Muon {
+class PadTrig_ROD_Decoder : public IPadTrig_ROD_Decoder, public AthAlgTool
+{
+
+ public:
+ PadTrig_ROD_Decoder(const std::string& type, const std::string& name, const IInterface* parent);
+
+ // Convert the given ROBFragment to an NSW_PadTriggerData object, and store it
+ // in the RDO container at the appropriate hash ID, if no collection is found
+ // at that hash ID.
+ StatusCode fillCollection(const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment& fragment, NSW_PadTriggerDataContainer& rdo) const override;
+
+ protected:
+ // Parse the given eformat ROB data into a NSW_PadTriggerData, and store it in
+ // the RDO container at the given hash ID.
+ StatusCode parseBytestream(OFFLINE_FRAGMENTS_NAMESPACE::PointerType data, std::size_t size, NSW_PadTriggerDataContainer& rdo, const IdentifierHash hashID) const;
+ // Parse the pad bitmap found in the data starting at byteIndex, returning a
+ // list of hit addresses and discarding disconnected pFEBs. If using channel
+ // mapping, use bitmap sizes appropriate to the sector size. Store pop count
+ // in hitCount.
+ std::vector<uint16_t> parseBitmap(OFFLINE_FRAGMENTS_NAMESPACE::PointerType data, std::size_t byteIndex, std::size_t& hitCount, bool isSmallSector) const;
+ // Parse Pad Trigger segments found in the data starting at byteIndex.
+ // Discard any empty segments. Store the resulting NSW_PadTriggerSegments in
+ // the given collection.
+ void parseSegments(OFFLINE_FRAGMENTS_NAMESPACE::PointerType data, std::size_t byteIndex, NSW_PadTriggerData& collection) const;
+ // Return the value of the bit at the given index in data.
+ // Treats data as a contigous bit field rather than as an array of 4-byte
+ // values, where MSB is at index 0.
+ bool extractBit(OFFLINE_FRAGMENTS_NAMESPACE::PointerType data, std::size_t index) const;
+ // Return the byte at the given index in data.
+ uint8_t extractByte(OFFLINE_FRAGMENTS_NAMESPACE::PointerType data, std::size_t index) const;
+ // Properties
+ Gaudi::Property<bool> m_pfebBCIDs{this,"pFEBBCIDs", false, "Are pFEB BCIDs present?"};
+ Gaudi::Property<bool> m_toTPData{this, "toTPData", false, "Is to-TP data present?"};
+ Gaudi::Property<bool> m_channelMapping{this, "channelMapping", "Are pFEB channels re-mapped?"};
+
+ // Mappings (go from pFEB0 to pFEB23)
+ // Large sector:
+ static constexpr std::array<std::size_t, 24> LARGE_PFEB_SIZES{
+ 102, 96, 96, 104, 96, 96, 91, 96, 56, 56, 75, 75,
+ 56, 56, 56, 56, 60, 60, 70, 70, 52, 52, 56, 56};
+ // Small sector (TODO, this is a placeholder)
+ static constexpr std::array<std::size_t, 24> SMALL_PFEB_SIZES{
+ 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
+ 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85};
+};
+} // namespace Muon
+
+#endif // MUONSTGC_CNVTOOLS_PADTRIG_ROD_DECODER_H
diff --git a/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/PadTrig_RawDataProviderTool.cxx b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/PadTrig_RawDataProviderTool.cxx
new file mode 100644
index 000000000000..36a90c04ac42
--- /dev/null
+++ b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/PadTrig_RawDataProviderTool.cxx
@@ -0,0 +1,37 @@
+#include "PadTrig_RawDataProviderTool.h"
+
+namespace Muon {
+
+//=====================================================================
+PadTrig_RawDataProviderTool::PadTrig_RawDataProviderTool(const std::string& type, const std::string& name, const IInterface* parent)
+: AthAlgTool(type, name, parent)
+{
+ declareInterface<IMuonRawDataProviderTool>(this);
+}
+
+//=====================================================================
+StatusCode PadTrig_RawDataProviderTool::convert(const ROBFragmentList&) const
+{
+ ATH_MSG_ERROR(__PRETTY_FUNCTION__ << " not yet implemented!");
+ return StatusCode::FAILURE;
+}
+
+StatusCode PadTrig_RawDataProviderTool::convert(const ROBFragmentList&, const std::vector<IdentifierHash>&) const
+{
+ ATH_MSG_ERROR(__PRETTY_FUNCTION__ << " not yet implemented!");
+ return StatusCode::FAILURE;
+}
+
+StatusCode PadTrig_RawDataProviderTool::convert() const
+{
+ ATH_MSG_ERROR(__PRETTY_FUNCTION__ << " not yet implemented!");
+ return StatusCode::FAILURE;
+}
+
+StatusCode PadTrig_RawDataProviderTool::convert(const std::vector<IdentifierHash>&) const
+{
+ ATH_MSG_ERROR(__PRETTY_FUNCTION__ << " not yet implemented!");
+ return StatusCode::FAILURE;
+}
+
+}
diff --git a/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/PadTrig_RawDataProviderTool.h b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/PadTrig_RawDataProviderTool.h
new file mode 100644
index 000000000000..08a8d076f3b6
--- /dev/null
+++ b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/PadTrig_RawDataProviderTool.h
@@ -0,0 +1,29 @@
+#ifndef MUONSTGC_CNVTOOLS_PADTRIG_RAWDATAPROVIDERTOOL_H
+#define MUONSTGC_CNVTOOLS_PADTRIG_RAWDATAPROVIDERTOOL_H
+
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "MuonCnvToolInterfaces/IMuonRawDataProviderTool.h"
+
+namespace Muon {
+
+class PadTrig_RawDataProviderTool : virtual public IMuonRawDataProviderTool, public AthAlgTool
+{
+ public:
+ using IMuonRawDataProviderTool::convert;
+
+ PadTrig_RawDataProviderTool(const std::string& type, const std::string& name, const IInterface* parent);
+ virtual ~PadTrig_RawDataProviderTool() = default;
+
+ //StatusCode initialize();
+ //StatusCode finalize();
+
+ // unimplemented methods
+ StatusCode convert() const override;
+ StatusCode convert(const ROBFragmentList&) const override;
+ StatusCode convert(const std::vector<IdentifierHash>&) const override;
+ StatusCode convert(const ROBFragmentList&, const std::vector<IdentifierHash>&) const override;
+};
+
+}
+
+#endif
diff --git a/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/PadTrig_RawDataProviderToolMT.cxx b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/PadTrig_RawDataProviderToolMT.cxx
new file mode 100644
index 000000000000..40cdd92bfb6e
--- /dev/null
+++ b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/PadTrig_RawDataProviderToolMT.cxx
@@ -0,0 +1,104 @@
+#include "PadTrig_RawDataProviderToolMT.h"
+
+namespace Muon {
+
+//=====================================================================
+PadTrig_RawDataProviderToolMT::PadTrig_RawDataProviderToolMT(const std::string& type, const std::string& name, const IInterface* parent)
+: AthAlgTool(type, name, parent), m_robDataProvider("ROBDataProviderSvc", name)
+{
+ declareInterface<IMuonRawDataProviderTool>(this);
+}
+
+//=====================================================================
+StatusCode PadTrig_RawDataProviderToolMT::initialize()
+{
+ ATH_CHECK(AthAlgTool::initialize());
+ ATH_CHECK(m_decoder.retrieve());
+ ATH_CHECK(m_idHelperSvc.retrieve());
+ ATH_CHECK(m_robDataProvider.retrieve());
+ ATH_CHECK(m_rdoContainerKey.initialize());
+
+ m_maxhashtoUse = m_idHelperSvc->stgcIdHelper().module_hash_max();
+
+ return StatusCode::SUCCESS;
+}
+
+
+//=====================================================================
+StatusCode PadTrig_RawDataProviderToolMT::convert() const
+{
+ ATH_MSG_ERROR(__PRETTY_FUNCTION__ << " not yet implemented!");
+ return StatusCode::FAILURE;
+}
+
+StatusCode PadTrig_RawDataProviderToolMT::convert(const ROBFragmentList&) const
+{
+ ATH_MSG_ERROR(__PRETTY_FUNCTION__ << " not implemented!");
+ return StatusCode::FAILURE;
+}
+
+StatusCode PadTrig_RawDataProviderToolMT::convert(const std::vector<IdentifierHash>&) const
+{
+ ATH_MSG_ERROR(__PRETTY_FUNCTION__ << " not yet implemented!");
+ return StatusCode::FAILURE;
+}
+
+StatusCode PadTrig_RawDataProviderToolMT::convert(const ROBFragmentList&, const std::vector<IdentifierHash>&) const
+{
+ ATH_MSG_ERROR(__PRETTY_FUNCTION__ << " not implemented!");
+ return StatusCode::FAILURE;
+}
+
+
+//=====================================================================
+StatusCode PadTrig_RawDataProviderToolMT::convert(const ROBFragmentList& fragments, const EventContext& ctx) const
+{
+ ATH_MSG_DEBUG(__PRETTY_FUNCTION__ << ": Got " << fragments.size() << " fragments");
+ SG::WriteHandle<NSW_PadTriggerDataContainer> rdoContainerHandle{m_rdoContainerKey, ctx};
+ NSW_PadTriggerDataContainer* pContainer{nullptr};
+
+ // Retrieve container, if it exists in the event store; otherwise, create one
+ if (rdoContainerHandle.isPresent()) {
+ ATH_CHECK(evtStore()->retrieve(pContainer, m_rdoContainerKey.key()));
+ } else {
+ ATH_CHECK(rdoContainerHandle.record(std::make_unique<NSW_PadTriggerDataContainer>(m_maxhashtoUse)));
+ pContainer = rdoContainerHandle.ptr();
+ }
+
+ if (!pContainer) {
+ ATH_MSG_ERROR("Could not retrieve nor create Pad Trigger RDO container!");
+ return StatusCode::FAILURE;
+ }
+
+ for (const auto fragment : fragments) {
+ // TODO should an error here be a hard failure?
+ ATH_CHECK(m_decoder->fillCollection(*fragment, *pContainer));
+ }
+
+ return StatusCode::SUCCESS;
+}
+
+
+//=====================================================================
+// Convert all Pad Trigger ROBFragments within the given EventContext
+StatusCode PadTrig_RawDataProviderToolMT::convert(const EventContext& ctx) const
+{
+ // Get all ROBs!
+ std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*> fragments;
+ std::vector<uint32_t> robIDs;
+
+ // Generate all possible ROB IDs, aka Source Identifiers
+ // Valid values are: 0x00{6d,6e}002[0..f]
+ for (uint32_t detectorID : {eformat::MUON_STGC_ENDCAP_A_SIDE, eformat::MUON_STGC_ENDCAP_C_SIDE}) { // 0x6D, 0x6E
+ for (uint8_t sector{}; sector < 16; sector++) {
+ uint16_t moduleID = (0x2 << 4) | sector;
+ eformat::helper::SourceIdentifier sourceID{static_cast<eformat::SubDetector>(detectorID), moduleID};
+ robIDs.push_back(sourceID.simple_code());
+ }
+ }
+
+ m_robDataProvider->getROBData(robIDs, fragments);
+ return convert(fragments, ctx);
+}
+
+} // namespace Muon
diff --git a/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/PadTrig_RawDataProviderToolMT.h b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/PadTrig_RawDataProviderToolMT.h
new file mode 100644
index 000000000000..8c96151a5aef
--- /dev/null
+++ b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/PadTrig_RawDataProviderToolMT.h
@@ -0,0 +1,47 @@
+#ifndef MUONSTGC_CNVTOOLS_PADTRIG_RAWDATAPROVIDERTOOLMT_H
+#define MUONSTGC_CNVTOOLS_PADTRIG_RAWDATAPROVIDERTOOLMT_H
+
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
+#include "ByteStreamData/RawEvent.h"
+#include "GaudiKernel/ServiceHandle.h"
+#include "GaudiKernel/ToolHandle.h"
+#include "MuonIdHelpers/IMuonIdHelperSvc.h"
+#include "MuonCnvToolInterfaces/IMuonRawDataProviderTool.h"
+#include "MuonRDO/NSW_PadTriggerDataContainer.h"
+#include "MuonSTGC_CnvTools/IPadTrig_ROD_Decoder.h"
+
+namespace Muon {
+
+class PadTrig_RawDataProviderToolMT : virtual public IMuonRawDataProviderTool, public AthAlgTool
+{
+ public:
+ using IMuonRawDataProviderTool::convert;
+
+ PadTrig_RawDataProviderToolMT(const std::string& type, const std::string& name, const IInterface* parent);
+ virtual ~PadTrig_RawDataProviderToolMT() = default;
+
+ StatusCode initialize() override;
+
+ // unimplemented
+ StatusCode convert() const override;
+ StatusCode convert(const ROBFragmentList&) const override;
+ StatusCode convert(const std::vector<IdentifierHash>&) const override;
+ StatusCode convert(const ROBFragmentList&, const std::vector<IdentifierHash>&) const override;
+
+ // implemented
+ StatusCode convert(const ROBFragmentList& fragments, const EventContext& ctx) const override;
+ StatusCode convert(const EventContext& ctx) const override;
+
+ private:
+ ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
+ ToolHandle<IPadTrig_ROD_Decoder> m_decoder{this, "Decoder", "Muon::PadTrig_ROD_Decoder/PadTrig_ROD_Decoder"};
+ ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
+ SG::WriteHandleKey<NSW_PadTriggerDataContainer> m_rdoContainerKey{this, "RdoLocation", "PADTRGRDO", "Name of of the RDO container to write to"};
+
+ unsigned int m_maxhashtoUse{0};
+};
+
+} // namespace Muon
+
+#endif // MUONSTGC_CNVTOOLS_PADTRIG_RAWDATAPROVIDERTOOLMT_H
diff --git a/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/STGC_ROD_Decoder.cxx b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/STGC_ROD_Decoder.cxx
new file mode 100644
index 000000000000..d76ea6a42333
--- /dev/null
+++ b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/STGC_ROD_Decoder.cxx
@@ -0,0 +1,129 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include <memory>
+#include <unordered_map>
+
+#include "MuonRDO/STGC_RawData.h"
+#include "MuonRDO/STGC_RawDataContainer.h"
+#include "MuonIdHelpers/sTgcIdHelper.h"
+
+#include "MuonNSWCommonDecode/NSWCommonDecoder.h"
+#include "MuonNSWCommonDecode/NSWElink.h"
+#include "MuonNSWCommonDecode/VMMChannel.h"
+#include "MuonNSWCommonDecode/NSWResourceId.h"
+
+#include "Identifier/Identifier.h"
+#include "eformat/Issue.h"
+#include "STGC_ROD_Decoder.h"
+
+using OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment;
+
+//==============================================================================
+Muon::STGC_ROD_Decoder::STGC_ROD_Decoder(const std::string& t, const std::string& n, const IInterface* p)
+: AthAlgTool(t, n, p)
+{
+ declareInterface<ISTGC_ROD_Decoder>(this);
+}
+
+
+//==============================================================================
+StatusCode Muon::STGC_ROD_Decoder::initialize()
+{
+ ATH_CHECK(detStore()->retrieve(m_stgcIdHelper, "STGCIDHELPER"));
+ return StatusCode::SUCCESS;
+}
+
+
+//===============================================================================
+// Processes a ROB fragment and fills the RDO container.
+// If the vector of IdentifierHashes is not empty, then seeded mode is assumed
+// (only requested modules are decoded). This must be made here, because the
+// trigger granularity is quadruplet, whereas ROB granularity is a whole sector
+// (or wedge). Therefore, refined selection is needed with decoded information.
+StatusCode Muon::STGC_ROD_Decoder::fillCollection(const ROBFragment& robFrag, const std::vector<IdentifierHash>& rdoIdhVect, STGC_RawDataContainer& rdoIdc) const
+{
+
+ // check fragment for errors
+ try {
+ robFrag.check();
+ } catch (eformat::Issue &ex) {
+ ATH_MSG_WARNING(ex.what());
+ return StatusCode::SUCCESS;
+ }
+
+ // if the vector of hashes is not empty, then we are in seeded mode
+ bool seeded_mode(!rdoIdhVect.empty());
+
+ // have the NSWCommonDecoder take care of the decoding
+ Muon::nsw::NSWCommonDecoder common_decoder(robFrag);
+ const std::vector<Muon::nsw::NSWElink *> elinks = common_decoder.get_elinks();
+ ATH_MSG_DEBUG("Retrieved "<<elinks.size()<<" elinks");
+ if (!elinks.size()) return StatusCode::SUCCESS;
+
+ // temporary storage of the individual RDOs corresponding to this ROB
+ // (expecting to have one per quadruplet).
+ std::unordered_map<IdentifierHash, std::unique_ptr<STGC_RawDataCollection>> rdo_map;
+
+ // loop on elinks. for STGCs a "module" is a quadruplet
+ // therefore, we need an RDO (collection) per quadruplet!
+ for (auto* elink : elinks) {
+
+ // get the offline ID hash (module ctx) to be passed to the RDO
+ // also specifies the index of the RDO in the container.
+ bool is_validID(false);
+ const char* station_name = elink->elinkId()->is_large_station() ? "STL" : "STS";
+ int station_eta = (int)elink->elinkId()->station_eta();
+ unsigned int station_phi = (unsigned int)elink->elinkId()->station_phi();
+ unsigned int multi_layer = (unsigned int)elink->elinkId()->multi_layer();
+ unsigned int gas_gap = (unsigned int)elink->elinkId()->gas_gap();
+ Identifier module_ID = m_stgcIdHelper->elementID(station_name, station_eta, station_phi, true, &is_validID);
+ if(!is_validID) { ATH_MSG_ERROR("Invalid identifier created for sTGC station"); continue; }
+
+ IdentifierHash module_hashID;
+ m_stgcIdHelper->get_module_hash(module_ID, module_hashID);
+
+ // if we are in ROI-seeded mode, check if this hashID is requested
+ if (seeded_mode && std::find(rdoIdhVect.begin(), rdoIdhVect.end(), module_hashID) == rdoIdhVect.end()) continue;
+
+ // get the RDO... RDO hash IDs should not repeat for different ROBs,
+ // but may repeat for the different elinks of a single ROB.
+ // To handle possible repetition, we temporarily store them in an STL map.
+ if (rdoIdc.indexFindPtr(module_hashID)) {
+ ATH_MSG_WARNING("Collection with hashID "<<module_hashID<<" already exists in the identifiable container. Skipping this elink.\n");
+ continue;
+ }
+
+ if (!rdo_map[module_hashID]) rdo_map[module_hashID] = std::make_unique<STGC_RawDataCollection>(module_hashID);
+ STGC_RawDataCollection* rdo = rdo_map[module_hashID].get();
+
+ // loop on all channels of this elink to fill the collection
+ const std::vector<Muon::nsw::VMMChannel *>& channels = elink->get_channels();
+ for (auto channel : channels) {
+ unsigned int channel_number = channel->channel_number();
+ unsigned int channel_type = channel->channel_type();
+ if (channel_type != Muon::nsw::OFFLINE_CHANNEL_TYPE_STRIP) continue; // TODO: decoder not ready for pads/wires
+ if (channel_number == 0) continue; // skip disconnected vmm channels
+
+ Identifier channel_ID = m_stgcIdHelper->channelID(module_ID, multi_layer, gas_gap, channel_type, channel_number, true, &is_validID);
+ if (!is_validID) { ATH_MSG_ERROR("Invalid identifier created for sTGC channel"); continue; }
+
+ rdo->push_back(new STGC_RawData(channel_ID, channel->rel_bcid(), channel->tdo(), channel->pdo(), false)); // isDead = false (ok?)
+ }
+ }
+
+ // add the RDO collections created from the data of this ROB into the identifiable container
+ for (auto& pair : rdo_map) {
+ if (pair.second->size() && !rdoIdc.addCollection(pair.second.release(), pair.first).isSuccess()) {
+ ATH_MSG_ERROR("Failed to add STGC RDO into the identifiable container");
+ }
+ }
+
+ rdo_map.clear();
+
+ return StatusCode::SUCCESS;
+}
+
+
+
diff --git a/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/STGC_ROD_Decoder.h b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/STGC_ROD_Decoder.h
new file mode 100644
index 000000000000..33365ee073d8
--- /dev/null
+++ b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/STGC_ROD_Decoder.h
@@ -0,0 +1,34 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONSTGC_CNVTOOLS_STGC_ROD_DECODER_H
+#define MUONSTGC_CNVTOOLS_STGC_ROD_DECODER_H
+
+#include <string>
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "MuonSTGC_CnvTools/ISTGC_ROD_Decoder.h"
+
+class sTgcIdHelper;
+
+namespace Muon
+{
+
+class STGC_RawData;
+class STGC_RawDataCollection;
+
+class STGC_ROD_Decoder : virtual public ISTGC_ROD_Decoder, public AthAlgTool
+{
+ public:
+ STGC_ROD_Decoder(const std::string& t, const std::string& n, const IInterface* p);
+ virtual ~STGC_ROD_Decoder() = default;
+ virtual StatusCode initialize() override;
+ virtual StatusCode fillCollection(const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment&, const std::vector<IdentifierHash>&, STGC_RawDataContainer&) const override;
+
+ protected:
+ const sTgcIdHelper* m_stgcIdHelper;
+};
+
+} // end of namespace
+
+#endif // MUONSTGC_CNVTOOLS_STGC_ROD_DECODER_H
diff --git a/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/STGC_RawDataProviderToolCore.cxx b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/STGC_RawDataProviderToolCore.cxx
new file mode 100644
index 000000000000..ed17fb41a5a5
--- /dev/null
+++ b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/STGC_RawDataProviderToolCore.cxx
@@ -0,0 +1,50 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include <atomic>
+#include "STGC_RawDataProviderToolCore.h"
+using OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment;
+
+//================ Constructor =================================================
+
+Muon::STGC_RawDataProviderToolCore::STGC_RawDataProviderToolCore(const std::string& t, const std::string& n, const IInterface* p)
+: AthAlgTool(t, n, p)
+, m_robDataProvider("ROBDataProviderSvc",n)
+{ }
+
+//================ Initialisation ==============================================
+StatusCode Muon::STGC_RawDataProviderToolCore::initialize()
+{
+ ATH_CHECK(m_idHelperSvc.retrieve());
+ ATH_CHECK(m_decoder.retrieve());
+ ATH_CHECK(m_robDataProvider.retrieve()); // ROBDataProviderSvc
+ ATH_CHECK(m_rdoContainerKey.initialize());
+
+ m_maxhashtoUse = m_idHelperSvc->stgcIdHelper().module_hash_max();
+ return StatusCode::SUCCESS;
+}
+
+//==============================================================================
+StatusCode Muon::STGC_RawDataProviderToolCore::convertIntoContainer(const std::vector<const ROBFragment*>& vecRobs, const std::vector<IdentifierHash>& rdoIdhVect, STGC_RawDataContainer& stgcRdoContainer) const
+{
+ // Loop on the passed ROB fragments, and call the decoder for each one to fill the RDO container.
+
+ static std::atomic_int DecodeErrCount{0};
+
+ for (const ROBFragment* fragment : vecRobs) {
+ if (m_decoder->fillCollection(*fragment, rdoIdhVect, stgcRdoContainer).isFailure()) {
+ if (DecodeErrCount < 100) {
+ ATH_MSG_INFO( "Problem with STGC ByteStream Decoding!" );
+ ++DecodeErrCount;
+ } else if (DecodeErrCount == 100) {
+ ATH_MSG_INFO( "Too many Problems with STGC Bytestream Decoding messages. Turning messaging off." );
+ ++DecodeErrCount;
+ }
+ }
+ }
+
+ ATH_MSG_DEBUG("Size of sTgcRdoContainer is " << stgcRdoContainer.size());
+ return StatusCode::SUCCESS;
+}
+
diff --git a/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/STGC_RawDataProviderToolCore.h b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/STGC_RawDataProviderToolCore.h
new file mode 100644
index 000000000000..a9061005c133
--- /dev/null
+++ b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/STGC_RawDataProviderToolCore.h
@@ -0,0 +1,58 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONSTGC_CNVTOOLS_STGC_RAWDATAPROVIDERTOOLCORE_H
+#define MUONSTGC_CNVTOOLS_STGC_RAWDATAPROVIDERTOOLCORE_H
+
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "GaudiKernel/ServiceHandle.h"
+#include "GaudiKernel/ToolHandle.h"
+#include "MuonIdHelpers/IMuonIdHelperSvc.h"
+#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
+#include "MuonSTGC_CnvTools/ISTGC_ROD_Decoder.h"
+
+#include "MuonRDO/STGC_RawDataContainer.h"
+
+namespace Muon {
+
+ /** @class STGC_RawDataProviderToolCore
+ * A tool to decode STGC ROB fragments into STGC RDO (based on the TGC tool).
+ * @author Stelios Angelidakis <sangelid@cern.ch>
+ */
+
+ class STGC_RawDataProviderToolCore : public AthAlgTool
+ {
+ public:
+ /** Default constructor */
+ STGC_RawDataProviderToolCore(const std::string& t, const std::string& n, const IInterface* p);
+
+ /** Default destructor */
+ virtual ~STGC_RawDataProviderToolCore() = default;
+
+ /** Standard AlgTool method */
+ virtual StatusCode initialize() override;
+
+ /** Method that converts the ROBFragments into the passed container */
+ virtual StatusCode convertIntoContainer (const std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>&,
+ const std::vector<IdentifierHash>&, STGC_RawDataContainer&) const;
+
+ protected:
+
+ /** The ID helper */
+ ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
+
+ /** Decoder for ROB fragment RDO conversion */
+ ToolHandle<ISTGC_ROD_Decoder> m_decoder{this, "Decoder", "Muon::STGC_ROD_Decoder/STGC_ROD_Decoder"};
+
+ /** RDO container key */
+ SG::WriteHandleKey<STGC_RawDataContainer> m_rdoContainerKey{ this, "RdoLocation", "sTGCRDO", "Name of the sTGCRDO produced by RawDataProvider"}; //MT
+
+ unsigned int m_maxhashtoUse{0}; //MT
+
+ /** Rob Data Provider handle */
+ ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
+ };
+} // end of namespace
+
+#endif // MUONSTGC_CNVTOOLS_STGC_RAWDATAPROVIDERTOOLCORE_H
diff --git a/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/STGC_RawDataProviderToolMT.cxx b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/STGC_RawDataProviderToolMT.cxx
new file mode 100644
index 000000000000..d98a0ee3b0e1
--- /dev/null
+++ b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/STGC_RawDataProviderToolMT.cxx
@@ -0,0 +1,125 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+///////////////////////////////////////////////////////////////////
+// STGC_RawDataProviderToolMT.cxx, (c) ATLAS Detector software
+///////////////////////////////////////////////////////////////////
+
+#include "STGC_RawDataProviderToolMT.h"
+#include "MuonRDO/STGC_RawDataContainer.h"
+#include "eformat/SourceIdentifier.h"
+using eformat::helper::SourceIdentifier;
+
+//==============================================================================
+Muon::STGC_RawDataProviderToolMT::STGC_RawDataProviderToolMT(const std::string& t, const std::string& n, const IInterface* p)
+: STGC_RawDataProviderToolCore(t, n, p)
+{
+ declareInterface<IMuonRawDataProviderTool>(this);
+ declareProperty("sTgcContainerCacheKey", m_rdoContainerCacheKey, "Optional external cache for the sTGC container");
+}
+
+
+//==============================================================================
+StatusCode Muon::STGC_RawDataProviderToolMT::initialize()
+{
+ // generate all the Source Identifiers to request the fragments.
+ // assume 16 RODs per side (one per sector) and that ROB ID = ROD ID.
+ for (uint32_t detID : {eformat::MUON_STGC_ENDCAP_A_SIDE, eformat::MUON_STGC_ENDCAP_C_SIDE}) { //0x6D, 0x6E
+ for (uint16_t sectorID(0); sectorID < 16; ++sectorID) {
+ SourceIdentifier sid(static_cast<eformat::SubDetector>(detID), sectorID);
+ m_allRobIds.push_back(sid.simple_code());
+ }
+ }
+
+ ATH_CHECK(m_rdoContainerCacheKey.initialize(!m_rdoContainerCacheKey.key().empty()));
+ ATH_CHECK(STGC_RawDataProviderToolCore::initialize());
+ return StatusCode::SUCCESS;
+}
+
+
+//==============================================================================
+StatusCode Muon::STGC_RawDataProviderToolMT::initRdoContainer(const EventContext& ctx, STGC_RawDataContainer*& rdoContainer) const
+{
+ // Create the identifiable RdoContainer in StoreGate to be filled with decoded fragment contents.
+ SG::WriteHandle<STGC_RawDataContainer> rdoContainerHandle(m_rdoContainerKey, ctx);
+
+ const bool externalCacheRDO = !m_rdoContainerCacheKey.key().empty();
+ if(!externalCacheRDO){
+ ATH_CHECK(rdoContainerHandle.record(std::make_unique<STGC_RawDataContainer>(m_maxhashtoUse)));
+ ATH_MSG_DEBUG("Created STGC RDO container");
+ } else {
+ SG::UpdateHandle<STGC_RawDataCollection_Cache> update(m_rdoContainerCacheKey, ctx);
+ ATH_CHECK(update.isValid());
+ ATH_CHECK(rdoContainerHandle.record(std::make_unique<STGC_RawDataContainer>(update.ptr())));
+ ATH_MSG_DEBUG("Created STGC RDO container using cache for " << m_rdoContainerCacheKey.key());
+ }
+
+ // this should never happen, but since we dereference the pointer, we should check
+ if (!(rdoContainer = rdoContainerHandle.ptr())) {
+ ATH_MSG_ERROR("The STGC RDO container is null, cannot decode STGC data");
+ return StatusCode::FAILURE;
+ }
+
+ return StatusCode::SUCCESS;
+}
+
+
+//==============================================================================
+StatusCode Muon::STGC_RawDataProviderToolMT::convert(const std::vector<IdentifierHash>& rdoIdhVect, const EventContext& ctx) const
+{
+ // method for RoI-seeded mode. we don't let empty hash containers reach the decoder,
+ // since an empty container means unseeded mode (decode everything).
+
+ STGC_RawDataContainer* rdoContainer{nullptr};
+ ATH_CHECK(initRdoContainer(ctx, rdoContainer));
+
+ std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*> vecRobf;
+ m_robDataProvider->getROBData(m_allRobIds, vecRobf);
+
+ return convertIntoContainer(vecRobf, rdoIdhVect, *rdoContainer);
+}
+
+
+//==============================================================================
+StatusCode Muon::STGC_RawDataProviderToolMT::convert(const EventContext& ctx) const
+{
+ // method for unseeded mode. just decode everything.
+
+ STGC_RawDataContainer* rdoContainer{nullptr};
+ ATH_CHECK(initRdoContainer(ctx, rdoContainer));
+
+ std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*> vecRobf;
+ m_robDataProvider->getROBData(m_allRobIds, vecRobf);
+
+ // dummy hashID vector for the decoder (empty = unseeded mode)
+ const std::vector<IdentifierHash> rdoIdhVect;
+
+ return convertIntoContainer(vecRobf, rdoIdhVect, *rdoContainer);
+}
+
+
+//===============================================================================
+StatusCode Muon::STGC_RawDataProviderToolMT::convert() const
+{
+ ATH_MSG_ERROR("STGC_RawDataProviderToolMT::convert() Not implemented.");
+ return StatusCode::FAILURE;
+}
+
+StatusCode Muon::STGC_RawDataProviderToolMT::convert(const ROBFragmentList& ) const
+{
+ ATH_MSG_ERROR("STGC_RawDataProviderToolMT::convert(const ROBFragmentList& vecRobs) Not implemented.");
+ return StatusCode::FAILURE;
+}
+
+StatusCode Muon::STGC_RawDataProviderToolMT::convert(const std::vector<IdentifierHash>& ) const
+{
+ ATH_MSG_ERROR("STGC_RawDataProviderToolMT::convert(const std::vector<IdentifierHash>& rdoIdhVect) Not implemented.");
+ return StatusCode::FAILURE;
+}
+
+StatusCode Muon::STGC_RawDataProviderToolMT::convert(const ROBFragmentList&, const std::vector<IdentifierHash>&) const
+{
+ ATH_MSG_ERROR("STGC_RawDataProviderToolMT::convert(const ROBFragmentList& vecRobs, const std::vector<IdentifierHash>&) Not implemented.");
+ return StatusCode::FAILURE;
+}
diff --git a/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/STGC_RawDataProviderToolMT.h b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/STGC_RawDataProviderToolMT.h
new file mode 100644
index 000000000000..fa7d518c2f82
--- /dev/null
+++ b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/STGC_RawDataProviderToolMT.h
@@ -0,0 +1,54 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONTGC_CNVTOOLS_STGC_RAWDATAPROVIDERTOOLMT_H
+#define MUONTGC_CNVTOOLS_STGC_RAWDATAPROVIDERTOOLMT_H
+
+#include "STGC_RawDataProviderToolCore.h"
+#include "MuonCnvToolInterfaces/IMuonRawDataProviderTool.h"
+#include "MuonRDO/STGC_RawDataCollection_Cache.h"
+
+namespace Muon
+{
+ /** @class STGC_RawDataProviderToolMT
+ * A tool to decode STGC ROB fragments into STGC RDO (based on the TGC tool).
+ * @author Stelios Angelidakis <sangelid@cern.ch>
+ */
+
+ class STGC_RawDataProviderToolMT : virtual public IMuonRawDataProviderTool, public STGC_RawDataProviderToolCore
+ {
+ public:
+
+ using IMuonRawDataProviderTool::convert; // Otherwise get a -Woverloaded-virtual warning about hiding convert(const std::vector<IdentifierHash>& rdoIdhVect)
+
+ /** Default constructor */
+ STGC_RawDataProviderToolMT(const std::string& t, const std::string& n, const IInterface* p);
+
+ /** Default destructor */
+ virtual ~STGC_RawDataProviderToolMT() = default;
+
+ /** Standard AlgTool method */
+ virtual StatusCode initialize() override;
+
+ // unused, needing initialization
+ virtual StatusCode convert() const override;
+ virtual StatusCode convert(const ROBFragmentList&) const override;
+ virtual StatusCode convert(const std::vector<IdentifierHash>& rdoIdhVect) const override;
+ virtual StatusCode convert(const ROBFragmentList&, const std::vector<IdentifierHash>&) const override;
+
+ // used
+ virtual StatusCode convert(const EventContext&) const override;
+ virtual StatusCode convert(const std::vector<IdentifierHash>&, const EventContext&) const override;
+
+ protected:
+
+ StatusCode initRdoContainer(const EventContext&, STGC_RawDataContainer*&) const;
+ std::vector<uint32_t> m_allRobIds;
+
+ // Key for the cache for the CSM containers; can be empty,
+ SG::UpdateHandleKey<STGC_RawDataCollection_Cache> m_rdoContainerCacheKey;
+ };
+} // end of namespace
+
+#endif // MUONTGC_CNVTOOLS_TGC_RAWDATAPROVIDERTOOLMT_H
diff --git a/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/components/MuonSTGC_CnvTools_entries.cxx b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/components/MuonSTGC_CnvTools_entries.cxx
index b6b509d138b6..e25b24052698 100644
--- a/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/components/MuonSTGC_CnvTools_entries.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools/src/components/MuonSTGC_CnvTools_entries.cxx
@@ -2,9 +2,19 @@
#include "../sTgcRdoToPrepDataToolCore.h"
#include "../sTgcRdoToPrepDataToolMT.h"
#include "../STGC_RawDataProviderTool.h"
+#include "../STGC_RawDataProviderToolMT.h"
+#include "../STGC_ROD_Decoder.h"
#include "../STGC_RDO_Decoder.h"
+#include "../PadTrig_ROD_Decoder.h"
+#include "../PadTrig_RawDataProviderTool.h"
+#include "../PadTrig_RawDataProviderToolMT.h"
DECLARE_COMPONENT( Muon::sTgcRdoToPrepDataTool )
DECLARE_COMPONENT( Muon::sTgcRdoToPrepDataToolMT )
DECLARE_COMPONENT( Muon::STGC_RawDataProviderTool )
+DECLARE_COMPONENT( Muon::STGC_RawDataProviderToolMT )
+DECLARE_COMPONENT( Muon::STGC_ROD_Decoder )
DECLARE_COMPONENT( Muon::STGC_RDO_Decoder )
+DECLARE_COMPONENT( Muon::PadTrig_ROD_Decoder )
+DECLARE_COMPONENT( Muon::PadTrig_RawDataProviderTool )
+DECLARE_COMPONENT( Muon::PadTrig_RawDataProviderToolMT )
\ No newline at end of file
diff --git a/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py b/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py
index 2e391380b559..125e4dfa758b 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py
@@ -11,23 +11,26 @@ class MuonCacheNames(object):
CscCache = "CscRdoCache"
RpcCache = "RpcRdoCache"
TgcCache = "TgcRdoCache"
-
+
## This configuration function creates the IdentifiableCaches for RDO
#
# The function returns a ComponentAccumulator which should be loaded first
# If a configuration wants to use the cache, they need to use the same names as defined here
def MuonCacheCfg():
+
+ from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags
+
acc = ComponentAccumulator()
MuonCacheCreator=CompFactory.MuonCacheCreator
cacheCreator = MuonCacheCreator(MdtCsmCacheKey = MuonCacheNames.MdtCsmCache,
- CscCacheKey = MuonCacheNames.CscCache,
+ CscCacheKey = (MuonCacheNames.CscCache if MuonGeometryFlags.hasCSC() else ""),
RpcCacheKey = MuonCacheNames.RpcCache,
TgcCacheKey = MuonCacheNames.TgcCache)
+
acc.addEventAlgo( cacheCreator, primary=True )
return acc
-
## This configuration function sets up everything for decoding RPC bytestream data into RDOs
#
# The function returns a ComponentAccumulator and the data-decoding algorithm, which should be added to the right sequence by the user
@@ -225,6 +228,100 @@ def CscBytestreamDecodeCfg(flags, name="CscRawDataProvider"):
return acc
+def sTgcBytestreamDecodeCfg(flags, name="sTgcRawDataProvider"):
+
+ acc = ComponentAccumulator()
+
+ # We need the sTGC cabling to be setup
+ #from MuonConfig.MuonCablingConfig import STGCCablingConfigCfg
+ #acc.merge( STGCCablingConfigCfg(flags) )
+
+ # Make sure muon geometry is configured
+ from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg
+ acc.merge(MuonGeoModelCfg(flags))
+
+ # Setup the sTGC ROD decoder
+ Muon__STGC_ROD_Decoder=CompFactory.Muon.STGC_ROD_Decoder
+ STGCRodDecoder = Muon__STGC_ROD_Decoder(name = "sTgcROD_Decoder")
+
+ # RAW data provider tool needs ROB data provider service (should be another Config function?)
+ ROBDataProviderSvc=CompFactory.ROBDataProviderSvc
+ robDPSvc = ROBDataProviderSvc()
+ acc.addService( robDPSvc )
+
+ # Setup the RAW data provider tool
+ keyName = flags.Overlay.BkgPrefix + "sTGCRDO" if flags.Common.ProductionStep == ProductionStep.Overlay else "sTGCRDO"
+ Muon__STGC_RawDataProviderToolMT=CompFactory.Muon.STGC_RawDataProviderToolMT
+ MuonsTgcRawDataProviderTool = Muon__STGC_RawDataProviderToolMT(name = "STGC_RawDataProviderToolMT",
+ Decoder = STGCRodDecoder,
+ RdoLocation = keyName )
+
+ #if flags.Muon.MuonTrigger:
+ # MuonsTgcRawDataProviderTool.sTgcContainerCacheKey = MuonCacheNames.sTgcCache
+
+ acc.addPublicTool( MuonsTgcRawDataProviderTool ) # This should be removed, but now defined as PublicTool at MuFastSteering
+
+ # Setup the RAW data provider algorithm
+ Muon__sTgcRawDataProvider=CompFactory.Muon.sTgcRawDataProvider
+ sTgcRawDataProvider = Muon__sTgcRawDataProvider(name = name,
+ ProviderTool = MuonsTgcRawDataProviderTool )
+ if flags.Muon.MuonTrigger:
+ sTgcRawDataProvider.DoSeededDecoding = True
+ # add RegSelTool
+ from RegionSelector.RegSelToolConfig import regSelTool_STGC_Cfg
+ sTgcRawDataProvider.RegionSelectionTool = acc.popToolsAndMerge( regSelTool_STGC_Cfg( flags ) )
+
+
+ acc.addEventAlgo(sTgcRawDataProvider,primary=True)
+
+ return acc
+
+def MmBytestreamDecodeCfg(flags, name="MmRawDataProvider"):
+ acc = ComponentAccumulator()
+
+ # We need the MM cabling to be setup
+ #from MuonConfig.MuonCablingConfig import MM_CablingConfigCfg
+ #acc.merge( MM_CablingConfigCfg(flags) )
+
+ # Make sure muon geometry is configured
+ from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg
+ acc.merge(MuonGeoModelCfg(flags))
+
+ # Setup the MM ROD decoder
+ Muon__MmROD_Decoder=CompFactory.Muon.MM_ROD_Decoder
+ MMRodDecoder = Muon__MmROD_Decoder(name="MmROD_Decoder")
+
+ # RAW data provider tool needs ROB data provider service (should be another Config function?)
+ ROBDataProviderSvc=CompFactory.ROBDataProviderSvc
+ robDPSvc = ROBDataProviderSvc()
+ acc.addService( robDPSvc )
+
+ # Setup the RAW data provider tool
+ #keyName = flags.Overlay.BkgPrefix + "MMRDO" if flags.Detector.OverlayMM else "MMRDO"
+ keyName = flags.Overlay.BkgPrefix + "MMRDO" if flags.Common.ProductionStep == ProductionStep.Overlay else "MMRDO"
+ Muon_MM_RawDataProviderToolMT = CompFactory.Muon.MM_RawDataProviderToolMT
+ MuonMmRawDataProviderTool = Muon_MM_RawDataProviderToolMT(name = "MM_RawDataProviderToolMT",
+ Decoder = MMRodDecoder,
+ RdoLocation = keyName)
+
+ #if flags.Muon.MuonTrigger:
+ # MuonMmRawDataProviderTool.RawDataContainerCacheKey = MuonCacheNames.MicromegasCache
+
+ acc.addPublicTool( MuonMmRawDataProviderTool ) # This should be removed, but now defined as PublicTool at MuFastSteering
+
+ # Setup the RAW data provider algorithm
+ Muon__MmRawDataProvider = CompFactory.Muon.MM_RawDataProvider
+ MmRawDataProvider = Muon__MmRawDataProvider(name = name, ProviderTool = MuonMmRawDataProviderTool )
+ if flags.Muon.MuonTrigger:
+ MmRawDataProvider.DoSeededDecoding = True
+ # add RegSelTool
+ from RegionSelector.RegSelToolConfig import regSelTool_MM_Cfg
+ MmRawDataProvider.RegionSelectionTool = acc.popToolsAndMerge( regSelTool_MM_Cfg( flags ) )
+
+ acc.addEventAlgo(MmRawDataProvider,primary=True)
+
+ return acc
+
def MuonByteStreamDecodersCfg(flags):
cfg=ComponentAccumulator()
@@ -241,15 +338,28 @@ def MuonByteStreamDecodersCfg(flags):
cfg.merge( tgcdecodingAcc )
# Schedule Mdt data decoding
-
mdtdecodingAcc = MdtBytestreamDecodeCfg( flags )
cfg.merge( mdtdecodingAcc )
- # Schedule Csc data decoding
- cscdecodingAcc = CscBytestreamDecodeCfg( flags )
- cfg.merge( cscdecodingAcc )
+ from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags
+
+ if MuonGeometryFlags.hasCSC():
+ # Schedule Csc data decoding
+ cscdecodingAcc = CscBytestreamDecodeCfg( flags )
+ cfg.merge( cscdecodingAcc )
+
+ if (MuonGeometryFlags.hasSTGC() and MuonGeometryFlags.hasMM()):
+ # Schedule MM data decoding
+ mmdecodingAcc = MmBytestreamDecodeCfg( flags )
+ cfg.merge( mmdecodingAcc )
+
+ # Schedule sTGC data decoding
+ stgcdecodingAcc = sTgcBytestreamDecodeCfg( flags )
+ cfg.merge( stgcdecodingAcc )
+
return cfg
+
if __name__=="__main__":
# To run this, do e.g.
# python ../athena/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecode.py
--
GitLab
From 117447ee3c923ab1e39446560a97046ebe96656e Mon Sep 17 00:00:00 2001
From: Varsiha Sothilingam <varsiha.sothilingam@kip.uni-heidelberg.de>
Date: Tue, 24 Aug 2021 13:09:14 +0200
Subject: [PATCH 253/272] L1Calo Bitwise Offline Simulation: jFEX Forward Jets
completed
---
.../xAOD/xAODTrigger/Root/jFexLRJetRoI_v1.cxx | 162 +++++++++++---
.../xAOD/xAODTrigger/Root/jFexSRJetRoI_v1.cxx | 207 +++++++++++-------
.../xAODTrigger/versions/jFexLRJetRoI_v1.h | 7 +-
.../xAODTrigger/versions/jFexSRJetRoI_v1.h | 9 +-
.../L1CaloFEXSim/L1CaloFEXSim/jFEXFPGA.h | 17 +-
.../L1CaloFEXSim/jFEXForwardJetsAlgo.h | 6 +-
.../L1CaloFEXSim/jFEXOutputCollection.h | 117 +++++-----
.../share/jFEXDriverJobOptions.py | 1 -
.../L1CaloFEX/L1CaloFEXSim/src/jFEXFPGA.cxx | 197 ++++++++++-------
.../L1CaloFEXSim/src/jFEXForwardJetsAlgo.cxx | 73 ++++--
.../L1CaloFEXSim/src/jFEXForwardJetsInfo.cxx | 4 +-
.../L1CaloFEXSim/src/jFEXPileupAndNoise.cxx | 3 -
.../L1CaloFEXSim/src/jFEXSmallRJetAlgo.cxx | 9 +-
.../src/jSuperCellTowerMapper.cxx | 1 +
.../L1CaloFEXSim/src/jTowerBuilder.cxx | 2 -
.../IjFEXForwardJetsAlgo.h | 3 +-
16 files changed, 507 insertions(+), 311 deletions(-)
diff --git a/Event/xAOD/xAODTrigger/Root/jFexLRJetRoI_v1.cxx b/Event/xAOD/xAODTrigger/Root/jFexLRJetRoI_v1.cxx
index f708004e538f..6413321420e3 100644
--- a/Event/xAOD/xAODTrigger/Root/jFexLRJetRoI_v1.cxx
+++ b/Event/xAOD/xAODTrigger/Root/jFexLRJetRoI_v1.cxx
@@ -17,8 +17,26 @@ namespace xAOD {
const float jFexLRJetRoI_v1::s_tobEtScale = 200.;
const float jFexLRJetRoI_v1::s_towerEtaWidth = 0.1;
const float jFexLRJetRoI_v1::s_towerPhiWidth = 0.1;
- const float jFexLRJetRoI_v1::s_minEta = -4.9;
+ // globalEta/Phi calculation in the FCAL varies depending on position in eta space due to TT granularity change.
+ //| Region | eta region | TT (eta x phi)
+ //---------------------------------------------------------
+ // Region 1 EMB | |eta| < 25 | (1 x 1)
+ // Region 2 EMIE | 25 < |eta|< 31 | (2 x 2)
+ // Region 3 TRANS | 31 < |eta| < 32 | (1 x 2)
+ // Region 4 FCAL | |eta| > 32 | (2 x 4)
+
+ //eta position in FCAL FPGAs
+ const std::vector<int> jFexLRJetRoI_v1::s_FWD_EtaPosition = {0, 8, //Region 1
+ 9, 11, //Region 2
+ 12, //Region 3
+ 13, 23}; //Region 4
+
+ //eta position of FCAL EM layer as an integer
+ //Needs to be modified with firmware values
+ const std::vector<int> jFexLRJetRoI_v1::s_FCAL_EtaPosition = {32,34,35,37,38,40,41,43,44,46,47,49};
+
+
jFexLRJetRoI_v1::jFexLRJetRoI_v1()
: SG::AuxElement() {
}
@@ -33,12 +51,13 @@ namespace xAOD {
setTobSat(unpackSaturationIndex());
setGlobalEta(unpackGlobalEta());
setGlobalPhi(unpackGlobalPhi());
- setEta( (unpackGlobalEta()+0.5)/10 );
- setPhi( (unpackGlobalPhi()+0.5)/10 );
+ setEta( (unpackGlobalEta()+unpackTTweightEta())/10 );
+ setPhi( (unpackGlobalPhi()+unpackTTweightPhi())/10 );
+
//include in future when xTOB in jFEX has been implemented.
// If the object is a TOB then the isTOB should be true.
- // For xTOB default is false, but should be set if a matching TOB is found
+ // For xTOB default is false, but should be set if a matching TOB is found
// if (type() == TOB) setIsTOB(1);
// else setIsTOB(0);
@@ -66,7 +85,8 @@ namespace xAOD {
AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( jFexLRJetRoI_v1, float, phi, setPhi)
//-----------------
- /// Methods to decode data from the TOB/RoI and return to the user
+ //
+ //Methods to decode data from the TOB/RoI and return to the user
//-----------------
//include in future when xTOB in jFEX has been implemented.
@@ -108,29 +128,121 @@ namespace xAOD {
return tobEt()*s_tobEtScale;
}
- //global coords
-
- /// As the Trigger towers are 1x1 in Eta - Phi coords (x10), we add 0.5 to centre them
- int jFexLRJetRoI_v1::unpackGlobalEta() const{
-
- int globalEta = 0;
- if(jFexNumber()==0){
- globalEta = -25+tobLocalEta(); //-24.5 is the minimum eta for the most granular part of module 0 - needs to be modified for the EMEC/HEC and FCAL
+ // Global coords
+ // As the Trigger towers are 1x1 in Eta - Phi coords (x10). This changes in the FCAL, and depends on the eta position
+ int jFexLRJetRoI_v1::unpackGlobalEta() const {
+ int globalEta = 0;
+
+ if(jFexNumber()==5 ) {
+
+ if(tobLocalEta() <=s_FWD_EtaPosition[1]) { //Region 1
+ globalEta = (tobLocalEta() + (8*(jFexNumber() -3)) );
+ }
+ else if(tobLocalEta() <=s_FWD_EtaPosition[3]) { //Region 2
+ globalEta = 25 +2*(tobLocalEta()-9);
+ }
+ else if(tobLocalEta() == s_FWD_EtaPosition[4] ) { //Region 3
+ globalEta = 31;
+ }
+ else if(tobLocalEta() <= s_FWD_EtaPosition[6]) { //Region 4
+ globalEta = s_FCAL_EtaPosition[tobLocalEta()-13]-1;
+ }
+
+ }
+ else if(jFexNumber()==0) {
+
+ if(tobLocalEta() <=s_FWD_EtaPosition[1]) { //Region 1
+ globalEta = (8-tobLocalEta() + (8*(jFexNumber() -3)) )-1;
+ }
+ else if(tobLocalEta() <=s_FWD_EtaPosition[3]) { //Region 2
+ globalEta = -27 -2*(tobLocalEta()-9);
+ }
+ else if(tobLocalEta() == s_FWD_EtaPosition[4] ) { //Region 3
+ globalEta = -32;
+ }
+ else if(tobLocalEta() <= s_FWD_EtaPosition[6]) { //Region 4
+ globalEta = -s_FCAL_EtaPosition[tobLocalEta()-13];
+ }
+ }
+ else { //Module 1-4
+ globalEta = (tobLocalEta() + (8*(jFexNumber() -3)) );
+ }
+
+ return globalEta;
}
- else if(jFexNumber()==5){
- globalEta = 16+tobLocalEta(); //16.5 is the minimum eta for the most granular part of module 5 - needs to be modified for the EMEC/HEC and FCAL
+
+ uint jFexLRJetRoI_v1::unpackGlobalPhi() const {
+ uint globalPhi = 0;
+
+ //16 is the phi height of an FPGA
+ if(jFexNumber() == 0 || jFexNumber() == 5) {
+
+ if(tobLocalEta() <=s_FWD_EtaPosition[1]) { //Region 1
+ globalPhi = tobLocalPhi() + (fpgaNumber() * 16);
+ }
+ else if(tobLocalEta() <=s_FWD_EtaPosition[4]) {//Region 2 and Region 3 have the same granularity
+ globalPhi = (16*fpgaNumber()) + 2*(tobLocalPhi());
+ }
+ else if(tobLocalEta() <=s_FWD_EtaPosition[6]) {//Region 4
+ globalPhi = (16*fpgaNumber()) + 4*(tobLocalPhi());
+ }
+ }
+ else{ //Modules 1-4
+ globalPhi = tobLocalPhi() + (fpgaNumber() * 16);
+ }
+
+
+ return globalPhi;
+
+ }
+
+
+ float jFexLRJetRoI_v1::unpackTTweightEta(){
+ float weight = 0.0;
+ if(jFexNumber() == 0 || jFexNumber() == 5) {
+
+ if(tobLocalEta() <=s_FWD_EtaPosition[1]) { //Region 1
+ weight = 0.5;
+ }
+ else if(tobLocalEta() <=s_FWD_EtaPosition[3]) { //Region 2
+ weight = 1.0;
+ }
+ else if(tobLocalEta() == s_FWD_EtaPosition[4] ) { //Region 3
+ weight = 0.5;
+ }
+ else if(tobLocalEta() <=s_FWD_EtaPosition[6]) {//Region 4
+ weight = 0.5;
+ }
+ }
+ else{ //Modules 1-4
+ weight = 0.5;
+ }
+
+ return weight;
}
- else{
- globalEta = tobLocalEta()+(8*(jFexNumber() - 3)) ; // for module 1 to 4
+ float jFexLRJetRoI_v1::unpackTTweightPhi(){
+ float weight = 0.0;
+ if(jFexNumber() == 0 || jFexNumber() == 5) {
+
+ if(tobLocalEta() <=s_FWD_EtaPosition[1]) { //Region 1
+ weight = 0.5;
+ }
+ else if(tobLocalEta() <=s_FWD_EtaPosition[3]) { //Region 2
+ weight = 1.0;
+ }
+ else if(tobLocalEta() == s_FWD_EtaPosition[4] ) { //Region 3
+ weight = 1.0;
+ }
+ else if(tobLocalEta() <=s_FWD_EtaPosition[6]) {//Region 4
+ weight = 2;
+ }
+ }
+ else { //Modules 1-4
+ weight = 0.5;
+ }
+
+ return weight;
}
- return globalEta;
- }
-
- uint jFexLRJetRoI_v1::unpackGlobalPhi() const{
- uint globalPhi = tobLocalPhi() + (fpgaNumber() * 16);
- return globalPhi;
-
- }
} // namespace xAOD
diff --git a/Event/xAOD/xAODTrigger/Root/jFexSRJetRoI_v1.cxx b/Event/xAOD/xAODTrigger/Root/jFexSRJetRoI_v1.cxx
index 3653194bb29d..35cc8d600188 100644
--- a/Event/xAOD/xAODTrigger/Root/jFexSRJetRoI_v1.cxx
+++ b/Event/xAOD/xAODTrigger/Root/jFexSRJetRoI_v1.cxx
@@ -5,7 +5,6 @@
// System include(s):
#include <stdexcept>
-
// xAOD include(s):
#include "xAODCore/AuxStoreAccessorMacros.h"
@@ -16,8 +15,7 @@ namespace xAOD {
const float jFexSRJetRoI_v1::s_tobEtScale = 200.;
const float jFexSRJetRoI_v1::s_towerEtaWidth = 0.1;
- const float jFexSRJetRoI_v1::s_towerPhiWidth = 0.1;
- const float jFexSRJetRoI_v1::s_minEta = -4.9;
+ const float jFexSRJetRoI_v1::s_towerPhiWidth = 0.1;
// globalEta/Phi calculation in the FCAL varies depending on position in eta space due to TT granularity change.
@@ -27,24 +25,23 @@ namespace xAOD {
// Region 2 EMIE | 25 < |eta|< 31 | (2 x 2)
// Region 3 TRANS | 31 < |eta| < 32 | (1 x 2)
// Region 4 FCAL | |eta| > 32 | (2 x 4)
-
- //eta position in array for jfex module 0
- const std::vector<int> jFexSRJetRoI_v1::s_EtaPosition_C_Side = {28, 36, //Region 1
- 25, 27, //Region 2
- 24, //Region 3
- 13, 23}; //Region 4
- //eta position in array for jfex module 5
- const std::vector<int> jFexSRJetRoI_v1::s_EtaPosition_A_Side = { 8, 16, //Region 1
- 17, 19, //Region 2
- 20, //Region 3
- 21, 31}; //Region 4
+ //eta position in FCAL FPGAs
+ const std::vector<int> jFexSRJetRoI_v1::s_FWD_EtaPosition = {0, 8, //Region 1
+ 9, 11, //Region 2
+ 12, //Region 3
+ 13, 24}; //Region 4
+ //eta position of FCAL EM layer as an integer
+ //Needs to be modified with firmware values
+ const std::vector<int> jFexSRJetRoI_v1::s_FCAL_EtaPosition = {32,34,35,37,38,40,41,43,44,46,47,49};
jFexSRJetRoI_v1::jFexSRJetRoI_v1()
: SG::AuxElement() {
}
+
void jFexSRJetRoI_v1::initialize( uint8_t jFexNumber, uint8_t fpgaNumber, uint32_t tobWord) {
-
+
+
setTobWord( tobWord );
setjFexNumber( jFexNumber );
setfpgaNumber( fpgaNumber);
@@ -54,8 +51,9 @@ namespace xAOD {
setTobSat(unpackSaturationIndex());
setGlobalEta(unpackGlobalEta());
setGlobalPhi(unpackGlobalPhi());
- setEta( (unpackGlobalEta()+0.5)/10 );
- setPhi( (unpackGlobalPhi()+0.5)/10 );
+ setEta( (unpackGlobalEta()+unpackTTweightEta())/10 );
+ setPhi( (unpackGlobalPhi()+unpackTTweightPhi())/10 );
+
//include in future when xTOB in jFEX has been implemented.
// If the object is a TOB then the isTOB should be true.
@@ -84,12 +82,10 @@ namespace xAOD {
AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( jFexSRJetRoI_v1, int , globalEta, setGlobalEta )
AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( jFexSRJetRoI_v1, uint, globalPhi, setGlobalPhi )
- ///global coordinates, stored for furture use but not sent to L1Topo
+ ///global coordinates, stored for furture use but not sent to L1Topo
AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( jFexSRJetRoI_v1, float, eta, setEta)
AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( jFexSRJetRoI_v1, float, phi, setPhi)
-
-
-
+
//-----------------
/// Methods to decode data from the TOB/RoI and return to the user
@@ -135,68 +131,121 @@ namespace xAOD {
return tobEt()*s_tobEtScale;
}
- /// As the Trigger towers are 1x1 in Eta - Phi coords (x10)
- int jFexSRJetRoI_v1::unpackGlobalEta() const{
-
- int globalEta = 0;
-
- if(jFexNumber()==0){
- //Region 2
- if((s_EtaPosition_C_Side[2] <= tobLocalEta()) && (tobLocalEta() <=s_EtaPosition_C_Side[3])){
- globalEta = 25 + (2*(tobLocalEta() -16));
- }
- //Region 3
- if(s_EtaPosition_C_Side[5] == tobLocalEta()){
- globalEta = 32;
- }
- //Region 4
- if((s_EtaPosition_C_Side[6] <= tobLocalEta()) && (tobLocalEta() <=s_EtaPosition_C_Side[7])){
- globalEta = 32 + (tobLocalEta()-20);
- }
+ // Global coords
+ // As the Trigger towers are 1x1 in Eta - Phi coords (x10). This changes in the FCAL, and depends on the eta position
+ int jFexSRJetRoI_v1::unpackGlobalEta() const {
+ int globalEta = 0;
+
+ if(jFexNumber()==5 ) {
+
+ if(tobLocalEta() <=s_FWD_EtaPosition[1]) { //Region 1
+ globalEta = (tobLocalEta() + (8*(jFexNumber() -3)) );
+ }
+ else if(tobLocalEta() <=s_FWD_EtaPosition[3]) { //Region 2
+ globalEta = 25 +2*(tobLocalEta()-9);
+ }
+ else if(tobLocalEta() == s_FWD_EtaPosition[4] ) { //Region 3
+ globalEta = 31;
+ }
+ else if(tobLocalEta() <= s_FWD_EtaPosition[6]) { //Region 4
+ globalEta = s_FCAL_EtaPosition[tobLocalEta()-13]-1;
+ }
+
+ }
+ else if(jFexNumber()==0) {
+
+ if(tobLocalEta() <=s_FWD_EtaPosition[1]) { //Region 1
+ globalEta = (8-tobLocalEta() + (8*(jFexNumber() -3)) )-1;
+ }
+ else if(tobLocalEta() <=s_FWD_EtaPosition[3]) { //Region 2
+ globalEta = -27 -2*(tobLocalEta()-9);
+ }
+ else if(tobLocalEta() == s_FWD_EtaPosition[4] ) { //Region 3
+ globalEta = -32;
+ }
+ else if(tobLocalEta() <= s_FWD_EtaPosition[6]) { //Region 4
+ globalEta = -s_FCAL_EtaPosition[tobLocalEta()-13];
+ }
+ }
+ else { //Module 1-4
+ globalEta = (tobLocalEta() + (8*(jFexNumber() -3)) );
+ }
+
+ return globalEta;
}
- if(jFexNumber()==5){
- //Region 2
- if((s_EtaPosition_A_Side[2] <= tobLocalEta()) && (tobLocalEta() <=s_EtaPosition_A_Side[3])){
- globalEta = -25 - (2*(tobLocalEta() -16));
- }
- //Region 3
- if(s_EtaPosition_A_Side[5] == tobLocalEta()){
- globalEta = -32;
- }
- //Region 4
- if((s_EtaPosition_A_Side[6] <= tobLocalEta()) && (tobLocalEta() <=s_EtaPosition_A_Side[7])){
- globalEta = -32 - (tobLocalEta()-20);
- }
+ uint jFexSRJetRoI_v1::unpackGlobalPhi() const {
+ uint globalPhi = 0;
+
+ //16 is the phi height of an FPGA
+ if(jFexNumber() == 0 || jFexNumber() == 5) {
+
+ if(tobLocalEta() <=s_FWD_EtaPosition[1]) { //Region 1
+ globalPhi = tobLocalPhi() + (fpgaNumber() * 16);
+ }
+ else if(tobLocalEta() <=s_FWD_EtaPosition[4]) {//Region 2 and Region 3 have the same granularity
+ globalPhi = (16*fpgaNumber()) + 2*(tobLocalPhi());
+ }
+ else if(tobLocalEta() <=s_FWD_EtaPosition[6]) {//Region 4
+ globalPhi = (16*fpgaNumber()) + 4*(tobLocalPhi());
+ }
+ }
+ else { //Modules 1-4
+ globalPhi = tobLocalPhi() + (fpgaNumber() * 16);
+ }
+
+ return globalPhi;
+
}
- //Region 1
- else{
- globalEta = tobLocalEta()+(8*(jFexNumber() - 3)) ; // for module 1 to 4
+
+
+ float jFexSRJetRoI_v1::unpackTTweightEta(){
+ float weight = 0.0;
+ if(jFexNumber() == 0 || jFexNumber() == 5) {
+
+ if(tobLocalEta() <=s_FWD_EtaPosition[1]) { //Region 1
+ weight = 0.5;
+ }
+ else if(tobLocalEta() <=s_FWD_EtaPosition[3]) { //Region 2
+ weight = 1.0;
+ }
+ else if(tobLocalEta() == s_FWD_EtaPosition[4] ) { //Region 3
+ weight = 0.5;
+ }
+ else if(tobLocalEta() <=s_FWD_EtaPosition[6]) {//Region 4
+ weight = 0.5;
+ }
+ }
+ else { //Modules 1-4
+ weight = 0.5;
+ }
+
+ return weight;
}
- return globalEta;
- }
-
- uint jFexSRJetRoI_v1::unpackGlobalPhi() const{
- uint globalPhi = 0;
- //16 is the phi height of an FPGA
- if(jFexNumber()==0 || jFexNumber()==5){
- //Region 2
- if((s_EtaPosition_A_Side[2] <= tobLocalEta()) && (tobLocalEta() <=s_EtaPosition_A_Side[3])){
- globalPhi = 16*fpgaNumber() + (2*(tobLocalPhi()-4));
- }
- //Region 3
- if(s_EtaPosition_A_Side[5] == tobLocalEta()){
- globalPhi = 16*fpgaNumber() + (2*(tobLocalPhi()-4));
- }
- //Region 4
- if((s_EtaPosition_A_Side[6] <= tobLocalEta()) && (tobLocalEta() <=s_EtaPosition_A_Side[7])){
- globalPhi = (16*fpgaNumber()) + (4*(tobLocalPhi() -2));
- }
+
+ float jFexSRJetRoI_v1::unpackTTweightPhi(){
+ float weight = 0.0;
+ if(jFexNumber() == 0 || jFexNumber() == 5) {
+
+ if(tobLocalEta() <=s_FWD_EtaPosition[1]) { //Region 1
+ weight = 0.5;
+ }
+ else if(tobLocalEta() <=s_FWD_EtaPosition[3]) { //Region 2
+ weight = 1.0;
+ }
+ else if(tobLocalEta() == s_FWD_EtaPosition[4] ) { //Region 3
+ weight = 1.0;
+ }
+ else if(tobLocalEta() <=s_FWD_EtaPosition[6]) {//Region 4
+ weight = 2;
+ }
+ }
+ else { //Modules 1-4
+ weight = 0.5;
+ }
+
+ return weight;
}
- //Region 1
- else{ globalPhi = tobLocalPhi() + (fpgaNumber() * 16);}
- return globalPhi;
-
- }
+
} // namespace xAOD
diff --git a/Event/xAOD/xAODTrigger/xAODTrigger/versions/jFexLRJetRoI_v1.h b/Event/xAOD/xAODTrigger/xAODTrigger/versions/jFexLRJetRoI_v1.h
index b60a0337b872..9521ab7b09cf 100644
--- a/Event/xAOD/xAODTrigger/xAODTrigger/versions/jFexLRJetRoI_v1.h
+++ b/Event/xAOD/xAODTrigger/xAODTrigger/versions/jFexLRJetRoI_v1.h
@@ -79,8 +79,8 @@ namespace xAOD {
static const float s_tobEtScale;
static const float s_towerEtaWidth;
static const float s_towerPhiWidth;
- static const float s_minEta;
-
+ static const std::vector<int> s_FCAL_EtaPosition;
+ static const std::vector<int> s_FWD_EtaPosition;
// Data locations within word
static const int s_satBit = 0;
//static const int s_ResBit = 1;
@@ -95,6 +95,9 @@ namespace xAOD {
//static const int s_resMask = 0x7ff;
static const int s_satMask = 0x1;
+ float unpackTTweightEta();
+ float unpackTTweightPhi();
+
}; // class jFexLRJetRoI_v1
} // namespace xAOD
diff --git a/Event/xAOD/xAODTrigger/xAODTrigger/versions/jFexSRJetRoI_v1.h b/Event/xAOD/xAODTrigger/xAODTrigger/versions/jFexSRJetRoI_v1.h
index 1b58531a1c2d..0254e6acc43c 100644
--- a/Event/xAOD/xAODTrigger/xAODTrigger/versions/jFexSRJetRoI_v1.h
+++ b/Event/xAOD/xAODTrigger/xAODTrigger/versions/jFexSRJetRoI_v1.h
@@ -77,10 +77,8 @@ namespace xAOD {
static const float s_tobEtScale;
static const float s_towerEtaWidth;
static const float s_towerPhiWidth;
- static const float s_minEta;
- static const std::vector<int> s_EtaPosition_C_Side;
- static const std::vector<int> s_EtaPosition_A_Side;
-
+ static const std::vector<int> s_FWD_EtaPosition;
+ static const std::vector<int> s_FCAL_EtaPosition;
// Data locations within word
static const int s_satBit =0;
@@ -95,6 +93,9 @@ namespace xAOD {
static const int s_phiMask = 0xf;
//static const int s_resMask = 0x7ff;
static const int s_satMask = 0x1;
+
+ float unpackTTweightEta();
+ float unpackTTweightPhi();
}; // class jFexSRJetRoI_v1
diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/L1CaloFEXSim/jFEXFPGA.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/L1CaloFEXSim/jFEXFPGA.h
index 0237710cf299..e6ec4e430a79 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/L1CaloFEXSim/jFEXFPGA.h
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/L1CaloFEXSim/jFEXFPGA.h
@@ -30,10 +30,8 @@
#include "CaloIdentifier/CaloCell_SuperCell_ID.h"
#include "L1CaloFEXSim/jFEXOutputCollection.h"
#include "L1CaloFEXSim/FEXAlgoSpaceDefs.h"
-#include <vector>
-
#include "TrigConfData/L1Menu.h"
-
+#include <vector>
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/ITHistSvc.h"
@@ -42,10 +40,8 @@
#include "SGTools/TestStore.h"
#include "StoreGate/WriteHandle.h"
#include "StoreGate/ReadHandle.h"
-
#include "StoreGate/StoreGateSvc.h"
-
namespace LVL1 {
//Doxygen class description below:
@@ -126,13 +122,14 @@ namespace LVL1 {
std::map<int, jFEXForwardJetsInfo> m_FCALJets;
+ int m_SRJetET;
+ int m_LRJetET;
+
CaloCellContainer m_sCellsCollection;
SG::ReadHandleKey<LVL1::jTowerContainer> m_jFEXFPGA_jTowerContainerKey {this, "MyETowers", "jTowerContainer", "Input container for jTowers"};
- SG::ReadHandleKey<TrigConf::L1Menu> m_l1MenuKey{this, "L1TriggerMenu", "DetectorStore+L1TriggerMenu","Name of the L1Menu object to read configuration from"};
-
+ SG::ReadHandleKey<TrigConf::L1Menu> m_l1MenuKey{this, "L1TriggerMenu", "DetectorStore+L1TriggerMenu","Name of the L1Menu object to read configuration from"};
SG::WriteHandleKey<LVL1::jFEXOutputCollection> m_jFEXFPGA_jFEXOutputCollectionKey {this, "jFEXOutputCollection", "jFEXOutputCollection", "Input container for jFEXOutputCollection"};
-
ToolHandle<IjFEXSmallRJetAlgo> m_jFEXSmallRJetAlgoTool {this, "jFEXSmallRJetAlgoTool", "LVL1::jFEXSmallRJetAlgo", "Tool that runs the jFEX Small R Jet algorithm"};
ToolHandle<IjFEXLargeRJetAlgo> m_jFEXLargeRJetAlgoTool {this, "jFEXLargeRJetAlgoTool", "LVL1::jFEXLargeRJetAlgo", "Tool that runs the jFEX Large R Jet algorithm"};
ToolHandle<IjFEXtauAlgo> m_jFEXtauAlgoTool {this, "jFEXtauAlgoTool" , "LVL1::jFEXtauAlgo" , "Tool that runs the jFEX tau algorithm"};
@@ -144,12 +141,10 @@ namespace LVL1 {
ToolHandle<IjFEXPileupAndNoise> m_jFEXPileupAndNoiseTool {this, "jFEXPileupAndNoiseTool", "LVL1::jFEXPileupAndNoise", "Tool that applies Pileup and Noise"};
int getTTowerET_SG(unsigned int TTID);
-
-
};
} // end of namespace
-CLASS_DEF( LVL1::jFEXFPGA , 76081081 , 1 )
+CLASS_DEF( LVL1::jFEXFPGA , 76081081 , 1 )
#endif
diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/L1CaloFEXSim/jFEXForwardJetsAlgo.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/L1CaloFEXSim/jFEXForwardJetsAlgo.h
index 58819985557a..25d328cac7e2 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/L1CaloFEXSim/jFEXForwardJetsAlgo.h
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/L1CaloFEXSim/jFEXForwardJetsAlgo.h
@@ -47,12 +47,12 @@ namespace LVL1 {
virtual float globalEta(int nphi, int neta) override;
virtual unsigned int localPhi(int nphi, int neta) override;
virtual unsigned int localEta(int nphi, int neta) override;
- virtual int getTTowerET(int nphi, int neta) override;
-
+ virtual unsigned int getTTowerET(int nphi, int neta) override;
virtual std::map<int, jFEXForwardJetsInfo> FcalJetsTowerIDLists() override;
virtual std::map<int, jFEXForwardJetsInfo> isSeedLocalMaxima() override;
virtual std::map<int, jFEXForwardJetsInfo> calculateJetETs() override;
virtual void setFPGAEnergy(std::map<int,std::vector<int> > et_map) override;
+
protected:
private:
@@ -60,6 +60,8 @@ namespace LVL1 {
int m_jFEXalgoTowerID[FEXAlgoSpaceDefs::jFEX_algoSpace_height][FEXAlgoSpaceDefs::jFEX_wide_algoSpace_width];
bool m_storeEnergyRingTTIDs;
std::map<int,std::vector<int> > m_map_Etvalues;
+ int m_lowerEM_eta;
+ int m_upperEM_eta;
};
}//end of namespace
#endif
diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/L1CaloFEXSim/jFEXOutputCollection.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/L1CaloFEXSim/jFEXOutputCollection.h
index 83ec1dc3223b..5b763ff346ea 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/L1CaloFEXSim/jFEXOutputCollection.h
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/L1CaloFEXSim/jFEXOutputCollection.h
@@ -1,68 +1,57 @@
-/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
-
-//***************************************************************************
-// jFEXOutputCollection.h -
-// -------------------
-// begin : 09 12 2020
-// email : varsiha.sothilingam@cern.ch
-// **************************************************************************
-
-
-#ifndef JFEX_OUTPUT_COLLECTION_H
-#define JFEX_OUTPUT_COLLECTION_H
-
-#include "AthenaKernel/CLASS_DEF.h"
-#include "StoreGate/StoreGateSvc.h"
-#include <map>
-#include <iostream>
-#include <vector>
-#include <string>
-
-namespace LVL1 {
- class jFEXOutputCollection
- {
- public:
- jFEXOutputCollection() {};
- ~jFEXOutputCollection();
- void clear();
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+//***************************************************************************
+// jFEXOutputCollection.h -
+// -------------------
+// begin : 09 12 2020
+// email : varsiha.sothilingam@cern.ch
+// **************************************************************************
+
+#ifndef JFEX_OUTPUT_COLLECTION_H
+#define JFEX_OUTPUT_COLLECTION_H
+
+#include "AthenaKernel/CLASS_DEF.h"
+#include "StoreGate/StoreGateSvc.h"
+#include <map>
+#include <iostream>
+#include <vector>
+#include <string>
+
+namespace LVL1 {
+ class jFEXOutputCollection
+ {
+ public:
+ jFEXOutputCollection() {};
+ ~jFEXOutputCollection();
+ void clear();
void addValue_smallRJet(std::string, int);
- void fill_smallRJet();
- void addValue_largeRJet(std::string, int);
- void fill_largeRJet();
- void addValue_tau(std::string, int);
- void fill_tau();
- void addValue_pileup(std::string, int);
- void fill_pileup();
-
- int SRsize();
- int LRsize();
+ void fill_smallRJet();
+ void addValue_largeRJet(std::string, int);
+ void fill_largeRJet();
+ void addValue_tau(std::string, int);
+ void fill_tau();
+ void addValue_pileup(std::string, int);
+ void fill_pileup();
+ int SRsize();
+ int LRsize();
int tausize();
- int pileupsize();
-
- std::map<std::string, int>* get_smallRJet(int);
+ int pileupsize();
+ std::map<std::string, int>* get_smallRJet(int);
std::map<std::string, int>* get_largeRJet(int);
- std::map<std::string, int>* get_tau(int);
- std::map<std::string, int>* get_pileup(int);
-
- private:
-
- std::map<std::string, int> m_values_tem_smallRJet;
- std::vector<std::map<std::string, int>*> m_allvalues_smallRJet;
-
- std::map<std::string, int> m_values_tem_largeRJet;
- std::vector<std::map<std::string, int>*> m_allvalues_largeRJet;
-
- std::map<std::string, int> m_values_tem_tau;
- std::vector<std::map<std::string, int>*> m_allvalues_tau;
-
- std::map<std::string, int> m_values_tem_pileup;
- std::vector<std::map<std::string, int>*> m_allvalues_pileup;
- };
-}
-
-CLASS_DEF(LVL1::jFEXOutputCollection, 1317184196 , 1 )
-
-#endif
+ std::map<std::string, int>* get_tau(int);
+ std::map<std::string, int>* get_pileup(int);
+ private:
+ std::map<std::string, int> m_values_tem_smallRJet;
+ std::vector<std::map<std::string, int>*> m_allvalues_smallRJet;
+ std::map<std::string, int> m_values_tem_largeRJet;
+ std::vector<std::map<std::string, int>*> m_allvalues_largeRJet;
+ std::map<std::string, int> m_values_tem_tau;
+ std::vector<std::map<std::string, int>*> m_allvalues_tau;
+ std::map<std::string, int> m_values_tem_pileup;
+ std::vector<std::map<std::string, int>*> m_allvalues_pileup;
+ };
+}
+CLASS_DEF(LVL1::jFEXOutputCollection, 1317184196 , 1 )
+#endif
diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/share/jFEXDriverJobOptions.py b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/share/jFEXDriverJobOptions.py
index 4e5e0e44b798..08a57ad6c02c 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/share/jFEXDriverJobOptions.py
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/share/jFEXDriverJobOptions.py
@@ -136,7 +136,6 @@ StreamAOD.ItemList+=["xAOD::TrigNavigationAuxInfo#TrigNavigationAux."]
-
#######################################################
log.info("==========================================================")
log.info("Scheduling jFEXDriver")
diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXFPGA.cxx b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXFPGA.cxx
index dbf3c1f850fa..0a243a7d02e2 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXFPGA.cxx
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXFPGA.cxx
@@ -26,12 +26,12 @@
#include "L1CaloFEXSim/jFEXForwardJetsAlgo.h"
#include "L1CaloFEXSim/jFEXForwardJetsInfo.h"
#include "L1CaloFEXSim/jFEXPileupAndNoise.h"
-
#include "CaloEvent/CaloCellContainer.h"
#include "CaloIdentifier/CaloIdManager.h"
#include "CaloIdentifier/CaloCell_SuperCell_ID.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include <vector>
+#include "TrigConfData/L1Menu.h"
#include "TH1F.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ISvcLocator.h"
@@ -42,7 +42,6 @@
#include "SGTools/TestStore.h"
#include "StoreGate/StoreGateSvc.h"
-#include "TrigConfData/L1Menu.h"
namespace LVL1 {
@@ -137,8 +136,6 @@ StatusCode jFEXFPGA::execute() {
m_map_EM_Etvalues_FPGA = m_jFEXPileupAndNoiseTool->Get_EM_Et_values();
m_map_Etvalues_FPGA = m_jFEXPileupAndNoiseTool->GetEt_values();
-
-
if(m_id==0 || m_id==2){
//ATH_CHECK( m_jFEXsumETAlgoTool.retrieve());
ATH_CHECK( m_jFEXsumETAlgoTool->safetyTest());
@@ -200,14 +197,11 @@ StatusCode jFEXFPGA::execute() {
//-----------jFEXSmallRJet & Large R Jet Algo-----------------
ATH_MSG_DEBUG("==== jFEXSmallRJetAlgo ========");
-
-
//Central region algorithms
if(m_jfexid > 0 && m_jfexid < 5){
for(int mphi = 8; mphi < FEXAlgoSpaceDefs::jFEX_algoSpace_height -8; mphi++) {
for(int meta = 8; meta < FEXAlgoSpaceDefs::jFEX_thin_algoSpace_width -8; meta++) {
-
-
+
//create search window including towerIDs required for seeding.
int SRJet_SearchWindow[7][7] = {{0}};
for(int i = -3 ; i <4; i++){
@@ -269,14 +263,16 @@ StatusCode jFEXFPGA::execute() {
if(!SRJet_LM){continue;}
std::unique_ptr<jFEXSmallRJetTOB> tmp_SRJet_tob = m_jFEXSmallRJetAlgoTool->getSmallRJetTOBs();
- bool check = m_jFEXSmallRJetAlgoTool->checkDisplacedLM();
+ bool isLMdisplaced = m_jFEXSmallRJetAlgoTool->checkDisplacedLM();
+ if(isLMdisplaced && (meta == 8 || mphi == 8) ){
+ continue; // avoiding edges in the core FPGA, cannot be displaced to the overlap. will be identified in the next FPGA
+ }
//to check if Local Maxima is displaced.
int meta_LM = meta;
int mphi_LM = mphi;
- if(check && SRJet_LM){
+ if(isLMdisplaced ){
meta_LM = meta -1;
mphi_LM = mphi -1;
-
}
bool SR_TOB_saturated = false;
@@ -292,6 +288,7 @@ StatusCode jFEXFPGA::execute() {
uint32_t SRJet_tobword = formSmallRJetTOB(mphi_LM, meta_LM);
m_SRJet_tobwords.push_back(SRJet_tobword);
+
jFEXOutputs->addValue_smallRJet("smallRJetTOB_word",SRJet_tobword);
jFEXOutputs->addValue_smallRJet("smallRJetTOB_jfexID", m_jfexid);
jFEXOutputs->addValue_smallRJet("smallRJetTOB_fpgaID", m_id);
@@ -316,13 +313,11 @@ StatusCode jFEXFPGA::execute() {
jFEXOutputs->fill_largeRJet();
uint32_t LRJet_tobword = formLargeRJetTOB(mphi, meta);
if ( LRJet_tobword != 0 ) m_LRJet_tobwords.push_back(LRJet_tobword);
- m_SRJet_tobwords.push_back(SRJet_tobword);
jFEXOutputs->addValue_largeRJet("largeRJetTOB_word", LRJet_tobword);
jFEXOutputs->addValue_largeRJet("largeRJetTOB_jfexID", m_jfexid);
jFEXOutputs->addValue_largeRJet("largeRJetTOB_fpgaID", m_id);
}
}
-
} //end of if statement for checking if in central jfex modules
jFEXOutputs->fill_smallRJet();
@@ -330,44 +325,51 @@ jFEXOutputs->fill_largeRJet();
//**********Forward Jets***********************
-//FCAL region algorithm
-if((m_jfexid ==0 || m_jfexid ==5) and 0 ){ //This is currently masked due to on going debugging in this FCAL Jets Algorithm
+//FCAL region algorithm
+if(m_jfexid ==0 || m_jfexid ==5){
+ ATH_CHECK(m_jFEXForwardJetsAlgoTool->initialize());
+ ATH_CHECK(m_jFEXForwardJetsAlgoTool->safetyTest());
+ m_jFEXForwardJetsAlgoTool->setFPGAEnergy(m_map_Etvalues_FPGA);
m_jFEXForwardJetsAlgoTool->setup(m_jTowersIDs_Wide);
+
m_FCALJets = m_jFEXForwardJetsAlgoTool->calculateJetETs();
for(std::map<int, jFEXForwardJetsInfo>::iterator it = m_FCALJets.begin(); it!=(m_FCALJets.end()); ++it){
jFEXForwardJetsInfo FCALJets = it->second;
+
int iphi = FCALJets.getCentreLocalTTPhi();
int ieta = FCALJets.getCentreLocalTTEta();
-
+
+ float centre_eta = std::round(FCALJets.getCentreTTEta()*10);
+ float centre_phi = std::round(FCALJets.getCentreTTPhi()*10);
+ int output_centre_eta = static_cast<int> (centre_eta);
+ int output_centre_phi = static_cast<int> (centre_phi);
+
+ m_SRJetET = FCALJets.getSeedET() + FCALJets.getFirstEnergyRingET();
+ m_LRJetET = m_SRJetET + FCALJets.getSecondEnergyRingET();
+
uint32_t SRFCAL_Jet_tobword = formSmallRJetTOB(iphi, ieta);
if ( SRFCAL_Jet_tobword != 0 ) m_SRJet_tobwords.push_back(SRFCAL_Jet_tobword);
uint32_t LRFCAL_Jet_tobword = formLargeRJetTOB(iphi, ieta);
if ( LRFCAL_Jet_tobword != 0 ) m_LRJet_tobwords.push_back(LRFCAL_Jet_tobword);
-
- float centre_eta = std::round(FCALJets.getCentreTTEta()*10);
- float centre_phi = std::round(FCALJets.getCentreTTPhi()*10);
- int output_centre_eta = static_cast<int> (centre_eta);
- int output_centre_phi = static_cast<int> (centre_phi);
- int SRJetET = FCALJets.getSeedET() + FCALJets.getFirstEnergyRingET();
- int LRJetET = SRJetET + FCALJets.getSecondEnergyRingET();
int SRFCAL_TOB_saturated = 0;
- if (SRJetET/200. > 0x7ff) SRFCAL_TOB_saturated = 1;
+ if (m_SRJetET/200. > 0x7ff) SRFCAL_TOB_saturated = 1;
unsigned int LRFCAL_TOB_saturated = 0;
- if (LRJetET/200. > 0x1fff) LRFCAL_TOB_saturated = 1;
+ if (m_LRJetET/200. > 0x1fff) LRFCAL_TOB_saturated = 1;
- //Output Collection for Small R Jet
jFEXOutputs->addValue_smallRJet("smallRJet_phi", output_centre_phi);
jFEXOutputs->addValue_smallRJet("smallRJet_eta", output_centre_eta);
- jFEXOutputs->addValue_smallRJet("smallRJet_clusterET", SRJetET);
+ jFEXOutputs->addValue_smallRJet("smallRJet_clusterET", m_SRJetET);
jFEXOutputs->addValue_smallRJet("smallRJet_sat", SRFCAL_TOB_saturated);
jFEXOutputs->addValue_smallRJet("smallRJet_isCentralTowerSeed",true);
+ jFEXOutputs->addValue_smallRJet("smallRJetTOB_jfexID", m_jfexid);
+ jFEXOutputs->addValue_smallRJet("smallRJetTOB_fpgaID", m_id);
if(m_jfexid == 0){
jFEXOutputs->addValue_smallRJet("smallRJetTOB_eta", 37-ieta);
@@ -394,34 +396,33 @@ if((m_jfexid ==0 || m_jfexid ==5) and 0 ){ //This is currently masked due to on
jFEXOutputs->addValue_largeRJet("largeRJetTOB_phi", iphi-2);
}
- jFEXOutputs->addValue_smallRJet("smallRJetTOB_ET", SRJetET/200);
+ jFEXOutputs->addValue_smallRJet("smallRJetTOB_ET", m_SRJetET/200);
jFEXOutputs->addValue_smallRJet("smallRJetTOB_sat", SRFCAL_TOB_saturated);
jFEXOutputs->addValue_smallRJet("smallRJetTOB_word", SRFCAL_Jet_tobword);
jFEXOutputs->addValue_smallRJet("smallRJetTOB_jfexID", m_jfexid);
jFEXOutputs->addValue_smallRJet("smallRJetTOB_fpgaID", m_id);
- jFEXOutputs->fill_smallRJet();
-
//Output Collection for Large R Jet
- jFEXOutputs->addValue_largeRJet("largeRJet_ET", LRJetET);
+ jFEXOutputs->addValue_largeRJet("largeRJet_ET", m_LRJetET);
jFEXOutputs->addValue_largeRJet("largeRJet_phi", output_centre_phi);
jFEXOutputs->addValue_largeRJet("largeRJet_eta", output_centre_eta);
jFEXOutputs->addValue_largeRJet("largeRJet_sat", LRFCAL_TOB_saturated);
- jFEXOutputs->addValue_largeRJet("largeRJetTOB_ET", LRJetET/200);
+ jFEXOutputs->addValue_largeRJet("largeRJetTOB_ET", m_LRJetET/200);
jFEXOutputs->addValue_largeRJet("largeRJetTOB_sat",LRFCAL_TOB_saturated);
jFEXOutputs->addValue_largeRJet("largeRJetTOB_word", LRFCAL_Jet_tobword);
jFEXOutputs->addValue_largeRJet("largeRJetTOB_jfexID", m_jfexid);
jFEXOutputs->addValue_largeRJet("largeRJetTOB_fpgaID", m_id);
- jFEXOutputs->fill_largeRJet();
-
}
-}
+
+ jFEXOutputs->fill_smallRJet();
+ jFEXOutputs->fill_largeRJet();
+} //end of if statement for checking if in central jfex modules
//******************************** TAU **********************************************
@@ -573,7 +574,7 @@ std::vector <uint32_t> jFEXFPGA::getLargeRJetTOBs()
{
auto tobsSort = m_LRJet_tobwords;
- // ATH_MSG_DEBUG("number of largeRJet tobs: " << tobsSort.size() << " in FPGA: " << m_id<< " before truncation");
+ ATH_MSG_DEBUG("number of largeRJet tobs: " << tobsSort.size() << " in FPGA: " << m_id<< " before truncation");
// sort tobs by their et ( 13 bits of the 32 bit tob word)
std::sort (tobsSort.begin(), tobsSort.end(), etLRJetSort);
tobsSort.resize(1);
@@ -582,11 +583,12 @@ std::vector <uint32_t> jFEXFPGA::getLargeRJetTOBs()
}
-uint32_t jFEXFPGA::formSmallRJetTOB(int &iphi, int &ieta) {
+uint32_t jFEXFPGA::formSmallRJetTOB(int &iphi, int &ieta)
+{
uint32_t tobWord = 0;
const unsigned int jFEXETResolution = 200; //LSB is 200MeV
- int eta = 0;
- int phi = 0;
+ unsigned int eta = 0;
+ unsigned int phi = 0;
unsigned int et = 0;
unsigned int jFEXSmallRJetTOBEt = 0;
int Res = 0; // 11 bits reserved
@@ -594,26 +596,42 @@ uint32_t jFEXFPGA::formSmallRJetTOB(int &iphi, int &ieta) {
if(m_jfexid > 0 && m_jfexid < 5) {
et = m_jFEXSmallRJetAlgoTool->getSmallClusterET();
- jFEXSmallRJetTOBEt = et/jFEXETResolution;
eta = ieta -8;
phi = iphi -8;
}
-
- if(m_jfexid ==0 || m_jfexid ==5) {
- for(std::map<int, jFEXForwardJetsInfo>::iterator it = m_FCALJets.begin(); it!=(m_FCALJets.end()); ++it) {
- jFEXForwardJetsInfo FCALJetInfo = it->second;
- eta = ieta -8;
- phi = iphi -8;
- et = FCALJetInfo.getSeedET() + FCALJetInfo.getFirstEnergyRingET();
- jFEXSmallRJetTOBEt = et/jFEXETResolution;
+ else if(m_jfexid == 5) {
+ et = m_SRJetET;
+ eta = ieta -8;
+ if(ieta < FEXAlgoSpaceDefs::jFEX_algoSpace_A_EMIE_eta) { // ieta lower than EMIE stats -> belong to EMB
+ phi = iphi-8;
+ }
+ else if(ieta < FEXAlgoSpaceDefs::jFEX_algoSpace_A_FCAL_start_eta) { // ieta lower than FCAL stats -> belong to EMIE
+ phi = iphi -4;
+ }
+ else { // rest ieta belongs to FCAL
+ phi = iphi -2;
+ }
+ }
+ else if(m_jfexid == 0) {
+ et = m_SRJetET;
+ eta = 36 - ieta;
+
+ if(ieta < FEXAlgoSpaceDefs::jFEX_algoSpace_C_FCAL_end_eta) { // ieta lower than FCal ends -> FCAL
+ phi = iphi -2 ;
+ }
+ else if(ieta < FEXAlgoSpaceDefs::jFEX_algoSpace_C_EMIE_end_eta) {// ieta lower than EMIE ends -> EMIE
+ phi = iphi -4 ;
}
+ else {// rest of ieta -> EMB
+ phi = iphi -8 ;
+ }
}
- if (jFEXSmallRJetTOBEt > 0x7ff) {
+ jFEXSmallRJetTOBEt = et/jFEXETResolution;
+ if(jFEXSmallRJetTOBEt > 0x7ff) {
jFEXSmallRJetTOBEt = 0x7ff;
Sat = 1;
}
-
//create basic tobword with 32 bits
tobWord = tobWord + (eta<<27) + (phi << 23) + (jFEXSmallRJetTOBEt << 12) + (Res<<1) + (Sat);
ATH_MSG_DEBUG("tobword smallRJet with et, phi, eta, res and sat : " << std::bitset<32>(tobWord) );
@@ -621,17 +639,16 @@ uint32_t jFEXFPGA::formSmallRJetTOB(int &iphi, int &ieta) {
SG::ReadHandle<TrigConf::L1Menu> l1Menu (m_l1MenuKey/*, ctx*/);
auto & thr_jJ = l1Menu->thrExtraInfo().jJ();
unsigned int minEtThreshold = thr_jJ.ptMinToTopoSmallMeV()/jFEXETResolution;
-
if (jFEXSmallRJetTOBEt < minEtThreshold) return 0;
else return tobWord;
}
-uint32_t jFEXFPGA::formLargeRJetTOB(int & iphi, int &ieta) {
-
+uint32_t jFEXFPGA::formLargeRJetTOB(int &iphi, int &ieta)
+{
uint32_t tobWord = 0;
const unsigned int jFEXETResolution = 200; //LSB is 200MeV
- int eta = 0;
- int phi = 0;
+ unsigned int eta = 0;
+ unsigned int phi = 0;
unsigned int et = 0;
unsigned int jFEXLargeRJetTOBEt = 0;
int Res = 0; // 9 bits reserved
@@ -639,35 +656,55 @@ uint32_t jFEXFPGA::formLargeRJetTOB(int & iphi, int &ieta) {
if(m_jfexid > 0 && m_jfexid < 5) {
et = m_jFEXLargeRJetAlgoTool->getLargeClusterET(m_jFEXSmallRJetAlgoTool->getSmallClusterET(),m_jFEXLargeRJetAlgoTool->getRingET());
- jFEXLargeRJetTOBEt = et/jFEXETResolution;
eta = ieta -8;
phi = iphi -8;
- }
+ }
- if(m_jfexid ==0 || m_jfexid ==5) {
- for(std::map<int, jFEXForwardJetsInfo>::iterator it = m_FCALJets.begin(); it!=(m_FCALJets.end()); ++it) {
- jFEXForwardJetsInfo FCALJetInfo = it->second;
- eta = ieta -8;
- phi = iphi -8;
- et = FCALJetInfo.getSeedET() + FCALJetInfo.getFirstEnergyRingET() + FCALJetInfo.getSecondEnergyRingET();
- jFEXLargeRJetTOBEt = et/jFEXETResolution;
+ else if(m_jfexid == 5) {
+ et = m_LRJetET;
+ eta = ieta -8;
+
+ if(ieta < FEXAlgoSpaceDefs::jFEX_algoSpace_A_EMIE_eta) { // ieta lower than EMIE stats -> belong to EMB
+ phi = iphi-8;
+ }
+ else if(ieta < FEXAlgoSpaceDefs::jFEX_algoSpace_A_FCAL_start_eta) { // ieta lower than FCAL stats -> belong to EMIE
+ phi = iphi -4;
+ }
+ else { // rest ieta belongs to FCAL
+ phi = iphi -2;
}
}
+ else if(m_jfexid == 0) {
+ et = m_LRJetET;
+ eta = 36 - ieta;
- if (jFEXLargeRJetTOBEt > 0x1fff) {
- jFEXLargeRJetTOBEt = 0x1fff; //0x1fff is 13 bits
- Sat = 1;
- }
- //create basic tobword with 32 bits
- tobWord = tobWord + (eta<<27) + (phi << 23) + (jFEXLargeRJetTOBEt << 10) + (Res<<1) + (Sat);
- ATH_MSG_DEBUG("tobword largeRJet with et, phi, eta, sub and sat : " << std::bitset<32>(tobWord) );
+ if(ieta < FEXAlgoSpaceDefs::jFEX_algoSpace_C_FCAL_end_eta) { // ieta lower than FCal ends -> FCAL
+ phi = iphi -2 ;
+ }
+ else if(ieta < FEXAlgoSpaceDefs::jFEX_algoSpace_C_EMIE_end_eta) {// ieta lower than EMIE ends -> EMIE
+ phi = iphi -4 ;
+ }
+ else {// rest of ieta -> EMB
+ phi = iphi -8 ;
+ }
+ }
- // Retrieve the L1 menu configuration
- SG::ReadHandle<TrigConf::L1Menu> l1Menu (m_l1MenuKey/*, ctx*/);
- auto & thr_jJ = l1Menu->thrExtraInfo().jJ();
- unsigned int minEtThreshold = thr_jJ.ptMinToTopoLargeMeV()/jFEXETResolution;
- if (jFEXLargeRJetTOBEt < minEtThreshold) return 0;
- else return tobWord;
+ jFEXLargeRJetTOBEt = et/jFEXETResolution;
+ if (jFEXLargeRJetTOBEt > 0x1fff){
+ jFEXLargeRJetTOBEt = 0x1fff; //0x1fff is 13 bits
+ Sat = 1;
+ }
+ //create basic tobword with 32 bits
+ tobWord = tobWord + (eta<<27) + (phi << 23) + (jFEXLargeRJetTOBEt << 10) + (Res<<1) + (Sat);
+ ATH_MSG_DEBUG("tobword largeRJet with et, phi, eta, sub and sat : " << std::bitset<32>(tobWord) );
+
+ // Retrieve the L1 menu configuration
+ SG::ReadHandle<TrigConf::L1Menu> l1Menu (m_l1MenuKey/*, ctx*/);
+ auto & thr_jJ = l1Menu->thrExtraInfo().jJ();
+ unsigned int minEtThreshold = thr_jJ.ptMinToTopoLargeMeV()/jFEXETResolution;
+
+ if (jFEXLargeRJetTOBEt < minEtThreshold) return 0;
+ else return tobWord;
}
@@ -687,12 +724,9 @@ uint32_t jFEXFPGA::formTauTOB(int & iphi, int &ieta )
sat=1;
}
-
-
unsigned int iso = m_jFEXtauAlgoTool->getFirstEtRing()/jFEXETResolution;
if (iso > 0x7ff) iso = 0x7ff; //0x7ff is 11 bits
-
//create basic tobword with 32 bits
tobWord = tobWord + (eta << 27) + (phi << 23) + (et << 12) + (iso << 1) + sat ;
@@ -700,7 +734,6 @@ uint32_t jFEXFPGA::formTauTOB(int & iphi, int &ieta )
//arbitary et threshold to not overflow the TOBs
-
/***************** NEEDS TO BE IMPLEMENTED IN THE FUTURE (JIRA TICKED OPENED) *****************/
// Retrieve the L1 menu configuration
//SG::ReadHandle<TrigConf::L1Menu> l1Menu (m_l1MenuKey/*, ctx*/);
@@ -709,7 +742,6 @@ uint32_t jFEXFPGA::formTauTOB(int & iphi, int &ieta )
//arbitary et threshold to not overflow the TOBs
unsigned int minEtThreshold = 100;
-
if (et < minEtThreshold) return 0;
else return tobWord;
@@ -892,4 +924,3 @@ int jFEXFPGA::getTTowerET_SG(unsigned int TTID) {
} // end of namespace bracket
-
diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXForwardJetsAlgo.cxx b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXForwardJetsAlgo.cxx
index a5954b1ccd52..4ebb8b81ce7d 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXForwardJetsAlgo.cxx
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXForwardJetsAlgo.cxx
@@ -74,16 +74,15 @@ float LVL1::jFEXForwardJetsAlgo::globalEta(int nphi, int neta) {
SG::ReadHandle<jTowerContainer> jk_jFEXForwardJetsAlgo_jTowerContainer(m_jFEXForwardJetsAlgo_jTowerContainerKey/*,ctx*/);
float eta = jk_jFEXForwardJetsAlgo_jTowerContainer->findTower(m_jFEXalgoTowerID[nphi][neta])->centreEta();
return eta;
-
}
//Gets Phi of the TT
unsigned int LVL1::jFEXForwardJetsAlgo::localPhi(int nphi, int neta) {
-
SG::ReadHandle<jTowerContainer> jk_jFEXForwardJetsAlgo_jTowerContainer(m_jFEXForwardJetsAlgo_jTowerContainerKey/*,ctx*/);
unsigned int phi = jk_jFEXForwardJetsAlgo_jTowerContainer->findTower(m_jFEXalgoTowerID[nphi][neta])->phi();
return phi;
}
+
//Gets Eta of the TT
unsigned int LVL1::jFEXForwardJetsAlgo::localEta(int nphi, int neta) {
@@ -93,7 +92,7 @@ unsigned int LVL1::jFEXForwardJetsAlgo::localEta(int nphi, int neta) {
}
//Return ET of TT. Should be FCAL 0 + 1 + 2 //maybe check this
-int LVL1::jFEXForwardJetsAlgo::getTTowerET(int nphi, int neta ) {
+unsigned int LVL1::jFEXForwardJetsAlgo::getTTowerET(int nphi, int neta ) {
unsigned int TTID = m_jFEXalgoTowerID[nphi][neta];
if(TTID == 0) {
return 0;
@@ -104,8 +103,7 @@ int LVL1::jFEXForwardJetsAlgo::getTTowerET(int nphi, int neta ) {
}
//we shouldn't arrive here
- return 0;
-
+ return 0;
}
std::map<int, jFEXForwardJetsInfo> LVL1::jFEXForwardJetsAlgo::FcalJetsTowerIDLists(){
@@ -119,17 +117,16 @@ std::map<int, jFEXForwardJetsInfo> LVL1::jFEXForwardJetsAlgo::FcalJetsTowerIDLis
std::vector<int> lower_centre_neta;
std::vector<int> upper_centre_neta;
- int lowerEM_eta = 0;
- int upperEM_eta = 0;
+ m_lowerEM_eta = 0;
+ m_upperEM_eta = 0;
//STEP 1: check if we are in module 0 or 5 and assign corrrect eta FEXAlgoSpace parameters
if(m_jFEXalgoTowerID[31][0] == 0){
//Module 0
lower_centre_neta.assign({FEXAlgoSpaceDefs::jFEX_algoSpace_C_EMB_start_eta, FEXAlgoSpaceDefs::jFEX_algoSpace_C_EMIE_start_eta, FEXAlgoSpaceDefs::jFEX_algoSpace_C_FCAL_start_eta});
upper_centre_neta.assign({FEXAlgoSpaceDefs::jFEX_algoSpace_C_EMB_end_eta, FEXAlgoSpaceDefs::jFEX_algoSpace_C_EMIE_end_eta,FEXAlgoSpaceDefs::jFEX_algoSpace_C_FCAL_end_eta });
-
- lowerEM_eta = FEXAlgoSpaceDefs::jFEX_algoSpace_C_lowerEM_eta;
- upperEM_eta = FEXAlgoSpaceDefs::jFEX_algoSpace_C_upperEM_eta;
+ m_lowerEM_eta = FEXAlgoSpaceDefs::jFEX_algoSpace_C_lowerEM_eta;
+ m_upperEM_eta = FEXAlgoSpaceDefs::jFEX_algoSpace_C_upperEM_eta;
}
else{
@@ -137,15 +134,15 @@ std::map<int, jFEXForwardJetsInfo> LVL1::jFEXForwardJetsAlgo::FcalJetsTowerIDLis
lower_centre_neta.assign({FEXAlgoSpaceDefs::jFEX_algoSpace_A_EMB_eta, FEXAlgoSpaceDefs::jFEX_algoSpace_A_EMIE_eta, FEXAlgoSpaceDefs::jFEX_algoSpace_A_FCAL_start_eta});
upper_centre_neta.assign({FEXAlgoSpaceDefs::jFEX_algoSpace_A_EMIE_eta, FEXAlgoSpaceDefs::jFEX_algoSpace_A_FCAL_start_eta, FEXAlgoSpaceDefs::jFEX_algoSpace_A_FCAL_end_eta});
- lowerEM_eta = FEXAlgoSpaceDefs::jFEX_algoSpace_A_lowerEM_eta;
- upperEM_eta = FEXAlgoSpaceDefs::jFEX_algoSpace_A_upperEM_eta;
+ m_lowerEM_eta = FEXAlgoSpaceDefs::jFEX_algoSpace_A_lowerEM_eta;
+ m_upperEM_eta = FEXAlgoSpaceDefs::jFEX_algoSpace_A_upperEM_eta;
+
}
//STEP 2: define phi FEXAlgoSpace parameters
std::vector<int> lower_centre_nphi{FEXAlgoSpaceDefs::jFEX_algoSpace_EMB_start_phi, FEXAlgoSpaceDefs::jFEX_algoSpace_EMIE_start_phi, FEXAlgoSpaceDefs::jFEX_algoSpace_FCAL_start_phi};
std::vector<int> upper_centre_nphi{FEXAlgoSpaceDefs::jFEX_algoSpace_EMB_end_phi, FEXAlgoSpaceDefs::jFEX_algoSpace_EMIE_end_phi, FEXAlgoSpaceDefs::jFEX_algoSpace_FCAL_end_phi};
-
//STEP 3: loop over different EM/FCAL0 eta phi core fpga regions. These are potential central trigger towers for jets
for(int myCounter = 0; myCounter<3; myCounter++){
for(int centre_nphi = lower_centre_nphi[myCounter]; centre_nphi < upper_centre_nphi[myCounter]; centre_nphi++) {
@@ -168,14 +165,16 @@ std::map<int, jFEXForwardJetsInfo> LVL1::jFEXForwardJetsAlgo::FcalJetsTowerIDLis
float centreTT_eta = globalEta(centre_nphi, centre_neta);
TriggerTowerInformation.setCentreTTPhi(centreTT_phi);
TriggerTowerInformation.setCentreTTEta(centreTT_eta);
-
+ //TriggerTowerInformation.includeTTinSeed(m_jFEXalgoTowerID[centre_nphi][centre_neta]);
+ TriggerTowerInformation.addToSeedET(getTTowerET(centreTT_phi, centreTT_eta));
//STEP 8: loop over all FCAL0 TTIDs and fill TT IDs for seed and calculate seed energy
for(int nphi = 0; nphi < 32; nphi++) {
- for(int neta = lowerEM_eta; neta < upperEM_eta; neta++) {
+ for(int neta = m_lowerEM_eta; neta < m_upperEM_eta; neta++) {
if(((nphi == centre_nphi) && (neta == centre_neta)) ||(m_jFEXalgoTowerID[nphi][neta])==0 ){continue;}
float TT_phi = globalPhi(nphi, neta);
float TT_eta = globalEta(nphi, neta);
float R = sqrt(pow((centreTT_eta - TT_eta),2) + pow((centreTT_phi - TT_phi),2));
+
if((R > 0) && (R <( 2 * TT_Size))){
//STEP 9: fill TTID in seed
TriggerTowerInformation.includeTTinSeed(m_jFEXalgoTowerID[nphi][neta]);
@@ -197,18 +196,21 @@ std::map<int, jFEXForwardJetsInfo> LVL1::jFEXForwardJetsAlgo::FcalJetsTowerIDLis
std::map<int, jFEXForwardJetsInfo> LVL1::jFEXForwardJetsAlgo::isSeedLocalMaxima(){
std::vector<int> localMaximas;
std::map<int, jFEXForwardJetsInfo> localMaximaLists = FcalJetsTowerIDLists();
+
size_t isLocalMaxima = 0;
int totalLM = 0;
for(std::map<int, jFEXForwardJetsInfo>::iterator it = localMaximaLists.begin(); it != (localMaximaLists.end()); ++it)
{
isLocalMaxima = 0;
int myTTKey = it->first;
+
jFEXForwardJetsInfo myFCALJetInfoClass = it ->second;
//Local maxima check takes place here
SG::ReadHandle<jTowerContainer> jk_jFEXForwardJetsAlgo_jTowerContainer(m_jFEXForwardJetsAlgo_jTowerContainerKey/*,ctx*/);
float centre_phi = myFCALJetInfoClass.getCentreTTPhi();
- float centre_eta = myFCALJetInfoClass.getCentreTTPhi();
- float centre_energy = myFCALJetInfoClass.getSeedET();
+ float centre_eta = myFCALJetInfoClass.getCentreTTEta();
+ int centre_energy = myFCALJetInfoClass.getSeedET();
+
std::vector<int> TTinSeed = myFCALJetInfoClass.getTTinSeed();
for (std::size_t i = 0, max = TTinSeed.size(); i != max; ++i){
float seed_phi = jk_jFEXForwardJetsAlgo_jTowerContainer->findTower(TTinSeed[i])->centrePhi();
@@ -216,9 +218,34 @@ std::map<int, jFEXForwardJetsInfo> LVL1::jFEXForwardJetsAlgo::isSeedLocalMaxima(
float delta_phi = seed_phi - centre_phi;
float delta_eta = seed_eta - centre_eta;
- float seed_energy = localMaximaLists[TTinSeed[i]].getSeedET();
+
+ static constexpr float TT_Size = M_PI/32;
+ int seed_energy = 0;
+ //here is where the extra values are being created.
+ if(localMaximaLists.count(TTinSeed[i])==1 ){//&& (localMaximaLists[TTinSeed[i]].getSeedET()==0)) {
+ seed_energy = localMaximaLists[TTinSeed[i]].getSeedET();
+ }
+
+ else if(localMaximaLists.count(TTinSeed[i])==0){
+ for(int nphi = 0; nphi < 32; nphi++) {
+ for(int neta = m_lowerEM_eta; neta < m_upperEM_eta; neta++) {
+ SG::ReadHandle<jTowerContainer> jk_jFEXForwardJetsAlgo_jTowerContainer(m_jFEXForwardJetsAlgo_jTowerContainerKey);
+ float centre_seed_eta = jk_jFEXForwardJetsAlgo_jTowerContainer->findTower(TTinSeed[i])->centreEta();
+ float centre_seed_phi = jk_jFEXForwardJetsAlgo_jTowerContainer->findTower(TTinSeed[i])->centrePhi();
+
+ seed_energy += getTTowerET(centre_seed_phi, centre_seed_phi);
- if( ((delta_eta + delta_phi) < 0) || ((delta_eta + delta_phi == 0) && (delta_eta < 0)) )
+ if((TTinSeed[i] == m_jFEXalgoTowerID[nphi][neta]) ||(m_jFEXalgoTowerID[nphi][neta])==0 ){continue;}
+ float TT_phi = globalPhi(nphi, neta);
+ float TT_eta = globalEta(nphi, neta);
+ float R = sqrt(pow((centre_seed_eta - TT_eta),2) + pow((centre_seed_phi - TT_phi),2));
+ if((R > 0) && (R <( 2 * TT_Size))){
+ seed_energy += getTTowerET(nphi, neta);
+ }
+ }
+ }
+ }
+ if( ((delta_eta + delta_phi) < 0) || ((delta_eta + delta_phi == 0) && (delta_eta < 0)) )
{
if(centre_energy >= seed_energy){isLocalMaxima++;}
}
@@ -242,25 +269,22 @@ std::map<int, jFEXForwardJetsInfo> LVL1::jFEXForwardJetsAlgo::isSeedLocalMaxima(
localMaximaLists.erase(it->first);
}
}
-
return localMaximaLists;
}
std::map<int, jFEXForwardJetsInfo> LVL1::jFEXForwardJetsAlgo::calculateJetETs(){
std::map<int, jFEXForwardJetsInfo> localMaximas = isSeedLocalMaxima();
static constexpr float TT_Size = M_PI/32;
-
//here we loop over all trigger towers, fcal 0 1 2 and calculate energy of TT which lays in the 0.4
//and 0.8 radius to be stored.
for(std::map<int, jFEXForwardJetsInfo>::iterator it = localMaximas.begin(); it !=localMaximas.end(); ++it){
int key = it->first;
float centreTT_phi = localMaximas[key].getCentreTTPhi();
- float centreTT_eta = localMaximas[key].getCentreTTEta();
-
+ float centreTT_eta = localMaximas[key].getCentreTTEta();
for(int nphi = 0; nphi < FEXAlgoSpaceDefs::jFEX_algoSpace_height; nphi++) {
for(int neta = 0; neta < FEXAlgoSpaceDefs::jFEX_wide_algoSpace_width; neta++) {
- if(m_jFEXalgoTowerID[nphi][neta] == (it->first)){continue;}
+ if((m_jFEXalgoTowerID[nphi][neta] == (it->first))){continue;}
float TT_phi = globalPhi(nphi, neta);
float TT_eta = globalEta(nphi, neta);
float R = sqrt(pow((centreTT_eta - TT_eta),2) + pow((centreTT_phi - TT_phi),2));
@@ -281,6 +305,7 @@ std::map<int, jFEXForwardJetsInfo> LVL1::jFEXForwardJetsAlgo::calculateJetETs(){
return localMaximas;
}
+
void LVL1::jFEXForwardJetsAlgo::setFPGAEnergy(std::map<int,std::vector<int> > et_map){
m_map_Etvalues=et_map;
}
diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXForwardJetsInfo.cxx b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXForwardJetsInfo.cxx
index 0fd940abd460..a0015c87b1b6 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXForwardJetsInfo.cxx
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXForwardJetsInfo.cxx
@@ -83,7 +83,7 @@ int LVL1::jFEXForwardJetsInfo::getSeedET()
void LVL1::jFEXForwardJetsInfo::addToFirstEnergyRingET(int firstER_ET)
{
- m_firstEnergyRing_ET = firstER_ET;
+ m_firstEnergyRing_ET += firstER_ET;
}
int LVL1::jFEXForwardJetsInfo::getFirstEnergyRingET()
{
@@ -111,7 +111,7 @@ std::vector<int> LVL1::jFEXForwardJetsInfo::getTTIDinSecondER()
void LVL1::jFEXForwardJetsInfo::addToSecondEnergyRingET(int secondER_ET)
{
- m_secondEnergyRing_ET = secondER_ET;
+ m_secondEnergyRing_ET += secondER_ET;
}
int LVL1::jFEXForwardJetsInfo::getSecondEnergyRingET()
diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXPileupAndNoise.cxx b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXPileupAndNoise.cxx
index f1fa26ecc744..1747441302b7 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXPileupAndNoise.cxx
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXPileupAndNoise.cxx
@@ -378,8 +378,6 @@ std::map<int,std::vector<int> > LVL1::jFEXPileupAndNoise::Get_EM_Et_values(){
return map_Etvalues;
}
-
-
std::map<int,std::vector<int> > LVL1::jFEXPileupAndNoise::Get_HAD_Et_values(){
// map for energies sent to the FPGA
@@ -517,7 +515,6 @@ std::map<int,std::vector<int> > LVL1::jFEXPileupAndNoise::GetEt_values(){
}
-
//Gets Eta of the TT
int LVL1::jFEXPileupAndNoise::getTTowerEta(unsigned int TTID) {
diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXSmallRJetAlgo.cxx b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXSmallRJetAlgo.cxx
index 5962886de376..e23fe643b8c4 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXSmallRJetAlgo.cxx
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jFEXSmallRJetAlgo.cxx
@@ -69,12 +69,12 @@ int LVL1::jFEXSmallRJetAlgo::realValue(int ID, int eta){
//Gets the ET for the TT. This ET is EM + HAD
unsigned int LVL1::jFEXSmallRJetAlgo::getTTowerET(unsigned int TTID ) {
- if(TTID == 0) {
+ if(TTID == 0) {
return 0;
}
if(m_map_Etvalues.find(TTID) != m_map_Etvalues.end()) {
- return m_map_Etvalues[TTID][0];
+ return m_map_Etvalues[TTID][0];
}
//we shouldn't arrive here
@@ -110,29 +110,24 @@ void LVL1::jFEXSmallRJetAlgo::buildSeeds()
m_seedSet = false;
m_LMDisplaced = false;
-
for(int mphi = 1; mphi < 6; mphi++) {
for(int meta = 1; meta< 6; meta++) {
int et_tmp = 0;
int seedTotalET = 0;
for(int ieta = -1; ieta < 2; ieta++) {
for(int iphi = -1; iphi < 2; iphi++) {
- //for that TT, build the seed
- //here we sum TT ET to calculate seed
et_tmp = getTTowerET(m_jFEXalgoTowerID[meta + ieta][mphi + iphi]);
seedTotalET += et_tmp;
}
}
m_jFEXalgoSearchWindowSeedET[meta -1][mphi -1] = seedTotalET;
}
-
}
int centralTT_ET = getTTowerET(m_jFEXalgoTowerID[3][3]);
if(centralTT_ET==m_jFEXalgoSearchWindowSeedET[3][3]) {
m_LMDisplaced = true;
}
-
m_seedSet = true;
}
diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jSuperCellTowerMapper.cxx b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jSuperCellTowerMapper.cxx
index a1ba8072c945..fe01f40688e4 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jSuperCellTowerMapper.cxx
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jSuperCellTowerMapper.cxx
@@ -1174,3 +1174,4 @@ int jSuperCellTowerMapper::FindTowerIDForSuperCell(int towereta, int towerphi)
} // end of LVL1 namespace
+
diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jTowerBuilder.cxx b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jTowerBuilder.cxx
index 70ba3b793670..2197ebcfab02 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jTowerBuilder.cxx
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jTowerBuilder.cxx
@@ -314,9 +314,7 @@ void jTowerBuilder::BuildEMEjTowers(std::unique_ptr<jTowerContainer> & jTowerCon
void jTowerBuilder::BuildAllTowers(std::unique_ptr<jTowerContainer> & jTowerContainerRaw) const
{
-
// BuildSingleTower(jTowerContainerRaw, 0.0, 0.0, 0, -1.0, 0, 0.0, 0.0, 0);
-
BuildEMBjTowers(jTowerContainerRaw);
BuildTRANSjTowers(jTowerContainerRaw);
BuildEMEjTowers(jTowerContainerRaw);
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXForwardJetsAlgo.h b/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXForwardJetsAlgo.h
index f5e7109bbc7d..295c3030580f 100644
--- a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXForwardJetsAlgo.h
+++ b/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXForwardJetsAlgo.h
@@ -32,8 +32,7 @@ namespace LVL1{
virtual float globalEta(int , int ) =0;
virtual unsigned int localPhi(int , int ) =0;
virtual unsigned int localEta(int , int ) =0;
- virtual int getTTowerET(int, int) =0;
-
+ virtual unsigned int getTTowerET(int, int) =0;
virtual std::map<int, jFEXForwardJetsInfo> FcalJetsTowerIDLists() =0;
virtual std::map<int, jFEXForwardJetsInfo> isSeedLocalMaxima() =0;
virtual std::map<int, jFEXForwardJetsInfo> calculateJetETs() =0;
--
GitLab
From 82e482c63738af1c3746a29fc0f78ea254acc7da Mon Sep 17 00:00:00 2001
From: Ewelina Maria Lobodzinska <ewelina.maria.lobodzinska@cern.ch>
Date: Tue, 24 Aug 2021 13:11:21 +0200
Subject: [PATCH 254/272] GeneratorFilters: add corrections for ParentChild and
ParentTwoChildren...
---
.../GeneratorFilters/ParentChildFilter.h | 15 ++++-
.../src/ParentChildFilter.cxx | 23 ++++++--
.../src/ParentTwoChildrenFilter.cxx | 56 +++++++++++++------
.../components/GeneratorFilters_entries.cxx | 8 +--
4 files changed, 75 insertions(+), 27 deletions(-)
diff --git a/Generators/GeneratorFilters/GeneratorFilters/ParentChildFilter.h b/Generators/GeneratorFilters/GeneratorFilters/ParentChildFilter.h
index f7605f82b2f9..7f3a92ee2e74 100644
--- a/Generators/GeneratorFilters/GeneratorFilters/ParentChildFilter.h
+++ b/Generators/GeneratorFilters/GeneratorFilters/ParentChildFilter.h
@@ -1,7 +1,6 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-
#ifndef GENERATORFILTERS_PARENTCHILDFILTER_H
#define GENERATORFILTERS_PARENTCHILDFILTER_H
@@ -24,10 +23,22 @@ private:
double m_MassMinParent;
double m_MassMaxParent;
double m_EtaRangeParent;
+ double m_EtaMinParent;
+ double m_RapidityRangeParent;
+ double m_RapidityMinParent;
std::vector<int> m_PDGChild;
double m_PtMinChild;
double m_EtaRangeChild;
+ /** calculate the rapidity of a particle */
+ inline double getRapidity(HepMC::GenParticle*& p) {
+ double e = (p)->momentum().e();
+ double pz = (p)->momentum().pz();
+ if (e == pz) return 9999.;
+ if (e == -pz) return -9999.;
+ double rapidity = 0.5 * log((e + pz) / (e - pz));
+ return rapidity;
+ };
};
#endif
diff --git a/Generators/GeneratorFilters/src/ParentChildFilter.cxx b/Generators/GeneratorFilters/src/ParentChildFilter.cxx
index 297997614a6b..e84c2b0c4649 100644
--- a/Generators/GeneratorFilters/src/ParentChildFilter.cxx
+++ b/Generators/GeneratorFilters/src/ParentChildFilter.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "GeneratorFilters/ParentChildFilter.h"
@@ -13,6 +13,9 @@ ParentChildFilter::ParentChildFilter(const std::string& name, ISvcLocator* pSvcL
declareProperty("MassMinParent",m_MassMinParent = -1e9);
declareProperty("MassMaxParent",m_MassMaxParent = 1e9);
declareProperty("EtaRangeParent",m_EtaRangeParent = 10.0);
+ declareProperty("EtaMinParent",m_EtaMinParent = 0.);
+ declareProperty("RapidityRangeParent",m_RapidityRangeParent = 10.0);
+ declareProperty("RapidityMinParent",m_RapidityMinParent = 0.);
declareProperty("PDGChild",m_PDGChild);
declareProperty("PtMinChild",m_PtMinChild = 0.);
declareProperty("EtaRangeChild",m_EtaRangeChild = 10.0);
@@ -28,6 +31,10 @@ StatusCode ParentChildFilter::filterInitialize() {
ATH_MSG_INFO("MassMinParent = " << m_MassMinParent);
ATH_MSG_INFO("MassMaxParent = " << m_MassMaxParent);
ATH_MSG_INFO("EtaRangeParent = " << m_EtaRangeParent);
+ ATH_MSG_INFO("EtaMinParent = " << m_EtaMinParent);
+ ATH_MSG_INFO("RapidityRangeParent = " << m_RapidityRangeParent);
+ ATH_MSG_INFO("RapidityMinParent = " << m_RapidityMinParent);
+
for (int i=0; i < int(m_PDGChild.size()); i++) ATH_MSG_INFO("PDGChild["<<i<<"] = " << m_PDGChild[i]);
ATH_MSG_INFO("PtMinChild = " << m_PtMinChild);
ATH_MSG_INFO("EtaRangeChild = " << m_EtaRangeChild);
@@ -42,11 +49,19 @@ StatusCode ParentChildFilter::filterEvent() {
int okPDGParent = 0;
for (int i = 0; i < int(m_PDGParent.size()); i++) if (std::abs(pitr->pdg_id()) == m_PDGParent[i]) okPDGParent=1;
if ( (m_PDGParent[0] == 0) || (okPDGParent
- && pitr->momentum().perp() >= m_PtMinParent
+ && (pitr->momentum().perp() >= m_PtMinParent)
&& (pitr->momentum().perp() < m_PtMaxParent)
&& (pitr->momentum().m() >= m_MassMinParent)
- && (pitr->momentum().m() < m_MassMaxParent)
- && std::abs(pitr->momentum().eta()) < m_EtaRangeParent)) {
+ && (pitr->momentum().m() < m_MassMaxParent)
+ && (std::abs(pitr->momentum().eta()) > m_EtaMinParent)
+ && (std::abs(pitr->momentum().eta()) < m_EtaRangeParent)
+#ifdef HEPMC3
+ && (std::abs(pitr->momentum().rap()) > m_RapidityMinParent)
+ && (std::abs(pitr->momentum().rap()) < m_RapidityRangeParent))) {
+#else
+ && (std::abs(getRapidity(pitr)) > m_RapidityMinParent)
+ && (std::abs(getRapidity(pitr)) < m_RapidityRangeParent))) {
+#endif
// Check if has end_vertex (skips initial protons)
if (!pitr->end_vertex()) continue;
// Child
diff --git a/Generators/GeneratorFilters/src/ParentTwoChildrenFilter.cxx b/Generators/GeneratorFilters/src/ParentTwoChildrenFilter.cxx
index 0e760cb1546a..23b234de9bcd 100644
--- a/Generators/GeneratorFilters/src/ParentTwoChildrenFilter.cxx
+++ b/Generators/GeneratorFilters/src/ParentTwoChildrenFilter.cxx
@@ -1,8 +1,9 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "GeneratorFilters/ParentTwoChildrenFilter.h"
+#include "TruthUtils/PIDHelpers.h"
ParentTwoChildrenFilter::ParentTwoChildrenFilter(const std::string& name, ISvcLocator* pSvcLocator)
: GenFilter(name,pSvcLocator)
@@ -30,8 +31,9 @@ StatusCode ParentTwoChildrenFilter::filterInitialize() {
StatusCode ParentTwoChildrenFilter::filterEvent() {
- ATH_MSG_DEBUG(" ParentTwoChildrenFilter filtering for: Parent --> " << m_PDGParent[0]
- << ", Child(1) --> " << m_PDGChild[0] << " and Child(2) --> " << m_PDGChild[1]);
+ ATH_MSG_DEBUG(" ParentTwoChildrenFilter filtering for: "
+ << "Parent (" << m_PDGParent[0] << ") --> Child (" << m_PDGChild[0] << ") + antiparticle and "
+ << "Parent (" << m_PDGParent[0] << ") --> Child (" << m_PDGChild[1] << ") + antiparticle." );
int n_parents = 0;
int N_Child[2][2];
for (int i = 0; i < 2; i++) {
@@ -53,20 +55,40 @@ StatusCode ParentTwoChildrenFilter::filterEvent() {
#else
int n_daughters = decayVtx->particles_out_size();
#endif
- if (n_daughters < 2) continue;
- for( auto thisChild: *decayVtx ) {
- ATH_MSG_DEBUG(" ParentTwoChildrenFilter: parent ==> " <<pitr->pdg_id() << " child ===> " <<thisChild->pdg_id());
- for (int i = 0; i < 2; i++) {
- if ( std::abs(thisChild->pdg_id()) == m_PDGChild[i] ){
- if ( thisChild->pdg_id() == m_PDGChild[i] ){
- if (thisChild->momentum().perp() >= m_PtMinChild) N_Child[i][0]++;
- }
- if ( thisChild->pdg_id() == -m_PDGChild[i] ){
- if (thisChild->momentum().perp() >= m_PtMinChild) N_Child[i][1]++;
- }
- }
- }
- }
+
+ if (n_daughters < 2) continue;
+
+ // Check whether decays are part of the requested set
+ HepMC::GenVertex::particle_iterator firstChild = pitr->end_vertex()->particles_begin(HepMC::children);
+ HepMC::GenVertex::particle_iterator endChild = pitr->end_vertex()->particles_end(HepMC::children);
+ HepMC::GenVertex::particle_iterator thisChild = firstChild;
+
+ int neutralPar = 0;
+ for(auto thisChild: *decayVtx) {
+ ATH_MSG_DEBUG(" ParentTwoChildrenFilter: parent ==> " <<pitr->pdg_id() << " child ===> " <<thisChild->pdg_id());
+ for (int i = 0; i < 2; i++) {
+ if ( std::abs(thisChild->pdg_id()) == m_PDGChild[i]) {
+ int antiparticle = ( MC::PID::charge(m_PDGChild[i]) == 0 ? 1 : -1 ); // assume that zero charge particles are their own anti-particle
+ if ( thisChild->pdg_id() == m_PDGChild[i] ) {
+ if( (thisChild->momentum().perp() >= m_PtMinChild) ) {
+ if(antiparticle == 1) {
+ neutralPar++;
+ if(neutralPar == 1) N_Child[i][0]++;
+ }
+ else N_Child[i][0]++;
+ }
+ }
+ if ( thisChild->pdg_id() == antiparticle * m_PDGChild[i] ) {
+ if( (thisChild->momentum().perp() >= m_PtMinChild) ) {
+ if(antiparticle == 1){
+ if (neutralPar == 2) N_Child[i][1]++;
+ }
+ else N_Child[i][1]++;
+ }
+ }
+ }
+ }
+ }
}
}
setFilterPassed(N_Child[0][0] >= 1 && N_Child[0][1] >= 1 && N_Child[1][0] >= 1 && N_Child[1][1] >= 1);
diff --git a/Generators/GeneratorFilters/src/components/GeneratorFilters_entries.cxx b/Generators/GeneratorFilters/src/components/GeneratorFilters_entries.cxx
index f38350132fa5..007e9b2064a3 100644
--- a/Generators/GeneratorFilters/src/components/GeneratorFilters_entries.cxx
+++ b/Generators/GeneratorFilters/src/components/GeneratorFilters_entries.cxx
@@ -9,6 +9,8 @@
#include "GeneratorFilters/MissingEtFilter.h"
#include "GeneratorFilters/MultiCjetFilter.h"
#include "GeneratorFilters/MultiElecMuTauFilter.h"
+#include "GeneratorFilters/ParentChildFilter.h"
+#include "GeneratorFilters/ParentTwoChildrenFilter.h"
#include "GeneratorFilters/QCDTruthJetFilter.h"
#include "GeneratorFilters/TauFilter.h"
#include "GeneratorFilters/xAODTauFilter.h"
@@ -49,8 +51,6 @@
#include "GeneratorFilters/TTbarMassFilter.h"
#include "GeneratorFilters/TruthJetFilter.h"
#include "GeneratorFilters/SoftLeptonFilter.h"
-#include "GeneratorFilters/ParentChildFilter.h"
-#include "GeneratorFilters/ParentTwoChildrenFilter.h"
#include "GeneratorFilters/ParentChildwStatusFilter.h"
#include "GeneratorFilters/SoftLeptonInJetFilter.h"
#include "GeneratorFilters/VBFForwardJetsFilter.h"
@@ -119,6 +119,8 @@ DECLARE_COMPONENT( M4MuIntervalFilter )
DECLARE_COMPONENT( MissingEtFilter )
DECLARE_COMPONENT( MultiCjetFilter )
DECLARE_COMPONENT( MultiElecMuTauFilter )
+DECLARE_COMPONENT( ParentChildFilter )
+DECLARE_COMPONENT( ParentTwoChildrenFilter )
DECLARE_COMPONENT( QCDTruthJetFilter )
DECLARE_COMPONENT( TauFilter )
DECLARE_COMPONENT( xAODTauFilter )
@@ -160,8 +162,6 @@ DECLARE_COMPONENT( TTbarWToLeptonFilter )
DECLARE_COMPONENT( TTbarMassFilter )
DECLARE_COMPONENT( TruthJetFilter )
DECLARE_COMPONENT( SoftLeptonFilter )
-DECLARE_COMPONENT( ParentChildFilter )
-DECLARE_COMPONENT( ParentTwoChildrenFilter )
DECLARE_COMPONENT( ParentChildwStatusFilter )
DECLARE_COMPONENT( SoftLeptonInJetFilter )
DECLARE_COMPONENT( VBFForwardJetsFilter )
--
GitLab
From 7fcd94aa6f680b424143a85a7409344d24e74ab1 Mon Sep 17 00:00:00 2001
From: Thomas Strebler <thomas.strebler@cern.ch>
Date: Tue, 24 Aug 2021 13:12:30 +0200
Subject: [PATCH 255/272] Updated ITk tracking configs for reco
---
.../python/ITkPixelConditionsConfig.py | 2 +-
.../InDetConfig/python/ITkTrackRecoConfig.py | 13 ++++++++-----
.../python/ITkTrackingCommonConfig.py | 17 +++--------------
.../python/ITkTrackingSiPatternConfig.py | 13 ++++++-------
.../InDetConfig/python/TrackRecoConfig.py | 18 ++++++++++--------
5 files changed, 28 insertions(+), 35 deletions(-)
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py
index 9e42c9a2989b..7d337fef20bb 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/ITkPixelConditionsConfig.py
@@ -157,7 +157,7 @@ def ITkPixelOfflineCalibCondAlgCfg(flags, name="ITkPixelOfflineCalibCondAlg", **
DetDescrVersion = flags.GeoModel.AtlasVersion
ctag = 'PixelITkError_v4_' + DetDescrVersion
cfoldertag = CoolDataBaseFolder+' <tag>'+ctag+'</tag>'
- acc.merge( addFoldersSplitOnline(flags,'PIXEL',[cfoldertag],[cfoldertag],splitMC=True) )
+ acc.merge( addFoldersSplitOnline(flags,'PIXEL',[cfoldertag],[cfoldertag],splitMC=True,className="CondAttrListCollection") )
kwargs.setdefault("ReadKey", "/PIXEL/ITkClusterError")
kwargs.setdefault("WriteKey", "ITkPixelOfflineCalibData")
diff --git a/InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py b/InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py
index 944934441f43..e16076bd6427 100644
--- a/InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py
+++ b/InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py
@@ -109,7 +109,7 @@ def ITkClusterMakerToolCfg(flags, name="ITkClusterMakerTool", **kwargs) :
from PixelConditionsAlgorithms.ITkPixelConditionsConfig import (ITkPixelChargeCalibCondAlgCfg, ITkPixelConfigCondAlgCfg, ITkPixelDeadMapCondAlgCfg,
ITkPixelOfflineCalibCondAlgCfg)
- from PixelCabling.PixelCablingConfigNew import ITkPixelCablingSvcCfg
+ from PixelReadoutGeometry.PixelReadoutGeometryConfig import ITkPixelReadoutManagerCfg
#ITkPixelCablingCondAlgCfg + ITkPixelReadoutSpeedAlgCfg needed?
# This directly needs the following Conditions data:
@@ -118,7 +118,7 @@ def ITkClusterMakerToolCfg(flags, name="ITkClusterMakerTool", **kwargs) :
acc.merge(ITkPixelDeadMapCondAlgCfg(flags))
acc.merge(ITkPixelChargeCalibCondAlgCfg(flags))
acc.merge(ITkPixelOfflineCalibCondAlgCfg(flags))
- acc.merge(ITkPixelCablingSvcCfg(flags))
+ acc.merge(ITkPixelReadoutManagerCfg(flags))
#acc.merge(PixelCablingCondAlgCfg(flags))
#acc.merge(PixelReadoutSpeedAlgCfg(flags))
@@ -128,7 +128,7 @@ def ITkClusterMakerToolCfg(flags, name="ITkClusterMakerTool", **kwargs) :
ITkStripLorentzAngleTool = acc.popToolsAndMerge(ITkStripLorentzAngleCfg(flags))
kwargs.setdefault("PixelChargeCalibCondData", "ITkPixelChargeCalibCondData")
- kwargs.setdefault("PixelCablingSvc",acc.getService("ITkPixelCablingSvc"))
+ kwargs.setdefault("PixelReadoutManager",acc.getService("ITkPixelReadoutManager"))
kwargs.setdefault("PixelLorentzAngleTool", ITkPixelLorentzAngleTool)
kwargs.setdefault("SCTLorentzAngleTool", ITkStripLorentzAngleTool)
kwargs.setdefault("PixelOfflineCalibData", "")
@@ -157,14 +157,17 @@ def ITkTrackParticleCreatorToolCfg(flags, name="ITkTrackParticleCreatorTool", **
kwargs["TrackToVertex"] = result.popToolsAndMerge(ITkTrackToVertexCfg(flags))
if "TrackSummaryTool" not in kwargs:
from InDetConfig.ITkTrackingCommonConfig import ITkTrackSummaryToolSharedHitsCfg
- kwargs["TrackSummaryTool"] = result.popToolsAndMerge(ITkTrackSummaryToolSharedHitsCfg(flags))
+ TrackSummaryTool = result.popToolsAndMerge(ITkTrackSummaryToolSharedHitsCfg(flags))
+ result.addPublicTool(TrackSummaryTool)
+ kwargs["TrackSummaryTool"] = TrackSummaryTool
p_expr = flags.ITk.perigeeExpression
kwargs.setdefault("BadClusterID", flags.ITk.pixelClusterBadClusterID)
kwargs.setdefault("KeepParameters", True)
kwargs.setdefault("KeepFirstParameters", flags.ITk.KeepFirstParameters)
kwargs.setdefault("PerigeeExpression", p_expr if p_expr != "Vertex" else "BeamLine")
kwargs.setdefault("DoITk", True)
- result.addPublicTool(CompFactory.Trk.TrackParticleCreatorTool(name, **kwargs), primary=True)
+ ITkTrackParticleCreatorTool = CompFactory.Trk.TrackParticleCreatorTool(name, **kwargs)
+ result.addPublicTool(ITkTrackParticleCreatorTool, primary=True)
return result
def ITkTrackCollectionCnvToolCfg(flags, name="ITkTrackCollectionCnvTool", ITkTrackParticleCreator = None, **kwargs):
diff --git a/InnerDetector/InDetConfig/python/ITkTrackingCommonConfig.py b/InnerDetector/InDetConfig/python/ITkTrackingCommonConfig.py
index edb3606e120e..2dcbd3f1063c 100644
--- a/InnerDetector/InDetConfig/python/ITkTrackingCommonConfig.py
+++ b/InnerDetector/InDetConfig/python/ITkTrackingCommonConfig.py
@@ -63,6 +63,7 @@ def ITkTruthClusterizationFactoryCfg(flags, name = 'ITkTruthClusterizationFactor
acc = ComponentAccumulator()
the_name = makeName(name, kwargs)
+ kwargs.setdefault("InputSDOMap", 'ITkPixelSDO_Map')
ITkTruthClusterizationFactory = CompFactory.InDet.TruthClusterizationFactory( name = the_name, **kwargs )
acc.setPrivateTools(ITkTruthClusterizationFactory)
return acc
@@ -279,19 +280,10 @@ def ITkTrackSummaryToolCfg(flags, name='ITkTrackSummaryTool', **kwargs):
acc.setPrivateTools(CompFactory.Trk.TrackSummaryTool(name = the_name, **kwargs))
return acc
-def ITkPixelToTPIDToolCfg(flags, name = "ITkPixelToTPIDTool", **kwargs):
- acc = ComponentAccumulator()
- the_name = makeName( name, kwargs)
- ITkPixelToTPIDTool = CompFactory.InDet.PixelToTPIDTool(name = the_name, **kwargs)
- acc.setPrivateTools(ITkPixelToTPIDTool)
- return acc
-
def ITkSummaryHelperSharedHitsCfg(flags, name='ITkSummaryHelperSharedHits', **kwargs):
acc = ComponentAccumulator()
- if 'PixelToTPIDTool' not in kwargs :
- ITkPixelToTPIDTool = acc.popToolsAndMerge(ITkPixelToTPIDToolCfg(flags))
- kwargs.setdefault("PixelToTPIDTool", ITkPixelToTPIDTool)
+ kwargs.setdefault("PixelToTPIDTool", None)
kwargs.setdefault("TestBLayerTool", None)
kwargs.setdefault("DoSharedHits", flags.ITk.doSharedHits)
@@ -313,10 +305,7 @@ def ITkTrackSummaryToolSharedHitsCfg(flags, name='ITkTrackSummaryToolSharedHits'
ITkSummaryHelperSharedHits = acc.popToolsAndMerge(ITkSummaryHelperSharedHitsCfg(flags, **id_helper_args))
kwargs.setdefault("InDetSummaryHelperTool", ITkSummaryHelperSharedHits)
- if 'PixelToTPIDTool' not in kwargs :
- ITkPixelToTPIDTool = acc.popToolsAndMerge(ITkPixelToTPIDToolCfg(flags))
- kwargs.setdefault( "PixelToTPIDTool", ITkPixelToTPIDTool)
-
+ kwargs.setdefault( "PixelToTPIDTool", None)
kwargs.setdefault( "doSharedHits", flags.ITk.doSharedHits)
ITkTrackSummaryTool = acc.popToolsAndMerge(ITkTrackSummaryToolCfg(flags, name, **kwargs))
diff --git a/InnerDetector/InDetConfig/python/ITkTrackingSiPatternConfig.py b/InnerDetector/InDetConfig/python/ITkTrackingSiPatternConfig.py
index 327521ef0659..8a980130850f 100644
--- a/InnerDetector/InDetConfig/python/ITkTrackingSiPatternConfig.py
+++ b/InnerDetector/InDetConfig/python/ITkTrackingSiPatternConfig.py
@@ -19,7 +19,7 @@ def ITkSiSpacePointsSeedMakerCfg(flags, name="ITkSpSeedsMaker", InputCollections
# --- get list of already associated hits (always do this, even if no other tracking ran before)
#
if usePrdAssociationTool:
- prefix = 'InDet'
+ prefix = 'ITk'
suffix = flags.ITk.Tracking.extension
#
# --- Space points seeds maker, use different ones for cosmics and collisions
@@ -41,8 +41,7 @@ def ITkSiSpacePointsSeedMakerCfg(flags, name="ITkSpSeedsMaker", InputCollections
if usePrdAssociationTool:
# not all classes have that property !!!
- kwargs.setdefault("PRDtoTrackMap", prefix+'PRDtoTrackMap'+ suffix \
- if usePrdAssociationTool else '')
+ kwargs.setdefault("PRDtoTrackMap", prefix+'PRDtoTrackMap'+ suffix)
if not flags.Beam.Type == 'cosmics':
kwargs.setdefault("maxRadius1", 0.75*flags.ITk.Tracking.radMax)
kwargs.setdefault("maxRadius2", flags.ITk.Tracking.radMax)
@@ -248,7 +247,7 @@ def ITkSiSPSeededTrackFinderCfg(flags, name="ITkSiSpTrackFinder", InputCollectio
# --- get list of already associated hits (always do this, even if no other tracking ran before)
#
if usePrdAssociationTool:
- prefix = 'InDet'
+ prefix = 'ITk'
suffix = flags.ITk.Tracking.extension
ITkSiTrackMaker = acc.popToolsAndMerge(ITkSiTrackMaker_xkCfg(flags,
@@ -401,7 +400,7 @@ def ITkDenseEnvironmentsAmbiguityScoreProcessorToolCfg(flags, name = "ITkAmbigui
kwargs.setdefault("SplitProbTool", ITkNnPixelClusterSplitProbTool if flags.ITk.doPixelClusterSplitting else None,)
kwargs.setdefault("AssociationTool", ITkPRDtoTrackMapToolGangedPixels)
kwargs.setdefault("AssociationToolNotGanged", ITkPRDtoTrackMapTool)
- kwargs.setdefault("AssociationMapName", 'PRDToTrackMap'+flags.ITk.Tracking.extension)
+ kwargs.setdefault("AssociationMapName", 'ITkPRDToTrackMap'+flags.ITk.Tracking.extension)
kwargs.setdefault("InputClusterSplitProbabilityName", ClusterSplitProbContainer)
kwargs.setdefault("OutputClusterSplitProbabilityName", 'SplitProb'+flags.ITk.Tracking.extension)
@@ -551,7 +550,7 @@ def ITkTrkAmbiguityScoreCfg(flags, name="ITkAmbiguityScore", SiSPSeededTrackColl
# --- configure Ambiguity (score) solver
#
kwargs.setdefault("TrackInput" , [ InputTrackCollection ])
- kwargs.setdefault("TrackOutput", 'ScoredMap'+'InDetAmbiguityScore'+ flags.ITk.Tracking.extension)
+ kwargs.setdefault("TrackOutput", 'ScoredMap'+'ITkAmbiguityScore'+ flags.ITk.Tracking.extension)
kwargs.setdefault("AmbiguityScoreProcessor" , ITkAmbiguityScoreProcessor ) ## TODO: check the case when it is None object
ITkAmbiguityScore = CompFactory.Trk.TrkAmbiguityScore(name = name+flags.ITk.Tracking.extension, **kwargs)
@@ -600,7 +599,7 @@ def ITkTrackingSiPatternCfg(flags, InputCollections = None, ResolvedTrackCollect
# --- get list of already associated hits (always do this, even if no other tracking ran before)
#
if usePrdAssociationTool:
- prefix = 'InDet'
+ prefix = 'ITk'
suffix = flags.ITk.Tracking.extension
acc.merge(TC.ITkTrackPRD_AssociationCfg(flags,namePrefix = prefix,
nameSuffix = suffix,
diff --git a/InnerDetector/InDetConfig/python/TrackRecoConfig.py b/InnerDetector/InDetConfig/python/TrackRecoConfig.py
index d1b42ac08423..4f3dd6cdb8bb 100644
--- a/InnerDetector/InDetConfig/python/TrackRecoConfig.py
+++ b/InnerDetector/InDetConfig/python/TrackRecoConfig.py
@@ -146,7 +146,9 @@ def TrackParticleCreatorToolCfg(flags, name="TrackParticleCreatorTool", **kwargs
kwargs["TrackToVertex"] = result.popToolsAndMerge(TrackToVertexCfg(flags))
if "TrackSummaryTool" not in kwargs:
from InDetConfig.TrackingCommonConfig import InDetTrackSummaryToolSharedHitsCfg
- kwargs["TrackSummaryTool"] = result.popToolsAndMerge(InDetTrackSummaryToolSharedHitsCfg(flags))
+ TrackSummaryTool = result.popToolsAndMerge(InDetTrackSummaryToolSharedHitsCfg(flags))
+ result.addPublicTool(TrackSummaryTool)
+ kwargs["TrackSummaryTool"] = TrackSummaryTool
p_expr = flags.InDet.perigeeExpression
kwargs.setdefault("BadClusterID", flags.InDet.pixelClusterBadClusterID)
kwargs.setdefault("KeepParameters", True)
@@ -154,17 +156,17 @@ def TrackParticleCreatorToolCfg(flags, name="TrackParticleCreatorTool", **kwargs
kwargs.setdefault(
"PerigeeExpression",
p_expr if p_expr != "Vertex" else "BeamLine")
- result.setPrivateTools(CompFactory.Trk.TrackParticleCreatorTool(name, **kwargs))
+ result.addPublicTool(CompFactory.Trk.TrackParticleCreatorTool(name, **kwargs), primary = True)
return result
def TrackCollectionCnvToolCfg(flags, name="TrackCollectionCnvTool", TrackParticleCreator = None):
result = ComponentAccumulator()
if TrackParticleCreator is None:
- TrackParticleCreator = result.popToolsAndMerge(TrackParticleCreatorToolCfg(flags))
- result.setPrivateTools(CompFactory.xAODMaker.TrackCollectionCnvTool(
- name,
- TrackParticleCreator=TrackParticleCreator,
- ))
+ TrackParticleCreator = result.getPrimaryAndMerge(TrackParticleCreatorToolCfg(flags))
+ result.setPrivateTools(CompFactory.xAODMaker.TrackCollectionCnvTool(
+ name,
+ TrackParticleCreator=TrackParticleCreator,
+ ))
return result
def TrackParticleCnvAlgCfg(flags, name="TrackParticleCnvAlg", OutputTrackParticleContainer="InDetTrackParticles", **kwargs):
@@ -174,7 +176,7 @@ def TrackParticleCnvAlgCfg(flags, name="TrackParticleCnvAlg", OutputTrackParticl
kwargs.setdefault("xAODContainerName", OutputTrackParticleContainer)
kwargs.setdefault("xAODTrackParticlesFromTracksContainerName", OutputTrackParticleContainer)
if "TrackParticleCreator" not in kwargs:
- kwargs["TrackParticleCreator"] = result.popToolsAndMerge(TrackParticleCreatorToolCfg(flags))
+ kwargs["TrackParticleCreator"] = result.getPrimaryAndMerge(TrackParticleCreatorToolCfg(flags))
if "TrackCollectionCnvTool" not in kwargs:
kwargs["TrackCollectionCnvTool"] = result.popToolsAndMerge(TrackCollectionCnvToolCfg(
flags,
--
GitLab
From d7446a8aaef86577f110ef5119b1ce6a3a912d63 Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <stewart.martin-haugh@cern.ch>
Date: Tue, 24 Aug 2021 13:13:48 +0200
Subject: [PATCH 256/272] Migration L1Calo tools to JSON (ATR-21865)
---
.../TrigConfigSvc/python/TrigConfigSvcCfg.py | 9 +-
.../TrigT1/TrigT1CaloSim/src/JEMEnergySim.cxx | 1 -
.../TrigT1/TrigT1CaloSim/src/JEMEnergySim.h | 8 +-
Trigger/TrigT1/TrigT1CaloSim/src/Tester.cxx | 1016 -----------------
Trigger/TrigT1/TrigT1CaloSim/src/Tester.h | 190 ---
.../src/components/TrigT1CaloSim_entries.cxx | 2 -
.../TrigT1CaloToolInterfaces/IL1JetTools.h | 53 -
Trigger/TrigT1/TrigT1CaloTools/CMakeLists.txt | 2 +-
.../TrigT1/TrigT1CaloTools/src/L1CPMTools.h | 1 -
.../TrigT1CaloTools/src/L1EnergyCMXTools.h | 1 -
.../TrigT1CaloTools/src/L1JEPEtSumsTools.h | 1 -
.../TrigT1/TrigT1CaloTools/src/L1JetTools.cxx | 279 -----
.../TrigT1/TrigT1CaloTools/src/L1JetTools.h | 93 --
.../src/L1TriggerTowerTool.cxx | 16 +-
.../TrigT1CaloTools/src/L1TriggerTowerTool.h | 7 +-
.../components/TrigT1CaloTools_entries.cxx | 4 -
.../TrigT1CaloUtils/src/JEMJetAlgorithm.cxx | 5 +-
.../BStoESD_Tier0_HLTConfig_jobOptions.py | 2 +-
18 files changed, 20 insertions(+), 1670 deletions(-)
delete mode 100644 Trigger/TrigT1/TrigT1CaloSim/src/Tester.cxx
delete mode 100644 Trigger/TrigT1/TrigT1CaloSim/src/Tester.h
delete mode 100755 Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetTools.h
delete mode 100755 Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.cxx
delete mode 100755 Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.h
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py
index b0f67ed51530..a6aab99c665d 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py
@@ -220,8 +220,6 @@ def getL1ConfigSvc( flags ):
l1ConfigSvc.BGSK = cfg["BGSK"]
log.info( "For run 3 style menu access configured LVL1ConfigSvc with InputType='DB', SMK %d, and BGSK %d", cfg['SMK'], cfg['BGSK'] )
- from AthenaCommon.AppMgr import theApp
- theApp.CreateSvc += [ "TrigConf::LVL1ConfigSvc/LVL1ConfigSvc" ]
return l1ConfigSvc
@@ -252,22 +250,21 @@ def getHLTConfigSvc( flags ):
hltConfigSvc.SMK = cfg["SMK"]
log.info( "For run 3 style menu access configured HLTConfigSvc with InputType='DB' and SMK %d", cfg['SMK'] )
- from AthenaCommon.AppMgr import theApp
- theApp.CreateSvc += [ "TrigConf::HLTConfigSvc/HLTConfigSvc" ]
return hltConfigSvc
# provide L1 config service in new JO
def L1ConfigSvcCfg( flags ):
acc = ComponentAccumulator()
- acc.addService( getL1ConfigSvc( flags ) )
+ l1ConfigSvc = getL1ConfigSvc( flags )
+ acc.addService( l1ConfigSvc, create=True )
return acc
# provide HLT config service in new JO
def HLTConfigSvcCfg( flags ):
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
acc = ComponentAccumulator()
- acc.addService( getHLTConfigSvc( flags ) )
+ acc.addService( getHLTConfigSvc( flags ), create=True )
return acc
# provide both services in new JO
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/JEMEnergySim.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/JEMEnergySim.cxx
index 325b82d130ab..f730685dbd82 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/JEMEnergySim.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/JEMEnergySim.cxx
@@ -25,7 +25,6 @@
#include "TrigT1Interfaces/TrigT1Interfaces_ClassDEF.h"
#include "xAODTrigL1Calo/JetElementContainer.h"
-#include "TrigT1CaloEvent/JEMEtSums_ClassDEF.h"
#include "TrigT1CaloEvent/EnergyCMXData_ClassDEF.h"
#include "TrigT1CaloUtils/ModuleEnergy.h"
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/JEMEnergySim.h b/Trigger/TrigT1/TrigT1CaloSim/src/JEMEnergySim.h
index e6c29ef3d6fd..c2e5a0fcbbf7 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/JEMEnergySim.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/JEMEnergySim.h
@@ -24,11 +24,11 @@
#include "AthContainers/DataVector.h"
- // Athena/Gaudi includes
- #include "GaudiKernel/DataSvc.h"
-
+#include "StoreGate/WriteHandleKey.h"
+
// LVL1 Calo Trigger
- #include "TrigT1CaloToolInterfaces/IL1EtTools.h"
+#include "TrigT1CaloEvent/JEMEtSums_ClassDEF.h"
+#include "TrigT1CaloToolInterfaces/IL1EtTools.h"
#include "TrigT1Interfaces/TrigT1CaloDefs.h"
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/Tester.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/Tester.cxx
deleted file mode 100644
index b8240884d641..000000000000
--- a/Trigger/TrigT1/TrigT1CaloSim/src/Tester.cxx
+++ /dev/null
@@ -1,1016 +0,0 @@
-/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
-/***************************************************************************
- Tester.cxx - description
- -------------------
- begin : Mon Apr 23 2001
- email : e.moyse@qmw.ac.uk
- ***************************************************************************/
-//
-// updated: June 20, M. Wielers
-// move to Storegate
-//
-// ================================================
-// Tester class Implementation
-// ================================================
-//
-//
-
-// This algorithm includes
-#include "Tester.h"
-#include <fstream>
-#include <algorithm>
-// #include "CaloGeoHelpers/CaloSampling.h"
-#include "TrigT1CaloEvent/TriggerTower_ClassDEF.h"
-#include "TrigT1CaloEvent/CPMTower_ClassDEF.h"
-#include "TrigT1CaloEvent/JetElement_ClassDEF.h"
-#include "TrigT1CaloEvent/EmTauROI_ClassDEF.h"
-#include "TrigT1CaloEvent/JetROI_ClassDEF.h"
-#include "TrigT1Interfaces/TrigT1Interfaces_ClassDEF.h"
-#include "TrigT1CaloEvent/JEMHits_ClassDEF.h"
-#include "TrigT1CaloEvent/JEMEtSums_ClassDEF.h"
-#include "TrigT1CaloEvent/JEMRoI_ClassDEF.h"
-#include "TrigT1CaloEvent/CPMHits_ClassDEF.h"
-#include "TrigT1CaloEvent/CPMRoI_ClassDEF.h"
-#include "TrigT1CaloEvent/CMMCPHits_ClassDEF.h"
-#include "TrigT1CaloEvent/CMMJetHits_ClassDEF.h"
-#include "TrigT1CaloEvent/CMMEtSums_ClassDEF.h"
-#include "TrigT1CaloEvent/CPMTobRoI_ClassDEF.h"
-#include "TrigT1CaloEvent/CPMCMXData_ClassDEF.h"
-#include "TrigT1CaloEvent/JEMTobRoI_ClassDEF.h"
-#include "TrigT1CaloEvent/JetCMXData_ClassDEF.h"
-#include "TrigT1CaloEvent/CMMRoI.h"
-#include "TrigT1CaloEvent/CPCMXTopoData.h"
-#include "TrigT1CaloEvent/JetCMXTopoData.h"
-#include "TrigT1CaloEvent/CPTopoTOB.h"
-#include "TrigT1CaloEvent/JetTopoTOB.h"
-#include "TrigT1CaloEvent/EnergyTopoData.h"
-#include "TrigT1CaloUtils/ModuleEnergy.h"
-#include "TrigT1CaloUtils/CrateEnergy.h"
-#include "TrigT1CaloUtils/SystemEnergy.h"
-#include "TrigT1Interfaces/EmTauCTP.h"
-#include "TrigT1Interfaces/JetCTP.h"
-#include "TrigT1Interfaces/EnergyCTP.h"
-
-namespace LVL1{
-
-
-//--------------------------------
-// Constructors and destructors
-//--------------------------------
-
-Tester::Tester
- ( const std::string& name, ISvcLocator* pSvcLocator )
- : AthAlgorithm( name, pSvcLocator ),
- m_VectorOfEmTauROIs(0),
- m_EmTauSlinkLocation(TrigT1CaloDefs::EmTauSlinkLocation),
- m_EmTauTool("LVL1::L1EmTauTools/L1EmTauTools"),
- m_JetTool("LVL1::L1JetTools/L1JetTools"),
- m_EtTool("LVL1::L1EtTools/L1EtTools")
-{
- m_numberOfErrors=0;
- m_numberOfEvents=0;
- m_eventNumber=0;
- m_mode=0;
- //set defaults
- m_TriggerTowerLocation = TrigT1CaloDefs::TriggerTowerLocation ;
- m_JetElementLocation = TrigT1CaloDefs::JetElementLocation;
- m_EmTauROILocation = TrigT1CaloDefs::EmTauROILocation ;
- m_JetROILocation = TrigT1CaloDefs::JetROILocation ;
- m_actualROIWordLocation = DEFAULT_actualROIWordLocation ;
- m_jemHitsLocation = LVL1::TrigT1CaloDefs::JEMHitsLocation ;
- m_jemEtSumsLocation = LVL1::TrigT1CaloDefs::JEMEtSumsLocation ;
- m_CPMTobRoILocation = TrigT1CaloDefs::CPMTobRoILocation;
- m_CPMCMXDataLocation = TrigT1CaloDefs::CPMCMXDataLocation ;
- m_JEMTobRoILocation = TrigT1CaloDefs::JEMTobRoILocation;
- m_JetCMXDataLocation = TrigT1CaloDefs::JetCMXDataLocation;
- m_CPCMXTopoDataLocation = TrigT1CaloDefs::EmTauTopoTobLocation;
- m_JetCMXTopoDataLocation = TrigT1CaloDefs::JetTopoTobLocation;
- m_EnergyTopoDataLocation = TrigT1CaloDefs::EnergyTopoDataLocation;
- m_EmTauCTPLocation = TrigT1CaloDefs::EmTauCTPLocation;
- m_JetCTPLocation = TrigT1CaloDefs::JetCTPLocation;
- m_EnergyCTPLocation = TrigT1CaloDefs::EnergyCTPLocation;
-
- declareProperty( "L1EmTauTools", m_EmTauTool, "Tool for EM/Tau trigger simulation");
- declareProperty( "L1JetTools", m_JetTool, "Tool for Jet trigger simulation");
- declareProperty( "L1EtTools", m_EtTool, "Tool for ET trigger simulation");
-
- // This is how you declare the paramemters to Gaudi so that
- // they can be over-written via the job options file
- declareProperty( "TriggerTowerLocation", m_TriggerTowerLocation ) ;
- declareProperty( "JetElementLocation", m_JetElementLocation ) ;
- declareProperty( "EMTauROILocation", m_EmTauROILocation ) ;
- declareProperty( "JetROILocation", m_JetROILocation ) ;
- declareProperty( "ActualROIWordLocation", m_actualROIWordLocation );
- declareProperty( "Mode", m_mode);
- declareProperty( "EmTauSlinkLocation", m_EmTauSlinkLocation );
-
- for (unsigned int i = 0; i < TrigT1CaloDefs::numOfCPRoIRODs; ++i) {
- m_emTauSlink[i] = 0;
- }
-}
-
-
-//---------------------------------
-// initialise()
-//---------------------------------
-
-StatusCode Tester::initialize()
-{
- if (m_mode&m_dumpEmTauRoIs || m_mode&m_compareEmTauRoIs) {
- ATH_CHECK( m_EmTauTool.retrieve() );
- } else {
- m_EmTauTool.disable();
- }
- // The following are never used?
- m_JetTool.disable();
- m_EtTool.disable();
-
- return StatusCode::SUCCESS ;
-}
-
-
-//---------------------------------
-// finalise()
-//---------------------------------
-
-StatusCode Tester::finalize()
-{
- ATH_MSG_INFO( "Finalizing" );
- ATH_MSG_INFO( "TOTAL ERRORS : " <<m_numberOfErrors<<" out of "<<m_numberOfEvents<<" examined events.");
-
-
- for( std::vector<int>::const_iterator it= m_eventsWithErrors.begin(); it < m_eventsWithErrors.end(); ++it){
- ATH_MSG_DEBUG("Error in event :"<<std::ios::dec<<(*it));
- }
-
- return StatusCode::SUCCESS ;
-}
-
-
-//----------------------------------------------
-// execute() method called once per event
-//----------------------------------------------
-//
-
-
-StatusCode Tester::execute( )
-{
-
- ATH_MSG_DEBUG ( "Executing" );
-
-
- m_numberOfEvents++;
- m_actualROIWords.erase(m_actualROIWords.begin(), m_actualROIWords.end());
- m_generatedROIWords.erase(m_generatedROIWords.begin(), m_generatedROIWords.end());
-
- // Dump TriggerTower values.
- if (m_mode&m_dumpTTs) {printTriggerTowerValues();}
- // Dump EmTauROI values.
- if (m_mode&m_dumpEmTauRoIs) {loadEmTauROIs();}
- // try to compare generated ROI words with actual ROI words.
- if (m_mode&m_compareEmTauRoIs) {
- loadEmTauROIs(); // get some ROIs
- loadActualROIWord();
- compareROIWords();
- }
- // compare coords from RoIwords and RoIDecoder and original RoI objects
- if (m_mode&m_compRoIWrdCoords) {compareRoIWordCoords();}
- // look for specific RoI and dump its calo cells
- if (m_mode&m_dumpRoICells) {dumpROICells();}
-
- if (m_mode&m_dumpJEMResults) {dumpJEMResults();}
-
- if (m_mode&m_dumpEDM) {dumpEDM();}
-
- return StatusCode::SUCCESS ;
-}
-
-void LVL1::Tester::loadTriggerTowers(){
-//
-// typedef DataVector<LVL1::TriggerTower> t_TTCollection ;
-// DataHandle<t_TTCollection> TTVector;
-//
-// if( evtStore()->retrieve(TTVector, m_TriggerTowerLocation).isFailure() ){
-// log << MSG::ERROR
-// << "No TriggerTowers found in TES at "
-// << m_TriggerTowerLocation
-// );
-// return;
-// }
-//
-// log << MSG::INFO
-// << "Got "
-// << TTVector->size()
-// << " Trigger Towers from TES"
-// );
-//
-//
-// return;
-} // end of loadTriggerTowers()
-
-/** prints useful TriggerTower values*/
-void LVL1::Tester::printTriggerTowerValues(){
-typedef DataVector<LVL1::TriggerTower> t_TTCollection ;
- const t_TTCollection* TTVector;
-
- if( evtStore()->retrieve(TTVector, m_TriggerTowerLocation).isFailure() ){
- ATH_MSG_DEBUG ( "No TriggerTowers found in TES at "
- << m_TriggerTowerLocation ) ;
- return;
- }
-
- ATH_MSG_INFO( "Got " << TTVector->size()
- << " Trigger Towers from TES" );
-
- // Step over all TTs and print values...
- t_TTCollection::const_iterator it ;
-
- for( it = TTVector->begin(); it < TTVector->end(); ++it ){
- ATH_MSG_INFO("TT has coords ("<<(*it)->phi()<<", "<<(*it)->eta()
- << " and energies : "<<(*it)->emEnergy()<<", "<<(*it)->hadEnergy()<<" (Em,Had)");
- }//end it for-loop
-}//end of printTTs
-
-/** loads the EmTauROIs from the TES.*/
-void LVL1::Tester::loadEmTauROIs(){
-
- const t_EmTauROICollection* ROIs = nullptr;
- evtStore()->retrieve(ROIs, m_EmTauROILocation).ignore();
-
- if( ! ROIs ) {
- ATH_MSG_DEBUG( "No ROIs found in TES at "
- << m_EmTauROILocation );
- return;
- } else {
- ATH_MSG_DEBUG("Found "<<ROIs->size() << " ROI(s)");
-
- t_EmTauROICollection::const_iterator it ;
-
- for( it = ROIs->begin(); it < ROIs->end(); ++it){
- int tempROIword=(*it)->roiWord();
- ATH_MSG_DEBUG("ROI has ROIword : " << std::hex
- << tempROIword << std::dec << endmsg
- << "eta : " << (*it)->eta() << endmsg
- << "phi : " << (*it)->phi() << endmsg
- << "Core ET : " << (*it)->energy() << endmsg
- << "EM cluster : " << (*it)->clusterEnergy() << endmsg
- << "Tau cluster : " << (*it)->tauClusterEnergy() << endmsg
- << "EM isol : " << (*it)->emRingIsolationEnergy() << endmsg
- << "Had isol : " << (*it)->hadRingIsolationEnergy() << endmsg
- << "Had veto : " << (*it)->hadCoreEnergy() );
- //m_generatedROIWords.push_back(tempROIword);
- }
- }
-
- // Now test new EM/Tau implementation
-
- StatusCode sc = m_EmTauTool.retrieve();
- if (sc.isFailure()) {
- ATH_MSG_ERROR( "Problem retrieving EmTauTool" );
- }
- else {
- const DataVector<LVL1::TriggerTower>* TTVector;
- if( evtStore()->retrieve(TTVector, m_TriggerTowerLocation).isSuccess() ) {
- DataVector<CPAlgorithm>* rois = new DataVector<CPAlgorithm>;
- m_EmTauTool->findRoIs(TTVector,rois);
- DataVector<CPAlgorithm>::iterator cpw = rois->begin();
- for ( ; cpw != rois->end(); cpw++) {
- ATH_MSG_DEBUG("CPAlgorithm has properties : " << std::hex
- << "RoIWord : " << std::hex << (*cpw)->RoIWord() << std::dec << endmsg
- << "eta : " << (*cpw)->eta() << endmsg
- << "phi : " << (*cpw)->phi() << endmsg
- << "Core ET : " << (*cpw)->Core() << endmsg
- << "EM cluster : " << (*cpw)->EMClus() << endmsg
- << "Tau cluster : " << (*cpw)->TauClus() << endmsg
- << "EM isol : " << (*cpw)->EMIsol() << endmsg
- << "Had isol : " << (*cpw)->HadIsol() << endmsg
- << "Had veto : " << (*cpw)->HadVeto() );
- }
- delete rois;
- }
- }
-
- return;
-} // end of loadROIs()
-
-/** loads the Actual ROI words from the TES.*/
-void LVL1::Tester::loadActualROIWord(){
- char line[60]=""; // to read a line into
- long lineNumber=0;
- int numRows=2;
-
- ATH_MSG_DEBUG("Trying to open input file " << m_actualROIWordLocation.c_str() );
- std::ifstream in( m_actualROIWordLocation.c_str() );
- if (!in){
- ATH_MSG_FATAL( "Could not find ROI words in "<<m_actualROIWordLocation.c_str() );
- return;
- }else{
- TriggerTowerKey get(0.0, 0.0);
- ATH_MSG_DEBUG ( "Event Number : "<<std::ios::dec<<m_eventNumber );
-
- while ( lineNumber < ((m_eventNumber-1)*3) ){
- in.getline(line,50);
- lineNumber++;
- }
-
- for ( int row = 1 ; row <= numRows ; row++ ){
- lineNumber++;
-
- int input=0;
- //if ( in.eof( ) )
- // return;
- in >> input;
-
-
- // I'm ignoring the left/right info...
- input &= 0x0000FFFF;
-
- if (input>0){
- ATH_MSG_DEBUG(
- " LineNumber : "<<std::ios::dec<<lineNumber
- << " ROIword : "<<std::ios::dec<<input<<" and in hex : "<<std::ios::hex<<input
- );
- m_actualROIWords.push_back(input);
- }
- } // end phi for loop
- }
- return;
-}//end of loadActualROIWords
-
-/** Compares generated ROIwords with actual ROIwords and checks to make sure they are the same.*/
-void LVL1::Tester::compareROIWords(){
- if (m_actualROIWords.size()!=m_generatedROIWords.size()){
- ATH_MSG_FATAL( "Different numbers of ROI words in generated and actual data!" );
- }else{
- sort(m_actualROIWords.begin(), m_actualROIWords.end());
- sort(m_generatedROIWords.begin(), m_generatedROIWords.end());
- if (equal(m_actualROIWords.begin(), m_actualROIWords.end(),m_generatedROIWords.begin() )){
- }else{
- ATH_MSG_INFO("ROIWords do not match!!!!!!!!!!!!!!!!!!!!!" );
- m_numberOfErrors++;
- m_eventsWithErrors.push_back(m_eventNumber);
- }
- }
- return;
-}//end of compareROIWords
-
-
-/** prints useful TriggerTower values*/
-void LVL1::Tester::dumpEDM(){
- typedef DataVector<LVL1::TriggerTower> t_TTCollection ;
- const t_TTCollection* TTVector;
-
- if( evtStore()->retrieve(TTVector, m_TriggerTowerLocation).isFailure() ){
- ATH_MSG_INFO ( "No TriggerTowers found in TES at "
- << m_TriggerTowerLocation ) ;
- }
- else {
-
- ATH_MSG_INFO( "Got " << TTVector->size()
- << " Trigger Towers from TES");
-
- // Step over all TTs and print values...
- t_TTCollection::const_iterator it ;
-
- for( it = TTVector->begin(); it < TTVector->end(); ++it ){
- ATH_MSG_INFO("TT has coords ("<<(*it)->phi()<<", "<<(*it)->eta()
- << " and energies : "<<(*it)->emEnergy()<<", "<<(*it)->hadEnergy()<<" (Em,Had)");
- }//end it for-loop
- }
-
-
- // Now do the same for CPMTowers
- const DataVector<LVL1::CPMTower>* CPMTVector;
-
- if( evtStore()->retrieve(CPMTVector, TrigT1CaloDefs::CPMTowerLocation).isFailure() ){
- ATH_MSG_INFO ( "No CPMTowers found in TES at "
- << TrigT1CaloDefs::CPMTowerLocation ) ;
- }
- else {
-
- ATH_MSG_INFO( "Got " << CPMTVector->size() << " CPMTowers from TES" );
-
- // Step over all TTs and print values...
- DataVector<LVL1::CPMTower>::const_iterator it2 ;
- for( it2 = CPMTVector->begin(); it2 < CPMTVector->end(); ++it2 ){
- ATH_MSG_INFO("CPMT has coords ("<<(*it2)->phi()<<", "<<(*it2)->eta()
- << " and energies : "<<(*it2)->emEnergy()<<", "<<(*it2)->hadEnergy()<<" (Em,Had)");
- }//end it for-loop
- }
-
-
- // Now do the same for JetElements
- const DataVector<LVL1::JetElement>* JEVector;
-
- if( evtStore()->retrieve(JEVector, TrigT1CaloDefs::JetElementLocation).isFailure() ){
- ATH_MSG_INFO ( "No JetElements found in TES at "
- << TrigT1CaloDefs::JetElementLocation ) ;
- }
- else {
- ATH_MSG_INFO( "Got " << JEVector->size() << " JetElements from TES" );
-
- // Step over all TTs and print values...
- DataVector<LVL1::JetElement>::const_iterator it3 ;
- for( it3 = JEVector->begin(); it3 < JEVector->end(); ++it3 ){
- ATH_MSG_INFO("JE has coords ("<<(*it3)->phi()<<", "<<(*it3)->eta()
- << " and energies : "<<(*it3)->emEnergy()<<", "<<(*it3)->hadEnergy()<<" (Em,Had)");
- }//end it for-loop
- }
-
-
- // Now do the same for CPMHits
- const DataVector<LVL1::CPMHits>* CPMHVector;
-
- if( evtStore()->retrieve(CPMHVector, TrigT1CaloDefs::CPMHitsLocation).isFailure() ){
- ATH_MSG_INFO ( "No CPMHits found in TES at "
- << TrigT1CaloDefs::CPMHitsLocation ) ;
- }
- else {
-
- ATH_MSG_INFO( "Got " << CPMHVector->size() << " CPMHits from TES" );
-
- // Step over all TTs and print values...
- DataVector<LVL1::CPMHits>::const_iterator it4 ;
- for( it4 = CPMHVector->begin(); it4 < CPMHVector->end(); ++it4 ){
- ATH_MSG_INFO("CPMHits from crate "<<(*it4)->crate()
- <<" module "<<(*it4)->module() << " hitwords : "
- << std::hex << (*it4)->HitWord0()<<", "<<(*it4)->HitWord1()
- << std::dec );
- }//end it for-loop
- }
-
-
- // Now do the same for CPMRoIs
- const DataVector<LVL1::CPMRoI>* CPMRVector;
-
- if( evtStore()->retrieve(CPMRVector, TrigT1CaloDefs::CPMRoILocation).isFailure() ){
- ATH_MSG_INFO ( "No CPMRoIs found in TES at "
- << TrigT1CaloDefs::CPMRoILocation ) ;
- }
- else {
-
- ATH_MSG_INFO( "Got " << CPMRVector->size() << " CPMRoIs from TES" );
-
- // Step over all TTs and print values...
- DataVector<LVL1::CPMRoI>::const_iterator it5 ;
- for( it5 = CPMRVector->begin(); it5 < CPMRVector->end(); ++it5 ){
- ATH_MSG_INFO( "CPMRoI from crate " << (*it5)->crate()
- <<" module " << (*it5)->cpm() << " chip " << (*it5)->chip()
- << " LC " << (*it5)->location()
- << " word " << std::hex << (*it5)->hits() << std::dec );
- }//end it for-loop
- }
-
-
-
- // Now do the same for CMMCPHits
- const DataVector<LVL1::CMMCPHits>* CMMCPHVector;
-
- if( evtStore()->retrieve(CMMCPHVector, TrigT1CaloDefs::CMMCPHitsLocation).isFailure() ){
- ATH_MSG_INFO ( "No CMMCPHits found in TES at "
- << TrigT1CaloDefs::CMMCPHitsLocation ) ;
- }
- else {
-
- ATH_MSG_INFO( "Got " << CMMCPHVector->size() << " CMMCPHits from TES" );
-
- // Step over all TTs and print values...
- DataVector<LVL1::CMMCPHits>::const_iterator it6;
- for( it6 = CMMCPHVector->begin(); it6 < CMMCPHVector->end(); ++it6 ){
- ATH_MSG_INFO("CMMCPHits from crate "<<(*it6)->crate()
- <<" dataID "<<(*it6)->dataID() << " hitwords : "
- << std::hex << (*it6)->HitWord0()<<", "<<(*it6)->HitWord1()
- << std::dec );
- }//end it for-loop
- }
-
-
- // Now do the same for CMMJetHits
- const DataVector<LVL1::CMMJetHits>* CMMJHVector;
-
- if( evtStore()->retrieve(CMMJHVector, TrigT1CaloDefs::CMMJetHitsLocation).isFailure() ){
- ATH_MSG_INFO ( "No CMMJetHits found in TES at "
- << TrigT1CaloDefs::CMMJetHitsLocation ) ;
- }
- else {
-
- ATH_MSG_INFO( "Got " << CMMJHVector->size() << " CMMJetHits from TES" );
-
- // Step over all TTs and print values...
- DataVector<LVL1::CMMJetHits>::const_iterator it7;
- for( it7 = CMMJHVector->begin(); it7 < CMMJHVector->end(); ++it7 ){
- ATH_MSG_INFO("CMMJetHits from crate "<<(*it7)->crate()
- <<" dataID "<<(*it7)->dataID() << " hitwords : "
- << std::hex << (*it7)->Hits()
- << std::dec );
- }//end it for-loop
- }
-
-
- // Now do the same for CMMEtSums
- const DataVector<LVL1::CMMEtSums>* CMMESVector;
-
- if( evtStore()->retrieve(CMMESVector, TrigT1CaloDefs::CMMEtSumsLocation).isFailure() ){
- ATH_MSG_INFO ( "No CMMEtSums found in TES at "
- << TrigT1CaloDefs::CMMEtSumsLocation ) ;
- }
- else {
-
- ATH_MSG_INFO( "Got " << CMMESVector->size() << " CMMEtSums from TES" );
-
- // Step over all TTs and print values...
- DataVector<LVL1::CMMEtSums>::const_iterator it8;
- for( it8 = CMMESVector->begin(); it8 < CMMESVector->end(); ++it8 ){
- ATH_MSG_INFO("CMMEtSums from crate "<<(*it8)->crate()
- <<" dataID "<<(*it8)->dataID() << " ET: "
- << (*it8)->Et() << " Ex: " << (*it8)->Ex() << " Ey: " << (*it8)->Ey()
- );
- }//end it for-loop
- }
-
-
- // Now do the same for JEMHits
- const DataVector<LVL1::JEMHits>* JEMHVector;
-
- if( evtStore()->retrieve(JEMHVector, TrigT1CaloDefs::JEMHitsLocation).isFailure() ){
- ATH_MSG_INFO ( "No JEMHits found in TES at "
- << TrigT1CaloDefs::JEMHitsLocation ) ;
- }
- else {
-
- ATH_MSG_INFO( "Got " << JEMHVector->size() << " JEMHits from TES" );
-
- // Step over all TTs and print values...
- DataVector<LVL1::JEMHits>::const_iterator it9 ;
- for( it9 = JEMHVector->begin(); it9 < JEMHVector->end(); ++it9 ){
- ATH_MSG_INFO("JEMHits from crate "<<(*it9)->crate()
- <<" module "<<(*it9)->module() << " hitword : "
- << std::hex << (*it9)->JetHits()
- << std::dec );
- }//end it for-loop
- }
-
-
- // Now do the same for JEMEtSums
- const DataVector<LVL1::JEMEtSums>* JEMESVector;
-
- if( evtStore()->retrieve(JEMESVector, TrigT1CaloDefs::JEMEtSumsLocation).isFailure() ){
- ATH_MSG_INFO ( "No JEMEtSums found in TES at "
- << TrigT1CaloDefs::JEMEtSumsLocation ) ;
- }
- else {
-
- ATH_MSG_INFO( "Got " << JEMESVector->size() << " JEMEtSums from TES" );
-
- // Step over all TTs and print values...
- DataVector<LVL1::JEMEtSums>::const_iterator it10;
- for( it10 = JEMESVector->begin(); it10 < JEMESVector->end(); ++it10 ){
- ATH_MSG_INFO("JEMEtSums from crate "<<(*it10)->crate()
- <<" module "<<(*it10)->module() << " ET: "
- << (*it10)->Et() << " Ex: " << (*it10)->Ex() << " Ey: " << (*it10)->Ey()
- );
- }//end it for-loop
- }
-
-
- // Now do the same for JEMRoIs
- const DataVector<LVL1::JEMRoI>* JEMRVector;
-
- if( evtStore()->retrieve(JEMRVector, TrigT1CaloDefs::JEMRoILocation).isFailure() ){
- ATH_MSG_INFO ( "No JEMRoIs found in TES at "
- << TrigT1CaloDefs::JEMRoILocation ) ;
- }
- else {
-
- ATH_MSG_INFO( "Got " << JEMRVector->size() << " JEMRoIs from TES" );
-
- // Step over all TTs and print values...
- DataVector<LVL1::JEMRoI>::const_iterator it11 ;
- for( it11 = JEMRVector->begin(); it11 < JEMRVector->end(); ++it11 ){
- ATH_MSG_INFO( "JEMRoI from crate " << (*it11)->crate()
- <<" module " << (*it11)->jem() << " frame " << (*it11)->frame()
- << " LC " << (*it11)->location()
- << " hits " << std::hex << (*it11)->hits() << std::dec );
- }//end it for-loop
- }
-
-
- // Now do the same for CPMTobRoI
- const DataVector<CPMTobRoI>* cpmtobrois;
-
- if( evtStore()->retrieve(cpmtobrois, m_CPMTobRoILocation).isFailure() ){
- ATH_MSG_INFO ( "No CPMTobRoI found in TES at "
- << m_CPMTobRoILocation ) ;
- }
- else {
-
- ATH_MSG_INFO( "Got " << cpmtobrois->size() << " CPMTobRoI from TES" );
-
- // print values...
- DataVector<LVL1::CPMTobRoI>::const_iterator itcp ;
- for( itcp = cpmtobrois->begin(); itcp < cpmtobrois->end(); ++itcp ) {
- ATH_MSG_INFO( std::hex
- << "RoI Word " << (*itcp)->roiWord()
- << std::dec << " Crate = "
- << (*itcp)->crate() << ", Module = " << (*itcp)->cpm()
- << ", Chip = " << (*itcp)->chip()
- << ", Coordinate = " << (*itcp)->location()
- );
- ATH_MSG_INFO( " ET " << (*itcp)->energy()
- << " Isolation " << std::hex << (*itcp)->isolation() << std::dec
- << " Type = " << (*itcp)->type()
- );
- }
-
- }
-
-
- // CPM->CMX Data
- const DataVector<CPMCMXData>* emcmx;
-
- if( evtStore()->retrieve(emcmx, m_CPMCMXDataLocation).isFailure() ){
- ATH_MSG_INFO ( "No CPMCMXData found in TES at "
- << m_CPMCMXDataLocation ) ;
- }
- else {
-
- ATH_MSG_INFO( "Got " << emcmx->size() << " CPMCMXData from TES" );
-
- // print values...
- DataVector<LVL1::CPMCMXData>::const_iterator item ;
- for( item = emcmx->begin(); item < emcmx->end(); ++item ) {
- ATH_MSG_INFO( " Crate = " << (*item)->crate() << ", Module = " << (*item)->module()
- << ", Type = " << (*item)->type() );
- std::vector<unsigned int> data = (*item)->DataWords();
- ATH_MSG_INFO( " Map " << std::hex << (*item)->presenceMap() << std::dec );
- ATH_MSG_INFO( " Data : " << std::hex << data[0] << " " << data[1]
- << " " << data[2] << " " << data[3] << std::dec );
- }
-
- }
-
-
-
- // Now do the same for JEMTobRoI
- const DataVector<JEMTobRoI>* jemtobrois;
-
- if( evtStore()->retrieve(jemtobrois, m_JEMTobRoILocation).isFailure() ){
- ATH_MSG_INFO ( "No JEMTobRoI found in TES at " << m_JEMTobRoILocation ) ;
- }
- else {
-
- ATH_MSG_INFO( "Got " << jemtobrois->size() << " JEMTobRoI from TES" );
-
- // print values...
- DataVector<LVL1::JEMTobRoI>::const_iterator itje ;
- for( itje = jemtobrois->begin(); itje < jemtobrois->end(); ++itje ) {
- ATH_MSG_INFO( std::hex
- << "RoI Word " << (*itje)->roiWord()
- << std::dec << " Crate = "
- << (*itje)->crate() << ", Module = " << (*itje)->jem()
- << ", Frame = " << (*itje)->frame()
- << ", Coordinate = " << (*itje)->location()
- );
- ATH_MSG_INFO( " ETLarge = " << (*itje)->energyLarge()
- << " ETSmall = " << (*itje)->energySmall()
- );
- }
-
- }
-
-
- // Jet JEM->CMX Data
- const DataVector<JetCMXData>* jetcmx;
-
- if( evtStore()->retrieve(jetcmx, m_JetCMXDataLocation).isFailure() ){
- ATH_MSG_INFO ( "No JetCMXData found in TES at "
- << m_JetCMXDataLocation ) ;
- }
- else {
-
- ATH_MSG_INFO( "Got " << jetcmx->size() << " JetCMXData from TES" );
-
- // print values...
- DataVector<LVL1::JetCMXData>::const_iterator itjetcmx ;
- for( itjetcmx = jetcmx->begin(); itjetcmx < jetcmx->end(); ++itjetcmx ) {
- ATH_MSG_INFO(" Crate = " << (*itjetcmx)->crate() << ", Module = " << (*itjetcmx)->module() );
- std::vector<unsigned int> data = (*itjetcmx)->DataWords();
- ATH_MSG_INFO( " Map " << std::hex << (*itjetcmx)->presenceMap() << std::dec );
- ATH_MSG_INFO( " Data : " << std::hex << data[0] << " " << data[1]
- << " " << data[2] << " " << data[3] << std::dec );
- }
-
- }
-
- // CPCMXTopoData
- const DataVector<CPCMXTopoData>* cpcmxtopo;
-
- if( evtStore()->retrieve(cpcmxtopo, m_CPCMXTopoDataLocation).isFailure() ){
- ATH_MSG_INFO ( "No CPCMXTopoData found in TES at "
- << m_CPCMXTopoDataLocation ) ;
- }
- else {
-
- ATH_MSG_INFO( "Got " << cpcmxtopo->size() << " CPCMXTopoData from TES" );
-
- // print values...
- DataVector<LVL1::CPCMXTopoData>::const_iterator itcpcmxtopo ;
- for( itcpcmxtopo = cpcmxtopo->begin(); itcpcmxtopo < cpcmxtopo->end(); ++itcpcmxtopo ) {
- ATH_MSG_INFO( " Crate = " << (*itcpcmxtopo)->crate() << ", CMX = " << (*itcpcmxtopo)->cmx()
- << ", Overflow = " << (*itcpcmxtopo)->overflow() );
- std::vector<unsigned int> data = (*itcpcmxtopo)->tobWords();
- std::vector<CPTopoTOB> tobs;
- (*itcpcmxtopo)->tobs(tobs);
- if (tobs.size() == data.size()) {
- for (unsigned int i = 0; i < data.size(); ++i) {
- ATH_MSG_INFO( " TOB word " << std::hex << data[i] << std::dec <<
- " ET " << tobs[i].et() << ", isolation = 0x" << std::hex << tobs[i].isolation() << std::dec << endmsg <<
- " Coordinate (" << tobs[i].eta() << ", " << tobs[i].phi() << ") => (" <<
- tobs[i].ieta() << ", " << tobs[i].iphi() << ")" );
- }
- }
- else ATH_MSG_INFO( "MisMatch: " << data.size() << " words but " << tobs.size() << " TOBs" );
- }
-
- }
-
-
- // JetCMXTopoData
- const DataVector<JetCMXTopoData>* jetcmxtopo;
-
- if( evtStore()->retrieve(jetcmxtopo, m_JetCMXTopoDataLocation).isFailure() ){
- ATH_MSG_INFO ( "No JetCMXTopoData found in TES at "
- << m_JetCMXTopoDataLocation ) ;
- }
- else {
-
- ATH_MSG_INFO( "Got " << jetcmxtopo->size() << " JetCMXTopoData from TES" );
-
- // print values...
- DataVector<LVL1::JetCMXTopoData>::const_iterator itjetcmxtopo ;
- for( itjetcmxtopo = jetcmxtopo->begin(); itjetcmxtopo < jetcmxtopo->end(); ++itjetcmxtopo ) {
- ATH_MSG_INFO(" Crate = " << (*itjetcmxtopo)->crate()
- << ", Overflow = " << (*itjetcmxtopo)->overflow() );
- std::vector<unsigned int> data = (*itjetcmxtopo)->tobWords();
- std::vector<JetTopoTOB> tobs;
- (*itjetcmxtopo)->tobs(tobs);
- if (tobs.size() == data.size()) {
- for (unsigned int i = 0; i < data.size(); ++i) {
- ATH_MSG_INFO( " TOB word " << std::hex << data[i] << std::dec <<
- " ETLarge " << tobs[i].etLarge() << ", ETSmall " << tobs[i].etSmall() << endmsg <<
- " Coordinate (" << tobs[i].eta() << ", " << tobs[i].phi() << ") => (" <<
- tobs[i].ieta() << ", " << tobs[i].iphi() << ")" );
- }
- }
- else ATH_MSG_INFO( "MisMatch: " << data.size() << " words but " << tobs.size() << " TOBs" );
- }
-
- }
-
-
- // EnergyTopoData
- const EnergyTopoData* energytopo;
-
- if( evtStore()->retrieve(energytopo, m_EnergyTopoDataLocation).isFailure() ){
- ATH_MSG_INFO ( "No EnergyTopoData found in TES at "
- << m_EnergyTopoDataLocation ) ;
- }
- else {
-
- // print values...
- ATH_MSG_INFO( " EnergyTopoData:"
- << "Word 0: " << MSG::hex << energytopo->word0() << ", Word 1: " << energytopo->word1()
- << ", Word 2: " << energytopo->word2() << MSG::dec
- << "Ex: Full " << energytopo->Ex(LVL1::EnergyTopoData::Normal)
- << ", Restricted " << energytopo->Ex(LVL1::EnergyTopoData::Restricted)
- << ", Overflows " << energytopo->ExOverflow(LVL1::EnergyTopoData::Normal) << ", " << energytopo->ExOverflow(LVL1::EnergyTopoData::Restricted)
- << "Ey: Full " << energytopo->Ey(LVL1::EnergyTopoData::Normal)
- << ", Restricted " << energytopo->Ey(LVL1::EnergyTopoData::Restricted)
- << ", Overflows " << energytopo->ExOverflow(LVL1::EnergyTopoData::Normal) << ", " << energytopo->ExOverflow(LVL1::EnergyTopoData::Restricted)
- << "ET: Full " << energytopo->Et(LVL1::EnergyTopoData::Normal)
- << ", Restricted " << energytopo->Et(LVL1::EnergyTopoData::Restricted)
- << ", Overflows " << energytopo->ExOverflow(LVL1::EnergyTopoData::Normal) << ", " << energytopo->ExOverflow(LVL1::EnergyTopoData::Restricted)
- );
-
- }
-
-
- // CTP Data
- const EmTauCTP* emtauctp = nullptr;
- if( evtStore()->retrieve(emtauctp, m_EmTauCTPLocation).isFailure() ){
- ATH_MSG_INFO ( "No EmTauCTP found in TES at "
- << m_EmTauCTPLocation ) ;
- }
- else {
- // print values...
- ATH_MSG_INFO( " EmTauCTP:" << MSG::hex
- << "Word 0: " << emtauctp->cableWord0() << ", Word 1: " << emtauctp->cableWord1()
- << ", Word 2: " << emtauctp->cableWord2() << ", Word 3: " << emtauctp->cableWord3() << MSG::dec );
- }
-
- const JetCTP* jetctp = nullptr;
- if( evtStore()->retrieve(jetctp, m_JetCTPLocation).isFailure() ){
- ATH_MSG_INFO ( "No JetCTP found in TES at "
- << m_JetCTPLocation ) ;
- }
- else {
- // print values...
- ATH_MSG_INFO( " JetCTP:" << MSG::hex << endmsg
- << "Word 0: " << jetctp->cableWord0() << ", Word 1: " << jetctp->cableWord1() << MSG::dec );
- }
-
- const EnergyCTP* energyctp = nullptr;
- if( evtStore()->retrieve(energyctp, m_EnergyCTPLocation).isFailure() ){
- ATH_MSG_INFO ( "No EnergyCTP found in TES at "
- << m_EnergyCTPLocation ) ;
- }
- else {
- // print values...
- ATH_MSG_INFO( " EnergyCTP:" << MSG::hex << endmsg
- << "Word 0: " << energyctp->cableWord0() << ", Word 1: " << energyctp->cableWord1() << MSG::dec );
- }
-
-
- // Now do the same for CMMRoI
- const CMMRoI* cmmroi = nullptr;
-
- if( evtStore()->retrieve(cmmroi, TrigT1CaloDefs::CMMRoILocation).isFailure() ){
- ATH_MSG_INFO ( "No CMMRoI found in TES at "
- << TrigT1CaloDefs::CMMRoILocation ) ;
- }
- else {
-
- ATH_MSG_INFO( "Got CMMRoI from TES" );
-
- // print values...
- ATH_MSG_INFO( std::hex
- << "jetEtHits " << cmmroi->jetEtHits()
- << " sumEtHits " << cmmroi->sumEtHits()
- << " EtMissHits " << cmmroi->missingEtHits()
- << std::dec );
- ATH_MSG_INFO( " ET " << cmmroi->et()
- << " Ex: " << cmmroi->ex()
- << " Ey: " << cmmroi->ey()
- );
- }
-
-
-}//end of dumpEDM
-
-
-} // end of LVL1 namespace bracket
-
-/** load and lookat SlinkObject. Form lost of EmTauRoIwords from them and check coordinates. */
-void LVL1::Tester::examineSlinkObjects(){
- /**\todo There must be a better way of doing this, but CERN doesn't seem to have sstream.h*/
- std::string emTauSlinkLocation[4];
- emTauSlinkLocation[0]= m_EmTauSlinkLocation+"0";
- emTauSlinkLocation[1]= m_EmTauSlinkLocation+"1";
- emTauSlinkLocation[2]= m_EmTauSlinkLocation+"2";
- emTauSlinkLocation[3]= m_EmTauSlinkLocation+"3";
-
- for (unsigned int i = 0; i<TrigT1CaloDefs::numOfCPRoIRODs;i++){
- // Here we tell load a CTP object from the transient store.
- StatusCode sc1 = evtStore()->retrieve(m_emTauSlink[i],emTauSlinkLocation[i]);
- if ( sc1.isFailure() ) {
- ATH_MSG_ERROR( "No Slink object found in TES at "
- << emTauSlinkLocation[i] );
- return;
- }
- }
- //dumpSlinks();
- return;
-}
-/** Compare RoI coords reconstructed from RoI words with coords from original RoI objects */
-void LVL1::Tester::compareRoIWordCoords(){
- //Not finished yet. Not sure if this is actually needed.
- examineSlinkObjects();
- std::vector<unsigned int>* RoIWords = extractRoIWords();
- for (std::vector<unsigned int>::const_iterator i=RoIWords->begin(); i!=RoIWords->end(); i++){
- ATH_MSG_INFO("Got RoIWord : "<<(*i));
- }
- delete RoIWords;
- return;
-}
-/** returns a pointer to a vector of RoIwords extracted
-from the Slink fragment. Very much a cludge at the moment */
-std::vector<unsigned int>* LVL1::Tester::extractRoIWords(){
- std::vector<unsigned int>* extractedWords = new std::vector<unsigned int>;
-
- const unsigned int headerLength=10;
- const unsigned int tailerLength=5;
- for (unsigned int slink=0; slink<(TrigT1CaloDefs::numOfCPRoIRODs);slink++){
- //a blank Slink fragment still has header and tail (=15 words)
- unsigned int numberOfWords=(m_emTauSlink[slink]->size())-headerLength-tailerLength;
- for (unsigned int word=9; word<(headerLength+numberOfWords-1);word++){
- //
- const DataVector<LVL1CTP::SlinkWord>* testOne=m_emTauSlink[slink];
- const LVL1CTP::SlinkWord* test=(*testOne)[word];
- extractedWords->push_back(test->word() );
- }
- }
- return extractedWords;
-}
-/** dump the cells belonging to an RoI. */
-void LVL1::Tester::dumpROICells(){
- const t_EmTauROICollection* ROIs = nullptr;
- evtStore()->retrieve(ROIs, m_EmTauROILocation).ignore();
-
- if( ! ROIs ) {
- ATH_MSG_DEBUG("No ROIs found in TES at "
- << m_EmTauROILocation );
- return;
- } else {
- ATH_MSG_DEBUG( "Found "<<ROIs->size() << " ROI(s)");
-
- t_EmTauROICollection::const_iterator it ;
- // I think these should provide enough of a signature....
- unsigned int emClus = 6;
- unsigned int emIsol = 6;
- unsigned int hadIsol = 12;
- unsigned int hadCore = 17;
-// unsigned int RoICore = 26 ;
- for( it = ROIs->begin(); it < ROIs->end(); ++it){
- bool matchesSignature=( (*it)->clusterEnergy()==emClus) && ( (*it)->emRingIsolationEnergy()==emIsol) &&
- ( (*it)->hadRingIsolationEnergy()==hadIsol) &&( (*it)->hadCoreEnergy()==hadCore) &&( (*it)->emRingIsolationEnergy()==emIsol);
- // cludge for testing
- matchesSignature=true;
- if (matchesSignature){
- ATH_MSG_DEBUG( "Found matching iROI");
- //std::vector<LVL1::TriggerTower*>::const_iterator ttIter=(*it)->getTowers().begin();
- //ATH_MSG_DEBUG( "which contains "<<(*it)->getTowers().size()<<" TriggerTowers");
- /*
- for(ttIter=(*it)->getTowers().begin(); ttIter!= (*it)->getTowers().end();++ttIter){
- std::vector<const CaloCell*>::const_iterator ccIter=(*ttIter)->containedGEANTCells().begin();
- ATH_MSG_DEBUG( "One TT contains "<<(*ttIter)->containedGEANTCells().size()<<" CaloCells");
- for( ccIter=(*ttIter)->containedGEANTCells().begin(); ccIter!=(*ttIter)->containedGEANTCells().end();++ccIter){
- CaloSampling::CaloSample sampl = CaloSampling::getSampling((**ccIter) );
- ATH_MSG_DEBUG( "Cell has "<<std::endl<<"-----------"<<std::endl
- << "Energy : "<<(*ccIter)->energy()
- << "coords : "<<(*ccIter)->phi()<<", "<< (*ccIter)->eta()
- << "and sampling "<<(static_cast<unsigned int>(sampl) ) );
- }//endfor
- }//endfor
- */
- }//endif
- }//endfor
- }
- return;
-}
-/** dump the cells belonging to an RoI. */
-void LVL1::Tester::dumpJEMResults(){
-
- ATH_MSG_INFO( "loadJEMResults" );
-
- const JEMHitsCollection* jemHits;
- StatusCode sc1 = evtStore()->retrieve(jemHits, m_jemHitsLocation);
-
- if( (sc1==StatusCode::FAILURE) ) {
- ATH_MSG_INFO( "No JEMHits found in Storegate at "
- << m_jemHitsLocation);
- }
- else {
- ATH_MSG_INFO( jemHits->size() << " JEMHits found at "
- << m_jemHitsLocation);
-
- JEMHitsCollection::const_iterator it;
- JetEnergyModuleKey testKey;
-
- for ( it = jemHits->begin(); it < jemHits->end(); ++it ){
- unsigned int crate =(*it)->crate();
- unsigned int module=(*it)->module();
- unsigned int hits=(*it)->JetHits();
- ATH_MSG_INFO( "Crate " << crate << " Module " << module
- << " -> Hits = " << std::ios::hex << hits << std::ios::dec );
- }
- }
-
- const JEMEtSumsCollection* jemEtSums;
- sc1 = evtStore()->retrieve(jemEtSums, m_jemEtSumsLocation);
-
- if( (sc1==StatusCode::FAILURE) ) {
- ATH_MSG_INFO("No JEMEtSums found in Storegate at "
- << m_jemEtSumsLocation);
- }
- else {
- ATH_MSG_INFO(jemEtSums->size() << " JEMEtSums found at "
- << m_jemEtSumsLocation);
-
- JEMEtSumsCollection::const_iterator it;
- JetEnergyModuleKey testKey;
-
- for ( it = jemEtSums->begin(); it < jemEtSums->end(); ++it ){
- unsigned int crate =(*it)->crate();
- unsigned int module=(*it)->module();
- unsigned int Ex=(*it)->Ex();
- unsigned int Ey=(*it)->Ey();
- unsigned int Et=(*it)->Et();
- ATH_MSG_INFO("Crate " << crate << " Module " << module
- << " -> Ex = " << Ex << ", Ey = " << Ey << ", Et = " << Et );
- }
- }
-
-}
-
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/Tester.h b/Trigger/TrigT1/TrigT1CaloSim/src/Tester.h
deleted file mode 100644
index 14e97c0c48af..000000000000
--- a/Trigger/TrigT1/TrigT1CaloSim/src/Tester.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-/***************************************************************************
- Tester.h - description
- -------------------
- begin : Wed Dec 13 2000
- email : moyse@heppch.ph.qmw.ac.uk
- ***************************************************************************/
-
-#ifndef _TESTER_H_
-#define _TESTER_H_
-
-// STL
-#include <string>
-#include <vector>
-
-// Athena/Gaudi
-#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/DataObject.h"
-#include "AthContainers/DataVector.h"
-//#include "StoreGate/DataHandle.h"
-#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/SmartDataPtr.h"
-#include "GaudiKernel/SmartRefVector.h"
-#include "GaudiKernel/ServiceHandle.h"
-
-//TrigT1Calo includes
-#include "TrigT1CaloEvent/TriggerTower.h"
-#include "TrigT1CaloEvent/EmTauROI.h"
-#include "TrigT1CaloEvent/JetROI.h"
-#include "TrigT1CaloEvent/JEMHits.h"
-#include "TrigT1CaloEvent/JEMEtSums.h"
-#include "TrigT1Interfaces/TrigT1CaloDefs.h"
-#include "TrigT1Interfaces/SlinkWord.h"
-#include "TrigT1CaloUtils/TriggerTowerKey.h"
-#include "TrigT1CaloUtils/JetEnergyModuleKey.h"
-#include "TrigT1CaloUtils/CPAlgorithm.h"
-#include "TrigT1CaloUtils/JetAlgorithm.h"
-#include "TrigT1CaloToolInterfaces/IL1EmTauTools.h"
-#include "TrigT1CaloToolInterfaces/IL1JetTools.h"
-#include "TrigT1CaloToolInterfaces/IL1EtTools.h"
-
-
-
-//Default for parameters of this algorithm
-//These can be overridden by job options.
-//Descriptions are given in the class declaration
-
-
-#define DEFAULT_TriggerTowerLocation "/Event/LVL1TriggerTowers"
-#define DEFAULT_EmTauROILocation "/Event/EmTauROIs"
-#define DEFAULT_actualROIWordLocation "TestVectors/RoI_elnew.dat"
-
- /**LVL1 namespace.
- This belongs to the TrigT1Calo atrig simulation.
- */
-namespace LVL1 {
-
-/**
- The Tester algorithm checks the performance of the LVL1 em simulation.
-*/
-class Tester : public AthAlgorithm
-{
-
- public:
-
- //-------------------------
- // Constructors/Destructors
- //
- // Athena requires that the constructor takes certain arguments
- // (and passes them directly to the constructor of the base class)
- //-------------------------
-
- Tester( const std::string& name, ISvcLocator* pSvcLocator ) ;
-
-
- //------------------------------------------------------
- // Methods used by Athena to run the algorithm
- //------------------------------------------------------
-
- StatusCode initialize() ;
- StatusCode execute() ;
- StatusCode finalize() ;
-
-
-
-
- private:
- /**this is a TriggerTower container*/
- typedef DataVector<EmTauROI> t_EmTauROICollection ;
- typedef DataVector<JetROI> t_JetROICollection ;
- typedef DataVector<JEMHits> JEMHitsCollection;
- typedef DataVector<JEMEtSums> JEMEtSumsCollection;
-
-private: // Private methods
- /** loads the Trigger Towers from the TES.*/
- void loadTriggerTowers();
- void loadEmTauROIs();
- void loadActualROIWord();
- void compareROIWords();
- void printTriggerTowerValues();
- void printEmTauROIValues();
- /** load and lookat SlinkObject. Form lost of EmTauRoIwords from them and check coordinates. */
- void examineSlinkObjects();
- /** Compare RoI coords reconstructed from RoI words with coords from original RoI objects */
- void compareRoIWordCoords();
- /** returns a vector of RoIwords extracted from the Slink fragment. Very much a cludge at the moment */
- std::vector<unsigned int>* extractRoIWords();
- /** dump the cells belonging to an RoI. */
- void dumpROICells();
- void dumpJEMResults();
- /** dump the whole collection of EDM objects */
- void dumpEDM();
-
-
-private: // Private attributes
-
- std::string m_TriggerTowerLocation ;
- std::string m_JetElementLocation ;
- std::string m_jemHitsLocation ;
- std::string m_jemEtSumsLocation ;
- std::string m_CPMTobRoILocation ;
- std::string m_emCMXDataLocation ;
- std::string m_tauCMXDataLocation ;
- std::string m_JEMTobRoILocation ;
- std::string m_JetCMXDataLocation ;
- std::string m_CPMCMXDataLocation ;
- std::string m_CPCMXTopoDataLocation ;
- std::string m_JetCMXTopoDataLocation ;
- std::string m_EnergyTopoDataLocation ;
- std::string m_EmTauCTPLocation ;
- std::string m_JetCTPLocation ;
- std::string m_EnergyCTPLocation ;
-
- /** contains the external ROIs that will be saved
- to the TES */
- DataVector<EmTauROI>* m_VectorOfEmTauROIs;
-
-
- /** locations within the TES to store collections of EmTauROIs*/
- std::string m_EmTauROILocation ;
- std::string m_actualROIWordLocation ;
- std::string m_JetROILocation ;
-
- std::vector<int> m_actualROIWords;
- std::vector<int> m_generatedROIWords;
- std::vector<int> m_eventsWithErrors;
- int m_numberOfErrors;
- int m_numberOfEvents;
- int m_eventNumber;
- int m_mode;
-
- std::string m_EmTauSlinkLocation ;
-
- ToolHandle<LVL1::IL1EmTauTools> m_EmTauTool;
- ToolHandle<LVL1::IL1JetTools> m_JetTool;
- ToolHandle<LVL1::IL1EtTools> m_EtTool;
-
- /** there are 4 CP RoI RODs which have a Slink cable connected to the RoIB. This array holds pointers to 4
- DataVectors containing the Slink words*/
- const DataVector<LVL1CTP::SlinkWord >* m_emTauSlink[TrigT1CaloDefs::numOfCPRoIRODs];
-
- static const unsigned int m_dumpTTs =1;//00001
- static const unsigned int m_dumpEmTauRoIs =2;//00010
- static const unsigned int m_compareEmTauRoIs =4;//00100
- static const unsigned int m_compRoIWrdCoords =8;//01000
- static const unsigned int m_dumpRoICells =16;//10000
- static const unsigned int m_dumpJEMResults =32;//100000
- static const unsigned int m_testEtTool =64;//100000
- static const unsigned int m_testJetTool =128;//100000
- static const unsigned int m_dumpEDM =256;
-
-};
-
-} // end of namespace bracket
-
-
-#endif
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/components/TrigT1CaloSim_entries.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/components/TrigT1CaloSim_entries.cxx
index cca1b6469d8e..7db0c8049d48 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/components/TrigT1CaloSim_entries.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/components/TrigT1CaloSim_entries.cxx
@@ -1,7 +1,6 @@
#include "../Run2TriggerTowerMaker.h"
#include "../Run2CPMTowerMaker.h"
#include "../Run2JetElementMaker.h"
-#include "../Tester.h"
#include "../CPMSim.h"
#include "../JEMJetSim.h"
#include "../JEMEnergySim.h"
@@ -20,7 +19,6 @@ using namespace LVL1;
DECLARE_COMPONENT( Run2TriggerTowerMaker )
DECLARE_COMPONENT( Run2CPMTowerMaker )
DECLARE_COMPONENT( Run2JetElementMaker )
-DECLARE_COMPONENT( Tester )
DECLARE_COMPONENT( CPMSim )
DECLARE_COMPONENT( JEMJetSim )
DECLARE_COMPONENT( JEMEnergySim )
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetTools.h
deleted file mode 100755
index 5412340ae9ec..000000000000
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetTools.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-///////////////////////////////////////////////////////////////////
-// IL1JetTools.h,
-///////////////////////////////////////////////////////////////////
-#ifndef ILVL1L1JETTOOLS_H
-#define ILVL1L1JETTOOLS_H
-
-#include "GaudiKernel/IAlgTool.h"
-#include "TrigT1CaloEvent/JetInput.h"
-#include "TrigT1CaloEvent/JetElement.h"
-//#include "TrigT1CaloUtils/JetAlgorithm.h"
-
-namespace LVL1
-{
-class JetAlgorithm;
-
-/**
-Interface definition for L1JetTools
-*/
-
- static const InterfaceID IID_IL1JetTools("LVL1::IL1JetTools", 1, 0);
-
- class IL1JetTools : virtual public IAlgTool {
- public:
- static const InterfaceID& interfaceID( ) ;
-
- // enter declaration of your interface-defining member functions here
- virtual void findRoIs(const std::map<int, JetInput*>* elements, DataVector<JetAlgorithm>* rois) = 0;
- virtual void findRoIs(const DataVector<JetElement>* jes, DataVector<JetAlgorithm>* rois, int slice = -1) = 0;
- virtual void mapJetInputs(const DataVector<JetElement>* jes, std::map<int, JetInput*>* elements, int slice = -1) = 0;
- virtual JetAlgorithm findRoI(double RoIeta, double RoIphi, const std::map<int, JetInput*>* elements) = 0;
- virtual void formSums(double RoIeta, double RoIphi, const std::map<int, JetInput*>* elements) = 0;
- virtual void formSums(uint32_t roiWord, const std::map<int, JetInput*>* elements) = 0;
- virtual int ET4x4() const = 0;
- virtual int ET6x6() const = 0;
- virtual int ET8x8() const = 0;
- virtual bool isEtMax() const = 0;
- virtual unsigned int Hits() const = 0;
- virtual unsigned int RoIWord() const = 0;
-
- };
-
- inline const InterfaceID& LVL1::IL1JetTools::interfaceID()
- {
- return IID_IL1JetTools;
- }
-
-} // end of namespace
-
-#endif
diff --git a/Trigger/TrigT1/TrigT1CaloTools/CMakeLists.txt b/Trigger/TrigT1/TrigT1CaloTools/CMakeLists.txt
index 8de37af56f89..07dd253367a7 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CaloTools/CMakeLists.txt
@@ -13,7 +13,7 @@ atlas_add_component( TrigT1CaloTools
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthContainers AthenaBaseComps CaloIdentifier
- CaloTriggerToolLib CxxUtils EventInfo GaudiKernel PathResolver StoreGateLib LumiBlockData
+ CaloTriggerToolLib CxxUtils GaudiKernel PathResolver StoreGateLib LumiBlockData
TrigConfInterfaces TrigConfData TrigConfL1Data TrigT1CaloCalibConditions
TrigT1CaloCalibToolInterfaces TrigT1CaloCondSvcLib TrigT1CaloEventLib TrigT1CaloToolInterfaces
TrigT1CaloUtilsLib TrigT1Interfaces xAODEventInfo xAODTrigL1Calo )
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.h
index 19e4229b95ee..99a471b9c90f 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.h
@@ -18,7 +18,6 @@
#include "TrigT1CaloUtils/CPMTobAlgorithm.h"
#include "TrigT1CaloEvent/CPMTobRoI.h"
#include "TrigT1Interfaces/CPRoIDecoder.h"
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
class AtlasDetectorID;
class Identifier;
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.h
index 812886ebf9be..89120918524a 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.h
@@ -17,7 +17,6 @@
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
#include "AthContainers/DataVector.h"
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
#include "TrigT1CaloToolInterfaces/IL1EtTools.h"
#include "TrigT1CaloToolInterfaces/IL1EnergyCMXTools.h"
#include "TrigT1CaloToolInterfaces/IL1JetElementTools.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.h
index 67674d8bcbe4..9420f32a0296 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.h
@@ -19,7 +19,6 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
#include "AthContainers/DataVector.h"
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
#include "TrigT1CaloToolInterfaces/IL1EtTools.h"
#include "TrigT1CaloToolInterfaces/IL1JEPEtSumsTools.h"
#include "TrigT1CaloToolInterfaces/IL1JetElementTools.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.cxx
deleted file mode 100755
index e5237642bc39..000000000000
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.cxx
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-///////////////////////////////////////////////////////////////////
-// L1JetTools.cxx,
-///////////////////////////////////////////////////////////////////
-
-#include "L1JetTools.h"
-#include "TrigT1Interfaces/TrigT1CaloDefs.h"
-#include "TrigT1Interfaces/CoordinateRange.h"
-#include "TrigT1CaloEvent/JetInput.h"
-#include "TrigT1CaloEvent/JetInput_ClassDEF.h"
-
-namespace LVL1 {
-
-//================ Constructor =================================================
-
-L1JetTools::L1JetTools(const std::string& t,
- const std::string& n,
- const IInterface* p )
- :
- AthAlgTool(t,n,p),
- m_configSvc("TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", n),
- m_RoI(0)
-{
- declareInterface<IL1JetTools>(this);
-
- declareProperty( "LVL1ConfigSvc", m_configSvc, "LVL1 Config Service");
-
-}
-
-//================ Destructor =================================================
-
-L1JetTools::~L1JetTools()
-{
- if (m_RoI != 0) delete m_RoI;
-}
-
-
-//================ Initialisation =================================================
-
-StatusCode L1JetTools::initialize()
-{
- return StatusCode::SUCCESS;
-}
-
-//================ Finalisation =================================================
-
-StatusCode L1JetTools::finalize()
-{
- return StatusCode::SUCCESS;
-}
-
-//================ Need to load JetInputs into map before can form clusters =======
-
-void L1JetTools::mapJetInputs(const DataVector<JetElement>* jes, std::map<int, JetInput*>* elements, int slice){
-
- // Clear map before filling
- elements->clear();
-
- // Step over JEs, form JIs, and put into map
- JECollection::const_iterator it ;
- JetInputKey testKey(0.0, 0.0);
-
- /** Fill map from DataVector */
- JetInput* jetInput;
- for( it = jes->begin(); it != jes->end(); ++it ){
- double jetElementPhi=(*it)->phi();
- double jetElementEta=(*it)->eta();
- int jetElementET = 0;
- if (slice < 0) { // Default to using peak slice
- jetElementET = (*it)->energy();
- }
- else { // Use user-specified slice
- jetElementET = (*it)->sliceEnergy(slice);
- }
- // Don't waste time & fill the JetInput map with empty elements
- if (jetElementET == 0) continue;
-
- if (!testKey.isFCAL(jetElementEta)) { // 1-to-1 JE->JI outside FCAL
- int key = testKey.jeKey(jetElementPhi,jetElementEta);
- std::map<int, JetInput*>::iterator test=elements->find( key );
- if (test == elements->end()){
- // no JI yet. Create it!
- ATH_MSG_DEBUG( "Creating JetInput at ("
- << jetElementPhi << " , " << jetElementEta << ")" );
- jetInput=new JetInput(jetElementPhi,jetElementEta, jetElementET, key);
- elements->insert(std::map<int, JetInput*>::value_type(key,jetInput)); //and put it in the map.
- }
- else{
- ATH_MSG_ERROR( "JetInput already exists (shouldn't happen!) " );
- }
- }
- else { // FCAL JEs are divided into 2 JIs
- // Each gets half of the ET. If value is odd, remainder added to lower JI
- int jetInputET = (jetElementET>>1);
- int underflow = jetElementET&0x1;
- // Modifier: if JetElement is saturated, both "halves" should saturate
- if ((*it)->isSaturated()) {
- jetInputET = jetElementET; // don't divide saturated ET
- underflow = 0; // want both halves set to same value
- }
- // Phi coordinates of the two elements
- double phiOffset = testKey.dPhi(jetElementPhi,jetElementEta)/2.;
- std::vector<double> phiValues;
- std::vector<int> etValues;
- phiValues.push_back(jetElementPhi - phiOffset);
- etValues.push_back(jetInputET+underflow);
- phiValues.push_back(jetElementPhi + phiOffset);
- etValues.push_back(jetInputET);
- // Calculate keys, create JI, and add (halved) ET to each
- for (size_t iphi = 0; iphi < phiValues.size(); ++iphi) {
- int key = testKey.jeKey(phiValues[iphi],jetElementEta);
- std::map<int, JetInput*>::iterator test=elements->find( key );
- JetInput* jetInput=0;
- if (test == elements->end()){
- // no JI yet. Create it!
- ATH_MSG_DEBUG( "Creating JetInput at ("
- << phiValues[iphi] << " , " << jetElementEta << ")" );
- jetInput=new JetInput(phiValues[iphi],jetElementEta, etValues[iphi], key);
- elements->insert(std::map<int, JetInput*>::value_type(key,jetInput)); //and put it in the map.
- }
- else{
- ATH_MSG_ERROR( "FCAL JetInput already exists (shouldn't happen!) " );
- }
- } // end loop over parts of the JE
- } // end handling of FCAL JEs
- }//endfor
-
-}
-
-/** Find list of RoIs passing at least 1 threshold */
-
-void L1JetTools::findRoIs(const std::map<int, JetInput*>* elements, DataVector<JetAlgorithm>* rois){
-
- // Start with an empty DataVector
- rois->clear();
-
- /** Now step through JetInput map <br>
- Each element could be reference element of 4 RoIs <br>
- But need to ensure we don't double count, so we use <br>
- a std::map to keep track of which RoIs already exist <br>
- We also use KeyUtilities to find neighbours (to allow <br>
- for the variable sizes of JetInputs) */
-
- JetInputKey testKey(0.0, 0.0);
- std::map<int, int> analysed;
- std::map<int, JetInput*>::const_iterator input = elements->begin();
- for ( ; input != elements->end(); ++input) {
- double eta = (*input).second->eta();
- double startPhi = (*input).second->phi();
- for (int etaOffset = 0; etaOffset >= -1; etaOffset--) {
- Coordinate tempCoord(startPhi, eta);
- for (int phiOffset = 0; phiOffset >= -1; phiOffset--) {
- int key = testKey.jeKey(tempCoord);
- std::map<int, int>::iterator test = analysed.find(key);
- if (test == analysed.end()) {
- analysed.insert(std::map<int, int>::value_type(key,1));
- double tempEta = tempCoord.eta();
- double tempPhi = tempCoord.phi();
- JetAlgorithm* roi = new JetAlgorithm(tempEta, tempPhi, elements, m_configSvc);
- if (roi->Hits() != 0) {
- rois->push_back(roi);
- }
- else {
- delete roi;
- }
- }
- tempCoord = testKey.downPhi(tempCoord); // decrement phi
- } // phi offset loop
- tempCoord = testKey.leftEta(tempCoord); // decrement eta
- eta = tempCoord.eta();
- if (eta == TrigT1CaloDefs::RegionERROREtaCentre) break; // gone outside detector
- } // eta offset loop
- } // loop over JetInput map
-
-}
-
-/** Find list of RoIs passing at least 1 threshold */
-
-void L1JetTools::findRoIs(const DataVector<JetElement>* jes, DataVector<JetAlgorithm>* rois, int slice){
-
- /** Need a map of JetInputs as input */
- std::map<int, JetInput*>* inputs = new std::map<int, JetInput*>;
- mapJetInputs(jes, inputs, slice);
-
- /** Now find the RoIs in this map */
- findRoIs(inputs, rois);
-
- /** Clean up JetInputs */
- for (std::map<int, JetInput*>::iterator it = inputs->begin(); it != inputs->end(); ++it) {
- delete (*it).second;
- }
- delete inputs;
-
-}
-
-/** Form RoI object for specified coordinate */
-
-JetAlgorithm L1JetTools::findRoI(double RoIeta, double RoIphi, const std::map<int, JetInput*>* elements){
-
- JetAlgorithm roi(RoIeta, RoIphi, elements, m_configSvc);
-
- return roi;
-}
-
-///=====================Form clusters for given coordinates ====================
-
-void L1JetTools::formSums(double RoIeta, double RoIphi, const std::map<int, JetInput*>* elements) {
-
- // Initialise
- if (m_RoI != 0) delete m_RoI;
-
- // Performs all processing for this location
- m_RoI = new JetAlgorithm(RoIeta, RoIphi, elements, m_configSvc);
-
-}
-
-///=====================Form clusters for given RoI ====================
-
-void L1JetTools::formSums(uint32_t roiWord, const std::map<int, JetInput*>* elements) {
-
- // Initialise
- if (m_RoI != 0) delete m_RoI;
-
- // Find RoI coordinate
- CoordinateRange coord = m_conv.coordinate(roiWord);
- float RoIphi = coord.phi();
- float RoIeta = coord.eta();
- // For this purpose we need to resolve the 2 possible FJ coordinates at end C
- // This is necessary here due to the large size of FCAL JetElements
- if (RoIeta > 3.1 && m_conv.column(roiWord) != 3) RoIeta = 3.15;
-
- // Performs all processing for this location
- m_RoI = new JetAlgorithm(RoIeta, RoIphi, elements, m_configSvc);
-
-}
-
-/** Accessors for the current RoI location (if extant) */
-
-int L1JetTools::ET4x4() const {
- int result = 0;
- if (m_RoI != 0) result = m_RoI->ET4x4();
- return result;
-}
-
-int L1JetTools::ET6x6() const {
- int result = 0;
- if (m_RoI != 0) result = m_RoI->ET6x6();
- return result;
-}
-
-int L1JetTools::ET8x8() const {
- int result = 0;
- if (m_RoI != 0) result = m_RoI->ET8x8();
- return result;
-}
-
-bool L1JetTools::isEtMax() const {
- bool result = false;
- if (m_RoI != 0) result = m_RoI->isEtMax();
- return result;
-}
-
-unsigned int L1JetTools::Hits() const {
- int result = 0;
- if (m_RoI != 0) result = m_RoI->Hits();
- return result;
-}
-
-unsigned int L1JetTools::RoIWord() const {
- int result = 0;
- if (m_RoI != 0) result = m_RoI->RoIWord();
- return result;
-}
-
-//============================================================================================
-
-} // end of namespace
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.h
deleted file mode 100755
index 7a4a26cff750..000000000000
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-///////////////////////////////////////////////////////////////////
-// L1JetTools.h,
-///////////////////////////////////////////////////////////////////
-
- /***************************************************************************
- * *
- * *
- ***************************************************************************/
-
-#ifndef LVL1L1JETTOOLS_H
-#define LVL1L1JETTOOLS_H
-
-#include "AthenaBaseComps/AthAlgTool.h"
-#include "TrigT1CaloToolInterfaces/IL1JetTools.h"
-#include "TrigT1CaloUtils/JetInputKey.h"
-#include "TrigT1CaloUtils/JetAlgorithm.h"
-#include "TrigT1Interfaces/JEPRoIDecoder.h"
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
-
-class AtlasDetectorID;
-class Identifier;
-
-namespace LVL1
-{
-
- /** @class L1JetTools
-
- This is a tool to reconstruct the L1 Jet trigger sums
- for a particular RoI location from the stored JetInputs.
- Used for offline monitoring and trigger reconstruction.
-
- Useage: L1JetTools->mapTowers() // set up event for analysis
- L1JetTools->formSums(eta, phi) // for each RoI
- L1JetTools->ET8x8() // etc. Return values
-
- @author Alan Watson <Alan.Watson@cern.ch>
- */
-
- class L1JetTools : virtual public IL1JetTools, public AthAlgTool
- {
- public:
- typedef DataVector<JetElement> JECollection ;
-
- L1JetTools(const std::string&,const std::string&,const IInterface*);
-
- /** default destructor */
- virtual ~L1JetTools ();
-
- /** standard Athena-Algorithm method */
- virtual StatusCode initialize();
- /** standard Athena-Algorithm method */
- virtual StatusCode finalize ();
-
- /** Convert user-supplied JetElements to map of JetInputs. Can specify which time slice of data to use */
- virtual void mapJetInputs(const DataVector<JetElement>* jes, std::map<int, JetInput*>* elements, int slice = -1) ;
-
- /** Return vector of RoI objects derived from user-specified inputs. JetElements can be multi-slice */
- virtual void findRoIs(const std::map<int, JetInput*>* elements, DataVector<JetAlgorithm>* rois) ;
- virtual void findRoIs(const DataVector<JetElement>* jes, DataVector<JetAlgorithm>* rois, int slice = -1) ;
-
- /** Return RoI object for specified location */
- virtual JetAlgorithm findRoI(double RoIeta, double RoIphi, const std::map<int, JetInput*>* elements) ;
-
- /** Form jet cluster sums for a given RoI location */
- virtual void formSums(double RoIeta, double RoIphi,
- const std::map<int, JetInput*>* elements) ;
- virtual void formSums(uint32_t roiWord, const std::map<int, JetInput*>* elements) ;
- /** Methods to return the cluster ET values */
- virtual int ET4x4() const ;
- virtual int ET6x6() const ;
- virtual int ET8x8() const ;
- virtual bool isEtMax() const ;
- virtual unsigned int Hits() const ;
- virtual unsigned int RoIWord() const ;
-
- private:
-
- /** pointer to LVL1ConfigSvc */
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc;
-
- /** Utility for decoding RoI words */
- JEPRoIDecoder m_conv;
-
- /** member variables for algorithm properties: */
- JetAlgorithm* m_RoI;
-
- };
-} // end of namespace
-
-#endif
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
index 782d842d4715..d3d6ca15a337 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
@@ -13,13 +13,6 @@
#include "CaloIdentifier/CaloLVL1_ID.h"
#include "CaloTriggerTool/CaloTriggerTowerService.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-#include "EventInfo/EventType.h"
-
-#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
-#include "TrigConfL1Data/ThresholdConfig.h"
-
#include "TrigT1CaloCondSvc/L1CaloCondSvc.h"
#include "TrigT1CaloCalibConditions/ChanCalibErrorCode.h"
#include "TrigT1CaloCalibConditions/ChanDeadErrorCode.h"
@@ -72,7 +65,6 @@ L1TriggerTowerTool::L1TriggerTowerTool(const std::string& t,
m_ttSvc("CaloTriggerTowerService/CaloTriggerTowerService", this),
m_mappingTool("LVL1::PpmCoolOrBuiltinMappingTool/PpmCoolOrBuiltinMappingTool", this),
m_l1CondSvc("L1CaloCondSvc", n),
- m_configSvc("TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", n),
m_dbFineTimeRefsTowers(0),
m_correctFir(false),
m_dynamicPedestalProvider("", this)
@@ -81,7 +73,6 @@ L1TriggerTowerTool::L1TriggerTowerTool(const std::string& t,
declareProperty( "BaselineCorrection", m_correctFir );
declareProperty( "L1DynamicPedestalProvider", m_dynamicPedestalProvider );
- declareProperty("LVL1ConfigSvc", m_configSvc, "LVL1 Config Service");
}
//================ Destructor =================================================
@@ -98,7 +89,6 @@ StatusCode L1TriggerTowerTool::initialize()
CHECK(m_l1CondSvc.retrieve());
- CHECK(m_configSvc.retrieve());
CHECK(m_l1CaloTTIdTools.retrieve());
if(!m_ttSvc.retrieve().isSuccess()) {
@@ -139,6 +129,8 @@ StatusCode L1TriggerTowerTool::initialize()
if (incSvc) incSvc->addListener(this, "BeginRun");
ATH_CHECK( m_eventInfoKey.initialize() );
+
+ ATH_CHECK( m_L1MenuKey.initialize() );
ATH_MSG_INFO( "Initialization completed" );
@@ -985,7 +977,9 @@ void L1TriggerTowerTool::jepLut(const std::vector<int> &fir, const L1CaloCoolCha
ped = settings->pedValue();
pedMean = settings->pedMean();
scale_db = settings->lutJepScale();
- scale_menu = m_configSvc->thresholdConfig()->caloInfo().globalJetScale(); // Retrieve scale param from menu instead of coolDB
+
+ auto l1Menu = SG::makeHandle( m_L1MenuKey );
+ scale_menu = l1Menu->thrExtraInfo().JET().jetScale(); // Retrieve scale param from menu
if (strategy == 3) {
par1 = settings->lutJepPar1();
par2 = settings->lutJepPar2();
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.h
index a82a9ec78d7b..f1ce1bb575ad 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.h
@@ -23,6 +23,7 @@
#include "xAODTrigL1Calo/TriggerTowerContainer.h"
#include "xAODEventInfo/EventInfo.h"
#include "StoreGate/ReadHandleKey.h"
+#include "TrigConfData/L1Menu.h"
class CaloIdManager;
class CaloLVL1_ID;
@@ -34,7 +35,6 @@ class L1CaloDerivedRunParsContainer;
class L1CaloRunParametersContainer;
class L1CaloPprChanStrategyContainer;
-namespace TrigConf { class ILVL1ConfigSvc; }
namespace LVL1
{
@@ -155,9 +155,6 @@ namespace LVL1
/// L1Calo conditions
ServiceHandle<L1CaloCondSvc> m_l1CondSvc;
- /// Trig configurations
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc;
-
// one of L1CaloPprConditionsContainer{,Run2}*
/// For Run2 strategy (LowMu, HighMu)
@@ -182,6 +179,8 @@ namespace LVL1
SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey
{ this, "EventInfoKey", "EventInfo", "" };
+ SG::ReadHandleKey<TrigConf::L1Menu> m_L1MenuKey{ this, "L1TriggerMenu", "DetectorStore+L1TriggerMenu", "L1 Menu" };
+
///Parameters
static const int s_saturationValue = 255;
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/components/TrigT1CaloTools_entries.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/components/TrigT1CaloTools_entries.cxx
index 1ee38814d084..e31a7803ebfc 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/components/TrigT1CaloTools_entries.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/components/TrigT1CaloTools_entries.cxx
@@ -2,7 +2,6 @@
#include "../L1DynamicPedestalProviderTxt.h"
#include "../L1DynamicPedestalProviderRoot.h"
#include "../L1EmTauTools.h"
-#include "../L1JetTools.h"
#include "../L1EtTools.h"
#include "../L1JetElementTools.h"
#include "../L1CPHitsTools.h"
@@ -10,7 +9,6 @@
#include "../L1JEPEtSumsTools.h"
#include "../L1JetEtTools.h"
#include "../L1TriggerTowerTool.h"
-// #include "TrigT1CaloTools/L1RoITools.h"
#include "../L1CPMTowerTools.h"
#include "../L1CPMTools.h"
#include "../L1JEMJetTools.h"
@@ -23,7 +21,6 @@ DECLARE_COMPONENT( LVL1::L1DatabaseOverrideForDataTool )
DECLARE_COMPONENT( LVL1::L1DynamicPedestalProviderTxt )
DECLARE_COMPONENT( LVL1::L1DynamicPedestalProviderRoot )
DECLARE_COMPONENT( LVL1::L1EmTauTools )
-DECLARE_COMPONENT( LVL1::L1JetTools )
DECLARE_COMPONENT( LVL1::L1EtTools )
DECLARE_COMPONENT( LVL1::L1JetElementTools )
DECLARE_COMPONENT( LVL1::L1CPHitsTools )
@@ -31,7 +28,6 @@ DECLARE_COMPONENT( LVL1::L1JEPHitsTools )
DECLARE_COMPONENT( LVL1::L1JEPEtSumsTools )
DECLARE_COMPONENT( LVL1::L1JetEtTools )
DECLARE_COMPONENT( LVL1::L1TriggerTowerTool )
-// DECLARE_COMPONENT( LVL1::L1RoITools )
DECLARE_COMPONENT( LVL1::L1CPMTowerTools )
DECLARE_COMPONENT( LVL1::L1CPMTools )
DECLARE_COMPONENT( LVL1::L1JEMJetTools )
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/JEMJetAlgorithm.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/JEMJetAlgorithm.cxx
index 84d31bf9179d..4b57ee7ce419 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/JEMJetAlgorithm.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/JEMJetAlgorithm.cxx
@@ -221,8 +221,9 @@ void LVL1::JEMJetAlgorithm::passesTrigger() {
sizeSmall = 4; // not part of the new menu
sizeLarge = 8; // not part of the new menu
- threshSmall = m_l1menu->thrExtraInfo().JET().ptMinToTopoSmallWindowCounts();
- threshLarge = m_l1menu->thrExtraInfo().JET().ptMinToTopoLargeWindowCounts();
+ float scale = m_l1menu->thrExtraInfo().JET().jetScale();
+ threshSmall = m_l1menu->thrExtraInfo().JET().ptMinToTopoSmallWindowCounts()*scale;
+ threshLarge = m_l1menu->thrExtraInfo().JET().ptMinToTopoLargeWindowCounts()*scale;
int etLarge = m_ET8x8;
if (sizeLarge == 6) etLarge = m_ET6x6;
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/BStoESD_Tier0_HLTConfig_jobOptions.py b/Trigger/TriggerCommon/TriggerJobOpts/share/BStoESD_Tier0_HLTConfig_jobOptions.py
index db9ed22b77b3..c5d3845832de 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/BStoESD_Tier0_HLTConfig_jobOptions.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/BStoESD_Tier0_HLTConfig_jobOptions.py
@@ -88,7 +88,7 @@ if rec.doTrigger():
import TrigT1CaloTools.TrigT1CaloToolsConf as calotools # noqa: F401
for toolName in ['L1JetCMXTools', 'L1EnergyCMXTools', 'L1TriggerTowerTool', 'L1CPMTools',
- 'L1CPCMXTools', 'L1EmTauTools', 'L1JEMJetTools', 'L1JetEtTools', 'L1JetTools']:
+ 'L1CPCMXTools', 'L1EmTauTools', 'L1JEMJetTools', 'L1JetEtTools']:
if not hasattr(ToolSvc, toolName ):
ToolSvc += eval('calotools.LVL1__%s( toolName )' % toolName)
theTool = getattr(ToolSvc, toolName)
--
GitLab
From 48f4946f93b5e440f51fecd4943c05c6962cf3c2 Mon Sep 17 00:00:00 2001
From: Kunihiro Nagano <kunihiro.nagano@cern.ch>
Date: Tue, 24 Aug 2021 13:15:48 +0200
Subject: [PATCH 257/272] Fix for HitDV crash if subdetectors are disabled
(ATR-24018) and fix for HitDV thread safety (ATR-24022)
---
.../src/TrigFastTrackFinder.cxx | 252 +++++++++---------
.../src/TrigFastTrackFinder.h | 5 +-
.../src/TrigHitDVHypoAlg.cxx | 139 +++++-----
.../src/TrigHitDVHypoAlg.h | 32 +--
4 files changed, 218 insertions(+), 210 deletions(-)
diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
index eb2c87575567..ccb83610c5e5 100644
--- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
+++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
@@ -281,19 +281,12 @@ StatusCode TrigFastTrackFinder::initialize() {
}
// UTT read/write handles
- if( m_doHitDV ) {
- ATH_CHECK(m_recJetRoiCollectionKey.initialize());
- ATH_CHECK(m_hitDVTrkKey.initialize());
- ATH_CHECK(m_hitDVSPKey.initialize());
- }
- if( m_dodEdxTrk ) {
- ATH_CHECK(m_dEdxTrkKey.initialize());
- ATH_CHECK(m_dEdxHitKey.initialize());
- }
- if( m_doDisappearingTrk ) {
- ATH_MSG_INFO("Initializing disTrkCandKey = " << m_disTrkCandKey);
- ATH_CHECK(m_disTrkCandKey.initialize());
- }
+ ATH_CHECK( m_recJetRoiCollectionKey.initialize(m_doHitDV) );
+ ATH_CHECK( m_hitDVTrkKey.initialize(m_doHitDV) ) ;
+ ATH_CHECK( m_hitDVSPKey.initialize(m_doHitDV) );
+ ATH_CHECK( m_dEdxTrkKey.initialize(m_dodEdxTrk) );
+ ATH_CHECK( m_dEdxHitKey.initialize(m_dodEdxTrk) );
+ ATH_CHECK( m_disTrkCandKey.initialize(m_doDisappearingTrk) );
//
ATH_MSG_DEBUG("FTF : " << name() );
@@ -475,6 +468,7 @@ StatusCode TrigFastTrackFinder::findTracks(InDet::SiTrackMakerEventData_xk &trac
}
else {
ATH_MSG_DEBUG("No tracks found - too few hits in ROI to run " << mnt_roi_nSPs);
+ ATH_CHECK( createEmptyUTTEDMs(ctx) );
return StatusCode::SUCCESS;
}
@@ -525,6 +519,7 @@ StatusCode TrigFastTrackFinder::findTracks(InDet::SiTrackMakerEventData_xk &trac
/// TODO: add vertices collection handling here,
/// should not be 0 at this point unless fastZVseeding
/// is enabled
+ ATH_CHECK( createEmptyUTTEDMs(ctx) );
return StatusCode::SUCCESS;
}
}
@@ -626,13 +621,13 @@ StatusCode TrigFastTrackFinder::findTracks(InDet::SiTrackMakerEventData_xk &trac
tracksFail = tracksAll;
}
if( m_doDisappearingTrk ) {
- ATH_MSG_DEBUG("UTT: size of tracks=" << tracks.size() << ", tracksFail=" << tracksFail.size() << ": resultCode=" << resultCode);
+ ATH_MSG_VERBOSE("size of tracks=" << tracks.size() << ", tracksFail=" << tracksFail.size() << ": resultCode=" << resultCode);
for(std::list<Trk::Track*>::const_iterator t=tracks.begin(); t!=tracks.end(); ++t) {
if( ! (*t) ) continue;
m_trackSummaryTool->updateTrack(**t);
disTrk_n_disCombTrks++;
if( (*t)->perigeeParameters()!=0 && isCleaningPassDisTrack(seed, (*t), false) ) {
- ATH_MSG_DEBUG("UTT: ... combTrk, cleaningPass");
+ ATH_MSG_VERBOSE("... combTrk, cleaningPass");
disTrk_n_disCombTrks_cleaning++;
disCombTrks.push_back((*t));
qualityDisCombTrks.emplace_back(std::make_tuple(true, -disTrackQuality((*t)), (*t)));
@@ -643,7 +638,7 @@ StatusCode TrigFastTrackFinder::findTracks(InDet::SiTrackMakerEventData_xk &trac
m_trackSummaryTool->updateTrack(**t);
disTrk_n_disFailTrks++;
if( (*t)->perigeeParameters()!=0 && isCleaningPassDisTrack(seed, (*t), true) ) {
- ATH_MSG_DEBUG("UTT: ... failTrk, cleaningPass");
+ ATH_MSG_VERBOSE("... failTrk, cleaningPass");
disTrk_n_disFailTrks_cleaning++;
disFailTrks.push_back((*t));
qualityDisFailTrks.emplace_back(std::make_tuple(true, -disTrackQuality((*t)), (*t)));
@@ -678,8 +673,8 @@ StatusCode TrigFastTrackFinder::findTracks(InDet::SiTrackMakerEventData_xk &trac
}
if( m_doDisappearingTrk ) {
- ATH_MSG_DEBUG("UTT: ===> nr of disFailTrks=" << disTrk_n_disFailTrks << " -> cleaning pass=" << disTrk_n_disFailTrks_cleaning);
- ATH_MSG_DEBUG("UTT: ===> nr of disCombTrks=" << disTrk_n_disCombTrks << " -> cleaning pass=" << disTrk_n_disCombTrks_cleaning);
+ ATH_MSG_DEBUG("===> nr of disFailTrks=" << disTrk_n_disFailTrks << " -> cleaning pass=" << disTrk_n_disFailTrks_cleaning);
+ ATH_MSG_DEBUG("===> nr of disCombTrks=" << disTrk_n_disCombTrks << " -> cleaning pass=" << disTrk_n_disCombTrks_cleaning);
}
m_trackMaker->endEvent(trackEventData);
@@ -713,7 +708,7 @@ StatusCode TrigFastTrackFinder::findTracks(InDet::SiTrackMakerEventData_xk &trac
break;
}
}
- if( needed_for_disCombTrk) ATH_MSG_DEBUG("UTT: idx=" << idx << " ===> neded for disCombTrk");
+ if( needed_for_disCombTrk) ATH_MSG_VERBOSE("idx=" << idx << " ===> neded for disCombTrk");
}
if (std::get<0>(q)==true) {
initialTracks.push_back(std::get<2>(q));
@@ -725,7 +720,7 @@ StatusCode TrigFastTrackFinder::findTracks(InDet::SiTrackMakerEventData_xk &trac
}
else {
if( needed_for_disCombTrk ) {
- ATH_MSG_DEBUG("UTT: ... adding to extraDisCombTracks");
+ ATH_MSG_VERBOSE("... adding to extraDisCombTracks");
extraDisCombTracks.push_back(std::get<2>(q));
}
else {
@@ -757,7 +752,7 @@ StatusCode TrigFastTrackFinder::findTracks(InDet::SiTrackMakerEventData_xk &trac
// large dEdx finding
mnt_timer_dEdxTrk.start();
for(auto t=outputTrackswTP.begin(); t!=outputTrackswTP.end();t++) { m_trackSummaryTool->updateTrack(**t); }
- ATH_CHECK(finddEdxTrk(ctx,outputTrackswTP));
+ ATH_CHECK( finddEdxTrk(ctx,outputTrackswTP) );
}
if( m_dodEdxTrk ) mnt_timer_dEdxTrk.stop(); // to include timing to destroy TrackCollection object
@@ -768,7 +763,7 @@ StatusCode TrigFastTrackFinder::findTracks(InDet::SiTrackMakerEventData_xk &trac
bool do_recoverDisCombTrk = true;
if( m_doDisappearingTrk && (initialTracks.size()!=outputTracks.size()) ) {
- ATH_MSG_DEBUG("UTT: part of initialTracks fails in fitting. do not try to recover DisCombTracks");
+ ATH_MSG_DEBUG("part of initialTracks fails in fitting. do not try to recover DisCombTracks");
do_recoverDisCombTrk = false;
}
@@ -776,9 +771,9 @@ StatusCode TrigFastTrackFinder::findTracks(InDet::SiTrackMakerEventData_xk &trac
fittedExtraDisCombTracks.reserve(extraDisCombTracks.size());
TrackCollection fittedDisCombTrks(SG::VIEW_ELEMENTS);
if( m_doDisappearingTrk ) {
- ATH_MSG_DEBUG("UTT: nr of extraDisCombTracks=" << extraDisCombTracks.size());
+ ATH_MSG_VERBOSE("nr of extraDisCombTracks=" << extraDisCombTracks.size());
if( extraDisCombTracks.size() > 0 ) {
- ATH_MSG_DEBUG("UTT: fitting extraDisCombTracks ...");
+ ATH_MSG_VERBOSE("fitting extraDisCombTracks ...");
m_trigInDetTrackFitter->fit(extraDisCombTracks, fittedExtraDisCombTracks, ctx, m_particleHypothesis);
for (auto fittedTrack = fittedExtraDisCombTracks.begin(); fittedTrack!=fittedExtraDisCombTracks.end(); ++fittedTrack) {
(*fittedTrack)->info().setPatternRecognitionInfo(Trk::TrackInfo::FastTrackFinderSeed);
@@ -843,7 +838,7 @@ StatusCode TrigFastTrackFinder::findTracks(InDet::SiTrackMakerEventData_xk &trac
if( m_doDisappearingTrk && do_recoverDisCombTrk ) {
if( std::find(indexDisCombTrk.begin(),indexDisCombTrk.end(),idx)!=indexDisCombTrk.end() ) {
- ATH_MSG_DEBUG("UTT: fittedTrack idx=" << idx << ": recovers also for DisCombTrack");
+ ATH_MSG_VERBOSE("fittedTrack idx=" << idx << ": recovers also for DisCombTrack");
fittedDisCombTrks.push_back(*fittedTrack);
}
}
@@ -873,14 +868,14 @@ StatusCode TrigFastTrackFinder::findTracks(InDet::SiTrackMakerEventData_xk &trac
// disappearing track reco
if( m_doDisappearingTrk ) {
mnt_timer_disTrk.start();
- ATH_CHECK(findDisTracks(ctx,outputTracks,qualityDisFailTrks,qualityDisCombTrks,fittedDisCombTrks,disTrk_v_xVtx,disTrk_v_yVtx,disTrk_v_zVtx));
+ ATH_CHECK( findDisTracks(ctx,outputTracks,qualityDisFailTrks,qualityDisCombTrks,fittedDisCombTrks,disTrk_v_xVtx,disTrk_v_yVtx,disTrk_v_zVtx) );
mnt_timer_disTrk.stop();
}
- // find L1 J seeded Hit-based displaced vertex
+ // find Hit-based displaced vertex
if( m_doHitDV ) {
mnt_timer_HitDV.start();
- ATH_CHECK(findHitDV(ctx,convertedSpacePoints,outputTracks));
+ ATH_CHECK( findHitDV(ctx,convertedSpacePoints,outputTracks) );
mnt_timer_HitDV.stop();
}
@@ -1435,19 +1430,35 @@ void TrigFastTrackFinder::makeSeedsOnGPU(const TrigCombinatorialSettings& tcs, c
delete dataBuffer;
}
+StatusCode TrigFastTrackFinder::createEmptyUTTEDMs(const EventContext& ctx) const
+{
+ if( m_doHitDV ) {
+ SG::WriteHandle<xAOD::TrigCompositeContainer> hitDVTrkHandle(m_hitDVTrkKey, ctx);
+ ATH_CHECK( hitDVTrkHandle.record(std::make_unique<xAOD::TrigCompositeContainer>(), std::make_unique<xAOD::TrigCompositeAuxContainer>()) );
+ }
+ if( m_dodEdxTrk ) {
+ SG::WriteHandle<xAOD::TrigCompositeContainer> hitDVSPHandle(m_hitDVSPKey, ctx);
+ ATH_CHECK( hitDVSPHandle.record(std::make_unique<xAOD::TrigCompositeContainer>(), std::make_unique<xAOD::TrigCompositeAuxContainer>()) );
+ SG::WriteHandle<xAOD::TrigCompositeContainer> dEdxTrkHandle(m_dEdxTrkKey, ctx);
+ ATH_CHECK( dEdxTrkHandle.record(std::make_unique<xAOD::TrigCompositeContainer>(), std::make_unique<xAOD::TrigCompositeAuxContainer>()) );
+ }
+ if( m_doDisappearingTrk ) {
+ SG::WriteHandle<xAOD::TrigCompositeContainer> disTrkCandHandle(m_disTrkCandKey, ctx);
+ ATH_CHECK( disTrkCandHandle.record(std::make_unique<xAOD::TrigCompositeContainer>(), std::make_unique<xAOD::TrigCompositeAuxContainer>()) );
+ }
+ return StatusCode::SUCCESS;
+}
+
StatusCode TrigFastTrackFinder::findHitDV(const EventContext& ctx, const std::vector<TrigSiSpacePointBase>& convertedSpacePoints,
const TrackCollection& outputTracks) const
{
- // Output containers & writeHandle
- auto hitDVTrkContainer = std::make_unique<xAOD::TrigCompositeContainer>();
- auto hitDVTrkContainerAux = std::make_unique<xAOD::TrigCompositeAuxContainer>();
- hitDVTrkContainer->setStore(hitDVTrkContainerAux.get());
SG::WriteHandle<xAOD::TrigCompositeContainer> hitDVTrkHandle(m_hitDVTrkKey, ctx);
+ ATH_CHECK( hitDVTrkHandle.record(std::make_unique<xAOD::TrigCompositeContainer>(), std::make_unique<xAOD::TrigCompositeAuxContainer>()) );
+ auto hitDVTrkContainer = hitDVTrkHandle.ptr();
- auto hitDVSPContainer = std::make_unique<xAOD::TrigCompositeContainer>();
- auto hitDVSPContainerAux = std::make_unique<xAOD::TrigCompositeAuxContainer>();
- hitDVSPContainer->setStore(hitDVSPContainerAux.get());
SG::WriteHandle<xAOD::TrigCompositeContainer> hitDVSPHandle(m_hitDVSPKey, ctx);
+ ATH_CHECK( hitDVSPHandle.record(std::make_unique<xAOD::TrigCompositeContainer>(), std::make_unique<xAOD::TrigCompositeAuxContainer>()) );
+ auto hitDVSPContainer = hitDVSPHandle.ptr();
// select good tracks
const float TRKCUT_PT = 0.5;
@@ -1570,11 +1581,11 @@ StatusCode TrigFastTrackFinder::findHitDV(const EventContext& ctx, const std::ve
v_sp_isSct.push_back(isSct);
v_sp_usedTrkId.push_back(usedTrack_id);
- ATH_MSG_DEBUG("+++ SP eta / phi / layer / ixPix / usedTrack_id = " << sp_eta << " / " << sp_phi << " / " << layer << " / " << isPix << " / " << usedTrack_id);
+ ATH_MSG_VERBOSE("+++ SP eta / phi / layer / ixPix / usedTrack_id = " << sp_eta << " / " << sp_phi << " / " << layer << " / " << isPix << " / " << usedTrack_id);
}
- ATH_MSG_DEBUG("Nr of SPs = " << n_sp);
- ATH_MSG_DEBUG("Nr of SPs used by selected tracks = " << n_sp_usedByTrk);
+ ATH_MSG_VERBOSE("Nr of SPs = " << n_sp);
+ ATH_MSG_VERBOSE("Nr of SPs used by selected tracks = " << n_sp_usedByTrk);
// Seed
std::vector<float> v_seeds_eta;
@@ -1584,7 +1595,7 @@ StatusCode TrigFastTrackFinder::findHitDV(const EventContext& ctx, const std::ve
// space-point based (unseeded mode)
ATH_CHECK( findSPSeeds(v_sp_eta, v_sp_phi, v_sp_layer, v_sp_usedTrkId, v_seeds_eta, v_seeds_phi) );
- ATH_MSG_DEBUG("Nr of SP seeds = " << v_seeds_eta.size());
+ ATH_MSG_VERBOSE("Nr of SP seeds = " << v_seeds_eta.size());
// add J1 J30 seeds
const unsigned int L1JET_ET_CUT = 30;
@@ -1613,7 +1624,7 @@ StatusCode TrigFastTrackFinder::findHitDV(const EventContext& ctx, const std::ve
v_seeds_eta.push_back(recRoI->eta());
v_seeds_phi.push_back(roiPhi);
}
- ATH_MSG_DEBUG("Nr of SP + L1_J30 seeds = " << v_seeds_eta.size());
+ ATH_MSG_VERBOSE("Nr of SP + L1_J30 seeds = " << v_seeds_eta.size());
}
// fill objects
@@ -1677,10 +1688,6 @@ StatusCode TrigFastTrackFinder::findHitDV(const EventContext& ctx, const std::ve
hitDVSP->setDetail<int16_t>("hitDVSP_usedTrkId", (int16_t)v_sp_usedTrkId[iSp]);
}
- // record
- ATH_CHECK(hitDVTrkHandle.record(std::move(hitDVTrkContainer), std::move(hitDVTrkContainerAux)));
- ATH_CHECK(hitDVSPHandle.record(std::move(hitDVSPContainer), std::move(hitDVSPContainerAux)));
-
return StatusCode::SUCCESS;
}
@@ -1746,7 +1753,7 @@ StatusCode TrigFastTrackFinder::findSPSeeds( const std::vector<float>& v_sp_eta,
}
}
- ATH_MSG_DEBUG("looking for ly6/ly6 doublet seeds");
+ ATH_MSG_VERBOSE("looking for ly6/ly6 doublet seeds");
// (idx, sort/weight, eta, phi)
std::vector<std::tuple<int,float,float,float>> QT;
@@ -1790,7 +1797,7 @@ StatusCode TrigFastTrackFinder::findSPSeeds( const std::vector<float>& v_sp_eta,
delete ly7_h2_nsp;
delete ly6_h2_nsp_notrk;
delete ly7_h2_nsp_notrk;
- ATH_MSG_DEBUG("nr of ly6/ly7 doublet candidate seeds=" << QT.size() << ", doing clustering...");
+ ATH_MSG_VERBOSE("nr of ly6/ly7 doublet candidate seeds=" << QT.size() << ", doing clustering...");
// sort
std::sort(QT.begin(), QT.end(),
@@ -1855,7 +1862,7 @@ StatusCode TrigFastTrackFinder::findSPSeeds( const std::vector<float>& v_sp_eta,
if( phi > TMath::Pi() ) phi = -2*TMath::Pi() + phi;
seeds_phi[i] = phi;
}
- ATH_MSG_DEBUG("after clustering, nr of seeds = " << seeds_eta.size());
+ ATH_MSG_VERBOSE("after clustering, nr of seeds = " << seeds_eta.size());
// delete overlap (can happen at phi=-Pi/Pi bounadry)
std::vector<unsigned int> idx_to_delete;
@@ -1871,7 +1878,7 @@ StatusCode TrigFastTrackFinder::findSPSeeds( const std::vector<float>& v_sp_eta,
if( dr < CLUSTCUT_DIST ) idx_to_delete.push_back(j);
}
}
- ATH_MSG_DEBUG("nr of duplicated seeds to be removed = " << idx_to_delete.size());
+ ATH_MSG_VERBOSE("nr of duplicated seeds to be removed = " << idx_to_delete.size());
if( idx_to_delete.size() > 0 ) {
std::sort(idx_to_delete.begin(),idx_to_delete.end());
for(unsigned int j=idx_to_delete.size(); j>0; j--) {
@@ -1881,7 +1888,7 @@ StatusCode TrigFastTrackFinder::findSPSeeds( const std::vector<float>& v_sp_eta,
}
}
- ATH_MSG_DEBUG("nr of ly6/ly7 seeds=" << seeds_eta.size());
+ ATH_MSG_VERBOSE("nr of ly6/ly7 seeds=" << seeds_eta.size());
// return
return StatusCode::SUCCESS;
@@ -1901,7 +1908,7 @@ int TrigFastTrackFinder::getSPLayer(int layer, float eta) const
// Pixel barrel or SCT barrel
if( 0<=layer && layer <=7 ) {
- ATH_MSG_DEBUG("layer=" << layer << ", eta=" << abseta);
+ ATH_MSG_VERBOSE("layer=" << layer << ", eta=" << abseta);
return layer;
}
@@ -1917,7 +1924,7 @@ int TrigFastTrackFinder::getSPLayer(int layer, float eta) const
// Pixel Endcap #1
base = 8;
if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Pix EC1, eta=" << abseta);
+ ATH_MSG_VERBOSE("Pix EC1, eta=" << abseta);
if( abseta > PixBR2limit ) return 2;
return 3;
}
@@ -1925,7 +1932,7 @@ int TrigFastTrackFinder::getSPLayer(int layer, float eta) const
// Pixel Endcap #2
base = 9;
if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Pix EC2, eta=" << abseta);
+ ATH_MSG_VERBOSE("Pix EC2, eta=" << abseta);
if( abseta > PixBR2limit ) return 2;
return 3;
}
@@ -1933,14 +1940,14 @@ int TrigFastTrackFinder::getSPLayer(int layer, float eta) const
// Pixel Endcap #3
base = 10;
if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Pix EC3, eta=" << abseta);
+ ATH_MSG_VERBOSE("Pix EC3, eta=" << abseta);
return 3;
}
// SCT Endcap #1
base = 11;
if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC1, eta=" << abseta);
+ ATH_MSG_VERBOSE("Sct EC1, eta=" << abseta);
if( abseta < PixBR6limit ) return 7;
else if( abseta < PixBR5limit ) return 6;
return 5;
@@ -1949,7 +1956,7 @@ int TrigFastTrackFinder::getSPLayer(int layer, float eta) const
// SCT Endcap #2
base = 12;
if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC2, eta=" << abseta);
+ ATH_MSG_VERBOSE("Sct EC2, eta=" << abseta);
if( abseta < PixBR5limit ) return 7;
else if( abseta < PixBR4limit ) return 6;
return 4;
@@ -1958,7 +1965,7 @@ int TrigFastTrackFinder::getSPLayer(int layer, float eta) const
// SCT Endcap #3
base = 13;
if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC3, eta=" << abseta);
+ ATH_MSG_VERBOSE("Sct EC3, eta=" << abseta);
if( abseta < PixBR4limit ) return 7;
return 5;
}
@@ -1966,7 +1973,7 @@ int TrigFastTrackFinder::getSPLayer(int layer, float eta) const
// SCT Endcap #4
base = 14;
if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC4, eta=" << abseta);
+ ATH_MSG_VERBOSE("Sct EC4, eta=" << abseta);
if( abseta < PixBR4limit ) return 6;
else if( abseta < PixBR3limit ) return 6;
return 4;
@@ -1975,7 +1982,7 @@ int TrigFastTrackFinder::getSPLayer(int layer, float eta) const
// SCT Endcap #5
base = 15;
if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC5, eta=" << abseta);
+ ATH_MSG_VERBOSE("Sct EC5, eta=" << abseta);
if( abseta < PixBR3limit ) return 7;
return 5;
}
@@ -1983,7 +1990,7 @@ int TrigFastTrackFinder::getSPLayer(int layer, float eta) const
// SCT Endcap #6
base = 16;
if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC6, eta=" << abseta);
+ ATH_MSG_VERBOSE("Sct EC6, eta=" << abseta);
if( abseta < PixBR3limit ) return 6;
return 4;
}
@@ -1991,7 +1998,7 @@ int TrigFastTrackFinder::getSPLayer(int layer, float eta) const
// SCT Endcap #7
base = 17;
if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC7, eta=" << abseta);
+ ATH_MSG_VERBOSE("Sct EC7, eta=" << abseta);
if( abseta < PixBR3limit ) return 7;
return 5;
}
@@ -1999,7 +2006,7 @@ int TrigFastTrackFinder::getSPLayer(int layer, float eta) const
// SCT Endcap #8
base = 18;
if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC8, eta=" << abseta);
+ ATH_MSG_VERBOSE("Sct EC8, eta=" << abseta);
if( abseta < PixBR3limit ) return 7;
return 6;
}
@@ -2007,7 +2014,7 @@ int TrigFastTrackFinder::getSPLayer(int layer, float eta) const
// SCT Endcap #9
base = 19;
if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC9, eta=" << abseta);
+ ATH_MSG_VERBOSE("Sct EC9, eta=" << abseta);
return 7;
}
@@ -2016,15 +2023,13 @@ int TrigFastTrackFinder::getSPLayer(int layer, float eta) const
StatusCode TrigFastTrackFinder::finddEdxTrk(const EventContext& ctx, const TrackCollection& outputTracks) const
{
- auto dEdxTrkContainer = std::make_unique<xAOD::TrigCompositeContainer>();
- auto dEdxTrkContainerAux = std::make_unique<xAOD::TrigCompositeAuxContainer>();
- dEdxTrkContainer->setStore(dEdxTrkContainerAux.get());
SG::WriteHandle<xAOD::TrigCompositeContainer> dEdxTrkHandle(m_dEdxTrkKey, ctx);
+ ATH_CHECK( dEdxTrkHandle.record(std::make_unique<xAOD::TrigCompositeContainer>(), std::make_unique<xAOD::TrigCompositeAuxContainer>()) );
+ auto dEdxTrkContainer = dEdxTrkHandle.ptr();
- auto dEdxHitContainer = std::make_unique<xAOD::TrigCompositeContainer>();
- auto dEdxHitContainerAux = std::make_unique<xAOD::TrigCompositeAuxContainer>();
- dEdxHitContainer->setStore(dEdxHitContainerAux.get());
SG::WriteHandle<xAOD::TrigCompositeContainer> dEdxHitHandle(m_dEdxHitKey, ctx);
+ ATH_CHECK( dEdxHitHandle.record(std::make_unique<xAOD::TrigCompositeContainer>(), std::make_unique<xAOD::TrigCompositeAuxContainer>()) );
+ auto dEdxHitContainer = dEdxHitHandle.ptr();
std::vector<float> mnt_dedx;
std::vector<int> mnt_dedx_nusedhits;
@@ -2034,7 +2039,7 @@ StatusCode TrigFastTrackFinder::finddEdxTrk(const EventContext& ctx, const Track
int i_track=0;
- ATH_MSG_DEBUG("========== in finddEdxTrk ==========");
+ ATH_MSG_VERBOSE("========== in finddEdxTrk ==========");
const float TRKCUT_A0BEAM = 2.5;
const int TRKCUT_N_HITS_INNER = 1;
@@ -2048,7 +2053,7 @@ StatusCode TrigFastTrackFinder::finddEdxTrk(const EventContext& ctx, const Track
for (auto track : outputTracks) {
- ATH_MSG_DEBUG("+++++++ i_track: " << i_track << " +++++++");
+ ATH_MSG_VERBOSE("+++++++ i_track: " << i_track << " +++++++");
i_track++;
if ( ! track->perigeeParameters() ) continue;
@@ -2073,13 +2078,13 @@ StatusCode TrigFastTrackFinder::finddEdxTrk(const EventContext& ctx, const Track
float a0beam = a0 + shift_x*sin(phi0)-shift_y*cos(phi0);
if( std::abs(a0beam) > TRKCUT_A0BEAM ) continue;
- ATH_MSG_DEBUG("calculate dEdx -->");
+ ATH_MSG_VERBOSE("calculate dEdx -->");
int pixelhits=0; int n_usedhits=0;
std::vector<float> v_pixhit_dedx; std::vector<float> v_pixhit_tot; std::vector<float> v_pixhit_trkchi2; std::vector<float> v_pixhit_trkndof;
std::vector<int> v_pixhit_iblovfl; std::vector<int> v_pixhit_loc; std::vector<int> v_pixhit_layer;
float dedx = dEdx(track,pixelhits,n_usedhits,v_pixhit_dedx,v_pixhit_tot,v_pixhit_trkchi2,v_pixhit_trkndof,
v_pixhit_iblovfl,v_pixhit_loc,v_pixhit_layer);
- ATH_MSG_DEBUG("--> dedx = " << dedx);
+ ATH_MSG_VERBOSE("--> dedx = " << dedx);
mnt_dedx.push_back(dedx);
mnt_dedx_nusedhits.push_back(n_usedhits);
@@ -2119,8 +2124,6 @@ StatusCode TrigFastTrackFinder::finddEdxTrk(const EventContext& ctx, const Track
}
}
- ATH_CHECK(dEdxTrkHandle.record(std::move(dEdxTrkContainer), std::move(dEdxTrkContainerAux)));
- ATH_CHECK(dEdxHitHandle.record(std::move(dEdxHitContainer), std::move(dEdxHitContainerAux)));
return StatusCode::SUCCESS;
}
@@ -2174,38 +2177,38 @@ float TrigFastTrackFinder::dEdx(const Trk::Track* track, int& pixelhits, int& n_
// Loop over track states on surfaces (i.e. generalized hits):
for ( ; tsosIter != tsosIterEnd; ++tsosIter) {
- ATH_MSG_DEBUG("-------- TSoS: " << i_tsos++ << " --------");
+ ATH_MSG_VERBOSE("-------- TSoS: " << i_tsos++ << " --------");
const Trk::MeasurementBase *measurement = (*tsosIter)->measurementOnTrack();
if ( measurement == nullptr ) {
- ATH_MSG_DEBUG("no measurement on this TSoS, skip it");
+ ATH_MSG_VERBOSE("no measurement on this TSoS, skip it");
continue;
}
const Trk::TrackParameters* tp = (*tsosIter)->trackParameters();
if( tp == nullptr ) {
- ATH_MSG_DEBUG("no trackParameters() to this TSoS, skip it");
+ ATH_MSG_VERBOSE("no trackParameters() to this TSoS, skip it");
continue;
}
const InDet::PixelClusterOnTrack *pixclus = dynamic_cast<const InDet::PixelClusterOnTrack*>(measurement);
if ( pixclus == nullptr ) {
- ATH_MSG_DEBUG("this TSoS is not Pixel, skip it");
+ ATH_MSG_VERBOSE("this TSoS is not Pixel, skip it");
continue;
}
const InDet::PixelCluster* prd = pixclus->prepRawData();
if( prd == nullptr ) {
- ATH_MSG_DEBUG("no PrepRawData(), skip it");
+ ATH_MSG_VERBOSE("no PrepRawData(), skip it");
continue;
}
float dotProd = tp->momentum().dot(tp->associatedSurface().normal());
float cosalpha = std::abs(dotProd/tp->momentum().mag());
- ATH_MSG_DEBUG("dotProd / cosalpha = " << dotProd << " / " << cosalpha);
+ ATH_MSG_VERBOSE("dotProd / cosalpha = " << dotProd << " / " << cosalpha);
if (std::abs(cosalpha)<.16) continue;
const std::vector<int>& v_tots = prd->totList();
float charge = prd->totalCharge();
float tot = prd->totalToT();
- ATH_MSG_DEBUG("charge / ToT = " << charge << " / " << tot);
+ ATH_MSG_VERBOSE("charge / ToT = " << charge << " / " << tot);
charge *= cosalpha; // path length correction
double locx = pixclus->localParameters()[Trk::locX];
@@ -2234,7 +2237,7 @@ float TrigFastTrackFinder::dEdx(const Trk::Track* track, int& pixelhits, int& n_
break; //no need to check other hits of this cluster
}
}
- if(iblOverflow==1) ATH_MSG_DEBUG("IBL overflow");
+ if(iblOverflow==1) ATH_MSG_VERBOSE("IBL overflow");
if(((eta_module>=-10 && eta_module<=-7)||(eta_module>=6 && eta_module<=9)) && (std::abs(locy)<10. && (locx>-8.33 && locx <8.3)) ){ // IBL 3D
thickness = IBL_3D_sensorthickness;
@@ -2245,7 +2248,7 @@ float TrigFastTrackFinder::dEdx(const Trk::Track* track, int& pixelhits, int& n_
loc = PIXLOC_IBL_PL;
}
else {
- ATH_MSG_DEBUG("unknown IBL module");
+ ATH_MSG_VERBOSE("unknown IBL module");
loc = PIXLOC_IBL_UNKNOWN;
}
}
@@ -2258,7 +2261,7 @@ float TrigFastTrackFinder::dEdx(const Trk::Track* track, int& pixelhits, int& n_
loc = PIXLOC_PIX_EC;
}
else {
- ATH_MSG_DEBUG("unknown Pixel module");
+ ATH_MSG_VERBOSE("unknown Pixel module");
loc = PIXLOC_IBL_UNKNOWN;
}
@@ -2269,7 +2272,7 @@ float TrigFastTrackFinder::dEdx(const Trk::Track* track, int& pixelhits, int& n_
pixelhits++;
if(iblOverflow==1)n_usedIBLOverflowHits++;
}
- ATH_MSG_DEBUG("dEdx=" << dEdxValue);
+ ATH_MSG_VERBOSE("dEdx=" << dEdxValue);
v_pixhit_dedx.push_back(dEdxValue); v_pixhit_tot.push_back(tot);
v_pixhit_trkchi2.push_back(chi2); v_pixhit_trkndof.push_back(ndof);
v_pixhit_iblovfl.push_back(iblOverflow); v_pixhit_loc.push_back(loc); v_pixhit_layer.push_back(layer);
@@ -2285,39 +2288,39 @@ float TrigFastTrackFinder::dEdx(const Trk::Track* track, int& pixelhits, int& n_
int i_map=0;
for (std::pair<float,int> itdEdx : dEdxMap) {
- ATH_MSG_DEBUG("++++++++ i_map: " << i_map++ << " ++++++++");
+ ATH_MSG_VERBOSE("++++++++ i_map: " << i_map++ << " ++++++++");
if(itdEdx.second==0){
- ATH_MSG_DEBUG("usedhits, dEdx=" << itdEdx.first);
+ ATH_MSG_VERBOSE("usedhits, dEdx=" << itdEdx.first);
averagedEdx += itdEdx.first;
n_usedhits++;
}
if(itdEdx.second > 0){
- ATH_MSG_DEBUG("IBLOverflow");
+ ATH_MSG_VERBOSE("IBLOverflow");
IBLOverflow++;
}
// break, skipping last or the two last elements depending on total measurements
if (((int)pixelhits >= 5) and ((int)n_usedhits >= (int)pixelhits-2)) {
- ATH_MSG_DEBUG("break, skipping last or two last elements");
+ ATH_MSG_VERBOSE("break, skipping last or two last elements");
break;
}
// break, IBL Overflow case pixelhits==3 and 4
if((int)IBLOverflow>0 and ((int)pixelhits==3) and (int)n_usedhits==1) {
- ATH_MSG_DEBUG("break, IBL overflow case, pixel hits=3");
+ ATH_MSG_VERBOSE("break, IBL overflow case, pixel hits=3");
break;
}
if((int)IBLOverflow>0 and ((int)pixelhits==4) and (int)n_usedhits==2) {
- ATH_MSG_DEBUG("break, IBL overflow case, pixel hits=4");
+ ATH_MSG_VERBOSE("break, IBL overflow case, pixel hits=4");
break;
}
if (((int)pixelhits > 1) and ((int)n_usedhits >=(int)pixelhits-1)) {
- ATH_MSG_DEBUG("break, skipping last??");
+ ATH_MSG_VERBOSE("break, skipping last??");
break;
}
if((int)IBLOverflow>0 and (int)pixelhits==1){ // only IBL in overflow
- ATH_MSG_DEBUG("break, only IBL in overflow");
+ ATH_MSG_VERBOSE("break, only IBL in overflow");
averagedEdx=itdEdx.first;
break;
}
@@ -2361,7 +2364,7 @@ bool TrigFastTrackFinder::isCleaningPassDisTrack(const TrigInDetTriplet& seed, T
float s3_z = seed.s3().z();
const float PIXEL_BARREL_Z = 410.0;
if( std::abs(s1_z) > PIXEL_BARREL_Z || std::abs(s2_z) > PIXEL_BARREL_Z || std::abs(s3_z) > PIXEL_BARREL_Z ) return false;
- ATH_MSG_DEBUG("UTT: FTF::isCleaningPassDisTrack> ... barrel cut passed");
+ ATH_MSG_VERBOSE("FTF::isCleaningPassDisTrack> ... barrel cut passed");
// pt cut
double theta = trk->perigeeParameters()->parameters()[Trk::theta];
@@ -2369,7 +2372,7 @@ bool TrigFastTrackFinder::isCleaningPassDisTrack(const TrigInDetTriplet& seed, T
if ( qOverP < 1e-12 ) qOverP = 1e-12;
double pt = sin(theta)/qOverP;
if( pt/1000.0 < PT_CUT ) return false;
- ATH_MSG_DEBUG("UTT: FTF::isCleaningPassDisTrack> ... pT cut passed");
+ ATH_MSG_VERBOSE("FTF::isCleaningPassDisTrack> ... pT cut passed");
// fail/comb dependent cuts
if( isFail ) {
@@ -2377,7 +2380,7 @@ bool TrigFastTrackFinder::isCleaningPassDisTrack(const TrigInDetTriplet& seed, T
double ndof = trk->fitQuality()->doubleNumberDoF();
if( std::abs(ndof) < 1e-12 ) return false;
if( chi2/ndof > FAIL_CHI2_OV_NDOF_CUT ) return false;
- ATH_MSG_DEBUG("UTT: FTF::isCleaningPassDisTrack> ... (failTrk) Chi2 cut passed");
+ ATH_MSG_VERBOSE("FTF::isCleaningPassDisTrack> ... (failTrk) Chi2 cut passed");
}
else {
@@ -2399,7 +2402,7 @@ bool TrigFastTrackFinder::isCleaningPassDisTrack(const TrigInDetTriplet& seed, T
if( ndof_pixbr < 1 ) return false;
double chi2_ov_ndof_pixbr = chi2_pixbr / ndof_pixbr;
if( chi2_ov_ndof_pixbr > COMB_CHI2_OV_NDOF_PIX_BR_CUT ) return false;
- ATH_MSG_DEBUG("UTT: FTF::isCleaningPassDisTrack> ... (combTrk) Pix cut passed");
+ ATH_MSG_VERBOSE("FTF::isCleaningPassDisTrack> ... (combTrk) Pix cut passed");
// SCT cuts
int n_hits_sctbr_good = 0;
@@ -2410,7 +2413,7 @@ bool TrigFastTrackFinder::isCleaningPassDisTrack(const TrigInDetTriplet& seed, T
}
if( n_hits_sctbr_good > COMB_N_GOOD_HITS_SCT_BR_CUT ) return false;
if( n_doublehits_sctbr_good > COMB_N_GOOD_DOUBLEHITS_SCT_BR_CUT ) return false;
- ATH_MSG_DEBUG("UTT: FTF::isCleaningPassDisTrack> ... (combTrk) SCT cut passed");
+ ATH_MSG_VERBOSE("FTF::isCleaningPassDisTrack> ... (combTrk) SCT cut passed");
}
// cut passed
@@ -2631,7 +2634,7 @@ void TrigFastTrackFinder::recoVertexForDisTrack(const EventContext& ctx, TrackCo
[](const std::tuple<double,double,double,int>& lhs, const std::tuple<double,double,double,int>& rhs) {
return std::get<0>(lhs) > std::get<0>(rhs); } );
}
- ATH_MSG_DEBUG("UTT: disTrkZVtertex> ===== looping zVtx size: " << zVtx.size());
+ ATH_MSG_VERBOSE("disTrkZVtertex> ===== looping zVtx size: " << zVtx.size());
for(unsigned int i=0; i<zVtx.size(); i++) {
double z = std::get<1>(zVtx[i]);
double zerr = std::get<2>(zVtx[i]);
@@ -2640,7 +2643,7 @@ void TrigFastTrackFinder::recoVertexForDisTrack(const EventContext& ctx, TrackCo
v_zvtx.push_back(z);
v_xvtx.push_back(xVTX - tiltXZ*z); //correction for tilt
v_yvtx.push_back(yVTX - tiltYZ*z); //correction for tilt
- ATH_MSG_DEBUG("UTT: disTrkZVtertex> Vertex cand i=" << i << ": z = " << z << " +- " << zerr << ", sum n / pt = " << n << " / " << pt);
+ ATH_MSG_VERBOSE("disTrkZVtertex> Vertex cand i=" << i << ": z = " << z << " +- " << zerr << ", sum n / pt = " << n << " / " << pt);
}
// monitoring
@@ -2753,11 +2756,9 @@ StatusCode TrigFastTrackFinder::findDisTracks(const EventContext& ctx,
const std::vector<double>& v_yvtx,
const std::vector<double>& v_zvtx) const
{
- // output EDM
- auto disTrkCandContainer = std::make_unique<xAOD::TrigCompositeContainer>();
- auto disTrkCandContainerAux = std::make_unique<xAOD::TrigCompositeAuxContainer>();
- disTrkCandContainer->setStore(disTrkCandContainerAux.get());
SG::WriteHandle<xAOD::TrigCompositeContainer> disTrkCandHandle(m_disTrkCandKey, ctx);
+ ATH_CHECK( disTrkCandHandle.record(std::make_unique<xAOD::TrigCompositeContainer>(), std::make_unique<xAOD::TrigCompositeAuxContainer>()) );
+ auto disTrkCandContainer = disTrkCandHandle.ptr();
// monitoring
auto mnt_disFailTrk_n = Monitored::Scalar<int>("disFailTrk_n", 0);
@@ -2789,29 +2790,26 @@ StatusCode TrigFastTrackFinder::findDisTracks(const EventContext& ctx,
delete std::get<2>(q);
}
}
- ATH_MSG_DEBUG("UTT: ===> nr of disFailTrk=" << qualityDisFailTrks.size() << " -> clone removal=" << initialDisFailTrks.size());
+ ATH_MSG_VERBOSE("===> nr of disFailTrk=" << qualityDisFailTrks.size() << " -> clone removal=" << initialDisFailTrks.size());
TrackCollection fittedDisFailTrks;
m_trigInDetTrackFitter->fit(initialDisFailTrks, fittedDisFailTrks, ctx, m_particleHypothesis);
- int n_disFailTrkCands = recoAndFillDisTrkCand(prefix, &fittedDisFailTrks, tracksForIso, disTrkCandContainer.get(), v_xvtx, v_yvtx, v_zvtx, true);
- ATH_MSG_DEBUG("UTT: disFailTrk: nr of cands = " << n_disFailTrkCands);
+ int n_disFailTrkCands = recoAndFillDisTrkCand(prefix, &fittedDisFailTrks, tracksForIso, disTrkCandContainer, v_xvtx, v_yvtx, v_zvtx, true);
+ ATH_MSG_VERBOSE("disFailTrk: nr of cands = " << n_disFailTrkCands);
mnt_disFailTrk_n = qualityDisFailTrks.size();
mnt_disFailTrk_nclone = initialDisFailTrks.size();
mnt_disFailTrk_ncand = n_disFailTrkCands;
// disCombTrk
- ATH_MSG_DEBUG("UTT: ===> nr of disCombTrk=" << qualityDisCombTrks.size() << " -> clone removal=" << fittedDisCombTrks.size());
- int n_disCombTrkCands = recoAndFillDisTrkCand(prefix, &fittedDisCombTrks, tracksForIso, disTrkCandContainer.get(), v_xvtx, v_yvtx, v_zvtx, false);
- ATH_MSG_DEBUG("UTT: disCombTrk: nr of cands = " << n_disCombTrkCands);
+ ATH_MSG_VERBOSE("===> nr of disCombTrk=" << qualityDisCombTrks.size() << " -> clone removal=" << fittedDisCombTrks.size());
+ int n_disCombTrkCands = recoAndFillDisTrkCand(prefix, &fittedDisCombTrks, tracksForIso, disTrkCandContainer, v_xvtx, v_yvtx, v_zvtx, false);
+ ATH_MSG_VERBOSE("disCombTrk: nr of cands = " << n_disCombTrkCands);
mnt_disCombTrk_n = qualityDisCombTrks.size();
mnt_disCombTrk_nclone = fittedDisCombTrks.size();
mnt_disCombTrk_ncand = n_disCombTrkCands;
- // record
- ATH_CHECK(disTrkCandHandle.record(std::move(disTrkCandContainer), std::move(disTrkCandContainerAux)));
-
return StatusCode::SUCCESS;
}
@@ -3096,8 +3094,8 @@ int TrigFastTrackFinder::recoAndFillDisTrkCand(const std::string& base_prefix,
if( vertexPerigee != nullptr ) {
d0_wrtVtx = vertexPerigee->parameters()[Trk::d0];
z0_wrtVtx = vertexPerigee->parameters()[Trk::z0];
- ATH_MSG_DEBUG("UTT: d0 : " << d0 << " -> extrapolate -> " << d0_wrtVtx);
- ATH_MSG_DEBUG("UTT: z0 : " << z0 << " -> extrapolate -> " << z0_wrtVtx);
+ ATH_MSG_VERBOSE("d0 : " << d0 << " -> extrapolate -> " << d0_wrtVtx);
+ ATH_MSG_VERBOSE("z0 : " << z0 << " -> extrapolate -> " << z0_wrtVtx);
}
// pre-selection
@@ -3129,15 +3127,15 @@ int TrigFastTrackFinder::recoAndFillDisTrkCand(const std::string& base_prefix,
if( refit_trk != nullptr ) {
refitVertexPerigee = extrapolateDisTrackToBS(refit_trk.get(),v_xvtx,v_yvtx,v_zvtx);
if( refitVertexPerigee == nullptr ) {
- ATH_MSG_DEBUG("UTT: extrapote to BS fails for refit track");
+ ATH_MSG_VERBOSE("extrapote to BS fails for refit track");
}
else {
float d0 = refit_trk.get()->perigeeParameters()->parameters()[Trk::d0];
float z0 = refit_trk.get()->perigeeParameters()->parameters()[Trk::z0];
float d0_wrtVtx = refitVertexPerigee->parameters()[Trk::d0];
float z0_wrtVtx = refitVertexPerigee->parameters()[Trk::z0];
- ATH_MSG_DEBUG("UTT: refit trk d0 : " << d0 << " -> extrapolate -> " << d0_wrtVtx);
- ATH_MSG_DEBUG("UTT: refit trk z0 : " << z0 << " -> extrapolate -> " << z0_wrtVtx);
+ ATH_MSG_VERBOSE("refit trk d0 : " << d0 << " -> extrapolate -> " << d0_wrtVtx);
+ ATH_MSG_VERBOSE("refit trk z0 : " << z0 << " -> extrapolate -> " << z0_wrtVtx);
}
}
@@ -3152,8 +3150,8 @@ int TrigFastTrackFinder::recoAndFillDisTrkCand(const std::string& base_prefix,
}
//
- ATH_MSG_DEBUG("UTT: ========> filling trigcomposite for " << prefix << " end");
- ATH_MSG_DEBUG("UTT: nr of " << prefix << " tracks / stored = " << tracks->size() << " / " << n_stored_tracks);
+ ATH_MSG_VERBOSE("========> filling trigcomposite for " << prefix << " end");
+ ATH_MSG_VERBOSE("nr of " << prefix << " tracks / stored = " << tracks->size() << " / " << n_stored_tracks);
//
return n_stored_tracks;
@@ -3166,12 +3164,12 @@ std::unique_ptr<Trk::Track> TrigFastTrackFinder::disTrk_refit(Trk::Track* t) con
if( t == nullptr ) return newtrack;
if( t->trackSummary() == nullptr ) m_trackSummaryTool->updateTrack(*t);
- ATH_MSG_DEBUG("UTT: refitting - input track:");
+ ATH_MSG_VERBOSE("refitting - input track:");
print_disTrk(t);
const Trk::Perigee* origPerigee = t->perigeeParameters();
if( origPerigee == nullptr ) return newtrack;
- ATH_MSG_DEBUG("UTT: ... origPerigee is there");
+ ATH_MSG_VERBOSE("... origPerigee is there");
// remove SCT hits
std::vector<const Trk::MeasurementBase*> vec;
@@ -3196,16 +3194,16 @@ std::unique_ptr<Trk::Track> TrigFastTrackFinder::disTrk_refit(Trk::Track* t) con
}
}
}
- ATH_MSG_DEBUG("UTT: ... Nr of measurments / refit = " << n_measurements << " / " << n_measurements_refit);
+ ATH_MSG_VERBOSE("... Nr of measurments / refit = " << n_measurements << " / " << n_measurements_refit);
// perform refit
newtrack.reset( m_disTrkFitter->fit(vec, *origPerigee, false, m_particleHypothesis) ); // false to run outlier switch
- ATH_MSG_DEBUG("UTT: ... ---> refit track:");
+ ATH_MSG_VERBOSE("... ---> refit track:");
if( newtrack!=0 && newtrack.get() ) {
print_disTrk(dynamic_cast<const Trk::Track*>(newtrack.get()));
}
else {
- ATH_MSG_DEBUG("UTT: ... refit failed");
+ ATH_MSG_VERBOSE("... refit failed");
}
//
@@ -3227,6 +3225,6 @@ void TrigFastTrackFinder::print_disTrk(const Trk::Track* t) const
float pt = sin(theta)/qOverP;
pt /= 1000.0;
}
- ATH_MSG_DEBUG("UTT: ... pt / theta / phi / d0 / z0 = " << pt << " / " << theta << " / " << phi << " / " << d0 << " / " << z0);
- ATH_MSG_DEBUG("UTT: ... chi2 / ndof = " << chi2 << " / " << ndof);
+ ATH_MSG_DEBUG("... pt / theta / phi / d0 / z0 = " << pt << " / " << theta << " / " << phi << " / " << d0 << " / " << z0);
+ ATH_MSG_DEBUG("... chi2 / ndof = " << chi2 << " / " << ndof);
}
diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.h b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.h
index 78f99733715b..5023d8fd377f 100644
--- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.h
+++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.h
@@ -241,7 +241,10 @@ protected:
std::string m_trigseedML_LUT;//ML-based track seeding LUT name
- // L1 J seeded hit-based displaced vertex
+ // create UTT EDMs (to avoid crash in case of findTrack's quitting before UTT algos)
+ StatusCode createEmptyUTTEDMs(const EventContext&) const;
+
+ // Hit-based displaced vertex
bool m_doHitDV;
bool m_doHitDV_Seeding;
StatusCode findHitDV(const EventContext&, const std::vector<TrigSiSpacePointBase>&, const TrackCollection&) const;
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoAlg.cxx b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoAlg.cxx
index e2ad6be5de2d..dd9f7b15313e 100644
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoAlg.cxx
@@ -51,25 +51,28 @@ StatusCode TrigHitDVHypoAlg::initialize()
if ( !m_monTool.empty() ) CHECK( m_monTool.retrieve() );
- m_tmva_reader = new TMVA::Reader( "!Color:!Silent" );
- m_tmva_reader->AddVariable("n_track_qual", &m_tmva_n_track_qual);
- m_tmva_reader->AddVariable("ly0_sp_frac", &m_tmva_ly0_sp_frac);
- m_tmva_reader->AddVariable("ly1_sp_frac", &m_tmva_ly1_sp_frac);
- m_tmva_reader->AddVariable("ly2_sp_frac", &m_tmva_ly2_sp_frac);
- m_tmva_reader->AddVariable("ly3_sp_frac", &m_tmva_ly3_sp_frac);
- m_tmva_reader->AddVariable("ly4_sp_frac", &m_tmva_ly4_sp_frac);
- m_tmva_reader->AddVariable("ly5_sp_frac", &m_tmva_ly5_sp_frac);
- m_tmva_reader->AddVariable("ly6_sp_frac", &m_tmva_ly6_sp_frac);
- m_tmva_reader->AddVariable("ly7_sp_frac", &m_tmva_ly7_sp_frac);
-
- // --- Book the MVA methods
- const std::string tuningVer = "v21a";
- const std::string methodName = "BDT method";
-
- std::string file = "TrigHitDVHypo/HitDV.BDT.weights." + tuningVer + ".xml";
- std::string weightfile = PathResolver::find_calib_file(file.c_str());
- ATH_MSG_DEBUG("opening weightfile = " << weightfile);
- m_tmva_reader->BookMVA(methodName, weightfile);
+ for (size_t slot = 0; slot < SG::getNSlots(); ++slot) {
+ EventContext dummyContext(/*dummyEventNumber*/0, slot);
+ m_tmva_reader.get(dummyContext)->reset( new TMVA::Reader( "!Color:!Silent" ) );
+ (**m_tmva_reader.get(dummyContext)).AddVariable("n_track_qual", m_tmva_n_track_qual.get(dummyContext));
+ (**m_tmva_reader.get(dummyContext)).AddVariable("ly0_sp_frac", m_tmva_ly0_sp_frac.get(dummyContext));
+ (**m_tmva_reader.get(dummyContext)).AddVariable("ly1_sp_frac", m_tmva_ly1_sp_frac.get(dummyContext));
+ (**m_tmva_reader.get(dummyContext)).AddVariable("ly2_sp_frac", m_tmva_ly2_sp_frac.get(dummyContext));
+ (**m_tmva_reader.get(dummyContext)).AddVariable("ly3_sp_frac", m_tmva_ly3_sp_frac.get(dummyContext));
+ (**m_tmva_reader.get(dummyContext)).AddVariable("ly4_sp_frac", m_tmva_ly4_sp_frac.get(dummyContext));
+ (**m_tmva_reader.get(dummyContext)).AddVariable("ly5_sp_frac", m_tmva_ly5_sp_frac.get(dummyContext));
+ (**m_tmva_reader.get(dummyContext)).AddVariable("ly6_sp_frac", m_tmva_ly6_sp_frac.get(dummyContext));
+ (**m_tmva_reader.get(dummyContext)).AddVariable("ly7_sp_frac", m_tmva_ly7_sp_frac.get(dummyContext));
+
+ // --- Book the MVA methods
+ const std::string tuningVer = "v21a";
+ const std::string methodName = "BDT method";
+
+ std::string file = "TrigHitDVHypo/HitDV.BDT.weights." + tuningVer + ".xml";
+ std::string weightfile = PathResolver::find_calib_file(file.c_str());
+ ATH_MSG_DEBUG("opening weightfile = " << weightfile);
+ (**m_tmva_reader.get(dummyContext)).BookMVA(methodName, weightfile);
+ }
return StatusCode::SUCCESS;
}
@@ -154,7 +157,7 @@ StatusCode TrigHitDVHypoAlg::execute( const EventContext& context ) const
float averageMu = 0;
if( m_isMC ) {
if( m_lumiBlockMuTool ) {
- averageMu = (float)m_lumiBlockMuTool->averageInteractionsPerCrossing();
+ averageMu = static_cast<float>(m_lumiBlockMuTool->averageInteractionsPerCrossing());
ATH_MSG_DEBUG( "offline averageMu = " << averageMu );
}
}
@@ -190,12 +193,12 @@ StatusCode TrigHitDVHypoAlg::execute( const EventContext& context ) const
int n_passed_jet = 0;
int seed_type = 0;
- ATH_CHECK( calculateBDT(hitDVSPsContainer, hitDVTrksContainer, jetSeeds_pt, jetSeeds_eta, jetSeeds_phi, preselBDTthreshold, seed_type, dvContainer, n_passed_jet) );
+ ATH_CHECK( calculateBDT(context, hitDVSPsContainer, hitDVTrksContainer, jetSeeds_pt, jetSeeds_eta, jetSeeds_phi, preselBDTthreshold, seed_type, dvContainer, n_passed_jet) );
int n_passed_sp = 0;
std::vector<float> void_pt;
seed_type = 1;
- ATH_CHECK( calculateBDT(hitDVSPsContainer, hitDVTrksContainer, void_pt, spSeeds_eta, spSeeds_phi, preselBDTthreshold, seed_type, dvContainer, n_passed_sp) );
+ ATH_CHECK( calculateBDT(context, hitDVSPsContainer, hitDVTrksContainer, void_pt, spSeeds_eta, spSeeds_phi, preselBDTthreshold, seed_type, dvContainer, n_passed_sp) );
ATH_MSG_DEBUG( "nr of dv container / jet-seeded / sp-seed candidates = " << dvContainer->size() << " / " << n_passed_jet << " / " << n_passed_sp );
@@ -268,7 +271,7 @@ int TrigHitDVHypoAlg::getSPLayer(int layer, float eta) const
// if Pixel/SCT barrel, layer number is as it is
if( 0<=layer && layer <=7 ) {
- ATH_MSG_DEBUG("layer=" << layer << ", eta=" << abseta);
+ ATH_MSG_VERBOSE("layer=" << layer << ", eta=" << abseta);
return layer;
}
@@ -286,7 +289,7 @@ int TrigHitDVHypoAlg::getSPLayer(int layer, float eta) const
// Pixel Endcap #1
base = 8;
if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Pix EC1, eta=" << abseta);
+ ATH_MSG_VERBOSE("Pix EC1, eta=" << abseta);
if( abseta > PixBR2limit ) return 2;
return 3;
}
@@ -294,7 +297,7 @@ int TrigHitDVHypoAlg::getSPLayer(int layer, float eta) const
// Pixel Endcap #2
base = 9;
if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Pix EC2, eta=" << abseta);
+ ATH_MSG_VERBOSE("Pix EC2, eta=" << abseta);
if( abseta > PixBR2limit ) return 2;
return 3;
}
@@ -302,14 +305,14 @@ int TrigHitDVHypoAlg::getSPLayer(int layer, float eta) const
// Pixel Endcap #3
base = 10;
if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Pix EC3, eta=" << abseta);
+ ATH_MSG_VERBOSE("Pix EC3, eta=" << abseta);
return 3;
}
// SCT Endcap #1
base = 11;
if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC1, eta=" << abseta);
+ ATH_MSG_VERBOSE("Sct EC1, eta=" << abseta);
if( abseta < PixBR6limit ) return 7;
else if( abseta < PixBR5limit ) return 6;
return 5;
@@ -318,7 +321,7 @@ int TrigHitDVHypoAlg::getSPLayer(int layer, float eta) const
// SCT Endcap #2
base = 12;
if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC2, eta=" << abseta);
+ ATH_MSG_VERBOSE("Sct EC2, eta=" << abseta);
if( abseta < PixBR5limit ) return 7;
else if( abseta < PixBR4limit ) return 6;
return 4;
@@ -327,7 +330,7 @@ int TrigHitDVHypoAlg::getSPLayer(int layer, float eta) const
// SCT Endcap #3
base = 13;
if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC3, eta=" << abseta);
+ ATH_MSG_VERBOSE("Sct EC3, eta=" << abseta);
if( abseta < PixBR4limit ) return 7;
return 5;
}
@@ -335,7 +338,7 @@ int TrigHitDVHypoAlg::getSPLayer(int layer, float eta) const
// SCT Endcap #4
base = 14;
if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC4, eta=" << abseta);
+ ATH_MSG_VERBOSE("Sct EC4, eta=" << abseta);
if( abseta < PixBR4limit ) return 6;
else if( abseta < PixBR3limit ) return 6;
return 4;
@@ -344,7 +347,7 @@ int TrigHitDVHypoAlg::getSPLayer(int layer, float eta) const
// SCT Endcap #5
base = 15;
if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC5, eta=" << abseta);
+ ATH_MSG_VERBOSE("Sct EC5, eta=" << abseta);
if( abseta < PixBR3limit ) return 7;
return 5;
}
@@ -352,7 +355,7 @@ int TrigHitDVHypoAlg::getSPLayer(int layer, float eta) const
// SCT Endcap #6
base = 16;
if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC6, eta=" << abseta);
+ ATH_MSG_VERBOSE("Sct EC6, eta=" << abseta);
if( abseta < PixBR3limit ) return 6;
return 4;
}
@@ -360,7 +363,7 @@ int TrigHitDVHypoAlg::getSPLayer(int layer, float eta) const
// SCT Endcap #7
base = 17;
if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC7, eta=" << abseta);
+ ATH_MSG_VERBOSE("Sct EC7, eta=" << abseta);
if( abseta < PixBR3limit ) return 7;
return 5;
}
@@ -368,7 +371,7 @@ int TrigHitDVHypoAlg::getSPLayer(int layer, float eta) const
// SCT Endcap #8
base = 18;
if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC8, eta=" << abseta);
+ ATH_MSG_VERBOSE("Sct EC8, eta=" << abseta);
if( abseta < PixBR3limit ) return 7;
return 6;
}
@@ -376,7 +379,7 @@ int TrigHitDVHypoAlg::getSPLayer(int layer, float eta) const
// SCT Endcap #9
base = 19;
if( layer==base || layer==(base+12) ) {
- ATH_MSG_DEBUG("Sct EC9, eta=" << abseta);
+ ATH_MSG_VERBOSE("Sct EC9, eta=" << abseta);
return 7;
}
@@ -483,9 +486,11 @@ StatusCode TrigHitDVHypoAlg::doMonitor(const xAOD::TrigCompositeContainer* dvCon
// ------------------------------------------------------------------------------------------------
// ------------------------------------------------------------------------------------------------
-StatusCode TrigHitDVHypoAlg::calculateBDT(const xAOD::TrigCompositeContainer* spsContainer,
+StatusCode TrigHitDVHypoAlg::calculateBDT(const EventContext& context,
+ const xAOD::TrigCompositeContainer* spsContainer,
const xAOD::TrigCompositeContainer* trksContainer,
- const std::vector<float>& seeds_pt, const std::vector<float>& seeds_eta, const std::vector<float>& seeds_phi,
+ const std::vector<float>& seeds_pt,
+ const std::vector<float>& seeds_eta, const std::vector<float>& seeds_phi,
const float& cutBDTthreshold, const int seed_type,
xAOD::TrigCompositeContainer* dvContainer, int& n_passed) const
{
@@ -497,7 +502,7 @@ StatusCode TrigHitDVHypoAlg::calculateBDT(const xAOD::TrigCompositeContainer* sp
float seed_eta = seeds_eta[iseed];
float seed_phi = seeds_phi[iseed];
- ATH_MSG_DEBUG("+++++ seed eta: " << seed_eta << ", phi:" << seed_phi << " +++++");
+ ATH_MSG_VERBOSE("+++++ seed eta: " << seed_eta << ", phi:" << seed_phi << " +++++");
// loop on space points
const int N_LAYER = 8;
@@ -539,13 +544,13 @@ StatusCode TrigHitDVHypoAlg::calculateBDT(const xAOD::TrigCompositeContainer* sp
}
}
}
- ATH_MSG_DEBUG("nr of SPs in jet: usedByTrk / all = " << n_sp_injet_usedByTrk << " / " << n_sp_injet);
+ ATH_MSG_VERBOSE("nr of SPs in jet: usedByTrk / all = " << n_sp_injet_usedByTrk << " / " << n_sp_injet);
float v_ly_sp_frac[N_LAYER];
for(int i=0; i<N_LAYER; i++) {
float frac = 0.;
- if( v_n_sp_injet[i] > 0 ) frac = 1.0 - (float)v_n_sp_injet_usedByTrk[i] / (float)v_n_sp_injet[i];
+ if( v_n_sp_injet[i] > 0 ) frac = 1.0 - static_cast<float>(v_n_sp_injet_usedByTrk[i]) / static_cast<float>(v_n_sp_injet[i]);
v_ly_sp_frac[i] = frac;
- ATH_MSG_DEBUG("Layer " << i << ": frac=" << v_ly_sp_frac[i] << ", n used / all = " << v_n_sp_injet_usedByTrk[i] << " / " << v_n_sp_injet[i]);
+ ATH_MSG_VERBOSE("Layer " << i << ": frac=" << v_ly_sp_frac[i] << ", n used / all = " << v_n_sp_injet_usedByTrk[i] << " / " << v_n_sp_injet[i]);
}
// loop on tracks
@@ -562,25 +567,25 @@ StatusCode TrigHitDVHypoAlg::calculateBDT(const xAOD::TrigCompositeContainer* sp
if( dr > DR_TO_REF_CUT ) continue;
n_qtrk_injet++;
}
- ATH_MSG_DEBUG("nr of quality tracks in jet = " << n_qtrk_injet);
+ ATH_MSG_VERBOSE("nr of quality tracks in jet = " << n_qtrk_injet);
// evaluate BDT
- m_tmva_n_track_qual = (float)n_qtrk_injet;
- m_tmva_ly0_sp_frac = v_ly_sp_frac[0];
- m_tmva_ly1_sp_frac = v_ly_sp_frac[1];
- m_tmva_ly2_sp_frac = v_ly_sp_frac[2];
- m_tmva_ly3_sp_frac = v_ly_sp_frac[3];
- m_tmva_ly4_sp_frac = v_ly_sp_frac[4];
- m_tmva_ly5_sp_frac = v_ly_sp_frac[5];
- m_tmva_ly6_sp_frac = v_ly_sp_frac[6];
- m_tmva_ly7_sp_frac = v_ly_sp_frac[7];
- float bdt_score = m_tmva_reader->EvaluateMVA("BDT method");
+ (*(const_cast<float*>(m_tmva_n_track_qual.get(context)))) = static_cast<float>(n_qtrk_injet);
+ (*(const_cast<float*>(m_tmva_ly0_sp_frac.get(context)))) = v_ly_sp_frac[0];
+ (*(const_cast<float*>(m_tmva_ly1_sp_frac.get(context)))) = v_ly_sp_frac[1];
+ (*(const_cast<float*>(m_tmva_ly2_sp_frac.get(context)))) = v_ly_sp_frac[2];
+ (*(const_cast<float*>(m_tmva_ly3_sp_frac.get(context)))) = v_ly_sp_frac[3];
+ (*(const_cast<float*>(m_tmva_ly4_sp_frac.get(context)))) = v_ly_sp_frac[4];
+ (*(const_cast<float*>(m_tmva_ly5_sp_frac.get(context)))) = v_ly_sp_frac[5];
+ (*(const_cast<float*>(m_tmva_ly6_sp_frac.get(context)))) = v_ly_sp_frac[6];
+ (*(const_cast<float*>(m_tmva_ly7_sp_frac.get(context)))) = v_ly_sp_frac[7];
+ float bdt_score = (**m_tmva_reader.get(context)).EvaluateMVA("BDT method");
// BDT threshold
if( bdt_score < cutBDTthreshold ) continue;
// passed selection
- ATH_MSG_DEBUG("Passed selection");
+ ATH_MSG_VERBOSE("Passed selection");
n_passed++;
// create EDM object
@@ -605,7 +610,7 @@ StatusCode TrigHitDVHypoAlg::calculateBDT(const xAOD::TrigCompositeContainer* sp
dv->setDetail<float>("hitDV_ly7_sp_frac", v_ly_sp_frac[7]);
dv->setDetail<float>("hitDV_bdt_score", bdt_score);
- ATH_MSG_DEBUG("Created a new entry EDM");
+ ATH_MSG_VERBOSE("Created a new entry EDM");
}
ATH_MSG_DEBUG("nr of BDT passed = " << n_passed);
@@ -625,26 +630,26 @@ StatusCode TrigHitDVHypoAlg::findJetSeeds(const xAOD::JetContainer* jetsContaine
auto mon_jet_eta = Monitored::Collection("jet_eta", mnt_jet_eta);
auto monitorIt = Monitored::Group( m_monTool, mon_jet_pt, mon_jet_eta );
- ATH_MSG_DEBUG("looking for jet seed with pt cut=" << cutJetPt << ", eta cut=" << cutJetEta);
+ ATH_MSG_VERBOSE("looking for jet seed with pt cut=" << cutJetPt << ", eta cut=" << cutJetEta);
for ( const xAOD::Jet* jet : *jetsContainer ) {
- float jet_pt = (float)jet->pt() / 1000.0;
+ float jet_pt = static_cast<float>(jet->pt() / 1000.0 );
mnt_jet_pt.push_back(jet_pt);
if( jet_pt < cutJetPt ) {
- ATH_MSG_DEBUG("Fails jet pt cut, pt = " << jet_pt);
+ ATH_MSG_VERBOSE("Fails jet pt cut, pt = " << jet_pt);
continue;
}
- float jet_eta = (float)jet->eta();
+ float jet_eta = static_cast<float>(jet->eta());
mnt_jet_eta.push_back(jet_eta);
if( std::fabs(jet_eta) > cutJetEta ) {
- ATH_MSG_DEBUG("Fails jet eta cut, eta = " << jet_eta);
+ ATH_MSG_VERBOSE("Fails jet eta cut, eta = " << jet_eta);
continue;
}
- float jet_phi = (float)jet->phi();
+ float jet_phi = static_cast<float>(jet->phi());
jetSeeds_pt.push_back(jet_pt);
jetSeeds_eta.push_back(jet_eta);
jetSeeds_phi.push_back(jet_phi);
}
- ATH_MSG_DEBUG("nr of jet seeds=" << jetSeeds_eta.size());
+ ATH_MSG_VERBOSE("nr of jet seeds=" << jetSeeds_eta.size());
return StatusCode::SUCCESS;
}
@@ -653,7 +658,7 @@ StatusCode TrigHitDVHypoAlg::findJetSeeds(const xAOD::JetContainer* jetsContaine
// ------------------------------------------------------------------------------------------------
StatusCode TrigHitDVHypoAlg::findSPSeeds( const xAOD::TrigCompositeContainer* spsContainer,
- std::vector<float>& seeds_eta, std::vector<float>& seeds_phi ) const
+ std::vector<float>& seeds_eta, std::vector<float>& seeds_phi ) const
{
seeds_eta.clear();
seeds_phi.clear();
@@ -712,7 +717,7 @@ StatusCode TrigHitDVHypoAlg::findSPSeeds( const xAOD::TrigCompositeContainer* sp
}
}
- ATH_MSG_DEBUG("looking for ly6/ly6 doublet seeds");
+ ATH_MSG_VERBOSE("looking for ly6/ly6 doublet seeds");
// (idx, sort/weight, eta, phi)
std::vector<std::tuple<int,float,float,float>> QT;
@@ -752,7 +757,7 @@ StatusCode TrigHitDVHypoAlg::findSPSeeds( const xAOD::TrigCompositeContainer* sp
QT.push_back(std::make_tuple(-1,w,weta,wphi));
}
}
- ATH_MSG_DEBUG("nr of ly6/ly7 doublet candidate seeds=" << QT.size() << ", doing clustering...");
+ ATH_MSG_VERBOSE("nr of ly6/ly7 doublet candidate seeds=" << QT.size() << ", doing clustering...");
// sort
std::sort(QT.begin(), QT.end(),
@@ -817,7 +822,7 @@ StatusCode TrigHitDVHypoAlg::findSPSeeds( const xAOD::TrigCompositeContainer* sp
if( phi > TMath::Pi() ) phi = -2*TMath::Pi() + phi;
seeds_phi[i] = phi;
}
- ATH_MSG_DEBUG("after clustering, nr of seeds = " << seeds_eta.size());
+ ATH_MSG_VERBOSE("after clustering, nr of seeds = " << seeds_eta.size());
// delete overlap (can happen at phi=-Pi/Pi bounadry)
std::vector<unsigned int> idx_to_delete;
@@ -833,7 +838,7 @@ StatusCode TrigHitDVHypoAlg::findSPSeeds( const xAOD::TrigCompositeContainer* sp
if( dr < CLUSTCUT_DIST ) idx_to_delete.push_back(j);
}
}
- ATH_MSG_DEBUG("nr of duplicated seeds to be removed = " << idx_to_delete.size());
+ ATH_MSG_VERBOSE("nr of duplicated seeds to be removed = " << idx_to_delete.size());
if( idx_to_delete.size() > 0 ) {
std::sort(idx_to_delete.begin(),idx_to_delete.end());
for(unsigned int j=idx_to_delete.size(); j>0; j--) {
@@ -843,7 +848,7 @@ StatusCode TrigHitDVHypoAlg::findSPSeeds( const xAOD::TrigCompositeContainer* sp
}
}
- ATH_MSG_DEBUG("nr of ly6/ly7 seeds=" << seeds_eta.size());
+ ATH_MSG_VERBOSE("nr of ly6/ly7 seeds=" << seeds_eta.size());
// return
return StatusCode::SUCCESS;
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoAlg.h b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoAlg.h
index a1d3254afc84..0babfcf61a31 100644
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigHitDVHypoAlg.h
@@ -4,11 +4,13 @@
#ifndef TRIGLONGLIVEDPARTICLESHYPO_TRIGHITDVHYPOALG_H
#define TRIGLONGLIVEDPARTICLESHYPO_TRIGHITDVHYPOALG_H
-#include "Gaudi/Property.h"
-
#include <string>
-#include "TrigHitDVHypoTool.h"
+
+#include "Gaudi/Property.h"
+#include "AthenaKernel/SlotSpecificObj.h"
#include "DecisionHandling/HypoBase.h"
+#include "TrigHitDVHypoTool.h"
+
#include "xAODJet/JetContainer.h"
#include "LumiBlockData/LuminosityCondData.h"
#include "LumiBlockComps/ILumiBlockMuTool.h"
@@ -41,7 +43,7 @@ private:
// Luminosity related
ToolHandle<ILumiBlockMuTool> m_lumiBlockMuTool;
// Property: Per-bunch luminosity data (data only) conditions input)
- SG::ReadCondHandleKey<LuminosityCondData> m_lumiDataKey {this, "LuminosityCondDataKey", "LuminosityCondData", ""};
+ SG::ReadCondHandleKey<LuminosityCondData> m_lumiDataKey {this, "LuminosityCondDataKey", "LuminosityCondData", ""};
// Property; MC flag.
Gaudi::Property<bool> m_isMC {this, "isMC", false, "Real data or MC"};
@@ -54,21 +56,21 @@ private:
int getSPLayer(int, float) const;
StatusCode findSPSeeds( const xAOD::TrigCompositeContainer*, std::vector<float>&, std::vector<float>& ) const;
StatusCode findJetSeeds(const xAOD::JetContainer*, const float, const float, std::vector<float>&, std::vector<float>&, std::vector<float>&) const;
- StatusCode calculateBDT(const xAOD::TrigCompositeContainer*, const xAOD::TrigCompositeContainer*,
+ StatusCode calculateBDT(const EventContext&, const xAOD::TrigCompositeContainer*, const xAOD::TrigCompositeContainer*,
const std::vector<float>&, const std::vector<float>&, const std::vector<float>&,
const float&, const int, xAOD::TrigCompositeContainer*, int&) const;
// BDT
- TMVA::Reader* m_tmva_reader;
- mutable float m_tmva_n_track_qual ATLAS_THREAD_SAFE;
- mutable float m_tmva_ly0_sp_frac ATLAS_THREAD_SAFE;
- mutable float m_tmva_ly1_sp_frac ATLAS_THREAD_SAFE;
- mutable float m_tmva_ly2_sp_frac ATLAS_THREAD_SAFE;
- mutable float m_tmva_ly3_sp_frac ATLAS_THREAD_SAFE;
- mutable float m_tmva_ly4_sp_frac ATLAS_THREAD_SAFE;
- mutable float m_tmva_ly5_sp_frac ATLAS_THREAD_SAFE;
- mutable float m_tmva_ly6_sp_frac ATLAS_THREAD_SAFE;
- mutable float m_tmva_ly7_sp_frac ATLAS_THREAD_SAFE;
+ SG::SlotSpecificObj<std::unique_ptr<TMVA::Reader> > m_tmva_reader ATLAS_THREAD_SAFE;
+ SG::SlotSpecificObj<float> m_tmva_n_track_qual ATLAS_THREAD_SAFE;
+ SG::SlotSpecificObj<float> m_tmva_ly0_sp_frac ATLAS_THREAD_SAFE;
+ SG::SlotSpecificObj<float> m_tmva_ly1_sp_frac ATLAS_THREAD_SAFE;
+ SG::SlotSpecificObj<float> m_tmva_ly2_sp_frac ATLAS_THREAD_SAFE;
+ SG::SlotSpecificObj<float> m_tmva_ly3_sp_frac ATLAS_THREAD_SAFE;
+ SG::SlotSpecificObj<float> m_tmva_ly4_sp_frac ATLAS_THREAD_SAFE;
+ SG::SlotSpecificObj<float> m_tmva_ly5_sp_frac ATLAS_THREAD_SAFE;
+ SG::SlotSpecificObj<float> m_tmva_ly6_sp_frac ATLAS_THREAD_SAFE;
+ SG::SlotSpecificObj<float> m_tmva_ly7_sp_frac ATLAS_THREAD_SAFE;
};
#endif //> !TRIGLONGLIVEDPARTICLESHYPO_TRIGHITDVHYPOALG_H
--
GitLab
From 8e2d6a27368a28bdff67cda95dc45fc8a1147922 Mon Sep 17 00:00:00 2001
From: Joao Victor Da Fonseca Pinto <joao.victor.da.fonseca.pinto@cern.ch>
Date: Tue, 24 Aug 2021 13:17:20 +0200
Subject: [PATCH 258/272] Fix emulator and add new job
---
.../Root/TrigEgammaEmulationChain.cxx | 16 +--
.../TrigEgammaEmulationL1CaloHypoTool.cxx | 34 ++---
...EgammaEmulationPrecisionPhotonHypoTool.cxx | 6 +-
.../Root/TrigEgammaEmulationToolMT.cxx | 24 ++--
...igEgammaEmulationPrecisionPhotonHypoTool.h | 2 +-
.../TrigEgammaEmulationToolMT.h | 3 +-
.../python/TrigEgammaEmulationToolConfigMT.py | 66 +++++----
.../python/eventLoopHeartBeat.txt | 1 -
.../src/TrigEgammaEmulationToolTest.cxx | 3 +-
.../TrigEgammaMonitoring/CMakeLists.txt | 2 +
.../TrigEgammaMonitoring/README.md | 27 ++++
.../python/TrigEgammaMonitorAlgorithm.py | 9 +-
.../python/TrigEgammaMonitoringMTConfig.py | 99 ++++++-------
.../share/RunEsdToAodStandalone.py | 74 ----------
.../share/RunTrigEgammaMonitoring.py | 134 ++++++++++++++++++
.../TrigEgammaMonitorAlgorithm_jobOptions.py | 41 ------
.../testAthenaTrigAOD_TrigEgammaMonitoring.py | 133 -----------------
...gAOD_xTrigDecision_TrigEgammaMonitoring.py | 52 -------
.../TrigEgammaMonitorAnalysisAlgorithm.cxx | 29 ++--
.../src/TrigEgammaMonitorBaseAlgorithm.h | 2 +
20 files changed, 327 insertions(+), 430 deletions(-)
delete mode 100644 Trigger/TrigAnalysis/TrigEgammaEmulationTool/python/eventLoopHeartBeat.txt
create mode 100644 Trigger/TrigMonitoring/TrigEgammaMonitoring/README.md
delete mode 100644 Trigger/TrigMonitoring/TrigEgammaMonitoring/share/RunEsdToAodStandalone.py
create mode 100755 Trigger/TrigMonitoring/TrigEgammaMonitoring/share/RunTrigEgammaMonitoring.py
delete mode 100644 Trigger/TrigMonitoring/TrigEgammaMonitoring/share/TrigEgammaMonitorAlgorithm_jobOptions.py
delete mode 100644 Trigger/TrigMonitoring/TrigEgammaMonitoring/share/testAthenaTrigAOD_TrigEgammaMonitoring.py
delete mode 100644 Trigger/TrigMonitoring/TrigEgammaMonitoring/share/testAthenaTrigAOD_xTrigDecision_TrigEgammaMonitoring.py
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationChain.cxx b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationChain.cxx
index a65c84fd231f..076e4b5356cb 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationChain.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationChain.cxx
@@ -39,7 +39,7 @@ asg::AcceptData TrigEgammaEmulationChain::emulate(const Trig::TrigData &input) c
{
asg::AcceptData acceptData (&m_accept);
- ATH_MSG_INFO( "Emulate " << m_chain);
+ ATH_MSG_DEBUG( "Emulate " << m_chain);
// Emulate L1 seed
bool passedL1Calo = false;
@@ -57,13 +57,13 @@ asg::AcceptData TrigEgammaEmulationChain::emulate(const Trig::TrigData &input) c
}
}
- ATH_MSG_INFO("Accept results:");
- ATH_MSG_INFO("L1 : " << acceptData.getCutResult(0)); // Step 0
- ATH_MSG_INFO("L2Calo : " << acceptData.getCutResult(1)); // Step 1
- ATH_MSG_INFO("L2 : " << acceptData.getCutResult(2)); // Step 2
- ATH_MSG_INFO("EFCalo : " << acceptData.getCutResult(3)); // Step 3
- ATH_MSG_INFO("EFTrack : " << acceptData.getCutResult(4)); // Step 4
- ATH_MSG_INFO("HLT : " << acceptData.getCutResult(5)); // Step 5
+ ATH_MSG_DEBUG("Accept results:");
+ ATH_MSG_DEBUG("L1 : " << acceptData.getCutResult(0)); // Step 0
+ ATH_MSG_DEBUG("L2Calo : " << acceptData.getCutResult(1)); // Step 1
+ ATH_MSG_DEBUG("L2 : " << acceptData.getCutResult(2)); // Step 2
+ ATH_MSG_DEBUG("EFCalo : " << acceptData.getCutResult(3)); // Step 3
+ ATH_MSG_DEBUG("EFTrack : " << acceptData.getCutResult(4)); // Step 4
+ ATH_MSG_DEBUG("HLT : " << acceptData.getCutResult(5)); // Step 5
return acceptData;
}
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationL1CaloHypoTool.cxx b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationL1CaloHypoTool.cxx
index 9b8aa7b2a057..3219c33a995f 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationL1CaloHypoTool.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationL1CaloHypoTool.cxx
@@ -37,7 +37,7 @@ bool TrigEgammaEmulationL1CaloHypoTool::decide( const Trig::TrigData &input ) c
//for(const auto& l1 : *l1Cont){
if (l1->roiType() != xAOD::EmTauRoI::EMRoIWord){
- ATH_MSG_INFO("This roi is not EMRoIWord!");
+ ATH_MSG_DEBUG("This roi is not EMRoIWord!");
return true;
}
float emE = l1->emClus()/Gaudi::Units::GeV; // Cluster energy
@@ -45,37 +45,37 @@ bool TrigEgammaEmulationL1CaloHypoTool::decide( const Trig::TrigData &input ) c
float hadCore = l1->hadCore()/Gaudi::Units::GeV; // Hadronic core energy
float emIsol = l1->emIsol()/Gaudi::Units::GeV; // EM Isolation energy
- ATH_MSG_INFO("emE = " << emE);
- ATH_MSG_INFO("eta = " << eta);
- ATH_MSG_INFO("hadCore = " << hadCore);
- ATH_MSG_INFO("emIsol = " << emIsol);
+ ATH_MSG_DEBUG("emE = " << emE);
+ ATH_MSG_DEBUG("eta = " << eta);
+ ATH_MSG_DEBUG("hadCore = " << hadCore);
+ ATH_MSG_DEBUG("emIsol = " << emIsol);
if (boost::contains(l1item,"H")) {
- ATH_MSG_INFO("L1 (H) CUT");
+ ATH_MSG_DEBUG("L1 (H) CUT");
if (!isolationL1(m_hadCoreCutMin,m_hadCoreCutOff,m_hadCoreCutSlope,hadCore,emE)) {
- ATH_MSG_INFO("rejected");
+ ATH_MSG_DEBUG("rejected");
return false;
}
- ATH_MSG_INFO("accepted");
+ ATH_MSG_DEBUG("accepted");
}
if (boost::contains(l1item,"I")) {
- ATH_MSG_INFO("L1 (I) CUT");
+ ATH_MSG_DEBUG("L1 (I) CUT");
if (!isolationL1(m_emIsolCutMin,m_emIsolCutOff,m_emIsolCutSlope,emIsol,emE)) {
- ATH_MSG_INFO("rejected");
+ ATH_MSG_DEBUG("rejected");
return false;
}
- ATH_MSG_INFO("accepted");
+ ATH_MSG_DEBUG("accepted");
}
- ATH_MSG_INFO("Apply L1 Et cut " << m_l1threshold << " cluster emE " << emE << " eta " << eta);
+ ATH_MSG_DEBUG("Apply L1 Et cut " << m_l1threshold << " cluster emE " << emE << " eta " << eta);
if (boost::contains(l1item,"V")) {
- ATH_MSG_INFO("L1 (V) CUT");
+ ATH_MSG_DEBUG("L1 (V) CUT");
if (!variableEtL1(l1item,emE,eta)) {
- ATH_MSG_INFO("rejected");
+ ATH_MSG_DEBUG("rejected");
return false;
}
- ATH_MSG_INFO("accepted");
+ ATH_MSG_DEBUG("accepted");
}
// add new method for this also
else if (emE <= m_l1threshold) { // this cut is confirmed to be <=
@@ -92,7 +92,7 @@ bool TrigEgammaEmulationL1CaloHypoTool::decide( const Trig::TrigData &input ) c
bool TrigEgammaEmulationL1CaloHypoTool::isolationL1(float min, float offset, float slope, float energy, float emE) const
{
if (emE > m_isolMaxCut) {
- ATH_MSG_INFO("L1 Isolation skipped, ET > Maximum isolation");
+ ATH_MSG_DEBUG("L1 Isolation skipped, ET > Maximum isolation");
return true;
}
float isolation = offset + emE*slope;
@@ -104,7 +104,7 @@ bool TrigEgammaEmulationL1CaloHypoTool::isolationL1(float min, float offset, flo
bool value = (energy <= isolation);
- ATH_MSG_INFO("L1 Isolation ET = " << energy << " ISOLATION CUT " << isolation);
+ ATH_MSG_DEBUG("L1 Isolation ET = " << energy << " ISOLATION CUT " << isolation);
return value;
}
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationPrecisionPhotonHypoTool.cxx b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationPrecisionPhotonHypoTool.cxx
index 116b517dfeac..72048323a345 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationPrecisionPhotonHypoTool.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationPrecisionPhotonHypoTool.cxx
@@ -220,7 +220,7 @@ bool TrigEgammaEmulationPrecisionPhotonHypoTool::decide( const Trig::TrigData &
// Monitor showershapes
reletcone20 = etcone20/ph->caloCluster()->et();
ATH_MSG_DEBUG("reletcone20 = " <<reletcone20 );
- ATH_MSG_DEBUG("m_RelEtConeCut = " << m_RelEtConeCut );
+ ATH_MSG_DEBUG("m_RelEtConeCut = " << m_RelTopoEtConeCut );
// Decode isEM bits of result to see which bits passed and which bits fialed
@@ -235,13 +235,13 @@ bool TrigEgammaEmulationPrecisionPhotonHypoTool::decide( const Trig::TrigData &
// Check if need to apply isolation
// First check logic. if cut is very negative, then no isolation cut is defined
// if m_RelEtConeCut <-100 then hypo is configured not to apply isolation
- if (m_RelEtConeCut < -100){
+ if (m_RelTopoEtConeCut < -100){
ATH_MSG_DEBUG(" not applying isolation. Returning NOW");
ATH_MSG_DEBUG("TAccept = " << pass);
return true;
}
// Then, It will pass if reletcone20 is less than cut:
- pass = (reletcone20 < m_RelEtConeCut);
+ pass = (reletcone20 < m_RelTopoEtConeCut);
//
// Reach this point successfully
ATH_MSG_DEBUG( "pass = " << pass );
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationToolMT.cxx b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationToolMT.cxx
index 3f8c1cff6733..5778161587d0 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationToolMT.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationToolMT.cxx
@@ -32,7 +32,6 @@ StatusCode TrigEgammaEmulationToolMT::initialize()
ATH_CHECK( m_hypoTools.retrieve() );
- ATH_CHECK( m_ringerTools.retrieve() );
ATH_CHECK( m_egammaPhotonCBTools.retrieve() );
ATH_CHECK( m_egammaElectronDNNTools.retrieve() );
ATH_CHECK( m_egammaElectronCBTools.retrieve() );
@@ -55,19 +54,27 @@ StatusCode TrigEgammaEmulationToolMT::initialize()
//**********************************************************************
asg::AcceptData TrigEgammaEmulationToolMT::emulate(const TrigCompositeUtils::Decision *roi,
- std::string trigger) const
+ std::string trigger, bool &valid) const
{
asg::AcceptData acceptData (&m_accept);
-
+ valid=false;
for ( auto& tool : m_hypoTools )
{
if( tool->chain() == trigger )
{
Trig::TrigData input(trigger);
if(!match(roi, input)) return acceptData;
- if(input.isValid())
- return tool->emulate(input);
- }
+
+ // Check of the match procedure has all objects inside
+ if(!input.isValid()){
+ ATH_MSG_WARNING("Its not possible to find all trigger features for this RoI. Skip emulation.");
+ return acceptData;
+ }
+
+ valid=true;
+ return tool->emulate(input);
+
+ }// Tool
}// Loop over all hypo tool chains
@@ -101,8 +108,9 @@ bool TrigEgammaEmulationToolMT::match( const TrigCompositeUtils::Decision *roi,
if(output.signature == "electron"){
for (auto& trigger : m_electronTrigList){
- if(boost::contains(trigger,"gsf")) continue;
- if(boost::contains(trigger,"lrt")) continue;
+ if(boost::contains(output.trigger,"gsf") && !boost::contains(trigger,"gsf")) continue;
+ if(boost::contains(output.trigger,"lrt") && !boost::contains(trigger,"lrt")) continue;
+
ATH_MSG_DEBUG("Matching with " << trigger );
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/TrigEgammaEmulationPrecisionPhotonHypoTool.h b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/TrigEgammaEmulationPrecisionPhotonHypoTool.h
index 482c6a7daf8f..a473df6cc793 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/TrigEgammaEmulationPrecisionPhotonHypoTool.h
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/TrigEgammaEmulationPrecisionPhotonHypoTool.h
@@ -41,7 +41,7 @@ namespace Trig{
Gaudi::Property< std::string > m_pidName { this, "PidName", "" };
Gaudi::Property< float > m_detacluster { this, "dETACLUSTERthr", 0. , "" };
Gaudi::Property< float > m_dphicluster { this, "dPHICLUSTERthr", 0. , "" };
- Gaudi::Property< float > m_RelEtConeCut { this, "RelEtConeCut", -999. , "Calo isolation cut" };
+ Gaudi::Property< float > m_RelTopoEtConeCut { this, "RelTopoEtConeCut", -999. , "Calo isolation cut" };
Gaudi::Property< std::vector<float> > m_etabin { this, "EtaBins", {} , "Bins of eta" };
Gaudi::Property< std::vector<float> > m_eTthr { this, "ETthr", {}, "ET Threshold" };
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/TrigEgammaEmulationToolMT.h b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/TrigEgammaEmulationToolMT.h
index 2f96f38c48bc..30f43ce218e8 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/TrigEgammaEmulationToolMT.h
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/TrigEgammaEmulationToolMT.h
@@ -51,6 +51,7 @@ class TrigData{
bool isPassed( const xAOD::Electron *el , float avgmu, std::string pidname ) const;
bool isPassed( const xAOD::TrigRingerRings *rings , float avgmu, std::string pidname ) const;
+
public:
@@ -104,7 +105,7 @@ class TrigEgammaEmulationToolMT: public asg::AsgTool
StatusCode initialize();
- asg::AcceptData emulate(const TrigCompositeUtils::Decision *dec, std::string trigger) const;
+ asg::AcceptData emulate(const TrigCompositeUtils::Decision *dec, std::string trigger, bool &valid) const;
bool match( const TrigCompositeUtils::Decision *dec , Trig::TrigData &, unsigned int condition=TrigDefs::includeFailedDecisions ) const;
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/python/TrigEgammaEmulationToolConfigMT.py b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/python/TrigEgammaEmulationToolConfigMT.py
index 3fbb332a86b6..1b026377fff1 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/python/TrigEgammaEmulationToolConfigMT.py
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/python/TrigEgammaEmulationToolConfigMT.py
@@ -5,7 +5,6 @@
from AthenaConfiguration.ComponentFactory import CompFactory
from TrigEgammaMonitoring.TrigEgammaMonitCategoryMT import single_electron_triggers, single_photon_triggers
-
#
# emulator config class
#
@@ -14,9 +13,10 @@ class TrigEgammaEmulationToolConfig:
#
# Constructor
#
- def __init__(self, name, triggerList, OutputLevel = 0,
- ElectronTriggerList=single_electron_triggers,
- PhotonTriggerList=single_photon_triggers):
+ def __init__(self, name, triggerList = [],
+ OutputLevel = 0,
+ ElectronTriggerList = single_electron_triggers,
+ PhotonTriggerList = single_photon_triggers):
self.name = name
self.__chains = []
@@ -25,13 +25,28 @@ class TrigEgammaEmulationToolConfig:
self.ElectronTriggerList = ElectronTriggerList
self.PhotonTriggerList = PhotonTriggerList
- # configure everything
- self.configure()
-
+ # force cofnig file path
+ self.ElectronCBConfigFilePath = None
+ self.ElectronDNNConfigFilePath = None
+ self.ElectronLHConfigFilePath = None
+ self.FastCaloConfigFilePath = None
+ self.PhotonCBConfigFilePath = None
+
+ self.__configured_triggers = []
- def __call__(self):
+
+ def core(self):
+ self.update()
return self.__emulator
+
+ def update(self):
+ for trigger in self.TriggerList:
+ if trigger not in self.__configured_triggers:
+ hypo = self.setupChain(trigger)
+ self.__emulator.HypoTools += [hypo]
+ self.__configured_triggers += trigger
+
#
# Configure emulator tool
#
@@ -44,21 +59,16 @@ class TrigEgammaEmulationToolConfig:
from TriggerMenuMT.HLTMenuConfig.Egamma.EgammaDefs import createTrigEgammaPrecisionPhotonSelectors
from TriggerMenuMT.HLTMenuConfig.Egamma.EgammaDefs import createTrigEgammaFastCaloSelectors
- # setup all chains
- for trigger in self.TriggerList:
- self.setupChain(trigger)
-
# create the emulator tool
self.__emulator = CompFactory.Trig.TrigEgammaEmulationToolMT( self.name,
- HypoTools = self.__chains,
ElectronTriggerList = self.ElectronTriggerList,
PhotonTriggerList = self.PhotonTriggerList )
- self.__emulator.RingerTools = createTrigEgammaFastCaloSelectors()
- self.__emulator.ElectronLHSelectorTools = createTrigEgammaPrecisionElectronLHSelectors()
- self.__emulator.ElectronCBSelectorTools = createTrigEgammaPrecisionElectronCBSelectors()
- self.__emulator.ElectronDNNSelectorTools = createTrigEgammaPrecisionElectronDNNSelectors()
- self.__emulator.PhotonCBSelectorTools = createTrigEgammaPrecisionPhotonSelectors()
+ self.__emulator.RingerTools = createTrigEgammaFastCaloSelectors(ConfigFilePath = self.FastCaloConfigFilePath)
+ self.__emulator.ElectronLHSelectorTools = createTrigEgammaPrecisionElectronLHSelectors(ConfigFilePath = self.ElectronLHConfigFilePath)
+ self.__emulator.ElectronCBSelectorTools = createTrigEgammaPrecisionElectronCBSelectors(ConfigFilePath = self.ElectronCBConfigFilePath)
+ self.__emulator.ElectronDNNSelectorTools = createTrigEgammaPrecisionElectronDNNSelectors(ConfigFilePath = self.ElectronDNNConfigFilePath)
+ self.__emulator.PhotonCBSelectorTools = createTrigEgammaPrecisionPhotonSelectors(ConfigFilePath = self.PhotonCBConfigFilePath)
#
@@ -69,13 +79,10 @@ class TrigEgammaEmulationToolConfig:
import cppyy
cppyy.load_library('libElectronPhotonSelectorToolsDict')
-
from TriggerMenuMT.HLTMenuConfig.Menu.DictFromChainName import dictFromChainName
d = dictFromChainName(trigger)
signature = d['signatures'][0]
- from pprint import pprint
- pprint(d)
from TrigEgammaHypo.TrigEgammaFastCaloHypoTool import TrigEgammaFastCaloHypoToolFromDict
from TrigEgammaHypo.TrigEgammaFastElectronHypoTool import TrigEgammaFastElectronHypoToolFromDict
@@ -110,7 +117,7 @@ class TrigEgammaEmulationToolConfig:
OutputLevel = self.OutputLevel
)
- self.__chains.append(chain)
+ return chain
@@ -179,10 +186,13 @@ def TrigEgammaEmulationToolTestConfig(inputFlags):
EgammaMatchTool.DeltaR=0.4
acc.addPublicTool(EgammaMatchTool)
- emulator = TrigEgammaEmulationToolConfig("EmulatorTool", triggerList)
- acc.addPublicTool(emulator())
+ emulator = TrigEgammaEmulationToolConfig("EmulatorTool")
+ emulator.configure()
+
+ emulator.TriggerList += triggerList
+ acc.addPublicTool(emulator.core())
test.MatchTool = EgammaMatchTool
- test.EmulatorTool = emulator()
+ test.EmulatorTool = emulator.core()
test.ElectronTriggerList = [
#"HLT_e5_etcut_L1EM3",
"HLT_e17_lhvloose_L1EM15VHI",
@@ -200,8 +210,6 @@ def TrigEgammaEmulationToolTestConfig(inputFlags):
monGroup.defineHistogram("emulations", type='TH1I', path='', title="Event Selection; Cut ; Count",
xbins=len(cutLabels), xmin=0, xmax=len(cutLabels), xlabels=cutLabels)
-
-
return helper.result()
@@ -224,7 +232,7 @@ if __name__=='__main__':
# Set the Athena configuration flags
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- path = '/afs/cern.ch/work/j/jodafons/public/valid_sampleA/valid1.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.AOD.e5112_s3214_d1664_r12711_tid25855898_00/AOD.25855898._000124.pool.root.1'
+ path = '/afs/cern.ch/work/j/jodafons/public/valid_sampleA/AOD_fixCalo.pool.root'
ConfigFlags.Input.Files = [path]
ConfigFlags.Input.isMC = True
ConfigFlags.Output.HISTFileName = 'TrigEgammaMonitorOutput.root'
@@ -240,7 +248,7 @@ if __name__=='__main__':
# If you want to turn on more detailed messages ...
cfg.printConfig(withDetails=False) # set True for exhaustive info
- cfg.run(20) #use cfg.run(20) to only run on first 20 events
+ cfg.run(-1) #use cfg.run(20) to only run on first 20 events
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/python/eventLoopHeartBeat.txt b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/python/eventLoopHeartBeat.txt
deleted file mode 100644
index 34a371e5a11b..000000000000
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/python/eventLoopHeartBeat.txt
+++ /dev/null
@@ -1 +0,0 @@
- done processing event #91575, run #311000 13 events read so far <<<===
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.cxx b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.cxx
index 0dc78ac30c79..6cc158fcb44c 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.cxx
@@ -96,7 +96,8 @@ StatusCode TrigEgammaEmulationToolTest::fillHistograms( const EventContext &ctx
}
auto accept = setAccept(dec, info);
- auto emu_accept = m_emulatorTool->emulate( dec, info.trigger );
+ bool valid=false;
+ auto emu_accept = m_emulatorTool->emulate( dec, info.trigger, valid );
ATH_MSG_DEBUG( "trigger : " << info.trigger << " (tdt/emu)");
ATH_MSG_DEBUG( "L1Calo : " << accept.getCutResult(0) << " / " << emu_accept.getCutResult(0));
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/CMakeLists.txt b/Trigger/TrigMonitoring/TrigEgammaMonitoring/CMakeLists.txt
index 1b44ed546414..4f0c75563e11 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/CMakeLists.txt
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/CMakeLists.txt
@@ -22,6 +22,8 @@ atlas_add_component( TrigEgammaMonitoring
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
+atlas_install_scripts( share/RunTrigEgammaMonitoring.py )
+
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/README.md b/Trigger/TrigMonitoring/TrigEgammaMonitoring/README.md
new file mode 100644
index 000000000000..879549f35545
--- /dev/null
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/README.md
@@ -0,0 +1,27 @@
+# TrigEgammaMonitoring:
+
+Egamma offline monitoring package.
+
+## How to Run standalone:
+
+Execute the egamma monitoring locally.
+
+### Run:
+```
+RunTrigEgammaMonitoring.py -i path/to/AOD.root --nov 1000
+```
+
+### Run with emulator (default):
+
+Default configuration can be found [here](https://gitlab.cern.ch/atlas/athena/-/blob/master/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/EgammaDefs.py#L22).
+
+```
+RunTrigEgammaMonitoring.py -i path/to/AOD.root --nov 1000 --emulate
+```
+
+### Run with emulator (custom):
+
+```
+RunTrigEgammaMonitoring.py -i path/to/AOD.root --nov 1000 --emulate --dnnConfigPath "ElectronPhotonSelectorTools/offline/mc16_20210430" --ringerConfigPath "RingerSelectorTools/TrigL2_20210702_r4"
+```
+
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitorAlgorithm.py b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitorAlgorithm.py
index 847dd8fd2e26..fdd0f1f700e7 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitorAlgorithm.py
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitorAlgorithm.py
@@ -15,16 +15,21 @@ log_trigeg = logging.getLogger( 'TrigEgammaMonitorAlgorithm' )
-def TrigEgammaMonConfig(inputFlags):
+def TrigEgammaMonConfig(inputFlags, emulator=None):
'''Function to configures some algorithms in the monitoring system.'''
# The following class will make a sequence, configure algorithms, and link
from AthenaMonitoring import AthMonitorCfgHelper
helper = AthMonitorCfgHelper(inputFlags,'TrigEgammaAthMonitorCfg')
+
+ if emulator: # add emulator as public
+ acc = helper.resobj
+ acc.addPublicTool(emulator.core())
+
# configure alg and ana tools
from TrigEgammaMonitoring.TrigEgammaMonitoringMTConfig import TrigEgammaMonAlgBuilder
- monAlgCfg = TrigEgammaMonAlgBuilder( helper, '2018', detailedHistograms=False ) # Using 2018 e/g tunings
+ monAlgCfg = TrigEgammaMonAlgBuilder( helper, '2018', detailedHistograms=False, emulator=emulator ) # Using 2018 e/g tunings
# build monitor and book histograms
monAlgCfg.configure()
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py
index 48b61d837b4b..5412d3095cd6 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py
@@ -19,9 +19,6 @@ if 'DQMonFlags' not in dir():
class TrigEgammaMonAlgBuilder:
-
- _configured = False
- _get_monitoring_mode_success = False
data_type = ''
pp_mode = False
@@ -41,19 +38,10 @@ class TrigEgammaMonAlgBuilder:
jpsiList = []
# Monitoring algorithms
- zeeMonAlg = None
+ zeeMonAlg = None
jpsieeMonAlg = None
- elMonAlg = None
- phMonAlg = None
-
-
- # Add a flag to enable emulation
- __acceptable_keys_list=['derivation','emulation','detailedHistograms','basePath','emulation']
- emulation = False
- derivation = False
- detailedHistograms = False
- basePath = 'HLT/EgammaMon'
-
+ elMonAlg = None
+ phMonAlg = None
isemnames = ["tight", "medium", "loose"]
lhnames = ["lhtight", "lhmedium", "lhloose","lhvloose"]
@@ -61,25 +49,28 @@ class TrigEgammaMonAlgBuilder:
- def __init__(self, helper, runflag, **kwargs):
+
+ def __init__(self, helper, runflag, emulator=None,
+ derivation=False,
+ detailedHistograms = False,
+ basePath = 'HLT/EgammaMon'):
from AthenaCommon.Logging import logging
self.__logger = logging.getLogger( 'TrigEgammaMonAlgBuilder' )
self.runFlag = runflag
self.helper = helper
- if not self._configured:
- for key,value in kwargs.items():
- if key in self.__acceptable_keys_list:
- setattr(self,key,value)
- self.configureMode()
+ self.derivation = derivation
+ self.emulator = emulator
+ self.basePath = basePath
+ self.detailedHistograms = detailedHistograms
+ self.configureMode()
def configureMode(self):
self.__logger.info("TrigEgammaMonToolBuilder.configureMode()")
- self._get_monitoring_mode_success = self.get_monitoring_mode()
- if self._get_monitoring_mode_success is False:
+ if not self.get_monitoring_mode():
self.__logger.warning("HLTMonTriggerList: Error getting monitoring mode, default monitoring lists will be used.")
else:
self.__logger.info("Configuring for %s", self.data_type)
@@ -87,15 +78,15 @@ class TrigEgammaMonAlgBuilder:
# Since we load the tools by name below
# Need to ensure the correct tools are configured
# for each monitoring mode
- if self.mc_mode is True or self.pp_mode is True:
- if(self.derivation is True or self.emulation is True):
+ if self.mc_mode or self.pp_mode:
+ if(self.derivation):
self.activate_zee = True
else:
self.activate_zee=True
self.activate_jpsiee=True
self.activate_electron=True
self.activate_photon=True
- elif self.HI_mode is True or self.pPb_mode is True or self.cosmic_mode is True:
+ elif self.HI_mode or self.pPb_mode or self.cosmic_mode:
self.activate_electron=True
self.activate_photon=True
else:
@@ -116,7 +107,6 @@ class TrigEgammaMonAlgBuilder:
def get_monitoring_mode(self):
- # Implementation of https://its.cern.ch/jira/browse/ATR-13200
self.__logger.info("TrigEgammaMonToolBuilder.get_monitoring_mode()")
self.data_type = dqflags.monManDataType()
if self.data_type == 'monteCarlo':
@@ -141,15 +131,15 @@ class TrigEgammaMonAlgBuilder:
self.__logger.info("TrigEgammaMonToolBuilder.setProperties()")
self.basePath = 'HLT/EgammaMon'
- if self.pp_mode is True:
+ if self.pp_mode:
self.setDefaultProperties()
- elif self.cosmic_mode is True:
+ elif self.cosmic_mode:
# This should be change in future
self.setDefaultProperties()
- elif self.HI_mode is True or self.pPb_mode is True:
+ elif self.HI_mode or self.pPb_mode:
# This should be change in future
self.setDefaultProperties()
- elif self.mc_mode is True:
+ elif self.mc_mode:
# This should be change in future
self.setDefaultProperties()
else:
@@ -167,17 +157,19 @@ class TrigEgammaMonAlgBuilder:
from TrigEgammaMonitoring.TrigEgammaMonitCategoryMT import monitoring_photon, monitoring_electron, monitoringTP_electron,validation_photon , validation_electron, validationTP_electron, validation_jpsi, validationTP_jpsiee, validation_Zee
- if self.pp_mode is True:
+ if self.pp_mode:
self.electronList = monitoring_electron
self.photonList = monitoring_photon
self.tpList = monitoringTP_electron
- elif self.mc_mode is True:
+ elif self.mc_mode:
self.electronList = validation_electron + validation_Zee
self.photonList = validation_photon
self.tpList = validationTP_electron
self.jpsiList = validation_jpsi
- self.jpsitagItems = validationTP_jpsiee
- self.tagItems = [] #monitoring_tags
+ self.jpsitagItems = validationTP_jpsiee
+ self.tagItems = [] #monitoring_tags
+
+
#
# Create all minitor algorithms
#
@@ -227,8 +219,11 @@ class TrigEgammaMonAlgBuilder:
acc.addPublicTool(MediumDNNElectronSelector)
acc.addPublicTool(TightDNNElectronSelector)
+ if self.runFlag == '2022':
+ raise RuntimeError( '2022 (Run 3) configuration not available yet' )
+
- if self.runFlag == '2018':
+ elif self.runFlag == '2018':
# cut based
LooseElectronSelector.ConfigFile = "ElectronPhotonSelectorTools/offline/mc15_20150712/ElectronIsEMLooseSelectorCutDefs.conf"
MediumElectronSelector.ConfigFile = "ElectronPhotonSelectorTools/offline/mc15_20150712/ElectronIsEMMediumSelectorCutDefs.conf"
@@ -272,14 +267,6 @@ class TrigEgammaMonAlgBuilder:
- if self.emulation:
- from TrigEgammaEmulationTool.TrigEgammaEmulationToolConfigMT import TrigEgammaEmulationToolConfig
- triggerList = self.tpList
- emulator = TrigEgammaEmulationToolConfig("EgammaEmulationTool", triggerList)
- acc.addPublicTool(emulator())
-
-
-
if self.activate_zee:
self.__logger.info( "Creating the Zee monitor algorithm...")
@@ -304,9 +291,13 @@ class TrigEgammaMonAlgBuilder:
self.zeeMonAlg.TagTriggerList=self.tagItems
self.zeeMonAlg.TriggerList=self.tpList
self.zeeMonAlg.DetailedHistograms=self.detailedHistograms
- if self.emulation:
+ if self.emulator:
self.zeeMonAlg.DoEmulation = True
- self.zeeMonAlg.EmulationTool = emulator()
+ self.emulator.TriggerList += self.tpList
+ self.zeeMonAlg.EmulationTool = self.emulator.core()
+ else:
+ self.zeeMonAlg.DoEmulation = False
+
if self.activate_jpsiee:
@@ -353,7 +344,12 @@ class TrigEgammaMonAlgBuilder:
self.elMonAlg.ForceEtThreshold=True
self.elMonAlg.TriggerList=self.electronList
self.elMonAlg.DetailedHistograms=self.detailedHistograms
- self.elMonAlg.DoEmulation = False
+ if self.emulator:
+ self.elMonAlg.DoEmulation = True
+ self.emulator.TriggerList += self.electronList
+ self.elMonAlg.EmulationTool = self.emulator.core()
+ else:
+ self.elMonAlg.DoEmulation = False
if self.activate_photon:
@@ -368,7 +364,12 @@ class TrigEgammaMonAlgBuilder:
self.phMonAlg.TriggerList=self.photonList
self.phMonAlg.DetailedHistograms=self.detailedHistograms
self.phMonAlg.ForcePidSelection=True
- self.phMonAlg.DoEmulation = False
+ if self.emulator:
+ self.phMonAlg.DoEmulation = True
+ self.emulator.TriggerList += self.photonList
+ self.phMonAlg.EmulationTool = self.emulator.core()
+ else:
+ self.phMonAlg.DoEmulation = False
@@ -466,7 +467,7 @@ class TrigEgammaMonAlgBuilder:
#
# Emulation
#
- if self.emulation:
+ if self.emulator:
self.bookEfficiencies( monAlg, trigger, "L1Calo" , doEmulation=True)
self.bookEfficiencies( monAlg, trigger, "FastCalo" , doEmulation=True)
self.bookEfficiencies( monAlg, trigger, "PrecisionCalo" , doEmulation=True)
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/share/RunEsdToAodStandalone.py b/Trigger/TrigMonitoring/TrigEgammaMonitoring/share/RunEsdToAodStandalone.py
deleted file mode 100644
index ea001e4d4c96..000000000000
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/share/RunEsdToAodStandalone.py
+++ /dev/null
@@ -1,74 +0,0 @@
-#######################
-# standalone options for running ESD->AOD with TrigEgammaMonitoring locally
-#
-# - configures most things by itself (tested on rel16/17 data ESD
-# -- this takes quite a while for the first time (patience)
-# - reads from esd.pool.root and writes to monitor.root
-# - state(110713): still produces a few warnings that might be configured away, but is functional (and fast)
-# - update(5th Mar 13): added performance monitoring
-#######################
-
-# set basic job properties
-from AthenaCommon.AthenaCommonFlags import jobproperties
-jobproperties.AthenaCommonFlags.FilesInput = ['esd.pool.root']
-jobproperties.AthenaCommonFlags.EvtMax=-1
-
-# setup performance monitoring
-from PerfMonComps.PerfMonFlags import jobproperties as pmon_properties
-pmon_properties.PerfMonFlags.doSemiDetailedMonitoring=True
-
-# get handle on rec
-from RecExConfig.RecFlags import rec
-rec.OutputLevel = INFO
-
-# disable physics output
-rec.doCBNT.set_Value_and_Lock(False)
-rec.doWriteESD.set_Value_and_Lock(False)
-rec.doWriteAOD.set_Value_and_Lock(False)
-rec.doWriteTAG.set_Value_and_Lock(False)
-
-# set up histogram output
-from GaudiSvc.GaudiSvcConf import THistSvc
-svcMgr += THistSvc()
-svcMgr.THistSvc.Output += ["GLOBAL DATAFILE='monitor.root' OPT='RECREATE'"]
-
-# load monitoring flags
-if not 'HLTMonFlags' in dir():
- from TrigHLTMonitoring.HLTMonFlags import HLTMonFlags
-if not 'DQMonFlags' in dir():
- from AthenaMonitoring.DQMonFlags import DQMonFlags
-
-# toggle slice monitoring on/off
-if DQMonFlags.monManEnvironment == 'tier0ESD':
- HLTMonFlags.doCalo = False
- HLTMonFlags.doGeneral = False
- HLTMonFlags.doBjet = False
- HLTMonFlags.doBphys = False
- HLTMonFlags.doMET = False
- HLTMonFlags.doJet = False
- HLTMonFlags.doEgamma = True
- HLTMonFlags.doMuon = False
- HLTMonFlags.doIDtrk = False
- HLTMonFlags.doTau = False
- HLTMonFlags.doMinBias = False
- HLTMonFlags.doDump = False
- HLTMonFlags.doOfflineTauTTP = False
-else :
- print 'HLTMonitoring_topOptions.py: environment is not tier0ESD'
- print 'HLTMonitoring_topOptions.py: switching all tools off...'
- HLTMonFlags.doGeneral = False
- HLTMonFlags.doMonTier0 = False
-
-# add monitoring tools
-include("TrigHLTMonitoring/addMonTools.py")
-ToolSvc.HLTEgammaNavSigTEMon.OutputLevel = INFO
-
-# configure TrigEgammaMonitoring ()
-from TrigEgammaMonitoring.TrigEgammaMonitoringConf import HLTEgammaNavSigTEMonTool as TrigEgammaMon
-TrigEgammaMon.doActiveChain = True
-TrigEgammaMon.doActiveTe = True
-TrigEgammaMon.doAllTe = False
-
-
-# add RecExCommon - main workhorse
-include("RecExCommon/RecExCommon_topOptions.py")
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/share/RunTrigEgammaMonitoring.py b/Trigger/TrigMonitoring/TrigEgammaMonitoring/share/RunTrigEgammaMonitoring.py
new file mode 100755
index 000000000000..f9dadc90abb0
--- /dev/null
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/share/RunTrigEgammaMonitoring.py
@@ -0,0 +1,134 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+#
+
+if __name__=='__main__':
+
+ import argparse
+ import sys,os
+
+
+ parser = argparse.ArgumentParser(description = '', add_help = False)
+ parser = argparse.ArgumentParser()
+
+ #
+ # File configuration
+ #
+
+ parser.add_argument('-i','--inputFiles', action='store', dest='inputFiles', required = False,
+ help = "Comma-separated list of input files (alias for --filesInput)")
+
+ parser.add_argument('-o','--outputFile', action='store', dest='outputFile', required = False,
+ default = 'TrigEgammaMonitorOutput.root',
+ help = "Histogram output.")
+
+ parser.add_argument('--nov','--numberOfEvents', action='store', dest='numberOfEvents', required = False,
+ type=int, default=-1,
+ help = "The number of events to run.")
+
+ #
+ # Selector calib paths
+ #
+
+ parser.add_argument('--pidConfigPath', action='store', required = False,
+ type=str, default='ElectronPhotonSelectorTools/trigger/rel22_20210611',
+ help = "Electron Likelihood and Photon CB config path to use in emulated precision step.")
+
+ parser.add_argument('--dnnConfigPath', action='store', required = False,
+ type=str, default='ElectronPhotonSelectorTools/offline/mc16_20210430',
+ help = "Electron DNN config path to use in emulated precision step.")
+
+ parser.add_argument('--ringerConfigPath', action='store', required = False,
+ type=str, default='RingerSelectorTools/TrigL2_20210702_r4',
+ help = "Electron ringer config path to use in emulated fast calo step.")
+
+
+
+ parser.add_argument('--preExec', help='Code to execute before locking configs', default=None)
+ parser.add_argument('--postExec', help='Code to execute after setup', default=None)
+ parser.add_argument('--emulate', help='emulate the HLT e/g sequence', action='store_true')
+ parser.add_argument('--debug', help='debug mode', action='store_true')
+
+
+ if len(sys.argv)==1:
+ parser.print_help()
+ sys.exit(1)
+
+ args = parser.parse_args()
+
+
+
+
+ # ATR-11839 to fix the egammaPid import
+ from PyUtils.Helpers import ROOT6Setup
+ ROOT6Setup()
+ # Setup the Run III behavior
+ from AthenaCommon.Configurable import Configurable
+ Configurable.configurableRun3Behavior = 1
+ # Setup logs
+ from AthenaCommon.Logging import log
+ from AthenaCommon.Constants import INFO
+ log.setLevel(INFO)
+
+
+ # Set the Athena configuration flags
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags
+
+ if args.inputFiles is not None:
+ ConfigFlags.Input.Files = args.inputFiles.split(',')
+ ConfigFlags.Input.isMC = True
+ ConfigFlags.Output.HISTFileName = args.outputFile
+
+
+ if args.preExec:
+ # bring things into scope
+ from AthenaMonitoring.DQConfigFlags import allSteeringFlagsOff
+ exec(args.preExec)
+
+ ConfigFlags.lock()
+
+
+ # Initialize configuration object, add accumulator, merge, and run.
+ from AthenaConfiguration.MainServicesConfig import MainServicesCfg
+ from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
+ cfg = MainServicesCfg(ConfigFlags)
+ cfg.merge(PoolReadCfg(ConfigFlags))
+
+ emulator=None
+ if args.emulate:
+ # create and configure emulator tool
+ from TrigEgammaEmulationTool.TrigEgammaEmulationToolConfigMT import TrigEgammaEmulationToolConfig
+ emulator = TrigEgammaEmulationToolConfig("EgammaEmulation")
+
+ # configure all selectors
+ emulator.PhotonCBConfigFilePath = args.pidConfigPath # Cut-based
+ emulator.ElectronLHConfigFilePath = args.pidConfigPath # LH
+ emulator.ElectronCBConfigFilePath = args.pidConfigPath # Cut-based
+ emulator.ElectronDNNConfigFilePath = args.dnnConfigPath # DNN
+ emulator.FastCaloConfigFilePath = args.ringerConfigPath # NN
+ emulator.configure()
+
+
+
+ # create the e/g monitoring tool and add into the component accumulator
+ from TrigEgammaMonitoring.TrigEgammaMonitorAlgorithm import TrigEgammaMonConfig
+ trigEgammaMonitorAcc = TrigEgammaMonConfig(ConfigFlags, emulator=emulator)
+ cfg.merge(trigEgammaMonitorAcc)
+
+
+ # any last things to do?
+ if args.postExec:
+ exec(args.postExec)
+
+ # If you want to turn on more detailed messages ...
+ if args.debug:
+ trigEgammaMonitorAcc.getEventAlgo('EgammaEmulation').OutputLevel = 2 # DEBUG
+
+
+
+ cfg.printConfig(withDetails=False) # set True for exhaustive info
+ sc = cfg.run(args.numberOfEvents) #use cfg
+
+ sys.exit(0 if sc.isSuccess() else 1)
+
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/share/TrigEgammaMonitorAlgorithm_jobOptions.py b/Trigger/TrigMonitoring/TrigEgammaMonitoring/share/TrigEgammaMonitorAlgorithm_jobOptions.py
deleted file mode 100644
index e4d0a480c005..000000000000
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/share/TrigEgammaMonitorAlgorithm_jobOptions.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-#
-
-'''@file TrigEgammaMonitorAlgorithm_jobOptions.py
-@author E. Bergeaas Kuutmann
-@date 2019-04-16
-@brief Example trigger python configuration for the Run III AthenaMonitoring package (old jobOptions), based on the example by C Burton and P Onyisi
-'''
-
-# The following class will make a sequence, configure algorithms, and link
-# them to GenericMonitoringTools
-from AthenaMonitoring import AthMonitorCfgHelperOld
-helper = AthMonitorCfgHelperOld(DQMonFlags, "TrigEgammaMonitor")
-
-### 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.
-from TrigEgammaMonitoring.TrigEgammaMonitoringConf import TrigEgammaMonitorAlgorithm
-trigEgammaMonAlg = helper.addAlgorithm(TrigEgammaMonitorAlgorithm,'TrigEgammaMonAlg')
-
-# Examples of setting a trigger, or of running with debug messages on
-#trigEgammaMonAlg.TriggerChain = 'HLT_mu26_ivarmedium'
-#trigEgammaMonAlg.OutputLevel = DEBUG
-
-myGroup = helper.addGroup( trigEgammaMonAlg,
- "TrigEgammaMonitor",
- "HLT/EgammaMon/Expert"
- )
-
-myGroup.defineHistogram("lumiPerBCID;lumiPerBCID", title="Luminosity;L/BCID;Events",
- path='lumi',xbins=10,xmin=0.0,xmax=10.0)
-myGroup.defineHistogram("lb;lb", title="Luminosity Block;lb;Events",
- path='lbpath',xbins=1000,xmin=-0.5,xmax=999.5)
-myGroup.defineHistogram("random;random", title="LB;x;Events",
- path='randompath',xbins=30,xmin=0,xmax=1)
-
-topSequence += helper.result()
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/share/testAthenaTrigAOD_TrigEgammaMonitoring.py b/Trigger/TrigMonitoring/TrigEgammaMonitoring/share/testAthenaTrigAOD_TrigEgammaMonitoring.py
deleted file mode 100644
index d11e1e71d0f5..000000000000
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/share/testAthenaTrigAOD_TrigEgammaMonitoring.py
+++ /dev/null
@@ -1,133 +0,0 @@
-import logging
-log = logging.getLogger( "testAthenaTrigAOD_TrigEgammaMonitoring.py")
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf
-from AthenaCommon.GlobalFlags import globalflags
-from AthenaCommon.AppMgr import (theApp, ServiceMgr as svcMgr,ToolSvc)
-from glob import glob
-
-if ('FILE' in dir()):
- #athenaCommonFlags.PoolAODInput.set_Value_and_Lock( runArgs.inputAODFile )
- acf.PoolAODInput=[FILE]
-elif ('inputDir' in dir()):
- inputFiles = glob(inputDir+'*')
- acf.PoolAODInput=inputFiles
-elif 'RTT' in dir():
- rttfile='root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/rtt/prod/rtt/'+RTT+'/x86_64-slc6-gcc49-opt/offline/TrigEgammaValidation/RDOtoAOD_MC_transform_Zee_25ns_pileup/AOD.Zee.25ns.pileup.pool.root'
- acf.PoolAODInput=[rttfile]
-if ('NOV' in dir()):
- log.info('Setting Max events to ' + str(NOV))
- acf.EvtMax=NOV
- acf.EvtMax.set_Value_and_Lock(NOV)
- theApp.EvtMax = NOV
-else:
- acf.EvtMax=-1
-
-#if not acf.EvtMax.is_locked():
-# acf.EvtMax=-1
-
-from RecExConfig.RecFlags import rec
-
-rec.doCBNT=False
-rec.readESD=False
-rec.doWriteESD=False
-rec.doWriteAOD=False
-rec.doAOD=False
-rec.doDPD=False
-rec.doWriteTAG=False
-rec.doInDet=False
-rec.readAOD=True
-
-
-from RecExConfig.AutoConfiguration import GetProjectName,GetRunNumber,ConfigureTriggerStream,ConfigureSimulationOrRealData,ConfigureBeamType
-
-from AthenaCommon.BeamFlags import jobproperties
-runNb=GetRunNumber()
-projectName=GetProjectName()
-ConfigureTriggerStream()
-ConfigureSimulationOrRealData()
-ConfigureBeamType()
-
-data_type=globalflags.InputFormat.get_Value()
-beam_type=jobproperties.Beam.beamType.get_Value()
-log.info("Run Number %s",runNb)
-log.info("Project name %s",projectName)
-log.info("File type %s",data_type)
-log.info("Beam type %s",beam_type)
-log.info("Trigger stream %s",rec.triggerStream())
-
-from AthenaMonitoring.DQMonFlags import DQMonFlags
-if globalflags.DataSource.get_Value() == 'geant4':
- DQMonFlags.monManDataType = 'monteCarlo'
-elif (rec.doHeavyIon() or rec.doHIP()):
- DQMonFlags.monManDataType = 'heavyioncollisions'
- DQMonFlags.doHIMon = True
-elif jobproperties.Beam.beamType() == 'cosmics':
- DQMonFlags.monManDataType = 'cosmics'
-elif jobproperties.Beam.beamType() == 'collisions':
- DQMonFlags.monManDataType = 'collisions'
-elif jobproperties.Beam.beamType() == 'singlebeam':
- DQMonFlags.monManDataType = 'collisions'
-else:
- log.warning("invalid jobproperties.Beam.beamType(): %s, using default (%s)",
- jobproperties.Beam.beamType(), DQMonFlags.monManDataType)
-DQMonFlags.monManEnvironment = 'tier0'
-DQMonFlags.monManStream=rec.triggerStream()
-if ('histogramFile' in dir()):
- DQMonFlags.histogramFile = histogramFile
- log.info('Setting output file to %s' %DQMonFlags.histogramFile)
-
-log.info('DQMonFlags %s',DQMonFlags)
-log.info('RecFlags %s', rec)
-
-if not 'HLTMonFlags' in dir():
- from TrigHLTMonitoring.HLTMonFlags import HLTMonFlags
-
-algseq = CfgMgr.AthSequencer("AthAlgSeq")
-import AthenaPoolCnvSvc.ReadAthenaPool
-
-svcMgr.EventSelector.InputCollections=acf.PoolAODInput()
-
-from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
-from AthenaCommon.AppMgr import ToolSvc
-ToolSvc += Trig__TrigDecisionTool( "TrigDecisionTool" )
-from TrigEDMConfig.TriggerEDM import EDMLibraries
-ToolSvc.TrigDecisionTool.Navigation.Dlls = [e for e in EDMLibraries if 'TPCnv' not in e]
-ToolSvc.TrigDecisionTool.Navigation.ReadonlyHolders=True
-
-
-from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager
-algseq += CfgMgr.AthenaMonManager( "HLTMonManager")
-HLTMonManager = algseq.HLTMonManager
-
-from TrigEgammaMonitoring.TrigEgammaMonitoringConfig import TrigEgammaMonitoringTool
-if ('derivation' in dir()):
- HLTMonManager.AthenaMonTools += TrigEgammaMonitoringTool(derivation=True)
-elif ('emulation' in dir()):
- HLTMonManager.AthenaMonTools += TrigEgammaMonitoringTool(emulation=True)
-else:
- HLTMonManager.AthenaMonTools += TrigEgammaMonitoringTool()
-
-from GaudiSvc.GaudiSvcConf import THistSvc
-svcMgr += THistSvc()
-svcMgr.THistSvc.Output += ["GLOBAL DATAFILE='" + DQMonFlags.histogramFile() + "' OPT='RECREATE'"]
-HLTMonManager.FileKey = "GLOBAL"
-
-if 'outputLevel' in dir():
- for tool in ToolSvc.getAllChildren():
- # Set DEBUG output level for ALL HLTEgamma* tools
- Tool_Name = tool.getName()
- if 'HLTEgamma' in Tool_Name or 'Isolation' in Tool_Name or 'Track' in Tool_Name:
- log.info('Setting tool %s.OutputLevel=%s'%(Tool_Name,str(outputLevel)))
- tool.OutputLevel = outputLevel
- tool_prop = tool.getDefaultProperties()
- for prop,value in tool_prop.iteritems():
- if prop == "TrigConfigTool":
- log.info("Set TrigConfigTool %s",tool.getName())
- tool.TrigConfigTool="TrigConf::xAODConfigTool"
-
-# main jobOption
-#include ("RecExCommon/RecExCommon_topOptions.py")
-#
-#if ('derivation' in dir()):
-
-MessageSvc.debugLimit = 20000000
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/share/testAthenaTrigAOD_xTrigDecision_TrigEgammaMonitoring.py b/Trigger/TrigMonitoring/TrigEgammaMonitoring/share/testAthenaTrigAOD_xTrigDecision_TrigEgammaMonitoring.py
deleted file mode 100644
index e0889e091d45..000000000000
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/share/testAthenaTrigAOD_xTrigDecision_TrigEgammaMonitoring.py
+++ /dev/null
@@ -1,52 +0,0 @@
-from AthenaCommon.AppMgr import theApp
-from AthenaCommon.AppMgr import ToolSvc
-## get a handle on the ServiceManager
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-
-#--------------------------------------------------------------
-# Load POOL support
-#--------------------------------------------------------------
-import AthenaPoolCnvSvc.ReadAthenaPool
-
-from glob import glob
-
-if ('FILE' in dir()):
- svcMgr.EventSelector.InputCollections=[FILE]
-if ('inputDir' in dir()):
- inputFiles = glob(inputDir+'*')
- svcMgr.EventSelector.FilesInput=inputFiles
-if ('NOV' in dir()):
- theApp.EvtMax=NOV
-
-cfgtool = CfgMgr.TrigConf__xAODConfigTool("xAODConfigTool")
-ToolSvc += cfgtool
-
-from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
-
-ToolSvc += Trig__TrigDecisionTool( "TrigDecisionTool" )
-
-from TrigEDMConfig.TriggerEDM import EDMLibraries
-ToolSvc.TrigDecisionTool.Navigation.Dlls = [e for e in EDMLibraries if 'TPCnv' not in e]
-
-from GaudiSvc.GaudiSvcConf import THistSvc
-svcMgr += THistSvc()
-## The string "histo" in the argument below is the 'FileKey'
-## used by Athena to access the output file internally
-svcMgr.THistSvc.Output += ["histo DATAFILE='histo.root' OPT='RECREATE'"]
-#svcMgr.THistSvc.PrintAll = True
-#svcMgr.THistSvc.OutputLevel = 1
-
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager
-topSequence += AthenaMonManager( "HLTMonManager")
-HLTMonManager = topSequence.HLTMonManager
-
-from TrigEgammaMonitoring.TrigEgammaMonitoringConfig import TrigEgammaMonitoringTool
-HLTMonManager.AthenaMonTools += TrigEgammaMonitoringTool()
-
-HLTMonManager.FileKey = "histo"
-
-#print HLTMonManager;
-
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorAnalysisAlgorithm.cxx b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorAnalysisAlgorithm.cxx
index bef11ddf291b..e6191b69fdb9 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorAnalysisAlgorithm.cxx
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorAnalysisAlgorithm.cxx
@@ -53,6 +53,7 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillEfficiencies( const std::vector< st
for( auto pairObj : pairObjs ){
+
if(pairObj.first->type()==xAOD::Type::Electron){
const xAOD::Electron* el = static_cast<const xAOD::Electron *> (pairObj.first);
float et = getEt(el)/Gaudi::Units::GeV;
@@ -71,6 +72,24 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillEfficiencies( const std::vector< st
} // Offline photon
+
+ // Good pair to be measure
+ if(m_doEmulation){ // Emulation
+ bool valid=false;
+ auto acceptData = m_emulatorTool->emulate( pairObj.second, info.trigName , valid);
+ // skip this probe since the emulation is not possible. Avoid diff denominators between emulation and efficiecy
+ if(!valid) {
+ ATH_MSG_WARNING("Emulation fail. Skip this probe...");
+ continue;
+ }
+ emu_accept_vec.push_back( acceptData );
+ if( pairObj.first->auxdecor<bool>("Isolated") ){
+ emu_accept_iso_vec.push_back(acceptData);
+ }
+ }
+
+
+
// Good pair to be measure
{ // Efficiency
pair_vec.push_back(pairObj);
@@ -82,15 +101,6 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillEfficiencies( const std::vector< st
}
}
-
- // Good pair to be measure
- if(m_doEmulation){ // Emulation
- auto acceptData = m_emulatorTool->emulate( pairObj.second, info.trigName );
- emu_accept_vec.push_back( acceptData );
- if( pairObj.first->auxdecor<bool>("Isolated") ){
- emu_accept_iso_vec.push_back(acceptData);
- }
- }
}
@@ -126,7 +136,6 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillEfficiencies( const std::vector< st
// Fill emulator efficiency plots
if ( m_doEmulation ){
- ATH_MSG_INFO("Fill emulation...");
dirname= "Emulation";
if (info.trigL1){
fillEfficiency( "L1Calo", "L1Calo" , info.trigPidDecorator, info, pair_vec , emu_accept_vec, dirname);
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorBaseAlgorithm.h b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorBaseAlgorithm.h
index 6e87750a460c..ded311cdda76 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorBaseAlgorithm.h
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorBaseAlgorithm.h
@@ -56,6 +56,7 @@ typedef struct _triginfo
} TrigInfo;
class TrigEgammaMonitorBaseAlgorithm : public AthMonitorAlgorithm {
+
public:
@@ -100,6 +101,7 @@ class TrigEgammaMonitorBaseAlgorithm : public AthMonitorAlgorithm {
/*! Do emulation */
Gaudi::Property<bool> m_doEmulation{this, "DoEmulation", false };
+
/*! TP Trigger Analysis */
Gaudi::Property<bool> m_tp{this, "TPTrigger", false };
/*! default probe pid for trigitems that don't have pid in their name */
--
GitLab
From 483280850e58b933aae8d3c07535b05de816f59a Mon Sep 17 00:00:00 2001
From: Rafal Bielski <rafal.bielski@cern.ch>
Date: Tue, 24 Aug 2021 13:21:45 +0200
Subject: [PATCH 259/272] Rec[Em|Jet|Energy]RoI + L1TopoTOB: Avoid unnecessary
narrowing casts between signed and unsigned integers
---
.../src/L1TopoLegacyOnlineMonitor.cxx | 2 +-
.../L1Topo/L1TopoRDO/L1TopoRDO/L1TopoTOB.h | 6 ++--
.../TrigT1/L1Topo/L1TopoRDO/src/Helpers.cxx | 4 +--
.../TrigT1/L1Topo/L1TopoRDO/src/L1TopoTOB.cxx | 6 ++--
.../L1TopoSimulation/src/L1TopoSimulation.cxx | 2 +-
.../TrigT1CaloTools/src/L1JetCMXTools.cxx | 12 +++----
.../TrigT1Interfaces/RecEmTauRoI.h | 2 +-
.../TrigT1Interfaces/RecEnergyRoI.h | 6 ++--
.../TrigT1Interfaces/RecJetRoI.h | 8 ++---
.../TrigT1Interfaces/src/RecEmTauRoI.cxx | 2 +-
.../TrigT1Interfaces/src/RecEnergyRoI.cxx | 6 ++--
.../TrigT1/TrigT1Interfaces/src/RecJetRoI.cxx | 36 +++++++++----------
.../TrigT1Monitoring/src/L1CaloL1TopoMon.cxx | 4 +--
13 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/Trigger/TrigT1/L1Topo/L1TopoOnlineMonitoring/src/L1TopoLegacyOnlineMonitor.cxx b/Trigger/TrigT1/L1Topo/L1TopoOnlineMonitoring/src/L1TopoLegacyOnlineMonitor.cxx
index dc76937598f8..6e53a45bdcda 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoOnlineMonitoring/src/L1TopoLegacyOnlineMonitor.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoOnlineMonitoring/src/L1TopoLegacyOnlineMonitor.cxx
@@ -374,7 +374,7 @@ StatusCode L1TopoLegacyOnlineMonitor::doCnvMon(xAOD::TrigComposite& errorFlags,
break;
}
case L1Topo::BlockTypes::L1TOPO_TOB: {
- block.daqTobs.emplace_back(static_cast<int32_t>(word)); // TODO: Fix L1TopoTOB ctor to take uint32_t word
+ block.daqTobs.emplace_back(word);
if (block.header.bcn_offset() == 0) {
daqTobsBC0.emplace_back(rdo->getSourceID(), block.daqTobs.back());
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoRDO/L1TopoRDO/L1TopoTOB.h b/Trigger/TrigT1/L1Topo/L1TopoRDO/L1TopoRDO/L1TopoTOB.h
index 4fffe3500469..a0db81aab919 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoRDO/L1TopoRDO/L1TopoTOB.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoRDO/L1TopoRDO/L1TopoTOB.h
@@ -17,11 +17,11 @@ namespace L1Topo {
class L1TopoTOB {
public:
//! Construct from contents and encode word
- L1TopoTOB(const int32_t ctp_signal, uint32_t overflow_bits, uint32_t trigger_bits, uint32_t error_bits);
+ L1TopoTOB(const uint32_t ctp_signal, uint32_t overflow_bits, uint32_t trigger_bits, uint32_t error_bits);
//! Construct from contents and encode word, without CRC error bits (they will be 0 by default)
- L1TopoTOB(const int32_t ctp_signal, uint32_t overflow_bits, uint32_t trigger_bits);
+ L1TopoTOB(const uint32_t ctp_signal, uint32_t overflow_bits, uint32_t trigger_bits);
//! Construct with word and decode contents
- L1TopoTOB(const int32_t word);
+ L1TopoTOB(const uint32_t word);
//! access method for ctp signal bits
uint32_t ctp_signal() const;
//! accessor method for overflow bits
diff --git a/Trigger/TrigT1/L1Topo/L1TopoRDO/src/Helpers.cxx b/Trigger/TrigT1/L1Topo/L1TopoRDO/src/Helpers.cxx
index e94bf69ab249..a9c871d4994e 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoRDO/src/Helpers.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoRDO/src/Helpers.cxx
@@ -41,7 +41,7 @@ std::ostream& operator<<(std::ostream& os, const L1TopoRDO& rdo) {
}
os << " Data words:\n";
std::vector<uint32_t> data = rdo.getDataWords();
- for(auto & word: data){
+ for(const uint32_t word: data){
os << " " << L1Topo::formatHex8(word) << " ";
switch (L1Topo::blockType(word)){
case L1Topo::BlockTypes::HEADER:
@@ -166,7 +166,7 @@ const std::string formatVecHex8(const std::vector<uint32_t>& vec)
for (L1TopoRDOCollection::const_iterator pRDO = col.begin(); pRDO != col.end(); ++pRDO){
const std::vector<uint32_t> data = (*pRDO)->getDataWords();
//std::cout << "L1Topo::getDecisionAndOverflowBits: number of data words " << data.size() << std::endl;
- for(auto & word: data){
+ for(const uint32_t word: data){
if (L1Topo::blockType(word) == L1Topo::BlockTypes::L1TOPO_TOB){
L1Topo::L1TopoTOB c(word);
const uint32_t triggerByte = c.trigger_bits();
diff --git a/Trigger/TrigT1/L1Topo/L1TopoRDO/src/L1TopoTOB.cxx b/Trigger/TrigT1/L1Topo/L1TopoRDO/src/L1TopoTOB.cxx
index 60ef49a33690..c3b4b8affe1e 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoRDO/src/L1TopoTOB.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoRDO/src/L1TopoTOB.cxx
@@ -11,15 +11,15 @@
namespace L1Topo {
- L1TopoTOB::L1TopoTOB(const int32_t ctp_signal, uint32_t overflow_bits, uint32_t trigger_bits, uint32_t error_bits)
+ L1TopoTOB::L1TopoTOB(const uint32_t ctp_signal, uint32_t overflow_bits, uint32_t trigger_bits, uint32_t error_bits)
: m_ctp_signal(ctp_signal), m_overflow_bits(overflow_bits), m_trigger_bits(trigger_bits),m_error_bits(error_bits),m_word(0){
this->encode();
}
- L1TopoTOB::L1TopoTOB(const int32_t ctp_signal, uint32_t overflow_bits, uint32_t trigger_bits)
+ L1TopoTOB::L1TopoTOB(const uint32_t ctp_signal, uint32_t overflow_bits, uint32_t trigger_bits)
: m_ctp_signal(ctp_signal), m_overflow_bits(overflow_bits), m_trigger_bits(trigger_bits),m_error_bits(0),m_word(0){
this->encode();
}
- L1TopoTOB::L1TopoTOB(const int32_t word)
+ L1TopoTOB::L1TopoTOB(const uint32_t word)
: m_word(word){
this->decode();
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/L1TopoSimulation.cxx b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/L1TopoSimulation.cxx
index 690caa83fa00..e02bb40a453f 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/L1TopoSimulation.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/L1TopoSimulation.cxx
@@ -290,7 +290,7 @@ L1TopoSimulation::retrieveHardwareDecision()
const std::vector<uint32_t> cDataWords = rdo->getDataWords();
// initialise header: set version 15, BCN -7, which is unlikely
L1Topo::Header header(0xf,0,0,0,0,1,0x7);
- for (auto word : cDataWords){
+ for (const uint32_t word : cDataWords){
switch (L1Topo::blockType(word)){
case L1Topo::BlockTypes::HEADER: {
header = L1Topo::Header(word);
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetCMXTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetCMXTools.cxx
index 5314ee8581a3..118b34eb9131 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetCMXTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetCMXTools.cxx
@@ -380,13 +380,13 @@ void L1JetCMXTools::getHits(const xAOD::CMXJetTob *tob, HitsVector &hit10,
energyLg[slice], energySm[slice]);
LVL1::RecJetRoI roi(tobRoi.roiWord(), &thresholds);
- int numThresholdsHalf = 5;
- int numBitsPerCounter = 3;
+ unsigned int numThresholdsHalf = 5;
+ unsigned int numBitsPerCounter = 3;
- for (int i = 0; i < numThresholdsHalf * 2; ++i) {
+ for (unsigned int i = 0; i < numThresholdsHalf * 2; ++i) {
if (roi.passedThreshold(i)) {
HitsVector &hit = i < numThresholdsHalf ? hit10 : hit11;
- int ibit = i < numThresholdsHalf ? i : i - numThresholdsHalf;
+ unsigned int ibit = i < numThresholdsHalf ? i : i - numThresholdsHalf;
hit[slice] |= (1 << (ibit * numBitsPerCounter));
}
}
@@ -394,10 +394,10 @@ void L1JetCMXTools::getHits(const xAOD::CMXJetTob *tob, HitsVector &hit10,
numThresholdsHalf = 8;
numBitsPerCounter = 2;
- for (int i = 0; i < numThresholdsHalf * 2; ++i) {
+ for (unsigned int i = 0; i < numThresholdsHalf * 2; ++i) {
if (roi.passedThreshold(10 + i)) {
HitsVector &hit = i < numThresholdsHalf ? hit20 : hit21;
- int ibit = i < numThresholdsHalf ? i : i - numThresholdsHalf;
+ unsigned int ibit = i < numThresholdsHalf ? i : i - numThresholdsHalf;
hit[slice] |= (1 << (ibit * numBitsPerCounter));
}
}
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecEmTauRoI.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecEmTauRoI.h
index 9c4ee171fc55..5f2d01e3dc38 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecEmTauRoI.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecEmTauRoI.h
@@ -95,7 +95,7 @@ namespace LVL1 {
/** returns TRUE if threshold number <em>threshold_number</em> has been
passed by this ROI. */
- bool passedThreshold( int threshold_number ) const;
+ bool passedThreshold( unsigned int threshold_number ) const;
/** returns the CoordinateRange. This is worked out from the RoIWord's hardware coords
(i.e. crate number, CPM number etc.) by the RoIDecoder class. */
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecEnergyRoI.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecEnergyRoI.h
index 62683e633ad5..d2e1e56fbdb4 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecEnergyRoI.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecEnergyRoI.h
@@ -74,15 +74,15 @@ namespace LVL1 {
/** returns TRUE if threshold number <em>threshold_number</em> has been passed
by this ROI. */
- bool passedEtMissThreshold( int thresholdNumber ) const;
+ bool passedEtMissThreshold( unsigned int thresholdNumber ) const;
/** returns TRUE if threshold number <em>threshold_number</em> has been passed
by this ROI. */
- bool passedSumEtThreshold( int thresholdNumber ) const;
+ bool passedSumEtThreshold( unsigned int thresholdNumber ) const;
/** returns TRUE if threshold number <em>threshold_number</em> has been passed
by this ROI. */
- bool passedMEtSigThreshold( int thresholdNumber ) const;
+ bool passedMEtSigThreshold( unsigned int thresholdNumber ) const;
/** returns a vector of thresholds passed. */
std::vector<unsigned int> etMissThresholdsPassed() const;
diff --git a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecJetRoI.h b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecJetRoI.h
index fd914ebd1c56..36b2b7f6a36c 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecJetRoI.h
+++ b/Trigger/TrigT1/TrigT1Interfaces/TrigT1Interfaces/RecJetRoI.h
@@ -88,10 +88,10 @@ namespace LVL1 {
virtual unsigned int etSmall() const;
/** returns TRUE if threshold number <em>threshold_number</em> has been passed by this ROI. */
- bool passedThreshold( int thresholdNumber ) const;
+ bool passedThreshold( unsigned int thresholdNumber ) const;
/** Same for forward jets. Deprecated in Run 2, will always return false. */
- bool passedFwdThreshold( int thresholdNumber ) const;
+ bool passedFwdThreshold( unsigned int thresholdNumber ) const;
/** @brief returns the CoordinateRange.
* This is worked out from the RoIWord's hardware coords
@@ -144,8 +144,8 @@ namespace LVL1 {
/** Information on trigger thresholds passed by RoI */
unsigned long int m_thresholdMask { 0 };
- std::map< int, unsigned int > m_triggerThresholdValue;
- std::map< int, unsigned int > m_windowSize;
+ std::map< unsigned int, unsigned int > m_triggerThresholdValue; //< {threshold number, threshold value}
+ std::map< unsigned int, unsigned int > m_windowSize; //< {threshold number, window size}
private:
// Constructor for Run 1 RoI format
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/RecEmTauRoI.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/RecEmTauRoI.cxx
index e404015f4eb8..097d63da9386 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/RecEmTauRoI.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/RecEmTauRoI.cxx
@@ -379,7 +379,7 @@ LVL1::RecEmTauRoI::roiType() const { return m_type; }
/** returns TRUE if threshold number <em>threshold_number</em> has been passed
* by this ROI. */
-bool LVL1::RecEmTauRoI::passedThreshold(int threshold_number) const
+bool LVL1::RecEmTauRoI::passedThreshold(unsigned int threshold_number) const
{
if (this->isValidThreshold(threshold_number)) {
return ((1 << threshold_number) & m_thresholdMask) != 0;
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/RecEnergyRoI.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/RecEnergyRoI.cxx
index fdcf1434a04c..d15aecb0f5fb 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/RecEnergyRoI.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/RecEnergyRoI.cxx
@@ -175,7 +175,7 @@ unsigned int LVL1::RecEnergyRoI::roiWord2() const
/** returns TRUE if threshold number <em>threshold_number</em> has been pass
ed by this ROI. */
-bool LVL1::RecEnergyRoI::passedEtMissThreshold(int thresholdNumber) const
+bool LVL1::RecEnergyRoI::passedEtMissThreshold(unsigned int thresholdNumber) const
{
if ( this->isValidEtMissThreshold( thresholdNumber ) ) {
@@ -187,7 +187,7 @@ bool LVL1::RecEnergyRoI::passedEtMissThreshold(int thresholdNumber) const
/** returns TRUE if threshold number <em>threshold_number</em> has been pass
ed by this ROI. */
-bool LVL1::RecEnergyRoI::passedSumEtThreshold(int thresholdNumber) const
+bool LVL1::RecEnergyRoI::passedSumEtThreshold(unsigned int thresholdNumber) const
{
if ( this->isValidSumEtThreshold( thresholdNumber ) ) {
@@ -199,7 +199,7 @@ bool LVL1::RecEnergyRoI::passedSumEtThreshold(int thresholdNumber) const
/** returns TRUE if threshold number <em>threshold_number</em> has been pass
ed by this ROI. */
-bool LVL1::RecEnergyRoI::passedMEtSigThreshold(int thresholdNumber) const
+bool LVL1::RecEnergyRoI::passedMEtSigThreshold(unsigned int thresholdNumber) const
{
if ( this->isValidSumEtThreshold( thresholdNumber ) ) {
diff --git a/Trigger/TrigT1/TrigT1Interfaces/src/RecJetRoI.cxx b/Trigger/TrigT1/TrigT1Interfaces/src/RecJetRoI.cxx
index 5895202753c1..05e7c1ea7297 100644
--- a/Trigger/TrigT1/TrigT1Interfaces/src/RecJetRoI.cxx
+++ b/Trigger/TrigT1/TrigT1Interfaces/src/RecJetRoI.cxx
@@ -102,15 +102,15 @@ void LVL1::RecJetRoI::constructRun1(const std::vector<TriggerThreshold *> *caloT
// easy
//
- std::map<int, TriggerThreshold *> thrMap;
+ std::map<unsigned int, TriggerThreshold *> thrMap;
for (std::vector<TriggerThreshold *>::const_iterator it =
caloThresholds->begin();
it != caloThresholds->end(); ++it)
{
if ((*it)->type() == jetTriggerType)
{
- int num = (*it)->thresholdNumber();
- thrMap.insert(std::map<int, TriggerThreshold *>::value_type(num, (*it)));
+ unsigned int num = static_cast<unsigned int>((*it)->thresholdNumber());
+ thrMap.insert(std::map<unsigned int, TriggerThreshold *>::value_type(num, (*it)));
}
}
@@ -131,7 +131,7 @@ void LVL1::RecJetRoI::constructRun1(const std::vector<TriggerThreshold *> *caloT
for (vector<unsigned int>::const_iterator itp = passed_thresholds.begin();
itp != passed_thresholds.end(); ++itp)
{
- std::map<int, TriggerThreshold *>::const_iterator thr =
+ std::map<unsigned int, TriggerThreshold *>::const_iterator thr =
thrMap.find(*itp - 1);
if (thr != thrMap.end())
{
@@ -140,10 +140,10 @@ void LVL1::RecJetRoI::constructRun1(const std::vector<TriggerThreshold *> *caloT
JetThresholdValue *jtv = dynamic_cast<JetThresholdValue *>(ttv);
if (jtv)
{
- m_triggerThresholdValue.insert(std::map<int, unsigned int>::value_type(
+ m_triggerThresholdValue.insert(std::map<unsigned int, unsigned int>::value_type(
*itp, jtv->thresholdValueCount()));
m_windowSize.insert(
- std::map<int, unsigned int>::value_type(*itp, jtv->window()));
+ std::map<unsigned int, unsigned int>::value_type(*itp, jtv->window()));
}
} // end "found threshold in map"
} // end loop through passed thresholds
@@ -185,11 +185,11 @@ LVL1::RecJetRoI::constructRun2(const std::vector<TriggerThreshold *> *caloThresh
unsigned int roiET =
(window == JetWindowSize::LARGE ? etLarge() : etSmall());
if (roiET > threshold) {
- int num = (*it)->thresholdNumber();
+ unsigned int num = static_cast<unsigned int>((*it)->thresholdNumber());
m_triggerThresholdValue.insert(
- std::map<int, unsigned int>::value_type(num, etCut));
+ std::map<unsigned int, unsigned int>::value_type(num, etCut));
m_windowSize.insert(
- std::map<int, unsigned int>::value_type(num, window));
+ std::map<unsigned int, unsigned int>::value_type(num, window));
m_thresholdMask |= (1 << num);
} // passes cuts
} // JetThresholdValue pointer valid
@@ -227,7 +227,7 @@ LVL1::RecJetRoI::constructRun3(const TrigConf::L1Menu * const l1menu)
if (eTPassed)
{
- int num = thr->mapping();
+ const unsigned int num = thr->mapping();
m_triggerThresholdValue[num] = etCut;
m_windowSize[num] = window;
m_thresholdMask |= (1 << num);
@@ -284,7 +284,7 @@ LVL1::RecJetRoI::etLarge() const {
return m_decoder->etLarge(m_roiWord);
} else {
float highest = 0;
- std::map<int, unsigned int>::const_iterator it =
+ std::map<unsigned int, unsigned int>::const_iterator it =
m_triggerThresholdValue.begin();
for (; it != m_triggerThresholdValue.end(); ++it)
if (it->second > highest)
@@ -301,7 +301,7 @@ LVL1::RecJetRoI::etSmall() const {
return m_decoder->etSmall(m_roiWord);
} else {
float highest = 0;
- std::map<int, unsigned int>::const_iterator it =
+ std::map<unsigned int, unsigned int>::const_iterator it =
m_triggerThresholdValue.begin();
for (; it != m_triggerThresholdValue.end(); ++it)
if (it->second > highest)
@@ -317,11 +317,11 @@ LVL1::RecJetRoI::thresholdPattern() const { return m_thresholdMask; }
/** returns TRUE if threshold number <em>threshold_number</em> has been pass
ed by this ROI. */
bool
-LVL1::RecJetRoI::passedThreshold(int thresholdNumber) const {
+LVL1::RecJetRoI::passedThreshold(unsigned int thresholdNumber) const {
bool value = false;
- std::map<int, unsigned int>::const_iterator it =
+ std::map<unsigned int, unsigned int>::const_iterator it =
m_triggerThresholdValue.find(thresholdNumber);
if (it != m_triggerThresholdValue.end())
value = true;
@@ -333,7 +333,7 @@ LVL1::RecJetRoI::passedThreshold(int thresholdNumber) const {
ed by this ROI.
Returns FALSE if used in Run 2, where forward jet is not defined */
bool
-LVL1::RecJetRoI::passedFwdThreshold(int thresholdNumber) const {
+LVL1::RecJetRoI::passedFwdThreshold(unsigned int thresholdNumber) const {
if ((m_version < 2) && this->isValidThreshold(thresholdNumber)) {
return (((1 << (thresholdNumber + 7)) & m_roiWord) > 0);
@@ -362,7 +362,7 @@ LVL1::RecJetRoI::thresholdsPassed() const {
}
for (unsigned int iTh = 0; iTh <= nThresh; ++iTh) {
- std::map<int, unsigned int>::const_iterator it =
+ std::map<unsigned int, unsigned int>::const_iterator it =
m_triggerThresholdValue.find(iTh);
if (it != m_triggerThresholdValue.end())
newVec.push_back(iTh);
@@ -377,7 +377,7 @@ LVL1::RecJetRoI::thresholdsPassed() const {
**/
unsigned int
LVL1::RecJetRoI::triggerThreshold(const unsigned int thresh) const {
- map<int, unsigned int>::const_iterator it =
+ map<unsigned int, unsigned int>::const_iterator it =
m_triggerThresholdValue.find(thresh);
if (it != m_triggerThresholdValue.end()) {
return it->second;
@@ -388,7 +388,7 @@ LVL1::RecJetRoI::triggerThreshold(const unsigned int thresh) const {
/** returns the value of the jet cluster for the threshold passed.*/
unsigned int
LVL1::RecJetRoI::windowSize(const unsigned int thresh) const {
- map<int, unsigned int>::const_iterator it = m_windowSize.find(thresh);
+ map<unsigned int, unsigned int>::const_iterator it = m_windowSize.find(thresh);
if (it != m_windowSize.end()) {
return it->second;
}
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloL1TopoMon.cxx b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloL1TopoMon.cxx
index a92f5fa6919a..abdc362dc8ae 100644
--- a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloL1TopoMon.cxx
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloL1TopoMon.cxx
@@ -601,7 +601,7 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
// set version 15, BCN -7, which is unlikely:
L1Topo::Header header(0xf, 0, 0, 0, 0, 1, 0x7);
int i_fpga=-1;
- for (auto word : cDataWords){
+ for (const uint32_t word : cDataWords){
switch (L1Topo::blockType(word)){
case L1Topo::BlockTypes::HEADER:
{
@@ -765,7 +765,7 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
m_h_l1topo_1d_Errors->Fill(NO_ROI);
topo_error|=(1<<NO_ROI);
}
- for (auto word : cDataWords) {
+ for (const uint32_t word : cDataWords) {
switch (L1Topo::blockType(word)) {
case L1Topo::BlockTypes::L1TOPO_TOB:
{
--
GitLab
From d2734e09ea2571b51a9249c26c5d24a6afbae78e Mon Sep 17 00:00:00 2001
From: Attila Krasznahorkay <attila.krasznahorkay@cern.ch>
Date: Tue, 24 Aug 2021 13:26:40 +0200
Subject: [PATCH 260/272] Externals Update, master branch (2021.08.23.)
---
Projects/AnalysisBase/externals.txt | 2 +-
Projects/AthAnalysis/externals.txt | 2 +-
Projects/AthDataQuality/externals.txt | 2 +-
Projects/AthGeneration/externals.txt | 2 +-
Projects/AthSimulation/externals.txt | 2 +-
Projects/Athena/externals.txt | 2 +-
Projects/DetCommon/externals.txt | 2 +-
Projects/VP1Light/externals.txt | 2 +-
Projects/WorkDir/CMakeLists.txt | 7 ++++++-
9 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/Projects/AnalysisBase/externals.txt b/Projects/AnalysisBase/externals.txt
index 1f8a97d67f84..3bbc654302a9 100644
--- a/Projects/AnalysisBase/externals.txt
+++ b/Projects/AnalysisBase/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AnalysisBaseExternalsVersion = 2.0.112
+AnalysisBaseExternalsVersion = 2.0.113
diff --git a/Projects/AthAnalysis/externals.txt b/Projects/AthAnalysis/externals.txt
index 8a43eee0b95a..cd75ced27bf1 100644
--- a/Projects/AthAnalysis/externals.txt
+++ b/Projects/AthAnalysis/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthAnalysisExternalsVersion = 2.0.112
+AthAnalysisExternalsVersion = 2.0.113
diff --git a/Projects/AthDataQuality/externals.txt b/Projects/AthDataQuality/externals.txt
index 3d3c176daea7..d5f38d45bd96 100644
--- a/Projects/AthDataQuality/externals.txt
+++ b/Projects/AthDataQuality/externals.txt
@@ -5,4 +5,4 @@
# an "origin/" prefix before it. For tags however this is explicitly
# forbidden.
-AtlasExternalsVersion = 2.0.112
+AtlasExternalsVersion = 2.0.113
diff --git a/Projects/AthGeneration/externals.txt b/Projects/AthGeneration/externals.txt
index 1ceacebc37f6..e0a97c899777 100644
--- a/Projects/AthGeneration/externals.txt
+++ b/Projects/AthGeneration/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthGenerationExternalsVersion = 2.0.112
+AthGenerationExternalsVersion = 2.0.113
diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt
index f75cbfabcfe2..d84ae4c9facb 100644
--- a/Projects/AthSimulation/externals.txt
+++ b/Projects/AthSimulation/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthSimulationExternalsVersion = 2.0.112
+AthSimulationExternalsVersion = 2.0.113
diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt
index 3665ea9d766a..0e3bc6800f6e 100644
--- a/Projects/Athena/externals.txt
+++ b/Projects/Athena/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthenaExternalsVersion = 2.0.112
+AthenaExternalsVersion = 2.0.113
diff --git a/Projects/DetCommon/externals.txt b/Projects/DetCommon/externals.txt
index 96f2cef3ae33..7721bd3851ad 100644
--- a/Projects/DetCommon/externals.txt
+++ b/Projects/DetCommon/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AtlasExternalsVersion = 2.0.112
+AtlasExternalsVersion = 2.0.113
diff --git a/Projects/VP1Light/externals.txt b/Projects/VP1Light/externals.txt
index 96ac43db7166..9e76d50a8ec8 100644
--- a/Projects/VP1Light/externals.txt
+++ b/Projects/VP1Light/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-VP1LightExternalsVersion = 2.0.112
+VP1LightExternalsVersion = 2.0.113
diff --git a/Projects/WorkDir/CMakeLists.txt b/Projects/WorkDir/CMakeLists.txt
index e5f84547fbec..181e4ee937cb 100644
--- a/Projects/WorkDir/CMakeLists.txt
+++ b/Projects/WorkDir/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
#
# Project file for building a selected set of packages against an
# installed ATLAS release/nightly.
@@ -85,6 +85,11 @@ atlas_ctest_setup()
set( CMAKE_EXPORT_COMPILE_COMMANDS TRUE CACHE BOOL
"Create compile_commands.json" FORCE )
+# Re-check all of the wildcarded expressions on every re-build in this
+# project.
+set( ATLAS_ALWAYS_CHECK_WILDCARDS TRUE CACHE BOOL
+ "(Re-)Check wildcards in file specifications on every build" )
+
# Set up a work directory project with the same version as our parent:
atlas_project( USE ${ATLAS_PROJECT} ${${ATLAS_PROJECT}_VERSION}
PROJECT_ROOT ${CMAKE_SOURCE_DIR}/../../ )
--
GitLab
From fad436b1ece22acaeae0111389ed4be1424117c2 Mon Sep 17 00:00:00 2001
From: Ewelina Maria Lobodzinska <ewelina.maria.lobodzinska@cern.ch>
Date: Tue, 24 Aug 2021 13:32:51 +0200
Subject: [PATCH 261/272] GeneratorFilters : update
XtoVVDecayFilterExtended.cxx to 21.6 version
---
.../src/XtoVVDecayFilterExtended.cxx | 54 ++++++++++++++++---
1 file changed, 47 insertions(+), 7 deletions(-)
diff --git a/Generators/GeneratorFilters/src/XtoVVDecayFilterExtended.cxx b/Generators/GeneratorFilters/src/XtoVVDecayFilterExtended.cxx
index 8c6e65c08a79..6317385b463a 100644
--- a/Generators/GeneratorFilters/src/XtoVVDecayFilterExtended.cxx
+++ b/Generators/GeneratorFilters/src/XtoVVDecayFilterExtended.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "GeneratorFilters/XtoVVDecayFilterExtended.h"
@@ -95,9 +95,19 @@ bool XtoVVDecayFilterExtended::RunHistory(HepMC::ConstGenParticlePtr pitr) {
return false;
}
int result = 999;
+
+ // Check if the first mother is ok
+ pitr = CheckGrandparent(pitr, result);
+ ATH_MSG_DEBUG("Pointer PDG ID: " << pitr->pdg_id());
+ if(std::abs(pitr->pdg_id()) != m_PDGGrandParent && std::abs(pitr->pdg_id()) != m_PDGParent) return false;
+ if (result == m_PDGGrandParent) return true;
+
auto pitr_current = pitr->production_vertex()->particles_in().at(0);
while ( result >= 0 ) {
pitr_current = CheckGrandparent(pitr_current, result);
+ ATH_MSG_DEBUG("Pointer PDG ID: " << pitr->pdg_id());
+ if(std::abs(pitr_current->pdg_id()) != m_PDGGrandParent && std::abs(pitr_current->pdg_id()) != m_PDGParent) return false;
+
if (result == m_PDGGrandParent) return true;
}
#else
@@ -109,9 +119,17 @@ bool XtoVVDecayFilterExtended::RunHistory(HepMC::ConstGenParticlePtr pitr) {
return false;
}
int result = 999;
+ // Check if the first mother is ok
+ pitr = CheckGrandparent(pitr, result);
+ ATH_MSG_DEBUG("Pointer PDG ID: " << pitr->pdg_id());
+ if(std::abs(pitr->pdg_id()) != m_PDGGrandParent && std::abs(pitr->pdg_id()) != m_PDGParent) return false;
+ if (result == m_PDGGrandParent) return true;
+
HepMC::ConstGenParticlePtr pitr_current = (*firstMother);
while ( result >= 0 ) {
pitr_current = CheckGrandparent(pitr_current, result);
+ ATH_MSG_DEBUG("Pointer PDG ID: " << pitr->pdg_id());
+ if(std::abs(pitr_current->pdg_id()) != m_PDGGrandParent && std::abs(pitr_current->pdg_id()) != m_PDGParent) return false;
if (result == m_PDGGrandParent) return true;
}
#endif
@@ -137,12 +155,23 @@ HepMC::ConstGenParticlePtr XtoVVDecayFilterExtended::CheckGrandparent(HepMC::Co
return NULL;
}
+ int n_mothers = 1;
+
for (auto thisMother: pitr->production_vertex()->particles_in()) {
- if ( thisMother->pdg_id() == m_PDGGrandParent ) { isGrandParentOK = true; }
+ ATH_MSG_DEBUG("Now on this mother: " << (thisMother)->pdg_id() << " " << n_mothers);
+ if ( (thisMother)->pdg_id() != m_PDGGrandParent && std::abs((thisMother)->pdg_id()) != m_PDGParent)
+ break;
+ if ( (thisMother)->pdg_id() == m_PDGGrandParent && n_mothers == 1) { isGrandParentOK = true; }
+ n_mothers++;
+ }
+
+ if (isGrandParentOK) {
+ result = m_PDGGrandParent;
+ }
+ else {
+ result = 0;
}
- if (isGrandParentOK) result = m_PDGGrandParent;
- else result = 0;
return pitr->production_vertex()->particles_in()[0];
#else
HepMC::GenVertex::particle_iterator firstMother = pitr->production_vertex()->particles_begin(HepMC::parents);
@@ -154,12 +183,23 @@ HepMC::ConstGenParticlePtr XtoVVDecayFilterExtended::CheckGrandparent(HepMC::Co
return NULL;
}
+ int n_mothers = 1;
+
for (; thisMother != endMother; ++thisMother) {
- if ( (*thisMother)->pdg_id() == m_PDGGrandParent ) { isGrandParentOK = true; }
+ ATH_MSG_DEBUG("Now on this mother: " << (*thisMother)->pdg_id() << " " << n_mothers);
+ if ( (*thisMother)->pdg_id() != m_PDGGrandParent && std::abs((*thisMother)->pdg_id()) != m_PDGParent)
+ break;
+ if ( (*thisMother)->pdg_id() == m_PDGGrandParent && n_mothers == 1) { isGrandParentOK = true; }
+ n_mothers++;
+
}
- if (isGrandParentOK) result = m_PDGGrandParent;
- else result = 0;
+ if (isGrandParentOK) {
+ result = m_PDGGrandParent;
+ }
+ else {
+ result = 0;
+ }
return (*firstMother);
#endif
}
--
GitLab
From 8b90ad2b19cca9b36788af6d611564d718e5ed3e Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Tue, 24 Aug 2021 13:39:55 +0200
Subject: [PATCH 262/272]
TrigT1CaloCalibTools+TrigT1CaloCalibUtils+TrigT1CaloCalibToolInterfaces:
Remove use of LArCablingLegacyService.
---
.../IL1CaloCells2TriggerTowers.h | 8 +-
.../IL1CaloLArTowerEnergy.h | 9 +-
.../IL1CaloOfflineTriggerTowerTools.h | 6 +-
.../L1CaloCells2TriggerTowers.h | 83 ++++++++++---------
.../L1CaloLArTowerEnergy.h | 34 ++++----
.../L1CaloMonitoringCaloTool.h | 7 +-
.../L1CaloOfflineTriggerTowerTools.h | 6 +-
.../src/L1CaloCells2TriggerTowers.cxx | 36 +++++---
.../src/L1CaloLArTowerEnergy.cxx | 33 +++++---
.../src/L1CaloMonitoringCaloTool.cxx | 8 +-
.../src/L1CaloOfflineTriggerTowerTools.cxx | 26 +-----
.../share/L1CaloRampMaker_topOptions.py | 3 +
.../share/LArL1CaloRampMaker.py | 3 +
.../share/LArL1Calo_DumpHVCorr.py | 3 +
.../share/TileL1CaloRampMaker.py | 3 +
15 files changed, 144 insertions(+), 124 deletions(-)
diff --git a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloCells2TriggerTowers.h b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloCells2TriggerTowers.h
index 0f1f6991f977..bf3032dfe084 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloCells2TriggerTowers.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloCells2TriggerTowers.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// ***************************************************************************
// * Author: John Morris (john.morris@cern.ch) *
@@ -10,8 +10,8 @@
// Pure abstract base class interface to L1CaloCells2TriggerTowers
//
-#ifndef _TRIGGER_TRIGT1_TRIGT1CALOCALIBTOOLINTERFACES_IL1CALOCELLS2TRIGGERTOWERS_H_
-#define _TRIGGER_TRIGT1_TRIGT1CALOCALIBTOOLINTERFACES_IL1CALOCELLS2TRIGGERTOWERS_H_
+#ifndef TRIGT1CALOCALIBTOOLINTERFACES_IL1CALOCELLS2TRIGGERTOWERS_H
+#define TRIGT1CALOCALIBTOOLINTERFACES_IL1CALOCELLS2TRIGGERTOWERS_H
// Framework include(s):
#include "AsgTools/IAsgTool.h"
@@ -25,6 +25,7 @@ class CaloCell;
class Identifier;
class LArDigit;
class TileDigits;
+class LArOnOffIdMapping;
namespace LVL1{
@@ -48,6 +49,7 @@ namespace LVL1{
virtual float energy(const Identifier& ttId) const = 0;
virtual float et(const Identifier& ttId) const = 0;
virtual void matchCell2Tower(const CaloCell* caloCell, Identifier& ttId1, Identifier& ttId2) const = 0;
+ virtual void matchCell2Tower(const LArOnOffIdMapping& cabling, const CaloCell* caloCell, Identifier& ttId1, Identifier& ttId2) const = 0;
// Return a vector digits belonging the to requested trigger tower
virtual std::vector<double> samples(const Identifier& ttId) const = 0;
virtual std::vector<const LArDigit*> larDigits(const Identifier& ttId) const = 0;
diff --git a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloLArTowerEnergy.h b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloLArTowerEnergy.h
index e9ace946d933..bf4c8fd9153e 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloLArTowerEnergy.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloLArTowerEnergy.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// ***************************************************************************
// * Author: John Morris (john.morris@cern.ch) *
@@ -10,8 +10,8 @@
// Pure abstract base class interface to L1CaloLArTowerEnergy
//
-#ifndef _TRIGGER_TRIGT1_TRIGT1CALOCALIBTOOLINTERFACES_IL1CALOLARTOWERENERGY_H_
-#define _TRIGGER_TRIGT1_TRIGT1CALOCALIBTOOLINTERFACES_IL1CALOLARTOWERENERGY_H_
+#ifndef TRIGT1CALOCALIBTOOLINTERFACES_IL1CALOLARTOWERENERGY_H
+#define TRIGT1CALOCALIBTOOLINTERFACES_IL1CALOLARTOWERENERGY_H
// Framework include(s):
@@ -21,6 +21,7 @@
class CaloCellContainer;
class Identifier;
+class LArOnOffIdMapping;
namespace LVL1{
@@ -33,6 +34,8 @@ namespace LVL1{
virtual bool initL1CaloLArTowerEnergy(const CaloCellContainer& cellContainer, const TriggerTowerCollection &triggerTowerCollection) = 0;
virtual float EtLArg(const Identifier& TTid) const = 0;
virtual bool hasMissingFEB(const Identifier& TTid) const = 0;
+ virtual bool hasMissingFEB(const LArOnOffIdMapping& cabling,
+ const Identifier& TTid) const = 0;
protected:
virtual void reset() = 0;
diff --git a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloOfflineTriggerTowerTools.h b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloOfflineTriggerTowerTools.h
index 9f4d5392054b..aedb5a96b969 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloOfflineTriggerTowerTools.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloOfflineTriggerTowerTools.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// ***************************************************************************
// * Author: John Morris (john.morris@cern.ch) *
@@ -97,8 +97,7 @@ namespace LVL1{
virtual float hadLArTowerEnergy(const TriggerTower* tt) const = 0;
virtual float tileCellEnergy(const TriggerTower* tt,IdTTL1CellMapType& map) const = 0;
- // Bad Calo, High Voltage Information
- virtual int emBadCalo(const TriggerTower* tt) const = 0;
+ // High Voltage Information
virtual float emCaloQuality(const TriggerTower* tt) const = 0;
virtual float emNCellsNonNominal(const TriggerTower* tt) const = 0;
virtual std::vector<float> emNCellsNonNominalByLayer(const TriggerTower* tt) const = 0;
@@ -108,7 +107,6 @@ namespace LVL1{
virtual std::vector<float> emNonNominalMeanScaleByReceiver(const TriggerTower* tt) const = 0;
virtual std::vector<std::vector<float> > emNonNominalMeanScaleByReceiverByLayer(const TriggerTower* tt) const = 0;
- virtual int hadBadCalo(const TriggerTower* tt,IdTTL1CellMapType& map) const = 0;
virtual float hadCaloQuality(const TriggerTower* tt) const = 0;
virtual float hadNCellsNonNominal(const TriggerTower* tt) const = 0;
virtual std::vector<float> hadNCellsNonNominalByLayer(const TriggerTower* tt) const = 0;
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloCells2TriggerTowers.h b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloCells2TriggerTowers.h
index 30793d03584d..3b4bb2ef4fcd 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloCells2TriggerTowers.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloCells2TriggerTowers.h
@@ -1,15 +1,14 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef _TRIGGER_TRIGT1_TRIGT1CALOCALIBTOOLS_L1CALOCELLS2TRIGGERTOWERS_H_
-#define _TRIGGER_TRIGT1_TRIGT1CALOCALIBTOOLS_L1CALOCELLS2TRIGGERTOWERS_H_
+#ifndef TRIGT1CALOCALIBTOOLS_L1CALOCELLS2TRIGGERTOWERS_H
+#define TRIGT1CALOCALIBTOOLS_L1CALOCELLS2TRIGGERTOWERS_H
// Athena Includes
#include "AsgTools/AsgTool.h"
#include "GaudiKernel/ToolHandle.h"
-#include "CxxUtils/checker_macros.h"
-#include "StoreGate/StoreGateSvc.h"
+#include "StoreGate/ReadCondHandleKey.h"
// Calo includes
#include "CaloIdentifier/CaloIdManager.h"
@@ -22,7 +21,7 @@
// LAr includes
#include "LArRawEvent/LArDigitContainer.h"
#include "LArRawEvent/LArDigit.h"
-#include "LArCabling/LArCablingLegacyService.h"
+#include "LArCabling/LArOnOffIdMapping.h"
// Tile includes
#include "TileEvent/TileDigitsContainer.h"
@@ -49,7 +48,7 @@
namespace LVL1 {
-class ATLAS_NOT_THREAD_SAFE // use of LArCablingBase
+class
L1CaloCells2TriggerTowers final : virtual public IL1CaloCells2TriggerTowers, public asg::AsgTool
{
/// Create a proper constructor for Athena
@@ -65,57 +64,58 @@ public:
L1CaloCells2TriggerTowers(L1CaloCells2TriggerTowers&& rhs) = delete;
L1CaloCells2TriggerTowers& operator=(const L1CaloCells2TriggerTowers& rhs) = delete;
- virtual StatusCode initialize();
- virtual StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
// To associate CaloCell to the trigger tower they belong to
// This method must be called before any other method in order
// to setup correctly the CaloCell-TT map
- bool initCaloCellsTriggerTowers(const CaloCellContainer& cellContainer);
- bool initLArDigitsTriggerTowers(const LArDigitContainer& larDigitContainer);
- bool initTileDigitsTriggerTowers(const TileDigitsContainer& tileDigitsContainer);
+ virtual bool initCaloCellsTriggerTowers(const CaloCellContainer& cellContainer) override;
+ virtual bool initLArDigitsTriggerTowers(const LArDigitContainer& larDigitContainer) override;
+ virtual bool initTileDigitsTriggerTowers(const TileDigitsContainer& tileDigitsContainer) override;
// John Morris <john.morris@cern.ch> 15/2/2011
// Moving most useful functions to the top of this file for clarity
- std::vector<const CaloCell*> caloCells(const Identifier& ttId) const;
- std::vector<std::vector<const CaloCell*> > caloCellsByLayer(const Identifier& ttId) const;
- virtual std::vector<int> layerNames(const Identifier& ttID) const;
- virtual int layerNames(const CaloCell* cell) const;
- virtual float energy(const std::vector<const CaloCell*> &cells) const;
- virtual float et(const std::vector<const CaloCell*> &cells) const;
- virtual float energy(const Identifier& ttId) const;
- virtual float et(const Identifier& ttId) const;
-
- void matchCell2Tower(const CaloCell* caloCell, Identifier& ttId1, Identifier& ttId2) const;
+ virtual std::vector<const CaloCell*> caloCells(const Identifier& ttId) const override;
+ virtual std::vector<std::vector<const CaloCell*> > caloCellsByLayer(const Identifier& ttId) const override;
+ virtual std::vector<int> layerNames(const Identifier& ttID) const override;
+ virtual int layerNames(const CaloCell* cell) const override;
+ virtual float energy(const std::vector<const CaloCell*> &cells) const override;
+ virtual float et(const std::vector<const CaloCell*> &cells) const override;
+ virtual float energy(const Identifier& ttId) const override;
+ virtual float et(const Identifier& ttId) const override;
+
+ virtual void matchCell2Tower(const CaloCell* caloCell, Identifier& ttId1, Identifier& ttId2) const override;
+ virtual void matchCell2Tower(const LArOnOffIdMapping& cabling, const CaloCell* caloCell, Identifier& ttId1, Identifier& ttId2) const override;
// Return a vector digits belonging the to requested trigger tower
- std::vector<double> samples(const Identifier& ttId) const;
- std::vector<const LArDigit*> larDigits(const Identifier& ttId) const;
- std::vector<const TileDigits*> tileDigits(const Identifier& ttId) const;
+ virtual std::vector<double> samples(const Identifier& ttId) const override;
+ virtual std::vector<const LArDigit*> larDigits(const Identifier& ttId) const override;
+ virtual std::vector<const TileDigits*> tileDigits(const Identifier& ttId) const override;
- void dumpCaloCells() const;
- void dumpCaloCells(const Identifier& ttId) const;
+ virtual void dumpCaloCells() const override;
+ virtual void dumpCaloCells(const Identifier& ttId) const override;
- void dumpDigits(const Identifier& ttId) const;
+ virtual void dumpDigits(const Identifier& ttId) const override;
- void dumpLArDigits(const Identifier& ttId) const; /* ttId must be a LAr TTId */
- void dumpLArDigits() const;
+ virtual void dumpLArDigits(const Identifier& ttId) const override; /* ttId must be a LAr TTId */
+ virtual void dumpLArDigits() const override;
- void dumpTileDigits(const Identifier& ttId) const; /* ttId must be a Tile TTId */
- void dumpTileDigits() const;
+ virtual void dumpTileDigits(const Identifier& ttId) const override; /* ttId must be a Tile TTId */
+ virtual void dumpTileDigits() const override;
protected:
- float calcEnergyOrEt(const std::vector<const CaloCell*> &cells, const unsigned int mode) const;
+ virtual float calcEnergyOrEt(const std::vector<const CaloCell*> &cells, const unsigned int mode) const override;
- void reset();
- void resetCaloCells();
- void resetLArDigits();
- void resetTileDigits();
+ virtual void reset() override;
+ virtual void resetCaloCells() override;
+ virtual void resetLArDigits() override;
+ virtual void resetTileDigits() override;
- void dump(const std::vector<const CaloCell*>& vCells) const;
- void dump(const std::vector<const LArDigit*>& vCells) const;
- void dump(const std::vector<const TileDigits*>& vCells) const;
+ virtual void dump(const std::vector<const CaloCell*>& vCells) const override;
+ virtual void dump(const std::vector<const LArDigit*>& vCells) const override;
+ virtual void dump(const std::vector<const TileDigits*>& vCells) const override;
private:
@@ -128,7 +128,8 @@ private:
const CaloCell_ID* m_caloCellHelper;
// Services
- LArCablingLegacyService* m_larCablingSvc;
+ SG::ReadCondHandleKey<LArOnOffIdMapping> m_cablingKey
+ {this,"CablingKey","LArOnOffIdMap","SG Key of LArOnOffIdMapping object"};
const TileCablingService * m_tileCablingService;
CaloTriggerTowerService* m_ttSvc;
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloLArTowerEnergy.h b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloLArTowerEnergy.h
index e27c105778b1..6d6442c73174 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloLArTowerEnergy.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloLArTowerEnergy.h
@@ -1,15 +1,14 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef _TRIGGER_TRIGT1_TRIGT1CALOCALIBTOOLS_L1CALOLARTOWERENERGY_H_
-#define _TRIGGER_TRIGT1_TRIGT1CALOCALIBTOOLS_L1CALOLARTOWERENERGY_H_
+#ifndef TRIGT1CALOCALIBTOOLS_L1CALOLARTOWERENERGY_H
+#define TRIGT1CALOCALIBTOOLS_L1CALOLARTOWERENERGY_H
// Athena includes
#include "AsgTools/AsgTool.h"
#include "GaudiKernel/ToolHandle.h"
-#include "CxxUtils/checker_macros.h"
-#include "StoreGate/StoreGateSvc.h"
+#include "StoreGate/ReadCondHandleKey.h"
#include "Identifier/Identifier.h"
#include "TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h"
@@ -19,13 +18,13 @@
#include "TrigT1CaloCondSvc/L1CaloCondSvc.h"
#include "CaloIdentifier/CaloIdManager.h"
#include "LArRecConditions/ILArBadFebMasker.h"
-#include "LArCabling/LArCablingLegacyService.h"
+#include "LArCabling/LArOnOffIdMapping.h"
#include "LArIdentifier/LArOnlineID.h"
// PABC interface include
#include "TrigT1CaloCalibToolInterfaces/IL1CaloLArTowerEnergy.h"
-// STL inlcudes
+// STL includes
#include <vector>
#include <map>
#include <string>
@@ -41,7 +40,7 @@
namespace LVL1 {
-class ATLAS_NOT_THREAD_SAFE // use of LArCablingBase
+class
L1CaloLArTowerEnergy : virtual public IL1CaloLArTowerEnergy, public asg::AsgTool
{
/// Create a proper constructor for Athena
@@ -52,16 +51,18 @@ public:
L1CaloLArTowerEnergy( const std::string& name );
virtual ~L1CaloLArTowerEnergy() {};
- virtual StatusCode initialize();
- virtual StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
- bool initL1CaloLArTowerEnergy(const CaloCellContainer& cellContainer, const TriggerTowerCollection &triggerTowerCollection);
- float EtLArg(const Identifier& TTid) const;
- bool hasMissingFEB(const Identifier& TTid) const;
+ virtual bool initL1CaloLArTowerEnergy(const CaloCellContainer& cellContainer, const TriggerTowerCollection &triggerTowerCollection) override;
+ virtual float EtLArg(const Identifier& TTid) const override;
+ virtual bool hasMissingFEB(const Identifier& TTid) const override;
+ virtual bool hasMissingFEB(const LArOnOffIdMapping& cabling,
+ const Identifier& TTid) const override;
protected:
- void reset();
- double IDeta(const Identifier& TTid) const;
+ virtual void reset() override;
+ virtual double IDeta(const Identifier& TTid) const override;
private:
@@ -79,9 +80,10 @@ private:
ToolHandle<LVL1::IL1CaloCells2TriggerTowers> m_cells2tt;
ToolHandle< ILArBadFebMasker > m_badFebMasker; // Handle to badChannelTool
- ToolHandle<LArCablingLegacyService> m_larCablingSvc; // Handle to LarCablingService
ToolHandle<LVL1::IL1TriggerTowerTool> m_ttTool; // Handle to L1TriggerTowerTool
+ SG::ReadCondHandleKey<LArOnOffIdMapping> m_cablingKey
+ {this,"CablingKey","LArOnOffIdMap","SG Key of LArOnOffIdMapping object"};
typedef std::map<Identifier, double> mapTT;
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloMonitoringCaloTool.h b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloMonitoringCaloTool.h
index 6bffe6f1b886..30dc024acfc7 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloMonitoringCaloTool.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloMonitoringCaloTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
@@ -19,8 +19,10 @@
#include "AsgTools/AsgTool.h"
#include "GaudiKernel/ToolHandle.h"
+#include "StoreGate/ReadCondHandleKey.h"
#include "TrigT1CaloCalibToolInterfaces/IL1CaloMonitoringCaloTool.h"
+#include "LArCabling/LArOnOffIdMapping.h"
class IInterface;
class StatusCode;
@@ -61,6 +63,9 @@ namespace LVL1 {
int region(const int index) const;
int etaBin(const int index) const;
+ SG::ReadCondHandleKey<LArOnOffIdMapping> m_cablingKey
+ {this,"CablingKey","LArOnOffIdMap","SG Key of LArOnOffIdMapping object"};
+
ToolHandle<LVL1::IL1CaloCells2TriggerTowers> m_cells2tt;
const CaloLVL1_ID* m_lvl1Helper;
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloOfflineTriggerTowerTools.h b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloOfflineTriggerTowerTools.h
index d2d367683be3..d4e7de8d5831 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloOfflineTriggerTowerTools.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloOfflineTriggerTowerTools.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// ***************************************************************************
// * Author: John Morris (john.morris@cern.ch) *
@@ -141,8 +141,7 @@ public:
virtual float tileCellEnergy(const TriggerTower* tt, IdTTL1CellMapType& map) const override;
- // Bad Calo, High Voltage Information
- virtual int emBadCalo(const TriggerTower* tt) const override;
+ // High Voltage Information
virtual float emCaloQuality(const TriggerTower* tt) const override;
virtual float emNCellsNonNominal(const TriggerTower* tt) const override;
virtual std::vector<float> emNCellsNonNominalByLayer(const TriggerTower* tt) const override;
@@ -152,7 +151,6 @@ public:
virtual std::vector<float> emNonNominalMeanScaleByReceiver(const TriggerTower* tt) const override;
virtual std::vector<std::vector<float> > emNonNominalMeanScaleByReceiverByLayer(const TriggerTower* tt) const override;
- virtual int hadBadCalo(const TriggerTower* tt, IdTTL1CellMapType& map) const override;
virtual float hadCaloQuality(const TriggerTower* tt) const override;
virtual float hadNCellsNonNominal(const TriggerTower* tt) const override;
virtual std::vector<float> hadNCellsNonNominalByLayer(const TriggerTower* tt) const override;
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloCells2TriggerTowers.cxx b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloCells2TriggerTowers.cxx
index fecd199e946f..9ca8e5f0dab3 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloCells2TriggerTowers.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloCells2TriggerTowers.cxx
@@ -1,8 +1,9 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "TrigT1CaloCalibTools/L1CaloCells2TriggerTowers.h"
+#include "StoreGate/ReadCondHandle.h"
namespace LVL1{
L1CaloCells2TriggerTowers::L1CaloCells2TriggerTowers(const std::string& name) :
@@ -11,7 +12,6 @@ namespace LVL1{
m_lvl1Helper(nullptr),
m_tileID(nullptr),
m_caloCellHelper(nullptr),
- m_larCablingSvc(nullptr),
m_tileCablingService(nullptr),
m_ttSvc(nullptr),
m_bInitialized(false),
@@ -174,14 +174,13 @@ namespace LVL1{
sc = toolSvc->retrieveTool("CaloTriggerTowerService",m_ttSvc);
if(sc.isFailure()){ATH_MSG_ERROR("Could not retrieve CaloTriggerTowerService Tool");return sc;}
- sc = toolSvc->retrieveTool("LArCablingLegacyService", m_larCablingSvc);
- if(sc.isFailure()){ATH_MSG_ERROR("Could not retrieve LArCablingService");return sc;}
-
}
else{ATH_MSG_ERROR("Could not retrieve ToolSvc");return sc;}
m_tileCablingService = TileCablingService::getInstance();
+ ATH_CHECK( m_cablingKey.initialize() );
+
return sc;
}
@@ -191,6 +190,8 @@ namespace LVL1{
bool L1CaloCells2TriggerTowers::initCaloCellsTriggerTowers(const CaloCellContainer& cellContainer) {
+ SG::ReadCondHandle<LArOnOffIdMapping> cabling (m_cablingKey);
+
this->resetCaloCells();
std::vector<Identifier>::const_iterator it_towerId = m_lvl1Helper->tower_begin();
@@ -209,7 +210,7 @@ namespace LVL1{
Identifier ttId1;
Identifier ttId2;
- this->matchCell2Tower(caloCell, ttId1, ttId2);
+ this->matchCell2Tower(**cabling, caloCell, ttId1, ttId2);
if (ttId1 != invalidId) {
m_mTTCaloCells[ttId1.get_identifier32().get_compact()].push_back(caloCell);
@@ -224,8 +225,14 @@ namespace LVL1{
return m_bInitialized;
}
- void L1CaloCells2TriggerTowers::matchCell2Tower(const CaloCell* caloCell, Identifier& ttId1, Identifier& ttId2) const {
-
+ void L1CaloCells2TriggerTowers::matchCell2Tower(const CaloCell* caloCell, Identifier& ttId1, Identifier& ttId2) const
+ {
+ SG::ReadCondHandle<LArOnOffIdMapping> cabling (m_cablingKey);
+ matchCell2Tower (**cabling, caloCell, ttId1, ttId2);
+ }
+ void L1CaloCells2TriggerTowers::matchCell2Tower(const LArOnOffIdMapping& cabling,
+ const CaloCell* caloCell, Identifier& ttId1, Identifier& ttId2) const
+ {
const Identifier invalidId(0);
ttId1 = invalidId;
ttId2 = invalidId;
@@ -284,8 +291,8 @@ namespace LVL1{
if(lvl1) {
// check if the channel is connected
- HWIdentifier channelID = m_larCablingSvc->createSignalChannelID(cellId);
- if(m_larCablingSvc->isOnlineConnected(channelID)) {
+ HWIdentifier channelID = cabling.createSignalChannelID(cellId);
+ if(cabling.isOnlineConnected(channelID)) {
// As we don't want the layer information embedded in the identifier, we recreate a tower Id
ttId1 = m_lvl1Helper->tower_id( m_lvl1Helper->pos_neg_z(layerId), m_lvl1Helper->sampling(layerId), m_lvl1Helper->region(layerId), m_lvl1Helper->eta(layerId), m_lvl1Helper->phi(layerId));
@@ -299,6 +306,8 @@ namespace LVL1{
this->resetLArDigits();
+ SG::ReadCondHandle<LArOnOffIdMapping> cabling (m_cablingKey);
+
std::vector<Identifier>::const_iterator it_towerId = m_lvl1Helper->tower_begin();
std::vector<Identifier>::const_iterator it_towerEnd = m_lvl1Helper->tower_end();
@@ -313,9 +322,9 @@ namespace LVL1{
const LArDigit * larDigit= *itLArDigit;
const HWIdentifier larDigitChannelID = larDigit->channelID();
- if(m_larCablingSvc->isOnlineConnected(larDigitChannelID)) {
+ if(cabling->isOnlineConnected(larDigitChannelID)) {
// convert HWID to ID
- Identifier larDigitID = m_larCablingSvc->cnvToIdentifier(larDigitChannelID);
+ Identifier larDigitID = cabling->cnvToIdentifier(larDigitChannelID);
//whichTTID ttId returns a layer_id, not a tower_id !
const Identifier layerId(m_ttSvc->whichTTID(larDigitID));
@@ -603,6 +612,7 @@ namespace LVL1{
void L1CaloCells2TriggerTowers::dump(const std::vector<const LArDigit*>& vLArDigits) const {
+ SG::ReadCondHandle<LArOnOffIdMapping> cabling (m_cablingKey);
ATH_MSG_INFO( "ncells: "<< vLArDigits.size() );
std::vector<const LArDigit*>::const_iterator itLArDigits = vLArDigits.begin();
@@ -610,7 +620,7 @@ namespace LVL1{
const LArDigit* larDigit= *itLArDigits;
HWIdentifier hwId = larDigit->channelID();
- Identifier larDigitID = m_larCablingSvc->cnvToIdentifier(hwId);
+ Identifier larDigitID = cabling->cnvToIdentifier(hwId);
ATH_MSG_INFO( "pos_neg: " << m_caloCellHelper->pos_neg(larDigitID)<<", sampling: "<< m_caloCellHelper->sampling(larDigitID)<<", region: "<< m_caloCellHelper->region(larDigitID)<<", eta: "<< m_caloCellHelper->eta(larDigitID)<<", phi: "<< m_caloCellHelper->phi(larDigitID) );
std::vector<short> vADC= larDigit->samples();
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloLArTowerEnergy.cxx b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloLArTowerEnergy.cxx
index 3ff8294621b8..bd69cdb497b9 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloLArTowerEnergy.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloLArTowerEnergy.cxx
@@ -1,9 +1,10 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "TrigT1CaloCalibTools/L1CaloLArTowerEnergy.h"
#include "LArRecConditions/LArBadChannelCont.h"
+#include "StoreGate/ReadCondHandle.h"
namespace LVL1{
@@ -16,7 +17,6 @@ namespace LVL1{
m_ttService(nullptr),
m_cells2tt("LVL1::L1CaloCells2TriggerTowers/L1CaloCells2TriggerTowers"),
m_badFebMasker("LArBadFebMasker"),
- m_larCablingSvc("LArCablingLegacyService"),
m_ttTool("LVL1::L1TriggerTowerTool/LVL1::L1TriggerTowerTool")
{
}
@@ -48,9 +48,6 @@ namespace LVL1{
ATH_CHECK(m_badFebMasker.retrieve());
- ATH_CHECK(m_larCablingSvc.retrieve());
-
-
//Retrieve cabling & tt services
ISvcLocator* svcLoc = Gaudi::svcLocator( );
IToolSvc* toolSvc;
@@ -62,6 +59,8 @@ namespace LVL1{
}
+ ATH_CHECK( m_cablingKey.initialize() );
+
return sc;
}
@@ -77,6 +76,8 @@ namespace LVL1{
this->reset();
+ SG::ReadCondHandle<LArOnOffIdMapping> cabling (m_cablingKey);
+
// access database - each event conditions may have changed ...
sc = m_ttTool->retrieveConditions();
if(!sc.isSuccess()) {
@@ -110,7 +111,7 @@ namespace LVL1{
TTid = m_ttTool->identifier(tt->eta(), tt->phi(), 0);
coolId = m_ttTool->channelID(TTid).id();
- if(!this->hasMissingFEB(TTid) && !m_ttTool->disabledChannel(coolId)) {
+ if(!this->hasMissingFEB(**cabling, TTid) && !m_ttTool->disabledChannel(coolId)) {
sinTheta = 1. / std::cosh(tt->eta());
caloEnergy = 1e-3 * m_cells2tt->energy(TTid) * sinTheta;
@@ -143,7 +144,7 @@ namespace LVL1{
bool bIsTile = m_lvl1Helper->is_tile(TTid);
if(bIsTile) continue;
- if(hasMissingFEB(TTid)) continue;
+ if(hasMissingFEB(**cabling, TTid)) continue;
it_map = m_map_sumEtcells_phi_had.find(tt->eta());
if(it_map == m_map_sumEtcells_phi_had.end()) {
@@ -162,6 +163,8 @@ namespace LVL1{
float L1CaloLArTowerEnergy::EtLArg(const Identifier& TTid) const {
+ SG::ReadCondHandle<LArOnOffIdMapping> cabling (m_cablingKey);
+
float energy = 0;
mapTT::const_iterator it_mapTT;
@@ -172,7 +175,7 @@ namespace LVL1{
//electromagnetic sampling
if(sampling==0) {
- if(this->hasMissingFEB(TTid)) {
+ if(this->hasMissingFEB(**cabling, TTid)) {
it_mapSum = m_map_sumEtcells_phi_em.find(eta);
std::pair<double,int> Et = (*it_mapSum).second;
energy = Et.first/Et.second;
@@ -192,7 +195,7 @@ namespace LVL1{
energy = (*it_mapTT).second;
}
else {
- if(this->hasMissingFEB(TTid)) {
+ if(this->hasMissingFEB(**cabling, TTid)) {
it_mapSum = m_map_sumEtcells_phi_had.find(eta);
std::pair<double,int> Et = (*it_mapSum).second;
energy = Et.first/Et.second;
@@ -226,8 +229,14 @@ namespace LVL1{
}
- bool L1CaloLArTowerEnergy::hasMissingFEB(const Identifier& TTid) const {
-
+ bool L1CaloLArTowerEnergy::hasMissingFEB(const Identifier& TTid) const
+ {
+ SG::ReadCondHandle<LArOnOffIdMapping> cabling (m_cablingKey);
+ return hasMissingFEB (**cabling, TTid);
+ }
+ bool L1CaloLArTowerEnergy::hasMissingFEB(const LArOnOffIdMapping& cabling,
+ const Identifier& TTid) const
+ {
bool result = false;
std::vector<Identifier> TT_cells_vec = m_ttService->createCellIDvecTT(TTid) ;
@@ -239,7 +248,7 @@ namespace LVL1{
for (; it!=it_e; ++it)
{
- HWIdentifier chid = m_larCablingSvc->createSignalChannelID(*it);
+ HWIdentifier chid = cabling.createSignalChannelID(*it);
HWIdentifier febId = m_LArOnlineHelper->feb_Id(chid);
LArBadFeb febstatus = m_badFebMasker->febStatus(febId);
bool deadReadout = febstatus.deadReadout();
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloMonitoringCaloTool.cxx b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloMonitoringCaloTool.cxx
index 1566427c9cfd..8c8a9c73c267 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloMonitoringCaloTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloMonitoringCaloTool.cxx
@@ -128,6 +128,8 @@ StatusCode L1CaloMonitoringCaloTool:: initialize()
m_sideOffset = binsEta[s_nregions-1]*binsPhi[s_nregions-1] + m_indexOffset[s_nregions-1];
m_layerOffset = 2*m_sideOffset;
+ ATH_CHECK( m_cablingKey.initialize() );
+
return StatusCode::SUCCESS;
}
@@ -191,6 +193,8 @@ StatusCode L1CaloMonitoringCaloTool::loadCaloCells()
m_quality.assign(s_maxTowers, 0.0);
m_denom.assign(s_maxTowers, 0.0);
unsigned int cellIdsIndex = 0;
+
+ SG::ReadCondHandle<LArOnOffIdMapping> cabling (m_cablingKey);
for (; CaloCellIterator != CaloCellIteratorEnd; ++CaloCellIterator) {
@@ -206,7 +210,7 @@ StatusCode L1CaloMonitoringCaloTool::loadCaloCells()
int index2 = s_maxTowers;
const unsigned int cellId32 = cellId.get_identifier32().get_compact();
if (m_events == 1) {
- m_cells2tt->matchCell2Tower(caloCell, ttId1, ttId2);
+ m_cells2tt->matchCell2Tower(**cabling, caloCell, ttId1, ttId2);
if (ttId1 != invalidId) index1 = towerIndex(ttId1);
if (ttId2 != invalidId) index2 = towerIndex(ttId2);
if (cellIdsIndex < m_maxCells-1) {
@@ -222,7 +226,7 @@ StatusCode L1CaloMonitoringCaloTool::loadCaloCells()
index1 = m_ttIdx[cellIdsIndex++];
if (m_cellIds[cellIdsIndex] == cellId32) index2 = m_ttIdx[cellIdsIndex++];
} else {
- m_cells2tt->matchCell2Tower(caloCell, ttId1, ttId2);
+ m_cells2tt->matchCell2Tower(**cabling, caloCell, ttId1, ttId2);
if (ttId1 != invalidId) index1 = towerIndex(ttId1);
if (ttId2 != invalidId) index2 = towerIndex(ttId2);
}
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloOfflineTriggerTowerTools.cxx b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloOfflineTriggerTowerTools.cxx
index 12155165758c..9375863403c1 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloOfflineTriggerTowerTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloOfflineTriggerTowerTools.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// ***************************************************************************
// * Author: John Morris (john.morris@cern.ch) *
@@ -888,13 +888,6 @@ namespace LVL1 {
// EM
- int L1CaloOfflineTriggerTowerTools::emBadCalo(const TriggerTower* tt) const{
- Identifier Id = this->emID(tt->eta(),tt->phi());
- int badCalo(0);
- if(m_larEnergy->hasMissingFEB(Id) == true){badCalo = 1;}
- return badCalo;
- }
-
float L1CaloOfflineTriggerTowerTools::emCaloQuality(const TriggerTower* tt) const{
Identifier Id = this->emID(tt->eta(),tt->phi());
std::vector<const CaloCell*> cells = m_cells2tt->caloCells(Id);
@@ -1012,23 +1005,6 @@ namespace LVL1 {
// Had
- int L1CaloOfflineTriggerTowerTools::hadBadCalo(const TriggerTower* tt,IdTTL1CellMapType& map) const{
- Identifier Id = this->hadID(tt->eta(),tt->phi());
- int badCalo(0);
-
- if(m_lvl1Helper->is_tile(Id) == false){
- if(m_larEnergy->hasMissingFEB(Id) == true){badCalo = 1;}
- }
- else{
- IdTTL1CellMapType::const_iterator ttL1Cell(map.find(Id));
- IdTTL1CellMapType::const_iterator ttL1Cell_E(map.end());
- if(ttL1Cell != ttL1Cell_E){
- badCalo = (ttL1Cell->second)->qualTower();
- }
- }
- return badCalo;
- }
-
float L1CaloOfflineTriggerTowerTools::hadCaloQuality(const TriggerTower* tt) const{
Identifier Id = this->hadID(tt->eta(),tt->phi());
std::vector<const CaloCell*> cells = m_cells2tt->caloCells(Id);
diff --git a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloRampMaker_topOptions.py b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloRampMaker_topOptions.py
index cdcd505107c3..273db07129e7 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloRampMaker_topOptions.py
+++ b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloRampMaker_topOptions.py
@@ -141,6 +141,9 @@ for l1calofolder in L1CaloFolderList:
conddb.addFolder("", L1CaloDbConnection + l1calofolder + L1CaloDbTag)
svcMgr.IOVDbSvc.overrideTags += ["<prefix>/CALO/Identifier/CaloTTOnOffIdMapAtlas</prefix> <tag>CALOIdentifierCaloTTOnOffIdMapAtlas-0002</tag>"]
+from LArCabling.LArCablingAccess import LArOnOffIdMapping
+LArOnOffMapping()
+
# set up tools
from TrigT1CaloCondSvc.TrigT1CaloCondSvcConf import L1CaloCondSvc
ServiceMgr += L1CaloCondSvc()
diff --git a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/LArL1CaloRampMaker.py b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/LArL1CaloRampMaker.py
index 24e37a81e18c..2ccc3ed1fd06 100755
--- a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/LArL1CaloRampMaker.py
+++ b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/LArL1CaloRampMaker.py
@@ -134,6 +134,9 @@ else:
# setup l1calo database
include('TrigT1CaloCalibConditions/L1CaloCalibConditions_jobOptions.py')
+from LArCabling.LArCablingAccess import LArOnOffIdMapping
+LArOnOffMapping()
+
# set up tools
ToolSvc += CfgMgr.LVL1__L1TriggerTowerTool()
ToolSvc += CfgMgr.LVL1__L1CaloLArTowerEnergy()
diff --git a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/LArL1Calo_DumpHVCorr.py b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/LArL1Calo_DumpHVCorr.py
index 8ca0ef7467fa..8b653f24e110 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/LArL1Calo_DumpHVCorr.py
+++ b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/LArL1Calo_DumpHVCorr.py
@@ -143,6 +143,9 @@ include('TrigT1CaloCalibConditions/L1CaloCalibConditions_jobOptions.py')
svcMgr.IOVDbSvc.overrideTags += ["<prefix>/CALO/Identifier/CaloTTOnOffIdMapAtlas</prefix> <tag>CALOIdentifierCaloTTOnOffIdMapAtlas-0002</tag>"]
svcMgr.IOVDbSvc.overrideTags += ["<prefix>/LAR/Identifier/LArTTCellMapAtlas</prefix> <tag>LARIdentifierLArTTCellMapAtlas-HadFcalFix2</tag>"]
+from LArCabling.LArCablingAccess import LArOnOffIdMapping
+LArOnOffMapping()
+
# set up tools
from TrigT1CaloTools.TrigT1CaloToolsConf import LVL1__L1TriggerTowerTool
ToolSvc += LVL1__L1TriggerTowerTool("L1TriggerTowerTool")
diff --git a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/TileL1CaloRampMaker.py b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/TileL1CaloRampMaker.py
index 9557417e2dd9..e7e5c2f4aaf0 100755
--- a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/TileL1CaloRampMaker.py
+++ b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/TileL1CaloRampMaker.py
@@ -126,6 +126,9 @@ else:
# setup l1calo database
include('TrigT1CaloCalibConditions/L1CaloCalibConditions_jobOptions.py')
+from LArCabling.LArCablingAccess import LArOnOffIdMapping
+LArOnOffMapping()
+
# set up tools
ToolSvc += CfgMgr.LVL1__L1TriggerTowerTool()
ToolSvc += CfgMgr.LVL1__L1CaloLArTowerEnergy()
--
GitLab
From b9fe2deb8d98401c1a6ea8ea94181a0146b3b099 Mon Sep 17 00:00:00 2001
From: Bertrand LAFORGE <laforge@lpnhe.in2p3.fr>
Date: Wed, 1 Sep 2021 16:33:26 +0200
Subject: [PATCH 263/272] last ajustement of Egamma run3 monitoring
---
.../config/Egamma/collisions_run.config_run2 | 3294 +++++++++++++++++
.../python/SetupEgammaMonitoring.py | 252 +-
.../python/egammaMonitoringConfig.py | 6 +-
.../src/MonitorElectronAlgorithm.cxx | 107 +-
.../src/MonitorPhotonAlgorithm.cxx | 37 +-
.../src/MonitorTnPAlgorithm.cxx | 234 +-
6 files changed, 3632 insertions(+), 298 deletions(-)
create mode 100644 DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config_run2
diff --git a/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config_run2 b/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config_run2
new file mode 100644
index 000000000000..623fecc0b34f
--- /dev/null
+++ b/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config_run2
@@ -0,0 +1,3294 @@
+# **********************************************************************
+# $Id: collisions_run.config 777627 2016-10-11 10:49:51Z nproklov $
+# **********************************************************************
+
+############################################################
+# e,gamma
+############################################################
+
+# #############
+# Reference
+# #############
+
+reference EgammaReference {
+ location = /eos/atlas/atlascerngroupdisk/data-dqm/references/Other/,root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/data-dqm/references/Other/
+ file = data15_13TeV.00281411.express_express.merge.HIST.r7510.f810.ref.root
+ path = run_281411
+ name = same_name
+}
+
+####################
+# Thresholds
+####################
+thresholds egKolmogorovThr {
+ limits MaxDist {
+ warning = 0.05
+ error = 0.15
+ }
+}
+
+thresholds egamma_BinsDiffFromStripMedian_threshold {
+ limits MaxDeviation {
+ warning = 25
+ error = 200
+ }
+}
+
+thresholds egamma_FitZmass_Thresholds {
+ limits Sigma {
+ warning = 4000.0
+ error = 10000.0
+ }
+}
+
+thresholds egamma_FitJPsimass_Thresholds {
+ limits Sigma {
+ warning = 4000.0
+ error = 10000.0
+ }
+}
+
+
+####################
+# Common Algorithms
+####################
+
+algorithm egamma_BinsDiffFromStripMedian {
+ libname = libdqm_algorithms.so
+ SuppressFactor = 0
+ name = BinsDiffFromStripMedian
+ thresholds = egamma_BinsDiffFromStripMedian_threshold
+}
+
+algorithm egKolmogorov {
+ libname = libdqm_algorithms.so
+ name = KolmogorovTest_MaxDist
+# reference = EgammaReference
+# reference = CentrallyManagedReferences_Egamma
+ reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
+ thresholds = egKolmogorovThr
+ MinStat = 20
+}
+
+algorithm egKolmogorovProb {
+ libname = libdqm_algorithms.so
+ name = KolmogorovTest_Prob
+# reference = EgammaReference
+# reference = CentrallyManagedReferences_Egamma
+ reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
+ thresholds = egKolmogorovThr
+ MinStat = 20
+}
+
+algorithm egamma_GatherData {
+ libname = libdqm_algorithms.so
+ name = GatherData
+}
+
+algorithm egamma_Histogram_Not_Empty {
+ libname = libdqm_algorithms.so
+ name = Histogram_Not_Empty
+# reference = EgammaReference
+ reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
+ MinStat = 20
+}
+
+algorithm 2D_Histogram_Not_Empty {
+ libname = libdqm_algorithms.so
+ name = Histogram_Not_Empty
+ MinStat = 10
+# reference = EgammaReference
+ reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
+}
+
+
+algorithm egamma_FitZmass {
+ libname = libdqm_algorithms.so
+ name = Simple_gaus_Fit
+ xmin = 80000.
+ xmax = 100000.
+ thresholds = egamma_FitZmass_Thresholds
+}
+
+algorithm egamma_FitJPsimass {
+ libname = libdqm_algorithms.so
+ name = Simple_gaus_Fit
+ xmin = 3000.
+ xmax = 5000.
+ thresholds = egamma_FitJPsimass_Thresholds
+}
+
+#############
+# Output
+#############
+
+output top_level {
+ algorithm = WorstCaseSummary
+ output egamma {
+ algorithm = WorstCaseSummary
+ output photons {
+ algorithm = WorstCaseSummary
+ output EXPERT {
+ algorithm = WorstCaseSummary
+ }
+ output ID {
+ algorithm = WorstCaseSummary
+ }
+ output LBMon {
+ algorithm = WorstCaseSummary
+ }
+ }
+ output photonsWithTrigger {
+ algorithm = WorstCaseSummary
+ output EXPERT {
+ algorithm = WorstCaseSummary
+ }
+ output ID {
+ algorithm = WorstCaseSummary
+ }
+ output LBMon {
+ algorithm = WorstCaseSummary
+ }
+ }
+ output electrons {
+ algorithm = WorstCaseSummary
+ output EXPERT {
+ algorithm = WorstCaseSummary
+ }
+ output ID {
+ algorithm = WorstCaseSummary
+ }
+ output Track {
+ algorithm = WorstCaseSummary
+ }
+ output LBMon {
+ algorithm = WorstCaseSummary
+ }
+ }
+ output electronsWithTrigger {
+ algorithm = WorstCaseSummary
+ output EXPERT {
+ algorithm = WorstCaseSummary
+ }
+ output ID {
+ algorithm = WorstCaseSummary
+ }
+ output Track {
+ algorithm = WorstCaseSummary
+ }
+ output LBMon {
+ algorithm = WorstCaseSummary
+ }
+ }
+ output forwardElectrons {
+ algorithm = WorstCaseSummary
+ output ID {
+ algorithm = WorstCaseSummary
+ }
+ output EXPERT {
+ algorithm = WorstCaseSummary
+ }
+ }
+ output tagandprobeZ {
+ algorithm = WorstCaseSummary
+ output ID {
+ algorithm = WorstCaseSummary
+ }
+ output Track {
+ algorithm = WorstCaseSummary
+ }
+ output LBMon {
+ algorithm = WorstCaseSummary
+ }
+ }
+ output tagandprobeJPsi {
+ algorithm = WorstCaseSummary
+ output ID {
+ algorithm = WorstCaseSummary
+ }
+ output Track {
+ algorithm = WorstCaseSummary
+ }
+ output LBMon {
+ algorithm = WorstCaseSummary
+ }
+ }
+ }
+}
+
+#######################
+# Histogram Assessments
+#######################
+
+ dir egamma/electrons {
+ output = egamma/electrons
+
+ # CbLoose
+ hist electronNCbLoose {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist electronEtCbLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiCbLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaCbLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPtCone20CbLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40CbLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeCbLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+
+ # CbTight
+ hist electronNCbTight {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist electronEtCbTight {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiCbTight {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaCbTight {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPtCone20CbTight {
+ algorithm = egKolmogorov
+ }
+ hist electronTopoEtCone40CbTight {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeCbTight {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+
+ # LhLoose
+ hist electronNLhLoose {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist electronEtLhLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiLhLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaLhLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaPhiPtgt2.5GeVLhLoose {
+ output = egamma/electrons/EXPERT
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist electronEtaPhiPtgt4GeVLhLoose {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist electronEtaPhiPtgt20GeVLhLoose {
+ output = egamma/electrons/EXPERT
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist electronPtCone20LhLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40LhLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeLhLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronNLhLoose_BARREL {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox, LogY
+ }
+ hist electronEtLhLoose_BARREL {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaLhLoose_BARREL {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiLhLoose_BARREL {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPtCone20LhLoose_BARREL {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40LhLoose_BARREL {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeLhLoose_BARREL {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronNLhLoose_CRACK {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox, LogY
+ }
+ hist electronEtLhLoose_CRACK {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaLhLoose_CRACK {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiLhLoose_CRACK {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPtCone20LhLoose_CRACK {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40LhLoose_CRACK {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeLhLoose_CRACK {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronNLhLoose_ENDCAP {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox, LogY
+ }
+ hist electronEtLhLoose_ENDCAP {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaLhLoose_ENDCAP {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiLhLoose_ENDCAP {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaPhiPtgt2.5GeVLhLoose {
+ output = egamma/electrons/EXPERT
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist electronEtaPhiPtgt4GeVLhLoose {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist electronEtaPhiPtgt20GeVLhLoose {
+ output = egamma/electrons/EXPERT
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist electronPtCone20LhLoose_ENDCAP {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40LhLoose_ENDCAP {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeLhLoose_ENDCAP {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+
+ # LhMedium
+ hist electronNLhMedium {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist electronEtLhMedium {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiLhMedium {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaLhMedium {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaPhiPtgt2.5GeVLhMedium {
+ output = egamma/electrons/EXPERT
+ algorithm = 2D_Histogram_Not_Empty
+ # algorithm = egamma_BinsDiffFromStripMedian
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist electronEtaPhiPtgt4GeVLhMedium {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist electronEtaPhiPtgt20GeVLhMedium {
+ output = egamma/electrons/EXPERT
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist electronPtCone20LhMedium {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40LhMedium {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeLhMedium {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronNLhMedium_BARREL {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox, LogY
+ }
+ hist electronEtLhMedium_BARREL {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaLhMedium_BARREL {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiLhMedium_BARREL {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPtCone20LhMedium_BARREL {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40LhMedium_BARREL {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeLhMedium_BARREL {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronNLhMedium_CRACK {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox, LogY
+ }
+ hist electronEtLhMedium_CRACK {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaLhMedium_CRACK {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiLhMedium_CRACK {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPtCone20LhMedium_CRACK {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40LhMedium_CRACK {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeLhMedium_CRACK {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronNLhMedium_ENDCAP {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox, LogY
+ }
+ hist electronEtLhMedium_ENDCAP {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaLhMedium_ENDCAP {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiLhMedium_ENDCAP {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPtCone20LhMedium_ENDCAP {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40LhMedium_ENDCAP {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeLhMedium_ENDCAP {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+
+ # LhTight
+ hist electronNLhTight {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist electronEtLhTight {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiLhTight {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaLhTight {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaPhiPtgt2.5GeVLhTight {
+ output = egamma/electrons/EXPERT
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist electronEtaPhiPtgt4GeVLhTight {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist electronEtaPhiPtgt20GeVLhTight {
+ output = egamma/electrons/EXPERT
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist electronPtCone20LhTight {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40LhTight {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeLhTight {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronNLhTight_BARREL {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox, LogY
+ }
+ hist electronEtLhTight_BARREL {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaLhTight_BARREL {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiLhTight_BARREL {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPtCone20LhTight_BARREL {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40LhTight_BARREL {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeLhTight_BARREL {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronNLhTight_CRACK {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox, LogY
+ }
+ hist electronEtLhTight_CRACK {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaLhTight_CRACK {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiLhTight_CRACK {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPtCone20LhTight_CRACK {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40LhTight_CRACK {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeLhTight_CRACK {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronNLhTight_ENDCAP {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtLhTight_ENDCAP {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaLhTight_ENDCAP {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiLhTight_ENDCAP {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPtCone20LhTight_ENDCAP {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40LhTight_ENDCAP {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeLhTight_ENDCAP {
+ output = egamma/electrons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+}
+
+ dir egamma/electrons/ID {
+ algorithm = egKolmogorov
+ output = egamma/electrons/ID
+ display = Draw=e1,StatBox
+
+ # LhLoose
+ hist electronEhad1LhLoose_BARREL {
+ }
+ hist electronEoverPLhLoose_BARREL {
+ }
+ hist electronCoreEMLhLoose_BARREL {
+ }
+ hist electronF0LhLoose_BARREL {
+ }
+ hist electronF1LhLoose_BARREL {
+ }
+ hist electronF2LhLoose_BARREL {
+ }
+ hist electronF3LhLoose_BARREL {
+ }
+ hist electronRe233e237LhLoose_BARREL {
+ }
+ hist electronRe237e277LhLoose_BARREL {
+ }
+ hist electronEhad1LhLoose_CRACK {
+ }
+ hist electronEoverPLhLoose_CRACK {
+ }
+ hist electronCoreEMLhLoose_CRACK {
+ }
+ hist electronF0LhLoose_CRACK {
+ }
+ hist electronF1LhLoose_CRACK {
+ }
+ hist electronF2LhLoose_CRACK {
+ }
+ hist electronF3LhLoose_CRACK {
+ }
+ hist electronRe233e237LhLoose_CRACK {
+ }
+ hist electronRe237e277LhLoose_CRACK {
+ }
+ hist electronEhad1LhLoose_ENDCAP {
+ }
+ hist electronEoverPLhLoose_ENDCAP {
+ }
+ hist electronCoreEMLhLoose_ENDCAP {
+ }
+ hist electronF0LhLoose_ENDCAP {
+ }
+ hist electronF1LhLoose_ENDCAP {
+ }
+ hist electronF2LhLoose_ENDCAP {
+ }
+ hist electronF3LhLoose_ENDCAP {
+ }
+ hist electronRe233e237LhLoose_ENDCAP {
+ }
+ hist electronRe237e277LhLoose_ENDCAP {
+ }
+
+ # LhMedium
+ hist electronEhad1LhMedium_BARREL {
+ }
+ hist electronEoverPLhMedium_BARREL {
+ }
+ hist electronCoreEMLhMedium_BARREL {
+ }
+ hist electronF0LhMedium_BARREL {
+ }
+ hist electronF1LhMedium_BARREL {
+ }
+ hist electronF2LhMedium_BARREL {
+ }
+ hist electronF3LhMedium_BARREL {
+ }
+ hist electronRe233e237LhMedium_BARREL {
+ }
+ hist electronRe237e277LhMedium_BARREL {
+ }
+ hist electronEhad1LhMedium_CRACK {
+ }
+ hist electronEoverPLhMedium_CRACK {
+ }
+ hist electronCoreEMLhMedium_CRACK {
+ }
+ hist electronF0LhMedium_CRACK {
+ }
+ hist electronF1LhMedium_CRACK {
+ }
+ hist electronF2LhMedium_CRACK {
+ }
+ hist electronF3LhMedium_CRACK {
+ }
+ hist electronRe233e237LhMedium_CRACK {
+ }
+ hist electronRe237e277LhMedium_CRACK {
+ }
+ hist electronEhad1LhMedium_ENDCAP {
+ }
+ hist electronEoverPLhMedium_ENDCAP {
+ }
+ hist electronCoreEMLhMedium_ENDCAP {
+ }
+ hist electronF0LhMedium_ENDCAP {
+ }
+ hist electronF1LhMedium_ENDCAP {
+ }
+ hist electronF2LhMedium_ENDCAP {
+ }
+ hist electronF3LhMedium_ENDCAP {
+ }
+ hist electronRe233e237LhMedium_ENDCAP {
+ }
+ hist electronRe237e277LhMedium_ENDCAP {
+ }
+
+ # LhTight
+ hist electronEhad1LhTight_BARREL {
+ }
+ hist electronEoverPLhTight_BARREL {
+ }
+ hist electronCoreEMLhTight_BARREL {
+ }
+ hist electronF0LhTight_BARREL {
+ }
+ hist electronF1LhTight_BARREL {
+ }
+ hist electronF2LhTight_BARREL {
+ }
+ hist electronF3LhTight_BARREL {
+ }
+ hist electronRe233e237LhTight_BARREL {
+ }
+ hist electronRe237e277LhTight_BARREL {
+ }
+ hist electronEhad1LhTight_CRACK {
+ }
+ hist electronEoverPLhTight_CRACK {
+ }
+ hist electronCoreEMLhTight_CRACK {
+ }
+ hist electronF0LhTight_CRACK {
+ }
+ hist electronF1LhTight_CRACK {
+ }
+ hist electronF2LhTight_CRACK {
+ }
+ hist electronF3LhTight_CRACK {
+ }
+ hist electronRe233e237LhTight_CRACK {
+ }
+ hist electronRe237e277LhTight_CRACK {
+ }
+ hist electronEhad1LhTight_ENDCAP {
+ }
+ hist electronEoverPLhTight_ENDCAP {
+ }
+ hist electronCoreEMLhTight_ENDCAP {
+ }
+ hist electronF0LhTight_ENDCAP {
+ }
+ hist electronF1LhTight_ENDCAP {
+ }
+ hist electronF2LhTight_ENDCAP {
+ }
+ hist electronF3LhTight_ENDCAP {
+ }
+ hist electronRe233e237LhTight_ENDCAP {
+ }
+ hist electronRe237e277LhTight_ENDCAP {
+ }
+}
+
+ dir egamma/electrons/Track {
+ algorithm = egKolmogorov
+ output = egamma/electrons/Track
+ display = Draw=e1,StatBox
+
+ # LhLoose
+ hist electronNOfBLayersHitsLhLoose_BARREL {
+ }
+ hist electronNOfTRTHitsLhLoose_BARREL {
+ }
+ hist electronNOfSiHitsLhLoose_BARREL {
+ }
+ hist electronDeltaEta1LhLoose_BARREL {
+ }
+ hist electronDeltaPhi2LhLoose_BARREL {
+ }
+ hist electronDeltaEta1LhLoose_CRACK {
+ }
+ hist electronDeltaPhi2LhLoose_CRACK {
+ }
+ hist electronNOfBLayersHitsLhLoose_CRACK {
+ }
+ hist electronNOfTRTHitsLhLoose_CRACK {
+ }
+ hist electronNOfSiHitsLhLoose_CRACK {
+ }
+ hist electronDeltaEta1LhLoose_ENDCAP {
+ }
+ hist electronDeltaPhi2LhLoose_ENDCAP {
+ }
+ hist electronNOfBLayersHitsLhLoose_ENDCAP {
+ }
+ hist electronNOfTRTHitsLhLoose_ENDCAP {
+ }
+ hist electronNOfSiHitsLhLoose_ENDCAP {
+ }
+
+ # LhMedium
+ hist electronNOfBLayersHitsLhMedium_BARREL {
+ }
+ hist electronNOfTRTHitsLhMedium_BARREL {
+ }
+ hist electronNOfSiHitsLhMedium_BARREL {
+ }
+ hist electronDeltaEta1LhMedium_BARREL {
+ }
+ hist electronDeltaPhi2LhMedium_BARREL {
+ }
+ hist electronDeltaEta1LhMedium_CRACK {
+ }
+ hist electronDeltaPhi2LhMedium_CRACK {
+ }
+ hist electronNOfBLayersHitsLhMedium_CRACK {
+ }
+ hist electronNOfTRTHitsLhMedium_CRACK {
+ }
+ hist electronNOfSiHitsLhMedium_CRACK {
+ }
+ hist electronDeltaEta1LhMedium_ENDCAP {
+ }
+ hist electronDeltaPhi2LhMedium_ENDCAP {
+ }
+ hist electronNOfBLayersHitsLhMedium_ENDCAP {
+ }
+ hist electronNOfTRTHitsLhMedium_ENDCAP {
+ }
+ hist electronNOfSiHitsLhMedium_ENDCAP {
+ }
+
+ # LhTight
+ hist electronNOfBLayersHitsLhTight_BARREL {
+ }
+ hist electronNOfTRTHitsLhTight_BARREL {
+ }
+ hist electronNOfSiHitsLhTight_BARREL {
+ }
+ hist electronDeltaEta1LhTight_BARREL {
+ }
+ hist electronDeltaPhi2LhTight_BARREL {
+ }
+ hist electronDeltaEta1LhTight_CRACK {
+ }
+ hist electronDeltaPhi2LhTight_CRACK {
+ }
+ hist electronNOfBLayersHitsLhTight_CRACK {
+ }
+ hist electronNOfTRTHitsLhTight_CRACK {
+ }
+ hist electronNOfSiHitsLhTight_CRACK {
+ }
+ hist electronDeltaEta1LhTight_ENDCAP {
+ }
+ hist electronDeltaPhi2LhTight_ENDCAP {
+ }
+ hist electronNOfBLayersHitsLhTight_ENDCAP {
+ }
+ hist electronNOfTRTHitsLhTight_ENDCAP {
+ }
+ hist electronNOfSiHitsLhTight_ENDCAP {
+ }
+ }
+
+ dir egamma/electrons/LBMon {
+ algorithm = egamma_GatherData
+ output = egamma/electrons/LBMon
+ display = Draw=e1,StatBox
+ # LhLoose
+ hist LBEvoNElectronsLhLoose {
+ }
+ # LhMedium
+ hist LBEvoNElectronsLhMedium {
+ }
+ # LhTight
+ hist LBEvoNElectronsLhTight {
+ }
+ # CbLoose
+ hist LBEvoNElectronsCbLoose {
+ }
+ # CbTight
+ hist LBEvoNElectronsCbTight {
+ }
+}
+
+### electronsWithTrigger
+
+ dir egamma/electronsWithTrigger {
+ output = egamma/electronsWithTrigger
+
+ # CbLoose
+ hist electronNCbLoose {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist electronEtCbLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiCbLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaCbLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPtCone20CbLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40CbLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeCbLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaPhiPtgt2.5GeVCbLoose {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist electronEtaPhiPtgt4GeVCbLoose {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist electronEtaPhiPtgt20GeVCbLoose {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+
+ # CbTight
+ hist electronNCbTight {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist electronEtCbTight {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiCbTight {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaCbTight {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaPhiPtgt2.5GeVCbTight {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist electronEtaPhiPtgt4GeVCbTight {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist electronEtaPhiPtgt20GeVCbTight {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist electronPtCone20CbTight {
+ algorithm = egKolmogorov
+ }
+ hist electronTopoEtCone40CbTight {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeCbTight {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+
+ # LhLoose
+ hist electronNLhLoose {
+ algorithm = egamma_Histogram_Not_Empty
+ algorithm = egKolmogorov
+ display = Draw=e1,StatBox,LogY
+ }
+ hist electronEtLhLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiLhLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaLhLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaPhiPtgt2.5GeVLhLoose {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = 2D_Histogram_Not_Empty
+# algorithm = egamma_BinsDiffFromStripMedian
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist electronEtaPhiPtgt4GeVLhLoose {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist electronEtaPhiPtgt20GeVLhLoose {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+
+ hist electronPtCone20LhLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40LhLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeLhLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronNLhLoose_BARREL {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox, LogY
+ }
+ hist electronEtLhLoose_BARREL {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaLhLoose_BARREL {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiLhLoose_BARREL {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPtCone20LhLoose_BARREL {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40LhLoose_BARREL {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeLhLoose_BARREL {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronNLhLoose_CRACK {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox, LogY
+ }
+ hist electronEtLhLoose_CRACK {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaLhLoose_CRACK {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiLhLoose_CRACK {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPtCone20LhLoose_CRACK {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40LhLoose_CRACK {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeLhLoose_CRACK {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronNLhLoose_ENDCAP {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox, LogY
+ }
+ hist electronEtLhLoose_ENDCAP {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaLhLoose_ENDCAP {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiLhLoose_ENDCAP {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPtCone20LhLoose_ENDCAP {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40LhLoose_ENDCAP {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeLhLoose_ENDCAP {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+
+ # LhMedium
+ hist electronNLhMedium {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist electronEtLhMedium {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiLhMedium {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaLhMedium {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaPhiPtgt2.5GeVLhMedium {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist electronEtaPhiPtgt4GeVLhMedium {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist electronEtaPhiPtgt20GeVLhMedium {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist electronPtCone20LhMedium {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40LhMedium {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeLhMedium {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronNLhMedium_BARREL {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox, LogY
+ }
+ hist electronEtLhMedium_BARREL {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaLhMedium_BARREL {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiLhMedium_BARREL {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPtCone20LhMedium_BARREL {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40LhMedium_BARREL {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeLhMedium_BARREL {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronNLhMedium_CRACK {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox, LogY
+ }
+ hist electronEtLhMedium_CRACK {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaLhMedium_CRACK {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiLhMedium_CRACK {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPtCone20LhMedium_CRACK {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40LhMedium_CRACK {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeLhMedium_CRACK {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronNLhMedium_ENDCAP {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox, LogY
+ }
+ hist electronEtLhMedium_ENDCAP {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaLhMedium_ENDCAP {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiLhMedium_ENDCAP {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPtCone20LhMedium_ENDCAP {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40LhMedium_ENDCAP {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeLhMedium_ENDCAP {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+
+ # LhTight
+ hist electronNLhTight {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist electronEtLhTight {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiLhTight {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaLhTight {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaPhiPtgt2.5GeVLhTight {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist electronEtaPhiPtgt4GeVLhTight {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist electronEtaPhiPtgt20GeVLhTight {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist electronPtCone20LhTight {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40LhTight {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeLhTight {
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronNLhTight_BARREL {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox, LogY
+ }
+ hist electronEtLhTight_BARREL {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaLhTight_BARREL {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiLhTight_BARREL {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPtCone20LhTight_BARREL {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40LhTight_BARREL {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeLhTight_BARREL {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronNLhTight_CRACK {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox, LogY
+ }
+ hist electronEtLhTight_CRACK {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaLhTight_CRACK {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiLhTight_CRACK {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPtCone20LhTight_CRACK {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40LhTight_CRACK {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeLhTight_CRACK {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronNLhTight_ENDCAP {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtLhTight_ENDCAP {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronEtaLhTight_ENDCAP {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPhiLhTight_ENDCAP {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronPtCone20LhTight_ENDCAP {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTopoEtCone40LhTight_ENDCAP {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+ hist electronTimeLhTight_ENDCAP {
+ output = egamma/electronsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+ }
+}
+
+ dir egamma/electronsWithTrigger/ID {
+ algorithm = egKolmogorov
+ output = egamma/electronsWithTrigger/ID
+ display = Draw=e1,StatBox
+
+ # LhLoose
+ hist electronEhad1LhLoose_BARREL {
+ }
+ hist electronEoverPLhLoose_BARREL {
+ }
+ hist electronCoreEMLhLoose_BARREL {
+ }
+ hist electronF0LhLoose_BARREL {
+ }
+ hist electronF1LhLoose_BARREL {
+ }
+ hist electronF2LhLoose_BARREL {
+ }
+ hist electronF3LhLoose_BARREL {
+ }
+ hist electronRe233e237LhLoose_BARREL {
+ }
+ hist electronRe237e277LhLoose_BARREL {
+ }
+ hist electronEhad1LhLoose_CRACK {
+ }
+ hist electronEoverPLhLoose_CRACK {
+ }
+ hist electronCoreEMLhLoose_CRACK {
+ }
+ hist electronF0LhLoose_CRACK {
+ }
+ hist electronF1LhLoose_CRACK {
+ }
+ hist electronF2LhLoose_CRACK {
+ }
+ hist electronF3LhLoose_CRACK {
+ }
+ hist electronRe233e237LhLoose_CRACK {
+ }
+ hist electronRe237e277LhLoose_CRACK {
+ }
+ hist electronEhad1LhLoose_ENDCAP {
+ }
+ hist electronEoverPLhLoose_ENDCAP {
+ }
+ hist electronCoreEMLhLoose_ENDCAP {
+ }
+ hist electronF0LhLoose_ENDCAP {
+ }
+ hist electronF1LhLoose_ENDCAP {
+ }
+ hist electronF2LhLoose_ENDCAP {
+ }
+ hist electronF3LhLoose_ENDCAP {
+ }
+ hist electronRe233e237LhLoose_ENDCAP {
+ }
+ hist electronRe237e277LhLoose_ENDCAP {
+ }
+
+ # LhMedium
+ hist electronEhad1LhMedium_BARREL {
+ }
+ hist electronEoverPLhMedium_BARREL {
+ }
+ hist electronCoreEMLhMedium_BARREL {
+ }
+ hist electronF0LhMedium_BARREL {
+ }
+ hist electronF1LhMedium_BARREL {
+ }
+ hist electronF2LhMedium_BARREL {
+ }
+ hist electronF3LhMedium_BARREL {
+ }
+ hist electronRe233e237LhMedium_BARREL {
+ }
+ hist electronRe237e277LhMedium_BARREL {
+ }
+ hist electronEhad1LhMedium_CRACK {
+ }
+ hist electronEoverPLhMedium_CRACK {
+ }
+ hist electronCoreEMLhMedium_CRACK {
+ }
+ hist electronF0LhMedium_CRACK {
+ }
+ hist electronF1LhMedium_CRACK {
+ }
+ hist electronF2LhMedium_CRACK {
+ }
+ hist electronF3LhMedium_CRACK {
+ }
+ hist electronRe233e237LhMedium_CRACK {
+ }
+ hist electronRe237e277LhMedium_CRACK {
+ }
+ hist electronEhad1LhMedium_ENDCAP {
+ }
+ hist electronEoverPLhMedium_ENDCAP {
+ }
+ hist electronCoreEMLhMedium_ENDCAP {
+ }
+ hist electronF0LhMedium_ENDCAP {
+ }
+ hist electronF1LhMedium_ENDCAP {
+ }
+ hist electronF2LhMedium_ENDCAP {
+ }
+ hist electronF3LhMedium_ENDCAP {
+ }
+ hist electronRe233e237LhMedium_ENDCAP {
+ }
+ hist electronRe237e277LhMedium_ENDCAP {
+ }
+
+ # LhTight
+ hist electronEhad1LhTight_BARREL {
+ }
+ hist electronEoverPLhTight_BARREL {
+ }
+ hist electronCoreEMLhTight_BARREL {
+ }
+ hist electronF0LhTight_BARREL {
+ }
+ hist electronF1LhTight_BARREL {
+ }
+ hist electronF2LhTight_BARREL {
+ }
+ hist electronF3LhTight_BARREL {
+ }
+ hist electronRe233e237LhTight_BARREL {
+ }
+ hist electronRe237e277LhTight_BARREL {
+ }
+ hist electronEhad1LhTight_CRACK {
+ }
+ hist electronEoverPLhTight_CRACK {
+ }
+ hist electronCoreEMLhTight_CRACK {
+ }
+ hist electronF0LhTight_CRACK {
+ }
+ hist electronF1LhTight_CRACK {
+ }
+ hist electronF2LhTight_CRACK {
+ }
+ hist electronF3LhTight_CRACK {
+ }
+ hist electronRe233e237LhTight_CRACK {
+ }
+ hist electronRe237e277LhTight_CRACK {
+ }
+ hist electronEhad1LhTight_ENDCAP {
+ }
+ hist electronEoverPLhTight_ENDCAP {
+ }
+ hist electronCoreEMLhTight_ENDCAP {
+ }
+ hist electronF0LhTight_ENDCAP {
+ }
+ hist electronF1LhTight_ENDCAP {
+ }
+ hist electronF2LhTight_ENDCAP {
+ }
+ hist electronF3LhTight_ENDCAP {
+ }
+ hist electronRe233e237LhTight_ENDCAP {
+ }
+ hist electronRe237e277LhTight_ENDCAP {
+ }
+}
+
+ dir egamma/electronsWithTrigger/Track {
+ algorithm = egKolmogorov
+ output = egamma/electronsWithTrigger/Track
+ display = Draw=e1,StatBox
+
+ # LhLoose
+ hist electronNOfBLayersHitsLhLoose_BARREL {
+ }
+ hist electronNOfTRTHitsLhLoose_BARREL {
+ }
+ hist electronNOfSiHitsLhLoose_BARREL {
+ }
+ hist electronDeltaEta1LhLoose_BARREL {
+ }
+ hist electronDeltaPhi2LhLoose_BARREL {
+ }
+ hist electronDeltaEta1LhLoose_CRACK {
+ }
+ hist electronDeltaPhi2LhLoose_CRACK {
+ }
+ hist electronNOfBLayersHitsLhLoose_CRACK {
+ }
+ hist electronNOfTRTHitsLhLoose_CRACK {
+ }
+ hist electronNOfSiHitsLhLoose_CRACK {
+ }
+ hist electronDeltaEta1LhLoose_ENDCAP {
+ }
+ hist electronDeltaPhi2LhLoose_ENDCAP {
+ }
+ hist electronNOfBLayersHitsLhLoose_ENDCAP {
+ }
+ hist electronNOfTRTHitsLhLoose_ENDCAP {
+ }
+ hist electronNOfSiHitsLhLoose_ENDCAP {
+ }
+
+ # LhMedium
+ hist electronNOfBLayersHitsLhMedium_BARREL {
+ }
+ hist electronNOfTRTHitsLhMedium_BARREL {
+ }
+ hist electronNOfSiHitsLhMedium_BARREL {
+ }
+ hist electronDeltaEta1LhMedium_BARREL {
+ }
+ hist electronDeltaPhi2LhMedium_BARREL {
+ }
+ hist electronDeltaEta1LhMedium_CRACK {
+ }
+ hist electronDeltaPhi2LhMedium_CRACK {
+ }
+ hist electronNOfBLayersHitsLhMedium_CRACK {
+ }
+ hist electronNOfTRTHitsLhMedium_CRACK {
+ }
+ hist electronNOfSiHitsLhMedium_CRACK {
+ }
+ hist electronDeltaEta1LhMedium_ENDCAP {
+ }
+ hist electronDeltaPhi2LhMedium_ENDCAP {
+ }
+ hist electronNOfBLayersHitsLhMedium_ENDCAP {
+ }
+ hist electronNOfTRTHitsLhMedium_ENDCAP {
+ }
+ hist electronNOfSiHitsLhMedium_ENDCAP {
+ }
+
+ # LhTight
+ hist electronNOfBLayersHitsLhTight_BARREL {
+ }
+ hist electronNOfTRTHitsLhTight_BARREL {
+ }
+ hist electronNOfSiHitsLhTight_BARREL {
+ }
+ hist electronDeltaEta1LhTight_BARREL {
+ }
+ hist electronDeltaPhi2LhTight_BARREL {
+ }
+ hist electronDeltaEta1LhTight_CRACK {
+ }
+ hist electronDeltaPhi2LhTight_CRACK {
+ }
+ hist electronNOfBLayersHitsLhTight_CRACK {
+ }
+ hist electronNOfTRTHitsLhTight_CRACK {
+ }
+ hist electronNOfSiHitsLhTight_CRACK {
+ }
+ hist electronDeltaEta1LhTight_ENDCAP {
+ }
+ hist electronDeltaPhi2LhTight_ENDCAP {
+ }
+ hist electronNOfBLayersHitsLhTight_ENDCAP {
+ }
+ hist electronNOfTRTHitsLhTight_ENDCAP {
+ }
+ hist electronNOfSiHitsLhTight_ENDCAP {
+ }
+ }
+
+ dir egamma/electronsWithTrigger/LBMon {
+ algorithm = egamma_GatherData
+ output = egamma/electronsWithTrigger/LBMon
+ display = Draw=e1,StatBox
+ # LhLoose
+ hist LBEvoNElectronsLhLoose {
+ }
+ # LhMedium
+ hist LBEvoNElectronsLhMedium {
+ }
+ # LhTight
+ hist LBEvoNElectronsLhTight {
+ }
+ # CbLoose
+ hist LBEvoNElectronsCbLoose {
+ }
+ # CbTight
+ hist LBEvoNElectronsCbTight {
+ }
+}
+
+
+### photons
+
+
+ dir egamma/photons {
+ output = egamma/photons
+
+ # CbLoose
+ hist photonNCbLoose {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist photonEtCbLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1,StatBox
+ }
+ hist photonPhiCbLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1,StatBox
+ }
+ hist photonEtaPhiPt2.5GeVCbLoose {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+ hist photonEtaPhiPtgt4GeVCbLoose {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+ hist photonEtaPhiPtgt20GeVCbLoose {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+ hist photonPtCone20CbLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1,StatBox
+ }
+ hist photonTopoEtCone40CbLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1,StatBox
+ }
+ hist photonTimeCbLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1,StatBox
+ }
+ hist photonRconvCbLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1,StatBox
+ }
+
+ # CbTight
+ hist photonNCbTight {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist photonEtCbTight {
+ algorithm = egKolmogorov
+ display = Draw=e1,StatBox
+ }
+ hist photonPhiCbTight {
+ algorithm = egKolmogorov
+ display = Draw=e1,StatBox
+ }
+ hist photonEtaPhiPt2.5GeVCbTight {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist photonEtaPhiPtgt4GeVCbTight {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist photonEtaPhiPtgt20GeVCbTight {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist photonPtCone20CbTight {
+ algorithm = egKolmogorov
+ display = Draw=e1,StatBox
+ }
+ hist photonTopoEtCone40CbTight {
+ algorithm = egKolmogorov
+ display = Draw=e1,StatBox
+ }
+ hist photonTimeCbTight {
+ algorithm = egKolmogorov
+ display = Draw=e1,StatBox
+ }
+ hist photonRconvCbTight {
+ algorithm = egKolmogorov
+ display = Draw=e1,StatBox
+ }
+}
+
+ dir egamma/photons/Region {
+ algorithm = egKolmogorov
+ output = egamma/photons/EXPERT
+ display = Draw=e1,StatBox
+
+ # CbLoose
+ hist photonNCbLoose_BARREL {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist photonEtCbLoose_BARREL {
+ }
+ hist photonEtaCbLoose_BARREL {
+ }
+ hist photonPhiCbLoose_BARREL {
+ }
+ hist photonPtCone20CbLoose_BARREL {
+ }
+ hist photonTopoEtCone40CbLoose_BARREL {
+ }
+ hist photonNCbLoose_CRACK {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist photonEtCbLoose_CRACK {
+ }
+ hist photonEtaCbLoose_CRACK {
+ }
+ hist photonPhiCbLoose_CRACK {
+ }
+ hist photonPtCone20CbLoose_CRACK {
+ }
+ hist photonTopoEtCone40CbLoose_CRACK {
+ }
+ hist photonNCbLoose_ENDCAP {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist photonEtCbLoose_ENDCAP {
+ }
+ hist photonEtaCbLoose_ENDCAP {
+ }
+ hist photonPhiCbLoose_ENDCAP {
+ }
+ hist photonPtCone20CbLoose_ENDCAP {
+ }
+ hist photonTopoEtCone40CbLoose_ENDCAP {
+ }
+
+ # CbTight
+ hist photonNCbTight_BARREL {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist photonEtCbTight_BARREL {
+ }
+ hist photonEtaCbTight_BARREL {
+ }
+ hist photonPhiCbTight_BARREL {
+ }
+ hist photonPtCone20CbTight_BARREL {
+ }
+ hist photonTopoEtCone40CbTight_BARREL {
+ }
+ hist photonNCbTight_CRACK {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist photonEtCbTight_CRACK {
+ }
+ hist photonEtaCbTight_CRACK {
+ }
+ hist photonPhiCbTight_CRACK {
+ }
+ hist photonPtCone20CbTight_CRACK {
+ }
+ hist photonTopoEtCone40CbTight_CRACK {
+ }
+ hist photonNCbTight_ENDCAP {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist photonEtCbTight_ENDCAP {
+ }
+ hist photonEtaCbTight_ENDCAP {
+ }
+ hist photonPhiCbTight_ENDCAP {
+ }
+ hist photonPtCone20CbTight_ENDCAP {
+ }
+ hist photonTopoEtCone40CbTight_ENDCAP {
+ }
+}
+
+ dir egamma/photons/Unconv {
+ algorithm = egKolmogorov
+ output = egamma/photons
+ display = Draw=e1,StatBox
+
+ #CbLoose
+ hist photonNUnconvCbLoose {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist photonEtUnconvCbLoose {
+ }
+ hist photonEtaUnconvCbLoose {
+ }
+ hist photonPhiUnconvCbLoose {
+ }
+ hist photonEtaPhiUnconvCbLoose {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+ hist photonTopoEtCone40UnconvCbLoose {
+ }
+ hist photonPtCone20UnconvCbLoose {
+ }
+
+ #CbTight
+ hist photonNUnconvCbTight {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist photonEtUnconvCbTight {
+ }
+ hist photonEtaUnconvCbTight {
+ }
+ hist photonPhiUnconvCbTight {
+ }
+ hist photonEtaPhiUnconvCbTight {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+ hist photonTopoEtCone40UnconvCbTight {
+ }
+ hist photonPtCone20UnconvCbTight {
+ }
+
+}
+
+
+ dir egamma/photons/Conv {
+ algorithm = egKolmogorov
+ output = egamma/photons
+ display = Draw=e1,StatBox
+
+ #CbLoose
+ hist photonNConvCbLoose {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist photonEtConvCbLoose {
+ }
+ hist photonEtaConvCbLoose {
+ }
+ hist photonPhiConvCbLoose {
+ }
+ hist photonEtaPhiConvCbLoose {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+ hist photonTopoEtCone40ConvCbLoose {
+ }
+ hist photonPtCone20ConvCbLoose {
+ }
+ #CbTight
+ hist photonNConvCbTight {
+ }
+ hist photonEtConvCbTight {
+ }
+ hist photonEtaConvCbTight {
+ }
+ hist photonPhiConvCbTight {
+ }
+ hist photonEtaPhiConvCbTight {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+ hist photonTopoEtCone40ConvCbTight {
+ }
+ hist photonPtCone20ConvCbTight {
+ }
+}
+
+ dir egamma/photons/ID {
+ algorithm = egKolmogorov
+ output = egamma/photons/ID
+ display = Draw=e1,StatBox
+
+ #CbLoose
+ hist photonEhad1CbLoose_BARREL {
+ }
+ hist photonCoreEMCbLoose_BARREL {
+ }
+ hist photonF0CbLoose_BARREL {
+ }
+ hist photonF1CbLoose_BARREL {
+ }
+ hist photonF2CbLoose_BARREL {
+ }
+ hist photonF3CbLoose_BARREL {
+ }
+ hist photonRe233e237CbLoose_BARREL {
+ }
+ hist photonRe237e277CbLoose_BARREL {
+ }
+ hist photonEhad1CbLoose_CRACK {
+ }
+ hist photonCoreEMCbLoose_CRACK {
+ }
+ hist photonF0CbLoose_CRACK {
+ }
+ hist photonF1CbLoose_CRACK {
+ }
+ hist photonF2CbLoose_CRACK {
+ }
+ hist photonF3CbLoose_CRACK {
+ }
+ hist photonRe233e237CbLoose_CRACK {
+ }
+ hist photonRe237e277CbLoose_CRACK {
+ }
+ hist photonEhad1CbLoose_ENDCAP {
+ }
+ hist photonCoreEMCbLoose_ENDCAP {
+ }
+ hist photonF0CbLoose_ENDCAP {
+ }
+ hist photonF1CbLoose_ENDCAP {
+ }
+ hist photonF2CbLoose_ENDCAP {
+ }
+ hist photonF3CbLoose_ENDCAP {
+ }
+ hist photonRe233e237CbLoose_ENDCAP {
+ }
+ hist photonRe237e277CbLoose_ENDCAP {
+ }
+ #CbTight
+ hist photonEhad1CbTight_BARREL {
+ }
+ hist photonCoreEMCbTight_BARREL {
+ }
+ hist photonF0CbTight_BARREL {
+ }
+ hist photonF1CbTight_BARREL {
+ }
+ hist photonF2CbTight_BARREL {
+ }
+ hist photonF3CbTight_BARREL {
+ }
+ hist photonRe233e237CbTight_BARREL {
+ }
+ hist photonRe237e277CbTight_BARREL {
+ }
+ hist photonEhad1CbTight_CRACK {
+ }
+ hist photonCoreEMCbTight_CRACK {
+ }
+ hist photonF0CbTight_CRACK {
+ }
+ hist photonF1CbTight_CRACK {
+ }
+ hist photonF2CbTight_CRACK {
+ }
+ hist photonF3CbTight_CRACK {
+ }
+ hist photonRe233e237CbTight_CRACK {
+ }
+ hist photonRe237e277CbTight_CRACK {
+ }
+ hist photonEhad1CbTight_ENDCAP {
+ }
+ hist photonCoreEMCbTight_ENDCAP {
+ }
+ hist photonF0CbTight_ENDCAP {
+ }
+ hist photonF1CbTight_ENDCAP {
+ }
+ hist photonF2CbTight_ENDCAP {
+ }
+ hist photonF3CbTight_ENDCAP {
+ }
+ hist photonRe233e237CbTight_ENDCAP {
+ }
+ hist photonRe237e277CbTight_ENDCAP {
+ }
+}
+
+ dir egamma/photons/Region {
+ algorithm = egKolmogorov
+ output = egamma/photons/EXPERT
+ display = Draw=e1,StatBox
+
+ # CbLoose
+ hist photonConvTrkMatch1CbLoose_BARREL {
+ }
+ hist photonConvTrkMatch2CbLoose_BARREL {
+ }
+ hist photonConvTypeCbLoose_BARREL {
+ }
+ hist photonConvTrkMatch1CbLoose_CRACK {
+ }
+ hist photonConvTrkMatch2CbLoose_CRACK {
+ }
+ hist photonConvTypeCbLoose_CRACK {
+ }
+ hist photonConvTrkMatch1CbLoose_ENDCAP {
+ }
+ hist photonConvTrkMatch2CbLoose_ENDCAP {
+ }
+ hist photonConvTypeCbLoose_ENDCAP {
+ }
+ # CbTight
+ hist photonConvTrkMatch1CbTight_BARREL {
+ }
+ hist photonConvTrkMatch2CbTight_BARREL {
+ }
+ hist photonConvTypeCbTight_BARREL {
+ }
+ hist photonConvTrkMatch1CbTight_CRACK {
+ }
+ hist photonConvTrkMatch2CbTight_CRACK {
+ }
+ hist photonConvTypeCbTight_CRACK {
+ }
+ hist photonConvTrkMatch1CbTight_ENDCAP {
+ }
+ hist photonConvTrkMatch2CbTight_ENDCAP {
+ }
+ hist photonConvTypeCbTight_ENDCAP {
+ }
+ }
+
+
+ dir egamma/photons/LBMon {
+ algorithm = egamma_GatherData
+ output = egamma/photons/LBMon
+ display = Draw=e1,StatBox
+ # CbLoose
+ hist LBEvoNPhotonsCbLoose {
+ }
+ hist LBEvoNPhotonsUnconvCbLoose {
+ }
+ hist LBEvoNPhotonsConvCbLoose {
+ }
+ hist LBEvoConvOverNCbLoose {
+ }
+
+ # CbTight
+ hist LBEvoNPhotonsCbTight {
+ }
+ hist LBEvoNPhotonsUnconvCbTight {
+ }
+ hist LBEvoNPhotonsConvCbTight {
+ }
+ hist LBEvoConvOverNCbTight {
+ }
+}
+
+### photonsWithTrigger
+
+ dir egamma/photonsWithTrigger {
+ output = egamma/photonsWithTrigger
+
+ # CbLoose
+ hist photonNCbLoose {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist photonEtCbLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1,StatBox
+ }
+ hist photonPhiCbLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1,StatBox
+ }
+ hist photonEtaPhiPt2.5GeVCbLoose {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist photonEtaPhiPtgt4GeVCbLoose {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist photonEtaPhiPtgt20GeVCbLoose {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist photonPtCone20CbLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1,StatBox
+ }
+ hist photonTopoEtCone40CbLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1,StatBox
+ }
+ hist photonTimeCbLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1,StatBox
+ }
+ hist photonRconvCbLoose {
+ algorithm = egKolmogorov
+ display = Draw=e1,StatBox
+ }
+
+ # CbTight
+ hist photonNCbTight {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist photonEtCbTight {
+ algorithm = egKolmogorov
+ display = Draw=e1,StatBox
+ }
+ hist photonPhiCbTight {
+ algorithm = egKolmogorov
+ display = Draw=e1,StatBox
+ }
+ hist photonEtaPhiPt2.5GeVCbTight {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist photonEtaPhiPtgt4GeVCbTight {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist photonEtaPhiPtgt20GeVCbTight {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist photonPtCone20CbTight {
+ algorithm = egKolmogorov
+ display = Draw=e1,StatBox
+ }
+ hist photonTopoEtCone40CbTight {
+ algorithm = egKolmogorov
+ display = Draw=e1,StatBox
+ }
+ hist photonTimeCbTight {
+ algorithm = egKolmogorov
+ display = Draw=e1,StatBox
+ }
+ hist photonRconvCbTight {
+ algorithm = egKolmogorov
+ display = Draw=e1,StatBox
+ }
+}
+
+
+ dir egamma/photonsWithTrigger/Region {
+ algorithm = egKolmogorov
+ output = egamma/photonsWithTrigger/EXPERT
+ display = Draw=e1,StatBox
+
+ # CbLoose
+ hist photonNCbLoose_BARREL {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist photonEtCbLoose_BARREL {
+ }
+ hist photonEtaCbLoose_BARREL {
+ }
+ hist photonPhiCbLoose_BARREL {
+ }
+ hist photonPtCone20CbLoose_BARREL {
+ }
+ hist photonTopoEtCone40CbLoose_BARREL {
+ }
+ hist photonNCbLoose_CRACK {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist photonEtCbLoose_CRACK {
+ }
+ hist photonEtaCbLoose_CRACK {
+ }
+ hist photonPhiCbLoose_CRACK {
+ }
+ hist photonPtCone20CbLoose_CRACK {
+ }
+ hist photonTopoEtCone40CbLoose_CRACK {
+ }
+ hist photonNCbLoose_ENDCAP {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist photonEtCbLoose_ENDCAP {
+ }
+ hist photonEtaCbLoose_ENDCAP {
+ }
+ hist photonPhiCbLoose_ENDCAP {
+ }
+ hist photonPtCone20CbLoose_ENDCAP {
+ }
+ hist photonTopoEtCone40CbLoose_ENDCAP {
+ }
+
+ # CbTight
+ hist photonNCbTight_BARREL {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist photonEtCbTight_BARREL {
+ }
+ hist photonEtaCbTight_BARREL {
+ }
+ hist photonPhiCbTight_BARREL {
+ }
+ hist photonPtCone20CbTight_BARREL {
+ }
+ hist photonTopoEtCone40CbTight_BARREL {
+ }
+ hist photonNCbTight_CRACK {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist photonEtCbTight_CRACK {
+ }
+ hist photonEtaCbTight_CRACK {
+ }
+ hist photonPhiCbTight_CRACK {
+ }
+ hist photonPtCone20CbTight_CRACK {
+ }
+ hist photonTopoEtCone40CbTight_CRACK {
+ }
+ hist photonNCbTight_ENDCAP {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist photonEtCbTight_ENDCAP {
+ }
+ hist photonEtaCbTight_ENDCAP {
+ }
+ hist photonPhiCbTight_ENDCAP {
+ }
+ hist photonPtCone20CbTight_ENDCAP {
+ }
+ hist photonTopoEtCone40CbTight_ENDCAP {
+ }
+}
+
+ dir egamma/photonsWithTrigger/Unconv {
+ algorithm = egKolmogorov
+ output = egamma/photonsWithTrigger
+ display = Draw=e1,StatBox
+
+ #CbLoose
+ hist photonNUnconvCbLoose {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist photonEtUnconvCbLoose {
+ }
+ hist photonEtaUnconvCbLoose {
+ }
+ hist photonPhiUnconvCbLoose {
+ }
+ hist photonEtaPhiUnconvCbLoose {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+ hist photonTopoEtCone40UnconvCbLoose {
+ }
+ hist photonPtCone20UnconvCbLoose {
+ }
+
+ #CbTight
+ hist photonNUnconvCbTight {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist photonEtUnconvCbTight {
+ }
+ hist photonEtaUnconvCbTight {
+ }
+ hist photonPhiUnconvCbTight {
+ }
+ hist photonEtaPhiUnconvCbTight {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+ hist photonTopoEtCone40UnconvCbTight {
+ }
+ hist photonPtCone20UnconvCbTight {
+ }
+
+}
+
+
+ dir egamma/photonsWithTrigger/Conv {
+ algorithm = egKolmogorov
+ output = egamma/photonsWithTrigger
+ display = Draw=e1,StatBox
+
+ #CbLoose
+ hist photonNConvCbLoose {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist photonEtConvCbLoose {
+ }
+ hist photonEtaConvCbLoose {
+ }
+ hist photonPhiConvCbLoose {
+ }
+ hist photonEtaPhiConvCbLoose {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+ hist photonTopoEtCone40ConvCbLoose {
+ }
+ hist photonPtCone20ConvCbLoose {
+ }
+ #CbTight
+ hist photonNConvCbTight {
+ }
+ hist photonEtConvCbTight {
+ }
+ hist photonEtaConvCbTight {
+ }
+ hist photonPhiConvCbTight {
+ }
+ hist photonEtaPhiConvCbTight {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+ hist photonTopoEtCone40ConvCbTight {
+ }
+ hist photonPtCone20ConvCbTight {
+ }
+}
+
+ dir egamma/photonsWithTrigger/ID {
+ algorithm = egKolmogorov
+ output = egamma/photonsWithTrigger/ID
+ display = Draw=e1,StatBox
+
+ #CbLoose
+ hist photonEhad1CbLoose_BARREL {
+ }
+ hist photonCoreEMCbLoose_BARREL {
+ }
+ hist photonF0CbLoose_BARREL {
+ }
+ hist photonF1CbLoose_BARREL {
+ }
+ hist photonF2CbLoose_BARREL {
+ }
+ hist photonF3CbLoose_BARREL {
+ }
+ hist photonRe233e237CbLoose_BARREL {
+ }
+ hist photonRe237e277CbLoose_BARREL {
+ }
+ hist photonEhad1CbLoose_CRACK {
+ }
+ hist photonCoreEMCbLoose_CRACK {
+ }
+ hist photonF0CbLoose_CRACK {
+ }
+ hist photonF1CbLoose_CRACK {
+ }
+ hist photonF2CbLoose_CRACK {
+ }
+ hist photonF3CbLoose_CRACK {
+ }
+ hist photonRe233e237CbLoose_CRACK {
+ }
+ hist photonRe237e277CbLoose_CRACK {
+ }
+ hist photonEhad1CbLoose_ENDCAP {
+ }
+ hist photonCoreEMCbLoose_ENDCAP {
+ }
+ hist photonF0CbLoose_ENDCAP {
+ }
+ hist photonF1CbLoose_ENDCAP {
+ }
+ hist photonF2CbLoose_ENDCAP {
+ }
+ hist photonF3CbLoose_ENDCAP {
+ }
+ hist photonRe233e237CbLoose_ENDCAP {
+ }
+ hist photonRe237e277CbLoose_ENDCAP {
+ }
+ #CbTight
+ hist photonEhad1CbTight_BARREL {
+ }
+ hist photonCoreEMCbTight_BARREL {
+ }
+ hist photonF0CbTight_BARREL {
+ }
+ hist photonF1CbTight_BARREL {
+ }
+ hist photonF2CbTight_BARREL {
+ }
+ hist photonF3CbTight_BARREL {
+ }
+ hist photonRe233e237CbTight_BARREL {
+ }
+ hist photonRe237e277CbTight_BARREL {
+ }
+ hist photonEhad1CbTight_CRACK {
+ }
+ hist photonCoreEMCbTight_CRACK {
+ }
+ hist photonF0CbTight_CRACK {
+ }
+ hist photonF1CbTight_CRACK {
+ }
+ hist photonF2CbTight_CRACK {
+ }
+ hist photonF3CbTight_CRACK {
+ }
+ hist photonRe233e237CbTight_CRACK {
+ }
+ hist photonRe237e277CbTight_CRACK {
+ }
+ hist photonEhad1CbTight_ENDCAP {
+ }
+ hist photonCoreEMCbTight_ENDCAP {
+ }
+ hist photonF0CbTight_ENDCAP {
+ }
+ hist photonF1CbTight_ENDCAP {
+ }
+ hist photonF2CbTight_ENDCAP {
+ }
+ hist photonF3CbTight_ENDCAP {
+ }
+ hist photonRe233e237CbTight_ENDCAP {
+ }
+ hist photonRe237e277CbTight_ENDCAP {
+ }
+}
+
+ dir egamma/photonsWithTrigger/Region {
+ algorithm = egKolmogorov
+ output = egamma/photonsWithTrigger/EXPERT
+ display = Draw=e1,StatBox
+
+ # CbLoose
+ hist photonConvTrkMatch1CbLoose_BARREL {
+ }
+ hist photonConvTrkMatch2CbLoose_BARREL {
+ }
+ hist photonConvTypeCbLoose_BARREL {
+ }
+ hist photonConvTrkMatch1CbLoose_CRACK {
+ }
+ hist photonConvTrkMatch2CbLoose_CRACK {
+ }
+ hist photonConvTypeCbLoose_CRACK {
+ }
+ hist photonConvTrkMatch1CbLoose_ENDCAP {
+ }
+ hist photonConvTrkMatch2CbLoose_ENDCAP {
+ }
+ hist photonConvTypeCbLoose_ENDCAP {
+ }
+ # CbTight
+ hist photonConvTrkMatch1CbTight_BARREL {
+ }
+ hist photonConvTrkMatch2CbTight_BARREL {
+ }
+ hist photonConvTypeCbTight_BARREL {
+ }
+ hist photonConvTrkMatch1CbTight_CRACK {
+ }
+ hist photonConvTrkMatch2CbTight_CRACK {
+ }
+ hist photonConvTypeCbTight_CRACK {
+ }
+ hist photonConvTrkMatch1CbTight_ENDCAP {
+ }
+ hist photonConvTrkMatch2CbTight_ENDCAP {
+ }
+ hist photonConvTypeCbTight_ENDCAP {
+ }
+ }
+
+
+ dir egamma/photonsWithTrigger/LBMon {
+ algorithm = egamma_GatherData
+ output = egamma/photonsWithTrigger/LBMon
+ display = Draw=e1,StatBox
+ # CbLoose
+ hist LBEvoNPhotonsCbLoose {
+ }
+ hist LBEvoNPhotonsUnconvCbLoose {
+ }
+ hist LBEvoNPhotonsConvCbLoose {
+ }
+ hist LBEvoConvOverNCbLoose {
+ }
+
+ # CbTight
+ hist LBEvoNPhotonsCbTight {
+ }
+ hist LBEvoNPhotonsUnconvCbTight {
+ }
+ hist LBEvoNPhotonsConvCbTight {
+ }
+ hist LBEvoConvOverNCbTight {
+ }
+}
+
+### forwardElectrons
+
+ dir egamma/forwardElectrons {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons
+ display = Draw=e1,StatBox
+
+ hist forwardElectronN {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist forwardElectronEt {
+ }
+ hist forwardElectronPhi {
+ }
+ hist forwardElectronEta {
+ }
+ hist forwardElectronEtaPhi {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+ # hist forwardElectronTopoEtCone40 {
+ # }
+ hist forwardElectronTime {
+ }
+
+ hist forwardElectronTightN {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist forwardElectronTightEt {
+ }
+ hist forwardElectronTightPhi {
+ }
+ hist forwardElectronTightEta {
+ }
+ hist forwardElectronTightEtaPhi {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+ #hist forwardElectronTightTopoEtCone40 {
+ #}
+ hist forwardElectronTightTime {
+ }
+
+}
+
+
+ dir egamma/forwardElectrons {
+ Algorithm = Egkolmogorov
+ Output = egamma/forwardElectrons/EXPERT
+ display = Draw=e1,StatBox
+ hist forwardElectronN_ENDCAP {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist forwardElectronEt_ENDCAP {
+ output = egamma/forwardElectrons/EXPERT
+ }
+ hist forwardElectronEta_ENDCAP {
+ output = egamma/forwardElectrons/EXPERT
+ }
+ hist forwardElectronPhi_ENDCAP {
+ output = egamma/forwardElectrons/EXPERT
+ }
+ hist forwardElectronTopoEtCone40_ENDCAP {
+ output = egamma/forwardElectrons/EXPERT
+ }
+ hist forwardElectronTime_ENDCAP {
+ output = egamma/forwardElectrons/EXPERT
+ }
+ hist forwardElectronTightN_ENDCAP {
+ output = egamma/forwardElectrons/EXPERT
+ }
+ hist forwardElectronTightEt_ENDCAP {
+ output = egamma/forwardElectrons/EXPERT
+ }
+ hist forwardElectronTightEta_ENDCAP {
+ output = egamma/forwardElectrons/EXPERT
+ }
+ hist forwardElectronTightPhi_ENDCAP {
+ output = egamma/forwardElectrons/EXPERT
+ }
+ #hist forwardElectronTightTopoEtCone40_ENDCAP {
+ #output = egamma/forwardElectrons/EXPERT
+ #}
+ hist forwardElectronN_FORWARD {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ output = egamma/forwardElectrons/EXPERT
+ }
+ hist forwardElectronEt_FORWARD {
+ output = egamma/forwardElectrons/EXPERT
+ }
+ hist forwardElectronEta_FORWARD {
+ output = egamma/forwardElectrons/EXPERT
+ }
+ hist forwardElectronPhi_FORWARD {
+ output = egamma/forwardElectrons/EXPERT
+ }
+ #hist forwardElectronTopoEtCone40_FORWARD {
+ #output = egamma/forwardElectrons/EXPERT
+ #}
+ hist forwardElectronTime_FORWARD {
+ output = egamma/forwardElectrons/EXPERT
+ }
+ hist forwardElectronTightN_FORWARD {
+ output = egamma/forwardElectrons/EXPERT
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist forwardElectronTightEt_FORWARD {
+ output = egamma/forwardElectrons/EXPERT
+ }
+ hist forwardElectronTightEta_FORWARD {
+ output = egamma/forwardElectrons/EXPERT
+ }
+ hist forwardElectronTightPhi_FORWARD {
+ output = egamma/forwardElectrons/EXPERT
+ }
+ #hist forwardElectronTightTopoEtCone40_FORWARD {
+ #output = egamma/forwardElectrons/EXPERT
+ #}
+}
+
+dir egamma/forwardElectrons/ID {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/ID
+ hist forwardElectronENG_DENS_ENDCAP {
+ }
+ hist forwardElectronFRAC_MAX_ENDCAP {
+ }
+ hist forwardElectronLONGITUDINAL_ENDCAP {
+ }
+ hist forwardElectron2ND_LAMBDA_ENDCAP {
+ }
+ hist forwardElectronLATERAL_ENDCAP {
+ }
+ hist forwardElectron2ND_R_ENDCAP {
+ }
+ hist forwardElectronCENTER_LAMBDA_ENDCAP {
+ }
+ hist forwardElectronENG_DENS_FORWARD {
+ }
+ hist forwardElectronFRAC_MAX_FORWARD {
+ }
+ hist forwardElectronLONGITUDINAL_FORWARD {
+ }
+ hist forwardElectron2ND_LAMBDA_FORWARD {
+ }
+ hist forwardElectronLATERAL_FORWARD {
+ }
+ hist forwardElectron2ND_R_FORWARD {
+ }
+ hist forwardElectronCENTER_LAMBDA_FORWARD {
+ }
+}
+
+
+### Tag&Probe Z
+
+dir egamma/tagandprobeZ {
+ algorithm = egKolmogorov
+ output = egamma/tagandprobeZ
+ display = Draw=e1,StatBox
+
+ hist electronTagAndProbeNcandidates {
+ }
+ hist electronTagAndProbeGlobalMass {
+ algorithm = egamma_FitZmass
+ display = StatBox,gaus(xmin,xmax)
+ }
+ hist electronTagAndProbeMass_BARREL {
+ algorithm = egamma_FitZmass
+ display = StatBox,gaus(xmin,xmax)
+ }
+ hist electronTagAndProbeMass_CRACK {
+ algorithm = egamma_FitZmass
+ display = StatBox,gaus(xmin,xmax)
+ }
+ hist electronTagAndProbeMass_ENDCAP {
+ algorithm = egamma_FitZmass
+ display = StatBox,gaus(xmin,xmax)
+ }
+ hist electronTagAndProbeN {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist electronTagAndProbeEt {
+ }
+ hist electronTagAndProbeEta {
+ }
+ hist electronTagAndProbePhi {
+ }
+ hist electronTagAndProbeEtaPhi {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+}
+
+dir egamma/tagandprobeZ {
+ algorithm = egKolmogorov
+ output = egamma/tagandprobeZ
+ display = Draw=e1,StatBox
+
+ hist EfficiencyTagAndProbeElectronIDvsEt {
+ }
+ hist EfficiencyTagAndProbeElectronIDvsEta {
+ }
+ hist EfficiencyTagAndProbeElectronIDvsPhi {
+ }
+ hist EfficiencyTagAndProbeElectronISOvsEt {
+ }
+ hist EfficiencyTagAndProbeElectronISOvsEta {
+ }
+ hist EfficiencyTagAndProbeElectronISOvsPhi {
+ }
+}
+
+dir egamma/tagandprobeZ/ID {
+ algorithm = egKolmogorov
+ output = egamma/tagandprobeZ/ID
+ display = Draw=e1,StatBox
+
+ hist electronTagAndProbeEhad1_BARREL {
+ }
+ hist electronTagAndProbeEoverP_BARREL {
+ }
+ hist electronTagAndProbeCoreEM_BARREL {
+ }
+ hist electronTagAndProbeF1_BARREL {
+ }
+ hist electronTagAndProbeF2_BARREL {
+ }
+ hist electronTagAndProbeF3_BARREL {
+ }
+ hist electronTagAndProbeRe233e237_BARREL {
+ }
+ hist electronTagAndProbeRe237e277_BARREL {
+ }
+ hist electronTagAndProbeEhad1_ENDCAP {
+ }
+ hist electronTagAndProbeEoverP_ENDCAP {
+ }
+ hist electronTagAndProbeCoreEM_ENDCAP {
+ }
+ hist electronTagAndProbeF1_ENDCAP {
+ }
+ hist electronTagAndProbeF2_ENDCAP {
+ }
+ hist electronTagAndProbeF3_ENDCAP {
+ }
+ hist electronTagAndProbeRe233e237_ENDCAP {
+ }
+ hist electronTagAndProbeRe237e277_ENDCAP {
+ }
+ hist electronTagAndProbeEhad1_CRACK {
+ }
+ hist electronTagAndProbeEoverP_CRACK {
+ }
+ hist electronTagAndProbeCoreEM_CRACK {
+ }
+ hist electronTagAndProbeF1_CRACK {
+ }
+ hist electronTagAndProbeF2_CRACK {
+ }
+ hist electronTagAndProbeF3_CRACK {
+ }
+ hist electronTagAndProbeRe233e237_CRACK {
+ }
+ hist electronTagAndProbeRe237e277_CRACK {
+ }
+}
+
+dir egamma/tagandprobeZ/Track {
+ algorithm = egKolmogorov
+ output = egamma/tagandprobeZ/Track
+ display = Draw=e1,StatBox
+
+ hist electronTagAndProbeNOfBLayerHits_BARREL {
+ }
+ hist electronTagAndProbeNOfTRTHits_BARREL {
+ }
+ hist electronTagAndProbeNOfSiHits_BARREL {
+ }
+ hist electronTagAndProbeDeltaEta1_BARREL {
+ }
+ hist electronTagAndProbeDeltaPhi2_BARREL {
+ }
+ hist electronTagAndProbeNOfBLayerHits_ENDCAP {
+ }
+ hist electronTagAndProbeNOfTRTHits_ENDCAP {
+ }
+ hist electronTagAndProbeNOfSiHits_ENDCAP {
+ }
+ hist electronTagAndProbeDeltaEta1_ENDCAP {
+ }
+ hist electronTagAndProbeDeltaPhi2_ENDCAP {
+ }
+ hist electronTagAndProbeNOfBLayerHits_CRACK {
+ }
+ hist electronTagAndProbeNOfTRTHits_CRACK {
+ }
+ hist electronTagAndProbeNOfSiHits_CRACK {
+ }
+ hist electronTagAndProbeDeltaEta1_CRACK {
+ }
+ hist electronTagAndProbeDeltaPhi2_CRACK {
+ }
+
+ }
+
+dir egamma/tagandprobeZ/Isolation {
+ algorithm = egKolmogorov
+ output = egamma/tagandprobeZ
+ display = Draw=e1,StatBox
+
+ hist electronTagAndProbeCaloIso_BARREL {
+ }
+ hist electronTagAndProbeTrackIso_BARREL {
+ }
+ hist electronTagAndProbeCaloIso_ENDCAP {
+ }
+ hist electronTagAndProbeTrackIso_ENDCAP {
+ }
+ hist electronTagAndProbeCaloIso_CRACK {
+ }
+ hist electronTagAndProbeTrackIso_CRACK {
+ }
+}
+
+dir egamma/tagandprobeZ/LBMon {
+ algorithm = egamma_GatherData
+ output = egamma/tagandprobeZ/LBMon
+ display = Draw=e1,StatBox
+
+ hist LBEvoNZcandidates {
+ }
+}
+
+### Tag&Probe JPsi
+
+dir egamma/tagandprobeJPsi {
+ algorithm = egKolmogorov
+ output = egamma/tagandprobeJPsi
+ display = Draw=e1,StatBox
+
+ hist electronTagAndProbeNcandidates {
+ }
+ hist electronTagAndProbeGlobalMass {
+ algorithm = egamma_FitJPsimass
+ display = StatBox,gaus(xmin,xmax)
+ }
+ hist electronTagAndProbeMass_BARREL {
+ algorithm = egamma_FitJPsimass
+ display = StatBox,gaus(xmin,xmax)
+ }
+ hist electronTagAndProbeMass_CRACK {
+ algorithm = egamma_FitJPsimass
+ display = StatBox,gaus(xmin,xmax)
+ }
+ hist electronTagAndProbeMass_ENDCAP {
+ algorithm = egamma_FitJPsimass
+ display = StatBox,gaus(xmin,xmax)
+ }
+ hist electronTagAndProbeN {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist electronTagAndProbeEt {
+ }
+ hist electronTagAndProbeEta {
+ }
+ hist electronTagAndProbePhi {
+ }
+ hist electronTagAndProbeEtaPhi {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+}
+
+dir egamma/tagandprobeJPsi {
+ algorithm = egKolmogorov
+ output = egamma/tagandprobeJPsi
+ display = Draw=e1,StatBox
+
+ hist EfficiencyTagAndProbeElectronIDvsEt {
+ }
+ hist EfficiencyTagAndProbeElectronIDvsEta {
+ }
+ hist EfficiencyTagAndProbeElectronIDvsPhi {
+ }
+ hist EfficiencyTagAndProbeElectronISOvsEt {
+ }
+ hist EfficiencyTagAndProbeElectronISOvsEta {
+ }
+ hist EfficiencyTagAndProbeElectronISOvsPhi {
+ }
+}
+
+dir egamma/tagandprobeJPsi/ID {
+ algorithm = egKolmogorov
+ output = egamma/tagandprobeJPsi/ID
+ display = Draw=e1,StatBox
+
+ hist electronTagAndProbeEhad1_BARREL {
+ }
+ hist electronTagAndProbeEoverP_BARREL {
+ }
+ hist electronTagAndProbeCoreEM_BARREL {
+ }
+ hist electronTagAndProbeF1_BARREL {
+ }
+ hist electronTagAndProbeF2_BARREL {
+ }
+ hist electronTagAndProbeF3_BARREL {
+ }
+ hist electronTagAndProbeRe233e237_BARREL {
+ }
+ hist electronTagAndProbeRe237e277_BARREL {
+ }
+ hist electronTagAndProbeEhad1_ENDCAP {
+ }
+ hist electronTagAndProbeEoverP_ENDCAP {
+ }
+ hist electronTagAndProbeCoreEM_ENDCAP {
+ }
+ hist electronTagAndProbeF1_ENDCAP {
+ }
+ hist electronTagAndProbeF2_ENDCAP {
+ }
+ hist electronTagAndProbeF3_ENDCAP {
+ }
+ hist electronTagAndProbeRe233e237_ENDCAP {
+ }
+ hist electronTagAndProbeRe237e277_ENDCAP {
+ }
+ hist electronTagAndProbeEhad1_CRACK {
+ }
+ hist electronTagAndProbeEoverP_CRACK {
+ }
+ hist electronTagAndProbeCoreEM_CRACK {
+ }
+ hist electronTagAndProbeF1_CRACK {
+ }
+ hist electronTagAndProbeF2_CRACK {
+ }
+ hist electronTagAndProbeF3_CRACK {
+ }
+ hist electronTagAndProbeRe233e237_CRACK {
+ }
+ hist electronTagAndProbeRe237e277_CRACK {
+ }
+}
+
+dir egamma/tagandprobeJPsi/Track {
+ algorithm = egKolmogorov
+ output = egamma/tagandprobeJPsi/Track
+ display = Draw=e1,StatBox
+
+ hist electronTagAndProbeNOfBLayerHits_BARREL {
+ }
+ hist electronTagAndProbeNOfTRTHits_BARREL {
+ }
+ hist electronTagAndProbeNOfSiHits_BARREL {
+ }
+ hist electronTagAndProbeDeltaEta1_BARREL {
+ }
+ hist electronTagAndProbeDeltaPhi2_BARREL {
+ }
+ hist electronTagAndProbeNOfBLayerHits_ENDCAP {
+ }
+ hist electronTagAndProbeNOfTRTHits_ENDCAP {
+ }
+ hist electronTagAndProbeNOfSiHits_ENDCAP {
+ }
+ hist electronTagAndProbeDeltaEta1_ENDCAP {
+ }
+ hist electronTagAndProbeDeltaPhi2_ENDCAP {
+ }
+ hist electronTagAndProbeNOfBLayerHits_CRACK {
+ }
+ hist electronTagAndProbeNOfTRTHits_CRACK {
+ }
+ hist electronTagAndProbeNOfSiHits_CRACK {
+ }
+ hist electronTagAndProbeDeltaEta1_CRACK {
+ }
+ hist electronTagAndProbeDeltaPhi2_CRACK {
+ }
+
+ }
+
+dir egamma/tagandprobeJPsi/Isolation {
+ algorithm = egKolmogorov
+ output = egamma/tagandprobeJPsi
+ display = Draw=e1,StatBox
+
+ hist electronTagAndProbeCaloIso_BARREL {
+ }
+ hist electronTagAndProbeTrackIso_BARREL {
+ }
+ hist electronTagAndProbeCaloIso_ENDCAP {
+ }
+ hist electronTagAndProbeTrackIso_ENDCAP {
+ }
+ hist electronTagAndProbeCaloIso_CRACK {
+ }
+ hist electronTagAndProbeTrackIso_CRACK {
+ }
+}
+
+dir egamma/tagandprobeJPsi/LBMon {
+ algorithm = egamma_GatherData
+ output = egamma/tagandprobeJPsi/LBMon
+ display = Draw=e1,StatBox
+
+ hist LBEvoNJPsicandidates {
+ }
+}
diff --git a/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py b/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py
index 06bf0a1f68eb..2015b9c3f114 100755
--- a/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py
+++ b/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py
@@ -9,7 +9,6 @@
'''
from AthenaConfiguration.ComponentFactory import CompFactory
-#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)
@@ -17,9 +16,11 @@ def BookHistogramsPerRegions(thegroupe,theparttype,thename,title,path,xbins,xmin
'''
Regions = ['BARREL', 'CRACK', 'ENDCAP']
for n in range(len(Regions)):
- hname = thename + "in" + Regions[n] + ";" + thename + "in" + Regions[n] #+ " " + thepartype + thereconame + thewithTrigger
+ 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)
+ thefinalcut = thecut+Regions[n]
+ thegroupe.defineHistogram(hname,title=htitle, path=path, xbins=xbins,xmin=xmin,xmax=xmax,type = thetype, cutmask = thefinalcut)
+
def BookHistogramsPerForwardRegions(thegroupe,theparttype,thename,title,path,xbins,xmin,xmax,thetype="TH1F",thecut="is_pt_gt_10gev"):
'''
@@ -60,17 +61,17 @@ def BookHistograms(groupe,reconame,particletype,withTrigger=""):
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"
+ hname= "Et"
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"
+ hname= "EtConv"
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"
+ hname= "EtUnconv"
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')
@@ -92,50 +93,50 @@ def BookHistograms(groupe,reconame,particletype,withTrigger=""):
groupe.defineHistogram(hname,title=htitle, path='',xbins=64,xmin=-3.2,xmax=3.2)
if particletype in ["Photon"] :
- hname= "Phi ; Phi of conv. photons"
+ hname= "Phi;PhiConv"
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"
+ hname= "Phi;PhiUnconv"
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"
+ hname= "Eta,Phi;Eta_Phi_with_Pt_gt_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"
+ hname= "Eta,Phi;Eta_Phi_Conv_with_Pt_gt_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"
+ hname= "Eta,Phi;Eta_Phi_Unconv_with_Pt.gt.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"
+ hname= "Eta,Phi;Eta_Phi_distribution_with_Pt.gt.4GeV"
+ htitle= particletype + " #eta,#phi map (candidates with Pt>4GeV)" + " (" + reconame + " " + prefix + " " + 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"
+ hname= "Eta,Phi;Eta_Phi_Conv_with_Pt.gt.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"
+ hname= "Eta,Phi;Eta_Phi_Unconv_with_Pt.gt.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"
+ hname= "Eta,Phi;Eta_Phi_with_Pt.gt.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"
+ hname= "Eta,Phi;Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.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"
+ hname= "Eta,Phi;Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.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')
@@ -198,75 +199,75 @@ def BookHistograms(groupe,reconame,particletype,withTrigger=""):
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.)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='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.)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='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.)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='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.)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='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.)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='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.)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='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.)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='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.)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='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.)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='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)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='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)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='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)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='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)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='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)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='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)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='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)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='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.)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Tracks',xbins=100,xmin=-5.,xmax=5.)
# LumiBlock dependant histogram
@@ -275,15 +276,15 @@ def BookHistograms(groupe,reconame,particletype,withTrigger=""):
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"
+ 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"
+ 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"
+ 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.)
@@ -298,178 +299,178 @@ def BookTnPHistograms(groupe,reconame,TnPType,MassLowerCut,MassUpperCut):
tlabel = "_{" + TnPType + "}"
particletype = 'Electron'
- hname = "LB; Number of " + TnPType + "candidates vs LB"
+ 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"
+ 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)"
+ 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)"
+ 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)"
+ 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 "
+ 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 "
+ 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"
+ hname = "is_Tight,Etprobe;TnP_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"
+ hname = "is_Tight,Etaprobe;TnP_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"
+ hname = "is_Tight,Phiprobe;TnP_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"
+ hname = "is_Iso,Etprobe;TnP_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"
+ hname = "is_Iso,Etaprobe;TnP_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"
+ hname = "is_Iso,Phiprobe;TnP_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"
+ hname = "is_IsoandTight,Etprobe;TnP_Calo_Iso_and_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"
+ hname = "is_IsoandTight,Etaprobe;TnP_Calo_Iso_and_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"
+ hname = "is_IsoandTight,Phiprobe;TnP_Calo_Iso_and_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"
+ 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"
+ 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"
+ 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
+ hname = "Etaprobe,Phiprobe;Eta_Phi_map_of_electron_probes_for_T_and_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"
+ 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"
+ 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"
+ 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"
+ hname = "NOfBLayerHitsProbe"
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)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Tracks',xbins=6,xmin=-0.5,xmax=5.5)
- hname= "NOfPixelHits"
+ hname = "NOfPixelHitsProbe"
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)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Tracks',xbins=6,xmin=-0.5,xmax=5.5)
- hname= "NOfSCTHits"
+ hname = "NOfSCTHitsProbe"
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)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Tracks',xbins=26,xmin=-0.5,xmax=25.5)
- hname= "NOfTRTHits"
+ hname = "NOfTRTHitsProbe"
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)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Tracks',xbins=26,xmin=-0.5,xmax=50.5)
- hname= "NOfTRTHighThresholdHits"
+ hname = "NOfTRTHighThresholdHitsProbe"
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)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Tracks',xbins=26,xmin=-0.5,xmax=50.5)
- hname= "DeltaEta1"
+ hname = "DeltaEta1Probe"
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)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Tracks',xbins=50,xmin=-0.05,xmax=0.05)
- hname= "DeltaPhi2"
+ hname = "DeltaPhi2Probe"
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)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Tracks',xbins=50,xmin=-0.15,xmax=0.15)
- hname= "Trackd0"
+ hname = "Trackd0Probe"
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.)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Tracks',xbins=100,xmin=-5.,xmax=5.)
# ID distributions
- hname= "Ehad1"
+ hname = "Ehad1Probe"
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.)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='ID',xbins=50,xmin=-1000.,xmax=10000.)
- hname= "EoverP"
+ hname = "EoverPProbe"
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.)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='ID',xbins=50,xmin=0.,xmax=5.)
- hname= "CoreEM"
+ hname = "CoreEMProbe"
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.)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='ID',xbins=50,xmin=-5000.,xmax=250000.)
- hname= "F0"
+ hname = "F0Probe"
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.)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='ID',xbins=50,xmin=-0.2,xmax=1.)
- hname= "F1"
+ hname = "F1Probe"
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.)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='ID',xbins=50,xmin=-0.2,xmax=1.)
- hname= "F2"
+ hname = "F2Probe"
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.)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='ID',xbins=50,xmin=-0.2,xmax=1.)
- hname= "F3"
+ hname = "F3Probe"
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.)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='ID',xbins=50,xmin=-0.2,xmax=1.)
- hname= "Re233e237"
+ hname = "Re233e237Probe"
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.)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='ID',xbins=50,xmin=0.,xmax=2.)
- hname= "Re237e277"
+ hname = "Re237e277Probe"
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.)
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='ID',xbins=50,xmin=0.,xmax=2.)
- hname= "LBEvoN"
+ hname = "LBEvoNProbe"
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)
@@ -489,7 +490,7 @@ def BookFwdElectronHistograms(groupe,reconame,particletype,withTrigger=""):
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"
+ 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)
@@ -501,41 +502,41 @@ def BookFwdElectronHistograms(groupe,reconame,particletype,withTrigger=""):
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"
+ hname= "Eta,Phi;Eta_Phi_distribution_of_Pt_gt_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"
+ hname= "Eta,Phi;Eta_Phi_distribution_for_"+ prefix +"s_with_Pt_gt_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"
+ 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"
+ 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"
+ 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"
+ 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"
+ hname= "SecondLambda;Fwd_Electron_second_Lambda_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
+ hname= "SecondR;Fwd_Electron_second_R_moment_distribution"
+ htitle= "Fwd electron SecondR 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"
+ 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)
@@ -578,7 +579,7 @@ def MonitorElectronConfig(inputFlags):
### STEP 2 ###
- SpareElectronMonitoringGroups = [ "CBTightTrig" ]
+ SpareElectronMonitoringGroups = [ ]
MonitorElectronAlgorithm=CompFactory.MonitorElectronAlgorithm
elLHTightMonAlg = helper.addAlgorithm(MonitorElectronAlgorithm,'elLHTightMonAlg')
@@ -611,7 +612,7 @@ def MonitorElectronConfig(inputFlags):
elLHTightTrigMonAlg.ParticlePrefix = "electron"
elLHTightTrigMonAlg.WithTrigger = "WithTrigger"
# to enable a trigger filter, for example:
- elLHTightTrigMonAlg.TriggerChain = egammaConf.primary_single_ele[0]
+ #elLHTightTrigMonAlg.TriggerChain = egammaConf.primary_single_ele[0]
elLHLooseMonAlg.ParticleContainerName = "Electrons"
elLHLooseMonAlg.RecoName = "LHLoose"
@@ -725,7 +726,7 @@ def MonitorPhotonConfig(inputFlags):
phCBLooseTrigMonAlg.ParticlePrefix = "photon"
phCBLooseTrigMonAlg.WithTrigger = "WithTrigger"
# to enable a trigger filter, for example:
- phCBLooseTrigMonAlg.TriggerChain = egammaConf.primary_double_pho[0]
+ #phCBLooseTrigMonAlg.TriggerChain = egammaConf.primary_double_pho[0]
### STEP 4 ###
@@ -760,10 +761,11 @@ def MonitorTnPConfig(inputFlags):
### STEP 2 ###
- MonitorTnPAlgorithm=CompFactory.MonitorTnPAlgorithm
+ MonitorTnPAlgorithm = CompFactory.MonitorTnPAlgorithm
ZeeMonAlg = helper.addAlgorithm(MonitorTnPAlgorithm,'TnPZeeMonAlg')
JPsiMonAlg = helper.addAlgorithm(MonitorTnPAlgorithm,'TnPJpsiMonAlg')
+
### STEP 3 ###
# Edit properties of algorithms
@@ -782,10 +784,10 @@ def MonitorTnPConfig(inputFlags):
JPsiMonAlg.ParticleContainerName = "Electrons"
JPsiMonAlg.RecoName = "LHLoose"
JPsiMonAlg.ParticlePrefix = "electron"
- JPsiMonAlg.MassPeak = 3097
- JPsiMonAlg.ElectronEtCut = 3000
- JPsiMonAlg.MassLowerCut = 2500
- JPsiMonAlg.MassUpperCut = 3500
+ JPsiMonAlg.MassPeak = 3097.
+ JPsiMonAlg.ElectronEtCut = 3000.
+ JPsiMonAlg.MassLowerCut = 2500.
+ JPsiMonAlg.MassUpperCut = 3500.
JPsiMonAlg.TnPType = "JPsi"
JPsiMonAlg.TriggerChain =egammaConf.monitoring_Jpsiee[0]
@@ -955,16 +957,18 @@ if __name__=='__main__':
MonitorTnPAcc = MonitorTnPConfig(ConfigFlags)
cfg.merge(MonitorTnPAcc)
+ # If you want to turn on more detailed messages ...
+
+ #MonitorElectronAcc.getEventAlgo('elLHLooseMonAlg').OutputLevel = 2 # 2 = DEBUG
+ #MonitorTnPAcc.getEventAlgo('TnPZeeMonAlg').OutputLevel = 2 # 2 = DEBUG
+ #MonitorFwdElectronAcc.getEventAlgo('fwdelCBTightMonAlg').OutputLevel = 2 # 2 = DEBUG
+
MonitorFwdElectronAcc = MonitorForwardElectronConfig(ConfigFlags)
cfg.merge(MonitorFwdElectronAcc)
- # If you want to turn on more detailed messages ...
- #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.printConfig(withDetails=False) # set True for exhaustive info
+ cfg.printConfig(withDetails=True) # set True for exhaustive info
- #cfg.run(2)
- cfg.run(-1)
- #cfg.run(600) #use cfg.run(20) to only run on first 20 events
+ #cfg.run(598)
+ cfg.run(-1) # the one to process all events
+ #cfg.run(600) # use cfg.run(20) to only run on first 20 events
diff --git a/Reconstruction/egamma/egammaPerformance/python/egammaMonitoringConfig.py b/Reconstruction/egamma/egammaPerformance/python/egammaMonitoringConfig.py
index bdbd7bfa7f74..f620e45d53f4 100644
--- a/Reconstruction/egamma/egammaPerformance/python/egammaMonitoringConfig.py
+++ b/Reconstruction/egamma/egammaPerformance/python/egammaMonitoringConfig.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
#
def egammaMonitoringConfig(flags):
@@ -8,9 +8,11 @@ def egammaMonitoringConfig(flags):
# don't run in RAW -> ESD
if flags.DQ.Environment in ('tier0', 'tier0ESD',' online', 'AOD'):
- from egammaPerformance.SetupEgammaMonitoring import MonitorElectronConfig, MonitorPhotonConfig
+ from egammaPerformance.SetupEgammaMonitoring import MonitorElectronConfig, MonitorPhotonConfig, MonitorTnPConfig, MonitorForwardElectronConfig
result.merge(MonitorElectronConfig(flags))
result.merge(MonitorPhotonConfig(flags))
+ result.merge(MonitorTnPConfig(flags))
+ result.merge(MonitorForwardElectronConfig(flags))
return result
diff --git a/Reconstruction/egamma/egammaPerformance/src/MonitorElectronAlgorithm.cxx b/Reconstruction/egamma/egammaPerformance/src/MonitorElectronAlgorithm.cxx
index d8d3fedad498..cb0f4f0c431d 100755
--- a/Reconstruction/egamma/egammaPerformance/src/MonitorElectronAlgorithm.cxx
+++ b/Reconstruction/egamma/egammaPerformance/src/MonitorElectronAlgorithm.cxx
@@ -20,6 +20,7 @@ StatusCode MonitorElectronAlgorithm::initialize() {
ATH_CHECK( AthMonitorAlgorithm::initialize() );
ATH_CHECK( m_ParticleContainerKey.initialize() );
ATH_CHECK( m_ElectronIsolationKey.initialize() );
+
return StatusCode::SUCCESS;
}
@@ -75,7 +76,7 @@ StatusCode MonitorElectronAlgorithm::fillHistograms( const EventContext& ctx ) c
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 re233e237_barrel = Monitored::Scalar<Float_t>("Re233e237inbarrel",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);
@@ -99,8 +100,8 @@ StatusCode MonitorElectronAlgorithm::fillHistograms( const EventContext& ctx ) c
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 re233e237_endcap = Monitored::Scalar<Float_t>("Re233e237inENDCAP",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);
@@ -123,7 +124,7 @@ StatusCode MonitorElectronAlgorithm::fillHistograms( const EventContext& ctx ) c
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 re233e237_crack = Monitored::Scalar<Float_t>("Re233e237inCRACK",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);
@@ -134,6 +135,11 @@ StatusCode MonitorElectronAlgorithm::fillHistograms( const EventContext& ctx ) c
auto deltaphi2_crack = Monitored::Scalar<Float_t>("DeltaPhi2inCRACK",0.0);
auto trackd0_crack = Monitored::Scalar<Float_t>("Trackd0inCRACK",0.0);
+
+ auto is_pt_gt_4gev_barrel = Monitored::Scalar<bool>("is_pt_gt_4gevBARREL",false);
+ auto is_pt_gt_4gev_endcap = Monitored::Scalar<bool>("is_pt_gt_4gevENDCAP",false);
+ auto is_pt_gt_4gev_crack = Monitored::Scalar<bool>("is_pt_gt_4gevCRACK",false);
+
// Set the values of the monitored variables for the event
u_int16_t mylb = GetEventInfo(ctx)->lumiBlock();
@@ -160,6 +166,10 @@ StatusCode MonitorElectronAlgorithm::fillHistograms( const EventContext& ctx ) c
is_pt_gt_4gev = myet > 4000. ;
is_pt_gt_20gev = myet > 20000. ;
+ is_pt_gt_4gev_barrel = myet > 4000. ;
+ is_pt_gt_4gev_endcap = myet > 4000. ;
+ is_pt_gt_4gev_crack = myet > 4000. ;
+
// Isolation Energy
Float_t mytopoetcone40 = -999.;
e_iter->isolationValue(mytopoetcone40,xAOD::Iso::topoetcone40);
@@ -247,49 +257,54 @@ StatusCode MonitorElectronAlgorithm::fillHistograms( const EventContext& ctx ) c
// Fill per region histograms
auto region = GetRegion(myeta);
+
+ //ATH_MSG_INFO("Test electron in region : " << region);
+
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;
+
+ case BARREL :
+
+ nofblayerhits_barrel = mynofblayerhits ; nofpixelhits_barrel = mynofpixelhits ; nofscthits_barrel = mynofscthits ;
+ noftrthits_barrel = mynoftrthits ; noftrthighthresholdhits_barrel = mynoftrthighthresholdhits;
+ deltaeta1_barrel = mydeltaeta1; deltaphi2_barrel = mydeltaphi2; trackd0_barrel = mytrackd0;
+ eoverp_barrel = myeoverp;
+ et_barrel = myet ; eta_barrel = myeta ; phi_barrel = myphi ;
+ time_barrel = mytime; ehad1_barrel = myehad1; coreem_barrel = myecore;
+ f0_barrel = myf0; f1_barrel = myf1; f2_barrel = myf2; f3_barrel = myf3; re233e237_barrel = myre233e237; re237e277_barrel = myre237e277;
+ fill("MonitorElectron",nofblayerhits_barrel, nofpixelhits_barrel, nofscthits_barrel, noftrthits_barrel, noftrthighthresholdhits_barrel,
+ deltaeta1_barrel, deltaphi2_barrel,trackd0_barrel,eoverp_barrel,
+ et_barrel,eta_barrel,phi_barrel, time_barrel, ehad1_barrel,coreem_barrel, f0_barrel,f1_barrel,f2_barrel, f3_barrel,
+ re233e237_barrel,re237e277_barrel,is_pt_gt_4gev_barrel);
+ break;
+
+ case ENDCAP :
+
+ nofblayerhits_endcap = mynofblayerhits; nofpixelhits_endcap = mynofpixelhits ; nofscthits_endcap = mynofscthits ;
+ noftrthits_endcap = mynoftrthits ; noftrthighthresholdhits_endcap = mynoftrthighthresholdhits;
+ deltaeta1_endcap = mydeltaeta1; deltaphi2_endcap = mydeltaphi2; trackd0_endcap = mytrackd0;
+ eoverp_endcap = myeoverp;
+ et_endcap = myet ; eta_endcap = myeta ; phi_endcap = myphi ;
+ time_endcap = mytime; ehad1_endcap = myehad1; coreem_endcap = myecore;
+ f0_endcap = myf0; f1_endcap = myf1; f2_endcap = myf2; f3_endcap = myf3; re233e237_endcap = myre233e237; re237e277_endcap = myre237e277;
+ fill("MonitorElectron",nofblayerhits_endcap,nofpixelhits_endcap,nofscthits_endcap,noftrthits_endcap,noftrthighthresholdhits_endcap,
+ deltaeta1_endcap, deltaphi2_endcap,trackd0_endcap,eoverp_endcap,et_endcap,eta_endcap,phi_endcap,
+ time_endcap, ehad1_endcap,coreem_endcap,
+ f0_endcap,f1_endcap,f2_endcap,f3_endcap,re233e237_endcap,re237e277_endcap,is_pt_gt_4gev_endcap);
+ break;
+
+ case CRACK :
+ nofblayerhits_crack = mynofblayerhits; nofpixelhits_crack = mynofpixelhits ; nofscthits_crack = mynofscthits ;
+ noftrthits_crack = mynoftrthits ; noftrthighthresholdhits_crack = mynoftrthighthresholdhits;
+ deltaeta1_crack = mydeltaeta1; deltaphi2_crack = mydeltaphi2; trackd0_crack = mytrackd0;
+ eoverp_crack = myeoverp;
+ et_crack = myet ; eta_crack = myeta ; phi_crack = myphi ;
+ time_crack = mytime; ehad1_crack = myehad1; coreem_crack = myecore;
+ f0_crack = myf0; f1_crack = myf1; f2_crack = myf2; f3_crack = myf3; re233e237_crack = myre233e237; re237e277_crack = myre237e277;
+ fill("MonitorElectron",nofblayerhits_crack, nofpixelhits_crack,nofscthits_crack,noftrthits_crack,noftrthighthresholdhits_crack,
+ deltaeta1_crack, deltaphi2_crack,trackd0_crack,eoverp_crack,et_crack,eta_crack,phi_crack,
+ time_crack, ehad1_crack,coreem_crack,f0_crack,f1_crack,f2_crack,f3_crack,re233e237_crack,re237e277_crack,is_pt_gt_4gev_crack);
+ break;
+
default :
//ATH_MSG_WARNING("found an electron outside the |eta| > 2.47 acceptance");
break;
diff --git a/Reconstruction/egamma/egammaPerformance/src/MonitorPhotonAlgorithm.cxx b/Reconstruction/egamma/egammaPerformance/src/MonitorPhotonAlgorithm.cxx
index 75719765524e..4960856ac1d9 100755
--- a/Reconstruction/egamma/egammaPerformance/src/MonitorPhotonAlgorithm.cxx
+++ b/Reconstruction/egamma/egammaPerformance/src/MonitorPhotonAlgorithm.cxx
@@ -57,6 +57,9 @@ StatusCode MonitorPhotonAlgorithm::fillHistograms( const EventContext& ctx ) con
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_4gev_barrel = Monitored::Scalar<bool>("is_pt_gt_4gevBARREL",false);
+ auto is_pt_gt_4gev_endcap = Monitored::Scalar<bool>("is_pt_gt_4gevENDCAP",false);
+ auto is_pt_gt_4gev_crack = Monitored::Scalar<bool>("is_pt_gt_4gevCRACK",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);
@@ -77,7 +80,7 @@ StatusCode MonitorPhotonAlgorithm::fillHistograms( const EventContext& ctx ) con
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 re233e237_barrel = Monitored::Scalar<Float_t>("Re233e237inBARREL",0.0);
auto re237e277_barrel = Monitored::Scalar<Float_t>("Re237e277inBARREL",0.0);
// ENDCAP
@@ -93,7 +96,7 @@ StatusCode MonitorPhotonAlgorithm::fillHistograms( const EventContext& ctx ) con
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 re233e237_endcap = Monitored::Scalar<Float_t>("Re233e237inENDCAP",0.0);
auto re237e277_endcap = Monitored::Scalar<Float_t>("Re237e277inENDCAP",0.0);
// CRACK
@@ -109,7 +112,7 @@ StatusCode MonitorPhotonAlgorithm::fillHistograms( const EventContext& ctx ) con
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 re233e237_crack = Monitored::Scalar<Float_t>("Re233e237inCRACK",0.0);
auto re237e277_crack = Monitored::Scalar<Float_t>("Re237e277inCRACK",0.0);
// Specific Photon variables
@@ -175,6 +178,11 @@ StatusCode MonitorPhotonAlgorithm::fillHistograms( const EventContext& ctx ) con
is_pt_gt_4gev = myis_pt_gt_4gev ;
is_pt_gt_20gev = myis_pt_gt_20gev ;
+ is_pt_gt_4gev_barrel = myis_pt_gt_4gev ;
+ is_pt_gt_4gev_endcap = myis_pt_gt_4gev ;
+ is_pt_gt_4gev_crack = myis_pt_gt_4gev ;
+
+
// Isolation Energy
Float_t mytopoetcone40 = -999.;
p_iter->isolationValue(mytopoetcone40,xAOD::Iso::topoetcone40);
@@ -260,35 +268,34 @@ StatusCode MonitorPhotonAlgorithm::fillHistograms( const EventContext& ctx ) con
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);
+ fill("MonitorPhoton",np_barrel,et_barrel,eta_barrel,phi_barrel, time_barrel, ehad1_barrel,coreem_barrel,
+ f0_barrel,f1_barrel,f2_barrel, f3_barrel,re233e237_barrel,re237e277_barrel,
+ rconv_barrel,convtype_barrel,contrkmatch1_barrel,contrkmatch2_barrel,is_pt_gt_4gev_barrel);
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);
+ fill("MonitorPhoton",np_endcap,et_endcap,eta_endcap,phi_endcap,
+ time_endcap, ehad1_endcap,coreem_endcap,
+ f0_endcap,f1_endcap,f2_endcap,f3_endcap,re233e237_endcap,re237e277_endcap,
+ rconv_endcap,convtype_endcap,contrkmatch1_endcap,contrkmatch2_endcap,is_pt_gt_4gev_endcap);
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);
+ fill("MonitorPhoton",np_crack,et_crack,eta_crack,phi_crack,
+ time_crack, ehad1_crack,coreem_crack,
+ f0_crack,f1_crack,f2_crack,f3_crack,re233e237_crack,re237e277_crack,
+ rconv_crack,convtype_crack,contrkmatch1_crack,contrkmatch2_crack,is_pt_gt_4gev_crack);
break;
default :
diff --git a/Reconstruction/egamma/egammaPerformance/src/MonitorTnPAlgorithm.cxx b/Reconstruction/egamma/egammaPerformance/src/MonitorTnPAlgorithm.cxx
index b3c1c030be21..66d1222f6c08 100644
--- a/Reconstruction/egamma/egammaPerformance/src/MonitorTnPAlgorithm.cxx
+++ b/Reconstruction/egamma/egammaPerformance/src/MonitorTnPAlgorithm.cxx
@@ -128,8 +128,7 @@ StatusCode MonitorTnPAlgorithm::fillHistograms( const EventContext& ctx ) const
break;
}
-
- ATH_MSG_DEBUG("Zee mass & cuts: (" << mass << ", " << m_MassLowerCut << ", " << m_MassUpperCut << ")");
+ ATH_MSG_DEBUG("ee mass & cuts: (" << mass << ", " << m_MassLowerCut << ", " << m_MassUpperCut << ")");
if(mass<m_MassLowerCut || mass>m_MassUpperCut) return StatusCode::SUCCESS;
// Register this good Tag & Probe candidate
@@ -210,73 +209,77 @@ StatusCode MonitorTnPAlgorithm::fillElectronProbe(const xAOD::Electron *el, cons
// 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);
+
+ auto et_barrel = Monitored::Scalar<Float_t>("EtProbeinBARREL",0.0);
+ auto eta_barrel = Monitored::Scalar<Float_t>("EtaProbeinBARREL",0.0);
+ auto phi_barrel = Monitored::Scalar<Float_t>("PhiProbeinBARREL",0.0);
+ auto time_barrel = Monitored::Scalar<Float_t>("TimeProbeinBARREL",0.0);
+ auto ehad1_barrel = Monitored::Scalar<Float_t>("Ehad1ProbeinBARREL",0.0);
+ auto eoverp_barrel = Monitored::Scalar<Float_t>("EoverPProbeinBARREL",0.0);
+ auto coreem_barrel = Monitored::Scalar<Float_t>("CoreEMProbeinBARREL",0.0);
+ auto f0_barrel = Monitored::Scalar<Float_t>("F0ProbeinBARREL",0.0);
+ auto f1_barrel = Monitored::Scalar<Float_t>("F1ProbeinBARREL",0.0);
+ auto f2_barrel = Monitored::Scalar<Float_t>("F2ProbeinBARREL",0.0);
+ auto f3_barrel = Monitored::Scalar<Float_t>("F3ProbeinBARREL",0.0);
+ auto re233e237_barrel = Monitored::Scalar<Float_t>("Re233e237ProbeinBARREL",0.0);
+ auto re237e277_barrel = Monitored::Scalar<Float_t>("Re237e277ProbeinBARREL",0.0);
+ auto nofblayerhits_barrel = Monitored::Scalar<u_int8_t>("NOfBLayerHitsProbeinBARREL",0);
+ auto nofpixelhits_barrel = Monitored::Scalar<u_int8_t>("NOfPixelHitsProbeinBARREL",0);
+ auto nofscthits_barrel = Monitored::Scalar<u_int8_t>("NOfSCTHitsProbeinBARREL",0);
+ auto noftrthits_barrel = Monitored::Scalar<u_int8_t>("NOfTRTHitsProbeinBARREL",0);
+ auto noftrthighthresholdhits_barrel = Monitored::Scalar<u_int8_t>("NOfTRTHighThresholdHitsProbeinBARREL",0);
+ auto deltaeta1_barrel = Monitored::Scalar<Float_t>("DeltaEta1ProbeinBARREL",0.0);
+ auto deltaphi2_barrel = Monitored::Scalar<Float_t>("DeltaPhi2ProbeinBARREL",0.0);
+ auto trackd0_barrel = Monitored::Scalar<Float_t>("Trackd0ProbeinBARREL",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);
+
+ auto et_endcap = Monitored::Scalar<Float_t>("EtProbeinENDCAP",0.0);
+ auto eta_endcap = Monitored::Scalar<Float_t>("EtaProbeinENDCAP",0.0);
+ auto phi_endcap = Monitored::Scalar<Float_t>("PhiProbeinENDCAP",0.0);
+ auto time_endcap = Monitored::Scalar<Float_t>("TimeProbeinENDCAP",0.0);
+ auto ehad1_endcap = Monitored::Scalar<Float_t>("Ehad1ProbeinENDCAP",0.0);
+ auto eoverp_endcap = Monitored::Scalar<Float_t>("EoverPProbeinENDCAP",0.0);
+ auto coreem_endcap = Monitored::Scalar<Float_t>("CoreEMProbeinENDCAP",0.0);
+ auto f0_endcap = Monitored::Scalar<Float_t>("F0ProbeinENDCAP",0.0);
+ auto f1_endcap = Monitored::Scalar<Float_t>("F1ProbeinENDCAP",0.0);
+ auto f2_endcap = Monitored::Scalar<Float_t>("F2ProbeinENDCAP",0.0);
+ auto f3_endcap = Monitored::Scalar<Float_t>("F3ProbeinENDCAP",0.0);
+ auto re233e237_endcap = Monitored::Scalar<Float_t>("Re233e237ProbeinENDCAP",0.0);
+ auto re237e277_endcap = Monitored::Scalar<Float_t>("Re237e277ProbeinENDCAP",0.0);
+ auto nofblayerhits_endcap = Monitored::Scalar<u_int8_t>("NOfBLayerHitsProbeinENDCAP",0);
+ auto nofpixelhits_endcap = Monitored::Scalar<u_int8_t>("NOfPixelHitsProbeinENDCAP",0);
+ auto nofscthits_endcap = Monitored::Scalar<u_int8_t>("NOfSCTHitsProbeinENDCAP",0);
+ auto noftrthits_endcap = Monitored::Scalar<u_int8_t>("NOfTRTHitsProbeinENDCAP",0);
+ auto noftrthighthresholdhits_endcap = Monitored::Scalar<u_int8_t>("NOfTRTHighThresholdHitsProbeinENDCAP",0);
+ auto deltaeta1_endcap = Monitored::Scalar<Float_t>("DeltaEta1ProbeinENDCAP",0.0);
+ auto deltaphi2_endcap = Monitored::Scalar<Float_t>("DeltaPhi2ProbeinENDCAP",0.0);
+ auto trackd0_endcap = Monitored::Scalar<Float_t>("Trackd0ProbeinENDCAP",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);
+
+ auto et_crack = Monitored::Scalar<Float_t>("EtProbeinCRACK",0.0);
+ auto eta_crack = Monitored::Scalar<Float_t>("EtaProbeinCRACK",0.0);
+ auto phi_crack = Monitored::Scalar<Float_t>("PhiProbeinCRACK",0.0);
+ auto time_crack = Monitored::Scalar<Float_t>("TimeProbeinCRACK",0.0);
+ auto ehad1_crack = Monitored::Scalar<Float_t>("Ehad1ProbeinCRACK",0.0);
+ auto eoverp_crack = Monitored::Scalar<Float_t>("EoverPProbeinCRACK",0.0);
+ auto coreem_crack = Monitored::Scalar<Float_t>("CoreEMProbeinCRACK",0.0);
+ auto f0_crack = Monitored::Scalar<Float_t>("F0ProbeinCRACK",0.0);
+ auto f1_crack = Monitored::Scalar<Float_t>("F1ProbeinCRACK",0.0);
+ auto f2_crack = Monitored::Scalar<Float_t>("F2ProbeinCRACK",0.0);
+ auto f3_crack = Monitored::Scalar<Float_t>("F3ProbeinCRACK",0.0);
+ auto re233e237_crack = Monitored::Scalar<Float_t>("Re233e237ProbeinCRACK",0.0);
+ auto re237e277_crack = Monitored::Scalar<Float_t>("Re237e277ProbeinCRACK",0.0);
+ auto nofblayerhits_crack = Monitored::Scalar<u_int8_t>("NOfBLayerHitsProbeinCRACK",0);
+ auto nofpixelhits_crack = Monitored::Scalar<u_int8_t>("NOfPixelHitsProbeinCRACK",0);
+ auto nofscthits_crack = Monitored::Scalar<u_int8_t>("NOfSCTHitsProbeinCRACK",0);
+ auto noftrthits_crack = Monitored::Scalar<u_int8_t>("NOfTRTHitsProbeinCRACK",0);
+ auto noftrthighthresholdhits_crack = Monitored::Scalar<u_int8_t>("NOfTRTHighThresholdHitsProbeinCRACK",0);
+ auto deltaeta1_crack = Monitored::Scalar<Float_t>("DeltaEta1ProbeinCRACK",0.0);
+ auto deltaphi2_crack = Monitored::Scalar<Float_t>("DeltaPhi2ProbeinCRACK",0.0);
+ auto trackd0_crack = Monitored::Scalar<Float_t>("Trackd0ProbeinCRACK",0.0);
+
Float_t myeta = el->eta();
Float_t myphi = el->phi();
@@ -284,6 +287,15 @@ StatusCode MonitorTnPAlgorithm::fillElectronProbe(const xAOD::Electron *el, cons
auto is_pt_gt_4gev = Monitored::Scalar<bool>("is_pt_gt_4gev",false);
is_pt_gt_4gev = myet > 4000. ;
+ auto is_pt_gt_4gev_barrel = Monitored::Scalar<bool>("is_pt_gt_4gevBARREL",false);
+ is_pt_gt_4gev_barrel = myet > 4000. ;
+
+ auto is_pt_gt_4gev_endcap = Monitored::Scalar<bool>("is_pt_gt_4gevENDCAP",false);
+ is_pt_gt_4gev_endcap = myet > 4000. ;
+
+ auto is_pt_gt_4gev_crack = Monitored::Scalar<bool>("is_pt_gt_4gevCRACK",false);
+ is_pt_gt_4gev_crack = myet > 4000. ;
+
// Isolation Energy
el->isolationValue(myptcone20,xAOD::Iso::ptcone20);
@@ -296,9 +308,9 @@ StatusCode MonitorTnPAlgorithm::fillElectronProbe(const xAOD::Electron *el, cons
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 e233 = 0.0;
+ Float_t e237 = 0.0;
+ Float_t e277 = 0.0;
Float_t myre233e237 = 0.0;
Float_t myre237e277 = 0.0;
@@ -330,7 +342,7 @@ StatusCode MonitorTnPAlgorithm::fillElectronProbe(const xAOD::Electron *el, cons
u_int8_t mynoftrthits=-1;
u_int8_t mynoftrthighthresholdhits=-1;
- if(t) {
+ if (t) {
trackp = t->pt()*cosh(t->eta());
// retrieve track summary information
t->summaryValue(mynofblayerhits,xAOD::numberOfInnermostPixelLayerHits);
@@ -366,56 +378,56 @@ StatusCode MonitorTnPAlgorithm::fillElectronProbe(const xAOD::Electron *el, cons
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;
+
+ nofblayerhits_barrel = mynofblayerhits ; nofpixelhits_barrel = mynofpixelhits ; nofscthits_barrel = mynofscthits ;
+ noftrthits_barrel = mynoftrthits ; noftrthighthresholdhits_barrel = mynoftrthighthresholdhits;
+ deltaeta1_barrel = mydeltaeta1; deltaphi2_barrel = mydeltaphi2; trackd0_barrel = mytrackd0;
+ eoverp_barrel = myeoverp;
+ et_barrel = myet ; eta_barrel = myeta ; phi_barrel = myphi ;
+ time_barrel = mytime; ehad1_barrel = myehad1; coreem_barrel = myecore;
+ f0_barrel = myf0; f1_barrel = myf1; f2_barrel = myf2; f3_barrel = myf3; re233e237_barrel = myre233e237; re237e277_barrel = myre237e277;
+ fill("MonitorTnP",nofblayerhits_barrel, nofpixelhits_barrel, nofscthits_barrel, noftrthits_barrel, noftrthighthresholdhits_barrel,
+ deltaeta1_barrel, deltaphi2_barrel,trackd0_barrel,eoverp_barrel,
+ et_barrel,eta_barrel,phi_barrel, time_barrel, ehad1_barrel,coreem_barrel, f0_barrel,f1_barrel,f2_barrel, f3_barrel,
+ re233e237_barrel,re237e277_barrel,is_pt_gt_4gev_barrel);
+ 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;
+
+ nofblayerhits_endcap = mynofblayerhits; nofpixelhits_endcap = mynofpixelhits ; nofscthits_endcap = mynofscthits ;
+ noftrthits_endcap = mynoftrthits ; noftrthighthresholdhits_endcap = mynoftrthighthresholdhits;
+ deltaeta1_endcap = mydeltaeta1; deltaphi2_endcap = mydeltaphi2; trackd0_endcap = mytrackd0;
+ eoverp_endcap = myeoverp;
+ et_endcap = myet ; eta_endcap = myeta ; phi_endcap = myphi ;
+ time_endcap = mytime; ehad1_endcap = myehad1; coreem_endcap = myecore;
+ f0_endcap = myf0; f1_endcap = myf1; f2_endcap = myf2; f3_endcap = myf3; re233e237_endcap = myre233e237; re237e277_endcap = myre237e277;
+ fill("MonitorTnP",nofblayerhits_endcap,nofpixelhits_endcap,nofscthits_endcap,noftrthits_endcap,noftrthighthresholdhits_endcap,
+ deltaeta1_endcap, deltaphi2_endcap,trackd0_endcap,eoverp_endcap,et_endcap,eta_endcap,phi_endcap,
+ time_endcap, ehad1_endcap,coreem_endcap,
+ f0_endcap,f1_endcap,f2_endcap,f3_endcap,re233e237_endcap,re237e277_endcap,is_pt_gt_4gev_endcap);
+ 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;
+ nofblayerhits_crack = mynofblayerhits; nofpixelhits_crack = mynofpixelhits ; nofscthits_crack = mynofscthits ;
+ noftrthits_crack = mynoftrthits ; noftrthighthresholdhits_crack = mynoftrthighthresholdhits;
+ deltaeta1_crack = mydeltaeta1; deltaphi2_crack = mydeltaphi2; trackd0_crack = mytrackd0;
+ eoverp_crack = myeoverp;
+ et_crack = myet ; eta_crack = myeta ; phi_crack = myphi ;
+ time_crack = mytime; ehad1_crack = myehad1; coreem_crack = myecore;
+ f0_crack = myf0; f1_crack = myf1; f2_crack = myf2; f3_crack = myf3; re233e237_crack = myre233e237; re237e277_crack = myre237e277;
+ fill("MonitorTnP",nofblayerhits_crack, nofpixelhits_crack,nofscthits_crack,noftrthits_crack,noftrthighthresholdhits_crack,
+ deltaeta1_crack, deltaphi2_crack,trackd0_crack,eoverp_crack,et_crack,eta_crack,phi_crack,
+ time_crack, ehad1_crack,coreem_crack,f0_crack,f1_crack,f2_crack,f3_crack,re233e237_crack,re237e277_crack,is_pt_gt_4gev_crack);
+ break;
default :
- //ATH_MSG_WARNING("found an electron outside the |eta| > 2.47 acceptance");
- break;
+ //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);
+ ptcone20,topoetcone40,lbNProbeCandidates,is_TightID,is_Iso,is_IsoandTight);
return StatusCode::SUCCESS;
}
--
GitLab
From 48b9d54a9a3581f9d65757605a24ace3d4a70459 Mon Sep 17 00:00:00 2001
From: Bertrand LAFORGE <laforge@lpnhe.in2p3.fr>
Date: Wed, 1 Sep 2021 16:35:28 +0200
Subject: [PATCH 264/272] Enable Tnp Monitors in the egammaMonitoringConfig.py
file
---
.../config/Egamma/collisions_run.config | 2747 +----------------
1 file changed, 155 insertions(+), 2592 deletions(-)
diff --git a/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config b/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config
index 623fecc0b34f..4abc12781108 100644
--- a/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config
@@ -101,7 +101,6 @@ algorithm 2D_Histogram_Not_Empty {
reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
}
-
algorithm egamma_FitZmass {
libname = libdqm_algorithms.so
name = Simple_gaus_Fit
@@ -125,92 +124,62 @@ algorithm egamma_FitJPsimass {
output top_level {
algorithm = WorstCaseSummary
output egamma {
- algorithm = WorstCaseSummary
output photons {
- algorithm = WorstCaseSummary
output EXPERT {
- algorithm = WorstCaseSummary
}
output ID {
- algorithm = WorstCaseSummary
}
output LBMon {
- algorithm = WorstCaseSummary
}
}
output photonsWithTrigger {
- algorithm = WorstCaseSummary
output EXPERT {
- algorithm = WorstCaseSummary
}
output ID {
- algorithm = WorstCaseSummary
}
output LBMon {
- algorithm = WorstCaseSummary
}
}
output electrons {
- algorithm = WorstCaseSummary
output EXPERT {
- algorithm = WorstCaseSummary
}
output ID {
- algorithm = WorstCaseSummary
}
output Track {
- algorithm = WorstCaseSummary
}
output LBMon {
- algorithm = WorstCaseSummary
}
}
output electronsWithTrigger {
- algorithm = WorstCaseSummary
output EXPERT {
- algorithm = WorstCaseSummary
}
output ID {
- algorithm = WorstCaseSummary
}
output Track {
- algorithm = WorstCaseSummary
}
output LBMon {
- algorithm = WorstCaseSummary
}
}
output forwardElectrons {
- algorithm = WorstCaseSummary
output ID {
- algorithm = WorstCaseSummary
}
output EXPERT {
- algorithm = WorstCaseSummary
}
}
output tagandprobeZ {
- algorithm = WorstCaseSummary
output ID {
- algorithm = WorstCaseSummary
}
output Track {
- algorithm = WorstCaseSummary
}
output LBMon {
- algorithm = WorstCaseSummary
}
}
output tagandprobeJPsi {
- algorithm = WorstCaseSummary
output ID {
- algorithm = WorstCaseSummary
}
output Track {
- algorithm = WorstCaseSummary
}
output LBMon {
- algorithm = WorstCaseSummary
}
}
}
@@ -220,2605 +189,199 @@ output top_level {
# Histogram Assessments
#######################
- dir egamma/electrons {
+##################################
+# Electrons
+#################################@
+
+# LhLoose
+
+dir egamma/LHLooseElectrons {
output = egamma/electrons
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
- # CbLoose
- hist electronNCbLoose {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist electronEtCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20CbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40CbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
-
- # CbTight
- hist electronNCbTight {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist electronEtCbTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiCbTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaCbTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20CbTight {
- algorithm = egKolmogorov
- }
- hist electronTopoEtCone40CbTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeCbTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
-
- # LhLoose
- hist electronNLhLoose {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist electronEtLhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaPhiPtgt2.5GeVLhLoose {
- output = egamma/electrons/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt4GeVLhLoose {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt20GeVLhLoose {
- output = egamma/electrons/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronPtCone20LhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhLoose_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhLoose_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhLoose_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhLoose_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhLoose_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhLoose_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhLoose_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhLoose_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhLoose_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhLoose_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhLoose_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhLoose_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhLoose_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhLoose_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhLoose_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhLoose_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhLoose_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhLoose_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaPhiPtgt2.5GeVLhLoose {
- output = egamma/electrons/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt4GeVLhLoose {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt20GeVLhLoose {
- output = egamma/electrons/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronPtCone20LhLoose_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhLoose_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhLoose_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
-
- # LhMedium
- hist electronNLhMedium {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist electronEtLhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaPhiPtgt2.5GeVLhMedium {
- output = egamma/electrons/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- # algorithm = egamma_BinsDiffFromStripMedian
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt4GeVLhMedium {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt20GeVLhMedium {
- output = egamma/electrons/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronPtCone20LhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhMedium_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhMedium_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhMedium_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhMedium_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhMedium_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhMedium_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhMedium_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhMedium_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhMedium_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhMedium_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhMedium_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhMedium_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhMedium_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhMedium_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhMedium_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhMedium_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhMedium_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhMedium_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhMedium_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhMedium_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhMedium_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
-
- # LhTight
- hist electronNLhTight {
+ hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
}
- hist electronEtLhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaPhiPtgt2.5GeVLhTight {
- output = egamma/electrons/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt4GeVLhTight {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt20GeVLhTight {
- output = egamma/electrons/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronPtCone20LhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhTight_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhTight_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhTight_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhTight_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhTight_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhTight_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhTight_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhTight_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhTight_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhTight_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhTight_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhTight_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhTight_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhTight_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhTight_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtLhTight_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhTight_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhTight_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhTight_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhTight_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhTight_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
+ hist Et { }
+ hist Phi { }
+ hist Eta { }
+ hist PtCone20 { }
+ hist EtCone40 { }
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV { }
+ hist Time { }
}
- dir egamma/electrons/ID {
- algorithm = egKolmogorov
- output = egamma/electrons/ID
- display = Draw=e1,StatBox
+dir egamma/LHLooseElectrons/Expert {
+ output = egamma/electrons/Expert
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
- # LhLoose
- hist electronEhad1LhLoose_BARREL {
- }
- hist electronEoverPLhLoose_BARREL {
- }
- hist electronCoreEMLhLoose_BARREL {
- }
- hist electronF0LhLoose_BARREL {
- }
- hist electronF1LhLoose_BARREL {
- }
- hist electronF2LhLoose_BARREL {
- }
- hist electronF3LhLoose_BARREL {
- }
- hist electronRe233e237LhLoose_BARREL {
- }
- hist electronRe237e277LhLoose_BARREL {
- }
- hist electronEhad1LhLoose_CRACK {
- }
- hist electronEoverPLhLoose_CRACK {
- }
- hist electronCoreEMLhLoose_CRACK {
- }
- hist electronF0LhLoose_CRACK {
- }
- hist electronF1LhLoose_CRACK {
- }
- hist electronF2LhLoose_CRACK {
- }
- hist electronF3LhLoose_CRACK {
- }
- hist electronRe233e237LhLoose_CRACK {
- }
- hist electronRe237e277LhLoose_CRACK {
- }
- hist electronEhad1LhLoose_ENDCAP {
- }
- hist electronEoverPLhLoose_ENDCAP {
- }
- hist electronCoreEMLhLoose_ENDCAP {
- }
- hist electronF0LhLoose_ENDCAP {
- }
- hist electronF1LhLoose_ENDCAP {
- }
- hist electronF2LhLoose_ENDCAP {
- }
- hist electronF3LhLoose_ENDCAP {
- }
- hist electronRe233e237LhLoose_ENDCAP {
- }
- hist electronRe237e277LhLoose_ENDCAP {
- }
+ hist Eta_Phi_with_Pt_gt_2.5GeV { }
+ hist Eta_Phi_with_Pt_gt_20GeV { }
+}
- # LhMedium
- hist electronEhad1LhMedium_BARREL {
- }
- hist electronEoverPLhMedium_BARREL {
- }
- hist electronCoreEMLhMedium_BARREL {
- }
- hist electronF0LhMedium_BARREL {
- }
- hist electronF1LhMedium_BARREL {
- }
- hist electronF2LhMedium_BARREL {
- }
- hist electronF3LhMedium_BARREL {
- }
- hist electronRe233e237LhMedium_BARREL {
- }
- hist electronRe237e277LhMedium_BARREL {
- }
- hist electronEhad1LhMedium_CRACK {
- }
- hist electronEoverPLhMedium_CRACK {
- }
- hist electronCoreEMLhMedium_CRACK {
- }
- hist electronF0LhMedium_CRACK {
- }
- hist electronF1LhMedium_CRACK {
- }
- hist electronF2LhMedium_CRACK {
- }
- hist electronF3LhMedium_CRACK {
- }
- hist electronRe233e237LhMedium_CRACK {
- }
- hist electronRe237e277LhMedium_CRACK {
- }
- hist electronEhad1LhMedium_ENDCAP {
- }
- hist electronEoverPLhMedium_ENDCAP {
- }
- hist electronCoreEMLhMedium_ENDCAP {
- }
- hist electronF0LhMedium_ENDCAP {
- }
- hist electronF1LhMedium_ENDCAP {
- }
- hist electronF2LhMedium_ENDCAP {
- }
- hist electronF3LhMedium_ENDCAP {
- }
- hist electronRe233e237LhMedium_ENDCAP {
- }
- hist electronRe237e277LhMedium_ENDCAP {
- }
+dir egamma/LHLooseElectrons/byLB {
+ output = egamma/electrons/byLB
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
- # LhTight
- hist electronEhad1LhTight_BARREL {
- }
- hist electronEoverPLhTight_BARREL {
- }
- hist electronCoreEMLhTight_BARREL {
- }
- hist electronF0LhTight_BARREL {
- }
- hist electronF1LhTight_BARREL {
- }
- hist electronF2LhTight_BARREL {
- }
- hist electronF3LhTight_BARREL {
- }
- hist electronRe233e237LhTight_BARREL {
- }
- hist electronRe237e277LhTight_BARREL {
- }
- hist electronEhad1LhTight_CRACK {
- }
- hist electronEoverPLhTight_CRACK {
- }
- hist electronCoreEMLhTight_CRACK {
- }
- hist electronF0LhTight_CRACK {
- }
- hist electronF1LhTight_CRACK {
- }
- hist electronF2LhTight_CRACK {
- }
- hist electronF3LhTight_CRACK {
- }
- hist electronRe233e237LhTight_CRACK {
- }
- hist electronRe237e277LhTight_CRACK {
- }
- hist electronEhad1LhTight_ENDCAP {
- }
- hist electronEoverPLhTight_ENDCAP {
- }
- hist electronCoreEMLhTight_ENDCAP {
- }
- hist electronF0LhTight_ENDCAP {
- }
- hist electronF1LhTight_ENDCAP {
- }
- hist electronF2LhTight_ENDCAP {
- }
- hist electronF3LhTight_ENDCAP {
- }
- hist electronRe233e237LhTight_ENDCAP {
- }
- hist electronRe237e277LhTight_ENDCAP {
- }
+ hist LBEvON { }
}
- dir egamma/electrons/Track {
+dir egamma/LHLooseElectrons/Expert/ID {
+ algorithm = egKolmogorov
+ output = egamma/electrons/ID
+ display = Draw=e1,StatBox
+
+ hist Ehad1_BARREL { }
+ hist EoverP_BARREL { }
+ hist CoreEM_BARREL { }
+ hist F0_BARREL { }
+ hist F1_BARREL { }
+ hist F2_BARREL { }
+ hist F3_BARREL { }
+ hist Re233e237_BARREL { }
+ hist Re237e277_BARREL { }
+ hist Ehad1_CRACK { }
+ hist EoverP_CRACK { }
+ hist CoreEM_CRACK { }
+ hist F0_CRACK { }
+ hist F1_CRACK { }
+ hist F2_CRACK { }
+ hist F3_CRACK { }
+ hist Re233e237_CRACK { }
+ hist Re237e277_CRACK { }
+ hist Ehad1_ENDCAP { }
+ hist EoverP_ENDCAP { }
+ hist CoreEM_ENDCAP { }
+ hist F0_ENDCAP { }
+ hist F1_ENDCAP { }
+ hist F2_ENDCAP { }
+ hist F3_ENDCAP { }
+ hist Re233e237_ENDCAP { }
+ hist Re237e277_ENDCAP { }
+}
+
+dir egamma/LHLooseElectrons/Expert/Track {
algorithm = egKolmogorov
output = egamma/electrons/Track
display = Draw=e1,StatBox
- # LhLoose
- hist electronNOfBLayersHitsLhLoose_BARREL {
- }
- hist electronNOfTRTHitsLhLoose_BARREL {
- }
- hist electronNOfSiHitsLhLoose_BARREL {
- }
- hist electronDeltaEta1LhLoose_BARREL {
- }
- hist electronDeltaPhi2LhLoose_BARREL {
- }
- hist electronDeltaEta1LhLoose_CRACK {
- }
- hist electronDeltaPhi2LhLoose_CRACK {
- }
- hist electronNOfBLayersHitsLhLoose_CRACK {
- }
- hist electronNOfTRTHitsLhLoose_CRACK {
- }
- hist electronNOfSiHitsLhLoose_CRACK {
- }
- hist electronDeltaEta1LhLoose_ENDCAP {
- }
- hist electronDeltaPhi2LhLoose_ENDCAP {
- }
- hist electronNOfBLayersHitsLhLoose_ENDCAP {
- }
- hist electronNOfTRTHitsLhLoose_ENDCAP {
- }
- hist electronNOfSiHitsLhLoose_ENDCAP {
- }
+ hist electronNOfBLayersHitsLhLoose_BARREL { }
+ hist electronNOfTRTHitsLhLoose_BARREL { }
+ hist electronNOfSiHitsLhLoose_BARREL { }
+ hist electronDeltaEta1LhLoose_BARREL { }
+ hist electronDeltaPhi2LhLoose_BARREL { }
+ hist electronDeltaEta1LhLoose_CRACK { }
+ hist electronDeltaPhi2LhLoose_CRACK { }
+ hist electronNOfBLayersHitsLhLoose_CRACK { }
+ hist electronNOfTRTHitsLhLoose_CRACK { }
+ hist electronNOfSiHitsLhLoose_CRACK { }
+ hist electronDeltaEta1LhLoose_ENDCAP { }
+ hist electronDeltaPhi2LhLoose_ENDCAP { }
+ hist electronNOfBLayersHitsLhLoose_ENDCAP { }
+ hist electronNOfTRTHitsLhLoose_ENDCAP { }
+ hist electronNOfSiHitsLhLoose_ENDCAP { }
+}
+
+##############################################
+### photons
+##############################################
- # LhMedium
- hist electronNOfBLayersHitsLhMedium_BARREL {
- }
- hist electronNOfTRTHitsLhMedium_BARREL {
- }
- hist electronNOfSiHitsLhMedium_BARREL {
- }
- hist electronDeltaEta1LhMedium_BARREL {
- }
- hist electronDeltaPhi2LhMedium_BARREL {
- }
- hist electronDeltaEta1LhMedium_CRACK {
- }
- hist electronDeltaPhi2LhMedium_CRACK {
- }
- hist electronNOfBLayersHitsLhMedium_CRACK {
- }
- hist electronNOfTRTHitsLhMedium_CRACK {
- }
- hist electronNOfSiHitsLhMedium_CRACK {
- }
- hist electronDeltaEta1LhMedium_ENDCAP {
- }
- hist electronDeltaPhi2LhMedium_ENDCAP {
- }
- hist electronNOfBLayersHitsLhMedium_ENDCAP {
- }
- hist electronNOfTRTHitsLhMedium_ENDCAP {
- }
- hist electronNOfSiHitsLhMedium_ENDCAP {
- }
+# CBLoose
- # LhTight
- hist electronNOfBLayersHitsLhTight_BARREL {
- }
- hist electronNOfTRTHitsLhTight_BARREL {
- }
- hist electronNOfSiHitsLhTight_BARREL {
- }
- hist electronDeltaEta1LhTight_BARREL {
- }
- hist electronDeltaPhi2LhTight_BARREL {
- }
- hist electronDeltaEta1LhTight_CRACK {
- }
- hist electronDeltaPhi2LhTight_CRACK {
- }
- hist electronNOfBLayersHitsLhTight_CRACK {
- }
- hist electronNOfTRTHitsLhTight_CRACK {
- }
- hist electronNOfSiHitsLhTight_CRACK {
- }
- hist electronDeltaEta1LhTight_ENDCAP {
- }
- hist electronDeltaPhi2LhTight_ENDCAP {
- }
- hist electronNOfBLayersHitsLhTight_ENDCAP {
- }
- hist electronNOfTRTHitsLhTight_ENDCAP {
- }
- hist electronNOfSiHitsLhTight_ENDCAP {
- }
- }
+dir egamma/CBLoosePhotons {
+ output = egamma/electrons
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
- dir egamma/electrons/LBMon {
- algorithm = egamma_GatherData
- output = egamma/electrons/LBMon
- display = Draw=e1,StatBox
- # LhLoose
- hist LBEvoNElectronsLhLoose {
- }
- # LhMedium
- hist LBEvoNElectronsLhMedium {
- }
- # LhTight
- hist LBEvoNElectronsLhTight {
- }
- # CbLoose
- hist LBEvoNElectronsCbLoose {
- }
- # CbTight
- hist LBEvoNElectronsCbTight {
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
}
+ hist Et { }
+ hist Phi { }
+ hist Eta { }
+ hist PtCone20 { }
+ hist EtCone40 { }
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV { }
+ hist Time { }
}
-### electronsWithTrigger
+dir egamma/CBLoosePhotons/Expert {
+ output = egamma/photons/Expert
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
- dir egamma/electronsWithTrigger {
- output = egamma/electronsWithTrigger
+ hist Eta_Phi_with_Pt_gt_2.5GeV { }
+ hist Eta_Phi_with_Pt_gt_20GeV { }
+}
- # CbLoose
- hist electronNCbLoose {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist electronEtCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20CbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40CbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaPhiPtgt2.5GeVCbLoose {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt4GeVCbLoose {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt20GeVCbLoose {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
-
- # CbTight
- hist electronNCbTight {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist electronEtCbTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiCbTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaCbTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaPhiPtgt2.5GeVCbTight {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt4GeVCbTight {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt20GeVCbTight {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronPtCone20CbTight {
- algorithm = egKolmogorov
- }
- hist electronTopoEtCone40CbTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeCbTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
-
- # LhLoose
- hist electronNLhLoose {
- algorithm = egamma_Histogram_Not_Empty
- algorithm = egKolmogorov
- display = Draw=e1,StatBox,LogY
- }
- hist electronEtLhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaPhiPtgt2.5GeVLhLoose {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = 2D_Histogram_Not_Empty
-# algorithm = egamma_BinsDiffFromStripMedian
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt4GeVLhLoose {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt20GeVLhLoose {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
-
- hist electronPtCone20LhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhLoose_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhLoose_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhLoose_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhLoose_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhLoose_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhLoose_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhLoose_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhLoose_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhLoose_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhLoose_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhLoose_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhLoose_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhLoose_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhLoose_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhLoose_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhLoose_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhLoose_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhLoose_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhLoose_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhLoose_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhLoose_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
-
- # LhMedium
- hist electronNLhMedium {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist electronEtLhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaPhiPtgt2.5GeVLhMedium {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt4GeVLhMedium {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt20GeVLhMedium {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronPtCone20LhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhMedium_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhMedium_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhMedium_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhMedium_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhMedium_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhMedium_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhMedium_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhMedium_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhMedium_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhMedium_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhMedium_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhMedium_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhMedium_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhMedium_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhMedium_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhMedium_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhMedium_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhMedium_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhMedium_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhMedium_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhMedium_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
-
- # LhTight
- hist electronNLhTight {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist electronEtLhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaPhiPtgt2.5GeVLhTight {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt4GeVLhTight {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt20GeVLhTight {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronPtCone20LhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhTight_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhTight_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhTight_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhTight_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhTight_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhTight_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhTight_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhTight_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhTight_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhTight_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhTight_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhTight_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhTight_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhTight_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhTight_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtLhTight_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhTight_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhTight_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhTight_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhTight_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhTight_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
+dir egamma/CBLoosePhotons/byLB {
+ output = egamma/photons/byLB
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist LBEvON { }
}
- dir egamma/electronsWithTrigger/ID {
+dir egamma/CBLoosePhotons/Expert/ID {
algorithm = egKolmogorov
- output = egamma/electronsWithTrigger/ID
+ output = egamma/photons/ID
display = Draw=e1,StatBox
- # LhLoose
- hist electronEhad1LhLoose_BARREL {
- }
- hist electronEoverPLhLoose_BARREL {
- }
- hist electronCoreEMLhLoose_BARREL {
- }
- hist electronF0LhLoose_BARREL {
- }
- hist electronF1LhLoose_BARREL {
- }
- hist electronF2LhLoose_BARREL {
- }
- hist electronF3LhLoose_BARREL {
- }
- hist electronRe233e237LhLoose_BARREL {
- }
- hist electronRe237e277LhLoose_BARREL {
- }
- hist electronEhad1LhLoose_CRACK {
- }
- hist electronEoverPLhLoose_CRACK {
- }
- hist electronCoreEMLhLoose_CRACK {
- }
- hist electronF0LhLoose_CRACK {
- }
- hist electronF1LhLoose_CRACK {
- }
- hist electronF2LhLoose_CRACK {
- }
- hist electronF3LhLoose_CRACK {
- }
- hist electronRe233e237LhLoose_CRACK {
- }
- hist electronRe237e277LhLoose_CRACK {
- }
- hist electronEhad1LhLoose_ENDCAP {
- }
- hist electronEoverPLhLoose_ENDCAP {
- }
- hist electronCoreEMLhLoose_ENDCAP {
- }
- hist electronF0LhLoose_ENDCAP {
- }
- hist electronF1LhLoose_ENDCAP {
- }
- hist electronF2LhLoose_ENDCAP {
- }
- hist electronF3LhLoose_ENDCAP {
- }
- hist electronRe233e237LhLoose_ENDCAP {
- }
- hist electronRe237e277LhLoose_ENDCAP {
- }
+ hist Ehad1_BARREL { }
+ hist EoverP_BARREL { }
+ hist CoreEM_BARREL { }
+ hist F0_BARREL { }
+ hist F1_BARREL { }
+ hist F2_BARREL { }
+ hist F3_BARREL { }
+ hist Re233e237_BARREL { }
+ hist Re237e277_BARREL { }
+ hist Ehad1_CRACK { }
+ hist EoverP_CRACK { }
+ hist CoreEM_CRACK { }
+ hist F0_CRACK { }
+ hist F1_CRACK { }
+ hist F2_CRACK { }
+ hist F3_CRACK { }
+ hist Re233e237_CRACK { }
+ hist Re237e277_CRACK { }
+ hist Ehad1_ENDCAP { }
+ hist EoverP_ENDCAP { }
+ hist CoreEM_ENDCAP { }
+ hist F0_ENDCAP { }
+ hist F1_ENDCAP { }
+ hist F2_ENDCAP { }
+ hist F3_ENDCAP { }
+ hist Re233e237_ENDCAP { }
+ hist Re237e277_ENDCAP { }
+}
+
+########################################
+### forwardElectrons
+########################################
- # LhMedium
- hist electronEhad1LhMedium_BARREL {
- }
- hist electronEoverPLhMedium_BARREL {
- }
- hist electronCoreEMLhMedium_BARREL {
- }
- hist electronF0LhMedium_BARREL {
- }
- hist electronF1LhMedium_BARREL {
- }
- hist electronF2LhMedium_BARREL {
- }
- hist electronF3LhMedium_BARREL {
- }
- hist electronRe233e237LhMedium_BARREL {
- }
- hist electronRe237e277LhMedium_BARREL {
- }
- hist electronEhad1LhMedium_CRACK {
- }
- hist electronEoverPLhMedium_CRACK {
- }
- hist electronCoreEMLhMedium_CRACK {
- }
- hist electronF0LhMedium_CRACK {
- }
- hist electronF1LhMedium_CRACK {
- }
- hist electronF2LhMedium_CRACK {
- }
- hist electronF3LhMedium_CRACK {
- }
- hist electronRe233e237LhMedium_CRACK {
- }
- hist electronRe237e277LhMedium_CRACK {
- }
- hist electronEhad1LhMedium_ENDCAP {
- }
- hist electronEoverPLhMedium_ENDCAP {
- }
- hist electronCoreEMLhMedium_ENDCAP {
- }
- hist electronF0LhMedium_ENDCAP {
- }
- hist electronF1LhMedium_ENDCAP {
- }
- hist electronF2LhMedium_ENDCAP {
- }
- hist electronF3LhMedium_ENDCAP {
- }
- hist electronRe233e237LhMedium_ENDCAP {
- }
- hist electronRe237e277LhMedium_ENDCAP {
- }
+# Loose Forward Electrons
- # LhTight
- hist electronEhad1LhTight_BARREL {
- }
- hist electronEoverPLhTight_BARREL {
- }
- hist electronCoreEMLhTight_BARREL {
- }
- hist electronF0LhTight_BARREL {
- }
- hist electronF1LhTight_BARREL {
- }
- hist electronF2LhTight_BARREL {
- }
- hist electronF3LhTight_BARREL {
- }
- hist electronRe233e237LhTight_BARREL {
- }
- hist electronRe237e277LhTight_BARREL {
- }
- hist electronEhad1LhTight_CRACK {
- }
- hist electronEoverPLhTight_CRACK {
- }
- hist electronCoreEMLhTight_CRACK {
- }
- hist electronF0LhTight_CRACK {
- }
- hist electronF1LhTight_CRACK {
- }
- hist electronF2LhTight_CRACK {
- }
- hist electronF3LhTight_CRACK {
- }
- hist electronRe233e237LhTight_CRACK {
- }
- hist electronRe237e277LhTight_CRACK {
- }
- hist electronEhad1LhTight_ENDCAP {
- }
- hist electronEoverPLhTight_ENDCAP {
- }
- hist electronCoreEMLhTight_ENDCAP {
- }
- hist electronF0LhTight_ENDCAP {
- }
- hist electronF1LhTight_ENDCAP {
- }
- hist electronF2LhTight_ENDCAP {
- }
- hist electronF3LhTight_ENDCAP {
- }
- hist electronRe233e237LhTight_ENDCAP {
- }
- hist electronRe237e277LhTight_ENDCAP {
- }
-}
-
- dir egamma/electronsWithTrigger/Track {
- algorithm = egKolmogorov
- output = egamma/electronsWithTrigger/Track
- display = Draw=e1,StatBox
-
- # LhLoose
- hist electronNOfBLayersHitsLhLoose_BARREL {
- }
- hist electronNOfTRTHitsLhLoose_BARREL {
- }
- hist electronNOfSiHitsLhLoose_BARREL {
- }
- hist electronDeltaEta1LhLoose_BARREL {
- }
- hist electronDeltaPhi2LhLoose_BARREL {
- }
- hist electronDeltaEta1LhLoose_CRACK {
- }
- hist electronDeltaPhi2LhLoose_CRACK {
- }
- hist electronNOfBLayersHitsLhLoose_CRACK {
- }
- hist electronNOfTRTHitsLhLoose_CRACK {
- }
- hist electronNOfSiHitsLhLoose_CRACK {
- }
- hist electronDeltaEta1LhLoose_ENDCAP {
- }
- hist electronDeltaPhi2LhLoose_ENDCAP {
- }
- hist electronNOfBLayersHitsLhLoose_ENDCAP {
- }
- hist electronNOfTRTHitsLhLoose_ENDCAP {
- }
- hist electronNOfSiHitsLhLoose_ENDCAP {
- }
-
- # LhMedium
- hist electronNOfBLayersHitsLhMedium_BARREL {
- }
- hist electronNOfTRTHitsLhMedium_BARREL {
- }
- hist electronNOfSiHitsLhMedium_BARREL {
- }
- hist electronDeltaEta1LhMedium_BARREL {
- }
- hist electronDeltaPhi2LhMedium_BARREL {
- }
- hist electronDeltaEta1LhMedium_CRACK {
- }
- hist electronDeltaPhi2LhMedium_CRACK {
- }
- hist electronNOfBLayersHitsLhMedium_CRACK {
- }
- hist electronNOfTRTHitsLhMedium_CRACK {
- }
- hist electronNOfSiHitsLhMedium_CRACK {
- }
- hist electronDeltaEta1LhMedium_ENDCAP {
- }
- hist electronDeltaPhi2LhMedium_ENDCAP {
- }
- hist electronNOfBLayersHitsLhMedium_ENDCAP {
- }
- hist electronNOfTRTHitsLhMedium_ENDCAP {
- }
- hist electronNOfSiHitsLhMedium_ENDCAP {
- }
-
- # LhTight
- hist electronNOfBLayersHitsLhTight_BARREL {
- }
- hist electronNOfTRTHitsLhTight_BARREL {
- }
- hist electronNOfSiHitsLhTight_BARREL {
- }
- hist electronDeltaEta1LhTight_BARREL {
- }
- hist electronDeltaPhi2LhTight_BARREL {
- }
- hist electronDeltaEta1LhTight_CRACK {
- }
- hist electronDeltaPhi2LhTight_CRACK {
- }
- hist electronNOfBLayersHitsLhTight_CRACK {
- }
- hist electronNOfTRTHitsLhTight_CRACK {
- }
- hist electronNOfSiHitsLhTight_CRACK {
- }
- hist electronDeltaEta1LhTight_ENDCAP {
- }
- hist electronDeltaPhi2LhTight_ENDCAP {
- }
- hist electronNOfBLayersHitsLhTight_ENDCAP {
- }
- hist electronNOfTRTHitsLhTight_ENDCAP {
- }
- hist electronNOfSiHitsLhTight_ENDCAP {
- }
- }
-
- dir egamma/electronsWithTrigger/LBMon {
- algorithm = egamma_GatherData
- output = egamma/electronsWithTrigger/LBMon
- display = Draw=e1,StatBox
- # LhLoose
- hist LBEvoNElectronsLhLoose {
- }
- # LhMedium
- hist LBEvoNElectronsLhMedium {
- }
- # LhTight
- hist LBEvoNElectronsLhTight {
- }
- # CbLoose
- hist LBEvoNElectronsCbLoose {
- }
- # CbTight
- hist LBEvoNElectronsCbTight {
- }
-}
-
-
-### photons
-
-
- dir egamma/photons {
- output = egamma/photons
-
- # CbLoose
- hist photonNCbLoose {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonPhiCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonEtaPhiPt2.5GeVCbLoose {
- algorithm = egamma_BinsDiffFromStripMedian
- }
- hist photonEtaPhiPtgt4GeVCbLoose {
- algorithm = egamma_BinsDiffFromStripMedian
- }
- hist photonEtaPhiPtgt20GeVCbLoose {
- algorithm = egamma_BinsDiffFromStripMedian
- }
- hist photonPtCone20CbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonTopoEtCone40CbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonTimeCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonRconvCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
-
- # CbTight
- hist photonNCbTight {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonPhiCbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonEtaPhiPt2.5GeVCbTight {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist photonEtaPhiPtgt4GeVCbTight {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist photonEtaPhiPtgt20GeVCbTight {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist photonPtCone20CbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonTopoEtCone40CbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonTimeCbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonRconvCbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
-}
-
- dir egamma/photons/Region {
- algorithm = egKolmogorov
- output = egamma/photons/EXPERT
- display = Draw=e1,StatBox
-
- # CbLoose
- hist photonNCbLoose_BARREL {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbLoose_BARREL {
- }
- hist photonEtaCbLoose_BARREL {
- }
- hist photonPhiCbLoose_BARREL {
- }
- hist photonPtCone20CbLoose_BARREL {
- }
- hist photonTopoEtCone40CbLoose_BARREL {
- }
- hist photonNCbLoose_CRACK {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbLoose_CRACK {
- }
- hist photonEtaCbLoose_CRACK {
- }
- hist photonPhiCbLoose_CRACK {
- }
- hist photonPtCone20CbLoose_CRACK {
- }
- hist photonTopoEtCone40CbLoose_CRACK {
- }
- hist photonNCbLoose_ENDCAP {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbLoose_ENDCAP {
- }
- hist photonEtaCbLoose_ENDCAP {
- }
- hist photonPhiCbLoose_ENDCAP {
- }
- hist photonPtCone20CbLoose_ENDCAP {
- }
- hist photonTopoEtCone40CbLoose_ENDCAP {
- }
-
- # CbTight
- hist photonNCbTight_BARREL {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbTight_BARREL {
- }
- hist photonEtaCbTight_BARREL {
- }
- hist photonPhiCbTight_BARREL {
- }
- hist photonPtCone20CbTight_BARREL {
- }
- hist photonTopoEtCone40CbTight_BARREL {
- }
- hist photonNCbTight_CRACK {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbTight_CRACK {
- }
- hist photonEtaCbTight_CRACK {
- }
- hist photonPhiCbTight_CRACK {
- }
- hist photonPtCone20CbTight_CRACK {
- }
- hist photonTopoEtCone40CbTight_CRACK {
- }
- hist photonNCbTight_ENDCAP {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbTight_ENDCAP {
- }
- hist photonEtaCbTight_ENDCAP {
- }
- hist photonPhiCbTight_ENDCAP {
- }
- hist photonPtCone20CbTight_ENDCAP {
- }
- hist photonTopoEtCone40CbTight_ENDCAP {
- }
-}
-
- dir egamma/photons/Unconv {
- algorithm = egKolmogorov
- output = egamma/photons
- display = Draw=e1,StatBox
-
- #CbLoose
- hist photonNUnconvCbLoose {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtUnconvCbLoose {
- }
- hist photonEtaUnconvCbLoose {
- }
- hist photonPhiUnconvCbLoose {
- }
- hist photonEtaPhiUnconvCbLoose {
- algorithm = egamma_BinsDiffFromStripMedian
- }
- hist photonTopoEtCone40UnconvCbLoose {
- }
- hist photonPtCone20UnconvCbLoose {
- }
-
- #CbTight
- hist photonNUnconvCbTight {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtUnconvCbTight {
- }
- hist photonEtaUnconvCbTight {
- }
- hist photonPhiUnconvCbTight {
- }
- hist photonEtaPhiUnconvCbTight {
- algorithm = egamma_BinsDiffFromStripMedian
- }
- hist photonTopoEtCone40UnconvCbTight {
- }
- hist photonPtCone20UnconvCbTight {
- }
-
-}
-
-
- dir egamma/photons/Conv {
- algorithm = egKolmogorov
- output = egamma/photons
- display = Draw=e1,StatBox
-
- #CbLoose
- hist photonNConvCbLoose {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtConvCbLoose {
- }
- hist photonEtaConvCbLoose {
- }
- hist photonPhiConvCbLoose {
- }
- hist photonEtaPhiConvCbLoose {
- algorithm = egamma_BinsDiffFromStripMedian
- }
- hist photonTopoEtCone40ConvCbLoose {
- }
- hist photonPtCone20ConvCbLoose {
- }
- #CbTight
- hist photonNConvCbTight {
- }
- hist photonEtConvCbTight {
- }
- hist photonEtaConvCbTight {
- }
- hist photonPhiConvCbTight {
- }
- hist photonEtaPhiConvCbTight {
- algorithm = egamma_BinsDiffFromStripMedian
- }
- hist photonTopoEtCone40ConvCbTight {
- }
- hist photonPtCone20ConvCbTight {
- }
-}
-
- dir egamma/photons/ID {
- algorithm = egKolmogorov
- output = egamma/photons/ID
- display = Draw=e1,StatBox
-
- #CbLoose
- hist photonEhad1CbLoose_BARREL {
- }
- hist photonCoreEMCbLoose_BARREL {
- }
- hist photonF0CbLoose_BARREL {
- }
- hist photonF1CbLoose_BARREL {
- }
- hist photonF2CbLoose_BARREL {
- }
- hist photonF3CbLoose_BARREL {
- }
- hist photonRe233e237CbLoose_BARREL {
- }
- hist photonRe237e277CbLoose_BARREL {
- }
- hist photonEhad1CbLoose_CRACK {
- }
- hist photonCoreEMCbLoose_CRACK {
- }
- hist photonF0CbLoose_CRACK {
- }
- hist photonF1CbLoose_CRACK {
- }
- hist photonF2CbLoose_CRACK {
- }
- hist photonF3CbLoose_CRACK {
- }
- hist photonRe233e237CbLoose_CRACK {
- }
- hist photonRe237e277CbLoose_CRACK {
- }
- hist photonEhad1CbLoose_ENDCAP {
- }
- hist photonCoreEMCbLoose_ENDCAP {
- }
- hist photonF0CbLoose_ENDCAP {
- }
- hist photonF1CbLoose_ENDCAP {
- }
- hist photonF2CbLoose_ENDCAP {
- }
- hist photonF3CbLoose_ENDCAP {
- }
- hist photonRe233e237CbLoose_ENDCAP {
- }
- hist photonRe237e277CbLoose_ENDCAP {
- }
- #CbTight
- hist photonEhad1CbTight_BARREL {
- }
- hist photonCoreEMCbTight_BARREL {
- }
- hist photonF0CbTight_BARREL {
- }
- hist photonF1CbTight_BARREL {
- }
- hist photonF2CbTight_BARREL {
- }
- hist photonF3CbTight_BARREL {
- }
- hist photonRe233e237CbTight_BARREL {
- }
- hist photonRe237e277CbTight_BARREL {
- }
- hist photonEhad1CbTight_CRACK {
- }
- hist photonCoreEMCbTight_CRACK {
- }
- hist photonF0CbTight_CRACK {
- }
- hist photonF1CbTight_CRACK {
- }
- hist photonF2CbTight_CRACK {
- }
- hist photonF3CbTight_CRACK {
- }
- hist photonRe233e237CbTight_CRACK {
- }
- hist photonRe237e277CbTight_CRACK {
- }
- hist photonEhad1CbTight_ENDCAP {
- }
- hist photonCoreEMCbTight_ENDCAP {
- }
- hist photonF0CbTight_ENDCAP {
- }
- hist photonF1CbTight_ENDCAP {
- }
- hist photonF2CbTight_ENDCAP {
- }
- hist photonF3CbTight_ENDCAP {
- }
- hist photonRe233e237CbTight_ENDCAP {
- }
- hist photonRe237e277CbTight_ENDCAP {
- }
-}
-
- dir egamma/photons/Region {
- algorithm = egKolmogorov
- output = egamma/photons/EXPERT
- display = Draw=e1,StatBox
-
- # CbLoose
- hist photonConvTrkMatch1CbLoose_BARREL {
- }
- hist photonConvTrkMatch2CbLoose_BARREL {
- }
- hist photonConvTypeCbLoose_BARREL {
- }
- hist photonConvTrkMatch1CbLoose_CRACK {
- }
- hist photonConvTrkMatch2CbLoose_CRACK {
- }
- hist photonConvTypeCbLoose_CRACK {
- }
- hist photonConvTrkMatch1CbLoose_ENDCAP {
- }
- hist photonConvTrkMatch2CbLoose_ENDCAP {
- }
- hist photonConvTypeCbLoose_ENDCAP {
- }
- # CbTight
- hist photonConvTrkMatch1CbTight_BARREL {
- }
- hist photonConvTrkMatch2CbTight_BARREL {
- }
- hist photonConvTypeCbTight_BARREL {
- }
- hist photonConvTrkMatch1CbTight_CRACK {
- }
- hist photonConvTrkMatch2CbTight_CRACK {
- }
- hist photonConvTypeCbTight_CRACK {
- }
- hist photonConvTrkMatch1CbTight_ENDCAP {
- }
- hist photonConvTrkMatch2CbTight_ENDCAP {
- }
- hist photonConvTypeCbTight_ENDCAP {
- }
- }
-
-
- dir egamma/photons/LBMon {
- algorithm = egamma_GatherData
- output = egamma/photons/LBMon
- display = Draw=e1,StatBox
- # CbLoose
- hist LBEvoNPhotonsCbLoose {
- }
- hist LBEvoNPhotonsUnconvCbLoose {
- }
- hist LBEvoNPhotonsConvCbLoose {
- }
- hist LBEvoConvOverNCbLoose {
- }
-
- # CbTight
- hist LBEvoNPhotonsCbTight {
- }
- hist LBEvoNPhotonsUnconvCbTight {
- }
- hist LBEvoNPhotonsConvCbTight {
- }
- hist LBEvoConvOverNCbTight {
- }
-}
-
-### photonsWithTrigger
-
- dir egamma/photonsWithTrigger {
- output = egamma/photonsWithTrigger
-
- # CbLoose
- hist photonNCbLoose {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonPhiCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonEtaPhiPt2.5GeVCbLoose {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist photonEtaPhiPtgt4GeVCbLoose {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist photonEtaPhiPtgt20GeVCbLoose {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist photonPtCone20CbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonTopoEtCone40CbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonTimeCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonRconvCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
-
- # CbTight
- hist photonNCbTight {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonPhiCbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonEtaPhiPt2.5GeVCbTight {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist photonEtaPhiPtgt4GeVCbTight {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist photonEtaPhiPtgt20GeVCbTight {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist photonPtCone20CbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonTopoEtCone40CbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonTimeCbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonRconvCbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
-}
-
-
- dir egamma/photonsWithTrigger/Region {
- algorithm = egKolmogorov
- output = egamma/photonsWithTrigger/EXPERT
- display = Draw=e1,StatBox
-
- # CbLoose
- hist photonNCbLoose_BARREL {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbLoose_BARREL {
- }
- hist photonEtaCbLoose_BARREL {
- }
- hist photonPhiCbLoose_BARREL {
- }
- hist photonPtCone20CbLoose_BARREL {
- }
- hist photonTopoEtCone40CbLoose_BARREL {
- }
- hist photonNCbLoose_CRACK {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbLoose_CRACK {
- }
- hist photonEtaCbLoose_CRACK {
- }
- hist photonPhiCbLoose_CRACK {
- }
- hist photonPtCone20CbLoose_CRACK {
- }
- hist photonTopoEtCone40CbLoose_CRACK {
- }
- hist photonNCbLoose_ENDCAP {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbLoose_ENDCAP {
- }
- hist photonEtaCbLoose_ENDCAP {
- }
- hist photonPhiCbLoose_ENDCAP {
- }
- hist photonPtCone20CbLoose_ENDCAP {
- }
- hist photonTopoEtCone40CbLoose_ENDCAP {
- }
-
- # CbTight
- hist photonNCbTight_BARREL {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbTight_BARREL {
- }
- hist photonEtaCbTight_BARREL {
- }
- hist photonPhiCbTight_BARREL {
- }
- hist photonPtCone20CbTight_BARREL {
- }
- hist photonTopoEtCone40CbTight_BARREL {
- }
- hist photonNCbTight_CRACK {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbTight_CRACK {
- }
- hist photonEtaCbTight_CRACK {
- }
- hist photonPhiCbTight_CRACK {
- }
- hist photonPtCone20CbTight_CRACK {
- }
- hist photonTopoEtCone40CbTight_CRACK {
- }
- hist photonNCbTight_ENDCAP {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbTight_ENDCAP {
- }
- hist photonEtaCbTight_ENDCAP {
- }
- hist photonPhiCbTight_ENDCAP {
- }
- hist photonPtCone20CbTight_ENDCAP {
- }
- hist photonTopoEtCone40CbTight_ENDCAP {
- }
-}
-
- dir egamma/photonsWithTrigger/Unconv {
- algorithm = egKolmogorov
- output = egamma/photonsWithTrigger
- display = Draw=e1,StatBox
-
- #CbLoose
- hist photonNUnconvCbLoose {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtUnconvCbLoose {
- }
- hist photonEtaUnconvCbLoose {
- }
- hist photonPhiUnconvCbLoose {
- }
- hist photonEtaPhiUnconvCbLoose {
- algorithm = egamma_BinsDiffFromStripMedian
- }
- hist photonTopoEtCone40UnconvCbLoose {
- }
- hist photonPtCone20UnconvCbLoose {
- }
-
- #CbTight
- hist photonNUnconvCbTight {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtUnconvCbTight {
- }
- hist photonEtaUnconvCbTight {
- }
- hist photonPhiUnconvCbTight {
- }
- hist photonEtaPhiUnconvCbTight {
- algorithm = egamma_BinsDiffFromStripMedian
- }
- hist photonTopoEtCone40UnconvCbTight {
- }
- hist photonPtCone20UnconvCbTight {
- }
-
-}
-
-
- dir egamma/photonsWithTrigger/Conv {
- algorithm = egKolmogorov
- output = egamma/photonsWithTrigger
- display = Draw=e1,StatBox
-
- #CbLoose
- hist photonNConvCbLoose {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtConvCbLoose {
- }
- hist photonEtaConvCbLoose {
- }
- hist photonPhiConvCbLoose {
- }
- hist photonEtaPhiConvCbLoose {
- algorithm = egamma_BinsDiffFromStripMedian
- }
- hist photonTopoEtCone40ConvCbLoose {
- }
- hist photonPtCone20ConvCbLoose {
- }
- #CbTight
- hist photonNConvCbTight {
- }
- hist photonEtConvCbTight {
- }
- hist photonEtaConvCbTight {
- }
- hist photonPhiConvCbTight {
- }
- hist photonEtaPhiConvCbTight {
- algorithm = egamma_BinsDiffFromStripMedian
- }
- hist photonTopoEtCone40ConvCbTight {
- }
- hist photonPtCone20ConvCbTight {
- }
-}
-
- dir egamma/photonsWithTrigger/ID {
- algorithm = egKolmogorov
- output = egamma/photonsWithTrigger/ID
- display = Draw=e1,StatBox
-
- #CbLoose
- hist photonEhad1CbLoose_BARREL {
- }
- hist photonCoreEMCbLoose_BARREL {
- }
- hist photonF0CbLoose_BARREL {
- }
- hist photonF1CbLoose_BARREL {
- }
- hist photonF2CbLoose_BARREL {
- }
- hist photonF3CbLoose_BARREL {
- }
- hist photonRe233e237CbLoose_BARREL {
- }
- hist photonRe237e277CbLoose_BARREL {
- }
- hist photonEhad1CbLoose_CRACK {
- }
- hist photonCoreEMCbLoose_CRACK {
- }
- hist photonF0CbLoose_CRACK {
- }
- hist photonF1CbLoose_CRACK {
- }
- hist photonF2CbLoose_CRACK {
- }
- hist photonF3CbLoose_CRACK {
- }
- hist photonRe233e237CbLoose_CRACK {
- }
- hist photonRe237e277CbLoose_CRACK {
- }
- hist photonEhad1CbLoose_ENDCAP {
- }
- hist photonCoreEMCbLoose_ENDCAP {
- }
- hist photonF0CbLoose_ENDCAP {
- }
- hist photonF1CbLoose_ENDCAP {
- }
- hist photonF2CbLoose_ENDCAP {
- }
- hist photonF3CbLoose_ENDCAP {
- }
- hist photonRe233e237CbLoose_ENDCAP {
- }
- hist photonRe237e277CbLoose_ENDCAP {
- }
- #CbTight
- hist photonEhad1CbTight_BARREL {
- }
- hist photonCoreEMCbTight_BARREL {
- }
- hist photonF0CbTight_BARREL {
- }
- hist photonF1CbTight_BARREL {
- }
- hist photonF2CbTight_BARREL {
- }
- hist photonF3CbTight_BARREL {
- }
- hist photonRe233e237CbTight_BARREL {
- }
- hist photonRe237e277CbTight_BARREL {
- }
- hist photonEhad1CbTight_CRACK {
- }
- hist photonCoreEMCbTight_CRACK {
- }
- hist photonF0CbTight_CRACK {
- }
- hist photonF1CbTight_CRACK {
- }
- hist photonF2CbTight_CRACK {
- }
- hist photonF3CbTight_CRACK {
- }
- hist photonRe233e237CbTight_CRACK {
- }
- hist photonRe237e277CbTight_CRACK {
- }
- hist photonEhad1CbTight_ENDCAP {
- }
- hist photonCoreEMCbTight_ENDCAP {
- }
- hist photonF0CbTight_ENDCAP {
- }
- hist photonF1CbTight_ENDCAP {
- }
- hist photonF2CbTight_ENDCAP {
- }
- hist photonF3CbTight_ENDCAP {
- }
- hist photonRe233e237CbTight_ENDCAP {
- }
- hist photonRe237e277CbTight_ENDCAP {
- }
-}
-
- dir egamma/photonsWithTrigger/Region {
- algorithm = egKolmogorov
- output = egamma/photonsWithTrigger/EXPERT
- display = Draw=e1,StatBox
-
- # CbLoose
- hist photonConvTrkMatch1CbLoose_BARREL {
- }
- hist photonConvTrkMatch2CbLoose_BARREL {
- }
- hist photonConvTypeCbLoose_BARREL {
- }
- hist photonConvTrkMatch1CbLoose_CRACK {
- }
- hist photonConvTrkMatch2CbLoose_CRACK {
- }
- hist photonConvTypeCbLoose_CRACK {
- }
- hist photonConvTrkMatch1CbLoose_ENDCAP {
- }
- hist photonConvTrkMatch2CbLoose_ENDCAP {
- }
- hist photonConvTypeCbLoose_ENDCAP {
- }
- # CbTight
- hist photonConvTrkMatch1CbTight_BARREL {
- }
- hist photonConvTrkMatch2CbTight_BARREL {
- }
- hist photonConvTypeCbTight_BARREL {
- }
- hist photonConvTrkMatch1CbTight_CRACK {
- }
- hist photonConvTrkMatch2CbTight_CRACK {
- }
- hist photonConvTypeCbTight_CRACK {
- }
- hist photonConvTrkMatch1CbTight_ENDCAP {
- }
- hist photonConvTrkMatch2CbTight_ENDCAP {
- }
- hist photonConvTypeCbTight_ENDCAP {
- }
- }
-
-
- dir egamma/photonsWithTrigger/LBMon {
- algorithm = egamma_GatherData
- output = egamma/photonsWithTrigger/LBMon
- display = Draw=e1,StatBox
- # CbLoose
- hist LBEvoNPhotonsCbLoose {
- }
- hist LBEvoNPhotonsUnconvCbLoose {
- }
- hist LBEvoNPhotonsConvCbLoose {
- }
- hist LBEvoConvOverNCbLoose {
- }
-
- # CbTight
- hist LBEvoNPhotonsCbTight {
- }
- hist LBEvoNPhotonsUnconvCbTight {
- }
- hist LBEvoNPhotonsConvCbTight {
- }
- hist LBEvoConvOverNCbTight {
- }
-}
-
-### forwardElectrons
-
- dir egamma/forwardElectrons {
+dir egamma/forwardElectrons {
algorithm = egKolmogorov
output = egamma/forwardElectrons
display = Draw=e1,StatBox
- hist forwardElectronN {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist forwardElectronEt {
- }
- hist forwardElectronPhi {
- }
- hist forwardElectronEta {
- }
- hist forwardElectronEtaPhi {
- algorithm = egamma_BinsDiffFromStripMedian
- }
- # hist forwardElectronTopoEtCone40 {
- # }
- hist forwardElectronTime {
- }
-
- hist forwardElectronTightN {
+ hist forwardElectronN {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
- }
- hist forwardElectronTightEt {
- }
- hist forwardElectronTightPhi {
- }
- hist forwardElectronTightEta {
- }
- hist forwardElectronTightEtaPhi {
+ }
+ hist forwardElectronEt { }
+ hist forwardElectronPhi { }
+ hist forwardElectronEta { }
+ hist forwardElectronEtaPhi {
algorithm = egamma_BinsDiffFromStripMedian
- }
- #hist forwardElectronTightTopoEtCone40 {
- #}
- hist forwardElectronTightTime {
- }
-
+ }
}
--
GitLab
From f1ad06344f767ab1cb4ee51aa2b4a766eae9aa6e Mon Sep 17 00:00:00 2001
From: Bertrand LAFORGE <laforge@lpnhe.in2p3.fr>
Date: Thu, 2 Sep 2021 00:42:43 +0200
Subject: [PATCH 265/272] new version of egamma DQ with new webdisplay for Run3
---
.../config/Egamma/collisions_run.config | 1047 +++++++++--------
.../python/SetupEgammaMonitoring.py | 24 +-
2 files changed, 580 insertions(+), 491 deletions(-)
diff --git a/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config b/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config
index 4abc12781108..55d62214a2af 100644
--- a/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config
@@ -204,12 +204,12 @@ dir egamma/LHLooseElectrons {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
}
- hist Et { }
- hist Phi { }
+ hist Et { }
hist Eta { }
- hist PtCone20 { }
- hist EtCone40 { }
+ hist Phi { }
hist Eta_Phi_distribution_with_Pt.gt.4GeV { }
+ hist TopoEtCone40 { }
+ hist PtCone20 { }
hist Time { }
}
@@ -230,38 +230,32 @@ dir egamma/LHLooseElectrons/byLB {
hist LBEvON { }
}
-dir egamma/LHLooseElectrons/Expert/ID {
+dir egamma/LHLooseElectrons/ID {
algorithm = egKolmogorov
output = egamma/electrons/ID
display = Draw=e1,StatBox
- hist Ehad1_BARREL { }
- hist EoverP_BARREL { }
- hist CoreEM_BARREL { }
- hist F0_BARREL { }
- hist F1_BARREL { }
- hist F2_BARREL { }
- hist F3_BARREL { }
- hist Re233e237_BARREL { }
- hist Re237e277_BARREL { }
- hist Ehad1_CRACK { }
- hist EoverP_CRACK { }
- hist CoreEM_CRACK { }
- hist F0_CRACK { }
- hist F1_CRACK { }
- hist F2_CRACK { }
- hist F3_CRACK { }
- hist Re233e237_CRACK { }
- hist Re237e277_CRACK { }
- hist Ehad1_ENDCAP { }
- hist EoverP_ENDCAP { }
- hist CoreEM_ENDCAP { }
- hist F0_ENDCAP { }
- hist F1_ENDCAP { }
- hist F2_ENDCAP { }
- hist F3_ENDCAP { }
- hist Re233e237_ENDCAP { }
- hist Re237e277_ENDCAP { }
+ hist Ehad1inBARREL { }
+ hist CoreEMinBARREL { }
+ hist F0inBARREL { }
+ hist F1inBARREL { }
+ hist F2inBARREL { }
+ hist F3inBARREL { }
+ hist Re237e277inBARREL { }
+ hist Ehad1inENDCAP { }
+ hist EoverPinENDCAP { }
+ hist CoreEMinENDCAP { }
+ hist Re233e237inENDCAP { }
+ hist Re237e277inENDCAP { }
+ hist Ehad1inCRACK { }
+ hist EoverPinCRACK { }
+ hist CoreEMinCRACK { }
+ hist F0inCRACK { }
+ hist F1inCRACK { }
+ hist F2inCRACK { }
+ hist F3inCRACK { }
+ hist Re233e237inCRACK { }
+ hist Re237e277inCRACK { }
}
dir egamma/LHLooseElectrons/Expert/Track {
@@ -269,23 +263,325 @@ dir egamma/LHLooseElectrons/Expert/Track {
output = egamma/electrons/Track
display = Draw=e1,StatBox
- hist electronNOfBLayersHitsLhLoose_BARREL { }
- hist electronNOfTRTHitsLhLoose_BARREL { }
- hist electronNOfSiHitsLhLoose_BARREL { }
- hist electronDeltaEta1LhLoose_BARREL { }
- hist electronDeltaPhi2LhLoose_BARREL { }
- hist electronDeltaEta1LhLoose_CRACK { }
- hist electronDeltaPhi2LhLoose_CRACK { }
- hist electronNOfBLayersHitsLhLoose_CRACK { }
- hist electronNOfTRTHitsLhLoose_CRACK { }
- hist electronNOfSiHitsLhLoose_CRACK { }
- hist electronDeltaEta1LhLoose_ENDCAP { }
- hist electronDeltaPhi2LhLoose_ENDCAP { }
- hist electronNOfBLayersHitsLhLoose_ENDCAP { }
- hist electronNOfTRTHitsLhLoose_ENDCAP { }
- hist electronNOfSiHitsLhLoose_ENDCAP { }
+ hist NOfBLayerHitsinBARREL { }
+ hist NOfPixelHitsinBARREL { }
+ hist NOfSCTHitsinBARREL { }
+ hist NOfTRTHitsinBARREL { }
+ hist NOfTRTHighThresholdHitsinBARREL { }
+ hist DeltaEta1inBARREL { }
+ hist DeltaPhi2inBARREL { }
+ hist Trackd0inBARREL { }
+ hist NOfBLayerHitsinENDCAP { }
+ hist NOfPixelHitsinENDCAP { }
+ hist NOfSCTHitsinENDCAP { }
+ hist NOfTRTHitsinENDCAP { }
+ hist NOfTRTHighThresholdHitsinENDCAP { }
+ hist DeltaEta1inENDCAP { }
+ hist DeltaPhi2inENDCAP { }
+ hist Trackd0inENDCAP { }
+ hist NOfBLayerHitsinCRACK { }
+ hist NOfPixelHitsinCRACK { }
+ hist NOfSCTHitsinCRACK { }
+ hist NOfTRTHitsinCRACK { }
+ hist NOfTRTHighThresholdHitsinCRACK { }
+ hist DeltaEta1inCRACK { }
+ hist DeltaPhi2inCRACK { }
+ hist Trackd0inCRACK { }
+
+}
+
+# LhLooseWithTrigger
+
+dir egamma/LHLooseElectronsWithTrigger {
+ output = egamma/electrons
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Et { }
+ hist Eta { }
+ hist Phi { }
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV { }
+ hist TopoEtCone40 { }
+ hist PtCone20 { }
+ hist Time { }
+}
+
+dir egamma/LHLooseElectronsWithTrigger/Expert {
+ output = egamma/electrons/Expert
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist Eta_Phi_with_Pt_gt_2.5GeV { }
+ hist Eta_Phi_with_Pt_gt_20GeV { }
}
+dir egamma/LHLooseElectronsWithTrigger/byLB {
+ output = egamma/electrons/byLB
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist LBEvON { }
+}
+
+dir egamma/LHLooseElectronsWithTrigger/ID {
+ algorithm = egKolmogorov
+ output = egamma/electrons/ID
+ display = Draw=e1,StatBox
+
+ hist Ehad1inBARREL { }
+ hist CoreEMinBARREL { }
+ hist F0inBARREL { }
+ hist F1inBARREL { }
+ hist F2inBARREL { }
+ hist F3inBARREL { }
+ hist Re237e277inBARREL { }
+ hist Ehad1inENDCAP { }
+ hist EoverPinENDCAP { }
+ hist CoreEMinENDCAP { }
+ hist Re233e237inENDCAP { }
+ hist Re237e277inENDCAP { }
+ hist Ehad1inCRACK { }
+ hist EoverPinCRACK { }
+ hist CoreEMinCRACK { }
+ hist F0inCRACK { }
+ hist F1inCRACK { }
+ hist F2inCRACK { }
+ hist F3inCRACK { }
+ hist Re233e237inCRACK { }
+ hist Re237e277inCRACK { }
+}
+
+dir egamma/LHLooseElectronsWithTrigger/Expert/Track {
+ algorithm = egKolmogorov
+ output = egamma/electrons/Track
+ display = Draw=e1,StatBox
+
+ hist NOfBLayerHitsinBARREL { }
+ hist NOfPixelHitsinBARREL { }
+ hist NOfSCTHitsinBARREL { }
+ hist NOfTRTHitsinBARREL { }
+ hist NOfTRTHighThresholdHitsinBARREL { }
+ hist DeltaEta1inBARREL { }
+ hist DeltaPhi2inBARREL { }
+ hist Trackd0inBARREL { }
+ hist NOfBLayerHitsinENDCAP { }
+ hist NOfPixelHitsinENDCAP { }
+ hist NOfSCTHitsinENDCAP { }
+ hist NOfTRTHitsinENDCAP { }
+ hist NOfTRTHighThresholdHitsinENDCAP { }
+ hist DeltaEta1inENDCAP { }
+ hist DeltaPhi2inENDCAP { }
+ hist Trackd0inENDCAP { }
+ hist NOfBLayerHitsinCRACK { }
+ hist NOfPixelHitsinCRACK { }
+ hist NOfSCTHitsinCRACK { }
+ hist NOfTRTHitsinCRACK { }
+ hist NOfTRTHighThresholdHitsinCRACK { }
+ hist DeltaEta1inCRACK { }
+ hist DeltaPhi2inCRACK { }
+ hist Trackd0inCRACK { }
+
+}
+
+# LhTight
+
+dir egamma/LHTightElectrons {
+ output = egamma/electrons
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Et { }
+ hist Eta { }
+ hist Phi { }
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV { }
+ hist TopoEtCone40 { }
+ hist PtCone20 { }
+ hist Time { }
+}
+
+dir egamma/LHTightElectrons/Expert {
+ output = egamma/electrons/Expert
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist Eta_Phi_with_Pt_gt_2.5GeV { }
+ hist Eta_Phi_with_Pt_gt_20GeV { }
+}
+
+dir egamma/LHTightElectrons/byLB {
+ output = egamma/electrons/byLB
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist LBEvON { }
+}
+
+dir egamma/LHTightElectrons/ID {
+ algorithm = egKolmogorov
+ output = egamma/electrons/ID
+ display = Draw=e1,StatBox
+
+ hist Ehad1inBARREL { }
+ hist CoreEMinBARREL { }
+ hist F0inBARREL { }
+ hist F1inBARREL { }
+ hist F2inBARREL { }
+ hist F3inBARREL { }
+ hist Re237e277inBARREL { }
+ hist Ehad1inENDCAP { }
+ hist EoverPinENDCAP { }
+ hist CoreEMinENDCAP { }
+ hist Re233e237inENDCAP { }
+ hist Re237e277inENDCAP { }
+ hist Ehad1inCRACK { }
+ hist EoverPinCRACK { }
+ hist CoreEMinCRACK { }
+ hist F0inCRACK { }
+ hist F1inCRACK { }
+ hist F2inCRACK { }
+ hist F3inCRACK { }
+ hist Re233e237inCRACK { }
+ hist Re237e277inCRACK { }
+}
+
+dir egamma/LHTightElectrons/Expert/Track {
+ algorithm = egKolmogorov
+ output = egamma/electrons/Track
+ display = Draw=e1,StatBox
+
+ hist NOfBLayerHitsinBARREL { }
+ hist NOfPixelHitsinBARREL { }
+ hist NOfSCTHitsinBARREL { }
+ hist NOfTRTHitsinBARREL { }
+ hist NOfTRTHighThresholdHitsinBARREL { }
+ hist DeltaEta1inBARREL { }
+ hist DeltaPhi2inBARREL { }
+ hist Trackd0inBARREL { }
+ hist NOfBLayerHitsinENDCAP { }
+ hist NOfPixelHitsinENDCAP { }
+ hist NOfSCTHitsinENDCAP { }
+ hist NOfTRTHitsinENDCAP { }
+ hist NOfTRTHighThresholdHitsinENDCAP { }
+ hist DeltaEta1inENDCAP { }
+ hist DeltaPhi2inENDCAP { }
+ hist Trackd0inENDCAP { }
+ hist NOfBLayerHitsinCRACK { }
+ hist NOfPixelHitsinCRACK { }
+ hist NOfSCTHitsinCRACK { }
+ hist NOfTRTHitsinCRACK { }
+ hist NOfTRTHighThresholdHitsinCRACK { }
+ hist DeltaEta1inCRACK { }
+ hist DeltaPhi2inCRACK { }
+ hist Trackd0inCRACK { }
+
+}
+
+# LhTightWithTrigger
+
+dir egamma/LHTightElectronsWithTrigger {
+ output = egamma/electrons
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Et { }
+ hist Eta { }
+ hist Phi { }
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV { }
+ hist TopoEtCone40 { }
+ hist PtCone20 { }
+ hist Time { }
+}
+
+dir egamma/LHTightElectronsWithTrigger/Expert {
+ output = egamma/electrons/Expert
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist Eta_Phi_with_Pt_gt_2.5GeV { }
+ hist Eta_Phi_with_Pt_gt_20GeV { }
+}
+
+dir egamma/LHTightElectronsWithTrigger/byLB {
+ output = egamma/electrons/byLB
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist LBEvON { }
+}
+
+dir egamma/LHTightElectronsWithTrigger/ID {
+ algorithm = egKolmogorov
+ output = egamma/electrons/ID
+ display = Draw=e1,StatBox
+
+ hist Ehad1inBARREL { }
+ hist CoreEMinBARREL { }
+ hist F0inBARREL { }
+ hist F1inBARREL { }
+ hist F2inBARREL { }
+ hist F3inBARREL { }
+ hist Re237e277inBARREL { }
+ hist Ehad1inENDCAP { }
+ hist EoverPinENDCAP { }
+ hist CoreEMinENDCAP { }
+ hist Re233e237inENDCAP { }
+ hist Re237e277inENDCAP { }
+ hist Ehad1inCRACK { }
+ hist EoverPinCRACK { }
+ hist CoreEMinCRACK { }
+ hist F0inCRACK { }
+ hist F1inCRACK { }
+ hist F2inCRACK { }
+ hist F3inCRACK { }
+ hist Re233e237inCRACK { }
+ hist Re237e277inCRACK { }
+}
+
+dir egamma/LHTightElectronsWithTrigger/Expert/Track {
+ algorithm = egKolmogorov
+ output = egamma/electrons/Track
+ display = Draw=e1,StatBox
+
+ hist NOfBLayerHitsinBARREL { }
+ hist NOfPixelHitsinBARREL { }
+ hist NOfSCTHitsinBARREL { }
+ hist NOfTRTHitsinBARREL { }
+ hist NOfTRTHighThresholdHitsinBARREL { }
+ hist DeltaEta1inBARREL { }
+ hist DeltaPhi2inBARREL { }
+ hist Trackd0inBARREL { }
+ hist NOfBLayerHitsinENDCAP { }
+ hist NOfPixelHitsinENDCAP { }
+ hist NOfSCTHitsinENDCAP { }
+ hist NOfTRTHitsinENDCAP { }
+ hist NOfTRTHighThresholdHitsinENDCAP { }
+ hist DeltaEta1inENDCAP { }
+ hist DeltaPhi2inENDCAP { }
+ hist Trackd0inENDCAP { }
+ hist NOfBLayerHitsinCRACK { }
+ hist NOfPixelHitsinCRACK { }
+ hist NOfSCTHitsinCRACK { }
+ hist NOfTRTHitsinCRACK { }
+ hist NOfTRTHighThresholdHitsinCRACK { }
+ hist DeltaEta1inCRACK { }
+ hist DeltaPhi2inCRACK { }
+ hist Trackd0inCRACK { }
+
+}
+
+
##############################################
### photons
##############################################
@@ -293,7 +589,7 @@ dir egamma/LHLooseElectrons/Expert/Track {
# CBLoose
dir egamma/CBLoosePhotons {
- output = egamma/electrons
+ output = egamma/photons
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -315,8 +611,30 @@ dir egamma/CBLoosePhotons/Expert {
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
- hist Eta_Phi_with_Pt_gt_2.5GeV { }
- hist Eta_Phi_with_Pt_gt_20GeV { }
+ hist NinBARREL { }
+ hist EtainBARREL { }
+ hist PhiinBARREL { }
+ hist TimeinBARREL { }
+ hist RConvinBARREL { }
+ hist ConvTypeinBARREL { }
+ hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV { }
+ hist Eta_Phi_Conv_with_Pt_gt_2.5GeV { }
+ hist NinENDCAP { }
+ hist EtainENDCAP { }
+ hist PhiinENDCAP { }
+ hist TimeinENDCAP { }
+ hist RConvinENDCAP { }
+ hist ConvTypeinENDCAP { }
+ hist Eta_Phi_with_Pt.gt.20GeV { }
+ hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV { }
+ hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV { }
+ hist NinCRACK { }
+ hist EtainCRACK { }
+ hist PhiinCRACK { }
+ hist TimeinCRACK { }
+ hist RConvinCRACK { }
+ hist ConvTypeinCRACK { }
+
}
dir egamma/CBLoosePhotons/byLB {
@@ -324,534 +642,305 @@ dir egamma/CBLoosePhotons/byLB {
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
- hist LBEvON { }
+ hist Number_of_Unconv._photons_vs_LB { }
+ hist Number_of_Conv._photons_vs_LB { }
+ hist LBEvoN { }
+ hist Conversion_fraction_vs_LB Conversion_fraction_vs_LB { }
+
}
-dir egamma/CBLoosePhotons/Expert/ID {
+dir egamma/CBLoosePhotons/ID {
algorithm = egKolmogorov
output = egamma/photons/ID
display = Draw=e1,StatBox
- hist Ehad1_BARREL { }
- hist EoverP_BARREL { }
- hist CoreEM_BARREL { }
- hist F0_BARREL { }
- hist F1_BARREL { }
- hist F2_BARREL { }
- hist F3_BARREL { }
- hist Re233e237_BARREL { }
- hist Re237e277_BARREL { }
- hist Ehad1_CRACK { }
- hist EoverP_CRACK { }
- hist CoreEM_CRACK { }
- hist F0_CRACK { }
- hist F1_CRACK { }
- hist F2_CRACK { }
- hist F3_CRACK { }
- hist Re233e237_CRACK { }
- hist Re237e277_CRACK { }
- hist Ehad1_ENDCAP { }
- hist EoverP_ENDCAP { }
- hist CoreEM_ENDCAP { }
- hist F0_ENDCAP { }
- hist F1_ENDCAP { }
- hist F2_ENDCAP { }
- hist F3_ENDCAP { }
- hist Re233e237_ENDCAP { }
- hist Re237e277_ENDCAP { }
+ hist Ehad1inBARREL { }
+ hist CoreEMinBARREL { }
+ hist F0inBARREL { }
+ hist F1inBARREL { }
+ hist F2inBARREL { }
+ hist F3inBARREL { }
+ hist Re233e237inBARREL { }
+ hist Re237e277inBARREL { }
+ hist Ehad1inENDCAP { }
+ hist CoreEMinENDCAP { }
+ hist F0inENDCAP { }
+ hist F1inENDCAP { }
+ hist F2inENDCAP { }
+ hist F3inENDCAP { }
+ hist Re233e237inENDCAP { }
+ hist Re237e277inENDCAP { }
+ hist Ehad1inCRACK { }
+ hist CoreEMinCRACK { }
+ hist F0inCRACK { }
+ hist F1inCRACK { }
+ hist F2inCRACK { }
+ hist F3inCRACK { }
+ hist Re233e237inCRACK { }
+ hist Re237e277inCRACK { }
}
########################################
### forwardElectrons
########################################
-# Loose Forward Electrons
+# CB Loose Forward Electrons
-dir egamma/forwardElectrons {
+dir egamma/CBLooseFwdElectrons {
algorithm = egKolmogorov
output = egamma/forwardElectrons
display = Draw=e1,StatBox
- hist forwardElectronN {
+ hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
}
- hist forwardElectronEt { }
- hist forwardElectronPhi { }
- hist forwardElectronEta { }
- hist forwardElectronEtaPhi {
+ hist Et { }
+ hist Phi { }
+ hist Eta { }
+ hist Time { }
+ hist Eta_Phi_distributionf_Pt_gt_10GeV {
algorithm = egamma_BinsDiffFromStripMedian
}
}
+dir egamma/CBLooseFwdElectrons {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/ID
+ display = Draw=e1,StatBox
- dir egamma/forwardElectrons {
- Algorithm = Egkolmogorov
+ hist EnergyDensity { }
+ hist FracMax { }
+ hist Lateral { }
+ hist Longitudinal { }
+ hist SecondLambda { }
+ hist SecondR { }
+ hist CenterLambda { }
+}
+
+
+dir egamma/CBLooseFwdElectrons {
+ algorithm = Egkolmogorov
Output = egamma/forwardElectrons/EXPERT
display = Draw=e1,StatBox
- hist forwardElectronN_ENDCAP {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist forwardElectronEt_ENDCAP {
- output = egamma/forwardElectrons/EXPERT
- }
- hist forwardElectronEta_ENDCAP {
- output = egamma/forwardElectrons/EXPERT
- }
- hist forwardElectronPhi_ENDCAP {
- output = egamma/forwardElectrons/EXPERT
- }
- hist forwardElectronTopoEtCone40_ENDCAP {
- output = egamma/forwardElectrons/EXPERT
- }
- hist forwardElectronTime_ENDCAP {
- output = egamma/forwardElectrons/EXPERT
- }
- hist forwardElectronTightN_ENDCAP {
- output = egamma/forwardElectrons/EXPERT
- }
- hist forwardElectronTightEt_ENDCAP {
- output = egamma/forwardElectrons/EXPERT
- }
- hist forwardElectronTightEta_ENDCAP {
- output = egamma/forwardElectrons/EXPERT
- }
- hist forwardElectronTightPhi_ENDCAP {
- output = egamma/forwardElectrons/EXPERT
- }
- #hist forwardElectronTightTopoEtCone40_ENDCAP {
- #output = egamma/forwardElectrons/EXPERT
- #}
- hist forwardElectronN_FORWARD {
- algorithm = egamma_Histogram_Not_Empty
+
+ hist NinENDCAP {
display = Draw=e1,StatBox,LogY
- output = egamma/forwardElectrons/EXPERT
- }
- hist forwardElectronEt_FORWARD {
- output = egamma/forwardElectrons/EXPERT
}
- hist forwardElectronEta_FORWARD {
- output = egamma/forwardElectrons/EXPERT
- }
- hist forwardElectronPhi_FORWARD {
- output = egamma/forwardElectrons/EXPERT
- }
- #hist forwardElectronTopoEtCone40_FORWARD {
- #output = egamma/forwardElectrons/EXPERT
- #}
- hist forwardElectronTime_FORWARD {
- output = egamma/forwardElectrons/EXPERT
- }
- hist forwardElectronTightN_FORWARD {
- output = egamma/forwardElectrons/EXPERT
- algorithm = egamma_Histogram_Not_Empty
+ hist NinFORWARD {
display = Draw=e1,StatBox,LogY
}
- hist forwardElectronTightEt_FORWARD {
- output = egamma/forwardElectrons/EXPERT
- }
- hist forwardElectronTightEta_FORWARD {
- output = egamma/forwardElectrons/EXPERT
- }
- hist forwardElectronTightPhi_FORWARD {
- output = egamma/forwardElectrons/EXPERT
- }
- #hist forwardElectronTightTopoEtCone40_FORWARD {
- #output = egamma/forwardElectrons/EXPERT
- #}
+ hist Eta_Phi_distribution_Pt_gt_2.5GeV { }
+ hist EtainENDCAP { }
+ hist PhiinENDCAP { }
+ hist TimeinENDCAP { }
+ hist EtainFORWARD { }
+ hist PhiinFORWARD { }
+ hist TimeinFORWARD { }
}
-dir egamma/forwardElectrons/ID {
- algorithm = egKolmogorov
- output = egamma/forwardElectrons/ID
- hist forwardElectronENG_DENS_ENDCAP {
- }
- hist forwardElectronFRAC_MAX_ENDCAP {
- }
- hist forwardElectronLONGITUDINAL_ENDCAP {
- }
- hist forwardElectron2ND_LAMBDA_ENDCAP {
- }
- hist forwardElectronLATERAL_ENDCAP {
- }
- hist forwardElectron2ND_R_ENDCAP {
- }
- hist forwardElectronCENTER_LAMBDA_ENDCAP {
- }
- hist forwardElectronENG_DENS_FORWARD {
- }
- hist forwardElectronFRAC_MAX_FORWARD {
- }
- hist forwardElectronLONGITUDINAL_FORWARD {
- }
- hist forwardElectron2ND_LAMBDA_FORWARD {
- }
- hist forwardElectronLATERAL_FORWARD {
- }
- hist forwardElectron2ND_R_FORWARD {
- }
- hist forwardElectronCENTER_LAMBDA_FORWARD {
- }
-}
-
-
### Tag&Probe Z
-dir egamma/tagandprobeZ {
- algorithm = egKolmogorov
- output = egamma/tagandprobeZ
- display = Draw=e1,StatBox
-
- hist electronTagAndProbeNcandidates {
- }
- hist electronTagAndProbeGlobalMass {
- algorithm = egamma_FitZmass
- display = StatBox,gaus(xmin,xmax)
- }
- hist electronTagAndProbeMass_BARREL {
- algorithm = egamma_FitZmass
- display = StatBox,gaus(xmin,xmax)
- }
- hist electronTagAndProbeMass_CRACK {
- algorithm = egamma_FitZmass
- display = StatBox,gaus(xmin,xmax)
- }
- hist electronTagAndProbeMass_ENDCAP {
- algorithm = egamma_FitZmass
- display = StatBox,gaus(xmin,xmax)
- }
- hist electronTagAndProbeN {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist electronTagAndProbeEt {
- }
- hist electronTagAndProbeEta {
- }
- hist electronTagAndProbePhi {
- }
- hist electronTagAndProbeEtaPhi {
- algorithm = egamma_BinsDiffFromStripMedian
- }
-}
-
-dir egamma/tagandprobeZ {
+dir egamma/TnPZ/TnPCandidate {
algorithm = egKolmogorov
output = egamma/tagandprobeZ
display = Draw=e1,StatBox
- hist EfficiencyTagAndProbeElectronIDvsEt {
- }
- hist EfficiencyTagAndProbeElectronIDvsEta {
+ hist Z_candidate_mass {
+ algorithm = egamma_FitZmass
+ display = StatBox,gaus(80000.,100000.)
}
- hist EfficiencyTagAndProbeElectronIDvsPhi {
+ hist Z_candidate_mass_distribution_(Lead_in_Barrel) {
+ algorithm = egamma_FitZmass
+ display = StatBox,gaus(80000.,100000.)
}
- hist EfficiencyTagAndProbeElectronISOvsEt {
+ hist Number_of_Z_candidates_vs_eta_leading_e {}
+ hist Number_of_Z_candidates_vs_phi_leading_e {}
+ hist Z_candidate mass distribution (Lead in Crack) {
+ algorithm = egamma_FitZmass
+ display = StatBox,gaus(80000.,100000.)
}
- hist EfficiencyTagAndProbeElectronISOvsEta {
- }
- hist EfficiencyTagAndProbeElectronISOvsPhi {
+ hist Z_candidate_mass_distribution_(Lead_in_EndCap) {
+ algorithm = egamma_FitZmass
+ display = StatBox,gaus(80000.,100000.)
}
+
}
-dir egamma/tagandprobeZ/ID {
+dir egamma/TnPZ/ID {
algorithm = egKolmogorov
output = egamma/tagandprobeZ/ID
display = Draw=e1,StatBox
- hist electronTagAndProbeEhad1_BARREL {
- }
- hist electronTagAndProbeEoverP_BARREL {
- }
- hist electronTagAndProbeCoreEM_BARREL {
- }
- hist electronTagAndProbeF1_BARREL {
- }
- hist electronTagAndProbeF2_BARREL {
- }
- hist electronTagAndProbeF3_BARREL {
- }
- hist electronTagAndProbeRe233e237_BARREL {
- }
- hist electronTagAndProbeRe237e277_BARREL {
- }
- hist electronTagAndProbeEhad1_ENDCAP {
- }
- hist electronTagAndProbeEoverP_ENDCAP {
- }
- hist electronTagAndProbeCoreEM_ENDCAP {
- }
- hist electronTagAndProbeF1_ENDCAP {
- }
- hist electronTagAndProbeF2_ENDCAP {
- }
- hist electronTagAndProbeF3_ENDCAP {
- }
- hist electronTagAndProbeRe233e237_ENDCAP {
- }
- hist electronTagAndProbeRe237e277_ENDCAP {
- }
- hist electronTagAndProbeEhad1_CRACK {
- }
- hist electronTagAndProbeEoverP_CRACK {
- }
- hist electronTagAndProbeCoreEM_CRACK {
- }
- hist electronTagAndProbeF1_CRACK {
- }
- hist electronTagAndProbeF2_CRACK {
- }
- hist electronTagAndProbeF3_CRACK {
- }
- hist electronTagAndProbeRe233e237_CRACK {
- }
- hist electronTagAndProbeRe237e277_CRACK {
- }
-}
-
-dir egamma/tagandprobeZ/Track {
+ hist Ehad1ProbeinBARREL { }
+ hist EoverPProbeinBARREL { }
+ hist CoreEMProbeinBARREL { }
+ hist F0ProbeinBARREL { }
+ hist F1ProbeinBARREL { }
+ hist F2ProbeinBARREL { }
+ hist F3ProbeinBARREL { }
+ hist Re233e237ProbeinBARREL { }
+ hist Re237e277ProbeinBARREL { }
+ hist Ehad1ProbeinENDCAP { }
+ hist EoverPProbeinENDCAP { }
+ hist CoreEMProbeinENDCAP { }
+ hist F0ProbeinENDCAP { }
+ hist F1ProbeinENDCAP { }
+ hist F2ProbeinENDCAP { }
+ hist F3ProbeinENDCAP { }
+ hist Re233e237ProbeinENDCAP { }
+ hist Re237e277ProbeinENDCAP { }
+
+}
+
+dir egamma/TnPZ/Tracks {
algorithm = egKolmogorov
output = egamma/tagandprobeZ/Track
display = Draw=e1,StatBox
- hist electronTagAndProbeNOfBLayerHits_BARREL {
- }
- hist electronTagAndProbeNOfTRTHits_BARREL {
- }
- hist electronTagAndProbeNOfSiHits_BARREL {
- }
- hist electronTagAndProbeDeltaEta1_BARREL {
- }
- hist electronTagAndProbeDeltaPhi2_BARREL {
- }
- hist electronTagAndProbeNOfBLayerHits_ENDCAP {
- }
- hist electronTagAndProbeNOfTRTHits_ENDCAP {
- }
- hist electronTagAndProbeNOfSiHits_ENDCAP {
- }
- hist electronTagAndProbeDeltaEta1_ENDCAP {
- }
- hist electronTagAndProbeDeltaPhi2_ENDCAP {
- }
- hist electronTagAndProbeNOfBLayerHits_CRACK {
- }
- hist electronTagAndProbeNOfTRTHits_CRACK {
- }
- hist electronTagAndProbeNOfSiHits_CRACK {
- }
- hist electronTagAndProbeDeltaEta1_CRACK {
- }
- hist electronTagAndProbeDeltaPhi2_CRACK {
- }
+ hist NOfBLayerHitsProbeinBARREL { }
+ hist NOfPixelHitsProbeinBARREL { }
+ hist NOfSCTHitsProbeinBARREL { }
+ hist NOfTRTHitsProbeinBARREL { }
+ hist NOfTRTHighThresholdHitsProbeinBARREL { }
+ hist DeltaEta1ProbeinBARREL { }
+ hist DeltaPhi2ProbeinBARREL { }
+ hist Trackd0ProbeinBARREL { }
+ hist NOfBLayerHitsProbeinENDCAP { }
+ hist NOfPixelHitsProbeinENDCAP { }
+ hist NOfSCTHitsProbeinENDCAP { }
+ hist NOfTRTHitsProbeinENDCAP { }
+ hist NOfTRTHighThresholdHitsProbeinENDCAP { }
+ hist DeltaEta1ProbeinENDCAP { }
+ hist DeltaPhi2ProbeinENDCAP { }
+ hist Trackd0ProbeinENDCAP { }
}
-dir egamma/tagandprobeZ/Isolation {
+dir egamma/TnPZ/Efficiencies {
algorithm = egKolmogorov
output = egamma/tagandprobeZ
display = Draw=e1,StatBox
- hist electronTagAndProbeCaloIso_BARREL {
- }
- hist electronTagAndProbeTrackIso_BARREL {
- }
- hist electronTagAndProbeCaloIso_ENDCAP {
- }
- hist electronTagAndProbeTrackIso_ENDCAP {
- }
- hist electronTagAndProbeCaloIso_CRACK {
- }
- hist electronTagAndProbeTrackIso_CRACK {
- }
+ hist TnP_ID_efficiency_vs_etprobe { }
+ hist TnP_ID_efficiency_vs_etaprobe { }
+ hist TnP_ID_efficiency_vs_phiprobe { }
+ hist TnP_Calo_Iso_efficiency_vs_etprobe { }
+ hist TnP_Calo_Iso_efficiency_vs_etaprobe { }
+ hist TnP_Calo_Iso_efficiency_vs_phiprobe { }
+ hist TnP_Calo_Iso_and_LHTight_efficiency_vs_etprobe { }
+ hist TnP_Calo_Iso_and_LHTight_efficiency_vs_etaprobe { }
+ hist TnP_Calo_Iso_and_LHTight_ID_efficiency_vs_phiprobe { }
}
-dir egamma/tagandprobeZ/LBMon {
+dir egamma/TnPZ/TnPCandidate {
algorithm = egamma_GatherData
output = egamma/tagandprobeZ/LBMon
display = Draw=e1,StatBox
- hist LBEvoNZcandidates {
- }
+ hist Number_of_Z_candidates_vs_LB { }
+
}
### Tag&Probe JPsi
-dir egamma/tagandprobeJPsi {
- algorithm = egKolmogorov
- output = egamma/tagandprobeJPsi
- display = Draw=e1,StatBox
-
- hist electronTagAndProbeNcandidates {
- }
- hist electronTagAndProbeGlobalMass {
- algorithm = egamma_FitJPsimass
- display = StatBox,gaus(xmin,xmax)
- }
- hist electronTagAndProbeMass_BARREL {
- algorithm = egamma_FitJPsimass
- display = StatBox,gaus(xmin,xmax)
- }
- hist electronTagAndProbeMass_CRACK {
- algorithm = egamma_FitJPsimass
- display = StatBox,gaus(xmin,xmax)
- }
- hist electronTagAndProbeMass_ENDCAP {
- algorithm = egamma_FitJPsimass
- display = StatBox,gaus(xmin,xmax)
- }
- hist electronTagAndProbeN {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist electronTagAndProbeEt {
- }
- hist electronTagAndProbeEta {
- }
- hist electronTagAndProbePhi {
- }
- hist electronTagAndProbeEtaPhi {
- algorithm = egamma_BinsDiffFromStripMedian
- }
-}
-
-dir egamma/tagandprobeJPsi {
+dir egamma/TnPJPsi/TnPCandidate {
algorithm = egKolmogorov
output = egamma/tagandprobeJPsi
display = Draw=e1,StatBox
- hist EfficiencyTagAndProbeElectronIDvsEt {
- }
- hist EfficiencyTagAndProbeElectronIDvsEta {
- }
- hist EfficiencyTagAndProbeElectronIDvsPhi {
+ hist JPsi_candidate_mass {
+ algorithm = egamma_FitJPsimass
+ display = StatBox,gaus(3000.,5000.)
}
- hist EfficiencyTagAndProbeElectronISOvsEt {
+ hist JPsi_candidate_mass_distribution_(Lead_in_Barrel) {
+ algorithm = egamma_FitJPsimass
+ display = StatBox,gaus(3000.,5000.)
}
- hist EfficiencyTagAndProbeElectronISOvsEta {
+ hist Number_of_JPsi_candidates_vs_eta_leading_e {}
+ hist Number_of_JPsi_candidates_vs_phi_leading_e {}
+ hist JPsi_candidate mass distribution (Lead in Crack) {
+ algorithm = egamma_FitJPsimass
+ display = StatBox,gaus(3000.,5000.)
}
- hist EfficiencyTagAndProbeElectronISOvsPhi {
+ hist JPsi_candidate_mass_distribution_(Lead_in_EndCap) {
+ algorithm = egamma_FitJPsimass
+ display = StatBox,gaus(3000.,5000.)
}
+
}
-dir egamma/tagandprobeJPsi/ID {
+dir egamma/TnPJPsi/ID {
algorithm = egKolmogorov
output = egamma/tagandprobeJPsi/ID
display = Draw=e1,StatBox
- hist electronTagAndProbeEhad1_BARREL {
- }
- hist electronTagAndProbeEoverP_BARREL {
- }
- hist electronTagAndProbeCoreEM_BARREL {
- }
- hist electronTagAndProbeF1_BARREL {
- }
- hist electronTagAndProbeF2_BARREL {
- }
- hist electronTagAndProbeF3_BARREL {
- }
- hist electronTagAndProbeRe233e237_BARREL {
- }
- hist electronTagAndProbeRe237e277_BARREL {
- }
- hist electronTagAndProbeEhad1_ENDCAP {
- }
- hist electronTagAndProbeEoverP_ENDCAP {
- }
- hist electronTagAndProbeCoreEM_ENDCAP {
- }
- hist electronTagAndProbeF1_ENDCAP {
- }
- hist electronTagAndProbeF2_ENDCAP {
- }
- hist electronTagAndProbeF3_ENDCAP {
- }
- hist electronTagAndProbeRe233e237_ENDCAP {
- }
- hist electronTagAndProbeRe237e277_ENDCAP {
- }
- hist electronTagAndProbeEhad1_CRACK {
- }
- hist electronTagAndProbeEoverP_CRACK {
- }
- hist electronTagAndProbeCoreEM_CRACK {
- }
- hist electronTagAndProbeF1_CRACK {
- }
- hist electronTagAndProbeF2_CRACK {
- }
- hist electronTagAndProbeF3_CRACK {
- }
- hist electronTagAndProbeRe233e237_CRACK {
- }
- hist electronTagAndProbeRe237e277_CRACK {
- }
-}
-
-dir egamma/tagandprobeJPsi/Track {
+ hist Ehad1ProbeinBARREL { }
+ hist EoverPProbeinBARREL { }
+ hist CoreEMProbeinBARREL { }
+ hist F0ProbeinBARREL { }
+ hist F1ProbeinBARREL { }
+ hist F2ProbeinBARREL { }
+ hist F3ProbeinBARREL { }
+ hist Re233e237ProbeinBARREL { }
+ hist Re237e277ProbeinBARREL { }
+ hist Ehad1ProbeinENDCAP { }
+ hist EoverPProbeinENDCAP { }
+ hist CoreEMProbeinENDCAP { }
+ hist F0ProbeinENDCAP { }
+ hist F1ProbeinENDCAP { }
+ hist F2ProbeinENDCAP { }
+ hist F3ProbeinENDCAP { }
+ hist Re233e237ProbeinENDCAP { }
+ hist Re237e277ProbeinENDCAP { }
+
+}
+
+dir egamma/TnPJPsi/Tracks {
algorithm = egKolmogorov
output = egamma/tagandprobeJPsi/Track
display = Draw=e1,StatBox
- hist electronTagAndProbeNOfBLayerHits_BARREL {
- }
- hist electronTagAndProbeNOfTRTHits_BARREL {
- }
- hist electronTagAndProbeNOfSiHits_BARREL {
- }
- hist electronTagAndProbeDeltaEta1_BARREL {
- }
- hist electronTagAndProbeDeltaPhi2_BARREL {
- }
- hist electronTagAndProbeNOfBLayerHits_ENDCAP {
- }
- hist electronTagAndProbeNOfTRTHits_ENDCAP {
- }
- hist electronTagAndProbeNOfSiHits_ENDCAP {
- }
- hist electronTagAndProbeDeltaEta1_ENDCAP {
- }
- hist electronTagAndProbeDeltaPhi2_ENDCAP {
- }
- hist electronTagAndProbeNOfBLayerHits_CRACK {
- }
- hist electronTagAndProbeNOfTRTHits_CRACK {
- }
- hist electronTagAndProbeNOfSiHits_CRACK {
- }
- hist electronTagAndProbeDeltaEta1_CRACK {
- }
- hist electronTagAndProbeDeltaPhi2_CRACK {
- }
+ hist NOfBLayerHitsProbeinBARREL { }
+ hist NOfPixelHitsProbeinBARREL { }
+ hist NOfSCTHitsProbeinBARREL { }
+ hist NOfTRTHitsProbeinBARREL { }
+ hist NOfTRTHighThresholdHitsProbeinBARREL { }
+ hist DeltaEta1ProbeinBARREL { }
+ hist DeltaPhi2ProbeinBARREL { }
+ hist Trackd0ProbeinBARREL { }
+ hist NOfBLayerHitsProbeinENDCAP { }
+ hist NOfPixelHitsProbeinENDCAP { }
+ hist NOfSCTHitsProbeinENDCAP { }
+ hist NOfTRTHitsProbeinENDCAP { }
+ hist NOfTRTHighThresholdHitsProbeinENDCAP { }
+ hist DeltaEta1ProbeinENDCAP { }
+ hist DeltaPhi2ProbeinENDCAP { }
+ hist Trackd0ProbeinENDCAP { }
}
-dir egamma/tagandprobeJPsi/Isolation {
+dir egamma/TnPJPsi/Efficiencies {
algorithm = egKolmogorov
output = egamma/tagandprobeJPsi
display = Draw=e1,StatBox
- hist electronTagAndProbeCaloIso_BARREL {
- }
- hist electronTagAndProbeTrackIso_BARREL {
- }
- hist electronTagAndProbeCaloIso_ENDCAP {
- }
- hist electronTagAndProbeTrackIso_ENDCAP {
- }
- hist electronTagAndProbeCaloIso_CRACK {
- }
- hist electronTagAndProbeTrackIso_CRACK {
- }
+ hist TnP_ID_efficiency_vs_etprobe { }
+ hist TnP_ID_efficiency_vs_etaprobe { }
+ hist TnP_ID_efficiency_vs_phiprobe { }
+ hist TnP_Calo_Iso_efficiency_vs_etprobe { }
+ hist TnP_Calo_Iso_efficiency_vs_etaprobe { }
+ hist TnP_Calo_Iso_efficiency_vs_phiprobe { }
+ hist TnP_Calo_Iso_and_LHTight_efficiency_vs_etprobe { }
+ hist TnP_Calo_Iso_and_LHTight_efficiency_vs_etaprobe { }
+ hist TnP_Calo_Iso_and_LHTight_ID_efficiency_vs_phiprobe { }
}
-dir egamma/tagandprobeJPsi/LBMon {
+dir egamma/TnPJPsi/TnPCandidate {
algorithm = egamma_GatherData
output = egamma/tagandprobeJPsi/LBMon
display = Draw=e1,StatBox
- hist LBEvoNJPsicandidates {
- }
+ hist Number_of_JPsi_candidates_vs_LB { }
+
}
diff --git a/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py b/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py
index 2015b9c3f114..c6e22ac94a57 100755
--- a/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py
+++ b/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py
@@ -29,7 +29,7 @@ def BookHistogramsPerForwardRegions(thegroupe,theparttype,thename,title,path,xbi
'''
Regions = ['ENDCAP','FORWARD']
for n in range(len(Regions)):
- hname = thename + "in" + Regions[n] + ";" + thename + "in" + Regions[n] #+ " " + thepartype + thereconame + thewithTrigger
+ 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)
@@ -490,7 +490,7 @@ def BookFwdElectronHistograms(groupe,reconame,particletype,withTrigger=""):
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"
+ hname= "Et"
htitle= particletype + " transverse energy [MeV]" + " (" + reconame + " " + withTrigger + ")" + " ; Et"+ tlabel +" ; N" + tlabel
groupe.defineHistogram(hname,title=htitle, path='',xbins=100,xmin=2.,xmax=102000.0)
@@ -502,41 +502,41 @@ def BookFwdElectronHistograms(groupe,reconame,particletype,withTrigger=""):
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_gt_2.5GeV"
+ hname= "Eta,Phi;Eta_Phi_distribution_Pt_gt_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_gt_10GeV"
+ hname= "Eta,Phi;Eta_Phi_distributionf_Pt_gt_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"
+ hname= "EnergyDensity"
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"
+ hname= "FracMax"
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"
+ hname= "Lateral"
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"
+ hname= "Longitudinal"
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_Lambda_moment_distribution"
+ hname= "SecondLambda"
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"
+ hname= "SecondR"
htitle= "Fwd electron SecondR 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"
+ hname= "CenterLambda"
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)
@@ -726,7 +726,7 @@ def MonitorPhotonConfig(inputFlags):
phCBLooseTrigMonAlg.ParticlePrefix = "photon"
phCBLooseTrigMonAlg.WithTrigger = "WithTrigger"
# to enable a trigger filter, for example:
- #phCBLooseTrigMonAlg.TriggerChain = egammaConf.primary_double_pho[0]
+ phCBLooseTrigMonAlg.TriggerChain = egammaConf.primary_double_pho[0]
### STEP 4 ###
--
GitLab
From b7ece8e19c15a93cdb24c87a6e792732affbfe2d Mon Sep 17 00:00:00 2001
From: Bertrand LAFORGE <laforge@lpnhe.in2p3.fr>
Date: Thu, 2 Sep 2021 01:14:58 +0200
Subject: [PATCH 266/272] update typo in webdisplay config file
---
.../config/Egamma/collisions_run.config | 1179 +++++++++++------
1 file changed, 784 insertions(+), 395 deletions(-)
diff --git a/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config b/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config
index 55d62214a2af..82ae5d179e06 100644
--- a/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config
@@ -204,13 +204,20 @@ dir egamma/LHLooseElectrons {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
}
- hist Et { }
- hist Eta { }
- hist Phi { }
- hist Eta_Phi_distribution_with_Pt.gt.4GeV { }
- hist TopoEtCone40 { }
- hist PtCone20 { }
- hist Time { }
+ hist Et {
+ }
+ hist Eta {
+ }
+ hist Phi {
+ }
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ }
+ hist TopoEtCone40 {
+ }
+ hist PtCone20 {
+ }
+ hist Time {
+ }
}
dir egamma/LHLooseElectrons/Expert {
@@ -218,8 +225,10 @@ dir egamma/LHLooseElectrons/Expert {
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
- hist Eta_Phi_with_Pt_gt_2.5GeV { }
- hist Eta_Phi_with_Pt_gt_20GeV { }
+ hist Eta_Phi_with_Pt_gt_2.5GeV {
+ }
+ hist Eta_Phi_with_Pt_gt_20GeV {
+ }
}
dir egamma/LHLooseElectrons/byLB {
@@ -227,7 +236,8 @@ dir egamma/LHLooseElectrons/byLB {
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
- hist LBEvON { }
+ hist LBEvON {
+ }
}
dir egamma/LHLooseElectrons/ID {
@@ -235,27 +245,48 @@ dir egamma/LHLooseElectrons/ID {
output = egamma/electrons/ID
display = Draw=e1,StatBox
- hist Ehad1inBARREL { }
- hist CoreEMinBARREL { }
- hist F0inBARREL { }
- hist F1inBARREL { }
- hist F2inBARREL { }
- hist F3inBARREL { }
- hist Re237e277inBARREL { }
- hist Ehad1inENDCAP { }
- hist EoverPinENDCAP { }
- hist CoreEMinENDCAP { }
- hist Re233e237inENDCAP { }
- hist Re237e277inENDCAP { }
- hist Ehad1inCRACK { }
- hist EoverPinCRACK { }
- hist CoreEMinCRACK { }
- hist F0inCRACK { }
- hist F1inCRACK { }
- hist F2inCRACK { }
- hist F3inCRACK { }
- hist Re233e237inCRACK { }
- hist Re237e277inCRACK { }
+ hist Ehad1inBARREL {
+ }
+ hist CoreEMinBARREL {
+ }
+ hist F0inBARREL {
+ }
+ hist F1inBARREL {
+ }
+ hist F2inBARREL {
+ }
+ hist F3inBARREL {
+ }
+ hist Re237e277inBARREL {
+ }
+ hist Ehad1inENDCAP {
+ }
+ hist EoverPinENDCAP {
+ }
+ hist CoreEMinENDCAP {
+ }
+ hist Re233e237inENDCAP {
+ }
+ hist Re237e277inENDCAP {
+ }
+ hist Ehad1inCRACK {
+ }
+ hist EoverPinCRACK {
+ }
+ hist CoreEMinCRACK {
+ }
+ hist F0inCRACK {
+ }
+ hist F1inCRACK {
+ }
+ hist F2inCRACK {
+ }
+ hist F3inCRACK {
+ }
+ hist Re233e237inCRACK {
+ }
+ hist Re237e277inCRACK {
+ }
}
dir egamma/LHLooseElectrons/Expert/Track {
@@ -263,30 +294,54 @@ dir egamma/LHLooseElectrons/Expert/Track {
output = egamma/electrons/Track
display = Draw=e1,StatBox
- hist NOfBLayerHitsinBARREL { }
- hist NOfPixelHitsinBARREL { }
- hist NOfSCTHitsinBARREL { }
- hist NOfTRTHitsinBARREL { }
- hist NOfTRTHighThresholdHitsinBARREL { }
- hist DeltaEta1inBARREL { }
- hist DeltaPhi2inBARREL { }
- hist Trackd0inBARREL { }
- hist NOfBLayerHitsinENDCAP { }
- hist NOfPixelHitsinENDCAP { }
- hist NOfSCTHitsinENDCAP { }
- hist NOfTRTHitsinENDCAP { }
- hist NOfTRTHighThresholdHitsinENDCAP { }
- hist DeltaEta1inENDCAP { }
- hist DeltaPhi2inENDCAP { }
- hist Trackd0inENDCAP { }
- hist NOfBLayerHitsinCRACK { }
- hist NOfPixelHitsinCRACK { }
- hist NOfSCTHitsinCRACK { }
- hist NOfTRTHitsinCRACK { }
- hist NOfTRTHighThresholdHitsinCRACK { }
- hist DeltaEta1inCRACK { }
- hist DeltaPhi2inCRACK { }
- hist Trackd0inCRACK { }
+ hist NOfBLayerHitsinBARREL {
+ }
+ hist NOfPixelHitsinBARREL {
+ }
+ hist NOfSCTHitsinBARREL {
+ }
+ hist NOfTRTHitsinBARREL {
+ }
+ hist NOfTRTHighThresholdHitsinBARREL {
+ }
+ hist DeltaEta1inBARREL {
+ }
+ hist DeltaPhi2inBARREL {
+ }
+ hist Trackd0inBARREL {
+ }
+ hist NOfBLayerHitsinENDCAP {
+ }
+ hist NOfPixelHitsinENDCAP {
+ }
+ hist NOfSCTHitsinENDCAP {
+ }
+ hist NOfTRTHitsinENDCAP {
+ }
+ hist NOfTRTHighThresholdHitsinENDCAP {
+ }
+ hist DeltaEta1inENDCAP {
+ }
+ hist DeltaPhi2inENDCAP {
+ }
+ hist Trackd0inENDCAP {
+ }
+ hist NOfBLayerHitsinCRACK {
+ }
+ hist NOfPixelHitsinCRACK {
+ }
+ hist NOfSCTHitsinCRACK {
+ }
+ hist NOfTRTHitsinCRACK {
+ }
+ hist NOfTRTHighThresholdHitsinCRACK {
+ }
+ hist DeltaEta1inCRACK {
+ }
+ hist DeltaPhi2inCRACK {
+ }
+ hist Trackd0inCRACK {
+ }
}
@@ -301,13 +356,20 @@ dir egamma/LHLooseElectronsWithTrigger {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
}
- hist Et { }
- hist Eta { }
- hist Phi { }
- hist Eta_Phi_distribution_with_Pt.gt.4GeV { }
- hist TopoEtCone40 { }
- hist PtCone20 { }
- hist Time { }
+ hist Et {
+ }
+ hist Eta {
+ }
+ hist Phi {
+ }
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ }
+ hist TopoEtCone40 {
+ }
+ hist PtCone20 {
+ }
+ hist Time {
+ }
}
dir egamma/LHLooseElectronsWithTrigger/Expert {
@@ -315,8 +377,10 @@ dir egamma/LHLooseElectronsWithTrigger/Expert {
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
- hist Eta_Phi_with_Pt_gt_2.5GeV { }
- hist Eta_Phi_with_Pt_gt_20GeV { }
+ hist Eta_Phi_with_Pt_gt_2.5GeV {
+ }
+ hist Eta_Phi_with_Pt_gt_20GeV {
+ }
}
dir egamma/LHLooseElectronsWithTrigger/byLB {
@@ -324,7 +388,8 @@ dir egamma/LHLooseElectronsWithTrigger/byLB {
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
- hist LBEvON { }
+ hist LBEvON {
+ }
}
dir egamma/LHLooseElectronsWithTrigger/ID {
@@ -332,27 +397,48 @@ dir egamma/LHLooseElectronsWithTrigger/ID {
output = egamma/electrons/ID
display = Draw=e1,StatBox
- hist Ehad1inBARREL { }
- hist CoreEMinBARREL { }
- hist F0inBARREL { }
- hist F1inBARREL { }
- hist F2inBARREL { }
- hist F3inBARREL { }
- hist Re237e277inBARREL { }
- hist Ehad1inENDCAP { }
- hist EoverPinENDCAP { }
- hist CoreEMinENDCAP { }
- hist Re233e237inENDCAP { }
- hist Re237e277inENDCAP { }
- hist Ehad1inCRACK { }
- hist EoverPinCRACK { }
- hist CoreEMinCRACK { }
- hist F0inCRACK { }
- hist F1inCRACK { }
- hist F2inCRACK { }
- hist F3inCRACK { }
- hist Re233e237inCRACK { }
- hist Re237e277inCRACK { }
+ hist Ehad1inBARREL {
+ }
+ hist CoreEMinBARREL {
+ }
+ hist F0inBARREL {
+ }
+ hist F1inBARREL {
+ }
+ hist F2inBARREL {
+ }
+ hist F3inBARREL {
+ }
+ hist Re237e277inBARREL {
+ }
+ hist Ehad1inENDCAP {
+ }
+ hist EoverPinENDCAP {
+ }
+ hist CoreEMinENDCAP {
+ }
+ hist Re233e237inENDCAP {
+ }
+ hist Re237e277inENDCAP {
+ }
+ hist Ehad1inCRACK {
+ }
+ hist EoverPinCRACK {
+ }
+ hist CoreEMinCRACK {
+ }
+ hist F0inCRACK {
+ }
+ hist F1inCRACK {
+ }
+ hist F2inCRACK {
+ }
+ hist F3inCRACK {
+ }
+ hist Re233e237inCRACK {
+ }
+ hist Re237e277inCRACK {
+ }
}
dir egamma/LHLooseElectronsWithTrigger/Expert/Track {
@@ -360,30 +446,54 @@ dir egamma/LHLooseElectronsWithTrigger/Expert/Track {
output = egamma/electrons/Track
display = Draw=e1,StatBox
- hist NOfBLayerHitsinBARREL { }
- hist NOfPixelHitsinBARREL { }
- hist NOfSCTHitsinBARREL { }
- hist NOfTRTHitsinBARREL { }
- hist NOfTRTHighThresholdHitsinBARREL { }
- hist DeltaEta1inBARREL { }
- hist DeltaPhi2inBARREL { }
- hist Trackd0inBARREL { }
- hist NOfBLayerHitsinENDCAP { }
- hist NOfPixelHitsinENDCAP { }
- hist NOfSCTHitsinENDCAP { }
- hist NOfTRTHitsinENDCAP { }
- hist NOfTRTHighThresholdHitsinENDCAP { }
- hist DeltaEta1inENDCAP { }
- hist DeltaPhi2inENDCAP { }
- hist Trackd0inENDCAP { }
- hist NOfBLayerHitsinCRACK { }
- hist NOfPixelHitsinCRACK { }
- hist NOfSCTHitsinCRACK { }
- hist NOfTRTHitsinCRACK { }
- hist NOfTRTHighThresholdHitsinCRACK { }
- hist DeltaEta1inCRACK { }
- hist DeltaPhi2inCRACK { }
- hist Trackd0inCRACK { }
+ hist NOfBLayerHitsinBARREL {
+ }
+ hist NOfPixelHitsinBARREL {
+ }
+ hist NOfSCTHitsinBARREL {
+ }
+ hist NOfTRTHitsinBARREL {
+ }
+ hist NOfTRTHighThresholdHitsinBARREL {
+ }
+ hist DeltaEta1inBARREL {
+ }
+ hist DeltaPhi2inBARREL {
+ }
+ hist Trackd0inBARREL {
+ }
+ hist NOfBLayerHitsinENDCAP {
+ }
+ hist NOfPixelHitsinENDCAP {
+ }
+ hist NOfSCTHitsinENDCAP {
+ }
+ hist NOfTRTHitsinENDCAP {
+ }
+ hist NOfTRTHighThresholdHitsinENDCAP {
+ }
+ hist DeltaEta1inENDCAP {
+ }
+ hist DeltaPhi2inENDCAP {
+ }
+ hist Trackd0inENDCAP {
+ }
+ hist NOfBLayerHitsinCRACK {
+ }
+ hist NOfPixelHitsinCRACK {
+ }
+ hist NOfSCTHitsinCRACK {
+ }
+ hist NOfTRTHitsinCRACK {
+ }
+ hist NOfTRTHighThresholdHitsinCRACK {
+ }
+ hist DeltaEta1inCRACK {
+ }
+ hist DeltaPhi2inCRACK {
+ }
+ hist Trackd0inCRACK {
+ }
}
@@ -398,13 +508,20 @@ dir egamma/LHTightElectrons {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
}
- hist Et { }
- hist Eta { }
- hist Phi { }
- hist Eta_Phi_distribution_with_Pt.gt.4GeV { }
- hist TopoEtCone40 { }
- hist PtCone20 { }
- hist Time { }
+ hist Et {
+ }
+ hist Eta {
+ }
+ hist Phi {
+ }
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ }
+ hist TopoEtCone40 {
+ }
+ hist PtCone20 {
+ }
+ hist Time {
+ }
}
dir egamma/LHTightElectrons/Expert {
@@ -412,8 +529,10 @@ dir egamma/LHTightElectrons/Expert {
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
- hist Eta_Phi_with_Pt_gt_2.5GeV { }
- hist Eta_Phi_with_Pt_gt_20GeV { }
+ hist Eta_Phi_with_Pt_gt_2.5GeV {
+ }
+ hist Eta_Phi_with_Pt_gt_20GeV {
+ }
}
dir egamma/LHTightElectrons/byLB {
@@ -421,7 +540,8 @@ dir egamma/LHTightElectrons/byLB {
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
- hist LBEvON { }
+ hist LBEvON {
+ }
}
dir egamma/LHTightElectrons/ID {
@@ -429,27 +549,48 @@ dir egamma/LHTightElectrons/ID {
output = egamma/electrons/ID
display = Draw=e1,StatBox
- hist Ehad1inBARREL { }
- hist CoreEMinBARREL { }
- hist F0inBARREL { }
- hist F1inBARREL { }
- hist F2inBARREL { }
- hist F3inBARREL { }
- hist Re237e277inBARREL { }
- hist Ehad1inENDCAP { }
- hist EoverPinENDCAP { }
- hist CoreEMinENDCAP { }
- hist Re233e237inENDCAP { }
- hist Re237e277inENDCAP { }
- hist Ehad1inCRACK { }
- hist EoverPinCRACK { }
- hist CoreEMinCRACK { }
- hist F0inCRACK { }
- hist F1inCRACK { }
- hist F2inCRACK { }
- hist F3inCRACK { }
- hist Re233e237inCRACK { }
- hist Re237e277inCRACK { }
+ hist Ehad1inBARREL {
+ }
+ hist CoreEMinBARREL {
+ }
+ hist F0inBARREL {
+ }
+ hist F1inBARREL {
+ }
+ hist F2inBARREL {
+ }
+ hist F3inBARREL {
+ }
+ hist Re237e277inBARREL {
+ }
+ hist Ehad1inENDCAP {
+ }
+ hist EoverPinENDCAP {
+ }
+ hist CoreEMinENDCAP {
+ }
+ hist Re233e237inENDCAP {
+ }
+ hist Re237e277inENDCAP {
+ }
+ hist Ehad1inCRACK {
+ }
+ hist EoverPinCRACK {
+ }
+ hist CoreEMinCRACK {
+ }
+ hist F0inCRACK {
+ }
+ hist F1inCRACK {
+ }
+ hist F2inCRACK {
+ }
+ hist F3inCRACK {
+ }
+ hist Re233e237inCRACK {
+ }
+ hist Re237e277inCRACK {
+ }
}
dir egamma/LHTightElectrons/Expert/Track {
@@ -457,30 +598,54 @@ dir egamma/LHTightElectrons/Expert/Track {
output = egamma/electrons/Track
display = Draw=e1,StatBox
- hist NOfBLayerHitsinBARREL { }
- hist NOfPixelHitsinBARREL { }
- hist NOfSCTHitsinBARREL { }
- hist NOfTRTHitsinBARREL { }
- hist NOfTRTHighThresholdHitsinBARREL { }
- hist DeltaEta1inBARREL { }
- hist DeltaPhi2inBARREL { }
- hist Trackd0inBARREL { }
- hist NOfBLayerHitsinENDCAP { }
- hist NOfPixelHitsinENDCAP { }
- hist NOfSCTHitsinENDCAP { }
- hist NOfTRTHitsinENDCAP { }
- hist NOfTRTHighThresholdHitsinENDCAP { }
- hist DeltaEta1inENDCAP { }
- hist DeltaPhi2inENDCAP { }
- hist Trackd0inENDCAP { }
- hist NOfBLayerHitsinCRACK { }
- hist NOfPixelHitsinCRACK { }
- hist NOfSCTHitsinCRACK { }
- hist NOfTRTHitsinCRACK { }
- hist NOfTRTHighThresholdHitsinCRACK { }
- hist DeltaEta1inCRACK { }
- hist DeltaPhi2inCRACK { }
- hist Trackd0inCRACK { }
+ hist NOfBLayerHitsinBARREL {
+ }
+ hist NOfPixelHitsinBARREL {
+ }
+ hist NOfSCTHitsinBARREL {
+ }
+ hist NOfTRTHitsinBARREL {
+ }
+ hist NOfTRTHighThresholdHitsinBARREL {
+ }
+ hist DeltaEta1inBARREL {
+ }
+ hist DeltaPhi2inBARREL {
+ }
+ hist Trackd0inBARREL {
+ }
+ hist NOfBLayerHitsinENDCAP {
+ }
+ hist NOfPixelHitsinENDCAP {
+ }
+ hist NOfSCTHitsinENDCAP {
+ }
+ hist NOfTRTHitsinENDCAP {
+ }
+ hist NOfTRTHighThresholdHitsinENDCAP {
+ }
+ hist DeltaEta1inENDCAP {
+ }
+ hist DeltaPhi2inENDCAP {
+ }
+ hist Trackd0inENDCAP {
+ }
+ hist NOfBLayerHitsinCRACK {
+ }
+ hist NOfPixelHitsinCRACK {
+ }
+ hist NOfSCTHitsinCRACK {
+ }
+ hist NOfTRTHitsinCRACK {
+ }
+ hist NOfTRTHighThresholdHitsinCRACK {
+ }
+ hist DeltaEta1inCRACK {
+ }
+ hist DeltaPhi2inCRACK {
+ }
+ hist Trackd0inCRACK {
+ }
}
@@ -495,13 +660,20 @@ dir egamma/LHTightElectronsWithTrigger {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
}
- hist Et { }
- hist Eta { }
- hist Phi { }
- hist Eta_Phi_distribution_with_Pt.gt.4GeV { }
- hist TopoEtCone40 { }
- hist PtCone20 { }
- hist Time { }
+ hist Et {
+ }
+ hist Eta {
+ }
+ hist Phi {
+ }
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ }
+ hist TopoEtCone40 {
+ }
+ hist PtCone20 {
+ }
+ hist Time {
+ }
}
dir egamma/LHTightElectronsWithTrigger/Expert {
@@ -509,8 +681,10 @@ dir egamma/LHTightElectronsWithTrigger/Expert {
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
- hist Eta_Phi_with_Pt_gt_2.5GeV { }
- hist Eta_Phi_with_Pt_gt_20GeV { }
+ hist Eta_Phi_with_Pt_gt_2.5GeV {
+ }
+ hist Eta_Phi_with_Pt_gt_20GeV {
+ }
}
dir egamma/LHTightElectronsWithTrigger/byLB {
@@ -518,7 +692,8 @@ dir egamma/LHTightElectronsWithTrigger/byLB {
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
- hist LBEvON { }
+ hist LBEvON {
+ }
}
dir egamma/LHTightElectronsWithTrigger/ID {
@@ -526,27 +701,48 @@ dir egamma/LHTightElectronsWithTrigger/ID {
output = egamma/electrons/ID
display = Draw=e1,StatBox
- hist Ehad1inBARREL { }
- hist CoreEMinBARREL { }
- hist F0inBARREL { }
- hist F1inBARREL { }
- hist F2inBARREL { }
- hist F3inBARREL { }
- hist Re237e277inBARREL { }
- hist Ehad1inENDCAP { }
- hist EoverPinENDCAP { }
- hist CoreEMinENDCAP { }
- hist Re233e237inENDCAP { }
- hist Re237e277inENDCAP { }
- hist Ehad1inCRACK { }
- hist EoverPinCRACK { }
- hist CoreEMinCRACK { }
- hist F0inCRACK { }
- hist F1inCRACK { }
- hist F2inCRACK { }
- hist F3inCRACK { }
- hist Re233e237inCRACK { }
- hist Re237e277inCRACK { }
+ hist Ehad1inBARREL {
+ }
+ hist CoreEMinBARREL {
+ }
+ hist F0inBARREL {
+ }
+ hist F1inBARREL {
+ }
+ hist F2inBARREL {
+ }
+ hist F3inBARREL {
+ }
+ hist Re237e277inBARREL {
+ }
+ hist Ehad1inENDCAP {
+ }
+ hist EoverPinENDCAP {
+ }
+ hist CoreEMinENDCAP {
+ }
+ hist Re233e237inENDCAP {
+ }
+ hist Re237e277inENDCAP {
+ }
+ hist Ehad1inCRACK {
+ }
+ hist EoverPinCRACK {
+ }
+ hist CoreEMinCRACK {
+ }
+ hist F0inCRACK {
+ }
+ hist F1inCRACK {
+ }
+ hist F2inCRACK {
+ }
+ hist F3inCRACK {
+ }
+ hist Re233e237inCRACK {
+ }
+ hist Re237e277inCRACK {
+ }
}
dir egamma/LHTightElectronsWithTrigger/Expert/Track {
@@ -554,30 +750,54 @@ dir egamma/LHTightElectronsWithTrigger/Expert/Track {
output = egamma/electrons/Track
display = Draw=e1,StatBox
- hist NOfBLayerHitsinBARREL { }
- hist NOfPixelHitsinBARREL { }
- hist NOfSCTHitsinBARREL { }
- hist NOfTRTHitsinBARREL { }
- hist NOfTRTHighThresholdHitsinBARREL { }
- hist DeltaEta1inBARREL { }
- hist DeltaPhi2inBARREL { }
- hist Trackd0inBARREL { }
- hist NOfBLayerHitsinENDCAP { }
- hist NOfPixelHitsinENDCAP { }
- hist NOfSCTHitsinENDCAP { }
- hist NOfTRTHitsinENDCAP { }
- hist NOfTRTHighThresholdHitsinENDCAP { }
- hist DeltaEta1inENDCAP { }
- hist DeltaPhi2inENDCAP { }
- hist Trackd0inENDCAP { }
- hist NOfBLayerHitsinCRACK { }
- hist NOfPixelHitsinCRACK { }
- hist NOfSCTHitsinCRACK { }
- hist NOfTRTHitsinCRACK { }
- hist NOfTRTHighThresholdHitsinCRACK { }
- hist DeltaEta1inCRACK { }
- hist DeltaPhi2inCRACK { }
- hist Trackd0inCRACK { }
+ hist NOfBLayerHitsinBARREL {
+ }
+ hist NOfPixelHitsinBARREL {
+ }
+ hist NOfSCTHitsinBARREL {
+ }
+ hist NOfTRTHitsinBARREL {
+ }
+ hist NOfTRTHighThresholdHitsinBARREL {
+ }
+ hist DeltaEta1inBARREL {
+ }
+ hist DeltaPhi2inBARREL {
+ }
+ hist Trackd0inBARREL {
+ }
+ hist NOfBLayerHitsinENDCAP {
+ }
+ hist NOfPixelHitsinENDCAP {
+ }
+ hist NOfSCTHitsinENDCAP {
+ }
+ hist NOfTRTHitsinENDCAP {
+ }
+ hist NOfTRTHighThresholdHitsinENDCAP {
+ }
+ hist DeltaEta1inENDCAP {
+ }
+ hist DeltaPhi2inENDCAP {
+ }
+ hist Trackd0inENDCAP {
+ }
+ hist NOfBLayerHitsinCRACK {
+ }
+ hist NOfPixelHitsinCRACK {
+ }
+ hist NOfSCTHitsinCRACK {
+ }
+ hist NOfTRTHitsinCRACK {
+ }
+ hist NOfTRTHighThresholdHitsinCRACK {
+ }
+ hist DeltaEta1inCRACK {
+ }
+ hist DeltaPhi2inCRACK {
+ }
+ hist Trackd0inCRACK {
+ }
}
@@ -597,13 +817,20 @@ dir egamma/CBLoosePhotons {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
}
- hist Et { }
- hist Phi { }
- hist Eta { }
- hist PtCone20 { }
- hist EtCone40 { }
- hist Eta_Phi_distribution_with_Pt.gt.4GeV { }
- hist Time { }
+ hist Et {
+ }
+ hist Phi {
+ }
+ hist Eta {
+ }
+ hist PtCone20 {
+ }
+ hist EtCone40 {
+ }
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ }
+ hist Time {
+ }
}
dir egamma/CBLoosePhotons/Expert {
@@ -611,29 +838,52 @@ dir egamma/CBLoosePhotons/Expert {
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
- hist NinBARREL { }
- hist EtainBARREL { }
- hist PhiinBARREL { }
- hist TimeinBARREL { }
- hist RConvinBARREL { }
- hist ConvTypeinBARREL { }
- hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV { }
- hist Eta_Phi_Conv_with_Pt_gt_2.5GeV { }
- hist NinENDCAP { }
- hist EtainENDCAP { }
- hist PhiinENDCAP { }
- hist TimeinENDCAP { }
- hist RConvinENDCAP { }
- hist ConvTypeinENDCAP { }
- hist Eta_Phi_with_Pt.gt.20GeV { }
- hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV { }
- hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV { }
- hist NinCRACK { }
- hist EtainCRACK { }
- hist PhiinCRACK { }
- hist TimeinCRACK { }
- hist RConvinCRACK { }
- hist ConvTypeinCRACK { }
+ hist NinBARREL {
+ }
+ hist EtainBARREL {
+ }
+ hist PhiinBARREL {
+ }
+ hist TimeinBARREL {
+ }
+ hist RConvinBARREL {
+ }
+ hist ConvTypeinBARREL {
+ }
+ hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
+ }
+ hist Eta_Phi_Conv_with_Pt_gt_2.5GeV {
+ }
+ hist NinENDCAP {
+ }
+ hist EtainENDCAP {
+ }
+ hist PhiinENDCAP {
+ }
+ hist TimeinENDCAP {
+ }
+ hist RConvinENDCAP {
+ }
+ hist ConvTypeinENDCAP {
+ }
+ hist Eta_Phi_with_Pt.gt.20GeV {
+ }
+ hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
+ }
+ hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
+ }
+ hist NinCRACK {
+ }
+ hist EtainCRACK {
+ }
+ hist PhiinCRACK {
+ }
+ hist TimeinCRACK {
+ }
+ hist RConvinCRACK {
+ }
+ hist ConvTypeinCRACK {
+ }
}
@@ -642,10 +892,14 @@ dir egamma/CBLoosePhotons/byLB {
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
- hist Number_of_Unconv._photons_vs_LB { }
- hist Number_of_Conv._photons_vs_LB { }
- hist LBEvoN { }
- hist Conversion_fraction_vs_LB Conversion_fraction_vs_LB { }
+ hist Number_of_Unconv._photons_vs_LB {
+ }
+ hist Number_of_Conv._photons_vs_LB {
+ }
+ hist LBEvoN {
+ }
+ hist Conversion_fraction_vs_LB {
+ }
}
@@ -654,30 +908,54 @@ dir egamma/CBLoosePhotons/ID {
output = egamma/photons/ID
display = Draw=e1,StatBox
- hist Ehad1inBARREL { }
- hist CoreEMinBARREL { }
- hist F0inBARREL { }
- hist F1inBARREL { }
- hist F2inBARREL { }
- hist F3inBARREL { }
- hist Re233e237inBARREL { }
- hist Re237e277inBARREL { }
- hist Ehad1inENDCAP { }
- hist CoreEMinENDCAP { }
- hist F0inENDCAP { }
- hist F1inENDCAP { }
- hist F2inENDCAP { }
- hist F3inENDCAP { }
- hist Re233e237inENDCAP { }
- hist Re237e277inENDCAP { }
- hist Ehad1inCRACK { }
- hist CoreEMinCRACK { }
- hist F0inCRACK { }
- hist F1inCRACK { }
- hist F2inCRACK { }
- hist F3inCRACK { }
- hist Re233e237inCRACK { }
- hist Re237e277inCRACK { }
+ hist Ehad1inBARREL {
+ }
+ hist CoreEMinBARREL {
+ }
+ hist F0inBARREL {
+ }
+ hist F1inBARREL {
+ }
+ hist F2inBARREL {
+ }
+ hist F3inBARREL {
+ }
+ hist Re233e237inBARREL {
+ }
+ hist Re237e277inBARREL {
+ }
+ hist Ehad1inENDCAP {
+ }
+ hist CoreEMinENDCAP {
+ }
+ hist F0inENDCAP {
+ }
+ hist F1inENDCAP {
+ }
+ hist F2inENDCAP {
+ }
+ hist F3inENDCAP {
+ }
+ hist Re233e237inENDCAP {
+ }
+ hist Re237e277inENDCAP {
+ }
+ hist Ehad1inCRACK {
+ }
+ hist CoreEMinCRACK {
+ }
+ hist F0inCRACK {
+ }
+ hist F1inCRACK {
+ }
+ hist F2inCRACK {
+ }
+ hist F3inCRACK {
+ }
+ hist Re233e237inCRACK {
+ }
+ hist Re237e277inCRACK {
+ }
}
########################################
@@ -695,10 +973,14 @@ dir egamma/CBLooseFwdElectrons {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
}
- hist Et { }
- hist Phi { }
- hist Eta { }
- hist Time { }
+ hist Et {
+ }
+ hist Phi {
+ }
+ hist Eta {
+ }
+ hist Time {
+ }
hist Eta_Phi_distributionf_Pt_gt_10GeV {
algorithm = egamma_BinsDiffFromStripMedian
}
@@ -709,13 +991,20 @@ dir egamma/CBLooseFwdElectrons {
output = egamma/forwardElectrons/ID
display = Draw=e1,StatBox
- hist EnergyDensity { }
- hist FracMax { }
- hist Lateral { }
- hist Longitudinal { }
- hist SecondLambda { }
- hist SecondR { }
- hist CenterLambda { }
+ hist EnergyDensity {
+ }
+ hist FracMax {
+ }
+ hist Lateral {
+ }
+ hist Longitudinal {
+ }
+ hist SecondLambda {
+ }
+ hist SecondR {
+ }
+ hist CenterLambda {
+ }
}
@@ -730,13 +1019,20 @@ dir egamma/CBLooseFwdElectrons {
hist NinFORWARD {
display = Draw=e1,StatBox,LogY
}
- hist Eta_Phi_distribution_Pt_gt_2.5GeV { }
- hist EtainENDCAP { }
- hist PhiinENDCAP { }
- hist TimeinENDCAP { }
- hist EtainFORWARD { }
- hist PhiinFORWARD { }
- hist TimeinFORWARD { }
+ hist Eta_Phi_distribution_Pt_gt_2.5GeV {
+ }
+ hist EtainENDCAP {
+ }
+ hist PhiinENDCAP {
+ }
+ hist TimeinENDCAP {
+ }
+ hist EtainFORWARD {
+ }
+ hist PhiinFORWARD {
+ }
+ hist TimeinFORWARD {
+ }
}
### Tag&Probe Z
@@ -750,17 +1046,19 @@ dir egamma/TnPZ/TnPCandidate {
algorithm = egamma_FitZmass
display = StatBox,gaus(80000.,100000.)
}
- hist Z_candidate_mass_distribution_(Lead_in_Barrel) {
+ hist Z_candidate_mass_distribution_Lead_in_Barrel {
algorithm = egamma_FitZmass
display = StatBox,gaus(80000.,100000.)
}
- hist Number_of_Z_candidates_vs_eta_leading_e {}
- hist Number_of_Z_candidates_vs_phi_leading_e {}
- hist Z_candidate mass distribution (Lead in Crack) {
+ hist Number_of_Z_candidates_vs_eta_leading_e {
+ }
+ hist Number_of_Z_candidates_vs_phi_leading_e {
+ }
+ hist Z_candidate_mass_distribution_Lead_in_Crack {
algorithm = egamma_FitZmass
display = StatBox,gaus(80000.,100000.)
}
- hist Z_candidate_mass_distribution_(Lead_in_EndCap) {
+ hist Z_candidate_mass_distribution_Lead_in_EndCap {
algorithm = egamma_FitZmass
display = StatBox,gaus(80000.,100000.)
}
@@ -772,24 +1070,42 @@ dir egamma/TnPZ/ID {
output = egamma/tagandprobeZ/ID
display = Draw=e1,StatBox
- hist Ehad1ProbeinBARREL { }
- hist EoverPProbeinBARREL { }
- hist CoreEMProbeinBARREL { }
- hist F0ProbeinBARREL { }
- hist F1ProbeinBARREL { }
- hist F2ProbeinBARREL { }
- hist F3ProbeinBARREL { }
- hist Re233e237ProbeinBARREL { }
- hist Re237e277ProbeinBARREL { }
- hist Ehad1ProbeinENDCAP { }
- hist EoverPProbeinENDCAP { }
- hist CoreEMProbeinENDCAP { }
- hist F0ProbeinENDCAP { }
- hist F1ProbeinENDCAP { }
- hist F2ProbeinENDCAP { }
- hist F3ProbeinENDCAP { }
- hist Re233e237ProbeinENDCAP { }
- hist Re237e277ProbeinENDCAP { }
+ hist Ehad1ProbeinBARREL {
+ }
+ hist EoverPProbeinBARREL {
+ }
+ hist CoreEMProbeinBARREL {
+ }
+ hist F0ProbeinBARREL {
+ }
+ hist F1ProbeinBARREL {
+ }
+ hist F2ProbeinBARREL {
+ }
+ hist F3ProbeinBARREL {
+ }
+ hist Re233e237ProbeinBARREL {
+ }
+ hist Re237e277ProbeinBARREL {
+ }
+ hist Ehad1ProbeinENDCAP {
+ }
+ hist EoverPProbeinENDCAP {
+ }
+ hist CoreEMProbeinENDCAP {
+ }
+ hist F0ProbeinENDCAP {
+ }
+ hist F1ProbeinENDCAP {
+ }
+ hist F2ProbeinENDCAP {
+ }
+ hist F3ProbeinENDCAP {
+ }
+ hist Re233e237ProbeinENDCAP {
+ }
+ hist Re237e277ProbeinENDCAP {
+ }
}
@@ -798,22 +1114,38 @@ dir egamma/TnPZ/Tracks {
output = egamma/tagandprobeZ/Track
display = Draw=e1,StatBox
- hist NOfBLayerHitsProbeinBARREL { }
- hist NOfPixelHitsProbeinBARREL { }
- hist NOfSCTHitsProbeinBARREL { }
- hist NOfTRTHitsProbeinBARREL { }
- hist NOfTRTHighThresholdHitsProbeinBARREL { }
- hist DeltaEta1ProbeinBARREL { }
- hist DeltaPhi2ProbeinBARREL { }
- hist Trackd0ProbeinBARREL { }
- hist NOfBLayerHitsProbeinENDCAP { }
- hist NOfPixelHitsProbeinENDCAP { }
- hist NOfSCTHitsProbeinENDCAP { }
- hist NOfTRTHitsProbeinENDCAP { }
- hist NOfTRTHighThresholdHitsProbeinENDCAP { }
- hist DeltaEta1ProbeinENDCAP { }
- hist DeltaPhi2ProbeinENDCAP { }
- hist Trackd0ProbeinENDCAP { }
+ hist NOfBLayerHitsProbeinBARREL {
+ }
+ hist NOfPixelHitsProbeinBARREL {
+ }
+ hist NOfSCTHitsProbeinBARREL {
+ }
+ hist NOfTRTHitsProbeinBARREL {
+ }
+ hist NOfTRTHighThresholdHitsProbeinBARREL {
+ }
+ hist DeltaEta1ProbeinBARREL {
+ }
+ hist DeltaPhi2ProbeinBARREL {
+ }
+ hist Trackd0ProbeinBARREL {
+ }
+ hist NOfBLayerHitsProbeinENDCAP {
+ }
+ hist NOfPixelHitsProbeinENDCAP {
+ }
+ hist NOfSCTHitsProbeinENDCAP {
+ }
+ hist NOfTRTHitsProbeinENDCAP {
+ }
+ hist NOfTRTHighThresholdHitsProbeinENDCAP {
+ }
+ hist DeltaEta1ProbeinENDCAP {
+ }
+ hist DeltaPhi2ProbeinENDCAP {
+ }
+ hist Trackd0ProbeinENDCAP {
+ }
}
@@ -822,15 +1154,25 @@ dir egamma/TnPZ/Efficiencies {
output = egamma/tagandprobeZ
display = Draw=e1,StatBox
- hist TnP_ID_efficiency_vs_etprobe { }
- hist TnP_ID_efficiency_vs_etaprobe { }
- hist TnP_ID_efficiency_vs_phiprobe { }
- hist TnP_Calo_Iso_efficiency_vs_etprobe { }
- hist TnP_Calo_Iso_efficiency_vs_etaprobe { }
- hist TnP_Calo_Iso_efficiency_vs_phiprobe { }
- hist TnP_Calo_Iso_and_LHTight_efficiency_vs_etprobe { }
- hist TnP_Calo_Iso_and_LHTight_efficiency_vs_etaprobe { }
- hist TnP_Calo_Iso_and_LHTight_ID_efficiency_vs_phiprobe { }
+ hist TnP_ID_efficiency_vs_etprobe {
+ }
+ hist TnP_ID_efficiency_vs_etaprobe {
+ }
+ hist TnP_ID_efficiency_vs_phiprobe {
+ }
+ hist TnP_Calo_Iso_efficiency_vs_etprobe {
+ }
+ hist TnP_Calo_Iso_efficiency_vs_etaprobe {
+ }
+ hist TnP_Calo_Iso_efficiency_vs_phiprobe {
+ }
+ hist TnP_Calo_Iso_and_LHTight_efficiency_vs_etprobe {
+ }
+ hist TnP_Calo_Iso_and_LHTight_efficiency_vs_etaprobe {
+ }
+ hist TnP_Calo_Iso_and_LHTight_ID_efficiency_vs_phiprobe {
+ }
+
}
dir egamma/TnPZ/TnPCandidate {
@@ -838,7 +1180,8 @@ dir egamma/TnPZ/TnPCandidate {
output = egamma/tagandprobeZ/LBMon
display = Draw=e1,StatBox
- hist Number_of_Z_candidates_vs_LB { }
+ hist Number_of_Z_candidates_vs_LB {
+ }
}
@@ -853,17 +1196,19 @@ dir egamma/TnPJPsi/TnPCandidate {
algorithm = egamma_FitJPsimass
display = StatBox,gaus(3000.,5000.)
}
- hist JPsi_candidate_mass_distribution_(Lead_in_Barrel) {
+ hist JPsi_candidate_mass_distribution_Lead_in_Barrel {
algorithm = egamma_FitJPsimass
display = StatBox,gaus(3000.,5000.)
}
- hist Number_of_JPsi_candidates_vs_eta_leading_e {}
- hist Number_of_JPsi_candidates_vs_phi_leading_e {}
- hist JPsi_candidate mass distribution (Lead in Crack) {
+ hist Number_of_JPsi_candidates_vs_eta_leading_e {
+ }
+ hist Number_of_JPsi_candidates_vs_phi_leading_e {
+ }
+ hist JPsi_candidate_mass_distribution_Lead_in_Crack {
algorithm = egamma_FitJPsimass
display = StatBox,gaus(3000.,5000.)
}
- hist JPsi_candidate_mass_distribution_(Lead_in_EndCap) {
+ hist JPsi_candidate_mass_distribution_Lead_in_EndCap {
algorithm = egamma_FitJPsimass
display = StatBox,gaus(3000.,5000.)
}
@@ -875,24 +1220,42 @@ dir egamma/TnPJPsi/ID {
output = egamma/tagandprobeJPsi/ID
display = Draw=e1,StatBox
- hist Ehad1ProbeinBARREL { }
- hist EoverPProbeinBARREL { }
- hist CoreEMProbeinBARREL { }
- hist F0ProbeinBARREL { }
- hist F1ProbeinBARREL { }
- hist F2ProbeinBARREL { }
- hist F3ProbeinBARREL { }
- hist Re233e237ProbeinBARREL { }
- hist Re237e277ProbeinBARREL { }
- hist Ehad1ProbeinENDCAP { }
- hist EoverPProbeinENDCAP { }
- hist CoreEMProbeinENDCAP { }
- hist F0ProbeinENDCAP { }
- hist F1ProbeinENDCAP { }
- hist F2ProbeinENDCAP { }
- hist F3ProbeinENDCAP { }
- hist Re233e237ProbeinENDCAP { }
- hist Re237e277ProbeinENDCAP { }
+ hist Ehad1ProbeinBARREL {
+ }
+ hist EoverPProbeinBARREL {
+ }
+ hist CoreEMProbeinBARREL {
+ }
+ hist F0ProbeinBARREL {
+ }
+ hist F1ProbeinBARREL {
+ }
+ hist F2ProbeinBARREL {
+ }
+ hist F3ProbeinBARREL {
+ }
+ hist Re233e237ProbeinBARREL {
+ }
+ hist Re237e277ProbeinBARREL {
+ }
+ hist Ehad1ProbeinENDCAP {
+ }
+ hist EoverPProbeinENDCAP {
+ }
+ hist CoreEMProbeinENDCAP {
+ }
+ hist F0ProbeinENDCAP {
+ }
+ hist F1ProbeinENDCAP {
+ }
+ hist F2ProbeinENDCAP {
+ }
+ hist F3ProbeinENDCAP {
+ }
+ hist Re233e237ProbeinENDCAP {
+ }
+ hist Re237e277ProbeinENDCAP {
+ }
}
@@ -901,22 +1264,38 @@ dir egamma/TnPJPsi/Tracks {
output = egamma/tagandprobeJPsi/Track
display = Draw=e1,StatBox
- hist NOfBLayerHitsProbeinBARREL { }
- hist NOfPixelHitsProbeinBARREL { }
- hist NOfSCTHitsProbeinBARREL { }
- hist NOfTRTHitsProbeinBARREL { }
- hist NOfTRTHighThresholdHitsProbeinBARREL { }
- hist DeltaEta1ProbeinBARREL { }
- hist DeltaPhi2ProbeinBARREL { }
- hist Trackd0ProbeinBARREL { }
- hist NOfBLayerHitsProbeinENDCAP { }
- hist NOfPixelHitsProbeinENDCAP { }
- hist NOfSCTHitsProbeinENDCAP { }
- hist NOfTRTHitsProbeinENDCAP { }
- hist NOfTRTHighThresholdHitsProbeinENDCAP { }
- hist DeltaEta1ProbeinENDCAP { }
- hist DeltaPhi2ProbeinENDCAP { }
- hist Trackd0ProbeinENDCAP { }
+ hist NOfBLayerHitsProbeinBARREL {
+ }
+ hist NOfPixelHitsProbeinBARREL {
+ }
+ hist NOfSCTHitsProbeinBARREL {
+ }
+ hist NOfTRTHitsProbeinBARREL {
+ }
+ hist NOfTRTHighThresholdHitsProbeinBARREL {
+ }
+ hist DeltaEta1ProbeinBARREL {
+ }
+ hist DeltaPhi2ProbeinBARREL {
+ }
+ hist Trackd0ProbeinBARREL {
+ }
+ hist NOfBLayerHitsProbeinENDCAP {
+ }
+ hist NOfPixelHitsProbeinENDCAP {
+ }
+ hist NOfSCTHitsProbeinENDCAP {
+ }
+ hist NOfTRTHitsProbeinENDCAP {
+ }
+ hist NOfTRTHighThresholdHitsProbeinENDCAP {
+ }
+ hist DeltaEta1ProbeinENDCAP {
+ }
+ hist DeltaPhi2ProbeinENDCAP {
+ }
+ hist Trackd0ProbeinENDCAP {
+ }
}
@@ -925,15 +1304,24 @@ dir egamma/TnPJPsi/Efficiencies {
output = egamma/tagandprobeJPsi
display = Draw=e1,StatBox
- hist TnP_ID_efficiency_vs_etprobe { }
- hist TnP_ID_efficiency_vs_etaprobe { }
- hist TnP_ID_efficiency_vs_phiprobe { }
- hist TnP_Calo_Iso_efficiency_vs_etprobe { }
- hist TnP_Calo_Iso_efficiency_vs_etaprobe { }
- hist TnP_Calo_Iso_efficiency_vs_phiprobe { }
- hist TnP_Calo_Iso_and_LHTight_efficiency_vs_etprobe { }
- hist TnP_Calo_Iso_and_LHTight_efficiency_vs_etaprobe { }
- hist TnP_Calo_Iso_and_LHTight_ID_efficiency_vs_phiprobe { }
+ hist TnP_ID_efficiency_vs_etprobe {
+ }
+ hist TnP_ID_efficiency_vs_etaprobe {
+ }
+ hist TnP_ID_efficiency_vs_phiprobe {
+ }
+ hist TnP_Calo_Iso_efficiency_vs_etprobe {
+ }
+ hist TnP_Calo_Iso_efficiency_vs_etaprobe {
+ }
+ hist TnP_Calo_Iso_efficiency_vs_phiprobe {
+ }
+ hist TnP_Calo_Iso_and_LHTight_efficiency_vs_etprobe {
+ }
+ hist TnP_Calo_Iso_and_LHTight_efficiency_vs_etaprobe {
+ }
+ hist TnP_Calo_Iso_and_LHTight_ID_efficiency_vs_phiprobe {
+ }
}
dir egamma/TnPJPsi/TnPCandidate {
@@ -941,6 +1329,7 @@ dir egamma/TnPJPsi/TnPCandidate {
output = egamma/tagandprobeJPsi/LBMon
display = Draw=e1,StatBox
- hist Number_of_JPsi_candidates_vs_LB { }
+ hist Number_of_JPsi_candidates_vs_LB {
+ }
-}
+}
\ No newline at end of file
--
GitLab
From ba130d0698ff7b3eb72041595581dfbd980e4c35 Mon Sep 17 00:00:00 2001
From: Bertrand LAFORGE <laforge@lpnhe.in2p3.fr>
Date: Thu, 2 Sep 2021 01:16:54 +0200
Subject: [PATCH 267/272] update typo in webdisplay config file
---
.../egammaPerformance/python/SetupEgammaMonitoring.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py b/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py
index c6e22ac94a57..4e1c02d962c2 100755
--- a/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py
+++ b/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py
@@ -307,21 +307,21 @@ def BookTnPHistograms(groupe,reconame,TnPType,MassLowerCut,MassUpperCut):
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)"
+ 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)"
+ 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)"
+ 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 "
+ 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)
--
GitLab
From 37aa697048b5eb922f52d3209dca09430753bece Mon Sep 17 00:00:00 2001
From: Bertrand LAFORGE <laforge@lpnhe.in2p3.fr>
Date: Thu, 2 Sep 2021 02:02:12 +0200
Subject: [PATCH 268/272] update webdisplay configuration for photons
---
.../config/Egamma/collisions_run.config | 459 +++++++++++++++++-
1 file changed, 458 insertions(+), 1 deletion(-)
diff --git a/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config b/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config
index 82ae5d179e06..310d69f96e1f 100644
--- a/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config
@@ -834,7 +834,7 @@ dir egamma/CBLoosePhotons {
}
dir egamma/CBLoosePhotons/Expert {
- output = egamma/photons/Expert
+ output = egamma/photons/EXPERT
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -958,6 +958,463 @@ dir egamma/CBLoosePhotons/ID {
}
}
+# CBLooseWithTrigger
+
+dir egamma/CBLoosePhotonsWithTrigger {
+ output = egamma/photonsWithTrigger
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Et {
+ }
+ hist Phi {
+ }
+ hist Eta {
+ }
+ hist PtCone20 {
+ }
+ hist EtCone40 {
+ }
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ }
+ hist Time {
+ }
+}
+
+dir egamma/CBLoosePhotonsWithTrigger/Expert {
+ output = egamma/photonsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist NinBARREL {
+ }
+ hist EtainBARREL {
+ }
+ hist PhiinBARREL {
+ }
+ hist TimeinBARREL {
+ }
+ hist RConvinBARREL {
+ }
+ hist ConvTypeinBARREL {
+ }
+ hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
+ }
+ hist Eta_Phi_Conv_with_Pt_gt_2.5GeV {
+ }
+ hist NinENDCAP {
+ }
+ hist EtainENDCAP {
+ }
+ hist PhiinENDCAP {
+ }
+ hist TimeinENDCAP {
+ }
+ hist RConvinENDCAP {
+ }
+ hist ConvTypeinENDCAP {
+ }
+ hist Eta_Phi_with_Pt.gt.20GeV {
+ }
+ hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
+ }
+ hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
+ }
+ hist NinCRACK {
+ }
+ hist EtainCRACK {
+ }
+ hist PhiinCRACK {
+ }
+ hist TimeinCRACK {
+ }
+ hist RConvinCRACK {
+ }
+ hist ConvTypeinCRACK {
+ }
+
+}
+
+dir egamma/CBLoosePhotonsWithTrigger/byLB {
+ output = egamma/photonsWithTrigger/byLB
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist Number_of_Unconv._photons_vs_LB {
+ }
+ hist Number_of_Conv._photons_vs_LB {
+ }
+ hist LBEvoN {
+ }
+ hist Conversion_fraction_vs_LB {
+ }
+
+}
+
+dir egamma/CBLoosePhotonsWithTrigger/ID {
+ algorithm = egKolmogorov
+ output = egamma/photonsWithTrigger/ID
+ display = Draw=e1,StatBox
+
+ hist Ehad1inBARREL {
+ }
+ hist CoreEMinBARREL {
+ }
+ hist F0inBARREL {
+ }
+ hist F1inBARREL {
+ }
+ hist F2inBARREL {
+ }
+ hist F3inBARREL {
+ }
+ hist Re233e237inBARREL {
+ }
+ hist Re237e277inBARREL {
+ }
+ hist Ehad1inENDCAP {
+ }
+ hist CoreEMinENDCAP {
+ }
+ hist F0inENDCAP {
+ }
+ hist F1inENDCAP {
+ }
+ hist F2inENDCAP {
+ }
+ hist F3inENDCAP {
+ }
+ hist Re233e237inENDCAP {
+ }
+ hist Re237e277inENDCAP {
+ }
+ hist Ehad1inCRACK {
+ }
+ hist CoreEMinCRACK {
+ }
+ hist F0inCRACK {
+ }
+ hist F1inCRACK {
+ }
+ hist F2inCRACK {
+ }
+ hist F3inCRACK {
+ }
+ hist Re233e237inCRACK {
+ }
+ hist Re237e277inCRACK {
+ }
+}
+
+# CBTight
+
+dir egamma/CBTightPhotons {
+ output = egamma/photons
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Et {
+ }
+ hist Phi {
+ }
+ hist Eta {
+ }
+ hist PtCone20 {
+ }
+ hist EtCone40 {
+ }
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ }
+ hist Time {
+ }
+}
+
+dir egamma/CBTightPhotons/Expert {
+ output = egamma/photons/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist NinBARREL {
+ }
+ hist EtainBARREL {
+ }
+ hist PhiinBARREL {
+ }
+ hist TimeinBARREL {
+ }
+ hist RConvinBARREL {
+ }
+ hist ConvTypeinBARREL {
+ }
+ hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
+ }
+ hist Eta_Phi_Conv_with_Pt_gt_2.5GeV {
+ }
+ hist NinENDCAP {
+ }
+ hist EtainENDCAP {
+ }
+ hist PhiinENDCAP {
+ }
+ hist TimeinENDCAP {
+ }
+ hist RConvinENDCAP {
+ }
+ hist ConvTypeinENDCAP {
+ }
+ hist Eta_Phi_with_Pt.gt.20GeV {
+ }
+ hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
+ }
+ hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
+ }
+ hist NinCRACK {
+ }
+ hist EtainCRACK {
+ }
+ hist PhiinCRACK {
+ }
+ hist TimeinCRACK {
+ }
+ hist RConvinCRACK {
+ }
+ hist ConvTypeinCRACK {
+ }
+
+}
+
+dir egamma/CBTightPhotons/byLB {
+ output = egamma/photons/byLB
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist Number_of_Unconv._photons_vs_LB {
+ }
+ hist Number_of_Conv._photons_vs_LB {
+ }
+ hist LBEvoN {
+ }
+ hist Conversion_fraction_vs_LB {
+ }
+
+}
+
+dir egamma/CBTightPhotons/ID {
+ algorithm = egKolmogorov
+ output = egamma/photons/ID
+ display = Draw=e1,StatBox
+
+ hist Ehad1inBARREL {
+ }
+ hist CoreEMinBARREL {
+ }
+ hist F0inBARREL {
+ }
+ hist F1inBARREL {
+ }
+ hist F2inBARREL {
+ }
+ hist F3inBARREL {
+ }
+ hist Re233e237inBARREL {
+ }
+ hist Re237e277inBARREL {
+ }
+ hist Ehad1inENDCAP {
+ }
+ hist CoreEMinENDCAP {
+ }
+ hist F0inENDCAP {
+ }
+ hist F1inENDCAP {
+ }
+ hist F2inENDCAP {
+ }
+ hist F3inENDCAP {
+ }
+ hist Re233e237inENDCAP {
+ }
+ hist Re237e277inENDCAP {
+ }
+ hist Ehad1inCRACK {
+ }
+ hist CoreEMinCRACK {
+ }
+ hist F0inCRACK {
+ }
+ hist F1inCRACK {
+ }
+ hist F2inCRACK {
+ }
+ hist F3inCRACK {
+ }
+ hist Re233e237inCRACK {
+ }
+ hist Re237e277inCRACK {
+ }
+}
+
+# CBTightWithTrigger
+
+dir egamma/CBTightPhotonsWithTrigger {
+ output = egamma/photonsWithTrigger
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Et {
+ }
+ hist Phi {
+ }
+ hist Eta {
+ }
+ hist PtCone20 {
+ }
+ hist EtCone40 {
+ }
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ }
+ hist Time {
+ }
+}
+
+dir egamma/CBTightPhotonsWithTrigger/Expert {
+ output = egamma/photonsWithTrigger/EXPERT
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist NinBARREL {
+ }
+ hist EtainBARREL {
+ }
+ hist PhiinBARREL {
+ }
+ hist TimeinBARREL {
+ }
+ hist RConvinBARREL {
+ }
+ hist ConvTypeinBARREL {
+ }
+ hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
+ }
+ hist Eta_Phi_Conv_with_Pt_gt_2.5GeV {
+ }
+ hist NinENDCAP {
+ }
+ hist EtainENDCAP {
+ }
+ hist PhiinENDCAP {
+ }
+ hist TimeinENDCAP {
+ }
+ hist RConvinENDCAP {
+ }
+ hist ConvTypeinENDCAP {
+ }
+ hist Eta_Phi_with_Pt.gt.20GeV {
+ }
+ hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
+ }
+ hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
+ }
+ hist NinCRACK {
+ }
+ hist EtainCRACK {
+ }
+ hist PhiinCRACK {
+ }
+ hist TimeinCRACK {
+ }
+ hist RConvinCRACK {
+ }
+ hist ConvTypeinCRACK {
+ }
+
+}
+
+dir egamma/CBTightPhotonsWithTrigger/byLB {
+ output = egamma/photonsWithTrigger/byLB
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist Number_of_Unconv._photons_vs_LB {
+ }
+ hist Number_of_Conv._photons_vs_LB {
+ }
+ hist LBEvoN {
+ }
+ hist Conversion_fraction_vs_LB {
+ }
+
+}
+
+dir egamma/CBTightPhotonsWithTrigger/ID {
+ algorithm = egKolmogorov
+ output = egamma/photonsWithTrigger/ID
+ display = Draw=e1,StatBox
+
+ hist Ehad1inBARREL {
+ }
+ hist CoreEMinBARREL {
+ }
+ hist F0inBARREL {
+ }
+ hist F1inBARREL {
+ }
+ hist F2inBARREL {
+ }
+ hist F3inBARREL {
+ }
+ hist Re233e237inBARREL {
+ }
+ hist Re237e277inBARREL {
+ }
+ hist Ehad1inENDCAP {
+ }
+ hist CoreEMinENDCAP {
+ }
+ hist F0inENDCAP {
+ }
+ hist F1inENDCAP {
+ }
+ hist F2inENDCAP {
+ }
+ hist F3inENDCAP {
+ }
+ hist Re233e237inENDCAP {
+ }
+ hist Re237e277inENDCAP {
+ }
+ hist Ehad1inCRACK {
+ }
+ hist CoreEMinCRACK {
+ }
+ hist F0inCRACK {
+ }
+ hist F1inCRACK {
+ }
+ hist F2inCRACK {
+ }
+ hist F3inCRACK {
+ }
+ hist Re233e237inCRACK {
+ }
+ hist Re237e277inCRACK {
+ }
+}
+
+
########################################
### forwardElectrons
########################################
--
GitLab
From df16402b17dd445bd54e64b282781b064692ade0 Mon Sep 17 00:00:00 2001
From: Bertrand LAFORGE <laforge@lpnhe.in2p3.fr>
Date: Thu, 2 Sep 2021 02:23:13 +0200
Subject: [PATCH 269/272] Fix webdisplay
---
.../config/Egamma/collisions_run.config | 60 +++++++++----------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config b/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config
index 310d69f96e1f..d648520e1233 100644
--- a/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config
@@ -125,7 +125,7 @@ output top_level {
algorithm = WorstCaseSummary
output egamma {
output photons {
- output EXPERT {
+ output Expert {
}
output ID {
}
@@ -133,7 +133,7 @@ output top_level {
}
}
output photonsWithTrigger {
- output EXPERT {
+ output Expert {
}
output ID {
}
@@ -141,7 +141,7 @@ output top_level {
}
}
output electrons {
- output EXPERT {
+ output Expert {
}
output ID {
}
@@ -151,7 +151,7 @@ output top_level {
}
}
output electronsWithTrigger {
- output EXPERT {
+ output Expert {
}
output ID {
}
@@ -163,7 +163,7 @@ output top_level {
output forwardElectrons {
output ID {
}
- output EXPERT {
+ output Expert {
}
}
output tagandprobeZ {
@@ -232,11 +232,11 @@ dir egamma/LHLooseElectrons/Expert {
}
dir egamma/LHLooseElectrons/byLB {
- output = egamma/electrons/byLB
+ output = egamma/electrons/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
- hist LBEvON {
+ hist LBEvoN {
}
}
@@ -348,7 +348,7 @@ dir egamma/LHLooseElectrons/Expert/Track {
# LhLooseWithTrigger
dir egamma/LHLooseElectronsWithTrigger {
- output = egamma/electrons
+ output = egamma/electronsWithTrigger
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -373,7 +373,7 @@ dir egamma/LHLooseElectronsWithTrigger {
}
dir egamma/LHLooseElectronsWithTrigger/Expert {
- output = egamma/electrons/Expert
+ output = egamme/electronsWithTrigger/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -384,17 +384,17 @@ dir egamma/LHLooseElectronsWithTrigger/Expert {
}
dir egamma/LHLooseElectronsWithTrigger/byLB {
- output = egamma/electrons/byLB
+ output = egamme/electronsWithTrigger/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
- hist LBEvON {
+ hist LBEvoN {
}
}
dir egamma/LHLooseElectronsWithTrigger/ID {
algorithm = egKolmogorov
- output = egamma/electrons/ID
+ output = egamme/electronsWithTrigger/ID
display = Draw=e1,StatBox
hist Ehad1inBARREL {
@@ -443,7 +443,7 @@ dir egamma/LHLooseElectronsWithTrigger/ID {
dir egamma/LHLooseElectronsWithTrigger/Expert/Track {
algorithm = egKolmogorov
- output = egamma/electrons/Track
+ output = egamme/electronsWithTrigger/Track
display = Draw=e1,StatBox
hist NOfBLayerHitsinBARREL {
@@ -500,7 +500,7 @@ dir egamma/LHLooseElectronsWithTrigger/Expert/Track {
# LhTight
dir egamma/LHTightElectrons {
- output = egamma/electrons
+ output = egamme/electrons
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -525,7 +525,7 @@ dir egamma/LHTightElectrons {
}
dir egamma/LHTightElectrons/Expert {
- output = egamma/electrons/Expert
+ output = egamme/electrons/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -536,7 +536,7 @@ dir egamma/LHTightElectrons/Expert {
}
dir egamma/LHTightElectrons/byLB {
- output = egamma/electrons/byLB
+ output = egamma/electrons/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -652,7 +652,7 @@ dir egamma/LHTightElectrons/Expert/Track {
# LhTightWithTrigger
dir egamma/LHTightElectronsWithTrigger {
- output = egamma/electrons
+ output = egamme/electronsWithTrigger
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -677,7 +677,7 @@ dir egamma/LHTightElectronsWithTrigger {
}
dir egamma/LHTightElectronsWithTrigger/Expert {
- output = egamma/electrons/Expert
+ output = egamme/electronsWithTrigger/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -688,7 +688,7 @@ dir egamma/LHTightElectronsWithTrigger/Expert {
}
dir egamma/LHTightElectronsWithTrigger/byLB {
- output = egamma/electrons/byLB
+ output = egamme/electronsWithTrigger/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -698,7 +698,7 @@ dir egamma/LHTightElectronsWithTrigger/byLB {
dir egamma/LHTightElectronsWithTrigger/ID {
algorithm = egKolmogorov
- output = egamma/electrons/ID
+ output = egamme/electronsWithTrigger/ID
display = Draw=e1,StatBox
hist Ehad1inBARREL {
@@ -747,7 +747,7 @@ dir egamma/LHTightElectronsWithTrigger/ID {
dir egamma/LHTightElectronsWithTrigger/Expert/Track {
algorithm = egKolmogorov
- output = egamma/electrons/Track
+ output = egamme/electronsWithTrigger/Track
display = Draw=e1,StatBox
hist NOfBLayerHitsinBARREL {
@@ -834,7 +834,7 @@ dir egamma/CBLoosePhotons {
}
dir egamma/CBLoosePhotons/Expert {
- output = egamma/photons/EXPERT
+ output = egamma/photons/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -888,7 +888,7 @@ dir egamma/CBLoosePhotons/Expert {
}
dir egamma/CBLoosePhotons/byLB {
- output = egamma/photons/byLB
+ output = egamma/photons/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -986,7 +986,7 @@ dir egamma/CBLoosePhotonsWithTrigger {
}
dir egamma/CBLoosePhotonsWithTrigger/Expert {
- output = egamma/photonsWithTrigger/EXPERT
+ output = egamma/photonsWithTrigger/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -1040,7 +1040,7 @@ dir egamma/CBLoosePhotonsWithTrigger/Expert {
}
dir egamma/CBLoosePhotonsWithTrigger/byLB {
- output = egamma/photonsWithTrigger/byLB
+ output = egamma/photonsWithTrigger/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -1138,7 +1138,7 @@ dir egamma/CBTightPhotons {
}
dir egamma/CBTightPhotons/Expert {
- output = egamma/photons/EXPERT
+ output = egamma/photons/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -1192,7 +1192,7 @@ dir egamma/CBTightPhotons/Expert {
}
dir egamma/CBTightPhotons/byLB {
- output = egamma/photons/byLB
+ output = egamma/photons/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -1290,7 +1290,7 @@ dir egamma/CBTightPhotonsWithTrigger {
}
dir egamma/CBTightPhotonsWithTrigger/Expert {
- output = egamma/photonsWithTrigger/EXPERT
+ output = egamma/photonsWithTrigger/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -1344,7 +1344,7 @@ dir egamma/CBTightPhotonsWithTrigger/Expert {
}
dir egamma/CBTightPhotonsWithTrigger/byLB {
- output = egamma/photonsWithTrigger/byLB
+ output = egamma/photonsWithTrigger/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -1467,7 +1467,7 @@ dir egamma/CBLooseFwdElectrons {
dir egamma/CBLooseFwdElectrons {
algorithm = Egkolmogorov
- Output = egamma/forwardElectrons/EXPERT
+ Output = egamma/forwardElectrons/Expert
display = Draw=e1,StatBox
hist NinENDCAP {
--
GitLab
From 49dcd5916a34b6e29ffc9fa1a9fbc6be10e68006 Mon Sep 17 00:00:00 2001
From: Bertrand LAFORGE <laforge@lpnhe.in2p3.fr>
Date: Thu, 2 Sep 2021 02:54:25 +0200
Subject: [PATCH 270/272] correction to SetupEgammaMonitoring.py
---
.../python/SetupEgammaMonitoring.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py b/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py
index 4e1c02d962c2..c40b12c621f0 100755
--- a/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py
+++ b/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py
@@ -668,17 +668,17 @@ def MonitorElectronConfig(inputFlags):
BookHistograms(GroupElectronLHTightTriggered,"LHTightTrig","Electron","WithTrigger")
# LHLoose Electrons
BookHistograms(GroupElectronLHLoose,"LHLoose","Electron")
- BookHistograms(GroupElectronLHLooseTriggered,"LHLooseTrig","Electron","withTrigger")
+ BookHistograms(GroupElectronLHLooseTriggered,"LHLooseTrig","Electron","WithTrigger")
# Cut Based Tight Electrons
if ("CBTight" in SpareElectronMonitoringGroups) :
BookHistograms(GroupElectronCBTight,"CBTight","Electron")
if ("CBTightTrig" in SpareElectronMonitoringGroups) :
- BookHistograms(GroupElectronCBTightTriggered,"CBTightTrig","Electron","withTrigger")
+ BookHistograms(GroupElectronCBTightTriggered,"CBTightTrig","Electron","WithTrigger")
# Cut Based Loose Electrons
if ("CBLoose" in SpareElectronMonitoringGroups) :
BookHistograms(GroupElectronCBLoose,"CBLoose","Electron")
if ("CBLooseTrig" in SpareElectronMonitoringGroups) :
- BookHistograms(GroupElectronCBLooseTriggered,"CBLooseTrig","Electron","withTrigger")
+ BookHistograms(GroupElectronCBLooseTriggered,"CBLooseTrig","Electron","WithTrigger")
### STEP 6 ###
return helper.result()
@@ -906,17 +906,17 @@ def MonitorForwardElectronConfig(inputFlags):
#BookHistograms(GroupFwdElectronLHTightTriggered,"LHTightTrig","FwdElectron","WithTrigger")
# LHLoose FwdElectrons
#BookHistograms(GroupFwdElectronLHLoose,"LHLoose","FwdElectron")
- #BookHistograms(GroupFwdElectronLHLooseTriggered,"LHLooseTrig","FwdElectron","withTrigger")
+ #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")
+ 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")
+ BookFwdElectronHistograms(GroupFwdElectronCBLooseTriggered,"CBLooseTrig","FwdElectron","WithTrigger")
### STEP 6 ###
return helper.result()
--
GitLab
From f18547fd39b515a0c3f0853830eea888b8a90379 Mon Sep 17 00:00:00 2001
From: Bertrand LAFORGE <laforge@lpnhe.in2p3.fr>
Date: Thu, 2 Sep 2021 19:23:41 +0200
Subject: [PATCH 271/272] new complete run 3 webdisplay
---
.../config/Egamma/collisions_run.config | 12 +-
.../config/Egamma/cosmics_run.config | 2456 ++++++-----
.../config/Egamma/heavyions_run.config | 3760 +++++------------
3 files changed, 2462 insertions(+), 3766 deletions(-)
diff --git a/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config b/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config
index d648520e1233..0e239471642c 100644
--- a/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config
@@ -112,8 +112,8 @@ algorithm egamma_FitZmass {
algorithm egamma_FitJPsimass {
libname = libdqm_algorithms.so
name = Simple_gaus_Fit
- xmin = 3000.
- xmax = 5000.
+ xmin = 2500.
+ xmax = 4000.
thresholds = egamma_FitJPsimass_Thresholds
}
@@ -1651,11 +1651,11 @@ dir egamma/TnPJPsi/TnPCandidate {
hist JPsi_candidate_mass {
algorithm = egamma_FitJPsimass
- display = StatBox,gaus(3000.,5000.)
+ display = StatBox,gaus(2500.,4000.)
}
hist JPsi_candidate_mass_distribution_Lead_in_Barrel {
algorithm = egamma_FitJPsimass
- display = StatBox,gaus(3000.,5000.)
+ display = StatBox,gaus(2500.,4000.)
}
hist Number_of_JPsi_candidates_vs_eta_leading_e {
}
@@ -1663,11 +1663,11 @@ dir egamma/TnPJPsi/TnPCandidate {
}
hist JPsi_candidate_mass_distribution_Lead_in_Crack {
algorithm = egamma_FitJPsimass
- display = StatBox,gaus(3000.,5000.)
+ display = StatBox,gaus(2500.,4000.)
}
hist JPsi_candidate_mass_distribution_Lead_in_EndCap {
algorithm = egamma_FitJPsimass
- display = StatBox,gaus(3000.,5000.)
+ display = StatBox,gaus(2500.,4000.)
}
}
diff --git a/DataQuality/DataQualityConfigurations/config/Egamma/cosmics_run.config b/DataQuality/DataQualityConfigurations/config/Egamma/cosmics_run.config
index cdbf437543bd..0e239471642c 100644
--- a/DataQuality/DataQualityConfigurations/config/Egamma/cosmics_run.config
+++ b/DataQuality/DataQualityConfigurations/config/Egamma/cosmics_run.config
@@ -1,5 +1,5 @@
# **********************************************************************
-# $Id: cosmics_run.config 777627 2016-10-11 10:49:51Z nproklov $
+# $Id: collisions_run.config 777627 2016-10-11 10:49:51Z nproklov $
# **********************************************************************
############################################################
@@ -88,6 +88,9 @@ algorithm egamma_GatherData {
algorithm egamma_Histogram_Not_Empty {
libname = libdqm_algorithms.so
name = Histogram_Not_Empty
+# reference = EgammaReference
+ reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
+ MinStat = 20
}
algorithm 2D_Histogram_Not_Empty {
@@ -98,7 +101,6 @@ algorithm 2D_Histogram_Not_Empty {
reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
}
-
algorithm egamma_FitZmass {
libname = libdqm_algorithms.so
name = Simple_gaus_Fit
@@ -110,8 +112,8 @@ algorithm egamma_FitZmass {
algorithm egamma_FitJPsimass {
libname = libdqm_algorithms.so
name = Simple_gaus_Fit
- xmin = 3000.
- xmax = 5000.
+ xmin = 2500.
+ xmax = 4000.
thresholds = egamma_FitJPsimass_Thresholds
}
@@ -122,41 +124,62 @@ algorithm egamma_FitJPsimass {
output top_level {
algorithm = WorstCaseSummary
output egamma {
- algorithm = WorstCaseSummary
output photons {
- algorithm = WorstCaseSummary
- output EXPERT {
- algorithm = WorstCaseSummary
+ output Expert {
+ }
+ output ID {
+ }
+ output LBMon {
+ }
+ }
+ output photonsWithTrigger {
+ output Expert {
}
output ID {
- algorithm = WorstCaseSummary
}
output LBMon {
- algorithm = WorstCaseSummary
}
}
output electrons {
- algorithm = WorstCaseSummary
- output EXPERT {
- algorithm = WorstCaseSummary
+ output Expert {
+ }
+ output ID {
+ }
+ output Track {
+ }
+ output LBMon {
+ }
+ }
+ output electronsWithTrigger {
+ output Expert {
}
output ID {
- algorithm = WorstCaseSummary
}
output Track {
- algorithm = WorstCaseSummary
}
output LBMon {
- algorithm = WorstCaseSummary
}
}
output forwardElectrons {
- algorithm = WorstCaseSummary
output ID {
- algorithm = WorstCaseSummary
}
- output EXPERT {
- algorithm = WorstCaseSummary
+ output Expert {
+ }
+ }
+ output tagandprobeZ {
+ output ID {
+ }
+ output Track {
+ }
+ output LBMon {
+ }
+ }
+ output tagandprobeJPsi {
+ output ID {
+ }
+ output Track {
+ }
+ output LBMon {
}
}
}
@@ -166,1429 +189,1604 @@ output top_level {
# Histogram Assessments
#######################
- dir egamma/electrons {
+##################################
+# Electrons
+#################################@
+
+# LhLoose
+
+dir egamma/LHLooseElectrons {
output = egamma/electrons
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
- # CbLoose
- hist electronNCbLoose {
+ hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
}
- hist electronEtCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20CbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40CbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
-
- # CbTight
- hist electronNCbTight {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist Et {
}
- hist electronEtCbTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiCbTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaCbTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20CbTight {
- algorithm = egKolmogorov
- }
- hist electronTopoEtCone40CbTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeCbTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
-
- # LhLoose
- hist electronNLhLoose {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist Eta {
}
- hist electronEtLhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaPhiPtgt2.5GeVLhLoose {
- output = egamma/electrons/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt4GeVLhLoose {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt20GeVLhLoose {
- output = egamma/electrons/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronPtCone20LhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhLoose_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhLoose_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhLoose_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhLoose_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhLoose_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhLoose_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhLoose_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhLoose_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhLoose_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhLoose_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhLoose_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhLoose_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhLoose_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhLoose_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhLoose_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhLoose_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhLoose_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhLoose_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaPhiPtgt2.5GeVLhLoose {
- output = egamma/electrons/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt4GeVLhLoose {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt20GeVLhLoose {
- output = egamma/electrons/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronPtCone20LhLoose_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhLoose_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhLoose_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
-
- # LhMedium
- hist electronNLhMedium {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist Phi {
}
- hist electronEtLhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaPhiPtgt2.5GeVLhMedium {
- output = egamma/electrons/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- # algorithm = egamma_BinsDiffFromStripMedian
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt4GeVLhMedium {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt20GeVLhMedium {
- output = egamma/electrons/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronPtCone20LhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhMedium_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhMedium_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhMedium_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhMedium_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhMedium_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhMedium_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhMedium_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhMedium_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhMedium_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhMedium_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhMedium_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhMedium_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhMedium_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhMedium_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhMedium_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhMedium_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhMedium_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhMedium_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhMedium_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhMedium_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhMedium_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
-
- # LhTight
- hist electronNLhTight {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ }
+ hist TopoEtCone40 {
+ }
+ hist PtCone20 {
}
- hist electronEtLhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaPhiPtgt2.5GeVLhTight {
- output = egamma/electrons/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt4GeVLhTight {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt20GeVLhTight {
- output = egamma/electrons/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronPtCone20LhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhTight_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhTight_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhTight_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhTight_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhTight_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhTight_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhTight_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhTight_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhTight_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhTight_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhTight_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhTight_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhTight_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhTight_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhTight_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtLhTight_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhTight_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhTight_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhTight_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhTight_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhTight_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
+ hist Time {
}
}
- dir egamma/electrons/ID {
- algorithm = egKolmogorov
- output = egamma/electrons/ID
- display = Draw=e1,StatBox
+dir egamma/LHLooseElectrons/Expert {
+ output = egamma/electrons/Expert
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
- # LhLoose
- hist electronEhad1LhLoose_BARREL {
- }
- hist electronEoverPLhLoose_BARREL {
- }
- hist electronCoreEMLhLoose_BARREL {
- }
- hist electronF0LhLoose_BARREL {
- }
- hist electronF1LhLoose_BARREL {
+ hist Eta_Phi_with_Pt_gt_2.5GeV {
}
- hist electronF2LhLoose_BARREL {
+ hist Eta_Phi_with_Pt_gt_20GeV {
}
- hist electronF3LhLoose_BARREL {
- }
- hist electronRe233e237LhLoose_BARREL {
+}
+
+dir egamma/LHLooseElectrons/byLB {
+ output = egamma/electrons/LBMon
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist LBEvoN {
}
- hist electronRe237e277LhLoose_BARREL {
+}
+
+dir egamma/LHLooseElectrons/ID {
+ algorithm = egKolmogorov
+ output = egamma/electrons/ID
+ display = Draw=e1,StatBox
+
+ hist Ehad1inBARREL {
+ }
+ hist CoreEMinBARREL {
+ }
+ hist F0inBARREL {
+ }
+ hist F1inBARREL {
+ }
+ hist F2inBARREL {
+ }
+ hist F3inBARREL {
+ }
+ hist Re237e277inBARREL {
+ }
+ hist Ehad1inENDCAP {
+ }
+ hist EoverPinENDCAP {
+ }
+ hist CoreEMinENDCAP {
+ }
+ hist Re233e237inENDCAP {
+ }
+ hist Re237e277inENDCAP {
+ }
+ hist Ehad1inCRACK {
+ }
+ hist EoverPinCRACK {
+ }
+ hist CoreEMinCRACK {
+ }
+ hist F0inCRACK {
+ }
+ hist F1inCRACK {
+ }
+ hist F2inCRACK {
+ }
+ hist F3inCRACK {
+ }
+ hist Re233e237inCRACK {
+ }
+ hist Re237e277inCRACK {
+ }
+}
+
+dir egamma/LHLooseElectrons/Expert/Track {
+ algorithm = egKolmogorov
+ output = egamma/electrons/Track
+ display = Draw=e1,StatBox
+
+ hist NOfBLayerHitsinBARREL {
+ }
+ hist NOfPixelHitsinBARREL {
+ }
+ hist NOfSCTHitsinBARREL {
+ }
+ hist NOfTRTHitsinBARREL {
+ }
+ hist NOfTRTHighThresholdHitsinBARREL {
+ }
+ hist DeltaEta1inBARREL {
+ }
+ hist DeltaPhi2inBARREL {
+ }
+ hist Trackd0inBARREL {
+ }
+ hist NOfBLayerHitsinENDCAP {
+ }
+ hist NOfPixelHitsinENDCAP {
+ }
+ hist NOfSCTHitsinENDCAP {
+ }
+ hist NOfTRTHitsinENDCAP {
+ }
+ hist NOfTRTHighThresholdHitsinENDCAP {
+ }
+ hist DeltaEta1inENDCAP {
+ }
+ hist DeltaPhi2inENDCAP {
+ }
+ hist Trackd0inENDCAP {
+ }
+ hist NOfBLayerHitsinCRACK {
+ }
+ hist NOfPixelHitsinCRACK {
+ }
+ hist NOfSCTHitsinCRACK {
+ }
+ hist NOfTRTHitsinCRACK {
+ }
+ hist NOfTRTHighThresholdHitsinCRACK {
+ }
+ hist DeltaEta1inCRACK {
+ }
+ hist DeltaPhi2inCRACK {
+ }
+ hist Trackd0inCRACK {
+ }
+
+}
+
+# LhLooseWithTrigger
+
+dir egamma/LHLooseElectronsWithTrigger {
+ output = egamma/electronsWithTrigger
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
}
- hist electronEhad1LhLoose_CRACK {
+ hist Et {
}
- hist electronEoverPLhLoose_CRACK {
+ hist Eta {
}
- hist electronCoreEMLhLoose_CRACK {
+ hist Phi {
}
- hist electronF0LhLoose_CRACK {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
}
- hist electronF1LhLoose_CRACK {
+ hist TopoEtCone40 {
}
- hist electronF2LhLoose_CRACK {
+ hist PtCone20 {
}
- hist electronF3LhLoose_CRACK {
+ hist Time {
}
- hist electronRe233e237LhLoose_CRACK {
+}
+
+dir egamma/LHLooseElectronsWithTrigger/Expert {
+ output = egamme/electronsWithTrigger/Expert
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist Eta_Phi_with_Pt_gt_2.5GeV {
}
- hist electronRe237e277LhLoose_CRACK {
+ hist Eta_Phi_with_Pt_gt_20GeV {
}
- hist electronEhad1LhLoose_ENDCAP {
+}
+
+dir egamma/LHLooseElectronsWithTrigger/byLB {
+ output = egamme/electronsWithTrigger/LBMon
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist LBEvoN {
}
- hist electronEoverPLhLoose_ENDCAP {
+}
+
+dir egamma/LHLooseElectronsWithTrigger/ID {
+ algorithm = egKolmogorov
+ output = egamme/electronsWithTrigger/ID
+ display = Draw=e1,StatBox
+
+ hist Ehad1inBARREL {
+ }
+ hist CoreEMinBARREL {
+ }
+ hist F0inBARREL {
+ }
+ hist F1inBARREL {
+ }
+ hist F2inBARREL {
+ }
+ hist F3inBARREL {
+ }
+ hist Re237e277inBARREL {
+ }
+ hist Ehad1inENDCAP {
+ }
+ hist EoverPinENDCAP {
+ }
+ hist CoreEMinENDCAP {
+ }
+ hist Re233e237inENDCAP {
+ }
+ hist Re237e277inENDCAP {
+ }
+ hist Ehad1inCRACK {
+ }
+ hist EoverPinCRACK {
+ }
+ hist CoreEMinCRACK {
+ }
+ hist F0inCRACK {
+ }
+ hist F1inCRACK {
+ }
+ hist F2inCRACK {
+ }
+ hist F3inCRACK {
+ }
+ hist Re233e237inCRACK {
+ }
+ hist Re237e277inCRACK {
+ }
+}
+
+dir egamma/LHLooseElectronsWithTrigger/Expert/Track {
+ algorithm = egKolmogorov
+ output = egamme/electronsWithTrigger/Track
+ display = Draw=e1,StatBox
+
+ hist NOfBLayerHitsinBARREL {
+ }
+ hist NOfPixelHitsinBARREL {
+ }
+ hist NOfSCTHitsinBARREL {
+ }
+ hist NOfTRTHitsinBARREL {
+ }
+ hist NOfTRTHighThresholdHitsinBARREL {
+ }
+ hist DeltaEta1inBARREL {
+ }
+ hist DeltaPhi2inBARREL {
+ }
+ hist Trackd0inBARREL {
+ }
+ hist NOfBLayerHitsinENDCAP {
+ }
+ hist NOfPixelHitsinENDCAP {
+ }
+ hist NOfSCTHitsinENDCAP {
+ }
+ hist NOfTRTHitsinENDCAP {
+ }
+ hist NOfTRTHighThresholdHitsinENDCAP {
+ }
+ hist DeltaEta1inENDCAP {
+ }
+ hist DeltaPhi2inENDCAP {
+ }
+ hist Trackd0inENDCAP {
+ }
+ hist NOfBLayerHitsinCRACK {
+ }
+ hist NOfPixelHitsinCRACK {
+ }
+ hist NOfSCTHitsinCRACK {
+ }
+ hist NOfTRTHitsinCRACK {
+ }
+ hist NOfTRTHighThresholdHitsinCRACK {
+ }
+ hist DeltaEta1inCRACK {
+ }
+ hist DeltaPhi2inCRACK {
+ }
+ hist Trackd0inCRACK {
+ }
+
+}
+
+# LhTight
+
+dir egamma/LHTightElectrons {
+ output = egamme/electrons
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
}
- hist electronCoreEMLhLoose_ENDCAP {
+ hist Et {
}
- hist electronF0LhLoose_ENDCAP {
+ hist Eta {
}
- hist electronF1LhLoose_ENDCAP {
+ hist Phi {
}
- hist electronF2LhLoose_ENDCAP {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
}
- hist electronF3LhLoose_ENDCAP {
+ hist TopoEtCone40 {
}
- hist electronRe233e237LhLoose_ENDCAP {
+ hist PtCone20 {
}
- hist electronRe237e277LhLoose_ENDCAP {
+ hist Time {
}
+}
- # LhMedium
- hist electronEhad1LhMedium_BARREL {
- }
- hist electronEoverPLhMedium_BARREL {
- }
- hist electronCoreEMLhMedium_BARREL {
- }
- hist electronF0LhMedium_BARREL {
- }
- hist electronF1LhMedium_BARREL {
- }
- hist electronF2LhMedium_BARREL {
+dir egamma/LHTightElectrons/Expert {
+ output = egamme/electrons/Expert
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist Eta_Phi_with_Pt_gt_2.5GeV {
}
- hist electronF3LhMedium_BARREL {
+ hist Eta_Phi_with_Pt_gt_20GeV {
}
- hist electronRe233e237LhMedium_BARREL {
+}
+
+dir egamma/LHTightElectrons/byLB {
+ output = egamma/electrons/LBMon
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist LBEvON {
}
- hist electronRe237e277LhMedium_BARREL {
+}
+
+dir egamma/LHTightElectrons/ID {
+ algorithm = egKolmogorov
+ output = egamma/electrons/ID
+ display = Draw=e1,StatBox
+
+ hist Ehad1inBARREL {
+ }
+ hist CoreEMinBARREL {
+ }
+ hist F0inBARREL {
+ }
+ hist F1inBARREL {
+ }
+ hist F2inBARREL {
+ }
+ hist F3inBARREL {
+ }
+ hist Re237e277inBARREL {
+ }
+ hist Ehad1inENDCAP {
+ }
+ hist EoverPinENDCAP {
+ }
+ hist CoreEMinENDCAP {
+ }
+ hist Re233e237inENDCAP {
+ }
+ hist Re237e277inENDCAP {
+ }
+ hist Ehad1inCRACK {
+ }
+ hist EoverPinCRACK {
+ }
+ hist CoreEMinCRACK {
+ }
+ hist F0inCRACK {
+ }
+ hist F1inCRACK {
+ }
+ hist F2inCRACK {
+ }
+ hist F3inCRACK {
+ }
+ hist Re233e237inCRACK {
+ }
+ hist Re237e277inCRACK {
+ }
+}
+
+dir egamma/LHTightElectrons/Expert/Track {
+ algorithm = egKolmogorov
+ output = egamma/electrons/Track
+ display = Draw=e1,StatBox
+
+ hist NOfBLayerHitsinBARREL {
+ }
+ hist NOfPixelHitsinBARREL {
+ }
+ hist NOfSCTHitsinBARREL {
+ }
+ hist NOfTRTHitsinBARREL {
+ }
+ hist NOfTRTHighThresholdHitsinBARREL {
+ }
+ hist DeltaEta1inBARREL {
+ }
+ hist DeltaPhi2inBARREL {
+ }
+ hist Trackd0inBARREL {
+ }
+ hist NOfBLayerHitsinENDCAP {
+ }
+ hist NOfPixelHitsinENDCAP {
+ }
+ hist NOfSCTHitsinENDCAP {
+ }
+ hist NOfTRTHitsinENDCAP {
+ }
+ hist NOfTRTHighThresholdHitsinENDCAP {
+ }
+ hist DeltaEta1inENDCAP {
+ }
+ hist DeltaPhi2inENDCAP {
+ }
+ hist Trackd0inENDCAP {
+ }
+ hist NOfBLayerHitsinCRACK {
+ }
+ hist NOfPixelHitsinCRACK {
+ }
+ hist NOfSCTHitsinCRACK {
+ }
+ hist NOfTRTHitsinCRACK {
+ }
+ hist NOfTRTHighThresholdHitsinCRACK {
+ }
+ hist DeltaEta1inCRACK {
+ }
+ hist DeltaPhi2inCRACK {
+ }
+ hist Trackd0inCRACK {
+ }
+
+}
+
+# LhTightWithTrigger
+
+dir egamma/LHTightElectronsWithTrigger {
+ output = egamme/electronsWithTrigger
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
}
- hist electronEhad1LhMedium_CRACK {
+ hist Et {
}
- hist electronEoverPLhMedium_CRACK {
+ hist Eta {
}
- hist electronCoreEMLhMedium_CRACK {
+ hist Phi {
}
- hist electronF0LhMedium_CRACK {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
}
- hist electronF1LhMedium_CRACK {
+ hist TopoEtCone40 {
}
- hist electronF2LhMedium_CRACK {
+ hist PtCone20 {
}
- hist electronF3LhMedium_CRACK {
+ hist Time {
}
- hist electronRe233e237LhMedium_CRACK {
+}
+
+dir egamma/LHTightElectronsWithTrigger/Expert {
+ output = egamme/electronsWithTrigger/Expert
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist Eta_Phi_with_Pt_gt_2.5GeV {
}
- hist electronRe237e277LhMedium_CRACK {
+ hist Eta_Phi_with_Pt_gt_20GeV {
}
- hist electronEhad1LhMedium_ENDCAP {
+}
+
+dir egamma/LHTightElectronsWithTrigger/byLB {
+ output = egamme/electronsWithTrigger/LBMon
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist LBEvON {
}
- hist electronEoverPLhMedium_ENDCAP {
+}
+
+dir egamma/LHTightElectronsWithTrigger/ID {
+ algorithm = egKolmogorov
+ output = egamme/electronsWithTrigger/ID
+ display = Draw=e1,StatBox
+
+ hist Ehad1inBARREL {
+ }
+ hist CoreEMinBARREL {
+ }
+ hist F0inBARREL {
+ }
+ hist F1inBARREL {
+ }
+ hist F2inBARREL {
+ }
+ hist F3inBARREL {
+ }
+ hist Re237e277inBARREL {
+ }
+ hist Ehad1inENDCAP {
+ }
+ hist EoverPinENDCAP {
+ }
+ hist CoreEMinENDCAP {
+ }
+ hist Re233e237inENDCAP {
+ }
+ hist Re237e277inENDCAP {
+ }
+ hist Ehad1inCRACK {
+ }
+ hist EoverPinCRACK {
+ }
+ hist CoreEMinCRACK {
+ }
+ hist F0inCRACK {
+ }
+ hist F1inCRACK {
+ }
+ hist F2inCRACK {
+ }
+ hist F3inCRACK {
+ }
+ hist Re233e237inCRACK {
+ }
+ hist Re237e277inCRACK {
+ }
+}
+
+dir egamma/LHTightElectronsWithTrigger/Expert/Track {
+ algorithm = egKolmogorov
+ output = egamme/electronsWithTrigger/Track
+ display = Draw=e1,StatBox
+
+ hist NOfBLayerHitsinBARREL {
+ }
+ hist NOfPixelHitsinBARREL {
+ }
+ hist NOfSCTHitsinBARREL {
+ }
+ hist NOfTRTHitsinBARREL {
+ }
+ hist NOfTRTHighThresholdHitsinBARREL {
+ }
+ hist DeltaEta1inBARREL {
+ }
+ hist DeltaPhi2inBARREL {
+ }
+ hist Trackd0inBARREL {
+ }
+ hist NOfBLayerHitsinENDCAP {
+ }
+ hist NOfPixelHitsinENDCAP {
+ }
+ hist NOfSCTHitsinENDCAP {
+ }
+ hist NOfTRTHitsinENDCAP {
+ }
+ hist NOfTRTHighThresholdHitsinENDCAP {
+ }
+ hist DeltaEta1inENDCAP {
+ }
+ hist DeltaPhi2inENDCAP {
+ }
+ hist Trackd0inENDCAP {
+ }
+ hist NOfBLayerHitsinCRACK {
+ }
+ hist NOfPixelHitsinCRACK {
+ }
+ hist NOfSCTHitsinCRACK {
+ }
+ hist NOfTRTHitsinCRACK {
+ }
+ hist NOfTRTHighThresholdHitsinCRACK {
+ }
+ hist DeltaEta1inCRACK {
+ }
+ hist DeltaPhi2inCRACK {
+ }
+ hist Trackd0inCRACK {
+ }
+
+}
+
+
+##############################################
+### photons
+##############################################
+
+# CBLoose
+
+dir egamma/CBLoosePhotons {
+ output = egamma/photons
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
}
- hist electronCoreEMLhMedium_ENDCAP {
+ hist Et {
}
- hist electronF0LhMedium_ENDCAP {
+ hist Phi {
}
- hist electronF1LhMedium_ENDCAP {
+ hist Eta {
}
- hist electronF2LhMedium_ENDCAP {
+ hist PtCone20 {
}
- hist electronF3LhMedium_ENDCAP {
+ hist EtCone40 {
}
- hist electronRe233e237LhMedium_ENDCAP {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
}
- hist electronRe237e277LhMedium_ENDCAP {
+ hist Time {
}
+}
- # LhTight
- hist electronEhad1LhTight_BARREL {
+dir egamma/CBLoosePhotons/Expert {
+ output = egamma/photons/Expert
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist NinBARREL {
}
- hist electronEoverPLhTight_BARREL {
+ hist EtainBARREL {
}
- hist electronCoreEMLhTight_BARREL {
+ hist PhiinBARREL {
}
- hist electronF0LhTight_BARREL {
+ hist TimeinBARREL {
}
- hist electronF1LhTight_BARREL {
+ hist RConvinBARREL {
}
- hist electronF2LhTight_BARREL {
+ hist ConvTypeinBARREL {
}
- hist electronF3LhTight_BARREL {
+ hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
}
- hist electronRe233e237LhTight_BARREL {
+ hist Eta_Phi_Conv_with_Pt_gt_2.5GeV {
}
- hist electronRe237e277LhTight_BARREL {
+ hist NinENDCAP {
}
- hist electronEhad1LhTight_CRACK {
+ hist EtainENDCAP {
}
- hist electronEoverPLhTight_CRACK {
+ hist PhiinENDCAP {
}
- hist electronCoreEMLhTight_CRACK {
+ hist TimeinENDCAP {
}
- hist electronF0LhTight_CRACK {
+ hist RConvinENDCAP {
}
- hist electronF1LhTight_CRACK {
+ hist ConvTypeinENDCAP {
}
- hist electronF2LhTight_CRACK {
+ hist Eta_Phi_with_Pt.gt.20GeV {
}
- hist electronF3LhTight_CRACK {
+ hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
}
- hist electronRe233e237LhTight_CRACK {
+ hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
}
- hist electronRe237e277LhTight_CRACK {
+ hist NinCRACK {
}
- hist electronEhad1LhTight_ENDCAP {
+ hist EtainCRACK {
}
- hist electronEoverPLhTight_ENDCAP {
+ hist PhiinCRACK {
}
- hist electronCoreEMLhTight_ENDCAP {
+ hist TimeinCRACK {
}
- hist electronF0LhTight_ENDCAP {
+ hist RConvinCRACK {
}
- hist electronF1LhTight_ENDCAP {
+ hist ConvTypeinCRACK {
}
- hist electronF2LhTight_ENDCAP {
+
+}
+
+dir egamma/CBLoosePhotons/byLB {
+ output = egamma/photons/LBMon
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist Number_of_Unconv._photons_vs_LB {
}
- hist electronF3LhTight_ENDCAP {
+ hist Number_of_Conv._photons_vs_LB {
}
- hist electronRe233e237LhTight_ENDCAP {
+ hist LBEvoN {
}
- hist electronRe237e277LhTight_ENDCAP {
+ hist Conversion_fraction_vs_LB {
}
+
}
- dir egamma/electrons/Track {
+dir egamma/CBLoosePhotons/ID {
algorithm = egKolmogorov
- output = egamma/electrons/Track
+ output = egamma/photons/ID
display = Draw=e1,StatBox
- # LhLoose
- hist electronNOfBLayersHitsLhLoose_BARREL {
- }
- hist electronNOfTRTHitsLhLoose_BARREL {
+ hist Ehad1inBARREL {
}
- hist electronNOfSiHitsLhLoose_BARREL {
+ hist CoreEMinBARREL {
}
- hist electronDeltaEta1LhLoose_BARREL {
+ hist F0inBARREL {
}
- hist electronDeltaPhi2LhLoose_BARREL {
+ hist F1inBARREL {
}
- hist electronDeltaEta1LhLoose_CRACK {
+ hist F2inBARREL {
}
- hist electronDeltaPhi2LhLoose_CRACK {
+ hist F3inBARREL {
}
- hist electronNOfBLayersHitsLhLoose_CRACK {
+ hist Re233e237inBARREL {
}
- hist electronNOfTRTHitsLhLoose_CRACK {
+ hist Re237e277inBARREL {
}
- hist electronNOfSiHitsLhLoose_CRACK {
+ hist Ehad1inENDCAP {
}
- hist electronDeltaEta1LhLoose_ENDCAP {
+ hist CoreEMinENDCAP {
}
- hist electronDeltaPhi2LhLoose_ENDCAP {
+ hist F0inENDCAP {
}
- hist electronNOfBLayersHitsLhLoose_ENDCAP {
+ hist F1inENDCAP {
}
- hist electronNOfTRTHitsLhLoose_ENDCAP {
+ hist F2inENDCAP {
}
- hist electronNOfSiHitsLhLoose_ENDCAP {
+ hist F3inENDCAP {
}
-
- # LhMedium
- hist electronNOfBLayersHitsLhMedium_BARREL {
- }
- hist electronNOfTRTHitsLhMedium_BARREL {
- }
- hist electronNOfSiHitsLhMedium_BARREL {
- }
- hist electronDeltaEta1LhMedium_BARREL {
+ hist Re233e237inENDCAP {
}
- hist electronDeltaPhi2LhMedium_BARREL {
+ hist Re237e277inENDCAP {
}
- hist electronDeltaEta1LhMedium_CRACK {
+ hist Ehad1inCRACK {
}
- hist electronDeltaPhi2LhMedium_CRACK {
+ hist CoreEMinCRACK {
}
- hist electronNOfBLayersHitsLhMedium_CRACK {
+ hist F0inCRACK {
}
- hist electronNOfTRTHitsLhMedium_CRACK {
+ hist F1inCRACK {
}
- hist electronNOfSiHitsLhMedium_CRACK {
+ hist F2inCRACK {
}
- hist electronDeltaEta1LhMedium_ENDCAP {
+ hist F3inCRACK {
}
- hist electronDeltaPhi2LhMedium_ENDCAP {
+ hist Re233e237inCRACK {
}
- hist electronNOfBLayersHitsLhMedium_ENDCAP {
- }
- hist electronNOfTRTHitsLhMedium_ENDCAP {
- }
- hist electronNOfSiHitsLhMedium_ENDCAP {
+ hist Re237e277inCRACK {
}
+}
- # LhTight
- hist electronNOfBLayersHitsLhTight_BARREL {
- }
- hist electronNOfTRTHitsLhTight_BARREL {
- }
- hist electronNOfSiHitsLhTight_BARREL {
- }
- hist electronDeltaEta1LhTight_BARREL {
- }
- hist electronDeltaPhi2LhTight_BARREL {
- }
- hist electronDeltaEta1LhTight_CRACK {
- }
- hist electronDeltaPhi2LhTight_CRACK {
- }
- hist electronNOfBLayersHitsLhTight_CRACK {
+# CBLooseWithTrigger
+
+dir egamma/CBLoosePhotonsWithTrigger {
+ output = egamma/photonsWithTrigger
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
}
- hist electronNOfTRTHitsLhTight_CRACK {
+ hist Et {
}
- hist electronNOfSiHitsLhTight_CRACK {
+ hist Phi {
}
- hist electronDeltaEta1LhTight_ENDCAP {
+ hist Eta {
}
- hist electronDeltaPhi2LhTight_ENDCAP {
+ hist PtCone20 {
}
- hist electronNOfBLayersHitsLhTight_ENDCAP {
+ hist EtCone40 {
}
- hist electronNOfTRTHitsLhTight_ENDCAP {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
}
- hist electronNOfSiHitsLhTight_ENDCAP {
+ hist Time {
}
- }
+}
- dir egamma/electrons/LBMon {
- algorithm = egamma_GatherData
- output = egamma/electrons/LBMon
- display = Draw=e1,StatBox
- # LhLoose
- hist LBEvoNElectronsLhLoose {
- }
- # LhMedium
- hist LBEvoNElectronsLhMedium {
- }
- # LhTight
- hist LBEvoNElectronsLhTight {
+dir egamma/CBLoosePhotonsWithTrigger/Expert {
+ output = egamma/photonsWithTrigger/Expert
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist NinBARREL {
}
- # CbLoose
- hist LBEvoNElectronsCbLoose {
+ hist EtainBARREL {
}
- # CbTight
- hist LBEvoNElectronsCbTight {
+ hist PhiinBARREL {
}
-}
-
-### photons
-
-
- dir egamma/photons {
- output = egamma/photons
-
- # CbLoose
- hist photonNCbLoose {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist TimeinBARREL {
}
- hist photonEtCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
+ hist RConvinBARREL {
}
- hist photonPhiCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
+ hist ConvTypeinBARREL {
}
- hist photonEtaPhiPt2.5GeVCbLoose {
- algorithm = egamma_BinsDiffFromStripMedian
+ hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
}
- hist photonEtaPhiPtgt4GeVCbLoose {
- algorithm = egamma_BinsDiffFromStripMedian
+ hist Eta_Phi_Conv_with_Pt_gt_2.5GeV {
}
- hist photonEtaPhiPtgt20GeVCbLoose {
- algorithm = egamma_BinsDiffFromStripMedian
+ hist NinENDCAP {
}
- hist photonPtCone20CbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
+ hist EtainENDCAP {
}
- hist photonTopoEtCone40CbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
+ hist PhiinENDCAP {
}
- hist photonTimeCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
+ hist TimeinENDCAP {
}
- hist photonRconvCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
+ hist RConvinENDCAP {
}
-
- # CbTight
- hist photonNCbTight {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist ConvTypeinENDCAP {
}
- hist photonEtCbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
+ hist Eta_Phi_with_Pt.gt.20GeV {
}
- hist photonPhiCbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
+ hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
}
- hist photonEtaPhiPt2.5GeVCbTight {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
+ hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
}
- hist photonEtaPhiPtgt4GeVCbTight {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
+ hist NinCRACK {
}
- hist photonEtaPhiPtgt20GeVCbTight {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
+ hist EtainCRACK {
}
- hist photonPtCone20CbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
+ hist PhiinCRACK {
}
- hist photonTopoEtCone40CbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
+ hist TimeinCRACK {
}
- hist photonTimeCbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
+ hist RConvinCRACK {
}
- hist photonRconvCbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
+ hist ConvTypeinCRACK {
}
+
}
- dir egamma/photons/Region {
+dir egamma/CBLoosePhotonsWithTrigger/byLB {
+ output = egamma/photonsWithTrigger/LBMon
algorithm = egKolmogorov
- output = egamma/photons/EXPERT
- display = Draw=e1,StatBox
+ display = Draw=e1, DrawRef=HIST, StatBox
- # CbLoose
- hist photonNCbLoose_BARREL {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbLoose_BARREL {
+ hist Number_of_Unconv._photons_vs_LB {
}
- hist photonEtaCbLoose_BARREL {
+ hist Number_of_Conv._photons_vs_LB {
}
- hist photonPhiCbLoose_BARREL {
+ hist LBEvoN {
}
- hist photonPtCone20CbLoose_BARREL {
+ hist Conversion_fraction_vs_LB {
}
- hist photonTopoEtCone40CbLoose_BARREL {
+
+}
+
+dir egamma/CBLoosePhotonsWithTrigger/ID {
+ algorithm = egKolmogorov
+ output = egamma/photonsWithTrigger/ID
+ display = Draw=e1,StatBox
+
+ hist Ehad1inBARREL {
}
- hist photonNCbLoose_CRACK {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist CoreEMinBARREL {
}
- hist photonEtCbLoose_CRACK {
+ hist F0inBARREL {
}
- hist photonEtaCbLoose_CRACK {
+ hist F1inBARREL {
}
- hist photonPhiCbLoose_CRACK {
+ hist F2inBARREL {
}
- hist photonPtCone20CbLoose_CRACK {
+ hist F3inBARREL {
}
- hist photonTopoEtCone40CbLoose_CRACK {
+ hist Re233e237inBARREL {
}
- hist photonNCbLoose_ENDCAP {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist Re237e277inBARREL {
}
- hist photonEtCbLoose_ENDCAP {
+ hist Ehad1inENDCAP {
}
- hist photonEtaCbLoose_ENDCAP {
+ hist CoreEMinENDCAP {
}
- hist photonPhiCbLoose_ENDCAP {
+ hist F0inENDCAP {
}
- hist photonPtCone20CbLoose_ENDCAP {
+ hist F1inENDCAP {
}
- hist photonTopoEtCone40CbLoose_ENDCAP {
+ hist F2inENDCAP {
}
-
- # CbTight
- hist photonNCbTight_BARREL {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist F3inENDCAP {
}
- hist photonEtCbTight_BARREL {
+ hist Re233e237inENDCAP {
}
- hist photonEtaCbTight_BARREL {
+ hist Re237e277inENDCAP {
}
- hist photonPhiCbTight_BARREL {
+ hist Ehad1inCRACK {
}
- hist photonPtCone20CbTight_BARREL {
+ hist CoreEMinCRACK {
}
- hist photonTopoEtCone40CbTight_BARREL {
+ hist F0inCRACK {
}
- hist photonNCbTight_CRACK {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist F1inCRACK {
}
- hist photonEtCbTight_CRACK {
+ hist F2inCRACK {
}
- hist photonEtaCbTight_CRACK {
+ hist F3inCRACK {
}
- hist photonPhiCbTight_CRACK {
+ hist Re233e237inCRACK {
}
- hist photonPtCone20CbTight_CRACK {
+ hist Re237e277inCRACK {
}
- hist photonTopoEtCone40CbTight_CRACK {
- }
- hist photonNCbTight_ENDCAP {
+}
+
+# CBTight
+
+dir egamma/CBTightPhotons {
+ output = egamma/photons
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
}
- hist photonEtCbTight_ENDCAP {
+ hist Et {
}
- hist photonEtaCbTight_ENDCAP {
+ hist Phi {
}
- hist photonPhiCbTight_ENDCAP {
+ hist Eta {
}
- hist photonPtCone20CbTight_ENDCAP {
+ hist PtCone20 {
}
- hist photonTopoEtCone40CbTight_ENDCAP {
+ hist EtCone40 {
+ }
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ }
+ hist Time {
}
}
- dir egamma/photons/Unconv {
- algorithm = egKolmogorov
- output = egamma/photons
- display = Draw=e1,StatBox
-
- #CbLoose
- hist photonNUnconvCbLoose {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtUnconvCbLoose {
- }
- hist photonEtaUnconvCbLoose {
- }
- hist photonPhiUnconvCbLoose {
- }
- hist photonEtaPhiUnconvCbLoose {
- algorithm = egamma_BinsDiffFromStripMedian
- }
- hist photonTopoEtCone40UnconvCbLoose {
- }
- hist photonPtCone20UnconvCbLoose {
- }
-
- #CbTight
- hist photonNUnconvCbTight {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtUnconvCbTight {
- }
- hist photonEtaUnconvCbTight {
- }
- hist photonPhiUnconvCbTight {
- }
- hist photonEtaPhiUnconvCbTight {
- algorithm = egamma_BinsDiffFromStripMedian
- }
- hist photonTopoEtCone40UnconvCbTight {
- }
- hist photonPtCone20UnconvCbTight {
- }
-
-}
-
-
- dir egamma/photons/Conv {
- algorithm = egKolmogorov
- output = egamma/photons
- display = Draw=e1,StatBox
-
- #CbLoose
- hist photonNConvCbLoose {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtConvCbLoose {
- }
- hist photonEtaConvCbLoose {
- }
- hist photonPhiConvCbLoose {
- }
- hist photonEtaPhiConvCbLoose {
- algorithm = egamma_BinsDiffFromStripMedian
- }
- hist photonTopoEtCone40ConvCbLoose {
- }
- hist photonPtCone20ConvCbLoose {
- }
- #CbTight
- hist photonNConvCbTight {
- }
- hist photonEtConvCbTight {
- }
- hist photonEtaConvCbTight {
- }
- hist photonPhiConvCbTight {
- }
- hist photonEtaPhiConvCbTight {
- algorithm = egamma_BinsDiffFromStripMedian
- }
- hist photonTopoEtCone40ConvCbTight {
- }
- hist photonPtCone20ConvCbTight {
- }
-}
-
- dir egamma/photons/ID {
- algorithm = egKolmogorov
- output = egamma/photons/ID
- display = Draw=e1,StatBox
-
- #CbLoose
- hist photonEhad1CbLoose_BARREL {
+dir egamma/CBTightPhotons/Expert {
+ output = egamma/photons/Expert
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist NinBARREL {
+ }
+ hist EtainBARREL {
+ }
+ hist PhiinBARREL {
}
- hist photonCoreEMCbLoose_BARREL {
+ hist TimeinBARREL {
}
- hist photonF0CbLoose_BARREL {
+ hist RConvinBARREL {
}
- hist photonF1CbLoose_BARREL {
+ hist ConvTypeinBARREL {
}
- hist photonF2CbLoose_BARREL {
+ hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
}
- hist photonF3CbLoose_BARREL {
+ hist Eta_Phi_Conv_with_Pt_gt_2.5GeV {
}
- hist photonRe233e237CbLoose_BARREL {
+ hist NinENDCAP {
}
- hist photonRe237e277CbLoose_BARREL {
+ hist EtainENDCAP {
}
- hist photonEhad1CbLoose_CRACK {
+ hist PhiinENDCAP {
}
- hist photonCoreEMCbLoose_CRACK {
+ hist TimeinENDCAP {
}
- hist photonF0CbLoose_CRACK {
+ hist RConvinENDCAP {
}
- hist photonF1CbLoose_CRACK {
+ hist ConvTypeinENDCAP {
}
- hist photonF2CbLoose_CRACK {
+ hist Eta_Phi_with_Pt.gt.20GeV {
}
- hist photonF3CbLoose_CRACK {
+ hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
}
- hist photonRe233e237CbLoose_CRACK {
+ hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
}
- hist photonRe237e277CbLoose_CRACK {
+ hist NinCRACK {
}
- hist photonEhad1CbLoose_ENDCAP {
+ hist EtainCRACK {
}
- hist photonCoreEMCbLoose_ENDCAP {
+ hist PhiinCRACK {
}
- hist photonF0CbLoose_ENDCAP {
+ hist TimeinCRACK {
}
- hist photonF1CbLoose_ENDCAP {
+ hist RConvinCRACK {
}
- hist photonF2CbLoose_ENDCAP {
+ hist ConvTypeinCRACK {
+ }
+
+}
+
+dir egamma/CBTightPhotons/byLB {
+ output = egamma/photons/LBMon
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist Number_of_Unconv._photons_vs_LB {
}
- hist photonF3CbLoose_ENDCAP {
+ hist Number_of_Conv._photons_vs_LB {
}
- hist photonRe233e237CbLoose_ENDCAP {
+ hist LBEvoN {
}
- hist photonRe237e277CbLoose_ENDCAP {
+ hist Conversion_fraction_vs_LB {
}
- #CbTight
- hist photonEhad1CbTight_BARREL {
+
+}
+
+dir egamma/CBTightPhotons/ID {
+ algorithm = egKolmogorov
+ output = egamma/photons/ID
+ display = Draw=e1,StatBox
+
+ hist Ehad1inBARREL {
}
- hist photonCoreEMCbTight_BARREL {
+ hist CoreEMinBARREL {
}
- hist photonF0CbTight_BARREL {
+ hist F0inBARREL {
}
- hist photonF1CbTight_BARREL {
+ hist F1inBARREL {
}
- hist photonF2CbTight_BARREL {
+ hist F2inBARREL {
}
- hist photonF3CbTight_BARREL {
+ hist F3inBARREL {
}
- hist photonRe233e237CbTight_BARREL {
+ hist Re233e237inBARREL {
}
- hist photonRe237e277CbTight_BARREL {
+ hist Re237e277inBARREL {
}
- hist photonEhad1CbTight_CRACK {
+ hist Ehad1inENDCAP {
}
- hist photonCoreEMCbTight_CRACK {
+ hist CoreEMinENDCAP {
}
- hist photonF0CbTight_CRACK {
+ hist F0inENDCAP {
}
- hist photonF1CbTight_CRACK {
+ hist F1inENDCAP {
}
- hist photonF2CbTight_CRACK {
+ hist F2inENDCAP {
}
- hist photonF3CbTight_CRACK {
+ hist F3inENDCAP {
}
- hist photonRe233e237CbTight_CRACK {
+ hist Re233e237inENDCAP {
}
- hist photonRe237e277CbTight_CRACK {
+ hist Re237e277inENDCAP {
}
- hist photonEhad1CbTight_ENDCAP {
+ hist Ehad1inCRACK {
}
- hist photonCoreEMCbTight_ENDCAP {
+ hist CoreEMinCRACK {
}
- hist photonF0CbTight_ENDCAP {
+ hist F0inCRACK {
}
- hist photonF1CbTight_ENDCAP {
+ hist F1inCRACK {
}
- hist photonF2CbTight_ENDCAP {
+ hist F2inCRACK {
}
- hist photonF3CbTight_ENDCAP {
+ hist F3inCRACK {
}
- hist photonRe233e237CbTight_ENDCAP {
+ hist Re233e237inCRACK {
}
- hist photonRe237e277CbTight_ENDCAP {
+ hist Re237e277inCRACK {
}
}
- dir egamma/photons/Region {
- algorithm = egKolmogorov
- output = egamma/photons/EXPERT
- display = Draw=e1,StatBox
+# CBTightWithTrigger
- # CbLoose
- hist photonConvTrkMatch1CbLoose_BARREL {
- }
- hist photonConvTrkMatch2CbLoose_BARREL {
+dir egamma/CBTightPhotonsWithTrigger {
+ output = egamma/photonsWithTrigger
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
}
- hist photonConvTypeCbLoose_BARREL {
+ hist Et {
}
- hist photonConvTrkMatch1CbLoose_CRACK {
+ hist Phi {
}
- hist photonConvTrkMatch2CbLoose_CRACK {
+ hist Eta {
}
- hist photonConvTypeCbLoose_CRACK {
+ hist PtCone20 {
}
- hist photonConvTrkMatch1CbLoose_ENDCAP {
+ hist EtCone40 {
}
- hist photonConvTrkMatch2CbLoose_ENDCAP {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
}
- hist photonConvTypeCbLoose_ENDCAP {
+ hist Time {
}
- # CbTight
- hist photonConvTrkMatch1CbTight_BARREL {
+}
+
+dir egamma/CBTightPhotonsWithTrigger/Expert {
+ output = egamma/photonsWithTrigger/Expert
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist NinBARREL {
}
- hist photonConvTrkMatch2CbTight_BARREL {
+ hist EtainBARREL {
}
- hist photonConvTypeCbTight_BARREL {
+ hist PhiinBARREL {
}
- hist photonConvTrkMatch1CbTight_CRACK {
+ hist TimeinBARREL {
}
- hist photonConvTrkMatch2CbTight_CRACK {
+ hist RConvinBARREL {
}
- hist photonConvTypeCbTight_CRACK {
+ hist ConvTypeinBARREL {
}
- hist photonConvTrkMatch1CbTight_ENDCAP {
+ hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
}
- hist photonConvTrkMatch2CbTight_ENDCAP {
+ hist Eta_Phi_Conv_with_Pt_gt_2.5GeV {
}
- hist photonConvTypeCbTight_ENDCAP {
+ hist NinENDCAP {
}
- }
-
-
- dir egamma/photons/LBMon {
- algorithm = egamma_GatherData
- output = egamma/photons/LBMon
- display = Draw=e1,StatBox
- # CbLoose
- hist LBEvoNPhotonsCbLoose {
+ hist EtainENDCAP {
}
- hist LBEvoNPhotonsUnconvCbLoose {
+ hist PhiinENDCAP {
}
- hist LBEvoNPhotonsConvCbLoose {
+ hist TimeinENDCAP {
}
- hist LBEvoConvOverNCbLoose {
+ hist RConvinENDCAP {
}
-
- # CbTight
- hist LBEvoNPhotonsCbTight {
+ hist ConvTypeinENDCAP {
}
- hist LBEvoNPhotonsUnconvCbTight {
+ hist Eta_Phi_with_Pt.gt.20GeV {
}
- hist LBEvoNPhotonsConvCbTight {
+ hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
}
- hist LBEvoConvOverNCbTight {
+ hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
}
-}
-
-
-### forwardElectrons
-
- dir egamma/forwardElectrons {
- algorithm = egKolmogorov
- output = egamma/forwardElectrons
- display = Draw=e1,StatBox
-
- hist forwardElectronN {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist NinCRACK {
}
- hist forwardElectronEt {
+ hist EtainCRACK {
}
- hist forwardElectronPhi {
+ hist PhiinCRACK {
}
- hist forwardElectronEta {
+ hist TimeinCRACK {
}
- hist forwardElectronEtaPhi {
- algorithm = egamma_BinsDiffFromStripMedian
+ hist RConvinCRACK {
}
- # hist forwardElectronTopoEtCone40 {
- # }
- hist forwardElectronTime {
+ hist ConvTypeinCRACK {
}
- hist forwardElectronTightN {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist forwardElectronTightEt {
- }
- hist forwardElectronTightPhi {
+}
+
+dir egamma/CBTightPhotonsWithTrigger/byLB {
+ output = egamma/photonsWithTrigger/LBMon
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist Number_of_Unconv._photons_vs_LB {
}
- hist forwardElectronTightEta {
+ hist Number_of_Conv._photons_vs_LB {
}
- hist forwardElectronTightEtaPhi {
- algorithm = egamma_BinsDiffFromStripMedian
+ hist LBEvoN {
}
- # hist forwardElectronTightTopoEtCone40 {
- # }
- hist forwardElectronTightTime {
+ hist Conversion_fraction_vs_LB {
}
}
+dir egamma/CBTightPhotonsWithTrigger/ID {
+ algorithm = egKolmogorov
+ output = egamma/photonsWithTrigger/ID
+ display = Draw=e1,StatBox
- dir egamma/forwardElectrons {
- Algorithm = Egkolmogorov
- Output = egamma/forwardElectrons/EXPERT
- display = Draw=e1,StatBox
- hist forwardElectronN_ENDCAP {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist Ehad1inBARREL {
}
- hist forwardElectronEt_ENDCAP {
- output = egamma/forwardElectrons/EXPERT
+ hist CoreEMinBARREL {
}
- hist forwardElectronEta_ENDCAP {
- output = egamma/forwardElectrons/EXPERT
+ hist F0inBARREL {
}
- hist forwardElectronPhi_ENDCAP {
- output = egamma/forwardElectrons/EXPERT
+ hist F1inBARREL {
}
- # hist forwardElectronTopoEtCone40_ENDCAP {
- # output = egamma/forwardElectrons/EXPERT
- # }
- hist forwardElectronTime_ENDCAP {
- output = egamma/forwardElectrons/EXPERT
+ hist F2inBARREL {
}
- hist forwardElectronTightN_ENDCAP {
- output = egamma/forwardElectrons/EXPERT
+ hist F3inBARREL {
}
- hist forwardElectronTightEt_ENDCAP {
- output = egamma/forwardElectrons/EXPERT
+ hist Re233e237inBARREL {
}
- hist forwardElectronTightEta_ENDCAP {
- output = egamma/forwardElectrons/EXPERT
+ hist Re237e277inBARREL {
}
- hist forwardElectronTightPhi_ENDCAP {
- output = egamma/forwardElectrons/EXPERT
+ hist Ehad1inENDCAP {
}
- #hist forwardElectronTightTopoEtCone40_ENDCAP {
- # output = egamma/forwardElectrons/EXPERT
- # }
- hist forwardElectronN_FORWARD {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- output = egamma/forwardElectrons/EXPERT
+ hist CoreEMinENDCAP {
}
- hist forwardElectronEt_FORWARD {
- output = egamma/forwardElectrons/EXPERT
+ hist F0inENDCAP {
}
- hist forwardElectronEta_FORWARD {
- output = egamma/forwardElectrons/EXPERT
+ hist F1inENDCAP {
}
- hist forwardElectronPhi_FORWARD {
- output = egamma/forwardElectrons/EXPERT
+ hist F2inENDCAP {
}
- # hist forwardElectronTopoEtCone40_FORWARD {
- # output = egamma/forwardElectrons/EXPERT
- # }
- hist forwardElectronTime_FORWARD {
- output = egamma/forwardElectrons/EXPERT
+ hist F3inENDCAP {
}
- hist forwardElectronTightN_FORWARD {
- output = egamma/forwardElectrons/EXPERT
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist Re233e237inENDCAP {
}
- hist forwardElectronTightEt_FORWARD {
- output = egamma/forwardElectrons/EXPERT
+ hist Re237e277inENDCAP {
}
- hist forwardElectronTightEta_FORWARD {
- output = egamma/forwardElectrons/EXPERT
+ hist Ehad1inCRACK {
}
- hist forwardElectronTightPhi_FORWARD {
- output = egamma/forwardElectrons/EXPERT
+ hist CoreEMinCRACK {
}
- # hist forwardElectronTightTopoEtCone40_FORWARD {
- # output = egamma/forwardElectrons/EXPERT
- # }
-}
-
-dir egamma/forwardElectrons/ID {
- algorithm = egKolmogorov
- output = egamma/forwardElectrons/ID
- hist forwardElectronENG_DENS_ENDCAP {
+ hist F0inCRACK {
}
- hist forwardElectronFRAC_MAX_ENDCAP {
+ hist F1inCRACK {
}
- hist forwardElectronLONGITUDINAL_ENDCAP {
+ hist F2inCRACK {
}
- hist forwardElectron2ND_LAMBDA_ENDCAP {
+ hist F3inCRACK {
}
- hist forwardElectronLATERAL_ENDCAP {
+ hist Re233e237inCRACK {
}
- hist forwardElectron2ND_R_ENDCAP {
+ hist Re237e277inCRACK {
+ }
+}
+
+
+########################################
+### forwardElectrons
+########################################
+
+# CB Loose Forward Electrons
+
+dir egamma/CBLooseFwdElectrons {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons
+ display = Draw=e1,StatBox
+
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Et {
+ }
+ hist Phi {
+ }
+ hist Eta {
+ }
+ hist Time {
+ }
+ hist Eta_Phi_distributionf_Pt_gt_10GeV {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+}
+
+dir egamma/CBLooseFwdElectrons {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/ID
+ display = Draw=e1,StatBox
+
+ hist EnergyDensity {
+ }
+ hist FracMax {
+ }
+ hist Lateral {
+ }
+ hist Longitudinal {
+ }
+ hist SecondLambda {
+ }
+ hist SecondR {
+ }
+ hist CenterLambda {
+ }
+}
+
+
+dir egamma/CBLooseFwdElectrons {
+ algorithm = Egkolmogorov
+ Output = egamma/forwardElectrons/Expert
+ display = Draw=e1,StatBox
+
+ hist NinENDCAP {
+ display = Draw=e1,StatBox,LogY
}
- hist forwardElectronCENTER_LAMBDA_ENDCAP {
+ hist NinFORWARD {
+ display = Draw=e1,StatBox,LogY
}
- hist forwardElectronENG_DENS_FORWARD {
+ hist Eta_Phi_distribution_Pt_gt_2.5GeV {
}
- hist forwardElectronFRAC_MAX_FORWARD {
+ hist EtainENDCAP {
}
- hist forwardElectronLONGITUDINAL_FORWARD {
+ hist PhiinENDCAP {
}
- hist forwardElectron2ND_LAMBDA_FORWARD {
+ hist TimeinENDCAP {
}
- hist forwardElectronLATERAL_FORWARD {
+ hist EtainFORWARD {
}
- hist forwardElectron2ND_R_FORWARD {
+ hist PhiinFORWARD {
}
- hist forwardElectronCENTER_LAMBDA_FORWARD {
+ hist TimeinFORWARD {
}
}
+### Tag&Probe Z
+
+dir egamma/TnPZ/TnPCandidate {
+ algorithm = egKolmogorov
+ output = egamma/tagandprobeZ
+ display = Draw=e1,StatBox
+
+ hist Z_candidate_mass {
+ algorithm = egamma_FitZmass
+ display = StatBox,gaus(80000.,100000.)
+ }
+ hist Z_candidate_mass_distribution_Lead_in_Barrel {
+ algorithm = egamma_FitZmass
+ display = StatBox,gaus(80000.,100000.)
+ }
+ hist Number_of_Z_candidates_vs_eta_leading_e {
+ }
+ hist Number_of_Z_candidates_vs_phi_leading_e {
+ }
+ hist Z_candidate_mass_distribution_Lead_in_Crack {
+ algorithm = egamma_FitZmass
+ display = StatBox,gaus(80000.,100000.)
+ }
+ hist Z_candidate_mass_distribution_Lead_in_EndCap {
+ algorithm = egamma_FitZmass
+ display = StatBox,gaus(80000.,100000.)
+ }
+
+}
+
+dir egamma/TnPZ/ID {
+ algorithm = egKolmogorov
+ output = egamma/tagandprobeZ/ID
+ display = Draw=e1,StatBox
+
+ hist Ehad1ProbeinBARREL {
+ }
+ hist EoverPProbeinBARREL {
+ }
+ hist CoreEMProbeinBARREL {
+ }
+ hist F0ProbeinBARREL {
+ }
+ hist F1ProbeinBARREL {
+ }
+ hist F2ProbeinBARREL {
+ }
+ hist F3ProbeinBARREL {
+ }
+ hist Re233e237ProbeinBARREL {
+ }
+ hist Re237e277ProbeinBARREL {
+ }
+ hist Ehad1ProbeinENDCAP {
+ }
+ hist EoverPProbeinENDCAP {
+ }
+ hist CoreEMProbeinENDCAP {
+ }
+ hist F0ProbeinENDCAP {
+ }
+ hist F1ProbeinENDCAP {
+ }
+ hist F2ProbeinENDCAP {
+ }
+ hist F3ProbeinENDCAP {
+ }
+ hist Re233e237ProbeinENDCAP {
+ }
+ hist Re237e277ProbeinENDCAP {
+ }
+
+}
+
+dir egamma/TnPZ/Tracks {
+ algorithm = egKolmogorov
+ output = egamma/tagandprobeZ/Track
+ display = Draw=e1,StatBox
+
+ hist NOfBLayerHitsProbeinBARREL {
+ }
+ hist NOfPixelHitsProbeinBARREL {
+ }
+ hist NOfSCTHitsProbeinBARREL {
+ }
+ hist NOfTRTHitsProbeinBARREL {
+ }
+ hist NOfTRTHighThresholdHitsProbeinBARREL {
+ }
+ hist DeltaEta1ProbeinBARREL {
+ }
+ hist DeltaPhi2ProbeinBARREL {
+ }
+ hist Trackd0ProbeinBARREL {
+ }
+ hist NOfBLayerHitsProbeinENDCAP {
+ }
+ hist NOfPixelHitsProbeinENDCAP {
+ }
+ hist NOfSCTHitsProbeinENDCAP {
+ }
+ hist NOfTRTHitsProbeinENDCAP {
+ }
+ hist NOfTRTHighThresholdHitsProbeinENDCAP {
+ }
+ hist DeltaEta1ProbeinENDCAP {
+ }
+ hist DeltaPhi2ProbeinENDCAP {
+ }
+ hist Trackd0ProbeinENDCAP {
+ }
+
+ }
+
+dir egamma/TnPZ/Efficiencies {
+ algorithm = egKolmogorov
+ output = egamma/tagandprobeZ
+ display = Draw=e1,StatBox
+
+ hist TnP_ID_efficiency_vs_etprobe {
+ }
+ hist TnP_ID_efficiency_vs_etaprobe {
+ }
+ hist TnP_ID_efficiency_vs_phiprobe {
+ }
+ hist TnP_Calo_Iso_efficiency_vs_etprobe {
+ }
+ hist TnP_Calo_Iso_efficiency_vs_etaprobe {
+ }
+ hist TnP_Calo_Iso_efficiency_vs_phiprobe {
+ }
+ hist TnP_Calo_Iso_and_LHTight_efficiency_vs_etprobe {
+ }
+ hist TnP_Calo_Iso_and_LHTight_efficiency_vs_etaprobe {
+ }
+ hist TnP_Calo_Iso_and_LHTight_ID_efficiency_vs_phiprobe {
+ }
+
+}
+
+dir egamma/TnPZ/TnPCandidate {
+ algorithm = egamma_GatherData
+ output = egamma/tagandprobeZ/LBMon
+ display = Draw=e1,StatBox
+
+ hist Number_of_Z_candidates_vs_LB {
+ }
+
+}
+
+### Tag&Probe JPsi
+
+dir egamma/TnPJPsi/TnPCandidate {
+ algorithm = egKolmogorov
+ output = egamma/tagandprobeJPsi
+ display = Draw=e1,StatBox
+
+ hist JPsi_candidate_mass {
+ algorithm = egamma_FitJPsimass
+ display = StatBox,gaus(2500.,4000.)
+ }
+ hist JPsi_candidate_mass_distribution_Lead_in_Barrel {
+ algorithm = egamma_FitJPsimass
+ display = StatBox,gaus(2500.,4000.)
+ }
+ hist Number_of_JPsi_candidates_vs_eta_leading_e {
+ }
+ hist Number_of_JPsi_candidates_vs_phi_leading_e {
+ }
+ hist JPsi_candidate_mass_distribution_Lead_in_Crack {
+ algorithm = egamma_FitJPsimass
+ display = StatBox,gaus(2500.,4000.)
+ }
+ hist JPsi_candidate_mass_distribution_Lead_in_EndCap {
+ algorithm = egamma_FitJPsimass
+ display = StatBox,gaus(2500.,4000.)
+ }
+
+}
+
+dir egamma/TnPJPsi/ID {
+ algorithm = egKolmogorov
+ output = egamma/tagandprobeJPsi/ID
+ display = Draw=e1,StatBox
+
+ hist Ehad1ProbeinBARREL {
+ }
+ hist EoverPProbeinBARREL {
+ }
+ hist CoreEMProbeinBARREL {
+ }
+ hist F0ProbeinBARREL {
+ }
+ hist F1ProbeinBARREL {
+ }
+ hist F2ProbeinBARREL {
+ }
+ hist F3ProbeinBARREL {
+ }
+ hist Re233e237ProbeinBARREL {
+ }
+ hist Re237e277ProbeinBARREL {
+ }
+ hist Ehad1ProbeinENDCAP {
+ }
+ hist EoverPProbeinENDCAP {
+ }
+ hist CoreEMProbeinENDCAP {
+ }
+ hist F0ProbeinENDCAP {
+ }
+ hist F1ProbeinENDCAP {
+ }
+ hist F2ProbeinENDCAP {
+ }
+ hist F3ProbeinENDCAP {
+ }
+ hist Re233e237ProbeinENDCAP {
+ }
+ hist Re237e277ProbeinENDCAP {
+ }
+
+}
+
+dir egamma/TnPJPsi/Tracks {
+ algorithm = egKolmogorov
+ output = egamma/tagandprobeJPsi/Track
+ display = Draw=e1,StatBox
+
+ hist NOfBLayerHitsProbeinBARREL {
+ }
+ hist NOfPixelHitsProbeinBARREL {
+ }
+ hist NOfSCTHitsProbeinBARREL {
+ }
+ hist NOfTRTHitsProbeinBARREL {
+ }
+ hist NOfTRTHighThresholdHitsProbeinBARREL {
+ }
+ hist DeltaEta1ProbeinBARREL {
+ }
+ hist DeltaPhi2ProbeinBARREL {
+ }
+ hist Trackd0ProbeinBARREL {
+ }
+ hist NOfBLayerHitsProbeinENDCAP {
+ }
+ hist NOfPixelHitsProbeinENDCAP {
+ }
+ hist NOfSCTHitsProbeinENDCAP {
+ }
+ hist NOfTRTHitsProbeinENDCAP {
+ }
+ hist NOfTRTHighThresholdHitsProbeinENDCAP {
+ }
+ hist DeltaEta1ProbeinENDCAP {
+ }
+ hist DeltaPhi2ProbeinENDCAP {
+ }
+ hist Trackd0ProbeinENDCAP {
+ }
+
+ }
+
+dir egamma/TnPJPsi/Efficiencies {
+ algorithm = egKolmogorov
+ output = egamma/tagandprobeJPsi
+ display = Draw=e1,StatBox
+
+ hist TnP_ID_efficiency_vs_etprobe {
+ }
+ hist TnP_ID_efficiency_vs_etaprobe {
+ }
+ hist TnP_ID_efficiency_vs_phiprobe {
+ }
+ hist TnP_Calo_Iso_efficiency_vs_etprobe {
+ }
+ hist TnP_Calo_Iso_efficiency_vs_etaprobe {
+ }
+ hist TnP_Calo_Iso_efficiency_vs_phiprobe {
+ }
+ hist TnP_Calo_Iso_and_LHTight_efficiency_vs_etprobe {
+ }
+ hist TnP_Calo_Iso_and_LHTight_efficiency_vs_etaprobe {
+ }
+ hist TnP_Calo_Iso_and_LHTight_ID_efficiency_vs_phiprobe {
+ }
+}
+
+dir egamma/TnPJPsi/TnPCandidate {
+ algorithm = egamma_GatherData
+ output = egamma/tagandprobeJPsi/LBMon
+ display = Draw=e1,StatBox
+ hist Number_of_JPsi_candidates_vs_LB {
+ }
+}
\ No newline at end of file
diff --git a/DataQuality/DataQualityConfigurations/config/Egamma/heavyions_run.config b/DataQuality/DataQualityConfigurations/config/Egamma/heavyions_run.config
index 02e36f8d5a72..0e239471642c 100644
--- a/DataQuality/DataQualityConfigurations/config/Egamma/heavyions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/Egamma/heavyions_run.config
@@ -1,5 +1,5 @@
# **********************************************************************
-# $Id: heavyions_run.config 781943 2016-11-02 16:47:25Z xhoad $
+# $Id: collisions_run.config 777627 2016-10-11 10:49:51Z nproklov $
# **********************************************************************
############################################################
@@ -101,7 +101,6 @@ algorithm 2D_Histogram_Not_Empty {
reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
}
-
algorithm egamma_FitZmass {
libname = libdqm_algorithms.so
name = Simple_gaus_Fit
@@ -113,8 +112,8 @@ algorithm egamma_FitZmass {
algorithm egamma_FitJPsimass {
libname = libdqm_algorithms.so
name = Simple_gaus_Fit
- xmin = 3000.
- xmax = 5000.
+ xmin = 2500.
+ xmax = 4000.
thresholds = egamma_FitJPsimass_Thresholds
}
@@ -125,92 +124,62 @@ algorithm egamma_FitJPsimass {
output top_level {
algorithm = WorstCaseSummary
output egamma {
- algorithm = WorstCaseSummary
output photons {
- algorithm = WorstCaseSummary
- output EXPERT {
- algorithm = WorstCaseSummary
+ output Expert {
}
output ID {
- algorithm = WorstCaseSummary
}
output LBMon {
- algorithm = WorstCaseSummary
}
}
output photonsWithTrigger {
- algorithm = WorstCaseSummary
- output EXPERT {
- algorithm = WorstCaseSummary
+ output Expert {
}
output ID {
- algorithm = WorstCaseSummary
}
output LBMon {
- algorithm = WorstCaseSummary
}
}
output electrons {
- algorithm = WorstCaseSummary
- output EXPERT {
- algorithm = WorstCaseSummary
+ output Expert {
}
output ID {
- algorithm = WorstCaseSummary
}
output Track {
- algorithm = WorstCaseSummary
}
output LBMon {
- algorithm = WorstCaseSummary
}
}
output electronsWithTrigger {
- algorithm = WorstCaseSummary
- output EXPERT {
- algorithm = WorstCaseSummary
+ output Expert {
}
output ID {
- algorithm = WorstCaseSummary
}
output Track {
- algorithm = WorstCaseSummary
}
output LBMon {
- algorithm = WorstCaseSummary
}
}
output forwardElectrons {
- algorithm = WorstCaseSummary
output ID {
- algorithm = WorstCaseSummary
}
- output EXPERT {
- algorithm = WorstCaseSummary
+ output Expert {
}
}
output tagandprobeZ {
- algorithm = WorstCaseSummary
output ID {
- algorithm = WorstCaseSummary
}
output Track {
- algorithm = WorstCaseSummary
}
output LBMon {
- algorithm = WorstCaseSummary
}
}
output tagandprobeJPsi {
- algorithm = WorstCaseSummary
output ID {
- algorithm = WorstCaseSummary
}
output Track {
- algorithm = WorstCaseSummary
}
output LBMon {
- algorithm = WorstCaseSummary
}
}
}
@@ -220,3075 +189,1604 @@ output top_level {
# Histogram Assessments
#######################
- dir egamma/electrons {
+##################################
+# Electrons
+#################################@
+
+# LhLoose
+
+dir egamma/LHLooseElectrons {
output = egamma/electrons
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
- # CbLoose
- hist electronNCbLoose {
+ hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
}
- hist electronEtCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20CbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40CbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
-
- # CbTight
- hist electronNCbTight {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist Et {
}
- hist electronEtCbTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiCbTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaCbTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20CbTight {
- algorithm = egKolmogorov
- }
- hist electronTopoEtCone40CbTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeCbTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
-
- # LhLoose
- hist electronNLhLoose {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist Eta {
}
- hist electronEtLhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaPhiPtgt2.5GeVLhLoose {
- output = egamma/electrons/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt4GeVLhLoose {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt20GeVLhLoose {
- output = egamma/electrons/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronPtCone20LhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhLoose_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhLoose_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhLoose_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhLoose_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhLoose_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhLoose_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhLoose_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhLoose_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhLoose_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhLoose_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhLoose_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhLoose_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhLoose_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhLoose_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhLoose_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhLoose_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhLoose_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhLoose_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaPhiPtgt2.5GeVLhLoose {
- output = egamma/electrons/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt4GeVLhLoose {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt20GeVLhLoose {
- output = egamma/electrons/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronPtCone20LhLoose_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhLoose_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhLoose_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
-
- # LhMedium
- hist electronNLhMedium {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist Phi {
}
- hist electronEtLhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaPhiPtgt2.5GeVLhMedium {
- output = egamma/electrons/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- # algorithm = egamma_BinsDiffFromStripMedian
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt4GeVLhMedium {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt20GeVLhMedium {
- output = egamma/electrons/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronPtCone20LhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhMedium_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhMedium_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhMedium_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhMedium_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhMedium_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhMedium_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhMedium_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhMedium_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhMedium_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhMedium_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhMedium_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhMedium_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhMedium_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhMedium_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhMedium_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhMedium_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhMedium_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhMedium_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhMedium_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhMedium_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhMedium_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
-
- # LhTight
- hist electronNLhTight {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
}
- hist electronEtLhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaPhiPtgt2.5GeVLhTight {
- output = egamma/electrons/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt4GeVLhTight {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt20GeVLhTight {
- output = egamma/electrons/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronPtCone20LhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhTight_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhTight_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhTight_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhTight_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhTight_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhTight_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhTight_BARREL {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhTight_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhTight_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhTight_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhTight_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhTight_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhTight_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhTight_CRACK {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhTight_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtLhTight_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhTight_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhTight_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhTight_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhTight_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhTight_ENDCAP {
- output = egamma/electrons/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
+ hist TopoEtCone40 {
+ }
+ hist PtCone20 {
+ }
+ hist Time {
}
}
- dir egamma/electrons/ID {
- algorithm = egKolmogorov
- output = egamma/electrons/ID
- display = Draw=e1,StatBox
+dir egamma/LHLooseElectrons/Expert {
+ output = egamma/electrons/Expert
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
- # LhLoose
- hist electronEhad1LhLoose_BARREL {
- }
- hist electronEoverPLhLoose_BARREL {
- }
- hist electronCoreEMLhLoose_BARREL {
- }
- hist electronF0LhLoose_BARREL {
- }
- hist electronF1LhLoose_BARREL {
- }
- hist electronF2LhLoose_BARREL {
- }
- hist electronF3LhLoose_BARREL {
- }
- hist electronRe233e237LhLoose_BARREL {
- }
- hist electronRe237e277LhLoose_BARREL {
- }
- hist electronEhad1LhLoose_CRACK {
- }
- hist electronEoverPLhLoose_CRACK {
- }
- hist electronCoreEMLhLoose_CRACK {
- }
- hist electronF0LhLoose_CRACK {
+ hist Eta_Phi_with_Pt_gt_2.5GeV {
}
- hist electronF1LhLoose_CRACK {
- }
- hist electronF2LhLoose_CRACK {
- }
- hist electronF3LhLoose_CRACK {
- }
- hist electronRe233e237LhLoose_CRACK {
- }
- hist electronRe237e277LhLoose_CRACK {
- }
- hist electronEhad1LhLoose_ENDCAP {
- }
- hist electronEoverPLhLoose_ENDCAP {
- }
- hist electronCoreEMLhLoose_ENDCAP {
- }
- hist electronF0LhLoose_ENDCAP {
- }
- hist electronF1LhLoose_ENDCAP {
- }
- hist electronF2LhLoose_ENDCAP {
- }
- hist electronF3LhLoose_ENDCAP {
- }
- hist electronRe233e237LhLoose_ENDCAP {
- }
- hist electronRe237e277LhLoose_ENDCAP {
+ hist Eta_Phi_with_Pt_gt_20GeV {
}
+}
- # LhMedium
- hist electronEhad1LhMedium_BARREL {
- }
- hist electronEoverPLhMedium_BARREL {
- }
- hist electronCoreEMLhMedium_BARREL {
- }
- hist electronF0LhMedium_BARREL {
- }
- hist electronF1LhMedium_BARREL {
- }
- hist electronF2LhMedium_BARREL {
- }
- hist electronF3LhMedium_BARREL {
- }
- hist electronRe233e237LhMedium_BARREL {
- }
- hist electronRe237e277LhMedium_BARREL {
- }
- hist electronEhad1LhMedium_CRACK {
- }
- hist electronEoverPLhMedium_CRACK {
- }
- hist electronCoreEMLhMedium_CRACK {
- }
- hist electronF0LhMedium_CRACK {
- }
- hist electronF1LhMedium_CRACK {
- }
- hist electronF2LhMedium_CRACK {
- }
- hist electronF3LhMedium_CRACK {
- }
- hist electronRe233e237LhMedium_CRACK {
- }
- hist electronRe237e277LhMedium_CRACK {
- }
- hist electronEhad1LhMedium_ENDCAP {
- }
- hist electronEoverPLhMedium_ENDCAP {
- }
- hist electronCoreEMLhMedium_ENDCAP {
- }
- hist electronF0LhMedium_ENDCAP {
- }
- hist electronF1LhMedium_ENDCAP {
- }
- hist electronF2LhMedium_ENDCAP {
- }
- hist electronF3LhMedium_ENDCAP {
- }
- hist electronRe233e237LhMedium_ENDCAP {
- }
- hist electronRe237e277LhMedium_ENDCAP {
- }
+dir egamma/LHLooseElectrons/byLB {
+ output = egamma/electrons/LBMon
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
- # LhTight
- hist electronEhad1LhTight_BARREL {
- }
- hist electronEoverPLhTight_BARREL {
- }
- hist electronCoreEMLhTight_BARREL {
- }
- hist electronF0LhTight_BARREL {
- }
- hist electronF1LhTight_BARREL {
- }
- hist electronF2LhTight_BARREL {
- }
- hist electronF3LhTight_BARREL {
- }
- hist electronRe233e237LhTight_BARREL {
- }
- hist electronRe237e277LhTight_BARREL {
- }
- hist electronEhad1LhTight_CRACK {
- }
- hist electronEoverPLhTight_CRACK {
- }
- hist electronCoreEMLhTight_CRACK {
- }
- hist electronF0LhTight_CRACK {
- }
- hist electronF1LhTight_CRACK {
- }
- hist electronF2LhTight_CRACK {
- }
- hist electronF3LhTight_CRACK {
- }
- hist electronRe233e237LhTight_CRACK {
- }
- hist electronRe237e277LhTight_CRACK {
- }
- hist electronEhad1LhTight_ENDCAP {
- }
- hist electronEoverPLhTight_ENDCAP {
- }
- hist electronCoreEMLhTight_ENDCAP {
- }
- hist electronF0LhTight_ENDCAP {
- }
- hist electronF1LhTight_ENDCAP {
- }
- hist electronF2LhTight_ENDCAP {
- }
- hist electronF3LhTight_ENDCAP {
- }
- hist electronRe233e237LhTight_ENDCAP {
- }
- hist electronRe237e277LhTight_ENDCAP {
+ hist LBEvoN {
}
}
- dir egamma/electrons/Track {
+dir egamma/LHLooseElectrons/ID {
algorithm = egKolmogorov
- output = egamma/electrons/Track
+ output = egamma/electrons/ID
display = Draw=e1,StatBox
- # LhLoose
- hist electronNOfBLayersHitsLhLoose_BARREL {
- }
- hist electronNOfTRTHitsLhLoose_BARREL {
- }
- hist electronNOfSiHitsLhLoose_BARREL {
- }
- hist electronDeltaEta1LhLoose_BARREL {
- }
- hist electronDeltaPhi2LhLoose_BARREL {
- }
- hist electronDeltaEta1LhLoose_CRACK {
- }
- hist electronDeltaPhi2LhLoose_CRACK {
- }
- hist electronNOfBLayersHitsLhLoose_CRACK {
- }
- hist electronNOfTRTHitsLhLoose_CRACK {
- }
- hist electronNOfSiHitsLhLoose_CRACK {
- }
- hist electronDeltaEta1LhLoose_ENDCAP {
- }
- hist electronDeltaPhi2LhLoose_ENDCAP {
- }
- hist electronNOfBLayersHitsLhLoose_ENDCAP {
- }
- hist electronNOfTRTHitsLhLoose_ENDCAP {
- }
- hist electronNOfSiHitsLhLoose_ENDCAP {
- }
+ hist Ehad1inBARREL {
+ }
+ hist CoreEMinBARREL {
+ }
+ hist F0inBARREL {
+ }
+ hist F1inBARREL {
+ }
+ hist F2inBARREL {
+ }
+ hist F3inBARREL {
+ }
+ hist Re237e277inBARREL {
+ }
+ hist Ehad1inENDCAP {
+ }
+ hist EoverPinENDCAP {
+ }
+ hist CoreEMinENDCAP {
+ }
+ hist Re233e237inENDCAP {
+ }
+ hist Re237e277inENDCAP {
+ }
+ hist Ehad1inCRACK {
+ }
+ hist EoverPinCRACK {
+ }
+ hist CoreEMinCRACK {
+ }
+ hist F0inCRACK {
+ }
+ hist F1inCRACK {
+ }
+ hist F2inCRACK {
+ }
+ hist F3inCRACK {
+ }
+ hist Re233e237inCRACK {
+ }
+ hist Re237e277inCRACK {
+ }
+}
- # LhMedium
- hist electronNOfBLayersHitsLhMedium_BARREL {
- }
- hist electronNOfTRTHitsLhMedium_BARREL {
- }
- hist electronNOfSiHitsLhMedium_BARREL {
- }
- hist electronDeltaEta1LhMedium_BARREL {
- }
- hist electronDeltaPhi2LhMedium_BARREL {
- }
- hist electronDeltaEta1LhMedium_CRACK {
- }
- hist electronDeltaPhi2LhMedium_CRACK {
- }
- hist electronNOfBLayersHitsLhMedium_CRACK {
- }
- hist electronNOfTRTHitsLhMedium_CRACK {
- }
- hist electronNOfSiHitsLhMedium_CRACK {
- }
- hist electronDeltaEta1LhMedium_ENDCAP {
- }
- hist electronDeltaPhi2LhMedium_ENDCAP {
- }
- hist electronNOfBLayersHitsLhMedium_ENDCAP {
- }
- hist electronNOfTRTHitsLhMedium_ENDCAP {
- }
- hist electronNOfSiHitsLhMedium_ENDCAP {
- }
+dir egamma/LHLooseElectrons/Expert/Track {
+ algorithm = egKolmogorov
+ output = egamma/electrons/Track
+ display = Draw=e1,StatBox
- # LhTight
- hist electronNOfBLayersHitsLhTight_BARREL {
- }
- hist electronNOfTRTHitsLhTight_BARREL {
- }
- hist electronNOfSiHitsLhTight_BARREL {
- }
- hist electronDeltaEta1LhTight_BARREL {
- }
- hist electronDeltaPhi2LhTight_BARREL {
- }
- hist electronDeltaEta1LhTight_CRACK {
- }
- hist electronDeltaPhi2LhTight_CRACK {
- }
- hist electronNOfBLayersHitsLhTight_CRACK {
- }
- hist electronNOfTRTHitsLhTight_CRACK {
- }
- hist electronNOfSiHitsLhTight_CRACK {
- }
- hist electronDeltaEta1LhTight_ENDCAP {
- }
- hist electronDeltaPhi2LhTight_ENDCAP {
- }
- hist electronNOfBLayersHitsLhTight_ENDCAP {
- }
- hist electronNOfTRTHitsLhTight_ENDCAP {
- }
- hist electronNOfSiHitsLhTight_ENDCAP {
- }
- }
+ hist NOfBLayerHitsinBARREL {
+ }
+ hist NOfPixelHitsinBARREL {
+ }
+ hist NOfSCTHitsinBARREL {
+ }
+ hist NOfTRTHitsinBARREL {
+ }
+ hist NOfTRTHighThresholdHitsinBARREL {
+ }
+ hist DeltaEta1inBARREL {
+ }
+ hist DeltaPhi2inBARREL {
+ }
+ hist Trackd0inBARREL {
+ }
+ hist NOfBLayerHitsinENDCAP {
+ }
+ hist NOfPixelHitsinENDCAP {
+ }
+ hist NOfSCTHitsinENDCAP {
+ }
+ hist NOfTRTHitsinENDCAP {
+ }
+ hist NOfTRTHighThresholdHitsinENDCAP {
+ }
+ hist DeltaEta1inENDCAP {
+ }
+ hist DeltaPhi2inENDCAP {
+ }
+ hist Trackd0inENDCAP {
+ }
+ hist NOfBLayerHitsinCRACK {
+ }
+ hist NOfPixelHitsinCRACK {
+ }
+ hist NOfSCTHitsinCRACK {
+ }
+ hist NOfTRTHitsinCRACK {
+ }
+ hist NOfTRTHighThresholdHitsinCRACK {
+ }
+ hist DeltaEta1inCRACK {
+ }
+ hist DeltaPhi2inCRACK {
+ }
+ hist Trackd0inCRACK {
+ }
- dir egamma/electrons/LBMon {
- algorithm = egamma_GatherData
- output = egamma/electrons/LBMon
- display = Draw=e1,StatBox
- # LhLoose
- hist LBEvoNElectronsLhLoose {
- }
- # LhMedium
- hist LBEvoNElectronsLhMedium {
- }
- # LhTight
- hist LBEvoNElectronsLhTight {
- }
- # CbLoose
- hist LBEvoNElectronsCbLoose {
- }
- # CbTight
- hist LBEvoNElectronsCbTight {
- }
}
-### electronsWithTrigger
+# LhLooseWithTrigger
- dir egamma/electronsWithTrigger {
+dir egamma/LHLooseElectronsWithTrigger {
output = egamma/electronsWithTrigger
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
- # CbLoose
- hist electronNCbLoose {
+ hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
}
- hist electronEtCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20CbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40CbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaPhiPtgt2.5GeVCbLoose {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt4GeVCbLoose {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt20GeVCbLoose {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
-
- # CbTight
- hist electronNCbTight {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist Et {
}
- hist electronEtCbTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiCbTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaCbTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaPhiPtgt2.5GeVCbTight {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt4GeVCbTight {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt20GeVCbTight {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronPtCone20CbTight {
- algorithm = egKolmogorov
- }
- hist electronTopoEtCone40CbTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeCbTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
-
- # LhLoose
- hist electronNLhLoose {
- algorithm = egamma_Histogram_Not_Empty
- algorithm = egKolmogorov
- display = Draw=e1,StatBox,LogY
+ hist Eta {
}
- hist electronEtLhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaPhiPtgt2.5GeVLhLoose {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = 2D_Histogram_Not_Empty
-# algorithm = egamma_BinsDiffFromStripMedian
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt4GeVLhLoose {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt20GeVLhLoose {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
-
- hist electronPtCone20LhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhLoose {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhLoose_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhLoose_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhLoose_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhLoose_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhLoose_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhLoose_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhLoose_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhLoose_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhLoose_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhLoose_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhLoose_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhLoose_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhLoose_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhLoose_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhLoose_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhLoose_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhLoose_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhLoose_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhLoose_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhLoose_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhLoose_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
-
- # LhMedium
- hist electronNLhMedium {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist Phi {
}
- hist electronEtLhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaPhiPtgt2.5GeVLhMedium {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt4GeVLhMedium {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt20GeVLhMedium {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronPtCone20LhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhMedium {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhMedium_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhMedium_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhMedium_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhMedium_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhMedium_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhMedium_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhMedium_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhMedium_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhMedium_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhMedium_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhMedium_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhMedium_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhMedium_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhMedium_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhMedium_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhMedium_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhMedium_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhMedium_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhMedium_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhMedium_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhMedium_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
-
- # LhTight
- hist electronNLhTight {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ }
+ hist TopoEtCone40 {
}
- hist electronEtLhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaPhiPtgt2.5GeVLhTight {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt4GeVLhTight {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronEtaPhiPtgt20GeVLhTight {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist electronPtCone20LhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhTight {
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhTight_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhTight_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhTight_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhTight_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhTight_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhTight_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhTight_BARREL {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhTight_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox, LogY
- }
- hist electronEtLhTight_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhTight_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhTight_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhTight_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhTight_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhTight_CRACK {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronNLhTight_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtLhTight_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronEtaLhTight_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPhiLhTight_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronPtCone20LhTight_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTopoEtCone40LhTight_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
- }
- hist electronTimeLhTight_ENDCAP {
- output = egamma/electronsWithTrigger/EXPERT
- algorithm = egKolmogorov
- display = Draw=e1, DrawRef=HIST, StatBox
+ hist PtCone20 {
+ }
+ hist Time {
}
}
- dir egamma/electronsWithTrigger/ID {
- algorithm = egKolmogorov
- output = egamma/electronsWithTrigger/ID
- display = Draw=e1,StatBox
+dir egamma/LHLooseElectronsWithTrigger/Expert {
+ output = egamme/electronsWithTrigger/Expert
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
- # LhLoose
- hist electronEhad1LhLoose_BARREL {
- }
- hist electronEoverPLhLoose_BARREL {
- }
- hist electronCoreEMLhLoose_BARREL {
- }
- hist electronF0LhLoose_BARREL {
- }
- hist electronF1LhLoose_BARREL {
- }
- hist electronF2LhLoose_BARREL {
- }
- hist electronF3LhLoose_BARREL {
- }
- hist electronRe233e237LhLoose_BARREL {
- }
- hist electronRe237e277LhLoose_BARREL {
- }
- hist electronEhad1LhLoose_CRACK {
- }
- hist electronEoverPLhLoose_CRACK {
- }
- hist electronCoreEMLhLoose_CRACK {
- }
- hist electronF0LhLoose_CRACK {
- }
- hist electronF1LhLoose_CRACK {
- }
- hist electronF2LhLoose_CRACK {
- }
- hist electronF3LhLoose_CRACK {
- }
- hist electronRe233e237LhLoose_CRACK {
- }
- hist electronRe237e277LhLoose_CRACK {
- }
- hist electronEhad1LhLoose_ENDCAP {
- }
- hist electronEoverPLhLoose_ENDCAP {
+ hist Eta_Phi_with_Pt_gt_2.5GeV {
}
- hist electronCoreEMLhLoose_ENDCAP {
- }
- hist electronF0LhLoose_ENDCAP {
- }
- hist electronF1LhLoose_ENDCAP {
- }
- hist electronF2LhLoose_ENDCAP {
- }
- hist electronF3LhLoose_ENDCAP {
- }
- hist electronRe233e237LhLoose_ENDCAP {
- }
- hist electronRe237e277LhLoose_ENDCAP {
+ hist Eta_Phi_with_Pt_gt_20GeV {
}
+}
- # LhMedium
- hist electronEhad1LhMedium_BARREL {
- }
- hist electronEoverPLhMedium_BARREL {
- }
- hist electronCoreEMLhMedium_BARREL {
- }
- hist electronF0LhMedium_BARREL {
- }
- hist electronF1LhMedium_BARREL {
- }
- hist electronF2LhMedium_BARREL {
- }
- hist electronF3LhMedium_BARREL {
- }
- hist electronRe233e237LhMedium_BARREL {
- }
- hist electronRe237e277LhMedium_BARREL {
- }
- hist electronEhad1LhMedium_CRACK {
- }
- hist electronEoverPLhMedium_CRACK {
- }
- hist electronCoreEMLhMedium_CRACK {
- }
- hist electronF0LhMedium_CRACK {
- }
- hist electronF1LhMedium_CRACK {
- }
- hist electronF2LhMedium_CRACK {
- }
- hist electronF3LhMedium_CRACK {
- }
- hist electronRe233e237LhMedium_CRACK {
- }
- hist electronRe237e277LhMedium_CRACK {
- }
- hist electronEhad1LhMedium_ENDCAP {
- }
- hist electronEoverPLhMedium_ENDCAP {
- }
- hist electronCoreEMLhMedium_ENDCAP {
- }
- hist electronF0LhMedium_ENDCAP {
- }
- hist electronF1LhMedium_ENDCAP {
- }
- hist electronF2LhMedium_ENDCAP {
- }
- hist electronF3LhMedium_ENDCAP {
- }
- hist electronRe233e237LhMedium_ENDCAP {
- }
- hist electronRe237e277LhMedium_ENDCAP {
- }
+dir egamma/LHLooseElectronsWithTrigger/byLB {
+ output = egamme/electronsWithTrigger/LBMon
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
- # LhTight
- hist electronEhad1LhTight_BARREL {
- }
- hist electronEoverPLhTight_BARREL {
- }
- hist electronCoreEMLhTight_BARREL {
- }
- hist electronF0LhTight_BARREL {
- }
- hist electronF1LhTight_BARREL {
- }
- hist electronF2LhTight_BARREL {
- }
- hist electronF3LhTight_BARREL {
- }
- hist electronRe233e237LhTight_BARREL {
- }
- hist electronRe237e277LhTight_BARREL {
- }
- hist electronEhad1LhTight_CRACK {
- }
- hist electronEoverPLhTight_CRACK {
- }
- hist electronCoreEMLhTight_CRACK {
- }
- hist electronF0LhTight_CRACK {
- }
- hist electronF1LhTight_CRACK {
- }
- hist electronF2LhTight_CRACK {
- }
- hist electronF3LhTight_CRACK {
- }
- hist electronRe233e237LhTight_CRACK {
- }
- hist electronRe237e277LhTight_CRACK {
- }
- hist electronEhad1LhTight_ENDCAP {
- }
- hist electronEoverPLhTight_ENDCAP {
- }
- hist electronCoreEMLhTight_ENDCAP {
- }
- hist electronF0LhTight_ENDCAP {
- }
- hist electronF1LhTight_ENDCAP {
- }
- hist electronF2LhTight_ENDCAP {
- }
- hist electronF3LhTight_ENDCAP {
- }
- hist electronRe233e237LhTight_ENDCAP {
- }
- hist electronRe237e277LhTight_ENDCAP {
+ hist LBEvoN {
}
}
- dir egamma/electronsWithTrigger/Track {
+dir egamma/LHLooseElectronsWithTrigger/ID {
algorithm = egKolmogorov
- output = egamma/electronsWithTrigger/Track
+ output = egamme/electronsWithTrigger/ID
display = Draw=e1,StatBox
- # LhLoose
- hist electronNOfBLayersHitsLhLoose_BARREL {
- }
- hist electronNOfTRTHitsLhLoose_BARREL {
- }
- hist electronNOfSiHitsLhLoose_BARREL {
- }
- hist electronDeltaEta1LhLoose_BARREL {
- }
- hist electronDeltaPhi2LhLoose_BARREL {
- }
- hist electronDeltaEta1LhLoose_CRACK {
- }
- hist electronDeltaPhi2LhLoose_CRACK {
- }
- hist electronNOfBLayersHitsLhLoose_CRACK {
- }
- hist electronNOfTRTHitsLhLoose_CRACK {
- }
- hist electronNOfSiHitsLhLoose_CRACK {
- }
- hist electronDeltaEta1LhLoose_ENDCAP {
- }
- hist electronDeltaPhi2LhLoose_ENDCAP {
- }
- hist electronNOfBLayersHitsLhLoose_ENDCAP {
- }
- hist electronNOfTRTHitsLhLoose_ENDCAP {
- }
- hist electronNOfSiHitsLhLoose_ENDCAP {
- }
+ hist Ehad1inBARREL {
+ }
+ hist CoreEMinBARREL {
+ }
+ hist F0inBARREL {
+ }
+ hist F1inBARREL {
+ }
+ hist F2inBARREL {
+ }
+ hist F3inBARREL {
+ }
+ hist Re237e277inBARREL {
+ }
+ hist Ehad1inENDCAP {
+ }
+ hist EoverPinENDCAP {
+ }
+ hist CoreEMinENDCAP {
+ }
+ hist Re233e237inENDCAP {
+ }
+ hist Re237e277inENDCAP {
+ }
+ hist Ehad1inCRACK {
+ }
+ hist EoverPinCRACK {
+ }
+ hist CoreEMinCRACK {
+ }
+ hist F0inCRACK {
+ }
+ hist F1inCRACK {
+ }
+ hist F2inCRACK {
+ }
+ hist F3inCRACK {
+ }
+ hist Re233e237inCRACK {
+ }
+ hist Re237e277inCRACK {
+ }
+}
- # LhMedium
- hist electronNOfBLayersHitsLhMedium_BARREL {
- }
- hist electronNOfTRTHitsLhMedium_BARREL {
- }
- hist electronNOfSiHitsLhMedium_BARREL {
- }
- hist electronDeltaEta1LhMedium_BARREL {
- }
- hist electronDeltaPhi2LhMedium_BARREL {
- }
- hist electronDeltaEta1LhMedium_CRACK {
- }
- hist electronDeltaPhi2LhMedium_CRACK {
- }
- hist electronNOfBLayersHitsLhMedium_CRACK {
- }
- hist electronNOfTRTHitsLhMedium_CRACK {
- }
- hist electronNOfSiHitsLhMedium_CRACK {
- }
- hist electronDeltaEta1LhMedium_ENDCAP {
- }
- hist electronDeltaPhi2LhMedium_ENDCAP {
- }
- hist electronNOfBLayersHitsLhMedium_ENDCAP {
- }
- hist electronNOfTRTHitsLhMedium_ENDCAP {
- }
- hist electronNOfSiHitsLhMedium_ENDCAP {
- }
+dir egamma/LHLooseElectronsWithTrigger/Expert/Track {
+ algorithm = egKolmogorov
+ output = egamme/electronsWithTrigger/Track
+ display = Draw=e1,StatBox
- # LhTight
- hist electronNOfBLayersHitsLhTight_BARREL {
- }
- hist electronNOfTRTHitsLhTight_BARREL {
- }
- hist electronNOfSiHitsLhTight_BARREL {
- }
- hist electronDeltaEta1LhTight_BARREL {
- }
- hist electronDeltaPhi2LhTight_BARREL {
+ hist NOfBLayerHitsinBARREL {
+ }
+ hist NOfPixelHitsinBARREL {
+ }
+ hist NOfSCTHitsinBARREL {
+ }
+ hist NOfTRTHitsinBARREL {
+ }
+ hist NOfTRTHighThresholdHitsinBARREL {
+ }
+ hist DeltaEta1inBARREL {
+ }
+ hist DeltaPhi2inBARREL {
+ }
+ hist Trackd0inBARREL {
+ }
+ hist NOfBLayerHitsinENDCAP {
+ }
+ hist NOfPixelHitsinENDCAP {
+ }
+ hist NOfSCTHitsinENDCAP {
+ }
+ hist NOfTRTHitsinENDCAP {
+ }
+ hist NOfTRTHighThresholdHitsinENDCAP {
+ }
+ hist DeltaEta1inENDCAP {
+ }
+ hist DeltaPhi2inENDCAP {
+ }
+ hist Trackd0inENDCAP {
+ }
+ hist NOfBLayerHitsinCRACK {
+ }
+ hist NOfPixelHitsinCRACK {
+ }
+ hist NOfSCTHitsinCRACK {
+ }
+ hist NOfTRTHitsinCRACK {
+ }
+ hist NOfTRTHighThresholdHitsinCRACK {
+ }
+ hist DeltaEta1inCRACK {
+ }
+ hist DeltaPhi2inCRACK {
+ }
+ hist Trackd0inCRACK {
+ }
+
+}
+
+# LhTight
+
+dir egamma/LHTightElectrons {
+ output = egamme/electrons
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
}
- hist electronDeltaEta1LhTight_CRACK {
+ hist Et {
}
- hist electronDeltaPhi2LhTight_CRACK {
+ hist Eta {
}
- hist electronNOfBLayersHitsLhTight_CRACK {
+ hist Phi {
}
- hist electronNOfTRTHitsLhTight_CRACK {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
}
- hist electronNOfSiHitsLhTight_CRACK {
+ hist TopoEtCone40 {
}
- hist electronDeltaEta1LhTight_ENDCAP {
+ hist PtCone20 {
}
- hist electronDeltaPhi2LhTight_ENDCAP {
+ hist Time {
}
- hist electronNOfBLayersHitsLhTight_ENDCAP {
+}
+
+dir egamma/LHTightElectrons/Expert {
+ output = egamme/electrons/Expert
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist Eta_Phi_with_Pt_gt_2.5GeV {
}
- hist electronNOfTRTHitsLhTight_ENDCAP {
+ hist Eta_Phi_with_Pt_gt_20GeV {
}
- hist electronNOfSiHitsLhTight_ENDCAP {
+}
+
+dir egamma/LHTightElectrons/byLB {
+ output = egamma/electrons/LBMon
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist LBEvON {
}
- }
+}
- dir egamma/electronsWithTrigger/LBMon {
- algorithm = egamma_GatherData
- output = egamma/electronsWithTrigger/LBMon
+dir egamma/LHTightElectrons/ID {
+ algorithm = egKolmogorov
+ output = egamma/electrons/ID
display = Draw=e1,StatBox
- # LhLoose
- hist LBEvoNElectronsLhLoose {
- }
- # LhMedium
- hist LBEvoNElectronsLhMedium {
- }
- # LhTight
- hist LBEvoNElectronsLhTight {
- }
- # CbLoose
- hist LBEvoNElectronsCbLoose {
- }
- # CbTight
- hist LBEvoNElectronsCbTight {
- }
+
+ hist Ehad1inBARREL {
+ }
+ hist CoreEMinBARREL {
+ }
+ hist F0inBARREL {
+ }
+ hist F1inBARREL {
+ }
+ hist F2inBARREL {
+ }
+ hist F3inBARREL {
+ }
+ hist Re237e277inBARREL {
+ }
+ hist Ehad1inENDCAP {
+ }
+ hist EoverPinENDCAP {
+ }
+ hist CoreEMinENDCAP {
+ }
+ hist Re233e237inENDCAP {
+ }
+ hist Re237e277inENDCAP {
+ }
+ hist Ehad1inCRACK {
+ }
+ hist EoverPinCRACK {
+ }
+ hist CoreEMinCRACK {
+ }
+ hist F0inCRACK {
+ }
+ hist F1inCRACK {
+ }
+ hist F2inCRACK {
+ }
+ hist F3inCRACK {
+ }
+ hist Re233e237inCRACK {
+ }
+ hist Re237e277inCRACK {
+ }
}
+dir egamma/LHTightElectrons/Expert/Track {
+ algorithm = egKolmogorov
+ output = egamma/electrons/Track
+ display = Draw=e1,StatBox
-### photons
+ hist NOfBLayerHitsinBARREL {
+ }
+ hist NOfPixelHitsinBARREL {
+ }
+ hist NOfSCTHitsinBARREL {
+ }
+ hist NOfTRTHitsinBARREL {
+ }
+ hist NOfTRTHighThresholdHitsinBARREL {
+ }
+ hist DeltaEta1inBARREL {
+ }
+ hist DeltaPhi2inBARREL {
+ }
+ hist Trackd0inBARREL {
+ }
+ hist NOfBLayerHitsinENDCAP {
+ }
+ hist NOfPixelHitsinENDCAP {
+ }
+ hist NOfSCTHitsinENDCAP {
+ }
+ hist NOfTRTHitsinENDCAP {
+ }
+ hist NOfTRTHighThresholdHitsinENDCAP {
+ }
+ hist DeltaEta1inENDCAP {
+ }
+ hist DeltaPhi2inENDCAP {
+ }
+ hist Trackd0inENDCAP {
+ }
+ hist NOfBLayerHitsinCRACK {
+ }
+ hist NOfPixelHitsinCRACK {
+ }
+ hist NOfSCTHitsinCRACK {
+ }
+ hist NOfTRTHitsinCRACK {
+ }
+ hist NOfTRTHighThresholdHitsinCRACK {
+ }
+ hist DeltaEta1inCRACK {
+ }
+ hist DeltaPhi2inCRACK {
+ }
+ hist Trackd0inCRACK {
+ }
+}
- dir egamma/photons {
- output = egamma/photons
+# LhTightWithTrigger
- # CbLoose
- hist photonNCbLoose {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonPhiCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonEtaPhiPt2.5GeVCbLoose {
- algorithm = egamma_BinsDiffFromStripMedian
- }
- hist photonEtaPhiPtgt4GeVCbLoose {
- algorithm = egamma_BinsDiffFromStripMedian
- }
- hist photonEtaPhiPtgt20GeVCbLoose {
- algorithm = egamma_BinsDiffFromStripMedian
- }
- hist photonPtCone20CbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonTopoEtCone40CbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonTimeCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonRconvCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
+dir egamma/LHTightElectronsWithTrigger {
+ output = egamme/electronsWithTrigger
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
- # CbTight
- hist photonNCbTight {
+ hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
}
- hist photonEtCbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonPhiCbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
+ hist Et {
}
- hist photonEtaPhiPt2.5GeVCbTight {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
+ hist Eta {
}
- hist photonEtaPhiPtgt4GeVCbTight {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
+ hist Phi {
}
- hist photonEtaPhiPtgt20GeVCbTight {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
}
- hist photonPtCone20CbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
+ hist TopoEtCone40 {
}
- hist photonTopoEtCone40CbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
+ hist PtCone20 {
}
- hist photonTimeCbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonRconvCbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
+ hist Time {
}
}
- dir egamma/photons/Region {
+dir egamma/LHTightElectronsWithTrigger/Expert {
+ output = egamme/electronsWithTrigger/Expert
algorithm = egKolmogorov
- output = egamma/photons/EXPERT
- display = Draw=e1,StatBox
+ display = Draw=e1, DrawRef=HIST, StatBox
- # CbLoose
- hist photonNCbLoose_BARREL {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbLoose_BARREL {
- }
- hist photonEtaCbLoose_BARREL {
- }
- hist photonPhiCbLoose_BARREL {
- }
- hist photonPtCone20CbLoose_BARREL {
- }
- hist photonTopoEtCone40CbLoose_BARREL {
- }
- hist photonNCbLoose_CRACK {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbLoose_CRACK {
- }
- hist photonEtaCbLoose_CRACK {
+ hist Eta_Phi_with_Pt_gt_2.5GeV {
}
- hist photonPhiCbLoose_CRACK {
- }
- hist photonPtCone20CbLoose_CRACK {
- }
- hist photonTopoEtCone40CbLoose_CRACK {
- }
- hist photonNCbLoose_ENDCAP {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbLoose_ENDCAP {
- }
- hist photonEtaCbLoose_ENDCAP {
- }
- hist photonPhiCbLoose_ENDCAP {
- }
- hist photonPtCone20CbLoose_ENDCAP {
- }
- hist photonTopoEtCone40CbLoose_ENDCAP {
+ hist Eta_Phi_with_Pt_gt_20GeV {
}
+}
- # CbTight
- hist photonNCbTight_BARREL {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbTight_BARREL {
- }
- hist photonEtaCbTight_BARREL {
- }
- hist photonPhiCbTight_BARREL {
- }
- hist photonPtCone20CbTight_BARREL {
- }
- hist photonTopoEtCone40CbTight_BARREL {
- }
- hist photonNCbTight_CRACK {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbTight_CRACK {
- }
- hist photonEtaCbTight_CRACK {
- }
- hist photonPhiCbTight_CRACK {
- }
- hist photonPtCone20CbTight_CRACK {
- }
- hist photonTopoEtCone40CbTight_CRACK {
- }
- hist photonNCbTight_ENDCAP {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbTight_ENDCAP {
- }
- hist photonEtaCbTight_ENDCAP {
- }
- hist photonPhiCbTight_ENDCAP {
- }
- hist photonPtCone20CbTight_ENDCAP {
- }
- hist photonTopoEtCone40CbTight_ENDCAP {
+dir egamma/LHTightElectronsWithTrigger/byLB {
+ output = egamme/electronsWithTrigger/LBMon
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist LBEvON {
}
}
- dir egamma/photons/Unconv {
+dir egamma/LHTightElectronsWithTrigger/ID {
algorithm = egKolmogorov
- output = egamma/photons
+ output = egamme/electronsWithTrigger/ID
display = Draw=e1,StatBox
- #CbLoose
- hist photonNUnconvCbLoose {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist Ehad1inBARREL {
}
- hist photonEtUnconvCbLoose {
+ hist CoreEMinBARREL {
}
- hist photonEtaUnconvCbLoose {
+ hist F0inBARREL {
}
- hist photonPhiUnconvCbLoose {
+ hist F1inBARREL {
}
- hist photonEtaPhiUnconvCbLoose {
- algorithm = egamma_BinsDiffFromStripMedian
+ hist F2inBARREL {
}
- hist photonTopoEtCone40UnconvCbLoose {
+ hist F3inBARREL {
}
- hist photonPtCone20UnconvCbLoose {
+ hist Re237e277inBARREL {
}
-
- #CbTight
- hist photonNUnconvCbTight {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist Ehad1inENDCAP {
}
- hist photonEtUnconvCbTight {
+ hist EoverPinENDCAP {
}
- hist photonEtaUnconvCbTight {
+ hist CoreEMinENDCAP {
}
- hist photonPhiUnconvCbTight {
+ hist Re233e237inENDCAP {
}
- hist photonEtaPhiUnconvCbTight {
- algorithm = egamma_BinsDiffFromStripMedian
+ hist Re237e277inENDCAP {
}
- hist photonTopoEtCone40UnconvCbTight {
+ hist Ehad1inCRACK {
}
- hist photonPtCone20UnconvCbTight {
+ hist EoverPinCRACK {
+ }
+ hist CoreEMinCRACK {
+ }
+ hist F0inCRACK {
+ }
+ hist F1inCRACK {
+ }
+ hist F2inCRACK {
+ }
+ hist F3inCRACK {
+ }
+ hist Re233e237inCRACK {
+ }
+ hist Re237e277inCRACK {
}
-
}
-
- dir egamma/photons/Conv {
+dir egamma/LHTightElectronsWithTrigger/Expert/Track {
algorithm = egKolmogorov
- output = egamma/photons
+ output = egamme/electronsWithTrigger/Track
display = Draw=e1,StatBox
- #CbLoose
- hist photonNConvCbLoose {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist NOfBLayerHitsinBARREL {
+ }
+ hist NOfPixelHitsinBARREL {
+ }
+ hist NOfSCTHitsinBARREL {
+ }
+ hist NOfTRTHitsinBARREL {
+ }
+ hist NOfTRTHighThresholdHitsinBARREL {
}
- hist photonEtConvCbLoose {
+ hist DeltaEta1inBARREL {
}
- hist photonEtaConvCbLoose {
+ hist DeltaPhi2inBARREL {
}
- hist photonPhiConvCbLoose {
+ hist Trackd0inBARREL {
}
- hist photonEtaPhiConvCbLoose {
- algorithm = egamma_BinsDiffFromStripMedian
+ hist NOfBLayerHitsinENDCAP {
}
- hist photonTopoEtCone40ConvCbLoose {
+ hist NOfPixelHitsinENDCAP {
}
- hist photonPtCone20ConvCbLoose {
+ hist NOfSCTHitsinENDCAP {
}
- #CbTight
- hist photonNConvCbTight {
+ hist NOfTRTHitsinENDCAP {
}
- hist photonEtConvCbTight {
+ hist NOfTRTHighThresholdHitsinENDCAP {
}
- hist photonEtaConvCbTight {
+ hist DeltaEta1inENDCAP {
}
- hist photonPhiConvCbTight {
+ hist DeltaPhi2inENDCAP {
}
- hist photonEtaPhiConvCbTight {
- algorithm = egamma_BinsDiffFromStripMedian
+ hist Trackd0inENDCAP {
}
- hist photonTopoEtCone40ConvCbTight {
+ hist NOfBLayerHitsinCRACK {
}
- hist photonPtCone20ConvCbTight {
+ hist NOfPixelHitsinCRACK {
}
+ hist NOfSCTHitsinCRACK {
+ }
+ hist NOfTRTHitsinCRACK {
+ }
+ hist NOfTRTHighThresholdHitsinCRACK {
+ }
+ hist DeltaEta1inCRACK {
+ }
+ hist DeltaPhi2inCRACK {
+ }
+ hist Trackd0inCRACK {
+ }
+
}
- dir egamma/photons/ID {
- algorithm = egKolmogorov
- output = egamma/photons/ID
- display = Draw=e1,StatBox
- #CbLoose
- hist photonEhad1CbLoose_BARREL {
- }
- hist photonCoreEMCbLoose_BARREL {
- }
- hist photonF0CbLoose_BARREL {
- }
- hist photonF1CbLoose_BARREL {
- }
- hist photonF2CbLoose_BARREL {
- }
- hist photonF3CbLoose_BARREL {
- }
- hist photonRe233e237CbLoose_BARREL {
- }
- hist photonRe237e277CbLoose_BARREL {
- }
- hist photonEhad1CbLoose_CRACK {
- }
- hist photonCoreEMCbLoose_CRACK {
- }
- hist photonF0CbLoose_CRACK {
- }
- hist photonF1CbLoose_CRACK {
- }
- hist photonF2CbLoose_CRACK {
- }
- hist photonF3CbLoose_CRACK {
+##############################################
+### photons
+##############################################
+
+# CBLoose
+
+dir egamma/CBLoosePhotons {
+ output = egamma/photons
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
}
- hist photonRe233e237CbLoose_CRACK {
+ hist Et {
}
- hist photonRe237e277CbLoose_CRACK {
+ hist Phi {
}
- hist photonEhad1CbLoose_ENDCAP {
+ hist Eta {
}
- hist photonCoreEMCbLoose_ENDCAP {
+ hist PtCone20 {
}
- hist photonF0CbLoose_ENDCAP {
+ hist EtCone40 {
}
- hist photonF1CbLoose_ENDCAP {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
}
- hist photonF2CbLoose_ENDCAP {
+ hist Time {
}
- hist photonF3CbLoose_ENDCAP {
+}
+
+dir egamma/CBLoosePhotons/Expert {
+ output = egamma/photons/Expert
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist NinBARREL {
}
- hist photonRe233e237CbLoose_ENDCAP {
+ hist EtainBARREL {
}
- hist photonRe237e277CbLoose_ENDCAP {
+ hist PhiinBARREL {
}
- #CbTight
- hist photonEhad1CbTight_BARREL {
+ hist TimeinBARREL {
}
- hist photonCoreEMCbTight_BARREL {
+ hist RConvinBARREL {
}
- hist photonF0CbTight_BARREL {
+ hist ConvTypeinBARREL {
}
- hist photonF1CbTight_BARREL {
+ hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
}
- hist photonF2CbTight_BARREL {
+ hist Eta_Phi_Conv_with_Pt_gt_2.5GeV {
}
- hist photonF3CbTight_BARREL {
+ hist NinENDCAP {
}
- hist photonRe233e237CbTight_BARREL {
+ hist EtainENDCAP {
}
- hist photonRe237e277CbTight_BARREL {
+ hist PhiinENDCAP {
}
- hist photonEhad1CbTight_CRACK {
+ hist TimeinENDCAP {
}
- hist photonCoreEMCbTight_CRACK {
+ hist RConvinENDCAP {
}
- hist photonF0CbTight_CRACK {
+ hist ConvTypeinENDCAP {
}
- hist photonF1CbTight_CRACK {
+ hist Eta_Phi_with_Pt.gt.20GeV {
}
- hist photonF2CbTight_CRACK {
+ hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
}
- hist photonF3CbTight_CRACK {
+ hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
}
- hist photonRe233e237CbTight_CRACK {
+ hist NinCRACK {
}
- hist photonRe237e277CbTight_CRACK {
+ hist EtainCRACK {
}
- hist photonEhad1CbTight_ENDCAP {
+ hist PhiinCRACK {
}
- hist photonCoreEMCbTight_ENDCAP {
+ hist TimeinCRACK {
}
- hist photonF0CbTight_ENDCAP {
+ hist RConvinCRACK {
}
- hist photonF1CbTight_ENDCAP {
+ hist ConvTypeinCRACK {
}
- hist photonF2CbTight_ENDCAP {
+
+}
+
+dir egamma/CBLoosePhotons/byLB {
+ output = egamma/photons/LBMon
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist Number_of_Unconv._photons_vs_LB {
}
- hist photonF3CbTight_ENDCAP {
+ hist Number_of_Conv._photons_vs_LB {
}
- hist photonRe233e237CbTight_ENDCAP {
+ hist LBEvoN {
}
- hist photonRe237e277CbTight_ENDCAP {
+ hist Conversion_fraction_vs_LB {
}
+
}
- dir egamma/photons/Region {
+dir egamma/CBLoosePhotons/ID {
algorithm = egKolmogorov
- output = egamma/photons/EXPERT
+ output = egamma/photons/ID
display = Draw=e1,StatBox
- # CbLoose
- hist photonConvTrkMatch1CbLoose_BARREL {
- }
- hist photonConvTrkMatch2CbLoose_BARREL {
+ hist Ehad1inBARREL {
}
- hist photonConvTypeCbLoose_BARREL {
+ hist CoreEMinBARREL {
}
- hist photonConvTrkMatch1CbLoose_CRACK {
+ hist F0inBARREL {
}
- hist photonConvTrkMatch2CbLoose_CRACK {
+ hist F1inBARREL {
}
- hist photonConvTypeCbLoose_CRACK {
+ hist F2inBARREL {
}
- hist photonConvTrkMatch1CbLoose_ENDCAP {
+ hist F3inBARREL {
}
- hist photonConvTrkMatch2CbLoose_ENDCAP {
+ hist Re233e237inBARREL {
}
- hist photonConvTypeCbLoose_ENDCAP {
+ hist Re237e277inBARREL {
}
- # CbTight
- hist photonConvTrkMatch1CbTight_BARREL {
+ hist Ehad1inENDCAP {
}
- hist photonConvTrkMatch2CbTight_BARREL {
+ hist CoreEMinENDCAP {
}
- hist photonConvTypeCbTight_BARREL {
+ hist F0inENDCAP {
}
- hist photonConvTrkMatch1CbTight_CRACK {
+ hist F1inENDCAP {
}
- hist photonConvTrkMatch2CbTight_CRACK {
+ hist F2inENDCAP {
}
- hist photonConvTypeCbTight_CRACK {
+ hist F3inENDCAP {
}
- hist photonConvTrkMatch1CbTight_ENDCAP {
+ hist Re233e237inENDCAP {
}
- hist photonConvTrkMatch2CbTight_ENDCAP {
+ hist Re237e277inENDCAP {
}
- hist photonConvTypeCbTight_ENDCAP {
- }
- }
-
-
- dir egamma/photons/LBMon {
- algorithm = egamma_GatherData
- output = egamma/photons/LBMon
- display = Draw=e1,StatBox
- # CbLoose
- hist LBEvoNPhotonsCbLoose {
+ hist Ehad1inCRACK {
}
- hist LBEvoNPhotonsUnconvCbLoose {
+ hist CoreEMinCRACK {
}
- hist LBEvoNPhotonsConvCbLoose {
+ hist F0inCRACK {
}
- hist LBEvoConvOverNCbLoose {
+ hist F1inCRACK {
}
-
- # CbTight
- hist LBEvoNPhotonsCbTight {
+ hist F2inCRACK {
}
- hist LBEvoNPhotonsUnconvCbTight {
+ hist F3inCRACK {
}
- hist LBEvoNPhotonsConvCbTight {
+ hist Re233e237inCRACK {
}
- hist LBEvoConvOverNCbTight {
+ hist Re237e277inCRACK {
}
}
-### photonsWithTrigger
+# CBLooseWithTrigger
- dir egamma/photonsWithTrigger {
- output = egamma/photonsWithTrigger
-
- # CbLoose
- hist photonNCbLoose {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonPhiCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonEtaPhiPt2.5GeVCbLoose {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist photonEtaPhiPtgt4GeVCbLoose {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist photonEtaPhiPtgt20GeVCbLoose {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
- }
- hist photonPtCone20CbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonTopoEtCone40CbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonTimeCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonRconvCbLoose {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
+dir egamma/CBLoosePhotonsWithTrigger {
+ output = egamma/photonsWithTrigger
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
- # CbTight
- hist photonNCbTight {
+ hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
}
- hist photonEtCbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonPhiCbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
- }
- hist photonEtaPhiPt2.5GeVCbTight {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
+ hist Et {
}
- hist photonEtaPhiPtgt4GeVCbTight {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
+ hist Phi {
}
- hist photonEtaPhiPtgt20GeVCbTight {
- algorithm = 2D_Histogram_Not_Empty
- display = Ref2DSignif, TCanvas(490,900)
+ hist Eta {
}
- hist photonPtCone20CbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
+ hist PtCone20 {
}
- hist photonTopoEtCone40CbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
+ hist EtCone40 {
}
- hist photonTimeCbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
}
- hist photonRconvCbTight {
- algorithm = egKolmogorov
- display = Draw=e1,StatBox
+ hist Time {
}
}
-
- dir egamma/photonsWithTrigger/Region {
+dir egamma/CBLoosePhotonsWithTrigger/Expert {
+ output = egamma/photonsWithTrigger/Expert
algorithm = egKolmogorov
- output = egamma/photonsWithTrigger/EXPERT
- display = Draw=e1,StatBox
+ display = Draw=e1, DrawRef=HIST, StatBox
- # CbLoose
- hist photonNCbLoose_BARREL {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbLoose_BARREL {
- }
- hist photonEtaCbLoose_BARREL {
- }
- hist photonPhiCbLoose_BARREL {
- }
- hist photonPtCone20CbLoose_BARREL {
+ hist NinBARREL {
}
- hist photonTopoEtCone40CbLoose_BARREL {
+ hist EtainBARREL {
}
- hist photonNCbLoose_CRACK {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbLoose_CRACK {
- }
- hist photonEtaCbLoose_CRACK {
- }
- hist photonPhiCbLoose_CRACK {
- }
- hist photonPtCone20CbLoose_CRACK {
- }
- hist photonTopoEtCone40CbLoose_CRACK {
- }
- hist photonNCbLoose_ENDCAP {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtCbLoose_ENDCAP {
- }
- hist photonEtaCbLoose_ENDCAP {
+ hist PhiinBARREL {
}
- hist photonPhiCbLoose_ENDCAP {
+ hist TimeinBARREL {
}
- hist photonPtCone20CbLoose_ENDCAP {
+ hist RConvinBARREL {
}
- hist photonTopoEtCone40CbLoose_ENDCAP {
- }
-
- # CbTight
- hist photonNCbTight_BARREL {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist ConvTypeinBARREL {
}
- hist photonEtCbTight_BARREL {
+ hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
}
- hist photonEtaCbTight_BARREL {
+ hist Eta_Phi_Conv_with_Pt_gt_2.5GeV {
}
- hist photonPhiCbTight_BARREL {
+ hist NinENDCAP {
}
- hist photonPtCone20CbTight_BARREL {
+ hist EtainENDCAP {
}
- hist photonTopoEtCone40CbTight_BARREL {
+ hist PhiinENDCAP {
}
- hist photonNCbTight_CRACK {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist TimeinENDCAP {
}
- hist photonEtCbTight_CRACK {
+ hist RConvinENDCAP {
}
- hist photonEtaCbTight_CRACK {
+ hist ConvTypeinENDCAP {
}
- hist photonPhiCbTight_CRACK {
+ hist Eta_Phi_with_Pt.gt.20GeV {
}
- hist photonPtCone20CbTight_CRACK {
+ hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
}
- hist photonTopoEtCone40CbTight_CRACK {
+ hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
}
- hist photonNCbTight_ENDCAP {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist NinCRACK {
}
- hist photonEtCbTight_ENDCAP {
+ hist EtainCRACK {
}
- hist photonEtaCbTight_ENDCAP {
+ hist PhiinCRACK {
}
- hist photonPhiCbTight_ENDCAP {
+ hist TimeinCRACK {
}
- hist photonPtCone20CbTight_ENDCAP {
+ hist RConvinCRACK {
}
- hist photonTopoEtCone40CbTight_ENDCAP {
+ hist ConvTypeinCRACK {
}
-}
-
- dir egamma/photonsWithTrigger/Unconv {
- algorithm = egKolmogorov
- output = egamma/photonsWithTrigger
- display = Draw=e1,StatBox
-
- #CbLoose
- hist photonNUnconvCbLoose {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtUnconvCbLoose {
- }
- hist photonEtaUnconvCbLoose {
- }
- hist photonPhiUnconvCbLoose {
- }
- hist photonEtaPhiUnconvCbLoose {
- algorithm = egamma_BinsDiffFromStripMedian
- }
- hist photonTopoEtCone40UnconvCbLoose {
- }
- hist photonPtCone20UnconvCbLoose {
- }
-
- #CbTight
- hist photonNUnconvCbTight {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtUnconvCbTight {
- }
- hist photonEtaUnconvCbTight {
- }
- hist photonPhiUnconvCbTight {
- }
- hist photonEtaPhiUnconvCbTight {
- algorithm = egamma_BinsDiffFromStripMedian
- }
- hist photonTopoEtCone40UnconvCbTight {
- }
- hist photonPtCone20UnconvCbTight {
- }
}
+dir egamma/CBLoosePhotonsWithTrigger/byLB {
+ output = egamma/photonsWithTrigger/LBMon
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
- dir egamma/photonsWithTrigger/Conv {
- algorithm = egKolmogorov
- output = egamma/photonsWithTrigger
- display = Draw=e1,StatBox
+ hist Number_of_Unconv._photons_vs_LB {
+ }
+ hist Number_of_Conv._photons_vs_LB {
+ }
+ hist LBEvoN {
+ }
+ hist Conversion_fraction_vs_LB {
+ }
- #CbLoose
- hist photonNConvCbLoose {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist photonEtConvCbLoose {
- }
- hist photonEtaConvCbLoose {
- }
- hist photonPhiConvCbLoose {
- }
- hist photonEtaPhiConvCbLoose {
- algorithm = egamma_BinsDiffFromStripMedian
- }
- hist photonTopoEtCone40ConvCbLoose {
- }
- hist photonPtCone20ConvCbLoose {
- }
- #CbTight
- hist photonNConvCbTight {
- }
- hist photonEtConvCbTight {
- }
- hist photonEtaConvCbTight {
- }
- hist photonPhiConvCbTight {
- }
- hist photonEtaPhiConvCbTight {
- algorithm = egamma_BinsDiffFromStripMedian
- }
- hist photonTopoEtCone40ConvCbTight {
- }
- hist photonPtCone20ConvCbTight {
- }
}
- dir egamma/photonsWithTrigger/ID {
+dir egamma/CBLoosePhotonsWithTrigger/ID {
algorithm = egKolmogorov
output = egamma/photonsWithTrigger/ID
display = Draw=e1,StatBox
- #CbLoose
- hist photonEhad1CbLoose_BARREL {
- }
- hist photonCoreEMCbLoose_BARREL {
- }
- hist photonF0CbLoose_BARREL {
- }
- hist photonF1CbLoose_BARREL {
- }
- hist photonF2CbLoose_BARREL {
- }
- hist photonF3CbLoose_BARREL {
+ hist Ehad1inBARREL {
}
- hist photonRe233e237CbLoose_BARREL {
+ hist CoreEMinBARREL {
}
- hist photonRe237e277CbLoose_BARREL {
+ hist F0inBARREL {
}
- hist photonEhad1CbLoose_CRACK {
+ hist F1inBARREL {
}
- hist photonCoreEMCbLoose_CRACK {
+ hist F2inBARREL {
}
- hist photonF0CbLoose_CRACK {
+ hist F3inBARREL {
}
- hist photonF1CbLoose_CRACK {
+ hist Re233e237inBARREL {
}
- hist photonF2CbLoose_CRACK {
+ hist Re237e277inBARREL {
}
- hist photonF3CbLoose_CRACK {
+ hist Ehad1inENDCAP {
}
- hist photonRe233e237CbLoose_CRACK {
+ hist CoreEMinENDCAP {
}
- hist photonRe237e277CbLoose_CRACK {
+ hist F0inENDCAP {
}
- hist photonEhad1CbLoose_ENDCAP {
+ hist F1inENDCAP {
}
- hist photonCoreEMCbLoose_ENDCAP {
+ hist F2inENDCAP {
}
- hist photonF0CbLoose_ENDCAP {
+ hist F3inENDCAP {
}
- hist photonF1CbLoose_ENDCAP {
+ hist Re233e237inENDCAP {
}
- hist photonF2CbLoose_ENDCAP {
+ hist Re237e277inENDCAP {
}
- hist photonF3CbLoose_ENDCAP {
+ hist Ehad1inCRACK {
}
- hist photonRe233e237CbLoose_ENDCAP {
+ hist CoreEMinCRACK {
}
- hist photonRe237e277CbLoose_ENDCAP {
+ hist F0inCRACK {
}
- #CbTight
- hist photonEhad1CbTight_BARREL {
+ hist F1inCRACK {
}
- hist photonCoreEMCbTight_BARREL {
+ hist F2inCRACK {
}
- hist photonF0CbTight_BARREL {
+ hist F3inCRACK {
}
- hist photonF1CbTight_BARREL {
+ hist Re233e237inCRACK {
}
- hist photonF2CbTight_BARREL {
+ hist Re237e277inCRACK {
}
- hist photonF3CbTight_BARREL {
- }
- hist photonRe233e237CbTight_BARREL {
- }
- hist photonRe237e277CbTight_BARREL {
+}
+
+# CBTight
+
+dir egamma/CBTightPhotons {
+ output = egamma/photons
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
}
- hist photonEhad1CbTight_CRACK {
+ hist Et {
}
- hist photonCoreEMCbTight_CRACK {
+ hist Phi {
}
- hist photonF0CbTight_CRACK {
+ hist Eta {
}
- hist photonF1CbTight_CRACK {
+ hist PtCone20 {
}
- hist photonF2CbTight_CRACK {
+ hist EtCone40 {
}
- hist photonF3CbTight_CRACK {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
}
- hist photonRe233e237CbTight_CRACK {
+ hist Time {
}
- hist photonRe237e277CbTight_CRACK {
+}
+
+dir egamma/CBTightPhotons/Expert {
+ output = egamma/photons/Expert
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist NinBARREL {
}
- hist photonEhad1CbTight_ENDCAP {
+ hist EtainBARREL {
}
- hist photonCoreEMCbTight_ENDCAP {
+ hist PhiinBARREL {
}
- hist photonF0CbTight_ENDCAP {
+ hist TimeinBARREL {
}
- hist photonF1CbTight_ENDCAP {
+ hist RConvinBARREL {
}
- hist photonF2CbTight_ENDCAP {
+ hist ConvTypeinBARREL {
}
- hist photonF3CbTight_ENDCAP {
+ hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
}
- hist photonRe233e237CbTight_ENDCAP {
+ hist Eta_Phi_Conv_with_Pt_gt_2.5GeV {
}
- hist photonRe237e277CbTight_ENDCAP {
+ hist NinENDCAP {
}
-}
-
- dir egamma/photonsWithTrigger/Region {
- algorithm = egKolmogorov
- output = egamma/photonsWithTrigger/EXPERT
- display = Draw=e1,StatBox
-
- # CbLoose
- hist photonConvTrkMatch1CbLoose_BARREL {
+ hist EtainENDCAP {
}
- hist photonConvTrkMatch2CbLoose_BARREL {
+ hist PhiinENDCAP {
}
- hist photonConvTypeCbLoose_BARREL {
+ hist TimeinENDCAP {
}
- hist photonConvTrkMatch1CbLoose_CRACK {
+ hist RConvinENDCAP {
}
- hist photonConvTrkMatch2CbLoose_CRACK {
+ hist ConvTypeinENDCAP {
}
- hist photonConvTypeCbLoose_CRACK {
+ hist Eta_Phi_with_Pt.gt.20GeV {
}
- hist photonConvTrkMatch1CbLoose_ENDCAP {
+ hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
}
- hist photonConvTrkMatch2CbLoose_ENDCAP {
+ hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
}
- hist photonConvTypeCbLoose_ENDCAP {
+ hist NinCRACK {
}
- # CbTight
- hist photonConvTrkMatch1CbTight_BARREL {
+ hist EtainCRACK {
}
- hist photonConvTrkMatch2CbTight_BARREL {
+ hist PhiinCRACK {
}
- hist photonConvTypeCbTight_BARREL {
+ hist TimeinCRACK {
}
- hist photonConvTrkMatch1CbTight_CRACK {
+ hist RConvinCRACK {
}
- hist photonConvTrkMatch2CbTight_CRACK {
+ hist ConvTypeinCRACK {
}
- hist photonConvTypeCbTight_CRACK {
+
+}
+
+dir egamma/CBTightPhotons/byLB {
+ output = egamma/photons/LBMon
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist Number_of_Unconv._photons_vs_LB {
}
- hist photonConvTrkMatch1CbTight_ENDCAP {
+ hist Number_of_Conv._photons_vs_LB {
}
- hist photonConvTrkMatch2CbTight_ENDCAP {
+ hist LBEvoN {
}
- hist photonConvTypeCbTight_ENDCAP {
+ hist Conversion_fraction_vs_LB {
}
- }
+}
- dir egamma/photonsWithTrigger/LBMon {
- algorithm = egamma_GatherData
- output = egamma/photonsWithTrigger/LBMon
+dir egamma/CBTightPhotons/ID {
+ algorithm = egKolmogorov
+ output = egamma/photons/ID
display = Draw=e1,StatBox
- # CbLoose
- hist LBEvoNPhotonsCbLoose {
+
+ hist Ehad1inBARREL {
}
- hist LBEvoNPhotonsUnconvCbLoose {
+ hist CoreEMinBARREL {
}
- hist LBEvoNPhotonsConvCbLoose {
+ hist F0inBARREL {
}
- hist LBEvoConvOverNCbLoose {
+ hist F1inBARREL {
}
-
- # CbTight
- hist LBEvoNPhotonsCbTight {
+ hist F2inBARREL {
}
- hist LBEvoNPhotonsUnconvCbTight {
+ hist F3inBARREL {
}
- hist LBEvoNPhotonsConvCbTight {
+ hist Re233e237inBARREL {
}
- hist LBEvoConvOverNCbTight {
+ hist Re237e277inBARREL {
}
-}
-
-### forwardElectrons
-
- dir egamma/forwardElectrons {
- algorithm = egKolmogorov
- output = egamma/forwardElectrons
- display = Draw=e1,StatBox
-
- hist forwardElectronN {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist Ehad1inENDCAP {
+ }
+ hist CoreEMinENDCAP {
}
- hist forwardElectronEt {
+ hist F0inENDCAP {
}
- hist forwardElectronPhi {
+ hist F1inENDCAP {
}
- hist forwardElectronEta {
+ hist F2inENDCAP {
}
- hist forwardElectronEtaPhi {
- algorithm = egamma_BinsDiffFromStripMedian
+ hist F3inENDCAP {
}
- # hist forwardElectronTopoEtCone40 {
- # }
- hist forwardElectronTime {
+ hist Re233e237inENDCAP {
}
-
- hist forwardElectronTightN {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist Re237e277inENDCAP {
}
- hist forwardElectronTightEt {
+ hist Ehad1inCRACK {
}
- hist forwardElectronTightPhi {
+ hist CoreEMinCRACK {
}
- hist forwardElectronTightEta {
+ hist F0inCRACK {
}
- hist forwardElectronTightEtaPhi {
- algorithm = egamma_BinsDiffFromStripMedian
+ hist F1inCRACK {
}
- # hist forwardElectronTightTopoEtCone40 {
- # }
- hist forwardElectronTightTime {
+ hist F2inCRACK {
+ }
+ hist F3inCRACK {
+ }
+ hist Re233e237inCRACK {
+ }
+ hist Re237e277inCRACK {
}
-
}
+# CBTightWithTrigger
- dir egamma/forwardElectrons {
- Algorithm = Egkolmogorov
- Output = egamma/forwardElectrons/EXPERT
- display = Draw=e1,StatBox
- hist forwardElectronN_ENDCAP {
+dir egamma/CBTightPhotonsWithTrigger {
+ output = egamma/photonsWithTrigger
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
}
- hist forwardElectronEt_ENDCAP {
- output = egamma/forwardElectrons/EXPERT
+ hist Et {
}
- hist forwardElectronEta_ENDCAP {
- output = egamma/forwardElectrons/EXPERT
+ hist Phi {
}
- hist forwardElectronPhi_ENDCAP {
- output = egamma/forwardElectrons/EXPERT
+ hist Eta {
}
- # hist forwardElectronTopoEtCone40_ENDCAP {
- # output = egamma/forwardElectrons/EXPERT
- # }
- hist forwardElectronTime_ENDCAP {
- output = egamma/forwardElectrons/EXPERT
+ hist PtCone20 {
}
- hist forwardElectronTightN_ENDCAP {
- output = egamma/forwardElectrons/EXPERT
+ hist EtCone40 {
}
- hist forwardElectronTightEt_ENDCAP {
- output = egamma/forwardElectrons/EXPERT
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
}
- hist forwardElectronTightEta_ENDCAP {
- output = egamma/forwardElectrons/EXPERT
+ hist Time {
}
- hist forwardElectronTightPhi_ENDCAP {
- output = egamma/forwardElectrons/EXPERT
- }
- # hist forwardElectronTightTopoEtCone40_ENDCAP {
- # output = egamma/forwardElectrons/EXPERT
- # }
- hist forwardElectronN_FORWARD {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- output = egamma/forwardElectrons/EXPERT
+}
+
+dir egamma/CBTightPhotonsWithTrigger/Expert {
+ output = egamma/photonsWithTrigger/Expert
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist NinBARREL {
}
- hist forwardElectronEt_FORWARD {
- output = egamma/forwardElectrons/EXPERT
+ hist EtainBARREL {
}
- hist forwardElectronEta_FORWARD {
- output = egamma/forwardElectrons/EXPERT
+ hist PhiinBARREL {
}
- hist forwardElectronPhi_FORWARD {
- output = egamma/forwardElectrons/EXPERT
+ hist TimeinBARREL {
}
- # hist forwardElectronTopoEtCone40_FORWARD {
- # output = egamma/forwardElectrons/EXPERT
- # }
- hist forwardElectronTime_FORWARD {
- output = egamma/forwardElectrons/EXPERT
+ hist RConvinBARREL {
}
- hist forwardElectronTightN_FORWARD {
- output = egamma/forwardElectrons/EXPERT
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
+ hist ConvTypeinBARREL {
}
- hist forwardElectronTightEt_FORWARD {
- output = egamma/forwardElectrons/EXPERT
+ hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
}
- hist forwardElectronTightEta_FORWARD {
- output = egamma/forwardElectrons/EXPERT
+ hist Eta_Phi_Conv_with_Pt_gt_2.5GeV {
}
- hist forwardElectronTightPhi_FORWARD {
- output = egamma/forwardElectrons/EXPERT
+ hist NinENDCAP {
}
- # hist forwardElectronTightTopoEtCone40_FORWARD {
- # output = egamma/forwardElectrons/EXPERT
- # }
-}
-
-dir egamma/forwardElectrons/ID {
- algorithm = egKolmogorov
- output = egamma/forwardElectrons/ID
- hist forwardElectronENG_DENS_ENDCAP {
+ hist EtainENDCAP {
}
- hist forwardElectronFRAC_MAX_ENDCAP {
+ hist PhiinENDCAP {
}
- hist forwardElectronLONGITUDINAL_ENDCAP {
+ hist TimeinENDCAP {
}
- hist forwardElectron2ND_LAMBDA_ENDCAP {
+ hist RConvinENDCAP {
}
- hist forwardElectronLATERAL_ENDCAP {
+ hist ConvTypeinENDCAP {
}
- hist forwardElectron2ND_R_ENDCAP {
+ hist Eta_Phi_with_Pt.gt.20GeV {
}
- hist forwardElectronCENTER_LAMBDA_ENDCAP {
+ hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
}
- hist forwardElectronENG_DENS_FORWARD {
+ hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
}
- hist forwardElectronFRAC_MAX_FORWARD {
+ hist NinCRACK {
}
- hist forwardElectronLONGITUDINAL_FORWARD {
+ hist EtainCRACK {
}
- hist forwardElectron2ND_LAMBDA_FORWARD {
+ hist PhiinCRACK {
}
- hist forwardElectronLATERAL_FORWARD {
+ hist TimeinCRACK {
}
- hist forwardElectron2ND_R_FORWARD {
+ hist RConvinCRACK {
}
- hist forwardElectronCENTER_LAMBDA_FORWARD {
+ hist ConvTypeinCRACK {
}
-}
-
-
-### Tag&Probe Z
-dir egamma/tagandprobeZ {
- algorithm = egKolmogorov
- output = egamma/tagandprobeZ
- display = Draw=e1,StatBox
-
- hist electronTagAndProbeNcandidates {
- }
- hist electronTagAndProbeGlobalMass {
- algorithm = egamma_FitZmass
- display = StatBox,gaus(xmin,xmax)
- }
- hist electronTagAndProbeMass_BARREL {
- algorithm = egamma_FitZmass
- display = StatBox,gaus(xmin,xmax)
- }
- hist electronTagAndProbeMass_CRACK {
- algorithm = egamma_FitZmass
- display = StatBox,gaus(xmin,xmax)
- }
- hist electronTagAndProbeMass_ENDCAP {
- algorithm = egamma_FitZmass
- display = StatBox,gaus(xmin,xmax)
- }
- hist electronTagAndProbeN {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist electronTagAndProbeEt {
- }
- hist electronTagAndProbeEta {
- }
- hist electronTagAndProbePhi {
- }
- hist electronTagAndProbeEtaPhi {
- algorithm = egamma_BinsDiffFromStripMedian
- }
}
-dir egamma/tagandprobeZ {
- algorithm = egKolmogorov
- output = egamma/tagandprobeZ
- display = Draw=e1,StatBox
+dir egamma/CBTightPhotonsWithTrigger/byLB {
+ output = egamma/photonsWithTrigger/LBMon
+ algorithm = egKolmogorov
+ display = Draw=e1, DrawRef=HIST, StatBox
+
+ hist Number_of_Unconv._photons_vs_LB {
+ }
+ hist Number_of_Conv._photons_vs_LB {
+ }
+ hist LBEvoN {
+ }
+ hist Conversion_fraction_vs_LB {
+ }
- hist EfficiencyTagAndProbeElectronIDvsEt {
- }
- hist EfficiencyTagAndProbeElectronIDvsEta {
- }
- hist EfficiencyTagAndProbeElectronIDvsPhi {
- }
- hist EfficiencyTagAndProbeElectronISOvsEt {
- }
- hist EfficiencyTagAndProbeElectronISOvsEta {
- }
- hist EfficiencyTagAndProbeElectronISOvsPhi {
- }
}
-dir egamma/tagandprobeZ/ID {
+dir egamma/CBTightPhotonsWithTrigger/ID {
algorithm = egKolmogorov
- output = egamma/tagandprobeZ/ID
+ output = egamma/photonsWithTrigger/ID
display = Draw=e1,StatBox
- hist electronTagAndProbeEhad1_BARREL {
+ hist Ehad1inBARREL {
}
- hist electronTagAndProbeEoverP_BARREL {
+ hist CoreEMinBARREL {
}
- hist electronTagAndProbeCoreEM_BARREL {
+ hist F0inBARREL {
}
- hist electronTagAndProbeF1_BARREL {
+ hist F1inBARREL {
}
- hist electronTagAndProbeF2_BARREL {
+ hist F2inBARREL {
}
- hist electronTagAndProbeF3_BARREL {
+ hist F3inBARREL {
}
- hist electronTagAndProbeRe233e237_BARREL {
+ hist Re233e237inBARREL {
}
- hist electronTagAndProbeRe237e277_BARREL {
+ hist Re237e277inBARREL {
}
- hist electronTagAndProbeEhad1_ENDCAP {
+ hist Ehad1inENDCAP {
}
- hist electronTagAndProbeEoverP_ENDCAP {
+ hist CoreEMinENDCAP {
}
- hist electronTagAndProbeCoreEM_ENDCAP {
+ hist F0inENDCAP {
}
- hist electronTagAndProbeF1_ENDCAP {
+ hist F1inENDCAP {
}
- hist electronTagAndProbeF2_ENDCAP {
+ hist F2inENDCAP {
}
- hist electronTagAndProbeF3_ENDCAP {
+ hist F3inENDCAP {
}
- hist electronTagAndProbeRe233e237_ENDCAP {
+ hist Re233e237inENDCAP {
}
- hist electronTagAndProbeRe237e277_ENDCAP {
+ hist Re237e277inENDCAP {
}
- hist electronTagAndProbeEhad1_CRACK {
+ hist Ehad1inCRACK {
}
- hist electronTagAndProbeEoverP_CRACK {
+ hist CoreEMinCRACK {
}
- hist electronTagAndProbeCoreEM_CRACK {
+ hist F0inCRACK {
}
- hist electronTagAndProbeF1_CRACK {
+ hist F1inCRACK {
}
- hist electronTagAndProbeF2_CRACK {
+ hist F2inCRACK {
}
- hist electronTagAndProbeF3_CRACK {
+ hist F3inCRACK {
}
- hist electronTagAndProbeRe233e237_CRACK {
+ hist Re233e237inCRACK {
}
- hist electronTagAndProbeRe237e277_CRACK {
+ hist Re237e277inCRACK {
}
}
-dir egamma/tagandprobeZ/Track {
+
+########################################
+### forwardElectrons
+########################################
+
+# CB Loose Forward Electrons
+
+dir egamma/CBLooseFwdElectrons {
algorithm = egKolmogorov
- output = egamma/tagandprobeZ/Track
+ output = egamma/forwardElectrons
display = Draw=e1,StatBox
- hist electronTagAndProbeNOfBLayerHits_BARREL {
- }
- hist electronTagAndProbeNOfTRTHits_BARREL {
- }
- hist electronTagAndProbeNOfSiHits_BARREL {
- }
- hist electronTagAndProbeDeltaEta1_BARREL {
- }
- hist electronTagAndProbeDeltaPhi2_BARREL {
- }
- hist electronTagAndProbeNOfBLayerHits_ENDCAP {
- }
- hist electronTagAndProbeNOfTRTHits_ENDCAP {
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Et {
+ }
+ hist Phi {
+ }
+ hist Eta {
+ }
+ hist Time {
+ }
+ hist Eta_Phi_distributionf_Pt_gt_10GeV {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+}
+
+dir egamma/CBLooseFwdElectrons {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/ID
+ display = Draw=e1,StatBox
+
+ hist EnergyDensity {
+ }
+ hist FracMax {
+ }
+ hist Lateral {
+ }
+ hist Longitudinal {
+ }
+ hist SecondLambda {
+ }
+ hist SecondR {
+ }
+ hist CenterLambda {
+ }
+}
+
+
+dir egamma/CBLooseFwdElectrons {
+ algorithm = Egkolmogorov
+ Output = egamma/forwardElectrons/Expert
+ display = Draw=e1,StatBox
+
+ hist NinENDCAP {
+ display = Draw=e1,StatBox,LogY
}
- hist electronTagAndProbeNOfSiHits_ENDCAP {
+ hist NinFORWARD {
+ display = Draw=e1,StatBox,LogY
}
- hist electronTagAndProbeDeltaEta1_ENDCAP {
+ hist Eta_Phi_distribution_Pt_gt_2.5GeV {
}
- hist electronTagAndProbeDeltaPhi2_ENDCAP {
+ hist EtainENDCAP {
}
- hist electronTagAndProbeNOfBLayerHits_CRACK {
+ hist PhiinENDCAP {
}
- hist electronTagAndProbeNOfTRTHits_CRACK {
+ hist TimeinENDCAP {
}
- hist electronTagAndProbeNOfSiHits_CRACK {
+ hist EtainFORWARD {
}
- hist electronTagAndProbeDeltaEta1_CRACK {
+ hist PhiinFORWARD {
}
- hist electronTagAndProbeDeltaPhi2_CRACK {
+ hist TimeinFORWARD {
}
+}
+
+### Tag&Probe Z
+
+dir egamma/TnPZ/TnPCandidate {
+ algorithm = egKolmogorov
+ output = egamma/tagandprobeZ
+ display = Draw=e1,StatBox
+
+ hist Z_candidate_mass {
+ algorithm = egamma_FitZmass
+ display = StatBox,gaus(80000.,100000.)
+ }
+ hist Z_candidate_mass_distribution_Lead_in_Barrel {
+ algorithm = egamma_FitZmass
+ display = StatBox,gaus(80000.,100000.)
+ }
+ hist Number_of_Z_candidates_vs_eta_leading_e {
+ }
+ hist Number_of_Z_candidates_vs_phi_leading_e {
+ }
+ hist Z_candidate_mass_distribution_Lead_in_Crack {
+ algorithm = egamma_FitZmass
+ display = StatBox,gaus(80000.,100000.)
+ }
+ hist Z_candidate_mass_distribution_Lead_in_EndCap {
+ algorithm = egamma_FitZmass
+ display = StatBox,gaus(80000.,100000.)
+ }
+
+}
+
+dir egamma/TnPZ/ID {
+ algorithm = egKolmogorov
+ output = egamma/tagandprobeZ/ID
+ display = Draw=e1,StatBox
+
+ hist Ehad1ProbeinBARREL {
+ }
+ hist EoverPProbeinBARREL {
+ }
+ hist CoreEMProbeinBARREL {
+ }
+ hist F0ProbeinBARREL {
+ }
+ hist F1ProbeinBARREL {
+ }
+ hist F2ProbeinBARREL {
+ }
+ hist F3ProbeinBARREL {
+ }
+ hist Re233e237ProbeinBARREL {
+ }
+ hist Re237e277ProbeinBARREL {
+ }
+ hist Ehad1ProbeinENDCAP {
+ }
+ hist EoverPProbeinENDCAP {
+ }
+ hist CoreEMProbeinENDCAP {
+ }
+ hist F0ProbeinENDCAP {
+ }
+ hist F1ProbeinENDCAP {
+ }
+ hist F2ProbeinENDCAP {
+ }
+ hist F3ProbeinENDCAP {
+ }
+ hist Re233e237ProbeinENDCAP {
+ }
+ hist Re237e277ProbeinENDCAP {
+ }
+
+}
+
+dir egamma/TnPZ/Tracks {
+ algorithm = egKolmogorov
+ output = egamma/tagandprobeZ/Track
+ display = Draw=e1,StatBox
+
+ hist NOfBLayerHitsProbeinBARREL {
+ }
+ hist NOfPixelHitsProbeinBARREL {
+ }
+ hist NOfSCTHitsProbeinBARREL {
+ }
+ hist NOfTRTHitsProbeinBARREL {
+ }
+ hist NOfTRTHighThresholdHitsProbeinBARREL {
+ }
+ hist DeltaEta1ProbeinBARREL {
+ }
+ hist DeltaPhi2ProbeinBARREL {
+ }
+ hist Trackd0ProbeinBARREL {
+ }
+ hist NOfBLayerHitsProbeinENDCAP {
+ }
+ hist NOfPixelHitsProbeinENDCAP {
+ }
+ hist NOfSCTHitsProbeinENDCAP {
+ }
+ hist NOfTRTHitsProbeinENDCAP {
+ }
+ hist NOfTRTHighThresholdHitsProbeinENDCAP {
+ }
+ hist DeltaEta1ProbeinENDCAP {
+ }
+ hist DeltaPhi2ProbeinENDCAP {
+ }
+ hist Trackd0ProbeinENDCAP {
+ }
}
-dir egamma/tagandprobeZ/Isolation {
+dir egamma/TnPZ/Efficiencies {
algorithm = egKolmogorov
output = egamma/tagandprobeZ
display = Draw=e1,StatBox
- hist electronTagAndProbeCaloIso_BARREL {
+ hist TnP_ID_efficiency_vs_etprobe {
+ }
+ hist TnP_ID_efficiency_vs_etaprobe {
}
- hist electronTagAndProbeTrackIso_BARREL {
+ hist TnP_ID_efficiency_vs_phiprobe {
}
- hist electronTagAndProbeCaloIso_ENDCAP {
+ hist TnP_Calo_Iso_efficiency_vs_etprobe {
}
- hist electronTagAndProbeTrackIso_ENDCAP {
+ hist TnP_Calo_Iso_efficiency_vs_etaprobe {
}
- hist electronTagAndProbeCaloIso_CRACK {
+ hist TnP_Calo_Iso_efficiency_vs_phiprobe {
}
- hist electronTagAndProbeTrackIso_CRACK {
+ hist TnP_Calo_Iso_and_LHTight_efficiency_vs_etprobe {
}
+ hist TnP_Calo_Iso_and_LHTight_efficiency_vs_etaprobe {
+ }
+ hist TnP_Calo_Iso_and_LHTight_ID_efficiency_vs_phiprobe {
+ }
+
}
-dir egamma/tagandprobeZ/LBMon {
+dir egamma/TnPZ/TnPCandidate {
algorithm = egamma_GatherData
output = egamma/tagandprobeZ/LBMon
display = Draw=e1,StatBox
- hist LBEvoNZcandidates {
+ hist Number_of_Z_candidates_vs_LB {
}
+
}
### Tag&Probe JPsi
-dir egamma/tagandprobeJPsi {
- algorithm = egKolmogorov
- output = egamma/tagandprobeJPsi
- display = Draw=e1,StatBox
-
- hist electronTagAndProbeNcandidates {
- }
- hist electronTagAndProbeGlobalMass {
- algorithm = egamma_FitJPsimass
- display = StatBox,gaus(xmin,xmax)
- }
- hist electronTagAndProbeMass_BARREL {
- algorithm = egamma_FitJPsimass
- display = StatBox,gaus(xmin,xmax)
- }
- hist electronTagAndProbeMass_CRACK {
- algorithm = egamma_FitJPsimass
- display = StatBox,gaus(xmin,xmax)
- }
- hist electronTagAndProbeMass_ENDCAP {
- algorithm = egamma_FitJPsimass
- display = StatBox,gaus(xmin,xmax)
- }
- hist electronTagAndProbeN {
- algorithm = egamma_Histogram_Not_Empty
- display = Draw=e1,StatBox,LogY
- }
- hist electronTagAndProbeEt {
- }
- hist electronTagAndProbeEta {
- }
- hist electronTagAndProbePhi {
- }
- hist electronTagAndProbeEtaPhi {
- algorithm = egamma_BinsDiffFromStripMedian
- }
-}
-
-dir egamma/tagandprobeJPsi {
+dir egamma/TnPJPsi/TnPCandidate {
algorithm = egKolmogorov
output = egamma/tagandprobeJPsi
display = Draw=e1,StatBox
- hist EfficiencyTagAndProbeElectronIDvsEt {
+ hist JPsi_candidate_mass {
+ algorithm = egamma_FitJPsimass
+ display = StatBox,gaus(2500.,4000.)
}
- hist EfficiencyTagAndProbeElectronIDvsEta {
+ hist JPsi_candidate_mass_distribution_Lead_in_Barrel {
+ algorithm = egamma_FitJPsimass
+ display = StatBox,gaus(2500.,4000.)
}
- hist EfficiencyTagAndProbeElectronIDvsPhi {
+ hist Number_of_JPsi_candidates_vs_eta_leading_e {
}
- hist EfficiencyTagAndProbeElectronISOvsEt {
+ hist Number_of_JPsi_candidates_vs_phi_leading_e {
}
- hist EfficiencyTagAndProbeElectronISOvsEta {
+ hist JPsi_candidate_mass_distribution_Lead_in_Crack {
+ algorithm = egamma_FitJPsimass
+ display = StatBox,gaus(2500.,4000.)
}
- hist EfficiencyTagAndProbeElectronISOvsPhi {
+ hist JPsi_candidate_mass_distribution_Lead_in_EndCap {
+ algorithm = egamma_FitJPsimass
+ display = StatBox,gaus(2500.,4000.)
}
+
}
-dir egamma/tagandprobeJPsi/ID {
+dir egamma/TnPJPsi/ID {
algorithm = egKolmogorov
output = egamma/tagandprobeJPsi/ID
display = Draw=e1,StatBox
- hist electronTagAndProbeEhad1_BARREL {
- }
- hist electronTagAndProbeEoverP_BARREL {
- }
- hist electronTagAndProbeCoreEM_BARREL {
- }
- hist electronTagAndProbeF1_BARREL {
- }
- hist electronTagAndProbeF2_BARREL {
- }
- hist electronTagAndProbeF3_BARREL {
- }
- hist electronTagAndProbeRe233e237_BARREL {
- }
- hist electronTagAndProbeRe237e277_BARREL {
- }
- hist electronTagAndProbeEhad1_ENDCAP {
- }
- hist electronTagAndProbeEoverP_ENDCAP {
- }
- hist electronTagAndProbeCoreEM_ENDCAP {
- }
- hist electronTagAndProbeF1_ENDCAP {
- }
- hist electronTagAndProbeF2_ENDCAP {
- }
- hist electronTagAndProbeF3_ENDCAP {
- }
- hist electronTagAndProbeRe233e237_ENDCAP {
- }
- hist electronTagAndProbeRe237e277_ENDCAP {
- }
- hist electronTagAndProbeEhad1_CRACK {
- }
- hist electronTagAndProbeEoverP_CRACK {
- }
- hist electronTagAndProbeCoreEM_CRACK {
- }
- hist electronTagAndProbeF1_CRACK {
- }
- hist electronTagAndProbeF2_CRACK {
- }
- hist electronTagAndProbeF3_CRACK {
- }
- hist electronTagAndProbeRe233e237_CRACK {
- }
- hist electronTagAndProbeRe237e277_CRACK {
- }
+ hist Ehad1ProbeinBARREL {
+ }
+ hist EoverPProbeinBARREL {
+ }
+ hist CoreEMProbeinBARREL {
+ }
+ hist F0ProbeinBARREL {
+ }
+ hist F1ProbeinBARREL {
+ }
+ hist F2ProbeinBARREL {
+ }
+ hist F3ProbeinBARREL {
+ }
+ hist Re233e237ProbeinBARREL {
+ }
+ hist Re237e277ProbeinBARREL {
+ }
+ hist Ehad1ProbeinENDCAP {
+ }
+ hist EoverPProbeinENDCAP {
+ }
+ hist CoreEMProbeinENDCAP {
+ }
+ hist F0ProbeinENDCAP {
+ }
+ hist F1ProbeinENDCAP {
+ }
+ hist F2ProbeinENDCAP {
+ }
+ hist F3ProbeinENDCAP {
+ }
+ hist Re233e237ProbeinENDCAP {
+ }
+ hist Re237e277ProbeinENDCAP {
+ }
+
}
-dir egamma/tagandprobeJPsi/Track {
+dir egamma/TnPJPsi/Tracks {
algorithm = egKolmogorov
output = egamma/tagandprobeJPsi/Track
display = Draw=e1,StatBox
- hist electronTagAndProbeNOfBLayerHits_BARREL {
- }
- hist electronTagAndProbeNOfTRTHits_BARREL {
- }
- hist electronTagAndProbeNOfSiHits_BARREL {
- }
- hist electronTagAndProbeDeltaEta1_BARREL {
- }
- hist electronTagAndProbeDeltaPhi2_BARREL {
- }
- hist electronTagAndProbeNOfBLayerHits_ENDCAP {
- }
- hist electronTagAndProbeNOfTRTHits_ENDCAP {
- }
- hist electronTagAndProbeNOfSiHits_ENDCAP {
- }
- hist electronTagAndProbeDeltaEta1_ENDCAP {
- }
- hist electronTagAndProbeDeltaPhi2_ENDCAP {
- }
- hist electronTagAndProbeNOfBLayerHits_CRACK {
- }
- hist electronTagAndProbeNOfTRTHits_CRACK {
- }
- hist electronTagAndProbeNOfSiHits_CRACK {
- }
- hist electronTagAndProbeDeltaEta1_CRACK {
- }
- hist electronTagAndProbeDeltaPhi2_CRACK {
- }
+ hist NOfBLayerHitsProbeinBARREL {
+ }
+ hist NOfPixelHitsProbeinBARREL {
+ }
+ hist NOfSCTHitsProbeinBARREL {
+ }
+ hist NOfTRTHitsProbeinBARREL {
+ }
+ hist NOfTRTHighThresholdHitsProbeinBARREL {
+ }
+ hist DeltaEta1ProbeinBARREL {
+ }
+ hist DeltaPhi2ProbeinBARREL {
+ }
+ hist Trackd0ProbeinBARREL {
+ }
+ hist NOfBLayerHitsProbeinENDCAP {
+ }
+ hist NOfPixelHitsProbeinENDCAP {
+ }
+ hist NOfSCTHitsProbeinENDCAP {
+ }
+ hist NOfTRTHitsProbeinENDCAP {
+ }
+ hist NOfTRTHighThresholdHitsProbeinENDCAP {
+ }
+ hist DeltaEta1ProbeinENDCAP {
+ }
+ hist DeltaPhi2ProbeinENDCAP {
+ }
+ hist Trackd0ProbeinENDCAP {
+ }
}
-dir egamma/tagandprobeJPsi/Isolation {
+dir egamma/TnPJPsi/Efficiencies {
algorithm = egKolmogorov
output = egamma/tagandprobeJPsi
display = Draw=e1,StatBox
- hist electronTagAndProbeCaloIso_BARREL {
+ hist TnP_ID_efficiency_vs_etprobe {
}
- hist electronTagAndProbeTrackIso_BARREL {
+ hist TnP_ID_efficiency_vs_etaprobe {
}
- hist electronTagAndProbeCaloIso_ENDCAP {
+ hist TnP_ID_efficiency_vs_phiprobe {
}
- hist electronTagAndProbeTrackIso_ENDCAP {
+ hist TnP_Calo_Iso_efficiency_vs_etprobe {
}
- hist electronTagAndProbeCaloIso_CRACK {
+ hist TnP_Calo_Iso_efficiency_vs_etaprobe {
}
- hist electronTagAndProbeTrackIso_CRACK {
+ hist TnP_Calo_Iso_efficiency_vs_phiprobe {
}
+ hist TnP_Calo_Iso_and_LHTight_efficiency_vs_etprobe {
+ }
+ hist TnP_Calo_Iso_and_LHTight_efficiency_vs_etaprobe {
+ }
+ hist TnP_Calo_Iso_and_LHTight_ID_efficiency_vs_phiprobe {
+ }
}
-dir egamma/tagandprobeJPsi/LBMon {
+dir egamma/TnPJPsi/TnPCandidate {
algorithm = egamma_GatherData
output = egamma/tagandprobeJPsi/LBMon
display = Draw=e1,StatBox
- hist LBEvoNJPsicandidates {
+ hist Number_of_JPsi_candidates_vs_LB {
}
-}
+
+}
\ No newline at end of file
--
GitLab
From 127fe57f84c50c046dae0f7bc8669a4c73dd0b4f Mon Sep 17 00:00:00 2001
From: Bertrand LAFORGE <laforge@lpnhe.in2p3.fr>
Date: Mon, 6 Sep 2021 19:10:31 +0200
Subject: [PATCH 272/272] 1st version of egamma webdisplay completed for run 3
---
.../config/Egamma/collisions_run.config | 581 ++++++++++++++----
.../config/Egamma/cosmics_run.config | 571 +++++++++++++----
.../config/Egamma/heavyions_run.config | 571 +++++++++++++----
3 files changed, 1360 insertions(+), 363 deletions(-)
diff --git a/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config b/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config
index 0e239471642c..f78683806df0 100644
--- a/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/Egamma/collisions_run.config
@@ -113,7 +113,7 @@ algorithm egamma_FitJPsimass {
libname = libdqm_algorithms.so
name = Simple_gaus_Fit
xmin = 2500.
- xmax = 4000.
+ xmax = 3500.
thresholds = egamma_FitJPsimass_Thresholds
}
@@ -122,51 +122,114 @@ algorithm egamma_FitJPsimass {
#############
output top_level {
- algorithm = WorstCaseSummary
+# algorithm = WorstCaseSummary
output egamma {
+# Photons
output photons {
- output Expert {
- }
- output ID {
- }
- output LBMon {
+ output CBLoose {
+ output Expert {
+ output ID {
+ }
+ output LBMon {
+ }
+ }
+ }
+ output CBTight {
+ output Expert {
+ output ID {
+ }
+ output LBMon {
+ }
+ }
}
}
output photonsWithTrigger {
- output Expert {
- }
- output ID {
+ output CBLoose {
+ output Expert {
+ output ID {
+ }
+ output LBMon {
+ }
+ }
}
- output LBMon {
+ output CBTight {
+ output Expert {
+ output ID {
+ }
+ output LBMon {
+ }
+ }
}
}
+
+# Electrons
output electrons {
- output Expert {
- }
- output ID {
- }
- output Track {
+ output LHLoose {
+ output Expert {
+ output ID {
+ }
+ output Track {
+ }
+ output LBMon {
+ }
+ }
}
- output LBMon {
+ output LHTight {
+ output Expert {
+ output ID {
+ }
+ output Track {
+ }
+ output LBMon {
+ }
+ }
}
}
output electronsWithTrigger {
- output Expert {
+ output LHLoose {
+ output Expert {
+ output ID {
+ }
+ output Track {
+ }
+ output LBMon {
+ }
}
- output ID {
+ }
+ output LHTight {
+ output Expert {
+ output ID {
+ }
+ output Track {
+ }
+ output LBMon {
+ }
}
- output Track {
+ }
+ }
+
+# FwdElectrons
+ output forwardElectrons {
+ output LHTight {
+ output Expert {
}
- output LBMon {
+ }
+ output LHLoose {
+ output Expert {
}
}
- output forwardElectrons {
- output ID {
+ output CBLoose {
+ output Expert {
}
+ }
+ output CBTight {
output Expert {
}
}
- output tagandprobeZ {
+ }
+
+# T&P
+ output tagandprobeZ {
output ID {
}
output Track {
@@ -182,7 +245,7 @@ output top_level {
output LBMon {
}
}
- }
+ }
}
#######################
@@ -196,10 +259,9 @@ output top_level {
# LhLoose
dir egamma/LHLooseElectrons {
- output = egamma/electrons
+ output = egamma/electrons/LHLoose
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
@@ -210,7 +272,9 @@ dir egamma/LHLooseElectrons {
}
hist Phi {
}
- hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist TopoEtCone40 {
}
@@ -221,30 +285,49 @@ dir egamma/LHLooseElectrons {
}
dir egamma/LHLooseElectrons/Expert {
- output = egamma/electrons/Expert
+ output = egamma/electrons/LHLoose/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
+ hist EtainENDCAP {
+ }
+ hist PhiinENDCAP {
+ }
+ hist TimeinENDCAP {
+ }
hist Eta_Phi_with_Pt_gt_2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
- hist Eta_Phi_with_Pt_gt_20GeV {
+ hist Eta_Phi_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist EtainBARREL {
+ }
+ hist PhiinBARREL {
+ }
+ hist TimeinBARREL {
+ }
+ hist EtainCRACK {
+ }
+ hist PhiinCRACK {
+ }
+ hist TimeinCRACK {
}
}
dir egamma/LHLooseElectrons/byLB {
- output = egamma/electrons/LBMon
+ output = egamma/electrons/LHLoose/Expert/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist LBEvoN {
}
}
dir egamma/LHLooseElectrons/ID {
algorithm = egKolmogorov
- output = egamma/electrons/ID
+ output = egamma/electrons/LHLoose/Expert/ID
display = Draw=e1,StatBox
-
hist Ehad1inBARREL {
}
hist CoreEMinBARREL {
@@ -289,11 +372,10 @@ dir egamma/LHLooseElectrons/ID {
}
}
-dir egamma/LHLooseElectrons/Expert/Track {
+dir egamma/LHLooseElectrons/Tracks {
algorithm = egKolmogorov
- output = egamma/electrons/Track
+ output = egamma/electrons/LHLoose/Expert/Track
display = Draw=e1,StatBox
-
hist NOfBLayerHitsinBARREL {
}
hist NOfPixelHitsinBARREL {
@@ -342,16 +424,14 @@ dir egamma/LHLooseElectrons/Expert/Track {
}
hist Trackd0inCRACK {
}
-
}
# LhLooseWithTrigger
dir egamma/LHLooseElectronsWithTrigger {
- output = egamma/electronsWithTrigger
+ output = egamma/electronsWithTrigger/LHLoose
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
@@ -362,7 +442,9 @@ dir egamma/LHLooseElectronsWithTrigger {
}
hist Phi {
}
- hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist TopoEtCone40 {
}
@@ -373,10 +455,9 @@ dir egamma/LHLooseElectronsWithTrigger {
}
dir egamma/LHLooseElectronsWithTrigger/Expert {
- output = egamme/electronsWithTrigger/Expert
+ output = egamma/electronsWithTrigger/LHLoose/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist Eta_Phi_with_Pt_gt_2.5GeV {
}
hist Eta_Phi_with_Pt_gt_20GeV {
@@ -384,19 +465,17 @@ dir egamma/LHLooseElectronsWithTrigger/Expert {
}
dir egamma/LHLooseElectronsWithTrigger/byLB {
- output = egamme/electronsWithTrigger/LBMon
+ output = egamma/electronsWithTrigger/LHLoose/Expert/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist LBEvoN {
}
}
dir egamma/LHLooseElectronsWithTrigger/ID {
algorithm = egKolmogorov
- output = egamme/electronsWithTrigger/ID
+ output = egamma/electronsWithTrigger/LHLoose/Expert/ID
display = Draw=e1,StatBox
-
hist Ehad1inBARREL {
}
hist CoreEMinBARREL {
@@ -441,9 +520,9 @@ dir egamma/LHLooseElectronsWithTrigger/ID {
}
}
-dir egamma/LHLooseElectronsWithTrigger/Expert/Track {
+dir egamma/LHLooseElectronsWithTrigger/Tracks {
algorithm = egKolmogorov
- output = egamme/electronsWithTrigger/Track
+ output = egamma/electronsWithTrigger/LHLoose/Expert/Track
display = Draw=e1,StatBox
hist NOfBLayerHitsinBARREL {
@@ -500,10 +579,9 @@ dir egamma/LHLooseElectronsWithTrigger/Expert/Track {
# LhTight
dir egamma/LHTightElectrons {
- output = egamme/electrons
+ output = egamma/electrons/LHTight
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
@@ -514,7 +592,9 @@ dir egamma/LHTightElectrons {
}
hist Phi {
}
- hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist TopoEtCone40 {
}
@@ -525,30 +605,49 @@ dir egamma/LHTightElectrons {
}
dir egamma/LHTightElectrons/Expert {
- output = egamme/electrons/Expert
+ output = egamma/electrons/LHTight/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
+ hist EtainENDCAP {
+ }
+ hist PhiinENDCAP {
+ }
+ hist TimeinENDCAP {
+ }
hist Eta_Phi_with_Pt_gt_2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
- hist Eta_Phi_with_Pt_gt_20GeV {
+ hist Eta_Phi_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist EtainBARREL {
+ }
+ hist PhiinBARREL {
+ }
+ hist TimeinBARREL {
+ }
+ hist EtainCRACK {
+ }
+ hist PhiinCRACK {
+ }
+ hist TimeinCRACK {
}
}
dir egamma/LHTightElectrons/byLB {
- output = egamma/electrons/LBMon
+ output = egamma/electrons/LHTight/Expert/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist LBEvON {
}
}
dir egamma/LHTightElectrons/ID {
algorithm = egKolmogorov
- output = egamma/electrons/ID
+ output = egamma/electrons/LHTight/Expert/ID
display = Draw=e1,StatBox
-
hist Ehad1inBARREL {
}
hist CoreEMinBARREL {
@@ -593,11 +692,10 @@ dir egamma/LHTightElectrons/ID {
}
}
-dir egamma/LHTightElectrons/Expert/Track {
+dir egamma/LHTightElectrons/Tracks {
algorithm = egKolmogorov
- output = egamma/electrons/Track
- display = Draw=e1,StatBox
-
+ output = egamma/electrons/LHTight/Expert/Track
+ Display = Draw=e1,StatBox
hist NOfBLayerHitsinBARREL {
}
hist NOfPixelHitsinBARREL {
@@ -646,27 +744,27 @@ dir egamma/LHTightElectrons/Expert/Track {
}
hist Trackd0inCRACK {
}
-
}
# LhTightWithTrigger
dir egamma/LHTightElectronsWithTrigger {
- output = egamme/electronsWithTrigger
+ output = egamma/electronsWithTrigger/LHTight
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
}
hist Et {
- }
+ }
hist Eta {
}
hist Phi {
}
- hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist TopoEtCone40 {
}
@@ -677,10 +775,9 @@ dir egamma/LHTightElectronsWithTrigger {
}
dir egamma/LHTightElectronsWithTrigger/Expert {
- output = egamme/electronsWithTrigger/Expert
+ output = egamma/electronsWithTrigger/LHTight/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist Eta_Phi_with_Pt_gt_2.5GeV {
}
hist Eta_Phi_with_Pt_gt_20GeV {
@@ -688,7 +785,7 @@ dir egamma/LHTightElectronsWithTrigger/Expert {
}
dir egamma/LHTightElectronsWithTrigger/byLB {
- output = egamme/electronsWithTrigger/LBMon
+ output = egamma/electronsWithTrigger/LHTight/Expert/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -698,9 +795,8 @@ dir egamma/LHTightElectronsWithTrigger/byLB {
dir egamma/LHTightElectronsWithTrigger/ID {
algorithm = egKolmogorov
- output = egamme/electronsWithTrigger/ID
+ output = egamma/electronsWithTrigger/LHTight/Expert/ID
display = Draw=e1,StatBox
-
hist Ehad1inBARREL {
}
hist CoreEMinBARREL {
@@ -745,9 +841,9 @@ dir egamma/LHTightElectronsWithTrigger/ID {
}
}
-dir egamma/LHTightElectronsWithTrigger/Expert/Track {
+dir egamma/LHTightElectronsWithTrigger/Tracks {
algorithm = egKolmogorov
- output = egamme/electronsWithTrigger/Track
+ output = egamma/electronsWithTrigger/LHTight/Expert/Track
display = Draw=e1,StatBox
hist NOfBLayerHitsinBARREL {
@@ -809,7 +905,7 @@ dir egamma/LHTightElectronsWithTrigger/Expert/Track {
# CBLoose
dir egamma/CBLoosePhotons {
- output = egamma/photons
+ output = egamma/photons/CBLoose
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -827,14 +923,16 @@ dir egamma/CBLoosePhotons {
}
hist EtCone40 {
}
- hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Time {
}
}
dir egamma/CBLoosePhotons/Expert {
- output = egamma/photons/Expert
+ output = egamma/photons/CBLoose/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -850,9 +948,13 @@ dir egamma/CBLoosePhotons/Expert {
}
hist ConvTypeinBARREL {
}
- hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
+ hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Eta_Phi_Conv_with_Pt_gt_2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist NinENDCAP {
}
@@ -867,10 +969,16 @@ dir egamma/CBLoosePhotons/Expert {
hist ConvTypeinENDCAP {
}
hist Eta_Phi_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
- hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
+ hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
- hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
+ hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist NinCRACK {
}
@@ -888,10 +996,9 @@ dir egamma/CBLoosePhotons/Expert {
}
dir egamma/CBLoosePhotons/byLB {
- output = egamma/photons/LBMon
+ output = egamma/photons/CBLoose/Expert/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist Number_of_Unconv._photons_vs_LB {
}
hist Number_of_Conv._photons_vs_LB {
@@ -900,14 +1007,12 @@ dir egamma/CBLoosePhotons/byLB {
}
hist Conversion_fraction_vs_LB {
}
-
}
dir egamma/CBLoosePhotons/ID {
algorithm = egKolmogorov
- output = egamma/photons/ID
+ output = egamma/photons/CBLoose/Expert/ID
display = Draw=e1,StatBox
-
hist Ehad1inBARREL {
}
hist CoreEMinBARREL {
@@ -961,10 +1066,9 @@ dir egamma/CBLoosePhotons/ID {
# CBLooseWithTrigger
dir egamma/CBLoosePhotonsWithTrigger {
- output = egamma/photonsWithTrigger
+ output = egamma/photonsWithTrigger/CBLoose
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
@@ -979,17 +1083,18 @@ dir egamma/CBLoosePhotonsWithTrigger {
}
hist EtCone40 {
}
- hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Time {
}
}
dir egamma/CBLoosePhotonsWithTrigger/Expert {
- output = egamma/photonsWithTrigger/Expert
+ output = egamma/photonsWithTrigger/CBLoose/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist NinBARREL {
}
hist EtainBARREL {
@@ -1002,9 +1107,13 @@ dir egamma/CBLoosePhotonsWithTrigger/Expert {
}
hist ConvTypeinBARREL {
}
- hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
+ hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Eta_Phi_Conv_with_Pt_gt_2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist NinENDCAP {
}
@@ -1021,8 +1130,12 @@ dir egamma/CBLoosePhotonsWithTrigger/Expert {
hist Eta_Phi_with_Pt.gt.20GeV {
}
hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist NinCRACK {
}
@@ -1036,14 +1149,12 @@ dir egamma/CBLoosePhotonsWithTrigger/Expert {
}
hist ConvTypeinCRACK {
}
-
}
dir egamma/CBLoosePhotonsWithTrigger/byLB {
- output = egamma/photonsWithTrigger/LBMon
+ output = egamma/photonsWithTrigger/CBLoose/Expert/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist Number_of_Unconv._photons_vs_LB {
}
hist Number_of_Conv._photons_vs_LB {
@@ -1052,14 +1163,12 @@ dir egamma/CBLoosePhotonsWithTrigger/byLB {
}
hist Conversion_fraction_vs_LB {
}
-
}
dir egamma/CBLoosePhotonsWithTrigger/ID {
algorithm = egKolmogorov
- output = egamma/photonsWithTrigger/ID
+ output = egamma/photonsWithTrigger/CBLoose/Expert/ID
display = Draw=e1,StatBox
-
hist Ehad1inBARREL {
}
hist CoreEMinBARREL {
@@ -1113,10 +1222,9 @@ dir egamma/CBLoosePhotonsWithTrigger/ID {
# CBTight
dir egamma/CBTightPhotons {
- output = egamma/photons
+ output = egamma/photons/CBTight
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
@@ -1131,17 +1239,18 @@ dir egamma/CBTightPhotons {
}
hist EtCone40 {
}
- hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Time {
}
}
dir egamma/CBTightPhotons/Expert {
- output = egamma/photons/Expert
+ output = egamma/photons/CBTight/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist NinBARREL {
}
hist EtainBARREL {
@@ -1155,8 +1264,12 @@ dir egamma/CBTightPhotons/Expert {
hist ConvTypeinBARREL {
}
hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Eta_Phi_Conv_with_Pt_gt_2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist NinENDCAP {
}
@@ -1173,8 +1286,12 @@ dir egamma/CBTightPhotons/Expert {
hist Eta_Phi_with_Pt.gt.20GeV {
}
hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist NinCRACK {
}
@@ -1188,11 +1305,10 @@ dir egamma/CBTightPhotons/Expert {
}
hist ConvTypeinCRACK {
}
-
}
dir egamma/CBTightPhotons/byLB {
- output = egamma/photons/LBMon
+ output = egamma/photons/CBTight/Expert/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -1209,9 +1325,8 @@ dir egamma/CBTightPhotons/byLB {
dir egamma/CBTightPhotons/ID {
algorithm = egKolmogorov
- output = egamma/photons/ID
+ output = egamma/photons/CBTight/Expert/ID
display = Draw=e1,StatBox
-
hist Ehad1inBARREL {
}
hist CoreEMinBARREL {
@@ -1265,10 +1380,9 @@ dir egamma/CBTightPhotons/ID {
# CBTightWithTrigger
dir egamma/CBTightPhotonsWithTrigger {
- output = egamma/photonsWithTrigger
+ output = egamma/photonsWithTrigger/CBTight
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
@@ -1283,17 +1397,18 @@ dir egamma/CBTightPhotonsWithTrigger {
}
hist EtCone40 {
}
- hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Time {
}
}
dir egamma/CBTightPhotonsWithTrigger/Expert {
- output = egamma/photonsWithTrigger/Expert
+ output = egamma/photonsWithTrigger/CBTight/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist NinBARREL {
}
hist EtainBARREL {
@@ -1306,9 +1421,13 @@ dir egamma/CBTightPhotonsWithTrigger/Expert {
}
hist ConvTypeinBARREL {
}
- hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
+ hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Eta_Phi_Conv_with_Pt_gt_2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist NinENDCAP {
}
@@ -1323,10 +1442,16 @@ dir egamma/CBTightPhotonsWithTrigger/Expert {
hist ConvTypeinENDCAP {
}
hist Eta_Phi_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist NinCRACK {
}
@@ -1340,14 +1465,12 @@ dir egamma/CBTightPhotonsWithTrigger/Expert {
}
hist ConvTypeinCRACK {
}
-
}
dir egamma/CBTightPhotonsWithTrigger/byLB {
- output = egamma/photonsWithTrigger/LBMon
+ output = egamma/photonsWithTrigger/CBTight/Expert/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist Number_of_Unconv._photons_vs_LB {
}
hist Number_of_Conv._photons_vs_LB {
@@ -1361,7 +1484,7 @@ dir egamma/CBTightPhotonsWithTrigger/byLB {
dir egamma/CBTightPhotonsWithTrigger/ID {
algorithm = egKolmogorov
- output = egamma/photonsWithTrigger/ID
+ output = egamma/photonsWithTrigger/CBTight/Expert/ID
display = Draw=e1,StatBox
hist Ehad1inBARREL {
@@ -1423,9 +1546,8 @@ dir egamma/CBTightPhotonsWithTrigger/ID {
dir egamma/CBLooseFwdElectrons {
algorithm = egKolmogorov
- output = egamma/forwardElectrons
+ output = egamma/forwardElectrons/CBLoose
display = Draw=e1,StatBox
-
hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
@@ -1445,9 +1567,79 @@ dir egamma/CBLooseFwdElectrons {
dir egamma/CBLooseFwdElectrons {
algorithm = egKolmogorov
- output = egamma/forwardElectrons/ID
+ output = egamma/forwardElectrons/CBLoose
display = Draw=e1,StatBox
+ hist EnergyDensity {
+ }
+ hist FracMax {
+ }
+ hist Lateral {
+ }
+ hist Longitudinal {
+ }
+ hist SecondLambda {
+ }
+ hist SecondR {
+ }
+ hist CenterLambda {
+ }
+}
+
+dir egamma/CBLooseFwdElectrons/Expert {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/CBLoose/Expert
+ display = Draw=e1,StatBox
+
+ hist NinENDCAP {
+ display = Draw=e1,StatBox,LogY
+ }
+ hist NinFORWARD {
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Eta_Phi_distribution_Pt_gt_2.5GeV {
+ }
+ hist EtainENDCAP {
+ }
+ hist PhiinENDCAP {
+ }
+ hist TimeinENDCAP {
+ }
+ hist EtainFORWARD {
+ }
+ hist PhiinFORWARD {
+ }
+ hist TimeinFORWARD {
+ }
+}
+
+# CBTight Forward Electrons
+
+dir egamma/CBTightFwdElectrons {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/CBTight
+ display = Draw=e1,StatBox
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Et {
+ }
+ hist Phi {
+ }
+ hist Eta {
+ }
+ hist Time {
+ }
+ hist Eta_Phi_distributionf_Pt_gt_10GeV {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+}
+
+dir egamma/CBTightFwdElectrons {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/CBTight
+ display = Draw=e1,StatBox
hist EnergyDensity {
}
hist FracMax {
@@ -1464,10 +1656,79 @@ dir egamma/CBLooseFwdElectrons {
}
}
+dir egamma/CBTightFwdElectrons/Expert {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/CBTight/Expert
+ display = Draw=e1,StatBox
+ hist NinENDCAP {
+ display = Draw=e1,StatBox,LogY
+ }
+ hist NinFORWARD {
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Eta_Phi_distribution_Pt_gt_2.5GeV {
+ }
+ hist EtainENDCAP {
+ }
+ hist PhiinENDCAP {
+ }
+ hist TimeinENDCAP {
+ }
+ hist EtainFORWARD {
+ }
+ hist PhiinFORWARD {
+ }
+ hist TimeinFORWARD {
+ }
+}
-dir egamma/CBLooseFwdElectrons {
- algorithm = Egkolmogorov
- Output = egamma/forwardElectrons/Expert
+# LH Loose Forward Electrons
+
+dir egamma/LHLooseFwdElectrons {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/LHLoose
+ display = Draw=e1,StatBox
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Et {
+ }
+ hist Phi {
+ }
+ hist Eta {
+ }
+ hist Time {
+ }
+ hist Eta_Phi_distributionf_Pt_gt_10GeV {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+}
+
+dir egamma/LHLooseFwdElectrons {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/LHLoose
+ display = Draw=e1,StatBox
+ hist EnergyDensity {
+ }
+ hist FracMax {
+ }
+ hist Lateral {
+ }
+ hist Longitudinal {
+ }
+ hist SecondLambda {
+ }
+ hist SecondR {
+ }
+ hist CenterLambda {
+ }
+}
+
+
+dir egamma/LHLooseFwdElectrons/Expert {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/LHLoose/Expert
display = Draw=e1,StatBox
hist NinENDCAP {
@@ -1492,13 +1753,81 @@ dir egamma/CBLooseFwdElectrons {
}
}
+# LHTight Forward Electrons
+
+dir egamma/LHTightFwdElectrons {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/LHTight
+ display = Draw=e1,StatBox
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Et {
+ }
+ hist Phi {
+ }
+ hist Eta {
+ }
+ hist Time {
+ }
+ hist Eta_Phi_distributionf_Pt_gt_10GeV {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+}
+
+dir egamma/LHTightFwdElectrons {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/LHTight
+ display = Draw=e1,StatBox
+ hist EnergyDensity {
+ }
+ hist FracMax {
+ }
+ hist Lateral {
+ }
+ hist Longitudinal {
+ }
+ hist SecondLambda {
+ }
+ hist SecondR {
+ }
+ hist CenterLambda {
+ }
+}
+
+dir egamma/LHTightFwdElectrons/Expert {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/LHTight/Expert
+ display = Draw=e1,StatBox
+ hist NinENDCAP {
+ display = Draw=e1,StatBox,LogY
+ }
+ hist NinFORWARD {
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Eta_Phi_distribution_Pt_gt_2.5GeV {
+ }
+ hist EtainENDCAP {
+ }
+ hist PhiinENDCAP {
+ }
+ hist TimeinENDCAP {
+ }
+ hist EtainFORWARD {
+ }
+ hist PhiinFORWARD {
+ }
+ hist TimeinFORWARD {
+ }
+}
+
### Tag&Probe Z
dir egamma/TnPZ/TnPCandidate {
algorithm = egKolmogorov
output = egamma/tagandprobeZ
display = Draw=e1,StatBox
-
hist Z_candidate_mass {
algorithm = egamma_FitZmass
display = StatBox,gaus(80000.,100000.)
@@ -1519,7 +1848,6 @@ dir egamma/TnPZ/TnPCandidate {
algorithm = egamma_FitZmass
display = StatBox,gaus(80000.,100000.)
}
-
}
dir egamma/TnPZ/ID {
@@ -1570,7 +1898,6 @@ dir egamma/TnPZ/Tracks {
algorithm = egKolmogorov
output = egamma/tagandprobeZ/Track
display = Draw=e1,StatBox
-
hist NOfBLayerHitsProbeinBARREL {
}
hist NOfPixelHitsProbeinBARREL {
diff --git a/DataQuality/DataQualityConfigurations/config/Egamma/cosmics_run.config b/DataQuality/DataQualityConfigurations/config/Egamma/cosmics_run.config
index 0e239471642c..f1c86ee60cd8 100644
--- a/DataQuality/DataQualityConfigurations/config/Egamma/cosmics_run.config
+++ b/DataQuality/DataQualityConfigurations/config/Egamma/cosmics_run.config
@@ -122,51 +122,114 @@ algorithm egamma_FitJPsimass {
#############
output top_level {
- algorithm = WorstCaseSummary
+# algorithm = WorstCaseSummary
output egamma {
+# Photons
output photons {
- output Expert {
- }
- output ID {
- }
- output LBMon {
+ output CBLoose {
+ output Expert {
+ output ID {
+ }
+ output LBMon {
+ }
+ }
+ }
+ output CBTight {
+ output Expert {
+ output ID {
+ }
+ output LBMon {
+ }
+ }
}
}
output photonsWithTrigger {
- output Expert {
- }
- output ID {
+ output CBLoose {
+ output Expert {
+ output ID {
+ }
+ output LBMon {
+ }
+ }
}
- output LBMon {
+ output CBTight {
+ output Expert {
+ output ID {
+ }
+ output LBMon {
+ }
+ }
}
}
+
+# Electrons
output electrons {
- output Expert {
- }
- output ID {
- }
- output Track {
+ output LHLoose {
+ output Expert {
+ output ID {
+ }
+ output Track {
+ }
+ output LBMon {
+ }
+ }
}
- output LBMon {
+ output LHTight {
+ output Expert {
+ output ID {
+ }
+ output Track {
+ }
+ output LBMon {
+ }
+ }
}
}
output electronsWithTrigger {
- output Expert {
+ output LHLoose {
+ output Expert {
+ output ID {
+ }
+ output Track {
+ }
+ output LBMon {
+ }
}
- output ID {
+ }
+ output LHTight {
+ output Expert {
+ output ID {
+ }
+ output Track {
+ }
+ output LBMon {
+ }
}
- output Track {
+ }
+ }
+
+# FwdElectrons
+ output forwardElectrons {
+ output LHTight {
+ output Expert {
}
- output LBMon {
+ }
+ output LHLoose {
+ output Expert {
}
}
- output forwardElectrons {
- output ID {
+ output CBLoose {
+ output Expert {
}
+ }
+ output CBTight {
output Expert {
}
}
- output tagandprobeZ {
+ }
+
+# T&P
+ output tagandprobeZ {
output ID {
}
output Track {
@@ -182,7 +245,7 @@ output top_level {
output LBMon {
}
}
- }
+ }
}
#######################
@@ -196,7 +259,7 @@ output top_level {
# LhLoose
dir egamma/LHLooseElectrons {
- output = egamma/electrons
+ output = egamma/electrons/LHLoose
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -210,7 +273,9 @@ dir egamma/LHLooseElectrons {
}
hist Phi {
}
- hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist TopoEtCone40 {
}
@@ -221,18 +286,39 @@ dir egamma/LHLooseElectrons {
}
dir egamma/LHLooseElectrons/Expert {
- output = egamma/electrons/Expert
+ output = egamma/electrons/LHLoose/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
+ hist EtainENDCAP {
+ }
+ hist PhiinENDCAP {
+ }
+ hist TimeinENDCAP {
+ }
hist Eta_Phi_with_Pt_gt_2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
- hist Eta_Phi_with_Pt_gt_20GeV {
+ hist Eta_Phi_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist EtainBARREL {
+ }
+ hist PhiinBARREL {
+ }
+ hist TimeinBARREL {
+ }
+ hist EtainCRACK {
+ }
+ hist PhiinCRACK {
+ }
+ hist TimeinCRACK {
}
}
dir egamma/LHLooseElectrons/byLB {
- output = egamma/electrons/LBMon
+ output = egamma/electrons/LHLoose/Expert/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -242,7 +328,7 @@ dir egamma/LHLooseElectrons/byLB {
dir egamma/LHLooseElectrons/ID {
algorithm = egKolmogorov
- output = egamma/electrons/ID
+ output = egamma/electrons/LHLoose/Expert/ID
display = Draw=e1,StatBox
hist Ehad1inBARREL {
@@ -289,9 +375,9 @@ dir egamma/LHLooseElectrons/ID {
}
}
-dir egamma/LHLooseElectrons/Expert/Track {
+dir egamma/LHLooseElectrons/Tracks {
algorithm = egKolmogorov
- output = egamma/electrons/Track
+ output = egamma/electrons/LHLoose/Expert/Track
display = Draw=e1,StatBox
hist NOfBLayerHitsinBARREL {
@@ -342,13 +428,12 @@ dir egamma/LHLooseElectrons/Expert/Track {
}
hist Trackd0inCRACK {
}
-
}
# LhLooseWithTrigger
dir egamma/LHLooseElectronsWithTrigger {
- output = egamma/electronsWithTrigger
+ output = egamma/electronsWithTrigger/LHLoose
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -362,7 +447,9 @@ dir egamma/LHLooseElectronsWithTrigger {
}
hist Phi {
}
- hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist TopoEtCone40 {
}
@@ -373,7 +460,7 @@ dir egamma/LHLooseElectronsWithTrigger {
}
dir egamma/LHLooseElectronsWithTrigger/Expert {
- output = egamme/electronsWithTrigger/Expert
+ output = egamma/electronsWithTrigger/LHLoose/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -384,7 +471,7 @@ dir egamma/LHLooseElectronsWithTrigger/Expert {
}
dir egamma/LHLooseElectronsWithTrigger/byLB {
- output = egamme/electronsWithTrigger/LBMon
+ output = egamma/electronsWithTrigger/LHLoose/Expert/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -394,7 +481,7 @@ dir egamma/LHLooseElectronsWithTrigger/byLB {
dir egamma/LHLooseElectronsWithTrigger/ID {
algorithm = egKolmogorov
- output = egamme/electronsWithTrigger/ID
+ output = egamma/electronsWithTrigger/LHLoose/Expert/ID
display = Draw=e1,StatBox
hist Ehad1inBARREL {
@@ -441,9 +528,9 @@ dir egamma/LHLooseElectronsWithTrigger/ID {
}
}
-dir egamma/LHLooseElectronsWithTrigger/Expert/Track {
+dir egamma/LHLooseElectronsWithTrigger/Tracks {
algorithm = egKolmogorov
- output = egamme/electronsWithTrigger/Track
+ output = egamma/electronsWithTrigger/LHLoose/Expert/Track
display = Draw=e1,StatBox
hist NOfBLayerHitsinBARREL {
@@ -500,10 +587,9 @@ dir egamma/LHLooseElectronsWithTrigger/Expert/Track {
# LhTight
dir egamma/LHTightElectrons {
- output = egamme/electrons
+ output = egamma/electrons/LHTight
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
@@ -514,7 +600,9 @@ dir egamma/LHTightElectrons {
}
hist Phi {
}
- hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist TopoEtCone40 {
}
@@ -525,30 +613,49 @@ dir egamma/LHTightElectrons {
}
dir egamma/LHTightElectrons/Expert {
- output = egamme/electrons/Expert
+ output = egamma/electrons/LHTight/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
+ hist EtainENDCAP {
+ }
+ hist PhiinENDCAP {
+ }
+ hist TimeinENDCAP {
+ }
hist Eta_Phi_with_Pt_gt_2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
- hist Eta_Phi_with_Pt_gt_20GeV {
+ hist Eta_Phi_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist EtainBARREL {
+ }
+ hist PhiinBARREL {
+ }
+ hist TimeinBARREL {
+ }
+ hist EtainCRACK {
+ }
+ hist PhiinCRACK {
+ }
+ hist TimeinCRACK {
}
}
dir egamma/LHTightElectrons/byLB {
- output = egamma/electrons/LBMon
+ output = egamma/electrons/LHTight/Expert/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist LBEvON {
}
}
dir egamma/LHTightElectrons/ID {
algorithm = egKolmogorov
- output = egamma/electrons/ID
+ output = egamma/electrons/LHTight/Expert/ID
display = Draw=e1,StatBox
-
hist Ehad1inBARREL {
}
hist CoreEMinBARREL {
@@ -593,11 +700,10 @@ dir egamma/LHTightElectrons/ID {
}
}
-dir egamma/LHTightElectrons/Expert/Track {
+dir egamma/LHTightElectrons/Tracks {
algorithm = egKolmogorov
- output = egamma/electrons/Track
- display = Draw=e1,StatBox
-
+ output = egamma/electrons/LHTight/Expert/Track
+ Display = Draw=e1,StatBox
hist NOfBLayerHitsinBARREL {
}
hist NOfPixelHitsinBARREL {
@@ -646,27 +752,27 @@ dir egamma/LHTightElectrons/Expert/Track {
}
hist Trackd0inCRACK {
}
-
}
# LhTightWithTrigger
dir egamma/LHTightElectronsWithTrigger {
- output = egamme/electronsWithTrigger
+ output = egamma/electronsWithTrigger/LHTight
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
}
hist Et {
- }
+ }
hist Eta {
}
hist Phi {
}
- hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist TopoEtCone40 {
}
@@ -677,10 +783,9 @@ dir egamma/LHTightElectronsWithTrigger {
}
dir egamma/LHTightElectronsWithTrigger/Expert {
- output = egamme/electronsWithTrigger/Expert
+ output = egamma/electronsWithTrigger/LHTight/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist Eta_Phi_with_Pt_gt_2.5GeV {
}
hist Eta_Phi_with_Pt_gt_20GeV {
@@ -688,7 +793,7 @@ dir egamma/LHTightElectronsWithTrigger/Expert {
}
dir egamma/LHTightElectronsWithTrigger/byLB {
- output = egamme/electronsWithTrigger/LBMon
+ output = egamma/electronsWithTrigger/LHTight/Expert/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -698,9 +803,8 @@ dir egamma/LHTightElectronsWithTrigger/byLB {
dir egamma/LHTightElectronsWithTrigger/ID {
algorithm = egKolmogorov
- output = egamme/electronsWithTrigger/ID
+ output = egamma/electronsWithTrigger/LHTight/Expert/ID
display = Draw=e1,StatBox
-
hist Ehad1inBARREL {
}
hist CoreEMinBARREL {
@@ -745,9 +849,9 @@ dir egamma/LHTightElectronsWithTrigger/ID {
}
}
-dir egamma/LHTightElectronsWithTrigger/Expert/Track {
+dir egamma/LHTightElectronsWithTrigger/Tracks {
algorithm = egKolmogorov
- output = egamme/electronsWithTrigger/Track
+ output = egamma/electronsWithTrigger/LHTight/Expert/Track
display = Draw=e1,StatBox
hist NOfBLayerHitsinBARREL {
@@ -809,7 +913,7 @@ dir egamma/LHTightElectronsWithTrigger/Expert/Track {
# CBLoose
dir egamma/CBLoosePhotons {
- output = egamma/photons
+ output = egamma/photons/CBLoose
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -827,14 +931,16 @@ dir egamma/CBLoosePhotons {
}
hist EtCone40 {
}
- hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Time {
}
}
dir egamma/CBLoosePhotons/Expert {
- output = egamma/photons/Expert
+ output = egamma/photons/CBLoose/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -850,9 +956,13 @@ dir egamma/CBLoosePhotons/Expert {
}
hist ConvTypeinBARREL {
}
- hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
+ hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Eta_Phi_Conv_with_Pt_gt_2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist NinENDCAP {
}
@@ -867,10 +977,16 @@ dir egamma/CBLoosePhotons/Expert {
hist ConvTypeinENDCAP {
}
hist Eta_Phi_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
- hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
+ hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
- hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
+ hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist NinCRACK {
}
@@ -888,10 +1004,9 @@ dir egamma/CBLoosePhotons/Expert {
}
dir egamma/CBLoosePhotons/byLB {
- output = egamma/photons/LBMon
+ output = egamma/photons/CBLoose/Expert/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist Number_of_Unconv._photons_vs_LB {
}
hist Number_of_Conv._photons_vs_LB {
@@ -900,14 +1015,12 @@ dir egamma/CBLoosePhotons/byLB {
}
hist Conversion_fraction_vs_LB {
}
-
}
dir egamma/CBLoosePhotons/ID {
algorithm = egKolmogorov
- output = egamma/photons/ID
+ output = egamma/photons/CBLoose/Expert/ID
display = Draw=e1,StatBox
-
hist Ehad1inBARREL {
}
hist CoreEMinBARREL {
@@ -961,10 +1074,9 @@ dir egamma/CBLoosePhotons/ID {
# CBLooseWithTrigger
dir egamma/CBLoosePhotonsWithTrigger {
- output = egamma/photonsWithTrigger
+ output = egamma/photonsWithTrigger/CBLoose
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
@@ -979,17 +1091,18 @@ dir egamma/CBLoosePhotonsWithTrigger {
}
hist EtCone40 {
}
- hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Time {
}
}
dir egamma/CBLoosePhotonsWithTrigger/Expert {
- output = egamma/photonsWithTrigger/Expert
+ output = egamma/photonsWithTrigger/CBLoose/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist NinBARREL {
}
hist EtainBARREL {
@@ -1002,9 +1115,13 @@ dir egamma/CBLoosePhotonsWithTrigger/Expert {
}
hist ConvTypeinBARREL {
}
- hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
+ hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Eta_Phi_Conv_with_Pt_gt_2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist NinENDCAP {
}
@@ -1021,8 +1138,12 @@ dir egamma/CBLoosePhotonsWithTrigger/Expert {
hist Eta_Phi_with_Pt.gt.20GeV {
}
hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist NinCRACK {
}
@@ -1036,14 +1157,12 @@ dir egamma/CBLoosePhotonsWithTrigger/Expert {
}
hist ConvTypeinCRACK {
}
-
}
dir egamma/CBLoosePhotonsWithTrigger/byLB {
- output = egamma/photonsWithTrigger/LBMon
+ output = egamma/photonsWithTrigger/CBLoose/Expert/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist Number_of_Unconv._photons_vs_LB {
}
hist Number_of_Conv._photons_vs_LB {
@@ -1052,14 +1171,12 @@ dir egamma/CBLoosePhotonsWithTrigger/byLB {
}
hist Conversion_fraction_vs_LB {
}
-
}
dir egamma/CBLoosePhotonsWithTrigger/ID {
algorithm = egKolmogorov
- output = egamma/photonsWithTrigger/ID
+ output = egamma/photonsWithTrigger/CBLoose/Expert/ID
display = Draw=e1,StatBox
-
hist Ehad1inBARREL {
}
hist CoreEMinBARREL {
@@ -1113,10 +1230,9 @@ dir egamma/CBLoosePhotonsWithTrigger/ID {
# CBTight
dir egamma/CBTightPhotons {
- output = egamma/photons
+ output = egamma/photons/CBTight
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
@@ -1131,17 +1247,18 @@ dir egamma/CBTightPhotons {
}
hist EtCone40 {
}
- hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Time {
}
}
dir egamma/CBTightPhotons/Expert {
- output = egamma/photons/Expert
+ output = egamma/photons/CBTight/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist NinBARREL {
}
hist EtainBARREL {
@@ -1155,8 +1272,12 @@ dir egamma/CBTightPhotons/Expert {
hist ConvTypeinBARREL {
}
hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Eta_Phi_Conv_with_Pt_gt_2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist NinENDCAP {
}
@@ -1173,8 +1294,12 @@ dir egamma/CBTightPhotons/Expert {
hist Eta_Phi_with_Pt.gt.20GeV {
}
hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist NinCRACK {
}
@@ -1188,11 +1313,10 @@ dir egamma/CBTightPhotons/Expert {
}
hist ConvTypeinCRACK {
}
-
}
dir egamma/CBTightPhotons/byLB {
- output = egamma/photons/LBMon
+ output = egamma/photons/CBTight/Expert/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -1209,9 +1333,8 @@ dir egamma/CBTightPhotons/byLB {
dir egamma/CBTightPhotons/ID {
algorithm = egKolmogorov
- output = egamma/photons/ID
+ output = egamma/photons/CBTight/Expert/ID
display = Draw=e1,StatBox
-
hist Ehad1inBARREL {
}
hist CoreEMinBARREL {
@@ -1265,10 +1388,9 @@ dir egamma/CBTightPhotons/ID {
# CBTightWithTrigger
dir egamma/CBTightPhotonsWithTrigger {
- output = egamma/photonsWithTrigger
+ output = egamma/photonsWithTrigger/CBTight
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
@@ -1283,17 +1405,18 @@ dir egamma/CBTightPhotonsWithTrigger {
}
hist EtCone40 {
}
- hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Time {
}
}
dir egamma/CBTightPhotonsWithTrigger/Expert {
- output = egamma/photonsWithTrigger/Expert
+ output = egamma/photonsWithTrigger/CBTight/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist NinBARREL {
}
hist EtainBARREL {
@@ -1306,9 +1429,13 @@ dir egamma/CBTightPhotonsWithTrigger/Expert {
}
hist ConvTypeinBARREL {
}
- hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
+ hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Eta_Phi_Conv_with_Pt_gt_2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist NinENDCAP {
}
@@ -1323,10 +1450,16 @@ dir egamma/CBTightPhotonsWithTrigger/Expert {
hist ConvTypeinENDCAP {
}
hist Eta_Phi_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist NinCRACK {
}
@@ -1340,14 +1473,12 @@ dir egamma/CBTightPhotonsWithTrigger/Expert {
}
hist ConvTypeinCRACK {
}
-
}
dir egamma/CBTightPhotonsWithTrigger/byLB {
- output = egamma/photonsWithTrigger/LBMon
+ output = egamma/photonsWithTrigger/CBTight/Expert/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist Number_of_Unconv._photons_vs_LB {
}
hist Number_of_Conv._photons_vs_LB {
@@ -1361,7 +1492,7 @@ dir egamma/CBTightPhotonsWithTrigger/byLB {
dir egamma/CBTightPhotonsWithTrigger/ID {
algorithm = egKolmogorov
- output = egamma/photonsWithTrigger/ID
+ output = egamma/photonsWithTrigger/CBTight/Expert/ID
display = Draw=e1,StatBox
hist Ehad1inBARREL {
@@ -1423,9 +1554,8 @@ dir egamma/CBTightPhotonsWithTrigger/ID {
dir egamma/CBLooseFwdElectrons {
algorithm = egKolmogorov
- output = egamma/forwardElectrons
+ output = egamma/forwardElectrons/CBLoose
display = Draw=e1,StatBox
-
hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
@@ -1445,9 +1575,79 @@ dir egamma/CBLooseFwdElectrons {
dir egamma/CBLooseFwdElectrons {
algorithm = egKolmogorov
- output = egamma/forwardElectrons/ID
+ output = egamma/forwardElectrons/CBLoose
display = Draw=e1,StatBox
+ hist EnergyDensity {
+ }
+ hist FracMax {
+ }
+ hist Lateral {
+ }
+ hist Longitudinal {
+ }
+ hist SecondLambda {
+ }
+ hist SecondR {
+ }
+ hist CenterLambda {
+ }
+}
+
+dir egamma/CBLooseFwdElectrons/Expert {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/CBLoose/Expert
+ display = Draw=e1,StatBox
+
+ hist NinENDCAP {
+ display = Draw=e1,StatBox,LogY
+ }
+ hist NinFORWARD {
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Eta_Phi_distribution_Pt_gt_2.5GeV {
+ }
+ hist EtainENDCAP {
+ }
+ hist PhiinENDCAP {
+ }
+ hist TimeinENDCAP {
+ }
+ hist EtainFORWARD {
+ }
+ hist PhiinFORWARD {
+ }
+ hist TimeinFORWARD {
+ }
+}
+
+# CBTight Forward Electrons
+
+dir egamma/CBTightFwdElectrons {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/CBTight
+ display = Draw=e1,StatBox
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Et {
+ }
+ hist Phi {
+ }
+ hist Eta {
+ }
+ hist Time {
+ }
+ hist Eta_Phi_distributionf_Pt_gt_10GeV {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+}
+
+dir egamma/CBTightFwdElectrons {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/CBTight
+ display = Draw=e1,StatBox
hist EnergyDensity {
}
hist FracMax {
@@ -1464,10 +1664,79 @@ dir egamma/CBLooseFwdElectrons {
}
}
+dir egamma/CBTightFwdElectrons/Expert {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/CBTight/Expert
+ display = Draw=e1,StatBox
+ hist NinENDCAP {
+ display = Draw=e1,StatBox,LogY
+ }
+ hist NinFORWARD {
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Eta_Phi_distribution_Pt_gt_2.5GeV {
+ }
+ hist EtainENDCAP {
+ }
+ hist PhiinENDCAP {
+ }
+ hist TimeinENDCAP {
+ }
+ hist EtainFORWARD {
+ }
+ hist PhiinFORWARD {
+ }
+ hist TimeinFORWARD {
+ }
+}
-dir egamma/CBLooseFwdElectrons {
- algorithm = Egkolmogorov
- Output = egamma/forwardElectrons/Expert
+# LH Loose Forward Electrons
+
+dir egamma/LHLooseFwdElectrons {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/LHLoose
+ display = Draw=e1,StatBox
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Et {
+ }
+ hist Phi {
+ }
+ hist Eta {
+ }
+ hist Time {
+ }
+ hist Eta_Phi_distributionf_Pt_gt_10GeV {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+}
+
+dir egamma/LHLooseFwdElectrons {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/LHLoose
+ display = Draw=e1,StatBox
+ hist EnergyDensity {
+ }
+ hist FracMax {
+ }
+ hist Lateral {
+ }
+ hist Longitudinal {
+ }
+ hist SecondLambda {
+ }
+ hist SecondR {
+ }
+ hist CenterLambda {
+ }
+}
+
+
+dir egamma/LHLooseFwdElectrons/Expert {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/LHLoose/Expert
display = Draw=e1,StatBox
hist NinENDCAP {
@@ -1492,13 +1761,81 @@ dir egamma/CBLooseFwdElectrons {
}
}
+# LHTight Forward Electrons
+
+dir egamma/LHTightFwdElectrons {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/LHTight
+ display = Draw=e1,StatBox
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Et {
+ }
+ hist Phi {
+ }
+ hist Eta {
+ }
+ hist Time {
+ }
+ hist Eta_Phi_distributionf_Pt_gt_10GeV {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+}
+
+dir egamma/LHTightFwdElectrons {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/LHTight
+ display = Draw=e1,StatBox
+ hist EnergyDensity {
+ }
+ hist FracMax {
+ }
+ hist Lateral {
+ }
+ hist Longitudinal {
+ }
+ hist SecondLambda {
+ }
+ hist SecondR {
+ }
+ hist CenterLambda {
+ }
+}
+
+dir egamma/LHTightFwdElectrons/Expert {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/LHTight/Expert
+ display = Draw=e1,StatBox
+ hist NinENDCAP {
+ display = Draw=e1,StatBox,LogY
+ }
+ hist NinFORWARD {
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Eta_Phi_distribution_Pt_gt_2.5GeV {
+ }
+ hist EtainENDCAP {
+ }
+ hist PhiinENDCAP {
+ }
+ hist TimeinENDCAP {
+ }
+ hist EtainFORWARD {
+ }
+ hist PhiinFORWARD {
+ }
+ hist TimeinFORWARD {
+ }
+}
+
### Tag&Probe Z
dir egamma/TnPZ/TnPCandidate {
algorithm = egKolmogorov
output = egamma/tagandprobeZ
display = Draw=e1,StatBox
-
hist Z_candidate_mass {
algorithm = egamma_FitZmass
display = StatBox,gaus(80000.,100000.)
@@ -1519,7 +1856,6 @@ dir egamma/TnPZ/TnPCandidate {
algorithm = egamma_FitZmass
display = StatBox,gaus(80000.,100000.)
}
-
}
dir egamma/TnPZ/ID {
@@ -1570,7 +1906,6 @@ dir egamma/TnPZ/Tracks {
algorithm = egKolmogorov
output = egamma/tagandprobeZ/Track
display = Draw=e1,StatBox
-
hist NOfBLayerHitsProbeinBARREL {
}
hist NOfPixelHitsProbeinBARREL {
diff --git a/DataQuality/DataQualityConfigurations/config/Egamma/heavyions_run.config b/DataQuality/DataQualityConfigurations/config/Egamma/heavyions_run.config
index 0e239471642c..f1c86ee60cd8 100644
--- a/DataQuality/DataQualityConfigurations/config/Egamma/heavyions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/Egamma/heavyions_run.config
@@ -122,51 +122,114 @@ algorithm egamma_FitJPsimass {
#############
output top_level {
- algorithm = WorstCaseSummary
+# algorithm = WorstCaseSummary
output egamma {
+# Photons
output photons {
- output Expert {
- }
- output ID {
- }
- output LBMon {
+ output CBLoose {
+ output Expert {
+ output ID {
+ }
+ output LBMon {
+ }
+ }
+ }
+ output CBTight {
+ output Expert {
+ output ID {
+ }
+ output LBMon {
+ }
+ }
}
}
output photonsWithTrigger {
- output Expert {
- }
- output ID {
+ output CBLoose {
+ output Expert {
+ output ID {
+ }
+ output LBMon {
+ }
+ }
}
- output LBMon {
+ output CBTight {
+ output Expert {
+ output ID {
+ }
+ output LBMon {
+ }
+ }
}
}
+
+# Electrons
output electrons {
- output Expert {
- }
- output ID {
- }
- output Track {
+ output LHLoose {
+ output Expert {
+ output ID {
+ }
+ output Track {
+ }
+ output LBMon {
+ }
+ }
}
- output LBMon {
+ output LHTight {
+ output Expert {
+ output ID {
+ }
+ output Track {
+ }
+ output LBMon {
+ }
+ }
}
}
output electronsWithTrigger {
- output Expert {
+ output LHLoose {
+ output Expert {
+ output ID {
+ }
+ output Track {
+ }
+ output LBMon {
+ }
}
- output ID {
+ }
+ output LHTight {
+ output Expert {
+ output ID {
+ }
+ output Track {
+ }
+ output LBMon {
+ }
}
- output Track {
+ }
+ }
+
+# FwdElectrons
+ output forwardElectrons {
+ output LHTight {
+ output Expert {
}
- output LBMon {
+ }
+ output LHLoose {
+ output Expert {
}
}
- output forwardElectrons {
- output ID {
+ output CBLoose {
+ output Expert {
}
+ }
+ output CBTight {
output Expert {
}
}
- output tagandprobeZ {
+ }
+
+# T&P
+ output tagandprobeZ {
output ID {
}
output Track {
@@ -182,7 +245,7 @@ output top_level {
output LBMon {
}
}
- }
+ }
}
#######################
@@ -196,7 +259,7 @@ output top_level {
# LhLoose
dir egamma/LHLooseElectrons {
- output = egamma/electrons
+ output = egamma/electrons/LHLoose
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -210,7 +273,9 @@ dir egamma/LHLooseElectrons {
}
hist Phi {
}
- hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist TopoEtCone40 {
}
@@ -221,18 +286,39 @@ dir egamma/LHLooseElectrons {
}
dir egamma/LHLooseElectrons/Expert {
- output = egamma/electrons/Expert
+ output = egamma/electrons/LHLoose/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
+ hist EtainENDCAP {
+ }
+ hist PhiinENDCAP {
+ }
+ hist TimeinENDCAP {
+ }
hist Eta_Phi_with_Pt_gt_2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
- hist Eta_Phi_with_Pt_gt_20GeV {
+ hist Eta_Phi_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist EtainBARREL {
+ }
+ hist PhiinBARREL {
+ }
+ hist TimeinBARREL {
+ }
+ hist EtainCRACK {
+ }
+ hist PhiinCRACK {
+ }
+ hist TimeinCRACK {
}
}
dir egamma/LHLooseElectrons/byLB {
- output = egamma/electrons/LBMon
+ output = egamma/electrons/LHLoose/Expert/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -242,7 +328,7 @@ dir egamma/LHLooseElectrons/byLB {
dir egamma/LHLooseElectrons/ID {
algorithm = egKolmogorov
- output = egamma/electrons/ID
+ output = egamma/electrons/LHLoose/Expert/ID
display = Draw=e1,StatBox
hist Ehad1inBARREL {
@@ -289,9 +375,9 @@ dir egamma/LHLooseElectrons/ID {
}
}
-dir egamma/LHLooseElectrons/Expert/Track {
+dir egamma/LHLooseElectrons/Tracks {
algorithm = egKolmogorov
- output = egamma/electrons/Track
+ output = egamma/electrons/LHLoose/Expert/Track
display = Draw=e1,StatBox
hist NOfBLayerHitsinBARREL {
@@ -342,13 +428,12 @@ dir egamma/LHLooseElectrons/Expert/Track {
}
hist Trackd0inCRACK {
}
-
}
# LhLooseWithTrigger
dir egamma/LHLooseElectronsWithTrigger {
- output = egamma/electronsWithTrigger
+ output = egamma/electronsWithTrigger/LHLoose
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -362,7 +447,9 @@ dir egamma/LHLooseElectronsWithTrigger {
}
hist Phi {
}
- hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist TopoEtCone40 {
}
@@ -373,7 +460,7 @@ dir egamma/LHLooseElectronsWithTrigger {
}
dir egamma/LHLooseElectronsWithTrigger/Expert {
- output = egamme/electronsWithTrigger/Expert
+ output = egamma/electronsWithTrigger/LHLoose/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -384,7 +471,7 @@ dir egamma/LHLooseElectronsWithTrigger/Expert {
}
dir egamma/LHLooseElectronsWithTrigger/byLB {
- output = egamme/electronsWithTrigger/LBMon
+ output = egamma/electronsWithTrigger/LHLoose/Expert/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -394,7 +481,7 @@ dir egamma/LHLooseElectronsWithTrigger/byLB {
dir egamma/LHLooseElectronsWithTrigger/ID {
algorithm = egKolmogorov
- output = egamme/electronsWithTrigger/ID
+ output = egamma/electronsWithTrigger/LHLoose/Expert/ID
display = Draw=e1,StatBox
hist Ehad1inBARREL {
@@ -441,9 +528,9 @@ dir egamma/LHLooseElectronsWithTrigger/ID {
}
}
-dir egamma/LHLooseElectronsWithTrigger/Expert/Track {
+dir egamma/LHLooseElectronsWithTrigger/Tracks {
algorithm = egKolmogorov
- output = egamme/electronsWithTrigger/Track
+ output = egamma/electronsWithTrigger/LHLoose/Expert/Track
display = Draw=e1,StatBox
hist NOfBLayerHitsinBARREL {
@@ -500,10 +587,9 @@ dir egamma/LHLooseElectronsWithTrigger/Expert/Track {
# LhTight
dir egamma/LHTightElectrons {
- output = egamme/electrons
+ output = egamma/electrons/LHTight
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
@@ -514,7 +600,9 @@ dir egamma/LHTightElectrons {
}
hist Phi {
}
- hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist TopoEtCone40 {
}
@@ -525,30 +613,49 @@ dir egamma/LHTightElectrons {
}
dir egamma/LHTightElectrons/Expert {
- output = egamme/electrons/Expert
+ output = egamma/electrons/LHTight/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
+ hist EtainENDCAP {
+ }
+ hist PhiinENDCAP {
+ }
+ hist TimeinENDCAP {
+ }
hist Eta_Phi_with_Pt_gt_2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
- hist Eta_Phi_with_Pt_gt_20GeV {
+ hist Eta_Phi_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
+ }
+ hist EtainBARREL {
+ }
+ hist PhiinBARREL {
+ }
+ hist TimeinBARREL {
+ }
+ hist EtainCRACK {
+ }
+ hist PhiinCRACK {
+ }
+ hist TimeinCRACK {
}
}
dir egamma/LHTightElectrons/byLB {
- output = egamma/electrons/LBMon
+ output = egamma/electrons/LHTight/Expert/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist LBEvON {
}
}
dir egamma/LHTightElectrons/ID {
algorithm = egKolmogorov
- output = egamma/electrons/ID
+ output = egamma/electrons/LHTight/Expert/ID
display = Draw=e1,StatBox
-
hist Ehad1inBARREL {
}
hist CoreEMinBARREL {
@@ -593,11 +700,10 @@ dir egamma/LHTightElectrons/ID {
}
}
-dir egamma/LHTightElectrons/Expert/Track {
+dir egamma/LHTightElectrons/Tracks {
algorithm = egKolmogorov
- output = egamma/electrons/Track
- display = Draw=e1,StatBox
-
+ output = egamma/electrons/LHTight/Expert/Track
+ Display = Draw=e1,StatBox
hist NOfBLayerHitsinBARREL {
}
hist NOfPixelHitsinBARREL {
@@ -646,27 +752,27 @@ dir egamma/LHTightElectrons/Expert/Track {
}
hist Trackd0inCRACK {
}
-
}
# LhTightWithTrigger
dir egamma/LHTightElectronsWithTrigger {
- output = egamme/electronsWithTrigger
+ output = egamma/electronsWithTrigger/LHTight
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
}
hist Et {
- }
+ }
hist Eta {
}
hist Phi {
}
- hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist TopoEtCone40 {
}
@@ -677,10 +783,9 @@ dir egamma/LHTightElectronsWithTrigger {
}
dir egamma/LHTightElectronsWithTrigger/Expert {
- output = egamme/electronsWithTrigger/Expert
+ output = egamma/electronsWithTrigger/LHTight/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist Eta_Phi_with_Pt_gt_2.5GeV {
}
hist Eta_Phi_with_Pt_gt_20GeV {
@@ -688,7 +793,7 @@ dir egamma/LHTightElectronsWithTrigger/Expert {
}
dir egamma/LHTightElectronsWithTrigger/byLB {
- output = egamme/electronsWithTrigger/LBMon
+ output = egamma/electronsWithTrigger/LHTight/Expert/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -698,9 +803,8 @@ dir egamma/LHTightElectronsWithTrigger/byLB {
dir egamma/LHTightElectronsWithTrigger/ID {
algorithm = egKolmogorov
- output = egamme/electronsWithTrigger/ID
+ output = egamma/electronsWithTrigger/LHTight/Expert/ID
display = Draw=e1,StatBox
-
hist Ehad1inBARREL {
}
hist CoreEMinBARREL {
@@ -745,9 +849,9 @@ dir egamma/LHTightElectronsWithTrigger/ID {
}
}
-dir egamma/LHTightElectronsWithTrigger/Expert/Track {
+dir egamma/LHTightElectronsWithTrigger/Tracks {
algorithm = egKolmogorov
- output = egamme/electronsWithTrigger/Track
+ output = egamma/electronsWithTrigger/LHTight/Expert/Track
display = Draw=e1,StatBox
hist NOfBLayerHitsinBARREL {
@@ -809,7 +913,7 @@ dir egamma/LHTightElectronsWithTrigger/Expert/Track {
# CBLoose
dir egamma/CBLoosePhotons {
- output = egamma/photons
+ output = egamma/photons/CBLoose
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -827,14 +931,16 @@ dir egamma/CBLoosePhotons {
}
hist EtCone40 {
}
- hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Time {
}
}
dir egamma/CBLoosePhotons/Expert {
- output = egamma/photons/Expert
+ output = egamma/photons/CBLoose/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -850,9 +956,13 @@ dir egamma/CBLoosePhotons/Expert {
}
hist ConvTypeinBARREL {
}
- hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
+ hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Eta_Phi_Conv_with_Pt_gt_2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist NinENDCAP {
}
@@ -867,10 +977,16 @@ dir egamma/CBLoosePhotons/Expert {
hist ConvTypeinENDCAP {
}
hist Eta_Phi_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
- hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
+ hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
- hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
+ hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist NinCRACK {
}
@@ -888,10 +1004,9 @@ dir egamma/CBLoosePhotons/Expert {
}
dir egamma/CBLoosePhotons/byLB {
- output = egamma/photons/LBMon
+ output = egamma/photons/CBLoose/Expert/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist Number_of_Unconv._photons_vs_LB {
}
hist Number_of_Conv._photons_vs_LB {
@@ -900,14 +1015,12 @@ dir egamma/CBLoosePhotons/byLB {
}
hist Conversion_fraction_vs_LB {
}
-
}
dir egamma/CBLoosePhotons/ID {
algorithm = egKolmogorov
- output = egamma/photons/ID
+ output = egamma/photons/CBLoose/Expert/ID
display = Draw=e1,StatBox
-
hist Ehad1inBARREL {
}
hist CoreEMinBARREL {
@@ -961,10 +1074,9 @@ dir egamma/CBLoosePhotons/ID {
# CBLooseWithTrigger
dir egamma/CBLoosePhotonsWithTrigger {
- output = egamma/photonsWithTrigger
+ output = egamma/photonsWithTrigger/CBLoose
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
@@ -979,17 +1091,18 @@ dir egamma/CBLoosePhotonsWithTrigger {
}
hist EtCone40 {
}
- hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Time {
}
}
dir egamma/CBLoosePhotonsWithTrigger/Expert {
- output = egamma/photonsWithTrigger/Expert
+ output = egamma/photonsWithTrigger/CBLoose/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist NinBARREL {
}
hist EtainBARREL {
@@ -1002,9 +1115,13 @@ dir egamma/CBLoosePhotonsWithTrigger/Expert {
}
hist ConvTypeinBARREL {
}
- hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
+ hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Eta_Phi_Conv_with_Pt_gt_2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist NinENDCAP {
}
@@ -1021,8 +1138,12 @@ dir egamma/CBLoosePhotonsWithTrigger/Expert {
hist Eta_Phi_with_Pt.gt.20GeV {
}
hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist NinCRACK {
}
@@ -1036,14 +1157,12 @@ dir egamma/CBLoosePhotonsWithTrigger/Expert {
}
hist ConvTypeinCRACK {
}
-
}
dir egamma/CBLoosePhotonsWithTrigger/byLB {
- output = egamma/photonsWithTrigger/LBMon
+ output = egamma/photonsWithTrigger/CBLoose/Expert/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist Number_of_Unconv._photons_vs_LB {
}
hist Number_of_Conv._photons_vs_LB {
@@ -1052,14 +1171,12 @@ dir egamma/CBLoosePhotonsWithTrigger/byLB {
}
hist Conversion_fraction_vs_LB {
}
-
}
dir egamma/CBLoosePhotonsWithTrigger/ID {
algorithm = egKolmogorov
- output = egamma/photonsWithTrigger/ID
+ output = egamma/photonsWithTrigger/CBLoose/Expert/ID
display = Draw=e1,StatBox
-
hist Ehad1inBARREL {
}
hist CoreEMinBARREL {
@@ -1113,10 +1230,9 @@ dir egamma/CBLoosePhotonsWithTrigger/ID {
# CBTight
dir egamma/CBTightPhotons {
- output = egamma/photons
+ output = egamma/photons/CBTight
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
@@ -1131,17 +1247,18 @@ dir egamma/CBTightPhotons {
}
hist EtCone40 {
}
- hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Time {
}
}
dir egamma/CBTightPhotons/Expert {
- output = egamma/photons/Expert
+ output = egamma/photons/CBTight/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist NinBARREL {
}
hist EtainBARREL {
@@ -1155,8 +1272,12 @@ dir egamma/CBTightPhotons/Expert {
hist ConvTypeinBARREL {
}
hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Eta_Phi_Conv_with_Pt_gt_2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist NinENDCAP {
}
@@ -1173,8 +1294,12 @@ dir egamma/CBTightPhotons/Expert {
hist Eta_Phi_with_Pt.gt.20GeV {
}
hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist NinCRACK {
}
@@ -1188,11 +1313,10 @@ dir egamma/CBTightPhotons/Expert {
}
hist ConvTypeinCRACK {
}
-
}
dir egamma/CBTightPhotons/byLB {
- output = egamma/photons/LBMon
+ output = egamma/photons/CBTight/Expert/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
@@ -1209,9 +1333,8 @@ dir egamma/CBTightPhotons/byLB {
dir egamma/CBTightPhotons/ID {
algorithm = egKolmogorov
- output = egamma/photons/ID
+ output = egamma/photons/CBTight/Expert/ID
display = Draw=e1,StatBox
-
hist Ehad1inBARREL {
}
hist CoreEMinBARREL {
@@ -1265,10 +1388,9 @@ dir egamma/CBTightPhotons/ID {
# CBTightWithTrigger
dir egamma/CBTightPhotonsWithTrigger {
- output = egamma/photonsWithTrigger
+ output = egamma/photonsWithTrigger/CBTight
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
@@ -1283,17 +1405,18 @@ dir egamma/CBTightPhotonsWithTrigger {
}
hist EtCone40 {
}
- hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ hist Eta_Phi_distribution_with_Pt.gt.4GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Time {
}
}
dir egamma/CBTightPhotonsWithTrigger/Expert {
- output = egamma/photonsWithTrigger/Expert
+ output = egamma/photonsWithTrigger/CBTight/Expert
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist NinBARREL {
}
hist EtainBARREL {
@@ -1306,9 +1429,13 @@ dir egamma/CBTightPhotonsWithTrigger/Expert {
}
hist ConvTypeinBARREL {
}
- hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
+ hist Eta_Phi_Unconv_with_Pt.gt.2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Eta_Phi_Conv_with_Pt_gt_2.5GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist NinENDCAP {
}
@@ -1323,10 +1450,16 @@ dir egamma/CBTightPhotonsWithTrigger/Expert {
hist ConvTypeinENDCAP {
}
hist Eta_Phi_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Eta_Phi_distribution_of_Unconv._photons_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist Eta_Phi_distribution_of_Conv._photons_with_Pt.gt.20GeV {
+ algorithm = 2D_Histogram_Not_Empty
+ display = Ref2DSignif, TCanvas(490,900)
}
hist NinCRACK {
}
@@ -1340,14 +1473,12 @@ dir egamma/CBTightPhotonsWithTrigger/Expert {
}
hist ConvTypeinCRACK {
}
-
}
dir egamma/CBTightPhotonsWithTrigger/byLB {
- output = egamma/photonsWithTrigger/LBMon
+ output = egamma/photonsWithTrigger/CBTight/Expert/LBMon
algorithm = egKolmogorov
display = Draw=e1, DrawRef=HIST, StatBox
-
hist Number_of_Unconv._photons_vs_LB {
}
hist Number_of_Conv._photons_vs_LB {
@@ -1361,7 +1492,7 @@ dir egamma/CBTightPhotonsWithTrigger/byLB {
dir egamma/CBTightPhotonsWithTrigger/ID {
algorithm = egKolmogorov
- output = egamma/photonsWithTrigger/ID
+ output = egamma/photonsWithTrigger/CBTight/Expert/ID
display = Draw=e1,StatBox
hist Ehad1inBARREL {
@@ -1423,9 +1554,8 @@ dir egamma/CBTightPhotonsWithTrigger/ID {
dir egamma/CBLooseFwdElectrons {
algorithm = egKolmogorov
- output = egamma/forwardElectrons
+ output = egamma/forwardElectrons/CBLoose
display = Draw=e1,StatBox
-
hist N {
algorithm = egamma_Histogram_Not_Empty
display = Draw=e1,StatBox,LogY
@@ -1445,9 +1575,79 @@ dir egamma/CBLooseFwdElectrons {
dir egamma/CBLooseFwdElectrons {
algorithm = egKolmogorov
- output = egamma/forwardElectrons/ID
+ output = egamma/forwardElectrons/CBLoose
display = Draw=e1,StatBox
+ hist EnergyDensity {
+ }
+ hist FracMax {
+ }
+ hist Lateral {
+ }
+ hist Longitudinal {
+ }
+ hist SecondLambda {
+ }
+ hist SecondR {
+ }
+ hist CenterLambda {
+ }
+}
+
+dir egamma/CBLooseFwdElectrons/Expert {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/CBLoose/Expert
+ display = Draw=e1,StatBox
+
+ hist NinENDCAP {
+ display = Draw=e1,StatBox,LogY
+ }
+ hist NinFORWARD {
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Eta_Phi_distribution_Pt_gt_2.5GeV {
+ }
+ hist EtainENDCAP {
+ }
+ hist PhiinENDCAP {
+ }
+ hist TimeinENDCAP {
+ }
+ hist EtainFORWARD {
+ }
+ hist PhiinFORWARD {
+ }
+ hist TimeinFORWARD {
+ }
+}
+
+# CBTight Forward Electrons
+
+dir egamma/CBTightFwdElectrons {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/CBTight
+ display = Draw=e1,StatBox
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Et {
+ }
+ hist Phi {
+ }
+ hist Eta {
+ }
+ hist Time {
+ }
+ hist Eta_Phi_distributionf_Pt_gt_10GeV {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+}
+
+dir egamma/CBTightFwdElectrons {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/CBTight
+ display = Draw=e1,StatBox
hist EnergyDensity {
}
hist FracMax {
@@ -1464,10 +1664,79 @@ dir egamma/CBLooseFwdElectrons {
}
}
+dir egamma/CBTightFwdElectrons/Expert {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/CBTight/Expert
+ display = Draw=e1,StatBox
+ hist NinENDCAP {
+ display = Draw=e1,StatBox,LogY
+ }
+ hist NinFORWARD {
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Eta_Phi_distribution_Pt_gt_2.5GeV {
+ }
+ hist EtainENDCAP {
+ }
+ hist PhiinENDCAP {
+ }
+ hist TimeinENDCAP {
+ }
+ hist EtainFORWARD {
+ }
+ hist PhiinFORWARD {
+ }
+ hist TimeinFORWARD {
+ }
+}
-dir egamma/CBLooseFwdElectrons {
- algorithm = Egkolmogorov
- Output = egamma/forwardElectrons/Expert
+# LH Loose Forward Electrons
+
+dir egamma/LHLooseFwdElectrons {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/LHLoose
+ display = Draw=e1,StatBox
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Et {
+ }
+ hist Phi {
+ }
+ hist Eta {
+ }
+ hist Time {
+ }
+ hist Eta_Phi_distributionf_Pt_gt_10GeV {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+}
+
+dir egamma/LHLooseFwdElectrons {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/LHLoose
+ display = Draw=e1,StatBox
+ hist EnergyDensity {
+ }
+ hist FracMax {
+ }
+ hist Lateral {
+ }
+ hist Longitudinal {
+ }
+ hist SecondLambda {
+ }
+ hist SecondR {
+ }
+ hist CenterLambda {
+ }
+}
+
+
+dir egamma/LHLooseFwdElectrons/Expert {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/LHLoose/Expert
display = Draw=e1,StatBox
hist NinENDCAP {
@@ -1492,13 +1761,81 @@ dir egamma/CBLooseFwdElectrons {
}
}
+# LHTight Forward Electrons
+
+dir egamma/LHTightFwdElectrons {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/LHTight
+ display = Draw=e1,StatBox
+ hist N {
+ algorithm = egamma_Histogram_Not_Empty
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Et {
+ }
+ hist Phi {
+ }
+ hist Eta {
+ }
+ hist Time {
+ }
+ hist Eta_Phi_distributionf_Pt_gt_10GeV {
+ algorithm = egamma_BinsDiffFromStripMedian
+ }
+}
+
+dir egamma/LHTightFwdElectrons {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/LHTight
+ display = Draw=e1,StatBox
+ hist EnergyDensity {
+ }
+ hist FracMax {
+ }
+ hist Lateral {
+ }
+ hist Longitudinal {
+ }
+ hist SecondLambda {
+ }
+ hist SecondR {
+ }
+ hist CenterLambda {
+ }
+}
+
+dir egamma/LHTightFwdElectrons/Expert {
+ algorithm = egKolmogorov
+ output = egamma/forwardElectrons/LHTight/Expert
+ display = Draw=e1,StatBox
+ hist NinENDCAP {
+ display = Draw=e1,StatBox,LogY
+ }
+ hist NinFORWARD {
+ display = Draw=e1,StatBox,LogY
+ }
+ hist Eta_Phi_distribution_Pt_gt_2.5GeV {
+ }
+ hist EtainENDCAP {
+ }
+ hist PhiinENDCAP {
+ }
+ hist TimeinENDCAP {
+ }
+ hist EtainFORWARD {
+ }
+ hist PhiinFORWARD {
+ }
+ hist TimeinFORWARD {
+ }
+}
+
### Tag&Probe Z
dir egamma/TnPZ/TnPCandidate {
algorithm = egKolmogorov
output = egamma/tagandprobeZ
display = Draw=e1,StatBox
-
hist Z_candidate_mass {
algorithm = egamma_FitZmass
display = StatBox,gaus(80000.,100000.)
@@ -1519,7 +1856,6 @@ dir egamma/TnPZ/TnPCandidate {
algorithm = egamma_FitZmass
display = StatBox,gaus(80000.,100000.)
}
-
}
dir egamma/TnPZ/ID {
@@ -1570,7 +1906,6 @@ dir egamma/TnPZ/Tracks {
algorithm = egKolmogorov
output = egamma/tagandprobeZ/Track
display = Draw=e1,StatBox
-
hist NOfBLayerHitsProbeinBARREL {
}
hist NOfPixelHitsProbeinBARREL {
--
GitLab